Feature: Show size when hovering over recycling bin

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

@@ -1,11 +1,15 @@
 using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.WinUI;
 using Files.App.Extensions;
 using Files.App.Filesystem;
 using Files.App.Helpers;
+using Files.App.Shell;
 using Files.Shared;
 using Microsoft.UI.Xaml.Media;
 using Microsoft.UI.Xaml.Media.Imaging;
 using System;
+using System.IO;
+using System.Threading.Tasks;
 
 namespace Files.App.DataModels.NavigationControlItems
 {
@@ -36,7 +40,7 @@ public string Path
 			}
 		}
 
-		public string ToolTipText { get; private set; }
+		public virtual string ToolTipText { get; set; }
 		public FontFamily Font { get; set; }
 		public NavigationControlItemType ItemType => NavigationControlItemType.Location;
 		public bool IsDefaultLocation { get; set; }
@@ -58,5 +62,39 @@ public bool IsExpanded
 		public ContextMenuOptions MenuOptions { get; set; }
 
 		public int CompareTo(INavigationControlItem other) => Text.CompareTo(other.Text);
+
+		public static T Create<T>() where T : LocationItem, new()
+		{
+			return new T();
+		}
+	}
+
+	public class RecycleBinLocationItem : LocationItem
+	{
+		public void RefreshSpaceUsed(object sender, FileSystemEventArgs e)
+		{
+			SpaceUsed = RecycleBinHelpers.GetSize();
+		}
+
+		private ulong spaceUsed;
+		public ulong SpaceUsed
+		{
+			get => spaceUsed;
+			set
+			{
+				SetProperty(ref spaceUsed, value);
+				App.Window.DispatcherQueue.EnqueueAsync(() => OnPropertyChanged(nameof(ToolTipText)));
+			}
+		}
+
+		public override string ToolTipText => SpaceUsed.ToSizeString();
+
+		public RecycleBinLocationItem()
+		{
+			SpaceUsed = RecycleBinHelpers.GetSize();
+
+			RecycleBinManager.Default.RecycleBinItemCreated += RefreshSpaceUsed;
+			RecycleBinManager.Default.RecycleBinItemDeleted += RefreshSpaceUsed;
+		}
 	}
-}
+}

src/Files.App/DataModels/SidebarPinnedModel.cs

