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=93975b05e59357bf40ae8f484dbe057ac7add7a6;hp=99cf91fecb07e32024878114560836dbbd90a0cf;hb=8fd287a2b36f1d28ee1c1ca67687abaab4e95f2f;hpb=4dd24557af8d6e2925843a2f68ec7602394eca75
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 99cf91fe..93975b05 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,35 +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.design.widget.Snackbar;
-import android.support.v4.app.Fragment;
-import android.support.v4.widget.SwipeRefreshLayout;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.Menu;
@@ -38,176 +29,150 @@ 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.async.RetrieveAccountsTask;
-import net.ktnx.mobileledger.model.LedgerAccount;
-import net.ktnx.mobileledger.ui.RecyclerItemListener;
+import net.ktnx.mobileledger.model.Data;
+import net.ktnx.mobileledger.ui.MobileLedgerListFragment;
import net.ktnx.mobileledger.ui.activity.MainActivity;
-import net.ktnx.mobileledger.utils.MLDB;
+import net.ktnx.mobileledger.utils.Colors;
+
+import java.util.Observer;
-import java.lang.ref.WeakReference;
-import java.util.Date;
-import java.util.List;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.DividerItemDecoration;
+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 Fragment {
+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;
- private AccountSummaryViewModel model;
- private AccountSummaryAdapter modelAdapter;
+ MenuItem mShowOnlyStarred;
+ public AccountSummaryAdapter modelAdapter;
private Menu optMenu;
- private MainActivity mActivity;
private FloatingActionButton fab;
- private SwipeRefreshLayout swiper;
+ private Observer backgroundTaskCountObserver;
+ @Override
+ public void onDestroy() {
+ if (backgroundTaskCountObserver != null) {
+ Log.d("acc", "destroying background task count observer");
+ Data.backgroundTaskCount.deleteObserver(backgroundTaskCountObserver);
+ }
+ super.onDestroy();
+ }
@Override
public void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
+ Log.d("flow", "AccountSummaryFragment.onCreate()");
setHasOptionsMenu(true);
+
+ if (backgroundTaskCountObserver == null) {
+ Log.d("acc", "creating background task count observer");
+ 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);
+ });
+ });
+ }
}
public void onAttach(Context context) {
super.onAttach(context);
+ Log.d("flow", "AccountSummaryFragment.onAttach()");
mActivity = (MainActivity) context;
}
@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();
+ mActivity.mAccountSummaryFragment = this;
+ 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);
+ DividerItemDecoration did = new DividerItemDecoration(mActivity, DividerItemDecoration.VERTICAL);
+ root.addItemDecoration(did);
fab = mActivity.findViewById(R.id.btn_add_transaction);
- root.addOnItemTouchListener(new RecyclerItemListener(mActivity, root,
- new RecyclerItemListener.RecyclerTouchListener() {
- @Override
- public void onClickItem(View v, int position) {
- Log.d("list", String.format("item %d clicked", position));
- if (modelAdapter.isSelectionActive()) {
- modelAdapter.selectItem(position);
- }
- else {
- List accounts = model.getAccounts(mActivity);
- if (accounts != null) {
- LedgerAccount account = accounts.get(position);
-
- mActivity.showAccountTransactions(account);
- }
- }
- }
-
- @Override
- public void onLongClickItem(View v, int position) {
- Log.d("list", String.format("item %d long-clicked", position));
- modelAdapter.startSelection();
- if (optMenu != null) {
- optMenu.findItem(R.id.menu_acc_summary_cancel_selection)
- .setVisible(true);
- optMenu.findItem(R.id.menu_acc_summary_confirm_selection)
- .setVisible(true);
- optMenu.findItem(R.id.menu_acc_summary_only_starred).setVisible(false);
- }
- {
- if (fab != null) fab.hide();
- }
- }
- }));
-
- fab.show();
+// root.addOnItemTouchListener(new RecyclerItemListener(mActivity, root,
+// new RecyclerItemListener.RecyclerTouchListener() {
+// @Override
+// public void onClickItem(View v, int position) {
+// Log.d("value", String.format("item %d clicked", position));
+// if (modelAdapter.isSelectionActive()) {
+// modelAdapter.selectItem(position);
+// }
+// else {
+// List accounts = Data.accounts.get();
+// if (accounts != null) {
+// LedgerAccount account = accounts.get(position);
+//
+// mActivity.showAccountTransactions(account);
+// }
+// }
+// }
+//
+// @Override
+// public void onLongClickItem(View v, int position) {
+// Log.d("value", String.format("item %d long-clicked", position));
+// modelAdapter.startSelection();
+// if (optMenu != null) {
+// optMenu.findItem(R.id.menu_acc_summary_cancel_selection)
+// .setVisible(true);
+// optMenu.findItem(R.id.menu_acc_summary_confirm_selection)
+// .setVisible(true);
+// optMenu.findItem(R.id.menu_acc_summary_only_starred).setVisible(false);
+// }
+// {
+// if (fab != null) fab.hide();
+// }
+// }
+// }));
+
+ 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");
- update_accounts(true);
+ mActivity.scheduleTransactionListRetrieval();
});
- prepare_db();
-// update_account_table();
- update_accounts(false);
-
- }
- private void prepare_db() {
- account_list_last_updated = MLDB.get_option_value(MLDB.OPT_LAST_REFRESH, (long) 0);
- }
-
- 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<>(this));
-
- task.setPref(PreferenceManager.getDefaultSharedPreferences(mActivity));
- task.execute();
- }
- public void onAccountRefreshDone(int error) {
- swiper.setRefreshing(false);
- if (error != 0) {
- String err_text = getResources().getString(error);
- Log.d("visual", String.format("showing snackbar: %s", err_text));
- Snackbar.make(swiper, err_text, Snackbar.LENGTH_LONG).show();
- }
- else {
- MLDB.set_option_value(MLDB.OPT_LAST_REFRESH, new Date().getTime());
- update_account_table();
- }
+ Data.accounts.addObserver(
+ (o, arg) -> mActivity.runOnUiThread(() -> modelAdapter.notifyDataSetChanged()));
}
private void update_account_table() {
if (this.getContext() == null) return;
- model.reloadAccounts(this.getContext());
- modelAdapter.notifyDataSetChanged();
- }
- public void onRefreshAccountSummaryClicked(MenuItem mi) {
- update_accounts(true);
- }
-
- 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();
+ AccountSummaryViewModel.scheduleAccountListReload();
}
-
void stopSelection() {
modelAdapter.stopSelection();
if (optMenu != null) {
@@ -223,7 +188,7 @@ public class AccountSummaryFragment extends Fragment {
stopSelection();
}
public void onConfirmAccSelection(MenuItem item) {
- model.commitSelections(mActivity);
+ AccountSummaryViewModel.commitSelections(mActivity);
stopSelection();
}
@Override
@@ -232,16 +197,46 @@ public class AccountSummaryFragment extends Fragment {
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());
- sBindPreferenceSummaryToValueListener = (preference, value) -> mShowHiddenAccounts
- .setChecked(preference.getBoolean(PREF_KEY_SHOW_ONLY_STARRED_ACCOUNTS, false));
- SharedPreferences pref = PreferenceManager.getDefaultSharedPreferences(mActivity);
- pref.registerOnSharedPreferenceChangeListener(sBindPreferenceSummaryToValueListener);
+ Log.d("menu", "Accounts: onCreateOptionsMenu called");
- mShowHiddenAccounts.setChecked(pref.getBoolean(PREF_KEY_SHOW_ONLY_STARRED_ACCOUNTS, false));
+ 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();
+
+ return true;
+ });
- Log.d("menu", "MainActivity: onCreateOptionsMenu called");
+ mCancelSelection.setOnMenuItemClickListener(item -> {
+ stopSelection();
+ return true;
+ });
+
+ mConfirmSelection.setOnMenuItemClickListener(item -> {
+ AccountSummaryViewModel.commitSelections(mActivity);
+ stopSelection();
+
+ return true;
+ });
}
}