]> git.ktnx.net Git - mobile-ledger.git/blobdiff - app/src/main/java/net/ktnx/mobileledger/ui/account_summary/AccountSummaryAdapter.java
major rework of parsed transaction/descriptions/accounts storage
[mobile-ledger.git] / app / src / main / java / net / ktnx / mobileledger / ui / account_summary / AccountSummaryAdapter.java
index 0540438ddcd6c47e4e7d9e873c393cd4a50cdb66..d50601efed707a4a21f76ae64be3459604a5a919 100644 (file)
@@ -19,7 +19,7 @@ package net.ktnx.mobileledger.ui.account_summary;
 
 import android.content.Context;
 import android.content.res.Resources;
-import android.util.Log;
+import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -29,48 +29,51 @@ 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.LockHolder;
+import net.ktnx.mobileledger.utils.Locker;
+import net.ktnx.mobileledger.utils.Logger;
+
+import org.jetbrains.annotations.NotNull;
+
+import java.util.List;
+import java.util.Locale;
+
+import static net.ktnx.mobileledger.utils.Logger.debug;
 
 public class AccountSummaryAdapter
         extends RecyclerView.Adapter<AccountSummaryAdapter.LedgerRowHolder> {
     public static final int AMOUNT_LIMIT = 3;
+    private AsyncListDiffer<LedgerAccount> listDiffer;
+    private MainModel model;
+    AccountSummaryAdapter(MainModel model) {
+        this.model = model;
 
-    AccountSummaryAdapter() { }
+        listDiffer = new AsyncListDiffer<>(this, new DiffUtil.ItemCallback<LedgerAccount>() {
+            @Override
+            public boolean areItemsTheSame(@NotNull LedgerAccount oldItem,
+                                           @NotNull LedgerAccount newItem) {
+                return TextUtils.equals(oldItem.getName(), newItem.getName());
+            }
+            @Override
+            public boolean areContentsTheSame(@NotNull LedgerAccount oldItem,
+                                              @NotNull LedgerAccount newItem) {
+                return oldItem.equals(newItem);
+            }
+        });
+    }
 
     public void onBindViewHolder(@NonNull LedgerRowHolder holder, int position) {
-        try (LockHolder lh = Data.accounts.lockForReading()) {
-                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.tvAccountName.setText(acc.getShortName());
-                ConstraintLayout.LayoutParams lp =
-                        (ConstraintLayout.LayoutParams) holder.tvAccountName.getLayoutParams();
-                lp.setMarginStart(
-                        acc.getLevel() * rm.getDimensionPixelSize(R.dimen.thumb_row_height) / 3);
-                holder.expanderContainer.setVisibility(
-                        acc.hasSubAccounts() ? View.VISIBLE : View.GONE);
-                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);
-                }
-
-                holder.row.setTag(R.id.POS, position);
-        }
+        holder.bindToAccount(listDiffer.getCurrentList()
+                                       .get(position));
     }
 
     @NonNull
@@ -83,22 +86,28 @@ public class AccountSummaryAdapter
 
     @Override
     public int getItemCount() {
-        return Data.accounts.size();
+        return listDiffer.getCurrentList()
+                         .size();
     }
-    static class LedgerRowHolder extends RecyclerView.ViewHolder {
+    public void setAccounts(List<LedgerAccount> newList) {
+        listDiffer.submitList(newList);
+    }
+    class LedgerRowHolder extends RecyclerView.ViewHolder {
         TextView tvAccountName, tvAccountAmounts;
         ConstraintLayout row;
         View expanderContainer;
         ImageView expander;
         View accountExpanderContainer;
+        LedgerAccount mAccount;
         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.expanderContainer = itemView.findViewById(R.id.account_expander_container);
-            this.expander = itemView.findViewById(R.id.account_expander);
-            this.accountExpanderContainer =
+
+            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);
@@ -107,48 +116,114 @@ public class AccountSummaryAdapter
             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;
+
+                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[]{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);
-            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 = (LedgerAccount) row.getTag();
-            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);
+                        activity.showAccountTransactions(accountName);
                         break;
+                    default:
+                        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;
+
+            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);
+            }
+        }
     }
 }