Remove legacy blue theme

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

View File

@ -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,
}
}

View File

@ -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
}

View File

@ -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<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
}
}