From 83b033dddee10b0ad8d217eb923f314fd11eb4dc Mon Sep 17 00:00:00 2001
From: SpiritCroc <dev@spiritcroc.de>
Date: Wed, 22 Jul 2020 13:00:10 +0200
Subject: [PATCH] Tweak SC dark theme

---
 vector/src/main/res/values-v21/theme_sc.xml   | 4 ++--
 vector/src/main/res/values/attrs_sc.xml       | 1 +
 vector/src/main/res/values/styles_riot.xml    | 2 +-
 vector/src/main/res/values/theme_dark.xml     | 1 +
 vector/src/main/res/values/theme_light.xml    | 1 +
 vector/src/main/res/values/theme_sc.xml       | 4 +++-
 vector/src/main/res/values/theme_sc_light.xml | 1 +
 vector/src/main/res/values/theme_status.xml   | 1 +
 8 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/vector/src/main/res/values-v21/theme_sc.xml b/vector/src/main/res/values-v21/theme_sc.xml
index c659bec90d..5eee2e078e 100644
--- a/vector/src/main/res/values-v21/theme_sc.xml
+++ b/vector/src/main/res/values-v21/theme_sc.xml
@@ -14,7 +14,7 @@
     </style>
 
     <style name="AppTheme.SC.Dark.v21" parent="AppTheme.Base.SC.Dark">
-        <item name="android:statusBarColor">@color/background_black_sc</item>
+        <item name="android:statusBarColor">@color/background_dark_sc</item>
         <item name="android:navigationBarColor">@color/background_black_sc</item>
 
         <!-- enable window content transitions -->
@@ -38,7 +38,7 @@
     </style>
 
     <style name="AppTheme.SC.Dark.Colored.v21" parent="AppTheme.Base.SC.Dark.Colored">
-        <item name="android:statusBarColor">@color/background_black_sc</item>
+        <item name="android:statusBarColor">@color/background_dark_sc</item>
         <item name="android:navigationBarColor">@color/background_black_sc</item>
 
         <!-- enable window content transitions -->
diff --git a/vector/src/main/res/values/attrs_sc.xml b/vector/src/main/res/values/attrs_sc.xml
index 858168dc2b..77151006dd 100644
--- a/vector/src/main/res/values/attrs_sc.xml
+++ b/vector/src/main/res/values/attrs_sc.xml
@@ -8,6 +8,7 @@
 
         <attr name="riotx_positive_accent" format="color" />
         <attr name="riotx_positive_accent_alpha12" format="color" />
+        <attr name="riotx_toolbar_bg" format="color" />
 
     </declare-styleable>
 
diff --git a/vector/src/main/res/values/styles_riot.xml b/vector/src/main/res/values/styles_riot.xml
index f95f885589..0289f791fa 100644
--- a/vector/src/main/res/values/styles_riot.xml
+++ b/vector/src/main/res/values/styles_riot.xml
@@ -8,7 +8,7 @@
         <!-- main text -->
         <item name="titleTextAppearance">@style/Vector.Toolbar.Title</item>
         <item name="subtitleTextAppearance">@style/Vector.Toolbar.SubTitle</item>
-        <item name="android:background">?riotx_background</item>
+        <item name="android:background">?riotx_toolbar_bg</item>
     </style>
 
     <style name="VectorToolbarStyle" parent="VectorToolbarStyleWithPadding">
diff --git a/vector/src/main/res/values/theme_dark.xml b/vector/src/main/res/values/theme_dark.xml
index a982e86f6b..bf27455c1c 100644
--- a/vector/src/main/res/values/theme_dark.xml
+++ b/vector/src/main/res/values/theme_dark.xml
@@ -227,6 +227,7 @@
         <item name="sc_message_bg_outgoing">#ff343b47</item>
         <item name="riotx_positive_accent">@color/riotx_positive_accent</item>
         <item name="riotx_positive_accent_alpha12">@color/riotx_positive_accent_alpha12</item>
