Merge branch 'master' into master

.github/workflows/release.yml

@@ -3,6 +3,16 @@ name: Release job
 on:
   workflow_dispatch:
     inputs: {}
+  push:
+    branches: [ release ]
+    paths-ignore:
+      - '.github/**'
+      - 'docs/**'
+      - 'assets/**'
+      - '*.yml'
+      - '*.json'
+      - '*.config'
+      - '*.md'
 
 concurrency: release
 

Directory.Packages.props

@@ -42,7 +42,7 @@
     <PackageVersion Include="Ryujinx.Graphics.Nvdec.Dependencies" Version="5.0.3-build14" />
     <PackageVersion Include="Ryujinx.Graphics.Vulkan.Dependencies.MoltenVK" Version="1.2.0" />
     <PackageVersion Include="Ryujinx.SDL2-CS" Version="2.30.0-build32" />
-    <PackageVersion Include="Gommon" Version="2.7.0.2" />
+    <PackageVersion Include="Gommon" Version="2.7.0.1" />
     <PackageVersion Include="securifybv.ShellLink" Version="0.1.0" />
     <PackageVersion Include="Sep" Version="0.6.0" />
     <PackageVersion Include="shaderc.net" Version="0.1.0" />

src/Ryujinx.HLE/HOS/Horizon.cs

@@ -284,7 +284,7 @@ namespace Ryujinx.HLE.HOS
                 ProcessCreationInfo creationInfo = new("Service", 1, 0, 0x8000000, 1, Flags, 0, 0);
 
                 uint[] defaultCapabilities = {
-                    (((uint)KScheduler.CpuCoresCount - 1) << 24) + (((uint)KScheduler.CpuCoresCount - 1) << 16) + 0x63F7u,
+                    0x030363F7,
                     0x1FFFFFCF,
                     0x207FFFEF,
                     0x47E0060F,

src/Ryujinx.HLE/HOS/Kernel/KernelContext.cs

@@ -63,7 +63,6 @@ namespace Ryujinx.HLE.HOS.Kernel
             TickSource = tickSource;
             Device = device;
             Memory = memory;
-            KScheduler.CpuCoresCount = device.CpuCoresCount;
 
             Running = true;
 

src/Ryujinx.HLE/HOS/Kernel/KernelStatic.cs

@@ -37,7 +37,7 @@ namespace Ryujinx.HLE.HOS.Kernel
                 return result;
             }
 
-            process.DefaultCpuCore = KScheduler.CpuCoresCount - 1;
+            process.DefaultCpuCore = 3;
 
             context.Processes.TryAdd(process.Pid, process);
 

src/Ryujinx.HLE/HOS/Kernel/Process/KProcess.cs

@@ -277,7 +277,7 @@ namespace Ryujinx.HLE.HOS.Kernel.Process
                 return result;
             }
 
-            result = Capabilities.InitializeForUser(capabilities, MemoryManager, IsApplication);
+            result = Capabilities.InitializeForUser(capabilities, MemoryManager);
 
             if (result != Result.Success)
             {

src/Ryujinx.HLE/HOS/Kernel/Process/KProcessCapabilities.cs

@@ -35,15 +35,15 @@ namespace Ryujinx.HLE.HOS.Kernel.Process
             DebuggingFlags &= ~3u;
             KernelReleaseVersion = KProcess.KernelVersionPacked;
 
-            return Parse(capabilities, memoryManager, false);
+            return Parse(capabilities, memoryManager);
         }
 
-        public Result InitializeForUser(ReadOnlySpan<uint> capabilities, KPageTableBase memoryManager, bool isApplication)
+        public Result InitializeForUser(ReadOnlySpan<uint> capabilities, KPageTableBase memoryManager)
         {
-            return Parse(capabilities, memoryManager, isApplication);
+            return Parse(capabilities, memoryManager);
         }
 
