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=7f1c8f3a27aff856611b52eae8453226b2b44715;hp=7218b15e728c7c89d4fc99a9e5a497e900a79a57;hb=e1a130f8b260df37640540c0098859d957761643;hpb=0167d1f5e98944aab435727e06ff74ccf9913908

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 7218b15e..7f1c8f3a 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
@@ -51,7 +51,6 @@ import static net.ktnx.mobileledger.ui.activity.SettingsActivity.PREF_KEY_SHOW_O
 public class AccountSummaryFragment extends MobileLedgerListFragment {
 
     MenuItem mShowOnlyStarred;
-    SharedPreferences.OnSharedPreferenceChangeListener sBindPreferenceSummaryToValueListener;
     private AccountSummaryViewModel model;
     private AccountSummaryAdapter modelAdapter;
     private Menu optMenu;
@@ -175,7 +174,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();
@@ -183,7 +182,7 @@ public class AccountSummaryFragment extends MobileLedgerListFragment {
     private void update_account_table() {
         if (this.getContext() == null) return;
 
-        model.scheduleAccountListReload(this.getContext());
+        model.scheduleAccountListReload();
     }
     void stopSelection() {
         modelAdapter.stopSelection();
@@ -211,15 +210,16 @@ public class AccountSummaryFragment extends MobileLedgerListFragment {
 
         mShowOnlyStarred = menu.findItem(R.id.menu_acc_summary_only_starred);
         if (mShowOnlyStarred == null) throw new AssertionError();
-
-        Data.optShowOnlyStarred.addObserver(new Observer() {
-            @Override
-            public void update(Observable o, Object arg) {
-                boolean newValue = Data.optShowOnlyStarred.get();
-                Log.d("pref", String.format("pref change came (%s)", newValue ? "true" : "false"));
-                mShowOnlyStarred.setChecked(newValue);
-                update_account_table();
-            }
+        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());
@@ -235,6 +235,17 @@ public class AccountSummaryFragment extends MobileLedgerListFragment {
                     "Setting show only starred accounts pref to " + (flag ? "false" : "true"));
             editor.apply();
 
+            return true;
+        });
+
+        mCancelSelection.setOnMenuItemClickListener(item -> {
+            stopSelection();
+            return true;
+        });
+
+        mConfirmSelection.setOnMenuItemClickListener(item -> {
+            AccountSummaryViewModel.commitSelections(mActivity);
+            stopSelection();
 
             return true;
         });