X-Git-Url: https://git.ktnx.net/?p=mobile-ledger.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Faccount_summary%2FAccountSummaryFragment.java;h=b6943adc41ae8d89d994d25a1c28c91f79665c31;hp=830bf6367f0f2b65850e952b1a5af7a528648abd;hb=9f35f59fcffd6b9778b36bf31f8b94d91411664f;hpb=0628b3f6f00212726a03842dff2b169adb64c64c

diff --git a/app/src/main/java/net/ktnx/mobileledger/ui/account_summary/AccountSummaryFragment.java b/app/src/main/java/net/ktnx/mobileledger/ui/account_summary/AccountSummaryFragment.java
index 830bf636..b6943adc 100644
--- a/app/src/main/java/net/ktnx/mobileledger/ui/account_summary/AccountSummaryFragment.java
+++ b/app/src/main/java/net/ktnx/mobileledger/ui/account_summary/AccountSummaryFragment.java
@@ -17,7 +17,6 @@
 
 package net.ktnx.mobileledger.ui.account_summary;
 
-import android.arch.lifecycle.ViewModelProviders;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.os.Bundle;
@@ -43,25 +42,20 @@ import net.ktnx.mobileledger.ui.RecyclerItemListener;
 import net.ktnx.mobileledger.ui.activity.MainActivity;
 
 import java.util.List;
