X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Faccount_summary%2FAccountSummaryFragment.java;h=35a9edb7205c84bd16889468d90416b6018d547b;hb=2e58db0c8edde65561f40cdd386cac74ce6fbd67;hp=d5964e4b3ce53002f50a1224391ca862bf500433;hpb=5df10dc0b58df4d4be4e9ab34f1e0f477ca46766;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 d5964e4b..35a9edb7 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
@@ -18,7 +18,6 @@
 package net.ktnx.mobileledger.ui.account_summary;
 
 import android.content.Context;
-import android.os.AsyncTask;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -30,8 +29,10 @@ 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;
@@ -54,6 +55,7 @@ import static net.ktnx.mobileledger.utils.Logger.debug;
 
 public class AccountSummaryFragment extends MobileLedgerListFragment {
     public AccountSummaryAdapter modelAdapter;
+    private AccountSummaryFragmentBinding b;
     @Override
     public void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -68,9 +70,13 @@ 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 SwipeRefreshLayout getRefreshLayout() {
+        return b.accountSwipeRefreshLayout;
     }
-
     @Override
     public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
         debug("flow", "AccountSummaryFragment.onActivityCreated()");
@@ -84,23 +90,21 @@ public class AccountSummaryFragment extends MobileLedgerListFragment {
         modelAdapter = new AccountSummaryAdapter();
         MainActivity mainActivity = getMainActivity();
 
-        root = view.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();
 
         if (mainActivity instanceof FabManager.FabHandler)
-            FabManager.handle(mainActivity, root);
+            FabManager.handle(mainActivity, b.accountRoot);
 
-        refreshLayout = view.findViewById(R.id.account_swipe_refresh_layout);
         Colors.themeWatch.observe(getViewLifecycleOwner(), this::themeChanged);
-        refreshLayout.setOnRefreshListener(() -> {
+        b.accountSwipeRefreshLayout.setOnRefreshListener(() -> {
             debug("ui", "refreshing accounts via swipe");
             model.scheduleTransactionListRetrieval();
         });
@@ -108,10 +112,13 @@ public class AccountSummaryFragment extends MobileLedgerListFragment {
         Data.observeProfile(this, this::onProfileChanged);
     }
     private void onProfileChanged(Profile profile) {
+        if (profile == null)
+            return;
+
         DB.get()
           .getAccountDAO()
           .getAllWithAmounts(profile.getId())
-          .observe(getViewLifecycleOwner(), list -> AsyncTask.execute(() -> {
+          .observe(getViewLifecycleOwner(), list -> GeneralBackgroundTasks.run(() -> {
               List<AccountListItem> adapterList = new ArrayList<>();
               adapterList.add(new AccountListItem.Header(Data.lastAccountsUpdateText));
               HashMap<String, LedgerAccount> accMap = new HashMap<>();