"final" fixes on account list layout

[mobile-ledger.git] / app / src / main / java / net / ktnx / mobileledger / ui / account_summary / AccountSummaryAdapter.java

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 ef912841b74d460ac804607636427f96aa246cd8..2490ff3bb51d13236db65f38694c3f5b48006930 100644 (file)
--- 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,8 +24,6 @@ import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.CheckBox;
-import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.TextView;
 
@@ -43,11 +41,8 @@ import androidx.recyclerview.widget.RecyclerView;
 public class AccountSummaryAdapter
         extends RecyclerView.Adapter<AccountSummaryAdapter.LedgerRowHolder> {
     public static final int AMOUNT_LIMIT = 3;
-    private boolean selectionActive;
 
-    AccountSummaryAdapter() {
-        this.selectionActive = false;
-    }
+    AccountSummaryAdapter() { }
 
     public void onBindViewHolder(@NonNull LedgerRowHolder holder, int position) {
         try (LockHolder lh = Data.accounts.lockForReading()) {
@@ -63,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);
+                        acc.getLevel() * rm.getDimensionPixelSize(R.dimen.thumb_row_height) / 3);
                 holder.expanderContainer
-                        .setVisibility(acc.hasSubAccounts() ? View.VISIBLE : View.INVISIBLE);
+                        .setVisibility(acc.hasSubAccounts() ? View.VISIBLE : View.GONE);
                 holder.expanderContainer.setRotation(acc.isExpanded() ? 0 : 180);
                 int amounts = acc.getAmountCount();
                 if ((amounts > AMOUNT_LIMIT) && !acc.amountsExpanded()) {
@@ -86,9 +81,6 @@ public class AccountSummaryAdapter
                     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 {
@@ -108,29 +100,9 @@ public class AccountSummaryAdapter
 
     @Override
     public int getItemCount() {
-        return Data.accounts.size() + 1;
-    }
-    public void startSelection() {
-        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() {
-        this.selectionActive = false;
-        notifyDataSetChanged();
+        return Data.accounts.size() + (Data.profile.getValue()
+                                                   .isPostingPermitted() ? 1 : 0);
     }
-
-    public boolean isSelectionActive() {
-        return selectionActive;
-    }
-
     public void selectItem(int position) {
         try (LockHolder lh = Data.accounts.lockForWriting()) {
             LedgerAccount acc = Data.accounts.get(position);
@@ -139,7 +111,7 @@ public class AccountSummaryAdapter
             notifyItemChanged(position);
         }
     }
-    void toggleChildrenOf(LedgerAccount parent, boolean hiddenToBe, int parentPosition) {
+    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++) {
@@ -154,20 +126,18 @@ public class AccountSummaryAdapter
         }
     }
 
-    class LedgerRowHolder extends RecyclerView.ViewHolder {
-        CheckBox selectionCb;
+    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);
             this.tvAccountName = itemView.findViewById(R.id.account_row_acc_name);
             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);
@@ -190,6 +160,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();
@@ -200,22 +171,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) {