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%2FAccountSummaryAdapter.java;h=c2ec0e96cf1053d27dca49b0e25292b495d3cab5;hp=086f0cb1cb34b3983ea79657462b50dce1e7ba6f;hb=7165b89c8ff2b9d8f69e02354197127ec27a4a47;hpb=09e26d2279484b4dfe0de218b05f075362fff4b5

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 086f0cb1..c2ec0e96 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
@@ -24,20 +24,21 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.CheckBox;
-import android.widget.LinearLayout;
+import android.widget.FrameLayout;
+import android.widget.ImageView;
 import android.widget.TextView;
 
 import net.ktnx.mobileledger.R;
 import net.ktnx.mobileledger.model.Data;
 import net.ktnx.mobileledger.model.LedgerAccount;
-import net.ktnx.mobileledger.utils.Colors;
-
-import java.util.List;
+import net.ktnx.mobileledger.utils.LockHolder;
 
 import androidx.annotation.NonNull;
+import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.recyclerview.widget.RecyclerView;
 
-class AccountSummaryAdapter extends RecyclerView.Adapter<AccountSummaryAdapter.LedgerRowHolder> {
+public class AccountSummaryAdapter
+        extends RecyclerView.Adapter<AccountSummaryAdapter.LedgerRowHolder> {
     private boolean selectionActive;
 
     AccountSummaryAdapter() {
@@ -45,44 +46,43 @@ class AccountSummaryAdapter extends RecyclerView.Adapter<AccountSummaryAdapter.L
     }
 
     public void onBindViewHolder(@NonNull LedgerRowHolder holder, int position) {
-        List<LedgerAccount> accounts = Data.accounts.get();
-        if (position < accounts.size()) {
-            LedgerAccount acc = accounts.get(position);
-            Context ctx = holder.row.getContext();
-            Resources rm = ctx.getResources();
-
-            holder.row.setVisibility(View.VISIBLE);
-            holder.vTrailer.setVisibility(View.GONE);
-            holder.tvAccountName.setText(acc.getShortName());
-            holder.tvAccountName.setPadding(
-                    acc.getLevel() * rm.getDimensionPixelSize(R.dimen.activity_horizontal_margin) /
-                    2, 0, 0, 0);
-            holder.tvAccountAmounts.setText(acc.getAmountsString());
-
-            if (acc.isHidden()) {
-                holder.tvAccountName.setTypeface(null, Typeface.ITALIC);
-                holder.tvAccountAmounts.setTypeface(null, Typeface.ITALIC);
-            }
-            else {
-                holder.tvAccountName.setTypeface(null, Typeface.NORMAL);
-                holder.tvAccountAmounts.setTypeface(null, Typeface.NORMAL);
-            }
-
-            if (position % 2 == 0) {
-                holder.row.setBackgroundColor(Colors.tableRowDarkBG);
+        try (LockHolder lh = Data.accounts.lockForReading()) {
+            if (position < Data.accounts.size()) {
+                LedgerAccount acc = Data.accounts.get(position);
+                Context ctx = holder.row.getContext();
+                Resources rm = ctx.getResources();
+
+                holder.row.setTag(acc);
+                holder.row.setVisibility(View.VISIBLE);
+                holder.vTrailer.setVisibility(View.GONE);
+                holder.tvAccountName.setText(acc.getShortName());
+                ConstraintLayout.LayoutParams lp =
+                        (ConstraintLayout.LayoutParams) holder.tvAccountName.getLayoutParams();
+                lp.setMarginStart(
+                        acc.getLevel() * rm.getDimensionPixelSize(R.dimen.thumb_row_height) / 2);
+                holder.expanderContainer
+                        .setVisibility(acc.hasSubAccounts() ? View.VISIBLE : View.INVISIBLE);
+                holder.expanderContainer.setRotation(acc.isExpanded() ? 0 : 180);
+                holder.tvAccountAmounts.setText(acc.getAmountsString());
+
+                if (acc.isHiddenByStar()) {
+                    holder.tvAccountName.setTypeface(null, Typeface.ITALIC);
+                    holder.tvAccountAmounts.setTypeface(null, Typeface.ITALIC);
+                }
+                else {
+                    holder.tvAccountName.setTypeface(null, Typeface.NORMAL);
+                    holder.tvAccountAmounts.setTypeface(null, Typeface.NORMAL);
+                }
+
+                holder.selectionCb.setVisibility(selectionActive ? View.VISIBLE : View.GONE);
+                holder.selectionCb.setChecked(!acc.isHiddenByStarToBe());
+
+                holder.row.setTag(R.id.POS, position);
             }
             else {
-                holder.row.setBackgroundColor(Colors.tableRowLightBG);
+                holder.vTrailer.setVisibility(View.VISIBLE);
+                holder.row.setVisibility(View.GONE);
             }
-
-            holder.selectionCb.setVisibility(selectionActive ? View.VISIBLE : View.GONE);
-            holder.selectionCb.setChecked(!acc.isHiddenToBe());
-
-            holder.row.setTag(R.id.POS, position);
-        }
-        else {
-            holder.vTrailer.setVisibility(View.VISIBLE);
-            holder.row.setVisibility(View.GONE);
         }
     }
 
@@ -96,12 +96,18 @@ class AccountSummaryAdapter extends RecyclerView.Adapter<AccountSummaryAdapter.L
 
     @Override
     public int getItemCount() {
-        return Data.accounts.get().size() + 1;
+        return Data.accounts.size() + 1;
     }
     public void startSelection() {
-        for (LedgerAccount acc : Data.accounts.get()) acc.setHiddenToBe(acc.isHidden());
-        this.selectionActive = true;
-        notifyDataSetChanged();
+        try (LockHolder lh = Data.accounts.lockForWriting()) {
+            for (int i = 0; i < Data.accounts.size(); i++) {
+                LedgerAccount acc = Data.accounts.get(i);
+                acc.setHiddenByStarToBe(acc.isHiddenByStar());
+            }
+            this.selectionActive = true;
+            lh.downgrade();
+            notifyDataSetChanged();
+        }
     }
 
     public void stopSelection() {
@@ -114,19 +120,24 @@ class AccountSummaryAdapter extends RecyclerView.Adapter<AccountSummaryAdapter.L
     }
 
     public void selectItem(int position) {
-        LedgerAccount acc = Data.accounts.get().get(position);
-        acc.toggleHiddenToBe();
-        toggleChildrenOf(acc, acc.isHiddenToBe(), position);
-        notifyItemChanged(position);
+        try (LockHolder lh = Data.accounts.lockForWriting()) {
+            LedgerAccount acc = Data.accounts.get(position);
+            acc.toggleHiddenToBe();
+            toggleChildrenOf(acc, acc.isHiddenByStarToBe(), position);
+            notifyItemChanged(position);
+        }
     }
     void toggleChildrenOf(LedgerAccount parent, boolean hiddenToBe, int parentPosition) {
         int i = parentPosition + 1;
-        for (LedgerAccount acc : Data.accounts.get()) {
-            if (acc.getName().startsWith(parent.getName() + ":")) {
-                acc.setHiddenToBe(hiddenToBe);
-                notifyItemChanged(i);
-                toggleChildrenOf(acc, hiddenToBe, i);
-                i++;
+        try (LockHolder lh = Data.accounts.lockForWriting()) {
+            for (int j = 0; j < Data.accounts.size(); j++) {
+                LedgerAccount acc = Data.accounts.get(j);
+                if (acc.getName().startsWith(parent.getName() + ":")) {
+                    acc.setHiddenByStarToBe(hiddenToBe);
+                    notifyItemChanged(i);
+                    toggleChildrenOf(acc, hiddenToBe, i);
+                    i++;
+                }
             }
         }
     }
@@ -134,8 +145,10 @@ class AccountSummaryAdapter extends RecyclerView.Adapter<AccountSummaryAdapter.L
     class LedgerRowHolder extends RecyclerView.ViewHolder {
         CheckBox selectionCb;
         TextView tvAccountName, tvAccountAmounts;
-        LinearLayout row;
+        ConstraintLayout row;
         View vTrailer;
+        FrameLayout expanderContainer;
+        ImageView expander;
         public LedgerRowHolder(@NonNull View itemView) {
             super(itemView);
             this.row = itemView.findViewById(R.id.account_summary_row);
@@ -143,6 +156,19 @@ class AccountSummaryAdapter extends RecyclerView.Adapter<AccountSummaryAdapter.L
             this.tvAccountAmounts = itemView.findViewById(R.id.account_row_acc_amounts);
             this.selectionCb = itemView.findViewById(R.id.account_row_check);
             this.vTrailer = itemView.findViewById(R.id.account_summary_trailer);
+            this.expanderContainer = itemView.findViewById(R.id.account_expander_container);
+            this.expander = itemView.findViewById(R.id.account_expander);
+
+            expanderContainer.addOnLayoutChangeListener(
+                    (v, left, top, right, bottom, oldLeft, oldTop, oldRight, oldBottom) -> {
+                        int w = right - left;
+                        int h = bottom - top;
+                        if (h > w) {
+                            int p = (h - w) / 2;
+                            v.setPadding(0, p, 0, p);
+                        }
+                        else v.setPadding(0, 0, 0, 0);
+                    });
         }
     }
 }