-        private Result Parse(ReadOnlySpan<uint> capabilities, KPageTableBase memoryManager, bool isApplication)
+        private Result Parse(ReadOnlySpan<uint> capabilities, KPageTableBase memoryManager)
         {
             int mask0 = 0;
             int mask1 = 0;
@@ -54,7 +54,7 @@ namespace Ryujinx.HLE.HOS.Kernel.Process
 
                 if (cap.GetCapabilityType() != CapabilityType.MapRange)
                 {
-                    Result result = ParseCapability(cap, ref mask0, ref mask1, memoryManager, isApplication);
+                    Result result = ParseCapability(cap, ref mask0, ref mask1, memoryManager);
 
                     if (result != Result.Success)
                     {
@@ -120,7 +120,7 @@ namespace Ryujinx.HLE.HOS.Kernel.Process
             return Result.Success;
         }
 
-        private Result ParseCapability(uint cap, ref int mask0, ref int mask1, KPageTableBase memoryManager, bool isApplication)
+        private Result ParseCapability(uint cap, ref int mask0, ref int mask1, KPageTableBase memoryManager)
         {
             CapabilityType code = cap.GetCapabilityType();
 
@@ -176,11 +176,6 @@ namespace Ryujinx.HLE.HOS.Kernel.Process
                         AllowedCpuCoresMask = GetMaskFromMinMax(lowestCpuCore, highestCpuCore);
                         AllowedThreadPriosMask = GetMaskFromMinMax(lowestThreadPrio, highestThreadPrio);
 
-                        if (isApplication && lowestCpuCore == 0 && highestCpuCore != 2)
-                            Ryujinx.Common.Logging.Logger.Error?.Print(Ryujinx.Common.Logging.LogClass.Application, $"Application requested cores with index range {lowestCpuCore} to {highestCpuCore}! Report this to @LotP on the Ryujinx/Ryubing discord server (discord.gg/ryujinx)!");
-                        else if (isApplication)
-                            Ryujinx.Common.Logging.Logger.Info?.Print(Ryujinx.Common.Logging.LogClass.Application, $"Application requested cores with index range {lowestCpuCore} to {highestCpuCore}");
-
                         break;
                     }
 

src/Ryujinx.HLE/HOS/Kernel/SupervisorCall/Syscall.cs

@@ -2683,7 +2683,7 @@ namespace Ryujinx.HLE.HOS.Kernel.SupervisorCall
                     return KernelResult.InvalidCombination;
                 }
 
-                if ((uint)preferredCore > KScheduler.CpuCoresCount - 1)
+                if ((uint)preferredCore > 3)
                 {
                     if ((preferredCore | 2) != -1)
                     {

src/Ryujinx.HLE/HOS/Kernel/Threading/KScheduler.cs

@@ -9,11 +9,13 @@ namespace Ryujinx.HLE.HOS.Kernel.Threading
     partial class KScheduler : IDisposable
     {
         public const int PrioritiesCount = 64;
-        public static int CpuCoresCount;
+        public const int CpuCoresCount = 4;
 
         private const int RoundRobinTimeQuantumMs = 10;
 
-        private static int[] _srcCoresHighestPrioThreads;
+        private static readonly int[] _preemptionPriorities = { 59, 59, 59, 63 };
+
+        private static readonly int[] _srcCoresHighestPrioThreads = new int[CpuCoresCount];
 
         private readonly KernelContext _context;
         private readonly int _coreId;
@@ -45,16 +47,6 @@ namespace Ryujinx.HLE.HOS.Kernel.Threading
             _coreId = coreId;
 
             _currentThread = null;
-
-            if (_srcCoresHighestPrioThreads == null)
-            {
-                _srcCoresHighestPrioThreads = new int[CpuCoresCount];
-            }
-        }
-
-        private static int PreemptionPriorities(int index)
-        {
-            return index == CpuCoresCount - 1 ? 63 : 59;
         }
 
         public static ulong SelectThreads(KernelContext context)
@@ -445,7 +437,7 @@ namespace Ryujinx.HLE.HOS.Kernel.Threading
 
                 for (int core = 0; core < CpuCoresCount; core++)
                 {
-                    RotateScheduledQueue(context, core, PreemptionPriorities(core));
+                    RotateScheduledQueue(context, core, _preemptionPriorities[core]);
                 }
 
                 context.CriticalSection.Leave();

src/Ryujinx.HLE/HOS/Services/ServerBase.cs

@@ -24,14 +24,14 @@ namespace Ryujinx.HLE.HOS.Services
         // not large enough.
         private const int PointerBufferSize = 0x8000;
 
-        private static uint[] _defaultCapabilities => [
+        private readonly static uint[] _defaultCapabilities = {
-            (((uint)KScheduler.CpuCoresCount - 1) << 24) + (((uint)KScheduler.CpuCoresCount - 1) << 16) + 0x63F7u,
+            0x030363F7,
             0x1FFFFFCF,
             0x207FFFEF,
             0x47E0060F,
             0x0048BFFF,
             0x01007FFF,
-        ];
+        };
 
         // The amount of time Dispose() will wait to Join() the thread executing the ServerLoop()
         private static readonly TimeSpan _threadJoinTimeout = TimeSpan.FromSeconds(3);

src/Ryujinx.HLE/Switch.cs

@@ -32,8 +32,6 @@ namespace Ryujinx.HLE
         public TamperMachine TamperMachine { get; }
         public IHostUIHandler UIHandler { get; }
 
-        public int CpuCoresCount = 4; //Switch 1 has 4 cores
-
         public VSyncMode VSyncMode { get; set; } = VSyncMode.Switch;
         public bool CustomVSyncIntervalEnabled { get; set; } = false;
         public int CustomVSyncInterval { get; set; }

src/Ryujinx/Assets/locales.json

@@ -1243,7 +1243,7 @@
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "",
-        "zh_CN": "问答与指南",
+        "zh_CN": "",
         "zh_TW": ""
       }
     },
@@ -4018,7 +4018,7 @@
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "",
-        "zh_CN": "与 PC 日期和时间重新同步",
+        "zh_CN": "",
         "zh_TW": ""
       }
     },
@@ -10435,7 +10435,7 @@
         "it_IT": "Finestra di input",
         "ja_JP": "入力ダイアログ",
         "ko_KR": "대화 상자 입력",
-        "no_NO": "",
+        "no_NO": "Dialogboksen Inndata",
         "pl_PL": "Okno Dialogowe Wprowadzania",
         "pt_BR": "Diálogo de texto",
         "ru_RU": "Диалоговое окно ввода",
@@ -14193,7 +14193,7 @@
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "Ryujinx — це емулятор для Nintendo Switch™.\nОтримуйте всі останні новини в нашому Discord.\nРозробники, які хочуть зробити внесок, можуть дізнатися більше на нашому GitHub або в Discord.",
-        "zh_CN": "Ryujinx 是一个 Nintendo Switch™ 模拟器。\n有兴趣做出贡献的开发者可以在我们的 GitHub 或 Discord 上了解更多信息。\n",
+        "zh_CN": "",
         "zh_TW": ""
       }
     },
@@ -17818,7 +17818,7 @@
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "",
-        "zh_CN": "档案对话框",
+        "zh_CN": "",
         "zh_TW": ""
       }
     },
@@ -19543,7 +19543,7 @@
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "Необрізаних {0} тайтл(ів)...",
-        "zh_CN": "正在精简 {0} 个游戏",
+        "zh_CN": "",
         "zh_TW": ""
       }
     },
@@ -19718,7 +19718,7 @@
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "Заголовок",
-        "zh_CN": "标题",
+        "zh_CN": "",
         "zh_TW": ""
       }
     },
@@ -19743,7 +19743,7 @@
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "Економія місця",
-        "zh_CN": "节省空间",
+        "zh_CN": "",
         "zh_TW": ""
       }
     },
@@ -19793,7 +19793,7 @@
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "Зшивання",
-        "zh_CN": "取消精简",
+        "zh_CN": "",
         "zh_TW": ""
       }
     },
@@ -22597,31 +22597,6 @@
         "zh_TW": ""
       }
     },
