mirror of
https://git.h3cjp.net/H3cJP/citra.git
synced 2024-12-27 05:36:42 +00:00
android: Inherit from Material 3 themes
Partially breaks the UI for now but is necessary to use new material components.
This commit is contained in:
parent
b5819594ba
commit
24ade95a13
|
@ -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>
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
Loading…
Reference in a new issue