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=0944d1fa5dba521fd9f2c3675b14018ae2a503ae;hp=7218b15e728c7c89d4fc99a9e5a497e900a79a57;hb=98bbfc6d6604db8339f9aa5042a6740ebbd503a2;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..0944d1fa 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
@@ -43,7 +43,6 @@ 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;
@@ -51,7 +50,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;
@@ -72,17 +70,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);
+                });
             });
         }
     }
@@ -166,24 +161,16 @@ 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.profile.addObserver(new Observer() {
-            @Override
-            public void update(Observable o, Object arg) {
-                mActivity.runOnUiThread(() -> model.scheduleAccountListReload(mActivity));
-            }
-        });
+        Data.accounts.addObserver(
+                (o, arg) -> mActivity.runOnUiThread(() -> modelAdapter.notifyDataSetChanged()));
+        Data.profile.addObserver(
+                (o, arg) -> mActivity.runOnUiThread(() -> model.scheduleAccountListReload()));
         update_account_table();
     }
     private void update_account_table() {
         if (this.getContext() == null) return;
 
-        model.scheduleAccountListReload(this.getContext());
+        model.scheduleAccountListReload();
     }
     void stopSelection() {
         modelAdapter.stopSelection();
@@ -211,15 +198,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 +223,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;
         });