From 51d895d0e6795840722f379dc5b311eca01eeac8 Mon Sep 17 00:00:00 2001
From: Janne Koschinski <janne@kuschku.de>
Date: Mon, 7 May 2018 21:39:38 +0200
Subject: [PATCH] Fixes further theming issues
Signed-off-by: Janne Koschinski <janne@kuschku.de>
---
app/src/main/res/layout/fragment_toolbar.xml | 5 ++++-
app/src/main/res/values/attrs.xml | 1 +
app/src/main/res/values/styles_widgets.xml | 9 +++++++++
app/src/main/res/values/themes_amoled.xml | 8 ++++++--
app/src/main/res/values/themes_base.xml | 12 ++++++++++++
app/src/main/res/values/themes_dracula.xml | 1 +
app/src/main/res/values/themes_gruvbox.xml | 2 ++
app/src/main/res/values/themes_material.xml | 14 ++++----------
app/src/main/res/values/themes_quassel.xml | 14 ++++----------
app/src/main/res/values/themes_solarized.xml | 2 ++
10 files changed, 45 insertions(+), 23 deletions(-)
diff --git a/app/src/main/res/layout/fragment_toolbar.xml b/app/src/main/res/layout/fragment_toolbar.xml
index f88878151..dfa09f03d 100644
--- a/app/src/main/res/layout/fragment_toolbar.xml
+++ b/app/src/main/res/layout/fragment_toolbar.xml
@@ -49,6 +49,7 @@
android:layout_marginTop="2dp"
android:gravity="center"
android:textAppearance="@style/TextAppearance.AppCompat.Widget.ActionBar.Title"
+ android:textColor="?android:textColorPrimary"
android:textSize="16sp"
android:visibility="gone" />
@@ -61,7 +62,8 @@
android:gravity="center_vertical"
android:singleLine="true"
android:text="@string/app_name"
- android:textAppearance="@style/TextAppearance.AppCompat.Widget.ActionBar.Title" />
+ android:textAppearance="@style/TextAppearance.AppCompat.Widget.ActionBar.Title"
+ android:textColor="?android:textColorPrimary" />
</LinearLayout>
@@ -73,5 +75,6 @@
android:layout_marginTop="-3dp"
android:ellipsize="end"
android:singleLine="true"
+ android:textColor="?android:textColorSecondary"
android:visibility="gone" />
</LinearLayout>
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index d34b99440..7ac8230ab 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -49,6 +49,7 @@
<attr name="colorTextPrimary" format="color" />
<attr name="colorTextPrimaryInverse" format="color" />
<attr name="colorTextSecondary" format="color" />
+ <attr name="colorTextSecondaryInverse" format="color" />
<attr name="colorDivider" format="color" />
<attr name="colorBackground" format="color" />
diff --git a/app/src/main/res/values/styles_widgets.xml b/app/src/main/res/values/styles_widgets.xml
index 10bbddc83..320604f8c 100644
--- a/app/src/main/res/values/styles_widgets.xml
+++ b/app/src/main/res/values/styles_widgets.xml
@@ -56,10 +56,18 @@
<style name="Widget.AppBarOverlay.Light.Auto" parent="Widget.AppBarOverlay.Light">
<item name="colorControlNormal">?colorTextPrimary</item>
+ <item name="android:textColor">?colorTextPrimary</item>
<item name="android:textColorPrimary">?colorTextPrimary</item>
<item name="android:textColorSecondary">?colorTextSecondary</item>
</style>
+ <style name="Widget.AppBarOverlay.Light.DarkHead" parent="Widget.AppBarOverlay.Light">
+ <item name="colorControlNormal">?colorTextPrimaryInverse</item>
+ <item name="android:textColor">?colorTextPrimaryInverse</item>
+ <item name="android:textColorPrimary">?colorTextPrimaryInverse</item>
+ <item name="android:textColorSecondary">?colorTextSecondaryInverse</item>
+ </style>
+
<style name="Widget.TabLayout.Auto" parent="Widget.Design.TabLayout">
<item name="tabIndicatorColor">?colorAccent</item>
<item name="tabIndicatorHeight">3dp</item>
@@ -85,6 +93,7 @@
<style name="Widget.PopupOverlay.Light" parent="ThemeOverlay.AppCompat.Light" />
<style name="Widget.PopupOverlay.Light.Auto" parent="Widget.PopupOverlay.Light">
+ <item name="android:textColor">?colorTextPrimary</item>
<item name="android:colorBackground">?colorBackgroundCard</item>
</style>
diff --git a/app/src/main/res/values/themes_amoled.xml b/app/src/main/res/values/themes_amoled.xml
index 429f7290a..a2cbaa0f0 100644
--- a/app/src/main/res/values/themes_amoled.xml
+++ b/app/src/main/res/values/themes_amoled.xml
@@ -44,6 +44,12 @@
<item name="senderColorE">#b39775</item>
<item name="senderColorF">#3176b3</item>
+ <item name="colorTextPrimary">#dedede</item>
+ <item name="colorTextPrimaryInverse">#303030</item>
+ <item name="colorTextSecondary">#8a8a8a</item>
+ <item name="colorTextSecondaryInverse">#757575</item>
+ <item name="colorDivider">#1FFFFFFF</item>
+
<item name="colorForeground">#FFFFFF</item>
<item name="colorForegroundHighlight">#FFFFFF</item>
<item name="colorForegroundSecondary">#B3FFFFFF</item>
@@ -53,8 +59,6 @@
<item name="colorForegroundMirc">0x0</item>
- <item name="colorDivider">#1FFFFFFF</item>
-
<item name="colorBackground">#000000</item>
<item name="android:windowBackground">@color/amoled_background</item>
<item name="colorBackgroundHighlight">#40ffaf3b</item>
diff --git a/app/src/main/res/values/themes_base.xml b/app/src/main/res/values/themes_base.xml
index 90022aeff..c19d5dd84 100644
--- a/app/src/main/res/values/themes_base.xml
+++ b/app/src/main/res/values/themes_base.xml
@@ -134,6 +134,18 @@
<item name="actionBarPopupTheme">@style/Widget.PopupOverlay.Light.Auto</item>
<item name="android:textColor">?colorTextPrimary</item>
+ <item name="android:textColorPrimary">?colorTextPrimary</item>
+ <item name="android:textColorSecondary">?colorTextSecondary</item>
+ <item name="colorControlNormal">?colorTextPrimary</item>
+ </style>
+
+ <style name="Theme.ChatTheme.Light.DarkHead" parent="Theme.ChatTheme.Light.Auto">
+ <item name="actionBarTheme">@style/Widget.AppBarOverlay.Light.DarkHead</item>
+ <item name="formatBarTheme">@style/Widget.AppBarOverlay.Light.Auto</item>
+ <item name="actionBarPopupTheme">@style/Widget.PopupOverlay.Light.Auto</item>
+
+ <item name="android:textColor">?colorTextPrimary</item>
+ <item name="android:textColorPrimary">?colorTextPrimary</item>
<item name="android:textColorSecondary">?colorTextSecondary</item>
<item name="colorControlNormal">?colorTextPrimary</item>
</style>
diff --git a/app/src/main/res/values/themes_dracula.xml b/app/src/main/res/values/themes_dracula.xml
index 7a17d0a2d..efa5ed0ce 100644
--- a/app/src/main/res/values/themes_dracula.xml
+++ b/app/src/main/res/values/themes_dracula.xml
@@ -54,6 +54,7 @@
<item name="colorTextPrimary">#f8f8f2</item>
<item name="colorTextPrimaryInverse">#282a36</item>
<item name="colorTextSecondary">#6272a4</item>
+ <item name="colorTextSecondaryInverse">#586e75</item>
<item name="colorDivider">#19f8f8f2</item>
<item name="colorForegroundMirc">0x0</item>
diff --git a/app/src/main/res/values/themes_gruvbox.xml b/app/src/main/res/values/themes_gruvbox.xml
index 770d43743..d3ddcc126 100644
--- a/app/src/main/res/values/themes_gruvbox.xml
+++ b/app/src/main/res/values/themes_gruvbox.xml
@@ -54,6 +54,7 @@
<item name="colorTextPrimary">#3c3836</item>
<item name="colorTextPrimaryInverse">#fbf1c7</item>
<item name="colorTextSecondary">#665c54</item>
+ <item name="colorTextSecondaryInverse">#bdae93</item>
<item name="colorDivider">#2d928374</item>
<item name="colorForegroundMirc">0x1</item>
@@ -113,6 +114,7 @@
<item name="colorTextPrimary">#dbdbb2</item>
<item name="colorTextPrimaryInverse">#282828</item>
<item name="colorTextSecondary">#bdae93</item>
+ <item name="colorTextSecondaryInverse">#665c54</item>
<item name="colorDivider">#33928374</item>
<item name="colorForegroundMirc">0x0</item>
diff --git a/app/src/main/res/values/themes_material.xml b/app/src/main/res/values/themes_material.xml
index 3d447fa80..70c1c91bf 100644
--- a/app/src/main/res/values/themes_material.xml
+++ b/app/src/main/res/values/themes_material.xml
@@ -22,7 +22,7 @@
<resources>
<color name="material_light_background">#fafafa</color>
- <style name="Theme.ChatTheme.Material_Light" parent="Theme.ChatTheme.Light">
+ <style name="Theme.ChatTheme.Material_Light" parent="Theme.ChatTheme.Light.DarkHead">
<item name="senderColor0">#F44336</item>
<item name="senderColor1">#2196F3</item>
<item name="senderColor2">#7CB342</item>
@@ -43,12 +43,9 @@
<item name="colorTextPrimary">#212121</item>
<item name="colorTextPrimaryInverse">#FAFAFA</item>
<item name="colorTextSecondary">#757575</item>
+ <item name="colorTextSecondaryInverse">#8a8a8a</item>
<item name="colorDivider">#1F000000</item>
- <item name="android:textColor">?colorTextPrimary</item>
- <item name="android:textColorSecondary">?colorTextSecondary</item>
- <item name="colorControlNormal">?colorTextPrimary</item>
-
<item name="colorForeground">#DE000000</item>
<item name="colorForegroundHighlight">#DE000000</item>
<item name="colorForegroundSecondary">#8A000000</item>
@@ -78,7 +75,7 @@
<color name="material_dark_background">#303030</color>
- <style name="Theme.ChatTheme.Material_Dark" parent="Theme.ChatTheme">
+ <style name="Theme.ChatTheme.Material_Dark" parent="Theme.ChatTheme.Auto">
<item name="senderColor0">#F44336</item>
<item name="senderColor1">#2196F3</item>
<item name="senderColor2">#8BC34A</item>
@@ -99,12 +96,9 @@
<item name="colorTextPrimary">#dedede</item>
<item name="colorTextPrimaryInverse">#303030</item>
<item name="colorTextSecondary">#8a8a8a</item>
+ <item name="colorTextSecondaryInverse">#757575</item>
<item name="colorDivider">#1FFFFFFF</item>
- <item name="android:textColor">?colorTextPrimary</item>
- <item name="android:textColorSecondary">?colorTextSecondary</item>
- <item name="colorControlNormal">?colorTextPrimary</item>
-
<item name="colorForeground">#FFFFFF</item>
<item name="colorForegroundHighlight">#FFFFFF</item>
<item name="colorForegroundSecondary">#B3FFFFFF</item>
diff --git a/app/src/main/res/values/themes_quassel.xml b/app/src/main/res/values/themes_quassel.xml
index e16f41a6a..0536dbcc7 100644
--- a/app/src/main/res/values/themes_quassel.xml
+++ b/app/src/main/res/values/themes_quassel.xml
@@ -22,7 +22,7 @@
<resources>
<color name="quassel_light_background">#fafafa</color>
- <style name="Theme.ChatTheme.Quassel_Light" parent="Theme.ChatTheme.Light">
+ <style name="Theme.ChatTheme.Quassel_Light" parent="Theme.ChatTheme.Light.DarkHead">
<item name="senderColor0">#cc0000</item>
<item name="senderColor1">#006cad</item>
<item name="senderColor2">#4d9900</item>
@@ -43,12 +43,9 @@
<item name="colorTextPrimary">#212121</item>
<item name="colorTextPrimaryInverse">#FAFAFA</item>
<item name="colorTextSecondary">#757575</item>
+ <item name="colorTextSecondaryInverse">#8a8a8a</item>
<item name="colorDivider">#1F000000</item>
- <item name="android:textColor">?colorTextPrimary</item>
- <item name="android:textColorSecondary">?colorTextSecondary</item>
- <item name="colorControlNormal">?colorTextPrimary</item>
-
<item name="colorForeground">#DE000000</item>
<item name="colorForegroundHighlight">#DE000000</item>
<item name="colorForegroundSecondary">#8A000000</item>
@@ -78,7 +75,7 @@
<color name="quassel_dark_background">#303030</color>
- <style name="Theme.ChatTheme.Quassel_Dark" parent="Theme.ChatTheme">
+ <style name="Theme.ChatTheme.Quassel_Dark" parent="Theme.ChatTheme.Auto">
<item name="senderColor0">#cc0000</item>
<item name="senderColor1">#006cad</item>
<item name="senderColor2">#4d9900</item>
@@ -99,12 +96,9 @@
<item name="colorTextPrimary">#dedede</item>
<item name="colorTextPrimaryInverse">#303030</item>
<item name="colorTextSecondary">#8a8a8a</item>
+ <item name="colorTextSecondaryInverse">#757575</item>
<item name="colorDivider">#1FFFFFFF</item>
- <item name="android:textColor">?colorTextPrimary</item>
- <item name="android:textColorSecondary">?colorTextSecondary</item>
- <item name="colorControlNormal">?colorTextPrimary</item>
-
<item name="colorForeground">#FFFFFF</item>
<item name="colorForegroundHighlight">#DE000000</item>
<item name="colorForegroundSecondary">#B3FFFFFF</item>
diff --git a/app/src/main/res/values/themes_solarized.xml b/app/src/main/res/values/themes_solarized.xml
index fb03da226..c1adef81a 100644
--- a/app/src/main/res/values/themes_solarized.xml
+++ b/app/src/main/res/values/themes_solarized.xml
@@ -54,6 +54,7 @@
<item name="colorTextPrimary">#586e75</item>
<item name="colorTextPrimaryInverse">#FDF6E3</item>
<item name="colorTextSecondary">#657b83</item>
+ <item name="colorTextSecondaryInverse">#839496</item>
<item name="colorDivider">#19586e75</item>
<item name="colorForegroundMirc">0x1</item>
@@ -113,6 +114,7 @@
<item name="colorTextPrimary">#93a1a1</item>
<item name="colorTextPrimaryInverse">#002B36</item>
<item name="colorTextSecondary">#839496</item>
+ <item name="colorTextSecondaryInverse">#657b83</item>
<item name="colorDivider">#1993a1a1</item>
<item name="colorForegroundMirc">0x0</item>
--
GitLab