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=ea57ab7c0c3d897571f10cddc8658b27ebe73e9d;hb=062d4edbcf358be32ef08d4ebbf85fddf272e82e;hpb=fbadb0e6e62d1959351b2dc81fc865201913361b 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 ea57ab7c..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 © 2019 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,10 +17,8 @@ package net.ktnx.mobileledger.ui.transaction_list; -import android.content.Context; -import android.database.MatrixCursor; +import android.os.AsyncTask; import android.os.Bundle; -import android.util.Log; import android.view.LayoutInflater; import android.view.Menu; import android.view.MenuInflater; @@ -29,68 +27,47 @@ import android.view.View; import android.view.ViewGroup; import android.view.inputmethod.InputMethodManager; import android.widget.AutoCompleteTextView; -import android.widget.Toast; -import com.google.android.material.floatingactionbutton.FloatingActionButton; +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.db.AccountAutocompleteAdapter; +import net.ktnx.mobileledger.db.Profile; import net.ktnx.mobileledger.model.Data; +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.MLDB; +import net.ktnx.mobileledger.utils.Logger; +import net.ktnx.mobileledger.utils.SimpleDate; -import java.util.Observable; -import java.util.Observer; +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 { +public class TransactionListFragment extends MobileLedgerListFragment + implements DatePickerFragment.DatePickedListener { private MenuItem menuTransactionListFilter; + private MenuItem menuGoToDate; private View vAccountFilter; private AutoCompleteTextView accNameFilter; - private Observer backgroundTaskCountObserver; - private Observer accountFilterObserver; - private static void update(Observable o, Object arg) { - } - @Override - public void onDestroy() { - if (backgroundTaskCountObserver != null) { - Log.d("rtl", "destroying background task count observer"); - Data.backgroundTaskCount.deleteObserver(backgroundTaskCountObserver); - } - super.onDestroy(); - } - public void setShowOnlyAccountName(String mShowOnlyAccountName) { - } + private MainModel model; + private boolean fragmentActive = false; @Override public void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); setHasOptionsMenu(true); - if (backgroundTaskCountObserver == null) { - Log.d("rtl", "creating background task count observer"); - Data.backgroundTaskCount.addObserver(backgroundTaskCountObserver = new Observer() { - @Override - public void update(Observable o, Object arg) { - mActivity.runOnUiThread(() -> { - int cnt = Data.backgroundTaskCount.get(); - Log.d("trl", String.format("background task count changed to %d", cnt)); - swiper.setRefreshing(cnt > 0); - }); - } - }); - } - } - @Override - public void onAttach(Context context) { - super.onAttach(context); - mActivity = (MainActivity) context; } @Nullable @Override @@ -101,136 +78,167 @@ public class TransactionListFragment extends MobileLedgerListFragment { @Override public void onResume() { super.onResume(); - Log.d("flow", "TransactionListFragment.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(); - Log.d("flow", "TransactionListFragment.onStop()"); + fragmentActive = false; + toggleMenuItems(); + debug("flow", "TransactionListFragment.onStop()"); } @Override public void onPause() { super.onPause(); - Log.d("flow", "TransactionListFragment.onPause()"); + fragmentActive = false; + toggleMenuItems(); + debug("flow", "TransactionListFragment.onPause()"); } @Override - public void onActivityCreated(@Nullable Bundle savedInstanceState) { - Log.d("flow", "TransactionListFragment.onActivityCreated called"); - super.onActivityCreated(savedInstanceState); + public void onViewCreated(@NotNull View view, @Nullable Bundle savedInstanceState) { + debug("flow", "TransactionListFragment.onActivityCreated called"); + super.onViewCreated(view, savedInstanceState); + + Data.backgroundTasksRunning.observe(getViewLifecycleOwner(), + this::onBackgroundTaskRunningChanged); + + MainActivity mainActivity = getMainActivity(); - 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); + 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(); root.setAdapter(modelAdapter); - FloatingActionButton fab = mActivity.findViewById(R.id.btn_add_transaction); + mainActivity.fabShouldShow(); - 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(); - } - }); + if (mainActivity instanceof FabManager.FabHandler) + FabManager.handle(mainActivity, root); - LinearLayoutManager llm = new LinearLayoutManager(mActivity); + LinearLayoutManager llm = new LinearLayoutManager(mainActivity); - llm.setOrientation(LinearLayoutManager.VERTICAL); + llm.setOrientation(RecyclerView.VERTICAL); root.setLayoutManager(llm); - swiper.setOnRefreshListener(() -> { - Log.d("ui", "refreshing transactions via swipe"); - mActivity.scheduleTransactionListRetrieval(); + refreshLayout.setOnRefreshListener(() -> { + debug("ui", "refreshing transactions via swipe"); + model.scheduleTransactionListRetrieval(); }); - Colors.themeWatch.addObserver((o, arg) -> swiper.setColorSchemeColors(Colors.primary)); - swiper.setColorSchemeColors(Colors.primary); + 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); - vAccountFilter = mActivity.findViewById(R.id.transaction_list_account_name_filter); - accNameFilter = mActivity.findViewById(R.id.transaction_filter_account_name); + Data.observeProfile(getViewLifecycleOwner(), this::onProfileChanged); - TransactionListFragment me = this; - MLDB.hookAutocompletionAdapter(mActivity, accNameFilter, "accounts", "name", true); - accNameFilter.setOnItemClickListener((parent, view, position, id) -> { -// Log.d("tmp", "direct onItemClick"); - MatrixCursor mc = (MatrixCursor) parent.getItemAtPosition(position); - Data.accountFilter.set(mc.getString(1)); - Globals.hideSoftKeyboard(mActivity); + accNameFilter.setOnItemClickListener((parent, v, position, id) -> { +// debug("tmp", "direct onItemClick"); + model.getAccountFilter() + .setValue(parent.getItemAtPosition(position) + .toString()); + Globals.hideSoftKeyboard(mainActivity); }); - if (accountFilterObserver == null) { - accountFilterObserver = (o, arg) -> onAccountNameFilterChanged(); - Data.accountFilter.addObserver(accountFilterObserver); - } + model.getAccountFilter() + .observe(getViewLifecycleOwner(), this::onAccountNameFilterChanged); - TransactionListViewModel.updating.addObserver( - (o, arg) -> swiper.setRefreshing(TransactionListViewModel.updating.get())); - TransactionListViewModel.updateError.addObserver(new Observer() { - @Override - public void update(Observable o, Object arg) { - String err = TransactionListViewModel.updateError.get(); - if (err == null) return; + model.getUpdatingFlag() + .observe(getViewLifecycleOwner(), (flag) -> refreshLayout.setRefreshing(flag)); + model.getDisplayedTransactions() + .observe(getViewLifecycleOwner(), list -> modelAdapter.setTransactions(list)); - Toast.makeText(mActivity, err, Toast.LENGTH_SHORT).show(); - TransactionListViewModel.updateError.set(null); + view.findViewById(R.id.clearAccountNameFilter) + .setOnClickListener(v -> { + 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)); + 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 -> { - String current = Data.accountFilter.get(); - Data.accountFilter.set(null); - vAccountFilter.setVisibility(View.GONE); - menuTransactionListFilter.setVisible(true); - Globals.hideSoftKeyboard(mActivity); - }); - - onAccountNameFilterChanged(false); } - private void onAccountNameFilterChanged() { - onAccountNameFilterChanged(true); + private void onProfileChanged(Profile profile) { + if (profile == null) + return; + + accNameFilter.setAdapter(new AccountAutocompleteAdapter(getContext(), profile)); } - private void onAccountNameFilterChanged(boolean reloadTransactions) { - String accName = Data.accountFilter.get(); - if (accNameFilter != null) { - accNameFilter.setText(accName, false); - } - final boolean filterActive = (accName != null) && !accName.isEmpty(); + 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); - - if (reloadTransactions) TransactionListViewModel.scheduleTransactionListReload(); - + if (menuTransactionListFilter != null) + menuTransactionListFilter.setVisible(!filterActive); } @Override - public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { + public void onCreateOptionsMenu(@NotNull Menu menu, @NotNull MenuInflater inflater) { 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(); + menuGoToDate = menu.findItem(R.id.menu_go_to_date); + if ((menuGoToDate == null)) + throw new AssertionError(); - if (Data.accountFilter.get() != null) { - 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) mActivity.getSystemService(INPUT_METHOD_SERVICE); + (InputMethodManager) getMainActivity().getSystemService(INPUT_METHOD_SERVICE); imm.showSoftInput(accNameFilter, 0); 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(); + + finder.execute( + new TransactionDateFinder.Params(model, new SimpleDate(year, month + 1, day))); } -} \ No newline at end of file +}