X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Ftransaction_list%2FTransactionListFragment.java;h=a82ee6350dff30a3f6363c758fae1a54e58260b6;hb=c6dd0097d1e6f59b0c82b36b103e7ccdafb1f85d;hp=d2f4f619b74c019f2d1977e97f33ccfb768aa6d9;hpb=6993727d9b09a792f28e750e9a3aa7eb84e66d05;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 d2f4f619..a82ee635 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
@@ -20,7 +20,6 @@ package net.ktnx.mobileledger.ui.transaction_list;
 import android.content.Context;
 import android.database.MatrixCursor;
 import android.os.Bundle;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -46,9 +45,9 @@ import org.jetbrains.annotations.NotNull;
 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;
+import static net.ktnx.mobileledger.utils.Logger.debug;
 
 public class TransactionListFragment extends MobileLedgerListFragment {
     private MenuItem menuTransactionListFilter;
@@ -74,21 +73,21 @@ public class TransactionListFragment extends MobileLedgerListFragment {
     @Override
     public void onResume() {
         super.onResume();
-        Log.d("flow", "TransactionListFragment.onResume()");
+        debug("flow", "TransactionListFragment.onResume()");
     }
     @Override
     public void onStop() {
         super.onStop();
-        Log.d("flow", "TransactionListFragment.onStop()");
+        debug("flow", "TransactionListFragment.onStop()");
     }
     @Override
     public void onPause() {
         super.onPause();
-        Log.d("flow", "TransactionListFragment.onPause()");
+        debug("flow", "TransactionListFragment.onPause()");
     }
     @Override
     public void onActivityCreated(@Nullable Bundle savedInstanceState) {
-        Log.d("flow", "TransactionListFragment.onActivityCreated called");
+        debug("flow", "TransactionListFragment.onActivityCreated called");
         super.onActivityCreated(savedInstanceState);
 
         swiper = mActivity.findViewById(R.id.transaction_swipe);
@@ -102,13 +101,8 @@ public class TransactionListFragment extends MobileLedgerListFragment {
         FloatingActionButton fab = mActivity.findViewById(R.id.btn_add_transaction);
 
         mActivity.fabShouldShow();
-        root.addOnScrollListener(new RecyclerView.OnScrollListener() {
-            @Override
-            public void onScrolled(@NonNull RecyclerView recyclerView, int dx, int dy) {
-                if (dy < 0) mActivity.fabShouldShow();
-                if (dy > 0) fab.hide();
-            }
-        });
+
+        manageFabOnScroll();
 
         LinearLayoutManager llm = new LinearLayoutManager(mActivity);
 
@@ -116,19 +110,18 @@ public class TransactionListFragment extends MobileLedgerListFragment {
         root.setLayoutManager(llm);
 
         swiper.setOnRefreshListener(() -> {
-            Log.d("ui", "refreshing transactions via swipe");
+            debug("ui", "refreshing transactions via swipe");
             mActivity.scheduleTransactionListRetrieval();
         });
 
         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);
 
         MLDB.hookAutocompletionAdapter(mActivity, accNameFilter, "accounts", "name", true);
         accNameFilter.setOnItemClickListener((parent, view, position, id) -> {
-//                Log.d("tmp", "direct onItemClick");
+//                debug("tmp", "direct onItemClick");
             MatrixCursor mc = (MatrixCursor) parent.getItemAtPosition(position);
             Data.accountFilter.setValue(mc.getString(1));
             Globals.hideSoftKeyboard(mActivity);
@@ -156,6 +149,9 @@ public class TransactionListFragment extends MobileLedgerListFragment {
         });
     }
     private void onAccountNameFilterChanged(String accName) {
+        final String fieldText = accNameFilter.getText().toString();
+        if ((accName == null) && (fieldText.equals(""))) return;
+
         if (accNameFilter != null) {
             accNameFilter.setText(accName, false);
         }