Skip to content

Commit b2f66b5

Browse files
yaira2yaira2
authored
Code Quality: Differentiate between icon size & icon height (#14713)
1 parent 6b8bfd9 commit b2f66b5

23 files changed

+181
-157
lines changed

‎src/Files.App/Constants.cs‎

Lines changed: 32 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -118,24 +118,48 @@ public static class Appearance
118118
public const string StandardFont = "Segoe UI Variable";
119119
}
120120

121-
public static class Browser
121+
// Default icon heights used in the differents layouts
122+
public static class IconHeights
122123
{
123-
public static class GridViewBrowser
124+
public static class GridView
124125
{
125-
public const int GridViewIncrement = 20;
126+
public const int Increment = 20;
126127

127-
public const int GridViewSizeLarge = 220;
128+
public const int Minimum = 80;
128129

129-
public const int GridViewSizeMedium = 160;
130+
public const int Small = 100;
130131

131-
public const int GridViewSizeSmall = 100;
132+
public const int Medium = 160;
132133

133-
public const int TilesView = 100;
134+
public const int Large = 220;
135+
136+
public const int Maximum = 300;
137+
}
138+
139+
public static class TilesView
140+
{
141+
public const int Regular = 100;
142+
}
143+
144+
public static class ListView
145+
{
146+
public const int Regular = 32;
147+
}
148+
149+
public static class DetailsView
150+
{
151+
public const int Regular = 32;
152+
}
153+
154+
public static class ColumnsView
155+
{
156+
public const int Regular = 32;
134157
}
135158
}
136159

