Merge

src/Files.App/DataModels/SidebarPinnedModel.cs

@@ -22,7 +22,8 @@ namespace Files.App.DataModels
 {
 	public class SidebarPinnedModel
 	{
-		private readonly IUserSettingsService userSettingsService = Ioc.Default.GetRequiredService<IUserSettingsService>();
+		private IUserSettingsService userSettingsService { get; } = Ioc.Default.GetRequiredService<IUserSettingsService>();
+		private IQuickAccessService QuickAccessService { get; } = Ioc.Default.GetRequiredService<IQuickAccessService>();
 
 		public EventHandler<NotifyCollectionChangedEventArgs>? DataChanged;
 
@@ -46,29 +47,6 @@ public IReadOnlyList<INavigationControlItem> Favorites
 		/// </summary>
 		public async Task UpdateItemsWithExplorer()
 		{
-			var udp = UserDataPaths.GetDefault();
-
-			FavoriteItems.Add(CommonPaths.DesktopPath);
-			FavoriteItems.Add(CommonPaths.DownloadsPath);
-			FavoriteItems.Add(udp.Documents);
-			FavoriteItems.Add(CommonPaths.RecycleBinPath);
-		}
-
-		/// <summary>
-		/// Gets the items from the navigation page
-		/// </summary>
-		public List<string> GetItems()
-		{
-			return FavoriteItems;
-		}
-
-		/// <summary>
-		/// Adds the item to the navigation page
-		/// </summary>
-		/// <param name="item">Item to remove</param>
-		public async void AddItem(string? item)
-		{
-			// add to `FavoriteItems` and `favoritesList` must be atomic
 			await addSyncSemaphore.WaitAsync();
 
 			try
@@ -82,75 +60,7 @@ public async void AddItem(string? item)
 				addSyncSemaphore.Release();
 			}
 		}
-
-		/// <summary>
-		/// Removes the item from the navigation page
-		/// </summary>
-		/// <param name="item">Item to remove</param>
-		public void RemoveItem(string? item)
-		{
-			if (string.IsNullOrWhiteSpace(item) || !FavoriteItems.Contains(item))
-				return;
-			FavoriteItems.Remove(item);
-			RemoveStaleSidebarItems();
-			Save();
-		}
-
-		/// <summary>
-		/// Moves the location item in the Favorites sidebar section from the old position to the new position
-		/// </summary>
-		/// <param name="locationItem">Location item to move</param>
-		/// <param name="oldIndex">The old position index of the location item</param>
-		/// <param name="newIndex">The new position index of the location item</param>
-		/// <returns>True if the move was successful</returns>
-		public bool MoveItem(INavigationControlItem locationItem, int oldIndex, int newIndex)
-		{
-			if (locationItem is null || newIndex > FavoriteItems.Count)
-				return false;
-
-			// A backup of the items, because the swapping of items requires removing and inserting them in the correct position
-			var sidebarItemsBackup = new List<string>(FavoriteItems);
-
-			try
-			{
-				FavoriteItems.RemoveAt(oldIndex);
-				FavoriteItems.Insert(newIndex, locationItem.Path);
-				lock (favoriteList)
-				{
-					favoriteList.RemoveAt(oldIndex);
-					favoriteList.Insert(newIndex, locationItem);
-				}
-				var e = new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Move, locationItem, newIndex, oldIndex);
-				controller?.DataChanged?.Invoke(SectionType.Favorites, e);
-				Save();
-				return true;
-			}
-			catch (Exception ex)
-			{
-				Debug.WriteLine($"An error occurred while moving pinned items in the Favorites sidebar section. {ex.Message}");
-				FavoriteItems = sidebarItemsBackup;
-				RemoveStaleSidebarItems();
-				_ = AddAllItemsToSidebar();
-				return false;
-			}
-		}
-
-		/// <summary>
-		/// Swaps two location items in the navigation sidebar
-		/// </summary>
-		/// <param name="firstLocationItem">The first location item</param>
-		/// <param name="secondLocationItem">The second location item</param>
-		public void SwapItems(INavigationControlItem firstLocationItem, INavigationControlItem secondLocationItem)
-		{
-			if (firstLocationItem is null || secondLocationItem is null)
-				return;
-
-			var indexOfFirstItemInMainPage = IndexOfItem(firstLocationItem);
-			var indexOfSecondItemInMainPage = IndexOfItem(secondLocationItem);
-
-			// Moves the items in the MainPage
-			MoveItem(firstLocationItem, indexOfFirstItemInMainPage, indexOfSecondItemInMainPage);
-		}
+
 
 		/// <summary>
 		/// Returns the index of the location item in the navigation sidebar
