X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Ftransaction_list%2FTransactionListFragment.java;h=9564cc8597317c79fa5bd378470c67eaf7ba9e0d;hb=5bba2c06a81c87327fdcf3f2a85c3206d932c2f9;hp=aa5a2dfec277600f47e4b730c155b5f4534a8128;hpb=525e6447f916a0c34c45cd5a3b5f6a26b034b0c2;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 aa5a2dfe..9564cc85 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; @@ -28,40 +28,46 @@ import android.view.View; import android.view.ViewGroup; import android.view.inputmethod.InputMethodManager; import android.widget.AutoCompleteTextView; -import android.widget.Toast; + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.lifecycle.ViewModelProvider; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; 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.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 androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; +import java.util.Locale; import static android.content.Context.INPUT_METHOD_SERVICE; import static net.ktnx.mobileledger.utils.Logger.debug; -public class TransactionListFragment extends MobileLedgerListFragment { +// TODO: support transaction-level comment + +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); - Data.backgroundTasksRunning.observe(this, this::onBackgroundTaskRunningChanged); - } - @Override - public void onAttach(@NotNull Context context) { - super.onAttach(context); - mActivity = (MainActivity) context; } @Nullable @Override @@ -89,65 +95,82 @@ public class TransactionListFragment extends MobileLedgerListFragment { debug("flow", "TransactionListFragment.onActivityCreated called"); super.onActivityCreated(savedInstanceState); - swiper = mActivity.findViewById(R.id.transaction_swipe); - if (swiper == null) throw new RuntimeException("Can't get hold on the swipe layout"); - root = mActivity.findViewById(R.id.transaction_root); + Data.backgroundTasksRunning.observe(getViewLifecycleOwner(), + this::onBackgroundTaskRunningChanged); + + MainActivity mainActivity = getMainActivity(); + + model = new ViewModelProvider(requireActivity()).get(MainModel.class); + + refreshLayout = mainActivity.findViewById(R.id.transaction_swipe); + if (refreshLayout == null) + throw new RuntimeException("Can't get hold on the swipe layout"); + root = mainActivity.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(); - 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"); - mActivity.scheduleTransactionListRetrieval(); + model.scheduleTransactionListRetrieval(); }); - Colors.themeWatch.observe(this, this::themeChanged); + 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 = mainActivity.findViewById(R.id.transaction_list_account_name_filter); + accNameFilter = mainActivity.findViewById(R.id.transaction_filter_account_name); - MLDB.hookAutocompletionAdapter(mActivity, accNameFilter, "accounts", "name", true); + MLDB.hookAutocompletionAdapter(mainActivity, accNameFilter, "accounts", "name"); accNameFilter.setOnItemClickListener((parent, view, 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(this, 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; - - Toast.makeText(mActivity, err, Toast.LENGTH_SHORT).show(); - TransactionListViewModel.updateError.set(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); + 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)); + + mainActivity.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); + } }); } private void onAccountNameFilterChanged(String accName) { - final String fieldText = accNameFilter.getText().toString(); - if ((accName == null) && (fieldText.equals(""))) return; + final String fieldText = accNameFilter.getText() + .toString(); + if ((accName == null) && (fieldText.equals(""))) + return; if (accNameFilter != null) { accNameFilter.setText(accName, false); @@ -156,9 +179,10 @@ public class TransactionListFragment extends MobileLedgerListFragment { if (vAccountFilter != null) { vAccountFilter.setVisibility(filterActive ? View.VISIBLE : View.GONE); } - if (menuTransactionListFilter != null) menuTransactionListFilter.setVisible(!filterActive); + if (menuTransactionListFilter != null) + menuTransactionListFilter.setVisible(!filterActive); - TransactionListViewModel.scheduleTransactionListReload(); + model.scheduleTransactionListReload(); } @Override @@ -166,9 +190,12 @@ public class TransactionListFragment extends MobileLedgerListFragment { inflater.inflate(R.menu.transaction_list, menu); menuTransactionListFilter = menu.findItem(R.id.menu_transaction_list_filter); - if ((menuTransactionListFilter == null)) throw new AssertionError(); + if ((menuTransactionListFilter == null)) + throw new AssertionError(); - if (Data.accountFilter.getValue() != null) { + if ((model.getAccountFilter() + .getValue() != null) || (vAccountFilter.getVisibility() == View.VISIBLE)) + { menuTransactionListFilter.setVisible(false); } @@ -176,13 +203,32 @@ public class TransactionListFragment extends MobileLedgerListFragment { menuTransactionListFilter.setOnMenuItemClickListener(item -> { vAccountFilter.setVisibility(View.VISIBLE); - if (menuTransactionListFilter != null) menuTransactionListFilter.setVisible(false); + if (menuTransactionListFilter != null) + 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))); } -} \ No newline at end of file +}