X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Faccount_summary%2FAccountSummaryFragment.java;h=fdeb54804e26471bbb2117c1736c29f7b7018fd7;hb=4f8b4f8bf16aaef182e1aac31a34f88a2adf5fa8;hp=79253bfb238faedd682e8dcdcefebca2ae96ca2c;hpb=b54a11eca1e4d0a03a3076047dc77f68666d4338;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 79253bfb..fdeb5480 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 @@ -31,12 +31,18 @@ import androidx.recyclerview.widget.RecyclerView; import net.ktnx.mobileledger.R; import net.ktnx.mobileledger.model.Data; +import net.ktnx.mobileledger.model.LedgerAccount; +import net.ktnx.mobileledger.model.MobileLedgerProfile; 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.List; +import java.util.Locale; + import static net.ktnx.mobileledger.utils.Logger.debug; public class AccountSummaryFragment extends MobileLedgerListFragment { @@ -83,14 +89,22 @@ public class AccountSummaryFragment extends MobileLedgerListFragment { manageFabOnScroll(); - swiper = mainActivity.findViewById(R.id.account_swiper); + refreshLayout = mainActivity.findViewById(R.id.account_swipe_refresh_layout); Colors.themeWatch.observe(getViewLifecycleOwner(), this::themeChanged); - swiper.setOnRefreshListener(() -> { + refreshLayout.setOnRefreshListener(() -> { debug("ui", "refreshing accounts via swipe"); Data.scheduleTransactionListRetrieval(mainActivity); }); - Data.accounts.addObserver( - (o, arg) -> mainActivity.runOnUiThread(() -> modelAdapter.notifyDataSetChanged())); + MobileLedgerProfile profile = Data.getProfile(); + profile.getDisplayedAccounts() + .observe(getViewLifecycleOwner(), + (accounts) -> onAccountsChanged(profile, accounts)); + } + 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); } }