@@ -165,25 +75,6 @@ public int IndexOfItem(INavigationControlItem locationItem)
 			}
 		}
 
-		/// <summary>
-		/// Returns the index of the location item in the collection containing Navigation control items
-		/// </summary>
-		/// <param name="locationItem">The location item</param>
-		/// <param name="collection">The collection in which to find the location item</param>
-		/// <returns>Index of the item</returns>
-		public int IndexOfItem(INavigationControlItem locationItem, List<INavigationControlItem> collection)
-		{
-			return collection.IndexOf(locationItem);
-		}
-
-		/// <summary>
-		/// Saves the model
-		/// </summary>
-		public void Save()
-		{
-			controller?.SaveModel();
-		}
-
 		/// <summary>
 		/// Adds the item (from a path) to the navigation sidebar
 		/// </summary>

src/Files.App/UserControls/SidebarControl.xaml.cs

@@ -35,7 +35,8 @@ namespace Files.App.UserControls
 {
 	public sealed partial class SidebarControl : NavigationView, INotifyPropertyChanged
 	{
-		private readonly IUserSettingsService userSettingsService = Ioc.Default.GetRequiredService<IUserSettingsService>();
+		public IUserSettingsService userSettingsService { get; } = Ioc.Default.GetRequiredService<IUserSettingsService>();
+		public IQuickAccessService QuickAccessService { get; } = Ioc.Default.GetRequiredService<IQuickAccessService>();
 
 		public delegate void SidebarItemInvokedEventHandler(object sender, SidebarItemInvokedEventArgs e);
 

src/Files.App/UserControls/Widgets/DrivesWidget.xaml.cs

@@ -64,8 +64,9 @@ public async Task LoadCardThumbnailAsync()
 
 	public sealed partial class DrivesWidget : UserControl, IWidgetItemModel, INotifyPropertyChanged
 	{
-		private readonly IUserSettingsService userSettingsService = Ioc.Default.GetRequiredService<IUserSettingsService>();
-
+		private IUserSettingsService userSettingsService { get; } = Ioc.Default.GetRequiredService<IUserSettingsService>();
+		private IQuickAccessService QuickAccessService { get; } = Ioc.Default.GetRequiredService<IQuickAccessService>();
+
 		public delegate void DrivesWidgetInvokedEventHandler(object sender, DrivesWidgetInvokedEventArgs e);
 
 		public event DrivesWidgetInvokedEventHandler DrivesWidgetInvoked;
@@ -165,15 +166,17 @@ private async void PinToFavorites_Click(object sender, RoutedEventArgs e)
 			var item = ((MenuFlyoutItem)sender).DataContext as DriveItem;
 			if (await DriveHelpers.CheckEmptyDrive(item?.Path))
 				return;
-			App.SidebarPinnedController.Model.AddItem(item?.Path);
+
+			_ = QuickAccessService.PinToSidebar(item.Path);
 		}
 
 		private async void UnpinFromFavorites_Click(object sender, RoutedEventArgs e)
 		{
 			var item = ((MenuFlyoutItem)sender).DataContext as DriveItem;
 			if (await DriveHelpers.CheckEmptyDrive(item?.Path))
 				return;
-			App.SidebarPinnedController.Model.RemoveItem(item?.Path);
+
+			_ = QuickAccessService.UnpinFromSidebar(item.Path);
 		}
 
 		private void OpenDriveProperties_Click(object sender, RoutedEventArgs e)