UI: Pretty Atmosphère mod names (#601)

Changes the mods from the Atmosphère folder to show a pretty name
instead of just the name of the folder they're in, because those names
are always just a title ID.

NOTE: The DLC names are from the file names, not retrieved from the
content file itself like the main applications.

src/Ryujinx.Common/Configuration/VSyncMode.cs

@@ -6,4 +6,16 @@ namespace Ryujinx.Common.Configuration
         Unbounded,
         Custom
     }
+    
+    public static class VSyncModeExtensions
+    {
+        public static VSyncMode Next(this VSyncMode vsync, bool customEnabled = false) =>
+            vsync switch
+            {
+                VSyncMode.Switch => customEnabled ? VSyncMode.Custom : VSyncMode.Unbounded,
+                VSyncMode.Unbounded => VSyncMode.Switch,
+                VSyncMode.Custom => VSyncMode.Unbounded,
+                _ => VSyncMode.Switch
+            };
+    }
 }

src/Ryujinx.Common/TitleIDs.cs

@@ -30,10 +30,11 @@ namespace Ryujinx.Common
         
         public static readonly string[] GreatMetalTitles =
         [
-            "010076f0049a2000", // Bayonetta
+            "01009b500007c000", // ARMS
             "0100a5c00d162000", // Cuphead
             "010023800d64a000", // Deltarune
             "01003a30012c0000", // LEGO City Undercover
+            "010048701995e000", // Luigi's Manion 2 HD
             "010028600EBDA000", // Mario 3D World
             "0100152000022000", // Mario Kart 8 Deluxe
             "010075a016a3a000", // Persona 4 Arena Ultimax
@@ -48,10 +49,14 @@ namespace Ryujinx.Common
             "01009bf0072d4000", // Captain Toad: Treasure Tracker
             "01009510001ca000", // Fast RMX
             "01005CA01580E000", // Persona 5 Royale
+            "010015100b514000", // Super Mario Bros. Wonder
             "0100000000010000", // Super Mario Odyssey
 
-            //Isaac claims it has a issue in level 2, but I am not able to replicate it on my M3. More testing would be appreciated:
+            // Further testing is appreciated, I did not test the entire game:
-            "010015100b514000", // Super Mario Bros. Wonder
+            "01007300020fa000", // Astral Chain
+            "010076f0049a2000", // Bayonetta
+            "0100cf5010fec000", // Bayonetta Origins: Cereza and the Lost Demon
+            "0100f4300bf2c000", // New Pokemon Snap
         ];
         
         public static string GetDiscordGameAsset(string titleId) 

src/Ryujinx/AppHost.cs

@@ -319,31 +319,12 @@ namespace Ryujinx.Ava
         public void VSyncModeToggle()
         {
             VSyncMode oldVSyncMode = Device.VSyncMode;
-            VSyncMode newVSyncMode = VSyncMode.Switch;
             bool customVSyncIntervalEnabled = ConfigurationState.Instance.Graphics.EnableCustomVSyncInterval.Value;
 
-            switch (oldVSyncMode)
+            UpdateVSyncMode(this, new ReactiveEventArgs<VSyncMode>(
-            {
+                oldVSyncMode, 
-                case VSyncMode.Switch:
+                oldVSyncMode.Next(customVSyncIntervalEnabled))
-                    newVSyncMode = VSyncMode.Unbounded;
+            );
-                    break;
-                case VSyncMode.Unbounded:
-                    if (customVSyncIntervalEnabled)
-                    {
-                        newVSyncMode = VSyncMode.Custom;
-                    }
-                    else
-                    {
-                        newVSyncMode = VSyncMode.Switch;
-                    }
-
-                    break;
-                case VSyncMode.Custom:
-                    newVSyncMode = VSyncMode.Switch;
-                    break;
-            }
-
-            UpdateVSyncMode(this, new ReactiveEventArgs<VSyncMode>(oldVSyncMode, newVSyncMode));
         }
 
         private void UpdateCustomVSyncIntervalValue(object sender, ReactiveEventArgs<int> e)

src/Ryujinx/Assets/locales.json

@@ -7747,6 +7747,31 @@
         "zh_TW": ""
       }
     },
