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=ef912841b74d460ac804607636427f96aa246cd8;hp=bd71fd74d792fed851130202e581af1a5537392a;hb=ce149cca0afd2290d20d42ae6d2117e6546723e9;hpb=685885185ce21d286a1eb6dadeb86829ece75250

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 bd71fd74..ef912841 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
@@ -20,6 +20,7 @@ package net.ktnx.mobileledger.ui.account_summary;
 import android.content.Context;
 import android.content.res.Resources;
 import android.graphics.Typeface;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -41,6 +42,7 @@ import androidx.recyclerview.widget.RecyclerView;
 
 public class AccountSummaryAdapter
         extends RecyclerView.Adapter<AccountSummaryAdapter.LedgerRowHolder> {
+    public static final int AMOUNT_LIMIT = 3;
     private boolean selectionActive;
 
     AccountSummaryAdapter() {
@@ -65,7 +67,15 @@ public class AccountSummaryAdapter
                 holder.expanderContainer
                         .setVisibility(acc.hasSubAccounts() ? View.VISIBLE : View.INVISIBLE);
                 holder.expanderContainer.setRotation(acc.isExpanded() ? 0 : 180);
-                holder.tvAccountAmounts.setText(acc.getAmountsString());
+                int amounts = acc.getAmountCount();
+                if ((amounts > AMOUNT_LIMIT) && !acc.amountsExpanded()) {
+                    holder.tvAccountAmounts.setText(acc.getAmountsString(AMOUNT_LIMIT));
+                    holder.accountExpanderContainer.setVisibility(View.VISIBLE);
+                }
+                else {
+                    holder.tvAccountAmounts.setText(acc.getAmountsString());
+                    holder.accountExpanderContainer.setVisibility(View.GONE);
+                }
 
                 if (acc.isHiddenByStar()) {
                     holder.tvAccountName.setTypeface(null, Typeface.ITALIC);
@@ -151,6 +161,7 @@ public class AccountSummaryAdapter
         View vTrailer;
         FrameLayout expanderContainer;
         ImageView expander;
+        FrameLayout accountExpanderContainer;
         public LedgerRowHolder(@NonNull View itemView) {
             super(itemView);
             this.row = itemView.findViewById(R.id.account_summary_row);
@@ -160,8 +171,8 @@ public class AccountSummaryAdapter
             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);
-
-            MainActivity activity = (MainActivity) row.getContext();
+            this.accountExpanderContainer =
+                    itemView.findViewById(R.id.account_row_amounts_expander_container);
 
             expanderContainer.addOnLayoutChangeListener(
                     (v, left, top, right, bottom, oldLeft, oldTop, oldRight, oldBottom) -> {
@@ -174,26 +185,49 @@ public class AccountSummaryAdapter
                         else v.setPadding(0, 0, 0, 0);
                     });
 
-            itemView.setOnLongClickListener(new View.OnLongClickListener() {
-                @Override
-                public boolean onLongClick(View v) {
-                    AlertDialog.Builder builder = new AlertDialog.Builder(itemView.getContext());
-                    LedgerAccount acc =
-                            (LedgerAccount) v.findViewById(R.id.account_summary_row).getTag();
-                    builder.setTitle(acc.getName());
-                    builder.setItems(R.array.acc_ctx_menu, (dialog, which) -> {
-                        switch(which) {
-                            case 0:
-                                // show transactions
-                                activity.showAccountTransactions(acc);
-                                break;
-                        }
-                        dialog.dismiss();
-                    });
-                    builder.show();
-                    return true;
+            itemView.setOnLongClickListener(this::onItemLongClick);
+            tvAccountName.setOnLongClickListener(this::onItemLongClick);
+            tvAccountAmounts.setOnLongClickListener(this::onItemLongClick);
+            expanderContainer.setOnLongClickListener(this::onItemLongClick);
+            expander.setOnLongClickListener(this::onItemLongClick);
+        }
+        private boolean onItemLongClick(View v) {
+            MainActivity activity = (MainActivity) v.getContext();
+            AlertDialog.Builder builder = new AlertDialog.Builder(activity);
+            View row;
+            int id = v.getId();
+            switch (id) {
+                case R.id.account_summary_row:
+                    row = v;
+                    break;
+                case R.id.account_root:
+                    row = v.findViewById(R.id.account_summary_row);
+                    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();
+                    break;
+                case R.id.account_expander:
+                    row = (View) v.getParent().getParent();
+                    break;
+                default:
+                    Log.e("error", String.format("Don't know how to handle long click on id ", id));
+                    return false;
+            }
+            LedgerAccount acc = (LedgerAccount) row.findViewById(R.id.account_summary_row).getTag();
+            builder.setTitle(acc.getName());
+            builder.setItems(R.array.acc_ctx_menu, (dialog, which) -> {
+                switch (which) {
+                    case 0:
+                        // show transactions
+                        activity.showAccountTransactions(acc);
+                        break;
                 }
+                dialog.dismiss();
             });
+            builder.show();
+            return true;
         }
     }
 }