whitespace

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

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 82082a903efd3fc8e715dfaf11c3bac142d62e3b..ea57ab7c0c3d897571f10cddc8658b27ebe73e9d 100644 (file)
--- 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
@@ -20,11 +20,6 @@ package net.ktnx.mobileledger.ui.transaction_list;
 import android.content.Context;
 import android.database.MatrixCursor;
 import android.os.Bundle;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import com.google.android.material.floatingactionbutton.FloatingActionButton;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -36,6 +31,8 @@ import android.view.inputmethod.InputMethodManager;
 import android.widget.AutoCompleteTextView;
 import android.widget.Toast;
 
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
+
 import net.ktnx.mobileledger.R;
 import net.ktnx.mobileledger.model.Data;
 import net.ktnx.mobileledger.ui.MobileLedgerListFragment;
@@ -43,21 +40,23 @@ 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 java.util.Observer;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.LinearLayoutManager;
+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
@@ -69,23 +68,6 @@ 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) {
@@ -142,8 +124,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);
@@ -167,8 +147,7 @@ public class TransactionListFragment extends MobileLedgerListFragment {
             mActivity.scheduleTransactionListRetrieval();
         });
 
-        Colors.themeWatch.addObserver(
-                (o, arg) -> swiper.setColorSchemeColors(Colors.primary));
+        Colors.themeWatch.addObserver((o, arg) -> swiper.setColorSchemeColors(Colors.primary));
         swiper.setColorSchemeColors(Colors.primary);
 
         vAccountFilter = mActivity.findViewById(R.id.transaction_list_account_name_filter);
@@ -178,26 +157,16 @@ public class TransactionListFragment extends MobileLedgerListFragment {
         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.set(mc.getString(1));
             Globals.hideSoftKeyboard(mActivity);
         });
 
-        accountFilter.addObserver((o, arg) -> {
-            String accountName = accountFilter.get();
-            modelAdapter.setBoldAccountName(accountName);
-            setShowOnlyAccountName(accountName);
-            TransactionListViewModel.scheduleTransactionListReload();
-            if (menuTransactionListFilter != null) menuTransactionListFilter.setVisible(false);
-        });
-
-        Data.profile.addObserver((o, arg) -> mActivity.runOnUiThread(() -> {
-            Log.d("transactions", "requesting list reload");
-            TransactionListViewModel.scheduleTransactionListReload();
-        }));
+        if (accountFilterObserver == null) {
+            accountFilterObserver = (o, arg) -> onAccountNameFilterChanged();
+            Data.accountFilter.addObserver(accountFilterObserver);
+        }
 
-        TransactionListViewModel.scheduleTransactionListReload();
         TransactionListViewModel.updating.addObserver(
                 (o, arg) -> swiper.setRefreshing(TransactionListViewModel.updating.get()));
         TransactionListViewModel.updateError.addObserver(new Observer() {
@@ -214,13 +183,31 @@ 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);
             vAccountFilter.setVisibility(View.GONE);
-            if (menuTransactionListFilter != null) menuTransactionListFilter.setVisible(true);
-            accountFilter.set(null);
-            accNameFilter.setText(null);
-            TransactionListViewModel.scheduleTransactionListReload();
+            menuTransactionListFilter.setVisible(true);
             Globals.hideSoftKeyboard(mActivity);
         });
+
+        onAccountNameFilterChanged(false);
+    }
+    private void onAccountNameFilterChanged() {
+        onAccountNameFilterChanged(true);
+    }
+    private void onAccountNameFilterChanged(boolean reloadTransactions) {
+        String accName = Data.accountFilter.get();
+        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);
+
+        if (reloadTransactions) TransactionListViewModel.scheduleTransactionListReload();
+
     }
     @Override
     public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
@@ -229,7 +216,7 @@ public class TransactionListFragment extends MobileLedgerListFragment {
         menuTransactionListFilter = menu.findItem(R.id.menu_transaction_list_filter);
         if ((menuTransactionListFilter == null)) throw new AssertionError();
 
-        if (mShowOnlyAccountName != null) {
+        if (Data.accountFilter.get() != null) {
             menuTransactionListFilter.setVisible(false);
         }