Paywalls: improved default paywall configuration

RevenueCatUI/Data/TestData.swift

@@ -321,7 +321,7 @@ internal enum TestData {
         background: Self.paywallBackgroundImageName,
         icon: Self.paywallHeaderImageName
     )
-    static let paywallAssetBaseURL = URL(string: "https://d35rwhxn1vk1te.cloudfront.net")!
+    static let paywallAssetBaseURL = URL(string: "https://assets.pawwalls.com")!
 
     private static let offeringIdentifier = "offering"
 

RevenueCatUI/Data/Variables.swift

@@ -14,6 +14,8 @@ extension PaywallData.LocalizedConfiguration {
 /// A type that can provide necessary information for `VariableHandler` to replace variable content in strings.
 protocol VariableDataProvider {
 
+    var applicationName: String { get }
+
     var isMonthly: Bool { get }
 
     var localizedPrice: String { get }
@@ -85,6 +87,7 @@ private extension VariableDataProvider {
 
     func value(for variableName: String, locale: Locale) -> String {
         switch variableName {
+        case "app_name": return self.applicationName
         case "price": return self.localizedPrice
         case "price_per_month": return self.localizedPricePerMonth
         case "total_price_and_per_month":

RevenueCatUI/Helpers/Package+VariableDataProvider.swift

@@ -4,6 +4,10 @@ import RevenueCat
 @available(iOS 16.0, macOS 13.0, tvOS 16.0, *)
 extension Package: VariableDataProvider {
 
+    var applicationName: String {
+        return Bundle.main.applicationDisplayName
+    }
+
     var isMonthly: Bool {
         return self.packageType == .monthly
     }
@@ -57,3 +61,13 @@ private extension Package {
     }
 
 }
+
+private extension Bundle {
+
+    var applicationDisplayName: String {
+        return self.object(forInfoDictionaryKey: "CFBundleDisplayName") as? String
+        ?? self.object(forInfoDictionaryKey: "CFBundleName") as? String
+        ?? ""
+    }
+
+}

RevenueCatUI/Helpers/PaywallData+Default.swift

@@ -36,27 +36,28 @@ private extension PaywallData {
         light: .init(
             background: try! .init(stringRepresentation: "#FFFFFF"),
             text1: try! .init(stringRepresentation: "#000000"),
-            callToActionBackground: try! .init(stringRepresentation: "#EC807C"),
+            callToActionBackground: try! .init(stringRepresentation: "#FF8181"),
             callToActionForeground: try! .init(stringRepresentation: "#FFFFFF"),
-            accent1: try! .init(stringRepresentation: "#EC807C")
+            accent1: try! .init(stringRepresentation: "#BC66FF"),
+            accent2: try! .init(stringRepresentation: "#111111")
         ),
         dark: .init(
             background: try! .init(stringRepresentation: "#000000"),
             text1: try! .init(stringRepresentation: "#FFFFFF"),
             callToActionBackground: try! .init(stringRepresentation: "#ACD27A"),
             callToActionForeground: try! .init(stringRepresentation: "#000000"),
-            accent1: try! .init(stringRepresentation: "#ACD27A")
+            accent1: try! .init(stringRepresentation: "#BC66FF"),
+            accent2: try! .init(stringRepresentation: "#EEEEEE")
         )
     )
     // swiftlint:enable force_try
 
     static let localization: PaywallData.LocalizedConfiguration = .init(
-        title: "Subscription",
-        subtitle: "Unlock access",
-        callToAction: "Purchase",
-        offerDetails: "{{ price_per_month }} per month",
-        offerDetailsWithIntroOffer: "Start your {{ intro_duration }} trial, then {{ price_per_month }} per month",
-        features: []
+        title: "{{ app_name }}",
+        subtitle: "Unlock full access with these subscriptions:",
+        callToAction: "Continue",
+        offerDetails: "{{ total_price_and_per_month }}.",
+        offerDetailsWithIntroOffer: "Start your {{ intro_duration }} trial, then {{ total_price_and_per_month }}."
     )
 
     static let backgroundImage = "background.jpg"

Tests/RevenueCatUITests/Data/VariablesTests.swift

@@ -26,6 +26,11 @@ class VariablesTests: TestCase {
         expect(self.process("{{price_per_month}}")) == "{{price_per_month}}"
     }
 
+    func testApplicationName() {
+        self.provider.applicationName = "Paywalls"
+        expect(self.process("Welcome to {{ app_name }}")) == "Welcome to Paywalls"
+    }
+
     func testPrice() {
         self.provider.localizedPrice = "$10.99"
         expect(self.process("Purchase for {{ price }}")) == "Purchase for $10.99"
@@ -90,7 +95,7 @@ class VariablesTests: TestCase {
 
     func testProcessesLocalizedConfiguration() {
         let configuration = PaywallData.LocalizedConfiguration(
-            title: "Title {{ product_name }}",
+            title: "Buy {{ product_name }} for {{ app_name }}",
             subtitle: "Price: {{ price }}",
             callToAction: "Unlock {{ product_name }} for {{ price_per_month }}",
             callToActionWithIntroOffer: "Start your {{ intro_duration }} free trial\n" +
@@ -110,7 +115,7 @@ class VariablesTests: TestCase {
         )
         let processed = configuration.processVariables(with: TestData.packageWithIntroOffer)
 
-        expect(processed.title) == "Title PRO monthly"
+        expect(processed.title) == "Buy PRO monthly for xctest"
         expect(processed.subtitle) == "Price: $3.99"
         expect(processed.callToAction) == "Unlock PRO monthly for $3.99"
         expect(processed.callToActionWithIntroOffer) == "Start your 1 week free trial\nThen $3.99 every month"
@@ -142,6 +147,7 @@ private extension VariablesTests {
 
 private struct MockVariableProvider: VariableDataProvider {
 
+    var applicationName: String = ""
     var isMonthly: Bool = false
     var localizedPrice: String = ""
     var localizedPricePerMonth: String = ""

Tests/RevenueCatUITests/Templates/OtherPaywallViewTests.swift

@@ -23,6 +23,15 @@ class OtherPaywallViewTests: BaseSnapshotTest {
         view.snapshot(size: Self.fullScreenSize)
     }
 
+    func testDefaultDarkModePaywall() {
+        let view = PaywallView(offering: Self.offeringWithNoPaywall,
+                               introEligibility: Self.eligibleChecker,
+                               purchaseHandler: Self.purchaseHandler)
+            .environment(\.colorScheme, .dark)
+
+        view.snapshot(size: Self.fullScreenSize)
+    }
+
     func testLoadingPaywallView() {
         let view = LoadingPaywallView()
         view.snapshot(size: Self.fullScreenSize)