From f5d1b11bda0a3bd36abd48a250c7538f23885c4e Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Fri, 27 Mar 2020 11:34:10 -0400
Subject: [PATCH] Fix some dark theme text contrast issues.

---
 app/src/main/res/layout/conversation_list_fragment.xml |  3 ++-
 .../res/layout/preference_right_summary_widget.xml     |  2 +-
 app/src/main/res/layout/quote_view.xml                 |  2 +-
 app/src/main/res/values/attrs.xml                      |  1 +
 app/src/main/res/values/core_colors.xml                |  2 +-
 app/src/main/res/values/themes.xml                     | 10 ++++++----
 6 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/app/src/main/res/layout/conversation_list_fragment.xml b/app/src/main/res/layout/conversation_list_fragment.xml
index b8f1d21b11..faedaac1d7 100644
--- a/app/src/main/res/layout/conversation_list_fragment.xml
+++ b/app/src/main/res/layout/conversation_list_fragment.xml
@@ -208,7 +208,8 @@
           android:tint="?conversation_list_compose_icon_tint"
           app:layout_constraintBottom_toTopOf="@id/megaphone_container"
           app:layout_constraintEnd_toEndOf="parent"
-          app:srcCompat="@drawable/ic_compose_solid_24" />
+          app:srcCompat="@drawable/ic_compose_solid_24"
+          app:backgroundTint="@color/core_ultramarine"/>
 
       <androidx.cardview.widget.CardView
           android:id="@+id/megaphone_container"
diff --git a/app/src/main/res/layout/preference_right_summary_widget.xml b/app/src/main/res/layout/preference_right_summary_widget.xml
index a217344e8c..e8f175d5e3 100644
--- a/app/src/main/res/layout/preference_right_summary_widget.xml
+++ b/app/src/main/res/layout/preference_right_summary_widget.xml
@@ -10,6 +10,6 @@
               android:layout_gravity="right|center_vertical"
               android:gravity="right|center_vertical"
               android:textSize="16sp"
-              android:textColor="@color/core_ultramarine"/>
+              android:textColor="?colorAccent"/>
 
 </FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/quote_view.xml b/app/src/main/res/layout/quote_view.xml
index 2f76c04d9d..532411da86 100644
--- a/app/src/main/res/layout/quote_view.xml
+++ b/app/src/main/res/layout/quote_view.xml
@@ -178,6 +178,6 @@
         android:layout_gravity="top|end"
         android:background="@drawable/dismiss_background"
         android:src="@drawable/ic_close_white_18dp"
-        android:tint="@color/core_grey_70" />
+        android:tint="?quote_dismiss_button_tint" />
 
 </merge>
\ No newline at end of file
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 3da6c28f42..6eee232cfa 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -217,6 +217,7 @@
     <attr name="pref_divider" format="reference" />
 
     <attr name="quote_missing_icon_color" format="color" />
+    <attr name="quote_dismiss_button_tint" format="color" />
 
     <declare-styleable name="CustomDefaultPreference">
         <attr name="custom_pref_toggle" format="string"/>
diff --git a/app/src/main/res/values/core_colors.xml b/app/src/main/res/values/core_colors.xml
index 75b8ddc62f..65afdde4dc 100644
--- a/app/src/main/res/values/core_colors.xml
+++ b/app/src/main/res/values/core_colors.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <color name="core_ultramarine">#2c6bed</color>
-    <color name="core_ultramarine_light">#2c6bed</color>
+    <color name="core_ultramarine_light">#6191f3</color>
     <color name="core_ultramarine_dark">#1851b4</color>
     <color name="core_ultramarine_icon">#3a76f0</color>
     <color name="core_ultramarine_33">#552c6bed</color>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 581110ed61..b4331eb68b 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -53,7 +53,7 @@
         <item name="theme_type">dark</item>
         <item name="actionBarPopupTheme">@style/ThemeOverlay.AppCompat.Dark</item>
         <item name="colorPrimary">@color/core_grey_95</item>
-        <item name="colorAccent">@color/core_ultramarine</item>
+        <item name="colorAccent">@color/core_ultramarine_light</item>
 
         <item name="recipient_preference_blocked">#d00000</item>
         <item name="contact_selection_label_text">#66eeeeee</item>
@@ -110,7 +110,7 @@
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
         <item name="windowActionModeOverlay">true</item>
-        <item name="colorAccent">@color/core_ultramarine</item>
+        <item name="colorAccent">@color/core_ultramarine_light</item>
 
         <item name="android:textColorHint">@color/white</item>
         <item name="centered_app_title_color">@color/core_grey_25</item>
@@ -401,6 +401,7 @@
         <item name="pref_divider">@drawable/preference_divider_light</item>
 
         <item name="quote_missing_icon_color">@color/core_grey_60</item>
+        <item name="quote_dismiss_button_tint">@color/core_grey_70</item>
 
         <item name="group_members_dialog_icon">@drawable/ic_group_outline_24</item>
         <item name="preferenceTheme">@style/PreferenceThemeOverlay.Fix</item>
@@ -450,7 +451,7 @@
         <item name="actionModeStyle">@style/TextSecure.ActionModeStyle</item>
         <item name="android:textColor">@color/text_color_dark_theme</item>
         <item name="android:textColorSecondary">@color/text_color_secondary_dark_theme</item>
-        <item name="colorAccent">@color/core_ultramarine</item>
+        <item name="colorAccent">@color/core_ultramarine_light</item>
         <item name="colorControlActivated">@color/core_ultramarine_light</item>
         <item name="colorControlHighlight">@color/core_ultramarine_light</item>
         <item name="android:colorControlHighlight" tools:ignore="NewApi">@color/core_ultramarine_light</item>
@@ -673,6 +674,7 @@
         <item name="pref_divider">@drawable/preference_divider_dark</item>
 
         <item name="quote_missing_icon_color">@color/core_grey_05</item>
+        <item name="quote_dismiss_button_tint">@color/core_white</item>
 
         <item name="group_members_dialog_icon">@drawable/ic_group_solid_24</item>
         <item name="preferenceTheme">@style/PreferenceThemeOverlay.Fix</item>
@@ -697,7 +699,7 @@
     </style>
 
     <style name="RationaleDialogDark.SignalAccent">
-        <item name="colorAccent">@color/core_ultramarine</item>
+        <item name="colorAccent">@color/core_ultramarine_light</item>
     </style>