-    {
-      "ID": "CompatibilityListLastUpdated",
-      "Translations": {
-        "ar_SA": "",
-        "de_DE": "",
-        "el_GR": "",
-        "en_US": "Last updated: {0}",
-        "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": "最后更新于: {0}",
-        "zh_TW": ""
-      }
-    },
     {
       "ID": "CompatibilityListWarning",
       "Translations": {
@@ -22635,7 +22610,7 @@
         "it_IT": "",
         "ja_JP": "",
         "ko_KR": "",
-        "no_NO": "",
+        "no_NO": "Denne kompatibilitetslisten kan inneholde oppføringer som er tomme for data.\nVær ikke imot å teste spill i statusen «Ingame».",
         "pl_PL": "",
         "pt_BR": "",
         "ru_RU": "",
@@ -22643,7 +22618,7 @@
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "",
-        "zh_CN": "此兼容性列表可能包含过时的条目。\n不要只测试 \"进入游戏\" 状态的游戏。",
+        "zh_CN": "",
         "zh_TW": ""
       }
     },
@@ -22660,7 +22635,7 @@
         "it_IT": "",
         "ja_JP": "",
         "ko_KR": "",
-        "no_NO": "",
+        "no_NO": "Søk i kompatibilitetsoppføringer...",
         "pl_PL": "",
         "pt_BR": "",
         "ru_RU": "",
@@ -22668,7 +22643,7 @@
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "",
-        "zh_CN": "正在搜索兼容性条目...",
+        "zh_CN": "",
         "zh_TW": ""
       }
     },
@@ -22685,7 +22660,7 @@
         "it_IT": "",
         "ja_JP": "",
         "ko_KR": "",
-        "no_NO": "",
+        "no_NO": "Åpne kompatibilitetslisten",
         "pl_PL": "",
         "pt_BR": "",
         "ru_RU": "",
@@ -22693,7 +22668,7 @@
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "",
-        "zh_CN": "打开兼容性列表",
+        "zh_CN": "",
         "zh_TW": ""
       }
     },
@@ -22710,7 +22685,7 @@
         "it_IT": "",
         "ja_JP": "",
         "ko_KR": "",
-        "no_NO": "",
+        "no_NO": "Vis bare eide spill",
         "pl_PL": "",
         "pt_BR": "",
         "ru_RU": "",
@@ -22718,7 +22693,7 @@
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "",
-        "zh_CN": "仅显示拥有的游戏",
+        "zh_CN": "",
         "zh_TW": ""
       }
     },
@@ -22735,7 +22710,7 @@
         "it_IT": "",
         "ja_JP": "",
         "ko_KR": "",
-        "no_NO": "",
+        "no_NO": "Spillbar",
         "pl_PL": "",
         "pt_BR": "",
         "ru_RU": "",
@@ -22743,7 +22718,7 @@
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "",
-        "zh_CN": "可游玩",
+        "zh_CN": "",
         "zh_TW": ""
       }
     },
@@ -22768,7 +22743,7 @@
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "",
-        "zh_CN": "进入游戏",
+        "zh_CN": "",
         "zh_TW": ""
       }
     },
@@ -22785,7 +22760,7 @@
         "it_IT": "",
         "ja_JP": "",
         "ko_KR": "",
-        "no_NO": "",
+        "no_NO": "Menyer",
         "pl_PL": "",
         "pt_BR": "",
         "ru_RU": "",
@@ -22793,7 +22768,7 @@
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "",
-        "zh_CN": "菜单",
+        "zh_CN": "",
         "zh_TW": ""
       }
     },
@@ -22810,7 +22785,7 @@
         "it_IT": "",
         "ja_JP": "",
         "ko_KR": "",
-        "no_NO": "",
+        "no_NO": "Starter",
         "pl_PL": "",
         "pt_BR": "",
         "ru_RU": "",
@@ -22818,7 +22793,7 @@
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "",
-        "zh_CN": "启动",
+        "zh_CN": "",
         "zh_TW": ""
       }
     },
@@ -22835,7 +22810,7 @@
         "it_IT": "",
         "ja_JP": "",
         "ko_KR": "",
-        "no_NO": "",
+        "no_NO": "Ingenting",
         "pl_PL": "",
         "pt_BR": "",
         "ru_RU": "",
@@ -22843,9 +22818,9 @@
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "",
-        "zh_CN": "什么都没有",
+        "zh_CN": "",
         "zh_TW": ""
       }
     }
   ]
-}
+}

src/Ryujinx/Headless/HeadlessRyujinx.Init.cs

@@ -1,4 +1,4 @@
-using DiscordRPC;
+using DiscordRPC;
 using LibHac.Tools.FsSystem;
 using Ryujinx.Audio.Backends.SDL2;
 using Ryujinx.Ava;

src/Ryujinx/UI/Controls/ApplicationListView.axaml

@@ -133,13 +133,12 @@
                                     Spacing="5">
                                     <TextBlock
                                         HorizontalAlignment="Stretch"
-                                        Text="{Binding LastPlayedString}"
+                                        Text="{Binding TimePlayedString}"
                                         TextAlignment="End"
                                         TextWrapping="Wrap" />
                                     <TextBlock
                                         HorizontalAlignment="Stretch"
-                                        Text="{Binding TimePlayedString}"
+                                        Text="{Binding LastPlayedString}"
-                                        IsVisible="{Binding HasPlayedPreviously}"
                                         TextAlignment="End"
                                         TextWrapping="Wrap" />
                                     <TextBlock

src/Ryujinx/UI/Helpers/PlayabilityStatusConverter.cs

@@ -12,8 +12,8 @@ namespace Ryujinx.Ava.UI.Helpers
         private static readonly Lazy<PlayabilityStatusConverter> _shared = new(() => new());
         public static PlayabilityStatusConverter Shared => _shared.Value;
 
-        public object Convert(object value, Type _, object __, CultureInfo ___)
+        public object Convert(object? value, Type _, object? __, CultureInfo ___) =>
-            => value.Cast<LocaleKeys>() switch
+            value.Cast<LocaleKeys>() switch
             {
                 LocaleKeys.CompatibilityListNothing or 
                     LocaleKeys.CompatibilityListBoots or 
@@ -22,7 +22,7 @@ namespace Ryujinx.Ava.UI.Helpers
                 _ => Brushes.ForestGreen
             };
 
-        public object ConvertBack(object value, Type _, object __, CultureInfo ___)
+        public object ConvertBack(object? value, Type _, object? __, CultureInfo ___) 
             => throw new NotSupportedException();
     }
 }

