X-Git-Url: https://git.ktnx.net/?p=mobile-ledger.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Faccount_summary%2FAccountSummaryFragment.java;h=82709138207aaf553b51f29b4f893a8d1c409895;hp=3a09f2bbde2cc5d90ad5196eb19520b871f4c46f;hb=198f2762d2236a57cec413322c0bde6985ead88a;hpb=abc331c02a265be778538a8416766c5d681a031f diff --git a/app/src/main/java/net/ktnx/mobileledger/ui/account_summary/AccountSummaryFragment.java b/app/src/main/java/net/ktnx/mobileledger/ui/account_summary/AccountSummaryFragment.java index 3a09f2bb..82709138 100644 --- a/app/src/main/java/net/ktnx/mobileledger/ui/account_summary/AccountSummaryFragment.java +++ b/app/src/main/java/net/ktnx/mobileledger/ui/account_summary/AccountSummaryFragment.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 @@ -25,9 +25,6 @@ import android.preference.PreferenceManager; import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.support.design.widget.FloatingActionButton; -import android.support.design.widget.Snackbar; -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; @@ -39,19 +36,19 @@ import android.view.View; import android.view.ViewGroup; import net.ktnx.mobileledger.R; -import net.ktnx.mobileledger.ui.RecyclerItemListener; -import net.ktnx.mobileledger.async.RetrieveAccountsTask; +import net.ktnx.mobileledger.model.Data; import net.ktnx.mobileledger.model.LedgerAccount; +import net.ktnx.mobileledger.ui.MobileLedgerListFragment; +import net.ktnx.mobileledger.ui.RecyclerItemListener; import net.ktnx.mobileledger.ui.activity.MainActivity; -import net.ktnx.mobileledger.utils.MLDB; -import java.lang.ref.WeakReference; -import java.util.Date; import java.util.List; +import java.util.Observable; +import java.util.Observer; import static net.ktnx.mobileledger.ui.activity.SettingsActivity.PREF_KEY_SHOW_ONLY_STARRED_ACCOUNTS; -public class AccountSummaryFragment extends Fragment { +public class AccountSummaryFragment extends MobileLedgerListFragment { private static long account_list_last_updated; private static boolean account_list_needs_update = true; @@ -60,13 +57,36 @@ public class AccountSummaryFragment extends Fragment { private AccountSummaryViewModel model; private AccountSummaryAdapter modelAdapter; private Menu optMenu; - private MainActivity mActivity; private FloatingActionButton fab; - private SwipeRefreshLayout swiper; + private Observer backgroundTaskCountObserver; + @Override + public void onDestroy() { + if(backgroundTaskCountObserver!= null) { + Log.d("acc", "destroying background task count observer"); + Data.backgroundTaskCount.deleteObserver(backgroundTaskCountObserver); + } + super.onDestroy(); + } @Override public void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); setHasOptionsMenu(true); + + if (backgroundTaskCountObserver == null) { + Log.d("acc", "creating background task count observer"); + Data.backgroundTaskCount.addObserver(backgroundTaskCountObserver = new Observer() { + @Override + public void update(Observable o, Object arg) { + if (mActivity == null) return; + if (swiper == null) return; + mActivity.runOnUiThread(() -> { + int cnt = Data.backgroundTaskCount.get(); + Log.d("acc", String.format("background task count changed to %d", cnt)); + swiper.setRefreshing(cnt > 0); + }); + } + }); + } } public void onAttach(Context context) { super.onAttach(context); @@ -85,8 +105,7 @@ public class AccountSummaryFragment extends Fragment { mActivity.markDrawerItemCurrent(R.id.nav_account_summary); model = ViewModelProviders.of(this).get(AccountSummaryViewModel.class); - List accounts = model.getAccounts(this.getContext()); - modelAdapter = new AccountSummaryAdapter(accounts); + modelAdapter = new AccountSummaryAdapter(); RecyclerView root = mActivity.findViewById(R.id.account_root); root.setAdapter(modelAdapter); @@ -101,12 +120,12 @@ public class AccountSummaryFragment extends Fragment { new RecyclerItemListener.RecyclerTouchListener() { @Override public void onClickItem(View v, int position) { - Log.d("list", String.format("item %d clicked", position)); + Log.d("value", String.format("item %d clicked", position)); if (modelAdapter.isSelectionActive()) { modelAdapter.selectItem(position); } else { - List accounts = model.getAccounts(mActivity); + List accounts = Data.accounts.get(); if (accounts != null) { LedgerAccount account = accounts.get(position); @@ -117,7 +136,7 @@ public class AccountSummaryFragment extends Fragment { @Override public void onLongClickItem(View v, int position) { - Log.d("list", String.format("item %d long-clicked", position)); + Log.d("value", String.format("item %d long-clicked", position)); modelAdapter.startSelection(); if (optMenu != null) { optMenu.findItem(R.id.menu_acc_summary_cancel_selection) @@ -132,6 +151,7 @@ public class AccountSummaryFragment extends Fragment { } })); + fab.show(); root.addOnScrollListener(new RecyclerView.OnScrollListener() { @Override public void onScrolled(@NonNull RecyclerView recyclerView, int dx, int dy) { @@ -145,56 +165,22 @@ public class AccountSummaryFragment extends Fragment { swiper.setColorSchemeResources(R.color.colorPrimary, R.color.colorAccent); swiper.setOnRefreshListener(() -> { Log.d("ui", "refreshing accounts via swipe"); - update_accounts(true); + mActivity.scheduleTransactionListRetrieval(); }); - prepare_db(); -// update_account_table(); - update_accounts(false); - - } - private void prepare_db() { - account_list_last_updated = MLDB.get_option_value(mActivity, "last_refresh", (long) 0); - } - private void update_accounts(boolean force) { - long now = new Date().getTime(); - if ((now > (account_list_last_updated + (24 * 3600 * 1000))) || force) { - Log.d("db", - "accounts last updated at " + account_list_last_updated + " and now is " + now + - ". re-fetching"); - update_accounts(); - } - } - - private void update_accounts() { - RetrieveAccountsTask task = new RetrieveAccountsTask(new WeakReference<>(this)); - - task.setPref(PreferenceManager.getDefaultSharedPreferences(mActivity)); - task.execute(); - - } - public void onAccountRefreshDone(int error) { - swiper.setRefreshing(false); - if (error != 0) { - String err_text = getResources().getString(error); - Log.d("visual", String.format("showing snackbar: %s", err_text)); - Snackbar.make(swiper, err_text, Snackbar.LENGTH_LONG).show(); - } - else { - MLDB.set_option_value(mActivity, "last_refresh", new Date().getTime()); - update_account_table(); - } + Data.accounts.addObserver(new Observer() { + @Override + public void update(Observable o, Object arg) { + mActivity.runOnUiThread(() -> modelAdapter.notifyDataSetChanged()); + } + }); + update_account_table(); } private void update_account_table() { if (this.getContext() == null) return; - model.reloadAccounts(this.getContext()); - modelAdapter.notifyDataSetChanged(); - } - public void onRefreshAccountSummaryClicked(MenuItem mi) { - update_accounts(true); + model.scheduleAccountListReload(this.getContext()); } - public void onShowOnlyStarredClicked(MenuItem mi) { SharedPreferences pref = PreferenceManager.getDefaultSharedPreferences(mActivity); boolean flag = pref.getBoolean(PREF_KEY_SHOW_ONLY_STARRED_ACCOUNTS, false); @@ -222,7 +208,7 @@ public class AccountSummaryFragment extends Fragment { stopSelection(); } public void onConfirmAccSelection(MenuItem item) { - model.commitSelections(mActivity); + AccountSummaryViewModel.commitSelections(mActivity); stopSelection(); } @Override