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=ea57ab7c0c3d897571f10cddc8658b27ebe73e9d;hp=1f6fbda69e5e2d83d23ae77fe02e2d73898bf2c1;hb=fbadb0e6e62d1959351b2dc81fc865201913361b;hpb=22f72903c1b7d827064c90b4472ff5c69ab3ba2f
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 1f6fbda6..ea57ab7c 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,31 +1,25 @@
/*
* Copyright © 2019 Damyan Ivanov.
- * This file is part of Mobile-Ledger.
- * Mobile-Ledger is free software: you can distribute it and/or modify it
+ * 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
* the Free Software Foundation, either version 3 of the License, or
* (at your opinion), any later version.
*
- * Mobile-Ledger is distributed in the hope that it will be useful,
+ * MoLe is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License terms for details.
*
* You should have received a copy of the GNU General Public License
- * along with Mobile-Ledger. If not, see .
+ * along with MoLe. If not, see .
*/
package net.ktnx.mobileledger.ui.transaction_list;
-import android.arch.lifecycle.ViewModelProviders;
import android.content.Context;
import android.database.MatrixCursor;
import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.design.widget.FloatingActionButton;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.Menu;
@@ -37,27 +31,32 @@ import android.view.inputmethod.InputMethodManager;
import android.widget.AutoCompleteTextView;
import android.widget.Toast;
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
+
import net.ktnx.mobileledger.R;
import net.ktnx.mobileledger.model.Data;
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.ObservableValue;
import java.util.Observable;
import java.util.Observer;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
import static android.content.Context.INPUT_METHOD_SERVICE;
public class TransactionListFragment extends MobileLedgerListFragment {
- public static final String BUNDLE_KEY_FILTER_ACCOUNT_NAME = "filter_account_name";
- public static ObservableValue accountFilter = new ObservableValue<>();
- private String mShowOnlyAccountName;
private MenuItem menuTransactionListFilter;
private View vAccountFilter;
private AutoCompleteTextView accNameFilter;
private Observer backgroundTaskCountObserver;
+ private Observer accountFilterObserver;
private static void update(Observable o, Object arg) {
}
@Override
@@ -69,23 +68,6 @@ public class TransactionListFragment extends MobileLedgerListFragment {
super.onDestroy();
}
public void setShowOnlyAccountName(String mShowOnlyAccountName) {
- this.mShowOnlyAccountName = mShowOnlyAccountName;
- if (modelAdapter != null) {
- modelAdapter.setBoldAccountName(mShowOnlyAccountName);
- }
- if (accNameFilter != null) {
- accNameFilter.setText(mShowOnlyAccountName, false);
- }
- if (vAccountFilter != null) {
- vAccountFilter.setVisibility(
- ((mShowOnlyAccountName != null) && !mShowOnlyAccountName.isEmpty())
- ? View.VISIBLE : View.GONE);
- }
- }
- @Override
- public void setArguments(@Nullable Bundle args) {
- super.setArguments(args);
- mShowOnlyAccountName = args.getString(BUNDLE_KEY_FILTER_ACCOUNT_NAME);
}
@Override
public void onCreate(@Nullable Bundle savedInstanceState) {
@@ -141,10 +123,7 @@ public class TransactionListFragment extends MobileLedgerListFragment {
root = mActivity.findViewById(R.id.transaction_root);
if (root == null)
throw new RuntimeException("Can't get hold on the transaction value view");
- model = ViewModelProviders.of(this).get(TransactionListViewModel.class);
modelAdapter = new TransactionListAdapter();
-
- modelAdapter.setBoldAccountName(mShowOnlyAccountName);
root.setAdapter(modelAdapter);
FloatingActionButton fab = mActivity.findViewById(R.id.btn_add_transaction);
@@ -168,7 +147,8 @@ public class TransactionListFragment extends MobileLedgerListFragment {
mActivity.scheduleTransactionListRetrieval();
});
- swiper.setColorSchemeResources(R.color.colorPrimary, R.color.colorAccent);
+ Colors.themeWatch.addObserver((o, arg) -> swiper.setColorSchemeColors(Colors.primary));
+ swiper.setColorSchemeColors(Colors.primary);
vAccountFilter = mActivity.findViewById(R.id.transaction_list_account_name_filter);
accNameFilter = mActivity.findViewById(R.id.transaction_filter_account_name);
@@ -177,26 +157,16 @@ public class TransactionListFragment extends MobileLedgerListFragment {
MLDB.hookAutocompletionAdapter(mActivity, accNameFilter, "accounts", "name", true);
accNameFilter.setOnItemClickListener((parent, view, position, id) -> {
// Log.d("tmp", "direct onItemClick");
- TransactionListViewModel.scheduleTransactionListReload();
MatrixCursor mc = (MatrixCursor) parent.getItemAtPosition(position);
- accountFilter.set(mc.getString(1));
+ Data.accountFilter.set(mc.getString(1));
Globals.hideSoftKeyboard(mActivity);
});
- accountFilter.addObserver((o, arg) -> {
- String accountName = accountFilter.get();
- modelAdapter.setBoldAccountName(accountName);
- setShowOnlyAccountName(accountName);
- TransactionListViewModel.scheduleTransactionListReload();
- if (menuTransactionListFilter != null) menuTransactionListFilter.setVisible(false);
- });
-
- Data.profile.addObserver((o, arg) -> mActivity.runOnUiThread(() -> {
- Log.d("transactions", "requesting list reload");
- TransactionListViewModel.scheduleTransactionListReload();
- }));
+ if (accountFilterObserver == null) {
+ accountFilterObserver = (o, arg) -> onAccountNameFilterChanged();
+ Data.accountFilter.addObserver(accountFilterObserver);
+ }
- TransactionListViewModel.scheduleTransactionListReload();
TransactionListViewModel.updating.addObserver(
(o, arg) -> swiper.setRefreshing(TransactionListViewModel.updating.get()));
TransactionListViewModel.updateError.addObserver(new Observer() {
@@ -213,13 +183,31 @@ public class TransactionListFragment extends MobileLedgerListFragment {
(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);
- if (menuTransactionListFilter != null) menuTransactionListFilter.setVisible(true);
- accountFilter.set(null);
- accNameFilter.setText(null);
- TransactionListViewModel.scheduleTransactionListReload();
+ menuTransactionListFilter.setVisible(true);
Globals.hideSoftKeyboard(mActivity);
});
+
+ onAccountNameFilterChanged(false);
+ }
+ private void onAccountNameFilterChanged() {
+ onAccountNameFilterChanged(true);
+ }
+ private void onAccountNameFilterChanged(boolean reloadTransactions) {
+ String accName = Data.accountFilter.get();
+ if (accNameFilter != null) {
+ accNameFilter.setText(accName, false);
+ }
+ final 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();
+
}
@Override
public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
@@ -228,7 +216,7 @@ public class TransactionListFragment extends MobileLedgerListFragment {
menuTransactionListFilter = menu.findItem(R.id.menu_transaction_list_filter);
if ((menuTransactionListFilter == null)) throw new AssertionError();
- if (mShowOnlyAccountName != null) {
+ if (Data.accountFilter.get() != null) {
menuTransactionListFilter.setVisible(false);
}