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

修复图片背景失效与调整透明模式数值 #102

HapeLee 1 год назад
Родитель
Сommit
e3735e3c95

+ 1 - 1
app/src/main/res/layout/item_bookshelf_grid.xml

@@ -72,7 +72,7 @@
                             android:id="@+id/tv_unread"
                             android:id="@+id/tv_unread"
                             android:layout_width="wrap_content"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_height="wrap_content"
-                            android:textColor="?attr/colorSurface"
+                            android:textColor="?attr/colorOnSecondaryContainer"
                             android:textSize="10sp"
                             android:textSize="10sp"
                             android:padding="4dp"
                             android:padding="4dp"
                             android:textStyle="bold"
                             android:textStyle="bold"

+ 1 - 1
app/src/main/res/layout/item_bookshelf_grid_compact.xml

@@ -61,7 +61,7 @@
                     android:layout_height="wrap_content"
                     android:layout_height="wrap_content"
                     android:includeFontPadding="false"
                     android:includeFontPadding="false"
                     android:padding="4dp"
                     android:padding="4dp"
-                    android:textColor="?attr/colorSurface"
+                    android:textColor="?attr/colorOnSecondaryContainer"
                     android:textSize="10sp"
                     android:textSize="10sp"
                     android:textStyle="bold"
                     android:textStyle="bold"
                     tools:ignore="SmallSp"
                     tools:ignore="SmallSp"

+ 1 - 1
app/src/main/res/layout/item_bookshelf_list.xml

@@ -71,7 +71,7 @@
                         android:id="@+id/tv_unread"
                         android:id="@+id/tv_unread"
                         android:layout_width="wrap_content"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_height="wrap_content"
-                        android:textColor="?attr/colorSurface"
+                        android:textColor="?attr/colorOnSecondaryContainer"
                         android:textSize="10sp"
                         android:textSize="10sp"
                         android:padding="4dp"
                         android:padding="4dp"
                         android:textStyle="bold"
                         android:textStyle="bold"

+ 1 - 1
app/src/main/res/layout/item_bookshelf_list_compact.xml

@@ -71,7 +71,7 @@
                         android:id="@+id/tv_unread"
                         android:id="@+id/tv_unread"
                         android:layout_width="wrap_content"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_height="wrap_content"
-                        android:textColor="?attr/colorSurface"
+                        android:textColor="?attr/colorOnSecondaryContainer"
                         android:textSize="9sp"
                         android:textSize="9sp"
                         android:padding="3dp"
                         android:padding="3dp"
                         android:textStyle="bold"
                         android:textStyle="bold"

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

@@ -487,7 +487,7 @@
     <color name="transparent_theme_onPrimaryContainer">#FF000000</color>
     <color name="transparent_theme_onPrimaryContainer">#FF000000</color>
     <color name="transparent_theme_secondary">#80FFFFFF</color>
     <color name="transparent_theme_secondary">#80FFFFFF</color>
     <color name="transparent_theme_onSecondary">#FF000000</color>
     <color name="transparent_theme_onSecondary">#FF000000</color>
-    <color name="transparent_theme_secondaryContainer">#40FFFFFF</color>
+    <color name="transparent_theme_secondaryContainer">#A0FFFFFF</color>
     <color name="transparent_theme_onSecondaryContainer">#FF000000</color>
     <color name="transparent_theme_onSecondaryContainer">#FF000000</color>
     <color name="transparent_theme_tertiary">#80FFFFFF</color>
     <color name="transparent_theme_tertiary">#80FFFFFF</color>
     <color name="transparent_theme_onTertiary">#FF000000</color>
     <color name="transparent_theme_onTertiary">#FF000000</color>
@@ -524,7 +524,7 @@
     <color name="transparent_theme_surfaceDim">#1AFFFFFF</color>
     <color name="transparent_theme_surfaceDim">#1AFFFFFF</color>
     <color name="transparent_theme_surfaceBright">#33FFFFFF</color>
     <color name="transparent_theme_surfaceBright">#33FFFFFF</color>
     <color name="transparent_theme_surfaceContainerLowest">#0DFFFFFF</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_surfaceContainer">#33FFFFFF</color>
     <color name="transparent_theme_surfaceContainerHigh">#4DFFFFFF</color>
     <color name="transparent_theme_surfaceContainerHigh">#4DFFFFFF</color>
     <color name="transparent_theme_surfaceContainerHighest">#66FFFFFF</color>
     <color name="transparent_theme_surfaceContainerHighest">#66FFFFFF</color>

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

