From d1ebcd3bf06b3a1e022345711e5de33577ca5e1e Mon Sep 17 00:00:00 2001 From: HapeLee <1321903405@qq.com> Date: Wed, 25 Mar 2026 01:39:07 +0800 Subject: [PATCH] =?UTF-8?q?[=E4=BC=98=E5=8C=96]=20=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/java/io/legado/app/ui/theme/ThemeManager.kt | 2 -- app/src/main/java/io/legado/app/ui/theme/ThemeResolver.kt | 8 -------- 2 files changed, 10 deletions(-) diff --git a/app/src/main/java/io/legado/app/ui/theme/ThemeManager.kt b/app/src/main/java/io/legado/app/ui/theme/ThemeManager.kt index 561b4d48c..0d3370e7a 100644 --- a/app/src/main/java/io/legado/app/ui/theme/ThemeManager.kt +++ b/app/src/main/java/io/legado/app/ui/theme/ThemeManager.kt @@ -8,7 +8,6 @@ import androidx.compose.material3.dynamicLightColorScheme import androidx.compose.ui.graphics.Color import io.legado.app.lib.theme.primaryColor import io.legado.app.ui.theme.ThemeResolver.resolvePaletteStyle -import io.legado.app.ui.theme.ThemeResolver.resolveThemeColorSpec import io.legado.app.ui.theme.colorScheme.AugustColorScheme import io.legado.app.ui.theme.colorScheme.CarlottaColorScheme import io.legado.app.ui.theme.colorScheme.ElinkColorScheme @@ -51,7 +50,6 @@ object ThemeManager { ): ColorScheme { val style = resolvePaletteStyle(paletteStyle) - val colorSpec = resolveThemeColorSpec(materialVersion) val actualMode = if (forceOpaque && mode == AppThemeMode.Transparent) { AppThemeMode.WH } else { diff --git a/app/src/main/java/io/legado/app/ui/theme/ThemeResolver.kt b/app/src/main/java/io/legado/app/ui/theme/ThemeResolver.kt index 44b3d8fd1..9db56a725 100644 --- a/app/src/main/java/io/legado/app/ui/theme/ThemeResolver.kt +++ b/app/src/main/java/io/legado/app/ui/theme/ThemeResolver.kt @@ -48,14 +48,6 @@ object ThemeResolver { } } - fun resolveThemeColorSpec(value: String?): ThemeColorSpec { - return when (value) { - "material3" -> ThemeColorSpec.SPEC_2021 - "material3Expressive" -> ThemeColorSpec.SPEC_2025 - else -> ThemeColorSpec.SPEC_2021 - } - } - fun resolveColorSpecVersion(colorSpec: ThemeColorSpec): ColorSpec.SpecVersion { return when (colorSpec) { ThemeColorSpec.SPEC_2025 -> ColorSpec.SpecVersion.SPEC_2025