/*
- * 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
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.util.Log;
import android.view.LayoutInflater;
import android.view.Menu;
import android.view.MenuInflater;
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.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.ui.DatePickerFragment;
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 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 {
+// TODO: support transaction-level comment
+
+public class TransactionListFragment extends MobileLedgerListFragment
+ implements DatePickerFragment.DatePickedListener {
private MenuItem menuTransactionListFilter;
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) {
- }
@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) {
+ public void onAttach(@NotNull Context context) {
super.onAttach(context);
mActivity = (MainActivity) context;
}
@Override
public void onResume() {
super.onResume();
- Log.d("flow", "TransactionListFragment.onResume()");
+ debug("flow", "TransactionListFragment.onResume()");
}
@Override
public void onStop() {
super.onStop();
- Log.d("flow", "TransactionListFragment.onStop()");
+ debug("flow", "TransactionListFragment.onStop()");
}
@Override
public void onPause() {
super.onPause();
- Log.d("flow", "TransactionListFragment.onPause()");
+ debug("flow", "TransactionListFragment.onPause()");
}
@Override
public void onActivityCreated(@Nullable Bundle savedInstanceState) {
- Log.d("flow", "TransactionListFragment.onActivityCreated called");
+ debug("flow", "TransactionListFragment.onActivityCreated called");
super.onActivityCreated(savedInstanceState);
+ Data.backgroundTasksRunning.observe(getViewLifecycleOwner(),
+ this::onBackgroundTaskRunningChanged);
+
swiper = mActivity.findViewById(R.id.transaction_swipe);
- if (swiper == null) throw new RuntimeException("Can't get hold on the swipe layout");
+ if (swiper == null)
+ throw new RuntimeException("Can't get hold on the swipe layout");
root = mActivity.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);
-
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();
- }
- });
+
+ manageFabOnScroll();
LinearLayoutManager llm = new LinearLayoutManager(mActivity);
- llm.setOrientation(LinearLayoutManager.VERTICAL);
+ llm.setOrientation(RecyclerView.VERTICAL);
root.setLayoutManager(llm);
swiper.setOnRefreshListener(() -> {
- Log.d("ui", "refreshing transactions via swipe");
- mActivity.scheduleTransactionListRetrieval();
+ debug("ui", "refreshing transactions via swipe");
+ Data.scheduleTransactionListRetrieval(mActivity);
});
- Colors.themeWatch.addObserver(
- (o, arg) -> swiper.setColorSchemeColors(Colors.primary));
- swiper.setColorSchemeColors(Colors.primary);
+ 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);
- TransactionListFragment me = this;
- MLDB.hookAutocompletionAdapter(mActivity, accNameFilter, "accounts", "name", true);
+ MLDB.hookAutocompletionAdapter(mActivity, accNameFilter, "accounts", "name");
accNameFilter.setOnItemClickListener((parent, view, position, id) -> {
-// Log.d("tmp", "direct onItemClick");
- MatrixCursor mc = (MatrixCursor) parent.getItemAtPosition(position);
- Data.accountFilter.set(mc.getString(1));
+// debug("tmp", "direct onItemClick");
+ Cursor c = (Cursor) parent.getItemAtPosition(position);
+ Data.accountFilter.setValue(c.getString(1));
Globals.hideSoftKeyboard(mActivity);
});
- if (accountFilterObserver == null) {
- accountFilterObserver = (o, arg) -> onAccountNameFilterChanged();
- Data.accountFilter.addObserver(accountFilterObserver);
- }
+ Data.accountFilter.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;
-
- Toast.makeText(mActivity, err, Toast.LENGTH_SHORT).show();
- TransactionListViewModel.updateError.set(null);
- }
+ 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);
});
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);
+ mActivity.findViewById(R.id.clearAccountNameFilter)
+ .setOnClickListener(v -> {
+ Data.accountFilter.setValue(null);
+ vAccountFilter.setVisibility(View.GONE);
+ menuTransactionListFilter.setVisible(true);
+ Globals.hideSoftKeyboard(mActivity);
+ });
+
+ Data.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
+ Data.foundTransactionItemIndex.setValue(null);
+ }
});
-
- onAccountNameFilterChanged(false);
- }
- private void onAccountNameFilterChanged() {
- onAccountNameFilterChanged(true);
}
- private void onAccountNameFilterChanged(boolean reloadTransactions) {
- String accName = Data.accountFilter.get();
+ private void onAccountNameFilterChanged(String accName) {
+ final String fieldText = accNameFilter.getText()
+ .toString();
+ if ((accName == null) && (fieldText.equals("")))
+ return;
+
if (accNameFilter != null) {
accNameFilter.setText(accName, false);
}
if (vAccountFilter != null) {
vAccountFilter.setVisibility(filterActive ? View.VISIBLE : View.GONE);
}
- if (menuTransactionListFilter != null) menuTransactionListFilter.setVisible(!filterActive);
+ if (menuTransactionListFilter != null)
+ menuTransactionListFilter.setVisible(!filterActive);
- if (reloadTransactions) TransactionListViewModel.scheduleTransactionListReload();
+ TransactionListViewModel.scheduleTransactionListReload();
}
@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();
- if (Data.accountFilter.get() != null) {
+ if ((Data.accountFilter.getValue() != null) ||
+ (vAccountFilter.getVisibility() == View.VISIBLE))
+ {
menuTransactionListFilter.setVisible(false);
}
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);
return true;
});
+
+ menu.findItem(R.id.menu_go_to_date)
+ .setOnMenuItemClickListener(item -> {
+ DatePickerFragment picker = new DatePickerFragment();
+ picker.setOnDatePickedListener(this);
+ picker.setDateRange(Data.earliestTransactionDate.getValue(),
+ Data.latestTransactionDate.getValue());
+ 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<SimpleDate, Void, Integer> finder = new TransactionDateFinder();
+
+ finder.execute(new SimpleDate(year, month + 1, day));
}
-}
\ No newline at end of file
+}
projects / mobile-ledger.git / blobdiff