Cleanup

Author: yaira2

src/Files.App/Views/Layouts/BaseLayoutPage.cs

@@ -39,6 +39,7 @@ public abstract class BaseLayoutPage : Page, IBaseLayoutPage, INotifyPropertyCha
 
 		protected IFileTagsSettingsService FileTagsSettingsService { get; } = Ioc.Default.GetService<IFileTagsSettingsService>()!;
 		protected IUserSettingsService UserSettingsService { get; } = Ioc.Default.GetService<IUserSettingsService>()!;
+		protected ILayoutSettingsService LayoutSettingsService { get; } = Ioc.Default.GetService<ILayoutSettingsService>()!;
 		protected ICommandManager Commands { get; } = Ioc.Default.GetRequiredService<ICommandManager>();
 		public InfoPaneViewModel InfoPaneViewModel { get; } = Ioc.Default.GetRequiredService<InfoPaneViewModel>();
 		protected readonly IWindowContext WindowContext = Ioc.Default.GetRequiredService<IWindowContext>();

src/Files.App/Views/Layouts/GridLayoutPage.xaml.cs

@@ -39,135 +39,102 @@ public sealed partial class GridLayoutPage : BaseGroupableLayoutPage
 		protected override SemanticZoom RootZoom => RootGridZoom;
 
 
+		// List View properties
+
 		/// <summary>
 		/// Row height in the List View layout
 		/// </summary>
-		public int RowHeightListView
-		{
-			get => LayoutSizeKindHelper.GetListViewRowHeight(UserSettingsService.LayoutSettingsService.ListViewSize);
-		}
+		public int RowHeightListView =>
+			LayoutSizeKindHelper.GetListViewRowHeight(LayoutSettingsService.ListViewSize);
 
 		/// <summary>
 		/// Icon Box size in the List View layout. The value is increased by 4px to account for icon overlays.
 		/// </summary>
-		public int IconBoxSizeListView
-		{
-			get => (int)(LayoutSizeKindHelper.GetIconSize(FolderLayoutModes.ListView) + 4);
-		}
+		public int IconBoxSizeListView =>
+			(int)(LayoutSizeKindHelper.GetIconSize(FolderLayoutModes.ListView) + 4);
+
+
+
+		// Grid View properties
 
 		/// <summary>
 		/// Item width in the Grid View layout
 		/// </summary>
-		public int ItemWidthGridView
-		{
-			get => LayoutSizeKindHelper.GetGridViewItemWidth(UserSettingsService.LayoutSettingsService.GridViewSize);
-		}
+		public int ItemWidthGridView =>
+			LayoutSizeKindHelper.GetGridViewItemWidth(LayoutSettingsService.GridViewSize);
 
 
+
+		// Cards View properties
+
 		/// <summary>
-		/// Details Box width in the Cards View layout
+		/// Gets the details box width for the Cards View layout based on the card size.
 		/// </summary>
-		public int CardsViewDetailsBoxWidth
+		public int CardsViewDetailsBoxWidth => LayoutSettingsService.CardsViewSize switch
 		{
-			get => UserSettingsService.LayoutSettingsService.CardsViewSize switch
-			{
-				CardsViewSizeKind.Small => 196,
-				CardsViewSizeKind.Medium => 240,
-				CardsViewSizeKind.Large => 280,
-				CardsViewSizeKind.ExtraLarge => 320,
-				_ => 300
-			};
-		}
+			CardsViewSizeKind.Small => 196,
+			CardsViewSizeKind.Medium => 240,
+			CardsViewSizeKind.Large => 280,
+			CardsViewSizeKind.ExtraLarge => 320,
+			_ => 300
+		};
 
 		/// <summary>
-		/// Details Box height in the Cards View layout
+		/// Gets the details box height for the Cards View layout based on the card size.
 		/// </summary>
-		public int CardsViewDetailsBoxHeight
+		public int CardsViewDetailsBoxHeight => LayoutSettingsService.CardsViewSize switch
 		{
-			get => UserSettingsService.LayoutSettingsService.CardsViewSize switch
-			{
-				CardsViewSizeKind.Small => 104, 
-				CardsViewSizeKind.Medium => 144, 
-				CardsViewSizeKind.Large => 144, 
-				CardsViewSizeKind.ExtraLarge => 128,
-				_ => 128 
-			};
-		}
+			CardsViewSizeKind.Small => 104,
+			CardsViewSizeKind.Medium => 144,
+			CardsViewSizeKind.Large => 144,
+			CardsViewSizeKind.ExtraLarge => 128,
+			_ => 128
+		};
 
 		/// <summary>