@@ -204,23 +204,27 @@ public async Task AddItemToSidebarAsync(string path)
 		{
 			var item = await FilesystemTasks.Wrap(() => DrivesManager.GetRootFromPathAsync(path));
 			var res = await FilesystemTasks.Wrap(() => StorageFileExtensions.DangerousGetFolderFromPathAsync(path, item));
-			var locationItem = new LocationItem
+			LocationItem locationItem;
+
+			if (string.Equals(path, CommonPaths.RecycleBinPath, StringComparison.OrdinalIgnoreCase))
+				locationItem = LocationItem.Create<RecycleBinLocationItem>();
+			else
+				locationItem = LocationItem.Create<LocationItem>();
+
+			locationItem.Font = App.AppModel.SymbolFontFamily;
+			locationItem.Path = path;
+			locationItem.Section = SectionType.Favorites;
+			locationItem.MenuOptions = new ContextMenuOptions
 			{
-				Font = App.AppModel.SymbolFontFamily,
-				Path = path,
-				Section = SectionType.Favorites,
-				MenuOptions = new ContextMenuOptions
-				{
-					IsLocationItem = true,
-					ShowProperties = true,
-					ShowUnpinItem = true,
-					ShowShellItems = true,
-					ShowEmptyRecycleBin = path == CommonPaths.RecycleBinPath,
-				},
-				IsDefaultLocation = false,
-				Text = res.Result?.DisplayName ?? Path.GetFileName(path.TrimEnd('\\'))
+				IsLocationItem = true,
+				ShowProperties = true,
+				ShowUnpinItem = true,
+				ShowShellItems = true,
+				ShowEmptyRecycleBin = string.Equals(path, CommonPaths.RecycleBinPath, StringComparison.OrdinalIgnoreCase)
 			};
-
+			locationItem.IsDefaultLocation = false;
+			locationItem.Text = res.Result?.DisplayName ?? Path.GetFileName(path.TrimEnd('\\'));
+
 			if (res || (FilesystemResult)FolderHelpers.CheckFolderAccessWithWin32(path))
 			{
 				locationItem.IsInvalid = false;

src/Files.App/Filesystem/FilesystemOperations/FilesystemOperations.cs

@@ -534,7 +534,7 @@ await associatedInstance.FilesystemViewModel.GetFileFromPathAsync(iFilePath)
 				if (!permanently)
 				{
 					// Enumerate Recycle Bin
-					IEnumerable<ShellFileItem> nameMatchItems, items = await recycleBinHelpers.EnumerateRecycleBin();
+					IEnumerable<ShellFileItem> nameMatchItems, items = await RecycleBinHelpers.EnumerateRecycleBin();
 
 					// Get name matching files
 					if (FileExtensionHelpers.IsShortcutOrUrlFile(source.Path)) // We need to check if it is a shortcut file

src/Files.App/Filesystem/FilesystemOperations/Helpers/FilesystemHelpers.cs

@@ -128,7 +128,7 @@ public async Task<ReturnResult> DeleteItemsAsync(IEnumerable<IStorageItemWithPat
 				{
 					if (recycleBinHelpers.IsPathUnderRecycleBin(src.Path))
 					{
-						binItems ??= await recycleBinHelpers.EnumerateRecycleBin();
+						binItems ??= await RecycleBinHelpers.EnumerateRecycleBin();
 						if (!binItems.IsEmpty()) // Might still be null because we're deserializing the list from Json
 						{
 							var matchingItem = binItems.FirstOrDefault(x => x.RecyclePath == src.Path); // Get original file name
@@ -376,7 +376,7 @@ public async Task<ReturnResult> CopyItemsFromClipboard(DataPackageView packageVi
 				{
 					if (recycleBinHelpers.IsPathUnderRecycleBin(item.Path))
 					{
-						binItems ??= await recycleBinHelpers.EnumerateRecycleBin();
+						binItems ??= await RecycleBinHelpers.EnumerateRecycleBin();
 						if (!binItems.IsEmpty()) // Might still be null because we're deserializing the list from Json
 						{
 							var matchingItem = binItems.FirstOrDefault(x => x.RecyclePath == item.Path); // Get original file name
@@ -521,7 +521,7 @@ public async Task<ReturnResult> MoveItemsFromClipboard(DataPackageView packageVi
 			{
 				if (recycleBinHelpers.IsPathUnderRecycleBin(item.Path))
 				{
-					binItems ??= await recycleBinHelpers.EnumerateRecycleBin();
+					binItems ??= await RecycleBinHelpers.EnumerateRecycleBin();
 					if (!binItems.IsEmpty()) // Might still be null because we're deserializing the list from Json
 					{
 						var matchingItem = binItems.FirstOrDefault(x => x.RecyclePath == item.Path); // Get original file name

src/Files.App/Filesystem/FilesystemOperations/ShellFilesystemOperations.cs

@@ -353,6 +353,7 @@ public async Task<IStorageHistory> DeleteItemsAsync(IList<IStorageItemWithPath>
 				{
 					var sourceMatch = await recycledSources.Select(x => source.DistinctBy(x => x.Path)
 						.SingleOrDefault(s => s.Path.Equals(x.Source, StringComparison.OrdinalIgnoreCase))).Where(x => x is not null).ToListAsync();
+
 					return new StorageHistory(FileOperationType.Recycle,
 						sourceMatch,
 						await recycledSources.Zip(sourceMatch, (rSrc, oSrc) => new { rSrc, oSrc })
@@ -669,6 +670,7 @@ public async Task<IStorageHistory> RestoreItemsFromTrashAsync(IList<IStorageItem
 						.Select(src => StorageHelpers.FromPathAndType(
 							Path.Combine(Path.GetDirectoryName(src.rSrc.Source), Path.GetFileName(src.rSrc.Source).Replace("$R", "$I", StringComparison.Ordinal)),
 							src.oSrc.ItemType)).ToListAsync(), null, true, cancellationToken);
+
 					return new StorageHistory(FileOperationType.Restore,
 						sourceMatch,
 						await movedSources.Zip(sourceMatch, (rSrc, oSrc) => new { rSrc, oSrc })
@@ -748,7 +750,7 @@ private async Task<DialogResult> GetFileListDialog(IEnumerable<string> source, s
 			{
 				if (recycleBinHelpers.IsPathUnderRecycleBin(src))
 				{
-					binItems ??= await recycleBinHelpers.EnumerateRecycleBin();
+					binItems ??= await RecycleBinHelpers.EnumerateRecycleBin();
 					if (!binItems.IsEmpty()) // Might still be null because we're deserializing the list from Json
 					{
 						var matchingItem = binItems.FirstOrDefault(x => x.RecyclePath == src); // Get original file name

src/Files.App/Helpers/RecycleBinHelpers.cs

@@ -1,3 +1,4 @@
+using Files.App.DataModels.NavigationControlItems;
 using Files.App.Extensions;
 using Files.App.Filesystem;
 using Files.App.Shell;
@@ -22,11 +23,16 @@ public class RecycleBinHelpers
 
 		#endregion Private Members
 
-		public async Task<List<ShellFileItem>> EnumerateRecycleBin()
+		public static async Task<List<ShellFileItem>> EnumerateRecycleBin()
 		{
 			return (await Win32Shell.GetShellFolderAsync(CommonPaths.RecycleBinPath, "Enumerate", 0, int.MaxValue)).Enumerate;
 		}
 
+        public static ulong GetSize()
+        {
+			return (ulong)Win32Shell.QueryRecycleBin().BinSize;
+		}
+
 		public async Task<bool> IsRecycleBinItem(IStorageItem item)
 		{
 			List<ShellFileItem> recycleBinItems = await EnumerateRecycleBin();

src/Files.App/UserControls/SidebarControl.xaml

@@ -65,7 +65,7 @@
 					RightTapped="NavigationViewItem_RightTapped"
 					SelectsOnInvoked="{x:Bind SelectsOnInvoked}"
 					Tag="{x:Bind Path}"
-					ToolTipService.ToolTip="{x:Bind ToolTipText}">
+					ToolTipService.ToolTip="{x:Bind ToolTipText, Mode=OneWay}">
 					<NavigationViewItem.Icon>
 						<ImageIcon Source="{x:Bind Icon, Mode=OneWay}" />
 					</NavigationViewItem.Icon>
@@ -1188,6 +1188,6 @@
 			DriveNavItemTemplate="{StaticResource DriveNavItem}"
 			FileTagNavItemTemplate="{StaticResource FileTagNavItem}"
 			LinuxNavItemTemplate="{StaticResource LinuxNavItem}"
-			LocationNavItemTemplate="{StaticResource LocationNavItem}" />
+			LocationNavItemTemplate="{StaticResource LocationNavItem}"/>
 	</NavigationView.MenuItemTemplateSelector>
 </NavigationView>

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

@@ -1233,4 +1233,4 @@ public class NavItemDataTemplateSelector : DataTemplateSelector
 			};
 		}
 	}
-}
+}

src/Files.App/ViewModels/ItemViewModel.cs

@@ -386,7 +386,7 @@ public ItemViewModel(FolderSettingsViewModel folderSettingsViewModel)
 
 		private async void RecycleBinRefreshRequested(object sender, FileSystemEventArgs e)
 		{
-			if (@"Shell:RecycleBinFolder".Equals(CurrentFolder?.ItemPath, StringComparison.OrdinalIgnoreCase))
+			if (CommonPaths.RecycleBinPath.Equals(CurrentFolder?.ItemPath, StringComparison.OrdinalIgnoreCase))
 			{
 				await dispatcherQueue.EnqueueAsync(() =>
 				{
@@ -397,7 +397,7 @@ await dispatcherQueue.EnqueueAsync(() =>
 
 		private async void RecycleBinItemDeleted(object sender, FileSystemEventArgs e)
 		{
-			if (@"Shell:RecycleBinFolder".Equals(CurrentFolder?.ItemPath, StringComparison.OrdinalIgnoreCase))
+			if (CommonPaths.RecycleBinPath.Equals(CurrentFolder?.ItemPath, StringComparison.OrdinalIgnoreCase))
 			{
 				// get the item that immediately follows matching item to be removed
 				// if the matching item is the last item, try to get the previous item; otherwise, null
@@ -416,7 +416,7 @@ private async void RecycleBinItemDeleted(object sender, FileSystemEventArgs e)
 
 		private async void RecycleBinItemCreated(object sender, FileSystemEventArgs e)
 		{
-			if (@"Shell:RecycleBinFolder".Equals(CurrentFolder?.ItemPath, StringComparison.OrdinalIgnoreCase))
+			if (CommonPaths.RecycleBinPath.Equals(CurrentFolder?.ItemPath, StringComparison.OrdinalIgnoreCase))
 			{
 				using var folderItem = SafetyExtensions.IgnoreExceptions(() => new ShellItem(e.FullPath));
 				if (folderItem is null) return;

src/Files.App/ViewModels/SidebarViewModel.cs

@@ -605,4 +605,4 @@ public GridLength TabControlMargin
 			set => SetProperty(ref tabControlMargin, value);
 		}
 	}
-}
+}

src/Files.App/Views/ColumnShellPage.xaml.cs

@@ -953,7 +953,7 @@ private void FilesystemViewModel_ItemLoadStatusChanged(object sender, ItemLoadSt
 					// Select previous directory
 					if (!string.IsNullOrWhiteSpace(e.PreviousDirectory))
 					{
-						if (e.PreviousDirectory.Contains(e.Path, StringComparison.Ordinal) && !e.PreviousDirectory.Contains("Shell:RecycleBinFolder", StringComparison.Ordinal))
+						if (e.PreviousDirectory.Contains(e.Path, StringComparison.Ordinal) && !e.PreviousDirectory.Contains(CommonPaths.RecycleBinPath, StringComparison.Ordinal))
 						{
 							// Remove the WorkingDir from previous dir
 							e.PreviousDirectory = e.PreviousDirectory.Replace(e.Path, string.Empty, StringComparison.Ordinal);

src/Files.App/Views/ModernShellPage.xaml.cs

@@ -991,7 +991,7 @@ private void FilesystemViewModel_ItemLoadStatusChanged(object sender, ItemLoadSt
 					// Select previous directory
 					if (!InstanceViewModel.IsPageTypeSearchResults && !string.IsNullOrWhiteSpace(e.PreviousDirectory))
 					{
-						if (e.PreviousDirectory.Contains(e.Path, StringComparison.Ordinal) && !e.PreviousDirectory.Contains("Shell:RecycleBinFolder", StringComparison.Ordinal))
+						if (e.PreviousDirectory.Contains(e.Path, StringComparison.Ordinal) && !e.PreviousDirectory.Contains(CommonPaths.RecycleBinPath, StringComparison.Ordinal))
 						{
 							// Remove the WorkingDir from previous dir
 							e.PreviousDirectory = e.PreviousDirectory.Replace(e.Path, string.Empty, StringComparison.Ordinal);