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;fp=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Ftransaction_list%2FTransactionListAdapter.java;h=599a9f8c8024e39e020a63485be749e1f5e0f27d;hp=67a4922b175be66ffac07f41fd0e8b81dfd651a2;hb=0b96f4968cd5c0b36474b94b94ec6dcf6699f60c;hpb=3c459e59ba3ac6082d65984359fcb6276965de4d

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 67a4922b..599a9f8c 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
@@ -17,51 +17,29 @@
 
 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.databinding.LastUpdateLayoutBinding;
+import net.ktnx.mobileledger.databinding.TransactionDelimiterBinding;
+import net.ktnx.mobileledger.databinding.TransactionListRowBinding;
 import net.ktnx.mobileledger.model.LedgerTransaction;
-import net.ktnx.mobileledger.model.LedgerTransactionAccount;
 import net.ktnx.mobileledger.model.TransactionListItem;
-import net.ktnx.mobileledger.ui.MainModel;
-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.List;
 import java.util.Locale;
-import java.util.TimeZone;
 
-public class TransactionListAdapter extends RecyclerView.Adapter<TransactionRowHolder> {
-    private final MainModel model;
+public class TransactionListAdapter extends RecyclerView.Adapter<TransactionRowHolderBase> {
     private final AsyncListDiffer<TransactionListItem> listDiffer;
-    public TransactionListAdapter(MainModel model) {
+    public TransactionListAdapter() {
         super();
-        this.model = model;
 
         listDiffer = new AsyncListDiffer<>(this, new DiffUtil.ItemCallback<TransactionListItem>() {
             @Override
@@ -94,7 +72,9 @@ public class TransactionListAdapter extends RecyclerView.Adapter<TransactionRowH
                         return true;
                     case TRANSACTION:
                         return oldItem.getTransaction()
-                                      .equals(newItem.getTransaction());
+                                      .equals(newItem.getTransaction()) &&
+                               Misc.equalStrings(oldItem.getBoldAccountName(),
+                                       newItem.getBoldAccountName());
                     case HEADER:
                         // headers don't differ in their contents. they observe the last update
                         // date and react to its changes
@@ -108,7 +88,14 @@ public class TransactionListAdapter extends RecyclerView.Adapter<TransactionRowH
             }
         });
     }
-    public void onBindViewHolder(@NonNull TransactionRowHolder holder, int position) {
+    @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);
 
@@ -120,53 +107,21 @@ public class TransactionListAdapter extends RecyclerView.Adapter<TransactionRowH
             return;
 
         final TransactionListItem.Type newType = item.getType();
-        holder.setType(newType);
 
         switch (newType) {
             case TRANSACTION:
                 LedgerTransaction tr = item.getTransaction();
+                holder.asTransaction()
+                      .bind(tr, item.getBoldAccountName());
 
-                //        debug("transactions", String.format("Filling position %d with %d
-                //        accounts", position,
-                //                tr.getAccounts().size()));
-
-                TransactionLoader loader = new TransactionLoader();
-                loader.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR,
-                        new TransactionLoaderParams(tr, holder, position, model.getAccountFilter()
-                                                                               .getValue()));
-
-                // 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.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.setLastUpdateText(Data.lastTransactionsUpdateText.getValue());
+                holder.asHeader()
+                      .bind();
 
                 break;
             default:
@@ -175,11 +130,23 @@ public class TransactionListAdapter extends RecyclerView.Adapter<TransactionRowH
     }
     @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
@@ -192,132 +159,4 @@ public class TransactionListAdapter extends RecyclerView.Adapter<TransactionRowH
                 String.format(Locale.US, "Got new transaction list (%d items)", newList.size()));
         listDiffer.submitList(newList);
     }
-    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;
-
-            SQLiteDatabase db = App.getDatabase();
-            tr.loadData(db);
-
-            publishProgress(new TransactionLoaderStep(p[0].holder, p[0].position, tr));
-
-            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) {
-                        row = new LinearLayout(ctx);
-                        LayoutInflater inflater = ((Activity) ctx).getLayoutInflater();
-                        inflater.inflate(R.layout.transaction_list_row_accounts_table_row, row);
-                        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()));
-            }
-        }
-    }
-
-    private static class TransactionLoaderParams {
-        final LedgerTransaction transaction;
-        final TransactionRowHolder holder;
-        final int position;
-        final String boldAccountName;
-        TransactionLoaderParams(LedgerTransaction transaction, TransactionRowHolder holder,
-                                int position, String boldAccountName) {
-            this.transaction = transaction;
-            this.holder = holder;
-            this.position = position;
-            this.boldAccountName = boldAccountName;
-        }
-    }
 }
\ No newline at end of file