diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceValues.kt b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceValues.kt index 41a5f1831f..f7a6e40f08 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceValues.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceValues.kt @@ -31,11 +31,11 @@ object PreferenceValues { GREEN_APPLE(R.string.theme_greenapple), TEALTURQUOISE(R.string.theme_tealturquoise), YINYANG(R.string.theme_yinyang), - BLUE(R.string.theme_blue), // Deprecated DARK_BLUE(null), HOT_PINK(null), + BLUE(null), } enum class TappingInvertMode(val shouldInvertHorizontal: Boolean = false, val shouldInvertVertical: Boolean = false) { @@ -61,6 +61,6 @@ object PreferenceValues { enum class ExtensionInstaller { LEGACY, PACKAGEINSTALLER, - SHIZUKU + SHIZUKU, } } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/base/activity/BaseThemedActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/base/activity/BaseThemedActivity.kt index 48a46ce9f2..c8b05e5da5 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/base/activity/BaseThemedActivity.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/base/activity/BaseThemedActivity.kt @@ -34,10 +34,6 @@ abstract class BaseThemedActivity : AppCompatActivity() { PreferenceValues.AppTheme.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 -> { resIds += R.style.Theme_Tachiyomi_GreenApple } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt index 66bdc83461..435fcf73c2 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt @@ -33,7 +33,6 @@ import eu.kanade.tachiyomi.BuildConfig import eu.kanade.tachiyomi.Migrations import eu.kanade.tachiyomi.R 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.updater.AppUpdateChecker import eu.kanade.tachiyomi.data.updater.AppUpdateResult @@ -568,8 +567,7 @@ class MainActivity : BaseViewBindingActivity() { binding.root.isLiftAppBarOnScroll = to !is NoAppBarElevationController - binding.appbar.isTransparentWhenNotLifted = to is MangaController && - preferences.appTheme().get() != PreferenceValues.AppTheme.BLUE + binding.appbar.isTransparentWhenNotLifted = to is MangaController binding.controllerContainer.overlapHeader = to is MangaController } } diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 292b37d16a..f5cc2e7c86 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -21,9 +21,7 @@ @color/on_surface_monet - #3598FE #54759E - #1F54759E #188140 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index a273027bd5..353b19264e 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -152,7 +152,6 @@ On App theme Dynamic - Legacy Blue Green Apple Midnight Dusk Strawberry Daiquiri diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 1c92d9f056..70b32fbcc4 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -9,10 +9,6 @@ ?attr/rippleColorToolbar - - @@ -30,13 +26,6 @@ ?attr/colorOnToolbar - - @@ -201,18 +190,6 @@ @color/ripple_toolbar_fainter - - @@ -241,21 +218,11 @@ labeled - - - - diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index e72de8e569..c56230a765 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -85,15 +85,6 @@ - -