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=dcad525bdd19b37025e4757df3bbb5ccd092efb0;hb=fbadb0e6e62d1959351b2dc81fc865201913361b;hpb=3b365016042215dd73cb4600840aa8199b8322b9
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 dcad525b..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;
@@ -34,28 +28,35 @@ import android.view.MenuItem;
import android.view.View;
import android.view.ViewGroup;
import android.view.inputmethod.InputMethodManager;
-import android.widget.AdapterView;
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 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";
- 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
@@ -67,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) {
@@ -114,7 +98,21 @@ public class TransactionListFragment extends MobileLedgerListFragment {
@Nullable Bundle savedInstanceState) {
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");
@@ -125,19 +123,16 @@ 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);
- 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();
}
});
@@ -152,56 +147,67 @@ 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);
TransactionListFragment me = this;
- MLDB.hook_autocompletion_adapter(mActivity, accNameFilter, "accounts", "name", true);
- accNameFilter.setOnItemClickListener(new AdapterView.OnItemClickListener() {
- @Override
- public void onItemClick(AdapterView parent, View view, int position, long id) {
- Log.d("tmp", "direct onItemClick");
- TransactionListViewModel.scheduleTransactionListReload(mActivity);
- MatrixCursor mc = (MatrixCursor) parent.getItemAtPosition(position);
- modelAdapter.setBoldAccountName(mc.getString(1));
- modelAdapter.notifyDataSetChanged();
- Globals.hideSoftKeyboard(mActivity);
- }
+ 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);
});
- if (mShowOnlyAccountName != null) {
- accNameFilter.setText(mShowOnlyAccountName, false);
- onShowFilterClick(null);
- Log.d("flow", String.format("Account filter set to '%s'", mShowOnlyAccountName));
+ if (accountFilterObserver == null) {
+ accountFilterObserver = (o, arg) -> onAccountNameFilterChanged();
+ Data.accountFilter.addObserver(accountFilterObserver);
}
- Data.profile.addObserver(new Observer() {
+ TransactionListViewModel.updating.addObserver(
+ (o, arg) -> swiper.setRefreshing(TransactionListViewModel.updating.get()));
+ TransactionListViewModel.updateError.addObserver(new Observer() {
@Override
public void update(Observable o, Object arg) {
- mActivity.runOnUiThread(() -> {
- Log.d("transactions", "requesting list reload");
- TransactionListViewModel.scheduleTransactionListReload(mActivity);
- });
- }
- });
+ String err = TransactionListViewModel.updateError.get();
+ if (err == null) return;
- TransactionListViewModel.scheduleTransactionListReload(mActivity);
- TransactionListViewModel.updating.addObserver(new Observer() {
- @Override
- public void update(Observable o, Object arg) {
- swiper.setRefreshing(TransactionListViewModel.updating.get());
+ Toast.makeText(mActivity, err, Toast.LENGTH_SHORT).show();
+ TransactionListViewModel.updateError.set(null);
}
});
-
- Data.transactions.addObserver(new Observer() {
- @Override
- public void update(Observable o, Object arg) {
- mActivity.runOnUiThread(() -> modelAdapter.notifyDataSetChanged());
- }
+ 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 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) {
@@ -210,30 +216,21 @@ 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);
}
super.onCreateOptionsMenu(menu, inflater);
- }
- public void onClearAccountNameClick(View view) {
- vAccountFilter.setVisibility(View.GONE);
- if (menuTransactionListFilter != null) menuTransactionListFilter.setVisible(true);
- accNameFilter.setText(null);
- mShowOnlyAccountName = null;
- modelAdapter.resetBoldAccountName();
- TransactionListViewModel.scheduleTransactionListReload(mActivity);
- Globals.hideSoftKeyboard(mActivity);
- }
- public void onShowFilterClick(MenuItem menuItem) {
- vAccountFilter.setVisibility(View.VISIBLE);
- if (menuTransactionListFilter != null) menuTransactionListFilter.setVisible(false);
- if (menuItem != null) {
+ menuTransactionListFilter.setOnMenuItemClickListener(item -> {
+ vAccountFilter.setVisibility(View.VISIBLE);
+ if (menuTransactionListFilter != null) menuTransactionListFilter.setVisible(false);
accNameFilter.requestFocus();
InputMethodManager imm =
(InputMethodManager) mActivity.getSystemService(INPUT_METHOD_SERVICE);
imm.showSoftInput(accNameFilter, 0);
- }
+
+ return true;
+ });
}
}
\ No newline at end of file