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=dbc200eb8f6e8ff592ae02048c9682efd8326877;hpb=0a73337c99e2074aa7e7228204289896342ec636;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 dbc200eb..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 © 2020 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,36 +17,51 @@ package net.ktnx.mobileledger.ui.account_summary; +import static net.ktnx.mobileledger.utils.Logger.debug; + import android.content.Context; import android.os.Bundle; 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 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.model.MobileLedgerProfile; +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 net.ktnx.mobileledger.utils.Logger; import org.jetbrains.annotations.NotNull; +import java.util.ArrayList; +import java.util.HashMap; import java.util.List; -import java.util.Locale; - -import static net.ktnx.mobileledger.utils.Logger.debug; public class AccountSummaryFragment extends MobileLedgerListFragment { public AccountSummaryAdapter modelAdapter; + private AccountSummaryFragmentBinding b; + private MenuItem menuShowZeroBalances; + private MainModel model; @Override public void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -61,14 +76,19 @@ public class AccountSummaryFragment extends MobileLedgerListFragment { public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { debug("flow", "AccountSummaryFragment.onCreateView()"); - return inflater.inflate(R.layout.account_summary_fragment, container, false); + b = AccountSummaryFragmentBinding.inflate(inflater, container, false); + return b.getRoot(); } - @Override - - public void onActivityCreated(@Nullable Bundle savedInstanceState) { + public SwipeRefreshLayout getRefreshLayout() { + return b.accountSwipeRefreshLayout; + } + @Override + public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) { debug("flow", "AccountSummaryFragment.onActivityCreated()"); - super.onActivityCreated(savedInstanceState); + super.onViewCreated(view, savedInstanceState); + + model = new ViewModelProvider(requireActivity()).get(MainModel.class); Data.backgroundTasksRunning.observe(this.getViewLifecycleOwner(), this::onBackgroundTaskRunningChanged); @@ -76,37 +96,126 @@ public class AccountSummaryFragment extends MobileLedgerListFragment { modelAdapter = new AccountSummaryAdapter(); MainActivity mainActivity = getMainActivity(); - root = mainActivity.findViewById(R.id.account_root); LinearLayoutManager llm = new LinearLayoutManager(mainActivity); llm.setOrientation(RecyclerView.VERTICAL); - root.setLayoutManager(llm); - root.setAdapter(modelAdapter); + b.accountRoot.setLayoutManager(llm); + b.accountRoot.setAdapter(modelAdapter); DividerItemDecoration did = new DividerItemDecoration(mainActivity, DividerItemDecoration.VERTICAL); - root.addItemDecoration(did); + b.accountRoot.addItemDecoration(did); mainActivity.fabShouldShow(); - manageFabOnScroll(); + if (mainActivity instanceof FabManager.FabHandler) + FabManager.handle(mainActivity, b.accountRoot); - swiper = mainActivity.findViewById(R.id.account_swiper); Colors.themeWatch.observe(getViewLifecycleOwner(), this::themeChanged); - swiper.setOnRefreshListener(() -> { + b.accountSwipeRefreshLayout.setOnRefreshListener(() -> { debug("ui", "refreshing accounts via swipe"); - Data.scheduleTransactionListRetrieval(mainActivity); + model.scheduleTransactionListRetrieval(); }); - MobileLedgerProfile profile = Data.profile.getValue(); - if (profile != null) { - profile.getDisplayedAccounts() - .observe(getViewLifecycleOwner(), - (accounts) -> onAccountsChanged(profile, accounts)); - } + Data.observeProfile(this, profile -> onProfileChanged(profile, Boolean.TRUE.equals( + model.getShowZeroBalanceAccounts() + .getValue()))); + } + @Override + public void onCreateOptionsMenu(@NotNull Menu menu, @NotNull MenuInflater inflater) { + inflater.inflate(R.menu.account_list, menu); + + 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; + }); + + model.getShowZeroBalanceAccounts() + .observe(this, v -> { + menuShowZeroBalances.setChecked(v); + onProfileChanged(Data.getProfile(), v); + }); + + super.onCreateOptionsMenu(menu, inflater); } - private void onAccountsChanged(MobileLedgerProfile profile, List accounts) { - Logger.debug("async-acc", - String.format(Locale.US, "fragment: got new account list (%d items)", - accounts.size())); - modelAdapter.setAccounts(profile, accounts); + 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; + } + + 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); + } } }