X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Faccount_summary%2FAccountSummaryAdapter.java;h=060828e746424e69f90f37704d469d30209cfbd8;hb=e67c3f4928d4898f845c8414f59f4d896046558a;hp=6923410bdc53a8c8ea311ae75d044ee631dd5058;hpb=3401750a61ef730644d9642d685a8543ecb7e142;p=mobile-ledger-staging.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 6923410b..060828e7 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,21 +24,20 @@ import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AlertDialog;
+import androidx.constraintlayout.widget.ConstraintLayout;
+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.ui.activity.MainActivity;
 import net.ktnx.mobileledger.utils.LockHolder;
 
-import androidx.annotation.NonNull;
-import androidx.appcompat.app.AlertDialog;
-import androidx.constraintlayout.widget.ConstraintLayout;
-import androidx.recyclerview.widget.RecyclerView;
-
 public class AccountSummaryAdapter
         extends RecyclerView.Adapter<AccountSummaryAdapter.LedgerRowHolder> {
     public static final int AMOUNT_LIMIT = 3;
@@ -59,9 +58,9 @@ public class AccountSummaryAdapter
                 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);
+                        acc.getLevel() * rm.getDimensionPixelSize(R.dimen.thumb_row_height) / 3);
+                holder.expanderContainer.setVisibility(
+                        acc.hasSubAccounts() ? View.VISIBLE : View.GONE);
                 holder.expanderContainer.setRotation(acc.isExpanded() ? 0 : 180);
                 int amounts = acc.getAmountCount();
                 if ((amounts > AMOUNT_LIMIT) && !acc.amountsExpanded()) {
@@ -95,44 +94,22 @@ public class AccountSummaryAdapter
     @Override
     public LedgerRowHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
         View row = LayoutInflater.from(parent.getContext())
-                .inflate(R.layout.account_summary_row, parent, false);
+                                 .inflate(R.layout.account_summary_row, parent, false);
         return new LedgerRowHolder(row);
     }
 
     @Override
     public int getItemCount() {
-        return Data.accounts.size();
+        return Data.accounts.size() + (Data.profile.getValue()
+                                                   .isPostingPermitted() ? 1 : 0);
     }
-    public void selectItem(int position) {
-        try (LockHolder lh = Data.accounts.lockForWriting()) {
-            LedgerAccount acc = Data.accounts.get(position);
-            acc.toggleHiddenToBe();
-            toggleChildrenOf(acc, acc.isHiddenByStarToBe(), position);
-            notifyItemChanged(position);
-        }
-    }
-    private void toggleChildrenOf(LedgerAccount parent, boolean hiddenToBe, int parentPosition) {
-        int i = parentPosition + 1;
-        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++;
-                }
-            }
-        }
-    }
-
     static class LedgerRowHolder extends RecyclerView.ViewHolder {
         TextView tvAccountName, tvAccountAmounts;
         ConstraintLayout row;
         View vTrailer;
-        FrameLayout expanderContainer;
+        View expanderContainer;
         ImageView expander;
-        FrameLayout accountExpanderContainer;
+        View accountExpanderContainer;
         public LedgerRowHolder(@NonNull View itemView) {
             super(itemView);
             this.row = itemView.findViewById(R.id.account_summary_row);
@@ -160,6 +137,7 @@ public class AccountSummaryAdapter
             tvAccountAmounts.setOnLongClickListener(this::onItemLongClick);
             expanderContainer.setOnLongClickListener(this::onItemLongClick);
             expander.setOnLongClickListener(this::onItemLongClick);
+            row.setOnLongClickListener(this::onItemLongClick);
         }
         private boolean onItemLongClick(View v) {
             MainActivity activity = (MainActivity) v.getContext();
@@ -170,22 +148,26 @@ public class AccountSummaryAdapter
                 case R.id.account_summary_row:
                     row = v;
                     break;
-                case R.id.account_root:
-                    row = v.findViewById(R.id.account_summary_row);
+                case R.id.account_row_acc_amounts:
+                case R.id.account_row_amounts_expander_container:
+                    row = (View) v.getParent();
                     break;
                 case R.id.account_row_acc_name:
-                case R.id.account_row_acc_amounts:
                 case R.id.account_expander_container:
-                    row = (View) v.getParent();
+                    row = (View) v.getParent()
+                                  .getParent();
                     break;
                 case R.id.account_expander:
-                    row = (View) v.getParent().getParent();
+                    row = (View) v.getParent()
+                                  .getParent()
+                                  .getParent();
                     break;
                 default:
-                    Log.e("error", String.format("Don't know how to handle long click on id ", id));
+                    Log.e("error",
+                            String.format("Don't know how to handle long click on id %d", id));
                     return false;
             }
-            LedgerAccount acc = (LedgerAccount) row.findViewById(R.id.account_summary_row).getTag();
+            LedgerAccount acc = (LedgerAccount) row.getTag();
             builder.setTitle(acc.getName());
             builder.setItems(R.array.acc_ctx_menu, (dialog, which) -> {
                 switch (which) {