X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Ftransaction_list%2FTransactionListAdapter.java;h=9d27ecfa1de9b3fe365a4db1c20947d46d4158f7;hb=32585e83b4165668a384eb43414d216601c16b31;hp=7004dd7d8d026aa1446bf6b64a51bc692460730b;hpb=bde37d0aa472d31606b53491240c79af3374f09b;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 7004dd7d..9d27ecfa 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,18 +1,18 @@
/*
* Copyright © 2019 Damyan Ivanov.
- * This file is part of Mobile-Ledger.
- * Mobile-Ledger is free software: you can distribute it and/or modify it
+ * 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;
@@ -21,9 +21,9 @@ 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;
@@ -34,26 +34,85 @@ 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.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.RecyclerView;
+
import static net.ktnx.mobileledger.utils.DimensionUtils.dp2px;
public class TransactionListAdapter extends RecyclerView.Adapter {
private String boldAccountName;
public void onBindViewHolder(@NonNull TransactionRowHolder holder, int position) {
- LedgerTransaction tr = TransactionListViewModel.getTransaction(position);
+ TransactionListItem item = TransactionListViewModel.getTransactionListItem(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;
+ 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,
-// tr.getAccounts().size()));
+ // 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));
+ TransactionLoader loader = new TransactionLoader();
+ loader.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR,
+ new TransactionLoaderParams(tr, holder, position, boldAccountName,
+ item.isOdd()));
+
+ // 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);
+ }
+ break;
+ case TRAILER:
+ holder.vTransaction.setVisibility(View.GONE);
+ holder.vTrailer.setVisibility(View.VISIBLE);
+ holder.vDelimiter.setVisibility(View.GONE);
+
+ break;
+ }
}
@NonNull
@@ -67,7 +126,7 @@ public class TransactionListAdapter extends RecyclerView.Adapter