misc: chore: very small cleanup in AvaHostUIHandler

Added more games to the RPC list. Now alphabetical.

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -22,7 +22,7 @@ body:
     id: log
     attributes:
       label: Log file
-      description: A log file will help our developers to better diagnose and fix the issue.
+      description: "A log file will help our developers to better diagnose and fix the issue. UPLOAD THE FILE. DO NOT COPY AND PASTE THE FILE'S CONTENT."
       placeholder: Logs files can be found under "Logs" folder in Ryujinx program folder. They can also be accessed by opening Ryujinx, then going to File > Open Logs Folder. You can drag and drop the log on to the text area (do not copy paste).
     validations:
       required: true

src/Ryujinx.Common/TitleIDs.cs

@@ -1,4 +1,4 @@
-using Gommon;
+using Gommon;
 using Ryujinx.Common.Configuration;
 using System;
 using System.Linq;
@@ -47,6 +47,9 @@ namespace Ryujinx.Common
 
         public static readonly string[] DiscordGameAssetKeys =
         [
+            "010008900705c000", // Dragon Quest Builders
+            "010042000a986000", // Dragon Quest Builders 2
+            
             "010055d009f78000", // Fire Emblem: Three Houses
             "0100a12011cc8000", // Fire Emblem: Shadow Dragon
             "0100a6301214e000", // Fire Emblem Engage
@@ -105,17 +108,18 @@ namespace Ryujinx.Common
             "0100f4c009322000", // Pikmin 3 Deluxe
             "0100b7c00933a000", // Pikmin 4
 
+            "0100f4300bf2c000", // New Pokémon Snap
+            "0100000011d90000", // Pokémon Brilliant Diamond
+            "01001f5010dfa000", // Pokémon Legends: Arceus
             "010003f003a34000", // Pokémon: Let's Go Pikachu!
             "0100187003a36000", // Pokémon: Let's Go Eevee!
-            "0100abf008968000", // Pokémon Sword
+            "01003d200baa2000", // Pokémon Mystery Dungeon - Rescue Team DX
-            "01008db008c2c000", // Pokémon Shield
-            "0100000011d90000", // Pokémon Brilliant Diamond
-            "010018e011d92000", // Pokémon Shining Pearl
-            "01001f5010dfa000", // Pokémon Legends: Arceus
             "0100a3d008c5c000", // Pokémon Scarlet
+            "01008db008c2c000", // Pokémon Shield
+            "010018e011d92000", // Pokémon Shining Pearl
+            "0100abf008968000", // Pokémon Sword
             "01008f6008c5e000", // Pokémon Violet
             "0100b3f000be2000", // Pokkén Tournament DX
-            "0100f4300bf2c000", // New Pokémon Snap
 
             "01003bc0000a0000", // Splatoon 2 (US)
             "0100f8f0000a2000", // Splatoon 2 (EU)
@@ -165,13 +169,21 @@ namespace Ryujinx.Common
             "01005ea01c0fc000", // SONIC X SHADOW GENERATIONS
             "01005ea01c0fc001", // ^
 
+            "0100ff500e34a000", // Xenoblade Chronicles - Definitive Edition
+            "0100e95004038000", // Xenoblade Chronicles 2
+            "010074f013262000", // Xenoblade Chronicles 3
+
             "010056e00853a000", // A Hat in Time
+            "0100fd1014726000", // Baldurs Gate: Dark Alliance
             "0100dbf01000a000", // Burnout Paradise Remastered
             "0100744001588000", // Cars 3: Driven to Win
             "0100b41013c82000", // Cruis'n Blast
+            "010085900337e000", // Death Squared
             "01001b300b9be000", // Diablo III: Eternal Collection
             "01008c8012920000", // Dying Light Platinum Edition
             "01001cc01b2d4000", // Goat Simulator 3
+            "01003620068ea000", // Hand of Fate 2
+            "010085500130a000", // Lego City: Undercover
             "010073c01af34000", // LEGO Horizon Adventures
             "0100770008dd8000", // Monster Hunter Generations Ultimate
             "0100b04011742000", // Monster Hunter Rise
@@ -190,6 +202,8 @@ namespace Ryujinx.Common
             "01000a10041ea000", // The Elder Scrolls V: Skyrim
             "010057a01e4d4000", // TSUKIHIME -A piece of blue glass moon-
             "010080b00ad66000", // Undertale
+            "010069401adb8000", // Unicorn Overlord
+            "0100534009ff2000", // Yonder - The cloud catcher chronicles
         ];
     }
 }

src/Ryujinx/AppHost.cs

@@ -489,7 +489,7 @@ namespace Ryujinx.Ava
 
             Dispatcher.UIThread.InvokeAsync(() =>
             {
-                _viewModel.Title = TitleHelper.ActiveApplicationTitle(Device.Processes.ActiveApplication, Program.Version);
+                _viewModel.Title = TitleHelper.ActiveApplicationTitle(Device.Processes.ActiveApplication, Program.Version, !ConfigurationState.Instance.ShowTitleBar);
             });
 
             _viewModel.SetUiProgressHandlers(Device);
