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=060840270962507c7a239a9bac358a3574ac0916;hb=f397735f4ef56cc287e3345d23eac91909e3e2f3;hpb=431f39f54e46ffbad03159c1881bac8edcf30d75 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 06084027..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; @@ -55,16 +56,17 @@ import net.ktnx.mobileledger.ui.profiles.ProfilesRecyclerViewAdapter; import net.ktnx.mobileledger.ui.transaction_list.TransactionListFragment; import net.ktnx.mobileledger.ui.transaction_list.TransactionListViewModel; import net.ktnx.mobileledger.utils.Colors; +import net.ktnx.mobileledger.utils.GetOptCallback; import net.ktnx.mobileledger.utils.LockHolder; import net.ktnx.mobileledger.utils.MLDB; import org.jetbrains.annotations.NotNull; -import java.lang.ref.WeakReference; import java.text.DateFormat; import java.util.ArrayList; import java.util.Date; import java.util.List; +import java.util.Locale; import java.util.Observer; import androidx.appcompat.app.ActionBarDrawerToggle; @@ -84,12 +86,12 @@ 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; private View profileListHeadArrow, profileListHeadMore, profileListHeadCancel; private FragmentManager fragmentManager; - private RetrieveTransactionsTask retrieveTransactionsTask; private View bTransactionListCancelDownload; private ProgressBar progressBar; private LinearLayout progressLayout; @@ -101,13 +103,12 @@ public class MainActivity extends ProfileThemedActivity { private int mCurrentPage; private String mAccountFilter; private boolean mBackMeansToAccountList = false; - private Observer profileObserver; - private Observer profilesObserver; private Toolbar mToolbar; private DrawerLayout.SimpleDrawerListener drawerListener; private ActionBarDrawerToggle barDrawerToggle; private ViewPager.SimpleOnPageChangeListener pageChangeListener; private Observer editingProfilesObserver; + private MobileLedgerProfile profile; @Override protected void onStart() { super.onStart(); @@ -127,10 +128,6 @@ public class MainActivity extends ProfileThemedActivity { @Override protected void onDestroy() { mSectionsPagerAdapter = null; - Data.profile.deleteObserver(profileObserver); - profileObserver = null; - Data.profiles.deleteObserver(profilesObserver); - profilesObserver = null; RecyclerView root = findViewById(R.id.nav_profile_list); if (root != null) root.setAdapter(null); if (drawer != null) drawer.removeDrawerListener(drawerListener); @@ -145,12 +142,18 @@ public class MainActivity extends ProfileThemedActivity { super.onDestroy(); } @Override + protected void setupProfileColors() { + 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) { super.onCreate(savedInstanceState); debug("flow", "MainActivity.onCreate()"); - int profileColor = Data.retrieveCurrentThemeIdFromDb(); - Colors.setupTheme(this, profileColor); - Colors.profileThemeId = profileColor; setContentView(R.layout.activity_main); fab = findViewById(R.id.btn_add_transaction); @@ -158,7 +161,8 @@ public class MainActivity extends ProfileThemedActivity { profileListHeadArrow = findViewById(R.id.nav_profiles_arrow); profileListHeadMore = findViewById(R.id.nav_profiles_start_edit); profileListHeadCancel = findViewById(R.id.nav_profiles_cancel_edit); - profileListHeadMoreAndCancel = findViewById(R.id.nav_profile_list_head_buttons); + LinearLayout profileListHeadMoreAndCancel = + findViewById(R.id.nav_profile_list_head_buttons); drawer = findViewById(R.id.drawer_layout); bTransactionListCancelDownload = findViewById(R.id.transaction_list_cancel_download); progressBar = findViewById(R.id.transaction_list_progress_bar); @@ -174,15 +178,9 @@ public class MainActivity extends ProfileThemedActivity { mToolbar = findViewById(R.id.toolbar); setSupportActionBar(mToolbar); - if (profileObserver == null) { - profileObserver = (o, arg) -> onProfileChanged(arg); - Data.profile.addObserver(profileObserver); - } + Data.profile.observe(this, this::onProfileChanged); - if (profilesObserver == null) { - profilesObserver = (o, arg) -> onProfileListChanged(arg); - Data.profiles.addObserver(profilesObserver); - } + Data.profiles.observe(this, this::onProfileListChanged); if (barDrawerToggle == null) { barDrawerToggle = new ActionBarDrawerToggle(this, drawer, mToolbar, @@ -263,8 +261,6 @@ public class MainActivity extends ProfileThemedActivity { if (editingProfilesObserver == null) { editingProfilesObserver = (o, arg) -> { if (mProfileListAdapter.isEditingProfiles()) { - profileListHeadArrow.clearAnimation(); - profileListHeadArrow.setVisibility(View.GONE); profileListHeadMore.setVisibility(View.GONE); profileListHeadMore .startAnimation(AnimationUtils.loadAnimation(this, R.anim.fade_out)); @@ -273,8 +269,6 @@ public class MainActivity extends ProfileThemedActivity { .startAnimation(AnimationUtils.loadAnimation(this, R.anim.fade_in)); } else { - profileListHeadArrow.setRotation(180f); - profileListHeadArrow.setVisibility(View.VISIBLE); profileListHeadCancel.setVisibility(View.GONE); profileListHeadCancel .startAnimation(AnimationUtils.loadAnimation(this, R.anim.fade_out)); @@ -314,120 +308,120 @@ public class MainActivity extends ProfileThemedActivity { findViewById(R.id.nav_profile_list_head_layout) .setOnClickListener(this::navProfilesHeadClicked); findViewById(R.id.nav_profiles_label).setOnClickListener(this::navProfilesHeadClicked); - boolean initialStart = Data.profile.get() == null; setupProfile(); - if (!initialStart) onProfileChanged(null); - - updateLastUpdateTextFromDB(); } private void scheduleDataRetrievalIfStale(Date lastUpdate) { long now = new Date().getTime(); if ((lastUpdate == null) || (now > (lastUpdate.getTime() + (24 * 3600 * 1000)))) { if (lastUpdate == null) debug("db::", "WEB data never fetched. scheduling a fetch"); - else debug("db", - String.format("WEB data last fetched at %1.3f and now is %1.3f. re-fetching", - lastUpdate.getTime() / 1000f, now / 1000f)); + else debug("db", String.format(Locale.ENGLISH, + "WEB data last fetched at %1.3f and now is %1.3f. re-fetching", + lastUpdate.getTime() / 1000f, now / 1000f)); - scheduleTransactionListRetrieval(); + Data.scheduleTransactionListRetrieval(this); } } - private void createShortcuts() { - if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) return; + private void createShortcuts(List list) { + if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) return; List shortcuts = new ArrayList<>(); - try (LockHolder ignored = Data.profiles.lockForReading()) { - for (int i = 0; i < Data.profiles.size(); i++) { - MobileLedgerProfile p = Data.profiles.get(i); - if (!p.isPostingPermitted()) continue; - - ShortcutInfo si = new ShortcutInfo.Builder(this, "new_transaction_" + p.getUuid()) - .setShortLabel(p.getName()) - .setIcon(Icon.createWithResource(this, R.drawable.svg_thick_plus_white)) - .setIntent(new Intent(Intent.ACTION_VIEW, null, this, - NewTransactionActivity.class).putExtra("profile_uuid", p.getUuid())) - .setRank(i).build(); - shortcuts.add(si); - } + int i = 0; + for (MobileLedgerProfile p : list) { + if (!p.isPostingPermitted()) continue; + + ShortcutInfo si = new ShortcutInfo.Builder(this, "new_transaction_" + p.getUuid()) + .setShortLabel(p.getName()) + .setIcon(Icon.createWithResource(this, R.drawable.svg_thick_plus_white)) + .setIntent( + new Intent(Intent.ACTION_VIEW, null, this, NewTransactionActivity.class) + .putExtra("profile_uuid", p.getUuid())).setRank(i).build(); + shortcuts.add(si); + i++; } ShortcutManager sm = getSystemService(ShortcutManager.class); sm.setDynamicShortcuts(shortcuts); } - private void onProfileListChanged(Object arg) { + 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); + findViewById(R.id.loading_layout).setVisibility(View.GONE); + return; + } + + findViewById(R.id.pager_layout).setVisibility(View.VISIBLE); + findViewById(R.id.no_profiles_layout).setVisibility(View.GONE); + findViewById(R.id.loading_layout).setVisibility(View.GONE); + findViewById(R.id.nav_profile_list).setMinimumHeight( - (int) (getResources().getDimension(R.dimen.thumb_row_height) * - Data.profiles.size())); + (int) (getResources().getDimension(R.dimen.thumb_row_height) * newList.size())); debug("profiles", "profile list changed"); - if (arg == null) mProfileListAdapter.notifyDataSetChanged(); - else mProfileListAdapter.notifyItemChanged((int) arg); - - createShortcuts(); - } - private void onProfileChanged(Object arg) { - MobileLedgerProfile profile = Data.profile.get(); - MainActivity.this.runOnUiThread(() -> { - - boolean haveProfile = profile != null; - findViewById(R.id.no_profiles_layout) - .setVisibility(haveProfile ? View.GONE : View.VISIBLE); - findViewById(R.id.pager_layout) - .setVisibility(haveProfile ? View.VISIBLE : View.VISIBLE); - - if (profile == null) MainActivity.this.setTitle(R.string.app_name); - else MainActivity.this.setTitle(profile.getName()); - MainActivity.this.updateLastUpdateTextFromDB(); - int old_index = -1; - int new_index = -1; - if (arg != null) { - MobileLedgerProfile old = (MobileLedgerProfile) arg; - old_index = Data.getProfileIndex(old); - new_index = Data.getProfileIndex(profile); - } + mProfileListAdapter.notifyDataSetChanged(); + + createShortcuts(newList); + } + /** + * 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); + findViewById(R.id.pager_layout).setVisibility(haveProfile ? View.VISIBLE : View.VISIBLE); + + if (haveProfile) setTitle(profile.getName()); + else setTitle(R.string.app_name); + + this.profile = profile; + + mProfileListAdapter.notifyDataSetChanged(); + + int newProfileTheme = haveProfile ? profile.getThemeId() : -1; + if (newProfileTheme != Colors.profileThemeId) { + debug("profiles", + String.format(Locale.ENGLISH, "profile theme %d → %d", Colors.profileThemeId, + newProfileTheme)); + MainActivity.this.profileThemeChanged(); + Colors.profileThemeId = newProfileTheme; + // profileThemeChanged would restart the activity, so no need to reload the + // data sets below + return; + } + collapseProfileList(); - if ((old_index != -1) && (new_index != -1)) { - mProfileListAdapter.notifyItemChanged(old_index); - mProfileListAdapter.notifyItemChanged(new_index); - } - else mProfileListAdapter.notifyDataSetChanged(); - - MainActivity.this.collapseProfileList(); - - int newProfileTheme = (profile == null) ? -1 : profile.getThemeId(); - if (newProfileTheme != Colors.profileThemeId) { - debug("profiles", String.format("profile theme %d → %d", Colors.profileThemeId, - newProfileTheme)); - MainActivity.this.profileThemeChanged(); - Colors.profileThemeId = newProfileTheme; - // profileThemeChanged would restart the activity, so no need to reload the - // data sets below - return; - } - drawer.closeDrawers(); + drawer.closeDrawers(); - Data.transactions.clear(); - debug("transactions", "requesting list reload"); - TransactionListViewModel.scheduleTransactionListReload(); + Data.transactions.clear(); + debug("transactions", "requesting list reload"); + TransactionListViewModel.scheduleTransactionListReload(); - Data.accounts.clear(); - AccountSummaryViewModel.scheduleAccountListReload(); + Data.accounts.clear(); + AccountSummaryViewModel.scheduleAccountListReload(); - if (profile == null) { + if (haveProfile) { + if (profile.isPostingPermitted()) { mToolbar.setSubtitle(null); - fab.hide(); + fab.show(); } else { - if (profile.isPostingPermitted()) { - mToolbar.setSubtitle(null); - fab.show(); - } - else { - mToolbar.setSubtitle(R.string.profile_subitlte_read_only); - fab.hide(); - } + mToolbar.setSubtitle(R.string.profile_subitlte_read_only); + fab.hide(); } + } + else { + mToolbar.setSubtitle(null); + fab.hide(); + } - updateLastUpdateTextFromDB(); - }); + updateLastUpdateTextFromDB(); } private void updateLastUpdateDisplay(Date newValue) { LinearLayout l = findViewById(R.id.transactions_last_update_layout); @@ -445,31 +439,30 @@ public class MainActivity extends ProfileThemedActivity { scheduleDataRetrievalIfStale(newValue); } - @Override - public void finish() { - if (profilesObserver != null) { - Data.profiles.deleteObserver(profilesObserver); - profilesObserver = null; - } - - if (profileObserver != null) { - Data.profile.deleteObserver(profileObserver); - profileObserver = null; - } - - super.finish(); - } private void profileThemeChanged() { - setupProfileColors(); - Bundle bundle = new Bundle(); onSaveInstanceState(bundle); + + storeThemeIdInPrefs(profile.getThemeId()); + // restart activity to reflect theme change finish(); + + // un-hook all observed LiveData + Data.profile.removeObservers(this); + Data.profiles.removeObservers(this); + Data.lastUpdateDate.removeObservers(this); Intent intent = new Intent(this, this.getClass()); 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(); @@ -481,25 +474,15 @@ public class MainActivity extends ProfileThemedActivity { startActivity(intent, args); } private void setupProfile() { - String profileUUID = MLDB.getOption(MLDB.OPT_PROFILE_UUID, null); - MobileLedgerProfile profile; + MLDB.getOption(MLDB.OPT_PROFILE_UUID, null, new GetOptCallback() { + @Override + protected void onResult(String profileUUID) { + MobileLedgerProfile startupProfile; - profile = Data.getProfile(profileUUID); - - if (Data.profiles.isEmpty()) { - findViewById(R.id.no_profiles_layout).setVisibility(View.VISIBLE); - findViewById(R.id.pager_layout).setVisibility(View.GONE); - return; - } - - findViewById(R.id.pager_layout).setVisibility(View.VISIBLE); - findViewById(R.id.no_profiles_layout).setVisibility(View.GONE); - - if (profile == null) profile = Data.profiles.get(0); - - if (profile == null) throw new AssertionError("profile must have a value"); - - Data.setCurrentProfile(profile); + startupProfile = Data.getProfile(profileUUID); + Data.setCurrentProfile(startupProfile); + } + }); } public void fabNewTransactionClicked(View view) { Intent intent = new Intent(this, NewTransactionActivity.class); @@ -542,7 +525,7 @@ public class MainActivity extends ProfileThemedActivity { mViewPager.setCurrentItem(1, true); } private void showTransactionsFragment(LedgerAccount account) { - showTransactionsFragment((account == null) ? (String) null : account.getName()); + showTransactionsFragment((account == null) ? null : account.getName()); } public void showAccountTransactions(LedgerAccount account) { mBackMeansToAccountList = true; @@ -561,7 +544,7 @@ public class MainActivity extends ProfileThemedActivity { mBackMeansToAccountList = false; } else { - debug("fragments", String.format("manager stack: %d", + debug("fragments", String.format(Locale.ENGLISH, "manager stack: %d", fragmentManager.getBackStackEntryCount())); super.onBackPressed(); @@ -569,10 +552,9 @@ public class MainActivity extends ProfileThemedActivity { } } public void updateLastUpdateTextFromDB() { - final MobileLedgerProfile profile = Data.profile.get(); long last_update = (profile != null) ? profile.getLongOption(MLDB.OPT_LAST_SCRAPE, 0L) : 0; - debug("transactions", String.format("Last update = %d", last_update)); + debug("transactions", String.format(Locale.ENGLISH, "Last update = %d", last_update)); if (last_update == 0) { Data.lastUpdateDate.postValue(null); } @@ -580,19 +562,13 @@ public class MainActivity extends ProfileThemedActivity { Data.lastUpdateDate.postValue(new Date(last_update)); } } - public void scheduleTransactionListRetrieval() { - if (Data.profile.get() == null) return; - - retrieveTransactionsTask = new RetrieveTransactionsTask(new WeakReference<>(this)); - - retrieveTransactionsTask.execute(); - } public void onStopTransactionRefreshClick(View view) { debug("interactive", "Cancelling transactions refresh"); - if (retrieveTransactionsTask != null) retrieveTransactionsTask.cancel(false); + Data.stopTransactionsRetrieval(); bTransactionListCancelDownload.setEnabled(false); } public void onRetrieveDone(String error) { + Data.transactionRetrievalDone(); progressLayout.setVisibility(View.GONE); if (error == null) { @@ -631,9 +607,11 @@ public class MainActivity extends ProfileThemedActivity { } } public void fabShouldShow() { - MobileLedgerProfile profile = Data.profile.get(); if ((profile != null) && profile.isPostingPermitted()) fab.show(); } + public void fabHide() { + fab.hide(); + } public void navProfilesHeadClicked(View view) { if (profileListExpanded) { collapseProfileList(); @@ -651,9 +629,10 @@ public class MainActivity extends ProfileThemedActivity { profileListHeadArrow.startAnimation(AnimationUtils.loadAnimation(this, R.anim.rotate_180)); profileListHeadMore.setVisibility(View.VISIBLE); profileListHeadMore.startAnimation(AnimationUtils.loadAnimation(this, R.anim.fade_in)); + final ArrayList profiles = Data.profiles.getValue(); findViewById(R.id.nav_profile_list).setMinimumHeight( (int) (getResources().getDimension(R.dimen.thumb_row_height) * - Data.profiles.size())); + (profiles != null ? profiles.size() : 0))); } private void collapseProfileList() { boolean wasExpanded = profileListExpanded; @@ -724,7 +703,7 @@ public class MainActivity extends ProfileThemedActivity { acc.toggleExpanded(); DbOpQueue.add("update accounts set expanded=? where name=? and profile=?", - new Object[]{acc.isExpanded(), acc.getName(), Data.profile.get().getUuid() + new Object[]{acc.isExpanded(), acc.getName(), profile.getUuid() }); if (wasExpanded) { @@ -770,8 +749,7 @@ public class MainActivity extends ProfileThemedActivity { debug("accounts", String.format("Expanding account '%s'", acc.getName())); arrow.setRotation(180); animator.rotationBy(-180); - List children = - Data.profile.get().loadVisibleChildAccountsOf(acc); + List children = profile.loadVisibleChildAccountsOf(acc); try (LockHolder ignored = Data.accounts.lockForWriting()) { int parentPos = Data.accounts.indexOf(acc); if (parentPos != -1) { @@ -789,7 +767,7 @@ public class MainActivity extends ProfileThemedActivity { DbOpQueue .add("update accounts set amounts_expanded=? where name=? and profile=?", new Object[]{acc.amountsExpanded(), acc.getName(), - Data.profile.get().getUuid() + profile.getUuid() }); Data.accounts.triggerItemChangedNotification(acc); } @@ -799,14 +777,14 @@ public class MainActivity extends ProfileThemedActivity { public class SectionsPagerAdapter extends FragmentPagerAdapter { - public SectionsPagerAdapter(FragmentManager fm) { + SectionsPagerAdapter(FragmentManager fm) { super(fm); } @NotNull @Override public Fragment getItem(int position) { - debug("main", String.format("Switching to fragment %d", position)); + debug("main", String.format(Locale.ENGLISH, "Switching to fragment %d", position)); switch (position) { case 0: // debug("flow", "Creating account summary fragment");