X-Git-Url: https://git.ktnx.net/?p=mobile-ledger.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Ftransaction_list%2FTransactionListFragment.java;h=7ebf4e9161a409185475f63dcbff384682329e0e;hp=0b9e4e33f5fe0d0c4cbca58b5d3cd41bb25b1cf1;hb=be3bfabca0462fc0c8ca7ab241da304b68971056;hpb=bd5da50ef980c0c9657ec1e9c3e681ab5092f438 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 0b9e4e33..7ebf4e91 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 @@ -30,8 +30,6 @@ 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; @@ -99,29 +97,21 @@ public class TransactionListFragment extends MobileLedgerListFragment { modelAdapter = new TransactionListAdapter(); root.setAdapter(modelAdapter); - 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); - llm.setOrientation(LinearLayoutManager.VERTICAL); + llm.setOrientation(RecyclerView.VERTICAL); root.setLayoutManager(llm); swiper.setOnRefreshListener(() -> { debug("ui", "refreshing transactions via swipe"); - mActivity.scheduleTransactionListRetrieval(); + Data.scheduleTransactionListRetrieval(mActivity); }); 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); @@ -156,6 +146,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); }