UI: compat: remove custom ContentDialog derived type

instead of downloading

Co-Authored-By: Vita Chumakova <me@ezhevita.dev>

src/Ryujinx/Assets/Styles/Styles.xaml

@@ -402,7 +402,7 @@
         <x:Double x:Key="ControlContentThemeFontSize">13</x:Double>
         <x:Double x:Key="MenuItemHeight">26</x:Double>
         <x:Double x:Key="TabItemMinHeight">28</x:Double>
-        <x:Double x:Key="ContentDialogMaxWidth">700</x:Double>
+        <x:Double x:Key="ContentDialogMaxWidth">900</x:Double>
         <x:Double x:Key="ContentDialogMaxHeight">756</x:Double>
     </Styles.Resources>
 </Styles>

src/Ryujinx/Assets/locales.json

@@ -22597,6 +22597,31 @@
         "zh_TW": ""
       }
     },
+    {
+      "ID": "CompatibilityListWarning",
+      "Translations": {
+        "ar_SA": "",
+        "de_DE": "",
+        "el_GR": "",
+        "en_US": "This compatibility list might contain out of date entries.\nDo not be opposed to testing games in the \"Ingame\" status.",
+        "es_ES": "",
+        "fr_FR": "",
+        "he_IL": "",
+        "it_IT": "",
+        "ja_JP": "",
+        "ko_KR": "",
+        "no_NO": "",
+        "pl_PL": "",
+        "pt_BR": "",
+        "ru_RU": "",
+        "sv_SE": "",
+        "th_TH": "",
+        "tr_TR": "",
+        "uk_UA": "",
+        "zh_CN": "",
+        "zh_TW": ""
+      }
+    },
     {
       "ID": "CompatibilityListSearchBoxWatermark",
       "Translations": {

src/Ryujinx/Ryujinx.csproj

@@ -145,6 +145,9 @@
     <EmbeddedResource Include="..\..\distribution\macos\shortcut-template.plist">
       <Link>Assets\ShortcutFiles\shortcut-template.plist</Link>
     </EmbeddedResource>
+    <EmbeddedResource Include="..\..\docs\compatibility.csv" LogicalName="RyujinxGameCompatibilityList">
+      <Link>Assets\RyujinxGameCompatibility.csv</Link>
+    </EmbeddedResource>
     <EmbeddedResource Include="Assets\locales.json" />
     <EmbeddedResource Include="Assets\Styles\Styles.xaml" />
     <EmbeddedResource Include="Assets\Icons\Controller_JoyConLeft.svg" />
@@ -168,12 +171,6 @@
   <ItemGroup>
     <AdditionalFiles Include="Assets\locales.json" />
   </ItemGroup>
-  <ItemGroup>
-    <Compile Update="Utilities\Compat\CompatibilityList.axaml.cs">
-      <DependentUpon>CompatibilityList.axaml</DependentUpon>
-      <SubType>Code</SubType>
-    </Compile>
-  </ItemGroup>
   <ItemGroup>
     <Folder Include="Assets\Fonts\Mono\" />
   </ItemGroup>

src/Ryujinx/UI/Helpers/MiniCommand.cs

@@ -63,6 +63,7 @@ namespace Ryujinx.Ava.UI.Helpers
         public static MiniCommand Create(Action callback) => new MiniCommand<object>(_ => callback());
         public static MiniCommand Create<TArg>(Action<TArg> callback) => new MiniCommand<TArg>(callback);
         public static MiniCommand CreateFromTask(Func<Task> callback) => new MiniCommand<object>(_ => callback());
+        public static MiniCommand CreateFromTask<TArg>(Func<TArg, Task> callback) => new MiniCommand<TArg>(callback);
 
         public abstract bool CanExecute(object parameter);
         public abstract void Execute(object parameter);

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

@@ -56,7 +56,7 @@
                     ToolTip.Tip="{ext:Locale LoadTitleUpdatesFromFolderTooltip}" />
                 <MenuItem Header="{ext:Locale MenuBarFileOpenApplet}" IsEnabled="{Binding IsAppletMenuActive}" Icon="{ext:Icon mdi-launch}">
                     <MenuItem
-                        Click="OpenMiiApplet"
+                        Name="MiiAppletMenuItem"
                         Header="{ext:Locale MenuBarFileOpenAppletOpenMiiApplet}"
                         Icon="{ext:Icon fa-solid fa-person}"
                         ToolTip.Tip="{ext:Locale MenuBarFileOpenAppletOpenMiiAppletToolTip}" />
@@ -72,7 +72,7 @@
                     ToolTip.Tip="{ext:Locale OpenRyujinxLogsTooltip}" />
                 <Separator />
                 <MenuItem
-                    Click="CloseWindow"
+                    Name="CloseRyujinxMenuItem"
                     Header="{ext:Locale MenuBarFileExit}"
                     Icon="{ext:Icon fa-solid fa-xmark}"
                     ToolTip.Tip="{ext:Locale ExitTooltip}" />
@@ -167,7 +167,7 @@
                     Header="{ext:Locale MenuBarShowFileTypes}" />
                 <Separator />
                 <MenuItem
-                    Click="OpenSettings"
+                    Name="OpenSettingsMenuItem"
                     Padding="0"
                     Header="{ext:Locale MenuBarOptionsSettings}"
                     Icon="{ext:Icon fa-solid fa-gear}"
@@ -210,21 +210,21 @@
                 Header="{ext:Locale MenuBarActions}"
                 IsEnabled="{Binding IsGameRunning}">
                 <MenuItem
-                    Click="PauseEmulation_Click"
+                    Name="PauseEmulationMenuItem"
                     Header="{ext:Locale MenuBarOptionsPauseEmulation}"
                     Icon="{ext:Icon fa-solid fa-pause}"
                     InputGesture="{Binding PauseKey}"
                     IsEnabled="{Binding !IsPaused}"
                     IsVisible="{Binding !IsPaused}" />
                 <MenuItem
-                    Click="ResumeEmulation_Click"
+                    Name="ResumeEmulationMenuItem"
                     Header="{ext:Locale MenuBarOptionsResumeEmulation}"
                     Icon="{ext:Icon fa-solid fa-play}"
                     InputGesture="{Binding PauseKey}"
                     IsEnabled="{Binding IsPaused}"
                     IsVisible="{Binding IsPaused}" />
                 <MenuItem
-                    Click="StopEmulation_Click"
+                    Name="StopEmulationMenuItem"
                     Header="{ext:Locale MenuBarOptionsStopEmulation}"
                     Icon="{ext:Icon fa-solid fa-stop}"
                     InputGesture="Escape"
@@ -233,17 +233,15 @@
                 <MenuItem Command="{Binding SimulateWakeUpMessage}" Header="{ext:Locale MenuBarOptionsSimulateWakeUpMessage}" />
                 <Separator />
                 <MenuItem
-                    Name="ScanAmiiboMenuItem"
+                    Command="{Binding OpenAmiiboWindow}"
                     AttachedToVisualTree="ScanAmiiboMenuItem_AttachedToVisualTree"
-                    Click="OpenAmiiboWindow"
                     Header="{ext:Locale MenuBarActionsScanAmiibo}"
                     Icon="{ext:Icon mdi-cube-scan}"
                     InputGesture="Ctrl + A"
                     IsEnabled="{Binding IsAmiiboRequested}" />
                 <MenuItem
-                    Name="ScanAmiiboMenuItemFromBin"
+                    Command="{Binding OpenBinFile}"
                     AttachedToVisualTree="ScanBinAmiiboMenuItem_AttachedToVisualTree"
-                    Click="OpenBinFile"
                     Header="{ext:Locale MenuBarActionsScanAmiiboBin}"
                     Icon="{ext:Icon mdi-cube-scan}"
                     IsVisible="{Binding CanScanAmiiboBinaries}"
@@ -262,7 +260,7 @@
                     InputGesture="{Binding ShowUiKey}"
                     IsEnabled="{Binding IsGameRunning}" />
                 <MenuItem
-                    Click="OpenCheatManagerForCurrentApp"
+                    Name="CheatManagerMenuItem"
                     Header="{ext:Locale GameListContextMenuManageCheat}"
                     Icon="{ext:Icon fa-solid fa-code}"
                     IsEnabled="{Binding IsGameRunning}" />
@@ -277,56 +275,55 @@
                     <MenuItem Command="{Binding InstallFirmwareFromFolder}" Header="{ext:Locale MenuBarFileToolsInstallFirmwareFromDirectory}" Icon="{ext:Icon mdi-folder-cog}" />
                 </MenuItem>
                 <MenuItem Header="{ext:Locale MenuBarToolsManageFileTypes}" IsVisible="{Binding ManageFileTypesVisible}">
-                    <MenuItem Header="{ext:Locale MenuBarToolsInstallFileTypes}" Click="InstallFileTypes_Click" IsEnabled="{Binding AreMimeTypesRegistered, Converter={x:Static BoolConverters.Not}}" />
-                    <MenuItem Header="{ext:Locale MenuBarToolsUninstallFileTypes}" Click="UninstallFileTypes_Click" IsEnabled="{Binding AreMimeTypesRegistered}" />
+                    <MenuItem Name="InstallFileTypesMenuItem" Header="{ext:Locale MenuBarToolsInstallFileTypes}" IsEnabled="{Binding AreMimeTypesRegistered, Converter={x:Static BoolConverters.Not}}" />
+                    <MenuItem Name="UninstallFileTypesMenuItem" Header="{ext:Locale MenuBarToolsUninstallFileTypes}" IsEnabled="{Binding AreMimeTypesRegistered}" />
                 </MenuItem>
                 <Separator />
-                <MenuItem Header="{ext:Locale MenuBarToolsXCITrimmer}" IsEnabled="{Binding EnableNonGameRunningControls}" Click="OpenXCITrimmerWindow" Icon="{ext:Icon fa-solid fa-scissors}" />
+                <MenuItem Name="XciTrimmerMenuItem" Header="{ext:Locale MenuBarToolsXCITrimmer}" IsEnabled="{Binding EnableNonGameRunningControls}" Icon="{ext:Icon fa-solid fa-scissors}" />
             </MenuItem>
             <MenuItem VerticalAlignment="Center" Header="{ext:Locale MenuBarView}">
                 <MenuItem VerticalAlignment="Center" Header="{ext:Locale MenuBarViewWindow}">
-                    <MenuItem Header="{ext:Locale MenuBarViewWindow720}" Tag="1280 720" Click="ChangeWindowSize_Click" />
-                    <MenuItem Header="{ext:Locale MenuBarViewWindow1080}" Tag="1920 1080" Click="ChangeWindowSize_Click" />
-                    <MenuItem Header="{ext:Locale MenuBarViewWindow1440}" Tag="2560 1440" Click="ChangeWindowSize_Click" />
-                    <MenuItem Header="{ext:Locale MenuBarViewWindow2160}" Tag="3840 2160" Click="ChangeWindowSize_Click" />
+                    <MenuItem Name="WindowSize720PMenuItem" Header="{ext:Locale MenuBarViewWindow720}" CommandParameter="1280 720" />
+                    <MenuItem Name="WindowSize1080PMenuItem" Header="{ext:Locale MenuBarViewWindow1080}" CommandParameter="1920 1080" />
+                    <MenuItem Name="WindowSize1440PMenuItem" Header="{ext:Locale MenuBarViewWindow1440}" CommandParameter="2560 1440" />
+                    <MenuItem Name="WindowSize2160PMenuItem" Header="{ext:Locale MenuBarViewWindow2160}" CommandParameter="3840 2160" />
                 </MenuItem>
             </MenuItem>
             <MenuItem VerticalAlignment="Center" Header="{ext:Locale MenuBarHelp}">
                 <MenuItem
-                    Click="OpenAboutWindow"
+                    Name="AboutWindowMenuItem"
                     Header="{ext:Locale MenuBarHelpAbout}"
                     Icon="{ext:Icon fa-solid fa-circle-info}"
                     ToolTip.Tip="{ext:Locale OpenAboutTooltip}" />
                 <MenuItem
                     Name="UpdateMenuItem"
                     IsEnabled="{Binding CanUpdate}"
-                    Click="CheckForUpdates"
                     Header="{ext:Locale MenuBarHelpCheckForUpdates}"
                     Icon="{ext:Icon mdi-update}"
                     ToolTip.Tip="{ext:Locale CheckUpdatesTooltip}" />
                 <MenuItem
-                    Click="OpenCompatibilityList"
+                    Name="CompatibilityListMenuItem"
                     Header="{ext:Locale CompatibilityListOpen}"
                     Icon="{ext:Icon mdi-gamepad}"/>
                 <Separator />
                 <MenuItem VerticalAlignment="Center" Header="{ext:Locale MenuBarHelpFaqAndGuides}" Icon="{ext:Icon fa-solid fa-question}" >
                     <MenuItem
-                        Click="MenuItem_OnClick"
+                        Name="FaqMenuItem"
                         Header="{ext:Locale MenuBarHelpFaq}"
                         Icon="{ext:Icon fa-github}"
-                        Tag="https://github.com/GreemDev/Ryujinx/wiki/FAQ-and-Troubleshooting"
+                        CommandParameter="https://github.com/GreemDev/Ryujinx/wiki/FAQ-and-Troubleshooting"
                         ToolTip.Tip="{ext:Locale MenuBarHelpFaqTooltip}" />
                     <MenuItem
-                        Click="MenuItem_OnClick"
+                        Name="SetupGuideMenuItem"
                         Header="{ext:Locale MenuBarHelpSetup}"
                         Icon="{ext:Icon fa-github}"
-                        Tag="https://github.com/GreemDev/Ryujinx/wiki/Ryujinx-Setup-&amp;-Configuration-Guide"
+                        CommandParameter="https://github.com/GreemDev/Ryujinx/wiki/Ryujinx-Setup-&amp;-Configuration-Guide"
                         ToolTip.Tip="{ext:Locale MenuBarHelpSetupTooltip}" />
                     <MenuItem
-                        Click="MenuItem_OnClick"
+                        Name="LdnGuideMenuItem"
                         Header="{ext:Locale MenuBarHelpMultiplayer}"
                         Icon="{ext:Icon fa-github}"
-                        Tag="https://github.com/GreemDev/Ryujinx/wiki/Multiplayer%E2%80%90(LDN%E2%80%90Local%E2%80%90Wireless)%E2%80%90Guide"
+                        CommandParameter="https://github.com/GreemDev/Ryujinx/wiki/Multiplayer%E2%80%90(LDN%E2%80%90Local%E2%80%90Wireless)%E2%80%90Guide"
                         ToolTip.Tip="{ext:Locale MenuBarHelpMultiplayerTooltip}" />
                 </MenuItem>
             </MenuItem>

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

@@ -1,7 +1,8 @@
 using Avalonia;
 using Avalonia.Controls;
-using Avalonia.Interactivity;
+using Avalonia.Layout;
 using Avalonia.Threading;
+using CommunityToolkit.Mvvm.Input;
 using Gommon;
 using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.UI.Helpers;
@@ -17,6 +18,7 @@ using Ryujinx.HLE.HOS.Services.Nfc.AmiiboDecryption;
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading.Tasks;
 
 namespace Ryujinx.Ava.UI.Views.Main
 {
@@ -34,9 +36,37 @@ namespace Ryujinx.Ava.UI.Views.Main
 
             ToggleFileTypesMenuItem.ItemsSource = GenerateToggleFileTypeItems();
             ChangeLanguageMenuItem.ItemsSource = GenerateLanguageMenuItems();
+
+            MiiAppletMenuItem.Command = new AsyncRelayCommand(OpenMiiApplet);
+            CloseRyujinxMenuItem.Command = new RelayCommand(CloseWindow);
+            OpenSettingsMenuItem.Command = new AsyncRelayCommand(OpenSettings);
+            PauseEmulationMenuItem.Command = new RelayCommand(() => ViewModel.AppHost?.Pause());
+            ResumeEmulationMenuItem.Command = new RelayCommand(() => ViewModel.AppHost?.Resume());
+            StopEmulationMenuItem.Command = new AsyncRelayCommand(() => ViewModel.AppHost?.ShowExitPrompt().OrCompleted());
+            CheatManagerMenuItem.Command = new AsyncRelayCommand(OpenCheatManagerForCurrentApp);
+            InstallFileTypesMenuItem.Command = new AsyncRelayCommand(InstallFileTypes);
+            UninstallFileTypesMenuItem.Command = new AsyncRelayCommand(UninstallFileTypes);
+            XciTrimmerMenuItem.Command = new AsyncRelayCommand(() => XCITrimmerWindow.Show(ViewModel));
+            AboutWindowMenuItem.Command = new AsyncRelayCommand(AboutWindow.Show);
+            CompatibilityListMenuItem.Command = new AsyncRelayCommand(CompatibilityList.Show);
+            
+            UpdateMenuItem.Command = new AsyncRelayCommand(async () =>
+            {
+                if (Updater.CanUpdate(true))
+                    await Updater.BeginUpdateAsync(true);
+            });
+
+            FaqMenuItem.Command = 
+                SetupGuideMenuItem.Command = 
+                    LdnGuideMenuItem.Command = new RelayCommand<string>(OpenHelper.OpenUrl);
+            
+            WindowSize720PMenuItem.Command = 
+                WindowSize1080PMenuItem.Command = 
+                    WindowSize1440PMenuItem.Command = 
+                        WindowSize2160PMenuItem.Command = new RelayCommand<string>(ChangeWindowSize);
         }
 
-        private CheckBox[] GenerateToggleFileTypeItems() =>
+        private IEnumerable<CheckBox> GenerateToggleFileTypeItems() =>
             Enum.GetValues<FileTypes>()
                 .Select(it => (FileName: Enum.GetName(it)!, FileType: it))
                 .Select(it =>
@@ -46,15 +76,13 @@ namespace Ryujinx.Ava.UI.Views.Main
                         IsChecked = it.FileType.GetConfigValue(ConfigurationState.Instance.UI.ShownFileTypes),
                         Command = MiniCommand.Create(() => Window.ToggleFileType(it.FileName))
                     }
-                ).ToArray();
+                );
 
