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=9ec46e79f9fbbc1cca26590ebeb61e9a5812f1b7;hp=45e6767b30a5984e17dbd7aaa0f970a0d62e25da;hb=19867626f491b4930a1c02a58ad515b52b75596d;hpb=22200a5db9403100a6c9ed6d81fac75adb14a574 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 45e6767b..9ec46e79 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,5 +1,5 @@ /* - * Copyright © 2018 Damyan Ivanov. + * Copyright © 2019 Damyan Ivanov. * This file is part of Mobile-Ledger. * Mobile-Ledger is free software: you can distribute it and/or modify it * under the term of the GNU General Public License as published by @@ -20,14 +20,10 @@ 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.design.widget.FloatingActionButton; -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; @@ -40,39 +36,36 @@ 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 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.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 java.util.Observable; +import java.util.Observer; import static android.content.Context.INPUT_METHOD_SERVICE; -public class TransactionListFragment extends Fragment { +public class TransactionListFragment extends MobileLedgerListFragment { public static final String BUNDLE_KEY_FILTER_ACCOUNT_NAME = "filter_account_name"; - public TransactionListViewModel model; private String mShowOnlyAccountName; - private MainActivity mActivity; - private View bTransactionListCancelDownload; 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; + private Observer backgroundTaskCountObserver; + private static void update(Observable o, Object arg) { + } + @Override + public void onDestroy() { + if (backgroundTaskCountObserver != null) { + Log.d("rtl", "destroying background task count observer"); + Data.backgroundTaskCount.deleteObserver(backgroundTaskCountObserver); + } + super.onDestroy(); + } public void setShowOnlyAccountName(String mShowOnlyAccountName) { this.mShowOnlyAccountName = mShowOnlyAccountName; if (modelAdapter != null) { @@ -96,6 +89,19 @@ public class TransactionListFragment extends Fragment { public void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); setHasOptionsMenu(true); + if (backgroundTaskCountObserver == null) { + Log.d("rtl", "creating background task count observer"); + Data.backgroundTaskCount.addObserver(backgroundTaskCountObserver = new Observer() { + @Override + public void update(Observable o, Object arg) { + mActivity.runOnUiThread(() -> { + int cnt = Data.backgroundTaskCount.get(); + Log.d("trl", String.format("background task count changed to %d", cnt)); + swiper.setRefreshing(cnt > 0); + }); + } + }); + } } @Override public void onAttach(Context context) { @@ -114,38 +120,25 @@ public class TransactionListFragment extends Fragment { Log.d("flow", "TransactionListFragment.onActivityCreated called"); super.onActivityCreated(savedInstanceState); - mActivity.markDrawerItemCurrent(R.id.nav_latest_transactions); - 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(); + 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(model); + modelAdapter = new TransactionListAdapter(); modelAdapter.setBoldAccountName(mShowOnlyAccountName); + root.setAdapter(modelAdapter); FloatingActionButton fab = mActivity.findViewById(R.id.btn_add_transaction); - RecyclerView root = mActivity.findViewById(R.id.transaction_root); - root.setAdapter(modelAdapter); - fab.show(); root.addOnScrollListener(new RecyclerView.OnScrollListener() { @Override public void onScrolled(@NonNull RecyclerView recyclerView, int dx, int dy) { - if (fab != null) { - if (dy < 0) fab.show(); - if (dy > 0) fab.hide(); - } + if (dy < 0) fab.show(); + if (dy > 0) fab.hide(); } }); @@ -156,23 +149,21 @@ public class TransactionListFragment extends Fragment { swiper.setOnRefreshListener(() -> { Log.d("ui", "refreshing transactions via swipe"); - update_transactions(); + mActivity.scheduleTransactionListRetrieval(); }); swiper.setColorSchemeResources(R.color.colorPrimary, R.color.colorAccent); 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"); + 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"); - model.reloadTransactions(me); +// Log.d("tmp", "direct onItemClick"); + TransactionListViewModel.scheduleTransactionListReload(mActivity); MatrixCursor mc = (MatrixCursor) parent.getItemAtPosition(position); modelAdapter.setBoldAccountName(mc.getString(1)); modelAdapter.notifyDataSetChanged(); @@ -180,22 +171,37 @@ public class TransactionListFragment extends Fragment { } }); - 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 (mShowOnlyAccountName != null) { accNameFilter.setText(mShowOnlyAccountName, false); onShowFilterClick(null); Log.d("flow", String.format("Account filter set to '%s'", mShowOnlyAccountName)); } - if (last_update == 0) { - update_transactions(); - } - else { - model.reloadTransactions(this); - } + Data.profile.addObserver(new Observer() { + @Override + public void update(Observable o, Object arg) { + mActivity.runOnUiThread(() -> { + Log.d("transactions", "requesting list reload"); + TransactionListViewModel.scheduleTransactionListReload(mActivity); + }); + } + }); + + TransactionListViewModel.scheduleTransactionListReload(mActivity); + TransactionListViewModel.updating.addObserver(new Observer() { + @Override + public void update(Observable o, Object arg) { + swiper.setRefreshing(TransactionListViewModel.updating.get()); + } + }); + + Data.transactions.addObserver(new Observer() { + @Override + public void update(Observable o, Object arg) { + mActivity.runOnUiThread(() -> modelAdapter.notifyDataSetChanged()); + } + }); + } @Override public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { @@ -210,77 +216,14 @@ public class TransactionListFragment extends Fragment { super.onCreateOptionsMenu(menu, inflater); } - private void update_transactions() { - retrieveTransactionsTask = new RetrieveTransactionsTask(new WeakReference<>(this)); - - RetrieveTransactionsTask.Params params = new RetrieveTransactionsTask.Params( - PreferenceManager.getDefaultSharedPreferences(mActivity)); - - 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); - } - } - 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); if (menuTransactionListFilter != null) menuTransactionListFilter.setVisible(true); accNameFilter.setText(null); mShowOnlyAccountName = null; - model.reloadTransactions(this); modelAdapter.resetBoldAccountName(); - modelAdapter.notifyDataSetChanged(); + TransactionListViewModel.scheduleTransactionListReload(mActivity); Globals.hideSoftKeyboard(mActivity); } public void onShowFilterClick(MenuItem menuItem) { @@ -293,9 +236,4 @@ public class TransactionListFragment extends Fragment { imm.showSoftInput(accNameFilter, 0); } } - public void onStopTransactionRefreshClick(View view) { - Log.d("interactive", "Cancelling transactions refresh"); - if (retrieveTransactionsTask != null) retrieveTransactionsTask.cancel(false); - bTransactionListCancelDownload.setEnabled(false); - } -} +} \ No newline at end of file