X-Git-Url: https://git.ktnx.net/?p=mobile-ledger.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2FTransactionListAdapter.java;h=41c3cdd551eaa6b08a12c82e02def820314377eb;hp=96cbfba856cc010b80d8b94c95198b2a797a9825;hb=14873dbc3aa249dc5af735c8906be1a19b5f7dda;hpb=0c437b5ed0d9da7e9340cb247d036cd141598065 diff --git a/app/src/main/java/net/ktnx/mobileledger/TransactionListAdapter.java b/app/src/main/java/net/ktnx/mobileledger/TransactionListAdapter.java index 96cbfba8..41c3cdd5 100644 --- a/app/src/main/java/net/ktnx/mobileledger/TransactionListAdapter.java +++ b/app/src/main/java/net/ktnx/mobileledger/TransactionListAdapter.java @@ -19,6 +19,7 @@ package net.ktnx.mobileledger; import android.content.Context; import android.database.sqlite.SQLiteDatabase; +import android.graphics.Typeface; import android.support.annotation.NonNull; import android.support.constraint.ConstraintLayout; import android.support.v7.widget.AppCompatTextView; @@ -33,29 +34,27 @@ import android.widget.TextView; import net.ktnx.mobileledger.model.LedgerTransaction; import net.ktnx.mobileledger.model.LedgerTransactionAccount; +import net.ktnx.mobileledger.ui.transaction_list.TransactionListViewModel; import net.ktnx.mobileledger.utils.Globals; import net.ktnx.mobileledger.utils.MLDB; -import java.util.List; - import static net.ktnx.mobileledger.utils.DimensionUtils.dp2px; class TransactionListAdapter extends RecyclerView.Adapter { - private List transactions; - - TransactionListAdapter(List transactions) { - this.transactions = transactions; + TransactionListViewModel model; + private String boldAccountName; + public TransactionListAdapter(TransactionListViewModel model) { + this.model = model; } - public void onBindViewHolder(@NonNull TransactionRowHolder holder, int position) { + LedgerTransaction tr = model.getTransaction(position); // in a race when transaction list 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 (position >= transactions.size()) return; + if (tr == null) return; - LedgerTransaction tr = transactions.get(position); Context ctx = holder.row.getContext(); try (SQLiteDatabase db = MLDB.getReadableDatabase(ctx)) { @@ -76,8 +75,9 @@ class TransactionListAdapter 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.setLayoutParams( + new LinearLayout.LayoutParams(0, LinearLayout.LayoutParams.WRAP_CONTENT, + 5f)); accName.setTextAlignment(View.TEXT_ALIGNMENT_VIEW_START); row.addView(accName); accAmount = new AppCompatTextView(ctx); @@ -95,8 +95,22 @@ class TransactionListAdapter accName = (TextView) row.getChildAt(0); accAmount = (TextView) row.getChildAt(1); } - accName.setText(acc.getShortAccountName()); + accName.setText(acc.getAccountName()); accAmount.setText(acc.toString()); + + 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); + } + } if (holder.tableAccounts.getChildCount() > rowIndex) { holder.tableAccounts @@ -109,6 +123,8 @@ class TransactionListAdapter else { holder.row.setBackgroundColor(Globals.table_row_odd_bg); } + + Log.d("transactions", String.format("Filled position %d", position)); } } @@ -123,7 +139,13 @@ class TransactionListAdapter @Override public int getItemCount() { - return transactions.size(); + return model.getTransactionCount(); + } + public void setBoldAccountName(String boldAccountName) { + this.boldAccountName = boldAccountName; + } + public void resetBoldAccountName() { + this.boldAccountName = null; } class TransactionRowHolder extends RecyclerView.ViewHolder { TextView tvDescription, tvDate;