Move masking after view sizing (#4675)

RevenueCat · Jan 15, 2025 · 4536ebc · 4536ebc
1 parent e28f028
commit 4536ebc
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/RevenueCatUI/Templates/V2/Components/Image/ImageComponentView.swift b/RevenueCatUI/Templates/V2/Components/Image/ImageComponentView.swift
@@ -55,6 +55,11 @@ struct ImageComponentView: View {
             }
             .size(style.size)
             .clipped()
+            .shape(border: nil,
+                   shape: style.shape)
+            .padding(style.padding)
+            // WIP: Add border still
+            .padding(style.margin)
         }
     }
 
@@ -89,11 +94,6 @@ struct ImageComponentView: View {
                     Color.clear.backgroundStyle(.color(colorOverlay))
                 )
             })
-            .shape(border: nil,
-                   shape: style.shape)
-            .padding(style.padding)
-            // WIP: Add border still
-            .padding(style.margin)
     }
 
 }

diff --git a/RevenueCatUI/Templates/V2/Previews/TemplateComponentsViewPreviews/Template1Preview.swift b/RevenueCatUI/Templates/V2/Previews/TemplateComponentsViewPreviews/Template1Preview.swift
@@ -33,7 +33,8 @@ private enum Template1Preview {
                 heicLowRes: catUrl
             )
         ),
-        fitMode: .fit,
+        size: .init(width: .fill, height: .fixed(270)),
+        fitMode: .fill,
         maskShape: .convex
     )
 

diff --git a/RevenueCatUI/Templates/V2/ViewHelpers/Shape.swift b/RevenueCatUI/Templates/V2/ViewHelpers/Shape.swift
@@ -263,7 +263,7 @@ private struct ConvexShape: Shape {
 
     private var curveHeight: CGFloat {
         // Calculate the curve height as a percentage of the view's height
-        max(0, size.height * curveHeightPercentage)
+        max(0, size.height * curveHeightPercentage) / 2
     }
 
 }