X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Ftransaction_list%2FTransactionListFragment.java;h=e6820cf86764fe00e67c999db77fc7e1c469f43e;hb=d63a611dce420b30fa0c0711eea1d02603945a43;hp=edd3782578faf550a60cbae1fb1d9edf043bee07;hpb=42fcb92013bb28047b0fb2a81f86eea90416cb09;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 edd37825..e6820cf8 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 © 2019 Damyan Ivanov. + * Copyright © 2020 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,8 +17,8 @@ package net.ktnx.mobileledger.ui.transaction_list; -import android.content.Context; -import android.database.MatrixCursor; +import android.database.Cursor; +import android.os.AsyncTask; import android.os.Bundle; import android.view.LayoutInflater; import android.view.Menu; @@ -31,40 +31,43 @@ 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 com.google.android.material.snackbar.Snackbar; - import net.ktnx.mobileledger.R; +import net.ktnx.mobileledger.async.TransactionDateFinder; 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; import net.ktnx.mobileledger.ui.MobileLedgerListFragment; 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; +import java.util.Locale; + import static android.content.Context.INPUT_METHOD_SERVICE; import static net.ktnx.mobileledger.utils.Logger.debug; -// TODO: support transaction-level comment - -public class TransactionListFragment extends MobileLedgerListFragment { +public class TransactionListFragment extends MobileLedgerListFragment + implements DatePickerFragment.DatePickedListener { private MenuItem menuTransactionListFilter; private View vAccountFilter; private AutoCompleteTextView accNameFilter; + private MainModel model; @Override public void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); setHasOptionsMenu(true); } - @Override - public void onAttach(@NotNull Context context) { - super.onAttach(context); - mActivity = (MainActivity) context; - } @Nullable @Override public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @@ -87,72 +90,81 @@ public class TransactionListFragment extends MobileLedgerListFragment { debug("flow", "TransactionListFragment.onPause()"); } @Override - public void onActivityCreated(@Nullable Bundle savedInstanceState) { + public void onViewCreated(@NotNull View view, @Nullable Bundle savedInstanceState) { debug("flow", "TransactionListFragment.onActivityCreated called"); - super.onActivityCreated(savedInstanceState); + super.onViewCreated(view, savedInstanceState); Data.backgroundTasksRunning.observe(getViewLifecycleOwner(), this::onBackgroundTaskRunningChanged); - swiper = mActivity.findViewById(R.id.transaction_swipe); - if (swiper == null) + MainActivity mainActivity = getMainActivity(); + + 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 = mActivity.findViewById(R.id.transaction_root); + 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(); + modelAdapter = new TransactionListAdapter(model); root.setAdapter(modelAdapter); - mActivity.fabShouldShow(); + mainActivity.fabShouldShow(); - manageFabOnScroll(); + if (mainActivity instanceof FabManager.FabHandler) + FabManager.handle((FabManager.FabHandler) mainActivity, root); - LinearLayoutManager llm = new LinearLayoutManager(mActivity); + LinearLayoutManager llm = new LinearLayoutManager(mainActivity); llm.setOrientation(RecyclerView.VERTICAL); root.setLayoutManager(llm); - swiper.setOnRefreshListener(() -> { + refreshLayout.setOnRefreshListener(() -> { debug("ui", "refreshing transactions via swipe"); - Data.scheduleTransactionListRetrieval(mActivity); + model.scheduleTransactionListRetrieval(); }); Colors.themeWatch.observe(getViewLifecycleOwner(), this::themeChanged); - vAccountFilter = mActivity.findViewById(R.id.transaction_list_account_name_filter); - accNameFilter = mActivity.findViewById(R.id.transaction_filter_account_name); + vAccountFilter = view.findViewById(R.id.transaction_list_account_name_filter); + accNameFilter = view.findViewById(R.id.transaction_filter_account_name); - MLDB.hookAutocompletionAdapter(mActivity, accNameFilter, "accounts", "name"); - accNameFilter.setOnItemClickListener((parent, view, position, id) -> { + MLDB.hookAutocompletionAdapter(mainActivity, accNameFilter, "accounts", "name"); + accNameFilter.setOnItemClickListener((parent, v, position, id) -> { // debug("tmp", "direct onItemClick"); - MatrixCursor mc = (MatrixCursor) parent.getItemAtPosition(position); - Data.accountFilter.setValue(mc.getString(1)); - Globals.hideSoftKeyboard(mActivity); + Cursor c = (Cursor) parent.getItemAtPosition(position); + model.getAccountFilter() + .setValue(c.getString(1)); + Globals.hideSoftKeyboard(mainActivity); }); - Data.accountFilter.observe(getViewLifecycleOwner(), this::onAccountNameFilterChanged); - - TransactionListViewModel.updating.addObserver( - (o, arg) -> swiper.setRefreshing(TransactionListViewModel.updating.get())); - TransactionListViewModel.updateError.addObserver((o, arg) -> { - String err = TransactionListViewModel.updateError.get(); - if (err == null) - return; - - Snackbar.make(this.root, err, Snackbar.LENGTH_LONG) - .show(); - TransactionListViewModel.updateError.set(null); + model.getAccountFilter() + .observe(getViewLifecycleOwner(), this::onAccountNameFilterChanged); + + 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.foundTransactionItemIndex.observe(getViewLifecycleOwner(), pos -> { + Logger.debug("go-to-date", String.format(Locale.US, "Found pos %d", pos)); + if (pos != null) { + root.scrollToPosition(pos); + // reset the value to avoid re-notification upon reconfiguration or app restart + model.foundTransactionItemIndex.setValue(null); + } }); - Data.transactions.addObserver( - (o, arg) -> mActivity.runOnUiThread(() -> modelAdapter.notifyDataSetChanged())); - - mActivity.findViewById(R.id.clearAccountNameFilter) - .setOnClickListener(v -> { - Data.accountFilter.setValue(null); - vAccountFilter.setVisibility(View.GONE); - menuTransactionListFilter.setVisible(true); - Globals.hideSoftKeyboard(mActivity); - }); } private void onAccountNameFilterChanged(String accName) { final String fieldText = accNameFilter.getText() @@ -170,7 +182,7 @@ public class TransactionListFragment extends MobileLedgerListFragment { if (menuTransactionListFilter != null) menuTransactionListFilter.setVisible(!filterActive); - TransactionListViewModel.scheduleTransactionListReload(); + model.scheduleTransactionListReload(); } @Override @@ -181,8 +193,8 @@ public class TransactionListFragment extends MobileLedgerListFragment { if ((menuTransactionListFilter == null)) throw new AssertionError(); - if ((Data.accountFilter.getValue() != null) || - (vAccountFilter.getVisibility() == View.VISIBLE)) + if ((model.getAccountFilter() + .getValue() != null) || (vAccountFilter.getVisibility() == View.VISIBLE)) { menuTransactionListFilter.setVisible(false); } @@ -195,10 +207,28 @@ public class TransactionListFragment extends MobileLedgerListFragment { menuTransactionListFilter.setVisible(false); accNameFilter.requestFocus(); InputMethodManager imm = - (InputMethodManager) mActivity.getSystemService(INPUT_METHOD_SERVICE); + (InputMethodManager) getMainActivity().getSystemService(INPUT_METHOD_SERVICE); imm.showSoftInput(accNameFilter, 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; + }); + } + @Override + public void onDatePicked(int year, int month, int day) { + RecyclerView list = requireActivity().findViewById(R.id.transaction_root); + AsyncTask finder = new TransactionDateFinder(); + + finder.execute( + new TransactionDateFinder.Params(model, new SimpleDate(year, month + 1, day))); } }