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=04cde356a6e4096c5899b1e2103462059106d2af;hp=6ce84c7827ec93338f814b0632e00b4c133f89c9;hb=254ccdbeec488fb1309513a3ff9be28f9b06855c;hpb=22f72903c1b7d827064c90b4472ff5c69ab3ba2f 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 6ce84c78..04cde356 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,23 +1,22 @@ /* * Copyright © 2019 Damyan Ivanov. - * This file is part of Mobile-Ledger. - * Mobile-Ledger is free software: you can distribute it and/or modify it + * 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.account_summary; -import android.arch.lifecycle.ViewModelProviders; import android.content.Context; import android.content.SharedPreferences; import android.os.Bundle; @@ -41,6 +40,7 @@ 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.Colors; import java.util.List; import java.util.Observer; @@ -50,7 +50,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 +97,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); @@ -155,7 +153,9 @@ public class AccountSummaryFragment extends MobileLedgerListFragment { } }); swiper = mActivity.findViewById(R.id.account_swiper); - swiper.setColorSchemeResources(R.color.colorPrimary, R.color.colorAccent); + Colors.themeWatch.addObserver( + (o, arg) -> swiper.setColorSchemeColors(Colors.primary)); + swiper.setColorSchemeColors(Colors.primary); swiper.setOnRefreshListener(() -> { Log.d("ui", "refreshing accounts via swipe"); mActivity.scheduleTransactionListRetrieval(); @@ -163,14 +163,14 @@ public class AccountSummaryFragment extends MobileLedgerListFragment { Data.accounts.addObserver( (o, arg) -> mActivity.runOnUiThread(() -> modelAdapter.notifyDataSetChanged())); - Data.profile.addObserver( - (o, arg) -> mActivity.runOnUiThread(() -> model.scheduleAccountListReload())); + Data.profile.addObserver((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();