X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Faccount_summary%2FAccountSummaryFragment.java;h=dd4e4d49ae37561288fd02d00197f9f702c25f11;hb=8d69552b756ba44e254251edf08206f8866c639b;hp=7218b15e728c7c89d4fc99a9e5a497e900a79a57;hpb=0167d1f5e98944aab435727e06ff74ccf9913908;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 7218b15e..dd4e4d49 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,32 +1,26 @@
/*
* 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;
import android.preference.PreferenceManager;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.design.widget.FloatingActionButton;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.Menu;
@@ -35,24 +29,29 @@ import android.view.MenuItem;
import android.view.View;
import android.view.ViewGroup;
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
+
import net.ktnx.mobileledger.R;
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.Colors;
import java.util.List;
-import java.util.Observable;
import java.util.Observer;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
import static net.ktnx.mobileledger.ui.activity.SettingsActivity.PREF_KEY_SHOW_ONLY_STARRED_ACCOUNTS;
public class AccountSummaryFragment extends MobileLedgerListFragment {
MenuItem mShowOnlyStarred;
- SharedPreferences.OnSharedPreferenceChangeListener sBindPreferenceSummaryToValueListener;
- private AccountSummaryViewModel model;
private AccountSummaryAdapter modelAdapter;
private Menu optMenu;
private FloatingActionButton fab;
@@ -72,17 +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(() -> {
- 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,12 +99,11 @@ 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);
LinearLayoutManager llm = new LinearLayoutManager(mActivity);
- llm.setOrientation(LinearLayoutManager.VERTICAL);
+ llm.setOrientation(RecyclerView.VERTICAL);
root.setLayoutManager(llm);
root.setAdapter(modelAdapter);
@@ -149,41 +144,35 @@ 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();
}
}
});
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();
});
- 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(mActivity));
- }
- });
+ 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(this.getContext());
+ AccountSummaryViewModel.scheduleAccountListReload();
}
void stopSelection() {
modelAdapter.stopSelection();
@@ -211,15 +200,16 @@ public class AccountSummaryFragment extends MobileLedgerListFragment {
mShowOnlyStarred = menu.findItem(R.id.menu_acc_summary_only_starred);
if (mShowOnlyStarred == null) throw new AssertionError();
-
- Data.optShowOnlyStarred.addObserver(new Observer() {
- @Override
- public void update(Observable o, Object arg) {
- boolean newValue = Data.optShowOnlyStarred.get();
- Log.d("pref", String.format("pref change came (%s)", newValue ? "true" : "false"));
- mShowOnlyStarred.setChecked(newValue);
- update_account_table();
- }
+ 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());
@@ -235,6 +225,17 @@ public class AccountSummaryFragment extends MobileLedgerListFragment {
"Setting show only starred accounts pref to " + (flag ? "false" : "true"));
editor.apply();
+ return true;
+ });
+
+ mCancelSelection.setOnMenuItemClickListener(item -> {
+ stopSelection();
+ return true;
+ });
+
+ mConfirmSelection.setOnMenuItemClickListener(item -> {
+ AccountSummaryViewModel.commitSelections(mActivity);
+ stopSelection();
return true;
});