UI: Inline game/autoload dir & motion/rumble/led

src/Ryujinx.Common/Configuration/DirtyHack.cs

@@ -9,7 +9,8 @@ namespace Ryujinx.Common.Configuration
     public enum DirtyHack : byte
     {
         Xc2MenuSoftlockFix = 1,
-        ShaderTranslationDelay = 2
+        // ShaderTranslationDelay = 2
+        NifmServiceDisableIsAnyInternetRequestAccepted = 3
     }
 
     public readonly struct EnabledDirtyHack(DirtyHack hack, int value)

src/Ryujinx.Common/TitleIDs.cs

@@ -1,7 +1,4 @@
 using Gommon;
-using Ryujinx.Common.Configuration;
-using Ryujinx.Common.Helper;
-using System;
 using System.Linq;
 
 namespace Ryujinx.Common

src/Ryujinx.HLE/HOS/Services/Nifm/IStaticService.cs

@@ -13,7 +13,7 @@ namespace Ryujinx.HLE.HOS.Services.Nifm
         // CreateGeneralServiceOld() -> object<nn::nifm::detail::IGeneralService>
         public ResultCode CreateGeneralServiceOld(ServiceCtx context)
         {
-            MakeObject(context, new IGeneralService());
+            MakeObject(context, new IGeneralService(context));
 
             return ResultCode.Success;
         }
@@ -22,7 +22,7 @@ namespace Ryujinx.HLE.HOS.Services.Nifm
         // CreateGeneralService(u64, pid) -> object<nn::nifm::detail::IGeneralService>
         public ResultCode CreateGeneralService(ServiceCtx context)
         {
-            MakeObject(context, new IGeneralService());
+            MakeObject(context, new IGeneralService(context));
 
             return ResultCode.Success;
         }

src/Ryujinx.HLE/HOS/Services/Nifm/StaticService/IGeneralService.cs

@@ -1,4 +1,5 @@
 using Ryujinx.Common;
+using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Logging;
 using Ryujinx.Common.Utilities;
 using Ryujinx.HLE.HOS.Services.Nifm.StaticService.GeneralService;
@@ -17,12 +18,12 @@ namespace Ryujinx.HLE.HOS.Services.Nifm.StaticService
         private UnicastIPAddressInformation _targetAddressInfoCache = null;
         private string _cacheChosenInterface = null;
 
-        public IGeneralService()
+        public IGeneralService(ServiceCtx context)
         {
             _generalServiceDetail = new GeneralServiceDetail
             {
                 ClientId = GeneralServiceManager.Count,
-                IsAnyInternetRequestAccepted = true, // NOTE: Why not accept any internet request?
+                IsAnyInternetRequestAccepted = !context.Device.DirtyHacks.IsEnabled(DirtyHack.NifmServiceDisableIsAnyInternetRequestAccepted), // NOTE: Why not accept any internet request?
             };
 
             NetworkChange.NetworkAddressChanged += LocalInterfaceCacheHandler;

src/Ryujinx.HLE/HOS/Services/Sockets/Bsd/Proxy/SocketHelpers.cs

@@ -1,6 +1,5 @@
 using Ryujinx.Common.Logging;
 using Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator.LdnRyu.Proxy;
-using Ryujinx.HLE.HOS.Services.Sockets.Bsd.Types;
 using System;
 using System.Collections.Generic;
 using System.Linq;

src/Ryujinx/Assets/Styles/Styles.xaml

@@ -49,6 +49,7 @@
                 <TextBlock
                          Classes="globalConfigMarker"/>
             </StackPanel>
+            
         </Border>
     </Design.PreviewWith>
     <Style Selector="DropDownButton">

src/Ryujinx/Assets/locales.json

@@ -7222,81 +7222,6 @@
         "zh_TW": "新增"
       }
     },
-    {
-      "ID": "ControllerSettingsModifiedNotification",
-      "Translations": {
-        "ar_SA": "(تم التعديل!)",
-        "de_DE": "(modifiziert!)",
-        "el_GR": "(τροποποιημένο!)",
-        "en_US": "(Modified!)",
-        "es_ES": "(modificado!)",
-        "fr_FR": "(modifié!)",
-        "he_IL": "(שונה!)",
-        "it_IT": "(modificato!)",
-        "ja_JP": "(変更済み!)",
-        "ko_KR": "(수정됨!)",
-        "no_NO": "(modifisert!)",
-        "pl_PL": "(zmodyfikowane!)",
-        "pt_BR": "(modificado!)",
-        "ru_RU": "(изменено!)",
-        "sv_SE": "(ändrad!)",
-        "th_TH": "(แก้ไขแล้ว!)",
-        "tr_TR": "(değiştirildi!)",
-        "uk_UA": "(модифіковано!)",
-        "zh_CN": "(已修改!)",
-        "zh_TW": "(已修改!)"
-      }
-    },
-    {
-      "ID": "ControllerSettingsDisableDeviceForSaving",
-      "Translations": {
-        "ar_SA": "تم إعداد التحكم.\n\nفي انتظار اتصال وحدة التحكم...",
-        "de_DE": "Steuerung konfiguriert.\n\nWarten auf die Verbindung des Controllers...",
-        "el_GR": "Η διαχείριση έχει ρυθμιστεί.\n\nΑναμένεται σύνδεση του χειριστηρίου...",
-        "en_US": "Control configured.\n\nWaiting for controller connection...",
-        "es_ES": "Control configurado.\n\nEsperando la conexión del controlador...",
-        "fr_FR": "Contrôle configuré.\n\nEn attente de la connexion du contrôleur...",
-        "he_IL": "השליטה הוגדרה.\n\nממתין לחיבור הבקר...",
-        "it_IT": "Controllo configurato.\n\nIn attesa della connessione del controller...",
-        "ja_JP": "コントロールが設定されました。\n\nコントローラーの接続を待っています...",
-        "ko_KR": "제어가 설정되었습니다.\n\n컨트롤러 연결 대기 중...",
-        "no_NO": "Kontroll konfigurert.\n\nVenter på tilkobling av kontroller...",
-        "pl_PL": "Sterowanie skonfigurowane.\n\nOczekiwanie na połączenie kontrolera...",
-        "pt_BR": "Controle configurado.\n\nAguardando conexão do controle...",
-        "ru_RU": "Управление настроено.\n\nОжидается подключение контроллера...",
-        "sv_SE": "Kontroll konfigurerad.\n\nVäntar på anslutning av kontrollen...",
-        "th_TH": "การควบคุมได้รับการตั้งค่าแล้ว\n\nกำลังรอการเชื่อมต่อคอนโทรลเลอร์...",
-        "tr_TR": "Kontrol yapılandırıldı.\n\nKontrolcü bağlantısı bekleniyor...",
-        "uk_UA": "Керування налаштовано.\n\nОчікується підключення контролера...",
-        "zh_CN": "控制已配置。\n\n等待控制器连接...",
-        "zh_TW": "控制已設定。\n\n等待控制器連接..."
-      }
-    },
-    {
-      "ID": "ControllerSettingsUnlink",
-      "Translations": {
-        "ar_SA": "إلغاء الربط",
-        "de_DE": "Entkoppeln",
-        "el_GR": "Αποσύνδεση",
-        "en_US": "Unlink",
-        "es_ES": "Desvincular",
-        "fr_FR": "Dissocier",
-        "he_IL": "ניתוק קישור",
-        "it_IT": "Scollega",
-        "ja_JP": "リンク解除",
-        "ko_KR": "연결 해제",
-        "no_NO": "Frakoble",
-        "pl_PL": "Odłącz",
-        "pt_BR": "Desvincular",
-        "ru_RU": "Отвязать",
-        "sv_SE": "Koppla från",
-        "th_TH": "ยกเลิกการเชื่อมโยง",
-        "tr_TR": "Bağlantıyı Kes",
-        "uk_UA": "Відв'язати",
-        "zh_CN": "解除绑定",
-        "zh_TW": "解除綁定"
-      }
-    },
     {
       "ID": "ControllerSettingsRemove",
       "Translations": {
@@ -11947,31 +11872,6 @@
         "zh_TW": "儲存設定檔"
       }
     },
-    {
-      "ID": "ControllerSettingsCancelCurrentChangesToolTip",
-      "Translations": {
-        "ar_SA": "إلغاء التغييرات الحالية",
-        "de_DE": "Aktuelle Änderungen abbrechen",
-        "el_GR": "Ακύρωση τρεχουσών αλλαγών",
-        "en_US": "Cancel current changes",
-        "es_ES": "Cancelar los cambios actuales",
-        "fr_FR": "Annuler les modifications en cours",
-        "he_IL": "ביטול השינויים הנוכחיים",
-        "it_IT": "Annulla le modifiche correnti",
-        "ja_JP": "現在の変更をキャンセル",
-        "ko_KR": "현재 변경 취소",
-        "no_NO": "Avbryt gjeldende endringer",
-        "pl_PL": "Anuluj bieżące zmiany",
-        "pt_BR": "Cancelar alterações atuais",
-        "ru_RU": "Отменить текущие изменения",
-        "sv_SE": "Avbryt aktuella ändringar",
-        "th_TH": "ยกเลิกการเปลี่ยนแปลงปัจจุบัน",
-        "tr_TR": "Geçerli değişiklikleri iptal et",
-        "uk_UA": "Скасувати поточні зміни",
-        "zh_CN": "取消当前更改",
-        "zh_TW": "取消當前變更"
-      }
-    },
     {
       "ID": "MenuBarFileToolsTakeScreenshot",
       "Translations": {

src/Ryujinx/Common/LocaleManager.cs

@@ -38,8 +38,8 @@ namespace Ryujinx.Ava.Common.Locale
                 { LocaleKeys.RyujinxConfirm, [RyujinxApp.FullAppName] },
                 { LocaleKeys.RyujinxUpdater, [RyujinxApp.FullAppName] },
                 { LocaleKeys.RyujinxRebooter, [RyujinxApp.FullAppName] },
-                { LocaleKeys.CompatibilityListSearchBoxWatermarkWithCount, [CompatibilityCsv.Entries.Length] },
+                { LocaleKeys.CompatibilityListSearchBoxWatermarkWithCount, [CompatibilityDatabase.Entries.Length] },
-                { LocaleKeys.CompatibilityListTitle, [CompatibilityCsv.Entries.Length] }
+                { LocaleKeys.CompatibilityListTitle, [CompatibilityDatabase.Entries.Length] }
             });
 
             Load();

src/Ryujinx/Common/Markup/MarkupExtensions.cs

@@ -1,5 +1,4 @@
 using Avalonia.Markup.Xaml.MarkupExtensions;
-using Humanizer;
 using Projektanker.Icons.Avalonia;
 using Ryujinx.Ava.Common.Locale;
 

src/Ryujinx/Common/XCITrimmerLog.cs

