X-Git-Url: https://git.ktnx.net/?p=mobile-ledger.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Ftransaction_list%2FTransactionListAdapter.java;h=bc463ed564661bb6d3da11155158322bbb2b5b29;hp=c61b9193d69e5071c781d43e122a4ab648524189;hb=HEAD;hpb=a27b9f88f066df4f4e70707c5d08bc8925b59b71

diff --git a/app/src/main/java/net/ktnx/mobileledger/ui/transaction_list/TransactionListAdapter.java b/app/src/main/java/net/ktnx/mobileledger/ui/transaction_list/TransactionListAdapter.java
index c61b9193..bc463ed5 100644
--- a/app/src/main/java/net/ktnx/mobileledger/ui/transaction_list/TransactionListAdapter.java
+++ b/app/src/main/java/net/ktnx/mobileledger/ui/transaction_list/TransactionListAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2020 Damyan Ivanov.
+ * Copyright © 2021 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
@@ -17,42 +17,107 @@
 
 package net.ktnx.mobileledger.ui.transaction_list;
 
-import android.app.Activity;
-import android.content.Context;
-import android.database.sqlite.SQLiteDatabase;
-import android.graphics.Typeface;
-import android.os.AsyncTask;
-import android.text.Spannable;
-import android.text.SpannableString;
-import android.text.style.StyleSpan;
 import android.view.LayoutInflater;
-import android.view.View;
 import android.view.ViewGroup;
-import android.widget.LinearLayout;
-import android.widget.TextView;
 
-import androidx.annotation.ColorInt;
 import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.AsyncListDiffer;
+import androidx.recyclerview.widget.DiffUtil;
 import androidx.recyclerview.widget.RecyclerView;
 
-import net.ktnx.mobileledger.App;
-import net.ktnx.mobileledger.R;
-import net.ktnx.mobileledger.model.Data;
-import net.ktnx.mobileledger.model.LedgerTransaction;
-import net.ktnx.mobileledger.model.LedgerTransactionAccount;
+import net.ktnx.mobileledger.databinding.LastUpdateLayoutBinding;
+import net.ktnx.mobileledger.databinding.TransactionDelimiterBinding;
+import net.ktnx.mobileledger.databinding.TransactionListRowBinding;
 import net.ktnx.mobileledger.model.TransactionListItem;
-import net.ktnx.mobileledger.utils.Colors;
-import net.ktnx.mobileledger.utils.Globals;
+import net.ktnx.mobileledger.utils.Logger;
 import net.ktnx.mobileledger.utils.Misc;
-import net.ktnx.mobileledger.utils.SimpleDate;
 
