/*
- * Copyright © 2020 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
package net.ktnx.mobileledger.ui.transaction_list;
-import android.database.Cursor;
import android.os.AsyncTask;
import android.os.Bundle;
import android.view.LayoutInflater;
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.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.Logger;
-import net.ktnx.mobileledger.utils.MLDB;
import net.ktnx.mobileledger.utils.SimpleDate;
import org.jetbrains.annotations.NotNull;
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
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);
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);
MainActivity mainActivity = getMainActivity();
- swiper = mainActivity.findViewById(R.id.transaction_swipe);
- if (swiper == null)
+ 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 = mainActivity.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);
mainActivity.fabShouldShow();
- manageFabOnScroll();
+ if (mainActivity instanceof FabManager.FabHandler)
+ FabManager.handle(mainActivity, root);
LinearLayoutManager llm = new LinearLayoutManager(mainActivity);
llm.setOrientation(RecyclerView.VERTICAL);
root.setLayoutManager(llm);
- swiper.setOnRefreshListener(() -> {
+ refreshLayout.setOnRefreshListener(() -> {
debug("ui", "refreshing transactions via swipe");
- Data.scheduleTransactionListRetrieval(mainActivity);
+ model.scheduleTransactionListRetrieval();
});
Colors.themeWatch.observe(getViewLifecycleOwner(), this::themeChanged);
- vAccountFilter = mainActivity.findViewById(R.id.transaction_list_account_name_filter);
- accNameFilter = mainActivity.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(mainActivity, accNameFilter, "accounts", "name");
- accNameFilter.setOnItemClickListener((parent, view, position, id) -> {
+ Profile profile = Data.getProfile();
+ accNameFilter.setAdapter(new AccountAutocompleteAdapter(mainActivity, profile));
+ accNameFilter.setOnItemClickListener((parent, v, position, id) -> {
// debug("tmp", "direct onItemClick");
- Cursor c = (Cursor) parent.getItemAtPosition(position);
- Data.accountFilter.setValue(c.getString(1));
+ model.getAccountFilter()
+ .setValue(parent.getItemAtPosition(position)
+ .toString());
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;
+ model.getAccountFilter()
+ .observe(getViewLifecycleOwner(), this::onAccountNameFilterChanged);
+
+ model.getUpdatingFlag()
+ .observe(getViewLifecycleOwner(), (flag) -> refreshLayout.setRefreshing(flag));
+ 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);
+ });
- Snackbar.make(this.root, err, Snackbar.LENGTH_LONG)
- .show();
- TransactionListViewModel.updateError.set(null);
- });
- Data.transactions.addObserver(
- (o, arg) -> mainActivity.runOnUiThread(() -> modelAdapter.notifyDataSetChanged()));
-
- mainActivity.findViewById(R.id.clearAccountNameFilter)
- .setOnClickListener(v -> {
- Data.accountFilter.setValue(null);
- vAccountFilter.setVisibility(View.GONE);
- menuTransactionListFilter.setVisible(true);
- Globals.hideSoftKeyboard(mainActivity);
- });
-
- Data.foundTransactionItemIndex.observe(getViewLifecycleOwner(), pos -> {
+ 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
- Data.foundTransactionItemIndex.setValue(null);
+ model.foundTransactionItemIndex.setValue(null);
}
});
}
if (menuTransactionListFilter != null)
menuTransactionListFilter.setVisible(!filterActive);
- TransactionListViewModel.scheduleTransactionListReload();
+ model.scheduleTransactionListReload();
}
@Override
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);
}
.setOnMenuItemClickListener(item -> {
DatePickerFragment picker = new DatePickerFragment();
picker.setOnDatePickedListener(this);
- picker.setDateRange(Data.earliestTransactionDate.getValue(),
- Data.latestTransactionDate.getValue());
+ 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<SimpleDate, Void, Integer> finder = new TransactionDateFinder();
+ AsyncTask<TransactionDateFinder.Params, Void, Integer> finder = new TransactionDateFinder();
- finder.execute(new SimpleDate(year, month + 1, day));
+ finder.execute(
+ new TransactionDateFinder.Params(model, new SimpleDate(year, month + 1, day)));
}
}
projects / mobile-ledger.git / blobdiff