X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Faccount_summary%2FAccountSummaryFragment.java;h=807c16daf8540af877827e2729d0e848f733d3c3;hb=HEAD;hp=ff4b20f48c9ff3d7b464bae3af532df70140ee92;hpb=4c5624fe5d6b8ec63fb92cebc343855e35ae53ad;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 ff4b20f4..807c16da 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,5 +1,5 @@ /* - * Copyright © 2019 Damyan Ivanov. + * Copyright © 2024 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 @@ -17,11 +17,10 @@ package net.ktnx.mobileledger.ui.account_summary; +import static net.ktnx.mobileledger.utils.Logger.debug; + import android.content.Context; -import android.content.SharedPreferences; import android.os.Bundle; -import android.preference.PreferenceManager; -import android.util.Log; import android.view.LayoutInflater; import android.view.Menu; import android.view.MenuInflater; @@ -29,193 +28,194 @@ import android.view.MenuItem; import android.view.View; import android.view.ViewGroup; -import com.google.android.material.floatingactionbutton.FloatingActionButton; +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 androidx.swiperefreshlayout.widget.SwipeRefreshLayout; import net.ktnx.mobileledger.R; +import net.ktnx.mobileledger.async.GeneralBackgroundTasks; +import net.ktnx.mobileledger.databinding.AccountSummaryFragmentBinding; +import net.ktnx.mobileledger.db.AccountWithAmounts; +import net.ktnx.mobileledger.db.DB; +import net.ktnx.mobileledger.db.Profile; +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.activity.MainActivity; import net.ktnx.mobileledger.utils.Colors; import org.jetbrains.annotations.NotNull; -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; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; public class AccountSummaryFragment extends MobileLedgerListFragment { - - MenuItem mShowOnlyStarred; public AccountSummaryAdapter modelAdapter; - private Menu optMenu; - private FloatingActionButton fab; + private AccountSummaryFragmentBinding b; + private MenuItem menuShowZeroBalances; + private MainModel model; @Override public void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); - Log.d("flow", "AccountSummaryFragment.onCreate()"); + debug("flow", "AccountSummaryFragment.onCreate()"); setHasOptionsMenu(true); - - Data.backgroundTasksRunning.observe(this, this::onBackgroundTaskRunningChanged); } public void onAttach(@NotNull Context context) { super.onAttach(context); - Log.d("flow", "AccountSummaryFragment.onAttach()"); - 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()"); - return inflater.inflate(R.layout.account_summary_fragment, container, false); + debug("flow", "AccountSummaryFragment.onCreateView()"); + b = AccountSummaryFragmentBinding.inflate(inflater, container, false); + return b.getRoot(); + } + @Override + public SwipeRefreshLayout getRefreshLayout() { + return b.accountSwipeRefreshLayout; } - @Override + public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) { + debug("flow", "AccountSummaryFragment.onActivityCreated()"); + super.onViewCreated(view, savedInstanceState); - public void onActivityCreated(@Nullable Bundle savedInstanceState) { - Log.d("flow", "AccountSummaryFragment.onActivityCreated()"); - super.onActivityCreated(savedInstanceState); + model = new ViewModelProvider(requireActivity()).get(MainModel.class); + + Data.backgroundTasksRunning.observe(this.getViewLifecycleOwner(), + this::onBackgroundTaskRunningChanged); modelAdapter = new AccountSummaryAdapter(); + MainActivity mainActivity = getMainActivity(); - mActivity.mAccountSummaryFragment = this; - root = mActivity.findViewById(R.id.account_root); - LinearLayoutManager llm = new LinearLayoutManager(mActivity); + LinearLayoutManager llm = new LinearLayoutManager(mainActivity); 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("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) mActivity.fabShouldShow(); - if (dy > 0) fab.hide(); - } - } - }); - swiper = mActivity.findViewById(R.id.account_swiper); - Colors.themeWatch.observe(this, this::themeChanged); - swiper.setOnRefreshListener(() -> { - Log.d("ui", "refreshing accounts via swipe"); - mActivity.scheduleTransactionListRetrieval(); - }); + b.accountRoot.setLayoutManager(llm); + b.accountRoot.setAdapter(modelAdapter); + DividerItemDecoration did = + new DividerItemDecoration(mainActivity, DividerItemDecoration.VERTICAL); + b.accountRoot.addItemDecoration(did); - Data.accounts.addObserver( - (o, arg) -> mActivity.runOnUiThread(() -> modelAdapter.notifyDataSetChanged())); - } - private void update_account_table() { - if (this.getContext() == null) return; + mainActivity.fabShouldShow(); - AccountSummaryViewModel.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(); + if (mainActivity instanceof FabManager.FabHandler) + FabManager.handle(mainActivity, b.accountRoot); + + Colors.themeWatch.observe(getViewLifecycleOwner(), this::themeChanged); + b.accountSwipeRefreshLayout.setOnRefreshListener(() -> { + debug("ui", "refreshing accounts via swipe"); + model.scheduleTransactionListRetrieval(); + }); + + Data.observeProfile(this, profile -> onProfileChanged(profile, Boolean.TRUE.equals( + model.getShowZeroBalanceAccounts() + .getValue()))); } @Override public void onCreateOptionsMenu(@NotNull Menu menu, @NotNull 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()); + inflater.inflate(R.menu.account_list, menu); - 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(); + menuShowZeroBalances = menu.findItem(R.id.menu_account_list_show_zero_balances); + if ((menuShowZeroBalances == null)) + throw new AssertionError(); + menuShowZeroBalances.setOnMenuItemClickListener(menuItem -> { + model.getShowZeroBalanceAccounts() + .setValue(Boolean.FALSE.equals(model.getShowZeroBalanceAccounts() + .getValue())); return true; }); - mCancelSelection.setOnMenuItemClickListener(item -> { - stopSelection(); - return true; - }); + model.getShowZeroBalanceAccounts() + .observe(this, v -> { + menuShowZeroBalances.setChecked(v); + onProfileChanged(Data.getProfile(), v); + }); - mConfirmSelection.setOnMenuItemClickListener(item -> { - AccountSummaryViewModel.commitSelections(mActivity); - stopSelection(); + super.onCreateOptionsMenu(menu, inflater); + } + private void onProfileChanged(Profile profile, boolean showZeroBalanceAccounts) { + if (profile == null) + return; + + DB.get() + .getAccountDAO() + .getAllWithAmounts(profile.getId(), showZeroBalanceAccounts) + .observe(getViewLifecycleOwner(), list -> GeneralBackgroundTasks.run(() -> { + List adapterList = new ArrayList<>(); + adapterList.add(new AccountListItem.Header(Data.lastAccountsUpdateText)); + HashMap accMap = new HashMap<>(); + for (AccountWithAmounts dbAcc : list) { + LedgerAccount parent = null; + String parentName = dbAcc.account.getParentName(); + if (parentName != null) + parent = accMap.get(parentName); + if (parent != null) + parent.setHasSubAccounts(true); + final LedgerAccount account = LedgerAccount.fromDBO(dbAcc, parent); + if (account.isVisible()) + adapterList.add(new AccountListItem.Account(account)); + accMap.put(dbAcc.account.getName(), account); + } + + if (!showZeroBalanceAccounts) { + removeZeroAccounts(adapterList); + } + modelAdapter.setAccounts(adapterList); + Data.lastUpdateAccountCount.postValue(adapterList.size() - 1); + })); + } + private void removeZeroAccounts(List list) { + boolean removed = true; + + while (removed) { + AccountListItem last = null; + removed = false; + List newList = new ArrayList<>(); + + for (AccountListItem item : list) { + if (last == null) { + last = item; + continue; + } - return true; - }); + if (!last.isAccount() || !last.toAccount() + .allAmountsAreZero() || last.toAccount() + .getAccount() + .isParentOf( + item.toAccount() + .getAccount())) + { + newList.add(last); + } + else { + removed = true; + } + + last = item; + } + + if (last != null) { + if (!last.isAccount() || !last.toAccount() + .allAmountsAreZero()) + { + newList.add(last); + } + else { + removed = true; + } + } + + list.clear(); + list.addAll(newList); + } } }