-import java.text.DateFormat;
-import java.util.GregorianCalendar;
-import java.util.TimeZone;
+import java.util.List;
+import java.util.Locale;
+
+public class TransactionListAdapter extends RecyclerView.Adapter<TransactionRowHolderBase> {
+    private final AsyncListDiffer<TransactionListItem> listDiffer;
+    public TransactionListAdapter() {
+        super();
+
+        setHasStableIds(true);
+
+        listDiffer = new AsyncListDiffer<>(this, new DiffUtil.ItemCallback<TransactionListItem>() {
+            @Override
+            public boolean areItemsTheSame(@NonNull TransactionListItem oldItem,
+                                           @NonNull TransactionListItem newItem) {
+                if (oldItem.getType() != newItem.getType())
+                    return false;
+                switch (oldItem.getType()) {
+                    case DELIMITER:
+                        return (oldItem.getDate()
+                                       .equals(newItem.getDate()));
+                    case TRANSACTION:
+                        return oldItem.getTransaction()
+                                      .getLedgerId() == newItem.getTransaction()
+                                                               .getLedgerId();
+                    case HEADER:
+                        return true;    // there can be only one header
+                    default:
+                        throw new IllegalStateException(
+                                String.format(Locale.US, "Unexpected transaction item type %s",
+                                        oldItem.getType()));
+                }
+            }
+            @Override
+            public boolean areContentsTheSame(@NonNull TransactionListItem oldItem,
+                                              @NonNull TransactionListItem newItem) {
+                switch (oldItem.getType()) {
+                    case DELIMITER:
+                        return oldItem.isMonthShown() == newItem.isMonthShown();
+                    case TRANSACTION:
+                        return oldItem.getTransaction()
+                                      .equals(newItem.getTransaction()) &&
+                               Misc.equalStrings(oldItem.getBoldAccountName(),
+                                       newItem.getBoldAccountName()) &&
+                               Misc.equalStrings(oldItem.getRunningTotal(),
+                                       newItem.getRunningTotal());
+                    case HEADER:
+                        // headers don't differ in their contents. they observe the last update
+                        // date and react to its changes
+                        return true;
+                    default:
+                        throw new IllegalStateException(
+                                String.format(Locale.US, "Unexpected transaction item type %s",
+                                        oldItem.getType()));
 
-public class TransactionListAdapter extends RecyclerView.Adapter<TransactionRowHolder> {
-    public void onBindViewHolder(@NonNull TransactionRowHolder holder, int position) {
-        TransactionListItem item = TransactionListViewModel.getTransactionListItem(position);
+                }
+            }
+        });
+    }
+    @Override
+    public long getItemId(int position) {
+        TransactionListItem item = listDiffer.getCurrentList()
+                                             .get(position);
+        switch (item.getType()) {
+            case HEADER:
+                return -1;
+            case TRANSACTION:
+                return item.getTransaction()
+                           .getLedgerId();
+            case DELIMITER:
+                return -item.getDate()
+                            .toDate()
+                            .getTime();
+            default:
+                throw new IllegalStateException("Unexpected value: " + item.getType());
+        }
+    }
+    @Override
+    public int getItemViewType(int position) {
+        return listDiffer.getCurrentList()
+                         .get(position)
+                         .getType()
+                         .ordinal();
+    }
+    public void onBindViewHolder(@NonNull TransactionRowHolderBase holder, int position) {
+        TransactionListItem item = listDiffer.getCurrentList()
+                                             .get(position);
 
         // in a race when transaction value is reduced, but the model hasn't been notified yet
         // the view will disappear when the notifications reaches the model, so by simply omitting
@@ -61,200 +126,56 @@ public class TransactionListAdapter extends RecyclerView.Adapter<TransactionRowH
         if (item == null)
             return;
 
-        switch (item.getType()) {
-            case TRANSACTION:
-                holder.vTransaction.setVisibility(View.VISIBLE);
-                holder.vDelimiter.setVisibility(View.GONE);
-                LedgerTransaction tr = item.getTransaction();
-
-                //        debug("transactions", String.format("Filling position %d with %d
-                //        accounts", position,
-                //                tr.getAccounts().size()));
+        final TransactionListItem.Type newType = item.getType();
 
-                TransactionLoader loader = new TransactionLoader();
-                loader.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR,
-                        new TransactionLoaderParams(tr, holder, position,
-                                Data.accountFilter.getValue(), item.isOdd()));
+        switch (newType) {
+            case TRANSACTION:
+                holder.asTransaction()
+                      .bind(item, item.getBoldAccountName());
 
-                // WORKAROUND what seems to be a bug in CardHolder somewhere
-                // when a view that was previously holding a delimiter is re-purposed
-                // occasionally it stays too short (not high enough)
-                holder.vTransaction.measure(
-                        View.MeasureSpec.makeMeasureSpec(holder.itemView.getWidth(),
-                                View.MeasureSpec.EXACTLY),
-                        View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED));
                 break;
             case DELIMITER:
-                SimpleDate date = item.getDate();
-                holder.vTransaction.setVisibility(View.GONE);
-                holder.vDelimiter.setVisibility(View.VISIBLE);
-                holder.tvDelimiterDate.setText(DateFormat.getDateInstance()
-                                                         .format(date.toDate()));
-                if (item.isMonthShown()) {
-                    GregorianCalendar cal = new GregorianCalendar(TimeZone.getDefault());
-                    cal.setTime(date.toDate());
-                    App.prepareMonthNames();
-                    holder.tvDelimiterMonth.setText(
-                            Globals.monthNames[cal.get(GregorianCalendar.MONTH)]);
-                    holder.tvDelimiterMonth.setVisibility(View.VISIBLE);
-                    //                holder.vDelimiterLine.setBackgroundResource(R.drawable
-                    //                .dashed_border_8dp);
-                    holder.vDelimiterThick.setVisibility(View.VISIBLE);
-                }
-                else {
-                    holder.tvDelimiterMonth.setVisibility(View.GONE);
-                    //                holder.vDelimiterLine.setBackgroundResource(R.drawable
-                    //                .dashed_border_1dp);
-                    holder.vDelimiterThick.setVisibility(View.GONE);
-                }
+                holder.asDelimiter()
+                      .bind(item);
                 break;
+            case HEADER:
+                holder.asHeader()
+                      .bind();
+
+                break;
+            default:
+                throw new IllegalStateException("Unexpected value: " + newType);
         }
     }
-
     @NonNull
     @Override
-    public TransactionRowHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+    public TransactionRowHolderBase onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
 //        debug("perf", "onCreateViewHolder called");
-        View row = LayoutInflater.from(parent.getContext())
-                                 .inflate(R.layout.transaction_list_row, parent, false);
-        return new TransactionRowHolder(row);
+        final LayoutInflater inflater = LayoutInflater.from(parent.getContext());
+
+        switch (TransactionListItem.Type.valueOf(viewType)) {
+            case TRANSACTION:
+                return new TransactionRowHolder(
+                        TransactionListRowBinding.inflate(inflater, parent, false));
+            case DELIMITER:
+                return new TransactionListDelimiterRowHolder(
+                        TransactionDelimiterBinding.inflate(inflater, parent, false));
+            case HEADER:
+                return new TransactionListLastUpdateRowHolder(
+                        LastUpdateLayoutBinding.inflate(inflater, parent, false));
+            default:
+                throw new IllegalStateException("Unexpected value: " + viewType);
+        }
     }
 
     @Override
     public int getItemCount() {
-        return Data.transactions.size();
-    }
-    enum LoaderStep {HEAD, ACCOUNTS, DONE}
-
-    private static class TransactionLoader
-            extends AsyncTask<TransactionLoaderParams, TransactionLoaderStep, Void> {
-        @Override
-        protected Void doInBackground(TransactionLoaderParams... p) {
-            LedgerTransaction tr = p[0].transaction;
-            boolean odd = p[0].odd;
-
-            SQLiteDatabase db = App.getDatabase();
-            tr.loadData(db);
-
-            publishProgress(new TransactionLoaderStep(p[0].holder, p[0].position, tr, odd));
-
-            int rowIndex = 0;
-            // FIXME ConcurrentModificationException in ArrayList$ltr.next (ArrayList.java:831)
-            for (LedgerTransactionAccount acc : tr.getAccounts()) {
-//                debug(c.getAccountName(), acc.getAmount()));
-                publishProgress(new TransactionLoaderStep(p[0].holder, acc, rowIndex++,
-                        p[0].boldAccountName));
-            }
-
-            publishProgress(new TransactionLoaderStep(p[0].holder, p[0].position, rowIndex));
-
-            return null;
-        }
-        @Override
-        protected void onProgressUpdate(TransactionLoaderStep... values) {
-            super.onProgressUpdate(values);
-            TransactionLoaderStep step = values[0];
-            TransactionRowHolder holder = step.getHolder();
-
-            switch (step.getStep()) {
-                case HEAD:
-                    holder.tvDescription.setText(step.getTransaction()
-                                                     .getDescription());
-                    String trComment = Misc.emptyIsNull(step.getTransaction()
-                                                            .getComment());
-                    if (trComment == null)
-                        holder.tvComment.setVisibility(View.GONE);
-                    else {
-                        holder.tvComment.setText(trComment);
-                        holder.tvComment.setVisibility(View.VISIBLE);
-                    }
-
-//                    if (step.isOdd())
-//                        holder.row.setBackgroundColor(Colors.tableRowDarkBG);
-//                    else
-//                        holder.row.setBackgroundColor(Colors.tableRowLightBG);
-
-                    break;
-                case ACCOUNTS:
-                    int rowIndex = step.getAccountPosition();
-                    Context ctx = holder.row.getContext();
-                    LinearLayout row = (LinearLayout) holder.tableAccounts.getChildAt(rowIndex);
-                    if (row == null) {
-                        LayoutInflater inflater = ((Activity) ctx).getLayoutInflater();
-                        row = (LinearLayout) inflater.inflate(
-                                R.layout.transaction_list_row_accounts_table_row, null);
-                        // if the rootView above is given (and the line below is spared)
-                        // the accounts remain with their default text (set in the layout resource)
-                        holder.tableAccounts.addView(row);
-                    }
-                    TextView dummyText = row.findViewById(R.id.dummy_text);
-                    TextView accName = row.findViewById(R.id.transaction_list_acc_row_acc_name);
-                    TextView accComment =
-                            row.findViewById(R.id.transaction_list_acc_row_acc_comment);
-                    TextView accAmount = row.findViewById(R.id.transaction_list_acc_row_acc_amount);
-                    LedgerTransactionAccount acc = step.getAccount();
-
-
-//                    debug("tmp", String.format("showing acc row %d: %s %1.2f", rowIndex,
-//                            acc.getAccountName(), acc.getAmount()));
-
-                    String boldAccountName = step.getBoldAccountName();
-                    if ((boldAccountName != null) && acc.getAccountName()
-                                                        .startsWith(boldAccountName))
-                    {
-                        accName.setTextColor(Colors.secondary);
-                        accAmount.setTextColor(Colors.secondary);
-
-                        SpannableString ss = new SpannableString(acc.getAccountName());
-                        ss.setSpan(new StyleSpan(Typeface.BOLD), 0, boldAccountName.length(),
-                                Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
-                        accName.setText(ss);
-                    }
-                    else {
-                        @ColorInt int textColor = dummyText.getTextColors()
-                                                           .getDefaultColor();
-                        accName.setTextColor(textColor);
-                        accAmount.setTextColor(textColor);
-                        accName.setText(acc.getAccountName());
-                    }
-
-                    String comment = acc.getComment();
-                    if (comment != null && !comment.isEmpty()) {
-                        accComment.setText(comment);
-                        accComment.setVisibility(View.VISIBLE);
-                    }
-                    else {
-                        accComment.setVisibility(View.GONE);
-                    }
-                    accAmount.setText(acc.toString());
-
-                    break;
-                case DONE:
-                    int accCount = step.getAccountCount();
-                    if (holder.tableAccounts.getChildCount() > accCount) {
-                        holder.tableAccounts.removeViews(accCount,
-                                holder.tableAccounts.getChildCount() - accCount);
-                    }
-
-//                    debug("transactions",
-//                            String.format("Position %d fill done", step.getPosition()));
-            }
-        }
+        return listDiffer.getCurrentList()
+                         .size();
     }
-
-    private class TransactionLoaderParams {
-        LedgerTransaction transaction;
-        TransactionRowHolder holder;
-        int position;
-        String boldAccountName;
-        boolean odd;
-        TransactionLoaderParams(LedgerTransaction transaction, TransactionRowHolder holder,
-                                int position, String boldAccountName, boolean odd) {
-            this.transaction = transaction;
-            this.holder = holder;
-            this.position = position;
-            this.boldAccountName = boldAccountName;
-            this.odd = odd;
-        }
+    public void setTransactions(List<TransactionListItem> newList) {
+        Logger.debug("transactions",
+                String.format(Locale.US, "Got new transaction list (%d items)", newList.size()));
+        listDiffer.submitList(newList);
     }
 }
\ No newline at end of file