Skip to content

Code Quality: Refactor IncreaseLayoutSize #14677

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 11, 2024
Merged

Code Quality: Refactor IncreaseLayoutSize #14677

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions src/Files.App/Data/Contexts/DisplayPage/DisplayPageContext.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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)
Expand All @@ -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;
Expand Down Expand Up @@ -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(),
Expand Down
2 changes: 1 addition & 1 deletion src/Files.App/Helpers/Layout/AdaptiveLayoutHelpers.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
Expand Down
Loading