diff options
| author | Charles Lombardo <clombardo169@gmail.com> | 2023-04-24 07:17:32 +0200 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2023-06-03 09:05:54 +0200 |
| commit | f984775f12804b40b4dd93e611e7cdb6383e9269 (patch) | |
| tree | 4775526d16aa670d786fe4edf50df95289a6f81e | |
| parent | android: Fix black backgrounds bug (diff) | |
| download | yuzu-f984775f12804b40b4dd93e611e7cdb6383e9269.tar yuzu-f984775f12804b40b4dd93e611e7cdb6383e9269.tar.gz yuzu-f984775f12804b40b4dd93e611e7cdb6383e9269.tar.bz2 yuzu-f984775f12804b40b4dd93e611e7cdb6383e9269.tar.lz yuzu-f984775f12804b40b4dd93e611e7cdb6383e9269.tar.xz yuzu-f984775f12804b40b4dd93e611e7cdb6383e9269.tar.zst yuzu-f984775f12804b40b4dd93e611e7cdb6383e9269.zip | |
6 files changed, 21 insertions, 2 deletions
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.xml index 4d20271e8..631d7fd1b 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.xml index ea8797b8e..1e563a6f2 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.xml index 292e44693..5d3a86bf6 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.xml index 1d355f310..4e3a6e93a 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.xml index 127eaf70e..f32e2f5d0 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.xml index e157a2f51..921149d88 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> |