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=a31b657fdc52b106e6ffd327e040b0d9cc3118e1;hp=037661f17edcdf15d07ced91f66942502ff49903;hb=HEAD;hpb=9ebf60c045fdf01d6f8d1243061e69232c2841ea 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 037661f1..a31b657f 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 @@ -17,7 +17,6 @@ package net.ktnx.mobileledger.ui.transaction_list; -import android.os.AsyncTask; import android.os.Bundle; import android.view.LayoutInflater; import android.view.Menu; @@ -26,19 +25,20 @@ import android.view.MenuItem; import android.view.View; import android.view.ViewGroup; import android.view.inputmethod.InputMethodManager; -import android.widget.AutoCompleteTextView; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.lifecycle.ViewModelProvider; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; +import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; import net.ktnx.mobileledger.R; import net.ktnx.mobileledger.async.TransactionDateFinder; +import net.ktnx.mobileledger.databinding.TransactionListFragmentBinding; 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; @@ -59,9 +59,10 @@ import static net.ktnx.mobileledger.utils.Logger.debug; public class TransactionListFragment extends MobileLedgerListFragment implements DatePickerFragment.DatePickedListener { private MenuItem menuTransactionListFilter; - private View vAccountFilter; - private AutoCompleteTextView accNameFilter; + private MenuItem menuGoToDate; private MainModel model; + private boolean fragmentActive = false; + private TransactionListFragmentBinding b; @Override public void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -71,28 +72,47 @@ public class TransactionListFragment extends MobileLedgerListFragment @Override public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { - return inflater.inflate(R.layout.transaction_list_fragment, container, false); + b = TransactionListFragmentBinding.inflate(inflater, container, false); + return b.getRoot(); } @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 = b.transactionListAccountNameFilter.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 + public SwipeRefreshLayout getRefreshLayout() { + return b.transactionSwipe; + } + @Override public void onViewCreated(@NotNull View view, @Nullable Bundle savedInstanceState) { debug("flow", "TransactionListFragment.onActivityCreated called"); super.onViewCreated(view, savedInstanceState); - Data.backgroundTasksRunning.observe(getViewLifecycleOwner(), this::onBackgroundTaskRunningChanged); @@ -100,38 +120,29 @@ public class TransactionListFragment extends MobileLedgerListFragment model = new ViewModelProvider(requireActivity()).get(MainModel.class); - refreshLayout = view.findViewById(R.id.transaction_swipe); - if (refreshLayout == null) - throw new RuntimeException("Can't get hold on the swipe layout"); - 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); - root.setAdapter(modelAdapter); + modelAdapter = new TransactionListAdapter(); + b.transactionRoot.setAdapter(modelAdapter); mainActivity.fabShouldShow(); if (mainActivity instanceof FabManager.FabHandler) - FabManager.handle((FabManager.FabHandler) mainActivity, root); + FabManager.handle(mainActivity, b.transactionRoot); LinearLayoutManager llm = new LinearLayoutManager(mainActivity); llm.setOrientation(RecyclerView.VERTICAL); - root.setLayoutManager(llm); + b.transactionRoot.setLayoutManager(llm); - refreshLayout.setOnRefreshListener(() -> { + b.transactionSwipe.setOnRefreshListener(() -> { debug("ui", "refreshing transactions via swipe"); model.scheduleTransactionListRetrieval(); }); Colors.themeWatch.observe(getViewLifecycleOwner(), this::themeChanged); - vAccountFilter = view.findViewById(R.id.transaction_list_account_name_filter); - accNameFilter = view.findViewById(R.id.transaction_filter_account_name); + Data.observeProfile(getViewLifecycleOwner(), this::onProfileChanged); - MobileLedgerProfile profile = Data.getProfile(); - accNameFilter.setAdapter(new AccountAutocompleteAdapter(mainActivity, profile)); - accNameFilter.setOnItemClickListener((parent, v, position, id) -> { + b.transactionFilterAccountName.setOnItemClickListener((parent, v, position, id) -> { // debug("tmp", "direct onItemClick"); model.getAccountFilter() .setValue(parent.getItemAtPosition(position) @@ -143,7 +154,7 @@ public class TransactionListFragment extends MobileLedgerListFragment .observe(getViewLifecycleOwner(), this::onAccountNameFilterChanged); model.getUpdatingFlag() - .observe(getViewLifecycleOwner(), (flag) -> refreshLayout.setRefreshing(flag)); + .observe(getViewLifecycleOwner(), (flag) -> b.transactionSwipe.setRefreshing(flag)); model.getDisplayedTransactions() .observe(getViewLifecycleOwner(), list -> modelAdapter.setTransactions(list)); @@ -151,38 +162,32 @@ public class TransactionListFragment extends MobileLedgerListFragment .setOnClickListener(v -> { model.getAccountFilter() .setValue(null); - vAccountFilter.setVisibility(View.GONE); - menuTransactionListFilter.setVisible(true); Globals.hideSoftKeyboard(mainActivity); }); model.foundTransactionItemIndex.observe(getViewLifecycleOwner(), pos -> { Logger.debug("go-to-date", String.format(Locale.US, "Found pos %d", pos)); if (pos != null) { - root.scrollToPosition(pos); + b.transactionRoot.scrollToPosition(pos); // reset the value to avoid re-notification upon reconfiguration or app restart model.foundTransactionItemIndex.setValue(null); } }); } - 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(); - if (vAccountFilter != null) { - vAccountFilter.setVisibility(filterActive ? View.VISIBLE : View.GONE); - } + b.transactionFilterAccountName.setAdapter( + new AccountAutocompleteAdapter(getContext(), profile)); + } + private void onAccountNameFilterChanged(String accName) { + b.transactionFilterAccountName.setText(accName, false); + + boolean filterActive = (accName != null) && !accName.isEmpty(); + b.transactionListAccountNameFilter.setVisibility(filterActive ? View.VISIBLE : View.GONE); if (menuTransactionListFilter != null) menuTransactionListFilter.setVisible(!filterActive); - - model.scheduleTransactionListReload(); - } @Override public void onCreateOptionsMenu(@NotNull Menu menu, @NotNull MenuInflater inflater) { @@ -191,43 +196,41 @@ 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); - accNameFilter.requestFocus(); + b.transactionListAccountNameFilter.setVisibility(View.VISIBLE); + menuTransactionListFilter.setVisible(false); + b.transactionFilterAccountName.requestFocus(); InputMethodManager imm = (InputMethodManager) getMainActivity().getSystemService(INPUT_METHOD_SERVICE); - imm.showSoftInput(accNameFilter, 0); + imm.showSoftInput(b.transactionFilterAccountName, 0); 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) { RecyclerView list = requireActivity().findViewById(R.id.transaction_root); - AsyncTask finder = new TransactionDateFinder(); + TransactionDateFinder finder = new TransactionDateFinder(model, new SimpleDate(year, month + 1, day)); - finder.execute( - new TransactionDateFinder.Params(model, new SimpleDate(year, month + 1, day))); + finder.start(); } }