@@ -872,7 +872,7 @@ namespace Ryujinx.Ava
             Device?.System.TogglePauseEmulation(false);
 
             _viewModel.IsPaused = false;
-            _viewModel.Title = TitleHelper.ActiveApplicationTitle(Device?.Processes.ActiveApplication, Program.Version);
+            _viewModel.Title = TitleHelper.ActiveApplicationTitle(Device?.Processes.ActiveApplication, Program.Version, !ConfigurationState.Instance.ShowTitleBar);
             Logger.Info?.Print(LogClass.Emulation, "Emulation was resumed");
         }
 
@@ -881,7 +881,7 @@ namespace Ryujinx.Ava
             Device?.System.TogglePauseEmulation(true);
 
             _viewModel.IsPaused = true;
-            _viewModel.Title = TitleHelper.ActiveApplicationTitle(Device?.Processes.ActiveApplication, Program.Version, LocaleManager.Instance[LocaleKeys.Paused]);
+            _viewModel.Title = TitleHelper.ActiveApplicationTitle(Device?.Processes.ActiveApplication, Program.Version, !ConfigurationState.Instance.ShowTitleBar, LocaleManager.Instance[LocaleKeys.Paused]);
             Logger.Info?.Print(LogClass.Emulation, "Emulation was paused");
         }
 

src/Ryujinx/Assets/locales.json

@@ -22898,4 +22898,4 @@
       }
     }
   ]
-}
+}

src/Ryujinx/Common/ThemeManager.cs

@@ -4,11 +4,11 @@ namespace Ryujinx.Ava.Common
 {
     public static class ThemeManager
     {
-        public static event EventHandler ThemeChanged;
+        public static event Action ThemeChanged;
 
         public static void OnThemeChanged()
         {
-            ThemeChanged?.Invoke(null, EventArgs.Empty);
+            ThemeChanged?.Invoke();
         }
     }
 }

src/Ryujinx/DiscordIntegrationModule.cs

@@ -2,6 +2,7 @@ using DiscordRPC;
 using Gommon;
 using Humanizer;
 using Humanizer.Localisation;
+using Ryujinx.Ava.Utilities;
 using Ryujinx.Ava.Utilities.AppLibrary;
 using Ryujinx.Ava.Utilities.Configuration;
 using Ryujinx.Common;
@@ -97,7 +98,7 @@ namespace Ryujinx.Ava
                 },
                 Details = TruncateToByteLength($"Playing {appMeta.Title}"),
                 State = appMeta.LastPlayed.HasValue && appMeta.TimePlayed.TotalSeconds > 5
-                    ? $"Total play time: {appMeta.TimePlayed.Humanize(2, false, maxUnit: TimeUnit.Hour)}"
+                    ? $"Total play time: {ValueFormatUtils.FormatTimeSpan(appMeta.TimePlayed)}"
                     : "Never played",
                 Timestamps = Timestamps.Now
             });

src/Ryujinx/UI/Applet/AvaHostUIHandler.cs

@@ -279,13 +279,13 @@ namespace Ryujinx.Ava.UI.Applet
                     .ForEach(profile => profiles.Add(new Models.UserProfile(profile, nav)));
                 
                 profiles.Add(new Models.UserProfile(guest, nav));
-                UserSelectorDialogViewModel viewModel = new();
+                UserSelectorDialogViewModel viewModel = new()
-                viewModel.Profiles = profiles;
+                {
-                viewModel.SelectedUserId = _parent.AccountManager.LastOpenedUser.UserId;
+                    Profiles = profiles, 
+                    SelectedUserId = _parent.AccountManager.LastOpenedUser.UserId
+                };
                 UserSelectorDialog content = new(viewModel);
-                (UserId id, _) = await UserSelectorDialog.ShowInputDialog(content);
+                (selected, _) = await UserSelectorDialog.ShowInputDialog(content);
-                
-                selected = id;
         
                 dialogCloseEvent.Set();
             });

src/Ryujinx/UI/Helpers/Commands.cs