@@ -26,9 +26,9 @@ namespace Ryujinx.Ava.Common
         
         internal class TrimmerWindow : Ryujinx.Common.Logging.XCIFileTrimmerLog
         {
-            private readonly XCITrimmerViewModel _viewModel;
+            private readonly XciTrimmerViewModel _viewModel;
 
-            public TrimmerWindow(XCITrimmerViewModel viewModel)
+            public TrimmerWindow(XciTrimmerViewModel viewModel)
             {
                 _viewModel = viewModel;
             }

src/Ryujinx/Headless/HeadlessRyujinx.Init.cs

@@ -2,6 +2,7 @@ using DiscordRPC;
 using LibHac.Tools.FsSystem;
 using Ryujinx.Audio.Backends.SDL2;
 using Ryujinx.Ava;
+using Ryujinx.Ava.Systems;
 using Ryujinx.Ava.Systems.Configuration;
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Configuration.Hid;
@@ -11,7 +12,6 @@ using Ryujinx.Common.Configuration.Hid.Keyboard;
 using Ryujinx.Common.Logging;
 using Ryujinx.Common.Utilities;
 using Ryujinx.Graphics.GAL;
-using Ryujinx.Graphics.GAL.Multithreading;
 using Ryujinx.Graphics.OpenGL;
 using Ryujinx.Graphics.Vulkan;
 using Ryujinx.HLE;

src/Ryujinx/Program.cs

@@ -5,6 +5,7 @@ using Gommon;
 using Projektanker.Icons.Avalonia;
 using Projektanker.Icons.Avalonia.FontAwesome;
 using Projektanker.Icons.Avalonia.MaterialDesign;
+using Ryujinx.Ava.Systems;
 using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.Windows;
 using Ryujinx.Ava.Utilities;

src/Ryujinx/Ryujinx.csproj

@@ -91,10 +91,12 @@
     <Content Include="..\..\distribution\legal\THIRDPARTY.md">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
       <TargetPath>THIRDPARTY.md</TargetPath>
+      <Visible>False</Visible>
     </Content>
     <Content Include="..\..\LICENSE.txt">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
       <TargetPath>LICENSE.txt</TargetPath>
+      <Visible>False</Visible>
     </Content>
   </ItemGroup>
 

src/Ryujinx/Systems/AppHost.cs

@@ -6,7 +6,6 @@ using Avalonia.Threading;
 using DiscordRPC;
 using LibHac.Common;
 using LibHac.Ns;
-using LibHac.Tools.FsSystem;
 using Ryujinx.Audio.Backends.Dummy;
 using Ryujinx.Audio.Backends.OpenAL;
 using Ryujinx.Audio.Backends.SDL2;
@@ -35,11 +34,9 @@ using Ryujinx.Graphics.GAL.Multithreading;
 using Ryujinx.Graphics.Gpu;
 using Ryujinx.Graphics.OpenGL;
 using Ryujinx.Graphics.Vulkan;
-using Ryujinx.HLE;
 using Ryujinx.HLE.FileSystem;
 using Ryujinx.HLE.HOS;
 using Ryujinx.HLE.HOS.Services.Account.Acc;
-using Ryujinx.HLE.HOS.SystemState;
 using Ryujinx.Input;
 using Ryujinx.Input.HLE;
 using SkiaSharp;
@@ -62,7 +59,7 @@ using Size = Avalonia.Size;
 using Switch = Ryujinx.HLE.Switch;
 using VSyncMode = Ryujinx.Common.Configuration.VSyncMode;
 
-namespace Ryujinx.Ava
+namespace Ryujinx.Ava.Systems
 {
     internal class AppHost
     {

src/Ryujinx/Systems/AppLibrary/ApplicationData.cs

@@ -36,7 +36,7 @@ namespace Ryujinx.Ava.Systems.AppLibrary
             {
                 _id = value;
 
-                Compatibility = CompatibilityCsv.Find(value);
+                Compatibility = CompatibilityDatabase.Find(value);
                 RichPresenceSpec = PlayReports.Analyzer.TryGetSpec(IdString, out GameSpec gameSpec) 
                     ? gameSpec 
                     : default(Optional<GameSpec>);

src/Ryujinx/Systems/AppLibrary/LdnGameDataReceivedEventArgs.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 
 namespace Ryujinx.Ava.Systems.AppLibrary
 {

src/Ryujinx/Systems/CompatibilityDatabase.cs

@@ -11,24 +11,9 @@ using System.Text;
 
 namespace Ryujinx.Ava.Systems
 {
-    public struct ColumnIndices(Func<ReadOnlySpan<char>, int> getIndex)
+    public class CompatibilityDatabase
     {
-        public const string TitleIdCol = "\"title_id\"";
+        static CompatibilityDatabase() => Load();
-        public const string GameNameCol = "\"game_name\"";
-        public const string LabelsCol = "\"labels\"";
-        public const string StatusCol = "\"status\"";
-        public const string LastUpdatedCol = "\"last_updated\"";
-        
-        public readonly int TitleId = getIndex(TitleIdCol);
-        public readonly int GameName = getIndex(GameNameCol);
-        public readonly int Labels = getIndex(LabelsCol);
-        public readonly int Status = getIndex(StatusCol);
-        public readonly int LastUpdated = getIndex(LastUpdatedCol);
-    }
-    
-    public class CompatibilityCsv
-    {
-        static CompatibilityCsv() => Load();
 
         public static void Load()
         {
@@ -65,16 +50,6 @@ namespace Ryujinx.Ava.Systems
         
         public static CompatibilityEntry Find(ulong titleId)
             => Find(titleId.ToString("X16"));
-        
-        public static LocaleKeys? GetStatus(string titleId)
-            => Find(titleId)?.Status;
-        
-        public static LocaleKeys? GetStatus(ulong titleId) => GetStatus(titleId.ToString("X16"));
-        
-        public static string GetLabels(string titleId)
-            => Find(titleId)?.FormattedIssueLabels;
-        
-        public static string GetLabels(ulong titleId) => GetLabels(titleId.ToString("X16"));
     }
 
     public class CompatibilityEntry
@@ -135,6 +110,7 @@ namespace Ryujinx.Ava.Systems
 
         public string FormattedIssueLabels => Labels
             .Select(FormatLabelName)
+            .Where(x => x != null)
             .JoinToString(", ");
 
         public override string ToString() =>
@@ -158,7 +134,6 @@ namespace Ryujinx.Ava.Systems
             "gui" => "GUI",
             "help wanted" => "Help Wanted",
             "horizon" => "Horizon",
-            "infra" => "Project Infra",
             "invalid" => "Invalid",
             "kernel" => "Kernel",
             "ldn" => "LDN",
@@ -172,9 +147,9 @@ namespace Ryujinx.Ava.Systems
             "ldn-untested" => "LDN Untested",
             "ldn-broken" => "LDN Broken",
             "ldn-partial" => "Partial LDN",
-            "nvdec" => "NVDEC",
+            "nvdec" => "GPU Video Decoding",
-            "services" => "NX Services",
+            "services" => "HLE Services",
-            "services-horizon" => "Horizon OS Services",
+            "services-horizon" => "New HLE Services",
             "slow" => "Runs Slow",
             "crash" => "Crashes",
             "deadlock" => "Deadlock",
@@ -182,7 +157,7 @@ namespace Ryujinx.Ava.Systems
             "opengl" => "OpenGL",
             "opengl-backend-bug" => "OpenGL Backend Bug",
             "vulkan-backend-bug" => "Vulkan Backend Bug",
-            "mac-bug" => "Mac-specific Bug(s)",
+            "mac-bug" => "Mac-specific Problems",
             "amd-vendor-bug" => "AMD GPU Bug",
             "intel-vendor-bug" => "Intel GPU Bug",
             "loader-allocator" => "Loader Allocator",
@@ -191,18 +166,22 @@ namespace Ryujinx.Ava.Systems
             "UE4" => "Unreal Engine 4",
             "homebrew" => "Homebrew Content",
             "online-broken" => "Online Broken",
-            _ => Capitalize(labelName)
+            _ => null
         };
+    }
+    
+    public struct ColumnIndices(Func<ReadOnlySpan<char>, int> getIndex)
+    {
+        private const string TitleIdCol = "\"title_id\"";
+        private const string GameNameCol = "\"game_name\"";
+        private const string LabelsCol = "\"labels\"";
+        private const string StatusCol = "\"status\"";
+        private const string LastUpdatedCol = "\"last_updated\"";
         
-        public static string Capitalize(string value)
+        public readonly int TitleId = getIndex(TitleIdCol);
-        {
+        public readonly int GameName = getIndex(GameNameCol);
-            if (value == string.Empty)
+        public readonly int Labels = getIndex(LabelsCol);
-                return string.Empty;
+        public readonly int Status = getIndex(StatusCol);
-        
+        public readonly int LastUpdated = getIndex(LastUpdatedCol);
-            char firstChar = value[0];
-            string rest = value[1..];
-
-            return $"{char.ToUpper(firstChar)}{rest}";
-        }
     }
 }

src/Ryujinx/Systems/Configuration/ConfigurationFileFormat.cs

@@ -15,7 +15,7 @@ namespace Ryujinx.Ava.Systems.Configuration
         /// <summary>
         /// The current version of the file format
         /// </summary>
-        public const int CurrentVersion = 67;
+        public const int CurrentVersion = 68;
 
         /// <summary>
         /// Version of the configuration file format

src/Ryujinx/Systems/Configuration/ConfigurationState.Migration.cs

@@ -160,9 +160,7 @@ namespace Ryujinx.Ava.Systems.Configuration
                 DirtyHacks hacks = new (cff.DirtyHacks ?? []);
 
                 Hacks.Xc2MenuSoftlockFix.Value = hacks.IsEnabled(DirtyHack.Xc2MenuSoftlockFix);
-
+                
-                Hacks.EnableShaderTranslationDelay.Value = hacks.IsEnabled(DirtyHack.ShaderTranslationDelay);
-                Hacks.ShaderTranslationDelay.Value = hacks[DirtyHack.ShaderTranslationDelay].CoerceAtLeast(0);
             }
 
             if (configurationFileUpdated)
@@ -441,6 +439,8 @@ namespace Ryujinx.Ava.Systems.Configuration
                 (65, static cff => cff.UpdateCheckerType = cff.CheckUpdatesOnStart ? UpdaterType.PromptAtStartup : UpdaterType.Off),
                 (66, static cff => cff.DisableInputWhenOutOfFocus = false),
                 (67, static cff => cff.FocusLostActionType = cff.DisableInputWhenOutOfFocus ? FocusLostType.BlockInput : FocusLostType.DoNothing)
+                // 68 was the version that added per-game configs; the file structure did not change
+                // the version was increased so external tools could know that your Ryujinx version has per-game config capabilities.
             );
     }
 }

src/Ryujinx/Systems/Configuration/ConfigurationState.Model.cs

@@ -11,7 +11,6 @@ using Ryujinx.Common.Helper;
 using Ryujinx.Common.Logging;
 using Ryujinx.Common.Utilities;
 using Ryujinx.HLE;
-using Ryujinx.HLE.HOS.SystemState;
 using System.Collections.Generic;
 using System.Linq;
 using RyuLogger = Ryujinx.Common.Logging.Logger;
@@ -684,18 +683,15 @@ namespace Ryujinx.Ava.Systems.Configuration
             
             public ReactiveObject<bool> Xc2MenuSoftlockFix { get; private set; }
             
-            public ReactiveObject<bool> EnableShaderTranslationDelay { get; private set; }
+            public ReactiveObject<bool> DisableNifmIsAnyInternetRequestAccepted { get; private set; }
-            
-            public ReactiveObject<int> ShaderTranslationDelay { get; private set; }
 
             public HacksSection()
             {
                 ShowDirtyHacks = new ReactiveObject<bool>();
                 Xc2MenuSoftlockFix = new ReactiveObject<bool>();
                 Xc2MenuSoftlockFix.Event += HackChanged;
-                EnableShaderTranslationDelay = new ReactiveObject<bool>();
+                DisableNifmIsAnyInternetRequestAccepted = new ReactiveObject<bool>();
-                EnableShaderTranslationDelay.Event += HackChanged;
+                DisableNifmIsAnyInternetRequestAccepted.Event += HackChanged;
-                ShaderTranslationDelay = new ReactiveObject<int>();
             }
 
             private void HackChanged(object sender, ReactiveEventArgs<bool> rxe)
@@ -726,8 +722,8 @@ namespace Ryujinx.Ava.Systems.Configuration
                     if (Xc2MenuSoftlockFix)
                         Apply(DirtyHack.Xc2MenuSoftlockFix);
                     
-                    if (EnableShaderTranslationDelay)
+                    if (DisableNifmIsAnyInternetRequestAccepted)
-                        Apply(DirtyHack.ShaderTranslationDelay, ShaderTranslationDelay);
+                        Apply(DirtyHack.NifmServiceDisableIsAnyInternetRequestAccepted);
                     
                     return enabledHacks.ToArray();
 

src/Ryujinx/Systems/DiscordIntegrationModule.cs

@@ -9,10 +9,9 @@ using Ryujinx.Common.Logging;
 using Ryujinx.HLE;
 using Ryujinx.HLE.Loaders.Processes;
 using Ryujinx.Horizon;
-using Ryujinx.Horizon.Prepo.Types;
 using System.Text;
 
