Fix invalid text style in toolbar on Samsung devices

This commit is contained in:
kitsunyan
2020-07-23 00:45:45 +03:00
parent 6a55edcaa7
commit 1cc79e168f
3 changed files with 14 additions and 4 deletions
+1 -1
View File
@@ -17,7 +17,7 @@
android:id="@+id/toolbar" android:id="@+id/toolbar"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:popupTheme="@style/Theme.Toolbar.Popup" /> android:popupTheme="@style/Theme.Main.Toolbar.Popup" />
<FrameLayout <FrameLayout
android:id="@+id/toolbar_extra" android:id="@+id/toolbar_extra"
+2
View File
@@ -1,10 +1,12 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<color name="background_light">#fffafafa</color>
<color name="primary_light">#ff262c38</color> <color name="primary_light">#ff262c38</color>
<color name="primary_dark_light">#ff21242b</color> <color name="primary_dark_light">#ff21242b</color>
<color name="accent_default_light">#ff1976d2</color> <color name="accent_default_light">#ff1976d2</color>
<color name="error_default_light">#ffff1d18</color> <color name="error_default_light">#ffff1d18</color>
<color name="background_dark">#ff111111</color>
<color name="primary_dark">#ff262c38</color> <color name="primary_dark">#ff262c38</color>
<color name="primary_dark_dark">#ff21242b</color> <color name="primary_dark_dark">#ff21242b</color>
<color name="accent_default_dark">#ff47a2fc</color> <color name="accent_default_dark">#ff47a2fc</color>
+11 -3
View File
@@ -4,7 +4,8 @@
<style name="Theme.Main.Light" parent="@android:style/Theme.Material.Light.DarkActionBar"> <style name="Theme.Main.Light" parent="@android:style/Theme.Material.Light.DarkActionBar">
<item name="android:windowActionBar">false</item> <item name="android:windowActionBar">false</item>
<item name="android:windowNoTitle">true</item> <item name="android:windowNoTitle">true</item>
<item name="android:colorBackground">#fffafafa</item> <item name="android:toolbarStyle">@style/Widget.Main.Toolbar</item>
<item name="android:colorBackground">@color/background_light</item>
<item name="android:colorPrimary">@color/primary_light</item> <item name="android:colorPrimary">@color/primary_light</item>
<item name="android:colorPrimaryDark">@color/primary_dark_light</item> <item name="android:colorPrimaryDark">@color/primary_dark_light</item>
<item name="android:colorAccent">@color/accent_light</item> <item name="android:colorAccent">@color/accent_light</item>
@@ -15,7 +16,8 @@
<style name="Theme.Main.Dark" parent="@android:style/Theme.Material"> <style name="Theme.Main.Dark" parent="@android:style/Theme.Material">
<item name="android:windowActionBar">false</item> <item name="android:windowActionBar">false</item>
<item name="android:windowNoTitle">true</item> <item name="android:windowNoTitle">true</item>
<item name="android:colorBackground">#ff111111</item> <item name="android:toolbarStyle">@style/Widget.Main.Toolbar</item>
<item name="android:colorBackground">@color/background_dark</item>
<item name="android:colorPrimary">@color/primary_dark</item> <item name="android:colorPrimary">@color/primary_dark</item>
<item name="android:colorPrimaryDark">@color/primary_dark_dark</item> <item name="android:colorPrimaryDark">@color/primary_dark_dark</item>
<item name="android:colorAccent">@color/accent_dark</item> <item name="android:colorAccent">@color/accent_dark</item>
@@ -23,7 +25,13 @@
<item name="colorError">@color/error_dark</item> <item name="colorError">@color/error_dark</item>
</style> </style>
<style name="Theme.Toolbar.Popup" parent="Theme.Main.Dark"> <style name="Widget.Main.Toolbar" parent="@android:style/Widget.Material.Toolbar">
<!-- Fixes invalid text style on Samsung devices -->
<item name="android:titleTextAppearance">@android:style/TextAppearance.Material.Widget.Toolbar.Title</item>
<item name="android:subtitleTextAppearance">@android:style/TextAppearance.Material.Widget.Toolbar.Subtitle</item>
</style>
<style name="Theme.Main.Toolbar.Popup" parent="Theme.Main.Dark">
<item name="android:colorBackground">?android:attr/colorPrimaryDark</item> <item name="android:colorBackground">?android:attr/colorPrimaryDark</item>
</style> </style>