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=d1aca96d8f48907d21b409ac24fbc83f1a6ee162;hp=0944d1fa5dba521fd9f2c3675b14018ae2a503ae;hb=d63a611dce420b30fa0c0711eea1d02603945a43;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..d1aca96d 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,241 +1,112 @@
/*
- * Copyright © 2019 Damyan Ivanov.
- * This file is part of Mobile-Ledger.
- * Mobile-Ledger is free software: you can distribute it and/or modify it
+ * Copyright © 2020 Damyan Ivanov.
+ * 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;
-import android.view.MenuInflater;
-import android.view.MenuItem;
import android.view.View;
import android.view.ViewGroup;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.lifecycle.ViewModelProvider;
+import androidx.recyclerview.widget.DividerItemDecoration;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
import net.ktnx.mobileledger.R;
+import net.ktnx.mobileledger.model.AccountListItem;
import net.ktnx.mobileledger.model.Data;
-import net.ktnx.mobileledger.model.LedgerAccount;
+import net.ktnx.mobileledger.ui.FabManager;
+import net.ktnx.mobileledger.ui.MainModel;
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 net.ktnx.mobileledger.utils.Logger;
+
+import org.jetbrains.annotations.NotNull;
import java.util.List;
-import java.util.Observer;
+import java.util.Locale;
-import static net.ktnx.mobileledger.ui.activity.SettingsActivity.PREF_KEY_SHOW_ONLY_STARRED_ACCOUNTS;
+import static net.ktnx.mobileledger.utils.Logger.debug;
public class AccountSummaryFragment extends MobileLedgerListFragment {
-
- MenuItem mShowOnlyStarred;
- private AccountSummaryViewModel model;
- private AccountSummaryAdapter modelAdapter;
- private Menu optMenu;
- private FloatingActionButton fab;
- private Observer backgroundTaskCountObserver;
- @Override
- public void onDestroy() {
- if (backgroundTaskCountObserver != null) {
- Log.d("acc", "destroying background task count observer");
- Data.backgroundTaskCount.deleteObserver(backgroundTaskCountObserver);
- }
- super.onDestroy();
- }
+ public AccountSummaryAdapter modelAdapter;
@Override
public void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
+ debug("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) {
+ public void onAttach(@NotNull Context context) {
super.onAttach(context);
- mActivity = (MainActivity) context;
+ debug("flow", "AccountSummaryFragment.onAttach()");
}
@Override
public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container,
@Nullable Bundle savedInstanceState) {
- Log.d("flow", "AccountSummaryFragment.onCreateView()");
+ debug("flow", "AccountSummaryFragment.onCreateView()");
return inflater.inflate(R.layout.account_summary_fragment, container, false);
}
@Override
+ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
+ debug("flow", "AccountSummaryFragment.onActivityCreated()");
+ super.onViewCreated(view, savedInstanceState);
+
+ MainModel model = new ViewModelProvider(requireActivity()).get(MainModel.class);
- public void onActivityCreated(@Nullable Bundle savedInstanceState) {
- Log.d("flow", "AccountSummaryFragment.onActivityCreated()");
- super.onActivityCreated(savedInstanceState);
+ Data.backgroundTasksRunning.observe(this.getViewLifecycleOwner(),
+ this::onBackgroundTaskRunningChanged);
- model = ViewModelProviders.of(this).get(AccountSummaryViewModel.class);
- modelAdapter = new AccountSummaryAdapter();
+ modelAdapter = new AccountSummaryAdapter(model);
+ MainActivity mainActivity = getMainActivity();
- root = mActivity.findViewById(R.id.account_root);
- LinearLayoutManager llm = new LinearLayoutManager(mActivity);
- llm.setOrientation(LinearLayoutManager.VERTICAL);
+ root = view.findViewById(R.id.account_root);
+ LinearLayoutManager llm = new LinearLayoutManager(mainActivity);
+ llm.setOrientation(RecyclerView.VERTICAL);
root.setLayoutManager(llm);
root.setAdapter(modelAdapter);
+ DividerItemDecoration did =
+ new DividerItemDecoration(mainActivity, 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("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();
- }
- }
- }));
-
- fab.show();
- 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) fab.hide();
- }
- }
- });
- swiper = mActivity.findViewById(R.id.account_swiper);
- swiper.setColorSchemeResources(R.color.colorPrimary, R.color.colorAccent);
- swiper.setOnRefreshListener(() -> {
- Log.d("ui", "refreshing accounts via swipe");
- mActivity.scheduleTransactionListRetrieval();
- });
+ mainActivity.fabShouldShow();
- Data.accounts.addObserver(
- (o, arg) -> mActivity.runOnUiThread(() -> modelAdapter.notifyDataSetChanged()));
- Data.profile.addObserver(
- (o, arg) -> mActivity.runOnUiThread(() -> model.scheduleAccountListReload()));
- update_account_table();
- }
- private void update_account_table() {
- if (this.getContext() == null) return;
+ if (mainActivity instanceof FabManager.FabHandler)
+ FabManager.handle((FabManager.FabHandler) mainActivity, root);
- model.scheduleAccountListReload();
- }
- void stopSelection() {
- modelAdapter.stopSelection();
- if (optMenu != null) {
- optMenu.findItem(R.id.menu_acc_summary_cancel_selection).setVisible(false);
- optMenu.findItem(R.id.menu_acc_summary_confirm_selection).setVisible(false);
- optMenu.findItem(R.id.menu_acc_summary_only_starred).setVisible(true);
- }
- {
- if (fab != null) fab.show();
- }
- }
- public void onCancelAccSelection(MenuItem item) {
- stopSelection();
- }
- public void onConfirmAccSelection(MenuItem item) {
- AccountSummaryViewModel.commitSelections(mActivity);
- stopSelection();
- }
- @Override
- public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
- // Inflate the menu; this adds items to the action bar if it is present.
- inflater.inflate(R.menu.account_summary, menu);
- optMenu = menu;
-
- 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());
-
- Log.d("menu", "Accounts: onCreateOptionsMenu called");
-
- 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;
- });
-
- mCancelSelection.setOnMenuItemClickListener(item -> {
- stopSelection();
- return true;
+ refreshLayout = view.findViewById(R.id.account_swipe_refresh_layout);
+ Colors.themeWatch.observe(getViewLifecycleOwner(), this::themeChanged);
+ refreshLayout.setOnRefreshListener(() -> {
+ debug("ui", "refreshing accounts via swipe");
+ model.scheduleTransactionListRetrieval();
});
- mConfirmSelection.setOnMenuItemClickListener(item -> {
- AccountSummaryViewModel.commitSelections(mActivity);
- stopSelection();
-
- return true;
- });
+ model.getDisplayedAccounts()
+ .observe(getViewLifecycleOwner(), this::onAccountsChanged);
+ }
+ private void onAccountsChanged(List accounts) {
+ Logger.debug("async-acc",
+ String.format(Locale.US, "fragment: got new account list (%d items)",
+ accounts.size()));
+ modelAdapter.setAccounts(accounts);
}
}