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=c9fd0bf33f51a75b0af907dd504eb07985cba65c;hp=e6820cf86764fe00e67c999db77fc7e1c469f43e;hb=062d4edbcf358be32ef08d4ebbf85fddf272e82e;hpb=d63a611dce420b30fa0c0711eea1d02603945a43 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 e6820cf8..c9fd0bf3 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 @@ -1,5 +1,5 @@ /* - * Copyright © 2020 Damyan Ivanov. + * Copyright © 2021 Damyan Ivanov. * This file is part of MoLe. * MoLe is free software: you can distribute it and/or modify it * under the term of the GNU General Public License as published by @@ -17,7 +17,6 @@ package net.ktnx.mobileledger.ui.transaction_list; -import android.database.Cursor; import android.os.AsyncTask; import android.os.Bundle; import android.view.LayoutInflater; @@ -37,8 +36,9 @@ import androidx.recyclerview.widget.RecyclerView; import net.ktnx.mobileledger.R; import net.ktnx.mobileledger.async.TransactionDateFinder; +import net.ktnx.mobileledger.db.AccountAutocompleteAdapter; +import net.ktnx.mobileledger.db.Profile; import net.ktnx.mobileledger.model.Data; -import net.ktnx.mobileledger.model.MobileLedgerProfile; import net.ktnx.mobileledger.ui.DatePickerFragment; import net.ktnx.mobileledger.ui.FabManager; import net.ktnx.mobileledger.ui.MainModel; @@ -47,7 +47,6 @@ import net.ktnx.mobileledger.ui.activity.MainActivity; import net.ktnx.mobileledger.utils.Colors; import net.ktnx.mobileledger.utils.Globals; import net.ktnx.mobileledger.utils.Logger; -import net.ktnx.mobileledger.utils.MLDB; import net.ktnx.mobileledger.utils.SimpleDate; import org.jetbrains.annotations.NotNull; @@ -60,9 +59,11 @@ import static net.ktnx.mobileledger.utils.Logger.debug; public class TransactionListFragment extends MobileLedgerListFragment implements DatePickerFragment.DatePickedListener { private MenuItem menuTransactionListFilter; + private MenuItem menuGoToDate; private View vAccountFilter; private AutoCompleteTextView accNameFilter; private MainModel model; + private boolean fragmentActive = false; @Override public void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -77,16 +78,31 @@ public class TransactionListFragment extends MobileLedgerListFragment @Override public void onResume() { super.onResume(); + fragmentActive = true; + toggleMenuItems(); debug("flow", "TransactionListFragment.onResume()"); } + private void toggleMenuItems() { + if (menuGoToDate != null) + menuGoToDate.setVisible(fragmentActive); + if (menuTransactionListFilter != null) { + final int filterVisibility = vAccountFilter.getVisibility(); + menuTransactionListFilter.setVisible( + fragmentActive && filterVisibility != View.VISIBLE); + } + } @Override public void onStop() { super.onStop(); + fragmentActive = false; + toggleMenuItems(); debug("flow", "TransactionListFragment.onStop()"); } @Override public void onPause() { super.onPause(); + fragmentActive = false; + toggleMenuItems(); debug("flow", "TransactionListFragment.onPause()"); } @Override @@ -107,13 +123,13 @@ public class TransactionListFragment extends MobileLedgerListFragment root = view.findViewById(R.id.transaction_root); if (root == null) throw new RuntimeException("Can't get hold on the transaction value view"); - modelAdapter = new TransactionListAdapter(model); + modelAdapter = new TransactionListAdapter(); root.setAdapter(modelAdapter); mainActivity.fabShouldShow(); if (mainActivity instanceof FabManager.FabHandler) - FabManager.handle((FabManager.FabHandler) mainActivity, root); + FabManager.handle(mainActivity, root); LinearLayoutManager llm = new LinearLayoutManager(mainActivity); @@ -130,12 +146,13 @@ public class TransactionListFragment extends MobileLedgerListFragment vAccountFilter = view.findViewById(R.id.transaction_list_account_name_filter); accNameFilter = view.findViewById(R.id.transaction_filter_account_name); - MLDB.hookAutocompletionAdapter(mainActivity, accNameFilter, "accounts", "name"); + Data.observeProfile(getViewLifecycleOwner(), this::onProfileChanged); + accNameFilter.setOnItemClickListener((parent, v, position, id) -> { // debug("tmp", "direct onItemClick"); - Cursor c = (Cursor) parent.getItemAtPosition(position); model.getAccountFilter() - .setValue(c.getString(1)); + .setValue(parent.getItemAtPosition(position) + .toString()); Globals.hideSoftKeyboard(mainActivity); }); @@ -144,18 +161,15 @@ public class TransactionListFragment extends MobileLedgerListFragment model.getUpdatingFlag() .observe(getViewLifecycleOwner(), (flag) -> refreshLayout.setRefreshing(flag)); - MobileLedgerProfile profile = Data.getProfile(); model.getDisplayedTransactions() .observe(getViewLifecycleOwner(), list -> modelAdapter.setTransactions(list)); view.findViewById(R.id.clearAccountNameFilter) .setOnClickListener(v -> { - model.getAccountFilter() - .setValue(null); - vAccountFilter.setVisibility(View.GONE); - menuTransactionListFilter.setVisible(true); - Globals.hideSoftKeyboard(mainActivity); - }); + model.getAccountFilter() + .setValue(null); + Globals.hideSoftKeyboard(mainActivity); + }); model.foundTransactionItemIndex.observe(getViewLifecycleOwner(), pos -> { Logger.debug("go-to-date", String.format(Locale.US, "Found pos %d", pos)); @@ -166,24 +180,21 @@ public class TransactionListFragment extends MobileLedgerListFragment } }); } - private void onAccountNameFilterChanged(String accName) { - final String fieldText = accNameFilter.getText() - .toString(); - if ((accName == null) && (fieldText.equals(""))) + private void onProfileChanged(Profile profile) { + if (profile == null) return; - if (accNameFilter != null) { - accNameFilter.setText(accName, false); - } - final boolean filterActive = (accName != null) && !accName.isEmpty(); + accNameFilter.setAdapter(new AccountAutocompleteAdapter(getContext(), profile)); + } + private void onAccountNameFilterChanged(String accName) { + accNameFilter.setText(accName, false); + + boolean filterActive = (accName != null) && !accName.isEmpty(); if (vAccountFilter != null) { vAccountFilter.setVisibility(filterActive ? View.VISIBLE : View.GONE); } if (menuTransactionListFilter != null) menuTransactionListFilter.setVisible(!filterActive); - - model.scheduleTransactionListReload(); - } @Override public void onCreateOptionsMenu(@NotNull Menu menu, @NotNull MenuInflater inflater) { @@ -192,19 +203,18 @@ public class TransactionListFragment extends MobileLedgerListFragment menuTransactionListFilter = menu.findItem(R.id.menu_transaction_list_filter); if ((menuTransactionListFilter == null)) throw new AssertionError(); + menuGoToDate = menu.findItem(R.id.menu_go_to_date); + if ((menuGoToDate == null)) + throw new AssertionError(); - if ((model.getAccountFilter() - .getValue() != null) || (vAccountFilter.getVisibility() == View.VISIBLE)) - { - menuTransactionListFilter.setVisible(false); - } + model.getAccountFilter() + .observe(this, v -> menuTransactionListFilter.setVisible(v == null)); super.onCreateOptionsMenu(menu, inflater); menuTransactionListFilter.setOnMenuItemClickListener(item -> { vAccountFilter.setVisibility(View.VISIBLE); - if (menuTransactionListFilter != null) - menuTransactionListFilter.setVisible(false); + menuTransactionListFilter.setVisible(false); accNameFilter.requestFocus(); InputMethodManager imm = (InputMethodManager) getMainActivity().getSystemService(INPUT_METHOD_SERVICE); @@ -213,15 +223,15 @@ public class TransactionListFragment extends MobileLedgerListFragment return true; }); - menu.findItem(R.id.menu_go_to_date) - .setOnMenuItemClickListener(item -> { - DatePickerFragment picker = new DatePickerFragment(); - picker.setOnDatePickedListener(this); - picker.setDateRange(model.getFirstTransactionDate(), - model.getLastTransactionDate()); - picker.show(requireActivity().getSupportFragmentManager(), null); - return true; - }); + menuGoToDate.setOnMenuItemClickListener(item -> { + DatePickerFragment picker = new DatePickerFragment(); + picker.setOnDatePickedListener(this); + picker.setDateRange(model.getFirstTransactionDate(), model.getLastTransactionDate()); + picker.show(requireActivity().getSupportFragmentManager(), null); + return true; + }); + + toggleMenuItems(); } @Override public void onDatePicked(int year, int month, int day) {