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=c2ec0e96cf1053d27dca49b0e25292b495d3cab5;hpb=7165b89c8ff2b9d8f69e02354197127ec27a4a47;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 c2ec0e96..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; @@ -31,19 +31,19 @@ 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) { try (LockHolder lh = Data.accounts.lockForReading()) { @@ -63,7 +63,15 @@ public class AccountSummaryAdapter holder.expanderContainer .setVisibility(acc.hasSubAccounts() ? View.VISIBLE : View.INVISIBLE); 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); @@ -74,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 { @@ -96,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(); - } + return Data.accounts.size(); } - - 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); @@ -149,15 +133,17 @@ public class AccountSummaryAdapter View vTrailer; FrameLayout expanderContainer; ImageView expander; + FrameLayout 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) -> { @@ -169,6 +155,50 @@ 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); + } + 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; } } }