X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;ds=inline;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Ftransaction_list%2FTransactionListAdapter.java;h=ff84c36e5e2e8ba42db52cea1536408e9049f013;hb=adf69118b53d51145ad6cd59ffe9a654f1305662;hp=f4a0bcbb11dd22682fc91206dde12d88a3791541;hpb=6f8d7eb0ab9e5754047ac5bda47868860b5f71e2;p=mobile-ledger-staging.git
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 f4a0bcbb..ff84c36e 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,132 +1,197 @@
/*
- * 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 © 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
* 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.app.Activity;
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.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.Data;
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 static net.ktnx.mobileledger.utils.DimensionUtils.dp2px;
+import java.util.GregorianCalendar;
+import java.util.List;
+import java.util.Locale;
+import java.util.TimeZone;
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();
+ 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:
+ // Delimiters items are "same" for same dates and the contents are the date
+ return true;
+ case TRANSACTION:
+ return oldItem.getTransaction()
+ .equals(newItem.getTransaction());
+ 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 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()) {
+ final TransactionListItem.Type newType = item.getType();
+ holder.setType(newType);
+
+ switch (newType) {
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.execute(new TransactionLoaderParams(tr, holder, position, boldAccountName,
- item.isOdd()));
+ 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),
+ 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));
+ SimpleDate date = item.getDate();
+ holder.tvDelimiterDate.setText(DateFormat.getDateInstance()
+ .format(date.toDate()));
if (item.isMonthShown()) {
- holder.tvDelimiterMonth.setText(Globals.monthNames[date.getMonth()]);
+ 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.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);
+ case HEADER:
+ holder.setLastUpdateText(Data.lastTransactionsUpdateText.get());
break;
+ default:
+ throw new IllegalStateException("Unexpected value: " + newType);
}
}
-
@NonNull
@Override
public TransactionRowHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-// Log.d("perf", "onCreateViewHolder called");
+// debug("perf", "onCreateViewHolder called");
View row = LayoutInflater.from(parent.getContext())
- .inflate(R.layout.transaction_list_row, parent, false);
+ .inflate(R.layout.transaction_list_row, parent, false);
return new TransactionRowHolder(row);
}
@Override
public int getItemCount() {
- return TransactionListViewModel.getTransactionCount() + 1;
+ return listDiffer.getCurrentList()
+ .size();
}
- public void setBoldAccountName(String boldAccountName) {
- 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);
}
- public void resetBoldAccountName() {
- this.boldAccountName = null;
- }
-
enum LoaderStep {HEAD, ACCOUNTS, DONE}
private static class TransactionLoader
@@ -134,16 +199,16 @@ public class TransactionListAdapter extends RecyclerView.Adapter