160+
137161
// Default icon sizes that are available for files and folders
138-
public static class DefaultIconSizes
162+
public static class ShellIconSizes
139163
{
140164
public const int Small = 16;
141165

‎src/Files.App/Data/Contexts/DisplayPage/DisplayPageContext.cs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Copyright (c) 2023 Files Community
22
// Licensed under the MIT License. See the LICENSE.
33

4-
using static Files.App.Constants.Browser.GridViewBrowser;
4+
using static Files.App.Constants;
55

66
namespace Files.App.Data.Contexts
77
{
@@ -34,13 +34,13 @@ public LayoutTypes LayoutType
3434
viewModel.ToggleLayoutModeTiles(true);
3535
break;
3636
case LayoutTypes.GridSmall:
37-
viewModel.ToggleLayoutModeGridView(GridViewSizeSmall, true);
37+
viewModel.ToggleLayoutModeGridView(IconHeights.GridView.Small, true);
3838
break;
3939
case LayoutTypes.GridMedium:
40-
viewModel.ToggleLayoutModeGridView(GridViewSizeMedium, true);
40+
viewModel.ToggleLayoutModeGridView(IconHeights.GridView.Medium, true);
4141
break;
4242
case LayoutTypes.GridLarge:
43-
viewModel.ToggleLayoutModeGridView(GridViewSizeLarge, true);
43+
viewModel.ToggleLayoutModeGridView(IconHeights.GridView.Large, true);
4444
break;
4545
case LayoutTypes.Columns:
4646
viewModel.ToggleLayoutModeColumnView(true);
@@ -174,7 +174,7 @@ private void FolderSettings_PropertyChanged(object? sender, PropertyChangedEvent
174174
switch (e.PropertyName)
175175
{
176176
case nameof(LayoutPreferencesManager.LayoutMode):
177-
case nameof(LayoutPreferencesManager.IconSize):
177+
case nameof(LayoutPreferencesManager.IconHeight):
178178
case nameof(LayoutPreferencesManager.IsAdaptiveLayoutEnabled):
179179
SetProperty(ref _LayoutType, GetLayoutType(), nameof(LayoutType));
180180
break;
@@ -251,10 +251,10 @@ private LayoutTypes GetLayoutType()
251251
FolderLayoutModes.DetailsView => LayoutTypes.Details,
252252
FolderLayoutModes.ListView => LayoutTypes.List,
253253
FolderLayoutModes.TilesView => LayoutTypes.Tiles,
254-
FolderLayoutModes.GridView => viewModel.IconSize switch
254+
FolderLayoutModes.GridView => viewModel.IconHeight switch
255255
{
256-
< GridViewSizeMedium => LayoutTypes.GridSmall,
257-
< GridViewSizeLarge => LayoutTypes.GridMedium,
256+
< IconHeights.GridView.Medium => LayoutTypes.GridSmall,
257+
< IconHeights.GridView.Large => LayoutTypes.GridMedium,
258258
_ => LayoutTypes.GridLarge,
259259
},
260260
FolderLayoutModes.ColumnView => LayoutTypes.Columns,

‎src/Files.App/Data/Items/DriveItem.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,7 @@ public int CompareTo(INavigationControlItem other)
317317
public async Task LoadThumbnailAsync()
318318
{
319319
if (!string.IsNullOrEmpty(DeviceID) && !string.Equals(DeviceID, "network-folder"))
320-
IconData ??= await FileThumbnailHelper.LoadIconWithoutOverlayAsync(DeviceID, Constants.DefaultIconSizes.Large, false, false, true);
320+
IconData ??= await FileThumbnailHelper.LoadIconWithoutOverlayAsync(DeviceID, Constants.ShellIconSizes.Large, false, false, true);
321321

322322
if (Root is not null)
323323
{

‎src/Files.App/Data/Items/SidebarLibraryItem.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public async Task<bool> CheckDefaultSaveFolderAccess()
4646

4747
public async Task LoadLibraryIconAsync()
4848
{
49-
IconData = await FileThumbnailHelper.LoadIconWithoutOverlayAsync(Path, Constants.DefaultIconSizes.Large, false, false, true);
49+
IconData = await FileThumbnailHelper.LoadIconWithoutOverlayAsync(Path, Constants.ShellIconSizes.Large, false, false, true);
5050

5151
if (IconData is not null)
5252
Icon = await IconData.ToBitmapAsync();

‎src/Files.App/Data/Items/WidgetDriveCardItem.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public WidgetDriveCardItem(DriveItem item)
2626

2727
public async Task LoadCardThumbnailAsync()
2828
{
29-
thumbnailData = await FileThumbnailHelper.LoadIconWithoutOverlayAsync(Item.Path, Constants.DefaultIconSizes.Jumbo, true, false, true);
29+
thumbnailData = await FileThumbnailHelper.LoadIconWithoutOverlayAsync(Item.Path, Constants.ShellIconSizes.Jumbo, true, false, true);
3030

3131
// Thumbnail data is valid, set the item icon
3232
if (thumbnailData is not null && thumbnailData.Length > 0)

‎src/Files.App/Data/Items/WidgetFolderCardItem.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public WidgetFolderCardItem(LocationItem item, string text, bool isPinned)
5050

5151
public async Task LoadCardThumbnailAsync()
5252
{
53-
_thumbnailData = await FileThumbnailHelper.LoadIconWithoutOverlayAsync(Path, Constants.DefaultIconSizes.Jumbo, true, false, true);
53+
_thumbnailData = await FileThumbnailHelper.LoadIconWithoutOverlayAsync(Path, Constants.ShellIconSizes.Jumbo, true, false, true);
5454

5555
if (_thumbnailData is not null && _thumbnailData.Length > 0)
5656
Thumbnail = await MainWindow.Instance.DispatcherQueue.EnqueueOrInvokeAsync(() => _thumbnailData.ToBitmapAsync(), Microsoft.UI.Dispatching.DispatcherQueuePriority.Low);

‎src/Files.App/Data/Models/ItemViewModel.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -613,11 +613,11 @@ await dispatcherQueue.EnqueueOrInvokeAsync(() =>
613613
case nameof(UserSettingsService.FoldersSettingsService.SyncFolderPreferencesAcrossDirectories):
614614
case nameof(UserSettingsService.FoldersSettingsService.DefaultGroupByDateUnit):
615615
case nameof(UserSettingsService.FoldersSettingsService.DefaultLayoutMode):
616-
case nameof(UserSettingsService.LayoutSettingsService.DefaultIconSizeDetailsView):
617-
case nameof(UserSettingsService.LayoutSettingsService.DefaultIconSizeListView):
618-
case nameof(UserSettingsService.LayoutSettingsService.DefaulIconSizeTilesView):
619-
case nameof(UserSettingsService.LayoutSettingsService.DefaulIconSizeGridView):
620-
case nameof(UserSettingsService.LayoutSettingsService.DefaultIconSizeColumnsView):
616+
case nameof(UserSettingsService.LayoutSettingsService.DefaultIconHeightDetailsView):
617+
case nameof(UserSettingsService.LayoutSettingsService.DefaultIconHeightListView):
618+
case nameof(UserSettingsService.LayoutSettingsService.DefaulIconHeightTilesView):
619+
case nameof(UserSettingsService.LayoutSettingsService.DefaulIconHeightGridView):
620+
case nameof(UserSettingsService.LayoutSettingsService.DefaultIconHeightColumnsView):
621621
await dispatcherQueue.EnqueueOrInvokeAsync(() =>
622622
{
623623
folderSettings.OnDefaultPreferencesChanged(WorkingDirectory, e.SettingName);
@@ -1288,7 +1288,7 @@ await SafetyExtensions.IgnoreExceptions(() =>
12881288
ImageSource? groupImage = null;
12891289
if (item.PrimaryItemAttribute != StorageItemTypes.Folder || item.IsArchive)
12901290
{
1291-
var headerIconInfo = await FileThumbnailHelper.LoadIconWithoutOverlayAsync(item.ItemPath, Constants.DefaultIconSizes.ExtraLarge, false, false, true);
1291+
var headerIconInfo = await FileThumbnailHelper.LoadIconWithoutOverlayAsync(item.ItemPath, Constants.ShellIconSizes.ExtraLarge, false, false, true);
12921292

12931293
if (headerIconInfo is not null && !item.IsShortcut)
12941294
groupImage = await dispatcherQueue.EnqueueOrInvokeAsync(() => headerIconInfo.ToBitmapAsync(), Microsoft.UI.Dispatching.DispatcherQueuePriority.Low);

‎src/Files.App/Helpers/Layout/AdaptiveLayoutHelpers.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public static void ApplyAdaptativeLayout(LayoutPreferencesManager folderSettings
3030
folderSettings.ToggleLayoutModeDetailsView(false);
3131
break;
3232
case Layouts.Grid:
33-
folderSettings.ToggleLayoutModeGridView(Constants.Browser.GridViewBrowser.GridViewSizeMedium, false);
33+
folderSettings.ToggleLayoutModeGridView(Constants.IconHeights.GridView.Medium, false);
3434
break;
3535
}
3636
}

‎src/Files.App/Helpers/Layout/LayoutPreferencesItem.cs‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ public class LayoutPreferencesItem
2020
public bool SortFilesFirst;
2121
public bool IsAdaptiveLayoutOverridden;
2222

23-
// Icon sizes
24-
public int IconSizeDetailsView;
25-
public int IconSizeListView;
26-
public int IconSizeTilesView;
27-
public int IconSizeGridView;
28-
public int IconSizeColumnsView;
23+
// Icon heights
24+
public int IconHeightDetailsView;
25+
public int IconHeightListView;
26+
public int IconHeightTilesView;
27+
public int IconHeightGridView;
28+
public int IconHeightColumnsView;
2929

3030
public FolderLayoutModes LayoutMode;
3131

@@ -43,11 +43,11 @@ public LayoutPreferencesItem()
4343
var defaultLayout = UserSettingsService.FoldersSettingsService.DefaultLayoutMode;
4444

4545
LayoutMode = defaultLayout is FolderLayoutModes.Adaptive ? FolderLayoutModes.DetailsView : defaultLayout;
46-
IconSizeDetailsView = UserSettingsService.LayoutSettingsService.DefaultIconSizeDetailsView;
47-
IconSizeListView = UserSettingsService.LayoutSettingsService.DefaultIconSizeListView;
48-
IconSizeTilesView = UserSettingsService.LayoutSettingsService.DefaulIconSizeTilesView;
49-
IconSizeGridView = UserSettingsService.LayoutSettingsService.DefaulIconSizeGridView;
50-
IconSizeColumnsView = UserSettingsService.LayoutSettingsService.DefaultIconSizeColumnsView;
46+
IconHeightDetailsView = UserSettingsService.LayoutSettingsService.DefaultIconHeightDetailsView;
47+
IconHeightListView = UserSettingsService.LayoutSettingsService.DefaultIconHeightListView;
48+
IconHeightTilesView = UserSettingsService.LayoutSettingsService.DefaulIconHeightTilesView;
49+
IconHeightGridView = UserSettingsService.LayoutSettingsService.DefaulIconHeightGridView;
50+
IconHeightColumnsView = UserSettingsService.LayoutSettingsService.DefaultIconHeightColumnsView;
5151
DirectorySortOption = UserSettingsService.FoldersSettingsService.DefaultSortOption;
5252
DirectoryGroupOption = UserSettingsService.FoldersSettingsService.DefaultGroupOption;
5353
DirectorySortDirection = UserSettingsService.FoldersSettingsService.DefaultDirectorySortDirection;
@@ -104,11 +104,11 @@ public override bool Equals(object? obj)
104104
{
105105
return (
106106
item.LayoutMode == LayoutMode &&
107-
item.IconSizeDetailsView == IconSizeDetailsView &&
108-
item.IconSizeListView == IconSizeListView &&
109-
item.IconSizeTilesView == IconSizeTilesView &&
110-
item.IconSizeGridView == IconSizeGridView &&
111-
item.IconSizeColumnsView == IconSizeColumnsView &&
107+
item.IconHeightDetailsView == IconHeightDetailsView &&
108+
item.IconHeightListView == IconHeightListView &&
109+
item.IconHeightTilesView == IconHeightTilesView &&
110+
item.IconHeightGridView == IconHeightGridView &&
111+
item.IconHeightColumnsView == IconHeightColumnsView &&
112112
item.DirectoryGroupOption == DirectoryGroupOption &&
113113
item.DirectorySortOption == DirectorySortOption &&
114114
item.DirectorySortDirection == DirectorySortDirection &&
@@ -127,11 +127,11 @@ public override int GetHashCode()
127127
HashCode hash = new();
128128

129129
hash.Add(LayoutMode);
130-
hash.Add(IconSizeDetailsView);
131-
hash.Add(IconSizeListView);
132-
hash.Add(IconSizeTilesView);
133-
hash.Add(IconSizeGridView);
134-
hash.Add(IconSizeColumnsView);
130+
hash.Add(IconHeightDetailsView);
131+
hash.Add(IconHeightListView);
132+
hash.Add(IconHeightTilesView);
133+
hash.Add(IconHeightGridView);
134+
hash.Add(IconHeightColumnsView);
135135
hash.Add(DirectoryGroupOption);
136136
hash.Add(DirectorySortOption);
137137
hash.Add(DirectorySortDirection);

0 commit comments

Comments
 (0)