X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Ftransaction_list%2FTransactionListFragment.java;h=631205f24448f0501aef8df95362bbf5db8c4802;hb=73adeb59bc035a88a2c18d8cd79467e2f15825db;hp=f77580bad018979c5b8e4708eade5fb5979ea179;hpb=ea17ca9e3b03ca0090be03fdc0abbbbfd954be89;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 f77580ba..631205f2 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,10 +31,13 @@ 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;
@@ -48,6 +45,11 @@ 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 {
@@ -58,6 +60,7 @@ public class TransactionListFragment extends MobileLedgerListFragment {
private View vAccountFilter;
private AutoCompleteTextView accNameFilter;
private Observer backgroundTaskCountObserver;
+ private Observer accountFilterObserver;
private static void update(Observable o, Object arg) {
}
@Override
@@ -117,6 +120,21 @@ public class TransactionListFragment extends MobileLedgerListFragment {
return inflater.inflate(R.layout.transaction_list_fragment, container, false);
}
@Override
+ public void onResume() {
+ super.onResume();
+ Log.d("flow", "TransactionListFragment.onResume()");
+ }
+ @Override
+ public void onStop() {
+ super.onStop();
+ Log.d("flow", "TransactionListFragment.onStop()");
+ }
+ @Override
+ public void onPause() {
+ super.onPause();
+ Log.d("flow", "TransactionListFragment.onPause()");
+ }
+ @Override
public void onActivityCreated(@Nullable Bundle savedInstanceState) {
Log.d("flow", "TransactionListFragment.onActivityCreated called");
super.onActivityCreated(savedInstanceState);
@@ -126,7 +144,6 @@ 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);
@@ -134,11 +151,11 @@ public class TransactionListFragment extends MobileLedgerListFragment {
FloatingActionButton fab = mActivity.findViewById(R.id.btn_add_transaction);
- fab.show();
+ mActivity.fabShouldShow();
root.addOnScrollListener(new RecyclerView.OnScrollListener() {
@Override
public void onScrolled(@NonNull RecyclerView recyclerView, int dx, int dy) {
- if (dy < 0) fab.show();
+ if (dy < 0) mActivity.fabShouldShow();
if (dy > 0) fab.hide();
}
});
@@ -153,7 +170,9 @@ 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);
@@ -168,18 +187,16 @@ public class TransactionListFragment extends MobileLedgerListFragment {
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) -> {
+ String accountName = accountFilter.get();
+ modelAdapter.setBoldAccountName(accountName);
+ setShowOnlyAccountName(accountName);
+ TransactionListViewModel.scheduleTransactionListReload();
+ if (menuTransactionListFilter != null) menuTransactionListFilter.setVisible(false);
+ };
+ accountFilter.addObserver(accountFilterObserver);
+ }
TransactionListViewModel.scheduleTransactionListReload();
TransactionListViewModel.updating.addObserver(