X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Faccount_summary%2FAccountSummaryAdapter.java;h=2490ff3bb51d13236db65f38694c3f5b48006930;hb=7bfd85e40b6fb441937c055ea0da2aeb5b00f1f6;hp=3778552503f3c833915779908432167bc4420f4d;hpb=83cac114e375728080194fb09758b49c50a8119b;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 37785525..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,66 +20,73 @@ 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; import net.ktnx.mobileledger.R; import net.ktnx.mobileledger.model.Data; import net.ktnx.mobileledger.model.LedgerAccount; +import net.ktnx.mobileledger.ui.activity.MainActivity; +import net.ktnx.mobileledger.utils.LockHolder; import androidx.annotation.NonNull; +import androidx.appcompat.app.AlertDialog; import androidx.constraintlayout.widget.ConstraintLayout; import androidx.recyclerview.widget.RecyclerView; public class AccountSummaryAdapter extends RecyclerView.Adapter { - private boolean selectionActive; + public static final int AMOUNT_LIMIT = 3; - AccountSummaryAdapter() { - this.selectionActive = false; - } + AccountSummaryAdapter() { } public void onBindViewHolder(@NonNull LedgerRowHolder holder, int position) { - if (position < Data.accounts.size()) { - LedgerAccount acc = Data.accounts.get(position); - Context ctx = holder.row.getContext(); - Resources rm = ctx.getResources(); - - holder.row.setTag(acc); - holder.row.setVisibility(View.VISIBLE); - holder.vTrailer.setVisibility(View.GONE); - holder.tvAccountName.setText(acc.getShortName()); - ConstraintLayout.LayoutParams lp = - (ConstraintLayout.LayoutParams) holder.tvAccountName.getLayoutParams(); - lp.setMarginStart( - acc.getLevel() * rm.getDimensionPixelSize(R.dimen.thumb_row_height) / 2); - holder.expanderContainer - .setVisibility(acc.hasSubAccounts() ? View.VISIBLE : View.INVISIBLE); - holder.expanderContainer.setRotation(acc.isExpanded() ? 0 : 180); - holder.tvAccountAmounts.setText(acc.getAmountsString()); - - if (acc.isHiddenByStar()) { - holder.tvAccountName.setTypeface(null, Typeface.ITALIC); - holder.tvAccountAmounts.setTypeface(null, Typeface.ITALIC); + try (LockHolder lh = Data.accounts.lockForReading()) { + if (position < Data.accounts.size()) { + LedgerAccount acc = Data.accounts.get(position); + Context ctx = holder.row.getContext(); + Resources rm = ctx.getResources(); + + holder.row.setTag(acc); + holder.row.setVisibility(View.VISIBLE); + holder.vTrailer.setVisibility(View.GONE); + holder.tvAccountName.setText(acc.getShortName()); + ConstraintLayout.LayoutParams lp = + (ConstraintLayout.LayoutParams) holder.tvAccountName.getLayoutParams(); + lp.setMarginStart( + acc.getLevel() * rm.getDimensionPixelSize(R.dimen.thumb_row_height) / 3); + holder.expanderContainer + .setVisibility(acc.hasSubAccounts() ? View.VISIBLE : View.GONE); + holder.expanderContainer.setRotation(acc.isExpanded() ? 0 : 180); + 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); + holder.tvAccountAmounts.setTypeface(null, Typeface.ITALIC); + } + else { + holder.tvAccountName.setTypeface(null, Typeface.NORMAL); + holder.tvAccountAmounts.setTypeface(null, Typeface.NORMAL); + } + + holder.row.setTag(R.id.POS, position); } else { - holder.tvAccountName.setTypeface(null, Typeface.NORMAL); - holder.tvAccountAmounts.setTypeface(null, Typeface.NORMAL); + holder.vTrailer.setVisibility(View.VISIBLE); + holder.row.setVisibility(View.GONE); } - - holder.selectionCb.setVisibility(selectionActive ? View.VISIBLE : View.GONE); - holder.selectionCb.setChecked(!acc.isHiddenByStarToBe()); - - holder.row.setTag(R.id.POS, position); - } - else { - holder.vTrailer.setVisibility(View.VISIBLE); - holder.row.setVisibility(View.GONE); } } @@ -93,61 +100,49 @@ 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() { - for (int i = 0; i < Data.accounts.size(); i++ ) { - LedgerAccount acc = Data.accounts.get(i); - acc.setHiddenByStarToBe(acc.isHiddenByStar()); - } - this.selectionActive = true; - notifyDataSetChanged(); - } - - public void stopSelection() { - this.selectionActive = false; - notifyDataSetChanged(); - } - - public boolean isSelectionActive() { - return selectionActive; - } - public void selectItem(int position) { - LedgerAccount acc = Data.accounts.get(position); - acc.toggleHiddenToBe(); - toggleChildrenOf(acc, acc.isHiddenByStarToBe(), position); - notifyItemChanged(position); + try (LockHolder lh = Data.accounts.lockForWriting()) { + LedgerAccount acc = Data.accounts.get(position); + acc.toggleHiddenToBe(); + toggleChildrenOf(acc, acc.isHiddenByStarToBe(), position); + notifyItemChanged(position); + } } - void toggleChildrenOf(LedgerAccount parent, boolean hiddenToBe, int parentPosition) { + private void toggleChildrenOf(LedgerAccount parent, boolean hiddenToBe, int parentPosition) { int i = parentPosition + 1; - for (int j = 0; j < Data.accounts.size(); j++) { - LedgerAccount acc = Data.accounts.get(j); - if (acc.getName().startsWith(parent.getName() + ":")) { - acc.setHiddenByStarToBe(hiddenToBe); - notifyItemChanged(i); - toggleChildrenOf(acc, hiddenToBe, i); - i++; + try (LockHolder lh = Data.accounts.lockForWriting()) { + for (int j = 0; j < Data.accounts.size(); j++) { + LedgerAccount acc = Data.accounts.get(j); + if (acc.getName().startsWith(parent.getName() + ":")) { + acc.setHiddenByStarToBe(hiddenToBe); + notifyItemChanged(i); + toggleChildrenOf(acc, hiddenToBe, i); + i++; + } } } } - 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); + this.accountExpanderContainer = + itemView.findViewById(R.id.account_row_amounts_expander_container); expanderContainer.addOnLayoutChangeListener( (v, left, top, right, bottom, oldLeft, oldTop, oldRight, oldBottom) -> { @@ -159,6 +154,55 @@ public class AccountSummaryAdapter } else v.setPadding(0, 0, 0, 0); }); + + 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; } } }