Remove legacy blue theme

Causing too many theming issues/complexity. This will make the Material 3 transition easier.

(cherry picked from commit f85dfa90b8)
This commit is contained in:
arkon
2021-11-10 09:15:13 -05:00
committed by Jobobby04
parent e4f493503d
commit 0f70c14879
7 changed files with 3 additions and 74 deletions
@@ -31,7 +31,6 @@ object PreferenceValues {
GREEN_APPLE(R.string.theme_greenapple),
TEALTURQUOISE(R.string.theme_tealturquoise),
YINYANG(R.string.theme_yinyang),
BLUE(R.string.theme_blue),
// SY -->
PURE_RED(R.string.theme_pure_red),
@@ -40,6 +39,7 @@ object PreferenceValues {
// Deprecated
DARK_BLUE(null),
HOT_PINK(null),
BLUE(null),
}
enum class TappingInvertMode(val shouldInvertHorizontal: Boolean = false, val shouldInvertVertical: Boolean = false) {
@@ -65,7 +65,7 @@ object PreferenceValues {
enum class ExtensionInstaller {
LEGACY,
PACKAGEINSTALLER,
SHIZUKU
SHIZUKU,
}
// SY -->
@@ -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
}
@@ -34,7 +34,6 @@ import dev.chrisbanes.insetter.applyInsetter
import eu.kanade.tachiyomi.BuildConfig
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
@@ -622,8 +621,7 @@ class MainActivity : BaseViewBindingActivity<MainActivityBinding>() {
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
}
}