/*
- * Copyright © 2018 Damyan Ivanov.
+ * Copyright © 2019 Damyan Ivanov.
* This file is part of Mobile-Ledger.
* Mobile-Ledger is free software: you can distribute it and/or modify it
* under the term of the GNU General Public License as published by
import android.support.annotation.NonNull;
import android.support.v7.widget.AppCompatTextView;
import android.support.v7.widget.RecyclerView;
-import android.util.Log;
import android.view.Gravity;
import android.view.LayoutInflater;
import android.view.View;
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.Globals;
import net.ktnx.mobileledger.utils.MLDB;
+import java.text.DateFormat;
+import java.util.Date;
+
import static net.ktnx.mobileledger.utils.DimensionUtils.dp2px;
public class TransactionListAdapter extends RecyclerView.Adapter<TransactionRowHolder> {
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;
-
- Log.d("transactions", String.format("Filling position %d", position));
-
- TransactionLoader loader = new TransactionLoader();
- loader.execute(new TransactionLoaderParams(tr, holder, position, boldAccountName));
+ if (item == null) return;
+
+ if (item.getType() == TransactionListItem.Type.TRANSACTION) {
+ holder.vTransaction.setVisibility(View.VISIBLE);
+ holder.vDelimiter.setVisibility(View.GONE);
+ LedgerTransaction tr = item.getTransaction();
+
+// 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,
+ 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));
+ }
+ else {
+ Date date = item.getDate();
+ holder.vTransaction.setVisibility(View.GONE);
+ holder.vDelimiter.setVisibility(View.VISIBLE);
+ holder.tvDelimiterDate.setText(DateFormat.getDateInstance().format(date));
+ if (item.isMonthShown()) {
+ holder.tvDelimiterMonth.setText(Globals.monthNames[date.getMonth()]);
+ holder.tvDelimiterMonth.setVisibility(View.VISIBLE);
+ holder.vDelimiterLine.setBackgroundResource(R.drawable.dashed_border_8dp);
+ }
+ else {
+ holder.tvDelimiterMonth.setVisibility(View.GONE);
+ holder.vDelimiterLine.setBackgroundResource(R.drawable.dashed_border_1dp);
+ }
+ }
}
@NonNull
@Override
public TransactionRowHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
- Log.d("perf", "onCreateViewHolder called");
+// Log.d("perf", "onCreateViewHolder called");
View row = LayoutInflater.from(parent.getContext())
.inflate(R.layout.transaction_list_row, parent, false);
return new TransactionRowHolder(row);
@Override
protected Void doInBackground(TransactionLoaderParams... p) {
LedgerTransaction tr = p[0].transaction;
+ boolean odd = p[0].odd;
- try (SQLiteDatabase db = MLDB.getReadableDatabase()) {
- tr.loadData(db);
+ SQLiteDatabase db = MLDB.getReadableDatabase();
+ tr.loadData(db);
- publishProgress(new TransactionLoaderStep(p[0].holder, p[0].position, tr));
+ publishProgress(new TransactionLoaderStep(p[0].holder, p[0].position, tr, odd));
- int rowIndex = 0;
- for (LedgerTransactionAccount acc : tr.getAccounts()) {
- publishProgress(new TransactionLoaderStep(p[0].holder, acc, rowIndex++,
- p[0].boldAccountName));
- }
-
- publishProgress(new TransactionLoaderStep(p[0].holder, p[0].position, rowIndex));
+ 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
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.table_row_even_bg);
- }
- else {
- holder.row.setBackgroundColor(Globals.table_row_odd_bg);
- }
+ if (step.isOdd()) holder.row.setBackgroundColor(Globals.tableRowDarkBG);
+ else holder.row.setBackgroundColor(Globals.tableRowLightBG);
break;
case ACCOUNTS:
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);
holder.tableAccounts.getChildCount() - accCount);
}
- Log.d("transactions",
- String.format("Position %d fill done", step.getPosition()));
+// Log.d("transactions",
+// String.format("Position %d fill done", step.getPosition()));
}
}
}
TransactionRowHolder holder;
int position;
String boldAccountName;
+ boolean odd;
TransactionLoaderParams(LedgerTransaction transaction, TransactionRowHolder holder,
- int position, String boldAccountName) {
+ int position, String boldAccountName, boolean odd) {
this.transaction = transaction;
this.holder = holder;
this.position = position;
this.boldAccountName = boldAccountName;
+ this.odd = odd;
}
}
}
\ No newline at end of file
projects / mobile-ledger.git / blobdiff