+    {
+      "ID": "ControllerSettingsLedColorRainbowSpeed",
+      "Translations": {
+        "ar_SA": "",
+        "de_DE": "",
+        "el_GR": "",
+        "en_US": "Rainbow Speed",
+        "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": "ControllerSettingsLedColor",
       "Translations": {

src/Ryujinx/UI/Models/ModModel.cs

@@ -1,5 +1,5 @@
 using Ryujinx.Ava.UI.ViewModels;
-using System.IO;
+using System.Globalization;
 
 namespace Ryujinx.Ava.UI.Models
 {
@@ -21,6 +21,11 @@ namespace Ryujinx.Ava.UI.Models
         public string Path { get; }
         public string Name { get; }
 
+        public string FormattedName => 
+            InSd && ulong.TryParse(Name, NumberStyles.HexNumber, null, out ulong applicationId)
+                ? $"Atmosphère: {System.IO.Path.GetFileNameWithoutExtension(RyujinxApp.MainWindow.ApplicationLibrary.GetNameForApplicationId(applicationId))}"
+                : Name;
+
         public ModModel(string path, string name, bool enabled, bool inSd)
         {
             Path = path;

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

@@ -28,7 +28,7 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
         [ObservableProperty] private bool _enableLedChanging;
         [ObservableProperty] private Color _ledColor;
 
-        public string RainbowSpeedText => RainbowSpeed.ToString(CultureInfo.CurrentCulture);
+        public string RainbowSpeedText => RainbowSpeed.ToString(CultureInfo.CurrentCulture).Truncate(4, string.Empty);
         
         public float RainbowSpeed
         {

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

@@ -28,7 +28,7 @@
             </CheckBox>
         </StackPanel>
         <StackPanel Orientation="Horizontal" IsEnabled="{Binding !TurnOffLed}">
-            <TextBlock MinWidth="75" MaxWidth="200" Text="Rainbow Speed" />
+            <TextBlock MinWidth="75" MaxWidth="200" Text="{ext:Locale ControllerSettingsLedColorRainbowSpeed}" />
             <Slider HorizontalAlignment="Center" 
                     Value="{Binding RainbowSpeed}"
                     Width="175"
@@ -36,13 +36,14 @@
                     Height="32"
                     Padding="0,-5"
                     TickFrequency="0.25"
-                    IsSnapToTickEnabled="True"
+                    LargeChange="1"
+                    SmallChange="0.25"
                     VerticalAlignment="Center"
                     Minimum="1"
                     Maximum="10" />
             <TextBlock Margin="5,0"
                        MinWidth="75"
-                       Text="{Binding RainbowSpeed}"/>
+                       Text="{Binding RainbowSpeedText}" />
         </StackPanel>
         <StackPanel Orientation="Horizontal" IsEnabled="{Binding ShowLedColorPicker}">
             <TextBlock MinWidth="75" MaxWidth="200" Text="{ext:Locale ControllerSettingsLedColor}" />

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

@@ -1,11 +1,9 @@
 using Avalonia;
 using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
 using FluentAvalonia.UI.Controls;
 using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.UI.Models.Input;
 using Ryujinx.Ava.UI.ViewModels.Input;
-using Ryujinx.Ava.UI.Views.Input;
 using System.Threading.Tasks;
 
 namespace Ryujinx.UI.Views.Input

src/Ryujinx/UI/Windows/ModManagerWindow.axaml

@@ -81,7 +81,7 @@
                                     MaxLines="2"
                                     TextWrapping="Wrap"
                                     TextTrimming="CharacterEllipsis"
-                                    Text="{Binding Name}" />
+                                    Text="{Binding FormattedName}" />
                                 <StackPanel
                                     Grid.Column="1"
                                     Spacing="10"

src/Ryujinx/Utilities/AppLibrary/ApplicationLibrary.cs

@@ -111,6 +111,30 @@ namespace Ryujinx.Ava.Utilities.AppLibrary
             return data;
         }
 
+        /// <summary>
+        ///     Gets a name for an available content file based on the Application ID '<paramref name="id"/>'.
+        ///     <br/><br/>
+        ///     For Applications, this returns the localized name of the app found in the file.
+        ///     For DLCs, this returns the name of the file that contains the DLC, minus the file extension.
+        /// </summary>
+        /// <param name="id">The Application ID to search for.</param>
+        /// <remarks>
+        /// If the provided Application ID does not have a corresponding Application OR DLC file,
+        /// <paramref name="id"/> formatted as hexadecimal is returned.
+        /// </remarks>
+        /// <returns>A formatted Application name, or <paramref name="id"/> as hexadecimal if none is found.</returns>
+        public string GetNameForApplicationId(ulong id)
+        {
+            DynamicData.Kernel.Optional<ApplicationData> appData = Applications.Lookup(id);
+            if (appData.HasValue)
+                return appData.Value.Name;
+            
+            if (DownloadableContents.Keys.FindFirst(x => x.TitleId == id).TryGet(out DownloadableContentModel dlcData))
+                return dlcData.FileName;
+
+            return id.ToString("X16");
+        }
+
         /// <exception cref="LibHac.Common.Keys.MissingKeyException">The configured key set is missing a key.</exception>
         /// <exception cref="InvalidDataException">The NCA header could not be decrypted.</exception>
         /// <exception cref="NotSupportedException">The NCA version is not supported.</exception>