From fe71d6ac4107b736911438b1e310daabb42d389f Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Sat, 16 Jan 2021 17:06:49 -0500
Subject: [PATCH] Make outage banner color less aggressive.

---
 .../securesms/components/reminder/ReminderView.java         | 3 +++
 app/src/main/res/drawable/reminder_background_error.xml     | 6 +++---
 app/src/main/res/values/core_colors.xml                     | 2 ++
 3 files changed, 8 insertions(+), 3 deletions(-)

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 a87d499854..4de9ab7216 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
@@ -14,6 +14,7 @@ import android.widget.TextView;
 
 import androidx.annotation.IdRes;
 import androidx.annotation.Nullable;
+import androidx.core.content.ContextCompat;
 import androidx.recyclerview.widget.RecyclerView;
 
 import org.thoughtcrime.securesms.R;
@@ -78,6 +79,7 @@ public final class ReminderView extends FrameLayout {
     }
 
     text.setText(reminder.getText());
+    text.setTextColor(ContextCompat.getColor(getContext(), R.color.signal_button_primary_text));
 
     switch (reminder.getImportance()) {
       case NORMAL:
@@ -85,6 +87,7 @@ public final class ReminderView extends FrameLayout {
         break;
       case ERROR:
         container.setBackgroundResource(R.drawable.reminder_background_error);
+        text.setTextColor(ContextCompat.getColor(getContext(), R.color.signal_text_primary));
         break;
       case TERMINAL:
         container.setBackgroundResource(R.drawable.reminder_background_terminal);
diff --git a/app/src/main/res/drawable/reminder_background_error.xml b/app/src/main/res/drawable/reminder_background_error.xml
index c5e5cd817f..0d20ba5faf 100644
--- a/app/src/main/res/drawable/reminder_background_error.xml
+++ b/app/src/main/res/drawable/reminder_background_error.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true" android:drawable="@color/core_red_highlight" />
-    <item android:state_focused="true" android:drawable="@color/core_red_highlight" />
-    <item android:drawable="@color/core_red" />
+    <item android:state_pressed="true" android:drawable="@color/reminder_background" />
+    <item android:state_focused="true" android:drawable="@color/reminder_background" />
+    <item android:drawable="@color/reminder_background" />
 </selector>
diff --git a/app/src/main/res/values/core_colors.xml b/app/src/main/res/values/core_colors.xml
index 84850146ba..4ee3f24150 100644
--- a/app/src/main/res/values/core_colors.xml
+++ b/app/src/main/res/values/core_colors.xml
@@ -16,6 +16,8 @@
     <color name="core_white">#ffffff</color>
     <color name="core_black">#000000</color>
 
+    <color name="reminder_background">#fcf0d9</color>
+
     <color name="core_grey_02">#f6f6f6</color>
     <color name="core_grey_05">#e9e9e9</color>
     <color name="core_grey_10">#e2e2e2</color>