-import java.util.Observable;
 import java.util.Observer;
 
 import static net.ktnx.mobileledger.ui.activity.SettingsActivity.PREF_KEY_SHOW_ONLY_STARRED_ACCOUNTS;
 
 public class AccountSummaryFragment extends MobileLedgerListFragment {
 
-    private static long account_list_last_updated;
-    private static boolean account_list_needs_update = true;
-    MenuItem mShowHiddenAccounts;
-    SharedPreferences.OnSharedPreferenceChangeListener sBindPreferenceSummaryToValueListener;
-    private AccountSummaryViewModel model;
+    MenuItem mShowOnlyStarred;
     private AccountSummaryAdapter modelAdapter;
     private Menu optMenu;
     private FloatingActionButton fab;
     private Observer backgroundTaskCountObserver;
     @Override
     public void onDestroy() {
-        if(backgroundTaskCountObserver!= null) {
+        if (backgroundTaskCountObserver != null) {
             Log.d("acc", "destroying background task count observer");
             Data.backgroundTaskCount.deleteObserver(backgroundTaskCountObserver);
         }
@@ -74,17 +68,14 @@ public class AccountSummaryFragment extends MobileLedgerListFragment {
 
         if (backgroundTaskCountObserver == null) {
             Log.d("acc", "creating background task count observer");
-            Data.backgroundTaskCount.addObserver(backgroundTaskCountObserver = new Observer() {
-                @Override
-                public void update(Observable o, Object arg) {
-                    if (mActivity == null) return;
-                    if (swiper == null) return;
-                    mActivity.runOnUiThread(() -> {
-                        int cnt = Data.backgroundTaskCount.get();
-                        Log.d("acc", String.format("background task count changed to %d", cnt));
-                        swiper.setRefreshing(cnt > 0);
-                    });
-                }
+            Data.backgroundTaskCount.addObserver(backgroundTaskCountObserver = (o, arg) -> {
+                if (mActivity == null) return;
+                if (swiper == null) return;
+                mActivity.runOnUiThread(() -> {
+                    int cnt = Data.backgroundTaskCount.get();
+                    Log.d("acc", String.format("background task count changed to %d", cnt));
+                    swiper.setRefreshing(cnt > 0);
+                });
             });
         }
     }
@@ -105,7 +96,6 @@ public class AccountSummaryFragment extends MobileLedgerListFragment {
         Log.d("flow", "AccountSummaryFragment.onActivityCreated()");
         super.onActivityCreated(savedInstanceState);
 
-        model = ViewModelProviders.of(this).get(AccountSummaryViewModel.class);
         modelAdapter = new AccountSummaryAdapter();
 
         root = mActivity.findViewById(R.id.account_root);
@@ -151,12 +141,12 @@ public class AccountSummaryFragment extends MobileLedgerListFragment {
                     }
                 }));
 
-        fab.show();
+        mActivity.fabShouldShow();
         root.addOnScrollListener(new RecyclerView.OnScrollListener() {
             @Override
             public void onScrolled(@NonNull RecyclerView recyclerView, int dx, int dy) {
                 if (fab != null) {
-                    if (dy < 0) fab.show();
+                    if (dy < 0) mActivity.fabShouldShow();
                     if (dy > 0) fab.hide();
                 }
             }
@@ -168,31 +158,17 @@ public class AccountSummaryFragment extends MobileLedgerListFragment {
             mActivity.scheduleTransactionListRetrieval();
         });
 
-        Data.accounts.addObserver(new Observer() {
-            @Override
-            public void update(Observable o, Object arg) {
-                mActivity.runOnUiThread(() -> modelAdapter.notifyDataSetChanged());
-            }
-        });
+        Data.accounts.addObserver(
+                (o, arg) -> mActivity.runOnUiThread(() -> modelAdapter.notifyDataSetChanged()));
+        Data.profile.addObserver(
+                (o, arg) -> mActivity.runOnUiThread(() -> AccountSummaryViewModel.scheduleAccountListReload()));
         update_account_table();
     }
     private void update_account_table() {
         if (this.getContext() == null) return;
 
-        model.scheduleAccountListReload(this.getContext());
+        AccountSummaryViewModel.scheduleAccountListReload();
     }
-    public void onShowOnlyStarredClicked(MenuItem mi) {
-        SharedPreferences pref = PreferenceManager.getDefaultSharedPreferences(mActivity);
-        boolean flag = pref.getBoolean(PREF_KEY_SHOW_ONLY_STARRED_ACCOUNTS, false);
-
-        SharedPreferences.Editor editor = pref.edit();
-        editor.putBoolean(PREF_KEY_SHOW_ONLY_STARRED_ACCOUNTS, !flag);
-        Log.d("pref", "Setting show only starred accounts pref to " + (flag ? "false" : "true"));
-        editor.apply();
-
-        update_account_table();
-    }
-
     void stopSelection() {
         modelAdapter.stopSelection();
         if (optMenu != null) {
@@ -217,16 +193,46 @@ public class AccountSummaryFragment extends MobileLedgerListFragment {
         inflater.inflate(R.menu.account_summary, menu);
         optMenu = menu;
 
-        mShowHiddenAccounts = menu.findItem(R.id.menu_acc_summary_only_starred);
-        if (mShowHiddenAccounts == null) throw new AssertionError();
+        mShowOnlyStarred = menu.findItem(R.id.menu_acc_summary_only_starred);
+        if (mShowOnlyStarred == null) throw new AssertionError();
+        MenuItem mCancelSelection = menu.findItem(R.id.menu_acc_summary_cancel_selection);
+        if (mCancelSelection == null) throw new AssertionError();
+        MenuItem mConfirmSelection = menu.findItem(R.id.menu_acc_summary_confirm_selection);
+        if (mConfirmSelection == null) throw new AssertionError();
+
+        Data.optShowOnlyStarred.addObserver((o, arg) -> {
+            boolean newValue = Data.optShowOnlyStarred.get();
+            Log.d("pref", String.format("pref change came (%s)", newValue ? "true" : "false"));
+            mShowOnlyStarred.setChecked(newValue);
+            update_account_table();
+        });
+
+        mShowOnlyStarred.setChecked(Data.optShowOnlyStarred.get());
+
+        Log.d("menu", "Accounts: onCreateOptionsMenu called");
+
+        mShowOnlyStarred.setOnMenuItemClickListener(item -> {
+            SharedPreferences pref = PreferenceManager.getDefaultSharedPreferences(mActivity);
+            SharedPreferences.Editor editor = pref.edit();
+            boolean flag = item.isChecked();
+            editor.putBoolean(PREF_KEY_SHOW_ONLY_STARRED_ACCOUNTS, !flag);
+            Log.d("pref",
+                    "Setting show only starred accounts pref to " + (flag ? "false" : "true"));
+            editor.apply();
 
-        sBindPreferenceSummaryToValueListener = (preference, value) -> mShowHiddenAccounts
-                .setChecked(preference.getBoolean(PREF_KEY_SHOW_ONLY_STARRED_ACCOUNTS, false));
-        SharedPreferences pref = PreferenceManager.getDefaultSharedPreferences(mActivity);
-        pref.registerOnSharedPreferenceChangeListener(sBindPreferenceSummaryToValueListener);
+            return true;
+        });
+
+        mCancelSelection.setOnMenuItemClickListener(item -> {
+            stopSelection();
+            return true;
+        });
 
-        mShowHiddenAccounts.setChecked(pref.getBoolean(PREF_KEY_SHOW_ONLY_STARRED_ACCOUNTS, false));
+        mConfirmSelection.setOnMenuItemClickListener(item -> {
+            AccountSummaryViewModel.commitSelections(mActivity);
+            stopSelection();
 
-        Log.d("menu", "MainActivity: onCreateOptionsMenu called");
+            return true;
+        });
     }
 }