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=7ebf4e9161a409185475f63dcbff384682329e0e;hp=72e07b27ba9229ea08599834f72dad2357b970e1;hb=be3bfabca0462fc0c8ca7ab241da304b68971056;hpb=0bbdc409d82da31324c031f36607510f17d992e6
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 72e07b27..7ebf4e91 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,35 +1,25 @@
/*
- * Copyright © 2018 Damyan Ivanov.
- * This file is part of Mobile-Ledger.
- * Mobile-Ledger is free software: you can distribute it and/or modify it
+ * Copyright © 2019 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
* 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.Build;
import android.os.Bundle;
-import android.preference.PreferenceManager;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
-import android.support.v4.widget.SwipeRefreshLayout;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.util.Log;
import android.view.LayoutInflater;
import android.view.Menu;
import android.view.MenuInflater;
@@ -37,46 +27,39 @@ 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.LinearLayout;
-import android.widget.ProgressBar;
-import android.widget.TextView;
+import android.widget.Toast;
-import net.ktnx.mobileledger.ui.activity.MainActivity;
import net.ktnx.mobileledger.R;
-import net.ktnx.mobileledger.async.RetrieveTransactionsTask;
+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.lang.ref.WeakReference;
-import java.time.ZoneId;
-import java.time.format.DateTimeFormatter;
-import java.util.Date;
+import org.jetbrains.annotations.NotNull;
+
+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;
+import static net.ktnx.mobileledger.utils.Logger.debug;
-public class TransactionListFragment extends Fragment {
- public TransactionListViewModel model;
- private MainActivity mActivity;
- private View bTransactionListCancelDownload;
+public class TransactionListFragment extends MobileLedgerListFragment {
private MenuItem menuTransactionListFilter;
private View vAccountFilter;
- private SwipeRefreshLayout swiper;
- private RecyclerView root;
- private ProgressBar progressBar;
- private LinearLayout progressLayout;
- private TextView tvLastUpdate;
- private TransactionListAdapter modelAdapter;
- private RetrieveTransactionsTask retrieveTransactionsTask;
private AutoCompleteTextView accNameFilter;
@Override
public void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setHasOptionsMenu(true);
+ Data.backgroundTasksRunning.observe(this, this::onBackgroundTaskRunningChanged);
}
@Override
- public void onAttach(Context context) {
+ public void onAttach(@NotNull Context context) {
super.onAttach(context);
mActivity = (MainActivity) context;
}
@@ -86,163 +69,120 @@ public class TransactionListFragment extends Fragment {
@Nullable Bundle savedInstanceState) {
return inflater.inflate(R.layout.transaction_list_fragment, container, false);
}
-
+ @Override
+ public void onResume() {
+ super.onResume();
+ debug("flow", "TransactionListFragment.onResume()");
+ }
+ @Override
+ public void onStop() {
+ super.onStop();
+ debug("flow", "TransactionListFragment.onStop()");
+ }
+ @Override
+ public void onPause() {
+ super.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);
swiper = mActivity.findViewById(R.id.transaction_swipe);
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 list view");
- progressBar = mActivity.findViewById(R.id.transaction_list_progress_bar);
- if (progressBar == null)
- throw new RuntimeException("Can't get hold on the transaction list progress bar");
- progressLayout = mActivity.findViewById(R.id.transaction_progress_layout);
- if (progressLayout == null) throw new RuntimeException(
- "Can't get hold on the transaction list progress bar layout");
- tvLastUpdate = mActivity.findViewById(R.id.transactions_last_update);
- updateLastUpdateText();
- model = ViewModelProviders.of(this).get(TransactionListViewModel.class);
- modelAdapter = new TransactionListAdapter(model);
-
- RecyclerView 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);
+ mActivity.fabShouldShow();
+
+ 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");
- update_transactions();
+ debug("ui", "refreshing transactions via swipe");
+ Data.scheduleTransactionListRetrieval(mActivity);
});
- swiper.setColorSchemeResources(R.color.colorPrimary, R.color.colorAccent);
+ Colors.themeWatch.observe(this, this::themeChanged);
vAccountFilter = mActivity.findViewById(R.id.transaction_list_account_name_filter);
accNameFilter = mActivity.findViewById(R.id.transaction_filter_account_name);
- bTransactionListCancelDownload =
- mActivity.findViewById(R.id.transaction_list_cancel_download);
-
- TransactionListFragment me = this;
- MLDB.hook_autocompletion_adapter(mActivity, accNameFilter, "accounts", "name");
- accNameFilter.setOnItemClickListener(new AdapterView.OnItemClickListener() {
- @Override
- public void onItemClick(AdapterView parent, View view, int position, long id) {
- Log.d("tmp", "direct onItemClick");
- model.reloadTransactions(me);
- 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) -> {
+// debug("tmp", "direct onItemClick");
+ MatrixCursor mc = (MatrixCursor) parent.getItemAtPosition(position);
+ Data.accountFilter.setValue(mc.getString(1));
+ Globals.hideSoftKeyboard(mActivity);
});
- updateLastUpdateText();
- long last_update = MLDB.get_option_value(mActivity, MLDB.OPT_TRANSACTION_LIST_STAMP, 0L);
- Log.d("transactions", String.format("Last update = %d", last_update));
- if (last_update == 0) {
- update_transactions();
+ Data.accountFilter.observe(this, 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;
+
+ Toast.makeText(mActivity, err, Toast.LENGTH_SHORT).show();
+ TransactionListViewModel.updateError.set(null);
+ });
+ Data.transactions.addObserver(
+ (o, arg) -> mActivity.runOnUiThread(() -> modelAdapter.notifyDataSetChanged()));
+
+ mActivity.findViewById(R.id.clearAccountNameFilter).setOnClickListener(v -> {
+ Data.accountFilter.setValue(null);
+ vAccountFilter.setVisibility(View.GONE);
+ menuTransactionListFilter.setVisible(true);
+ Globals.hideSoftKeyboard(mActivity);
+ });
+ }
+ private void onAccountNameFilterChanged(String accName) {
+ final String fieldText = accNameFilter.getText().toString();
+ if ((accName == null) && (fieldText.equals(""))) return;
+
+ if (accNameFilter != null) {
+ accNameFilter.setText(accName, false);
}
- else {
- model.reloadTransactions(this);
+ final boolean filterActive = (accName != null) && !accName.isEmpty();
+ if (vAccountFilter != null) {
+ vAccountFilter.setVisibility(filterActive ? View.VISIBLE : View.GONE);
}
+ if (menuTransactionListFilter != null) menuTransactionListFilter.setVisible(!filterActive);
+
+ 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();
- super.onCreateOptionsMenu(menu, inflater);
- }
- private void update_transactions() {
- retrieveTransactionsTask = new RetrieveTransactionsTask(new WeakReference<>(this));
+ if (Data.accountFilter.getValue() != null) {
+ menuTransactionListFilter.setVisible(false);
+ }
- RetrieveTransactionsTask.Params params = new RetrieveTransactionsTask.Params(
- PreferenceManager.getDefaultSharedPreferences(mActivity));
+ super.onCreateOptionsMenu(menu, inflater);
- retrieveTransactionsTask.execute(params);
- bTransactionListCancelDownload.setEnabled(true);
- }
- public void onRetrieveStart() {
- progressBar.setIndeterminate(true);
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) progressBar.setProgress(0, false);
- else progressBar.setProgress(0);
- progressLayout.setVisibility(View.VISIBLE);
- }
- public void onRetrieveProgress(RetrieveTransactionsTask.Progress progress) {
- if ((progress.getTotal() == RetrieveTransactionsTask.Progress.INDETERMINATE) ||
- (progress.getTotal() == 0))
- {
- progressBar.setIndeterminate(true);
- }
- else {
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
- progressBar.setMin(0);
- }
- progressBar.setMax(progress.getTotal());
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
- progressBar.setProgress(progress.getProgress(), true);
- }
- else progressBar.setProgress(progress.getProgress());
- progressBar.setIndeterminate(false);
- }
- }
+ 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);
- public void onRetrieveDone(boolean success) {
- progressLayout.setVisibility(View.GONE);
- swiper.setRefreshing(false);
- updateLastUpdateText();
- if (success) {
- Log.d("transactions", "calling notifyDataSetChanged()");
- modelAdapter.notifyDataSetChanged();
- }
- }
- private void updateLastUpdateText() {
- {
- long last_update =
- MLDB.get_option_value(mActivity, MLDB.OPT_TRANSACTION_LIST_STAMP, 0L);
- Log.d("transactions", String.format("Last update = %d", last_update));
- if (last_update == 0) {
- tvLastUpdate.setText(getString(R.string.transaction_last_update_never));
- }
- else {
- Date date = new Date(last_update);
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
- tvLastUpdate.setText(date.toInstant().atZone(ZoneId.systemDefault())
- .format(DateTimeFormatter.ISO_LOCAL_DATE_TIME));
- }
- else {
- tvLastUpdate.setText(date.toLocaleString());
- }
- }
- }
- }
- public void onClearAccountNameClick(View view) {
- vAccountFilter.setVisibility(View.GONE);
- menuTransactionListFilter.setVisible(true);
- accNameFilter.setText(null);
- model.reloadTransactions(this);
- modelAdapter.resetBoldAccountName();
- modelAdapter.notifyDataSetChanged();
- Globals.hideSoftKeyboard(mActivity);
- }
- public void onShowFilterClick(MenuItem menuItem) {
- vAccountFilter.setVisibility(View.VISIBLE);
- menuTransactionListFilter.setVisible(false);
- accNameFilter.requestFocus();
- InputMethodManager imm =
- (InputMethodManager) mActivity.getSystemService(INPUT_METHOD_SERVICE);
- imm.showSoftInput(accNameFilter, 0);
- }
- public void onStopTransactionRefreshClick(View view) {
- Log.d("interactive", "Cancelling transactions refresh");
- if (retrieveTransactionsTask != null) retrieveTransactionsTask.cancel(false);
- bTransactionListCancelDownload.setEnabled(false);
+ return true;
+ });
}
-}
+}
\ No newline at end of file