mirror/mihon
1
0
Fork 0
mirror of https://github.com/mihonapp/mihon.git synced 2025-10-30 22:07:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove legacy blue theme

Browse Source 
Causing too many theming issues/complexity. This will make the Material 3 transition easier.
This commit is contained in:
arkon
2021-11-10 09:15:13 -05:00
parent 0a4163d236
commit f85dfa90b8
7 changed files with 3 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/res/values/colors.xml
View File

@@ -21,9 +21,7 @@
<color name="on_background_monet" tools:targetApi="31">@color/on_surface_monet</color>
<!-- Blue Theme -->
<color name="primary_blue">#3598FE</color>
<color name="accent_blue">#54759E</color>
<color name="ripple_colored_blue">#1F54759E</color>
<!-- Green Apple Theme -->
<color name="accent_greenapple">#188140</color>

1
app/src/main/res/values/strings.xml
View File

@@ -152,7 +152,6 @@
<string name="theme_dark">On</string>
<string name="pref_app_theme">App theme</string>
<string name="theme_monet">Dynamic</string>
<string name="theme_blue">Legacy Blue</string>
<string name="theme_greenapple">Green Apple</string>
<string name="theme_midnightdusk">Midnight Dusk</string>
<string name="theme_strawberrydaiquiri">Strawberry Daiquiri</string>

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

@@ -9,10 +9,6 @@
<item name="android:colorControlHighlight">?attr/rippleColorToolbar</item>
</style>
<style name="ThemeOverlay.Tachiyomi.ActionBar.Colored" parent="ThemeOverlay.MaterialComponents.ActionBar">
<item name="android:colorControlHighlight">?attr/colorOnToolbar</item>
</style>
<style name="Widget.Tachiyomi.Toolbar.Button.Navigation" parent="Widget.AppCompat.Toolbar.Button.Navigation">
<item name="tint">?attr/colorOnToolbar</item>
</style>
@@ -30,13 +26,6 @@
<item name="android:tint">?attr/colorOnToolbar</item>
</style>
<style name="Widget.Tachiyomi.Toolbar.Colored" parent="Widget.MaterialComponents.Toolbar">
<item name="android:background">?attr/colorToolbar</item>
<item name="titleTextColor">?attr/colorOnToolbar</item>
<item name="subtitleTextColor">?attr/colorOnToolbar</item>
<item name="android:elevation">0dp</item>
</style>
<!--===========-->
<!--AlertDialog-->
@@ -201,18 +190,6 @@
<item name="tabRippleColor">@color/ripple_toolbar_fainter</item>
</style>
<style name="Widget.Tachiyomi.TabLayout.Colored" parent="Widget.MaterialComponents.TabLayout.Colored">
<item name="android:background">?attr/colorToolbar</item>
<item name="tabGravity">center</item>
<item name="tabIndicator">@drawable/tab_indicator</item>
<item name="tabIndicatorFullWidth">false</item>
<item name="tabIndicatorHeight">3dp</item>
<item name="tabInlineLabel">true</item>
<item name="tabMinWidth">75dp</item>
<item name="tabMode">scrollable</item>
<item name="tabRippleColor">?attr/colorOnPrimary</item>
</style>
<!--==============-->
<!--Widgets.Switch-->
<!--==============-->
@@ -241,21 +218,11 @@
<item name="labelVisibilityMode">labeled</item>
</style>
<style name="Widget.Tachiyomi.BottomNavigationView.Colored" parent="Widget.MaterialComponents.BottomNavigationView.Colored">
<item name="android:background">?attr/colorToolbar</item>
<item name="labelVisibilityMode">labeled</item>
</style>
<style name="Widget.Tachiyomi.NavigationRailView" parent="Widget.MaterialComponents.NavigationRailView">
<item name="itemRippleColor">@color/ripple_toolbar_fainter</item>
<item name="labelVisibilityMode">labeled</item>
</style>
<style name="Widget.Tachiyomi.NavigationRailView.Colored" parent="Widget.MaterialComponents.NavigationRailView.Colored">
<item name="android:background">?attr/colorToolbar</item>
<item name="labelVisibilityMode">labeled</item>
</style>
<!--============-->
<!--FastScroller-->

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

@@ -85,15 +85,6 @@
<!-- Monet theme only support S+ -->
<style name="Theme.Tachiyomi.Monet" />
<!--== Blue Theme ==-->
<style name="Theme.Tachiyomi.Blue">
<!-- Theme Colors -->
<item name="colorToolbar">@color/accent_blue</item>
<item name="colorOnToolbar">@color/md_white_1000</item>
<item name="colorPrimary">@color/primary_blue</item>
<item name="colorControlHighlight">@color/ripple_colored_blue</item>
</style>
<!--== Green Apple Theme ==-->
<style name="Theme.Tachiyomi.GreenApple">
<!-- Theme Colors -->
@@ -172,26 +163,6 @@
<!--== AMOLED Mode Overlay ==-->
<style name="ThemeOverlay.Tachiyomi.Amoled" parent="" />
<!--== Colored Bars (toolbar-navbar-navrail) Mode Overlay ==-->
<style name="ThemeOverlay.Tachiyomi.ColoredBars" parent="">
<!-- Base background/text colors -->
<item name="background">?attr/colorPrimary</item>
<!-- Themes -->
<item name="actionBarTheme">@style/ThemeOverlay.Tachiyomi.ActionBar.Colored</item>
<item name="toolbarNavigationButtonStyle">@style/Widget.Tachiyomi.Toolbar.Button.Navigation</item>
<item name="appBarLayoutStyle">@style/Widget.MaterialComponents.AppBarLayout.Primary</item>
<item name="toolbarStyle">@style/Widget.Tachiyomi.Toolbar.Colored</item>
<item name="tabStyle">@style/Widget.Tachiyomi.TabLayout.Colored</item>
<item name="bottomNavigationStyle">@style/Widget.Tachiyomi.BottomNavigationView.Colored</item>
<item name="navigationRailStyle">@style/Widget.Tachiyomi.NavigationRailView.Colored</item>
<!-- Status/Navigation bar -->
<item name="android:windowLightStatusBar" tools:targetApi="m">?attr/lightSystemBarsOnPrimary</item>
<item name="android:windowLightNavigationBar" tools:targetApi="o_mr1">?attr/lightSystemBarsOnPrimary</item>
<item name="android:navigationBarColor">?attr/colorToolbar</item>
</style>
<!--===============-->
<!-- Launch Screen -->
<!--===============-->