From 5ffa16003c899182872ba2f55c223904f42c8a72 Mon Sep 17 00:00:00 2001
From: Oscar Mira <valldrac@molly.im>
Date: Tue, 21 Apr 2020 03:08:30 +0200
Subject: [PATCH] Restore black background as dark theme (#3)

---
 CHANGELOG.md                                  |  4 ++++
 .../selectable_background_dark.xml            |  2 +-
 .../res/drawable/preference_divider_dark.xml  |  4 ++--
 .../reaction_pill_background_dark.xml         |  2 +-
 ...reaction_pill_background_selected_dark.xml |  2 +-
 .../drawable/unread_count_background_dark.xml |  2 +-
 .../res/layout/media_preview_activity.xml     |  2 +-
 app/src/main/res/values-v21/themes.xml        | 12 +++++-----
 app/src/main/res/values-v23/themes.xml        | 12 +++++-----
 app/src/main/res/values-v27/themes.xml        | 10 ++++----
 app/src/main/res/values/styles.xml            |  4 ++--
 app/src/main/res/values/themes.xml            | 24 +++++++++----------
 12 files changed, 42 insertions(+), 38 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0150ac7bfa..93bc49fd2f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,10 @@ All notable changes to Signal will be documented in this file.
 
 ## [Unreleased]
 
+### Changed
+
+- OLED friendly dark theme.
+
 ### Fixed
 
 - Passphrase circular progressbar is not always accurate.
diff --git a/app/src/main/res/drawable-v21/selectable_background_dark.xml b/app/src/main/res/drawable-v21/selectable_background_dark.xml
index 9e78c5a05e..3b8178a4b1 100644
--- a/app/src/main/res/drawable-v21/selectable_background_dark.xml
+++ b/app/src/main/res/drawable-v21/selectable_background_dark.xml
@@ -11,7 +11,7 @@
 
     <item>
         <shape android:shape="rectangle" >
-            <solid android:color="@color/core_grey_95"/>
+            <solid android:color="@color/core_black"/>
         </shape>
     </item>
 </ripple>
diff --git a/app/src/main/res/drawable/preference_divider_dark.xml b/app/src/main/res/drawable/preference_divider_dark.xml
index d0366796c4..8e7ff531a5 100644
--- a/app/src/main/res/drawable/preference_divider_dark.xml
+++ b/app/src/main/res/drawable/preference_divider_dark.xml
@@ -4,14 +4,14 @@
     <item>
         <shape>
             <padding android:top="1dp" android:right="0dp" android:bottom="0dp" android:left="0dp" />
-            <solid android:color="@color/core_grey_95" />
+            <solid android:color="@color/core_black" />
         </shape>
     </item>
 
     <item>
         <shape>
             <padding android:top="1dp" android:right="0dp" android:bottom="0dp" android:left="0dp" />
-            <solid android:color="@color/core_grey_90" />
+            <solid android:color="@color/core_grey_95" />
             <size android:height="20dp"/>
         </shape>
     </item>
diff --git a/app/src/main/res/drawable/reaction_pill_background_dark.xml b/app/src/main/res/drawable/reaction_pill_background_dark.xml
index 210e3c9fcd..fb4e4911e4 100644
--- a/app/src/main/res/drawable/reaction_pill_background_dark.xml
+++ b/app/src/main/res/drawable/reaction_pill_background_dark.xml
@@ -2,5 +2,5 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <corners android:radius="1000dp" />
     <solid android:color="@color/core_grey_75" />
-    <stroke android:color="@color/core_grey_95" android:width="1dp" />
+    <stroke android:color="@color/core_black" android:width="1dp" />
 </shape>
diff --git a/app/src/main/res/drawable/reaction_pill_background_selected_dark.xml b/app/src/main/res/drawable/reaction_pill_background_selected_dark.xml
index 534d363c44..bfdaae99ca 100644
--- a/app/src/main/res/drawable/reaction_pill_background_selected_dark.xml
+++ b/app/src/main/res/drawable/reaction_pill_background_selected_dark.xml
@@ -2,5 +2,5 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <corners android:radius="1000dp" />
     <solid android:color="@color/core_grey_60" />
-    <stroke android:color="@color/core_grey_95" android:width="1dp" />
+    <stroke android:color="@color/core_black" android:width="1dp" />
 </shape>
diff --git a/app/src/main/res/drawable/unread_count_background_dark.xml b/app/src/main/res/drawable/unread_count_background_dark.xml
index ddaf847ecc..3af5b30fc9 100644
--- a/app/src/main/res/drawable/unread_count_background_dark.xml
+++ b/app/src/main/res/drawable/unread_count_background_dark.xml
@@ -8,7 +8,7 @@
     <solid android:color="@color/core_ultramarine" />
 
     <stroke
-        android:color="@color/core_grey_95"
+        android:color="@color/core_black"
         android:width="1dp"/>
 
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/media_preview_activity.xml b/app/src/main/res/layout/media_preview_activity.xml
index ab190eea15..8822ba6bec 100644
--- a/app/src/main/res/layout/media_preview_activity.xml
+++ b/app/src/main/res/layout/media_preview_activity.xml
@@ -6,7 +6,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/core_grey_95">
+    android:background="@color/core_black">
 
     <org.thoughtcrime.securesms.components.viewpager.HackyViewPager
         android:id="@+id/media_pager"
diff --git a/app/src/main/res/values-v21/themes.xml b/app/src/main/res/values-v21/themes.xml
index a465348c79..1cf2084007 100644
--- a/app/src/main/res/values-v21/themes.xml
+++ b/app/src/main/res/values-v21/themes.xml
@@ -6,13 +6,13 @@
     </style>
 
     <style name="TextSecure.DarkTheme" parent="@style/TextSecure.BaseDarkTheme">
-        <item name="android:statusBarColor">@color/core_grey_95</item>
-        <item name="android:navigationBarColor">@color/core_grey_95</item>
+        <item name="android:statusBarColor">@color/core_black</item>
+        <item name="android:navigationBarColor">@color/core_black</item>
     </style>
 
     <style name="TextSecure.DarkNoActionBar" parent="@style/TextSecure.BaseDarkNoActionBar">
-        <item name="android:statusBarColor">@color/core_grey_95</item>
-        <item name="android:navigationBarColor">@color/core_grey_95</item>
+        <item name="android:statusBarColor">@color/core_black</item>
+        <item name="android:navigationBarColor">@color/core_black</item>
         <item name="android:colorControlActivated">@color/core_ultramarine_light</item>
     </style>
 
@@ -27,7 +27,7 @@
     </style>
 
     <style name="TextSecure.DarkRegistrationTheme" parent="TextSecure.DarkNoActionBar">
-        <item name="android:statusBarColor">@color/core_grey_95</item>
+        <item name="android:statusBarColor">@color/core_black</item>
         <item name="android:navigationBarColor">@color/core_black</item>
     </style>
 
@@ -42,7 +42,7 @@
 
     <style name="Theme.Design.BottomSheetDialog.Fixed">
         <item name="android:windowIsFloating">false</item>
-        <item name="android:statusBarColor">@color/core_grey_95</item>
+        <item name="android:statusBarColor">@color/core_black</item>
         <item name="android:navigationBarColor">@color/transparent</item>
     </style>
 
diff --git a/app/src/main/res/values-v23/themes.xml b/app/src/main/res/values-v23/themes.xml
index a709ccac0f..cf7758b1e1 100644
--- a/app/src/main/res/values-v23/themes.xml
+++ b/app/src/main/res/values-v23/themes.xml
@@ -6,8 +6,8 @@
     </style>
 
     <style name="TextSecure.DarkTheme" parent="TextSecure.BaseDarkTheme">
-        <item name="android:navigationBarColor">@color/core_grey_95</item>
-        <item name="android:statusBarColor">@color/core_grey_95</item>
+        <item name="android:navigationBarColor">@color/core_black</item>
+        <item name="android:statusBarColor">@color/core_black</item>
         <item name="android:windowLightStatusBar">false</item>
     </style>
 
@@ -19,7 +19,7 @@
 
     <style name="TextSecure.DarkRegistrationTheme" parent="TextSecure.DarkNoActionBar">
         <item name="android:windowLightStatusBar">false</item>
-        <item name="android:statusBarColor">@color/core_grey_95</item>
+        <item name="android:statusBarColor">@color/core_black</item>
         <item name="android:navigationBarColor">@color/core_black</item>
     </style>
 
@@ -29,9 +29,9 @@
     </style>
 
     <style name="TextSecure.DarkNoActionBar" parent="TextSecure.BaseDarkNoActionBar">
-        <item name="android:statusBarColor">@color/core_grey_95</item>
+        <item name="android:statusBarColor">@color/core_black</item>
         <item name="android:windowLightStatusBar">false</item>
-        <item name="android:navigationBarColor">@color/core_grey_95</item>
+        <item name="android:navigationBarColor">@color/core_black</item>
     </style>
 
     <style name="Theme.Design.Light.BottomSheetDialog.Fixed">
@@ -42,7 +42,7 @@
 
     <style name="Theme.Design.BottomSheetDialog.Fixed">
         <item name="android:windowIsFloating">false</item>
-        <item name="android:navigationBarColor">@color/core_grey_95</item>
+        <item name="android:navigationBarColor">@color/core_black</item>
         <item name="android:statusBarColor">@color/transparent</item>
         <item name="android:windowLightStatusBar">false</item>
     </style>
diff --git a/app/src/main/res/values-v27/themes.xml b/app/src/main/res/values-v27/themes.xml
index 649e743ebb..5cb13df259 100644
--- a/app/src/main/res/values-v27/themes.xml
+++ b/app/src/main/res/values-v27/themes.xml
@@ -9,7 +9,7 @@
     </style>
 
     <style name="TextSecure.DarkTheme" parent="TextSecure.BaseDarkTheme">
-        <item name="android:statusBarColor">@color/core_grey_95</item>
+        <item name="android:statusBarColor">@color/core_black</item>
         <item name="android:windowLightStatusBar">false</item>
         <item name="android:navigationBarColor">@color/core_black</item>
         <item name="android:windowLightNavigationBar">false</item>
@@ -24,8 +24,8 @@
 
     <style name="TextSecure.DarkRegistrationTheme" parent="TextSecure.DarkNoActionBar">
         <item name="android:windowLightStatusBar">false</item>
-        <item name="android:statusBarColor">@color/core_grey_95</item>
-        <item name="android:navigationBarColor">@color/core_grey_95</item>
+        <item name="android:statusBarColor">@color/core_black</item>
+        <item name="android:navigationBarColor">@color/core_black</item>
         <item name="android:windowLightNavigationBar">false</item>
     </style>
 
@@ -37,9 +37,9 @@
     </style>
 
     <style name="TextSecure.DarkNoActionBar" parent="TextSecure.BaseDarkNoActionBar">
-        <item name="android:statusBarColor">@color/core_grey_95</item>
+        <item name="android:statusBarColor">@color/core_black</item>
         <item name="android:windowLightStatusBar">false</item>
-        <item name="android:navigationBarColor">@color/core_grey_95</item>
+        <item name="android:navigationBarColor">@color/core_black</item>
         <item name="android:windowLightNavigationBar">false</item>
     </style>
 
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 5b73dfeee4..c39aa2b598 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -74,8 +74,8 @@
 
     <style name="TextSecure.DarkActionBar.TabBar"
         parent="@style/Widget.AppCompat.ActionBar.TabBar">
-        <item name="background">@color/core_grey_95</item>
-        <item name="android:background">@color/core_grey_95</item>
+        <item name="background">@color/core_black</item>
+        <item name="android:background">@color/core_black</item>
         <item name="elevation">4dp</item>
     </style>
 
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 25de59fab1..58fab972be 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -52,7 +52,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="colorPrimary">@color/core_black</item>
         <item name="colorAccent">@color/core_ultramarine_light</item>
 
         <item name="recipient_preference_blocked">#d00000</item>
@@ -117,7 +117,7 @@
         <item name="centered_app_title_color">@color/core_grey_25</item>
         <item name="ic_arrow_forward">@drawable/ic_arrow_forward_dark</item>
         <item name="lockscreen_watermark">@drawable/lockscreen_watermark_dark</item>
-        <item name="android:windowBackground">@color/core_grey_95</item>
+        <item name="android:windowBackground">@color/core_black</item>
         <item name="ic_visibility">@drawable/ic_visibility_white_24dp</item>
         <item name="ic_visibility_off">@drawable/ic_visibility_off_white_24dp</item>
 
@@ -249,7 +249,7 @@
         <item name="conversation_number_picker_text_color_selected">@color/black</item>
         <item name="conversation_sticker_footer_text_color">@color/core_grey_60</item>
         <item name="conversation_sticker_footer_icon_color">@color/core_grey_60</item>
-        <item name="conversation_sticker_author_color">@color/core_grey_95</item>
+        <item name="conversation_sticker_author_color">@color/core_black</item>
         <item name="conversation_popup_theme">@style/ThemeOverlay.AppCompat.Light</item>
         <item name="conversation_title_color">@color/white</item>
         <item name="conversation_subtitle_color">@color/transparent_white_90</item>
@@ -458,7 +458,7 @@
         <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>
-        <item name="android:windowBackground">@color/core_grey_95</item>
+        <item name="android:windowBackground">@color/core_black</item>
         <item name="android:windowContentOverlay">@null</item>
         <item name="alertDialogTheme">@style/AppCompatAlertDialogStyleDark</item>
         <item name="android:alertDialogTheme">@style/AppCompatDialogStyleDark</item>
@@ -467,7 +467,7 @@
 
         <item name="kbs_splash_image">@drawable/ic_kbs_splash_dark_svg</item>
 
-        <item name="attachment_type_selector_background">@color/core_grey_95</item>
+        <item name="attachment_type_selector_background">@color/core_black</item>
         <item name="attachment_document_icon_small">@drawable/ic_document_small_dark</item>
         <item name="attachment_document_icon_large">@drawable/ic_document_large_dark</item>
 
@@ -523,7 +523,7 @@
         <item name="debuglog_color_warn">@color/debuglog_dark_warn</item>
         <item name="debuglog_color_error">@color/debuglog_dark_error</item>
 
-        <item name="verification_background">@color/core_grey_95</item>
+        <item name="verification_background">@color/core_black</item>
 
         <item name="dialog_info_icon">@drawable/ic_info_outline_dark</item>
         <item name="dialog_alert_icon">@drawable/ic_warning_dark</item>
@@ -544,7 +544,7 @@
         <item name="help_next_background">@color/help_fragment_next_dark</item>
         <item name="help_problem_background">@drawable/help_fragment_problem_background_dark</item>
 
-        <item name="conversation_background">@color/core_grey_95</item>
+        <item name="conversation_background">@color/core_black</item>
         <item name="conversation_editor_background">#22ffffff</item>
         <item name="conversation_editor_text_color">#ffeeeeee</item>
         <item name="conversation_input_background">@drawable/compose_background_dark</item>
@@ -583,7 +583,7 @@
         <item name="emoji_tab_indicator">@color/core_grey_65</item>
         <item name="emoji_tab_underline">@color/core_grey_75</item>
         <item name="emoji_tab_seperator">@color/core_grey_70</item>
-        <item name="emoji_drawer_background">@color/core_grey_95</item>
+        <item name="emoji_drawer_background">@color/core_black</item>
         <item name="emoji_text_color">@color/white</item>
 
         <item name="emoji_category_recent">@drawable/ic_recent_dark_20</item>
@@ -598,7 +598,7 @@
         <item name="emoji_category_emoticons">@drawable/ic_emoji_emoticon_dark_20</item>
         <item name="emoji_variation_selector_background">@drawable/emoji_variation_selector_background_dark</item>
 
-        <item name="linkpreview_background_color">@color/core_grey_95</item>
+        <item name="linkpreview_background_color">@color/core_black</item>
         <item name="linkpreview_primary_text_color">@color/core_white</item>
         <item name="linkpreview_secondary_text_color">@color/core_grey_25</item>
         <item name="linkpreview_divider_color">@color/core_grey_60</item>
@@ -666,7 +666,7 @@
         <item name="sticker_management_action_button_color">@color/core_grey_25</item>
         <item name="sticker_management_item_background">@drawable/selectable_background_dark</item>
         <item name="sticker_popup_background">@color/transparent_black_60</item>
-        <item name="sticker_preview_toolbar_background">@color/core_grey_95</item>
+        <item name="sticker_preview_toolbar_background">@color/core_black</item>
         <item name="sticker_preview_status_bar_color">@color/core_grey_85</item>
         <item name="sticker_view_missing_background">@drawable/sticker_missing_background_dark</item>
 
@@ -681,7 +681,7 @@
 
         <item name="group_members_dialog_icon">@drawable/ic_group_solid_24</item>
         <item name="preferenceTheme">@style/PreferenceThemeOverlay.Fix</item>
-        <item name="search_toolbar_background">@color/core_grey_95</item>
+        <item name="search_toolbar_background">@color/core_black</item>
         <item name="search_background">@color/black</item>
 
         <item name="shared_contact_details_header_background">@color/grey_800</item>
@@ -710,7 +710,7 @@
     </style>
 
     <style name="TextSecure.MediaSendProgressDialog" parent="@android:style/Theme.Dialog">
-        <item name="android:background">@color/core_grey_95</item>
+        <item name="android:background">@color/core_black</item>
     </style>
 
     <style name="TextSecure.LightRegistrationTheme" parent="TextSecure.LightNoActionBar">