X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Faccount_summary%2FAccountSummaryAdapter.java;h=30025c2876d7cded8cd12cd9034718bb086e6eb6;hb=20c03b7a5eb152d42fbbe9ecbaae27530563b398;hp=6f3e4f2b29b1948b226bea5d2a69f8ac8657d373;hpb=b5ce02c84db901506139f9e0aaab3c56e394a6e3;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 6f3e4f2b..30025c28 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
@@ -1,151 +1,226 @@
/*
- * Copyright © 2019 Damyan Ivanov.
- * This file is part of Mobile-Ledger.
- * Mobile-Ledger is free software: you can distribute it and/or modify it
+ * Copyright © 2020 Damyan Ivanov.
+ * This file is part of MoLe.
+ * MoLe is free software: you can distribute it and/or modify it
* under the term of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your opinion), any later version.
*
- * Mobile-Ledger is distributed in the hope that it will be useful,
+ * MoLe is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License terms for details.
*
* You should have received a copy of the GNU General Public License
- * along with Mobile-Ledger. If not, see .
+ * along with MoLe. If not, see .
*/
package net.ktnx.mobileledger.ui.account_summary;
import android.content.Context;
import android.content.res.Resources;
-import android.graphics.Typeface;
-import android.os.Build;
-import android.support.annotation.NonNull;
-import android.support.v7.widget.RecyclerView;
+import android.text.TextUtils;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
-import android.widget.CheckBox;
-import android.widget.LinearLayout;
+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.AsyncListDiffer;
+import androidx.recyclerview.widget.DiffUtil;
+import androidx.recyclerview.widget.RecyclerView;
+
import net.ktnx.mobileledger.R;
-import net.ktnx.mobileledger.model.Data;
+import net.ktnx.mobileledger.async.DbOpQueue;
import net.ktnx.mobileledger.model.LedgerAccount;
+import net.ktnx.mobileledger.model.MobileLedgerProfile;
+import net.ktnx.mobileledger.ui.MainModel;
+import net.ktnx.mobileledger.ui.activity.MainActivity;
+import net.ktnx.mobileledger.utils.Locker;
+import net.ktnx.mobileledger.utils.Logger;
-import java.util.List;
-
-class AccountSummaryAdapter extends RecyclerView.Adapter {
- private boolean selectionActive;
+import org.jetbrains.annotations.NotNull;
- AccountSummaryAdapter() {
- this.selectionActive = false;
- }
-
- 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.setVisibility(View.VISIBLE);
- holder.vTrailer.setVisibility(View.GONE);
- holder.tvAccountName.setText(acc.getShortName());
- holder.tvAccountName.setPadding(
- acc.getLevel() * rm.getDimensionPixelSize(R.dimen.activity_horizontal_margin) /
- 2, 0, 0, 0);
- holder.tvAccountAmounts.setText(acc.getAmountsString());
-
- if (acc.isHidden()) {
- 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);
- }
-
- if (position % 2 == 0) {
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) holder.row
- .setBackgroundColor(rm.getColor(R.color.table_row_dark_bg, ctx.getTheme()));
- else holder.row.setBackgroundColor(rm.getColor(R.color.table_row_dark_bg));
+import java.util.List;
+import java.util.Locale;
+
+import static net.ktnx.mobileledger.utils.Logger.debug;
+
+public class AccountSummaryAdapter
+ extends RecyclerView.Adapter {
+ public static final int AMOUNT_LIMIT = 3;
+ private final AsyncListDiffer listDiffer;
+ private final MainModel model;
+ AccountSummaryAdapter(MainModel model) {
+ this.model = model;
+
+ listDiffer = new AsyncListDiffer<>(this, new DiffUtil.ItemCallback() {
+ @Override
+ public boolean areItemsTheSame(@NotNull LedgerAccount oldItem,
+ @NotNull LedgerAccount newItem) {
+ return TextUtils.equals(oldItem.getName(), newItem.getName());
}
- else {
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) holder.row
- .setBackgroundColor(rm.getColor(R.color.drawer_background, ctx.getTheme()));
- else holder.row.setBackgroundColor(rm.getColor(R.color.drawer_background));
+ @Override
+ public boolean areContentsTheSame(@NotNull LedgerAccount oldItem,
+ @NotNull LedgerAccount newItem) {
+ return oldItem.equals(newItem);
}
+ });
+ }
- holder.selectionCb.setVisibility(selectionActive ? View.VISIBLE : View.GONE);
- holder.selectionCb.setChecked(!acc.isHiddenToBe());
-
- holder.row.setTag(R.id.POS, position);
- }
- else {
- holder.vTrailer.setVisibility(View.VISIBLE);
- holder.row.setVisibility(View.GONE);
- }
+ public void onBindViewHolder(@NonNull LedgerRowHolder holder, int position) {
+ holder.bindToAccount(listDiffer.getCurrentList()
+ .get(position));
}
@NonNull
@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.get().size() + 1;
+ return listDiffer.getCurrentList()
+ .size();
}
- public void startSelection() {
- for (LedgerAccount acc : Data.accounts.get()) acc.setHiddenToBe(acc.isHidden());
- this.selectionActive = true;
- notifyDataSetChanged();
+ public void setAccounts(List newList) {
+ listDiffer.submitList(newList);
}
+ class LedgerRowHolder extends RecyclerView.ViewHolder {
+ final TextView tvAccountName, tvAccountAmounts;
+ final ConstraintLayout row;
+ final View expanderContainer;
+ final ImageView expander;
+ final View accountExpanderContainer;
+ LedgerAccount mAccount;
+ public LedgerRowHolder(@NonNull View itemView) {
+ super(itemView);
- public void stopSelection() {
- this.selectionActive = false;
- notifyDataSetChanged();
- }
+ row = itemView.findViewById(R.id.account_summary_row);
+ tvAccountName = itemView.findViewById(R.id.account_row_acc_name);
+ tvAccountAmounts = itemView.findViewById(R.id.account_row_acc_amounts);
+ expanderContainer = itemView.findViewById(R.id.account_expander_container);
+ expander = itemView.findViewById(R.id.account_expander);
+ accountExpanderContainer =
+ itemView.findViewById(R.id.account_row_amounts_expander_container);
+
+ itemView.setOnLongClickListener(this::onItemLongClick);
+ tvAccountName.setOnLongClickListener(this::onItemLongClick);
+ tvAccountAmounts.setOnLongClickListener(this::onItemLongClick);
+ expanderContainer.setOnLongClickListener(this::onItemLongClick);
+ expander.setOnLongClickListener(this::onItemLongClick);
+ row.setOnLongClickListener(this::onItemLongClick);
+
+ tvAccountName.setOnClickListener(v -> toggleAccountExpanded());
+ expanderContainer.setOnClickListener(v -> toggleAccountExpanded());
+ expander.setOnClickListener(v -> toggleAccountExpanded());
+ tvAccountAmounts.setOnClickListener(v -> toggleAmountsExpanded());
+ }
+ private void toggleAccountExpanded() {
+ if (!mAccount.hasSubAccounts())
+ return;
+ debug("accounts", "Account expander clicked");
+
+ // make sure we use the same object as the one in the allAccounts list
+ MobileLedgerProfile profile = mAccount.getProfile();
+ if (profile == null) {
+ return;
+ }
+ try (Locker ignored = model.lockAccountsForWriting()) {
+ LedgerAccount realAccount = model.locateAccount(mAccount.getName());
+ if (realAccount == null)
+ return;
- public boolean isSelectionActive() {
- return selectionActive;
- }
+ mAccount = realAccount;
+ mAccount.toggleExpanded();
+ }
+ expanderContainer.animate()
+ .rotation(mAccount.isExpanded() ? 0 : 180);
+ model.updateDisplayedAccounts();
- public void selectItem(int position) {
- LedgerAccount acc = Data.accounts.get().get(position);
- acc.toggleHiddenToBe();
- toggleChildrenOf(acc, acc.isHiddenToBe(), 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.setHiddenToBe(hiddenToBe);
- notifyItemChanged(i);
- toggleChildrenOf(acc, hiddenToBe, i);
- i++;
+ DbOpQueue.add("update accounts set expanded=? where name=? and profile=?",
+ new Object[]{mAccount.isExpanded(), mAccount.getName(), profile.getUuid()
+ });
+
+ }
+ private void toggleAmountsExpanded() {
+ if (mAccount.getAmountCount() <= AMOUNT_LIMIT)
+ return;
+
+ mAccount.toggleAmountsExpanded();
+ if (mAccount.amountsExpanded()) {
+ tvAccountAmounts.setText(mAccount.getAmountsString());
+ accountExpanderContainer.setVisibility(View.GONE);
}
+ else {
+ tvAccountAmounts.setText(mAccount.getAmountsString(AMOUNT_LIMIT));
+ accountExpanderContainer.setVisibility(View.VISIBLE);
+ }
+
+ MobileLedgerProfile profile = mAccount.getProfile();
+ if (profile == null)
+ return;
+
+ DbOpQueue.add("update accounts set amounts_expanded=? where name=? and profile=?",
+ new Object[]{mAccount.amountsExpanded(), mAccount.getName(), profile.getUuid()
+ });
+
}
- }
+ private boolean onItemLongClick(View v) {
+ MainActivity activity = (MainActivity) v.getContext();
+ AlertDialog.Builder builder = new AlertDialog.Builder(activity);
+ final String accountName = mAccount.getName();
+ builder.setTitle(accountName);
+ builder.setItems(R.array.acc_ctx_menu, (dialog, which) -> {
+ if (which == 0) {// show transactions
+ activity.showAccountTransactions(accountName);
+ }
+ else {
+ throw new RuntimeException(String.format("Unknown menu item id (%d)", which));
+ }
+ dialog.dismiss();
+ });
+ builder.show();
+ return true;
+ }
+ public void bindToAccount(LedgerAccount acc) {
+ Logger.debug("accounts", String.format(Locale.US, "Binding to '%s'", acc.getName()));
+ Context ctx = row.getContext();
+ Resources rm = ctx.getResources();
+ mAccount = acc;
- class LedgerRowHolder extends RecyclerView.ViewHolder {
- CheckBox selectionCb;
- TextView tvAccountName, tvAccountAmounts;
- LinearLayout row;
- View vTrailer;
- 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);
+ row.setTag(acc);
+
+ tvAccountName.setText(acc.getShortName());
+
+ ConstraintLayout.LayoutParams lp =
+ (ConstraintLayout.LayoutParams) tvAccountName.getLayoutParams();
+ lp.setMarginStart(
+ acc.getLevel() * rm.getDimensionPixelSize(R.dimen.thumb_row_height) / 3);
+
+ if (acc.hasSubAccounts()) {
+ expanderContainer.setVisibility(View.VISIBLE);
+ expanderContainer.setRotation(acc.isExpanded() ? 0 : 180);
+ }
+ else {
+ expanderContainer.setVisibility(View.GONE);
+ }
+
+ int amounts = acc.getAmountCount();
+ if ((amounts > AMOUNT_LIMIT) && !acc.amountsExpanded()) {
+ tvAccountAmounts.setText(acc.getAmountsString(AMOUNT_LIMIT));
+ accountExpanderContainer.setVisibility(View.VISIBLE);
+ }
+ else {
+ tvAccountAmounts.setText(acc.getAmountsString());
+ accountExpanderContainer.setVisibility(View.GONE);
+ }
}
}
}