X-Git-Url: https://git.ktnx.net/?p=mobile-ledger-staging.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Ftransaction_list%2FTransactionListAdapter.java;h=492c6151266a31540543c1f7cdf368234bc33afb;hp=1e9d2d43fd046178180a0f3534353a0b0bbbbf76;hb=20c03b7a5eb152d42fbbe9ecbaae27530563b398;hpb=abd5a19252bf81af903c3406132030e3ad63704f 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 1e9d2d43..492c6151 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 © 2019 Damyan Ivanov. + * 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 @@ -17,6 +17,7 @@ package net.ktnx.mobileledger.ui.transaction_list; +import android.app.Activity; import android.content.Context; import android.database.sqlite.SQLiteDatabase; import android.graphics.Typeface; @@ -24,93 +25,139 @@ import android.os.AsyncTask; import android.text.Spannable; import android.text.SpannableString; import android.text.style.StyleSpan; -import android.view.Gravity; 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.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.MLDB; +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.Date; import java.util.GregorianCalendar; +import java.util.List; +import java.util.Locale; import java.util.TimeZone; -import androidx.annotation.NonNull; -import androidx.appcompat.widget.AppCompatTextView; -import androidx.recyclerview.widget.RecyclerView; - -import static net.ktnx.mobileledger.utils.DimensionUtils.dp2px; - public class TransactionListAdapter extends RecyclerView.Adapter { - private String boldAccountName; + private final MainModel model; + private final AsyncListDiffer listDiffer; + public TransactionListAdapter(MainModel model) { + super(); + this.model = model; + + listDiffer = new AsyncListDiffer<>(this, new DiffUtil.ItemCallback() { + @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() + .getId() == newItem.getTransaction() + .getId(); + 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: + // Delimiters items are "same" for same dates and the contents are the date + return true; + case TRANSACTION: + return oldItem.getTransaction() + .equals(newItem.getTransaction()); + default: + throw new IllegalStateException( + String.format(Locale.US, "Unexpected transaction item type %s", + oldItem.getType())); + + } + } + }); + } public void onBindViewHolder(@NonNull TransactionRowHolder holder, int position) { - TransactionListItem item = TransactionListViewModel.getTransactionListItem(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 // the out-of-range get() call nothing bad happens - just a to-be-deleted view remains // a bit longer - if (item == null) return; + if (item == null) + return; switch (item.getType()) { case TRANSACTION: holder.vTransaction.setVisibility(View.VISIBLE); holder.vDelimiter.setVisibility(View.GONE); - holder.vTrailer.setVisibility(View.GONE); LedgerTransaction tr = item.getTransaction(); - // Log.d("transactions", String.format("Filling position %d with %d accounts", position, + // 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, boldAccountName, - item.isOdd())); + 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), + holder.vTransaction.measure( + View.MeasureSpec.makeMeasureSpec(holder.itemView.getWidth(), + View.MeasureSpec.EXACTLY), View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED)); break; case DELIMITER: - Date date = item.getDate(); + SimpleDate date = item.getDate(); holder.vTransaction.setVisibility(View.GONE); - holder.vTrailer.setVisibility(View.GONE); holder.vDelimiter.setVisibility(View.VISIBLE); - holder.tvDelimiterDate.setText(DateFormat.getDateInstance().format(date)); + holder.tvDelimiterDate.setText(DateFormat.getDateInstance() + .format(date.toDate())); if (item.isMonthShown()) { GregorianCalendar cal = new GregorianCalendar(TimeZone.getDefault()); - cal.setTime(date); - holder.tvDelimiterMonth - .setText(Globals.monthNames[cal.get(GregorianCalendar.MONTH)]); + 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.vDelimiterLine.setVisibility(View.GONE); + // 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.vDelimiterLine.setVisibility(View.VISIBLE); + // holder.vDelimiterLine.setBackgroundResource(R.drawable + // .dashed_border_1dp); holder.vDelimiterThick.setVisibility(View.GONE); } - break; - case TRAILER: - holder.vTransaction.setVisibility(View.GONE); - holder.vTrailer.setVisibility(View.VISIBLE); - holder.vDelimiter.setVisibility(View.GONE); - break; } } @@ -118,23 +165,22 @@ public class TransactionListAdapter extends RecyclerView.Adapter newList) { + Logger.debug("transactions", + String.format(Locale.US, "Got new transaction list (%d items)", newList.size())); + listDiffer.submitList(newList); } - enum LoaderStep {HEAD, ACCOUNTS, DONE} private static class TransactionLoader @@ -142,16 +188,16 @@ public class TransactionListAdapter extends RecyclerView.Adapter