-        private static MenuItem[] GenerateLanguageMenuItems()
+        private static IEnumerable<MenuItem> GenerateLanguageMenuItems()
         {
-            List<MenuItem> menuItems = new();
+            const string LocalePath = "Ryujinx/Assets/locales.json";
 
-            string localePath = "Ryujinx/Assets/locales.json";
-
-            string languageJson = EmbeddedResources.ReadAllText(localePath);
+            string languageJson = EmbeddedResources.ReadAllText(LocalePath);
 
             LocalesJson locales = JsonHelper.Deserialize(languageJson, LocalesJsonContext.Default.LocalesJson);
 
@@ -69,20 +97,23 @@ namespace Ryujinx.Ava.UI.Views.Main
                 }
                 else
                 {
-                    languageName = locales.Locales[index].Translations[language] == "" ? language : locales.Locales[index].Translations[language];
+                    string tr = locales.Locales[index].Translations[language];
+                    languageName = string.IsNullOrEmpty(tr)
+                        ? language 
+                        : tr;
                 }
 
                 MenuItem menuItem = new()
                 {
-                    Padding = new Thickness(10, 0, 0, 0),
-                    Header = " " + languageName,
+                    Padding = new Thickness(15, 0, 0, 0),
+                    Margin = new Thickness(3, 0, 3, 0),
+                    HorizontalAlignment = HorizontalAlignment.Stretch,
+                    Header = languageName,
                     Command = MiniCommand.Create(() => MainWindowViewModel.ChangeLanguage(language))
                 };
 
