From 24ade95a1330f296ace0257af54ea4af34886b91 Mon Sep 17 00:00:00 2001
From: Charles Lombardo <clombardo169@gmail.com>
Date: Wed, 8 Mar 2023 16:13:56 -0500
Subject: [PATCH] android: Inherit from Material 3 themes

Partially breaks the UI for now but is necessary to use new material components.
---
 src/android/app/src/main/res/values/styles.xml | 12 ++++--------
 1 file 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 @@
     </style>
 
     <!-- Inherit from the material theme -->
-    <style name="YuzuBase" parent="Theme.AppCompat.DayNight.NoActionBar">
+    <style name="YuzuBase" parent="Theme.Material3.DayNight.NoActionBar">
         <!-- Main theme colors -->
         <item name="colorSurface">@color/view_background</item>
         <item name="colorOnSurface">@color/view_text</item>
@@ -34,7 +34,7 @@
     </style>
 
     <!-- Same as above, but use default action bar, and mandate margins. -->
-    <style name="YuzuSettingsBase" parent="Theme.AppCompat.DayNight">
+    <style name="YuzuSettingsBase" parent="Theme.Material3.DayNight">
         <item name="colorSurface">@color/view_background</item>
         <item name="colorOnSurface">@color/view_text</item>
         <item name="colorPrimary">@color/citra_orange</item>
@@ -43,7 +43,7 @@
     </style>
 
     <!-- Inherit from the Base Citra Dialog Theme -->
-    <style name="YuzuEmulationBase" parent="Theme.AppCompat.DayNight">
+    <style name="YuzuEmulationBase" parent="Theme.Material3.DayNight">
         <item name="colorSurface">@color/view_background</item>
         <item name="colorOnSurface">@color/view_text</item>
         <item name="colorPrimary">@color/citra_orange</item>
@@ -61,7 +61,7 @@
         <item name="android:windowAllowReturnTransitionOverlap">true</item>
     </style>
 
-    <style name="FilePickerAlertDialogTheme" parent="Theme.AppCompat.DayNight.Dialog.Alert">
+    <style name="FilePickerAlertDialogTheme" parent="Theme.Material3.DayNight.Dialog.Alert">
         <item name="colorSurface">@color/view_background</item>
         <item name="colorOnSurface">@color/view_text</item>
         <item name="colorPrimary">@color/citra_orange</item>
@@ -70,7 +70,3 @@
     </style>
 
 </resources>
-
-
-
-