From 7ab6150febd9f504b5cc31495d5e491bb6c7181b Mon Sep 17 00:00:00 2001 From: Yair <39923744+yaira2@users.noreply.github.com> Date: Thu, 22 Feb 2024 20:29:41 -0500 Subject: [PATCH] Rename Rename --- src/Files.App/Actions/Display/LayoutAction.cs | 64 +++++++++---------- .../Layout/LayoutPreferencesManager.cs | 4 +- .../Settings/LayoutSettingsService.cs | 10 +-- .../UserControls/InnerNavigationToolbar.xaml | 8 +-- .../Views/Layouts/ColumnLayoutPage.xaml.cs | 10 +-- .../Views/Layouts/DetailsLayoutPage.xaml.cs | 10 +-- .../Views/Layouts/GridLayoutPage.xaml.cs | 26 ++++---- .../Settings/ILayoutSettingsService.cs | 10 +-- 8 files changed, 71 insertions(+), 71 deletions(-) diff --git a/src/Files.App/Actions/Display/LayoutAction.cs b/src/Files.App/Actions/Display/LayoutAction.cs index 1f3150a2eb82..85164ef35bf0 100644 --- a/src/Files.App/Actions/Display/LayoutAction.cs +++ b/src/Files.App/Actions/Display/LayoutAction.cs @@ -188,10 +188,10 @@ public HotKey MediaHotKey public bool IsExecutable => ContentPageContext.PageType is not ContentPageTypes.Home && - ((DisplayPageContext.LayoutType == LayoutTypes.Details && UserSettingsService.LayoutSettingsService.ItemSizeDetailsView > DetailsViewSizeKind.Compact) || - (DisplayPageContext.LayoutType == LayoutTypes.List && UserSettingsService.LayoutSettingsService.ItemSizeListView > ListViewSizeKind.Compact) || - (DisplayPageContext.LayoutType == LayoutTypes.Grid && UserSettingsService.LayoutSettingsService.ItemSizeGridView > GridViewSizeKind.Compact) || - (DisplayPageContext.LayoutType == LayoutTypes.Columns && UserSettingsService.LayoutSettingsService.ItemSizeColumnsView > ColumnsViewSizeKind.Compact)); + ((DisplayPageContext.LayoutType == LayoutTypes.Details && UserSettingsService.LayoutSettingsService.DetailsViewSize > DetailsViewSizeKind.Compact) || + (DisplayPageContext.LayoutType == LayoutTypes.List && UserSettingsService.LayoutSettingsService.ListViewSize > ListViewSizeKind.Compact) || + (DisplayPageContext.LayoutType == LayoutTypes.Grid && UserSettingsService.LayoutSettingsService.GridViewSize > GridViewSizeKind.Compact) || + (DisplayPageContext.LayoutType == LayoutTypes.Columns && UserSettingsService.LayoutSettingsService.ColumnsViewSize > ColumnsViewSizeKind.Compact)); public LayoutDecreaseSizeAction() { @@ -224,10 +224,10 @@ private void UserSettingsService_PropertyChanged(object? sender, PropertyChanged { switch (e.PropertyName) { - case nameof(ILayoutSettingsService.ItemSizeDetailsView): - case nameof(ILayoutSettingsService.ItemSizeListView): - case nameof(ILayoutSettingsService.ItemSizeGridView): - case nameof(ILayoutSettingsService.ItemSizeColumnsView): + case nameof(ILayoutSettingsService.DetailsViewSize): + case nameof(ILayoutSettingsService.ListViewSize): + case nameof(ILayoutSettingsService.GridViewSize): + case nameof(ILayoutSettingsService.ColumnsViewSize): OnPropertyChanged(nameof(IsExecutable)); break; } @@ -238,22 +238,22 @@ public Task ExecuteAsync() switch (DisplayPageContext.LayoutType) { case LayoutTypes.Details: - if (UserSettingsService.LayoutSettingsService.ItemSizeDetailsView > DetailsViewSizeKind.Compact) - UserSettingsService.LayoutSettingsService.ItemSizeDetailsView -= 1; + if (UserSettingsService.LayoutSettingsService.DetailsViewSize > DetailsViewSizeKind.Compact) + UserSettingsService.LayoutSettingsService.DetailsViewSize -= 1; break; case LayoutTypes.List: - if (UserSettingsService.LayoutSettingsService.ItemSizeListView > ListViewSizeKind.Compact) - UserSettingsService.LayoutSettingsService.ItemSizeListView -= 1; + if (UserSettingsService.LayoutSettingsService.ListViewSize > ListViewSizeKind.Compact) + UserSettingsService.LayoutSettingsService.ListViewSize -= 1; break; case LayoutTypes.Tiles: break; case LayoutTypes.Grid: - if (UserSettingsService.LayoutSettingsService.ItemSizeGridView > GridViewSizeKind.Compact) - UserSettingsService.LayoutSettingsService.ItemSizeGridView -= 1; + if (UserSettingsService.LayoutSettingsService.GridViewSize > GridViewSizeKind.Compact) + UserSettingsService.LayoutSettingsService.GridViewSize -= 1; break; case LayoutTypes.Columns: - if (UserSettingsService.LayoutSettingsService.ItemSizeColumnsView > ColumnsViewSizeKind.Compact) - UserSettingsService.LayoutSettingsService.ItemSizeColumnsView -= 1; + if (UserSettingsService.LayoutSettingsService.ColumnsViewSize > ColumnsViewSizeKind.Compact) + UserSettingsService.LayoutSettingsService.ColumnsViewSize -= 1; break; } @@ -281,10 +281,10 @@ public HotKey MediaHotKey public bool IsExecutable => ContentPageContext.PageType is not ContentPageTypes.Home && - ((DisplayPageContext.LayoutType == LayoutTypes.Details && UserSettingsService.LayoutSettingsService.ItemSizeDetailsView < DetailsViewSizeKind.ExtraLarge) || - (DisplayPageContext.LayoutType == LayoutTypes.List && UserSettingsService.LayoutSettingsService.ItemSizeListView < ListViewSizeKind.ExtraLarge) || - (DisplayPageContext.LayoutType == LayoutTypes.Grid && UserSettingsService.LayoutSettingsService.ItemSizeGridView < GridViewSizeKind.Eleven) || - (DisplayPageContext.LayoutType == LayoutTypes.Columns && UserSettingsService.LayoutSettingsService.ItemSizeColumnsView < ColumnsViewSizeKind.ExtraLarge)); + ((DisplayPageContext.LayoutType == LayoutTypes.Details && UserSettingsService.LayoutSettingsService.DetailsViewSize < DetailsViewSizeKind.ExtraLarge) || + (DisplayPageContext.LayoutType == LayoutTypes.List && UserSettingsService.LayoutSettingsService.ListViewSize < ListViewSizeKind.ExtraLarge) || + (DisplayPageContext.LayoutType == LayoutTypes.Grid && UserSettingsService.LayoutSettingsService.GridViewSize < GridViewSizeKind.Eleven) || + (DisplayPageContext.LayoutType == LayoutTypes.Columns && UserSettingsService.LayoutSettingsService.ColumnsViewSize < ColumnsViewSizeKind.ExtraLarge)); public LayoutIncreaseSizeAction() { @@ -317,10 +317,10 @@ private void UserSettingsService_PropertyChanged(object? sender, PropertyChanged { switch (e.PropertyName) { - case nameof(ILayoutSettingsService.ItemSizeDetailsView): - case nameof(ILayoutSettingsService.ItemSizeListView): - case nameof(ILayoutSettingsService.ItemSizeGridView): - case nameof(ILayoutSettingsService.ItemSizeColumnsView): + case nameof(ILayoutSettingsService.DetailsViewSize): + case nameof(ILayoutSettingsService.ListViewSize): + case nameof(ILayoutSettingsService.GridViewSize): + case nameof(ILayoutSettingsService.ColumnsViewSize): OnPropertyChanged(nameof(IsExecutable)); break; } @@ -331,22 +331,22 @@ public Task ExecuteAsync() switch (DisplayPageContext.LayoutType) { case LayoutTypes.Details: - if (UserSettingsService.LayoutSettingsService.ItemSizeDetailsView < DetailsViewSizeKind.ExtraLarge) - UserSettingsService.LayoutSettingsService.ItemSizeDetailsView += 1; + if (UserSettingsService.LayoutSettingsService.DetailsViewSize < DetailsViewSizeKind.ExtraLarge) + UserSettingsService.LayoutSettingsService.DetailsViewSize += 1; break; case LayoutTypes.List: - if (UserSettingsService.LayoutSettingsService.ItemSizeListView < ListViewSizeKind.ExtraLarge) - UserSettingsService.LayoutSettingsService.ItemSizeListView += 1; + if (UserSettingsService.LayoutSettingsService.ListViewSize < ListViewSizeKind.ExtraLarge) + UserSettingsService.LayoutSettingsService.ListViewSize += 1; break; case LayoutTypes.Tiles: break; case LayoutTypes.Grid: - if (UserSettingsService.LayoutSettingsService.ItemSizeGridView < GridViewSizeKind.Eleven) - UserSettingsService.LayoutSettingsService.ItemSizeGridView += 1; + if (UserSettingsService.LayoutSettingsService.GridViewSize < GridViewSizeKind.Eleven) + UserSettingsService.LayoutSettingsService.GridViewSize += 1; break; case LayoutTypes.Columns: - if (UserSettingsService.LayoutSettingsService.ItemSizeColumnsView < ColumnsViewSizeKind.ExtraLarge) - UserSettingsService.LayoutSettingsService.ItemSizeColumnsView += 1; + if (UserSettingsService.LayoutSettingsService.ColumnsViewSize < ColumnsViewSizeKind.ExtraLarge) + UserSettingsService.LayoutSettingsService.ColumnsViewSize += 1; break; } diff --git a/src/Files.App/Helpers/Layout/LayoutPreferencesManager.cs b/src/Files.App/Helpers/Layout/LayoutPreferencesManager.cs index ffc92275e504..09eec45a8dd2 100644 --- a/src/Files.App/Helpers/Layout/LayoutPreferencesManager.cs +++ b/src/Files.App/Helpers/Layout/LayoutPreferencesManager.cs @@ -235,10 +235,10 @@ public uint GetRoundedIconSize() => Constants.ShellIconSizes.Large, FolderLayoutModes.ColumnView => Constants.ShellIconSizes.Large, - _ when LayoutMode == FolderLayoutModes.GridView && UserSettingsService.LayoutSettingsService.ItemSizeGridView <= GridViewSizeKind.Small || + _ when LayoutMode == FolderLayoutModes.GridView && UserSettingsService.LayoutSettingsService.GridViewSize <= GridViewSizeKind.Small || LayoutMode == FolderLayoutModes.TilesView => 96, - _ when LayoutMode == FolderLayoutModes.GridView && UserSettingsService.LayoutSettingsService.ItemSizeGridView <= GridViewSizeKind.Large + _ when LayoutMode == FolderLayoutModes.GridView && UserSettingsService.LayoutSettingsService.GridViewSize <= GridViewSizeKind.Large => 128, _ => 256, }; diff --git a/src/Files.App/Services/Settings/LayoutSettingsService.cs b/src/Files.App/Services/Settings/LayoutSettingsService.cs index fa3508b12a1a..61892b9cf7e7 100644 --- a/src/Files.App/Services/Settings/LayoutSettingsService.cs +++ b/src/Files.App/Services/Settings/LayoutSettingsService.cs @@ -11,31 +11,31 @@ public LayoutSettingsService(ISettingsSharingContext settingsSharingContext) RegisterSettingsContext(settingsSharingContext); } - public DetailsViewSizeKind ItemSizeDetailsView + public DetailsViewSizeKind DetailsViewSize { get => Get(DetailsViewSizeKind.Small); set => Set(value); } - public ListViewSizeKind ItemSizeListView + public ListViewSizeKind ListViewSize { get => Get(ListViewSizeKind.Small); set => Set(value); } - public TilesViewSizeKind ItemSizeTilesView + public TilesViewSizeKind TilesViewSize { get => Get(TilesViewSizeKind.Small); set => Set(value); } - public GridViewSizeKind ItemSizeGridView + public GridViewSizeKind GridViewSize { get => Get(GridViewSizeKind.ExtraLarge); set => Set(value); } - public ColumnsViewSizeKind ItemSizeColumnsView + public ColumnsViewSizeKind ColumnsViewSize { get => Get(ColumnsViewSizeKind.Small); set => Set(value); diff --git a/src/Files.App/UserControls/InnerNavigationToolbar.xaml b/src/Files.App/UserControls/InnerNavigationToolbar.xaml index 7382225996f3..23159176dc23 100644 --- a/src/Files.App/UserControls/InnerNavigationToolbar.xaml +++ b/src/Files.App/UserControls/InnerNavigationToolbar.xaml @@ -780,7 +780,7 @@ SnapsTo="Ticks" TickFrequency="1" TickPlacement="BottomRight" - Value="{x:Bind UserSettingsService.LayoutSettingsService.ItemSizeDetailsView, Mode=TwoWay, Converter={StaticResource GenericEnumConverter}, ConverterParameter='0-0,1-1,2-2,3-3,4-4'}" /> + Value="{x:Bind UserSettingsService.LayoutSettingsService.DetailsViewSize, Mode=TwoWay, Converter={StaticResource GenericEnumConverter}, ConverterParameter='0-0,1-1,2-2,3-3,4-4'}" /> + Value="{x:Bind UserSettingsService.LayoutSettingsService.ListViewSize, Mode=TwoWay, Converter={StaticResource GenericEnumConverter}, ConverterParameter='0-0,1-1,2-2,3-3,4-4'}" /> + Value="{x:Bind UserSettingsService.LayoutSettingsService.GridViewSize, Mode=TwoWay, Converter={StaticResource GenericEnumConverter}, ConverterParameter='0-0,1-1,2-2,3-3,4-4,5-5,6-6,7-7,8-8,9-9,10-10,11-11'}" /> + Value="{x:Bind UserSettingsService.LayoutSettingsService.ColumnsViewSize, Mode=TwoWay, Converter={StaticResource GenericEnumConverter}, ConverterParameter='0-0,1-1,2-2,3-3,4-4'}" /> diff --git a/src/Files.App/Views/Layouts/ColumnLayoutPage.xaml.cs b/src/Files.App/Views/Layouts/ColumnLayoutPage.xaml.cs index a88e34e3b323..d11986b937a6 100644 --- a/src/Files.App/Views/Layouts/ColumnLayoutPage.xaml.cs +++ b/src/Files.App/Views/Layouts/ColumnLayoutPage.xaml.cs @@ -47,10 +47,10 @@ public sealed partial class ColumnLayoutPage : BaseGroupableLayoutPage /// public int RowHeight { - get => LayoutSizeKindHelper.GetColumnsViewRowHeight(UserSettingsService.LayoutSettingsService.ItemSizeColumnsView); + get => LayoutSizeKindHelper.GetColumnsViewRowHeight(UserSettingsService.LayoutSettingsService.ColumnsViewSize); set { - if (value != LayoutSizeKindHelper.GetColumnsViewRowHeight(UserSettingsService.LayoutSettingsService.ItemSizeColumnsView)) + if (value != LayoutSizeKindHelper.GetColumnsViewRowHeight(UserSettingsService.LayoutSettingsService.ColumnsViewSize)) { NotifyPropertyChanged(nameof(RowHeight)); } @@ -176,9 +176,9 @@ private void LayoutSettingsService_PropertyChanged(object? sender, PropertyChang { // TODO keep scroll position when changing styles (see details view) - if (e.PropertyName == nameof(ILayoutSettingsService.ItemSizeColumnsView)) + if (e.PropertyName == nameof(ILayoutSettingsService.ColumnsViewSize)) { - RowHeight = LayoutSizeKindHelper.GetColumnsViewRowHeight(UserSettingsService.LayoutSettingsService.ItemSizeColumnsView); + RowHeight = LayoutSizeKindHelper.GetColumnsViewRowHeight(UserSettingsService.LayoutSettingsService.ColumnsViewSize); SetItemContainerStyle(); } } @@ -240,7 +240,7 @@ protected override bool CanGetItemFromElement(object element) /// private void SetItemContainerStyle() { - if (UserSettingsService.LayoutSettingsService.ItemSizeColumnsView == ColumnsViewSizeKind.Compact) + if (UserSettingsService.LayoutSettingsService.ColumnsViewSize == ColumnsViewSizeKind.Compact) { // Toggle style to force item size to update FileList.ItemContainerStyle = RegularItemContainerStyle; diff --git a/src/Files.App/Views/Layouts/DetailsLayoutPage.xaml.cs b/src/Files.App/Views/Layouts/DetailsLayoutPage.xaml.cs index fcd297f89139..2b740a172d89 100644 --- a/src/Files.App/Views/Layouts/DetailsLayoutPage.xaml.cs +++ b/src/Files.App/Views/Layouts/DetailsLayoutPage.xaml.cs @@ -60,10 +60,10 @@ public double MaxWidthForRenameTextbox /// public int RowHeight { - get => LayoutSizeKindHelper.GetDetailsViewRowHeight((DetailsViewSizeKind)UserSettingsService.LayoutSettingsService.ItemSizeDetailsView); + get => LayoutSizeKindHelper.GetDetailsViewRowHeight((DetailsViewSizeKind)UserSettingsService.LayoutSettingsService.DetailsViewSize); set { - if (value != LayoutSizeKindHelper.GetDetailsViewRowHeight((DetailsViewSizeKind)UserSettingsService.LayoutSettingsService.ItemSizeDetailsView)) + if (value != LayoutSizeKindHelper.GetDetailsViewRowHeight((DetailsViewSizeKind)UserSettingsService.LayoutSettingsService.DetailsViewSize)) NotifyPropertyChanged(nameof(RowHeight)); } } @@ -195,12 +195,12 @@ protected override void OnNavigatingFrom(NavigatingCancelEventArgs e) private void LayoutSettingsService_PropertyChanged(object? sender, PropertyChangedEventArgs e) { - if (e.PropertyName == nameof(ILayoutSettingsService.ItemSizeDetailsView)) + if (e.PropertyName == nameof(ILayoutSettingsService.DetailsViewSize)) { // Get current scroll position var previousOffset = ContentScroller?.VerticalOffset; - RowHeight = LayoutSizeKindHelper.GetDetailsViewRowHeight(UserSettingsService.LayoutSettingsService.ItemSizeDetailsView); + RowHeight = LayoutSizeKindHelper.GetDetailsViewRowHeight(UserSettingsService.LayoutSettingsService.DetailsViewSize); // Update the container style to match the item size SetItemContainerStyle(); @@ -215,7 +215,7 @@ private void LayoutSettingsService_PropertyChanged(object? sender, PropertyChang /// private void SetItemContainerStyle() { - if (UserSettingsService.LayoutSettingsService.ItemSizeDetailsView == DetailsViewSizeKind.Compact) + if (UserSettingsService.LayoutSettingsService.DetailsViewSize == DetailsViewSizeKind.Compact) { // Toggle style to force item size to update FileList.ItemContainerStyle = RegularItemContainerStyle; diff --git a/src/Files.App/Views/Layouts/GridLayoutPage.xaml.cs b/src/Files.App/Views/Layouts/GridLayoutPage.xaml.cs index a0c3a601a665..2698b07e36e8 100644 --- a/src/Files.App/Views/Layouts/GridLayoutPage.xaml.cs +++ b/src/Files.App/Views/Layouts/GridLayoutPage.xaml.cs @@ -37,10 +37,10 @@ public sealed partial class GridLayoutPage : BaseGroupableLayoutPage /// public int RowHeightListView { - get => LayoutSizeKindHelper.GetListViewRowHeight(UserSettingsService.LayoutSettingsService.ItemSizeListView); + get => LayoutSizeKindHelper.GetListViewRowHeight(UserSettingsService.LayoutSettingsService.ListViewSize); set { - if (value != LayoutSizeKindHelper.GetListViewRowHeight(UserSettingsService.LayoutSettingsService.ItemSizeListView)) + if (value != LayoutSizeKindHelper.GetListViewRowHeight(UserSettingsService.LayoutSettingsService.ListViewSize)) NotifyPropertyChanged(nameof(RowHeightListView)); } } @@ -50,10 +50,10 @@ public int RowHeightListView /// public int ItemWidthTilesView { - get => LayoutSizeKindHelper.GetTilesViewItemWidth(UserSettingsService.LayoutSettingsService.ItemSizeTilesView); + get => LayoutSizeKindHelper.GetTilesViewItemWidth(UserSettingsService.LayoutSettingsService.TilesViewSize); set { - if (value != LayoutSizeKindHelper.GetTilesViewItemWidth(UserSettingsService.LayoutSettingsService.ItemSizeTilesView)) + if (value != LayoutSizeKindHelper.GetTilesViewItemWidth(UserSettingsService.LayoutSettingsService.TilesViewSize)) NotifyPropertyChanged(nameof(ItemWidthTilesView)); } } @@ -63,10 +63,10 @@ public int ItemWidthTilesView /// public int ItemWidthGridView { - get => LayoutSizeKindHelper.GetGridViewItemWidth(UserSettingsService.LayoutSettingsService.ItemSizeGridView); + get => LayoutSizeKindHelper.GetGridViewItemWidth(UserSettingsService.LayoutSettingsService.GridViewSize); set { - if (value != LayoutSizeKindHelper.GetGridViewItemWidth(UserSettingsService.LayoutSettingsService.ItemSizeGridView)) + if (value != LayoutSizeKindHelper.GetGridViewItemWidth(UserSettingsService.LayoutSettingsService.GridViewSize)) NotifyPropertyChanged(nameof(ItemWidthGridView)); } } @@ -164,21 +164,21 @@ private void LayoutSettingsService_PropertyChanged(object? sender, PropertyChang { // TODO keep scroll position when changing styles (see details view) - if (e.PropertyName == nameof(ILayoutSettingsService.ItemSizeListView)) + if (e.PropertyName == nameof(ILayoutSettingsService.ListViewSize)) { - RowHeightListView = LayoutSizeKindHelper.GetListViewRowHeight(UserSettingsService.LayoutSettingsService.ItemSizeListView); + RowHeightListView = LayoutSizeKindHelper.GetListViewRowHeight(UserSettingsService.LayoutSettingsService.ListViewSize); SetItemContainerStyle(); FolderSettings_IconHeightChanged(); } - if (e.PropertyName == nameof(ILayoutSettingsService.ItemSizeTilesView)) + if (e.PropertyName == nameof(ILayoutSettingsService.TilesViewSize)) { - ItemWidthTilesView = LayoutSizeKindHelper.GetTilesViewItemWidth(UserSettingsService.LayoutSettingsService.ItemSizeTilesView); + ItemWidthTilesView = LayoutSizeKindHelper.GetTilesViewItemWidth(UserSettingsService.LayoutSettingsService.TilesViewSize); SetItemContainerStyle(); FolderSettings_IconHeightChanged(); } - if (e.PropertyName == nameof(ILayoutSettingsService.ItemSizeGridView)) + if (e.PropertyName == nameof(ILayoutSettingsService.GridViewSize)) { - ItemWidthGridView = LayoutSizeKindHelper.GetGridViewItemWidth(UserSettingsService.LayoutSettingsService.ItemSizeGridView); + ItemWidthGridView = LayoutSizeKindHelper.GetGridViewItemWidth(UserSettingsService.LayoutSettingsService.GridViewSize); SetItemContainerStyle(); FolderSettings_IconHeightChanged(); } @@ -238,7 +238,7 @@ private void SetItemTemplate() private void SetItemContainerStyle() { - if (FolderSettings?.LayoutMode == FolderLayoutModes.ListView && UserSettingsService.LayoutSettingsService.ItemSizeListView == ListViewSizeKind.Compact) + if (FolderSettings?.LayoutMode == FolderLayoutModes.ListView && UserSettingsService.LayoutSettingsService.ListViewSize == ListViewSizeKind.Compact) { // Toggle style to force item size to update FileList.ItemContainerStyle = DefaultItemContainerStyle; diff --git a/src/Files.Core/Services/Settings/ILayoutSettingsService.cs b/src/Files.Core/Services/Settings/ILayoutSettingsService.cs index 917d76e10a23..0ab94a05cffc 100644 --- a/src/Files.Core/Services/Settings/ILayoutSettingsService.cs +++ b/src/Files.Core/Services/Settings/ILayoutSettingsService.cs @@ -10,26 +10,26 @@ public interface ILayoutSettingsService : IBaseSettingsService, INotifyPropertyC /// /// Item size in the Details View /// - DetailsViewSizeKind ItemSizeDetailsView { get; set; } + DetailsViewSizeKind DetailsViewSize { get; set; } /// /// Item size in the List View /// - ListViewSizeKind ItemSizeListView { get; set; } + ListViewSizeKind ListViewSize { get; set; } /// /// Item size in the Tiles View /// - TilesViewSizeKind ItemSizeTilesView { get; set; } + TilesViewSizeKind TilesViewSize { get; set; } /// /// Item size in the Grid View /// - GridViewSizeKind ItemSizeGridView { get; set; } + GridViewSizeKind GridViewSize { get; set; } /// /// Item size in the Columns View /// - ColumnsViewSizeKind ItemSizeColumnsView { get; set; } + ColumnsViewSizeKind ColumnsViewSize { get; set; } } }