X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Ftransaction_list%2FTransactionListFragment.java;h=088fd0bd94527f37107de03c1489e8a31c750e5c;hb=138706a5444b5b9b3b4038b69b27338793dbeb6b;hp=bb0355ce4de7e637026d213b2915308c6fe4e01b;hpb=8fd287a2b36f1d28ee1c1ca67687abaab4e95f2f;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 bb0355ce..088fd0bd 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
@@ -40,9 +40,9 @@ import net.ktnx.mobileledger.ui.activity.MainActivity;
 import net.ktnx.mobileledger.utils.Colors;
 import net.ktnx.mobileledger.utils.Globals;
 import net.ktnx.mobileledger.utils.MLDB;
-import net.ktnx.mobileledger.utils.ObservableValue;
 
-import java.util.Observable;
+import org.jetbrains.annotations.NotNull;
+
 import java.util.Observer;
 
 import androidx.annotation.NonNull;
@@ -53,16 +53,10 @@ import androidx.recyclerview.widget.RecyclerView;
 import static android.content.Context.INPUT_METHOD_SERVICE;
 
 public class TransactionListFragment extends MobileLedgerListFragment {
-    public static final String BUNDLE_KEY_FILTER_ACCOUNT_NAME = "filter_account_name";
-    public static ObservableValue<String> accountFilter = new ObservableValue<>();
-    private String mShowOnlyAccountName;
     private MenuItem menuTransactionListFilter;
     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) {
@@ -71,45 +65,22 @@ public class TransactionListFragment extends MobileLedgerListFragment {
         }
         super.onDestroy();
     }
-    public void setShowOnlyAccountName(String mShowOnlyAccountName) {
-        this.mShowOnlyAccountName = mShowOnlyAccountName;
-        if (modelAdapter != null) {
-            modelAdapter.setBoldAccountName(mShowOnlyAccountName);
-        }
-        if (accNameFilter != null) {
-            accNameFilter.setText(mShowOnlyAccountName, false);
-        }
-        if (vAccountFilter != null) {
-            vAccountFilter.setVisibility(
-                    ((mShowOnlyAccountName != null) && !mShowOnlyAccountName.isEmpty())
-                    ? View.VISIBLE : View.GONE);
-        }
-    }
-    @Override
-    public void setArguments(@Nullable Bundle args) {
-        super.setArguments(args);
-        mShowOnlyAccountName = args.getString(BUNDLE_KEY_FILTER_ACCOUNT_NAME);
-    }
     @Override
     public void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setHasOptionsMenu(true);
         if (backgroundTaskCountObserver == null) {
             Log.d("rtl", "creating background task count observer");
-            Data.backgroundTaskCount.addObserver(backgroundTaskCountObserver = new Observer() {
-                @Override
-                public void update(Observable o, Object arg) {
-                    mActivity.runOnUiThread(() -> {
+            Data.backgroundTaskCount.addObserver(
+                    backgroundTaskCountObserver = (o, arg) -> mActivity.runOnUiThread(() -> {
                         int cnt = Data.backgroundTaskCount.get();
                         Log.d("trl", String.format("background task count changed to %d", cnt));
                         swiper.setRefreshing(cnt > 0);
-                    });
-                }
-            });
+                    }));
         }
     }
     @Override
-    public void onAttach(Context context) {
+    public void onAttach(@NotNull Context context) {
         super.onAttach(context);
         mActivity = (MainActivity) context;
     }
@@ -145,8 +116,6 @@ public class TransactionListFragment extends MobileLedgerListFragment {
         if (root == null)
             throw new RuntimeException("Can't get hold on the transaction value view");
         modelAdapter = new TransactionListAdapter();
-
-        modelAdapter.setBoldAccountName(mShowOnlyAccountName);
         root.setAdapter(modelAdapter);
 
         FloatingActionButton fab = mActivity.findViewById(R.id.btn_add_transaction);
@@ -170,66 +139,62 @@ 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");
-            TransactionListViewModel.scheduleTransactionListReload();
             MatrixCursor mc = (MatrixCursor) parent.getItemAtPosition(position);
-            accountFilter.set(mc.getString(1));
+            Data.accountFilter.setValue(mc.getString(1));
             Globals.hideSoftKeyboard(mActivity);
         });
 
-        if (accountFilterObserver == null) {
-            accountFilterObserver = (o, arg) -> {
-                String accountName = accountFilter.get();
-                modelAdapter.setBoldAccountName(accountName);
-                setShowOnlyAccountName(accountName);
-                TransactionListViewModel.scheduleTransactionListReload();
-                if (menuTransactionListFilter != null) menuTransactionListFilter.setVisible(false);
-            };
-            accountFilter.addObserver(accountFilterObserver);
-        }
+        Data.accountFilter.observe(this, this::onAccountNameFilterChanged);
 
         TransactionListViewModel.updating.addObserver(
                 (o, arg) -> swiper.setRefreshing(TransactionListViewModel.updating.get()));
-        TransactionListViewModel.updateError.addObserver(new Observer() {
-            @Override
-            public void update(Observable o, Object arg) {
-                String err = TransactionListViewModel.updateError.get();
-                if (err == null) return;
+        TransactionListViewModel.updateError.addObserver((o, arg) -> {
+            String err = TransactionListViewModel.updateError.get();
+            if (err == null) return;
 
-                Toast.makeText(mActivity, err, Toast.LENGTH_SHORT).show();
-                TransactionListViewModel.updateError.set(null);
-            }
+            Toast.makeText(mActivity, err, Toast.LENGTH_SHORT).show();
+            TransactionListViewModel.updateError.set(null);
         });
         Data.transactions.addObserver(
                 (o, arg) -> mActivity.runOnUiThread(() -> modelAdapter.notifyDataSetChanged()));
 
         mActivity.findViewById(R.id.clearAccountNameFilter).setOnClickListener(v -> {
+            Data.accountFilter.setValue(null);
             vAccountFilter.setVisibility(View.GONE);
-            if (menuTransactionListFilter != null) menuTransactionListFilter.setVisible(true);
-            accountFilter.set(null);
-            accNameFilter.setText(null);
-            TransactionListViewModel.scheduleTransactionListReload();
+            menuTransactionListFilter.setVisible(true);
             Globals.hideSoftKeyboard(mActivity);
         });
     }
+    private void onAccountNameFilterChanged(String accName) {
+        if (accNameFilter != null) {
+            accNameFilter.setText(accName, false);
+        }
+        final boolean filterActive = (accName != null) && !accName.isEmpty();
+        if (vAccountFilter != null) {
+            vAccountFilter.setVisibility(filterActive ? View.VISIBLE : View.GONE);
+        }
+        if (menuTransactionListFilter != null) menuTransactionListFilter.setVisible(!filterActive);
+
+        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 (mShowOnlyAccountName != null) {
+        if (Data.accountFilter.getValue() != null) {
             menuTransactionListFilter.setVisible(false);
         }