src/Ryujinx/UI/Models/Input/HotkeyConfig.cs

@@ -1,53 +1,152 @@
-using CommunityToolkit.Mvvm.ComponentModel;
 using Ryujinx.Ava.UI.ViewModels;
 using Ryujinx.Common.Configuration.Hid;
 
 namespace Ryujinx.Ava.UI.Models.Input
 {
-    public partial class HotkeyConfig : BaseModel
+    public class HotkeyConfig : BaseModel
     {
-        [ObservableProperty] private Key _toggleVSyncMode;
+        private Key _toggleVSyncMode;
+        public Key ToggleVSyncMode
+        {
+            get => _toggleVSyncMode;
+            set
+            {
+                _toggleVSyncMode = value;
+                OnPropertyChanged();
+            }
+        }
 
-        [ObservableProperty] private Key _screenshot;
+        private Key _screenshot;
+        public Key Screenshot
+        {
+            get => _screenshot;
+            set
+            {
+                _screenshot = value;
+                OnPropertyChanged();
+            }
+        }
 
-        [ObservableProperty] private Key _showUI;
+        private Key _showUI;
+        public Key ShowUI
+        {
+            get => _showUI;
+            set
+            {
+                _showUI = value;
+                OnPropertyChanged();
+            }
+        }
 
-        [ObservableProperty] private Key _pause;
+        private Key _pause;
+        public Key Pause
+        {
+            get => _pause;
+            set
+            {
+                _pause = value;
+                OnPropertyChanged();
+            }
+        }
 
-        [ObservableProperty] private Key _toggleMute;
+        private Key _toggleMute;
+        public Key ToggleMute
+        {
+            get => _toggleMute;
+            set
+            {
+                _toggleMute = value;
+                OnPropertyChanged();
+            }
+        }
 
-        [ObservableProperty] private Key _resScaleUp;
+        private Key _resScaleUp;
+        public Key ResScaleUp
+        {
+            get => _resScaleUp;
+            set
+            {
+                _resScaleUp = value;
+                OnPropertyChanged();
+            }
+        }
 
-        [ObservableProperty] private Key _resScaleDown;
+        private Key _resScaleDown;
+        public Key ResScaleDown
+        {
+            get => _resScaleDown;
+            set
+            {
+                _resScaleDown = value;
+                OnPropertyChanged();
+            }
+        }
 
-        [ObservableProperty] private Key _volumeUp;
+        private Key _volumeUp;
+        public Key VolumeUp
+        {
+            get => _volumeUp;
+            set
+            {
+                _volumeUp = value;
+                OnPropertyChanged();
+            }
+        }
 
-        [ObservableProperty] private Key _volumeDown;
+        private Key _volumeDown;
+        public Key VolumeDown
+        {
+            get => _volumeDown;
+            set
+            {
+                _volumeDown = value;
+                OnPropertyChanged();
+            }
+        }
 
-        [ObservableProperty] private Key _customVSyncIntervalIncrement;
+        private Key _customVSyncIntervalIncrement;
+        public Key CustomVSyncIntervalIncrement
+        {
+            get => _customVSyncIntervalIncrement;
+            set
+            {
+                _customVSyncIntervalIncrement = value;
+                OnPropertyChanged();
+            }
+        }
 
-        [ObservableProperty] private Key _customVSyncIntervalDecrement;
+        private Key _customVSyncIntervalDecrement;
+        public Key CustomVSyncIntervalDecrement
+        {
+            get => _customVSyncIntervalDecrement;
+            set
+            {
+                _customVSyncIntervalDecrement = value;
+                OnPropertyChanged();
+            }
+        }
 
         public HotkeyConfig(KeyboardHotkeys config)
         {
-            if (config == null)
+            if (config != null)
-                return;
+            {
-
+                ToggleVSyncMode = config.ToggleVSyncMode;
-            ToggleVSyncMode = config.ToggleVSyncMode;
+                Screenshot = config.Screenshot;
-            Screenshot = config.Screenshot;
+                ShowUI = config.ShowUI;
-            ShowUI = config.ShowUI;
+                Pause = config.Pause;
-            Pause = config.Pause;
+                ToggleMute = config.ToggleMute;
-            ToggleMute = config.ToggleMute;
+                ResScaleUp = config.ResScaleUp;
-            ResScaleUp = config.ResScaleUp;
+                ResScaleDown = config.ResScaleDown;
-            ResScaleDown = config.ResScaleDown;
+                VolumeUp = config.VolumeUp;
-            VolumeUp = config.VolumeUp;
+                VolumeDown = config.VolumeDown;
-            VolumeDown = config.VolumeDown;
+                CustomVSyncIntervalIncrement = config.CustomVSyncIntervalIncrement;
-            CustomVSyncIntervalIncrement = config.CustomVSyncIntervalIncrement;
+                CustomVSyncIntervalDecrement = config.CustomVSyncIntervalDecrement;
-            CustomVSyncIntervalDecrement = config.CustomVSyncIntervalDecrement;
+            }
         }
 
-        public KeyboardHotkeys GetConfig() =>
+        public KeyboardHotkeys GetConfig()
-            new()
+        {
+            var config = new KeyboardHotkeys
             {
                 ToggleVSyncMode = ToggleVSyncMode,
                 Screenshot = Screenshot,
@@ -61,5 +160,8 @@ namespace Ryujinx.Ava.UI.Models.Input
                 CustomVSyncIntervalIncrement = CustomVSyncIntervalIncrement,
                 CustomVSyncIntervalDecrement = CustomVSyncIntervalDecrement,
             };
+
+            return config;
+        }
     }
 }

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

@@ -1,13 +1,21 @@
 using Avalonia.Svg.Skia;
