Explorar el Código

fix(theme): 输入法未指定颜色时回退到引擎默认色

HapeLee hace 3 meses
padre
commit
9d1d11400f

+ 1 - 1
app/src/main/java/io/legado/app/ui/theme/LegadoTheme.kt

@@ -77,7 +77,7 @@ data class LegadoColorScheme(
     val onSheetContent: Color,
     val onSheetContent: Color,
     val cardPrimaryContainer: Color,
     val cardPrimaryContainer: Color,
 
 
-    /** 输入框背景色,已应用容器背景不透明度 */
+    /** 输入框背景色覆盖;未配置时由当前主题引擎提供默认色 */
     val surfaceInput: Color,
     val surfaceInput: Color,
 )
 )
 
 

+ 1 - 1
app/src/main/java/io/legado/app/ui/theme/ThemeColorSchemeOverride.kt

@@ -79,7 +79,7 @@ fun ColorScheme.toLegadoColorScheme(
         surfaceInput = if (ThemeConfig.bookInfoInputColor != 0) {
         surfaceInput = if (ThemeConfig.bookInfoInputColor != 0) {
             Color(ThemeConfig.bookInfoInputColor)
             Color(ThemeConfig.bookInfoInputColor)
         } else {
         } else {
-            surface.copy(alpha = (ThemeConfig.containerOpacity / 100f).coerceIn(0f, 1f))
+            Color.Unspecified
         }
         }
     )
     )
 }
 }

+ 1 - 3
app/src/main/java/io/legado/app/ui/theme/ThemeComponents.kt

@@ -192,9 +192,7 @@ fun MiuixThemeWrapper(
                 surfaceInput = if (ThemeConfig.bookInfoInputColor != 0) {
                 surfaceInput = if (ThemeConfig.bookInfoInputColor != 0) {
                     Color(ThemeConfig.bookInfoInputColor)
                     Color(ThemeConfig.bookInfoInputColor)
                 } else {
                 } else {
-                    miuixColorScheme.surface.copy(
-                        alpha = (ThemeConfig.containerOpacity / 100f).coerceIn(0f, 1f)
-                    )
+                    Color.Unspecified
                 }
                 }
             )
             )
         }
         }