Просмотр исходного кода

[优化] 修复透明主题显示

HapeLee 8 месяцев назад
Родитель
Сommit
a9dce20726

+ 4 - 4
app/src/main/java/io/legado/app/ui/theme/colorScheme/TransparentColorScheme.kt

@@ -17,7 +17,7 @@ internal object TransparentColorScheme : BaseColorScheme() {
         secondaryContainer = Color(0xB0FFFFFF),
         onSecondaryContainer = Color(0xFF000000),
         tertiary = Color(0xFF000000),
-        onTertiary = Color(0xFFFFFFFF),
+        onTertiary = Color(0xFF000000),
         tertiaryContainer = Color(0xB0FFFFFF),
         onTertiaryContainer = Color(0xFF000000),
         error = Color(0xFFBA1A1A),
@@ -51,7 +51,7 @@ internal object TransparentColorScheme : BaseColorScheme() {
         surfaceDim = Color(0x1AFFFFFF),
         surfaceBright = Color(0x33FFFFFF),
         surfaceContainerLowest = Color(0x0DFFFFFF),
-        surfaceContainerLow = Color(0x1AFFFFFF),
+        surfaceContainerLow = Color(0x8FFFFFFF),
         surfaceContainer = Color(0x33FFFFFF),
         surfaceContainerHigh = Color(0x4DFFFFFF),
         surfaceContainerHighest = Color(0x66FFFFFF),
@@ -67,7 +67,7 @@ internal object TransparentColorScheme : BaseColorScheme() {
         secondaryContainer = Color(0xA0FFFFFF),
         onSecondaryContainer = Color(0xFF000000),
         tertiary = Color(0x80FFFFFF),
-        onTertiary = Color(0xFFFFFFFF),
+        onTertiary = Color(0xFF000000),
         tertiaryContainer = Color(0x40FFFFFF),
         onTertiaryContainer = Color(0xFF000000),
         error = Color(0xFFCF6679),
@@ -101,7 +101,7 @@ internal object TransparentColorScheme : BaseColorScheme() {
         surfaceDim = Color(0x1AFFFFFF),
         surfaceBright = Color(0x33FFFFFF),
         surfaceContainerLowest = Color(0x0DFFFFFF),
-        surfaceContainerLow = Color(0x1AFFFFFF),
+        surfaceContainerLow = Color(0x8F000000),
         surfaceContainer = Color(0x33FFFFFF),
         surfaceContainerHigh = Color(0x4DFFFFFF),
         surfaceContainerHighest = Color(0x66FFFFFF),

+ 1 - 1
app/src/main/res/values-night/colors.xml

@@ -524,7 +524,7 @@
     <color name="transparent_theme_surfaceDim">#1AFFFFFF</color>
     <color name="transparent_theme_surfaceBright">#33FFFFFF</color>
     <color name="transparent_theme_surfaceContainerLowest">#0DFFFFFF</color>
-    <color name="transparent_theme_surfaceContainerLow">#1AFFFFFF</color>
+
     <color name="transparent_theme_surfaceContainer">#33FFFFFF</color>
     <color name="transparent_theme_surfaceContainerHigh">#4DFFFFFF</color>
     <color name="transparent_theme_surfaceContainerHighest">#66FFFFFF</color>

+ 2 - 2
app/src/main/res/values/colors.xml

@@ -498,7 +498,7 @@
     <color name="transparent_theme_secondaryContainer">#B0FFFFFF</color>
     <color name="transparent_theme_onSecondaryContainer">#FF000000</color>
     <color name="transparent_theme_tertiary">#000000</color>
-    <color name="transparent_theme_onTertiary">#FFFFFFFF</color>
+    <color name="transparent_theme_onTertiary">#FF000000</color>
     <color name="transparent_theme_tertiaryContainer">#B0FFFFFF</color>
     <color name="transparent_theme_onTertiaryContainer">#FF000000</color>
     <color name="transparent_theme_error">#BA1A1A</color>
@@ -532,7 +532,7 @@
     <color name="transparent_theme_surfaceDim">#1AFFFFFF</color>
     <color name="transparent_theme_surfaceBright">#33FFFFFF</color>
     <color name="transparent_theme_surfaceContainerLowest">#0DFFFFFF</color>
-    <color name="transparent_theme_surfaceContainerLow">#1AFFFFFF</color>
+
     <color name="transparent_theme_surfaceContainer">#33FFFFFF</color>
     <color name="transparent_theme_surfaceContainerHigh">#4DFFFFFF</color>
     <color name="transparent_theme_surfaceContainerHighest">#66FFFFFF</color>

+ 0 - 3
app/src/main/res/values/themes.xml

@@ -607,10 +607,7 @@
         <item name="colorSurfaceBright">@color/transparent_theme_surfaceBright</item>
         <item name="colorSurfaceContainerLowest">@color/transparent_theme_surfaceContainerLowest
         </item>
-        <item name="colorSurfaceContainerLow">@color/transparent_theme_surfaceContainerLow</item>
         <item name="colorSurfaceContainer">@color/transparent_theme_surfaceContainer</item>
-        <item name="colorSurfaceContainerHigh">@color/transparent_theme_surfaceContainerHigh</item>
-        <item name="colorSurfaceContainerHighest">@color/transparent_theme_surfaceContainerHighest</item>
     </style>
 
     <style name="Theme.Base.Elink" parent="Base.AppTheme">