From c16115f71a3a787276da21fceb6c44c0de0cedf7 Mon Sep 17 00:00:00 2001
From: Rashad Sookram <rashad@signal.org>
Date: Wed, 8 Dec 2021 13:31:34 -0500
Subject: [PATCH] Fix color of close button on normal reminders.

This change also prevents the title from overlapping with the close
button.
---
 .../securesms/components/reminder/ReminderView.java           | 4 ++++
 app/src/main/res/layout/reminder_header.xml                   | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/reminder/ReminderView.java b/app/src/main/java/org/thoughtcrime/securesms/components/reminder/ReminderView.java
index 458db2e146..d076178a06 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/reminder/ReminderView.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/reminder/ReminderView.java
@@ -117,6 +117,10 @@ public final class ReminderView extends FrameLayout {
       }
     });
 
+    if (reminder.getImportance() == Reminder.Importance.NORMAL) {
+      closeButton.setColorFilter(ContextCompat.getColor(getContext(), R.color.signal_text_primary));
+    }
+
     int progress = reminder.getProgress();
     if (progress != -1) {
       progressBar.setProgress(progress);
diff --git a/app/src/main/res/layout/reminder_header.xml b/app/src/main/res/layout/reminder_header.xml
index f1b131c41a..acb4696b20 100644
--- a/app/src/main/res/layout/reminder_header.xml
+++ b/app/src/main/res/layout/reminder_header.xml
@@ -48,7 +48,7 @@
 
     <TextView
         android:id="@+id/reminder_title"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
         android:layout_marginTop="20dp"
@@ -57,6 +57,7 @@
         android:textSize="20sp"
         android:fontFamily="sans-serif-medium"
         app:layout_constraintBottom_toTopOf="@id/reminder_text"
+        app:layout_constraintEnd_toStartOf="@id/cancel"
         app:layout_constraintStart_toEndOf="@id/reminder_progress"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_goneMarginStart="16dp"