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=2490ff3bb51d13236db65f38694c3f5b48006930;hp=45a966676fde43b833f32fc41633128400285a23;hb=7bfd85e40b6fb441937c055ea0da2aeb5b00f1f6;hpb=1edf82b2b2e9c73897d115c23581eb581820264b 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..2490ff3b 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,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; @@ -42,11 +41,8 @@ import androidx.recyclerview.widget.RecyclerView; public class AccountSummaryAdapter extends RecyclerView.Adapter { 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()) { @@ -62,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()) { @@ -85,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 { @@ -107,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); @@ -138,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++) { @@ -153,26 +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; - 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); - 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 +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; } } }