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=7004dd7d8d026aa1446bf6b64a51bc692460730b;hb=HEAD;hpb=bde37d0aa472d31606b53491240c79af3374f09b
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 7004dd7d..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,204 +1,181 @@
/*
- * Copyright © 2019 Damyan Ivanov.
- * This file is part of Mobile-Ledger.
- * Mobile-Ledger is free software: you can distribute it and/or modify it
+ * 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
* the Free Software Foundation, either version 3 of the License, or
* (at your opinion), any later version.
*
- * Mobile-Ledger is distributed in the hope that it will be useful,
+ * MoLe is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License terms for details.
*
* You should have received a copy of the GNU General Public License
- * along with Mobile-Ledger. If not, see .
+ * along with MoLe. If not, see .
*/
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.support.annotation.NonNull;
-import android.support.v7.widget.AppCompatTextView;
-import android.support.v7.widget.RecyclerView;
-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.LedgerTransaction;
-import net.ktnx.mobileledger.model.LedgerTransactionAccount;
-import net.ktnx.mobileledger.utils.Globals;
-import net.ktnx.mobileledger.utils.MLDB;
-
-import static net.ktnx.mobileledger.utils.DimensionUtils.dp2px;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.AsyncListDiffer;
+import androidx.recyclerview.widget.DiffUtil;
+import androidx.recyclerview.widget.RecyclerView;
+
+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()));
+
+ }
+ }
+ });
+ }
+ @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);
-public class TransactionListAdapter extends RecyclerView.Adapter {
- private String boldAccountName;
- public void onBindViewHolder(@NonNull TransactionRowHolder holder, int position) {
- LedgerTransaction tr = TransactionListViewModel.getTransaction(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 (tr == null) return;
-
-// Log.d("transactions", String.format("Filling position %d with %d accounts", position,
-// tr.getAccounts().size()));
-
- TransactionLoader loader = new TransactionLoader();
- loader.execute(new TransactionLoaderParams(tr, holder, position, boldAccountName));
+ if (item == null)
+ return;
+
+ final TransactionListItem.Type newType = item.getType();
+
+ switch (newType) {
+ case TRANSACTION:
+ holder.asTransaction()
+ .bind(item, item.getBoldAccountName());
+
+ break;
+ case DELIMITER:
+ 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) {
-// Log.d("perf", "onCreateViewHolder called");
- View row = LayoutInflater.from(parent.getContext())
- .inflate(R.layout.transaction_list_row, parent, false);
- return new TransactionRowHolder(row);
+ public TransactionRowHolderBase onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+// debug("perf", "onCreateViewHolder called");
+ 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 TransactionListViewModel.getTransactionCount();
- }
- public void setBoldAccountName(String boldAccountName) {
- this.boldAccountName = boldAccountName;
+ return listDiffer.getCurrentList()
+ .size();
}
- public void resetBoldAccountName() {
- this.boldAccountName = null;
- }
-
- enum LoaderStep {HEAD, ACCOUNTS, DONE}
-
- private static class TransactionLoader
- extends AsyncTask {
- @Override
- protected Void doInBackground(TransactionLoaderParams... p) {
- LedgerTransaction tr = p[0].transaction;
-
- SQLiteDatabase db = MLDB.getReadableDatabase();
- tr.loadData(db);
-
- publishProgress(new TransactionLoaderStep(p[0].holder, p[0].position, tr));
-
- int rowIndex = 0;
- for (LedgerTransactionAccount acc : tr.getAccounts()) {
-// Log.d(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());
- holder.tvDate.setText(step.getTransaction().getDate());
-
- if (step.getPosition() % 2 == 0) {
- holder.row.setBackgroundColor(Globals.tableRowEvenBG);
- }
- else {
- holder.row.setBackgroundColor(Globals.tableRowOddBG);
- }
-
- 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();
-
- accName.setText(acc.getAccountName());
- accAmount.setText(acc.toString());
-
-// Log.d("tmp", String.format("showing acc row %d: %s %1.2f", rowIndex,
-// acc.getAccountName(), acc.getAmount()));
-
- String boldAccountName = step.getBoldAccountName();
- if ((boldAccountName != null) && boldAccountName.equals(acc.getAccountName())) {
- accName.setTypeface(null, Typeface.BOLD);
- accAmount.setTypeface(null, Typeface.BOLD);
- accName.setTextColor(Globals.primaryDark);
- accAmount.setTextColor(Globals.primaryDark);
- }
- else {
- accName.setTypeface(null, Typeface.NORMAL);
- accAmount.setTypeface(null, Typeface.NORMAL);
- accName.setTextColor(Globals.defaultTextColor);
- accAmount.setTextColor(Globals.defaultTextColor);
- }
-
- break;
- case DONE:
- int accCount = step.getAccountCount();
- if (holder.tableAccounts.getChildCount() > accCount) {
- holder.tableAccounts.removeViews(accCount,
- holder.tableAccounts.getChildCount() - accCount);
- }
-
-// Log.d("transactions",
-// String.format("Position %d fill done", step.getPosition()));
- }
- }
- }
-
- private class TransactionLoaderParams {
- LedgerTransaction transaction;
- TransactionRowHolder holder;
- int position;
- String boldAccountName;
- TransactionLoaderParams(LedgerTransaction transaction, TransactionRowHolder holder,
- int position, String boldAccountName) {
- this.transaction = transaction;
- this.holder = holder;
- this.position = position;
- this.boldAccountName = boldAccountName;
- }
+ 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