Paywalls: watchOS support (#3291)

![simulator_screenshot_38A61F03-8048-40E2-AD3E-384DF4112771](https://github.com/RevenueCat/purchases-ios/assets/685609/b74e2c9d-ece1-4f00-920b-7bccb68acd82) ![simulator_screenshot_ADD7F6B5-8A39-473B-85E2-5175027F641C](https://github.com/RevenueCat/purchases-ios/assets/685609/6531d598-b859-4482-a669-34d2eaf5b8f1)
RevenueCat · Nov 16, 2023 · 6317f09 · 6317f09
1 parent b57a1be
commit 6317f09
Show file tree

Hide file tree

Showing 72 changed files with 781 additions and 165 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -393,6 +393,10 @@ jobs:
     steps:
       - checkout
       - update-spm-installation-commit
+      - run:
+          name: SPM RevenueCatUI Release Build
+          command: swift build -c release --target RevenueCatUI
+          no_output_timeout: 5m
       - run:
           name: SPM RevenueCatUI Tests
           command: bundle exec fastlane test_revenuecatui
@@ -414,6 +418,28 @@ jobs:
           path: fastlane/test_output
           destination: scan-test-output
 
+  spm-revenuecat-ui-watchos:
+    <<: *base-job
+    steps:
+      - checkout
+      - update-spm-installation-commit
+      - run:
+          name: SPM RevenueCatUI Tests
+          command: bundle exec fastlane test_revenuecatui
+          no_output_timeout: 15m
+          environment:
+            SCAN_PLATFORM: watchOS Simulator
+            SCAN_DEVICE: Apple Watch Series 8 (41mm),OS=9.4
+            BUILD_SDK: watchsimulator
+      - compress_result_bundle:
+          directory: fastlane/test_output
+          bundle_name: revenuecatui
+      - store_test_results:
+          path: fastlane/test_output/revenuecatui/tests.xml
+      - store_artifacts:
+          path: fastlane/test_output
+          destination: scan-test-output
+
   run-test-ios-17:
     <<: *base-job
     resource_class: macos.m1.large.gen1
@@ -1017,6 +1043,8 @@ workflows:
           xcode_version: '14.3.0'
       - spm-revenuecat-ui-ios-17:
           xcode_version: '15.1'
+      - spm-revenuecat-ui-watchos:
+          xcode_version: '14.3.0'
       - run-test-ios-17:
           xcode_version: '15.0.1'
       - run-test-ios-16:

diff --git a/RevenueCatUI/Data/TemplateViewConfiguration.swift b/RevenueCatUI/Data/TemplateViewConfiguration.swift
@@ -76,6 +76,13 @@ extension TemplateViewConfiguration.PackageConfiguration {
         }
     }
 
+    var singleIfNotMultiple: TemplateViewConfiguration.Package? {
+        switch self {
+        case let .single(package): return package
+        case .multiple: return nil
+        }
+    }
+
     /// Returns all packages, useful for templates that expect multiple packages.
     var all: [TemplateViewConfiguration.Package] {
         switch self {

diff --git a/RevenueCatUI/Data/TestData.swift b/RevenueCatUI/Data/TestData.swift
@@ -24,7 +24,8 @@ internal enum TestData {
         productType: .autoRenewableSubscription,
         localizedDescription: "PRO weekly",
         subscriptionGroupIdentifier: "group",
-        subscriptionPeriod: .init(value: 1, unit: .week)
+        subscriptionPeriod: .init(value: 1, unit: .week),
+        locale: Self.locale
     )
     static let monthlyProduct = TestStoreProduct(
         localizedTitle: "Monthly",
@@ -35,7 +36,8 @@ internal enum TestData {
         localizedDescription: "PRO monthly",
         subscriptionGroupIdentifier: "group",
         subscriptionPeriod: .init(value: 1, unit: .month),
-        introductoryDiscount: Self.intro(7, .day)
+        introductoryDiscount: Self.intro(7, .day),
+        locale: Self.locale
     )
     static let threeMonthProduct = TestStoreProduct(
         localizedTitle: "3 months",
@@ -46,7 +48,8 @@ internal enum TestData {
         localizedDescription: "PRO monthly",
         subscriptionGroupIdentifier: "group",
         subscriptionPeriod: .init(value: 3, unit: .month),
-        introductoryDiscount: Self.intro(7, .day)
+        introductoryDiscount: Self.intro(7, .day),
+        locale: Self.locale
     )
     static let sixMonthProduct = TestStoreProduct(
         localizedTitle: "6 months",
@@ -57,7 +60,8 @@ internal enum TestData {
         localizedDescription: "PRO monthly",
         subscriptionGroupIdentifier: "group",
         subscriptionPeriod: .init(value: 6, unit: .month),
-        introductoryDiscount: Self.intro(7, .day)
+        introductoryDiscount: Self.intro(7, .day),
+        locale: Self.locale
     )
     static let annualProduct = TestStoreProduct(
         localizedTitle: "Annual",
@@ -68,7 +72,8 @@ internal enum TestData {
         localizedDescription: "PRO annual",
         subscriptionGroupIdentifier: "group",
         subscriptionPeriod: .init(value: 1, unit: .year),
-        introductoryDiscount: Self.intro(14, .day, priceString: "$1.99")
+        introductoryDiscount: Self.intro(14, .day, priceString: "$1.99"),
+        locale: Self.locale
     )
     static let lifetimeProduct = TestStoreProduct(
         localizedTitle: "Lifetime",
@@ -78,7 +83,8 @@ internal enum TestData {
         productType: .nonConsumable,
         localizedDescription: "Lifetime purchase",
         subscriptionGroupIdentifier: "group",
-        subscriptionPeriod: nil
+        subscriptionPeriod: nil,
+        locale: Self.locale
     )
     static let productWithIntroOffer = TestStoreProduct(
         localizedTitle: "PRO monthly",
@@ -98,7 +104,8 @@ internal enum TestData {
             numberOfPeriods: 1,
             type: .introductory
         ),
-        discounts: []
+        discounts: [],
+        locale: Self.locale
     )
     static let productWithNoIntroOffer = TestStoreProduct(
         localizedTitle: "PRO annual",
@@ -110,7 +117,8 @@ internal enum TestData {
         subscriptionGroupIdentifier: "group",
         subscriptionPeriod: .init(value: 1, unit: .year),
         introductoryDiscount: nil,
-        discounts: []
+        discounts: [],
+        locale: Self.locale
     )
     static let weeklyPackage = Package(
         identifier: PackageType.weekly.identifier,
@@ -504,6 +512,13 @@ internal enum TestData {
     )
     static let paywallAssetBaseURL = URL(string: "https://assets.pawwalls.com")!
 
+    #if os(watchOS)
+    // `Locale.current` in watchOS produces `en_001` when running tests
+    static let locale: Locale = .init(identifier: "en_US")
+    #else
+    static let locale: Locale = .current
+    #endif
+
     private static let offeringIdentifier = "offering"
 
     private static func intro(
@@ -521,6 +536,7 @@ internal enum TestData {
             type: .introductory
         )
     }
+
 }
 
 // MARK: -

diff --git a/RevenueCatUI/Data/UserInterfaceIdiom.swift b/RevenueCatUI/Data/UserInterfaceIdiom.swift
@@ -14,13 +14,16 @@ enum UserInterfaceIdiom {
     case phone
     case pad
     case mac
+    case watch
     case unknown
 
 }
 
 extension UserInterfaceIdiom {
 
-    #if canImport(UIKit) && !os(watchOS)
+    #if os(watchOS)
+    static let `default`: Self = .watch
+    #elseif canImport(UIKit)
     static let `default`: Self = UIDevice.interfaceIdiom
     #elseif os(macOS)
     static let `default`: Self = .mac

diff --git a/RevenueCatUI/Helpers/ColorInformation+MultiScheme.swift b/RevenueCatUI/Helpers/ColorInformation+MultiScheme.swift
@@ -21,13 +21,17 @@ extension PaywallData.Configuration.ColorInformation {
     /// - Returns: `PaywallData.Configuration.Colors` combining `light` and `dark` if they're available
     @available(iOS 14.0, macOS 11.0, tvOS 14.0, watchOS 7.0, *)
     var multiScheme: PaywallData.Configuration.Colors {
+        #if os(watchOS)
+        return self.dark ?? self.light
+        #else
         let light = self.light
         guard let dark = self.dark else {
             // With no dark information, simply use `light`.
             return light
         }
 
         return .combine(light: light, dark: dark)
+        #endif
     }
 
 }

diff --git a/RevenueCatUI/Helpers/PaywallData+Default.swift b/RevenueCatUI/Helpers/PaywallData+Default.swift
@@ -17,7 +17,7 @@ import SwiftUI
 
 #if canImport(SwiftUI)
 
-@available(iOS 15.0, macOS 12.0, tvOS 15.0, *)
+@available(iOS 15.0, macOS 12.0, tvOS 15.0, watchOS 8.0, *)
 extension PaywallData {
 
     /// Default `PaywallData` to display when attempting to present a ``PaywallView`` with an offering
@@ -47,7 +47,8 @@ extension PaywallData {
             ),
             localization: Self.localization(Localization.localizedBundle(locale)),
             assetBaseURL: Self.defaultTemplateBaseURL,
-            revision: Self.revisionID
+            revision: Self.revisionID,
+            locale: locale
         )
     }
 
@@ -123,14 +124,17 @@ private extension PaywallData {
 #if DEBUG
 
 @available(iOS 15.0, macOS 12.0, tvOS 15.0, watchOS 8.0, *)
-@available(watchOS, unavailable)
 @available(macOS, unavailable)
 @available(tvOS, unavailable)
 struct DefaultPaywall_Previews: PreviewProvider {
 
     static var previews: some View {
         PreviewableTemplate(offering: Self.offering) {
+            #if os(watchOS)
+            WatchTemplateView($0)
+            #else
             Template2View($0)
+            #endif
         }
     }
 

diff --git a/RevenueCatUI/Helpers/PreviewHelpers.swift b/RevenueCatUI/Helpers/PreviewHelpers.swift
@@ -17,7 +17,6 @@ import SwiftUI
 #if DEBUG
 
 @available(iOS 15.0, macOS 12.0, tvOS 15.0, watchOS 8.0, *)
-@available(watchOS, unavailable)
 @available(macOS, unavailable)
 @MainActor
 enum PreviewHelpers {
@@ -41,7 +40,6 @@ enum PreviewHelpers {
 /// }
 /// ```
 @available(iOS 15.0, macOS 12.0, tvOS 15.0, watchOS 8.0, *)
-@available(watchOS, unavailable)
 @available(macOS, unavailable)
 @available(tvOS, unavailable)
 struct PreviewableTemplate<T: TemplateViewType>: View {
@@ -118,7 +116,7 @@ struct PreviewableTemplate<T: TemplateViewType>: View {
 
 }
 
-@available(iOS 15.0, macOS 12.0, tvOS 15.0, *)
+@available(iOS 15.0, macOS 12.0, tvOS 15.0, watchOS 8.0, *)
 private extension PaywallViewMode {
 
     var layout: PreviewLayout {

diff --git a/RevenueCatUI/PaywallView.swift b/RevenueCatUI/PaywallView.swift
@@ -14,14 +14,13 @@
 import RevenueCat
 import SwiftUI
 
-#if !os(macOS) && !os(tvOS) && !os(watchOS)
+#if !os(macOS) && !os(tvOS)
 
 /// A SwiftUI view for displaying a `PaywallData` for an `Offering`.
 ///
 /// ### Related Articles
 /// [Documentation](https://rev.cat/paywalls)
 @available(iOS 15.0, macOS 12.0, tvOS 15.0, watchOS 8.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")
 public struct PaywallView: View {
@@ -209,8 +208,7 @@ public struct PaywallView: View {
 
 }
 
-@available(iOS 15.0, macOS 12.0, tvOS 15.0, *)
-@available(watchOS, unavailable)
+@available(iOS 15.0, macOS 12.0, tvOS 15.0, watchOS 8.0, *)
 @available(macOS, unavailable)
 @available(tvOS, unavailable)
 private extension PaywallView {
@@ -236,7 +234,6 @@ private extension PaywallView {
 // MARK: -
 
 @available(iOS 15.0, macOS 12.0, tvOS 15.0, watchOS 8.0, *)
-@available(watchOS, unavailable)
 @available(macOS, unavailable)
 @available(tvOS, unavailable)
 struct LoadedOfferingPaywallView: View {
@@ -343,7 +340,6 @@ struct LoadedOfferingPaywallView: View {
 }
 
 @available(iOS 15.0, macOS 12.0, tvOS 15.0, watchOS 8.0, *)
-@available(watchOS, unavailable)
 @available(macOS, unavailable)
 @available(tvOS, unavailable)
 private extension LoadedOfferingPaywallView {
@@ -369,7 +365,6 @@ private extension LoadedOfferingPaywallView {
 #if DEBUG
 
 @available(iOS 15.0, macOS 12.0, tvOS 15.0, watchOS 8.0, *)
-@available(watchOS, unavailable)
 @available(macOS, unavailable)
 @available(tvOS, unavailable)
 struct PaywallView_Previews: PreviewProvider {