From daa902608fd1925eac4e85a711f6702658da2162 Mon Sep 17 00:00:00 2001 From: Mustapha-Tarek Ben Lechhab Date: Thu, 18 Jul 2024 15:37:55 +0200 Subject: [PATCH 1/2] PLAYRTS-5590 Update Highlight Cell design (text layout and gradients) --- .../Sources/UI/Views/HighlightCell.swift | 28 +++++++++++++++---- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/Application/Sources/UI/Views/HighlightCell.swift b/Application/Sources/UI/Views/HighlightCell.swift index be60a93b7..cd3060241 100644 --- a/Application/Sources/UI/Views/HighlightCell.swift +++ b/Application/Sources/UI/Views/HighlightCell.swift @@ -77,7 +77,8 @@ struct HighlightCell: View { ZStack(alignment: .bottom) { ImageView(source: imageUrl, contentMode: contentMode) if let highlight { - LinearGradient(colors: [.srgGray16.opacity(0.9), .clear], startPoint: .bottom, endPoint: .center) + DiagonalGradientView(midwayStop: 0.5) + VerticalGradientView(midwayStop: 0.3) Text(highlight.title) .srgFont(.H2) .lineLimit(2) @@ -90,11 +91,12 @@ struct HighlightCell: View { ZStack(alignment: .leading) { ImageView(source: imageUrl, contentMode: contentMode) if let highlight { - LinearGradient(colors: [.srgGray16.opacity(0.9), .clear], startPoint: .leading, endPoint: .trailing) + DiagonalGradientView(midwayStop: 0.6) + VerticalGradientView(midwayStop: 0.5) DescriptionView(highlight: highlight) - .padding(.horizontal, 60) - .padding(.vertical, 40) - .frame(width: geometry.size.width * 2 / 3, height: geometry.size.height) + .padding(.horizontal, 30) + .padding(.vertical, 30) + .frame(width: geometry.size.width * 2 / 3, height: geometry.size.height, alignment: .bottomLeading) } } } @@ -122,6 +124,22 @@ struct HighlightCell: View { .frame(maxWidth: .infinity, alignment: .leading) } } + + private struct VerticalGradientView: View { + let midwayStop: CGFloat + var body: some View { + let stops = [Gradient.Stop(color: .srgGray16.opacity(0.6), location: 0.0), Gradient.Stop(color: .srgGray16.opacity(0.0), location: midwayStop)] + return LinearGradient(stops: stops, startPoint: .bottom, endPoint: .top) + } + } + + private struct DiagonalGradientView: View { + let midwayStop: CGFloat + var body: some View { + let stops = [Gradient.Stop(color: .srgGray16.opacity(0.6), location: 0.0), Gradient.Stop(color: .srgGray16.opacity(0.0), location: midwayStop)] + return LinearGradient(stops: stops, startPoint: UnitPoint(x: 0, y: 1), endPoint: UnitPoint(x: 0.2, y: 0.0)) + } + } } // MARK: Accessibility From e1d92d960abd78d4ba3c3ccb10a49008d1318ea6 Mon Sep 17 00:00:00 2001 From: Mustapha-Tarek Date: Mon, 5 Aug 2024 14:10:39 +0200 Subject: [PATCH 2/2] PLAYRTS-5590 Update Application/Sources/UI/Views/HighlightCell.swift Co-authored-by: Pierre-Yves --- Application/Sources/UI/Views/HighlightCell.swift | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Application/Sources/UI/Views/HighlightCell.swift b/Application/Sources/UI/Views/HighlightCell.swift index cd3060241..a80155e3f 100644 --- a/Application/Sources/UI/Views/HighlightCell.swift +++ b/Application/Sources/UI/Views/HighlightCell.swift @@ -94,8 +94,7 @@ struct HighlightCell: View { DiagonalGradientView(midwayStop: 0.6) VerticalGradientView(midwayStop: 0.5) DescriptionView(highlight: highlight) - .padding(.horizontal, 30) - .padding(.vertical, 30) + .padding(32) .frame(width: geometry.size.width * 2 / 3, height: geometry.size.height, alignment: .bottomLeading) } }