X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Faccount_summary%2FAccountSummaryAdapter.java;h=d50601efed707a4a21f76ae64be3459604a5a919;hb=5bba2c06a81c87327fdcf3f2a85c3206d932c2f9;hp=ee46b9c705dea401a2f1e7e1e00c689383cd273d;hpb=d08ab8235d0fd152c772b2dd5ffa1ca5747f67b1;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 ee46b9c7..d50601ef 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,7 +20,6 @@ package net.ktnx.mobileledger.ui.account_summary; import android.content.Context; import android.content.res.Resources; import android.text.TextUtils; -import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -38,20 +37,26 @@ import net.ktnx.mobileledger.R; 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 org.jetbrains.annotations.NotNull; -import java.util.ArrayList; +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 MobileLedgerProfile profile; private AsyncListDiffer listDiffer; - AccountSummaryAdapter() { + private MainModel model; + AccountSummaryAdapter(MainModel model) { + this.model = model; + listDiffer = new AsyncListDiffer<>(this, new DiffUtil.ItemCallback() { @Override public boolean areItemsTheSame(@NotNull LedgerAccount oldItem, @@ -61,14 +66,14 @@ public class AccountSummaryAdapter @Override public boolean areContentsTheSame(@NotNull LedgerAccount oldItem, @NotNull LedgerAccount newItem) { - return (oldItem.isExpanded() == newItem.isExpanded()) && - (oldItem.amountsExpanded() == newItem.amountsExpanded()); + return oldItem.equals(newItem); } }); } public void onBindViewHolder(@NonNull LedgerRowHolder holder, int position) { - holder.bindToAccount(listDiffer.getCurrentList().get(position)); + holder.bindToAccount(listDiffer.getCurrentList() + .get(position)); } @NonNull @@ -81,10 +86,10 @@ public class AccountSummaryAdapter @Override public int getItemCount() { - return listDiffer.getCurrentList().size(); + return listDiffer.getCurrentList() + .size(); } - public void setAccounts(MobileLedgerProfile profile, ArrayList newList) { - this.profile = profile; + public void setAccounts(List newList) { listDiffer.submitList(newList); } class LedgerRowHolder extends RecyclerView.ViewHolder { @@ -93,8 +98,10 @@ public class AccountSummaryAdapter View expanderContainer; ImageView expander; View accountExpanderContainer; + LedgerAccount mAccount; public LedgerRowHolder(@NonNull View itemView) { super(itemView); + 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); @@ -115,94 +122,70 @@ public class AccountSummaryAdapter expander.setOnClickListener(v -> toggleAccountExpanded()); tvAccountAmounts.setOnClickListener(v -> toggleAmountsExpanded()); } - private @NonNull - LedgerAccount getAccount() { - final ArrayList accountList = profile.getAccounts() - .getValue(); - if (accountList == null) - throw new IllegalStateException("No account list"); - - return accountList.get(getAdapterPosition()); - } private void toggleAccountExpanded() { - LedgerAccount acc = getAccount(); - if (!acc.hasSubAccounts()) + if (!mAccount.hasSubAccounts()) return; debug("accounts", "Account expander clicked"); - acc.toggleExpanded(); - expanderContainer.animate() - .rotation(acc.isExpanded() ? 0 : 180); - - MobileLedgerProfile profile = acc.getProfile(); - if (profile == null) + // 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; + + mAccount = realAccount; + mAccount.toggleExpanded(); + } + expanderContainer.animate() + .rotation(mAccount.isExpanded() ? 0 : 180); + model.updateDisplayedAccounts(); DbOpQueue.add("update accounts set expanded=? where name=? and profile=?", - new Object[]{acc.isExpanded(), acc.getName(), profile.getUuid() - }, profile::scheduleAccountListReload); + new Object[]{mAccount.isExpanded(), mAccount.getName(), profile.getUuid() + }); } private void toggleAmountsExpanded() { - LedgerAccount acc = getAccount(); - if (acc.getAmountCount() <= AMOUNT_LIMIT) + if (mAccount.getAmountCount() <= AMOUNT_LIMIT) return; - acc.toggleAmountsExpanded(); - if (acc.amountsExpanded()) { - tvAccountAmounts.setText(acc.getAmountsString()); + mAccount.toggleAmountsExpanded(); + if (mAccount.amountsExpanded()) { + tvAccountAmounts.setText(mAccount.getAmountsString()); accountExpanderContainer.setVisibility(View.GONE); } else { - tvAccountAmounts.setText(acc.getAmountsString(AMOUNT_LIMIT)); + tvAccountAmounts.setText(mAccount.getAmountsString(AMOUNT_LIMIT)); accountExpanderContainer.setVisibility(View.VISIBLE); } - MobileLedgerProfile profile = acc.getProfile(); + MobileLedgerProfile profile = mAccount.getProfile(); if (profile == null) return; DbOpQueue.add("update accounts set amounts_expanded=? where name=? and profile=?", - new Object[]{acc.amountsExpanded(), acc.getName(), profile.getUuid() + 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); - View row; - int id = v.getId(); - switch (id) { - case R.id.account_summary_row: - row = v; - break; - 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_expander_container: - row = (View) v.getParent() - .getParent(); - break; - case R.id.account_expander: - 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)); - return false; - } - LedgerAccount acc = getAccount(); - builder.setTitle(acc.getName()); + final String accountName = mAccount.getName(); + builder.setTitle(accountName); builder.setItems(R.array.acc_ctx_menu, (dialog, which) -> { switch (which) { case 0: // show transactions - activity.showAccountTransactions(acc.getName()); + activity.showAccountTransactions(accountName); break; + default: + throw new RuntimeException( + String.format("Unknown menu item id (%d)", which)); } dialog.dismiss(); }); @@ -210,8 +193,10 @@ public class AccountSummaryAdapter 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; row.setTag(acc);