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;
// tr.getAccounts().size()));
TransactionLoader loader = new TransactionLoader();
- loader.execute(new TransactionLoaderParams(tr, holder, position, boldAccountName));
+ 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
if (item.isMonthShown()) {
holder.tvDelimiterMonth.setText(Globals.monthNames[date.getMonth()]);
holder.tvDelimiterMonth.setVisibility(View.VISIBLE);
- holder.vDelimiterLine.setBackgroundResource(R.drawable.dashed_border_8dp);
+// 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.setBackgroundResource(R.drawable.dashed_border_1dp);
+ holder.vDelimiterLine.setVisibility(View.VISIBLE);
+ holder.vDelimiterThick.setVisibility(View.GONE);
}
}
}
@Override
protected Void doInBackground(TransactionLoaderParams... p) {
LedgerTransaction tr = p[0].transaction;
+ boolean odd = p[0].odd;
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()) {
case HEAD:
holder.tvDescription.setText(step.getTransaction().getDescription());
- if (step.getPosition() % 2 == 0) {
- holder.row.setBackgroundColor(Globals.tableRowEvenBG);
- }
- else {
- holder.row.setBackgroundColor(Globals.tableRowOddBG);
- }
+ if (step.isOdd()) holder.row.setBackgroundColor(Globals.tableRowDarkBG);
+ else holder.row.setBackgroundColor(Globals.tableRowLightBG);
break;
case ACCOUNTS:
}
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);
+ if ((boldAccountName != null) &&
+ acc.getAccountName().startsWith(boldAccountName))
+ {
accName.setTextColor(Globals.primaryDark);
accAmount.setTextColor(Globals.primaryDark);
+
+ SpannableString ss = new SpannableString(acc.getAccountName());
+ ss.setSpan(new StyleSpan(Typeface.BOLD), 0, boldAccountName.length(),
+ Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+ accName.setText(ss);
}
else {
- accName.setTypeface(null, Typeface.NORMAL);
- accAmount.setTypeface(null, Typeface.NORMAL);
accName.setTextColor(Globals.defaultTextColor);
accAmount.setTextColor(Globals.defaultTextColor);
+ accName.setText(acc.getAccountName());
}
+ accAmount.setText(acc.toString());
break;
case DONE:
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