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=a6c29db6a9884c7c395f2ec354c4978a9ba14b8b;hp=bccdb972fe1e5d5f23fc43e6a435e286e5c3b99f;hb=99c3bfb3451ebb1fc55d728d8d1741849cf789db;hpb=a64a1104191672d6bd017e9f833974cbdd852023 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 bccdb972..a6c29db6 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 @@ -19,8 +19,12 @@ package net.ktnx.mobileledger.ui.activity; import android.content.Intent; import android.content.pm.PackageInfo; +import android.content.pm.ShortcutInfo; +import android.content.pm.ShortcutManager; import android.content.res.ColorStateList; +import android.content.res.Resources; import android.graphics.Color; +import android.graphics.drawable.Icon; import android.os.AsyncTask; import android.os.Build; import android.os.Bundle; @@ -38,17 +42,21 @@ import android.widget.Toast; import com.google.android.material.floatingactionbutton.FloatingActionButton; import net.ktnx.mobileledger.R; +import net.ktnx.mobileledger.async.DbOpQueue; import net.ktnx.mobileledger.async.RefreshDescriptionsTask; import net.ktnx.mobileledger.async.RetrieveTransactionsTask; import net.ktnx.mobileledger.model.Data; import net.ktnx.mobileledger.model.LedgerAccount; import net.ktnx.mobileledger.model.MobileLedgerProfile; +import net.ktnx.mobileledger.ui.account_summary.AccountSummaryAdapter; import net.ktnx.mobileledger.ui.account_summary.AccountSummaryFragment; +import net.ktnx.mobileledger.ui.account_summary.AccountSummaryViewModel; import net.ktnx.mobileledger.ui.profiles.ProfileDetailFragment; 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.LockHolder; import net.ktnx.mobileledger.utils.MLDB; import java.lang.ref.WeakReference; @@ -56,7 +64,6 @@ import java.text.DateFormat; import java.util.ArrayList; import java.util.Date; import java.util.List; -import java.util.Observable; import java.util.Observer; import androidx.appcompat.app.ActionBarDrawerToggle; @@ -71,8 +78,9 @@ import androidx.recyclerview.widget.RecyclerView; import androidx.viewpager.widget.ViewPager; public class MainActivity extends ProfileThemedActivity { - private static final String STATE_CURRENT_PAGE = "current_page"; - private static final String BUNDLE_SAVED_STATE = "bundle_savedState"; + 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"; public AccountSummaryFragment mAccountSummaryFragment; DrawerLayout drawer; private LinearLayout profileListContainer; @@ -90,34 +98,49 @@ public class MainActivity extends ProfileThemedActivity { private boolean profileModificationEnabled = false; private boolean profileListExpanded = false; private ProfilesRecyclerViewAdapter mProfileListAdapter; + private int mCurrentPage; + private String mAccountFilter; + private boolean mBackMeansToAccountList = false; + private Observer profileObserver; + private Observer profilesObserver; + private Observer lastUpdateDateObserver; + private Toolbar mToolbar; @Override protected void onStart() { super.onStart(); - setupProfile(); - - updateLastUpdateTextFromDB(); - Date lastUpdate = Data.lastUpdateDate.get(); + Log.d("flow", "MainActivity.onStart()"); + mViewPager.setCurrentItem(mCurrentPage, false); + if (mAccountFilter != null) showTransactionsFragment(mAccountFilter); + else Data.accountFilter.set(null); - long now = new Date().getTime(); - if ((lastUpdate == null) || (now > (lastUpdate.getTime() + (24 * 3600 * 1000)))) { - if (lastUpdate == null) Log.d("db::", "WEB data never fetched. scheduling a fetch"); - else Log.d("db", - String.format("WEB data last fetched at %1.3f and now is %1.3f. re-fetching", - lastUpdate.getTime() / 1000f, now / 1000f)); - - scheduleTransactionListRetrieval(); - } } @Override protected void onSaveInstanceState(Bundle outState) { super.onSaveInstanceState(outState); outState.putInt(STATE_CURRENT_PAGE, mViewPager.getCurrentItem()); + if (Data.accountFilter.get() != null) + outState.putString(STATE_ACC_FILTER, Data.accountFilter.get()); + } + @Override + protected void onDestroy() { + mSectionsPagerAdapter = null; + Data.profile.deleteObserver(profileObserver); + profileObserver = null; + Data.profiles.deleteObserver(profilesObserver); + profilesObserver = null; + Data.lastUpdateDate.deleteObserver(lastUpdateDateObserver); + RecyclerView root = findViewById(R.id.nav_profile_list); + if (root != null) root.setAdapter(null); + super.onDestroy(); } @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - + Log.d("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); @@ -139,36 +162,21 @@ public class MainActivity extends ProfileThemedActivity { if (extra != null && savedInstanceState == null) savedInstanceState = extra; - Toolbar toolbar = findViewById(R.id.toolbar); - setSupportActionBar(toolbar); + mToolbar = findViewById(R.id.toolbar); + setSupportActionBar(mToolbar); - Data.profile.addObserver((o, arg) -> { - MobileLedgerProfile profile = Data.profile.get(); - runOnUiThread(() -> { - if (profile == null) setTitle(R.string.app_name); - else setTitle(profile.getName()); - updateLastUpdateTextFromDB(); - if (profile.isPostingPermitted()) { - toolbar.setSubtitle(null); - fab.show(); - } - else { - toolbar.setSubtitle(R.string.profile_subitlte_read_only); - fab.hide(); - } + if (profileObserver == null) { + profileObserver = (o, arg) -> onProfileChanged(arg); + Data.profile.addObserver(profileObserver); + } - int newProfileTheme = profile.getThemeId(); - if (newProfileTheme != Colors.profileThemeId) { - Log.d("profiles", String.format("profile theme %d → %d", Colors.profileThemeId, - newProfileTheme)); - profileThemeChanged(); - Colors.profileThemeId = newProfileTheme; - } - }); - }); + if (profilesObserver == null) { + profilesObserver = (o, arg) -> onProfileListChanged(arg); + Data.profiles.addObserver(profilesObserver); + } ActionBarDrawerToggle toggle = - new ActionBarDrawerToggle(this, drawer, toolbar, R.string.navigation_drawer_open, + new ActionBarDrawerToggle(this, drawer, mToolbar, R.string.navigation_drawer_open, R.string.navigation_drawer_close); drawer.addDrawerListener(toggle); toggle.syncState(); @@ -210,17 +218,21 @@ public class MainActivity extends ProfileThemedActivity { } }); + mCurrentPage = 0; if (savedInstanceState != null) { int currentPage = savedInstanceState.getInt(STATE_CURRENT_PAGE, -1); if (currentPage != -1) { - mViewPager.setCurrentItem(currentPage, false); + mCurrentPage = currentPage; } + mAccountFilter = savedInstanceState.getString(STATE_ACC_FILTER, null); } + else mAccountFilter = null; - Data.lastUpdateDate.addObserver((o, arg) -> { + lastUpdateDateObserver = (o, arg) -> { Log.d("main", "lastUpdateDate changed"); runOnUiThread(this::updateLastUpdateDisplay); - }); + }; + Data.lastUpdateDate.addObserver(lastUpdateDateObserver); updateLastUpdateDisplay(); @@ -236,26 +248,22 @@ public class MainActivity extends ProfileThemedActivity { if (root == null) throw new RuntimeException("Can't get hold on the transaction value view"); - mProfileListAdapter = new ProfilesRecyclerViewAdapter(); + if (mProfileListAdapter == null) mProfileListAdapter = new ProfilesRecyclerViewAdapter(); root.setAdapter(mProfileListAdapter); - mProfileListAdapter.addEditingProfilesObserver(new Observer() { - @Override - public void update(Observable o, Object arg) { - if (mProfileListAdapter.isEditingProfiles()) { - profileListHeadArrow.clearAnimation(); - profileListHeadArrow.setVisibility(View.GONE); - profileListHeadMore.setVisibility(View.GONE); - profileListHeadCancel.setVisibility(View.VISIBLE); - } - else { - profileListHeadArrow.setRotation(180f); - profileListHeadArrow.setVisibility(View.VISIBLE); - profileListHeadCancel.setVisibility(View.GONE); - profileListHeadMore.setVisibility(View.GONE); - profileListHeadMore - .setVisibility(profileListExpanded ? View.VISIBLE : View.GONE); - } + mProfileListAdapter.addEditingProfilesObserver((o, arg) -> { + if (mProfileListAdapter.isEditingProfiles()) { + profileListHeadArrow.clearAnimation(); + profileListHeadArrow.setVisibility(View.GONE); + profileListHeadMore.setVisibility(View.GONE); + profileListHeadCancel.setVisibility(View.VISIBLE); + } + else { + profileListHeadArrow.setRotation(180f); + profileListHeadArrow.setVisibility(View.VISIBLE); + profileListHeadCancel.setVisibility(View.GONE); + profileListHeadMore.setVisibility(View.GONE); + profileListHeadMore.setVisibility(profileListExpanded ? View.VISIBLE : View.GONE); } }); @@ -276,20 +284,142 @@ public class MainActivity extends ProfileThemedActivity { collapseProfileList(); } }); + + setupProfile(); + onProfileChanged(null); + + updateLastUpdateTextFromDB(); + Date lastUpdate = Data.lastUpdateDate.get(); + + long now = new Date().getTime(); + if ((lastUpdate == null) || (now > (lastUpdate.getTime() + (24 * 3600 * 1000)))) { + if (lastUpdate == null) Log.d("db::", "WEB data never fetched. scheduling a fetch"); + else Log.d("db", + String.format("WEB data last fetched at %1.3f and now is %1.3f. re-fetching", + lastUpdate.getTime() / 1000f, now / 1000f)); + + scheduleTransactionListRetrieval(); + } + } + private void createShortcuts() { + Resources rm = getResources(); + List shortcuts = new ArrayList<>(); + try (LockHolder lh = 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); + } + } + ShortcutManager sm = getSystemService(ShortcutManager.class); + sm.setDynamicShortcuts(shortcuts); + } + private void onProfileListChanged(Object arg) { + findViewById(R.id.nav_profile_list).setMinimumHeight( + (int) (getResources().getDimension(R.dimen.thumb_row_height) * + Data.profiles.size())); + + Log.d("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(() -> { + + Data.transactions.clear(); + Log.d("transactions", "requesting list reload"); + TransactionListViewModel.scheduleTransactionListReload(); + + Data.accounts.clear(); + AccountSummaryViewModel.scheduleAccountListReload(); + + 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); + } + + 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) { + Log.d("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(); + + if (profile == null) { + mToolbar.setSubtitle(null); + fab.hide(); + } + else { + if (profile.isPostingPermitted()) { + mToolbar.setSubtitle(null); + fab.show(); + } + else { + mToolbar.setSubtitle(R.string.profile_subitlte_read_only); + fab.hide(); + } + } + }); } private void updateLastUpdateDisplay() { + LinearLayout l = findViewById(R.id.transactions_last_update_layout); TextView v = findViewById(R.id.transactions_last_update); Date date = Data.lastUpdateDate.get(); if (date == null) { - v.setText(R.string.transaction_last_update_never); + l.setVisibility(View.INVISIBLE); Log.d("main", "no last update date :("); } else { final String text = DateFormat.getDateTimeInstance().format(date); v.setText(text); + l.setVisibility(View.VISIBLE); Log.d("main", String.format("Date formatted: %s", text)); } } + @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(); @@ -315,9 +445,9 @@ public class MainActivity extends ProfileThemedActivity { String profileUUID = MLDB.getOption(MLDB.OPT_PROFILE_UUID, null); MobileLedgerProfile profile; - profile = MobileLedgerProfile.loadAllFromDB(profileUUID); + profile = Data.getProfile(profileUUID); - if (Data.profiles.getList().isEmpty()) { + if (Data.profiles.isEmpty()) { findViewById(R.id.no_profiles_layout).setVisibility(View.VISIBLE); findViewById(R.id.pager_layout).setVisibility(View.GONE); return; @@ -361,7 +491,7 @@ public class MainActivity extends ProfileThemedActivity { } private void showAccountSummaryFragment() { mViewPager.setCurrentItem(0, true); - TransactionListFragment.accountFilter.set(null); + Data.accountFilter.set(null); // FragmentTransaction ft = fragmentManager.beginTransaction(); // accountSummaryFragment = new AccountSummaryFragment(); // ft.replace(R.id.root_frame, accountSummaryFragment); @@ -371,14 +501,18 @@ public class MainActivity extends ProfileThemedActivity { public void onLatestTransactionsClicked(View view) { drawer.closeDrawers(); - showTransactionsFragment(null); + showTransactionsFragment((String) null); } private void resetFragmentBackStack() { // fragmentManager.popBackStack(0, FragmentManager.POP_BACK_STACK_INCLUSIVE); } - private void showTransactionsFragment(LedgerAccount account) { - if (account != null) TransactionListFragment.accountFilter.set(account.getName()); + private void showTransactionsFragment(String accName) { + Data.accountFilter.set(accName); + Data.accountFilter.notifyObservers(); mViewPager.setCurrentItem(1, true); + } + private void showTransactionsFragment(LedgerAccount account) { + showTransactionsFragment((account == null) ? (String) null : account.getName()); // FragmentTransaction ft = fragmentManager.beginTransaction(); // if (transactionListFragment == null) { // Log.d("flow", "MainActivity creating TransactionListFragment"); @@ -398,6 +532,7 @@ public class MainActivity extends ProfileThemedActivity { // currentFragment = transactionListFragment; } public void showAccountTransactions(LedgerAccount account) { + mBackMeansToAccountList = true; showTransactionsFragment(account); } @Override @@ -407,10 +542,17 @@ public class MainActivity extends ProfileThemedActivity { drawer.closeDrawer(GravityCompat.START); } else { - Log.d("fragments", - String.format("manager stack: %d", fragmentManager.getBackStackEntryCount())); + if (mBackMeansToAccountList && (mViewPager.getCurrentItem() == 1)) { + Data.accountFilter.set(null); + showAccountSummaryFragment(); + mBackMeansToAccountList = false; + } + else { + Log.d("fragments", String.format("manager stack: %d", + fragmentManager.getBackStackEntryCount())); - super.onBackPressed(); + super.onBackPressed(); + } } } public void updateLastUpdateTextFromDB() { @@ -555,10 +697,14 @@ public class MainActivity extends ProfileThemedActivity { } public void onAccountSummaryRowViewClicked(View view) { - ViewGroup row = (ViewGroup) view.getParent(); + ViewGroup row; + if (view.getId() == R.id.account_expander) row = (ViewGroup) view.getParent().getParent(); + else row = (ViewGroup) view.getParent(); + LedgerAccount acc = (LedgerAccount) row.getTag(); switch (view.getId()) { case R.id.account_row_acc_name: + case R.id.account_expander: case R.id.account_expander_container: Log.d("accounts", "Account expander clicked"); if (!acc.hasSubAccounts()) return; @@ -571,7 +717,9 @@ public class MainActivity extends ProfileThemedActivity { ViewPropertyAnimator animator = arrow.animate(); acc.toggleExpanded(); - Data.profile.get().storeAccount(MLDB.getWritableDatabase(), acc); + DbOpQueue.add("update accounts set expanded=? where name=? and profile=?", + new Object[]{acc.isExpanded(), acc.getName(), Data.profile.get().getUuid() + }); if (wasExpanded) { Log.d("accounts", String.format("Collapsing account '%s'", acc.getName())); @@ -580,50 +728,65 @@ public class MainActivity extends ProfileThemedActivity { // removing all child accounts from the view int start = -1, count = 0; - int i = 0; - final ArrayList accountList = Data.accounts.get(); - for (LedgerAccount a : accountList) { - if (acc.isParentOf(a)) { - if (start == -1) { - start = i; + try (LockHolder lh = Data.accounts.lockForWriting()) { + for (int i = 0; i < Data.accounts.size(); i++) { + if (acc.isParentOf(Data.accounts.get(i))) { +// Log.d("accounts", String.format("Found a child '%s' at position %d", +// Data.accounts.get(i).getName(), i)); + if (start == -1) { + start = i; + } + count++; } - count++; - } - else { - if (start != -1) { - break; + else { + if (start != -1) { +// Log.d("accounts", +// String.format("Found a non-child '%s' at position %d", +// Data.accounts.get(i).getName(), i)); + break; + } } } - i++; - } - if (start != -1) { - for (int j = 0; j < count; j++) { - Log.d("accounts", String.format("Removing item %d: %s", start + j, - accountList.get(start).getName())); - accountList.remove(start); - } + if (start != -1) { + for (int j = 0; j < count; j++) { +// Log.d("accounts", String.format("Removing item %d: %s", start + j, +// Data.accounts.get(start).getName())); + Data.accounts.removeQuietly(start); + } - mAccountSummaryFragment.modelAdapter.notifyItemRangeRemoved(start, count); + mAccountSummaryFragment.modelAdapter + .notifyItemRangeRemoved(start, count); + } } } else { Log.d("accounts", String.format("Expanding account '%s'", acc.getName())); arrow.setRotation(180); animator.rotationBy(-180); - ArrayList accounts = Data.accounts.get(); List children = Data.profile.get().loadVisibleChildAccountsOf(acc); - int parentPos = accounts.indexOf(acc); - if (parentPos == -1) throw new RuntimeException( - "Can't find index of clicked account " + acc.getName()); - accounts.addAll(parentPos + 1, children); - mAccountSummaryFragment.modelAdapter - .notifyItemRangeInserted(parentPos + 1, children.size()); + try (LockHolder lh = Data.accounts.lockForWriting()) { + int parentPos = Data.accounts.indexOf(acc); + if (parentPos != -1) { + // may have disappeared in a concurrent refresh operation + Data.accounts.addAllQuietly(parentPos + 1, children); + mAccountSummaryFragment.modelAdapter + .notifyItemRangeInserted(parentPos + 1, children.size()); + } + } } break; case R.id.account_row_acc_amounts: - showAccountTransactions(acc); + if (acc.getAmountCount() > AccountSummaryAdapter.AMOUNT_LIMIT) { + acc.toggleAmountsExpanded(); + DbOpQueue + .add("update accounts set amounts_expanded=? where name=? and profile=?", + new Object[]{acc.amountsExpanded(), acc.getName(), + Data.profile.get().getUuid() + }); + Data.accounts.triggerItemChangedNotification(acc); + } break; } }