From d1d7498447ad240c32212ddb5f6924b85c006e4a Mon Sep 17 00:00:00 2001
From: Alan Evans <alan@signal.org>
Date: Mon, 22 Jun 2020 10:02:09 -0300
Subject: [PATCH] Fix text colors when system theme doesn't match.

---
 app/src/main/res/color/text_color_light_theme.xml           | 5 +++++
 app/src/main/res/color/text_color_secondary_light_theme.xml | 5 +++++
 app/src/main/res/values/themes.xml                          | 2 ++
 3 files changed, 12 insertions(+)
 create mode 100644 app/src/main/res/color/text_color_light_theme.xml
 create mode 100644 app/src/main/res/color/text_color_secondary_light_theme.xml

diff --git a/app/src/main/res/color/text_color_light_theme.xml b/app/src/main/res/color/text_color_light_theme.xml
new file mode 100644
index 0000000000..6eb49ffcaa
--- /dev/null
+++ b/app/src/main/res/color/text_color_light_theme.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+<item android:state_enabled="false" android:color="@color/core_grey_50"/>
+<item android:color="@color/core_grey_90"/>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/color/text_color_secondary_light_theme.xml b/app/src/main/res/color/text_color_secondary_light_theme.xml
new file mode 100644
index 0000000000..5f5cbf8149
--- /dev/null
+++ b/app/src/main/res/color/text_color_secondary_light_theme.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+<item android:state_enabled="false" android:color="@color/core_grey_50"/>
+<item android:color="@color/core_grey_60"/>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 4792834527..7851dabed2 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -180,6 +180,8 @@
         <item name="actionModeBackground">@color/core_grey_50</item>
         <item name="actionModeCloseDrawable">@drawable/ic_close_white_24dp</item>
         <item name="actionModeStyle">@style/TextSecure.ActionModeStyle</item>
+        <item name="android:textColor">@color/text_color_light_theme</item>
+        <item name="android:textColorSecondary">@color/text_color_secondary_light_theme</item>
         <item name="colorPrimary">@color/core_ultramarine</item>
         <item name="colorPrimaryDark">@color/core_ultramarine</item>
         <item name="colorAccent">@color/core_ultramarine</item>