@@ -494,7 +494,7 @@
     <color name="transparent_theme_onPrimaryContainer">#FF000000</color>
     <color name="transparent_theme_onPrimaryContainer">#FF000000</color>
     <color name="transparent_theme_secondary">#A0FFFFFF</color>
     <color name="transparent_theme_secondary">#A0FFFFFF</color>
     <color name="transparent_theme_onSecondary">#FF000000</color>
     <color name="transparent_theme_onSecondary">#FF000000</color>
-    <color name="transparent_theme_secondaryContainer">#80FFFFFF</color>
+    <color name="transparent_theme_secondaryContainer">#A0FFFFFF</color>
     <color name="transparent_theme_onSecondaryContainer">#FF000000</color>
     <color name="transparent_theme_onSecondaryContainer">#FF000000</color>
     <color name="transparent_theme_tertiary">#A0FFFFFF</color>
     <color name="transparent_theme_tertiary">#A0FFFFFF</color>
     <color name="transparent_theme_onTertiary">#FF000000</color>
     <color name="transparent_theme_onTertiary">#FF000000</color>
@@ -531,7 +531,7 @@
     <color name="transparent_theme_surfaceDim">#1AFFFFFF</color>
     <color name="transparent_theme_surfaceDim">#1AFFFFFF</color>
     <color name="transparent_theme_surfaceBright">#33FFFFFF</color>
     <color name="transparent_theme_surfaceBright">#33FFFFFF</color>
     <color name="transparent_theme_surfaceContainerLowest">#0DFFFFFF</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_surfaceContainer">#33FFFFFF</color>
     <color name="transparent_theme_surfaceContainerHigh">#4DFFFFFF</color>
     <color name="transparent_theme_surfaceContainerHigh">#4DFFFFFF</color>
     <color name="transparent_theme_surfaceContainerHighest">#66FFFFFF</color>
     <color name="transparent_theme_surfaceContainerHighest">#66FFFFFF</color>

+ 1 - 1
app/src/main/res/values/styles.xml

@@ -28,7 +28,7 @@
     <style name="AppTheme.AlertDialog" parent="ThemeOverlay.Material3.MaterialAlertDialog">
     <style name="AppTheme.AlertDialog" parent="ThemeOverlay.Material3.MaterialAlertDialog">
         <item name="dialogCornerRadius">28dp</item>
         <item name="dialogCornerRadius">28dp</item>
         <item name="cornerFamily">rounded</item>
         <item name="cornerFamily">rounded</item>
-        <item name="android:colorBackground">?attr/colorSurfaceContainer</item>
+        <item name="android:colorBackground">?attr/colorSurfaceContainerLow</item>
         <item name="android:layout" tools:ignore="PrivateResource">@layout/m3_alert_dialog</item>
         <item name="android:layout" tools:ignore="PrivateResource">@layout/m3_alert_dialog</item>
     </style>
     </style>
 
 

+ 1 - 1
app/src/main/res/values/themes.xml

@@ -607,7 +607,7 @@
         <item name="colorSurfaceBright">@color/transparent_theme_surfaceBright</item>
         <item name="colorSurfaceBright">@color/transparent_theme_surfaceBright</item>
         <item name="colorSurfaceContainerLowest">@color/transparent_theme_surfaceContainerLowest
         <item name="colorSurfaceContainerLowest">@color/transparent_theme_surfaceContainerLowest
         </item>
         </item>
-        <item name="colorSurfaceContainerLow">@color/transparent_theme_surfaceContainerLow</item>
+
         <item name="colorSurfaceContainer">@color/transparent_theme_surfaceContainer</item>
         <item name="colorSurfaceContainer">@color/transparent_theme_surfaceContainer</item>
         <item name="colorSurfaceContainerHigh">@color/transparent_theme_surfaceContainerHigh</item>
         <item name="colorSurfaceContainerHigh">@color/transparent_theme_surfaceContainerHigh</item>
         <item name="colorSurfaceContainerHighest">@color/transparent_theme_surfaceContainerHighest
         <item name="colorSurfaceContainerHighest">@color/transparent_theme_surfaceContainerHighest