From 5345befd9bbaded79c6ae4fda01a4f66079c492e Mon Sep 17 00:00:00 2001
From: Wiktor <wiktor@metacode.biz>
Date: Mon, 25 Jun 2018 19:40:37 +0200
Subject: [PATCH]  Set navigation bar color to dark on dark theme  (#3091)

* Allow overriding ConversationsTheme.Dark

This change splits the dark theme style into two styles - base that
stays the same in all configurations and Dark - the original - that can
be overridden in specific configurations to add version specific styles.

* Set navigation bar color to dark on dark theme

Use secondary background color as navigation bar color when using dark
theme. This avoids mismatched white colors on certain system themes.
---
 src/main/res/values-v21/themes.xml | 6 ++++++
 src/main/res/values/themes.xml     | 4 +++-
 2 files changed, 9 insertions(+), 1 deletion(-)
 create mode 100644 src/main/res/values-v21/themes.xml

diff --git a/src/main/res/values-v21/themes.xml b/src/main/res/values-v21/themes.xml
new file mode 100644
index 000000000..5fda8f514
--- /dev/null
+++ b/src/main/res/values-v21/themes.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="ConversationsTheme.Dark" parent="ConversationsTheme.Dark.Base">
+        <item name="android:navigationBarColor">@color/grey900</item>
+    </style>
+</resources>
diff --git a/src/main/res/values/themes.xml b/src/main/res/values/themes.xml
index a1a799902..532214c81 100644
--- a/src/main/res/values/themes.xml
+++ b/src/main/res/values/themes.xml
@@ -99,7 +99,9 @@
         <item type="reference" name="icon_enable_undecided_device">@drawable/ic_new_releases_black_24dp</item>
     </style>
 
-    <style name="ConversationsTheme.Dark" parent="Theme.AppCompat.NoActionBar">
+    <style name="ConversationsTheme.Dark" parent="ConversationsTheme.Dark.Base" />
+
+    <style name="ConversationsTheme.Dark.Base" parent="Theme.AppCompat.NoActionBar">
         <item name="colorPrimary">@color/green800</item>
         <item name="colorPrimaryDark">@color/green900</item>
         <item name="colorAccent">@color/blue_a100</item>