Paywalls: finished iOS 15 support (#3043)

RevenueCatUI/Helpers/VersionDetector.swift

@@ -0,0 +1,22 @@
+//
+//  VersionDetector.swift
+//  
+//
+//  Created by Nacho Soto on 8/17/23.
+//
+
+import Foundation
+
+enum VersionDetector {
+
+    static let iOS15: Bool = {
+        return Self.isAtLeast(version: 15) && !Self.isAtLeast(version: 16)
+    }()
+
+    private static func isAtLeast(version: Int) -> Bool {
+        return ProcessInfo.processInfo.isOperatingSystemAtLeast(.init(majorVersion: version,
+                                                                      minorVersion: 0,
+                                                                      patchVersion: 0))
+    }
+
+}

RevenueCatUI/Modifiers/CardHidingModifier.swift

@@ -41,9 +41,10 @@ private struct CardHidingModifier: ViewModifier {
                 .padding(.vertical)
 
         case .condensedCard:
+            // "Hidden view" so it doesn't contribute to size calculation
             Rectangle()
-                // "Hidden view" so it doesn't contribute to size calculation
-                .frame(height: 0)
+                .frame(height: VersionDetector.iOS15 ? 1 : 0) // Note: height "0" breaks iOS 15
+                .hidden()
                 .frame(maxWidth: .infinity)
                 .overlay(alignment: .bottom) {
                     // Content is displayed as an overlay so it's rendered over user's content

RevenueCatUI/Modifiers/ViewExtensions.swift

@@ -52,21 +52,69 @@ extension View {
 
     @available(iOS 15.0, macOS 12.0, tvOS 15.0, watchOS 8.0, *)
     @ViewBuilder
-    func scrollableIfNecessary(_ axes: Axis.Set = .vertical) -> some View {
+    func scrollableIfNecessary(_ axis: Axis = .vertical) -> some View {
         if #available(iOS 16.0, macOS 13.0, tvOS 16.0, watchOS 9.0, *) {
-            ViewThatFits(in: axes) {
+            ViewThatFits(in: axis.scrollViewAxis) {
                 self
 
-                ScrollView(axes) {
+                ScrollView(axis.scrollViewAxis) {
                     self
                 }
             }
         } else {
-            ScrollView(axes) {
-                self
+            self.modifier(ScrollableIfNecessaryModifier(axis: axis))
+        }
+    }
+}
+
+// MARK: - scrollableIfNecessary
+
+@available(iOS 15.0, macOS 12.0, tvOS 15.0, watchOS 8.0, *)
+private struct ScrollableIfNecessaryModifier: ViewModifier {
+
+    var axis: Axis
+
+    @State
+    private var overflowing: Bool = false
+
+    func body(content: Content) -> some View {
+        GeometryReader { geometry in
+            self.centeredContent(content)
+                .background(
+                    GeometryReader { contentGeometry in
+                        Color.clear
+                            .onAppear {
+                                switch self.axis {
+                                case .horizontal:
+                                    self.overflowing = contentGeometry.size.width > geometry.size.width
+                                case .vertical:
+                                    self.overflowing = contentGeometry.size.height > geometry.size.height
+                                }
+                            }
+                    }
+                )
+        }
+        .scrollable(self.axis.scrollViewAxis, if: self.overflowing)
+    }
+
+    @ViewBuilder
+    private func centeredContent(_ content: Content) -> some View {
+        switch self.axis {
+        case .horizontal:
+            HStack {
+                Spacer()
+                content
+                Spacer()
+            }
+        case .vertical:
+            VStack {
+                Spacer()
+                content
+                Spacer()
             }
         }
     }
+
 }
 
 // MARK: - Size changes
@@ -176,3 +224,17 @@ private struct ViewSizePreferenceKey: PreferenceKey {
     }
 
 }
+
+// MARK: -
+
+@available(iOS 13.0, tvOS 13.0, macOS 10.15, watchOS 6.2, *)
+private extension Axis {
+
+    var scrollViewAxis: Axis.Set {
+        switch self {
+        case .horizontal: return .horizontal
+        case .vertical: return .vertical
+        }
+    }
+
+}

RevenueCatUI/PaywallView.swift

@@ -5,7 +5,7 @@ import SwiftUI
 ///
 /// ### Related Articles
 /// [Documentation](https://rev.cat/paywalls)
-@available(iOS 16.0, macOS 13.0, tvOS 16.0, *)
+@available(iOS 15.0, macOS 12.0, tvOS 15.0, *)
 @available(watchOS, unavailable, message: "RevenueCatUI does not support watchOS yet")
 @available(macOS, unavailable, message: "RevenueCatUI does not support macOS yet")
 @available(tvOS, unavailable, message: "RevenueCatUI does not support tvOS yet")

RevenueCatUI/Templates/Template2View.swift

@@ -38,6 +38,8 @@ struct Template2View: TemplateViewType {
     @ViewBuilder
     var content: some View {
         VStack(spacing: 10) {
+            Spacer()
+
             self.scrollableContent
                 .scrollableIfNecessary()
 

RevenueCatUI/Templates/Template4View.swift

@@ -107,8 +107,8 @@ struct Template4View: TemplateViewType {
 
     private var packagesScrollView: some View {
         self.packages
-            .frame(height: self.packageContentHeight)
             .scrollableIfNecessary(.horizontal)
+            .frame(height: self.packageContentHeight)
             .frame(maxWidth: .infinity)
             .onSizeChange(.horizontal) {
                 self.containerWidth = $0

RevenueCatUI/UIKit/PaywallViewController.swift

@@ -14,7 +14,7 @@ import UIKit
 /// A view controller for displaying `PaywallData` for an `Offering`.
 ///
 /// - Seealso: ``PaywallView`` for `SwiftUI`.
-@available(iOS 16.0, macOS 13.0, tvOS 16.0, *)
+@available(iOS 15.0, macOS 12.0, tvOS 15.0, *)
 @objc(RCPaywallViewController)
 public final class PaywallViewController: UIViewController {
 
@@ -64,7 +64,7 @@ public final class PaywallViewController: UIViewController {
 }
 
 /// Delegate for ``PaywallViewController``.
-@available(iOS 16.0, macOS 13.0, tvOS 16.0, *)
+@available(iOS 15.0, macOS 12.0, tvOS 15.0, *)
 @objc(RCPaywallViewControllerDelegate)
 public protocol PaywallViewControllerDelegate: AnyObject {
 

RevenueCatUI/View+PresentPaywall.swift

@@ -8,7 +8,7 @@
 import RevenueCat
 import SwiftUI
 
-@available(iOS 16.0, macOS 13.0, tvOS 16.0, *)
+@available(iOS 15.0, macOS 12.0, tvOS 15.0, *)
 @available(macOS, unavailable, message: "RevenueCatUI does not support macOS yet")
 @available(tvOS, unavailable, message: "RevenueCatUI does not support tvOS yet")
 extension View {
@@ -100,7 +100,7 @@ extension View {
 
 }
 
-@available(iOS 16.0, macOS 13.0, tvOS 16.0, *)
+@available(iOS 15.0, macOS 12.0, tvOS 15.0, *)
 @available(macOS, unavailable)
 @available(tvOS, unavailable)
 private struct PresentingPaywallModifier: ViewModifier {

Tests/APITesters/RevenueCatUIAPITester/SwiftAPITester/PaywallViewAPI.swift

@@ -9,7 +9,7 @@ import RevenueCat
 import RevenueCatUI
 import SwiftUI
 
-@available(iOS 16.0, macOS 13.0, tvOS 16.0, *)
+@available(iOS 15.0, macOS 12.0, tvOS 15.0, *)
 struct App: View {
 
     private var offering: Offering

Tests/APITesters/RevenueCatUIAPITester/SwiftAPITester/PaywallViewControllerAPI.swift

@@ -9,15 +9,15 @@ import RevenueCat
 import RevenueCatUI
 import SwiftUI
 
-@available(iOS 16.0, macOS 13.0, tvOS 16.0, *)
+@available(iOS 15.0, macOS 12.0, tvOS 15.0, *)
 func paywallViewControllerAPI(_ delegate: Delegate, _ offering: Offering?) {
     let controller = PaywallViewController()
     controller.delegate = delegate
 
     let _: UIViewController = PaywallViewController(offering: offering)
 }
 
-@available(iOS 16.0, macOS 13.0, tvOS 16.0, *)
+@available(iOS 15.0, macOS 12.0, tvOS 15.0, *)
 final class Delegate: PaywallViewControllerDelegate {
 
     func paywallViewController(_ controller: PaywallViewController,

Tests/RevenueCatUITests/BaseSnapshotTest.swift

@@ -10,7 +10,7 @@ import SnapshotTesting
 import SwiftUI
 import XCTest
 
-@available(iOS 16.0, macOS 13.0, tvOS 16.0, watchOS 9.0, *)
+@available(iOS 15.0, macOS 12.0, tvOS 15.0, watchOS 8.0, *)
 @MainActor
 class BaseSnapshotTest: TestCase {
 
@@ -20,15 +20,9 @@ class BaseSnapshotTest: TestCase {
         // isRecording = true
     }
 
-    override func setUpWithError() throws {
-        try super.setUpWithError()
-
-        try AvailabilityChecks.iOS16APIAvailableOrSkipTest()
-    }
-
 }
 
-@available(iOS 16.0, macOS 13.0, tvOS 16.0, watchOS 9.0, *)
+@available(iOS 15.0, macOS 12.0, tvOS 15.0, watchOS 8.0, *)
 extension BaseSnapshotTest {
 
     static let eligibleChecker: TrialOrIntroEligibilityChecker = .producing(eligibility: .eligible)
@@ -41,7 +35,7 @@ extension BaseSnapshotTest {
 
 }
 
-@available(iOS 16.0, macOS 13.0, tvOS 16.0, watchOS 9.0, *)
+@available(iOS 15.0, macOS 12.0, tvOS 15.0, watchOS 8.0, *)
 extension View {
 
     /// Adds the receiver to a view hierarchy to be able to test lifetime logic.

Tests/RevenueCatUITests/PurchaseCompletedHandlerTests.swift

@@ -13,16 +13,10 @@ import XCTest
 
 #if !os(macOS)
 
-@available(iOS 16.0, macOS 13.0, tvOS 16.0, watchOS 9.0, *)
+@available(iOS 15.0, macOS 12.0, tvOS 15.0, watchOS 8.0, *)
 @MainActor
 class PurchaseCompletedHandlerTests: TestCase {
 
-    override func setUpWithError() throws {
-        try super.setUpWithError()
-
-        try AvailabilityChecks.iOS16APIAvailableOrSkipTest()
-    }
-
     func testOnPurchaseCompletedWithCancellation() throws {
         let handler: PurchaseHandler = .cancelling()
 

Tests/RevenueCatUITests/Templates/OtherPaywallViewTests.swift

@@ -12,7 +12,7 @@ import SnapshotTesting
 
 #if !os(macOS)
 
-@available(iOS 16.0, macOS 13.0, tvOS 16.0, watchOS 9.0, *)
+@available(iOS 15.0, macOS 12.0, tvOS 15.0, watchOS 8.0, *)
 class OtherPaywallViewTests: BaseSnapshotTest {
 
     func testDefaultPaywall() {

Tests/RevenueCatUITests/Templates/PaywallViewDynamicTypeTests.swift

@@ -11,7 +11,7 @@ import RevenueCat
 import SnapshotTesting
 import SwiftUI
 
-@available(iOS 16.0, macOS 13.0, tvOS 16.0, watchOS 9.0, *)
+@available(iOS 15.0, macOS 12.0, tvOS 15.0, watchOS 8.0, *)
 class PaywallViewDynamicTypeTests: BaseSnapshotTest {
 
     func testXSmall() {
@@ -56,7 +56,7 @@ class PaywallViewDynamicTypeTests: BaseSnapshotTest {
 
 }
 
-@available(iOS 16.0, macOS 13.0, tvOS 16.0, watchOS 9.0, *)
+@available(iOS 15.0, macOS 12.0, tvOS 15.0, watchOS 8.0, *)
 private extension PaywallViewDynamicTypeTests {
 
     static func test(_ type: DynamicTypeSize) {

Tests/RevenueCatUITests/Templates/PaywallViewLocalizationTests.swift

@@ -11,7 +11,7 @@ import RevenueCat
 import SnapshotTesting
 import SwiftUI
 
-@available(iOS 16.0, macOS 13.0, tvOS 16.0, watchOS 9.0, *)
+@available(iOS 15.0, macOS 12.0, tvOS 15.0, watchOS 8.0, *)
 class PaywallViewLocalizationTests: BaseSnapshotTest {
 
     func testSpanish() {
@@ -20,7 +20,7 @@ class PaywallViewLocalizationTests: BaseSnapshotTest {
 
  }
 
-@available(iOS 16.0, macOS 13.0, tvOS 16.0, watchOS 9.0, *)
+@available(iOS 15.0, macOS 12.0, tvOS 15.0, watchOS 8.0, *)
 private extension PaywallViewLocalizationTests {
 
     static func test(_ locale: Locale) {

Tests/RevenueCatUITests/Templates/Template1ViewTests.swift

@@ -6,7 +6,7 @@ import SwiftUI
 
 #if !os(macOS)
 
-@available(iOS 16.0, macOS 13.0, tvOS 16.0, watchOS 9.0, *)
+@available(iOS 15.0, macOS 12.0, tvOS 15.0, watchOS 8.0, *)
 class Template1ViewTests: BaseSnapshotTest {
 
     func testSamplePaywall() {

Tests/RevenueCatUITests/Templates/Template2ViewTests.swift

@@ -5,7 +5,7 @@ import SnapshotTesting
 
 #if !os(macOS)
 
-@available(iOS 16.0, macOS 13.0, tvOS 16.0, watchOS 9.0, *)
+@available(iOS 15.0, macOS 12.0, tvOS 15.0, watchOS 8.0, *)
 class Template2ViewTests: BaseSnapshotTest {
 
     func testSamplePaywall() {

Tests/RevenueCatUITests/Templates/Template3ViewTests.swift

@@ -5,7 +5,7 @@ import SnapshotTesting
 
 #if !os(macOS)
 
-@available(iOS 16.0, macOS 13.0, tvOS 16.0, watchOS 9.0, *)
+@available(iOS 15.0, macOS 12.0, tvOS 15.0, watchOS 8.0, *)
 class Template3ViewTests: BaseSnapshotTest {
 
     func testSamplePaywall() {

Tests/RevenueCatUITests/Templates/Template4ViewTests.swift

@@ -5,7 +5,7 @@ import SnapshotTesting
 
 #if !os(macOS)
 
-@available(iOS 16.0, macOS 13.0, tvOS 16.0, watchOS 9.0, *)
+@available(iOS 15.0, macOS 12.0, tvOS 15.0, watchOS 8.0, *)
 class Template4ViewTests: BaseSnapshotTest {
 
     func testSamplePaywall() {

Tests/TestingApps/SimpleApp/SimpleApp.xcodeproj/project.pbxproj

@@ -382,7 +382,7 @@
 				"INFOPLIST_KEY_UIStatusBarStyle[sdk=iphonesimulator*]" = UIStatusBarStyleDefault;
 				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
 				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
-				IPHONEOS_DEPLOYMENT_TARGET = 16.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
 				"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 13.0;
@@ -426,7 +426,7 @@
 				"INFOPLIST_KEY_UIStatusBarStyle[sdk=iphonesimulator*]" = UIStatusBarStyleDefault;
 				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
 				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
-				IPHONEOS_DEPLOYMENT_TARGET = 16.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
 				"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 13.0;

Tests/TestingApps/SimpleApp/SimpleApp/SimpleApp.swift

@@ -27,9 +27,7 @@ struct SimpleApp: App {
 
     var body: some Scene {
         WindowGroup {
-            NavigationView {
-                AppContentView()
-            }
+            AppContentView()
         }
     }
 

Tests/TestingApps/SimpleApp/SimpleApp/Views/SamplePaywallsList.swift

@@ -76,7 +76,7 @@ struct SamplePaywallsList: View {
                         self.display = .customFont(template)
                     } label: {
                         TemplateLabel(name: "Custom font", icon: "textformat")
-                            .italic()
+                            .font(.body.italic())
                     }
                 }
             }