CQ

Author: yaira2

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

@@ -160,71 +160,5 @@ public static int GetColumnsViewRowHeight(ColumnsViewSizeKind columnsViewSizeKin
 					return 32;
 			}
 		}
-
-		/// <summary>
-		/// Gets the desired width for items in the Cards View
-		/// </summary>
-		/// <param name="cardsViewSizeKind"></param>
-		/// <returns></returns>
-		public static int GetCardsViewItemWidth(CardsViewSizeKind cardsViewSizeKind)
-		{
-			switch (cardsViewSizeKind)
-			{
-				case CardsViewSizeKind.Small:
-					return 300;
-				case CardsViewSizeKind.Medium:
-					return 200;
-				case CardsViewSizeKind.Large:
-					return 240;
-				case CardsViewSizeKind.ExtraLarge:
-					return 260;
-				default:
-					return 300;
-			}
-		}
-
-		/// <summary>
-		/// Gets the desired height for the Icon Box in the Cards View
-		/// </summary>
-		/// <param name="columnsViewSizeKind"></param>
-		/// <returns></returns>
-		public static int GetCardsViewIconBoxHeight(CardsViewSizeKind cardsViewSizeKind)
-		{
-			switch (cardsViewSizeKind)
-			{
-				case CardsViewSizeKind.Small:
-					return 128;
-				case CardsViewSizeKind.Medium:
-					return 111;
-				case CardsViewSizeKind.Large:
-					return 128;
-				case CardsViewSizeKind.ExtraLarge:
-					return 160;
-				default:
-					return 128;
-			}
-		}
-		
-		/// <summary>
-		/// Gets the desired width for the Icon Box in the Cards View
-		/// </summary>
-		/// <param name="columnsViewSizeKind"></param>
-		/// <returns></returns>
-		public static int GetCardsViewIconBoxWidth(CardsViewSizeKind cardsViewSizeKind)
-		{
-			switch (cardsViewSizeKind)
-			{
-				case CardsViewSizeKind.Small:
-					return 128;
-				case CardsViewSizeKind.Medium:
-					return 200;
-				case CardsViewSizeKind.Large:
-					return 240;
-				case CardsViewSizeKind.ExtraLarge:
-					return 260;
-				default:
-					return 128;
-			}
-		}
 	}
 }

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

@@ -438,7 +438,7 @@
 			<UserControl>
 				<Grid
 					Width="{Binding ElementName=PageRoot, Path=CardsViewItemWidth, Mode=OneWay}"
-					MaxHeight="200"
+					Height="{Binding ElementName=PageRoot, Path=CardsViewItemHeight, Mode=OneWay}"
 					Padding="0"
 					HorizontalAlignment="Left"
 					VerticalAlignment="Stretch"

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

@@ -69,23 +69,59 @@ public int ItemWidthGridView
 		/// </summary>
 		public int CardsViewItemWidth
 		{
-			get => LayoutSizeKindHelper.GetCardsViewItemWidth(UserSettingsService.LayoutSettingsService.CardViewSize);
+			get => UserSettingsService.LayoutSettingsService.CardViewSize switch
+			{
+				CardsViewSizeKind.Small => 300,
+				CardsViewSizeKind.Medium => 200,
+				CardsViewSizeKind.Large => 240,
+				CardsViewSizeKind.ExtraLarge => 260,
+				_ => 300
+			};
+		}
+
+		/// <summary>
+		/// Item height in the Cards View layout
+		/// </summary>
+		public int CardsViewItemHeight
+		{
+			get => UserSettingsService.LayoutSettingsService.CardViewSize switch
+			{
+				CardsViewSizeKind.Small => 128, 
+				CardsViewSizeKind.Medium => 200, 
+				CardsViewSizeKind.Large => 240, 
+				CardsViewSizeKind.ExtraLarge => 260,
+				_ => 128 
+			};
 		}
 
 		/// <summary>
 		/// Icon Box height in the Cards View layout.
 		/// </summary>
 		public int CardsViewIconBoxHeight
 		{
-			get => LayoutSizeKindHelper.GetCardsViewIconBoxHeight(UserSettingsService.LayoutSettingsService.CardViewSize);
+			get => UserSettingsService.LayoutSettingsService.CardViewSize switch
+			{
+				CardsViewSizeKind.Small => 128,
+				CardsViewSizeKind.Medium => 111,
+				CardsViewSizeKind.Large => 128,
+				CardsViewSizeKind.ExtraLarge => 160,
+				_ => 128
+			};
 		}
-		
+
 		/// <summary>
 		/// Icon Box width in the Cards View layout.
 		/// </summary>
 		public int CardsViewIconBoxWidth
 		{
-			get => LayoutSizeKindHelper.GetCardsViewIconBoxWidth(UserSettingsService.LayoutSettingsService.CardViewSize);
+			get => UserSettingsService.LayoutSettingsService.CardViewSize switch
+			{
+				CardsViewSizeKind.Small => 128,
+				CardsViewSizeKind.Medium => 200,
+				CardsViewSizeKind.Large => 240,
+				CardsViewSizeKind.ExtraLarge => 260,
+				_ => 128
+			};
 		}
 
 		/// <summary>
@@ -209,6 +245,7 @@ private void LayoutSettingsService_PropertyChanged(object? sender, PropertyChang
 			if (e.PropertyName == nameof(ILayoutSettingsService.CardViewSize))
 			{
 				NotifyPropertyChanged(nameof(CardsViewItemWidth));
+				NotifyPropertyChanged(nameof(CardsViewItemHeight));
 				NotifyPropertyChanged(nameof(CardsViewIconBoxHeight));
 				NotifyPropertyChanged(nameof(CardsViewIconBoxWidth));
 				NotifyPropertyChanged(nameof(CardsViewIconSize));