summaryrefslogtreecommitdiff
path: root/src/android
diff options
context:
space:
mode:
authorGravatar Charles Lombardo2023-03-08 16:13:56 -0500
committerGravatar bunnei2023-06-03 00:05:38 -0700
commit24ade95a1330f296ace0257af54ea4af34886b91 (patch)
tree4ee0a26d6fad36c54b9cf16d9b4df7f8cdbd6091 /src/android
parentandroid: Convert MinimalDocumentFile to Kotlin (diff)
downloadyuzu-24ade95a1330f296ace0257af54ea4af34886b91.tar.gz
yuzu-24ade95a1330f296ace0257af54ea4af34886b91.tar.xz
yuzu-24ade95a1330f296ace0257af54ea4af34886b91.zip
android: Inherit from Material 3 themes
Partially breaks the UI for now but is necessary to use new material components.
Diffstat (limited to 'src/android')
-rw-r--r--src/android/app/src/main/res/values/styles.xml12
1 files changed, 4 insertions, 8 deletions
diff --git a/src/android/app/src/main/res/values/styles.xml b/src/android/app/src/main/res/values/styles.xml
index fdedc9b2e..773be611e 100644
--- a/src/android/app/src/main/res/values/styles.xml
+++ b/src/android/app/src/main/res/values/styles.xml
@@ -13,7 +13,7 @@
13 </style> 13 </style>
14 14
15 <!-- Inherit from the material theme --> 15 <!-- Inherit from the material theme -->
16 <style name="YuzuBase" parent="Theme.AppCompat.DayNight.NoActionBar"> 16 <style name="YuzuBase" parent="Theme.Material3.DayNight.NoActionBar">
17 <!-- Main theme colors --> 17 <!-- Main theme colors -->
18 <item name="colorSurface">@color/view_background</item> 18 <item name="colorSurface">@color/view_background</item>
19 <item name="colorOnSurface">@color/view_text</item> 19 <item name="colorOnSurface">@color/view_text</item>
@@ -34,7 +34,7 @@
34 </style> 34 </style>
35 35
36 <!-- Same as above, but use default action bar, and mandate margins. --> 36 <!-- Same as above, but use default action bar, and mandate margins. -->
37 <style name="YuzuSettingsBase" parent="Theme.AppCompat.DayNight"> 37 <style name="YuzuSettingsBase" parent="Theme.Material3.DayNight">
38 <item name="colorSurface">@color/view_background</item> 38 <item name="colorSurface">@color/view_background</item>
39 <item name="colorOnSurface">@color/view_text</item> 39 <item name="colorOnSurface">@color/view_text</item>
40 <item name="colorPrimary">@color/citra_orange</item> 40 <item name="colorPrimary">@color/citra_orange</item>
@@ -43,7 +43,7 @@
43 </style> 43 </style>
44 44
45 <!-- Inherit from the Base Citra Dialog Theme --> 45 <!-- Inherit from the Base Citra Dialog Theme -->
46 <style name="YuzuEmulationBase" parent="Theme.AppCompat.DayNight"> 46 <style name="YuzuEmulationBase" parent="Theme.Material3.DayNight">
47 <item name="colorSurface">@color/view_background</item> 47 <item name="colorSurface">@color/view_background</item>
48 <item name="colorOnSurface">@color/view_text</item> 48 <item name="colorOnSurface">@color/view_text</item>
49 <item name="colorPrimary">@color/citra_orange</item> 49 <item name="colorPrimary">@color/citra_orange</item>
@@ -61,7 +61,7 @@
61 <item name="android:windowAllowReturnTransitionOverlap">true</item> 61 <item name="android:windowAllowReturnTransitionOverlap">true</item>
62 </style> 62 </style>
63 63
64 <style name="FilePickerAlertDialogTheme" parent="Theme.AppCompat.DayNight.Dialog.Alert"> 64 <style name="FilePickerAlertDialogTheme" parent="Theme.Material3.DayNight.Dialog.Alert">
65 <item name="colorSurface">@color/view_background</item> 65 <item name="colorSurface">@color/view_background</item>
66 <item name="colorOnSurface">@color/view_text</item> 66 <item name="colorOnSurface">@color/view_text</item>
67 <item name="colorPrimary">@color/citra_orange</item> 67 <item name="colorPrimary">@color/citra_orange</item>
@@ -70,7 +70,3 @@
70 </style> 70 </style>
71 71
72</resources> 72</resources>
73
74
75
76
HIC SVNT DRACONES