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=a15ab0f6c68c18220db79d4ef0a3c17c2799ea5d;hb=HEAD;hpb=c6dd0097d1e6f59b0c82b36b103e7ccdafb1f85d 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 a15ab0f6..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 © 2019 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,240 +17,165 @@ package net.ktnx.mobileledger.ui.transaction_list; -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.Gravity; import android.view.LayoutInflater; -import android.view.View; import android.view.ViewGroup; -import android.widget.LinearLayout; -import android.widget.TextView; - -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.model.TransactionListItem; -import net.ktnx.mobileledger.utils.Colors; -import net.ktnx.mobileledger.utils.Globals; -import net.ktnx.mobileledger.utils.MLDB; - -import java.text.DateFormat; -import java.util.Date; -import java.util.GregorianCalendar; -import java.util.TimeZone; import androidx.annotation.NonNull; -import androidx.appcompat.widget.AppCompatTextView; +import androidx.recyclerview.widget.AsyncListDiffer; +import androidx.recyclerview.widget.DiffUtil; import androidx.recyclerview.widget.RecyclerView; -import static net.ktnx.mobileledger.utils.DimensionUtils.dp2px; +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.Logger; +import net.ktnx.mobileledger.utils.Misc; + +import java.util.List; +import java.util.Locale; + +public class TransactionListAdapter extends RecyclerView.Adapter { + private final AsyncListDiffer listDiffer; + public TransactionListAdapter() { + super(); + + setHasStableIds(true); + + 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() + .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 { - 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 // the out-of-range get() call nothing bad happens - just a to-be-deleted view remains // a bit longer - 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(); + if (item == null) + return; - // 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: - Date 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)); - if (item.isMonthShown()) { - GregorianCalendar cal = new GregorianCalendar(TimeZone.getDefault()); - cal.setTime(date); - 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.vDelimiterThick.setVisibility(View.VISIBLE); - } - else { - holder.tvDelimiterMonth.setVisibility(View.GONE); - // holder.vDelimiterLine.setBackgroundResource(R.drawable.dashed_border_1dp); - holder.vDelimiterLine.setVisibility(View.VISIBLE); - holder.vDelimiterThick.setVisibility(View.GONE); - } + holder.asDelimiter() + .bind(item); break; - case TRAILER: - holder.vTransaction.setVisibility(View.GONE); - holder.vTrailer.setVisibility(View.VISIBLE); - holder.vDelimiter.setVisibility(View.GONE); + 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 { - @Override - protected Void doInBackground(TransactionLoaderParams... p) { - LedgerTransaction tr = p[0].transaction; - boolean odd = p[0].odd; - - SQLiteDatabase db = MLDB.getDatabase(); - tr.loadData(db); - - publishProgress(new TransactionLoaderStep(p[0].holder, p[0].position, tr, odd)); - - int rowIndex = 0; - 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()); - - 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); - TextView accName, accAmount; - if (row == null) { - row = new LinearLayout(ctx); - row.setLayoutParams(new LinearLayout.LayoutParams( - LinearLayout.LayoutParams.MATCH_PARENT, - LinearLayout.LayoutParams.WRAP_CONTENT)); - row.setGravity(Gravity.CENTER_VERTICAL); - row.setOrientation(LinearLayout.HORIZONTAL); - row.setPaddingRelative(dp2px(ctx, 8), 0, 0, 0); - accName = new AppCompatTextView(ctx); - accName.setLayoutParams(new LinearLayout.LayoutParams(0, - LinearLayout.LayoutParams.WRAP_CONTENT, 5f)); - accName.setTextAlignment(View.TEXT_ALIGNMENT_VIEW_START); - row.addView(accName); - accAmount = new AppCompatTextView(ctx); - LinearLayout.LayoutParams llp = new LinearLayout.LayoutParams( - LinearLayout.LayoutParams.WRAP_CONTENT, - LinearLayout.LayoutParams.WRAP_CONTENT); - llp.setMarginEnd(0); - accAmount.setLayoutParams(llp); - accAmount.setTextAlignment(View.TEXT_ALIGNMENT_VIEW_END); - accAmount.setMinWidth(dp2px(ctx, 60)); - row.addView(accAmount); - holder.tableAccounts.addView(row); - } - else { - accName = (TextView) row.getChildAt(0); - accAmount = (TextView) row.getChildAt(1); - } - 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.accent); - accAmount.setTextColor(Colors.accent); - - SpannableString ss = new SpannableString(acc.getAccountName()); - ss.setSpan(new StyleSpan(Typeface.BOLD), 0, boldAccountName.length(), - Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); - accName.setText(ss); - } - else { - accName.setTextColor(Colors.defaultTextColor); - accAmount.setTextColor(Colors.defaultTextColor); - accName.setText(acc.getAccountName()); - } - 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 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