one more lambda

[mobile-ledger.git] / app / src / main / java / net / ktnx / mobileledger / ui / account_summary / AccountSummaryFragment.java

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 1f43c61ed5c0fabd8cddd5cdf8824dc2655e9959..66008e9c21221f0f98f1e07ade2614f553b4049b 100644 (file)
--- 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
@@ -50,10 +50,7 @@ import static net.ktnx.mobileledger.ui.activity.SettingsActivity.PREF_KEY_SHOW_O
 
 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;
+    MenuItem mShowOnlyStarred;
     private AccountSummaryViewModel model;
     private AccountSummaryAdapter modelAdapter;
     private Menu optMenu;
@@ -61,7 +58,7 @@ public class AccountSummaryFragment extends MobileLedgerListFragment {
     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 +71,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);
+                });
             });
         }
     }
@@ -177,7 +171,7 @@ public class AccountSummaryFragment extends MobileLedgerListFragment {
         Data.profile.addObserver(new Observer() {
             @Override
             public void update(Observable o, Object arg) {
-                mActivity.runOnUiThread(() -> model.scheduleAccountListReload(mActivity));
+                mActivity.runOnUiThread(() -> model.scheduleAccountListReload());
             }
         });
         update_account_table();
@@ -185,20 +179,8 @@ public class AccountSummaryFragment extends MobileLedgerListFragment {
     private void update_account_table() {
         if (this.getContext() == null) return;
 
-        model.scheduleAccountListReload(this.getContext());
+        model.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) {
@@ -223,16 +205,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");
 
-        sBindPreferenceSummaryToValueListener = (preference, value) -> mShowHiddenAccounts
-                .setChecked(preference.getBoolean(PREF_KEY_SHOW_ONLY_STARRED_ACCOUNTS, false));
-        SharedPreferences pref = PreferenceManager.getDefaultSharedPreferences(mActivity);
-        pref.registerOnSharedPreferenceChangeListener(sBindPreferenceSummaryToValueListener);
+        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();
 
-        mShowHiddenAccounts.setChecked(pref.getBoolean(PREF_KEY_SHOW_ONLY_STARRED_ACCOUNTS, false));
+            return true;
+        });
 
-        Log.d("menu", "MainActivity: onCreateOptionsMenu called");
+        mCancelSelection.setOnMenuItemClickListener(item -> {
+            stopSelection();
+            return true;
+        });
+
+        mConfirmSelection.setOnMenuItemClickListener(item -> {
+            AccountSummaryViewModel.commitSelections(mActivity);
+            stopSelection();
+
+            return true;
+        });
     }
 }