Cleanup

Author: yaira2

src/Files.App/Actions/Sidebar/PinFolderToSidebarAction.cs

@@ -42,7 +42,7 @@ public async Task ExecuteAsync(object? parameter = null)
 
 		private bool GetIsExecutable()
 		{
-			string[] pinnedFolders = [.. service.QuickAccessFolders.Select(x => x.Path)];
+			string[] pinnedFolders = [.. service.Folders.Select(x => x.Path)];
 
 			return context.HasSelection
 				? context.SelectedItems.All(IsPinnable)

src/Files.App/Actions/Sidebar/UnpinFolderToSidebarAction.cs

@@ -42,7 +42,7 @@ public async Task ExecuteAsync(object? parameter = null)
 
 		private bool GetIsExecutable()
 		{
-			string[] pinnedFolders = [.. service.QuickAccessFolders.Select(x => x.Path)];
+			string[] pinnedFolders = [.. service.Folders.Select(x => x.Path)];
 
 			return context.HasSelection
 				? context.SelectedItems.All(IsPinned)

src/Files.App/Data/Contracts/IQuickAccessService.cs

@@ -7,7 +7,7 @@ namespace Files.App.Data.Contracts
 {
 	public interface IQuickAccessService
 	{
-		IReadOnlyList<INavigationControlItem> QuickAccessFolders { get; }
+		IReadOnlyList<INavigationControlItem> Folders { get; }
 
 		event EventHandler<NotifyCollectionChangedEventArgs>? PinnedFoldersChanged;
 

src/Files.App/Services/Windows/WindowsJumpListService.cs

@@ -96,7 +96,7 @@ public async Task RefreshPinnedFoldersAsync()
 
 					var itemsToRemove = instance.Items.Where(x => string.Equals(x.GroupName, JumpListPinnedGroupHeader, StringComparison.OrdinalIgnoreCase)).ToList();
 					itemsToRemove.ForEach(x => instance.Items.Remove(x));
-					WindowsQuickAccessService.QuickAccessFolders.ForEach(x => AddFolder(x.Path, JumpListPinnedGroupHeader, instance));
+					WindowsQuickAccessService.Folders.ForEach(x => AddFolder(x.Path, JumpListPinnedGroupHeader, instance));
 
 					await instance.SaveAsync();
 				}

src/Files.App/Services/Windows/WindowsQuickAccessService.cs

@@ -22,7 +22,7 @@ internal sealed class QuickAccessService : IQuickAccessService
 
 		private readonly List<INavigationControlItem> _QuickAccessFolders = [];
 		/// <inheritdoc/>
-		public IReadOnlyList<INavigationControlItem> QuickAccessFolders
+		public IReadOnlyList<INavigationControlItem> Folders
 		{
 			get
 			{
@@ -67,7 +67,7 @@ public async Task<bool> UpdatePinnedFoldersAsync()
 					if (items.Count is 0)
 						return false;
 
-					var snapshot = QuickAccessFolders;
+					var snapshot = Folders;
 
 					lock (_QuickAccessFolders)
 					{

src/Files.App/ViewModels/Dialogs/ReorderSidebarItemsDialogViewModel.cs

@@ -18,7 +18,7 @@ public ReorderSidebarItemsDialogViewModel()
 		{
 			PrimaryButtonCommand = new RelayCommand(SaveChanges);
 
-			SidebarPinnedFolderItems = new(QuickAccessService.QuickAccessFolders
+			SidebarPinnedFolderItems = new(QuickAccessService.Folders
 				.Where(x => x is LocationItem loc && loc.Section is SectionType.Pinned && !loc.IsHeader)
 				.Cast<LocationItem>());
 		}

src/Files.App/ViewModels/UserControls/SidebarViewModel.cs

@@ -271,7 +271,7 @@ await dispatcherQueue.EnqueueOrInvokeAsync(async () =>
 				var section = await GetOrCreateSectionAsync(sectionType);
 				Func<IReadOnlyList<INavigationControlItem>> getElements = () => sectionType switch
 				{
-					SectionType.Pinned => WindowsQuickAccessService.QuickAccessFolders,
+					SectionType.Pinned => WindowsQuickAccessService.Folders,
 					SectionType.CloudDrives => CloudDrivesManager.Drives,
 					SectionType.Drives => drivesViewModel.Drives.Cast<DriveItem>().ToList().AsReadOnly(),
 					SectionType.Network => NetworkService.Computers.Cast<DriveItem>().ToList().AsReadOnly(),
@@ -923,7 +923,7 @@ private List<ContextMenuFlyoutItemViewModel> GetLocationItemMenuItems(INavigatio
 		{
 			var options = item.MenuOptions;
 
-			var pinnedFolders = WindowsQuickAccessService.QuickAccessFolders.ToList();
+			var pinnedFolders = WindowsQuickAccessService.Folders.ToList();
 			var pinnedFolderIndex = pinnedFolders.IndexOf(item);
 			var pinnedFolderCount = pinnedFolders.Count;
 
@@ -1082,7 +1082,7 @@ private async Task HandleLocationItemDragOverAsync(LocationItem locationItem, It
 
 				if (isPathNull && hasStorageItems && SectionType.Pinned.Equals(locationItem.Section))
 				{
-					var haveFoldersToPin = storageItems.Any(item => item.ItemType == FilesystemItemType.Directory && WindowsQuickAccessService.QuickAccessFolders.FirstOrDefault(x => x.Path == item.Path) is null);
+					var haveFoldersToPin = storageItems.Any(item => item.ItemType == FilesystemItemType.Directory && WindowsQuickAccessService.Folders.FirstOrDefault(x => x.Path == item.Path) is null);
 
 					if (!haveFoldersToPin)
 					{
@@ -1252,7 +1252,7 @@ private async Task HandleLocationItemDroppedAsync(LocationItem locationItem, Ite
 					var storageItems = await Utils.Storage.FilesystemHelpers.GetDraggedStorageItems(args.DroppedItem);
 					foreach (var item in storageItems)
 					{
-						if (item.ItemType == FilesystemItemType.Directory && WindowsQuickAccessService.QuickAccessFolders.FirstOrDefault(x => x.Path == item.Path) is null)
+						if (item.ItemType == FilesystemItemType.Directory && WindowsQuickAccessService.Folders.FirstOrDefault(x => x.Path == item.Path) is null)
 							await WindowsQuickAccessService.PinFolderAsync([item.Path]);
 					}
 				}

src/Files.App/ViewModels/UserControls/Widgets/BaseWidgetViewModel.cs

@@ -76,7 +76,7 @@ widgetCardItem.DataContext is not WidgetCardItem item ||
 			OnRightClickedItemChanged(item, itemContextMenuFlyout);
 
 			// Get items for the flyout
-			var menuItems = GetItemMenuItems(item, QuickAccessService.QuickAccessFolders.ToList().FirstOrDefault(x => x.Path == item.Path) is not null, fileTagsCardItem is not null && fileTagsCardItem.IsFolder);
+			var menuItems = GetItemMenuItems(item, QuickAccessService.Folders.ToList().FirstOrDefault(x => x.Path == item.Path) is not null, fileTagsCardItem is not null && fileTagsCardItem.IsFolder);
 			var (_, secondaryElements) = ContextFlyoutModelToElementHelper.GetAppBarItemsFromModel(menuItems);
 
 			// Set max width of the flyout

src/Files.App/ViewModels/UserControls/Widgets/QuickAccessWidgetViewModel.cs

@@ -176,7 +176,7 @@ private async Task UpdateCollectionAsync(NotifyCollectionChangedEventArgs e)
 					default:
 						{
 							Items.Clear();
-							foreach (var item in QuickAccessService.QuickAccessFolders.ToList())
+							foreach (var item in QuickAccessService.Folders.ToList())
 							{
 								if (item is not LocationItem locationItem)
 									continue;

src/Files.App/Views/Layouts/ColumnsLayoutPage.xaml.cs

@@ -17,6 +17,10 @@ namespace Files.App.Views.Layouts
 	/// </summary>
 	public sealed partial class ColumnsLayoutPage : BaseLayoutPage
 	{
+		// IOC
+
+		private readonly IQuickAccessService WindowsQuickAccessService = Ioc.Default.GetRequiredService<IQuickAccessService>();
+
 		// Properties
 
 		protected override ItemsControl ItemsControl => ColumnHost;
@@ -96,8 +100,7 @@ protected override void OnNavigatedTo(NavigationEventArgs eventArgs)
 
 			if (!string.IsNullOrEmpty(pathRoot))
 			{
-				var service = Ioc.Default.GetRequiredService<IQuickAccessService>();
-				var rootPathList = service.QuickAccessFolders.Select(x => NormalizePath(x.Path))
+				var rootPathList = WindowsQuickAccessService.Folders.Select(x => NormalizePath(x.Path))
 					.Concat(CloudDrivesManager.Drives.Select(x => NormalizePath(x.Path))).ToList()
 					.Concat(App.LibraryManager.Libraries.Select(x => NormalizePath(x.Path))).ToList();
 				rootPathList.Add(NormalizePath(pathRoot));