ソースを参照

android: Manual tweaks for dialog colors

Small fix for Flam
Charles Lombardo 3 年 前
コミット
f984775f12

+ 2 - 0
src/android/app/src/main/res/values-night-v31/themes.xml

@@ -24,6 +24,8 @@
         <item name="colorOnSurfaceInverse">@color/m3_sys_color_dynamic_dark_on_surface_variant</item>
         <item name="colorSurfaceInverse">@color/m3_sys_color_dynamic_dark_surface_variant</item>
         <item name="colorPrimaryInverse">@color/m3_sys_color_dynamic_dark_inverse_primary</item>
+
+        <item name="materialAlertDialogTheme">@style/ThemeOverlay.Material3.MaterialAlertDialog</item>
     </style>
 
 </resources>

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

@@ -3,7 +3,7 @@
 
     <color name="yuzu_primary">#A7DDEC</color>
     <color name="yuzu_onPrimary">#003399</color>
-    <color name="yuzu_primaryContainer">#26282C</color>
+    <color name="yuzu_primaryContainer">#31323F</color>
     <color name="yuzu_onPrimaryContainer">#D1E4FF</color>
     <color name="yuzu_secondary">#BAC8DB</color>
     <color name="yuzu_onSecondary">#253140</color>

+ 2 - 0
src/android/app/src/main/res/values-v31/themes.xml

@@ -24,6 +24,8 @@
         <item name="colorOnSurfaceInverse">@color/m3_sys_color_dynamic_light_on_surface_variant</item>
         <item name="colorSurfaceInverse">@color/m3_sys_color_dynamic_light_surface_variant</item>
         <item name="colorPrimaryInverse">@color/m3_sys_color_dynamic_light_inverse_primary</item>
+
+        <item name="materialAlertDialogTheme">@style/ThemeOverlay.Material3.MaterialAlertDialog</item>
     </style>
 
 </resources>

+ 14 - 0
src/android/app/src/main/res/values/styles.xml

@@ -18,4 +18,18 @@
         <item name="labelBehavior">gone</item>
     </style>
 
+    <style name="YuzuMaterialDialog" parent="ThemeOverlay.Material3.MaterialAlertDialog">
+        <item name="colorPrimary">@color/yuzu_primaryContainer</item>
+        <item name="colorSurface">@color/yuzu_primaryContainer</item>
+        <item name="colorSecondary">@color/yuzu_primary</item>
+        <item name="buttonBarPositiveButtonStyle">@style/YuzuButton</item>
+        <item name="buttonBarNegativeButtonStyle">@style/YuzuButton</item>
+        <item name="buttonBarNeutralButtonStyle">@style/YuzuButton</item>
+    </style>
+
+    <style name="YuzuButton" parent="Widget.Material3.Button.TextButton.Dialog">
+        <item name="android:textColor">@color/yuzu_primary</item>
+        <item name="rippleColor">@color/yuzu_inversePrimary</item>
+    </style>
+
 </resources>

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

@@ -40,6 +40,7 @@
         <item name="android:navigationBarColor">@android:color/transparent</item>
 
         <item name="sliderStyle">@style/YuzuSlider</item>
+        <item name="materialAlertDialogTheme">@style/YuzuMaterialDialog</item>
 
         <item name="android:windowLayoutInDisplayCutoutMode">default</item>
 

+ 1 - 1
src/android/app/src/main/res/values/yuzu_colors.xml

@@ -3,7 +3,7 @@
 
     <color name="yuzu_primary">#990E00</color>
     <color name="yuzu_onPrimary">#FFFFFF</color>
-    <color name="yuzu_primaryContainer">#FFDAD4</color>
+    <color name="yuzu_primaryContainer">#EEDEDD</color>
     <color name="yuzu_onPrimaryContainer">#400200</color>
     <color name="yuzu_secondary">#775650</color>
     <color name="yuzu_onSecondary">#FFFFFF</color>