-                menuItems.Add(menuItem);
+                yield return menuItem;
             }
-
-            return menuItems.ToArray();
         }
 
         protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)
@@ -96,22 +127,7 @@ namespace Ryujinx.Ava.UI.Views.Main
             }
         }
 
-        private async void StopEmulation_Click(object sender, RoutedEventArgs e)
-        {
-            await ViewModel.AppHost?.ShowExitPrompt().OrCompleted()!;
-        }
-
-        private void PauseEmulation_Click(object sender, RoutedEventArgs e)
-        {
-            ViewModel.AppHost?.Pause();
-        }
-
-        private void ResumeEmulation_Click(object sender, RoutedEventArgs e)
-        {
-            ViewModel.AppHost?.Resume();
-        }
-
-        public async void OpenSettings(object sender, RoutedEventArgs e)
+        public async Task OpenSettings()
         {
             Window.SettingsWindow = new(Window.VirtualFileSystem, Window.ContentManager);
 
@@ -124,7 +140,7 @@ namespace Ryujinx.Ava.UI.Views.Main
 
         public static readonly AppletMetadata MiiApplet = new("miiEdit", 0x0100000000001009);
 
-        public async void OpenMiiApplet(object sender, RoutedEventArgs e)
+        public async Task OpenMiiApplet()
         {
             if (MiiApplet.CanStart(ViewModel.ContentManager, out var appData, out var nacpData))
             {
@@ -132,13 +148,7 @@ namespace Ryujinx.Ava.UI.Views.Main
             }
         }
 
-        public async void OpenAmiiboWindow(object sender, RoutedEventArgs e)
-            => await ViewModel.OpenAmiiboWindow();
-
-        public async void OpenBinFile(object sender, RoutedEventArgs e)
-            => await ViewModel.OpenBinFile();
-
-        public async void OpenCheatManagerForCurrentApp(object sender, RoutedEventArgs e)
+        public async Task OpenCheatManagerForCurrentApp()
         {
             if (!ViewModel.IsGameRunning)
                 return;
@@ -166,7 +176,7 @@ namespace Ryujinx.Ava.UI.Views.Main
                 ViewModel.IsAmiiboBinRequested = ViewModel.IsAmiiboRequested && AmiiboBinReader.HasAmiiboKeyFile;
         }
 
-        private async void InstallFileTypes_Click(object sender, RoutedEventArgs e)
+        private async Task InstallFileTypes()
         {
             ViewModel.AreMimeTypesRegistered = FileAssociationHelper.Install();
             if (ViewModel.AreMimeTypesRegistered)
@@ -175,7 +185,7 @@ namespace Ryujinx.Ava.UI.Views.Main
                 await ContentDialogHelper.CreateErrorDialog(LocaleManager.Instance[LocaleKeys.DialogInstallFileTypesErrorMessage]);
         }
 
-        private async void UninstallFileTypes_Click(object sender, RoutedEventArgs e)
+        private async Task UninstallFileTypes()
         {
             ViewModel.AreMimeTypesRegistered = !FileAssociationHelper.Uninstall();
             if (!ViewModel.AreMimeTypesRegistered)
@@ -184,11 +194,8 @@ namespace Ryujinx.Ava.UI.Views.Main
                 await ContentDialogHelper.CreateErrorDialog(LocaleManager.Instance[LocaleKeys.DialogUninstallFileTypesErrorMessage]);
         }
 
-        private async void ChangeWindowSize_Click(object sender, RoutedEventArgs e)
+        private void ChangeWindowSize(string resolution)
         {
-            if (sender is not MenuItem { Tag: string resolution })
-                return;
-
             (int resolutionWidth, int resolutionHeight) = resolution.Split(' ', 2)
                 .Into(parts => 
                     (int.Parse(parts[0]), int.Parse(parts[1]))
@@ -201,7 +208,7 @@ namespace Ryujinx.Ava.UI.Views.Main
             double windowWidthScaled = (resolutionWidth * Program.WindowScaleFactor);
             double windowHeightScaled = ((resolutionHeight + barsHeight) * Program.WindowScaleFactor);
 
-            await Dispatcher.UIThread.InvokeAsync(() =>
+            Dispatcher.UIThread.Post(() =>
             {
                 ViewModel.WindowState = WindowState.Normal;
 
@@ -209,24 +216,7 @@ namespace Ryujinx.Ava.UI.Views.Main
             });
         }
 
-        public async void CheckForUpdates(object sender, RoutedEventArgs e)
-        {
-            if (Updater.CanUpdate(true))
-                await Updater.BeginUpdateAsync(true);
-        }
-
-        private void MenuItem_OnClick(object sender, RoutedEventArgs e)
-        {
-            if (sender is MenuItem { Tag: string url })
-                OpenHelper.OpenUrl(url);
-        }
-
-        public async void OpenXCITrimmerWindow(object sender, RoutedEventArgs e) => await XCITrimmerWindow.Show(ViewModel);
-
-        public async void OpenAboutWindow(object sender, RoutedEventArgs e) => await AboutWindow.Show();
-
-        public void CloseWindow(object sender, RoutedEventArgs e) => Window.Close();
-
-        private async void OpenCompatibilityList(object sender, RoutedEventArgs e) => await CompatibilityList.Show();
+        public void CloseWindow() => Window.Close();
+        
     }
 }

src/Ryujinx/Utilities/Compat/CompatibilityHelper.cs

@@ -1,32 +0,0 @@
-using Gommon;
-using nietras.SeparatedValues;
-using Ryujinx.Common.Configuration;
-using System.Net.Http;
-using System.Threading.Tasks;
-
-namespace Ryujinx.Ava.Utilities.Compat
-{
-    public static class CompatibilityHelper
-    {
-        private static readonly string _downloadUrl =
-            "https://gist.githubusercontent.com/ezhevita/b41ed3bf64d0cc01269cab036e884f3d/raw/002b1a1c1a5f7a83276625e8c479c987a5f5b722/Ryujinx%2520Games%2520List%2520Compatibility.csv";
-        
-        private static readonly FilePath _compatCsvPath = new FilePath(AppDataManager.BaseDirPath) / "system" / "compatibility.csv";
-
-        public static async Task<SepReader> DownloadAsync()
-        {
-            if (_compatCsvPath.ExistsAsFile)
-                return Sep.Reader().FromFile(_compatCsvPath.Path);
-            
-            using var httpClient = new HttpClient();
-            var compatCsv = await httpClient.GetStringAsync(_downloadUrl);
-            _compatCsvPath.WriteAllText(compatCsv);
-            return Sep.Reader().FromText(compatCsv);
-        }
-
-        public static async Task InitAsync()
-        {
-            CompatibilityCsv.Shared = new CompatibilityCsv(await DownloadAsync());
-        }
-    }
-}

src/Ryujinx/Utilities/Compat/CompatibilityList.axaml

@@ -4,6 +4,7 @@
              xmlns:local="using:Ryujinx.Ava.Utilities.Compat"
              xmlns:helpers="using:Ryujinx.Ava.UI.Helpers"
              xmlns:ext="using:Ryujinx.Ava.Common.Markup"
+             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.Utilities.Compat.CompatibilityList"
@@ -11,25 +12,44 @@
     <UserControl.DataContext>
         <local:CompatibilityViewModel />
     </UserControl.DataContext>
-    <StackPanel Orientation="Vertical">
-        <StackPanel HorizontalAlignment="Right" Orientation="Horizontal">
-            <TextBox Watermark="{ext:Locale CompatibilityListSearchBoxWatermark}" TextChanged="TextBox_OnTextChanged" />
-            <CheckBox Margin="7, 0, 0, 0" IsChecked="{Binding OnlyShowOwnedGames}" />
-            <TextBlock Margin="-3, 0, 0, 0" Text="{ext:Locale CompatibilityListOnlyShowOwnedGames}" />
-        </StackPanel>
-        <ScrollViewer>
-                <ListBox Margin="5"
-                         Padding="10"
+    <Grid RowDefinitions="*,Auto,*">
+        <Grid 
+            Grid.Row="0"
+            HorizontalAlignment="Center"
+            ColumnDefinitions="Auto,*"
+            Margin="0 0 0 10">
+            <ui:FontIcon
+                Grid.Column="0"
+                Margin="0"
+                HorizontalAlignment="Stretch"
+                FontFamily="avares://FluentAvalonia/Fonts#Symbols"
+                Glyph="{helpers:GlyphValueConverter Important}" />
+            <!-- NOTE: aligning to bottom for better visual alignment with glyph -->
+            <TextBlock
+                Grid.Column="1"
+                Margin="5, 0, 0, 0"
+                FontStyle="Italic"
+                VerticalAlignment="Center"
+                TextWrapping="Wrap"
+                Text="{ext:Locale CompatibilityListWarning}" />
+        </Grid>
+        <Grid Grid.Row="1" ColumnDefinitions="*,Auto,Auto">
+            <TextBox Grid.Column="0" HorizontalAlignment="Stretch" Watermark="{ext:Locale CompatibilityListSearchBoxWatermark}" TextChanged="TextBox_OnTextChanged" />
+            <CheckBox Grid.Column="1" Margin="7, 0, 0, 0" IsChecked="{Binding OnlyShowOwnedGames}" />
+            <TextBlock Grid.Column="2" Margin="-10, 0, 0, 0" Text="{ext:Locale CompatibilityListOnlyShowOwnedGames}" />
+        </Grid>
+        <ScrollViewer Grid.Row="2">
+                <ListBox Margin="0,5, 0, 0"
                          Background="Transparent"
                          ItemsSource="{Binding CurrentEntries}">
                     <ListBox.ItemTemplate>
                         <DataTemplate DataType="{x:Type local:CompatibilityEntry}">
-                            <Grid HorizontalAlignment="Center" Width="500" ColumnDefinitions="Auto,Auto,Auto,*"
+                            <Grid Width="750" ColumnDefinitions="Auto,Auto,Auto,*"
                                   Margin="5">
                                 <TextBlock Grid.Column="0"
                                            FontFamily="{StaticResource JetBrainsMono}"
                                            Text="{Binding GameName}"
-                                           Width="140"
+                                           Width="333"
                                            TextWrapping="Wrap" />
                                 <TextBlock Grid.Column="1"
                                            Width="135"
@@ -55,5 +75,5 @@
                     </ListBox.ItemTemplate>
                 </ListBox>
         </ScrollViewer>
-    </StackPanel>
+    </Grid>
 </UserControl>

src/Ryujinx/Utilities/Compat/CompatibilityList.axaml.cs

@@ -1,11 +1,11 @@
-using Avalonia;
-using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
+using Avalonia.Controls;
 using Avalonia.Styling;
 using FluentAvalonia.UI.Controls;
+using nietras.SeparatedValues;
 using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.UI.Helpers;
-using Ryujinx.Ava.UI.Windows;
+using System.IO;
+using System.Reflection;
 using System.Threading.Tasks;
 
 namespace Ryujinx.Ava.Utilities.Compat
@@ -14,19 +14,29 @@ namespace Ryujinx.Ava.Utilities.Compat
     {
         public static async Task Show()
         {
-            await CompatibilityHelper.InitAsync();
+            if (CompatibilityCsv.Shared is null)
+            {
+                await using Stream csvStream = Assembly.GetExecutingAssembly()
+                    .GetManifestResourceStream("RyujinxGameCompatibilityList")!;
+                csvStream.Position = 0;
+
+                CompatibilityCsv.Shared = new CompatibilityCsv(Sep.Reader().From(csvStream));
+            }
             
             ContentDialog contentDialog = new()
             {
                 PrimaryButtonText = string.Empty,
                 SecondaryButtonText = string.Empty,
                 CloseButtonText = LocaleManager.Instance[LocaleKeys.SettingsButtonClose],
-                Content = new CompatibilityList { DataContext = new CompatibilityViewModel(RyujinxApp.MainWindow.ViewModel.ApplicationLibrary) }
+                Content = new CompatibilityList
+                {
+                    DataContext = new CompatibilityViewModel(RyujinxApp.MainWindow.ViewModel.ApplicationLibrary)
+                }
             };
 
             Style closeButton = new(x => x.Name("CloseButton"));
             closeButton.Setters.Add(new Setter(WidthProperty, 80d));
-
+            
             Style closeButtonParent = new(x => x.Name("CommandSpace"));
             closeButtonParent.Setters.Add(new Setter(HorizontalAlignmentProperty, Avalonia.Layout.HorizontalAlignment.Right));
 
@@ -53,4 +63,3 @@ namespace Ryujinx.Ava.Utilities.Compat
         }
     }
 }
-