@@ -0,0 +1,48 @@
+using CommunityToolkit.Mvvm.Input;
+using System;
+using System.Threading.Tasks;
+
+namespace Ryujinx.Ava.UI.Helpers
+{
+#nullable enable
+    public static class Commands
+    {
+        public static RelayCommand Create(Action action)
+            => new(action);
+        public static RelayCommand CreateConditional(Action action, Func<bool> canExecute)
+            => new(action, canExecute);
+        
+        public static RelayCommand<T> CreateWithArg<T>(Action<T?> action)
+            => new(action);
+        public static RelayCommand<T> CreateConditionalWithArg<T>(Action<T?> action, Predicate<T?> canExecute)
+            => new(action, canExecute);
+
+        public static AsyncRelayCommand Create(Func<Task> action)
+            => new(action, AsyncRelayCommandOptions.None);
+        public static AsyncRelayCommand CreateConcurrent(Func<Task> action)
+            => new(action, AsyncRelayCommandOptions.AllowConcurrentExecutions);
+        public static AsyncRelayCommand CreateSilentFail(Func<Task> action)
+            => new(action, AsyncRelayCommandOptions.FlowExceptionsToTaskScheduler);
+        
+        public static AsyncRelayCommand<T> CreateWithArg<T>(Func<T?, Task> action)
+            => new(action, AsyncRelayCommandOptions.None);
+        public static AsyncRelayCommand<T> CreateConcurrentWithArg<T>(Func<T?, Task> action)
+            => new(action, AsyncRelayCommandOptions.AllowConcurrentExecutions);
+        public static AsyncRelayCommand<T> CreateSilentFailWithArg<T>(Func<T?, Task> action)
+            => new(action, AsyncRelayCommandOptions.FlowExceptionsToTaskScheduler);
+
+        public static AsyncRelayCommand CreateConditional(Func<Task> action, Func<bool> canExecute)
+            => new(action, canExecute, AsyncRelayCommandOptions.None);
+        public static AsyncRelayCommand CreateConcurrentConditional(Func<Task> action, Func<bool> canExecute)
+            => new(action, canExecute, AsyncRelayCommandOptions.AllowConcurrentExecutions);
+        public static AsyncRelayCommand CreateSilentFailConditional(Func<Task> action, Func<bool> canExecute)
+            => new(action, canExecute, AsyncRelayCommandOptions.FlowExceptionsToTaskScheduler);
+        
+        public static AsyncRelayCommand<T> CreateConditionalWithArg<T>(Func<T?, Task> action, Predicate<T?> canExecute)
+            => new(action, canExecute, AsyncRelayCommandOptions.None);
+        public static AsyncRelayCommand<T> CreateConcurrentConditionalWithArg<T>(Func<T?, Task> action, Predicate<T?> canExecute)
+            => new(action, canExecute, AsyncRelayCommandOptions.AllowConcurrentExecutions);
+        public static AsyncRelayCommand<T> CreateSilentFailConditionalWithArg<T>(Func<T?, Task> action, Predicate<T?> canExecute)
+            => new(action, canExecute, AsyncRelayCommandOptions.FlowExceptionsToTaskScheduler);
+    }
+}

src/Ryujinx/UI/ViewModels/AboutWindowViewModel.cs

@@ -27,7 +27,7 @@ namespace Ryujinx.Ava.UI.ViewModels
             ThemeManager.ThemeChanged += ThemeManager_ThemeChanged;
         }
 
-        private void ThemeManager_ThemeChanged(object sender, EventArgs e)
+        private void ThemeManager_ThemeChanged()
         {
             Dispatcher.UIThread.Post(() => UpdateLogoTheme(ConfigurationState.Instance.UI.BaseStyle.Value));
         }

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

@@ -43,7 +43,13 @@ namespace Ryujinx.Ava.UI.Views.Main
             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);
+            CheatManagerMenuItem.Command = new AsyncRelayCommand(async () =>
+            {
+                try
+                {
+                    await OpenCheatManagerForCurrentApp();
+                } catch {}
+            });
             InstallFileTypesMenuItem.Command = new AsyncRelayCommand(InstallFileTypes);
             UninstallFileTypesMenuItem.Command = new AsyncRelayCommand(UninstallFileTypes);
             XciTrimmerMenuItem.Command = new AsyncRelayCommand(() => XCITrimmerWindow.Show(ViewModel));

src/Ryujinx/Utilities/TitleHelper.cs

@@ -4,7 +4,7 @@ namespace Ryujinx.Ava.Utilities
 {
     public static class TitleHelper
     {
-        public static string ActiveApplicationTitle(ProcessResult activeProcess, string applicationVersion, string pauseString = "")
+        public static string ActiveApplicationTitle(ProcessResult activeProcess, string applicationVersion, bool customTitlebar, string pauseString = "")
         {
             if (activeProcess == null)
                 return string.Empty;
@@ -14,7 +14,9 @@ namespace Ryujinx.Ava.Utilities
             string titleIdSection = $" ({activeProcess.ProgramIdText.ToUpper()})";
             string titleArchSection = activeProcess.Is64Bit ? " (64-bit)" : " (32-bit)";
 
-            string appTitle = $"Ryujinx {applicationVersion} -{titleNameSection}{titleVersionSection}{titleIdSection}{titleArchSection}";
+            string appTitle = customTitlebar 
+                ? $"Ryujinx {applicationVersion}\n{titleNameSection.Trim()}\n{titleVersionSection.Trim()}\n{titleIdSection.Trim()}{titleArchSection}"
+                : $"Ryujinx {applicationVersion} -{titleNameSection}{titleVersionSection}{titleIdSection}{titleArchSection}";
 
             return !string.IsNullOrEmpty(pauseString)
                 ? appTitle + $" ({pauseString})"