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=45a966676fde43b833f32fc41633128400285a23;hp=d9df87d5741bf77d75923f3b3b07af6081afee74;hb=1edf82b2b2e9c73897d115c23581eb581820264b;hpb=c6fe580ac5a93cff593d95a0fe34bd6c2c7bddfc 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 d9df87d5..45a96667 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 @@ -31,15 +31,17 @@ import android.widget.TextView; import net.ktnx.mobileledger.R; import net.ktnx.mobileledger.model.Data; import net.ktnx.mobileledger.model.LedgerAccount; - -import java.util.List; +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() { @@ -47,42 +49,51 @@ public class AccountSummaryAdapter } public void onBindViewHolder(@NonNull LedgerRowHolder holder, int position) { - List accounts = Data.accounts.get(); - if (position < accounts.size()) { - LedgerAccount acc = 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) / 2); + holder.expanderContainer + .setVisibility(acc.hasSubAccounts() ? View.VISIBLE : View.INVISIBLE); + 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.selectionCb.setVisibility(selectionActive ? View.VISIBLE : View.GONE); + holder.selectionCb.setChecked(!acc.isHiddenByStarToBe()); + + 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); } } @@ -96,12 +107,18 @@ public class AccountSummaryAdapter @Override public int getItemCount() { - return Data.accounts.get().size() + 1; + return Data.accounts.size() + 1; } public void startSelection() { - for (LedgerAccount acc : Data.accounts.get()) acc.setHiddenByStarToBe(acc.isHiddenByStar()); - this.selectionActive = true; - notifyDataSetChanged(); + 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() { @@ -114,19 +131,24 @@ public class AccountSummaryAdapter } public void selectItem(int position) { - LedgerAccount acc = Data.accounts.get().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) { int i = parentPosition + 1; - for (LedgerAccount acc : Data.accounts.get()) { - 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++; + } } } } @@ -138,6 +160,7 @@ 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); @@ -147,6 +170,9 @@ public class AccountSummaryAdapter 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(); expanderContainer.addOnLayoutChangeListener( (v, left, top, right, bottom, oldLeft, oldTop, oldRight, oldBottom) -> { @@ -158,6 +184,27 @@ 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; + } + }); } } }