From e142e3960b13da487eedb07a515b2deb6a9aabb2 Mon Sep 17 00:00:00 2001 From: Hafiz Date: Tue, 2 May 2023 13:24:40 -0400 Subject: [PATCH] Update todo text colors When the date is gray, use the lighter gray we use for things like alarms and streaks (Gray300 in light mode) When the date is red, it should be red100 in dark mode (showing as the darker maroon we use in light mode) --- Habitica/res/values-night/colors.xml | 1 + Habitica/res/values/colors.xml | 1 + .../android/habitica/ui/viewHolders/tasks/TodoViewHolder.kt | 3 ++- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Habitica/res/values-night/colors.xml b/Habitica/res/values-night/colors.xml index b5db0e555..8b3ad7f16 100644 --- a/Habitica/res/values-night/colors.xml +++ b/Habitica/res/values-night/colors.xml @@ -62,5 +62,6 @@ @color/green_500 @color/gray_400 @color/gray_10 + @color/red_100 diff --git a/Habitica/res/values/colors.xml b/Habitica/res/values/colors.xml index 9ce855bde..6c9806637 100644 --- a/Habitica/res/values/colors.xml +++ b/Habitica/res/values/colors.xml @@ -129,4 +129,5 @@ @color/green_10 @color/gray_200 @color/gray_700 + @color/maroon_100 diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/TodoViewHolder.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/TodoViewHolder.kt index c948f2173..cd92725ab 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/TodoViewHolder.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/TodoViewHolder.kt @@ -40,9 +40,10 @@ class TodoViewHolder( specialTaskTextView?.text = context.getString(R.string.today) } else if (task.isDayOrMorePastDue() == true) { task.dueDate?.let { specialTaskTextView?.text = dateFormatter.format(it) } - specialTaskTextView?.setTextColor(ContextCompat.getColor(context, R.color.maroon_100)) + specialTaskTextView?.setTextColor(ContextCompat.getColor(context, R.color.maroon100_red100)) } else { task.dueDate?.let { specialTaskTextView?.text = dateFormatter.format(it) } + specialTaskTextView?.setTextColor(ContextCompat.getColor(context, R.color.gray_300)) } this.specialTaskTextView?.visibility = View.VISIBLE calendarIconView?.visibility = View.VISIBLE