/*
- * Copyright © 2019 Damyan Ivanov.
+ * 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
import android.widget.LinearLayout;
import android.widget.TextView;
+import androidx.annotation.ColorInt;
import androidx.annotation.NonNull;
import androidx.recyclerview.widget.RecyclerView;
import net.ktnx.mobileledger.model.TransactionListItem;
import net.ktnx.mobileledger.utils.Colors;
import net.ktnx.mobileledger.utils.Globals;
+import net.ktnx.mobileledger.utils.Misc;
+import net.ktnx.mobileledger.utils.SimpleDate;
import java.text.DateFormat;
-import java.util.Date;
import java.util.GregorianCalendar;
import java.util.TimeZone;
View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED));
break;
case DELIMITER:
- Date date = item.getDate();
+ SimpleDate date = item.getDate();
holder.vTransaction.setVisibility(View.GONE);
holder.vDelimiter.setVisibility(View.VISIBLE);
holder.tvDelimiterDate.setText(DateFormat.getDateInstance()
- .format(date));
+ .format(date.toDate()));
if (item.isMonthShown()) {
GregorianCalendar cal = new GregorianCalendar(TimeZone.getDefault());
- cal.setTime(date);
+ 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.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 HEAD:
holder.tvDescription.setText(step.getTransaction()
.getDescription());
+ String trComment = Misc.emptyIsNull(step.getTransaction()
+ .getComment());
+ if (trComment == null)
+ holder.tvComment.setVisibility(View.GONE);
+ else {
+ holder.tvComment.setText(trComment);
+ holder.tvComment.setVisibility(View.VISIBLE);
+ }
- if (step.isOdd())
- holder.row.setBackgroundColor(Colors.tableRowDarkBG);
- else
- holder.row.setBackgroundColor(Colors.tableRowLightBG);
+// if (step.isOdd())
+// holder.row.setBackgroundColor(Colors.tableRowDarkBG);
+// else
+// holder.row.setBackgroundColor(Colors.tableRowLightBG);
break;
case ACCOUNTS:
// the accounts remain with their default text (set in the layout resource)
holder.tableAccounts.addView(row);
}
+ TextView dummyText = row.findViewById(R.id.dummy_text);
TextView accName = row.findViewById(R.id.transaction_list_acc_row_acc_name);
TextView accComment =
row.findViewById(R.id.transaction_list_acc_row_acc_comment);
accName.setText(ss);
}
else {
- accName.setTextColor(Colors.defaultTextColor);
- accAmount.setTextColor(Colors.defaultTextColor);
+ @ColorInt int textColor = dummyText.getTextColors()
+ .getDefaultColor();
+ accName.setTextColor(textColor);
+ accAmount.setTextColor(textColor);
accName.setText(acc.getAccountName());
}