diff --git a/src/Ryujinx/AppHost.cs b/src/Ryujinx/AppHost.cs index 61beda154..b85b17b89 100644 --- a/src/Ryujinx/AppHost.cs +++ b/src/Ryujinx/AppHost.cs @@ -975,13 +975,13 @@ namespace Ryujinx.Ava private static IHardwareDeviceDriver InitializeAudio() { - List availableBackends = new() - { + List availableBackends = + [ AudioBackend.SDL2, AudioBackend.SoundIo, AudioBackend.OpenAl, - AudioBackend.Dummy, - }; + AudioBackend.Dummy + ]; AudioBackend preferredBackend = ConfigurationState.Instance.System.AudioBackend.Value; diff --git a/src/Ryujinx/Input/AvaloniaKeyboardDriver.cs b/src/Ryujinx/Input/AvaloniaKeyboardDriver.cs index 581d1db8e..89b2c29ce 100644 --- a/src/Ryujinx/Input/AvaloniaKeyboardDriver.cs +++ b/src/Ryujinx/Input/AvaloniaKeyboardDriver.cs @@ -11,7 +11,7 @@ namespace Ryujinx.Ava.Input { internal class AvaloniaKeyboardDriver : IGamepadDriver { - private static readonly string[] _keyboardIdentifers = new string[1] { "0" }; + private static readonly string[] _keyboardIdentifers = ["0"]; private readonly Control _control; private readonly HashSet _pressedKeys; @@ -25,7 +25,7 @@ namespace Ryujinx.Ava.Input public AvaloniaKeyboardDriver(Control control) { _control = control; - _pressedKeys = new HashSet(); + _pressedKeys = []; _control.KeyDown += OnKeyPress; _control.KeyUp += OnKeyRelease; diff --git a/src/Ryujinx/Input/AvaloniaKeyboardMappingHelper.cs b/src/Ryujinx/Input/AvaloniaKeyboardMappingHelper.cs index c3e653e5d..48e49a7fa 100644 --- a/src/Ryujinx/Input/AvaloniaKeyboardMappingHelper.cs +++ b/src/Ryujinx/Input/AvaloniaKeyboardMappingHelper.cs @@ -7,7 +7,8 @@ namespace Ryujinx.Ava.Input { internal static class AvaloniaKeyboardMappingHelper { - private static readonly AvaKey[] _keyMapping = { + private static readonly AvaKey[] _keyMapping = + [ // NOTE: Invalid AvaKey.None, @@ -143,8 +144,8 @@ namespace Ryujinx.Ava.Input AvaKey.OemBackslash, // NOTE: invalid - AvaKey.None, - }; + AvaKey.None + ]; private static readonly Dictionary _avaKeyMapping; diff --git a/src/Ryujinx/UI/Controls/ApplicationContextMenu.axaml.cs b/src/Ryujinx/UI/Controls/ApplicationContextMenu.axaml.cs index 13a1d3bf3..b98649a11 100644 --- a/src/Ryujinx/UI/Controls/ApplicationContextMenu.axaml.cs +++ b/src/Ryujinx/UI/Controls/ApplicationContextMenu.axaml.cs @@ -146,7 +146,7 @@ namespace Ryujinx.Ava.UI.Controls DirectoryInfo mainDir = new(Path.Combine(AppDataManager.GamesDirPath, viewModel.SelectedApplication.IdString, "cache", "cpu", "0")); DirectoryInfo backupDir = new(Path.Combine(AppDataManager.GamesDirPath, viewModel.SelectedApplication.IdString, "cache", "cpu", "1")); - List cacheFiles = new(); + List cacheFiles = []; if (mainDir.Exists) { @@ -189,8 +189,8 @@ namespace Ryujinx.Ava.UI.Controls { DirectoryInfo shaderCacheDir = new(Path.Combine(AppDataManager.GamesDirPath, viewModel.SelectedApplication.IdString, "cache", "shader")); - List oldCacheDirectories = new(); - List newCacheFiles = new(); + List oldCacheDirectories = []; + List newCacheFiles = []; if (shaderCacheDir.Exists) { diff --git a/src/Ryujinx/UI/Controls/NavigationDialogHost.axaml.cs b/src/Ryujinx/UI/Controls/NavigationDialogHost.axaml.cs index 44cd84433..fdfc588e2 100644 --- a/src/Ryujinx/UI/Controls/NavigationDialogHost.axaml.cs +++ b/src/Ryujinx/UI/Controls/NavigationDialogHost.axaml.cs @@ -114,7 +114,7 @@ namespace Ryujinx.Ava.UI.Controls Span saveDataInfo = stackalloc SaveDataInfo[10]; - HashSet lostAccounts = new(); + HashSet lostAccounts = []; while (true) { diff --git a/src/Ryujinx/UI/Models/CheatNode.cs b/src/Ryujinx/UI/Models/CheatNode.cs index cce0f1d97..4fc249e20 100644 --- a/src/Ryujinx/UI/Models/CheatNode.cs +++ b/src/Ryujinx/UI/Models/CheatNode.cs @@ -8,7 +8,7 @@ namespace Ryujinx.Ava.UI.Models public class CheatNode : BaseModel { private bool _isEnabled = false; - public ObservableCollection SubNodes { get; } = new(); + public ObservableCollection SubNodes { get; } = []; public string CleanName => Name[1..^7]; public string BuildIdKey => $"{BuildId}-{Name}"; public bool IsRootNode { get; } diff --git a/src/Ryujinx/UI/ViewModels/AmiiboWindowViewModel.cs b/src/Ryujinx/UI/ViewModels/AmiiboWindowViewModel.cs index afbc7882f..e8869c475 100644 --- a/src/Ryujinx/UI/ViewModels/AmiiboWindowViewModel.cs +++ b/src/Ryujinx/UI/ViewModels/AmiiboWindowViewModel.cs @@ -64,9 +64,9 @@ namespace Ryujinx.Ava.UI.ViewModels Directory.CreateDirectory(Path.Join(AppDataManager.BaseDirPath, "system", "amiibo")); _amiiboJsonPath = Path.Join(AppDataManager.BaseDirPath, "system", "amiibo", "Amiibo.json"); - _amiiboList = new List(); - _amiiboSeries = new ObservableCollection(); - _amiibos = new AvaloniaList(); + _amiiboList = []; + _amiiboSeries = []; + _amiibos = []; _amiiboLogoBytes = EmbeddedResources.Read("Ryujinx/Assets/UIImages/Logo_Amiibo.png"); diff --git a/src/Ryujinx/UI/ViewModels/DownloadableContentManagerViewModel.cs b/src/Ryujinx/UI/ViewModels/DownloadableContentManagerViewModel.cs index 169aeb41d..d1358e658 100644 --- a/src/Ryujinx/UI/ViewModels/DownloadableContentManagerViewModel.cs +++ b/src/Ryujinx/UI/ViewModels/DownloadableContentManagerViewModel.cs @@ -22,9 +22,9 @@ namespace Ryujinx.Ava.UI.ViewModels public partial class DownloadableContentManagerViewModel : BaseModel { private readonly ApplicationLibrary _applicationLibrary; - private AvaloniaList _downloadableContents = new(); - [ObservableProperty] private AvaloniaList _selectedDownloadableContents = new(); - [ObservableProperty] private AvaloniaList _views = new(); + private AvaloniaList _downloadableContents = []; + [ObservableProperty] private AvaloniaList _selectedDownloadableContents = []; + [ObservableProperty] private AvaloniaList _views = []; [ObservableProperty] private bool _showBundledContentNotice = false; private string _search; @@ -139,9 +139,9 @@ namespace Ryujinx.Ava.UI.ViewModels { new("NSP") { - Patterns = new[] { "*.nsp" }, - AppleUniformTypeIdentifiers = new[] { "com.ryujinx.nsp" }, - MimeTypes = new[] { "application/x-nx-nsp" }, + Patterns = ["*.nsp"], + AppleUniformTypeIdentifiers = ["com.ryujinx.nsp"], + MimeTypes = ["application/x-nx-nsp"], }, }, }); diff --git a/src/Ryujinx/UI/ViewModels/Input/InputViewModel.cs b/src/Ryujinx/UI/ViewModels/Input/InputViewModel.cs index cd0488f5f..83cead1ac 100644 --- a/src/Ryujinx/UI/ViewModels/Input/InputViewModel.cs +++ b/src/Ryujinx/UI/ViewModels/Input/InputViewModel.cs @@ -257,11 +257,11 @@ namespace Ryujinx.Ava.UI.ViewModels.Input public InputViewModel() { - PlayerIndexes = new ObservableCollection(); - Controllers = new ObservableCollection(); - Devices = new ObservableCollection<(DeviceType Type, string Id, string Name)>(); - ProfilesList = new AvaloniaList(); - DeviceList = new AvaloniaList(); + PlayerIndexes = []; + Controllers = []; + Devices = []; + ProfilesList = []; + DeviceList = []; ControllerImage = ProControllerResource; @@ -810,7 +810,7 @@ namespace Ryujinx.Ava.UI.ViewModels.Input { IsModified = false; - List newConfig = new(); + List newConfig = []; newConfig.AddRange(ConfigurationState.Instance.Hid.InputConfig.Value); diff --git a/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs b/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs index 53e476f59..3a6fc8d2f 100644 --- a/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs +++ b/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs @@ -1245,21 +1245,21 @@ namespace Ryujinx.Ava.UI.ViewModels { new(LocaleManager.Instance[LocaleKeys.FileDialogAllTypes]) { - Patterns = new[] { "*.xci", "*.zip" }, - AppleUniformTypeIdentifiers = new[] { "com.ryujinx.xci", "public.zip-archive" }, - MimeTypes = new[] { "application/x-nx-xci", "application/zip" }, + Patterns = ["*.xci", "*.zip"], + AppleUniformTypeIdentifiers = ["com.ryujinx.xci", "public.zip-archive"], + MimeTypes = ["application/x-nx-xci", "application/zip"], }, new("XCI") { - Patterns = new[] { "*.xci" }, - AppleUniformTypeIdentifiers = new[] { "com.ryujinx.xci" }, - MimeTypes = new[] { "application/x-nx-xci" }, + Patterns = ["*.xci"], + AppleUniformTypeIdentifiers = ["com.ryujinx.xci"], + MimeTypes = ["application/x-nx-xci"], }, new("ZIP") { - Patterns = new[] { "*.zip" }, - AppleUniformTypeIdentifiers = new[] { "public.zip-archive" }, - MimeTypes = new[] { "application/zip" }, + Patterns = ["*.zip"], + AppleUniformTypeIdentifiers = ["public.zip-archive"], + MimeTypes = ["application/zip"], }, }, }); @@ -1292,21 +1292,21 @@ namespace Ryujinx.Ava.UI.ViewModels { new(LocaleManager.Instance[LocaleKeys.FileDialogAllTypes]) { - Patterns = new[] { "*.keys", "*.zip" }, - AppleUniformTypeIdentifiers = new[] { "com.ryujinx.xci", "public.zip-archive" }, - MimeTypes = new[] { "application/keys", "application/zip" }, + Patterns = ["*.keys", "*.zip"], + AppleUniformTypeIdentifiers = ["com.ryujinx.xci", "public.zip-archive"], + MimeTypes = ["application/keys", "application/zip"], }, new("KEYS") { - Patterns = new[] { "*.keys" }, - AppleUniformTypeIdentifiers = new[] { "com.ryujinx.xci" }, - MimeTypes = new[] { "application/keys" }, + Patterns = ["*.keys"], + AppleUniformTypeIdentifiers = ["com.ryujinx.xci"], + MimeTypes = ["application/keys"], }, new("ZIP") { - Patterns = new[] { "*.zip" }, - AppleUniformTypeIdentifiers = new[] { "public.zip-archive" }, - MimeTypes = new[] { "application/zip" }, + Patterns = ["*.zip"], + AppleUniformTypeIdentifiers = ["public.zip-archive"], + MimeTypes = ["application/zip"], }, }, }); @@ -1418,53 +1418,53 @@ namespace Ryujinx.Ava.UI.ViewModels { new(LocaleManager.Instance[LocaleKeys.AllSupportedFormats]) { - Patterns = new[] { "*.nsp", "*.xci", "*.nca", "*.nro", "*.nso" }, - AppleUniformTypeIdentifiers = new[] - { + Patterns = ["*.nsp", "*.xci", "*.nca", "*.nro", "*.nso"], + AppleUniformTypeIdentifiers = + [ "com.ryujinx.nsp", "com.ryujinx.xci", "com.ryujinx.nca", "com.ryujinx.nro", - "com.ryujinx.nso", - }, - MimeTypes = new[] - { + "com.ryujinx.nso" + ], + MimeTypes = + [ "application/x-nx-nsp", "application/x-nx-xci", "application/x-nx-nca", "application/x-nx-nro", - "application/x-nx-nso", - }, + "application/x-nx-nso" + ], }, new("NSP") { - Patterns = new[] { "*.nsp" }, - AppleUniformTypeIdentifiers = new[] { "com.ryujinx.nsp" }, - MimeTypes = new[] { "application/x-nx-nsp" }, + Patterns = ["*.nsp"], + AppleUniformTypeIdentifiers = ["com.ryujinx.nsp"], + MimeTypes = ["application/x-nx-nsp"], }, new("XCI") { - Patterns = new[] { "*.xci" }, - AppleUniformTypeIdentifiers = new[] { "com.ryujinx.xci" }, - MimeTypes = new[] { "application/x-nx-xci" }, + Patterns = ["*.xci"], + AppleUniformTypeIdentifiers = ["com.ryujinx.xci"], + MimeTypes = ["application/x-nx-xci"], }, new("NCA") { - Patterns = new[] { "*.nca" }, - AppleUniformTypeIdentifiers = new[] { "com.ryujinx.nca" }, - MimeTypes = new[] { "application/x-nx-nca" }, + Patterns = ["*.nca"], + AppleUniformTypeIdentifiers = ["com.ryujinx.nca"], + MimeTypes = ["application/x-nx-nca"], }, new("NRO") { - Patterns = new[] { "*.nro" }, - AppleUniformTypeIdentifiers = new[] { "com.ryujinx.nro" }, - MimeTypes = new[] { "application/x-nx-nro" }, + Patterns = ["*.nro"], + AppleUniformTypeIdentifiers = ["com.ryujinx.nro"], + MimeTypes = ["application/x-nx-nro"], }, new("NSO") { - Patterns = new[] { "*.nso" }, - AppleUniformTypeIdentifiers = new[] { "com.ryujinx.nso" }, - MimeTypes = new[] { "application/x-nx-nso" }, + Patterns = ["*.nso"], + AppleUniformTypeIdentifiers = ["com.ryujinx.nso"], + MimeTypes = ["application/x-nx-nso"], }, }, }); @@ -1690,7 +1690,7 @@ namespace Ryujinx.Ava.UI.ViewModels { new(LocaleManager.Instance[LocaleKeys.AllSupportedFormats]) { - Patterns = new[] { "*.bin" }, + Patterns = ["*.bin"], } } }); diff --git a/src/Ryujinx/UI/ViewModels/ModManagerViewModel.cs b/src/Ryujinx/UI/ViewModels/ModManagerViewModel.cs index 9d817ea0d..603d8f7c5 100644 --- a/src/Ryujinx/UI/ViewModels/ModManagerViewModel.cs +++ b/src/Ryujinx/UI/ViewModels/ModManagerViewModel.cs @@ -23,9 +23,9 @@ namespace Ryujinx.Ava.UI.ViewModels { private readonly string _modJsonPath; - private AvaloniaList _mods = new(); - [ObservableProperty] private AvaloniaList _views = new(); - [ObservableProperty] private AvaloniaList _selectedMods = new(); + private AvaloniaList _mods = []; + [ObservableProperty] private AvaloniaList _views = []; + [ObservableProperty] private AvaloniaList _selectedMods = []; private string _search; private readonly ulong _applicationId; diff --git a/src/Ryujinx/UI/ViewModels/SettingsViewModel.cs b/src/Ryujinx/UI/ViewModels/SettingsViewModel.cs index b2f94d7b6..5a73dd574 100644 --- a/src/Ryujinx/UI/ViewModels/SettingsViewModel.cs +++ b/src/Ryujinx/UI/ViewModels/SettingsViewModel.cs @@ -51,7 +51,7 @@ namespace Ryujinx.Ava.UI.ViewModels [ObservableProperty] private bool _isVulkanAvailable = true; [ObservableProperty] private bool _gameDirectoryChanged; [ObservableProperty] private bool _autoloadDirectoryChanged; - private readonly List _gpuIds = new(); + private readonly List _gpuIds = []; private int _graphicsBackendIndex; private int _scalingFilter; private int _scalingFilterLevel; diff --git a/src/Ryujinx/UI/ViewModels/TitleUpdateViewModel.cs b/src/Ryujinx/UI/ViewModels/TitleUpdateViewModel.cs index b01929291..aaafc3913 100644 --- a/src/Ryujinx/UI/ViewModels/TitleUpdateViewModel.cs +++ b/src/Ryujinx/UI/ViewModels/TitleUpdateViewModel.cs @@ -21,8 +21,8 @@ namespace Ryujinx.Ava.UI.ViewModels private ApplicationLibrary ApplicationLibrary { get; } private ApplicationData ApplicationData { get; } - [ObservableProperty] private AvaloniaList _titleUpdates = new(); - [ObservableProperty] private AvaloniaList _views = new(); + [ObservableProperty] private AvaloniaList _titleUpdates = []; + [ObservableProperty] private AvaloniaList _views = []; [ObservableProperty] private object _selectedUpdate = new TitleUpdateViewModelNoUpdate(); [ObservableProperty] private bool _showBundledContentNotice; @@ -149,9 +149,9 @@ namespace Ryujinx.Ava.UI.ViewModels { new(LocaleManager.Instance[LocaleKeys.AllSupportedFormats]) { - Patterns = new[] { "*.nsp" }, - AppleUniformTypeIdentifiers = new[] { "com.ryujinx.nsp" }, - MimeTypes = new[] { "application/x-nx-nsp" }, + Patterns = ["*.nsp"], + AppleUniformTypeIdentifiers = ["com.ryujinx.nsp"], + MimeTypes = ["application/x-nx-nsp"], }, }, }); diff --git a/src/Ryujinx/UI/ViewModels/UserFirmwareAvatarSelectorViewModel.cs b/src/Ryujinx/UI/ViewModels/UserFirmwareAvatarSelectorViewModel.cs index 33f30dbb0..cc5b35dc6 100644 --- a/src/Ryujinx/UI/ViewModels/UserFirmwareAvatarSelectorViewModel.cs +++ b/src/Ryujinx/UI/ViewModels/UserFirmwareAvatarSelectorViewModel.cs @@ -32,7 +32,7 @@ namespace Ryujinx.Ava.UI.ViewModels public UserFirmwareAvatarSelectorViewModel() { - _images = new ObservableCollection(); + _images = []; LoadImagesFromStore(); PropertyChanged += (_, args) => diff --git a/src/Ryujinx/UI/ViewModels/UserProfileViewModel.cs b/src/Ryujinx/UI/ViewModels/UserProfileViewModel.cs index 0b65e6d13..f3a9e432a 100644 --- a/src/Ryujinx/UI/ViewModels/UserProfileViewModel.cs +++ b/src/Ryujinx/UI/ViewModels/UserProfileViewModel.cs @@ -9,8 +9,8 @@ namespace Ryujinx.Ava.UI.ViewModels { public UserProfileViewModel() { - Profiles = new ObservableCollection(); - LostProfiles = new ObservableCollection(); + Profiles = []; + LostProfiles = []; IsEmpty = !LostProfiles.Any(); } diff --git a/src/Ryujinx/UI/ViewModels/UserSaveManagerViewModel.cs b/src/Ryujinx/UI/ViewModels/UserSaveManagerViewModel.cs index ac711089e..0b3f89556 100644 --- a/src/Ryujinx/UI/ViewModels/UserSaveManagerViewModel.cs +++ b/src/Ryujinx/UI/ViewModels/UserSaveManagerViewModel.cs @@ -14,8 +14,8 @@ namespace Ryujinx.Ava.UI.ViewModels [ObservableProperty] private int _sortIndex; [ObservableProperty] private int _orderIndex; [ObservableProperty] private string _search; - [ObservableProperty] private ObservableCollection _saves = new(); - [ObservableProperty] private ObservableCollection _views = new(); + [ObservableProperty] private ObservableCollection _saves = []; + [ObservableProperty] private ObservableCollection _views = []; private readonly AccountManager _accountManager; public string SaveManagerHeading => LocaleManager.Instance.UpdateAndGetDynamicValue(LocaleKeys.SaveManagerHeading, _accountManager.LastOpenedUser.Name, _accountManager.LastOpenedUser.UserId); diff --git a/src/Ryujinx/UI/ViewModels/XCITrimmerViewModel.cs b/src/Ryujinx/UI/ViewModels/XCITrimmerViewModel.cs index 72905ed1b..560f852db 100644 --- a/src/Ryujinx/UI/ViewModels/XCITrimmerViewModel.cs +++ b/src/Ryujinx/UI/ViewModels/XCITrimmerViewModel.cs @@ -36,9 +36,9 @@ namespace Ryujinx.Ava.UI.ViewModels private readonly Ryujinx.Common.Logging.XCIFileTrimmerLog _logger; private ApplicationLibrary ApplicationLibrary => _mainWindowViewModel.ApplicationLibrary; private Optional _processingApplication = null; - private AvaloniaList _allXCIFiles = new(); - private AvaloniaList _selectedXCIFiles = new(); - private AvaloniaList _displayedXCIFiles = new(); + private AvaloniaList _allXCIFiles = []; + private AvaloniaList _selectedXCIFiles = []; + private AvaloniaList _displayedXCIFiles = []; private MainWindowViewModel _mainWindowViewModel; private CancellationTokenSource _cancellationTokenSource; private string _search; diff --git a/src/Ryujinx/UI/Views/User/UserProfileImageSelectorView.axaml.cs b/src/Ryujinx/UI/Views/User/UserProfileImageSelectorView.axaml.cs index 5740ffe77..bd328b0c7 100644 --- a/src/Ryujinx/UI/Views/User/UserProfileImageSelectorView.axaml.cs +++ b/src/Ryujinx/UI/Views/User/UserProfileImageSelectorView.axaml.cs @@ -70,9 +70,9 @@ namespace Ryujinx.Ava.UI.Views.User { new(LocaleManager.Instance[LocaleKeys.AllSupportedFormats]) { - Patterns = new[] { "*.jpg", "*.jpeg", "*.png", "*.bmp" }, - AppleUniformTypeIdentifiers = new[] { "public.jpeg", "public.png", "com.microsoft.bmp" }, - MimeTypes = new[] { "image/jpeg", "image/png", "image/bmp" }, + Patterns = ["*.jpg", "*.jpeg", "*.png", "*.bmp"], + AppleUniformTypeIdentifiers = ["public.jpeg", "public.png", "com.microsoft.bmp"], + MimeTypes = ["image/jpeg", "image/png", "image/bmp"], }, }, }); diff --git a/src/Ryujinx/UI/Views/User/UserSaveManagerView.axaml.cs b/src/Ryujinx/UI/Views/User/UserSaveManagerView.axaml.cs index 7a221e7b3..bf11e878c 100644 --- a/src/Ryujinx/UI/Views/User/UserSaveManagerView.axaml.cs +++ b/src/Ryujinx/UI/Views/User/UserSaveManagerView.axaml.cs @@ -67,7 +67,7 @@ namespace Ryujinx.Ava.UI.Views.User public void LoadSaves() { ViewModel.Saves.Clear(); - ObservableCollection saves = new(); + ObservableCollection saves = []; SaveDataFilter saveDataFilter = SaveDataFilter.Make( programId: default, saveType: SaveDataType.Account, diff --git a/src/Ryujinx/UI/Windows/CheatWindow.axaml.cs b/src/Ryujinx/UI/Windows/CheatWindow.axaml.cs index 71d864c99..ba384359a 100644 --- a/src/Ryujinx/UI/Windows/CheatWindow.axaml.cs +++ b/src/Ryujinx/UI/Windows/CheatWindow.axaml.cs @@ -34,7 +34,7 @@ namespace Ryujinx.Ava.UI.Windows public CheatWindow(VirtualFileSystem virtualFileSystem, string titleId, string titleName, string titlePath) { - LoadedCheats = new AvaloniaList(); + LoadedCheats = []; IntegrityCheckLevel checkLevel = ConfigurationState.Instance.System.EnableFsIntegrityChecks ? IntegrityCheckLevel.ErrorOnInvalid : IntegrityCheckLevel.None; diff --git a/src/Ryujinx/UI/Windows/MainWindow.axaml.cs b/src/Ryujinx/UI/Windows/MainWindow.axaml.cs index 76002d1ab..14ec80019 100644 --- a/src/Ryujinx/UI/Windows/MainWindow.axaml.cs +++ b/src/Ryujinx/UI/Windows/MainWindow.axaml.cs @@ -712,12 +712,13 @@ namespace Ryujinx.Ava.UI.Windows private void ShowNewContentAddedDialog(int numDlcAdded, int numDlcRemoved, int numUpdatesAdded, int numUpdatesRemoved) { - string[] messages = { + string[] messages = + [ numDlcRemoved > 0 ? string.Format(LocaleManager.Instance[LocaleKeys.AutoloadDlcRemovedMessage], numDlcRemoved): null, numDlcAdded > 0 ? string.Format(LocaleManager.Instance[LocaleKeys.AutoloadDlcAddedMessage], numDlcAdded): null, numUpdatesRemoved > 0 ? string.Format(LocaleManager.Instance[LocaleKeys.AutoloadUpdateRemovedMessage], numUpdatesRemoved): null, numUpdatesAdded > 0 ? string.Format(LocaleManager.Instance[LocaleKeys.AutoloadUpdateAddedMessage], numUpdatesAdded) : null - }; + ]; string msg = String.Join("\r\n", messages); diff --git a/src/Ryujinx/Updater.cs b/src/Ryujinx/Updater.cs index 230840a9a..3dc62f3d9 100644 --- a/src/Ryujinx/Updater.cs +++ b/src/Ryujinx/Updater.cs @@ -372,7 +372,7 @@ namespace Ryujinx.Ava for (int i = 0; i < ConnectionCount; i++) { - list.Add(Array.Empty()); + list.Add([]); } for (int i = 0; i < ConnectionCount; i++) diff --git a/src/Ryujinx/Utilities/AppLibrary/ApplicationLibrary.cs b/src/Ryujinx/Utilities/AppLibrary/ApplicationLibrary.cs index 1720cd7f5..7577b9f74 100644 --- a/src/Ryujinx/Utilities/AppLibrary/ApplicationLibrary.cs +++ b/src/Ryujinx/Utilities/AppLibrary/ApplicationLibrary.cs @@ -190,7 +190,7 @@ namespace Ryujinx.Ava.Utilities.AppLibrary /// An error occured while reading PFS data. private List GetApplicationsFromPfs(IFileSystem pfs, string filePath) { - List applications = new(); + List applications = []; string extension = Path.GetExtension(filePath).ToLower(); foreach ((ulong titleId, ContentMetaData content) in pfs.GetContentData(ContentMetaType.Application, _virtualFileSystem, _checkLevel)) @@ -642,7 +642,7 @@ namespace Ryujinx.Ava.Utilities.AppLibrary _applications.Clear(); // Builds the applications list with paths to found applications - List applicationPaths = new(); + List applicationPaths = []; try { @@ -833,7 +833,7 @@ namespace Ryujinx.Ava.Utilities.AppLibrary { _cancellationToken = new CancellationTokenSource(); - List dlcPaths = new(); + List dlcPaths = []; int newDlcLoaded = 0; numDlcRemoved = 0; @@ -943,14 +943,14 @@ namespace Ryujinx.Ava.Utilities.AppLibrary { _cancellationToken = new CancellationTokenSource(); - List updatePaths = new(); + List updatePaths = []; int numUpdatesLoaded = 0; numUpdatesRemoved = 0; try { - HashSet titleIdsToSave = new(); - HashSet titleIdsToRefresh = new(); + HashSet titleIdsToSave = []; + HashSet titleIdsToRefresh = []; // Remove any updates which can no longer be located on disk List<(TitleUpdateModel TitleUpdate, bool IsSelected)> updatesToRemove = _titleUpdates.Items diff --git a/src/Ryujinx/Utilities/CommandLineState.cs b/src/Ryujinx/Utilities/CommandLineState.cs index 6fb8e92d6..96b5d1b86 100644 --- a/src/Ryujinx/Utilities/CommandLineState.cs +++ b/src/Ryujinx/Utilities/CommandLineState.cs @@ -20,7 +20,7 @@ namespace Ryujinx.Ava.Utilities public static void ParseArguments(string[] args) { - List arguments = new(); + List arguments = []; // Parse Arguments. for (int i = 0; i < args.Length; ++i) diff --git a/src/Ryujinx/Utilities/DownloadableContentsHelper.cs b/src/Ryujinx/Utilities/DownloadableContentsHelper.cs index e46d1498a..0bafff9aa 100644 --- a/src/Ryujinx/Utilities/DownloadableContentsHelper.cs +++ b/src/Ryujinx/Utilities/DownloadableContentsHelper.cs @@ -45,7 +45,7 @@ namespace Ryujinx.Ava.Utilities public static void SaveDownloadableContentsJson(ulong applicationIdBase, List<(DownloadableContentModel, bool IsEnabled)> dlcs) { DownloadableContentContainer container = default; - List downloadableContentContainerList = new(); + List downloadableContentContainerList = []; foreach ((DownloadableContentModel dlc, bool isEnabled) in dlcs) { @@ -82,7 +82,7 @@ namespace Ryujinx.Ava.Utilities private static List<(DownloadableContentModel, bool IsEnabled)> LoadDownloadableContents(VirtualFileSystem vfs, List downloadableContentContainers) { - List<(DownloadableContentModel, bool IsEnabled)> result = new(); + List<(DownloadableContentModel, bool IsEnabled)> result = []; foreach (DownloadableContentContainer downloadableContentContainer in downloadableContentContainers) { diff --git a/src/Ryujinx/Utilities/ShortcutHelper.cs b/src/Ryujinx/Utilities/ShortcutHelper.cs index ff89725d8..db843959f 100644 --- a/src/Ryujinx/Utilities/ShortcutHelper.cs +++ b/src/Ryujinx/Utilities/ShortcutHelper.cs @@ -124,7 +124,7 @@ namespace Ryujinx.Ava.Utilities private static string GetArgsString(string appFilePath, string applicationId) { // args are first defined as a list, for easier adjustments in the future - List argsList = new(); + List argsList = []; if (!string.IsNullOrEmpty(CommandLineState.BaseDirPathArg)) { @@ -152,7 +152,7 @@ namespace Ryujinx.Ava.Utilities private static void SaveBitmapAsIcon(SKBitmap source, string filePath) { // Code Modified From https://stackoverflow.com/a/11448060/368354 by Benlitz - byte[] header = { 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1, 0, 32, 0, 0, 0, 0, 0, 22, 0, 0, 0 }; + byte[] header = [0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1, 0, 32, 0, 0, 0, 0, 0, 22, 0, 0, 0]; using FileStream fs = new(filePath, FileMode.Create); fs.Write(header); diff --git a/src/Ryujinx/Utilities/TitleUpdatesHelper.cs b/src/Ryujinx/Utilities/TitleUpdatesHelper.cs index fd3bb641c..12dd234d7 100644 --- a/src/Ryujinx/Utilities/TitleUpdatesHelper.cs +++ b/src/Ryujinx/Utilities/TitleUpdatesHelper.cs @@ -79,7 +79,7 @@ namespace Ryujinx.Ava.Utilities private static List<(TitleUpdateModel Update, bool IsSelected)> LoadTitleUpdates(VirtualFileSystem vfs, TitleUpdateMetadata titleUpdateMetadata, ulong applicationIdBase) { - List<(TitleUpdateModel, bool IsSelected)> result = new(); + List<(TitleUpdateModel, bool IsSelected)> result = []; IntegrityCheckLevel checkLevel = ConfigurationState.Instance.System.EnableFsIntegrityChecks ? IntegrityCheckLevel.ErrorOnInvalid diff --git a/src/Ryujinx/Utilities/ValueFormatUtils.cs b/src/Ryujinx/Utilities/ValueFormatUtils.cs index e0a8b0457..535518409 100644 --- a/src/Ryujinx/Utilities/ValueFormatUtils.cs +++ b/src/Ryujinx/Utilities/ValueFormatUtils.cs @@ -10,10 +10,10 @@ namespace Ryujinx.Ava.Utilities public static class ValueFormatUtils { private static readonly string[] _fileSizeUnitStrings = - { + [ "B", "KiB", "MiB", "GiB", "TiB", "PiB", "EiB", // Base 10 units, used for formatting and parsing - "KB", "MB", "GB", "TB", "PB", "EB", // Base 2 units, used for parsing legacy values - }; + "KB", "MB", "GB", "TB", "PB", "EB" // Base 2 units, used for parsing legacy values + ]; /// /// Used by .