X-Git-Url: https://git.ktnx.net/?p=mobile-ledger.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Factivity%2FMainActivity.java;h=484bcb018f3faef03af558a8bf8ac75703e5d679;hp=e43970d229594a7a3377fd25b8ca6f14f6305219;hb=f397735f4ef56cc287e3345d23eac91909e3e2f3;hpb=558fbcc35918d8fb106a3f7e5cad7c70650dfb59 diff --git a/app/src/main/java/net/ktnx/mobileledger/ui/activity/MainActivity.java b/app/src/main/java/net/ktnx/mobileledger/ui/activity/MainActivity.java index e43970d2..484bcb01 100644 --- a/app/src/main/java/net/ktnx/mobileledger/ui/activity/MainActivity.java +++ b/app/src/main/java/net/ktnx/mobileledger/ui/activity/MainActivity.java @@ -18,6 +18,7 @@ package net.ktnx.mobileledger.ui.activity; import android.content.Intent; +import android.content.SharedPreferences; import android.content.pm.PackageInfo; import android.content.pm.ShortcutInfo; import android.content.pm.ShortcutManager; @@ -85,6 +86,7 @@ public class MainActivity extends ProfileThemedActivity { public static final String STATE_CURRENT_PAGE = "current_page"; public static final String BUNDLE_SAVED_STATE = "bundle_savedState"; public static final String STATE_ACC_FILTER = "account_filter"; + private static final String PREF_THEME_ID = "themeId"; public AccountSummaryFragment mAccountSummaryFragment; DrawerLayout drawer; private LinearLayout profileListContainer; @@ -141,9 +143,12 @@ public class MainActivity extends ProfileThemedActivity { } @Override protected void setupProfileColors() { - int profileColor = Data.retrieveCurrentThemeIdFromDb(); + SharedPreferences prefs = getPreferences(MODE_PRIVATE); + int profileColor = prefs.getInt(PREF_THEME_ID, -2); + if (profileColor == -2) profileColor = Data.retrieveCurrentThemeIdFromDb(); Colors.setupTheme(this, profileColor); Colors.profileThemeId = profileColor; + storeThemeIdInPrefs(profileColor); } @Override protected void onCreate(Bundle savedInstanceState) { @@ -337,6 +342,14 @@ public class MainActivity extends ProfileThemedActivity { sm.setDynamicShortcuts(shortcuts); } private void onProfileListChanged(List newList) { + if (newList == null) { + // profiles not yet loaded from DB + findViewById(R.id.loading_layout).setVisibility(View.VISIBLE); + findViewById(R.id.no_profiles_layout).setVisibility(View.GONE); + findViewById(R.id.pager_layout).setVisibility(View.GONE); + return; + } + if (newList.isEmpty()) { findViewById(R.id.no_profiles_layout).setVisibility(View.VISIBLE); findViewById(R.id.pager_layout).setVisibility(View.GONE); @@ -356,7 +369,9 @@ public class MainActivity extends ProfileThemedActivity { createShortcuts(newList); } - /** called when the current profile has changed */ + /** + * called when the current profile has changed + */ private void onProfileChanged(MobileLedgerProfile profile) { boolean haveProfile = profile != null; findViewById(R.id.no_profiles_layout).setVisibility(haveProfile ? View.GONE : View.VISIBLE); @@ -427,6 +442,9 @@ public class MainActivity extends ProfileThemedActivity { private void profileThemeChanged() { Bundle bundle = new Bundle(); onSaveInstanceState(bundle); + + storeThemeIdInPrefs(profile.getThemeId()); + // restart activity to reflect theme change finish(); @@ -438,6 +456,13 @@ public class MainActivity extends ProfileThemedActivity { intent.putExtra(BUNDLE_SAVED_STATE, bundle); startActivity(intent); } + private void storeThemeIdInPrefs(int themeId) { + // store the new theme id in the preferences + SharedPreferences prefs = getPreferences(MODE_PRIVATE); + SharedPreferences.Editor e = prefs.edit(); + e.putInt(PREF_THEME_ID, themeId); + e.apply(); + } public void startEditProfileActivity(MobileLedgerProfile profile) { Intent intent = new Intent(this, ProfileDetailActivity.class); Bundle args = new Bundle(); @@ -449,7 +474,7 @@ public class MainActivity extends ProfileThemedActivity { startActivity(intent, args); } private void setupProfile() { - MLDB.getOption(MLDB.OPT_PROFILE_UUID, null, new GetOptCallback(){ + MLDB.getOption(MLDB.OPT_PROFILE_UUID, null, new GetOptCallback() { @Override protected void onResult(String profileUUID) { MobileLedgerProfile startupProfile;