Feature: Recycle Bin changing icons in the side bar

src/Files.App/BaseLayout.cs

@@ -1021,15 +1021,13 @@ protected void FileListItem_RightTapped(object sender, RightTappedRoutedEventArg
 				ItemManipulationModel.SetSelectedItem(rightClickedItem);
 		}
 
-		private readonly RecycleBinHelpers recycleBinHelpers = new();
-
 		protected void InitializeDrag(UIElement containter, ListedItem item)
 		{
 			if (item is null)
 				return;
 
 			UninitializeDrag(containter);
-			if ((item.PrimaryItemAttribute == StorageItemTypes.Folder && !recycleBinHelpers.IsPathUnderRecycleBin(item.ItemPath)) || item.IsExecutable)
+			if ((item.PrimaryItemAttribute == StorageItemTypes.Folder && !RecycleBinHelpers.IsPathUnderRecycleBin(item.ItemPath)) || item.IsExecutable)
 			{
 				containter.AllowDrop = true;
 				containter.DragOver += Item_DragOver;

src/Files.App/Constants.cs

@@ -28,7 +28,6 @@ public static class KnownImageFormats
 		{
 			public const string BITMAP_IMAGE_FORMAT = "bitmapimage";
 		}
-
 		public static class ImageRes
 		{
 			// See imageres.dll for more icon indexes to add
@@ -43,7 +42,8 @@ public static class ImageRes
 			public const int WindowsDrive = 36;
 			public const int ThisPC = 109;
 			public const int NetworkDrives = 25;
-			public const int RecycleBin = 55;
+			public const int RecycleBin = 54;
+			public const int EmptyRecycleBin = 55;
 			public const int CloudDrives = 1040;
 			public const int OneDrive = 1043;
 			public const int Libraries = 1023;

src/Files.App/DataModels/SidebarPinnedModel.cs

@@ -3,6 +3,7 @@
 using Files.App.Controllers;
 using Files.App.DataModels.NavigationControlItems;
 using Files.App.Filesystem;
+using Files.App.Filesystem.StorageItems;
 using Files.App.Helpers;
 using Files.Backend.Services.Settings;
 using System;
@@ -229,22 +230,23 @@ public async Task AddItemToSidebarAsync(string path)
 				Text = res.Result?.DisplayName ?? Path.GetFileName(path.TrimEnd('\\'))
 			};
 
+			locationItem.IsInvalid = res || (FilesystemResult)FolderHelpers.CheckFolderAccessWithWin32(path);
+
 			if (res || (FilesystemResult)FolderHelpers.CheckFolderAccessWithWin32(path))
 			{
-				locationItem.IsInvalid = false;
-				if (res)
+				if (locationItem.Path == CommonPaths.RecycleBinPath)
 				{
-					var iconData = await FileThumbnailHelper.LoadIconFromStorageItemAsync(res.Result, 96u, ThumbnailMode.ListView);
-					locationItem.IconData = iconData;
-					locationItem.Icon = await App.Window.DispatcherQueue.EnqueueAsync(() => locationItem.IconData.ToBitmapAsync());
+					int recycleBinIconIndex = UIHelpers.GetAdaptedRecycleBinIconIndex();
+					locationItem.IconData = UIHelpers.GetIconResourceInfo(recycleBinIconIndex).IconData;
 				}
-
-				if (locationItem.IconData == null)
+				else if (res)
 				{
-					locationItem.IconData = await FileThumbnailHelper.LoadIconWithoutOverlayAsync(path, 96u);
+					locationItem.IconData = await RetrieveItemIconData(path, res);
+				}
 
-					if (locationItem.IconData != null)
-						locationItem.Icon = await App.Window.DispatcherQueue.EnqueueAsync(() => locationItem.IconData.ToBitmapAsync());
+				if (locationItem.IconData != null)
+				{
+					locationItem.Icon = await App.Window.DispatcherQueue.EnqueueAsync(() => locationItem.IconData.ToBitmapAsync());
 				}
 			}
 			else
@@ -257,6 +259,14 @@ public async Task AddItemToSidebarAsync(string path)
 			AddLocationItemToSidebar(locationItem);
 		}
 
+		private async Task<byte[]?> RetrieveItemIconData(string itemPath, FilesystemResult<BaseStorageFolder> result)
+		{
+			byte[]? iconData = await FileThumbnailHelper.LoadIconFromStorageItemAsync(result.Result, 24u, Windows.Storage.FileProperties.ThumbnailMode.ListView);
+			iconData ??= await FileThumbnailHelper.LoadIconWithoutOverlayAsync(itemPath, 24u);
+
+			return iconData;
+		}
+
 		/// <summary>
 		/// Adds the location item to the navigation sidebar
 		/// </summary>

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

@@ -33,14 +33,11 @@ public class FilesystemOperations : IFilesystemOperations
 
         private IShellPage associatedInstance;
 
-        private RecycleBinHelpers recycleBinHelpers;
-
         #region Constructor
 
         public FilesystemOperations(IShellPage associatedInstance)
         {
             this.associatedInstance = associatedInstance;
-            recycleBinHelpers = new RecycleBinHelpers();
         }
 
         #endregion Constructor
@@ -495,7 +492,7 @@ private ContentDialog SetContentDialogRoot(ContentDialog contentDialog)
                                                        bool permanently,
                                                        CancellationToken cancellationToken)
         {
-            bool deleteFromRecycleBin = recycleBinHelpers.IsPathUnderRecycleBin(source.Path);
+            bool deleteFromRecycleBin = RecycleBinHelpers.IsPathUnderRecycleBin(source.Path);
 
             FilesystemResult fsResult = FileSystemStatusCode.InProgress;
 
@@ -549,7 +546,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 (Path.GetExtension(source.Path) == ".lnk" || Path.GetExtension(source.Path) == ".url") // We need to check if it is a shortcut file
@@ -861,7 +858,6 @@ private static async Task<BaseStorageFolder> MoveDirectoryAsync(BaseStorageFolde
 
         public void Dispose()
         {
-            recycleBinHelpers = null;
             associatedInstance = null;
         }
 
@@ -964,7 +960,7 @@ public async Task<IStorageHistory> DeleteItemsAsync(IList<IStorageItemWithPath>
                     break;
                 }
 
-                if (recycleBinHelpers.IsPathUnderRecycleBin(source[i].Path))
+                if (RecycleBinHelpers.IsPathUnderRecycleBin(source[i].Path))
                 {
                     permanently = true;
                 }

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

@@ -37,8 +37,6 @@ public class FilesystemHelpers : IFilesystemHelpers
 
         private ItemManipulationModel itemManipulationModel => associatedInstance.SlimContentPage?.ItemManipulationModel;
 
-        private RecycleBinHelpers recycleBinHelpers;
-
         private readonly CancellationToken cancellationToken;
 
         private Task<NamedPipeAsAppServiceConnection> ServiceConnection => AppServiceConnectionHelper.Instance;
@@ -87,7 +85,6 @@ public FilesystemHelpers(IShellPage associatedInstance, CancellationToken cancel
             this.associatedInstance = associatedInstance;
             this.cancellationToken = cancellationToken;
             this.filesystemOperations = new ShellFilesystemOperations(this.associatedInstance);
-            this.recycleBinHelpers = new RecycleBinHelpers();
         }
 
         #endregion Constructor
@@ -123,18 +120,18 @@ public async Task<ReturnResult> DeleteItemsAsync(IEnumerable<IStorageItemWithPat
 
             var returnStatus = ReturnResult.InProgress;
 
-            var deleteFromRecycleBin = source.Select(item => item.Path).Any(path => recycleBinHelpers.IsPathUnderRecycleBin(path));
-            var canBeSentToBin = !deleteFromRecycleBin && await recycleBinHelpers.HasRecycleBin(source.FirstOrDefault()?.Path);
+            var deleteFromRecycleBin = source.Select(item => item.Path).Any(path => RecycleBinHelpers.IsPathUnderRecycleBin(path));
+            var canBeSentToBin = !deleteFromRecycleBin && await RecycleBinHelpers.HasRecycleBin(source.FirstOrDefault()?.Path);
 
             if (((!permanently && !canBeSentToBin) || UserSettingsService.PreferencesSettingsService.ShowConfirmDeleteDialog) && showDialog) // Check if the setting to show a confirmation dialog is on
             {
                 var incomingItems = new List<BaseFileSystemDialogItemViewModel>();
                 List<ShellFileItem> binItems = null;
                 foreach (var src in source)
                 {
-                    if (recycleBinHelpers.IsPathUnderRecycleBin(src.Path))
+                    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
@@ -190,6 +187,7 @@ public async Task<ReturnResult> DeleteItemsAsync(IEnumerable<IStorageItemWithPat
             sw.Stop();
 
             PostBannerHelpers.PostBanner_Delete(source, returnStatus, permanently, token.IsCancellationRequested, itemsDeleted);
+            RecycleBinHelpers.RaiseRecycleBinChangedEvent();
 
             return returnStatus;
         }
@@ -239,6 +237,8 @@ public async Task<ReturnResult> RestoreItemsFromTrashAsync(IEnumerable<IStorageI
 
             sw.Stop();
 
+            RecycleBinHelpers.RaiseRecycleBinChangedEvent();
+
             return returnStatus;
         }
 
@@ -385,9 +385,9 @@ public async Task<ReturnResult> CopyItemsFromClipboard(DataPackageView packageVi
                 List<ShellFileItem> binItems = null;
                 foreach (var item in source)
                 {
-                    if (recycleBinHelpers.IsPathUnderRecycleBin(item.Path))
+                    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
@@ -532,9 +532,9 @@ public async Task<ReturnResult> MoveItemsFromClipboard(DataPackageView packageVi
             List<ShellFileItem> binItems = null;
             foreach (var item in source)
             {
-                if (recycleBinHelpers.IsPathUnderRecycleBin(item.Path))
+                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
@@ -668,7 +668,7 @@ public async Task<ReturnResult> RecycleItemsFromClipboard(DataPackageView packag
 
             ReturnResult returnStatus = ReturnResult.InProgress;
 
-            source = source.Where(x => !recycleBinHelpers.IsPathUnderRecycleBin(x.Path)); // Can't recycle items already in recyclebin
+            source = source.Where(x => !RecycleBinHelpers.IsPathUnderRecycleBin(x.Path)); // Can't recycle items already in recyclebin
             returnStatus = await DeleteItemsAsync(source, showDialog, false, registerHistory);
 
             return returnStatus;
@@ -852,7 +852,6 @@ public void Dispose()
 
             associatedInstance = null;
             filesystemOperations = null;
-            recycleBinHelpers = null;
         }
 
         #endregion IDisposable

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

@@ -31,8 +31,6 @@ public class ShellFilesystemOperations : IFilesystemOperations
 
         private FilesystemOperations filesystemOperations;
 
-        private RecycleBinHelpers recycleBinHelpers;
-
         private IDialogService DialogService { get; } = Ioc.Default.GetRequiredService<IDialogService>();
 
         private readonly JsonElement defaultJson = JsonSerializer.SerializeToElement("{}");
@@ -45,7 +43,6 @@ public ShellFilesystemOperations(IShellPage associatedInstance)
         {
             this.associatedInstance = associatedInstance;
             filesystemOperations = new FilesystemOperations(associatedInstance);
-            recycleBinHelpers = new RecycleBinHelpers();
         }
 
         #endregion Constructor
@@ -335,7 +332,7 @@ public async Task<IStorageHistory> DeleteItemsAsync(IList<IStorageItemWithPath>
             }
 
             var deleleFilePaths = source.Select(s => s.Path).Distinct();
-            var deleteFromRecycleBin = source.Any() ? recycleBinHelpers.IsPathUnderRecycleBin(source.ElementAt(0).Path) : false;
+            var deleteFromRecycleBin = source.Any() ? RecycleBinHelpers.IsPathUnderRecycleBin(source.ElementAt(0).Path) : false;
             permanently |= deleteFromRecycleBin;
 
             if (deleteFromRecycleBin)
@@ -809,9 +806,9 @@ private async Task<DialogResult> GetFileListDialog(IEnumerable<string> source, s
             List<ShellFileItem> binItems = null;
             foreach (var src in source)
             {
-                if (recycleBinHelpers.IsPathUnderRecycleBin(src))
+                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
@@ -842,7 +839,6 @@ public void Dispose()
             filesystemOperations?.Dispose();
 
             filesystemOperations = null;
-            recycleBinHelpers = null;
             associatedInstance = null;
         }