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=66008e9c21221f0f98f1e07ade2614f553b4049b;hp=99ce8bded745ef230239f09ff4ae358b95e2ab23;hb=62fd5c71d3eda795706f960c39d72f7006440ab0;hpb=9ab140e69f987d4a207037e9ef1d3ac9888f3fd4 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 99ce8bde..66008e9c 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 @@ -36,16 +36,12 @@ import android.view.View; import android.view.ViewGroup; import net.ktnx.mobileledger.R; -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; @@ -54,10 +50,7 @@ import static net.ktnx.mobileledger.ui.activity.SettingsActivity.PREF_KEY_SHOW_O public class AccountSummaryFragment extends MobileLedgerListFragment { - private static long account_list_last_updated; - private static boolean account_list_needs_update = true; - MenuItem mShowHiddenAccounts; - SharedPreferences.OnSharedPreferenceChangeListener sBindPreferenceSummaryToValueListener; + MenuItem mShowOnlyStarred; private AccountSummaryViewModel model; private AccountSummaryAdapter modelAdapter; private Menu optMenu; @@ -65,7 +58,7 @@ public class AccountSummaryFragment extends MobileLedgerListFragment { private Observer backgroundTaskCountObserver; @Override public void onDestroy() { - if(backgroundTaskCountObserver!= null) { + if (backgroundTaskCountObserver != null) { Log.d("acc", "destroying background task count observer"); Data.backgroundTaskCount.deleteObserver(backgroundTaskCountObserver); } @@ -78,20 +71,14 @@ public class AccountSummaryFragment extends MobileLedgerListFragment { 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(new Runnable() { - @Override - public void run() { - int cnt = Data.backgroundTaskCount.get(); - Log.d("acc", String.format("background task count changed to %d", cnt)); - swiper.setRefreshing(cnt > 0); - } - }); - } + Data.backgroundTaskCount.addObserver(backgroundTaskCountObserver = (o, 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); + }); }); } } @@ -102,25 +89,24 @@ public class AccountSummaryFragment extends MobileLedgerListFragment { @Override public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { + Log.d("flow", "AccountSummaryFragment.onCreateView()"); return inflater.inflate(R.layout.account_summary_fragment, container, false); } @Override + public void onActivityCreated(@Nullable Bundle savedInstanceState) { + Log.d("flow", "AccountSummaryFragment.onActivityCreated()"); super.onActivityCreated(savedInstanceState); - mActivity.markDrawerItemCurrent(R.id.nav_account_summary); - model = ViewModelProviders.of(this).get(AccountSummaryViewModel.class); - List accounts = model.getAccounts(this.getContext()); - modelAdapter = new AccountSummaryAdapter(accounts); - - RecyclerView root = mActivity.findViewById(R.id.account_root); - root.setAdapter(modelAdapter); + modelAdapter = new AccountSummaryAdapter(); + root = mActivity.findViewById(R.id.account_root); LinearLayoutManager llm = new LinearLayoutManager(mActivity); llm.setOrientation(LinearLayoutManager.VERTICAL); root.setLayoutManager(llm); + root.setAdapter(modelAdapter); fab = mActivity.findViewById(R.id.btn_add_transaction); @@ -133,7 +119,7 @@ public class AccountSummaryFragment extends MobileLedgerListFragment { modelAdapter.selectItem(position); } else { - List accounts = model.getAccounts(mActivity); + List accounts = Data.accounts.get(); if (accounts != null) { LedgerAccount account = accounts.get(position); @@ -173,58 +159,28 @@ public class AccountSummaryFragment extends MobileLedgerListFragment { swiper.setColorSchemeResources(R.color.colorPrimary, R.color.colorAccent); swiper.setOnRefreshListener(() -> { Log.d("ui", "refreshing accounts via swipe"); - update_accounts(true); + mActivity.scheduleTransactionListRetrieval(); }); Data.accounts.addObserver(new Observer() { @Override public void update(Observable o, Object arg) { - mActivity.runOnUiThread(new Runnable() { - @Override - public void run() { - modelAdapter.notifyDataSetChanged(); - } - }); + mActivity.runOnUiThread(() -> modelAdapter.notifyDataSetChanged()); + } + }); + Data.profile.addObserver(new Observer() { + @Override + public void update(Observable o, Object arg) { + mActivity.runOnUiThread(() -> model.scheduleAccountListReload()); } }); update_account_table(); } - - 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<>(mActivity)); - - task.setPref(PreferenceManager.getDefaultSharedPreferences(mActivity)); - task.execute(); - - } private void update_account_table() { if (this.getContext() == null) return; - model.reloadAccounts(this.getContext()); - modelAdapter.notifyDataSetChanged(); + model.scheduleAccountListReload(); } - public void onShowOnlyStarredClicked(MenuItem mi) { - SharedPreferences pref = PreferenceManager.getDefaultSharedPreferences(mActivity); - boolean flag = pref.getBoolean(PREF_KEY_SHOW_ONLY_STARRED_ACCOUNTS, false); - - SharedPreferences.Editor editor = pref.edit(); - editor.putBoolean(PREF_KEY_SHOW_ONLY_STARRED_ACCOUNTS, !flag); - Log.d("pref", "Setting show only starred accounts pref to " + (flag ? "false" : "true")); - editor.apply(); - - update_account_table(); - } - void stopSelection() { modelAdapter.stopSelection(); if (optMenu != null) { @@ -240,7 +196,7 @@ public class AccountSummaryFragment extends MobileLedgerListFragment { stopSelection(); } public void onConfirmAccSelection(MenuItem item) { - model.commitSelections(mActivity); + AccountSummaryViewModel.commitSelections(mActivity); stopSelection(); } @Override @@ -249,16 +205,46 @@ public class AccountSummaryFragment extends MobileLedgerListFragment { inflater.inflate(R.menu.account_summary, menu); optMenu = menu; - mShowHiddenAccounts = menu.findItem(R.id.menu_acc_summary_only_starred); - if (mShowHiddenAccounts == null) throw new AssertionError(); + mShowOnlyStarred = menu.findItem(R.id.menu_acc_summary_only_starred); + if (mShowOnlyStarred == null) throw new AssertionError(); + MenuItem mCancelSelection = menu.findItem(R.id.menu_acc_summary_cancel_selection); + if (mCancelSelection == null) throw new AssertionError(); + MenuItem mConfirmSelection = menu.findItem(R.id.menu_acc_summary_confirm_selection); + if (mConfirmSelection == null) throw new AssertionError(); + + Data.optShowOnlyStarred.addObserver((o, arg) -> { + boolean newValue = Data.optShowOnlyStarred.get(); + Log.d("pref", String.format("pref change came (%s)", newValue ? "true" : "false")); + mShowOnlyStarred.setChecked(newValue); + update_account_table(); + }); + + mShowOnlyStarred.setChecked(Data.optShowOnlyStarred.get()); + + Log.d("menu", "Accounts: onCreateOptionsMenu called"); + + mShowOnlyStarred.setOnMenuItemClickListener(item -> { + SharedPreferences pref = PreferenceManager.getDefaultSharedPreferences(mActivity); + SharedPreferences.Editor editor = pref.edit(); + boolean flag = item.isChecked(); + editor.putBoolean(PREF_KEY_SHOW_ONLY_STARRED_ACCOUNTS, !flag); + Log.d("pref", + "Setting show only starred accounts pref to " + (flag ? "false" : "true")); + editor.apply(); - sBindPreferenceSummaryToValueListener = (preference, value) -> mShowHiddenAccounts - .setChecked(preference.getBoolean(PREF_KEY_SHOW_ONLY_STARRED_ACCOUNTS, false)); - SharedPreferences pref = PreferenceManager.getDefaultSharedPreferences(mActivity); - pref.registerOnSharedPreferenceChangeListener(sBindPreferenceSummaryToValueListener); + return true; + }); + + mCancelSelection.setOnMenuItemClickListener(item -> { + stopSelection(); + return true; + }); - mShowHiddenAccounts.setChecked(pref.getBoolean(PREF_KEY_SHOW_ONLY_STARRED_ACCOUNTS, false)); + mConfirmSelection.setOnMenuItemClickListener(item -> { + AccountSummaryViewModel.commitSelections(mActivity); + stopSelection(); - Log.d("menu", "MainActivity: onCreateOptionsMenu called"); + return true; + }); } }