Use only SingleItem

Author: gave92

src/Files.App/Data/Enums/IconOptions.cs

@@ -38,15 +38,5 @@ public enum IconOptions
 		/// Retrieve a thumbnail only if it is cached or embedded in the file.
 		/// </summary>
 		ReturnOnlyIfCached = 16,
-
-		/// <summary>
-		/// Default. Retrieve a thumbnail to display a preview of any single item (like a file, folder, or file group).
-		/// </summary>
-		SingleItem = 32,
-
-		/// <summary>
-		/// Retrieve a thumbnail to display previews of files (or other items) in a list.
-		/// </summary>
-		ListView = 64,
 	}
 }

src/Files.App/Utils/Storage/Helpers/FileThumbnailHelper.cs

@@ -37,9 +37,7 @@ public static class FileThumbnailHelper
 								   (iconOptions.HasFlag(IconOptions.ReturnOnlyIfCached) ? ThumbnailOptions.ReturnOnlyIfCached : 0) |
 								   (iconOptions.HasFlag(IconOptions.ResizeThumbnail) ? ThumbnailOptions.ResizeThumbnail : 0);
 
-			var thumbnailMode = iconOptions.HasFlag(IconOptions.ListView) ? ThumbnailMode.ListView : ThumbnailMode.SingleItem;
-
-			return GetIconAsync(item, requestedSize, thumbnailMode, thumbnailOptions);
+			return GetIconAsync(item, requestedSize, ThumbnailMode.SingleItem, thumbnailOptions);
 		}
 
 		public static async Task<byte[]?> GetIconAsync(IStorageItem item, uint requestedSize, ThumbnailMode thumbnailMode, ThumbnailOptions thumbnailOptions)

src/Files.App/ViewModels/ShellViewModel.cs

@@ -1096,17 +1096,18 @@ private async Task<bool> LoadThumbnailAsync(ListedItem item, IStorageItem matchi
 			// SingleItem returns image thumbnails in the correct aspect ratio for the grid layouts
 			// ListView is used for the details and columns layout
 			// We use ReturnOnlyIfCached because otherwise folders thumbnails have a black background, this has the downside the folder previews don't work
-			var iconOptions = matchingStorageItem switch
+			var (mode, options) = matchingStorageItem switch
 			{
-				BaseStorageFolder => IconOptions.SingleItem | IconOptions.ReturnOnlyIfCached,
-				BaseStorageFile when thumbnailSize < 96 => IconOptions.ListView | IconOptions.ResizeThumbnail,
-				_ => IconOptions.SingleItem | IconOptions.ResizeThumbnail,
+				BaseStorageFolder => (ThumbnailMode.SingleItem, ThumbnailOptions.ReturnOnlyIfCached),
+				BaseStorageFile when thumbnailSize < 96 => (ThumbnailMode.ListView, ThumbnailOptions.ResizeThumbnail),
+				_ => (ThumbnailMode.SingleItem, ThumbnailOptions.ResizeThumbnail),
 			};
 
 			var result = await FileThumbnailHelper.GetIconAsync(
 						matchingStorageItem, 
 						thumbnailSize,
-						iconOptions);
+						mode,
+						options);
 
 			if (result is not null)
 			{