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=b6943adc41ae8d89d994d25a1c28c91f79665c31;hp=0944d1fa5dba521fd9f2c3675b14018ae2a503ae;hb=9f35f59fcffd6b9778b36bf31f8b94d91411664f;hpb=98bbfc6d6604db8339f9aa5042a6740ebbd503a2 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 0944d1fa..b6943adc 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 @@ -17,7 +17,6 @@ package net.ktnx.mobileledger.ui.account_summary; -import android.arch.lifecycle.ViewModelProviders; import android.content.Context; import android.content.SharedPreferences; import android.os.Bundle; @@ -50,7 +49,6 @@ import static net.ktnx.mobileledger.ui.activity.SettingsActivity.PREF_KEY_SHOW_O public class AccountSummaryFragment extends MobileLedgerListFragment { MenuItem mShowOnlyStarred; - private AccountSummaryViewModel model; private AccountSummaryAdapter modelAdapter; private Menu optMenu; private FloatingActionButton fab; @@ -98,7 +96,6 @@ public class AccountSummaryFragment extends MobileLedgerListFragment { Log.d("flow", "AccountSummaryFragment.onActivityCreated()"); super.onActivityCreated(savedInstanceState); - model = ViewModelProviders.of(this).get(AccountSummaryViewModel.class); modelAdapter = new AccountSummaryAdapter(); root = mActivity.findViewById(R.id.account_root); @@ -144,12 +141,12 @@ public class AccountSummaryFragment extends MobileLedgerListFragment { } })); - fab.show(); + mActivity.fabShouldShow(); 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) mActivity.fabShouldShow(); if (dy > 0) fab.hide(); } } @@ -164,13 +161,13 @@ public class AccountSummaryFragment extends MobileLedgerListFragment { Data.accounts.addObserver( (o, arg) -> mActivity.runOnUiThread(() -> modelAdapter.notifyDataSetChanged())); Data.profile.addObserver( - (o, arg) -> mActivity.runOnUiThread(() -> model.scheduleAccountListReload())); + (o, arg) -> mActivity.runOnUiThread(() -> AccountSummaryViewModel.scheduleAccountListReload())); update_account_table(); } private void update_account_table() { if (this.getContext() == null) return; - model.scheduleAccountListReload(); + AccountSummaryViewModel.scheduleAccountListReload(); } void stopSelection() { modelAdapter.stopSelection();