X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Faccount_summary%2FAccountSummaryAdapter.java;h=d7da335d675a19da8e1c273f717badb72488ce0c;hb=860e0419d619210bb59bcae1b64d8c5db90eef70;hp=488af1f42ca13018af0df78735121c7765e83d40;hpb=7095dbad114de50dbdb69ee1ea10ec29876e5c62;p=mobile-ledger.git

diff --git a/app/src/main/java/net/ktnx/mobileledger/ui/account_summary/AccountSummaryAdapter.java b/app/src/main/java/net/ktnx/mobileledger/ui/account_summary/AccountSummaryAdapter.java
index 488af1f4..d7da335d 100644
--- a/app/src/main/java/net/ktnx/mobileledger/ui/account_summary/AccountSummaryAdapter.java
+++ b/app/src/main/java/net/ktnx/mobileledger/ui/account_summary/AccountSummaryAdapter.java
@@ -18,9 +18,6 @@
 package net.ktnx.mobileledger.ui.account_summary;
 
 import android.content.res.Resources;
-import android.os.AsyncTask;
-import android.os.Handler;
-import android.os.Looper;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -35,6 +32,7 @@ import androidx.recyclerview.widget.DiffUtil;
 import androidx.recyclerview.widget.RecyclerView;
 
 import net.ktnx.mobileledger.R;
+import net.ktnx.mobileledger.dao.BaseDAO;
 import net.ktnx.mobileledger.databinding.AccountListRowBinding;
 import net.ktnx.mobileledger.databinding.AccountListSummaryRowBinding;
 import net.ktnx.mobileledger.db.Account;
@@ -149,7 +147,7 @@ public class AccountSummaryAdapter extends RecyclerView.Adapter<AccountSummaryAd
                 throw new IllegalStateException("Unexpected value: " + viewType);
         }
 
-        Logger.debug("acc-ui", "Creating " + result);
+//        Logger.debug("acc-ui", "Creating " + result);
         return result;
     }
     @Override
@@ -162,7 +160,7 @@ public class AccountSummaryAdapter extends RecyclerView.Adapter<AccountSummaryAd
         return (position == 0) ? ITEM_TYPE_HEADER : ITEM_TYPE_ACCOUNT;
     }
     public void setAccounts(List<AccountListItem> newList) {
-        new Handler(Looper.getMainLooper()).post(() -> listDiffer.submitList(newList));
+        Misc.onMainThread(() -> listDiffer.submitList(newList));
     }
     static class Change {
         static final int NAME = 1;
@@ -214,8 +212,8 @@ public class AccountSummaryAdapter extends RecyclerView.Adapter<AccountSummaryAd
         @Override
         public void bind(AccountListItem item, @Nullable List<Object> payloads) {
             Resources r = itemView.getResources();
-            Logger.debug("acc", itemView.getContext()
-                                        .toString());
+//            Logger.debug("acc", itemView.getContext()
+//                                        .toString());
             ((AccountListItem.Header) item).getText()
                                            .observe((LifecycleOwner) itemView.getContext(),
                                                    b.lastUpdateText::setText);
@@ -245,7 +243,7 @@ public class AccountSummaryAdapter extends RecyclerView.Adapter<AccountSummaryAd
                 return;
             debug("accounts", "Account expander clicked");
 
-            AsyncTask.execute(() -> {
+            BaseDAO.runAsync(() -> {
                 Account dbo = account.toDBO();
                 dbo.setExpanded(!dbo.isExpanded());
                 Logger.debug("accounts",
@@ -259,7 +257,7 @@ public class AccountSummaryAdapter extends RecyclerView.Adapter<AccountSummaryAd
         @NotNull
         private LedgerAccount getAccount() {
             return listDiffer.getCurrentList()
-                             .get(getAdapterPosition())
+                             .get(getBindingAdapterPosition())
                              .getAccount();
         }
         private void toggleAmountsExpanded() {
@@ -277,7 +275,7 @@ public class AccountSummaryAdapter extends RecyclerView.Adapter<AccountSummaryAd
                 b.accountRowAmountsExpanderContainer.setVisibility(View.VISIBLE);
             }
 
-            AsyncTask.execute(() -> {
+            BaseDAO.runAsync(() -> {
                 Account dbo = account.toDBO();
                 DB.get()
                   .getAccountDAO()
@@ -312,8 +310,8 @@ public class AccountSummaryAdapter extends RecyclerView.Adapter<AccountSummaryAd
                         changes.add((Change) p);
                 }
             }
-            debug("accounts",
-                    String.format(Locale.US, "Binding to '%s' to %s", acc.getName(), this));
+//            debug("accounts",
+//                    String.format(Locale.US, "Binding '%s' to %s", acc.getName(), this));
 
             Resources rm = b.getRoot()
                             .getContext()
@@ -324,7 +322,7 @@ public class AccountSummaryAdapter extends RecyclerView.Adapter<AccountSummaryAd
 
             if (changes.has(Change.LEVEL)) {
                 ConstraintLayout.LayoutParams lp =
-                        (ConstraintLayout.LayoutParams) b.accountNameLayout.getLayoutParams();
+                        (ConstraintLayout.LayoutParams) b.flowWrapper.getLayoutParams();
                 lp.setMarginStart(
                         acc.getLevel() * rm.getDimensionPixelSize(R.dimen.thumb_row_height) / 3);
             }
@@ -335,9 +333,9 @@ public class AccountSummaryAdapter extends RecyclerView.Adapter<AccountSummaryAd
                 if (changes.has(Change.EXPANDED)) {
                     int wantedRotation = acc.isExpanded() ? 0 : 180;
                     if (b.accountExpanderContainer.getRotation() != wantedRotation) {
-                        Logger.debug("acc-ui",
-                                String.format(Locale.ROOT, "Rotating %s to %d", acc.getName(),
-                                        wantedRotation));
+//                        Logger.debug("acc-ui",
+//                                String.format(Locale.ROOT, "Rotating %s to %d", acc.getName(),
+//                                        wantedRotation));
                         b.accountExpanderContainer.animate()
                                                   .rotation(wantedRotation);
                     }