]> git.ktnx.net Git - mobile-ledger.git/blobdiff - app/src/main/java/net/ktnx/mobileledger/ui/account_summary/AccountSummaryAdapter.java
"final" fixes on account list layout
[mobile-ledger.git] / app / src / main / java / net / ktnx / mobileledger / ui / account_summary / AccountSummaryAdapter.java
index bd71fd74d792fed851130202e581af1a5537392a..2490ff3bb51d13236db65f38694c3f5b48006930 100644 (file)
@@ -20,11 +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;
 
@@ -41,11 +40,9 @@ import androidx.recyclerview.widget.RecyclerView;
 
 public class AccountSummaryAdapter
         extends RecyclerView.Adapter<AccountSummaryAdapter.LedgerRowHolder> {
-    private boolean selectionActive;
+    public static final int AMOUNT_LIMIT = 3;
 
-    AccountSummaryAdapter() {
-        this.selectionActive = false;
-    }
+    AccountSummaryAdapter() { }
 
     public void onBindViewHolder(@NonNull LedgerRowHolder holder, int position) {
         try (LockHolder lh = Data.accounts.lockForReading()) {
@@ -61,11 +58,19 @@ 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);
-                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);
@@ -76,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 {
@@ -98,29 +100,9 @@ public class AccountSummaryAdapter
 
     @Override
     public int getItemCount() {
-        return Data.accounts.size() + 1;
+        return Data.accounts.size() + (Data.profile.getValue()
+                                                   .isPostingPermitted() ? 1 : 0);
     }
-    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();
-    }
-
-    public boolean isSelectionActive() {
-        return selectionActive;
-    }
-
     public void selectItem(int position) {
         try (LockHolder lh = Data.accounts.lockForWriting()) {
             LedgerAccount acc = Data.accounts.get(position);
@@ -129,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++) {
@@ -144,24 +126,23 @@ 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;
+        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);
-
-            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 +155,54 @@ 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);
+            row.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_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_expander_container:
+                    row = (View) v.getParent()
+                                  .getParent();
+                    break;
+                case R.id.account_expander:
+                    row = (View) v.getParent()
+                                  .getParent()
+                                  .getParent();
+                    break;
+                default:
+                    Log.e("error",
+                            String.format("Don't know how to handle long click on id %d", id));
+                    return false;
+            }
+            LedgerAccount acc = (LedgerAccount) 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;
         }
     }
 }