-using CommunityToolkit.Mvvm.ComponentModel;
 using Ryujinx.Ava.UI.Models.Input;
 using Ryujinx.Ava.UI.Views.Input;
 
 namespace Ryujinx.Ava.UI.ViewModels.Input
 {
-    public partial class ControllerInputViewModel : BaseModel
+    public class ControllerInputViewModel : BaseModel
     {
-        [ObservableProperty] private GamepadInputConfig _config;
+        private GamepadInputConfig _config;
+        public GamepadInputConfig Config
+        {
+            get => _config;
+            set
+            {
+                _config = value;
+                OnPropertyChanged();
+            }
+        }
 
         private bool _isLeft;
         public bool IsLeft
@@ -35,7 +43,16 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
 
         public bool HasSides => IsLeft ^ IsRight;
 
-        [ObservableProperty] private SvgImage _image;
+        private SvgImage _image;
+        public SvgImage Image
+        {
+            get => _image;
+            set
+            {
+                _image = value;
+                OnPropertyChanged();
+            }
+        }
 
         public readonly InputViewModel ParentModel;
 

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

@@ -1,8 +1,9 @@
+using Avalonia;
 using Avalonia.Collections;
 using Avalonia.Controls;
+using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Svg.Skia;
 using Avalonia.Threading;
-using CommunityToolkit.Mvvm.ComponentModel;
 using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.Input;
 using Ryujinx.Ava.UI.Helpers;
@@ -31,7 +32,7 @@ using Key = Ryujinx.Common.Configuration.Hid.Key;
 
 namespace Ryujinx.Ava.UI.ViewModels.Input
 {
-    public partial class InputViewModel : BaseModel, IDisposable
+    public class InputViewModel : BaseModel, IDisposable
     {
         private const string Disabled = "disabled";
         private const string ProControllerResource = "Ryujinx/Assets/Icons/Controller_ProCon.svg";
@@ -47,8 +48,8 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
         private int _controller;
         private string _controllerImage;
         private int _device;
-        [ObservableProperty] private object _configViewModel;
+        private object _configViewModel;
-        [ObservableProperty] private string _profileName;
+        private string _profileName;
         private bool _isLoaded;
 
         private static readonly InputConfigJsonSerializerContext _serializerContext = new(JsonHelper.GetDefaultSerializerOptions());
@@ -72,6 +73,17 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
         public bool IsModified { get; set; }
         public event Action NotifyChangesEvent;
 
+        public object ConfigViewModel
+        {
+            get => _configViewModel;
+            set
+            {
+                _configViewModel = value;
+
+                OnPropertyChanged();
+            }
+        }
+
         public PlayerIndex PlayerIdChoose
         {
             get => _playerIdChoose;
@@ -188,6 +200,16 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
             }
         }
 
+        public string ProfileName
+        {
+            get => _profileName; set
+            {
+                _profileName = value;
+
+                OnPropertyChanged();
+            }
+        }
+
         public int Device
         {
             get => _device;

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

@@ -1,12 +1,20 @@
 using Avalonia.Svg.Skia;
-using CommunityToolkit.Mvvm.ComponentModel;
 using Ryujinx.Ava.UI.Models.Input;
 
 namespace Ryujinx.Ava.UI.ViewModels.Input
 {
-    public partial class KeyboardInputViewModel : BaseModel
+    public class KeyboardInputViewModel : BaseModel
     {
-        [ObservableProperty] private KeyboardInputConfig _config;
+        private KeyboardInputConfig _config;
+        public KeyboardInputConfig Config
+        {
+            get => _config;
+            set
+            {
+                _config = value;
+                OnPropertyChanged();
+            }
+        }
 
         private bool _isLeft;
         public bool IsLeft
@@ -34,7 +42,16 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
 
         public bool HasSides => IsLeft ^ IsRight;
 
-        [ObservableProperty] private SvgImage _image;
+        private SvgImage _image;
+        public SvgImage Image
+        {
+            get => _image;
+            set
+            {
+                _image = value;
+                OnPropertyChanged();
+            }
+        }
 
         public readonly InputViewModel ParentModel;
 

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

@@ -1,23 +1,93 @@
-using CommunityToolkit.Mvvm.ComponentModel;
-
 namespace Ryujinx.Ava.UI.ViewModels.Input
 {
-    public partial class MotionInputViewModel : BaseModel
+    public class MotionInputViewModel : BaseModel
     {
-        [ObservableProperty] private int _slot;
+        private int _slot;
+        public int Slot
+        {
+            get => _slot;
+            set
+            {
+                _slot = value;
+                OnPropertyChanged();
+            }
+        }
 
-        [ObservableProperty] private int _altSlot;
+        private int _altSlot;
+        public int AltSlot
+        {
+            get => _altSlot;
+            set
+            {
+                _altSlot = value;
+                OnPropertyChanged();
+            }
+        }
 
-        [ObservableProperty] private string _dsuServerHost;
+        private string _dsuServerHost;
+        public string DsuServerHost
+        {
+            get => _dsuServerHost;
+            set
+            {
+                _dsuServerHost = value;
+                OnPropertyChanged();
+            }
+        }
 
-        [ObservableProperty] private int _dsuServerPort;
+        private int _dsuServerPort;
+        public int DsuServerPort
+        {
+            get => _dsuServerPort;
+            set
+            {
+                _dsuServerPort = value;
+                OnPropertyChanged();
+            }
+        }
 
-        [ObservableProperty] private bool _mirrorInput;
+        private bool _mirrorInput;
+        public bool MirrorInput
+        {
+            get => _mirrorInput;
+            set
+            {
+                _mirrorInput = value;
+                OnPropertyChanged();
+            }
+        }
 
-        [ObservableProperty] private int _sensitivity;
+        private int _sensitivity;
+        public int Sensitivity
+        {
+            get => _sensitivity;
+            set
+            {
+                _sensitivity = value;
+                OnPropertyChanged();
+            }
+        }
 
-        [ObservableProperty] private double _gyroDeadzone;
+        private double _gryoDeadzone;
+        public double GyroDeadzone
+        {
+            get => _gryoDeadzone;
+            set
+            {
+                _gryoDeadzone = value;
+                OnPropertyChanged();
+            }
+        }
 
-        [ObservableProperty] private bool _enableCemuHookMotion;
+        private bool _enableCemuHookMotion;
+        public bool EnableCemuHookMotion
+        {
+            get => _enableCemuHookMotion;
+            set
+            {
+                _enableCemuHookMotion = value;
+                OnPropertyChanged();
+            }
+        }
     }
 }

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

@@ -1,11 +1,27 @@
-using CommunityToolkit.Mvvm.ComponentModel;
-
 namespace Ryujinx.Ava.UI.ViewModels.Input
 {
-    public partial class RumbleInputViewModel : BaseModel
+    public class RumbleInputViewModel : BaseModel
     {
-        [ObservableProperty] private float _strongRumble;
+        private float _strongRumble;
+        public float StrongRumble
+        {
+            get => _strongRumble;
+            set
+            {
+                _strongRumble = value;
+                OnPropertyChanged();
+            }
+        }
 
-        [ObservableProperty] private float _weakRumble;
+        private float _weakRumble;
+        public float WeakRumble
+        {
+            get => _weakRumble;
+            set
+            {
+                _weakRumble = value;
+                OnPropertyChanged();
+            }
+        }
     }
 }

src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs

@@ -741,10 +741,7 @@ namespace Ryujinx.Ava.UI.ViewModels
             Applications.ToObservableChangeSet()
                 .Filter(Filter)
                 .Sort(GetComparer())
-#pragma warning disable MVVMTK0034
+                .Bind(out _appsObservableList).AsObservableList();
-                .Bind(out _appsObservableList)
-#pragma warning restore MVVMTK0034
-                .AsObservableList();
 
             OnPropertyChanged(nameof(AppsObservableList));
         }

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

@@ -164,7 +164,7 @@ namespace Ryujinx.Ava.UI.Windows
             });
         }
 
-        private void ApplicationLibrary_LdnGameDataReceived(LdnGameDataReceivedEventArgs e)
+        private void ApplicationLibrary_LdnGameDataReceived(object sender, LdnGameDataReceivedEventArgs e)
         {
             Dispatcher.UIThread.Post(() =>
             {
@@ -408,10 +408,13 @@ namespace Ryujinx.Ava.UI.Windows
         {
             StatusBarView.VolumeStatus.Click += VolumeStatus_CheckedChanged;
 
-            ApplicationGrid.DataContext = ApplicationList.DataContext = ViewModel;
-            
             ApplicationGrid.ApplicationOpened += Application_Opened;
+
+            ApplicationGrid.DataContext = ViewModel;
+
             ApplicationList.ApplicationOpened += Application_Opened;
+
+            ApplicationList.DataContext = ViewModel;
         }
 
         private void SetWindowSizePosition()

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

@@ -1,6 +1,4 @@
-using Avalonia;
 using Avalonia.Controls;
-using Avalonia.Input;
 using FluentAvalonia.Core;
 using FluentAvalonia.UI.Controls;
 using Ryujinx.Ava.Common.Locale;
@@ -25,11 +23,6 @@ namespace Ryujinx.Ava.UI.Windows
 
             InitializeComponent();
             Load();
-
-#if DEBUG
-            this.AttachDevTools(new KeyGesture(Key.F12, KeyModifiers.Alt));
-#endif
-            
         }
 
         public SettingsWindow()

src/Ryujinx/Utilities/AppLibrary/ApplicationData.cs

@@ -37,8 +37,6 @@ namespace Ryujinx.Ava.Utilities.AppLibrary
 
         public string TimePlayedString => ValueFormatUtils.FormatTimeSpan(TimePlayed);
 
-        public bool HasPlayedPreviously => TimePlayedString != string.Empty;
-
         public string LastPlayedString => ValueFormatUtils.FormatDateTime(LastPlayed)?.Replace(" ", "\n");
 
         public string FileSizeString => ValueFormatUtils.FormatFileSize(FileSize);

src/Ryujinx/Utilities/AppLibrary/ApplicationLibrary.cs

@@ -45,7 +45,7 @@ namespace Ryujinx.Ava.Utilities.AppLibrary
         public const string DefaultLanPlayWebHost = "ryuldnweb.vudjun.com";
         public Language DesiredLanguage { get; set; }
         public event EventHandler<ApplicationCountUpdatedEventArgs> ApplicationCountUpdated;
-        public event Action<LdnGameDataReceivedEventArgs> LdnGameDataReceived;
+        public event EventHandler<LdnGameDataReceivedEventArgs> LdnGameDataReceived;
 
         public readonly IObservableCache<ApplicationData, ulong> Applications;
         public readonly IObservableCache<(TitleUpdateModel TitleUpdate, bool IsSelected), TitleUpdateModel> TitleUpdates;
@@ -779,7 +779,7 @@ namespace Ryujinx.Ava.Utilities.AppLibrary
                     using HttpClient httpClient = new HttpClient();
                     string ldnGameDataArrayString = await httpClient.GetStringAsync($"https://{ldnWebHost}/api/public_games");
                     ldnGameDataArray = JsonHelper.Deserialize(ldnGameDataArrayString, _ldnDataSerializerContext.IEnumerableLdnGameData);
-                    LdnGameDataReceived?.Invoke(new LdnGameDataReceivedEventArgs
+                    LdnGameDataReceived?.Invoke(null, new LdnGameDataReceivedEventArgs
                     {
                         LdnData = ldnGameDataArray
                     });
@@ -787,7 +787,7 @@ namespace Ryujinx.Ava.Utilities.AppLibrary
                 catch (Exception ex)
                 {
                     Logger.Warning?.Print(LogClass.Application, $"Failed to fetch the public games JSON from the API. Player and game count in the game list will be unavailable.\n{ex.Message}");
-                    LdnGameDataReceived?.Invoke(new LdnGameDataReceivedEventArgs
+                    LdnGameDataReceived?.Invoke(null, new LdnGameDataReceivedEventArgs
                     {
                         LdnData = Array.Empty<LdnGameData>()
                     });
@@ -795,7 +795,7 @@ namespace Ryujinx.Ava.Utilities.AppLibrary
             }
             else
             {
-                LdnGameDataReceived?.Invoke(new LdnGameDataReceivedEventArgs
+                LdnGameDataReceived?.Invoke(null, new LdnGameDataReceivedEventArgs
                 {
                     LdnData = Array.Empty<LdnGameData>()
                 });

src/Ryujinx/Utilities/AppletMetadata.cs

@@ -32,27 +32,29 @@ namespace Ryujinx.Ava.Utilities
 
         public string GetContentPath(ContentManager contentManager)
             => (contentManager ?? _contentManager)
-                ?.GetInstalledContentPath(ProgramId, StorageId.BuiltInSystem, NcaContentType.Program);
+                .GetInstalledContentPath(ProgramId, StorageId.BuiltInSystem, NcaContentType.Program);
 
         public bool CanStart(ContentManager contentManager, out ApplicationData appData,
             out BlitStruct<ApplicationControlProperty> appControl)
         {
             contentManager ??= _contentManager;
-            if (contentManager == null) 
+            if (contentManager == null)
-                goto BadData;
+            {
-
+                appData = null;
-            string contentPath = GetContentPath(contentManager);
+                appControl = new BlitStruct<ApplicationControlProperty>(0);
-            if (string.IsNullOrEmpty(contentPath)) 
+                return false;
-                goto BadData;
+            }
 
             appData = new() { Name = Name, Id = ProgramId, Path = GetContentPath(contentManager) };
+
+            if (string.IsNullOrEmpty(appData.Path))
+            {
+                appControl = new BlitStruct<ApplicationControlProperty>(0);
+                return false;
+            }
+
             appControl = StructHelpers.CreateCustomNacpData(Name, Version);
             return true;
-            
-        BadData:
-            appData = null;
-            appControl = new BlitStruct<ApplicationControlProperty>(0);
-            return false;
         }
     }
 }

src/Ryujinx/Utilities/Compat/CompatibilityCsv.cs

@@ -1,66 +1,50 @@
 using Gommon;
-using Humanizer;
 using nietras.SeparatedValues;
 using Ryujinx.Ava.Common.Locale;
-using Ryujinx.Common.Logging;
 using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Reflection;
 using System.Text;
 
 namespace Ryujinx.Ava.Utilities.Compat
 {
-    public struct ColumnIndices(Func<ReadOnlySpan<char>, int> getIndex)
-    {
-        public const string TitleIdCol = "\"title_id\"";
-        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()
+        public static CompatibilityCsv Shared { get; set; }
+        
+        public CompatibilityCsv(SepReader reader)
         {
-            using Stream csvStream = Assembly.GetExecutingAssembly()
+            var entries = new List<CompatibilityEntry>();
-                .GetManifestResourceStream("RyujinxGameCompatibilityList")!;
-            csvStream.Position = 0;
 
-            using SepReader reader = Sep.Reader().From(csvStream);
+            foreach (var row in reader)
-            ColumnIndices columnIndices = new(reader.Header.IndexOf);
+            {
+                entries.Add(new CompatibilityEntry(reader.Header, row));
+            }
 
-            Entries = reader
+            Entries = entries.Where(x => x.Status != null)
-                .Enumerate(row => new CompatibilityEntry(ref columnIndices, row))
+                .OrderBy(it => it.GameName).ToArray();
-                .OrderBy(it => it.GameName)
-                .ToArray();
-            
-            Logger.Debug?.Print(LogClass.UI, "Compatibility CSV loaded.", "LoadCompatCsv");
         }
 
-        public static CompatibilityEntry[] Entries { get; private set; }
+        public CompatibilityEntry[] Entries { get; }
     }
 
     public class CompatibilityEntry
     {
-        public CompatibilityEntry(ref ColumnIndices indices, SepReader.Row row)
+        public CompatibilityEntry(SepReaderHeader header, SepReader.Row row)
         {
-            string titleIdRow = ColStr(row[indices.TitleId]);
+            if (row.ColCount != header.ColNames.Count)
+                throw new InvalidDataException($"CSV row {row.RowIndex} ({row.ToString()}) has mismatched column count");
+            
+            var titleIdRow = ColStr(row[header.IndexOf("\"title_id\"")]);
             TitleId = !string.IsNullOrEmpty(titleIdRow) 
                 ? titleIdRow 
                 : default(Optional<string>);
             
-            GameName = ColStr(row[indices.GameName]);
+            GameName = ColStr(row[header.IndexOf("\"game_name\"")]).Trim().Trim('"');
 
-            Labels = ColStr(row[indices.Labels]).Split(';');
+            IssueLabels = ColStr(row[header.IndexOf("\"labels\"")]).Split(';');
-            Status = ColStr(row[indices.Status]).ToLower() switch
+            Status = ColStr(row[header.IndexOf("\"status\"")]).ToLower() switch
             {
                 "playable" => LocaleKeys.CompatibilityListPlayable,
                 "ingame" => LocaleKeys.CompatibilityListIngame,
@@ -70,8 +54,8 @@ namespace Ryujinx.Ava.Utilities.Compat
                 _ => null
             };
 
-            if (DateTime.TryParse(ColStr(row[indices.LastUpdated]), out var dt))
+            if (DateTime.TryParse(ColStr(row[header.IndexOf("\"last_updated\"")]), out var dt))
-                LastUpdated = dt;
+                LastEvent = dt;
 
             return;
             
@@ -80,31 +64,27 @@ namespace Ryujinx.Ava.Utilities.Compat
         
         public string GameName { get; }
         public Optional<string> TitleId { get; }
-        public string[] Labels { get; }
+        public string[] IssueLabels { get; }
         public LocaleKeys? Status { get; }
-        public DateTime LastUpdated { get; }
+        public DateTime LastEvent { get; }
-
-        public string LocalizedLastUpdated =>
-            LocaleManager.FormatDynamicValue(LocaleKeys.CompatibilityListLastUpdated, LastUpdated.Humanize());
 
         public string LocalizedStatus => LocaleManager.Instance[Status!.Value];
         public string FormattedTitleId => TitleId
             .OrElse(new string(' ', 16));
 
-        public string FormattedIssueLabels => Labels
+        public string FormattedIssueLabels => IssueLabels
+            .Where(it => !it.StartsWithIgnoreCase("status"))
             .Select(FormatLabelName)
             .JoinToString(", ");
 
         public override string ToString()
         {
-            StringBuilder sb = new("CompatibilityEntry: {");
+            var sb = new StringBuilder("CompatibilityEntry: {");
             sb.Append($"{nameof(GameName)}=\"{GameName}\", ");
             sb.Append($"{nameof(TitleId)}={TitleId}, ");
-            sb.Append($"{nameof(Labels)}={
+            sb.Append($"{nameof(IssueLabels)}=\"{IssueLabels}\", ");
-                Labels.FormatCollection(it => $"\"{it}\"", separator: ", ", prefix: "[", suffix: "]")
-            }, ");
             sb.Append($"{nameof(Status)}=\"{Status}\", ");
-            sb.Append($"{nameof(LastUpdated)}=\"{LastUpdated}\"");
+            sb.Append($"{nameof(LastEvent)}=\"{LastEvent}\"");
             sb.Append('}');
 
             return sb.ToString();
@@ -160,8 +140,8 @@ namespace Ryujinx.Ava.Utilities.Compat
             if (value == string.Empty)
                 return string.Empty;
         
-            char firstChar = value[0];
+            var firstChar = value[0];
-            string rest = value[1..];
+            var rest = value[1..];
 
             return $"{char.ToUpper(firstChar)}{rest}";
         }

src/Ryujinx/Utilities/Compat/CompatibilityList.axaml

@@ -44,11 +44,8 @@
                          ItemsSource="{Binding CurrentEntries}">
                     <ListBox.ItemTemplate>
                         <DataTemplate DataType="{x:Type local:CompatibilityEntry}">
-                            <Grid Width="750"
+                            <Grid Width="750" ColumnDefinitions="Auto,Auto,Auto,*"
-                                  Margin="5"
+                                  Margin="5">
-                                  ColumnDefinitions="Auto,Auto,Auto,*"
-                                  Background="Transparent"
-                                  ToolTip.Tip="{Binding  LocalizedLastUpdated}">
                                 <TextBlock Grid.Column="0"
                                            Text="{Binding GameName}"
                                            Width="320"

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

@@ -14,6 +14,15 @@ namespace Ryujinx.Ava.Utilities.Compat
     {
         public static async Task Show()
         {
+            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,
@@ -42,7 +51,7 @@ namespace Ryujinx.Ava.Utilities.Compat
             InitializeComponent();
         }
 
-        private void TextBox_OnTextChanged(object sender, TextChangedEventArgs e)
+        private void TextBox_OnTextChanged(object? sender, TextChangedEventArgs e)
         {
             if (DataContext is not CompatibilityViewModel cvm)
                 return;

src/Ryujinx/Utilities/Compat/CompatibilityViewModel.cs

@@ -11,13 +11,14 @@ namespace Ryujinx.Ava.Utilities.Compat
     {
         [ObservableProperty] private bool _onlyShowOwnedGames = true;
 
-        private IEnumerable<CompatibilityEntry> _currentEntries = CompatibilityCsv.Entries;
+        private IEnumerable<CompatibilityEntry> _currentEntries = CompatibilityCsv.Shared.Entries;
         private readonly string[] _ownedGameTitleIds = [];
         private readonly ApplicationLibrary _appLibrary;
 
         public IEnumerable<CompatibilityEntry> CurrentEntries => OnlyShowOwnedGames
             ? _currentEntries.Where(x =>
-                x.TitleId.Check(tid => _ownedGameTitleIds.ContainsIgnoreCase(tid)))
+                x.TitleId.Check(tid => _ownedGameTitleIds.ContainsIgnoreCase(tid))
+                || _appLibrary.Applications.Items.Any(a => a.Name.EqualsIgnoreCase(x.GameName)))
             : _currentEntries;
 
         public CompatibilityViewModel() {}
@@ -38,11 +39,11 @@ namespace Ryujinx.Ava.Utilities.Compat
         {
             if (string.IsNullOrEmpty(searchTerm))
             {
-                SetEntries(CompatibilityCsv.Entries);
+                SetEntries(CompatibilityCsv.Shared.Entries);
                 return;
             }
 
-            SetEntries(CompatibilityCsv.Entries.Where(x =>
+            SetEntries(CompatibilityCsv.Shared.Entries.Where(x =>
                 x.GameName.ContainsIgnoreCase(searchTerm)
                 || x.TitleId.Check(tid => tid.ContainsIgnoreCase(searchTerm))));
         }

src/Ryujinx/Utilities/ValueFormatUtils.cs

@@ -1,5 +1,3 @@
-using Humanizer;
-using Humanizer.Localisation;
 using Ryujinx.Ava.Common.Locale;
 using System;
 using System.Globalization;
@@ -33,7 +31,7 @@ namespace Ryujinx.Ava.Utilities
             Gigabytes = 9,
             Terabytes = 10,
             Petabytes = 11,
-            Exabytes = 12
+            Exabytes = 12,
         }
 
         private const double SizeBase10 = 1000;
@@ -50,24 +48,22 @@ namespace Ryujinx.Ava.Utilities
         public static string FormatTimeSpan(TimeSpan? timeSpan)
         {
             if (!timeSpan.HasValue || timeSpan.Value.TotalSeconds < 1)
-                return string.Empty;
+            {
-            
+                // Game was never played
-            if (timeSpan.Value.TotalSeconds < 60)
+                return TimeSpan.Zero.ToString("c", CultureInfo.InvariantCulture);
-                return timeSpan.Value.Humanize(1, 
+            }
-                    countEmptyUnits: false, 
-                    maxUnit: TimeUnit.Second,
-                    minUnit: TimeUnit.Second);
 
-            if (timeSpan.Value.TotalMinutes < 60)
+            if (timeSpan.Value.TotalDays < 1)
-                return timeSpan.Value.Humanize(1, 
+            {
-                    countEmptyUnits: false, 
+                // Game was played for less than a day
-                    maxUnit: TimeUnit.Minute,
+                return timeSpan.Value.ToString("c", CultureInfo.InvariantCulture);
-                    minUnit: TimeUnit.Minute);
+            }
-            
+
-            return timeSpan.Value.Humanize(1, 
+            // Game was played for more than a day
-                countEmptyUnits: false, 
+            TimeSpan onlyTime = timeSpan.Value.Subtract(TimeSpan.FromDays(timeSpan.Value.Days));
-                maxUnit: TimeUnit.Hour, 
+            string onlyTimeString = onlyTime.ToString("c", CultureInfo.InvariantCulture);
-                minUnit: TimeUnit.Hour);
+
+            return $"{timeSpan.Value.Days}d, {onlyTimeString}";
         }
 
         /// <summary>