Code Quality: Use single image control for placeholder & thumbnail (#12970)

gave92 · web-flow · commit 9c4660d988da · 2023-07-18T15:54:09.000-04:00
diff --git a/src/Files.App/Data/Items/ListedItem.cs b/src/Files.App/Data/Items/ListedItem.cs
@@ -73,25 +73,11 @@ public bool LoadFileIcon
 			set => SetProperty(ref loadFileIcon, value);
 		}
 
-		private bool loadDefaultIcon = false;
-		public bool LoadDefaultIcon
-		{
-			get => loadDefaultIcon;
-			[Obsolete("The set accessor is used internally and should not be used outside ListedItem and derived classes.")]
-			set => SetProperty(ref loadDefaultIcon, value);
-		}
-
 		private bool loadWebShortcutGlyph;
 		public bool LoadWebShortcutGlyph
 		{
 			get => loadWebShortcutGlyph;
-			set
-			{
-				if (SetProperty(ref loadWebShortcutGlyph, value))
-				{
-					LoadDefaultIcon = !value;
-				}
-			}
+			set => SetProperty(ref loadWebShortcutGlyph, value);
 		}
 
 		private bool loadCustomIcon;
@@ -187,43 +173,14 @@ public BitmapImage FileImage
 			get => fileImage;
 			set
 			{
-				if (fileImage is BitmapImage imgOld)
-				{
-					imgOld.ImageOpened -= Img_ImageOpened;
-				}
 				if (SetProperty(ref fileImage, value))
 				{
-					if (value is BitmapImage img)
-					{
-						if (img.PixelWidth > 0)
-						{
-							Img_ImageOpened(img, null);
-						}
-						else
-						{
-							img.ImageOpened += Img_ImageOpened;
-						}
-					}
-				}
-			}
-		}
-
-		private void Img_ImageOpened(object sender, Microsoft.UI.Xaml.RoutedEventArgs e)
-		{
-			if (sender is BitmapImage image)
-			{
-				image.ImageOpened -= Img_ImageOpened;
-
-				if (image.PixelWidth > 0)
-				{
-					SafetyExtensions.IgnoreExceptions(() =>
+					if (value is BitmapImage)
 					{
 						LoadFileIcon = true;
-						PlaceholderDefaultIcon = null;
 						NeedsPlaceholderGlyph = false;
-						LoadDefaultIcon = false;
 						LoadWebShortcutGlyph = false;
-					}, App.Logger); // 2009482836u
+					}
 				}
 			}
 		}
@@ -243,13 +200,6 @@ public BitmapImage IconOverlay
 			}
 		}
 
-		private BitmapImage placeholderDefaultIcon;
-		public BitmapImage PlaceholderDefaultIcon
-		{
-			get => placeholderDefaultIcon;
-			set => SetProperty(ref placeholderDefaultIcon, value);
-		}
-
 		private BitmapImage shieldIcon;
 		public BitmapImage ShieldIcon
 		{
@@ -454,13 +404,6 @@ public void UpdateContainsFilesFolders()
 			ContainsFilesOrFolders = FolderHelpers.CheckForFilesFolders(ItemPath);
 		}
 
