VERY experimental Nintendo Switch 2 emulator
C++
android: Manual tweaks for dialog colors
Charles Lombardoaa6a2ec8321d
diff --git a/src/android/app/src/main/res/values-night-v31/themes.xml b/src/android/app/src/main/res/values-night-v31/themes.xmlindex 4d20271e86..631d7fd1b0 100644--- a/src/android/app/src/main/res/values-night-v31/themes.xml+++ b/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>diff --git a/src/android/app/src/main/res/values-night/yuzu_colors.xml b/src/android/app/src/main/res/values-night/yuzu_colors.xmlindex ea8797b8e5..1e563a6f2a 100644--- a/src/android/app/src/main/res/values-night/yuzu_colors.xml+++ b/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>diff --git a/src/android/app/src/main/res/values-v31/themes.xml b/src/android/app/src/main/res/values-v31/themes.xmlindex 292e44693d..5d3a86bf68 100644--- a/src/android/app/src/main/res/values-v31/themes.xml+++ b/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>diff --git a/src/android/app/src/main/res/values/styles.xml b/src/android/app/src/main/res/values/styles.xmlindex 1d355f3108..4e3a6e93a7 100644--- a/src/android/app/src/main/res/values/styles.xml+++ b/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>diff --git a/src/android/app/src/main/res/values/themes.xml b/src/android/app/src/main/res/values/themes.xmlindex 127eaf70ee..f32e2f5d09 100644--- a/src/android/app/src/main/res/values/themes.xml+++ b/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>diff --git a/src/android/app/src/main/res/values/yuzu_colors.xml b/src/android/app/src/main/res/values/yuzu_colors.xmlindex e157a2f518..921149d881 100644--- a/src/android/app/src/main/res/values/yuzu_colors.xml+++ b/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>