-namespace Ryujinx.Ava
+namespace Ryujinx.Ava.Systems
 {
     public static class DiscordIntegrationModule
     {
@@ -124,7 +123,7 @@ namespace Ryujinx.Ava
             _currentApp = null;
         }
 
-        private static void HandlePlayReport(PlayReport playReport)
+        private static void HandlePlayReport(Horizon.Prepo.Types.PlayReport playReport)
         {
             if (_discordClient is null) return;
             if (!TitleIDs.CurrentApplication.Value.HasValue) return;

src/Ryujinx/Systems/Rebooter.cs

@@ -1,8 +1,6 @@
 using FluentAvalonia.UI.Controls;
 using Ryujinx.Ava.Common.Locale;
-using Ryujinx.Ava.UI.ViewModels;
 using Ryujinx.Ava.Utilities;
-using SkiaSharp;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
@@ -10,7 +8,7 @@ using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace Ryujinx.Ava
+namespace Ryujinx.Ava.Systems
 {
     internal static class Rebooter
     {

src/Ryujinx/Systems/Updater.cs

@@ -27,7 +27,7 @@ using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace Ryujinx.Ava
+namespace Ryujinx.Ava.Systems
 {
     internal static class Updater
     {

src/Ryujinx/UI/Controls/ApplicationContextMenu.axaml.cs

@@ -9,10 +9,10 @@ using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.Common.Models;
 using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.ViewModels;
-using Ryujinx.Ava.UI.Views.Misc;
 using Ryujinx.Ava.UI.Windows;
 using Ryujinx.Ava.Utilities;
 using Ryujinx.Ava.Systems.AppLibrary;
+using Ryujinx.Ava.UI.Views.Dialog;
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Helper;
 using Ryujinx.HLE.HOS;
@@ -80,13 +80,13 @@ namespace Ryujinx.Ava.UI.Controls
         public async void OpenTitleUpdateManager_Click(object sender, RoutedEventArgs args)
         {
             if (sender is MenuItem { DataContext: MainWindowViewModel { SelectedApplication: not null } viewModel })
-                await TitleUpdateWindow.Show(viewModel.ApplicationLibrary, viewModel.SelectedApplication);
+                await TitleUpdateManagerView.Show(viewModel.ApplicationLibrary, viewModel.SelectedApplication);
         }
 
         public async void OpenDownloadableContentManager_Click(object sender, RoutedEventArgs args)
         {
             if (sender is MenuItem { DataContext: MainWindowViewModel { SelectedApplication: not null } viewModel })
-                await DownloadableContentManagerWindow.Show(viewModel.ApplicationLibrary, viewModel.SelectedApplication);
+                await DownloadableContentManagerView.Show(viewModel.ApplicationLibrary, viewModel.SelectedApplication);
         }
 
         public async void OpenCheatManager_Click(object sender, RoutedEventArgs args)
@@ -127,7 +127,7 @@ namespace Ryujinx.Ava.UI.Controls
         public async void OpenModManager_Click(object sender, RoutedEventArgs args)
         {
             if (sender is MenuItem { DataContext: MainWindowViewModel { SelectedApplication: not null } viewModel })
-                await ModManagerWindow.Show(
+                await ModManagerView.Show(
                     viewModel.SelectedApplication.Id, 
                     viewModel.SelectedApplication.IdBase, 
                     viewModel.ApplicationLibrary, 

src/Ryujinx/UI/Controls/RyujinxLogo.cs

@@ -1,6 +1,5 @@
 using Avalonia;
 using Avalonia.Controls;
-using Avalonia.Layout;
 using Avalonia.Media.Imaging;
 using Ryujinx.Ava.Systems.Configuration;
 using Ryujinx.Ava.UI.ViewModels;

src/Ryujinx/UI/Helpers/IconColorPicker.cs

@@ -2,9 +2,9 @@ using SkiaSharp;
 using System;
 using System.Collections.Generic;
 
-namespace Ryujinx.Ava.UI.Windows
+namespace Ryujinx.Ava.UI.Helpers
 {
-    static class IconColorPicker
+    public static class IconColorPicker
     {
         private const int ColorsPerLine = 64;
         private const int TotalColors = ColorsPerLine * ColorsPerLine;

src/Ryujinx/UI/RyujinxApp.axaml.cs

@@ -7,12 +7,12 @@ using Avalonia.Styling;
 using Avalonia.Threading;
 using FluentAvalonia.UI.Windowing;
 using Gommon;
-using Ryujinx.Ava.Common;
 using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.Windows;
 using Ryujinx.Ava.Utilities;
 using Ryujinx.Ava.Systems.Configuration;
+using Ryujinx.Ava.UI.Views.Dialog;
 using Ryujinx.Common;
 using Ryujinx.Common.Logging;
 using System;
@@ -150,7 +150,7 @@ namespace Ryujinx.Ava
 
         private async void AboutRyujinx_OnClick(object sender, EventArgs e)
         {
-            await AboutWindow.Show();
+            await AboutView.Show();
         }
     }
 }

src/Ryujinx/UI/ViewModels/AboutWindowViewModel.cs

@@ -3,7 +3,6 @@ using Avalonia.Styling;
 using Avalonia.Threading;
 using CommunityToolkit.Mvvm.ComponentModel;
 using Gommon;
-using Ryujinx.Ava.Common;
 using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.Systems.Configuration;
 using System;

src/Ryujinx/UI/ViewModels/CompatibilityViewModel.cs

@@ -1,17 +1,17 @@
 using Gommon;
 using Ryujinx.Ava.Systems;
 using Ryujinx.Ava.Systems.AppLibrary;
-using Ryujinx.Ava.UI.Windows;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 
 namespace Ryujinx.Ava.UI.ViewModels
 {
-    public class CompatibilityViewModel : BaseModel
+    public class CompatibilityViewModel : BaseModel, IDisposable
     {
-        private bool _onlyShowOwnedGames = true;
+        private readonly ApplicationLibrary _appLibrary;
 
-        private IEnumerable<CompatibilityEntry> _currentEntries = CompatibilityCsv.Entries;
+        private IEnumerable<CompatibilityEntry> _currentEntries = CompatibilityDatabase.Entries;
         private string[] _ownedGameTitleIds = [];
 
         public IEnumerable<CompatibilityEntry> CurrentEntries => OnlyShowOwnedGames
@@ -20,15 +20,27 @@ namespace Ryujinx.Ava.UI.ViewModels
             : _currentEntries;
 
         public CompatibilityViewModel() {}
+        
+        private void AppCountUpdated(object _, ApplicationCountUpdatedEventArgs __)
+            => _ownedGameTitleIds = _appLibrary.Applications.Keys.Select(x => x.ToString("X16")).ToArray();
 
         public CompatibilityViewModel(ApplicationLibrary appLibrary)
         {
-            appLibrary.ApplicationCountUpdated += (_, _) 
+            _appLibrary = appLibrary;
-                => _ownedGameTitleIds = appLibrary.Applications.Keys.Select(x => x.ToString("X16")).ToArray();
             
-            _ownedGameTitleIds = appLibrary.Applications.Keys.Select(x => x.ToString("X16")).ToArray();
+            AppCountUpdated(null, null);
+
+            _appLibrary.ApplicationCountUpdated += AppCountUpdated;
         }
 
+        void IDisposable.Dispose()
+        {
+            GC.SuppressFinalize(this);
+            _appLibrary.ApplicationCountUpdated -= AppCountUpdated;
+        }
+        
+        private bool _onlyShowOwnedGames = true;
+
         public bool OnlyShowOwnedGames
         {
             get => _onlyShowOwnedGames;
@@ -46,11 +58,11 @@ namespace Ryujinx.Ava.UI.ViewModels
         {
             if (string.IsNullOrEmpty(searchTerm))
             {
-                SetEntries(CompatibilityCsv.Entries);
+                SetEntries(CompatibilityDatabase.Entries);
                 return;
             }
 
-            SetEntries(CompatibilityCsv.Entries.Where(x =>
+            SetEntries(CompatibilityDatabase.Entries.Where(x =>
                 x.GameName.ContainsIgnoreCase(searchTerm)
                 || x.TitleId.Check(tid => tid.ContainsIgnoreCase(searchTerm))));
         }

src/Ryujinx/UI/ViewModels/Input/ControllerInputViewModel.cs

@@ -1,9 +1,5 @@
 using Avalonia.Svg.Skia;
 using CommunityToolkit.Mvvm.ComponentModel;
-using CommunityToolkit.Mvvm.Input;
-using FluentAvalonia.UI.Controls;
-using Ryujinx.Ava.Input;
-using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.Models.Input;
 using Ryujinx.Ava.UI.Views.Input;
 using Ryujinx.Common.Utilities;
@@ -95,21 +91,18 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
         }
 
         public async void ShowMotionConfig()
-        {      
+        {
             await MotionInputView.Show(this);
-            ParentModel.IsModified = true;
         }
 
         public async void ShowRumbleConfig()
-        {        
+        {
             await RumbleInputView.Show(this);
-            ParentModel.IsModified = true;
         }
         
         public async void ShowLedConfig()
         {
             await LedInputView.Show(this);
-            ParentModel.IsModified = true;
         }
 
         public void OnParentModelChanged()

src/Ryujinx/UI/ViewModels/Input/InputViewModel.cs

@@ -88,40 +88,13 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
         public bool IsKeyboard => !IsController;
         public bool IsRight { get; set; }
         public bool IsLeft { get; set; }
-        public string RevertDeviceId { get; set; }
+
         public bool HasLed => SelectedGamepad.Features.HasFlag(GamepadFeaturesFlag.Led);
         public bool CanClearLed => SelectedGamepad.Name.ContainsIgnoreCase("DualSense");
 
-        public bool _isChangeTrackingActive;
+        public bool IsModified { get; set; }
-
-        public bool _isModified;
-        public bool IsModified
-        {
-            get => _isModified;
-            set 
-            {
-                _isModified = value;
-                OnPropertyChanged();
-            }
-        }
-
         public event Action NotifyChangesEvent;
 
-
-        public string _profileChoose;
-        public string ProfileChoose
-        {
-            get => _profileChoose;
-            set
-            {
-                // When you select a profile, the settings from the profile will be applied.
-                // To save the settings, you still need to click the apply button
-                _profileChoose = value;
-                LoadProfile();
-                OnPropertyChanged();
-            }
-        }
-
         public object ConfigViewModel
         {
             get => _configViewModel;
@@ -147,14 +120,14 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
             set
             {
                 if (IsModified)
-                {                 
+                {
+
                     _playerIdChoose = value;
                     return;
                 }
-             
+
                 IsModified = false;
                 _playerId = value;
-                _isChangeTrackingActive = false;
 
                 if (!Enum.IsDefined<PlayerIndex>(_playerId))
                 {
@@ -162,13 +135,13 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
 
                 }
                 _isLoaded = false;
+
                 LoadConfiguration();
                 LoadDevice();
                 LoadProfiles();
 
-                RevertDeviceId = Devices[Device].Id;
                 _isLoaded = true;
-                _isChangeTrackingActive = true;
+
                 OnPropertyChanged();
             }
         }
@@ -178,8 +151,6 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
             get => _controller;
             set
             {
-                MarkAsChanged();
-
                 _controller = value;
 
                 if (_controller == -1)
@@ -214,11 +185,11 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
                             IsLeft = false;
                             break;
                     }
-                    
+
                     LoadInputDriver();
                     LoadProfiles();
                 }
-       
+
                 OnPropertyChanged();
                 NotifyChanges();
             }
@@ -258,8 +229,6 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
             get => _device;
             set
             {
-                MarkAsChanged();
-
                 _device = value < 0 ? 0 : value;
 
                 if (_device >= Devices.Count)
@@ -279,27 +248,13 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
                     }
                 }
 
-                FindPairedDeviceInConfigFile();
                 OnPropertyChanged();
                 NotifyChanges();
             }
         }
 
-
         public InputConfig Config { get; set; }
 
-        public bool _notificationView;
-
-        public bool NotificationView
-        {
-            get => _notificationView;
-            set
-            {
-                _notificationView = value;
-                OnPropertyChanged();
-            }
-        }
-
         public InputViewModel(UserControl owner) : this()
         {
             if (Program.PreviewerDetached)
@@ -319,8 +274,6 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
 
                 PlayerId = PlayerIndex.Player1;
             }
-
-            _isChangeTrackingActive = true;
         }
 
         public InputViewModel()
@@ -358,39 +311,8 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
             {
                 ConfigViewModel = new ControllerInputViewModel(this, new GamepadInputConfig(controllerInputConfig), VisualStick);
             }
-
-            FindPairedDeviceInConfigFile();
         }
 
-        private void FindPairedDeviceInConfigFile()
-        {
-            // This function allows you to output a message about the device configuration found in the file
-            // NOTE: if the configuration is found, we display the message "Waiting for controller connection",
-            // but only if the id gamepad belongs to the selected player
-            NotificationView = Config != null && Devices.FirstOrDefault(d => d.Id == Config.Id).Id != Config.Id && Config.PlayerIndex == PlayerId;
-        }
-
-
-        private void MarkAsChanged()
-        {
-            //If tracking is active, then allow changing the modifier      
-            if (!IsModified && _isChangeTrackingActive)
-            {
-                RevertDeviceId = Devices[Device].Id; // Remember the device to undo changes
-                IsModified = true;
-            }
-        }
-
-
-        public void UnlinkDevice()
-        {
-            // "Disabled" mode is available after unbinding the device
-            // NOTE: the IsModified flag to be able to apply the settings.
-            NotificationView = false;
-            IsModified = true;
-        }
-
-
         public void LoadDevice()
         {
             if (Config == null || Config.Backend == InputBackendType.Invalid)
@@ -456,34 +378,14 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
             }
         }
 
-        private async void HandleOnGamepadDisconnected(string id)
+        private void HandleOnGamepadDisconnected(string id)
         {
-            _isChangeTrackingActive = false; // Disable configuration change tracking
+            Dispatcher.UIThread.Post(LoadDevices);
-            await Dispatcher.UIThread.InvokeAsync(() =>
-            {
-                LoadDevices();
-
-                IsModified = true;
-                RevertChanges();
-                FindPairedDeviceInConfigFile();
-
-                _isChangeTrackingActive = true; // Enable configuration change tracking
-                return System.Threading.Tasks.Task.CompletedTask;
-            });
         }
 
-        private async void HandleOnGamepadConnected(string id)
+        private void HandleOnGamepadConnected(string id)
         {
-            _isChangeTrackingActive = false; // Disable configuration change tracking
+            Dispatcher.UIThread.Post(LoadDevices);
-            await Dispatcher.UIThread.InvokeAsync(() =>
-            {
-                LoadDevices();
-
-                IsModified = true;
-                RevertChanges();                  
-
-                _isChangeTrackingActive = true;// Enable configuration change tracking
-            });
         }
 
         private string GetCurrentGamepadId()
@@ -786,12 +688,6 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
             return config;
         }
 
-        public void LoadProfileButton()
-        { 
-            LoadProfile();
-            IsModified = true;
-        }
-
         public async void LoadProfile()
         {
             if (Device == 0)
@@ -843,11 +739,9 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
             {
                 _isLoaded = false;
 
-                config.Id = Config.Id; // Set current device id instead of changing device(independent profiles)
-
                 LoadConfiguration(config);
 
-                //LoadDevice();  This line of code hard-links profiles to controllers, the commented line allows profiles to be applied to all controllers 
+                LoadDevice();
 
                 _isLoaded = true;
 
@@ -857,58 +751,54 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
 
         public async void SaveProfile()
         {
-           
+            if (Device == 0)
-           if (Device == 0)
+            {
-           {
+                return;
-               return;
+            }
-           }
-           
-           if (ConfigViewModel == null)
-           {
-               return;
-           }
-         
-           if (ProfileName == LocaleManager.Instance[LocaleKeys.ControllerSettingsProfileDefault])
-           {
-               await ContentDialogHelper.CreateErrorDialog(LocaleManager.Instance[LocaleKeys.DialogProfileDefaultProfileOverwriteErrorMessage]);
 
-               return;
+            if (ConfigViewModel == null)
-           }
+            {
-           else
+                return;
-           {
+            }
-               bool validFileName = ProfileName.IndexOfAny(Path.GetInvalidFileNameChars()) == -1;
 
-               if (validFileName)
+            if (ProfileName == LocaleManager.Instance[LocaleKeys.ControllerSettingsProfileDefault])
-               {
+            {
-                   string path = Path.Combine(GetProfileBasePath(), ProfileName + ".json");
+                await ContentDialogHelper.CreateErrorDialog(LocaleManager.Instance[LocaleKeys.DialogProfileDefaultProfileOverwriteErrorMessage]);
 
-                   InputConfig config = null;
+                return;
+            }
+            else
+            {
+                bool validFileName = ProfileName.IndexOfAny(Path.GetInvalidFileNameChars()) == -1;
 
-                   if (IsKeyboard)
+                if (validFileName)
-                   {
+                {
-                       config = (ConfigViewModel as KeyboardInputViewModel).Config.GetConfig();
+                    string path = Path.Combine(GetProfileBasePath(), ProfileName + ".json");
-                   }
-                   else if (IsController)
-                   {
-                       config = (ConfigViewModel as ControllerInputViewModel).Config.GetConfig();
-                   }
 
-                   config.ControllerType = Controllers[_controller].Type;
+                    InputConfig config = null;
 
-                   string jsonString = JsonHelper.Serialize(config, _serializerContext.InputConfig);
+                    if (IsKeyboard)
+                    {
+                        config = (ConfigViewModel as KeyboardInputViewModel).Config.GetConfig();
+                    }
+                    else if (IsController)
+                    {
+                        config = (ConfigViewModel as ControllerInputViewModel).Config.GetConfig();
+                    }
 
-                   await File.WriteAllTextAsync(path, jsonString);
+                    config.ControllerType = Controllers[_controller].Type;
 
-                   LoadProfiles();
+                    string jsonString = JsonHelper.Serialize(config, _serializerContext.InputConfig);
 
-                   ProfileChoose = ProfileName; // Show new profile
+                    await File.WriteAllTextAsync(path, jsonString);
-               }
+
-               else
+                    LoadProfiles();
-               {
+                }
-                   await ContentDialogHelper.CreateErrorDialog(LocaleManager.Instance[LocaleKeys.DialogProfileInvalidProfileNameErrorMessage]);
+                else
-               }
+                {
-           }
+                    await ContentDialogHelper.CreateErrorDialog(LocaleManager.Instance[LocaleKeys.DialogProfileInvalidProfileNameErrorMessage]);
-           
+                }
+            }
         }
 
         public async void RemoveProfile()
@@ -935,33 +825,14 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
                 }
 
                 LoadProfiles();
-
-                ProfileChoose = ProfilesList[0].ToString(); // Show default profile
             }
         }
 
-        public void RevertChanges()
-        {
-                Device = Devices.ToList().FindIndex(d => d.Id == RevertDeviceId);
-                LoadDevice();
-                LoadConfiguration();
-                OnPropertyChanged();
-                IsModified = false;
-        }
-
         public void Save()
         {
-            
-            if (!IsModified)
-            {
-                return; //If the input settings were not touched, then do nothing
-            }
-
             IsModified = false;
 
-            RevertDeviceId = Devices[Device].Id; // Remember selected device after saving
+            List<InputConfig> newConfig = [];
-
-            List <InputConfig> newConfig = [];
 
             newConfig.AddRange(ConfigurationState.Instance.Hid.InputConfig.Value);
 

src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs

@@ -3,7 +3,6 @@ using Avalonia.Controls;
 using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Input;
 using Avalonia.Media;
-using Avalonia.Media.Imaging;
 using Avalonia.Platform.Storage;
 using Avalonia.Threading;
 using CommunityToolkit.Mvvm.ComponentModel;
@@ -17,6 +16,7 @@ using LibHac.Ns;
 using Ryujinx.Ava.Common;
 using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.Input;
+using Ryujinx.Ava.Systems;
 using Ryujinx.Ava.UI.Controls;
 using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.Models;
@@ -46,7 +46,6 @@ using System.Collections.ObjectModel;
 using System.Globalization;
 using System.IO;
 using System.Linq;
-using System.Reflection;
 using System.Threading;
 using System.Threading.Tasks;
 using Key = Ryujinx.Input.Key;

src/Ryujinx/UI/ViewModels/SettingsHacksViewModel.cs

@@ -16,11 +16,12 @@ namespace Ryujinx.Ava.UI.ViewModels
         }
 
         [ObservableProperty] private bool _xc2MenuSoftlockFix = ConfigurationState.Instance.Hacks.Xc2MenuSoftlockFix;
+        [ObservableProperty] private bool _nifmDisableIsAnyInternetRequestAccepted = ConfigurationState.Instance.Hacks.DisableNifmIsAnyInternetRequestAccepted;
         
         public static string Xc2MenuFixTooltip { get; } = Lambda.String(sb =>
         {
             sb.AppendLine(
-                    "This fix applies a 2ms delay (via 'Thread.Sleep(2)') every time the game tries to read data from the emulated Switch filesystem.")
+                    "This hack applies a 2ms delay (via 'Thread.Sleep(2)') every time the game tries to read data from the emulated Switch filesystem.")
                 .AppendLine();
             
             sb.AppendLine("From the issue on GitHub:").AppendLine();
@@ -29,5 +30,14 @@ namespace Ryujinx.Ava.UI.ViewModels
                 "there is a low chance that the game will softlock, " +
                 "the submenu won't show up, while background music is still there.");
         });
+        
+        public static string NifmDisableIsAnyInternetRequestAcceptedTooltip { get; } = Lambda.String(sb =>
+        {
+            sb.AppendLine(
+                    "This hack simply sets 'IsAnyInternetRequestAccepted' to 'false' when initializing the Nifm IGeneralService.")
+                .AppendLine();
+
+            sb.Append("Lets DOOM 2016 go in game.");
+        });
     }
 }

src/Ryujinx/UI/ViewModels/SettingsViewModel.cs

@@ -757,6 +757,8 @@ namespace Ryujinx.Ava.UI.ViewModels
 
             // Dirty Hacks
             config.Hacks.Xc2MenuSoftlockFix.Value = DirtyHacks.Xc2MenuSoftlockFix;
+            config.Hacks.DisableNifmIsAnyInternetRequestAccepted.Value =
+                DirtyHacks.NifmDisableIsAnyInternetRequestAccepted;
 
             config.ToFileFormat().SaveConfig(Program.ConfigurationPath);
 

src/Ryujinx/UI/ViewModels/XciTrimmerViewModel.cs

@@ -16,7 +16,7 @@ using static Ryujinx.Common.Utilities.XCIFileTrimmer;
 
 namespace Ryujinx.Ava.UI.ViewModels
 {
-    public class XCITrimmerViewModel : BaseModel
+    public class XciTrimmerViewModel : BaseModel
     {
         private const long _bytesPerMB = 1024 * 1024;
         private enum ProcessingMode
@@ -46,7 +46,7 @@ namespace Ryujinx.Ava.UI.ViewModels
         private SortField _sortField = SortField.Name;
         private bool _sortAscending = true;
 
-        public XCITrimmerViewModel(MainWindowViewModel mainWindowViewModel)
+        public XciTrimmerViewModel(MainWindowViewModel mainWindowViewModel)
         {
             _logger = new XCITrimmerLog.TrimmerWindow(this);
             _mainWindowViewModel = mainWindowViewModel;
@@ -254,9 +254,9 @@ namespace Ryujinx.Ava.UI.ViewModels
 
         private class CompareXCITrimmerFiles : IComparer<XCITrimmerFileModel>
         {
-            private XCITrimmerViewModel _viewModel;
+            private XciTrimmerViewModel _viewModel;
 
-            public CompareXCITrimmerFiles(XCITrimmerViewModel ViewModel)
+            public CompareXCITrimmerFiles(XciTrimmerViewModel ViewModel)
             {
                 _viewModel = ViewModel;
             }

src/Ryujinx/UI/Views/Dialog/AboutView.axaml

@@ -1,5 +1,5 @@
 <UserControl
-    x:Class="Ryujinx.Ava.UI.Windows.AboutWindow"
+    x:Class="Ryujinx.Ava.UI.Views.Dialog.AboutView"
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"

src/Ryujinx/UI/Views/Dialog/AboutView.axaml.cs

@@ -1,8 +1,6 @@
 using Avalonia.Controls;
 using Avalonia.Input;
 using Avalonia.Interactivity;
-using Avalonia.Layout;
-using Avalonia.Styling;
 using FluentAvalonia.UI.Controls;
 using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.UI.Controls;
@@ -13,11 +11,11 @@ using Ryujinx.Common.Helper;
 using System.Threading.Tasks;
 using Button = Avalonia.Controls.Button;
 
-namespace Ryujinx.Ava.UI.Windows
+namespace Ryujinx.Ava.UI.Views.Dialog
 {
-    public partial class AboutWindow : RyujinxControl<AboutWindowViewModel>
+    public partial class AboutView : RyujinxControl<AboutWindowViewModel>
     {
-        public AboutWindow()
+        public AboutView()
         {
             InitializeComponent();
 
@@ -34,7 +32,7 @@ namespace Ryujinx.Ava.UI.Windows
                 PrimaryButtonText = string.Empty,
                 SecondaryButtonText = string.Empty,
                 CloseButtonText = LocaleManager.Instance[LocaleKeys.UserProfilesClose],
-                Content = new AboutWindow { ViewModel = viewModel }
+                Content = new AboutView { ViewModel = viewModel }
             };
 
             await ContentDialogHelper.ShowAsync(contentDialog.ApplyStyles());

src/Ryujinx/UI/Views/Dialog/ApplicationDataView.axaml

@@ -7,7 +7,7 @@
              xmlns:ui="using:FluentAvalonia.UI.Controls"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="Ryujinx.Ava.UI.Views.Misc.ApplicationDataView"
+             x:Class="Ryujinx.Ava.UI.Views.Dialog.ApplicationDataView"
              x:DataType="viewModels:ApplicationDataViewModel">
     <StackPanel Orientation="Horizontal">
         <Image Margin="0"

src/Ryujinx/UI/Views/Dialog/ApplicationDataView.axaml.cs

@@ -12,7 +12,7 @@ using Ryujinx.Ava.Systems.AppLibrary;
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace Ryujinx.Ava.UI.Views.Misc
+namespace Ryujinx.Ava.UI.Views.Dialog
 {
     public partial class ApplicationDataView : RyujinxControl<ApplicationDataViewModel>
     {

src/Ryujinx/UI/Views/Dialog/DlcSelectView.axaml

@@ -7,7 +7,7 @@
              xmlns:models="using:Ryujinx.Ava.Common.Models"
              xmlns:viewModels="using:Ryujinx.Ava.UI.ViewModels"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="Ryujinx.Ava.UI.Views.Misc.DlcSelectView"
+             x:Class="Ryujinx.Ava.UI.Views.Dialog.DlcSelectView"
              x:DataType="viewModels:DlcSelectViewModel">
     <Grid RowDefinitions="*,Auto,*">
         <TextBlock

src/Ryujinx/UI/Views/Dialog/DlcSelectView.axaml.cs

@@ -1,6 +1,4 @@
-using Avalonia.Controls;
+using FluentAvalonia.UI.Controls;
-using Avalonia.Styling;
-using FluentAvalonia.UI.Controls;
 using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.Common.Models;
 using Ryujinx.Ava.UI.Controls;
@@ -9,7 +7,7 @@ using Ryujinx.Ava.UI.ViewModels;
 using Ryujinx.Ava.Systems.AppLibrary;
 using System.Threading.Tasks;
 
-namespace Ryujinx.Ava.UI.Views.Misc
+namespace Ryujinx.Ava.UI.Views.Dialog
 {
     public partial class DlcSelectView : RyujinxControl<DlcSelectViewModel>
     {

src/Ryujinx/UI/Views/Dialog/DownloadableContentManagerView.axaml

@@ -1,5 +1,5 @@
 <UserControl
-    x:Class="Ryujinx.Ava.UI.Windows.DownloadableContentManagerWindow"
+    x:Class="Ryujinx.Ava.UI.Views.Dialog.DownloadableContentManagerView"
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"

src/Ryujinx/UI/Views/Dialog/DownloadableContentManagerView.axaml.cs

@@ -6,26 +6,16 @@ using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.Common.Models;
 using Ryujinx.Ava.UI.ViewModels;
 using Ryujinx.Ava.Systems.AppLibrary;
+using Ryujinx.Ava.UI.Controls;
 using Ryujinx.Common.Helper;
 using System.Threading.Tasks;
 
-namespace Ryujinx.Ava.UI.Windows
+namespace Ryujinx.Ava.UI.Views.Dialog
 {
-    public partial class DownloadableContentManagerWindow : UserControl
+    public partial class DownloadableContentManagerView : RyujinxControl<DownloadableContentManagerViewModel>
     {
-        public DownloadableContentManagerViewModel ViewModel;
+        public DownloadableContentManagerView()
-
-        public DownloadableContentManagerWindow()
         {
-            DataContext = this;
-
-            InitializeComponent();
-        }
-
-        public DownloadableContentManagerWindow(ApplicationLibrary applicationLibrary, ApplicationData applicationData)
-        {
-            DataContext = ViewModel = new DownloadableContentManagerViewModel(applicationLibrary, applicationData);
-
             InitializeComponent();
         }
 
@@ -36,8 +26,11 @@ namespace Ryujinx.Ava.UI.Windows
                 PrimaryButtonText = string.Empty,
                 SecondaryButtonText = string.Empty,
                 CloseButtonText = string.Empty,
-                Content = new DownloadableContentManagerWindow(applicationLibrary, applicationData),
                 Title = string.Format(LocaleManager.Instance[LocaleKeys.DlcWindowTitle], applicationData.Name, applicationData.IdBaseString),
+                Content = new DownloadableContentManagerView
+                {
+                    ViewModel = new DownloadableContentManagerViewModel(applicationLibrary, applicationData)
+                }
             };
 
             Style bottomBorder = new(x => x.OfType<Grid>().Name("DialogSpace").Child().OfType<Border>());

src/Ryujinx/UI/Views/Dialog/ModManagerView.axaml

@@ -10,7 +10,7 @@
     Width="500"
     Height="380"
     mc:Ignorable="d"
-    x:Class="Ryujinx.Ava.UI.Windows.ModManagerWindow"
+    x:Class="Ryujinx.Ava.UI.Views.Dialog.ModManagerView"
     x:CompileBindings="True"
     x:DataType="viewModels:ModManagerViewModel"
     Focusable="True">

src/Ryujinx/UI/Views/Dialog/ModManagerView.axaml.cs

@@ -7,27 +7,17 @@ using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.Models;
 using Ryujinx.Ava.UI.ViewModels;
 using Ryujinx.Ava.Systems.AppLibrary;
+using Ryujinx.Ava.UI.Controls;
 using Ryujinx.Common.Helper;
 using System.Threading.Tasks;
 using Button = Avalonia.Controls.Button;
 
-namespace Ryujinx.Ava.UI.Windows
+namespace Ryujinx.Ava.UI.Views.Dialog
 {
-    public partial class ModManagerWindow : UserControl
+    public partial class ModManagerView : RyujinxControl<ModManagerViewModel>
     {
-        public readonly ModManagerViewModel ViewModel;
+        public ModManagerView()
-
-        public ModManagerWindow()
         {
-            DataContext = this;
-
-            InitializeComponent();
-        }
-
-        public ModManagerWindow(ulong titleId, ulong titleIdBase, ApplicationLibrary applicationLibrary)
-        {
-            DataContext = ViewModel = new ModManagerViewModel(titleId, titleIdBase, applicationLibrary);
-
             InitializeComponent();
         }
 
@@ -38,7 +28,10 @@ namespace Ryujinx.Ava.UI.Windows
                 PrimaryButtonText = string.Empty,
                 SecondaryButtonText = string.Empty,
                 CloseButtonText = string.Empty,
-                Content = new ModManagerWindow(titleId, titleIdBase, appLibrary),
+                Content = new ModManagerView
+                {
+                    ViewModel = new ModManagerViewModel(titleId, titleIdBase, appLibrary)
+                },
                 Title = string.Format(LocaleManager.Instance[LocaleKeys.ModWindowTitle], titleName, titleId.ToString("X16")),
             };
 

src/Ryujinx/UI/Views/Dialog/TitleUpdateManagerView.axaml

@@ -1,5 +1,5 @@
 <UserControl
-    x:Class="Ryujinx.Ava.UI.Windows.TitleUpdateWindow"
+    x:Class="Ryujinx.Ava.UI.Views.Dialog.TitleUpdateManagerView"
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"

src/Ryujinx/UI/Views/Dialog/TitleUpdateManagerView.axaml.cs

@@ -6,26 +6,16 @@ using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.Common.Models;
 using Ryujinx.Ava.UI.ViewModels;
 using Ryujinx.Ava.Systems.AppLibrary;
+using Ryujinx.Ava.UI.Controls;
 using Ryujinx.Common.Helper;
 using System.Threading.Tasks;
 
-namespace Ryujinx.Ava.UI.Windows
+namespace Ryujinx.Ava.UI.Views.Dialog
 {
-    public partial class TitleUpdateWindow : UserControl
+    public partial class TitleUpdateManagerView : RyujinxControl<TitleUpdateViewModel>
     {
-        public readonly TitleUpdateViewModel ViewModel;
+        public TitleUpdateManagerView()
-
-        public TitleUpdateWindow()
         {
-            DataContext = this;
-
-            InitializeComponent();
-        }
-
-        public TitleUpdateWindow(ApplicationLibrary applicationLibrary, ApplicationData applicationData)
-        {
-            DataContext = ViewModel = new TitleUpdateViewModel(applicationLibrary, applicationData);
-
             InitializeComponent();
         }
 
@@ -36,8 +26,11 @@ namespace Ryujinx.Ava.UI.Windows
                 PrimaryButtonText = string.Empty,
                 SecondaryButtonText = string.Empty,
                 CloseButtonText = string.Empty,
-                Content = new TitleUpdateWindow(applicationLibrary, applicationData),
                 Title = LocaleManager.Instance.UpdateAndGetDynamicValue(LocaleKeys.GameUpdateWindowHeading, applicationData.Name, applicationData.IdBaseString),
+                Content = new TitleUpdateManagerView
+                {
+                    ViewModel = new TitleUpdateViewModel(applicationLibrary, applicationData)
+                }
             };
 
             Style bottomBorder = new(x => x.OfType<Grid>().Name("DialogSpace").Child().OfType<Border>());

src/Ryujinx/UI/Views/Dialog/XciTrimmerView.axaml

@@ -1,5 +1,5 @@
 <UserControl
-    x:Class="Ryujinx.Ava.UI.Windows.XCITrimmerWindow"
+    x:Class="Ryujinx.Ava.UI.Views.Dialog.XciTrimmerView"
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
@@ -10,7 +10,7 @@
     xmlns:models="clr-namespace:Ryujinx.Ava.Common.Models"
     Width="700"
     Height="600"
-    x:DataType="viewModels:XCITrimmerViewModel"
+    x:DataType="viewModels:XciTrimmerViewModel"
     Focusable="True"
     mc:Ignorable="d">    
     <Grid Margin="20 0 20 0" RowDefinitions="Auto,Auto,*,Auto,Auto">
@@ -151,7 +151,7 @@
                                         HorizontalAlignment="Stretch"
                                         VerticalAlignment="Center"
                                         CornerRadius="5"
-                                        IsVisible="{Binding $parent[UserControl].((viewModels:XCITrimmerViewModel)DataContext).Processing}"
+                                        IsVisible="{Binding $parent[UserControl].((viewModels:XciTrimmerViewModel)DataContext).Processing}"
                                         Maximum="100"
                                         Minimum="0"
                                         Value="{Binding PercentageProgress}" />

src/Ryujinx/UI/Views/Dialog/XciTrimmerView.axaml.cs

@@ -4,27 +4,17 @@ using Avalonia.Styling;
 using FluentAvalonia.UI.Controls;
 using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.Common.Models;
+using Ryujinx.Ava.UI.Controls;
 using Ryujinx.Ava.UI.ViewModels;
 using System;
 using System.Threading.Tasks;
 
-namespace Ryujinx.Ava.UI.Windows
+namespace Ryujinx.Ava.UI.Views.Dialog
 {
-    public partial class XCITrimmerWindow : UserControl
+    public partial class XciTrimmerView : RyujinxControl<XciTrimmerViewModel>
     {
-        public XCITrimmerViewModel ViewModel;
+        public XciTrimmerView()
-
-        public XCITrimmerWindow()
         {
-            DataContext = this;
-
-            InitializeComponent();
-        }
-
-        public XCITrimmerWindow(MainWindowViewModel mainWindowViewModel)
-        {
-            DataContext = ViewModel = new XCITrimmerViewModel(mainWindowViewModel);
-
             InitializeComponent();
         }
 
@@ -35,7 +25,10 @@ namespace Ryujinx.Ava.UI.Windows
                 PrimaryButtonText = string.Empty,
                 SecondaryButtonText = string.Empty,
                 CloseButtonText = string.Empty,
-                Content = new XCITrimmerWindow(RyujinxApp.MainWindow.ViewModel),
+                Content = new XciTrimmerView
+                {
+                    ViewModel = new XciTrimmerViewModel(RyujinxApp.MainWindow.ViewModel)
+                },
                 Title = LocaleManager.Instance[LocaleKeys.XCITrimmerWindowTitle]
             };
 
@@ -70,7 +63,7 @@ namespace Ryujinx.Ava.UI.Windows
         public void Sort_Checked(object sender, RoutedEventArgs args)
         {
             if (sender is RadioButton { Tag: string sortField })
-                ViewModel.SortingField = Enum.Parse<XCITrimmerViewModel.SortField>(sortField);
+                ViewModel.SortingField = Enum.Parse<XciTrimmerViewModel.SortField>(sortField);
         }
 
         public void Order_Checked(object sender, RoutedEventArgs args)

src/Ryujinx/UI/Views/Input/ControllerInputView.axaml

@@ -4,10 +4,10 @@
     xmlns:ext="clr-namespace:Ryujinx.Ava.Common.Markup"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:ui="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
     xmlns:controls="clr-namespace:Ryujinx.Ava.UI.Controls"
     xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels.Input"
     xmlns:helpers="clr-namespace:Ryujinx.Ava.UI.Helpers"
+    xmlns:pt="using:Projektanker.Icons.Avalonia"
     HorizontalAlignment="Stretch"
     VerticalAlignment="Stretch"
     d:DesignHeight="800"
@@ -507,65 +507,49 @@
                         CornerRadius="5"
                         VerticalAlignment="Bottom"
                         HorizontalAlignment="Stretch">
-                        <Grid ColumnDefinitions="*,Auto">
+                        <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
-                            <CheckBox
+                            <StackPanel Orientation="Vertical" Spacing="5">
-                                Margin="10"
+                                <CheckBox
-                                MinWidth="0"
+                                    Margin="10, 10, 10, 0"
-                                Grid.Column="0"
+                                    MinWidth="0"
-                                IsChecked="{Binding Config.EnableMotion, Mode=TwoWay}">
+                                    IsChecked="{Binding Config.EnableMotion, Mode=TwoWay}">
-                                <TextBlock Text="{ext:Locale ControllerSettingsMotion}" />
+                                    <TextBlock Text="{ext:Locale ControllerSettingsMotion}" />
-                            </CheckBox>
+                                </CheckBox>
-                            <Button
+                                <Button
-                                Margin="10"
+                                    Margin="10, 0, 10, 10"
-                                Grid.Column="1"
+                                    Command="{Binding ShowMotionConfig}">
-                                Command="{Binding ShowMotionConfig}">
+                                    <pt:Icon Value="fa-solid fa-gear" />
-                                <TextBlock Text="{ext:Locale ControllerSettingsConfigureGeneral}" />
+                                </Button>
-                            </Button>
+                            </StackPanel>
-                        </Grid>
+                            <controls:MiniVerticalSeparator Height="64"/>
-                    </Border>
+                            <StackPanel Orientation="Vertical" Spacing="5">
-                    <Border
+                                <CheckBox
-                        BorderBrush="{DynamicResource ThemeControlBorderColor}"
+                                    Margin="10, 10, 10, 0"
-                        BorderThickness="1"
+                                    MinWidth="0"
-                        CornerRadius="5"
+                                    IsChecked="{Binding Config.EnableRumble, Mode=TwoWay}">
-                        HorizontalAlignment="Stretch"
+                                    <TextBlock Text="{ext:Locale ControllerSettingsRumble}" />
-                        Margin="0,-1,0,0">
+                                </CheckBox>
-                        <Grid ColumnDefinitions="*,Auto">
+                                <Button
-                            <CheckBox
+                                    Margin="10, 0, 10, 10"
-                                Margin="10"
+                                    Command="{Binding ShowRumbleConfig}">
-                                MinWidth="0"
+                                    <pt:Icon Value="fa-solid fa-gear" />
-                                Grid.Column="0"
+                                </Button>
-                                IsChecked="{Binding Config.EnableRumble, Mode=TwoWay}">
+                            </StackPanel>
-                                <TextBlock Text="{ext:Locale ControllerSettingsRumble}" />
+                            <controls:MiniVerticalSeparator Height="64" IsVisible="{Binding ParentModel.HasLed}"/>
-                            </CheckBox>
+                            <StackPanel Orientation="Vertical" Spacing="5">
-                            <Button
+                                <CheckBox
-                                Margin="10"
+                                    Margin="10, 10, 10, 0"
-                                Grid.Column="1"
+                                    MinWidth="0"
-                                Command="{Binding ShowRumbleConfig}">
+                                    IsChecked="{Binding Config.EnableLedChanging, Mode=TwoWay}">
-                                <TextBlock Text="{ext:Locale ControllerSettingsConfigureGeneral}" />
+                                    <TextBlock Text="{ext:Locale ControllerSettingsLed}" />
-                            </Button>
+                                </CheckBox>
-                        </Grid>
+                                <Button
-                    </Border>
+                                    Margin="10, 0, 10, 10"
-                    <Border
+                                    Command="{Binding ShowLedConfig}">
-                        BorderBrush="{DynamicResource ThemeControlBorderColor}"
+                                    <pt:Icon Value="fa-solid fa-gear" />
-                        BorderThickness="1"
+                                </Button>
-                        CornerRadius="5"
+                            </StackPanel>
-                        HorizontalAlignment="Stretch"
+                        </StackPanel>
-                        Margin="0,-1,0,0">
-                        <Grid IsVisible="{Binding ParentModel.HasLed}" ColumnDefinitions="*,Auto">
-                            <CheckBox
-                                Margin="10, 10, 5, 10"
-                                MinWidth="0"
-                                Grid.Column="0"
-                                IsChecked="{Binding Config.EnableLedChanging, Mode=TwoWay}">
-                                <TextBlock Text="{ext:Locale ControllerSettingsLed}" />
-                            </CheckBox>
-                            <Button
-                                Margin="10"
-                                Grid.Column="1"
-                                Command="{Binding ShowLedConfig}">
-                                <TextBlock Text="{ext:Locale ControllerSettingsConfigureGeneral}" />
-                            </Button>
-                        </Grid>
                     </Border>
                 </StackPanel>
             </StackPanel>

src/Ryujinx/UI/Views/Input/ControllerInputView.axaml.cs

@@ -64,9 +64,8 @@ namespace Ryujinx.Ava.UI.Views.Input
                 };
 
                 if (!float.IsNaN(_changeSlider) && _changeSlider != (float)check.Value)
-                {     
+                {
-                    FlagInputConfigChanged();
+                    (DataContext as ControllerInputViewModel)!.ParentModel.IsModified = true;
-
                     _changeSlider = (float)check.Value;
                 }
             }
@@ -76,8 +75,7 @@ namespace Ryujinx.Ava.UI.Views.Input
         {
             if (sender is CheckBox { IsPointerOver: true })
             {
-                FlagInputConfigChanged();
+                (DataContext as ControllerInputViewModel)!.ParentModel.IsModified = true;
-
                 _currentAssigner?.Cancel();
                 _currentAssigner = null;
             }
@@ -104,7 +102,7 @@ namespace Ryujinx.Ava.UI.Views.Input
                         this.Focus(NavigationMethod.Pointer);
 
                         PointerPressed += MouseClick;
-                       
+
                         ControllerInputViewModel viewModel = (DataContext as ControllerInputViewModel);
 
                         IKeyboard keyboard =
@@ -117,7 +115,7 @@ namespace Ryujinx.Ava.UI.Views.Input
                             if (e.ButtonValue.HasValue)
                             {
                                 Button buttonValue = e.ButtonValue.Value;
-                                FlagInputConfigChanged();
+                                viewModel.ParentModel.IsModified = true;
 
                                 switch (button.Name)
                                 {
@@ -211,11 +209,6 @@ namespace Ryujinx.Ava.UI.Views.Input
             }
         }
 
-        private void FlagInputConfigChanged()
-        {
-            (DataContext as ControllerInputViewModel)!.ParentModel.IsModified = true;
-        }
-
         private void MouseClick(object sender, PointerPressedEventArgs e)
         {
             bool shouldUnbind = e.GetCurrentPoint(this).Properties.IsMiddleButtonPressed;
@@ -239,6 +232,7 @@ namespace Ryujinx.Ava.UI.Views.Input
             {
                 gamepad?.ClearLed();
             }
+            
             _currentAssigner?.Cancel();
             _currentAssigner = null;
         }

src/Ryujinx/UI/Views/Input/InputView.axaml

@@ -41,20 +41,13 @@
                     Grid.Column="0"
                     Margin="2"
                     HorizontalAlignment="Stretch"
-                    VerticalAlignment="Center" ColumnDefinitions="Auto,*,Auto">
+                    VerticalAlignment="Center" ColumnDefinitions="Auto,*">
-                    <StackPanel 
+                    <TextBlock
-                        Orientation="Vertical"   
                         Margin="5,0,10,0"
+                        Width="90"
                         HorizontalAlignment="Left"
                         VerticalAlignment="Center"
-                        Width="90">
+                        Text="{ext:Locale ControllerSettingsPlayer}" />
-                        <TextBlock
-                            Text="{ext:Locale ControllerSettingsPlayer}" />
-                         <TextBlock                        
-                            Classes="pending" 
-                            Text ="{ext:Locale ControllerSettingsModifiedNotification}"
-                            IsVisible="{Binding IsModified}"/>
-                    </StackPanel>
                     <ComboBox
                         Grid.Column="1"
                         Name="PlayerIndexBox"
@@ -69,18 +62,6 @@
                             </DataTemplate>
                         </ComboBox.ItemTemplate>
                     </ComboBox>
-                    <Button
-                        Grid.Column="2"
-                            MinWidth="0"
-                            Margin="5,0,0,0"
-                            VerticalAlignment="Center"
-                            ToolTip.Tip="{ext:Locale ControllerSettingsCancelCurrentChangesToolTip}"
-                            Command="{Binding RevertChanges}">
-                        <ui:SymbolIcon
-                            Symbol="Undo"
-                            FontSize="15"
-                            Height="20" />
-                    </Button>
                 </Grid>
                 <!-- Profile Selection -->
                 <Grid
@@ -100,8 +81,7 @@
                         Name="ProfileBox"
                         HorizontalAlignment="Stretch"
                         VerticalAlignment="Center"
-                        SelectedItem="{Binding ProfileChoose, Mode=TwoWay}"
+                        SelectedIndex="0"
-                        SelectionChanged="ComboBox_SelectionChanged"
                         ItemsSource="{Binding ProfilesList}"
                         Text="{Binding ProfileName, Mode=TwoWay}" />
                     <Button
@@ -110,7 +90,7 @@
                         Margin="5,0,0,0"
                         VerticalAlignment="Center"
                         ToolTip.Tip="{ext:Locale ControllerSettingsLoadProfileToolTip}"
-                        Command="{Binding LoadProfileButton}">
+                        Command="{Binding LoadProfile}">
                         <ui:SymbolIcon
                             Symbol="View"
                             FontSize="15"
@@ -168,7 +148,7 @@
                         MinWidth="0"
                         Margin="5,0,0,0"
                         VerticalAlignment="Center"
-                        Command="{Binding LoadDevice}">
+                        Command="{Binding LoadDevices}">
                         <ui:SymbolIcon
                             Symbol="Refresh"
                             FontSize="15"
@@ -201,36 +181,15 @@
                 </Grid>
             </Grid>
         </StackPanel>
-        <ContentControl IsVisible="{Binding NotificationView}">
+        <ContentControl Content="{Binding ConfigViewModel}" IsVisible="{Binding ShowSettings}">
-            <ContentControl.Content>
+            <ContentControl.DataTemplates>
-                <StackPanel>
+                <DataTemplate DataType="viewModels:ControllerInputViewModel">
-                    <TextBlock 
+                    <views:ControllerInputView />
-                        Margin="5,20,0,0"
+                </DataTemplate>
-                        Text="{ext:Locale ControllerSettingsDisableDeviceForSaving}" />       
+                <DataTemplate DataType="viewModels:KeyboardInputViewModel">
-                    <Button
+                    <views:KeyboardInputView />
-                        MinWidth="0"
+                </DataTemplate>
-                        Width="90"
+            </ContentControl.DataTemplates>
-                        Height="27"
-                        Margin="5,10,0,0"
-                        VerticalAlignment="Center"
-                        Command="{Binding UnlinkDevice}">
-                        <TextBlock
-                            Text="{ext:Locale ControllerSettingsUnlink}"
-                            VerticalAlignment="Center"
-                            HorizontalAlignment="Center" />
-                    </Button>
-                </StackPanel>
-            </ContentControl.Content>
         </ContentControl>
-            <ContentControl Content="{Binding ConfigViewModel}" IsVisible="{Binding ShowSettings}">        
-                <ContentControl.DataTemplates>
-                    <DataTemplate DataType="viewModels:ControllerInputViewModel">
-                        <views:ControllerInputView />
-                    </DataTemplate>
-                    <DataTemplate DataType="viewModels:KeyboardInputViewModel">
-                        <views:KeyboardInputView />
-                    </DataTemplate>
-                </ContentControl.DataTemplates>
-            </ContentControl>
     </StackPanel>
 </UserControl>

src/Ryujinx/UI/Views/Input/InputView.axaml.cs

@@ -1,5 +1,4 @@
 using Avalonia.Controls;
-using FluentAvalonia.UI.Controls;
 using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.UI.Controls;
 using Ryujinx.Ava.UI.Helpers;
@@ -63,21 +62,12 @@ namespace Ryujinx.Ava.UI.Views.Input
                     }
                     return;
                 }
+                
+                ViewModel.PlayerId = ViewModel.PlayerIdChoose;
 
                 ViewModel.IsModified = false;
-                ViewModel.PlayerId = ViewModel.PlayerIdChoose;
-                
-            }   
-            
-        }
-
-        private void ComboBox_SelectionChanged(object sender, SelectionChangedEventArgs e)
-        {
-            if (sender is FAComboBox faComboBox)
-            {
-                faComboBox.IsDropDownOpen = false;
-                ViewModel.IsModified = true;
             }
+            
         }
 
         public void Dispose()

src/Ryujinx/UI/Views/Input/KeyboardInputView.axaml.cs

@@ -9,8 +9,6 @@ using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.ViewModels.Input;
 using Ryujinx.Input;
 using Ryujinx.Input.Assigner;
-using System.Collections.Generic;
-using System;
 using Button = Ryujinx.Input.Button;
 using Key = Ryujinx.Common.Configuration.Hid.Key;
 
@@ -188,63 +186,11 @@ namespace Ryujinx.Ava.UI.Views.Input
         {
             bool shouldUnbind = e.GetCurrentPoint(this).Properties.IsMiddleButtonPressed;
 
-            bool shouldRemoveBinding = e.GetCurrentPoint(this).Properties.IsRightButtonPressed;
-
-            if (shouldRemoveBinding)
-            {
-                DeleteBind();
-            }
-
             _currentAssigner?.Cancel(shouldUnbind);
 
             PointerPressed -= MouseClick;
         }
 
-        private void DeleteBind()
-        {
-
-            if (_currentAssigner != null)
-            {
-                Dictionary<string, Action> buttonActions = new Dictionary<string, Action>
-                {
-                    { "ButtonZl", () => ViewModel.Config.ButtonZl = Key.Unbound },
-                    { "ButtonL", () => ViewModel.Config.ButtonL = Key.Unbound },
-                    { "ButtonMinus", () => ViewModel.Config.ButtonMinus = Key.Unbound },
-                    { "LeftStickButton", () => ViewModel.Config.LeftStickButton = Key.Unbound },
-                    { "LeftStickUp", () => ViewModel.Config.LeftStickUp = Key.Unbound },
-                    { "LeftStickDown", () => ViewModel.Config.LeftStickDown = Key.Unbound },
-                    { "LeftStickRight", () => ViewModel.Config.LeftStickRight = Key.Unbound },
-                    { "LeftStickLeft", () => ViewModel.Config.LeftStickLeft = Key.Unbound },
-                    { "DpadUp", () => ViewModel.Config.DpadUp = Key.Unbound },
-                    { "DpadDown", () => ViewModel.Config.DpadDown = Key.Unbound },
-                    { "DpadLeft", () => ViewModel.Config.DpadLeft = Key.Unbound },
-                    { "DpadRight", () => ViewModel.Config.DpadRight = Key.Unbound },
-                    { "LeftButtonSr", () => ViewModel.Config.LeftButtonSr = Key.Unbound },
-                    { "LeftButtonSl", () => ViewModel.Config.LeftButtonSl = Key.Unbound },
-                    { "RightButtonSr", () => ViewModel.Config.RightButtonSr = Key.Unbound },
-                    { "RightButtonSl", () => ViewModel.Config.RightButtonSl = Key.Unbound },
-                    { "ButtonZr", () => ViewModel.Config.ButtonZr = Key.Unbound },
-                    { "ButtonR", () => ViewModel.Config.ButtonR = Key.Unbound },
-                    { "ButtonPlus", () => ViewModel.Config.ButtonPlus = Key.Unbound },
-                    { "ButtonA", () => ViewModel.Config.ButtonA = Key.Unbound },
-                    { "ButtonB", () => ViewModel.Config.ButtonB = Key.Unbound },
-                    { "ButtonX", () => ViewModel.Config.ButtonX = Key.Unbound },
-                    { "ButtonY", () => ViewModel.Config.ButtonY = Key.Unbound },
-                    { "RightStickButton", () => ViewModel.Config.RightStickButton = Key.Unbound },
-                    { "RightStickUp", () => ViewModel.Config.RightStickUp = Key.Unbound },
-                    { "RightStickDown", () => ViewModel.Config.RightStickDown = Key.Unbound },
-                    { "RightStickRight", () => ViewModel.Config.RightStickRight = Key.Unbound },
-                    { "RightStickLeft", () => ViewModel.Config.RightStickLeft = Key.Unbound }
-                };
-
-                if (buttonActions.TryGetValue(_currentAssigner.ToggledButton.Name, out Action action))
-                {
-                    action();
-                    ViewModel.ParentModel.IsModified = true;
-                }
-            }
-        }
-
         protected override void OnDetachedFromVisualTree(VisualTreeAttachmentEventArgs e)
         {
             base.OnDetachedFromVisualTree(e);

src/Ryujinx/UI/Views/Input/LedInputView.axaml.cs

@@ -1,5 +1,4 @@
 using Avalonia;
-using Avalonia.Controls;
 using FluentAvalonia.UI.Controls;
 using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.UI.Controls;

src/Ryujinx/UI/Views/Input/MotionInputView.axaml.cs

@@ -1,4 +1,3 @@
-using Avalonia.Controls;
 using FluentAvalonia.UI.Controls;
 using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.UI.Controls;

src/Ryujinx/UI/Views/Input/RumbleInputView.axaml.cs

@@ -1,4 +1,3 @@
-using Avalonia.Controls;
 using FluentAvalonia.UI.Controls;
 using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.UI.Controls;

src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml.cs

@@ -13,7 +13,7 @@ using Ryujinx.Ava.UI.Windows;
 using Ryujinx.Ava.Utilities;
 using Ryujinx.Ava.Systems.AppLibrary;
 using Ryujinx.Ava.Systems.Configuration;
-using Ryujinx.Ava.UI.Views.Misc;
+using Ryujinx.Ava.UI.Views.Dialog;
 using Ryujinx.Common;
 using Ryujinx.Common.Helper;
 using Ryujinx.Common.Utilities;
@@ -46,8 +46,8 @@ namespace Ryujinx.Ava.UI.Views.Main
             CheatManagerMenuItem.Command = Commands.CreateSilentFail(OpenCheatManagerForCurrentApp);
             InstallFileTypesMenuItem.Command = Commands.Create(InstallFileTypes);
             UninstallFileTypesMenuItem.Command = Commands.Create(UninstallFileTypes);
-            XciTrimmerMenuItem.Command = Commands.Create(XCITrimmerWindow.Show);
+            XciTrimmerMenuItem.Command = Commands.Create(XciTrimmerView.Show);
-            AboutWindowMenuItem.Command = Commands.Create(AboutWindow.Show);
+            AboutWindowMenuItem.Command = Commands.Create(AboutView.Show);
             CompatibilityListMenuItem.Command = Commands.Create(() => CompatibilityListWindow.Show());
 
             UpdateMenuItem.Command = MainWindowViewModel.UpdateCommand;

src/Ryujinx/UI/Views/Main/MainStatusBarView.axaml.cs

@@ -1,5 +1,4 @@
 using Avalonia;
-using Avalonia.Controls;
 using Avalonia.Input;
 using Avalonia.Interactivity;
 using Avalonia.Threading;

src/Ryujinx/UI/Views/Settings/SettingsHacksView.axaml

@@ -29,7 +29,7 @@
                 <TextBlock
                     Foreground="{DynamicResource SecondaryTextColor}"
                     TextDecorations="Underline"
-                    Text="Highly specific hacks &amp; tricks to alleviate performance issues, crashing, or freezing. Will cause issues." />
+                    Text="Highly specific hacks &amp; tricks to alleviate performance issues, crashing, or freezing. Can cause issues." />
                 <StackPanel
                     Margin="0,10,0,0"
                     Orientation="Horizontal"
@@ -43,6 +43,18 @@
                         Text="Xenoblade Chronicles 2 Menu Softlock Fix" />
                 </StackPanel>
                 <Separator/>
+                <StackPanel
+                    Margin="0,10,0,0"
+                    Orientation="Horizontal"
+                    HorizontalAlignment="Center"
+                    ToolTip.Tip="{Binding DirtyHacks.NifmDisableIsAnyInternetRequestAcceptedTooltip}">
+                    <CheckBox
+                        Margin="0"
+                        IsChecked="{Binding DirtyHacks.NifmDisableIsAnyInternetRequestAccepted}"/>
+                    <TextBlock
+                        VerticalAlignment="Center"
+                        Text="Disable IsAnyInternetRequestAccepted" />
+                </StackPanel>
             </StackPanel>
         </Border>
     </ScrollViewer>

src/Ryujinx/UI/Views/Settings/SettingsHotkeysView.axaml.cs

@@ -3,19 +3,19 @@ using Avalonia.Controls.Primitives;
 using Avalonia.Input;
 using Avalonia.Interactivity;
 using Avalonia.LogicalTree;
+using Avalonia.Threading;
 using Ryujinx.Ava.Input;
+using Ryujinx.Ava.UI.Controls;
 using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.ViewModels;
 using Ryujinx.Input;
 using Ryujinx.Input.Assigner;
-using System.Collections.Generic;
-using System;
 using Button = Ryujinx.Input.Button;
 using Key = Ryujinx.Common.Configuration.Hid.Key;
 
 namespace Ryujinx.Ava.UI.Views.Settings
 {
-    public partial class SettingsHotkeysView : UserControl
+    public partial class SettingsHotkeysView : RyujinxControl<SettingsViewModel>
     {
         private ButtonKeyAssigner _currentAssigner;
         private readonly IGamepadDriver _avaloniaKeyboardDriver;
@@ -48,47 +48,12 @@ namespace Ryujinx.Ava.UI.Views.Settings
         private void MouseClick(object sender, PointerPressedEventArgs e)
         {
             bool shouldUnbind = e.GetCurrentPoint(this).Properties.IsMiddleButtonPressed;
-            bool shouldRemoveBinding = e.GetCurrentPoint(this).Properties.IsRightButtonPressed;
 
-            if (shouldRemoveBinding)
-            {
-                DeleteBind();
-            }
-          
             _currentAssigner?.Cancel(shouldUnbind);
 
             PointerPressed -= MouseClick;
         }
 
-        private void DeleteBind()
-        {
-            if (DataContext is not SettingsViewModel viewModel)
-                return;
-
-            if (_currentAssigner != null)
-            {
-                Dictionary<string, Action> buttonActions = new Dictionary<string, Action>
-                {
-                    { "ToggleVSyncMode", () => viewModel.KeyboardHotkey.ToggleVSyncMode = Key.Unbound },
-                    { "Screenshot", () => viewModel.KeyboardHotkey.Screenshot = Key.Unbound },
-                    { "ShowUI", () => viewModel.KeyboardHotkey.ShowUI = Key.Unbound },
-                    { "Pause", () => viewModel.KeyboardHotkey.Pause = Key.Unbound },
-                    { "ToggleMute", () => viewModel.KeyboardHotkey.ToggleMute = Key.Unbound },
-                    { "ResScaleUp", () => viewModel.KeyboardHotkey.ResScaleUp = Key.Unbound },
-                    { "ResScaleDown", () => viewModel.KeyboardHotkey.ResScaleDown = Key.Unbound },
-                    { "VolumeUp", () => viewModel.KeyboardHotkey.VolumeUp = Key.Unbound },
-                    { "VolumeDown", () => viewModel.KeyboardHotkey.VolumeDown = Key.Unbound },
-                    { "CustomVSyncIntervalIncrement", () => viewModel.KeyboardHotkey.CustomVSyncIntervalIncrement = Key.Unbound },
-                    { "CustomVSyncIntervalDecrement", () => viewModel.KeyboardHotkey.CustomVSyncIntervalDecrement = Key.Unbound }
-                };
-
-                if (buttonActions.TryGetValue(_currentAssigner.ToggledButton.Name, out Action action))
-                {
-                    action();
-                }
-            }
-        }
-
         private void Button_IsCheckedChanged(object sender, RoutedEventArgs e)
         {
             if (sender is ToggleButton button)
@@ -115,45 +80,49 @@ namespace Ryujinx.Ava.UI.Views.Settings
                         {
                             if (e.ButtonValue.HasValue)
                             {
-                                SettingsViewModel viewModel = (DataContext) as SettingsViewModel;
                                 Button buttonValue = e.ButtonValue.Value;
 
-                                switch (button.Name)
+                                Dispatcher.UIThread.Post(() =>
                                 {
-                                    case "ToggleVSyncMode":
+                                    switch (button.Name)
-                                        viewModel.KeyboardHotkey.ToggleVSyncMode = buttonValue.AsHidType<Key>();
+                                    {
-                                        break;
+                                        case "ToggleVSyncMode":
-                                    case "Screenshot":
+                                            ViewModel.KeyboardHotkey.ToggleVSyncMode = buttonValue.AsHidType<Key>();
-                                        viewModel.KeyboardHotkey.Screenshot = buttonValue.AsHidType<Key>();
+                                            break;
-                                        break;
+                                        case "Screenshot":
-                                    case "ShowUI":
+                                            ViewModel.KeyboardHotkey.Screenshot = buttonValue.AsHidType<Key>();
-                                        viewModel.KeyboardHotkey.ShowUI = buttonValue.AsHidType<Key>();
+                                            break;
-                                        break;
+                                        case "ShowUI":
-                                    case "Pause":
+                                            ViewModel.KeyboardHotkey.ShowUI = buttonValue.AsHidType<Key>();
-                                        viewModel.KeyboardHotkey.Pause = buttonValue.AsHidType<Key>();
+                                            break;
-                                        break;
+                                        case "Pause":
-                                    case "ToggleMute":
+                                            ViewModel.KeyboardHotkey.Pause = buttonValue.AsHidType<Key>();
-                                        viewModel.KeyboardHotkey.ToggleMute = buttonValue.AsHidType<Key>();
+                                            break;
-                                        break;
+                                        case "ToggleMute":
-                                    case "ResScaleUp":
+                                            ViewModel.KeyboardHotkey.ToggleMute = buttonValue.AsHidType<Key>();
-                                        viewModel.KeyboardHotkey.ResScaleUp = buttonValue.AsHidType<Key>();
+                                            break;
-                                        break;
+                                        case "ResScaleUp":
-                                    case "ResScaleDown":
+                                            ViewModel.KeyboardHotkey.ResScaleUp = buttonValue.AsHidType<Key>();
-                                        viewModel.KeyboardHotkey.ResScaleDown = buttonValue.AsHidType<Key>();
+                                            break;
-                                        break;
+                                        case "ResScaleDown":
-                                    case "VolumeUp":
+                                            ViewModel.KeyboardHotkey.ResScaleDown = buttonValue.AsHidType<Key>();
-                                        viewModel.KeyboardHotkey.VolumeUp = buttonValue.AsHidType<Key>();
+                                            break;
-                                        break;
+                                        case "VolumeUp":
-                                    case "VolumeDown":
+                                            ViewModel.KeyboardHotkey.VolumeUp = buttonValue.AsHidType<Key>();
-                                        viewModel.KeyboardHotkey.VolumeDown = buttonValue.AsHidType<Key>();
+                                            break;
-                                        break;
+                                        case "VolumeDown":
-                                    case "CustomVSyncIntervalIncrement":
+                                            ViewModel.KeyboardHotkey.VolumeDown = buttonValue.AsHidType<Key>();
-                                        viewModel.KeyboardHotkey.CustomVSyncIntervalIncrement = buttonValue.AsHidType<Key>();
+                                            break;
-                                        break;
+                                        case "CustomVSyncIntervalIncrement":
-                                    case "CustomVSyncIntervalDecrement":
+                                            ViewModel.KeyboardHotkey.CustomVSyncIntervalIncrement =
-                                        viewModel.KeyboardHotkey.CustomVSyncIntervalDecrement = buttonValue.AsHidType<Key>();
+                                                buttonValue.AsHidType<Key>();
-                                        break;
+                                            break;
-                                }
+                                        case "CustomVSyncIntervalDecrement":
+                                            ViewModel.KeyboardHotkey.CustomVSyncIntervalDecrement =
+                                                buttonValue.AsHidType<Key>();
+                                            break;
+                                    }
+                                });
                             }
                         };
 

src/Ryujinx/UI/Views/Settings/SettingsNetworkView.axaml.cs

@@ -1,15 +1,13 @@
-using Avalonia.Controls;
 using Avalonia.Interactivity;
+using Ryujinx.Ava.UI.Controls;
 using Ryujinx.Ava.UI.ViewModels;
 using System;
 
 namespace Ryujinx.Ava.UI.Views.Settings
 {
-    public partial class SettingsNetworkView : UserControl
+    public partial class SettingsNetworkView : RyujinxControl<SettingsViewModel>
     {
         private readonly Random _random;
-        
-        public SettingsViewModel ViewModel;
 
         public SettingsNetworkView()
         {

src/Ryujinx/UI/Views/Settings/SettingsSystemView.axaml.cs

@@ -1,13 +1,12 @@
 using Avalonia.Controls;
+using Ryujinx.Ava.UI.Controls;
 using Ryujinx.Ava.UI.ViewModels;
 using TimeZone = Ryujinx.Ava.UI.Models.TimeZone;
 
 namespace Ryujinx.Ava.UI.Views.Settings
 {
-    public partial class SettingsSystemView : UserControl
+    public partial class SettingsSystemView : RyujinxControl<SettingsViewModel>
     {
-        public SettingsViewModel ViewModel;
-
         public SettingsSystemView()
         {
             InitializeComponent();

src/Ryujinx/UI/Views/Settings/SettingsUIView.axaml

@@ -6,7 +6,6 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:ext="clr-namespace:Ryujinx.Ava.Common.Markup"
     xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels"
-    xmlns:helper="clr-namespace:Ryujinx.Common.Helper;assembly=Ryujinx.Common"
     mc:Ignorable="d"
     x:DataType="viewModels:SettingsViewModel">
     <Design.DataContext>
@@ -19,246 +18,265 @@
         HorizontalScrollBarVisibility="Disabled"
         VerticalScrollBarVisibility="Auto">
         <Border Classes="settings">
-            <StackPanel
+            <Grid ColumnDefinitions="Auto,Auto,*" HorizontalAlignment="Stretch">
-                Margin="10"
+                <StackPanel
-                HorizontalAlignment="Stretch"
+                    Grid.Column="0"
-                Orientation="Vertical"
+                    Margin="10"
-                Spacing="10">
+                    HorizontalAlignment="Stretch"
-                <TextBlock Classes="h1" Text="{ext:Locale SettingsTabGeneralGeneral}" />
+                    Orientation="Vertical"
-                <StackPanel Margin="10,0,0,0" Orientation="Vertical">
+                    Spacing="10">
-                    <CheckBox IsChecked="{Binding EnableDiscordIntegration}">
+                    <TextBlock Classes="h1" Text="{ext:Locale SettingsTabGeneralGeneral}" />
-                        <StackPanel Orientation="Horizontal">
+                    <StackPanel Margin="10,0,0,0" Orientation="Vertical">
+                        <CheckBox IsChecked="{Binding EnableDiscordIntegration}">
+                            <StackPanel Orientation="Horizontal">
+                                <TextBlock VerticalAlignment="Center"
+                                           ToolTip.Tip="{ext:Locale ToggleDiscordTooltip}"
+                                           Text="{ext:Locale SettingsTabGeneralEnableDiscordRichPresence}" />
+                            </StackPanel>
+                        </CheckBox>
+                        <CheckBox
+                            IsEnabled="{Binding !IsGameTitleNotNull}"
+                            Opacity="{Binding PanelOpacity}"
+                            IsChecked="{Binding ShowConfirmExit}">
+                            <StackPanel Orientation="Horizontal">
+                                <TextBlock Text="{ext:Locale SettingsTabGeneralShowConfirmExitDialog}" />
+                                <TextBlock Classes="globalConfigMarker" IsVisible="{Binding IsGameTitleNotNull}" />
+                            </StackPanel>
+                        </CheckBox>
+                        <CheckBox
+                            IsEnabled="{Binding !IsGameTitleNotNull}"
+                            Opacity="{Binding PanelOpacity}"
+                            IsChecked="{Binding RememberWindowState}">
+                            <StackPanel Orientation="Horizontal">
+                                <TextBlock Text="{ext:Locale SettingsTabGeneralRememberWindowState}" />
+                                <TextBlock Classes="globalConfigMarker" IsVisible="{Binding IsGameTitleNotNull}" />
+                            </StackPanel>
+                        </CheckBox>
+                        <CheckBox
+                            IsEnabled="{Binding !IsGameTitleNotNull}"
+                            Opacity="{Binding PanelOpacity}"
+                            IsChecked="{Binding ShowOldUI}"
+                            ToolTip.Tip="{ext:Locale SettingsTabGeneralShowOldUIToolTip}">
+                            <StackPanel Orientation="Horizontal">
+                                <TextBlock Text="{ext:Locale SettingsTabGeneralShowOldUI}" />
+                                <TextBlock Classes="globalConfigMarker" IsVisible="{Binding IsGameTitleNotNull}" />
+                            </StackPanel>
+                        </CheckBox>
+                        <StackPanel
+                            Margin="0, 15, 0, 0"
+                            Orientation="Horizontal">
                             <TextBlock VerticalAlignment="Center"
-                                       ToolTip.Tip="{ext:Locale ToggleDiscordTooltip}"
+                                       Text="{ext:Locale SettingsTabGeneralFocusLossType}"
-                                       Text="{ext:Locale SettingsTabGeneralEnableDiscordRichPresence}" />
+                                       Width="150" />
+                            <ComboBox SelectedIndex="{Binding FocusLostActionType}"
+                                      HorizontalContentAlignment="Left"
+                                      MinWidth="100">
+                                <ComboBoxItem>
+                                    <TextBlock Text="{ext:Locale SettingsTabGeneralFocusLossTypeDoNothing}" />
+                                </ComboBoxItem>
+                                <ComboBoxItem>
+                                    <TextBlock Text="{ext:Locale SettingsTabGeneralFocusLossTypeBlockInput}" />
+                                </ComboBoxItem>
+                                <ComboBoxItem>
+                                    <TextBlock Text="{ext:Locale SettingsTabGeneralFocusLossTypeMuteAudio}" />
+                                </ComboBoxItem>
+                                <ComboBoxItem>
+                                    <TextBlock
+                                        Text="{ext:Locale SettingsTabGeneralFocusLossTypeBlockInputAndMuteAudio}" />
+                                </ComboBoxItem>
+                                <ComboBoxItem>
+                                    <TextBlock Text="{ext:Locale SettingsTabGeneralFocusLossTypePauseEmulation}" />
+                                </ComboBoxItem>
+                            </ComboBox>
                         </StackPanel>
-                    </CheckBox>
+                        <StackPanel
-                    <CheckBox 
+                            IsEnabled="{Binding !IsGameTitleNotNull}"
-                        IsEnabled="{Binding !IsGameTitleNotNull}"
+                            Opacity="{Binding PanelOpacity}"
-                        Opacity="{Binding PanelOpacity}"
+                            Margin="0, 15, 0, 0"
-                        IsChecked="{Binding ShowConfirmExit}">
+                            Orientation="Horizontal">
-                        <StackPanel Orientation="Horizontal">
+                            <TextBlock VerticalAlignment="Center"
-                            <TextBlock Text="{ext:Locale SettingsTabGeneralShowConfirmExitDialog}" />
+                                       Text="{ext:Locale SettingsTabGeneralCheckUpdatesOnLaunch}"
+                                       Width="150" />
+                            <ComboBox SelectedIndex="{Binding UpdateCheckerType}"
+                                      HorizontalContentAlignment="Left"
+                                      MinWidth="100">
+                                <ComboBoxItem>
+                                    <TextBlock Text="{ext:Locale SettingsTabGeneralCheckUpdatesOnLaunchOff}" />
+                                </ComboBoxItem>
+                                <ComboBoxItem>
+                                    <TextBlock
+                                        Text="{ext:Locale SettingsTabGeneralCheckUpdatesOnLaunchPromptAtStartup}" />
+                                </ComboBoxItem>
+                                <ComboBoxItem>
+                                    <TextBlock Text="{ext:Locale SettingsTabGeneralCheckUpdatesOnLaunchBackground}" />
+                                </ComboBoxItem>
+                            </ComboBox>
                             <TextBlock Classes="globalConfigMarker" IsVisible="{Binding IsGameTitleNotNull}" />
                         </StackPanel>
-                    </CheckBox>
+                        <StackPanel
-                    <CheckBox 
+                            Margin="0, 15, 0, 0"
-                        IsEnabled="{Binding !IsGameTitleNotNull}"
+                            Orientation="Horizontal">
-                        Opacity="{Binding PanelOpacity}"
+                            <TextBlock VerticalAlignment="Center"
-                        IsChecked="{Binding RememberWindowState}">
+                                       Text="{ext:Locale SettingsTabGeneralHideCursor}"
-                        <StackPanel Orientation="Horizontal">
+                                       Width="150" />
-                            <TextBlock Text="{ext:Locale SettingsTabGeneralRememberWindowState}" />
+                            <ComboBox SelectedIndex="{Binding HideCursor}"
+                                      HorizontalContentAlignment="Left"
+                                      MinWidth="100">
+                                <ComboBoxItem>
+                                    <TextBlock Text="{ext:Locale SettingsTabGeneralHideCursorNever}" />
+                                </ComboBoxItem>
+                                <ComboBoxItem>
+                                    <TextBlock Text="{ext:Locale SettingsTabGeneralHideCursorOnIdle}" />
+                                </ComboBoxItem>
+                                <ComboBoxItem>
+                                    <TextBlock Text="{ext:Locale SettingsTabGeneralHideCursorAlways}" />
+                                </ComboBoxItem>
+                            </ComboBox>
+                        </StackPanel>
+                        <StackPanel
+                            IsEnabled="{Binding !IsGameTitleNotNull}"
+                            Opacity="{Binding PanelOpacity}"
+                            Margin="0, 15, 0, 10"
+                            Orientation="Horizontal">
+                            <TextBlock
+                                VerticalAlignment="Center"
+                                Text="{ext:Locale SettingsTabGeneralTheme}"
+                                Width="150" />
+                            <ComboBox SelectedIndex="{Binding BaseStyleIndex}"
+                                      HorizontalContentAlignment="Left"
+                                      MinWidth="100">
+                                <ComboBoxItem>
+                                    <TextBlock Text="{ext:Locale SettingsTabGeneralThemeAuto}" />
+                                </ComboBoxItem>
+                                <ComboBoxItem>
+                                    <TextBlock Text="{ext:Locale SettingsTabGeneralThemeLight}" />
+                                </ComboBoxItem>
+                                <ComboBoxItem>
+                                    <TextBlock Text="{ext:Locale SettingsTabGeneralThemeDark}" />
+                                </ComboBoxItem>
+                            </ComboBox>
                             <TextBlock Classes="globalConfigMarker" IsVisible="{Binding IsGameTitleNotNull}" />
                         </StackPanel>
-                    </CheckBox>
-                    <CheckBox
-                        IsEnabled="{Binding !IsGameTitleNotNull}"
-                        Opacity="{Binding PanelOpacity}"
-                        IsChecked="{Binding ShowOldUI}"
-                        ToolTip.Tip="{ext:Locale SettingsTabGeneralShowOldUIToolTip}">
-                        <StackPanel Orientation="Horizontal">
-                            <TextBlock Text="{ext:Locale SettingsTabGeneralShowOldUI}" />
-                            <TextBlock Classes="globalConfigMarker" IsVisible="{Binding IsGameTitleNotNull}" />
-                        </StackPanel>
-                    </CheckBox>
-                    <StackPanel 
-                        Margin="0, 15, 0, 0" 
-                        Orientation="Horizontal">
-                        <TextBlock VerticalAlignment="Center"
-                                   Text="{ext:Locale SettingsTabGeneralFocusLossType}"
-                                   Width="150" />
-                        <ComboBox SelectedIndex="{Binding FocusLostActionType}"
-                                  HorizontalContentAlignment="Left"
-                                  MinWidth="100">
-                            <ComboBoxItem>
-                                <TextBlock Text="{ext:Locale SettingsTabGeneralFocusLossTypeDoNothing}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{ext:Locale SettingsTabGeneralFocusLossTypeBlockInput}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{ext:Locale SettingsTabGeneralFocusLossTypeMuteAudio}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{ext:Locale SettingsTabGeneralFocusLossTypeBlockInputAndMuteAudio}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{ext:Locale SettingsTabGeneralFocusLossTypePauseEmulation}" />
-                            </ComboBoxItem>
-                        </ComboBox>
-                    </StackPanel>
-                    <StackPanel 
-                        IsEnabled="{Binding !IsGameTitleNotNull}"
-                        Opacity="{Binding PanelOpacity}"
-                        Margin="0, 15, 0, 0" 
-                        Orientation="Horizontal">
-                        <TextBlock VerticalAlignment="Center"
-                                   Text="{ext:Locale SettingsTabGeneralCheckUpdatesOnLaunch}"
-                                   Width="150" />
-                        <ComboBox SelectedIndex="{Binding UpdateCheckerType}"
-                                  HorizontalContentAlignment="Left"
-                                  MinWidth="100">
-                            <ComboBoxItem>
-                                <TextBlock Text="{ext:Locale SettingsTabGeneralCheckUpdatesOnLaunchOff}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{ext:Locale SettingsTabGeneralCheckUpdatesOnLaunchPromptAtStartup}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{ext:Locale SettingsTabGeneralCheckUpdatesOnLaunchBackground}" />
-                            </ComboBoxItem>
-                        </ComboBox>
-                        <TextBlock  Classes="globalConfigMarker" IsVisible="{Binding IsGameTitleNotNull}"/>
-                    </StackPanel>
-                    <StackPanel 
-                        Margin="0, 15, 0, 0" 
-                        Orientation="Horizontal">
-                        <TextBlock VerticalAlignment="Center"
-                                   Text="{ext:Locale SettingsTabGeneralHideCursor}"
-                                   Width="150" />
-                        <ComboBox SelectedIndex="{Binding HideCursor}"
-                                  HorizontalContentAlignment="Left"
-                                  MinWidth="100">
-                            <ComboBoxItem>
-                                <TextBlock Text="{ext:Locale SettingsTabGeneralHideCursorNever}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{ext:Locale SettingsTabGeneralHideCursorOnIdle}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{ext:Locale SettingsTabGeneralHideCursorAlways}" />
-                            </ComboBoxItem>
-                        </ComboBox>
-                    </StackPanel>
-                    <StackPanel 
-                        IsEnabled="{Binding !IsGameTitleNotNull}"
-                        Opacity="{Binding PanelOpacity}"
-                        Margin="0, 15, 0, 10" 
-                        Orientation="Horizontal">
-                        <TextBlock
-                            VerticalAlignment="Center"
-                            Text="{ext:Locale SettingsTabGeneralTheme}"
-                            Width="150" />
-                        <ComboBox SelectedIndex="{Binding BaseStyleIndex}"
-                                  HorizontalContentAlignment="Left"
-                                  MinWidth="100">
-                            <ComboBoxItem>
-                                <TextBlock Text="{ext:Locale SettingsTabGeneralThemeAuto}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{ext:Locale SettingsTabGeneralThemeLight}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{ext:Locale SettingsTabGeneralThemeDark}" />
-                            </ComboBoxItem>
-                        </ComboBox>
-                        <TextBlock  Classes="globalConfigMarker" IsVisible="{Binding IsGameTitleNotNull}"/>
                     </StackPanel>
                 </StackPanel>
-                <Separator Height="1" />
+                <Border Grid.Column="1"
-                <StackPanel Orientation="Horizontal">
+                        HorizontalAlignment="Center"
-                    <TextBlock Classes="h1" Text="{ext:Locale SettingsTabGeneralGameDirectories}" />
+                        VerticalAlignment="Top"
-                    <TextBlock  Classes="globalConfigMarker" IsVisible="{Binding IsGameTitleNotNull}"/>
+                        Margin="10, 10, 10, 0"
-                </StackPanel>
+                        Height="405"
+                        BorderBrush="Gray"
+                        Background="Gray"
+                        Width="1" />
                 <StackPanel
-                    IsEnabled="{Binding !IsGameTitleNotNull}"
+                    Margin="10"
-                    Opacity="{Binding PanelOpacity}"
+                    Spacing="10"
-                    Margin="10,0,0,0"
+                    Grid.Column="2"
-                    HorizontalAlignment="Stretch"
+                    Orientation="Vertical" HorizontalAlignment="Stretch">
-                    Orientation="Vertical"
-                    Spacing="10">
-                    <ListBox
-                        Name="GameDirsList"
-                        MinHeight="120"
-                        ItemsSource="{Binding GameDirectories}">
-                        <ListBox.Styles>
-                            <Style Selector="ListBoxItem">
-                                <Setter Property="Padding" Value="10" />
-                                <Setter Property="Background" Value="{DynamicResource ListBoxBackground}" />
-                            </Style>
-                        </ListBox.Styles>
-                    </ListBox>
-                    <Grid HorizontalAlignment="Stretch" ColumnDefinitions="*,Auto,Auto">
-                        <TextBox
-                            Name="GameDirPathBox"
-                            Margin="0"
-                            ToolTip.Tip="{ext:Locale AddGameDirBoxTooltip}"
-                            VerticalAlignment="Stretch" />
-                        <Button
-                            Name="AddGameDirButton"
-                            Grid.Column="1"
-                            MinWidth="90"
-                            Margin="10,0,0,0"
-                            ToolTip.Tip="{ext:Locale AddGameDirTooltip}">
-                            <TextBlock HorizontalAlignment="Center"
-                                       Text="{ext:Locale SettingsTabGeneralAdd}" />
-                        </Button>
-                        <Button
-                            Name="RemoveGameDirButton"
-                            Grid.Column="2"
-                            MinWidth="90"
-                            Margin="10,0,0,0"
-                            ToolTip.Tip="{ext:Locale RemoveGameDirTooltip}"
-                            Click="RemoveGameDirButton_OnClick">
-                            <TextBlock HorizontalAlignment="Center"
-                                       Text="{ext:Locale SettingsTabGeneralRemove}" />
-                        </Button>
-                    </Grid>
-                </StackPanel>
-                <Separator Height="1" />
-               <StackPanel Orientation="Vertical" Spacing="5">
                     <StackPanel Orientation="Horizontal">
-                        <TextBlock Classes="h1" Text="{ext:Locale SettingsTabGeneralAutoloadDirectories}" />
+                        <TextBlock Classes="h1" Text="{ext:Locale SettingsTabGeneralGameDirectories}" />
-                        <TextBlock  Classes="globalConfigMarker" IsVisible="{Binding IsGameTitleNotNull}"/>
+                        <TextBlock Classes="globalConfigMarker" IsVisible="{Binding IsGameTitleNotNull}" />
+                    </StackPanel>
+                    <StackPanel
+                        IsEnabled="{Binding !IsGameTitleNotNull}"
+                        Opacity="{Binding PanelOpacity}"
+                        Margin="10,0,0,0"
+                        HorizontalAlignment="Stretch"
+                        Orientation="Vertical"
+                        Spacing="10">
+                        <ListBox
+                            Name="GameDirsList"
+                            MinHeight="120"
+                            ItemsSource="{Binding GameDirectories}">
+                            <ListBox.Styles>
+                                <Style Selector="ListBoxItem">
+                                    <Setter Property="Padding" Value="10" />
+                                    <Setter Property="Background" Value="{DynamicResource ListBoxBackground}" />
+                                </Style>
+                            </ListBox.Styles>
+                        </ListBox>
+                        <Grid HorizontalAlignment="Stretch" ColumnDefinitions="*,Auto,Auto">
+                            <TextBox
+                                Name="GameDirPathBox"
+                                Margin="0"
+                                ToolTip.Tip="{ext:Locale AddGameDirBoxTooltip}"
+                                VerticalAlignment="Stretch" />
+                            <Button
+                                Name="AddGameDirButton"
+                                Grid.Column="1"
+                                MinWidth="90"
+                                Margin="10,0,0,0"
+                                ToolTip.Tip="{ext:Locale AddGameDirTooltip}">
+                                <TextBlock HorizontalAlignment="Center"
+                                           Text="{ext:Locale SettingsTabGeneralAdd}" />
+                            </Button>
+                            <Button
+                                Name="RemoveGameDirButton"
+                                Grid.Column="2"
+                                MinWidth="90"
+                                Margin="10,0,0,0"
+                                ToolTip.Tip="{ext:Locale RemoveGameDirTooltip}"
+                                Click="RemoveGameDirButton_OnClick">
+                                <TextBlock HorizontalAlignment="Center"
+                                           Text="{ext:Locale SettingsTabGeneralRemove}" />
+                            </Button>
+                        </Grid>
+                    </StackPanel>
+                    <Separator Height="1" />
+                    <StackPanel Orientation="Vertical" Spacing="5">
+                        <StackPanel Orientation="Horizontal">
+                            <TextBlock Classes="h1" Text="{ext:Locale SettingsTabGeneralAutoloadDirectories}" />
+                            <TextBlock Classes="globalConfigMarker" IsVisible="{Binding IsGameTitleNotNull}" />
+                        </StackPanel>
+                        <TextBlock Foreground="{DynamicResource SecondaryTextColor}"
+                                   Text="{ext:Locale SettingsTabGeneralAutoloadNote}" />
+                    </StackPanel>
+                    <StackPanel
+                        IsEnabled="{Binding !IsGameTitleNotNull}"
+                        Opacity="{Binding PanelOpacity}"
+                        Margin="10,0,0,0"
+                        HorizontalAlignment="Stretch"
+                        Orientation="Vertical"
+                        Spacing="10">
+                        <ListBox
+                            Name="AutoloadDirsList"
+                            MinHeight="100"
+                            ItemsSource="{Binding AutoloadDirectories}">
+                            <ListBox.Styles>
+                                <Style Selector="ListBoxItem">
+                                    <Setter Property="Padding" Value="10" />
+                                    <Setter Property="Background" Value="{DynamicResource ListBoxBackground}" />
+                                </Style>
+                            </ListBox.Styles>
+                        </ListBox>
+                        <Grid HorizontalAlignment="Stretch" ColumnDefinitions="*,Auto,Auto">
+                            <TextBox
+                                Name="AutoloadDirPathBox"
+                                Margin="0"
+                                ToolTip.Tip="{ext:Locale AddAutoloadDirBoxTooltip}"
+                                VerticalAlignment="Stretch" />
+                            <Button
+                                Name="AddAutoloadDirButton"
+                                Grid.Column="1"
+                                MinWidth="90"
+                                Margin="10,0,0,0"
+                                ToolTip.Tip="{ext:Locale AddAutoloadDirTooltip}">
+                                <TextBlock HorizontalAlignment="Center"
+                                           Text="{ext:Locale SettingsTabGeneralAdd}" />
+                            </Button>
+                            <Button
+                                Name="RemoveAutoloadDirButton"
+                                Grid.Column="2"
+                                MinWidth="90"
+                                Margin="10,0,0,0"
+                                ToolTip.Tip="{ext:Locale RemoveAutoloadDirTooltip}"
+                                Click="RemoveAutoloadDirButton_OnClick">
+                                <TextBlock HorizontalAlignment="Center"
+                                           Text="{ext:Locale SettingsTabGeneralRemove}" />
+                            </Button>
+                        </Grid>
                     </StackPanel>
-                    <TextBlock Foreground="{DynamicResource SecondaryTextColor}" Text="{ext:Locale SettingsTabGeneralAutoloadNote}" />
                 </StackPanel>
-                <StackPanel
+            </Grid>
-                    IsEnabled="{Binding !IsGameTitleNotNull}"
-                    Opacity="{Binding PanelOpacity}"
-                    Margin="10,0,0,0"
-                    HorizontalAlignment="Stretch"
-                    Orientation="Vertical"
-                    Spacing="10">
-                    <ListBox
-                        Name="AutoloadDirsList"
-                        MinHeight="100"
-                        ItemsSource="{Binding AutoloadDirectories}">
-                        <ListBox.Styles>
-                            <Style Selector="ListBoxItem">
-                                <Setter Property="Padding" Value="10" />
-                                <Setter Property="Background" Value="{DynamicResource ListBoxBackground}" />
-                            </Style>
-                        </ListBox.Styles>
-                    </ListBox>
-                    <Grid HorizontalAlignment="Stretch" ColumnDefinitions="*,Auto,Auto">
-                        <TextBox
-                            Name="AutoloadDirPathBox"
-                            Margin="0"
-                            ToolTip.Tip="{ext:Locale AddAutoloadDirBoxTooltip}"
-                            VerticalAlignment="Stretch" />
-                        <Button
-                            Name="AddAutoloadDirButton"
-                            Grid.Column="1"
-                            MinWidth="90"
-                            Margin="10,0,0,0"
-                            ToolTip.Tip="{ext:Locale AddAutoloadDirTooltip}">
-                            <TextBlock HorizontalAlignment="Center"
-                                       Text="{ext:Locale SettingsTabGeneralAdd}" />
-                        </Button>
-                        <Button
-                            Name="RemoveAutoloadDirButton"
-                            Grid.Column="2"
-                            MinWidth="90"
-                            Margin="10,0,0,0"
-                            ToolTip.Tip="{ext:Locale RemoveAutoloadDirTooltip}"
-                            Click="RemoveAutoloadDirButton_OnClick">
-                            <TextBlock HorizontalAlignment="Center"
-                                       Text="{ext:Locale SettingsTabGeneralRemove}" />
-                        </Button>
-                    </Grid>
-                </StackPanel>
-            </StackPanel>
         </Border>
     </ScrollViewer>
 </UserControl>

src/Ryujinx/UI/Views/Settings/SettingsUIView.axaml.cs

@@ -3,10 +3,10 @@ using Avalonia.Controls;
 using Avalonia.Interactivity;
 using Avalonia.Platform.Storage;
 using Gommon;
+using Ryujinx.Ava.UI.Controls;
 using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.ViewModels;
 using Ryujinx.Ava.Utilities;
-using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -14,20 +14,18 @@ using System.Threading.Tasks;
 
 namespace Ryujinx.Ava.UI.Views.Settings
 {
-    public partial class SettingsUiView : UserControl
+    public partial class SettingsUiView : RyujinxControl<SettingsViewModel>
     {
-        public SettingsViewModel ViewModel;
-
         public SettingsUiView()
         {
             InitializeComponent();
             AddGameDirButton.Command =
-                Commands.Create(() => AddDirButton(GameDirPathBox, ViewModel.GameDirectories, true));
+                Commands.Create(() => AddDirButton(GameDirPathBox, ViewModel.GameDirectories));
             AddAutoloadDirButton.Command =
-                Commands.Create(() => AddDirButton(AutoloadDirPathBox, ViewModel.AutoloadDirectories, false));
+                Commands.Create(() => AddDirButton(AutoloadDirPathBox, ViewModel.AutoloadDirectories));
         }
 
-        private async Task AddDirButton(TextBox addDirBox, AvaloniaList<string> directories, bool isGameList)
+        private async Task AddDirButton(TextBox addDirBox, AvaloniaList<string> directories)
         {
             string path = addDirBox.Text;
 

src/Ryujinx/UI/Views/User/UserEditorView.axaml.cs

@@ -8,7 +8,6 @@ using Ryujinx.Ava.UI.Controls;
 using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.Models;
 using Ryujinx.HLE.HOS.Services.Account.Acc;
-using System;
 using UserProfile = Ryujinx.Ava.UI.Models.UserProfile;
 
 namespace Ryujinx.Ava.UI.Views.User

src/Ryujinx/UI/Views/User/UserRecovererView.axaml.cs

@@ -1,4 +1,3 @@
-using Avalonia.Controls;
 using Avalonia.Interactivity;
 using FluentAvalonia.UI.Controls;
 using FluentAvalonia.UI.Navigation;

src/Ryujinx/UI/Views/User/UserSaveManagerView.axaml.cs

@@ -1,4 +1,3 @@
-using Avalonia.Controls;
 using Avalonia.Interactivity;
 using Avalonia.Threading;
 using FluentAvalonia.UI.Controls;

src/Ryujinx/UI/Windows/CheatWindow.axaml.cs

@@ -1,10 +1,8 @@
 using Avalonia.Collections;
-using LibHac.Tools.FsSystem;
 using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.UI.Models;
 using Ryujinx.Ava.Systems.AppLibrary;
 using Ryujinx.Ava.Systems.Configuration;
-using Ryujinx.Ava.UI.ViewModels;
 using Ryujinx.HLE.FileSystem;
 using Ryujinx.HLE.HOS;
 using System.Collections.Generic;

src/Ryujinx/UI/Windows/CompatibilityListWindow.axaml.cs

@@ -1,25 +1,24 @@
 using Avalonia.Controls;
-using Avalonia.Styling;
-using FluentAvalonia.UI.Controls;
-using FluentAvalonia.UI.Windowing;
 using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.Systems.Configuration;
-using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.ViewModels;
-using Ryujinx.Ava.UI.Windows;
 using System.Threading.Tasks;
 
 namespace Ryujinx.Ava.UI.Windows
 {
     public partial class CompatibilityListWindow : StyleableAppWindow
     {
-        public static Task Show(string titleId = null) =>
+        public static async Task Show(string titleId = null)
-            ShowAsync(new CompatibilityListWindow
+        {
+            using CompatibilityViewModel compatWindow = new(RyujinxApp.MainWindow.ViewModel.ApplicationLibrary);
+            
+            await ShowAsync(new CompatibilityListWindow
             {
-                DataContext = new CompatibilityViewModel(RyujinxApp.MainWindow.ViewModel.ApplicationLibrary),
+                DataContext = compatWindow,
                 SearchBoxFlush = { Text = titleId ?? string.Empty },
                 SearchBoxNormal = { Text = titleId ?? string.Empty }
             });
+        }
 
         public CompatibilityListWindow() : base(useCustomTitleBar: true, 37)
         {

src/Ryujinx/UI/Windows/GameSpecificSettingsWindow.axaml.cs

@@ -1,25 +1,9 @@
-using Avalonia;
 using Avalonia.Controls;
-using Avalonia.Controls.Shapes;
-using Avalonia.Input;
-using Avalonia.Media.Imaging;
-using FluentAvalonia.Core;
 using FluentAvalonia.UI.Controls;
-using Projektanker.Icons.Avalonia;
 using Ryujinx.Ava.Common.Locale;
-using Ryujinx.Ava.UI.Models;
 using Ryujinx.Ava.UI.ViewModels;
-using Ryujinx.Ava.UI.ViewModels.Input;
-using Ryujinx.Ava.Utilities;
-using Ryujinx.Ava.Systems.Configuration;
-using Ryujinx.Common.Configuration;
-using Ryujinx.HLE.FileSystem;
-using Ryujinx.HLE.HOS.SystemState;
-using Ryujinx.Input;
 using System;
-using System.IO;
 using System.Linq;
-using Key = Avalonia.Input.Key;
 
 
 namespace Ryujinx.Ava.UI.Windows

src/Ryujinx/UI/Windows/MainWindow.axaml.cs

@@ -7,13 +7,12 @@ using Avalonia.Platform;
 using Avalonia.Threading;
 using DynamicData;
 using FluentAvalonia.UI.Controls;
-using FluentAvalonia.UI.Windowing;
 using Gommon;
 using LibHac.Ns;
-using LibHac.Tools.FsSystem;
 using Ryujinx.Ava.Common;
 using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.Input;
+using Ryujinx.Ava.Systems;
 using Ryujinx.Ava.UI.Applet;
 using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.ViewModels;

src/Ryujinx/UI/Windows/SettingsWindow.axaml.cs

@@ -31,8 +31,8 @@ namespace Ryujinx.Ava.UI.Windows
                     : NavigationViewPaneDisplayMode.Top;
 
             Height = ConfigurationState.Instance.ShowOldUI
-                ? 927
+                ? 906
-                : 993; // nav panel is put on top with custom title bar so account for new height
+                : 954; // nav panel is put on top with custom title bar so account for new height
             
             Load();
         }

src/Ryujinx/UI/Windows/StyleableWindow.cs

@@ -8,7 +8,6 @@ using FluentAvalonia.UI.Windowing;
 using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.Systems.Configuration;
 using Ryujinx.Ava.UI.Controls;
-using Ryujinx.Ava.UI.ViewModels;
 using System.Threading.Tasks;
 
 namespace Ryujinx.Ava.UI.Windows