From a96984b4ef074437185b56bb3f01ce95dd933a5a Mon Sep 17 00:00:00 2001 From: Cuong-Tran Date: Sun, 6 Oct 2024 21:31:42 +0700 Subject: [PATCH] Fix Custom theme breaking Compose preview --- .../java/eu/kanade/presentation/theme/TachiyomiTheme.kt | 6 +++--- .../presentation/theme/colorscheme/CustomColorScheme.kt | 2 -- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/eu/kanade/presentation/theme/TachiyomiTheme.kt b/app/src/main/java/eu/kanade/presentation/theme/TachiyomiTheme.kt index ca89f250b..2cbba5712 100644 --- a/app/src/main/java/eu/kanade/presentation/theme/TachiyomiTheme.kt +++ b/app/src/main/java/eu/kanade/presentation/theme/TachiyomiTheme.kt @@ -53,11 +53,11 @@ fun TachiyomiTheme( @Composable fun TachiyomiTheme( - appTheme: AppTheme? = null, - amoled: Boolean? = null, // KMK --> seedColor: Color?, // KMK <-- + appTheme: AppTheme? = null, + amoled: Boolean? = null, content: @Composable () -> Unit, ) { val uiPreferences = Injekt.get() @@ -113,13 +113,13 @@ private fun getThemeColorScheme( appTheme: AppTheme, isAmoled: Boolean, ): ColorScheme { - val uiPreferences = Injekt.get() val colorScheme = when (appTheme) { AppTheme.MONET -> { MonetColorScheme(LocalContext.current) } // KMK --> AppTheme.CUSTOM -> { + val uiPreferences = Injekt.get() CustomColorScheme( context = LocalContext.current, seed = uiPreferences.colorTheme().get(), diff --git a/app/src/main/java/eu/kanade/presentation/theme/colorscheme/CustomColorScheme.kt b/app/src/main/java/eu/kanade/presentation/theme/colorscheme/CustomColorScheme.kt index 37db5d1cb..7f97e191b 100644 --- a/app/src/main/java/eu/kanade/presentation/theme/colorscheme/CustomColorScheme.kt +++ b/app/src/main/java/eu/kanade/presentation/theme/colorscheme/CustomColorScheme.kt @@ -14,7 +14,6 @@ internal class CustomColorScheme( seed: Int, style: PaletteStyle, ) : BaseColorScheme() { - private val custom = CustomCompatColorScheme(context, seed, style) override val darkScheme @@ -29,7 +28,6 @@ private class CustomCompatColorScheme( seed: Int, style: PaletteStyle, ) : BaseColorScheme() { - override val lightScheme = dynamicColorScheme( seedColor = Color(seed), isDark = false,