Code Quality: Moved service interfaces to Contracts & Removed JumpListHelper (#15148)

0x5bfa · web-flow · commit 578529ab0ba1 · 2024-04-14T08:45:17.000-07:00
diff --git a/src/Files.App/Data/Contracts/IAddItemService.cs b/src/Files.App/Data/Contracts/IAddItemService.cs
@@ -1,7 +1,7 @@
 ﻿// Copyright (c) 2024 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
-namespace Files.App.Services
+namespace Files.App.Data.Contracts
 {
 	/// <summary>
 	/// A service to retrieve available item types
diff --git a/src/Files.App/Data/Contracts/IDialogService.cs b/src/Files.App/Data/Contracts/IDialogService.cs
@@ -4,7 +4,7 @@
 using Files.App.ViewModels.Dialogs;
 using Files.App.Data.Enums;
 
-namespace Files.App.Services
+namespace Files.App.Data.Contracts
 {
 	/// <summary>
 	/// A service to manage dialogs.
diff --git a/src/Files.App/Data/Contracts/IFileExplorerService.cs b/src/Files.App/Data/Contracts/IFileExplorerService.cs
@@ -3,7 +3,7 @@
 
 using Files.Core.Storage.LocatableStorage;
 
-namespace Files.App.Services
+namespace Files.App.Data.Contracts
 {
 	/// <summary>
 	/// A service that interacts with the system file explorer.
diff --git a/src/Files.App/Data/Contracts/IFileTagsService.cs b/src/Files.App/Data/Contracts/IFileTagsService.cs
@@ -4,7 +4,7 @@
 using Files.App.ViewModels.FileTags;
 using Files.Core.Storage.LocatableStorage;
 
-namespace Files.App.Services
+namespace Files.App.Data.Contracts
 {
 	/// <summary>
 	/// Represents a service used to manage file tags.
diff --git a/src/Files.App/Data/Contracts/IImageService.cs b/src/Files.App/Data/Contracts/IImageService.cs
@@ -4,7 +4,7 @@
 using Files.Core.Storage;
 using Files.Shared.Utils;
 
-namespace Files.App.Services
+namespace Files.App.Data.Contracts
 {
 	/// <summary>
 	/// Represents a service used for data to image conversion.
diff --git a/src/Files.App/Data/Contracts/ILocalizationService.cs b/src/Files.App/Data/Contracts/ILocalizationService.cs
@@ -1,7 +1,7 @@
 ﻿// Copyright (c) 2024 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
-namespace Files.App.Services
+namespace Files.App.Data.Contracts
 {
 	public interface ILocalizationService
 	{
diff --git a/src/Files.App/Data/Contracts/INetworkDrivesService.cs b/src/Files.App/Data/Contracts/INetworkDrivesService.cs
@@ -3,7 +3,7 @@
 
 using Files.Core.Storage.LocatableStorage;
 
-namespace Files.App.Services
+namespace Files.App.Data.Contracts
 {
 	public interface INetworkDrivesService
 	{
diff --git a/src/Files.App/Data/Contracts/IPreviewPopupProvider.cs b/src/Files.App/Data/Contracts/IPreviewPopupProvider.cs
@@ -1,7 +1,7 @@
 ﻿// Copyright (c) 2024 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
-namespace Files.App.Services
+namespace Files.App.Data.Contracts
 {
 	public interface IPreviewPopupProvider
 	{
diff --git a/src/Files.App/Data/Contracts/IPreviewPopupService.cs b/src/Files.App/Data/Contracts/IPreviewPopupService.cs
@@ -1,7 +1,7 @@
 ﻿// Copyright (c) 2024 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
-namespace Files.App.Services
+namespace Files.App.Data.Contracts
 {
 	public interface IPreviewPopupService : INotifyPropertyChanged
 	{
diff --git a/src/Files.App/Data/Contracts/IQuickAccessService.cs b/src/Files.App/Data/Contracts/IQuickAccessService.cs
@@ -1,7 +1,7 @@
 ﻿// Copyright (c) 2024 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
-namespace Files.App.Services
+namespace Files.App.Data.Contracts
 {
 	public interface IQuickAccessService
 	{
diff --git a/src/Files.App/Data/Contracts/IRemovableDrivesService.cs b/src/Files.App/Data/Contracts/IRemovableDrivesService.cs
@@ -3,7 +3,7 @@
 
 using Files.Core.Storage.LocatableStorage;
 
-namespace Files.App.Services
+namespace Files.App.Data.Contracts
 {
 	/// <summary>
 	/// Represents a service to enumerate drives and create a storage device watcher
diff --git a/src/Files.App/Data/Contracts/IResourcesService.cs b/src/Files.App/Data/Contracts/IResourcesService.cs
@@ -3,7 +3,7 @@
 
 using System.Drawing;
 
-namespace Files.App.Services
+namespace Files.App.Data.Contracts
 {
 	/// <summary>
 	/// Contains methods related to modifying various app theme resources
diff --git a/src/Files.App/Data/Contracts/IStartMenuService.cs b/src/Files.App/Data/Contracts/IStartMenuService.cs
@@ -1,6 +1,6 @@
 ﻿using Files.Core.Storage;
 
-namespace Files.App.Services
+namespace Files.App.Data.Contracts
 {
 	/// <summary>
 	/// A service that manages actions associated with system Start Menu.
diff --git a/src/Files.App/Data/Contracts/IThreadingService.cs b/src/Files.App/Data/Contracts/IThreadingService.cs
@@ -1,7 +1,7 @@
 ﻿// Copyright (c) 2024 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
-namespace Files.App.Services
+namespace Files.App.Data.Contracts
 {
 	public interface IThreadingService
 	{
diff --git a/src/Files.App/Data/Contracts/IUpdateService.cs b/src/Files.App/Data/Contracts/IUpdateService.cs
@@ -1,7 +1,7 @@
 ﻿// Copyright (c) 2024 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
-namespace Files.App.Services
+namespace Files.App.Data.Contracts
 {
 	public interface IUpdateService : INotifyPropertyChanged
 	{
diff --git a/src/Files.App/Data/Contracts/IVolumeInfoFactory.cs b/src/Files.App/Data/Contracts/IVolumeInfoFactory.cs
@@ -1,7 +1,7 @@
 ﻿// Copyright (c) 2024 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
-namespace Files.App.Services
+namespace Files.App.Data.Contracts
 {
 	public interface IVolumeInfoFactory
 	{
diff --git a/src/Files.App/Data/Contracts/IWindowsJumpListService.cs b/src/Files.App/Data/Contracts/IWindowsJumpListService.cs
@@ -1,10 +1,12 @@
 ﻿// Copyright (c) 2024 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
-namespace Files.App.Services
+namespace Files.App.Data.Contracts
 {
-	public interface IJumpListService
+	public interface IWindowsJumpListService
 	{
+		Task InitializeAsync();
+
 		Task AddFolderAsync(string path);
 
 		Task RefreshPinnedFoldersAsync();
diff --git a/src/Files.App/Data/Contracts/ImagingService.cs b/src/Files.App/Data/Contracts/ImagingService.cs
@@ -6,7 +6,7 @@
 using Files.Shared.Utils;
 using Windows.Storage.FileProperties;
 
-namespace Files.App.Services
+namespace Files.App.Data.Contracts
 {
 	internal sealed class ImagingService : IImageService
 	{
diff --git a/src/Files.App/Data/Models/ItemViewModel.cs b/src/Files.App/Data/Models/ItemViewModel.cs
@@ -47,7 +47,7 @@ public sealed class ItemViewModel : ObservableObject, IDisposable
 
 		// Files and folders list for manipulating
 		private ConcurrentCollection<ListedItem> filesAndFolders;
-		private readonly IJumpListService jumpListService = Ioc.Default.GetRequiredService<IJumpListService>();
+		private readonly IWindowsJumpListService jumpListService = Ioc.Default.GetRequiredService<IWindowsJumpListService>();
 		private readonly IDialogService dialogService = Ioc.Default.GetRequiredService<IDialogService>();
 		private IUserSettingsService UserSettingsService { get; } = Ioc.Default.GetRequiredService<IUserSettingsService>();
 		private readonly IFileTagsSettingsService fileTagsSettingsService = Ioc.Default.GetRequiredService<IFileTagsSettingsService>();
diff --git a/src/Files.App/Helpers/Application/AppLifecycleHelper.cs b/src/Files.App/Helpers/Application/AppLifecycleHelper.cs
@@ -66,6 +66,7 @@ public static async Task InitializeAppComponentsAsync()
 			var userSettingsService = Ioc.Default.GetRequiredService<IUserSettingsService>();
 			var addItemService = Ioc.Default.GetRequiredService<IAddItemService>();
 			var generalSettingsService = userSettingsService.GeneralSettingsService;
+			var jumpListService = Ioc.Default.GetRequiredService<IWindowsJumpListService>();
 
 			// Start off a list of tasks we need to run before we can continue startup
 			await Task.WhenAll(
@@ -77,7 +78,7 @@ await Task.WhenAll(
 			);
 
 			await Task.WhenAll(
-				JumpListHelper.InitializeUpdatesAsync(),
+				jumpListService.InitializeAsync(),
 				addItemService.InitializeAsync(),
 				ContextMenu.WarmUpQueryContextMenuAsync()
 			);
@@ -183,7 +184,7 @@ public static IHost ConfigureHost()
 					.AddSingleton<ISizeProvider, UserSizeProvider>()
 					.AddSingleton<IQuickAccessService, QuickAccessService>()
 					.AddSingleton<IResourcesService, ResourcesService>()
-					.AddSingleton<IJumpListService, JumpListService>()
+					.AddSingleton<IWindowsJumpListService, WindowsJumpListService>()
 					.AddSingleton<IRemovableDrivesService, RemovableDrivesService>()
 					.AddSingleton<INetworkDrivesService, NetworkDrivesService>()
 					.AddSingleton<IStartMenuService, StartMenuService>()
diff --git a/src/Files.App/Helpers/UI/JumpListHelper.cs b/src/Files.App/Helpers/UI/JumpListHelper.cs
diff --git a/src/Files.App/Services/WindowsJumpListService.cs b/src/Files.App/Services/WindowsJumpListService.cs
@@ -1,17 +1,33 @@
 // Copyright (c) 2024 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
+using Microsoft.Extensions.Logging;
 using System.IO;
 using Windows.Storage;
 using Windows.UI.StartScreen;
 
 namespace Files.App.Services
 {
-	public sealed class JumpListService : IJumpListService
+	public sealed class WindowsJumpListService : IWindowsJumpListService
 	{
 		private const string JumpListRecentGroupHeader = "ms-resource:///Resources/JumpListRecentGroupHeader";
 		private const string JumpListPinnedGroupHeader = "ms-resource:///Resources/JumpListPinnedGroupHeader";
 
+		public async Task InitializeAsync()
+		{
+			try
+			{
+				App.QuickAccessManager.UpdateQuickAccessWidget -= UpdateQuickAccessWidget_Invoked;
+				App.QuickAccessManager.UpdateQuickAccessWidget += UpdateQuickAccessWidget_Invoked;
+
+				await RefreshPinnedFoldersAsync();
+			}
+			catch (Exception ex)
+			{
+				App.Logger.LogWarning(ex, ex.Message);
+			}
+		}
+
 		public async Task AddFolderAsync(string path)
 		{
 			if (JumpList.IsSupported())
@@ -167,5 +183,10 @@ private void AddFolder(string path, string group, JumpList instance)
 				}
 			}
 		}
+
+		private async void UpdateQuickAccessWidget_Invoked(object? sender, ModifyQuickAccessEventArgs e)
+		{
+			await RefreshPinnedFoldersAsync();
+		}
 	}
-}
+}
diff --git a/src/Files.App/Utils/Storage/Operations/FilesystemHelpers.cs b/src/Files.App/Utils/Storage/Operations/FilesystemHelpers.cs
@@ -23,7 +23,7 @@ public sealed class FilesystemHelpers : IFilesystemHelpers
 		private readonly static StatusCenterViewModel _statusCenterViewModel = Ioc.Default.GetRequiredService<StatusCenterViewModel>();
 
 		private IShellPage associatedInstance;
-		private readonly IJumpListService jumpListService;
+		private readonly IWindowsJumpListService jumpListService;
 		private ShellFilesystemOperations filesystemOperations;
 
 		private ItemManipulationModel? itemManipulationModel => associatedInstance.SlimContentPage?.ItemManipulationModel;
@@ -56,7 +56,7 @@ public FilesystemHelpers(IShellPage associatedInstance, CancellationToken cancel
 		{
 			this.associatedInstance = associatedInstance;
 			this.cancellationToken = cancellationToken;
-			jumpListService = Ioc.Default.GetRequiredService<IJumpListService>();
+			jumpListService = Ioc.Default.GetRequiredService<IWindowsJumpListService>();
 			filesystemOperations = new ShellFilesystemOperations(this.associatedInstance);
 		}
 		public async Task<(ReturnResult, IStorageItem?)> CreateAsync(IStorageItemWithPath source, bool registerHistory)

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`// Copyright (c) 2024 Files Community`
`2`	`2`	`// Licensed under the MIT License. See the LICENSE.`
`3`	`3`
`4`		`-namespace Files.App.Services`
	`4`	`+namespace Files.App.Data.Contracts`
`5`	`5`	`{`
`6`	`6`	`/// <summary>`
`7`	`7`	`/// A service to retrieve available item types`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`using Files.App.ViewModels.Dialogs;`
`5`	`5`	`using Files.App.Data.Enums;`
`6`	`6`
`7`		`-namespace Files.App.Services`
	`7`	`+namespace Files.App.Data.Contracts`
`8`	`8`	`{`
`9`	`9`	`/// <summary>`
`10`	`10`	`/// A service to manage dialogs.`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`
`4`	`4`	`using Files.Core.Storage.LocatableStorage;`
`5`	`5`
`6`		`-namespace Files.App.Services`
	`6`	`+namespace Files.App.Data.Contracts`
`7`	`7`	`{`
`8`	`8`	`/// <summary>`
`9`	`9`	`/// A service that interacts with the system file explorer.`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`using Files.App.ViewModels.FileTags;`
`5`	`5`	`using Files.Core.Storage.LocatableStorage;`
`6`	`6`
`7`		`-namespace Files.App.Services`
	`7`	`+namespace Files.App.Data.Contracts`
`8`	`8`	`{`
`9`	`9`	`/// <summary>`
`10`	`10`	`/// Represents a service used to manage file tags.`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`using Files.Core.Storage;`
`5`	`5`	`using Files.Shared.Utils;`
`6`	`6`
`7`		`-namespace Files.App.Services`
	`7`	`+namespace Files.App.Data.Contracts`
`8`	`8`	`{`
`9`	`9`	`/// <summary>`
`10`	`10`	`/// Represents a service used for data to image conversion.`