Feature: Added support for reordering items in the sidebar

src/Files.App/DataModels/NavigationControlItems/DriveItem.cs

@@ -173,7 +173,6 @@ public static async Task<DriveItem> CreateFromPropertiesAsync(StorageFolder root
 				ShowProperties = true
 			};
 			item.Path = string.IsNullOrEmpty(root.Path) ? $"\\\\?\\{root.Name}\\" : root.Path;
-			App.Logger.Warn(item.Path);
 			item.DeviceID = deviceId;
 			item.Root = root;
 

src/Files.App/DataModels/NavigationControlItems/LocationItem.cs

@@ -72,6 +72,8 @@ public bool IsExpanded
 
 		public ContextMenuOptions MenuOptions { get; set; }
 
+		public bool IsHeader { get; set; }
+
 		public int CompareTo(INavigationControlItem other)
 			=> Text.CompareTo(other.Text);
 

src/Files.App/DataModels/SidebarPinnedModel.cs

@@ -30,7 +30,7 @@ public class SidebarPinnedModel
 
 		public List<string> FavoriteItems { get; set; } = new List<string>();
 
-		private readonly List<INavigationControlItem> favoriteList = new();
+		public readonly List<INavigationControlItem> favoriteList = new();
 
 		[JsonIgnore]
 		public IReadOnlyList<INavigationControlItem> Favorites
@@ -205,6 +205,8 @@ public async void LoadAsync(object? sender, FileSystemEventArgs e)
 		}
 
 		public async Task LoadAsync()
-			=> await UpdateItemsWithExplorer();
+		{
+			await UpdateItemsWithExplorer();
+		}
 	}
 }

src/Files.App/Dialogs/ReorderSidebarItemsDialog.xaml

@@ -0,0 +1,68 @@
+<ContentDialog
+	x:Class="Files.App.Dialogs.ReorderSidebarItemsDialog"
+	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+	xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+	xmlns:helpers="using:Files.App.Helpers"
+	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+	xmlns:navigationcontrolitems="using:Files.App.DataModels.NavigationControlItems"
+	Title="{helpers:ResourceString Name=ReorderSidebarItemsDialogText}"
+	DefaultButton="Primary"
+	IsPrimaryButtonEnabled="True"
+	PrimaryButtonCommand="{x:Bind ViewModel.PrimaryButtonCommand}"
+	PrimaryButtonText="{helpers:ResourceString Name=Save}"
+	RequestedTheme="{x:Bind helpers:ThemeHelper.RootTheme}"
+	SecondaryButtonText="{helpers:ResourceString Name=Cancel}"
+	Style="{StaticResource DefaultContentDialogStyle}"
+	mc:Ignorable="d">
+
+	<Grid
+		x:Name="DestinationPathGrid"
+		ColumnSpacing="8"
+		RowSpacing="8">
+		<Grid.ColumnDefinitions>
+			<ColumnDefinition />
+			<ColumnDefinition Width="Auto" />
+		</Grid.ColumnDefinitions>
+		<Grid.RowDefinitions>
+			<RowDefinition Height="Auto" />
+		</Grid.RowDefinitions>
+
+		<ListView
+			x:Name="SidebarNavView"
+			Grid.Row="1"
+			ItemsSource="{x:Bind ViewModel.SidebarFavoriteItems, Mode=OneWay}">
+			<ListView.ItemTemplate>
+				<DataTemplate x:DataType="navigationcontrolitems:LocationItem">
+					<Grid
+						AllowDrop="True"
+						AutomationProperties.AutomationId="{x:Bind Text}"
+						DataContext="{x:Bind}"
+						DragOver="ListViewItem_DragOver"
+						DragStarting="ListViewItem_DragStarting"
+						Drop="ListViewItem_Drop"
+						Tag="{x:Bind Path}"
+						ToolTipService.ToolTip="{x:Bind ToolTipText, Mode=OneWay}">
+						<Grid.ColumnDefinitions>
+							<ColumnDefinition Width="*" />
+							<ColumnDefinition Width="Auto" />
+							<ColumnDefinition Width="Auto" />
+						</Grid.ColumnDefinitions>
+						<Grid.RowDefinitions>
+							<RowDefinition Height="Auto" />
+							<RowDefinition Height="Auto" />
+						</Grid.RowDefinitions>
+						<TextBlock Grid.RowSpan="2" Text="{x:Bind Text}" />
+						<FontIcon
+							Grid.Row="1"
+							HorizontalAlignment="Right"
+							DataContext="{x:Bind}"
+							Glyph="&#xE76F;"
+							PointerPressed="MoveItem"
+							Visibility="{x:Bind IsPinned}" />
+					</Grid>
+				</DataTemplate>
+			</ListView.ItemTemplate>
+		</ListView>
+	</Grid>
+</ContentDialog>

src/Files.App/Dialogs/ReorderSidebarItemsDialog.xaml.cs

