mirror of
https://github.com/tachiyomiorg/tachiyomi.git
synced 2024-12-22 17:31:52 +01:00
Remove legacy blue theme
Causing too many theming issues/complexity. This will make the Material 3 transition easier.
This commit is contained in:
parent
0a4163d236
commit
f85dfa90b8
@ -31,11 +31,11 @@ object PreferenceValues {
|
|||||||
GREEN_APPLE(R.string.theme_greenapple),
|
GREEN_APPLE(R.string.theme_greenapple),
|
||||||
TEALTURQUOISE(R.string.theme_tealturquoise),
|
TEALTURQUOISE(R.string.theme_tealturquoise),
|
||||||
YINYANG(R.string.theme_yinyang),
|
YINYANG(R.string.theme_yinyang),
|
||||||
BLUE(R.string.theme_blue),
|
|
||||||
|
|
||||||
// Deprecated
|
// Deprecated
|
||||||
DARK_BLUE(null),
|
DARK_BLUE(null),
|
||||||
HOT_PINK(null),
|
HOT_PINK(null),
|
||||||
|
BLUE(null),
|
||||||
}
|
}
|
||||||
|
|
||||||
enum class TappingInvertMode(val shouldInvertHorizontal: Boolean = false, val shouldInvertVertical: Boolean = false) {
|
enum class TappingInvertMode(val shouldInvertHorizontal: Boolean = false, val shouldInvertVertical: Boolean = false) {
|
||||||
@ -61,6 +61,6 @@ object PreferenceValues {
|
|||||||
enum class ExtensionInstaller {
|
enum class ExtensionInstaller {
|
||||||
LEGACY,
|
LEGACY,
|
||||||
PACKAGEINSTALLER,
|
PACKAGEINSTALLER,
|
||||||
SHIZUKU
|
SHIZUKU,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -34,10 +34,6 @@ abstract class BaseThemedActivity : AppCompatActivity() {
|
|||||||
PreferenceValues.AppTheme.MONET -> {
|
PreferenceValues.AppTheme.MONET -> {
|
||||||
resIds += R.style.Theme_Tachiyomi_Monet
|
resIds += R.style.Theme_Tachiyomi_Monet
|
||||||
}
|
}
|
||||||
PreferenceValues.AppTheme.BLUE -> {
|
|
||||||
resIds += R.style.Theme_Tachiyomi_Blue
|
|
||||||
resIds += R.style.ThemeOverlay_Tachiyomi_ColoredBars
|
|
||||||
}
|
|
||||||
PreferenceValues.AppTheme.GREEN_APPLE -> {
|
PreferenceValues.AppTheme.GREEN_APPLE -> {
|
||||||
resIds += R.style.Theme_Tachiyomi_GreenApple
|
resIds += R.style.Theme_Tachiyomi_GreenApple
|
||||||
}
|
}
|
||||||
|
@ -33,7 +33,6 @@ import eu.kanade.tachiyomi.BuildConfig
|
|||||||
import eu.kanade.tachiyomi.Migrations
|
import eu.kanade.tachiyomi.Migrations
|
||||||
import eu.kanade.tachiyomi.R
|
import eu.kanade.tachiyomi.R
|
||||||
import eu.kanade.tachiyomi.data.notification.NotificationReceiver
|
import eu.kanade.tachiyomi.data.notification.NotificationReceiver
|
||||||
import eu.kanade.tachiyomi.data.preference.PreferenceValues
|
|
||||||
import eu.kanade.tachiyomi.data.preference.asImmediateFlow
|
import eu.kanade.tachiyomi.data.preference.asImmediateFlow
|
||||||
import eu.kanade.tachiyomi.data.updater.AppUpdateChecker
|
import eu.kanade.tachiyomi.data.updater.AppUpdateChecker
|
||||||
import eu.kanade.tachiyomi.data.updater.AppUpdateResult
|
import eu.kanade.tachiyomi.data.updater.AppUpdateResult
|
||||||
@ -568,8 +567,7 @@ class MainActivity : BaseViewBindingActivity<MainActivityBinding>() {
|
|||||||
|
|
||||||
binding.root.isLiftAppBarOnScroll = to !is NoAppBarElevationController
|
binding.root.isLiftAppBarOnScroll = to !is NoAppBarElevationController
|
||||||
|
|
||||||
binding.appbar.isTransparentWhenNotLifted = to is MangaController &&
|
binding.appbar.isTransparentWhenNotLifted = to is MangaController
|
||||||
preferences.appTheme().get() != PreferenceValues.AppTheme.BLUE
|
|
||||||
binding.controllerContainer.overlapHeader = to is MangaController
|
binding.controllerContainer.overlapHeader = to is MangaController
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -21,9 +21,7 @@
|
|||||||
<color name="on_background_monet" tools:targetApi="31">@color/on_surface_monet</color>
|
<color name="on_background_monet" tools:targetApi="31">@color/on_surface_monet</color>
|
||||||
|
|
||||||
<!-- Blue Theme -->
|
<!-- Blue Theme -->
|
||||||
<color name="primary_blue">#3598FE</color>
|
|
||||||
<color name="accent_blue">#54759E</color>
|
<color name="accent_blue">#54759E</color>
|
||||||
<color name="ripple_colored_blue">#1F54759E</color>
|
|
||||||
|
|
||||||
<!-- Green Apple Theme -->
|
<!-- Green Apple Theme -->
|
||||||
<color name="accent_greenapple">#188140</color>
|
<color name="accent_greenapple">#188140</color>
|
||||||
|
@ -152,7 +152,6 @@
|
|||||||
<string name="theme_dark">On</string>
|
<string name="theme_dark">On</string>
|
||||||
<string name="pref_app_theme">App theme</string>
|
<string name="pref_app_theme">App theme</string>
|
||||||
<string name="theme_monet">Dynamic</string>
|
<string name="theme_monet">Dynamic</string>
|
||||||
<string name="theme_blue">Legacy Blue</string>
|
|
||||||
<string name="theme_greenapple">Green Apple</string>
|
<string name="theme_greenapple">Green Apple</string>
|
||||||
<string name="theme_midnightdusk">Midnight Dusk</string>
|
<string name="theme_midnightdusk">Midnight Dusk</string>
|
||||||
<string name="theme_strawberrydaiquiri">Strawberry Daiquiri</string>
|
<string name="theme_strawberrydaiquiri">Strawberry Daiquiri</string>
|
||||||
|
@ -9,10 +9,6 @@
|
|||||||
<item name="android:colorControlHighlight">?attr/rippleColorToolbar</item>
|
<item name="android:colorControlHighlight">?attr/rippleColorToolbar</item>
|
||||||
</style>
|
</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">
|
<style name="Widget.Tachiyomi.Toolbar.Button.Navigation" parent="Widget.AppCompat.Toolbar.Button.Navigation">
|
||||||
<item name="tint">?attr/colorOnToolbar</item>
|
<item name="tint">?attr/colorOnToolbar</item>
|
||||||
</style>
|
</style>
|
||||||
@ -30,13 +26,6 @@
|
|||||||
<item name="android:tint">?attr/colorOnToolbar</item>
|
<item name="android:tint">?attr/colorOnToolbar</item>
|
||||||
</style>
|
</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-->
|
<!--AlertDialog-->
|
||||||
@ -201,18 +190,6 @@
|
|||||||
<item name="tabRippleColor">@color/ripple_toolbar_fainter</item>
|
<item name="tabRippleColor">@color/ripple_toolbar_fainter</item>
|
||||||
</style>
|
</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-->
|
<!--Widgets.Switch-->
|
||||||
<!--==============-->
|
<!--==============-->
|
||||||
@ -241,21 +218,11 @@
|
|||||||
<item name="labelVisibilityMode">labeled</item>
|
<item name="labelVisibilityMode">labeled</item>
|
||||||
</style>
|
</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">
|
<style name="Widget.Tachiyomi.NavigationRailView" parent="Widget.MaterialComponents.NavigationRailView">
|
||||||
<item name="itemRippleColor">@color/ripple_toolbar_fainter</item>
|
<item name="itemRippleColor">@color/ripple_toolbar_fainter</item>
|
||||||
<item name="labelVisibilityMode">labeled</item>
|
<item name="labelVisibilityMode">labeled</item>
|
||||||
</style>
|
</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-->
|
<!--FastScroller-->
|
||||||
|
@ -85,15 +85,6 @@
|
|||||||
<!-- Monet theme only support S+ -->
|
<!-- Monet theme only support S+ -->
|
||||||
<style name="Theme.Tachiyomi.Monet" />
|
<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 ==-->
|
<!--== Green Apple Theme ==-->
|
||||||
<style name="Theme.Tachiyomi.GreenApple">
|
<style name="Theme.Tachiyomi.GreenApple">
|
||||||
<!-- Theme Colors -->
|
<!-- Theme Colors -->
|
||||||
@ -172,26 +163,6 @@
|
|||||||
<!--== AMOLED Mode Overlay ==-->
|
<!--== AMOLED Mode Overlay ==-->
|
||||||
<style name="ThemeOverlay.Tachiyomi.Amoled" parent="" />
|
<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 -->
|
<!-- Launch Screen -->
|
||||||
<!--===============-->
|
<!--===============-->
|
||||||
|
Loading…
Reference in New Issue
Block a user