X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Ftransaction_list%2FTransactionListFragment.java;h=5fd3400a741d30d922f33c49c602b892a5f736a8;hb=1d187040079f526624833070f21a4477497d5b53;hp=ea57ab7c0c3d897571f10cddc8658b27ebe73e9d;hpb=fbadb0e6e62d1959351b2dc81fc865201913361b;p=mobile-ledger.git

diff --git a/app/src/main/java/net/ktnx/mobileledger/ui/transaction_list/TransactionListFragment.java b/app/src/main/java/net/ktnx/mobileledger/ui/transaction_list/TransactionListFragment.java
index ea57ab7c..5fd3400a 100644
--- a/app/src/main/java/net/ktnx/mobileledger/ui/transaction_list/TransactionListFragment.java
+++ b/app/src/main/java/net/ktnx/mobileledger/ui/transaction_list/TransactionListFragment.java
@@ -41,6 +41,8 @@ import net.ktnx.mobileledger.utils.Colors;
 import net.ktnx.mobileledger.utils.Globals;
 import net.ktnx.mobileledger.utils.MLDB;
 
+import org.jetbrains.annotations.NotNull;
+
 import java.util.Observable;
 import java.util.Observer;
 
@@ -56,9 +58,6 @@ public class TransactionListFragment extends MobileLedgerListFragment {
     private View vAccountFilter;
     private AutoCompleteTextView accNameFilter;
     private Observer backgroundTaskCountObserver;
-    private Observer accountFilterObserver;
-    private static void update(Observable o, Object arg) {
-    }
     @Override
     public void onDestroy() {
         if (backgroundTaskCountObserver != null) {
@@ -67,8 +66,6 @@ public class TransactionListFragment extends MobileLedgerListFragment {
         }
         super.onDestroy();
     }
-    public void setShowOnlyAccountName(String mShowOnlyAccountName) {
-    }
     @Override
     public void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -88,7 +85,7 @@ public class TransactionListFragment extends MobileLedgerListFragment {
         }
     }
     @Override
-    public void onAttach(Context context) {
+    public void onAttach(@NotNull Context context) {
         super.onAttach(context);
         mActivity = (MainActivity) context;
     }
@@ -147,25 +144,21 @@ public class TransactionListFragment extends MobileLedgerListFragment {
             mActivity.scheduleTransactionListRetrieval();
         });
 
-        Colors.themeWatch.addObserver((o, arg) -> swiper.setColorSchemeColors(Colors.primary));
+        Colors.themeWatch.observe(this, this::themeChanged);
         swiper.setColorSchemeColors(Colors.primary);
 
         vAccountFilter = mActivity.findViewById(R.id.transaction_list_account_name_filter);
         accNameFilter = mActivity.findViewById(R.id.transaction_filter_account_name);
 
-        TransactionListFragment me = this;
         MLDB.hookAutocompletionAdapter(mActivity, accNameFilter, "accounts", "name", true);
         accNameFilter.setOnItemClickListener((parent, view, position, id) -> {
 //                Log.d("tmp", "direct onItemClick");
             MatrixCursor mc = (MatrixCursor) parent.getItemAtPosition(position);
-            Data.accountFilter.set(mc.getString(1));
+            Data.accountFilter.setValue(mc.getString(1));
             Globals.hideSoftKeyboard(mActivity);
         });
 
-        if (accountFilterObserver == null) {
-            accountFilterObserver = (o, arg) -> onAccountNameFilterChanged();
-            Data.accountFilter.addObserver(accountFilterObserver);
-        }
+        Data.accountFilter.observe(this, this::onAccountNameFilterChanged);
 
         TransactionListViewModel.updating.addObserver(
                 (o, arg) -> swiper.setRefreshing(TransactionListViewModel.updating.get()));
@@ -183,20 +176,13 @@ public class TransactionListFragment extends MobileLedgerListFragment {
                 (o, arg) -> mActivity.runOnUiThread(() -> modelAdapter.notifyDataSetChanged()));
 
         mActivity.findViewById(R.id.clearAccountNameFilter).setOnClickListener(v -> {
-            String current = Data.accountFilter.get();
-            Data.accountFilter.set(null);
+            Data.accountFilter.setValue(null);
             vAccountFilter.setVisibility(View.GONE);
             menuTransactionListFilter.setVisible(true);
             Globals.hideSoftKeyboard(mActivity);
         });
-
-        onAccountNameFilterChanged(false);
-    }
-    private void onAccountNameFilterChanged() {
-        onAccountNameFilterChanged(true);
     }
-    private void onAccountNameFilterChanged(boolean reloadTransactions) {
-        String accName = Data.accountFilter.get();
+    private void onAccountNameFilterChanged(String accName) {
         if (accNameFilter != null) {
             accNameFilter.setText(accName, false);
         }
@@ -206,17 +192,17 @@ public class TransactionListFragment extends MobileLedgerListFragment {
         }
         if (menuTransactionListFilter != null) menuTransactionListFilter.setVisible(!filterActive);
 
-        if (reloadTransactions) TransactionListViewModel.scheduleTransactionListReload();
+        TransactionListViewModel.scheduleTransactionListReload();
 
     }
     @Override
-    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+    public void onCreateOptionsMenu(@NotNull Menu menu, @NotNull MenuInflater inflater) {
         inflater.inflate(R.menu.transaction_list, menu);
 
         menuTransactionListFilter = menu.findItem(R.id.menu_transaction_list_filter);
         if ((menuTransactionListFilter == null)) throw new AssertionError();
 
-        if (Data.accountFilter.get() != null) {
+        if (Data.accountFilter.getValue() != null) {
             menuTransactionListFilter.setVisible(false);
         }