Merge branch 'fix-toolbar-styles-api-24'

This commit is contained in:
sk 2022-12-17 14:58:09 +01:00
commit 400e340859
2 changed files with 8 additions and 6 deletions

View File

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style name="Widget.Mastodon.Toolbar" parent="android:Widget.Material.Toolbar">
<item name="android:contentInsetStartWithNavigation">0dp</item>
<item name="android:titleMarginEnd">0dp</item>
<item name="android:titleMarginStart">0dp</item>
</style>
</resources>

View File

@ -1011,12 +1011,6 @@
<item name="android:toolbarStyle">@style/Widget.Mastodon.Toolbar</item> <item name="android:toolbarStyle">@style/Widget.Mastodon.Toolbar</item>
</style> </style>
<style name="Widget.Mastodon.Toolbar" parent="android:Widget.Material.Toolbar">
<item name="android:contentInsetStartWithNavigation">0dp</item>
<item name="android:titleMarginEnd">0dp</item>
<item name="android:titleMarginStart">0dp</item>
</style>
<style name="Theme.Mastodon.Toolbar.Dark.CustomBase" parent="android:ThemeOverlay.Material.Dark.ActionBar"> <style name="Theme.Mastodon.Toolbar.Dark.CustomBase" parent="android:ThemeOverlay.Material.Dark.ActionBar">
<item name="android:colorPrimary">@color/custom_gray_800</item> <item name="android:colorPrimary">@color/custom_gray_800</item>
<item name="android:textColorPrimary">@color/gray_50</item> <item name="android:textColorPrimary">@color/gray_50</item>