X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Faccount_summary%2FAccountSummaryAdapter.java;h=3384fe8184f9e5ad1bb180cbc36db7f4be1e7d79;hb=60ab134250ddc964da640e18c02592e7e6eff11e;hp=ef912841b74d460ac804607636427f96aa246cd8;hpb=ce149cca0afd2290d20d42ae6d2117e6546723e9;p=mobile-ledger.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 ef912841..3384fe81 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 @@ -24,30 +24,25 @@ 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 androidx.annotation.NonNull; +import androidx.appcompat.app.AlertDialog; +import androidx.constraintlayout.widget.ConstraintLayout; +import androidx.recyclerview.widget.RecyclerView; + 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 { 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()) { @@ -63,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); - holder.expanderContainer - .setVisibility(acc.hasSubAccounts() ? View.VISIBLE : View.INVISIBLE); + 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()) { @@ -86,12 +81,11 @@ 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 { + // FIXME trailer's divider looks bad + // perhaps replace the trailer with bottom padding for the last item? holder.vTrailer.setVisibility(View.VISIBLE); holder.row.setVisibility(View.GONE); } @@ -102,94 +96,39 @@ public class AccountSummaryAdapter @Override public LedgerRowHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { View row = LayoutInflater.from(parent.getContext()) - .inflate(R.layout.account_summary_row, parent, false); + .inflate(R.layout.account_summary_row, parent, false); return new LedgerRowHolder(row); } @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(); - } - - public boolean isSelectionActive() { - return selectionActive; - } - - public void selectItem(int 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) { - int i = parentPosition + 1; - 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++; - } - } - } + return Data.accounts.size() + (Data.profile.getValue() + .isPostingPermitted() ? 1 : 0); } - - 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); - expanderContainer.addOnLayoutChangeListener( - (v, left, top, right, bottom, oldLeft, oldTop, oldRight, oldBottom) -> { - int w = right - left; - int h = bottom - top; - if (h > w) { - int p = (h - w) / 2; - v.setPadding(0, p, 0, p); - } - 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(); @@ -200,22 +139,26 @@ public class AccountSummaryAdapter case R.id.account_summary_row: row = v; break; - case R.id.account_root: - row = v.findViewById(R.id.account_summary_row); + 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_row_acc_amounts: case R.id.account_expander_container: - row = (View) v.getParent(); + row = (View) v.getParent() + .getParent(); break; case R.id.account_expander: - row = (View) v.getParent().getParent(); + row = (View) v.getParent() + .getParent() + .getParent(); break; default: - Log.e("error", String.format("Don't know how to handle long click on id ", id)); + Log.e("error", + String.format("Don't know how to handle long click on id %d", id)); return false; } - LedgerAccount acc = (LedgerAccount) row.findViewById(R.id.account_summary_row).getTag(); + LedgerAccount acc = (LedgerAccount) row.getTag(); builder.setTitle(acc.getName()); builder.setItems(R.array.acc_ctx_menu, (dialog, which) -> { switch (which) {