X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Factivity%2FProfileThemedActivity.java;h=07aae23c7d53ed64087da59d0aadd0a516703ff9;hb=8098a8b37a4331b9faf6cf50a51a0d7aa9677421;hp=6d2fff0b477919503ecdfb9bf3b758c99b05a013;hpb=dc53d92774b2ad47a921646bca65ada19aeed624;p=mobile-ledger.git diff --git a/app/src/main/java/net/ktnx/mobileledger/ui/activity/ProfileThemedActivity.java b/app/src/main/java/net/ktnx/mobileledger/ui/activity/ProfileThemedActivity.java index 6d2fff0b..07aae23c 100644 --- a/app/src/main/java/net/ktnx/mobileledger/ui/activity/ProfileThemedActivity.java +++ b/app/src/main/java/net/ktnx/mobileledger/ui/activity/ProfileThemedActivity.java @@ -1,5 +1,5 @@ /* - * Copyright © 2019 Damyan Ivanov. + * Copyright © 2021 Damyan Ivanov. * This file is part of MoLe. * MoLe is free software: you can distribute it and/or modify it * under the term of the GNU General Public License as published by @@ -25,13 +25,26 @@ import androidx.annotation.Nullable; import net.ktnx.mobileledger.model.Data; import net.ktnx.mobileledger.model.MobileLedgerProfile; import net.ktnx.mobileledger.utils.Colors; -import net.ktnx.mobileledger.utils.MLDB; +import net.ktnx.mobileledger.utils.Logger; @SuppressLint("Registered") public class ProfileThemedActivity extends CrashReportingActivity { protected MobileLedgerProfile mProfile; + private boolean themeSetUp = false; + private boolean mIgnoreProfileChange; protected void setupProfileColors() { - Colors.setupTheme(this, mProfile); + final int themeHue = (mProfile == null) ? -1 : mProfile.getThemeHue(); + + Colors.setupTheme(this, themeHue); + + if (themeSetUp) { + Logger.debug("prf-thm-act", + "setupProfileColors(): theme already set up, recreating activity"); + this.recreate(); + } + themeSetUp = true; + + Colors.profileThemeId = Data.retrieveCurrentThemeIdFromDb(); } @Override protected void onStart() { @@ -41,24 +54,20 @@ public class ProfileThemedActivity extends CrashReportingActivity { protected void onCreate(@Nullable Bundle savedInstanceState) { initProfile(); setupProfileColors(); - super.onCreate(savedInstanceState); + mIgnoreProfileChange = true; + Data.observeProfile(this, profile -> { + if (!mIgnoreProfileChange) { + mProfile = profile; + setupProfileColors(); + } - Data.profile.observe(this, mobileLedgerProfile -> { - mProfile = mobileLedgerProfile; - setupProfileColors(); + mIgnoreProfileChange = false; }); + + super.onCreate(savedInstanceState); } protected void initProfile() { - mProfile = Data.profile.getValue(); - if (mProfile == null) { - String profileUUID = MLDB.getOption(MLDB.OPT_PROFILE_UUID, null); - MobileLedgerProfile startupProfile; - - - startupProfile = Data.getProfile(profileUUID); - Data.setCurrentProfile(startupProfile); - mProfile = startupProfile; - } + mProfile = Data.initProfile(); } }