Replace sizes with constants

files-community · Jan 12, 2024 · b131620 · b131620
1 parent 92d57a4
commit b131620
Show file tree

Hide file tree

Showing 12 changed files with 21 additions and 21 deletions.
diff --git a/src/Files.App/Constants.cs b/src/Files.App/Constants.cs
@@ -132,18 +132,18 @@ public static class GridViewBrowser
 
 				public const int TilesView = 100;
 			}
+		}
 
-			public static class DetailsLayoutBrowser
-			{
-				public const int DetailsViewSize = 32;
-			}
+		// Default icon sizes that are available for files and folders
+		public static class DefaultIconSizes
+		{
+			public const int Small = 16;
 
-			public static class ColumnViewBrowser
-			{
-				public const int ColumnViewSize = 32;
+			public const int Large = 32;
 
-				public const int ColumnViewSizeSmall = 24;
-			}
+			public const int ExtraLarge = 48;
+
+			public const int Jumbo = 256;
 		}
 
 		public static class Widgets

diff --git a/src/Files.App/Data/Items/DriveItem.cs b/src/Files.App/Data/Items/DriveItem.cs
@@ -324,7 +324,7 @@ public async Task LoadThumbnailAsync(bool isSidebar = false)
 			else
 			{
 				if (!string.IsNullOrEmpty(DeviceID) && !string.Equals(DeviceID, "network-folder"))
-					IconData ??= await FileThumbnailHelper.LoadIconWithoutOverlayAsync(DeviceID, 16, false, true);
+					IconData ??= await FileThumbnailHelper.LoadIconWithoutOverlayAsync(DeviceID, Constants.DefaultIconSizes.Large, false, true);
 
 				if (Root is not null)
 				{

diff --git a/src/Files.App/Data/Models/ItemViewModel.cs b/src/Files.App/Data/Models/ItemViewModel.cs
@@ -1249,7 +1249,7 @@ public async Task LoadGitPropertiesAsync(GitItem gitItem)
 			ImageSource? groupImage = null;
 			if (item.PrimaryItemAttribute != StorageItemTypes.Folder || item.IsArchive)
 			{
-				var headerIconInfo = await FileThumbnailHelper.LoadIconWithoutOverlayAsync(item.ItemPath, 64u, false, true);
+				var headerIconInfo = await FileThumbnailHelper.LoadIconWithoutOverlayAsync(item.ItemPath, Constants.DefaultIconSizes.ExtraLarge, false, true);
 
 				if (headerIconInfo is not null && !item.IsShortcut)
 					groupImage = await dispatcherQueue.EnqueueOrInvokeAsync(() => headerIconInfo.ToBitmapAsync(), Microsoft.UI.Dispatching.DispatcherQueuePriority.Low);

diff --git a/src/Files.App/Helpers/Layout/LayoutPreferencesManager.cs b/src/Files.App/Helpers/Layout/LayoutPreferencesManager.cs
@@ -308,9 +308,9 @@ public uint GetIconSize()
 			return LayoutMode switch
 			{
 				FolderLayoutModes.DetailsView
-					=> Constants.Browser.DetailsLayoutBrowser.DetailsViewSize,
+					=> Constants.DefaultIconSizes.Large,
 				FolderLayoutModes.ColumnView
-					=> Constants.Browser.ColumnViewBrowser.ColumnViewSize,
+					=> Constants.DefaultIconSizes.Large,
 				FolderLayoutModes.TilesView
 					=> Constants.Browser.GridViewBrowser.TilesView,
 				_ when GridViewSize <= Constants.Browser.GridViewBrowser.GridViewSizeSmall

diff --git a/src/Files.App/Utils/Cloud/CloudDrivesManager.cs b/src/Files.App/Utils/Cloud/CloudDrivesManager.cs
@@ -63,7 +63,7 @@ public static async Task UpdateDrivesAsync()
 					ShowProperties = true,
 				};
 
-				var iconData = provider.IconData ?? await FileThumbnailHelper.LoadIconWithoutOverlayAsync(provider.SyncFolder, 24, false, true);
+				var iconData = provider.IconData ?? await FileThumbnailHelper.LoadIconWithoutOverlayAsync(provider.SyncFolder, Constants.DefaultIconSizes.Large, false, true);
 				if (iconData is not null)
 				{
 					cloudProviderItem.IconData = iconData;

diff --git a/src/Files.App/Utils/Library/LibraryLocationItem.cs b/src/Files.App/Utils/Library/LibraryLocationItem.cs
@@ -46,7 +46,7 @@ public async Task<bool> CheckDefaultSaveFolderAccess()
 
 		public async Task LoadLibraryIconAsync()
 		{
-			IconData = await FileThumbnailHelper.LoadIconWithoutOverlayAsync(Path, 24u, false, true);
+			IconData = await FileThumbnailHelper.LoadIconWithoutOverlayAsync(Path, Constants.DefaultIconSizes.Large, false, true);
 
 			if (IconData is not null)
 				Icon = await IconData.ToBitmapAsync();

diff --git a/src/Files.App/Utils/RecentItem/RecentItem.cs b/src/Files.App/Utils/RecentItem/RecentItem.cs
@@ -76,7 +76,7 @@ public RecentItem(ShellFileItem fileItem) : base()
 
 		public async Task LoadRecentItemIconAsync()
 		{
-			var iconData = await FileThumbnailHelper.LoadIconWithoutOverlayAsync(RecentPath, 96u, false, false);
+			var iconData = await FileThumbnailHelper.LoadIconWithoutOverlayAsync(RecentPath, Constants.DefaultIconSizes.Large, false, false);
 			if (iconData is not null)
 			{
 				EmptyImgVis = false;

diff --git a/src/Files.App/ViewModels/UserControls/Previews/BasePreviewModel.cs b/src/Files.App/ViewModels/UserControls/Previews/BasePreviewModel.cs
@@ -85,7 +85,7 @@ public virtual async Task LoadAsync()
 		public async virtual Task<List<FileProperty>> LoadPreviewAndDetailsAsync()
 		{
 			// Requesting sizes larger than 220 may result in a small thumbnail
-			var iconData = await FileThumbnailHelper.LoadIconWithoutOverlayAsync(Item.ItemPath, 220, false, false);
+			var iconData = await FileThumbnailHelper.LoadIconWithoutOverlayAsync(Item.ItemPath, Constants.DefaultIconSizes.Jumbo, false, false);
 			if (iconData is not null)
 				await MainWindow.Instance.DispatcherQueue.EnqueueOrInvokeAsync(async () => FileImage = await iconData.ToBitmapAsync());
 			else

diff --git a/src/Files.App/ViewModels/UserControls/Previews/FolderPreviewViewModel.cs b/src/Files.App/ViewModels/UserControls/Previews/FolderPreviewViewModel.cs
@@ -31,7 +31,7 @@ private async Task LoadPreviewAndDetailsAsync()
 			var items = await Folder.GetItemsAsync();
 
 			// Requesting sizes larger than 220 may result in a thumbnail with a small folder
-			var iconData = await FileThumbnailHelper.LoadIconWithoutOverlayAsync(Item.ItemPath, 220, true, false);
+			var iconData = await FileThumbnailHelper.LoadIconWithoutOverlayAsync(Item.ItemPath, Constants.DefaultIconSizes.Jumbo, true, false);
 			if (iconData is not null)
 				Thumbnail = await iconData.ToBitmapAsync();
 

diff --git a/src/Files.App/ViewModels/UserControls/Previews/ShortcutPreviewViewModel.cs b/src/Files.App/ViewModels/UserControls/Previews/ShortcutPreviewViewModel.cs
@@ -36,7 +36,7 @@ public override async Task LoadAsync()
 
 		private async Task LoadItemThumbnailAsync()
 		{
-			var iconData = await FileThumbnailHelper.LoadIconWithoutOverlayAsync(Item.ItemPath, 256, false, false);
+			var iconData = await FileThumbnailHelper.LoadIconWithoutOverlayAsync(Item.ItemPath, Constants.DefaultIconSizes.Jumbo, false, false);
 			if (iconData is not null)
 			{
 				FileImage = await iconData.ToBitmapAsync();

diff --git a/src/Files.App/Views/Layouts/ColumnLayoutPage.xaml.cs b/src/Files.App/Views/Layouts/ColumnLayoutPage.xaml.cs
@@ -39,7 +39,7 @@ public sealed partial class ColumnLayoutPage : BaseGroupableLayoutPage
 
 		// Properties
 
-		protected override uint IconSize => Browser.ColumnViewBrowser.ColumnViewSizeSmall;
+		protected override uint IconSize => Constants.DefaultIconSizes.Large;
 		protected override ListViewBase ListViewBase => FileList;
 		protected override SemanticZoom RootZoom => RootGridZoom;
 

diff --git a/src/Files.App/Views/Layouts/ColumnsLayoutPage.xaml.cs b/src/Files.App/Views/Layouts/ColumnsLayoutPage.xaml.cs
@@ -20,7 +20,7 @@ public sealed partial class ColumnsLayoutPage : BaseLayoutPage
 	{
 		// Properties
 
-		protected override uint IconSize => Browser.ColumnViewBrowser.ColumnViewSizeSmall;
+		protected override uint IconSize => Constants.DefaultIconSizes.Large;
 		protected override ItemsControl ItemsControl => ColumnHost;
 
 		public string? OwnerPath { get; private set; }