+        <item name="riotx_toolbar_bg">?riotx_background</item>
     </style>
 
     <style name="AppTheme.Dark" parent="AppTheme.Base.Dark" />
diff --git a/vector/src/main/res/values/theme_light.xml b/vector/src/main/res/values/theme_light.xml
index 7c3405589f..196bddd96c 100644
--- a/vector/src/main/res/values/theme_light.xml
+++ b/vector/src/main/res/values/theme_light.xml
@@ -227,6 +227,7 @@
         <item name="sc_message_bg_outgoing">#FFDDDDDD</item>
         <item name="riotx_positive_accent">@color/riotx_positive_accent</item>
         <item name="riotx_positive_accent_alpha12">@color/riotx_positive_accent_alpha12</item>
+        <item name="riotx_toolbar_bg">?riotx_background</item>
     </style>
 
     <style name="AppTheme.Light" parent="AppTheme.Base.Light" />
diff --git a/vector/src/main/res/values/theme_sc.xml b/vector/src/main/res/values/theme_sc.xml
index 1bf2d70f55..305270a8ad 100644
--- a/vector/src/main/res/values/theme_sc.xml
+++ b/vector/src/main/res/values/theme_sc.xml
@@ -10,7 +10,7 @@
         <item name="riotx_base_text_icon_secondary">@color/text_color_secondary_sc</item>
         <item name="riotx_search_background_mobile">@color/background_dark_sc</item>
         <item name="riotx_header_panel_background">@color/background_black_sc</item>
-        <item name="riotx_header_panel_border_mobile">@color/background_dark_sc</item>
+        <item name="riotx_header_panel_border_mobile">#20ffffff</item>
         <item name="riotx_header_panel_text_primary">@color/text_color_primary_sc</item>
         <item name="riotx_header_panel_text_secondary">@color/text_color_secondary_sc</item>
         <item name="riotx_text_primary">@color/text_color_primary_sc</item>
@@ -210,9 +210,11 @@
         <item name="sc_message_bg_outgoing">@color/background_sc</item>
         <item name="riotx_positive_accent">@color/accent_sc</item>
         <item name="riotx_positive_accent_alpha12">@color/accent_sc_alpha12</item>
+        <item name="riotx_toolbar_bg">?riotx_background</item>
     </style>
 
     <style name="AppTheme.Base.SC.Dark">
+        <item name="riotx_toolbar_bg">@color/background_sc</item>
         <item name="riotx_background">@color/background_dark_sc</item>
         <item name="riotx_header_panel_background">@color/background_sc</item>
     </style>
diff --git a/vector/src/main/res/values/theme_sc_light.xml b/vector/src/main/res/values/theme_sc_light.xml
index 75f8072f33..6501ccc9f0 100644
--- a/vector/src/main/res/values/theme_sc_light.xml
+++ b/vector/src/main/res/values/theme_sc_light.xml
@@ -47,6 +47,7 @@
         <item name="sc_message_bg_outgoing">@color/accent_sc_alpha12</item>
         <item name="riotx_positive_accent">@color/accent_sc</item>
         <item name="riotx_positive_accent_alpha12">@color/accent_sc_alpha12</item>
+        <item name="riotx_toolbar_bg">?riotx_background</item>
     </style>
 
     <!-- Default AppTheme for usage where settings don't apply -->
diff --git a/vector/src/main/res/values/theme_status.xml b/vector/src/main/res/values/theme_status.xml
index 469aa2506d..344e51d08a 100644
--- a/vector/src/main/res/values/theme_status.xml
+++ b/vector/src/main/res/values/theme_status.xml
@@ -156,6 +156,7 @@
         <item name="sc_message_bg_outgoing">#FFE4E8ED</item>
         <item name="riotx_positive_accent">@color/riotx_positive_accent</item>
         <item name="riotx_positive_accent_alpha12">@color/riotx_positive_accent_alpha12</item>
+        <item name="riotx_toolbar_bg">?riotx_background</item>
     </style>
 
     <style name="AppTheme.Status" parent="AppTheme.Base.Status" />