Paywalls: multi-package horizontal template

RevenueCatUI/Data/TestData.swift

@@ -27,19 +27,30 @@ internal enum TestData {
     )
     static let monthlyProduct = TestStoreProduct(
         localizedTitle: "Monthly",
-        price: 12.99,
-        localizedPriceString: "$12.99",
+        price: 6.99,
+        localizedPriceString: "$6.99",
         productIdentifier: "com.revenuecat.product_2",
         productType: .autoRenewableSubscription,
         localizedDescription: "PRO monthly",
         subscriptionGroupIdentifier: "group",
         subscriptionPeriod: .init(value: 1, unit: .month),
         introductoryDiscount: Self.intro(7, .day)
     )
+    static let sixMonthProduct = TestStoreProduct(
+        localizedTitle: "Monthly",
+        price: 34.99,
+        localizedPriceString: "$34.99",
+        productIdentifier: "com.revenuecat.product_5",
+        productType: .autoRenewableSubscription,
+        localizedDescription: "PRO monthly",
+        subscriptionGroupIdentifier: "group",
+        subscriptionPeriod: .init(value: 6, unit: .month),
+        introductoryDiscount: Self.intro(7, .day)
+    )
     static let annualProduct = TestStoreProduct(
         localizedTitle: "Annual",
-        price: 69.49,
-        localizedPriceString: "$69.49",
+        price: 53.99,
+        localizedPriceString: "$53.99",
         productIdentifier: "com.revenuecat.product_3",
         productType: .autoRenewableSubscription,
         localizedDescription: "PRO annual",
@@ -101,6 +112,12 @@ internal enum TestData {
         storeProduct: Self.monthlyProduct.toStoreProduct(),
         offeringIdentifier: Self.offeringIdentifier
     )
+    static let sixMonthPackage = Package(
+        identifier: PackageType.sixMonth.identifier,
+        packageType: .sixMonth,
+        storeProduct: Self.sixMonthProduct.toStoreProduct(),
+        offeringIdentifier: Self.offeringIdentifier
+    )
     static let annualPackage = Package(
         identifier: PackageType.annual.identifier,
         packageType: .annual,
@@ -256,6 +273,47 @@ internal enum TestData {
                             Self.annualPackage]
     )
 
+    static let offeringWithMultiPackageHorizontalPaywall = Offering(
+        identifier: Self.offeringIdentifier,
+        serverDescription: "Offering",
+        metadata: [:],
+        paywall: .init(
+            template: .multiPackageHorizontal,
+            config: .init(
+                packages: [PackageType.monthly.identifier,
+                           PackageType.sixMonth.identifier,
+                           PackageType.annual.identifier],
+                defaultPackage: PackageType.sixMonth.identifier,
+                images: .init(
+                    background: "background.jpg"
+                ),
+                colors: .init(
+                    light: .init(
+                        background: "#FFFFFF",
+                        text1: "#111111",
+                        callToActionBackground: "#06357D",
+                        callToActionForeground: "#FFFFFF",
+                        accent1: "#D4B5FC",
+                        accent2: "#DFDFDF"
+                    )
+                ),
+                termsOfServiceURL: URL(string: "https://revenuecat.com/tos")!
+            ),
+            localization: .init(
+                title: "Get _unlimited_ access",
+                callToAction: "Continue",
+                offerDetails: "",
+                offerDetailsWithIntroOffer: "Includes {{ intro_duration }} **free** trial",
+                offerName: "{{ subscription_duration }}",
+                features: []
+            ),
+            assetBaseURL: Bundle.module.resourceURL ?? Bundle.module.bundleURL
+        ),
+        availablePackages: [TestData.monthlyPackage,
+                            TestData.sixMonthPackage,
+                            TestData.annualPackage]
+    )
+
     static let lightColors: PaywallData.Configuration.Colors = .init(
         background: "#FFFFFF",
         text1: "#000000",

RevenueCatUI/Modifiers/ViewExtensions.swift

@@ -20,6 +20,13 @@ extension View {
         }
     }
 
+}
+
+// MARK: - Scrolling
+
+@available(iOS 13.0, tvOS 13.0, macOS 10.15, watchOS 6.2, *)
+extension View {
+
     @ViewBuilder
     func scrollable(
         _ axes: Axis.Set = .vertical,
@@ -60,6 +67,12 @@ extension View {
             }
         }
     }
+}
+
+// MARK: - Size changes
+
+@available(iOS 13.0, tvOS 13.0, macOS 10.15, watchOS 6.2, *)
+extension View {
 
     /// Invokes the given closure whethever the view size changes.
     func onSizeChange(_ closure: @escaping (CGSize) -> Void) -> some View {
@@ -74,9 +87,82 @@ extension View {
             .onPreferenceChange(ViewSizePreferenceKey.self, perform: closure)
     }
 
+    /// Invokes the given closure with the dimension specified by `axis` changes whenever it changes.
+    func onSizeChange(
+        _ axis: Axis,
+        _ closure: @escaping (CGFloat) -> Void
+    ) -> some View {
+        self
+            .overlay(
+                GeometryReader { geometry in
+                    Color.clear
+                        .preference(
+                            key: ViewDimensionPreferenceKey.self,
+                            value: axis == .horizontal
+                                ? geometry.size.width
+                                : geometry.size.height
+                        )
+                }
+            )
+            .onPreferenceChange(ViewDimensionPreferenceKey.self, perform: closure)
+    }
+
 }
 
-// MARK: -
+// MARK: - Rounded corners
+
+#if canImport(UIKit)
+
+@available(iOS 13.0, tvOS 13.0, macOS 10.15, watchOS 6.2, *)
+extension View {
+
+    func roundedCorner(
+        _ radius: CGFloat,
+        corners: UIRectCorner,
+        edgesIgnoringSafeArea edges: Edge.Set = []
+    ) -> some View {
+        self.mask(
+            RoundedCorner(radius: radius, corners: corners)
+                .edgesIgnoringSafeArea(edges)
+        )
+    }
+
+}
+
+@available(iOS 13.0, tvOS 13.0, macOS 10.15, watchOS 6.2, *)
+private struct RoundedCorner: Shape {
+
+    var radius: CGFloat
+    var corners: UIRectCorner
+
+    func path(in rect: CGRect) -> Path {
+        let path = UIBezierPath(roundedRect: rect,
+                                byRoundingCorners: self.corners,
+                                cornerRadii: CGSize(width: self.radius, height: self.radius))
+        return Path(path.cgPath)
+    }
+
+}
+
+#endif
+
+// MARK: - Preference Keys
+
+/// `PreferenceKey` for keeping track of a view dimension.
+private struct ViewDimensionPreferenceKey: PreferenceKey {
+
+    typealias Value = CGFloat
+
+    static var defaultValue: Value = 10
+
+    static func reduce(value: inout Value, nextValue: () -> Value) {
+        let newValue = max(value, nextValue())
+        if newValue != value {
+            value = newValue
+        }
+    }
+
+}
 
 /// `PreferenceKey` for keeping track of view size.
 private struct ViewSizePreferenceKey: PreferenceKey {

RevenueCatUI/PaywallView.swift

@@ -278,6 +278,7 @@ private extension PaywallTemplate {
         case .onePackageStandard: return "single"
         case .multiPackageBold: return "multi"
         case .onePackageWithFeatures: return "features"
+        case .multiPackageHorizontal: return "horizontal"
         }
     }