@@ -0,0 +1,96 @@
+using CommunityToolkit.WinUI.UI;
+using Files.App.DataModels.NavigationControlItems;
+using Files.App.Extensions;
+using Files.App.Filesystem;
+using Files.App.ServicesImplementation;
+using Files.App.ViewModels.Dialogs;
+using Files.Backend.ViewModels.Dialogs;
+using Files.Shared.Enums;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Input;
+using System;
+using System.Diagnostics;
+using System.Threading.Tasks;
+using Windows.ApplicationModel.DataTransfer;
+
+namespace Files.App.Dialogs
+{
+	public sealed partial class ReorderSidebarItemsDialog : ContentDialog, IDialog<ReorderSidebarItemsDialogViewModel>
+	{
+		public ReorderSidebarItemsDialogViewModel ViewModel
+		{
+			get => (ReorderSidebarItemsDialogViewModel)DataContext;
+			set => DataContext = value;
+		}
+
+		public ReorderSidebarItemsDialog()
+		{
+			InitializeComponent();
+		}
+
+		private async void MoveItem(object sender, PointerRoutedEventArgs e)
+		{
+			var properties = e.GetCurrentPoint(null).Properties;
+			var icon = sender as FontIcon;
+			if (!properties.IsLeftButtonPressed)
+				return;
+
+			var navItem = icon?.FindAscendant<Grid>();
+			if (navItem is not null)
+				await navItem.StartDragAsync(e.GetCurrentPoint(navItem));
+		}
+
+		private void ListViewItem_DragStarting(object sender, DragStartingEventArgs e)
+		{
+			if (sender is not Grid nav || nav.DataContext is not LocationItem)
+				return;
+
+			// Adding the original Location item dragged to the DragEvents data view
+			e.Data.Properties.Add("sourceLocationItem", nav);
+			e.AllowedOperations = DataPackageOperation.Move;
+		}
+
+
+		private void ListViewItem_DragOver(object sender, DragEventArgs e)
+		{
+			if ((sender as Grid)?.DataContext is not LocationItem locationItem)
+				return;
+			var deferral = e.GetDeferral();
+
+			if ((e.DataView.Properties["sourceLocationItem"] as Grid)?.DataContext is LocationItem sourceLocationItem)
+			{
+				DragOver_SetCaptions(sourceLocationItem, locationItem, e);
+			}
+
+			deferral.Complete();
+		}
+
+		private void DragOver_SetCaptions(LocationItem senderLocationItem, LocationItem sourceLocationItem, DragEventArgs e)
+		{
+			// If the location item is the same as the original dragged item
+			if (sourceLocationItem.CompareTo(senderLocationItem) == 0)
+			{
+				e.AcceptedOperation = DataPackageOperation.None;
+				e.DragUIOverride.IsCaptionVisible = false;
+			}
+			else
+			{
+				e.DragUIOverride.IsCaptionVisible = true;
+				e.DragUIOverride.Caption = "MoveItemsDialogPrimaryButtonText".GetLocalizedResource();
+				e.AcceptedOperation = DataPackageOperation.Move;
+			}
+		}
+
+		private void ListViewItem_Drop(object sender, DragEventArgs e)
+		{
+			if (sender is not Grid navView || navView.DataContext is not LocationItem locationItem)
+				return;
+
+			if ((e.DataView.Properties["sourceLocationItem"] as Grid)?.DataContext is LocationItem sourceLocationItem)
+				ViewModel.SidebarFavoriteItems.Move(ViewModel.SidebarFavoriteItems.IndexOf(sourceLocationItem), ViewModel.SidebarFavoriteItems.IndexOf(locationItem));
+		}
+
+		public new async Task<DialogResult> ShowAsync() => (DialogResult)await base.ShowAsync();
+	}
+}

src/Files.App/Files.App.csproj

@@ -129,4 +129,4 @@
         <XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
       </Page>
     </ItemGroup>
-</Project>
+</Project>

src/Files.App/ServicesImplementation/DialogService.cs

@@ -9,6 +9,7 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
+using System.Diagnostics;
 using System.Threading.Tasks;
 using Windows.Foundation.Metadata;
 
@@ -29,7 +30,8 @@ public DialogService()
 				{ typeof(FileSystemDialogViewModel), () => new FilesystemOperationDialog() },
 				{ typeof(DecompressArchiveDialogViewModel), () => new DecompressArchiveDialog() },
 				{ typeof(SettingsDialogViewModel), () => new SettingsDialog() },
-				{ typeof(CreateShortcutDialogViewModel), () => new CreateShortcutDialog() }
+				{ typeof(CreateShortcutDialogViewModel), () => new CreateShortcutDialog() },
+				{ typeof(ReorderSidebarItemsDialogViewModel), () => new ReorderSidebarItemsDialog() }
 			};
 		}
 
