X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;ds=inline;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Faccount_summary%2FAccountSummaryFragment.java;h=2fcfe67f320bb180b453bf3932f1a277a063a2a7;hb=998dd32a089d199a2569069415755eb3169b35b0;hp=d14cf418a5cd4f9b22dd0ba870c2d60ffb92bfa1;hpb=b4175624de863c7343de10db2436722e78e51cb1;p=mobile-ledger.git
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 d14cf418..2fcfe67f 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;
@@ -43,7 +42,6 @@ import net.ktnx.mobileledger.ui.RecyclerItemListener;
import net.ktnx.mobileledger.ui.activity.MainActivity;
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;
@@ -51,8 +49,6 @@ import static net.ktnx.mobileledger.ui.activity.SettingsActivity.PREF_KEY_SHOW_O
public class AccountSummaryFragment extends MobileLedgerListFragment {
MenuItem mShowOnlyStarred;
- SharedPreferences.OnSharedPreferenceChangeListener sBindPreferenceSummaryToValueListener;
- private AccountSummaryViewModel model;
private AccountSummaryAdapter modelAdapter;
private Menu optMenu;
private FloatingActionButton fab;
@@ -72,17 +68,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(() -> {
- 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);
+ });
});
}
}
@@ -103,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);
@@ -149,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();
}
}
@@ -166,24 +158,16 @@ public class AccountSummaryFragment extends MobileLedgerListFragment {
mActivity.scheduleTransactionListRetrieval();
});
- Data.accounts.addObserver(new Observer() {
- @Override
- public void update(Observable o, Object arg) {
- mActivity.runOnUiThread(() -> modelAdapter.notifyDataSetChanged());
- }
- });
- Data.profile.addObserver(new Observer() {
- @Override
- public void update(Observable o, Object arg) {
- mActivity.runOnUiThread(() -> model.scheduleAccountListReload());
- }
- });
+ Data.accounts.addObserver(
+ (o, arg) -> mActivity.runOnUiThread(() -> modelAdapter.notifyDataSetChanged()));
+ 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();