Code Quality: Refactor IncreaseLayoutSize (#14677)

Author: yaira2

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

@@ -34,13 +34,13 @@ public LayoutTypes LayoutType
 						viewModel.ToggleLayoutModeTiles(true);
 						break;
 					case LayoutTypes.GridSmall:
-						viewModel.ToggleLayoutModeGridViewSmall(true);
+						viewModel.ToggleLayoutModeGridView(GridViewSizeSmall, true);
 						break;
 					case LayoutTypes.GridMedium:
-						viewModel.ToggleLayoutModeGridViewMedium(true);
+						viewModel.ToggleLayoutModeGridView(GridViewSizeMedium, true);
 						break;
 					case LayoutTypes.GridLarge:
-						viewModel.ToggleLayoutModeGridViewLarge(true);
+						viewModel.ToggleLayoutModeGridView(GridViewSizeLarge, true);
 						break;
 					case LayoutTypes.Columns:
 						viewModel.ToggleLayoutModeColumnView(true);
@@ -141,12 +141,13 @@ public DisplayPageContext()
 		public void DecreaseLayoutSize()
 		{
 			if (FolderSettings is LayoutPreferencesManager viewModel)
-				viewModel.GridViewSize -= GridViewIncrement;
+				viewModel.DecreaseLayoutSize();
 		}
+
 		public void IncreaseLayoutSize()
 		{
 			if (FolderSettings is LayoutPreferencesManager viewModel)
-				viewModel.GridViewSize += GridViewIncrement;
+				viewModel.IncreaseLayoutSize();
 		}
 
 		private void Context_Changing(object? sender, EventArgs e)
@@ -173,7 +174,7 @@ private void FolderSettings_PropertyChanged(object? sender, PropertyChangedEvent
 			switch (e.PropertyName)
 			{
 				case nameof(LayoutPreferencesManager.LayoutMode):
-				case nameof(LayoutPreferencesManager.GridViewSize):
+				case nameof(LayoutPreferencesManager.IconSize):
 				case nameof(LayoutPreferencesManager.IsAdaptiveLayoutEnabled):
 					SetProperty(ref _LayoutType, GetLayoutType(), nameof(LayoutType));
 					break;
@@ -250,12 +251,11 @@ private LayoutTypes GetLayoutType()
 				FolderLayoutModes.DetailsView => LayoutTypes.Details,
 				FolderLayoutModes.ListView => LayoutTypes.List,
 				FolderLayoutModes.TilesView => LayoutTypes.Tiles,
-				FolderLayoutModes.GridView => viewModel.GridViewSizeKind switch
+				FolderLayoutModes.GridView => viewModel.IconSize switch
 				{
-					GridViewSizeKind.Small => LayoutTypes.GridSmall,
-					GridViewSizeKind.Medium => LayoutTypes.GridMedium,
-					GridViewSizeKind.Large => LayoutTypes.GridLarge,
-					_ => throw new InvalidEnumArgumentException(),
+					< GridViewSizeMedium => LayoutTypes.GridSmall,
+					< GridViewSizeLarge => LayoutTypes.GridMedium,
+					_ => LayoutTypes.GridLarge,
 				},
 				FolderLayoutModes.ColumnView => LayoutTypes.Columns,
 				_ => throw new InvalidEnumArgumentException(),

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

@@ -30,7 +30,7 @@ public static void ApplyAdaptativeLayout(LayoutPreferencesManager folderSettings
 					folderSettings.ToggleLayoutModeDetailsView(false);
 					break;
 				case Layouts.Grid:
-					folderSettings.ToggleLayoutModeGridView(folderSettings.GridViewSize);
+					folderSettings.ToggleLayoutModeGridView(Constants.Browser.GridViewBrowser.GridViewSizeMedium, false);
 					break;
 			}
 		}