@@ -62,7 +64,9 @@ public Task<DialogResult> ShowDialogAsync<TViewModel>(TViewModel viewModel)
 			}
 			catch (Exception ex)
 			{
-				_ = ex;
+				App.Logger.Warn(ex, "Failed to show dialog");
+
+				Debugger.Break();
 			}
 
 			return Task.FromResult(DialogResult.None);

src/Files.App/ServicesImplementation/QuickAccessService.cs

@@ -1,12 +1,9 @@
 using Files.App.Shell;
 using Files.App.UserControls.Widgets;
-using Files.Sdk.Storage.LocatableStorage;
 using Files.Shared;
 using Files.Shared.Extensions;
-using Microsoft.UI.Xaml.Shapes;
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
 
@@ -23,32 +20,47 @@ public async Task<IEnumerable<ShellFileItem>> GetPinnedFoldersAsync()
 		}
 
 		public Task PinToSidebar(string folderPath)
-			=> PinToSidebar(new[] { folderPath });
+		{ 
+			return PinToSidebar(new[] { folderPath });
+		}
 
 		public async Task PinToSidebar(string[] folderPaths)
 		{
-			await ContextMenu.InvokeVerb("pintohome", folderPaths);
+			foreach (string folderPath in folderPaths)
+				await ContextMenu.InvokeVerb("pintohome", new[] {folderPath});
 
 			await App.QuickAccessManager.Model.LoadAsync();
 
 			App.QuickAccessManager.UpdateQuickAccessWidget?.Invoke(this, new ModifyQuickAccessEventArgs(folderPaths, true));
 		}
-		
+
 		public Task UnpinFromSidebar(string folderPath)
-			=> UnpinFromSidebar(new[] { folderPath });
+		{ 
+			return UnpinFromSidebar(new[] { folderPath }); 
+		}
 
 		public async Task UnpinFromSidebar(string[] folderPaths)
 		{
 			Type? shellAppType = Type.GetTypeFromProgID("Shell.Application");
 			object? shell = Activator.CreateInstance(shellAppType);
 			dynamic? f2 = shellAppType.InvokeMember("NameSpace", System.Reflection.BindingFlags.InvokeMethod, null, shell, new object[] { $"shell:{guid}" });
 
+			if (folderPaths.Length == 0)
+				folderPaths = (await GetPinnedFoldersAsync())
+					.Where(link => (bool?)link.Properties["System.Home.IsPinned"] ?? false)
+					.Select(link => link.FilePath).ToArray();
+
 			foreach (dynamic? fi in f2.Items())
+			{
 				if (folderPaths.Contains((string)fi.Path)
 					|| (string.Equals(fi.Path, "::{645FF040-5081-101B-9F08-00AA002F954E}") && folderPaths.Contains(Constants.CommonPaths.RecycleBinPath)))
-					await SafetyExtensions.IgnoreExceptions(async () => {
+				{
+					await SafetyExtensions.IgnoreExceptions(async () =>
+					{
 						await fi.InvokeVerb("unpinfromhome");
 					});
+				}
+			}
 
 			await App.QuickAccessManager.Model.LoadAsync();
 
@@ -59,5 +71,20 @@ public bool IsItemPinned(string folderPath)
 		{
 			return App.QuickAccessManager.Model.FavoriteItems.Contains(folderPath);
 		}
+
+		public async Task Save(string[] items)
+		{
+			if (Equals(items, App.QuickAccessManager.Model.FavoriteItems.ToArray()))
+				return;
+
+			App.QuickAccessManager.PinnedItemsWatcher.EnableRaisingEvents = false;
+
+			// Unpin every item that is below this index and then pin them all in order
+			await UnpinFromSidebar(Array.Empty<string>());
+
+			await PinToSidebar(items);
+			App.QuickAccessManager.PinnedItemsWatcher.EnableRaisingEvents = true;
+			await App.QuickAccessManager.Model.LoadAsync();
+		}
 	}
 }

src/Files.App/Strings/en-US/Resources.resw

@@ -2595,6 +2595,9 @@
   <data name="MultiSelect" xml:space="preserve">
     <value>Multiselect</value>
   </data>
+  <data name="ReorderSidebarItemsDialogText" xml:space="preserve">
+    <value>Reorder sidebar items</value>
+  </data>
   <data name="Hashes" xml:space="preserve">
     <value>Hashes</value>
   </data>

src/Files.App/UserControls/SidebarControl.xaml

@@ -62,7 +62,6 @@
 					DragEnter="NavigationViewItem_DragEnter"
 					DragLeave="NavigationViewItem_DragLeave"
 					DragOver="NavigationViewLocationItem_DragOver"
-					DragStarting="NavigationViewItem_DragStarting"
 					Drop="NavigationViewLocationItem_Drop"
 					IsExpanded="{x:Bind IsExpanded, Mode=TwoWay}"
 					IsRightTapEnabled="True"