From 7bfd85e40b6fb441937c055ea0da2aeb5b00f1f6 Mon Sep 17 00:00:00 2001 From: Damyan Ivanov Date: Tue, 9 Jun 2020 20:08:50 +0000 Subject: [PATCH] "final" fixes on account list layout should work better on overly long account names or amounts also shows the bottom trailer --- .../AccountSummaryAdapter.java | 31 +-- .../ui/activity/MainActivity.java | 20 +- .../main/res/layout/account_summary_row.xml | 180 ++++++++++-------- app/src/main/res/values/styles.xml | 8 - 4 files changed, 130 insertions(+), 109 deletions(-) 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 80036a6f..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 @@ -24,7 +24,6 @@ import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import android.widget.FrameLayout; import android.widget.ImageView; import android.widget.TextView; @@ -59,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()) { @@ -101,7 +100,8 @@ public class AccountSummaryAdapter @Override public int getItemCount() { - return Data.accounts.size(); + return Data.accounts.size() + (Data.profile.getValue() + .isPostingPermitted() ? 1 : 0); } public void selectItem(int position) { try (LockHolder lh = Data.accounts.lockForWriting()) { @@ -130,9 +130,9 @@ public class AccountSummaryAdapter 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); @@ -160,6 +160,7 @@ public class AccountSummaryAdapter 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(); @@ -170,22 +171,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 %d", 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) { diff --git a/app/src/main/java/net/ktnx/mobileledger/ui/activity/MainActivity.java b/app/src/main/java/net/ktnx/mobileledger/ui/activity/MainActivity.java index 3f71e0a4..360f3006 100644 --- a/app/src/main/java/net/ktnx/mobileledger/ui/activity/MainActivity.java +++ b/app/src/main/java/net/ktnx/mobileledger/ui/activity/MainActivity.java @@ -655,11 +655,21 @@ public class MainActivity extends ProfileThemedActivity { } public void onAccountSummaryRowViewClicked(View view) { ViewGroup row; - if (view.getId() == R.id.account_expander) - row = (ViewGroup) view.getParent() - .getParent(); - else - row = (ViewGroup) view.getParent(); + switch (view.getId()) { + case R.id.account_expander: + row = (ViewGroup) view.getParent() + .getParent() + .getParent(); + break; + case R.id.account_expander_container: + case R.id.account_row_acc_name: + row = (ViewGroup) view.getParent() + .getParent(); + break; + default: + row = (ViewGroup) view.getParent(); + break; + } LedgerAccount acc = (LedgerAccount) row.getTag(); switch (view.getId()) { diff --git a/app/src/main/res/layout/account_summary_row.xml b/app/src/main/res/layout/account_summary_row.xml index 522c5930..3283a2ed 100644 --- a/app/src/main/res/layout/account_summary_row.xml +++ b/app/src/main/res/layout/account_summary_row.xml @@ -17,104 +17,118 @@ ~ You should have received a copy of the GNU General Public License ~ along with MoLe. If not, see . --> - - - - - + + + + - + + + - - - - - - + - + + - \ No newline at end of file + diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 9bd102f2..b0c366d2 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -709,17 +709,9 @@ -- 2.39.2