-		public void SetDefaultIcon(BitmapImage img)
-		{
-			NeedsPlaceholderGlyph = false;
-			LoadDefaultIcon = true;
-			PlaceholderDefaultIcon = img;
-		}
-
 		private bool CheckElevationRights()
 		{
 			return IsShortcut
diff --git a/src/Files.App/Data/Models/ItemViewModel.cs b/src/Files.App/Data/Models/ItemViewModel.cs
@@ -913,10 +913,11 @@ private async Task LoadItemThumbnail(ListedItem item, uint thumbnailSize = 96, I
 						{
 							await dispatcherQueue.EnqueueOrInvokeAsync(async () =>
 							{
-								item.FileImage ??= new BitmapImage();
-								item.FileImage.DecodePixelType = DecodePixelType.Logical;
-								item.FileImage.DecodePixelWidth = (int)thumbnailSize;
-								await item.FileImage.SetSourceAsync(Thumbnail);
+								var img = new BitmapImage();
+								img.DecodePixelType = DecodePixelType.Logical;
+								img.DecodePixelWidth = (int)thumbnailSize;
+								await img.SetSourceAsync(Thumbnail);
+								item.FileImage = img;
 								if (!string.IsNullOrEmpty(item.FileExtension) &&
 									!item.IsShortcut && !item.IsExecutable &&
 									!ImagePreviewViewModel.ContainsExtension(item.FileExtension.ToLowerInvariant()))
@@ -983,10 +984,11 @@ await dispatcherQueue.EnqueueOrInvokeAsync(async () =>
 						{
 							await dispatcherQueue.EnqueueOrInvokeAsync(async () =>
 							{
-								item.FileImage ??= new BitmapImage();
-								item.FileImage.DecodePixelType = DecodePixelType.Logical;
-								item.FileImage.DecodePixelWidth = (int)thumbnailSize;
-								await item.FileImage.SetSourceAsync(Thumbnail);
+								var img = new BitmapImage();
+								img.DecodePixelType = DecodePixelType.Logical;
+								img.DecodePixelWidth = (int)thumbnailSize;
+								await img.SetSourceAsync(Thumbnail);
+								item.FileImage = img;
 							}, Microsoft.UI.Dispatching.DispatcherQueuePriority.Normal);
 							wasIconLoaded = true;
 						}
diff --git a/src/Files.App/Utils/StorageEnumerators/UniversalStorageEnumerator.cs b/src/Files.App/Utils/StorageEnumerators/UniversalStorageEnumerator.cs
@@ -89,7 +89,7 @@ ex is UnauthorizedAccessException
 							{
 								if (defaultIconPairs?.ContainsKey(string.Empty) ?? false)
 								{
-									folder.SetDefaultIcon(defaultIconPairs[string.Empty]);
+									folder.FileImage = defaultIconPairs[string.Empty];
 								}
 								tempList.Add(folder);
 							}
@@ -106,7 +106,7 @@ ex is UnauthorizedAccessException
 										var lowercaseExtension = fileEntry.FileExtension.ToLowerInvariant();
 										if (defaultIconPairs.ContainsKey(lowercaseExtension))
 										{
-											fileEntry.SetDefaultIcon(defaultIconPairs[lowercaseExtension]);
+											fileEntry.FileImage = defaultIconPairs[lowercaseExtension];
 										}
 									}
 								}
diff --git a/src/Files.App/Utils/StorageEnumerators/Win32StorageEnumerator.cs b/src/Files.App/Utils/StorageEnumerators/Win32StorageEnumerator.cs
@@ -63,7 +63,7 @@ public static async Task<List<ListedItem>> ListEntries(
 									var lowercaseExtension = file.FileExtension.ToLowerInvariant();
 									if (defaultIconPairs.ContainsKey(lowercaseExtension))
 									{
-										file.SetDefaultIcon(defaultIconPairs[lowercaseExtension]);
+										file.FileImage = defaultIconPairs[lowercaseExtension];
 									}
 								}
 							}
@@ -86,7 +86,7 @@ public static async Task<List<ListedItem>> ListEntries(
 								if (defaultIconPairs?.ContainsKey(string.Empty) ?? false)
 								{
 									// Set folder icon (found by empty extension string)
-									folder.SetDefaultIcon(defaultIconPairs[string.Empty]);
+									folder.FileImage = defaultIconPairs[string.Empty];
 								}
 								tempList.Add(folder);
 								++count;
diff --git a/src/Files.App/Views/LayoutModes/ColumnViewBase.xaml b/src/Files.App/Views/LayoutModes/ColumnViewBase.xaml
@@ -218,14 +218,6 @@
 											Source="{x:Bind FileImage, Mode=OneWay}"
 											Stretch="Uniform" />
 									</ContentPresenter>
-									<Image
-										x:Name="FolderGlyphIcon"
-										Width="20"
-										Height="20"
-										HorizontalAlignment="Stretch"
-										VerticalAlignment="Stretch"
-										x:Load="{x:Bind LoadDefaultIcon, Mode=OneWay}"
-										Source="{x:Bind PlaceholderDefaultIcon, Mode=OneWay}" />
 									<Border
 										x:Name="TypeUnknownGlyph"
 										Width="20"
diff --git a/src/Files.App/Views/LayoutModes/DetailsLayoutBrowser.xaml b/src/Files.App/Views/LayoutModes/DetailsLayoutBrowser.xaml
@@ -915,14 +915,6 @@
 													Source="{x:Bind FileImage, Mode=OneWay}"
 													Stretch="Uniform" />
 											</ContentPresenter>
-											<Image
-												x:Name="FolderGlyphIcon"
-												Width="20"
-												Height="20"
-												HorizontalAlignment="Stretch"
-												VerticalAlignment="Stretch"
-												x:Load="{x:Bind LoadDefaultIcon, Mode=OneWay}"
-												Source="{x:Bind PlaceholderDefaultIcon, Mode=OneWay}" />
 											<Border
 												x:Name="TypeUnknownGlyph"
 												Width="20"
diff --git a/src/Files.App/Views/LayoutModes/GridViewBrowser.xaml b/src/Files.App/Views/LayoutModes/GridViewBrowser.xaml
@@ -92,16 +92,6 @@
 								Stretch="Uniform" />
 						</ContentPresenter>
 
-						<Image
-							x:Name="FolderGlyphIcon"
-							MaxWidth="{Binding FolderSettings.GridViewSize, ElementName=PageRoot, Mode=OneWay}"
-							MaxHeight="{Binding FolderSettings.GridViewSize, ElementName=PageRoot, Mode=OneWay}"
-							Margin="12"
-							HorizontalAlignment="Stretch"
-							VerticalAlignment="Stretch"
-							x:Load="{x:Bind LoadDefaultIcon, Mode=OneWay}"
-							Source="{x:Bind PlaceholderDefaultIcon, Mode=OneWay}" />
-
 						<Border
 							x:Name="TypeUnknownGlyph"
 							MaxWidth="{Binding FolderSettings.GridViewSize, ElementName=PageRoot, Mode=OneWay}"
@@ -332,15 +322,6 @@
 								Stretch="Uniform" />
 						</ContentPresenter>
 
-						<Image
-							x:Name="FolderGlyphIcon"
-							Width="60"
-							Height="60"
-							HorizontalAlignment="Stretch"
-							VerticalAlignment="Stretch"
-							x:Load="{x:Bind LoadDefaultIcon, Mode=OneWay}"
-							Source="{x:Bind PlaceholderDefaultIcon, Mode=OneWay}" />
-
 						<Border
 							x:Name="TypeUnknownGlyph"
 							Width="60"

Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ ex is UnauthorizedAccessException`
`89`	`89`	`{`
`90`	`90`	`if (defaultIconPairs?.ContainsKey(string.Empty) ?? false)`
`91`	`91`	`{`
`92`		`- folder.SetDefaultIcon(defaultIconPairs[string.Empty]);`
	`92`	`+ folder.FileImage = defaultIconPairs[string.Empty];`
`93`	`93`	`}`
`94`	`94`	`tempList.Add(folder);`
`95`	`95`	`}`
`@@ -106,7 +106,7 @@ ex is UnauthorizedAccessException`
`106`	`106`	`var lowercaseExtension = fileEntry.FileExtension.ToLowerInvariant();`
`107`	`107`	`if (defaultIconPairs.ContainsKey(lowercaseExtension))`
`108`	`108`	`{`
`109`		`- fileEntry.SetDefaultIcon(defaultIconPairs[lowercaseExtension]);`
	`109`	`+ fileEntry.FileImage = defaultIconPairs[lowercaseExtension];`
`110`	`110`	`}`
`111`	`111`	`}`
`112`	`112`	`}`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ public static async Task<List<ListedItem>> ListEntries(`
`63`	`63`	`var lowercaseExtension = file.FileExtension.ToLowerInvariant();`
`64`	`64`	`if (defaultIconPairs.ContainsKey(lowercaseExtension))`
`65`	`65`	`{`
`66`		`- file.SetDefaultIcon(defaultIconPairs[lowercaseExtension]);`
	`66`	`+ file.FileImage = defaultIconPairs[lowercaseExtension];`
`67`	`67`	`}`
`68`	`68`	`}`
`69`	`69`	`}`
`@@ -86,7 +86,7 @@ public static async Task<List<ListedItem>> ListEntries(`
`86`	`86`	`if (defaultIconPairs?.ContainsKey(string.Empty) ?? false)`
`87`	`87`	`{`
`88`	`88`	`// Set folder icon (found by empty extension string)`
`89`		`- folder.SetDefaultIcon(defaultIconPairs[string.Empty]);`
	`89`	`+ folder.FileImage = defaultIconPairs[string.Empty];`
`90`	`90`	`}`
`91`	`91`	`tempList.Add(folder);`
`92`	`92`	`++count;`