Przeglądaj źródła

[优化] 优化代码

HapeLee 7 miesięcy temu
rodzic
commit
d1ebcd3bf0

+ 0 - 2
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 androidx.compose.ui.graphics.Color
 import io.legado.app.lib.theme.primaryColor
 import io.legado.app.lib.theme.primaryColor
 import io.legado.app.ui.theme.ThemeResolver.resolvePaletteStyle
 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.AugustColorScheme
 import io.legado.app.ui.theme.colorScheme.CarlottaColorScheme
 import io.legado.app.ui.theme.colorScheme.CarlottaColorScheme
 import io.legado.app.ui.theme.colorScheme.ElinkColorScheme
 import io.legado.app.ui.theme.colorScheme.ElinkColorScheme
@@ -51,7 +50,6 @@ object ThemeManager {
     ): ColorScheme {
     ): ColorScheme {
 
 
         val style = resolvePaletteStyle(paletteStyle)
         val style = resolvePaletteStyle(paletteStyle)
-        val colorSpec = resolveThemeColorSpec(materialVersion)
         val actualMode = if (forceOpaque && mode == AppThemeMode.Transparent) {
         val actualMode = if (forceOpaque && mode == AppThemeMode.Transparent) {
             AppThemeMode.WH
             AppThemeMode.WH
         } else {
         } else {

+ 0 - 8
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 {
     fun resolveColorSpecVersion(colorSpec: ThemeColorSpec): ColorSpec.SpecVersion {
         return when (colorSpec) {
         return when (colorSpec) {
             ThemeColorSpec.SPEC_2025 -> ColorSpec.SpecVersion.SPEC_2025
             ThemeColorSpec.SPEC_2025 -> ColorSpec.SpecVersion.SPEC_2025