X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;ds=sidebyside;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Faccount_summary%2FAccountSummaryFragment.java;h=807c16daf8540af877827e2729d0e848f733d3c3;hb=HEAD;hp=447e57e75f9313916d736d4635a010a6c869b1e2;hpb=20b1574421ee368ca690d1e4de0f666ebfec6520;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 447e57e7..02d685ce 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
@@ -36,6 +36,7 @@ import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 
+import net.ktnx.mobileledger.App;
 import net.ktnx.mobileledger.R;
 import net.ktnx.mobileledger.async.GeneralBackgroundTasks;
 import net.ktnx.mobileledger.databinding.AccountSummaryFragmentBinding;
@@ -106,8 +107,7 @@ public class AccountSummaryFragment extends MobileLedgerListFragment {
 
         mainActivity.fabShouldShow();
 
-        if (mainActivity instanceof FabManager.FabHandler)
-            FabManager.handle(mainActivity, b.accountRoot);
+        FabManager.handle(mainActivity, b.accountRoot);
 
         Colors.themeWatch.observe(getViewLifecycleOwner(), this::themeChanged);
         b.accountSwipeRefreshLayout.setOnRefreshListener(() -> {
@@ -118,6 +118,8 @@ public class AccountSummaryFragment extends MobileLedgerListFragment {
         Data.observeProfile(this, profile -> onProfileChanged(profile, Boolean.TRUE.equals(
                 model.getShowZeroBalanceAccounts()
                      .getValue())));
+        model.getShowZeroBalanceAccounts()
+             .setValue(App.getShowZeroBalanceAccounts());
     }
     @Override
     public void onCreateOptionsMenu(@NotNull Menu menu, @NotNull MenuInflater inflater) {
@@ -138,6 +140,7 @@ public class AccountSummaryFragment extends MobileLedgerListFragment {
              .observe(this, v -> {
                  menuShowZeroBalances.setChecked(v);
                  onProfileChanged(Data.getProfile(), v);
+                 App.storeShowZeroBalanceAccounts(v);
              });
 
         super.onCreateOptionsMenu(menu, inflater);
@@ -204,8 +207,8 @@ public class AccountSummaryFragment extends MobileLedgerListFragment {
             }
 
             if (last != null) {
-                if (last.getType() != AccountListItem.Type.ACCOUNT ||
-                    !((AccountListItem.Account) last).allAmountsAreZero())
+                if (!last.isAccount() || !last.toAccount()
+                                              .allAmountsAreZero())
                 {
                     newList.add(last);
                 }