mirror/mihon
1
0
Fork 0
mirror of https://github.com/mihonapp/mihon.git synced 2025-11-01 06:47:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Workaround cleanup (#6350)

Browse Source 
* Remove material-components workaround that was fixed upstream

* Remove unused toolbar workaround

* Fix cover dialog navigation icon
This commit is contained in:
Ivan Iskandar
2021-12-17 21:32:42 +07:00
committed by GitHub
parent aeff846e1f
commit 38d131be37
35 changed files with 70 additions and 221 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/src/main/res/values/attrs.xml
View File

@@ -13,19 +13,6 @@
</declare-styleable>
<attr name="colorFilterActive" format="reference|integer"/>
<attr name="colorTertiary" format="reference|integer"/>
<attr name="colorOnTertiary" format="reference|integer"/>
<!-- Ripple color for toolbar elements -->
<attr name="rippleColorToolbar" format="reference|color"/>
<!-- Toolbar color. Not actually used by the toolbar. -->
<attr name="colorToolbar" format="reference|color"/>
<!-- For anything that is drawn on the toolbar -->
<attr name="colorOnToolbar" format="reference|integer"/>
<attr name="lightSystemBarsOnPrimary" format="reference|boolean"/>
<!-- Setting chip color values for specific themes -->
<attr name="chipTextColor" format="reference|integer"/>

13
app/src/main/res/values/styles.xml
View File

@@ -5,21 +5,12 @@
<!--Toolbars-->
<!--========-->
<style name="ThemeOverlay.Tachiyomi.ActionBar" parent="ThemeOverlay.Material3.ActionBar">
<item name="android:colorControlHighlight">?attr/rippleColorToolbar</item>
<item name="android:tint">?attr/colorOnToolbar</item>
</style>
<style name="Widget.Tachiyomi.ActionMode" parent="Widget.Material3.ActionMode">
<item name="background">?attr/colorToolbar</item>
</style>
<style name="Theme.Tachiyomi.ActionMode.CloseButton" parent="Widget.AppCompat.ActionButton.CloseMode">
<item name="android:tint">?attr/colorOnToolbar</item>
<item name="android:tint">?attr/colorOnSurface</item>
</style>
<style name="Theme.Tachiyomi.ActionButton.Overflow" parent="Widget.AppCompat.ActionButton.Overflow">
<item name="android:tint">?attr/colorOnToolbar</item>
<item name="android:tint">?attr/colorOnSurface</item>
</style>

7
app/src/main/res/values/themes.xml
View File

@@ -38,14 +38,11 @@
<item name="colorErrorContainer">@color/errorContainer</item>
<item name="colorOnErrorContainer">@color/onErrorContainer</item>
<item name="colorToolbar">?attr/colorSurface</item>
<item name="colorOnToolbar">?attr/colorOnSurface</item>
<item name="android:divider">@color/divider_default</item>
<item name="android:listDivider">@drawable/line_divider</item>
<!-- Ripples -->
<item name="colorControlHighlight">?attr/colorSurfaceVariant</item>
<item name="rippleColorToolbar">?attr/colorControlHighlight</item>
<!-- Handles RTL Text -->
<item name="android:textAlignment">gravity</item>
@@ -65,11 +62,9 @@
<item name="android:buttonStyle">?attr/borderlessButtonStyle</item>
<item name="android:backgroundDimAmount">0.32</item>
<item name="windowActionModeOverlay">true</item>
<item name="actionModeStyle">@style/Widget.Tachiyomi.ActionMode</item>
<item name="actionOverflowButtonStyle">@style/Theme.Tachiyomi.ActionButton.Overflow</item>
<item name="actionModeCloseButtonStyle">@style/Theme.Tachiyomi.ActionMode.CloseButton</item>
<item name="actionModeCloseDrawable">@drawable/ic_close_24dp</item>
<item name="actionBarTheme">@style/ThemeOverlay.Tachiyomi.ActionBar</item>
<item name="preferenceTheme">@style/PreferenceThemeOverlay.Tachiyomi</item>
<item name="bottomSheetDialogTheme">@style/ThemeOverlay.Tachiyomi.BottomSheetDialog</item>
<item name="chipStyle">@style/Widget.Tachiyomi.Chip.Action</item>
@@ -84,7 +79,6 @@
<item name="switchStyle">@style/Widget.Tachiyomi.Switch</item>
<item name="sliderStyle">@style/Widget.Tachiyomi.Slider</item>
<item name="materialCardViewStyle">@style/Widget.Material3.CardView.Elevated</item>
<item name="lightSystemBarsOnPrimary">false</item>
<!-- Custom Attributes-->
<item name="colorFilterActive">@color/filter_light</item>
@@ -125,7 +119,6 @@
<item name="colorOnSurfaceInverse">@color/greenapple_inverseOnSurface</item>
<item name="colorSurfaceInverse">@color/greenapple_inverseSurface</item>
<item name="colorPrimaryInverse">@color/greenapple_primaryInverse</item>
<item name="lightSystemBarsOnPrimary">true</item>
</style>
<!--== Midnight Dusk Theme ==-->