aboutsummaryrefslogtreecommitdiffstats
path: root/src/main
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2018-07-09 21:23:25 +0200
committerChristian Schneppe <christian@pix-art.de>2018-07-09 21:25:15 +0200
commit3a3ee3893d7292d5c5a13d3a044de351ecf0a674 (patch)
tree77a023355da937fbbaf3e121d28d02e6512c805c /src/main
parent906271bd4d873f9b2fff2b6688a9253fe3fcaa1b (diff)
Set navigation bar color to dark on dark theme
* 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.
Diffstat (limited to 'src/main')
-rw-r--r--src/main/res/values-v21/themes.xml7
-rw-r--r--src/main/res/values/themes.xml4
2 files changed, 10 insertions, 1 deletions
diff --git a/src/main/res/values-v21/themes.xml b/src/main/res/values-v21/themes.xml
new file mode 100644
index 000000000..47f419248
--- /dev/null
+++ b/src/main/res/values-v21/themes.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+ <style name="ConversationsTheme.Dark" parent="ConversationsTheme.Dark.Base">
+ <item name="android:navigationBarColor">@color/realblack</item>
+ </style>
+</resources> \ No newline at end of file
diff --git a/src/main/res/values/themes.xml b/src/main/res/values/themes.xml
index ed34c3452..a4d4209c5 100644
--- a/src/main/res/values/themes.xml
+++ b/src/main/res/values/themes.xml
@@ -137,7 +137,9 @@
<item name="ic_settings_about" type="reference">@drawable/ic_help_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/primary</item>
<item name="colorPrimaryDark">@color/primary_dark</item>
<item name="colorAccent">@color/accent</item>