X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Faccount_summary%2FAccountSummaryAdapter.java;h=a6566f17acca6ce6e7836832616ebe0b98008636;hb=1e5dde855621bd03da6b68f52dc6696c1fd24680;hp=45a966676fde43b833f32fc41633128400285a23;hpb=1edf82b2b2e9c73897d115c23581eb581820264b;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 45a96667..a6566f17 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,10 +20,10 @@ 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;
-import android.widget.CheckBox;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.TextView;
@@ -42,11 +42,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()) {
@@ -85,9 +82,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 {
@@ -107,29 +101,8 @@ 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();
     }
-
-    public boolean isSelectionActive() {
-        return selectionActive;
-    }
-
     public void selectItem(int position) {
         try (LockHolder lh = Data.accounts.lockForWriting()) {
             LedgerAccount acc = Data.accounts.get(position);
@@ -166,13 +139,11 @@ public class AccountSummaryAdapter
             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);
-            this.accountExpanderContainer = itemView.findViewById(R.id.account_row_amounts_expander_container);
-
-            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) -> {
@@ -185,26 +156,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;
         }
     }
 }