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=29003b820f484ea75c06bb24a15a578bc83eddd7;hp=63c7455df543f5ed45c9aae7d22e50da5d56ef3f;hb=5bba2c06a81c87327fdcf3f2a85c3206d932c2f9;hpb=d080698efeba76aab6ef6b5b9d182990749509a7 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 63c7455d..29003b82 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 @@ -25,6 +25,7 @@ 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; @@ -32,7 +33,7 @@ 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.MainModel; import net.ktnx.mobileledger.ui.MobileLedgerListFragment; import net.ktnx.mobileledger.ui.activity.MainActivity; import net.ktnx.mobileledger.utils.Colors; @@ -70,10 +71,12 @@ public class AccountSummaryFragment extends MobileLedgerListFragment { debug("flow", "AccountSummaryFragment.onActivityCreated()"); super.onActivityCreated(savedInstanceState); + MainModel model = new ViewModelProvider(requireActivity()).get(MainModel.class); + Data.backgroundTasksRunning.observe(this.getViewLifecycleOwner(), this::onBackgroundTaskRunningChanged); - modelAdapter = new AccountSummaryAdapter(); + modelAdapter = new AccountSummaryAdapter(model); MainActivity mainActivity = getMainActivity(); root = mainActivity.findViewById(R.id.account_root); @@ -93,12 +96,11 @@ public class AccountSummaryFragment extends MobileLedgerListFragment { Colors.themeWatch.observe(getViewLifecycleOwner(), this::themeChanged); refreshLayout.setOnRefreshListener(() -> { debug("ui", "refreshing accounts via swipe"); - Data.scheduleTransactionListRetrieval(); + model.scheduleTransactionListRetrieval(); }); - MobileLedgerProfile profile = Data.getProfile(); - profile.getDisplayedAccounts() - .observe(getViewLifecycleOwner(), this::onAccountsChanged); + model.getDisplayedAccounts() + .observe(getViewLifecycleOwner(), this::onAccountsChanged); } private void onAccountsChanged(List accounts) { Logger.debug("async-acc",