Codebase: Make private service fields readonly (#11011)

hecksmosis · web-flow · commit 362434d835ae · 2023-02-02T13:12:22.000-05:00
diff --git a/src/Files.App/Filesystem/FilesystemOperations/FilesystemOperations.cs b/src/Files.App/Filesystem/FilesystemOperations/FilesystemOperations.cs
@@ -29,8 +29,6 @@ public enum ImpossibleActionResponseTypes
 
 	public class FilesystemOperations : IFilesystemOperations
 	{
-		private IDialogService DialogService { get; } = Ioc.Default.GetRequiredService<IDialogService>();
-
 		private IShellPage associatedInstance;
 
 		#region Constructor
diff --git a/src/Files.App/Filesystem/FilesystemOperations/ShellFilesystemOperations.cs b/src/Files.App/Filesystem/FilesystemOperations/ShellFilesystemOperations.cs
@@ -27,8 +27,6 @@ public class ShellFilesystemOperations : IFilesystemOperations
 
 		private FilesystemOperations filesystemOperations;
 
-		private IDialogService DialogService { get; } = Ioc.Default.GetRequiredService<IDialogService>();
-
 		#endregion Private Members
 
 		#region Constructor
diff --git a/src/Files.App/Filesystem/ListedItem.cs b/src/Files.App/Filesystem/ListedItem.cs
@@ -29,9 +29,9 @@ public class ListedItem : ObservableObject, IGroupableItem
 	{
 		protected static IUserSettingsService UserSettingsService { get; } = Ioc.Default.GetRequiredService<IUserSettingsService>();
 
-		protected static IFileTagsSettingsService FileTagsSettingsService { get; } = Ioc.Default.GetRequiredService<IFileTagsSettingsService>();
+		protected static readonly IFileTagsSettingsService fileTagsSettingsService = Ioc.Default.GetRequiredService<IFileTagsSettingsService>();
 
-		protected static IDateTimeFormatter DateTimeFormatter { get; } = Ioc.Default.GetRequiredService<IDateTimeFormatter>();
+		protected static readonly IDateTimeFormatter dateTimeFormatter = Ioc.Default.GetRequiredService<IDateTimeFormatter>();
 
 		public bool IsHiddenItem { get; set; } = false;
 
@@ -140,7 +140,7 @@ public string[] FileTags
 
 		public IList<TagViewModel> FileTagsUI
 		{
-			get => FileTagsSettingsService.GetTagsByIds(FileTags);
+			get => fileTagsSettingsService.GetTagsByIds(FileTags);
 		}
 
 		private Uri customIconSource;
@@ -326,7 +326,7 @@ public DateTimeOffset ItemDateModifiedReal
 			get => itemDateModifiedReal;
 			set
 			{
-				ItemDateModified = DateTimeFormatter.ToShortLabel(value);
+				ItemDateModified = dateTimeFormatter.ToShortLabel(value);
 				itemDateModifiedReal = value;
 				OnPropertyChanged(nameof(ItemDateModified));
 			}
@@ -338,7 +338,7 @@ public DateTimeOffset ItemDateCreatedReal
 			get => itemDateCreatedReal;
 			set
 			{
-				ItemDateCreated = DateTimeFormatter.ToShortLabel(value);
+				ItemDateCreated = dateTimeFormatter.ToShortLabel(value);
 				itemDateCreatedReal = value;
 				OnPropertyChanged(nameof(ItemDateCreated));
 			}
@@ -350,7 +350,7 @@ public DateTimeOffset ItemDateAccessedReal
 			get => itemDateAccessedReal;
 			set
 			{
-				ItemDateAccessed = DateTimeFormatter.ToShortLabel(value);
+				ItemDateAccessed = dateTimeFormatter.ToShortLabel(value);
 				itemDateAccessedReal = value;
 				OnPropertyChanged(nameof(ItemDateAccessed));
 			}
@@ -455,7 +455,7 @@ public DateTimeOffset ItemDateDeletedReal
 			get => itemDateDeletedReal;
 			set
 			{
-				ItemDateDeleted = DateTimeFormatter.ToShortLabel(value);
+				ItemDateDeleted = dateTimeFormatter.ToShortLabel(value);
 				itemDateDeletedReal = value;
 			}
 		}
diff --git a/src/Files.App/Filesystem/Search/FolderSearch.cs b/src/Files.App/Filesystem/Search/FolderSearch.cs
@@ -24,7 +24,7 @@ public class FolderSearch
 	{
 		private IUserSettingsService UserSettingsService { get; } = Ioc.Default.GetRequiredService<IUserSettingsService>();
 
-		private IFileTagsSettingsService FileTagsSettingsService { get; } = Ioc.Default.GetRequiredService<IFileTagsSettingsService>();
+		private readonly IFileTagsSettingsService fileTagsSettingsService = Ioc.Default.GetRequiredService<IFileTagsSettingsService>();
 
 		private const uint defaultStepSize = 500;
 
@@ -189,7 +189,7 @@ private async Task SearchTagsAsync(string folder, IList<ListedItem> results, Can
 		{
 			//var sampler = new IntervalSampler(500);
 			var tags = AQSQuery.Substring("tag:".Length)?.Split(',').Where(t => !string.IsNullOrWhiteSpace(t))
-				.SelectMany(t => FileTagsSettingsService.GetTagsByName(t), (_, t) => t.Uid).ToHashSet();
+				.SelectMany(t => fileTagsSettingsService.GetTagsByName(t), (_, t) => t.Uid).ToHashSet();
 			if (tags?.Any() != true)
 			{
 				return;
diff --git a/src/Files.App/ServicesImplementation/FileTagsService.cs b/src/Files.App/ServicesImplementation/FileTagsService.cs
@@ -20,7 +20,7 @@ internal sealed class FileTagsService : IFileTagsService
 	{
 		private IStorageService StorageService { get; } = Ioc.Default.GetRequiredService<IStorageService>();
 
-		private IFileTagsSettingsService FileTagsSettingsService { get; } = Ioc.Default.GetRequiredService<IFileTagsSettingsService>();
+		private readonly IFileTagsSettingsService FileTagsSettingsService = Ioc.Default.GetRequiredService<IFileTagsSettingsService>();
 
 		/// <inheritdoc/>
 		public Task<bool> IsSupportedAsync()
diff --git a/src/Files.App/ViewModels/ItemViewModel.cs b/src/Files.App/ViewModels/ItemViewModel.cs
@@ -62,10 +62,10 @@ public class ItemViewModel : ObservableObject, IDisposable
 		// files and folders list for manipulating
 		private List<ListedItem> filesAndFolders;
 
-		private IDialogService DialogService { get; } = Ioc.Default.GetRequiredService<IDialogService>();
+		private readonly IDialogService dialogService = Ioc.Default.GetRequiredService<IDialogService>();
 		private IUserSettingsService UserSettingsService { get; } = Ioc.Default.GetRequiredService<IUserSettingsService>();
-		private IFileTagsSettingsService FileTagsSettingsService { get; } = Ioc.Default.GetRequiredService<IFileTagsSettingsService>();
-		private ISizeProvider FolderSizeProvider { get; } = Ioc.Default.GetRequiredService<ISizeProvider>();
+		private readonly IFileTagsSettingsService fileTagsSettingsService = Ioc.Default.GetRequiredService<IFileTagsSettingsService>();
+		private readonly ISizeProvider folderSizeProvider = Ioc.Default.GetRequiredService<ISizeProvider>();
 
 		// only used for Binding and ApplyFilesAndFoldersChangesAsync, don't manipulate on this!
 		public BulkConcurrentObservableCollection<ListedItem> FilesAndFolders { get; }
@@ -377,8 +377,8 @@ public ItemViewModel(FolderSettingsViewModel folderSettingsViewModel)
 			dispatcherQueue = DispatcherQueue.GetForCurrentThread();
 
 			UserSettingsService.OnSettingChangedEvent += UserSettingsService_OnSettingChangedEvent;
-			FileTagsSettingsService.OnSettingImportedEvent += FileTagsSettingsService_OnSettingImportedEvent;
-			FolderSizeProvider.SizeChanged += FolderSizeProvider_SizeChanged;
+			fileTagsSettingsService.OnSettingImportedEvent += FileTagsSettingsService_OnSettingImportedEvent;
+			folderSizeProvider.SizeChanged += FolderSizeProvider_SizeChanged;
 			RecycleBinManager.Default.RecycleBinItemCreated += RecycleBinItemCreated;
 			RecycleBinManager.Default.RecycleBinItemDeleted += RecycleBinItemDeleted;
 			RecycleBinManager.Default.RecycleBinRefreshRequested += RecycleBinRefreshRequested;
@@ -1408,7 +1408,7 @@ await dispatcherQueue.EnqueueAsync(async () =>
 							{
 								var credentialDialogViewModel = new CredentialDialogViewModel();
 
-								if (await DialogService.ShowDialogAsync(credentialDialogViewModel) != DialogResult.Primary)
+								if (await dialogService.ShowDialogAsync(credentialDialogViewModel) != DialogResult.Primary)
 									return;
 
 								// Can't do more than that to mitigate immutability of strings. Perhaps convert DisposableArray to SecureString immediately?
@@ -2235,8 +2235,8 @@ public void Dispose()
 			RecycleBinManager.Default.RecycleBinItemDeleted -= RecycleBinItemDeleted;
 			RecycleBinManager.Default.RecycleBinRefreshRequested -= RecycleBinRefreshRequested;
 			UserSettingsService.OnSettingChangedEvent -= UserSettingsService_OnSettingChangedEvent;
-			FileTagsSettingsService.OnSettingImportedEvent -= FileTagsSettingsService_OnSettingImportedEvent;
-			FolderSizeProvider.SizeChanged -= FolderSizeProvider_SizeChanged;
+			fileTagsSettingsService.OnSettingImportedEvent -= FileTagsSettingsService_OnSettingImportedEvent;
+			folderSizeProvider.SizeChanged -= FolderSizeProvider_SizeChanged;
 			DefaultIcons.Clear();
 		}
 	}
diff --git a/src/Files.App/ViewModels/PreviewPaneViewModel.cs b/src/Files.App/ViewModels/PreviewPaneViewModel.cs
@@ -24,7 +24,7 @@ public class PreviewPaneViewModel : ObservableObject, IDisposable
 	{
 		private IUserSettingsService UserSettingsService { get; } = Ioc.Default.GetRequiredService<IUserSettingsService>();
 
-		private IPreviewPaneSettingsService PreviewSettingsService { get; } = Ioc.Default.GetRequiredService<IPreviewPaneSettingsService>();
+		private readonly IPreviewPaneSettingsService previewSettingsService = Ioc.Default.GetRequiredService<IPreviewPaneSettingsService>();
 
 		private CancellationTokenSource loadCancellationTokenSource;
 
@@ -34,7 +34,7 @@ public bool IsEnabled
 			get => isEnabled;
 			set
 			{
-				PreviewSettingsService.IsEnabled = value;
+				previewSettingsService.IsEnabled = value;
 				SetProperty(ref isEnabled, value);
 			}
 		}
@@ -78,9 +78,9 @@ public PreviewPaneViewModel()
 		{
 			ShowPreviewOnlyInvoked = new RelayCommand(() => UpdateSelectedItemPreview());
 
-			IsEnabled = PreviewSettingsService.IsEnabled;
+			IsEnabled = previewSettingsService.IsEnabled;
 			UserSettingsService.OnSettingChangedEvent += UserSettingsService_OnSettingChangedEvent;
-			PreviewSettingsService.PropertyChanged += PreviewSettingsService_OnPropertyChangedEvent;
+			previewSettingsService.PropertyChanged += PreviewSettingsService_OnPropertyChangedEvent;
 		}
 
 		private async Task LoadPreviewControlAsync(CancellationToken token, bool downloadItem)
@@ -289,7 +289,7 @@ private void PreviewSettingsService_OnPropertyChangedEvent(object sender, Proper
 		{
 			if (e.PropertyName is nameof(IPreviewPaneSettingsService.IsEnabled))
 			{
-				var newEnablingStatus = PreviewSettingsService.IsEnabled;
+				var newEnablingStatus = previewSettingsService.IsEnabled;
 				if (isEnabled != newEnablingStatus)
 				{
 					isEnabled = newEnablingStatus;
@@ -332,7 +332,7 @@ public void TryRefresh()
 		public void Dispose()
 		{
 			UserSettingsService.OnSettingChangedEvent -= UserSettingsService_OnSettingChangedEvent;
-			PreviewSettingsService.PropertyChanged -= PreviewSettingsService_OnPropertyChangedEvent;
+			previewSettingsService.PropertyChanged -= PreviewSettingsService_OnPropertyChangedEvent;
 		}
 	}
 
diff --git a/src/Files.App/ViewModels/SettingsViewModels/AboutViewModel.cs b/src/Files.App/ViewModels/SettingsViewModels/AboutViewModel.cs
@@ -17,8 +17,7 @@ namespace Files.App.ViewModels.SettingsViewModels
 {
 	public class AboutViewModel : ObservableObject
 	{
-		private IUserSettingsService UserSettingsService { get; } = Ioc.Default.GetRequiredService<IUserSettingsService>();
-		protected IFileTagsSettingsService FileTagsSettingsService { get; } = Ioc.Default.GetRequiredService<IFileTagsSettingsService>();
+		protected readonly IFileTagsSettingsService FileTagsSettingsService = Ioc.Default.GetRequiredService<IFileTagsSettingsService>();
 
 		public ICommand CopyVersionInfoCommand { get; }
 		public ICommand SupportUsCommand { get; }
diff --git a/src/Files.App/ViewModels/SettingsViewModels/AdvancedViewModel.cs b/src/Files.App/ViewModels/SettingsViewModels/AdvancedViewModel.cs
@@ -26,8 +26,8 @@ namespace Files.App.ViewModels.SettingsViewModels
 	public class AdvancedViewModel : ObservableObject
 	{
 		private IUserSettingsService UserSettingsService { get; } = Ioc.Default.GetRequiredService<IUserSettingsService>();
-		private IBundlesSettingsService BundlesSettingsService { get; } = Ioc.Default.GetRequiredService<IBundlesSettingsService>();
-		private IFileTagsSettingsService FileTagsSettingsService { get; } = Ioc.Default.GetRequiredService<IFileTagsSettingsService>();
+		private readonly IBundlesSettingsService bundlesSettingsService = Ioc.Default.GetRequiredService<IBundlesSettingsService>();
+		private readonly IFileTagsSettingsService fileTagsSettingsService = Ioc.Default.GetRequiredService<IFileTagsSettingsService>();
 
 
 		public ICommand EditFileTagsCommand { get; }
@@ -190,11 +190,11 @@ private async Task ImportSettings()
 					// Import bundles
 					var bundles = await zipFolder.GetFileAsync(Constants.LocalSettings.BundlesSettingsFileName);
 					string importBundles = await bundles.ReadTextAsync();
-					BundlesSettingsService.ImportSettings(importBundles);
+					bundlesSettingsService.ImportSettings(importBundles);
 					// Import file tags list and DB
 					var fileTagsList = await zipFolder.GetFileAsync(Constants.LocalSettings.FileTagSettingsFileName);
 					string importTags = await fileTagsList.ReadTextAsync();
-					FileTagsSettingsService.ImportSettings(importTags);
+					fileTagsSettingsService.ImportSettings(importTags);
 					var fileTagsDB = await zipFolder.GetFileAsync(Path.GetFileName(FileTagsHelper.FileTagsDbPath));
 					string importTagsDB = await fileTagsDB.ReadTextAsync();
 					var tagDbInstance = FileTagsHelper.GetDbInstance();
@@ -236,10 +236,10 @@ private async Task ExportSettings()
 					var exportSettings = UTF8Encoding.UTF8.GetBytes((string)UserSettingsService.ExportSettings());
 					await zipFolder.CreateFileAsync(new MemoryStream(exportSettings), Constants.LocalSettings.UserSettingsFileName, CreationCollisionOption.ReplaceExisting);
 					// Export bundles
-					var exportBundles = UTF8Encoding.UTF8.GetBytes((string)BundlesSettingsService.ExportSettings());
+					var exportBundles = UTF8Encoding.UTF8.GetBytes((string)bundlesSettingsService.ExportSettings());
 					await zipFolder.CreateFileAsync(new MemoryStream(exportBundles), Constants.LocalSettings.BundlesSettingsFileName, CreationCollisionOption.ReplaceExisting);
 					// Export file tags list and DB
-					var exportTags = UTF8Encoding.UTF8.GetBytes((string)FileTagsSettingsService.ExportSettings());
+					var exportTags = UTF8Encoding.UTF8.GetBytes((string)fileTagsSettingsService.ExportSettings());
 					await zipFolder.CreateFileAsync(new MemoryStream(exportTags), Constants.LocalSettings.FileTagSettingsFileName, CreationCollisionOption.ReplaceExisting);
 					var tagDbInstance = FileTagsHelper.GetDbInstance();
 					byte[] exportTagsDB = UTF8Encoding.UTF8.GetBytes(tagDbInstance.Export());
diff --git a/src/Files.App/ViewModels/Widgets/Bundles/BundleItemViewModel.cs b/src/Files.App/ViewModels/Widgets/Bundles/BundleItemViewModel.cs
@@ -33,7 +33,7 @@ public class BundleItemViewModel : ObservableObject, IDisposable
 
 		private IUserSettingsService UserSettingsService { get; } = Ioc.Default.GetRequiredService<IUserSettingsService>();
 
-		private IBundlesSettingsService BundlesSettingsService { get; } = Ioc.Default.GetRequiredService<IBundlesSettingsService>();
+		private readonly IBundlesSettingsService bundlesSettingsService = Ioc.Default.GetRequiredService<IBundlesSettingsService>();
 
 		/// <summary>
 		/// The name of a bundle this item is contained within
@@ -147,11 +147,11 @@ public void OpenItem()
 
 		public void RemoveItem()
 		{
-			if (BundlesSettingsService.SavedBundles.ContainsKey(ParentBundleName))
+			if (bundlesSettingsService.SavedBundles.ContainsKey(ParentBundleName))
 			{
-				Dictionary<string, List<string>> allBundles = BundlesSettingsService.SavedBundles;
+				Dictionary<string, List<string>> allBundles = bundlesSettingsService.SavedBundles;
 				allBundles[ParentBundleName].Remove(Path);
-				BundlesSettingsService.SavedBundles = allBundles;
+				bundlesSettingsService.SavedBundles = allBundles;
 				NotifyItemRemoved(this);
 			}
 		}
diff --git a/src/Files.App/Views/ColumnShellPage.xaml.cs b/src/Files.App/Views/ColumnShellPage.xaml.cs
@@ -61,11 +61,11 @@ public sealed partial class ColumnShellPage : Page, IShellPage, INotifyPropertyC
 
 		public bool IsColumnView { get; } = true;
 
-		private IDialogService DialogService { get; } = Ioc.Default.GetRequiredService<IDialogService>();
+		private readonly IDialogService dialogService = Ioc.Default.GetRequiredService<IDialogService>();
 
 		private IUserSettingsService UserSettingsService { get; } = Ioc.Default.GetRequiredService<IUserSettingsService>();
 
-		private IUpdateService UpdateSettingsService { get; } = Ioc.Default.GetRequiredService<IUpdateService>();
+		private readonly IUpdateService updateSettingsService = Ioc.Default.GetRequiredService<IUpdateService>();
 
 		private bool isCurrentInstance = false;
 		public bool IsCurrentInstance
@@ -296,7 +296,7 @@ private void InitToolbarCommands()
 			ToolbarViewModel.RotateImageLeftCommand = new RelayCommand(() => SlimContentPage?.CommandsViewModel.RotateImageLeftCommand.Execute(null), () => SlimContentPage?.CommandsViewModel.RotateImageLeftCommand.CanExecute(null) == true);
 			ToolbarViewModel.RotateImageRightCommand = new RelayCommand(() => SlimContentPage?.CommandsViewModel.RotateImageRightCommand.Execute(null), () => SlimContentPage?.CommandsViewModel.RotateImageRightCommand.CanExecute(null) == true);
 			ToolbarViewModel.InstallFontCommand = new RelayCommand(() => SlimContentPage?.CommandsViewModel.InstallFontCommand.Execute(null));
-			ToolbarViewModel.UpdateCommand = new AsyncRelayCommand(async () => await UpdateSettingsService.DownloadUpdates());
+			ToolbarViewModel.UpdateCommand = new AsyncRelayCommand(async () => await updateSettingsService.DownloadUpdates());
 		}
 
 		private void FolderSettings_LayoutPreferencesUpdateRequired(object sender, LayoutPreferenceEventArgs e)
@@ -689,7 +689,7 @@ private async void KeyboardAccelerator_Invoked(KeyboardAccelerator sender, Keybo
 					if (InstanceViewModel.CanCreateFileInPage)
 					{
 						var addItemDialogViewModel = new AddItemDialogViewModel();
-						await DialogService.ShowDialogAsync(addItemDialogViewModel);
+						await dialogService.ShowDialogAsync(addItemDialogViewModel);
 						if (addItemDialogViewModel.ResultType.ItemType == AddItemDialogItemType.Shortcut)
 							CreateNewShortcutFromDialog();
 						else if (addItemDialogViewModel.ResultType.ItemType != AddItemDialogItemType.Cancel)
diff --git a/src/Files.App/Views/ModernShellPage.xaml.cs b/src/Files.App/Views/ModernShellPage.xaml.cs
@@ -51,11 +51,11 @@ public sealed partial class ModernShellPage : Page, IShellPage, INotifyPropertyC
 		public FolderSettingsViewModel FolderSettings => InstanceViewModel?.FolderSettings;
 		public AppModel AppModel => App.AppModel;
 
-		private IDialogService DialogService { get; } = Ioc.Default.GetRequiredService<IDialogService>();
+		private readonly IDialogService dialogService = Ioc.Default.GetRequiredService<IDialogService>();
 
 		private IUserSettingsService UserSettingsService { get; } = Ioc.Default.GetRequiredService<IUserSettingsService>();
 
-		private IUpdateService UpdateSettingsService { get; } = Ioc.Default.GetRequiredService<IUpdateService>();
+		private readonly IUpdateService updateSettingsService = Ioc.Default.GetRequiredService<IUpdateService>();
 
 		private bool isCurrentInstance = false;
 		public bool IsCurrentInstance
@@ -271,7 +271,7 @@ private void InitToolbarCommands()
 			ToolbarViewModel.RotateImageLeftCommand = new RelayCommand(() => SlimContentPage?.CommandsViewModel.RotateImageLeftCommand.Execute(null), () => SlimContentPage?.CommandsViewModel.RotateImageLeftCommand.CanExecute(null) == true);
 			ToolbarViewModel.RotateImageRightCommand = new RelayCommand(() => SlimContentPage?.CommandsViewModel.RotateImageRightCommand.Execute(null), () => SlimContentPage?.CommandsViewModel.RotateImageRightCommand.CanExecute(null) == true);
 			ToolbarViewModel.InstallFontCommand = new RelayCommand(() => SlimContentPage?.CommandsViewModel.InstallFontCommand.Execute(null));
-			ToolbarViewModel.UpdateCommand = new AsyncRelayCommand(async () => await UpdateSettingsService.DownloadUpdates());
+			ToolbarViewModel.UpdateCommand = new AsyncRelayCommand(async () => await updateSettingsService.DownloadUpdates());
 		}
 
 		private void ModernShellPage_RefreshWidgetsRequested(object sender, EventArgs e)
@@ -701,7 +701,7 @@ private async void KeyboardAccelerator_Invoked(KeyboardAccelerator sender, Keybo
 					if (InstanceViewModel.CanCreateFileInPage)
 					{
 						var addItemDialogViewModel = new AddItemDialogViewModel();
-						await DialogService.ShowDialogAsync(addItemDialogViewModel);
+						await dialogService.ShowDialogAsync(addItemDialogViewModel);
 						if (addItemDialogViewModel.ResultType.ItemType == AddItemDialogItemType.Shortcut)
 							CreateNewShortcutFromDialog();
 						else if (addItemDialogViewModel.ResultType.ItemType != AddItemDialogItemType.Cancel)

Original file line number	Diff line number	Diff line change
`@@ -29,8 +29,6 @@ public enum ImpossibleActionResponseTypes`
`29`	`29`
`30`	`30`	`public class FilesystemOperations : IFilesystemOperations`
`31`	`31`	`{`
`32`		`- private IDialogService DialogService { get; } = Ioc.Default.GetRequiredService<IDialogService>();`
`33`		`-`
`34`	`32`	`private IShellPage associatedInstance;`
`35`	`33`
`36`	`34`	`#region Constructor`
Original file line number	Diff line number	Diff line change
`@@ -29,9 +29,9 @@ public class ListedItem : ObservableObject, IGroupableItem`
`29`	`29`	`{`
`30`	`30`	`protected static IUserSettingsService UserSettingsService { get; } = Ioc.Default.GetRequiredService<IUserSettingsService>();`
`31`	`31`
`32`		`- protected static IFileTagsSettingsService FileTagsSettingsService { get; } = Ioc.Default.GetRequiredService<IFileTagsSettingsService>();`
	`32`	`+ protected static readonly IFileTagsSettingsService fileTagsSettingsService = Ioc.Default.GetRequiredService<IFileTagsSettingsService>();`
`33`	`33`
`34`		`- protected static IDateTimeFormatter DateTimeFormatter { get; } = Ioc.Default.GetRequiredService<IDateTimeFormatter>();`
	`34`	`+ protected static readonly IDateTimeFormatter dateTimeFormatter = Ioc.Default.GetRequiredService<IDateTimeFormatter>();`
`35`	`35`
`36`	`36`	`public bool IsHiddenItem { get; set; } = false;`
`37`	`37`
`@@ -140,7 +140,7 @@ public string[] FileTags`
`140`	`140`
`141`	`141`	`public IList<TagViewModel> FileTagsUI`
`142`	`142`	`{`
`143`		`- get => FileTagsSettingsService.GetTagsByIds(FileTags);`
	`143`	`+ get => fileTagsSettingsService.GetTagsByIds(FileTags);`
`144`	`144`	`}`
`145`	`145`
`146`	`146`	`private Uri customIconSource;`
`@@ -326,7 +326,7 @@ public DateTimeOffset ItemDateModifiedReal`
`326`	`326`	`get => itemDateModifiedReal;`
`327`	`327`	`set`
`328`	`328`	`{`
`329`		`- ItemDateModified = DateTimeFormatter.ToShortLabel(value);`
	`329`	`+ ItemDateModified = dateTimeFormatter.ToShortLabel(value);`
`330`	`330`	`itemDateModifiedReal = value;`
`331`	`331`	`OnPropertyChanged(nameof(ItemDateModified));`
`332`	`332`	`}`
`@@ -338,7 +338,7 @@ public DateTimeOffset ItemDateCreatedReal`
`338`	`338`	`get => itemDateCreatedReal;`
`339`	`339`	`set`
`340`	`340`	`{`
`341`		`- ItemDateCreated = DateTimeFormatter.ToShortLabel(value);`
	`341`	`+ ItemDateCreated = dateTimeFormatter.ToShortLabel(value);`
`342`	`342`	`itemDateCreatedReal = value;`
`343`	`343`	`OnPropertyChanged(nameof(ItemDateCreated));`
`344`	`344`	`}`
`@@ -350,7 +350,7 @@ public DateTimeOffset ItemDateAccessedReal`
`350`	`350`	`get => itemDateAccessedReal;`
`351`	`351`	`set`
`352`	`352`	`{`
`353`		`- ItemDateAccessed = DateTimeFormatter.ToShortLabel(value);`
	`353`	`+ ItemDateAccessed = dateTimeFormatter.ToShortLabel(value);`
`354`	`354`	`itemDateAccessedReal = value;`
`355`	`355`	`OnPropertyChanged(nameof(ItemDateAccessed));`
`356`	`356`	`}`
`@@ -455,7 +455,7 @@ public DateTimeOffset ItemDateDeletedReal`
`455`	`455`	`get => itemDateDeletedReal;`
`456`	`456`	`set`
`457`	`457`	`{`
`458`		`- ItemDateDeleted = DateTimeFormatter.ToShortLabel(value);`
	`458`	`+ ItemDateDeleted = dateTimeFormatter.ToShortLabel(value);`
`459`	`459`	`itemDateDeletedReal = value;`
`460`	`460`	`}`
`461`	`461`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ public class FolderSearch`
`24`	`24`	`{`
`25`	`25`	`private IUserSettingsService UserSettingsService { get; } = Ioc.Default.GetRequiredService<IUserSettingsService>();`
`26`	`26`
`27`		`- private IFileTagsSettingsService FileTagsSettingsService { get; } = Ioc.Default.GetRequiredService<IFileTagsSettingsService>();`
	`27`	`+ private readonly IFileTagsSettingsService fileTagsSettingsService = Ioc.Default.GetRequiredService<IFileTagsSettingsService>();`
`28`	`28`
`29`	`29`	`private const uint defaultStepSize = 500;`
`30`	`30`
`@@ -189,7 +189,7 @@ private async Task SearchTagsAsync(string folder, IList<ListedItem> results, Can`
`189`	`189`	`{`
`190`	`190`	`//var sampler = new IntervalSampler(500);`
`191`	`191`	`var tags = AQSQuery.Substring("tag:".Length)?.Split(',').Where(t => !string.IsNullOrWhiteSpace(t))`
`192`		`- .SelectMany(t => FileTagsSettingsService.GetTagsByName(t), (_, t) => t.Uid).ToHashSet();`
	`192`	`+ .SelectMany(t => fileTagsSettingsService.GetTagsByName(t), (_, t) => t.Uid).ToHashSet();`
`193`	`193`	`if (tags?.Any() != true)`
`194`	`194`	`{`
`195`	`195`	`return;`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ internal sealed class FileTagsService : IFileTagsService`
`20`	`20`	`{`
`21`	`21`	`private IStorageService StorageService { get; } = Ioc.Default.GetRequiredService<IStorageService>();`
`22`	`22`
`23`		`- private IFileTagsSettingsService FileTagsSettingsService { get; } = Ioc.Default.GetRequiredService<IFileTagsSettingsService>();`
	`23`	`+ private readonly IFileTagsSettingsService FileTagsSettingsService = Ioc.Default.GetRequiredService<IFileTagsSettingsService>();`
`24`	`24`
`25`	`25`	`/// <inheritdoc/>`
`26`	`26`	`public Task<bool> IsSupportedAsync()`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ public class PreviewPaneViewModel : ObservableObject, IDisposable`
`24`	`24`	`{`
`25`	`25`	`private IUserSettingsService UserSettingsService { get; } = Ioc.Default.GetRequiredService<IUserSettingsService>();`
`26`	`26`
`27`		`- private IPreviewPaneSettingsService PreviewSettingsService { get; } = Ioc.Default.GetRequiredService<IPreviewPaneSettingsService>();`
	`27`	`+ private readonly IPreviewPaneSettingsService previewSettingsService = Ioc.Default.GetRequiredService<IPreviewPaneSettingsService>();`
`28`	`28`
`29`	`29`	`private CancellationTokenSource loadCancellationTokenSource;`
`30`	`30`
`@@ -34,7 +34,7 @@ public bool IsEnabled`
`34`	`34`	`get => isEnabled;`
`35`	`35`	`set`
`36`	`36`	`{`
`37`		`- PreviewSettingsService.IsEnabled = value;`
	`37`	`+ previewSettingsService.IsEnabled = value;`
`38`	`38`	`SetProperty(ref isEnabled, value);`
`39`	`39`	`}`
`40`	`40`	`}`
`@@ -78,9 +78,9 @@ public PreviewPaneViewModel()`
`78`	`78`	`{`
`79`	`79`	`ShowPreviewOnlyInvoked = new RelayCommand(() => UpdateSelectedItemPreview());`
`80`	`80`
`81`		`- IsEnabled = PreviewSettingsService.IsEnabled;`
	`81`	`+ IsEnabled = previewSettingsService.IsEnabled;`
`82`	`82`	`UserSettingsService.OnSettingChangedEvent += UserSettingsService_OnSettingChangedEvent;`
`83`		`- PreviewSettingsService.PropertyChanged += PreviewSettingsService_OnPropertyChangedEvent;`
	`83`	`+ previewSettingsService.PropertyChanged += PreviewSettingsService_OnPropertyChangedEvent;`
`84`	`84`	`}`
`85`	`85`
`86`	`86`	`private async Task LoadPreviewControlAsync(CancellationToken token, bool downloadItem)`
`@@ -289,7 +289,7 @@ private void PreviewSettingsService_OnPropertyChangedEvent(object sender, Proper`
`289`	`289`	`{`
`290`	`290`	`if (e.PropertyName is nameof(IPreviewPaneSettingsService.IsEnabled))`
`291`	`291`	`{`
`292`		`- var newEnablingStatus = PreviewSettingsService.IsEnabled;`
	`292`	`+ var newEnablingStatus = previewSettingsService.IsEnabled;`
`293`	`293`	`if (isEnabled != newEnablingStatus)`
`294`	`294`	`{`
`295`	`295`	`isEnabled = newEnablingStatus;`
`@@ -332,7 +332,7 @@ public void TryRefresh()`
`332`	`332`	`public void Dispose()`
`333`	`333`	`{`
`334`	`334`	`UserSettingsService.OnSettingChangedEvent -= UserSettingsService_OnSettingChangedEvent;`
`335`		`- PreviewSettingsService.PropertyChanged -= PreviewSettingsService_OnPropertyChangedEvent;`
	`335`	`+ previewSettingsService.PropertyChanged -= PreviewSettingsService_OnPropertyChangedEvent;`
`336`	`336`	`}`
`337`	`337`	`}`
`338`	`338`
Original file line number	Diff line number	Diff line change
`@@ -17,8 +17,7 @@ namespace Files.App.ViewModels.SettingsViewModels`
`17`	`17`	`{`
`18`	`18`	`public class AboutViewModel : ObservableObject`
`19`	`19`	`{`
`20`		`- private IUserSettingsService UserSettingsService { get; } = Ioc.Default.GetRequiredService<IUserSettingsService>();`
`21`		`- protected IFileTagsSettingsService FileTagsSettingsService { get; } = Ioc.Default.GetRequiredService<IFileTagsSettingsService>();`
	`20`	`+ protected readonly IFileTagsSettingsService FileTagsSettingsService = Ioc.Default.GetRequiredService<IFileTagsSettingsService>();`
`22`	`21`
`23`	`22`	`public ICommand CopyVersionInfoCommand { get; }`
`24`	`23`	`public ICommand SupportUsCommand { get; }`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ public class BundleItemViewModel : ObservableObject, IDisposable`
`33`	`33`
`34`	`34`	`private IUserSettingsService UserSettingsService { get; } = Ioc.Default.GetRequiredService<IUserSettingsService>();`
`35`	`35`
`36`		`- private IBundlesSettingsService BundlesSettingsService { get; } = Ioc.Default.GetRequiredService<IBundlesSettingsService>();`
	`36`	`+ private readonly IBundlesSettingsService bundlesSettingsService = Ioc.Default.GetRequiredService<IBundlesSettingsService>();`
`37`	`37`
`38`	`38`	`/// <summary>`
`39`	`39`	`/// The name of a bundle this item is contained within`
`@@ -147,11 +147,11 @@ public void OpenItem()`
`147`	`147`
`148`	`148`	`public void RemoveItem()`
`149`	`149`	`{`
`150`		`- if (BundlesSettingsService.SavedBundles.ContainsKey(ParentBundleName))`
	`150`	`+ if (bundlesSettingsService.SavedBundles.ContainsKey(ParentBundleName))`
`151`	`151`	`{`
`152`		`- Dictionary<string, List<string>> allBundles = BundlesSettingsService.SavedBundles;`
	`152`	`+ Dictionary<string, List<string>> allBundles = bundlesSettingsService.SavedBundles;`
`153`	`153`	`allBundles[ParentBundleName].Remove(Path);`
`154`		`- BundlesSettingsService.SavedBundles = allBundles;`
	`154`	`+ bundlesSettingsService.SavedBundles = allBundles;`
`155`	`155`	`NotifyItemRemoved(this);`
`156`	`156`	`}`
`157`	`157`	`}`