From 59f7a7278c8efd30368aad8111d4df408fbad224 Mon Sep 17 00:00:00 2001
From: Isaac Marovitz <isaacryu@icloud.com>
Date: Sat, 10 Feb 2024 21:17:42 -0500
Subject: [PATCH] Conflicts

---
 src/Ryujinx.Ava/App.axaml.cs                       | 12 ++++++------
 src/Ryujinx.Ava/Common/Locale/LocaleManager.cs     |  4 ++--
 src/Ryujinx.Ava/UI/ViewModels/SettingsViewModel.cs |  8 ++++----
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/Ryujinx.Ava/App.axaml.cs b/src/Ryujinx.Ava/App.axaml.cs
index 11325dcb6..30bcfe790 100644
--- a/src/Ryujinx.Ava/App.axaml.cs
+++ b/src/Ryujinx.Ava/App.axaml.cs
@@ -46,9 +46,9 @@ namespace Ryujinx.Ava
 
             ApplyConfiguredTheme();
 
-            ConfigurationState.Instance.Ui.BaseStyle.Event += ThemeChanged_Event;
-            ConfigurationState.Instance.Ui.CustomThemePath.Event += ThemeChanged_Event;
-            ConfigurationState.Instance.Ui.EnableCustomTheme.Event += CustomThemeChanged_Event;
+            ConfigurationState.Instance.UI.BaseStyle.Event += ThemeChanged_Event;
+            ConfigurationState.Instance.UI.CustomThemePath.Event += ThemeChanged_Event;
+            ConfigurationState.Instance.UI.EnableCustomTheme.Event += CustomThemeChanged_Event;
         }
 
         private void CustomThemeChanged_Event(object sender, ReactiveEventArgs<bool> e)
@@ -91,13 +91,13 @@ namespace Ryujinx.Ava
         {
             try
             {
-                string baseStyle = ConfigurationState.Instance.Ui.BaseStyle;
+                string baseStyle = ConfigurationState.Instance.UI.BaseStyle;
 
                 if (string.IsNullOrWhiteSpace(baseStyle))
                 {
-                    ConfigurationState.Instance.Ui.BaseStyle.Value = "Dark";
+                    ConfigurationState.Instance.UI.BaseStyle.Value = "Dark";
 
-                    baseStyle = ConfigurationState.Instance.Ui.BaseStyle;
+                    baseStyle = ConfigurationState.Instance.UI.BaseStyle;
                 }
 
                 RequestedThemeVariant = baseStyle switch
diff --git a/src/Ryujinx.Ava/Common/Locale/LocaleManager.cs b/src/Ryujinx.Ava/Common/Locale/LocaleManager.cs
index b525f77ca..4f69b3ce2 100644
--- a/src/Ryujinx.Ava/Common/Locale/LocaleManager.cs
+++ b/src/Ryujinx.Ava/Common/Locale/LocaleManager.cs
@@ -31,8 +31,8 @@ namespace Ryujinx.Ava.Common.Locale
 
         public void Load()
         {
-            string localeLanguageCode = string.IsNullOrEmpty(ConfigurationState.Instance.Ui.LanguageCode.Value) ?
-                DefaultLanguageCode : ConfigurationState.Instance.Ui.LanguageCode.Value;
+            string localeLanguageCode = string.IsNullOrEmpty(ConfigurationState.Instance.UI.LanguageCode.Value) ?
+                DefaultLanguageCode : ConfigurationState.Instance.UI.LanguageCode.Value;
 
             // Load en_US as default, if the target language translation is incomplete.
             LoadDefaultLanguage();
diff --git a/src/Ryujinx.Ava/UI/ViewModels/SettingsViewModel.cs b/src/Ryujinx.Ava/UI/ViewModels/SettingsViewModel.cs
index ded94280d..22482e737 100644
--- a/src/Ryujinx.Ava/UI/ViewModels/SettingsViewModel.cs
+++ b/src/Ryujinx.Ava/UI/ViewModels/SettingsViewModel.cs
@@ -404,10 +404,10 @@ namespace Ryujinx.Ava.UI.ViewModels
             if (Program.PreviewerDetached)
             {
                 GameDirectories.Clear();
-                GameDirectories.AddRange(config.Ui.GameDirs.Value);
+                GameDirectories.AddRange(config.UI.GameDirs.Value);
             }
 
-            BaseStyleIndex = config.Ui.BaseStyle == "Light" ? 0 : 1;
+            BaseStyleIndex = config.UI.BaseStyle == "Light" ? 0 : 1;
 
             // Input
             EnableDockedMode = config.System.EnableDockedMode;
@@ -491,10 +491,10 @@ namespace Ryujinx.Ava.UI.ViewModels
             if (_directoryChanged)
             {
                 List<string> gameDirs = new(GameDirectories);
-                config.Ui.GameDirs.Value = gameDirs;
+                config.UI.GameDirs.Value = gameDirs;
             }
 
-            config.Ui.BaseStyle.Value = BaseStyleIndex == 0 ? "Light" : "Dark";
+            config.UI.BaseStyle.Value = BaseStyleIndex == 0 ? "Light" : "Dark";
 
             // Input
             config.System.EnableDockedMode.Value = EnableDockedMode;