From 4ee607878c39d56c5f66dc5e9396bedceee93667 Mon Sep 17 00:00:00 2001
From: Moxie Marlinspike <moxie@thoughtcrime.org>
Date: Tue, 21 Feb 2017 12:37:40 -0800
Subject: [PATCH] Fix unread message conversation separator for dark theme

Fixes #6265
// FREEBIE
---
 res/drawable/last_seen_divider_text_background.xml | 2 +-
 res/layout/conversation_item_last_seen.xml         | 2 +-
 res/values/attrs.xml                               | 2 ++
 res/values/themes.xml                              | 4 ++++
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/res/drawable/last_seen_divider_text_background.xml b/res/drawable/last_seen_divider_text_background.xml
index 8814e2a0a5..ccf22d1633 100644
--- a/res/drawable/last_seen_divider_text_background.xml
+++ b/res/drawable/last_seen_divider_text_background.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle" >
-    <solid android:color="@color/white"/>
+    <solid android:color="?conversation_item_last_seen_text_background"/>
 
     <corners android:radius="65dp"/>
     <padding android:bottom="15dp" android:left="15dp" android:right="15dp" android:top="15dp"/>
diff --git a/res/layout/conversation_item_last_seen.xml b/res/layout/conversation_item_last_seen.xml
index b125457b2b..d2dd402e42 100644
--- a/res/layout/conversation_item_last_seen.xml
+++ b/res/layout/conversation_item_last_seen.xml
@@ -6,7 +6,7 @@
              android:paddingTop="10dp"
              android:paddingBottom="10dp"
              android:layout_marginBottom="5dp"
-             android:background="@drawable/last_seen_background">
+             android:background="?conversation_item_last_seen_background">
 
         <TextView android:id="@+id/text"
                   android:layout_width="wrap_content"
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 131369a817..dedd894a49 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -72,6 +72,8 @@
     <attr name="conversation_item_sent_text_indicator_tab_color" format="reference|color"/>
     <attr name="conversation_item_sent_indicator_text_background" format="reference" />
     <attr name="conversation_item_header_background" format="reference"/>
+    <attr name="conversation_item_last_seen_background" format="reference|color"/>
+    <attr name="conversation_item_last_seen_text_background" format="color"/>
 
     <attr name="dialog_info_icon" format="reference" />
     <attr name="dialog_alert_icon" format="reference" />
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 556afe5abc..56e6e50630 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -157,6 +157,8 @@
         <item name="conversation_item_received_text_primary_color">@color/white</item>
         <item name="conversation_item_received_text_secondary_color">#BFffffff</item>
         <item name="conversation_item_header_background">@drawable/conversation_item_header_background</item>
+        <item name="conversation_item_last_seen_background">@drawable/last_seen_background</item>
+        <item name="conversation_item_last_seen_text_background">@color/white</item>
 
         <item name="quick_camera_icon">@drawable/quick_camera_light</item>
         <item name="quick_mic_icon">@drawable/ic_mic_grey600_24dp</item>
@@ -244,6 +246,8 @@
         <item name="conversation_item_received_text_secondary_color">#BFffffff</item>
         <item name="conversation_item_sent_indicator_text_background">@drawable/conversation_item_sent_indicator_text_shape_dark</item>
         <item name="conversation_item_header_background">@drawable/conversation_item_header_background_dark</item>
+        <item name="conversation_item_last_seen_background">#66333333</item>
+        <item name="conversation_item_last_seen_text_background">#ff333333</item>
 
         <item name="verification_background">#ff333333</item>