-		/// Icon Box height in the Cards View layout.
+		/// Gets the icon box height for the Cards View layout based on the card size.
 		/// </summary>
-		public int CardsViewIconBoxHeight
+		public int CardsViewIconBoxHeight => LayoutSettingsService.CardsViewSize switch
 		{
-			get => UserSettingsService.LayoutSettingsService.CardsViewSize switch
-			{
-				CardsViewSizeKind.Small => 104,
-				CardsViewSizeKind.Medium => 96,
-				CardsViewSizeKind.Large => 128,
-				CardsViewSizeKind.ExtraLarge => 160,
-				_ => 128
-			};
-		}
+			CardsViewSizeKind.Small => 104,
+			CardsViewSizeKind.Medium => 96,
+			CardsViewSizeKind.Large => 128,
+			CardsViewSizeKind.ExtraLarge => 160,
+			_ => 128
+		};
 
 		/// <summary>
-		/// Icon Box width in the Cards View layout.
+		/// Gets the icon box width for the Cards View layout based on the card size.
 		/// </summary>
-		public int CardsViewIconBoxWidth
+		public int CardsViewIconBoxWidth => LayoutSettingsService.CardsViewSize switch
 		{
-			get => UserSettingsService.LayoutSettingsService.CardsViewSize switch
-			{
-				CardsViewSizeKind.Small => 104,
-				CardsViewSizeKind.Medium => 240,
-				CardsViewSizeKind.Large => 280,
-				CardsViewSizeKind.ExtraLarge => 320,
-				_ => 128
-			};
-		}
+			CardsViewSizeKind.Small => 104,
+			CardsViewSizeKind.Medium => 240,
+			CardsViewSizeKind.Large => 280,
+			CardsViewSizeKind.ExtraLarge => 320,
+			_ => 128
+		};
 
 		/// <summary>
-		///  Orientation of cards in the Cards View layout.
+		/// Gets the orientation of cards in the Cards View layout.
 		/// </summary>
-		public Orientation CardsViewOrientation
-		{
-			get => UserSettingsService.LayoutSettingsService.CardsViewSize switch
-			{
-				CardsViewSizeKind.Small => Orientation.Horizontal,
-				_ => Orientation.Vertical
-			};
-		}
-		
+		public Orientation CardsViewOrientation => UserSettingsService.LayoutSettingsService.CardsViewSize == CardsViewSizeKind.Small
+			? Orientation.Horizontal
+			: Orientation.Vertical;
+
 		/// <summary>
-		///  Item Name max lines in the Cards View layout.
+		/// Gets the maximum lines for item names in the Cards View layout.
 		/// </summary>
-		public int CardsViewItemNameMaxLines
-		{
-			get => UserSettingsService.LayoutSettingsService.CardsViewSize switch
-			{
-				CardsViewSizeKind.ExtraLarge => 1,
-				_ => 2
-			};
-		}
+		public int CardsViewItemNameMaxLines =>
+			LayoutSettingsService.CardsViewSize == CardsViewSizeKind.ExtraLarge ? 1 : 2;
 
 		/// <summary>
-		/// Icon height in the Cards View layout.
+		/// Gets the icon size for item names in the Cards View layout.
 		/// </summary>
-		public int CardsViewIconSize
-		{
-			get => (int)(LayoutSizeKindHelper.GetIconSize(FolderLayoutModes.CardsView));
-		}
+		public int CardsViewIconSize =>
+			(int)LayoutSizeKindHelper.GetIconSize(FolderLayoutModes.CardsView);
 
-		public bool IsPointerOver
-		{
-			get => (bool)GetValue(IsPointerOverProperty);
-			set => SetValue(IsPointerOverProperty, value);
-		}
 
-		public static readonly DependencyProperty IsPointerOverProperty =
-			DependencyProperty.Register(
-				nameof(IsPointerOver),
-				typeof(bool),
-				typeof(GridLayoutPage),
-				new PropertyMetadata(false));
 
 		// Constructor