]> git.ktnx.net Git - mobile-ledger.git/blobdiff - app/src/main/java/net/ktnx/mobileledger/ui/activity/MainActivity.java
rework account list management to be fully asynchronous
[mobile-ledger.git] / app / src / main / java / net / ktnx / mobileledger / ui / activity / MainActivity.java
index 091a58fe097cd2f44d6e2ee14ddd70a2af2eb990..33bcbb005c32a855819091f4bedebf21b4a1d802 100644 (file)
@@ -30,8 +30,6 @@ import android.os.Build;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.View;
-import android.view.ViewGroup;
-import android.view.ViewPropertyAnimator;
 import android.view.animation.AnimationUtils;
 import android.widget.LinearLayout;
 import android.widget.ProgressBar;
@@ -53,22 +51,17 @@ import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import com.google.android.material.snackbar.Snackbar;
 
 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.GetOptCallback;
-import net.ktnx.mobileledger.utils.LockHolder;
 import net.ktnx.mobileledger.utils.Logger;
 import net.ktnx.mobileledger.utils.MLDB;
 
@@ -91,7 +84,6 @@ public class MainActivity extends ProfileThemedActivity {
     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 View profileListHeadMore, profileListHeadCancel, profileListHeadAddProfile;
     private View bTransactionListCancelDownload;
@@ -393,6 +385,15 @@ public class MainActivity extends ProfileThemedActivity {
      * called when the current profile has changed
      */
     private void onProfileChanged(MobileLedgerProfile profile) {
+        if (this.profile == null) {
+            if (profile == null)
+                return;
+        }
+        else {
+            if (this.profile.equals(profile))
+                return;
+        }
+
         boolean haveProfile = profile != null;
 
         if (haveProfile)
@@ -400,6 +401,10 @@ public class MainActivity extends ProfileThemedActivity {
         else
             setTitle(R.string.app_name);
 
+        if (this.profile != null)
+            this.profile.getDisplayedAccounts()
+                        .removeObservers(this);
+
         this.profile = profile;
 
         int newProfileTheme = haveProfile ? profile.getThemeHue() : -1;
@@ -423,10 +428,9 @@ public class MainActivity extends ProfileThemedActivity {
         debug("transactions", "requesting list reload");
         TransactionListViewModel.scheduleTransactionListReload();
 
-        Data.accounts.clear();
-        AccountSummaryViewModel.scheduleAccountListReload();
-
         if (haveProfile) {
+            profile.scheduleAccountListReload();
+
             if (profile.isPostingPermitted()) {
                 mToolbar.setSubtitle(null);
                 fab.show();
@@ -528,18 +532,15 @@ public class MainActivity extends ProfileThemedActivity {
     public void onLatestTransactionsClicked(View view) {
         drawer.closeDrawers();
 
-        showTransactionsFragment((String) null);
+        showTransactionsFragment(null);
     }
-    private void showTransactionsFragment(String accName) {
+    public void showTransactionsFragment(String accName) {
         Data.accountFilter.setValue(accName);
         mViewPager.setCurrentItem(1, true);
     }
-    private void showTransactionsFragment(LedgerAccount account) {
-        showTransactionsFragment((account == null) ? null : account.getName());
-    }
-    public void showAccountTransactions(LedgerAccount account) {
+    public void showAccountTransactions(String accountName) {
         mBackMeansToAccountList = true;
-        showTransactionsFragment(account);
+        showTransactionsFragment(accountName);
     }
     @Override
     public void onBackPressed() {
@@ -636,115 +637,8 @@ public class MainActivity extends ProfileThemedActivity {
     public void fabHide() {
         fab.hide();
     }
-    public void onAccountSummaryRowViewClicked(View view) {
-        ViewGroup row;
-        switch (view.getId()) {
-            case R.id.account_expander:
-                row = (ViewGroup) view.getParent()
-                                      .getParent()
-                                      .getParent();
-                break;
-            case R.id.account_expander_container:
-            case R.id.account_row_acc_name:
-                row = (ViewGroup) view.getParent()
-                                      .getParent();
-                break;
-            default:
-                row = (ViewGroup) view.getParent();
-                break;
-        }
-
-        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:
-                debug("accounts", "Account expander clicked");
-                if (!acc.hasSubAccounts())
-                    return;
-
-                boolean wasExpanded = acc.isExpanded();
-
-                View arrow = row.findViewById(R.id.account_expander_container);
-
-                arrow.clearAnimation();
-                ViewPropertyAnimator animator = arrow.animate();
-
-                acc.toggleExpanded();
-                DbOpQueue.add("update accounts set expanded=? where name=? and profile=?",
-                        new Object[]{acc.isExpanded(), acc.getName(), profile.getUuid()
-                        });
-
-                if (wasExpanded) {
-                    debug("accounts", String.format("Collapsing account '%s'", acc.getName()));
-                    arrow.setRotation(0);
-                    animator.rotationBy(180);
-
-                    // removing all child accounts from the view
-                    int start = -1, count = 0;
-                    try (LockHolder ignored = Data.accounts.lockForWriting()) {
-                        for (int i = 0; i < Data.accounts.size(); i++) {
-                            if (acc.isParentOf(Data.accounts.get(i))) {
-//                                debug("accounts", String.format("Found a child '%s' at position
-//                                %d",
-//                                        Data.accounts.get(i).getName(), i));
-                                if (start == -1) {
-                                    start = i;
-                                }
-                                count++;
-                            }
-                            else {
-                                if (start != -1) {
-//                                    debug("accounts",
-//                                            String.format("Found a non-child '%s' at position %d",
-//                                                    Data.accounts.get(i).getName(), i));
-                                    break;
-                                }
-                            }
-                        }
-
-                        if (start != -1) {
-                            for (int j = 0; j < count; j++) {
-//                                debug("accounts", String.format("Removing item %d: %s", start + j,
-//                                        Data.accounts.get(start).getName()));
-                                Data.accounts.removeQuietly(start);
-                            }
-
-                            mAccountSummaryFragment.modelAdapter.notifyItemRangeRemoved(start,
-                                    count);
-                        }
-                    }
-                }
-                else {
-                    debug("accounts", String.format("Expanding account '%s'", acc.getName()));
-                    arrow.setRotation(180);
-                    animator.rotationBy(-180);
-                    List<LedgerAccount> children = profile.loadVisibleChildAccountsOf(acc);
-                    try (LockHolder ignored = 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:
-                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(), profile.getUuid()
-                            });
-                    Data.accounts.triggerItemChangedNotification(acc);
-                }
-                break;
-        }
-    }
 
-    public class SectionsPagerAdapter extends FragmentPagerAdapter {
+    public static class SectionsPagerAdapter extends FragmentPagerAdapter {
 
         SectionsPagerAdapter(FragmentManager fm) {
             super(fm, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT);
@@ -757,7 +651,7 @@ public class MainActivity extends ProfileThemedActivity {
             switch (position) {
                 case 0:
 //                    debug("flow", "Creating account summary fragment");
-                    return mAccountSummaryFragment = new AccountSummaryFragment();
+                    return new AccountSummaryFragment();
                 case 1:
                     return new TransactionListFragment();
                 default: