From ad7dd7584eac0d1071531d870194415795bce8cf Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Sat, 8 Sep 2018 08:23:33 -0700
Subject: [PATCH] Fixed document display in media overview in dark theme.

Shoutout to @aleb2000 for working on this as well!

Fixes #8151
---
 res/layout/media_overview_document_item.xml | 4 +++-
 res/values/attrs.xml                        | 4 ++--
 res/values/themes.xml                       | 8 ++++----
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/res/layout/media_overview_document_item.xml b/res/layout/media_overview_document_item.xml
index 28f6d49d88..400c88cf76 100644
--- a/res/layout/media_overview_document_item.xml
+++ b/res/layout/media_overview_document_item.xml
@@ -16,6 +16,8 @@
             android:layout_gravity="center_vertical"
             android:layout_weight="1"
             android:visibility="visible"
+            app:doc_titleColor="?media_overview_document_primary"
+            app:doc_captionColor="?media_overview_document_secondary"
             tools:visibility="visible"/>
 
     <TextView android:id="@+id/date"
@@ -23,7 +25,7 @@
               android:layout_height="wrap_content"
               android:layout_gravity="center_vertical"
               android:textSize="12sp"
-              android:textColor="?attr/media_overview_document_foreground"
+              android:textColor="?media_overview_document_secondary"
               android:paddingTop="20dp"
               tools:text="Jun 1"/>
 
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index ca1ff5d318..c66374ac19 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -143,8 +143,8 @@
     <attr name="media_overview_toolbar_background" format="color"/>
     <attr name="media_overview_toolbar_foreground" format="color"/>
     <attr name="media_overview_header_foreground" format="color"/>
-    <attr name="media_overview_document_background" format="color"/>
-    <attr name="media_overview_document_foreground" format="color"/>
+    <attr name="media_overview_document_primary" format="color"/>
+    <attr name="media_overview_document_secondary" format="color"/>
 
     <attr name="shared_contact_details_header_background" format="color"/>
     <attr name="shared_contact_details_titlebar" format="color"/>
diff --git a/res/values/themes.xml b/res/values/themes.xml
index be3beacb76..4f61ea0211 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -21,8 +21,8 @@
         <item name="media_overview_toolbar_background">@color/white</item>
         <item name="media_overview_toolbar_foreground">@color/gray70</item>
         <item name="media_overview_header_foreground">@color/gray50</item>
-        <item name="media_overview_document_foreground">@color/gray70</item>
-        <item name="media_overview_document_background">@color/white</item>
+        <item name="media_overview_document_primary">@color/core_light_90</item>
+        <item name="media_overview_document_secondary">@color/core_light_60</item>
     </style>
 
     <style name="TextSecure.DarkNoActionBar" parent="@style/TextSecure.DarkTheme">
@@ -45,8 +45,8 @@
         <item name="media_overview_toolbar_background">@color/black</item>
         <item name="media_overview_toolbar_foreground">@color/white</item>
         <item name="media_overview_header_foreground">@color/gray10</item>
-        <item name="media_overview_document_foreground">@color/white</item>
-        <item name="media_overview_document_background">@color/black</item>
+        <item name="media_overview_document_primary">@color/core_dark_05</item>
+        <item name="media_overview_document_secondary">@color/core_dark_30</item>
     </style>
 
     <style name="TextSecure.HighlightTheme" parent="@style/TextSecure.LightTheme">