diff --git a/RevenueCatUI/Data/TestData.swift b/RevenueCatUI/Data/TestData.swift index 82aff8173a..188f82f255 100644 --- a/RevenueCatUI/Data/TestData.swift +++ b/RevenueCatUI/Data/TestData.swift @@ -232,14 +232,14 @@ internal enum TestData { termsOfServiceURL: URL(string: "https://revenuecat.com/tos")! ), localization: .init( - title: "How your free trial works", + title: "How your **free** trial works", callToAction: "Start", callToActionWithIntroOffer: "Start your {{ intro_duration }} free", offerDetails: "Only {{ price }} per {{ period }}", offerDetailsWithIntroOffer: "First {{ intro_duration }} free,\nthen {{ total_price_and_per_month }}", features: [ .init(title: "Today", - content: "Full access to 1000+ workouts plus free meal plan worth {{ price }}.", + content: "Full access to 1000+ workouts plus _free_ meal plan worth {{ price }}.", iconID: "tick"), .init(title: "Day 7", content: "Get a reminder about when your trial is about to end.", @@ -313,8 +313,8 @@ internal enum TestData { }() static let localization1: PaywallData.LocalizedConfiguration = .init( - title: "Ignite your child's curiosity", - subtitle: "Get access to all our educational content trusted by thousands of parents.", + title: "Ignite your child's *curiosity*", + subtitle: "Get access to all our educational content trusted by **thousands** of parents.", callToAction: "Purchase for {{ price }}", callToActionWithIntroOffer: "Purchase for {{ price_per_month }} per month", offerDetails: "{{ price_per_month }} per month", @@ -322,8 +322,8 @@ internal enum TestData { features: [] ) static let localization2: PaywallData.LocalizedConfiguration = .init( - title: "Call to action for better conversion.", - subtitle: "Lorem ipsum is simply dummy text of the printing and typesetting industry.", + title: "Call to action for _better_ conversion.", + subtitle: "Lorem ipsum is simply dummy text of the ~printing and~ typesetting industry.", callToAction: "Subscribe for {{ price_per_month }}/mo", offerDetails: "{{ total_price_and_per_month }}", offerDetailsWithIntroOffer: "{{ total_price_and_per_month }} after {{ intro_duration }} trial", diff --git a/RevenueCatUI/Templates/MultiPackageBoldTemplate.swift b/RevenueCatUI/Templates/MultiPackageBoldTemplate.swift index 7eec0002b7..d7f455f339 100644 --- a/RevenueCatUI/Templates/MultiPackageBoldTemplate.swift +++ b/RevenueCatUI/Templates/MultiPackageBoldTemplate.swift @@ -59,13 +59,13 @@ struct MultiPackageBoldTemplate: TemplateViewType { Spacer() - Text(self.selectedLocalization.title) + Text(.init(self.selectedLocalization.title)) .foregroundColor(self.configuration.colors.text1Color) .font(.largeTitle.bold()) Spacer() - Text(self.selectedLocalization.subtitle ?? "") + Text(.init(self.selectedLocalization.subtitle ?? "")) .foregroundColor(self.configuration.colors.text1Color) .font(.title3) diff --git a/RevenueCatUI/Templates/OnePackageStandardTemplate.swift b/RevenueCatUI/Templates/OnePackageStandardTemplate.swift index 32d7fbf647..32a5251c58 100644 --- a/RevenueCatUI/Templates/OnePackageStandardTemplate.swift +++ b/RevenueCatUI/Templates/OnePackageStandardTemplate.swift @@ -56,7 +56,7 @@ struct OnePackageStandardTemplate: TemplateViewType { self.headerImage Group { - Text(verbatim: self.localization.title) + Text(.init(self.localization.title)) .font(self.configuration.mode.titleFont) .fontWeight(.heavy) .padding( @@ -66,7 +66,7 @@ struct OnePackageStandardTemplate: TemplateViewType { ) if self.configuration.mode.displaySubtitle, let subtitle = self.localization.subtitle { - Text(verbatim: subtitle) + Text(.init(subtitle)) .font(self.configuration.mode.subtitleFont) } } diff --git a/RevenueCatUI/Templates/OnePackageWithFeaturesTemplate.swift b/RevenueCatUI/Templates/OnePackageWithFeaturesTemplate.swift index 7e5cd5e500..1bbdfc6eab 100644 --- a/RevenueCatUI/Templates/OnePackageWithFeaturesTemplate.swift +++ b/RevenueCatUI/Templates/OnePackageWithFeaturesTemplate.swift @@ -41,7 +41,7 @@ struct OnePackageWithFeaturesTemplate: TemplateViewType { .cornerRadius(8) } - Text(self.localization.title) + Text(.init(self.localization.title)) .font(.title) .foregroundStyle(self.configuration.colors.text1Color) .multilineTextAlignment(.center) @@ -146,14 +146,14 @@ private struct FeatureView: View { self.icon } - Text(self.feature.title) + Text(.init(self.feature.title)) .foregroundStyle(self.colors.text1Color) .font(.headline) .frame(maxWidth: .infinity, alignment: .leading) } if let content = self.feature.content { - Text(content) + Text(.init(content)) .foregroundStyle(self.colors.accent2Color) .font(.body) } diff --git a/RevenueCatUI/Views/IntroEligibilityStateView.swift b/RevenueCatUI/Views/IntroEligibilityStateView.swift index 5e35ef770f..e67132999f 100644 --- a/RevenueCatUI/Views/IntroEligibilityStateView.swift +++ b/RevenueCatUI/Views/IntroEligibilityStateView.swift @@ -33,7 +33,7 @@ struct IntroEligibilityStateView: View { } var body: some View { - Text(self.text) + Text(.init(self.text)) // Hide until we've determined intro eligibility // only if there is a custom intro text. .withPendingData(self.needsToWaitForIntroEligibility, alignment: self.alignment) diff --git a/Tests/RevenueCatUITests/Templates/__Snapshots__/MultiPackageBoldPaywallViewTests/iOS16-testDarkMode.1.png b/Tests/RevenueCatUITests/Templates/__Snapshots__/MultiPackageBoldPaywallViewTests/iOS16-testDarkMode.1.png index 8259b94836..659d180775 100644 Binary files a/Tests/RevenueCatUITests/Templates/__Snapshots__/MultiPackageBoldPaywallViewTests/iOS16-testDarkMode.1.png and b/Tests/RevenueCatUITests/Templates/__Snapshots__/MultiPackageBoldPaywallViewTests/iOS16-testDarkMode.1.png differ diff --git a/Tests/RevenueCatUITests/Templates/__Snapshots__/MultiPackageBoldPaywallViewTests/iOS16-testPurchasingState.1.png b/Tests/RevenueCatUITests/Templates/__Snapshots__/MultiPackageBoldPaywallViewTests/iOS16-testPurchasingState.1.png index a872087ca9..14a6674301 100644 Binary files a/Tests/RevenueCatUITests/Templates/__Snapshots__/MultiPackageBoldPaywallViewTests/iOS16-testPurchasingState.1.png and b/Tests/RevenueCatUITests/Templates/__Snapshots__/MultiPackageBoldPaywallViewTests/iOS16-testPurchasingState.1.png differ diff --git a/Tests/RevenueCatUITests/Templates/__Snapshots__/MultiPackageBoldPaywallViewTests/iOS16-testSamplePaywall.1.png b/Tests/RevenueCatUITests/Templates/__Snapshots__/MultiPackageBoldPaywallViewTests/iOS16-testSamplePaywall.1.png index 6adf4186fe..6693d23e74 100644 Binary files a/Tests/RevenueCatUITests/Templates/__Snapshots__/MultiPackageBoldPaywallViewTests/iOS16-testSamplePaywall.1.png and b/Tests/RevenueCatUITests/Templates/__Snapshots__/MultiPackageBoldPaywallViewTests/iOS16-testSamplePaywall.1.png differ diff --git a/Tests/RevenueCatUITests/Templates/__Snapshots__/OnePackageStandardPaywallViewTests/iOS16-testDarkMode.1.png b/Tests/RevenueCatUITests/Templates/__Snapshots__/OnePackageStandardPaywallViewTests/iOS16-testDarkMode.1.png index 935ebfa3d4..03cd5135bc 100644 Binary files a/Tests/RevenueCatUITests/Templates/__Snapshots__/OnePackageStandardPaywallViewTests/iOS16-testDarkMode.1.png and b/Tests/RevenueCatUITests/Templates/__Snapshots__/OnePackageStandardPaywallViewTests/iOS16-testDarkMode.1.png differ diff --git a/Tests/RevenueCatUITests/Templates/__Snapshots__/OnePackageStandardPaywallViewTests/iOS16-testSamplePaywall.1.png b/Tests/RevenueCatUITests/Templates/__Snapshots__/OnePackageStandardPaywallViewTests/iOS16-testSamplePaywall.1.png index 23935222c3..5088f1b1a8 100644 Binary files a/Tests/RevenueCatUITests/Templates/__Snapshots__/OnePackageStandardPaywallViewTests/iOS16-testSamplePaywall.1.png and b/Tests/RevenueCatUITests/Templates/__Snapshots__/OnePackageStandardPaywallViewTests/iOS16-testSamplePaywall.1.png differ diff --git a/Tests/RevenueCatUITests/Templates/__Snapshots__/OnePackageStandardPaywallViewTests/iOS16-testSamplePaywallWithIneligibleIntroOffer.1.png b/Tests/RevenueCatUITests/Templates/__Snapshots__/OnePackageStandardPaywallViewTests/iOS16-testSamplePaywallWithIneligibleIntroOffer.1.png index cd90cacd4c..cfe3388888 100644 Binary files a/Tests/RevenueCatUITests/Templates/__Snapshots__/OnePackageStandardPaywallViewTests/iOS16-testSamplePaywallWithIneligibleIntroOffer.1.png and b/Tests/RevenueCatUITests/Templates/__Snapshots__/OnePackageStandardPaywallViewTests/iOS16-testSamplePaywallWithIneligibleIntroOffer.1.png differ diff --git a/Tests/RevenueCatUITests/Templates/__Snapshots__/OnePackageStandardPaywallViewTests/iOS16-testSamplePaywallWithIntroOffer.1.png b/Tests/RevenueCatUITests/Templates/__Snapshots__/OnePackageStandardPaywallViewTests/iOS16-testSamplePaywallWithIntroOffer.1.png index f6cc2e3f40..f88c6a0b60 100644 Binary files a/Tests/RevenueCatUITests/Templates/__Snapshots__/OnePackageStandardPaywallViewTests/iOS16-testSamplePaywallWithIntroOffer.1.png and b/Tests/RevenueCatUITests/Templates/__Snapshots__/OnePackageStandardPaywallViewTests/iOS16-testSamplePaywallWithIntroOffer.1.png differ diff --git a/Tests/RevenueCatUITests/Templates/__Snapshots__/OnePackageStandardPaywallViewTests/iOS16-testSamplePaywallWithLoadingEligibility.1.png b/Tests/RevenueCatUITests/Templates/__Snapshots__/OnePackageStandardPaywallViewTests/iOS16-testSamplePaywallWithLoadingEligibility.1.png index a2b2415c83..65efd2a59a 100644 Binary files a/Tests/RevenueCatUITests/Templates/__Snapshots__/OnePackageStandardPaywallViewTests/iOS16-testSamplePaywallWithLoadingEligibility.1.png and b/Tests/RevenueCatUITests/Templates/__Snapshots__/OnePackageStandardPaywallViewTests/iOS16-testSamplePaywallWithLoadingEligibility.1.png differ diff --git a/Tests/RevenueCatUITests/Templates/__Snapshots__/OnePackageWithFeaturesPaywallViewTests/iOS16-testSamplePaywall.1.png b/Tests/RevenueCatUITests/Templates/__Snapshots__/OnePackageWithFeaturesPaywallViewTests/iOS16-testSamplePaywall.1.png index 7680bc20e4..ea1c0a3dab 100644 Binary files a/Tests/RevenueCatUITests/Templates/__Snapshots__/OnePackageWithFeaturesPaywallViewTests/iOS16-testSamplePaywall.1.png and b/Tests/RevenueCatUITests/Templates/__Snapshots__/OnePackageWithFeaturesPaywallViewTests/iOS16-testSamplePaywall.1.png differ diff --git a/Tests/RevenueCatUITests/Templates/__Snapshots__/PaywallViewDynamicTypeTests/iOS16-testAccessibility1.1.png b/Tests/RevenueCatUITests/Templates/__Snapshots__/PaywallViewDynamicTypeTests/iOS16-testAccessibility1.1.png index 3bdca40229..24435a5a63 100644 Binary files a/Tests/RevenueCatUITests/Templates/__Snapshots__/PaywallViewDynamicTypeTests/iOS16-testAccessibility1.1.png and b/Tests/RevenueCatUITests/Templates/__Snapshots__/PaywallViewDynamicTypeTests/iOS16-testAccessibility1.1.png differ diff --git a/Tests/RevenueCatUITests/Templates/__Snapshots__/PaywallViewDynamicTypeTests/iOS16-testAccessibility3.1.png b/Tests/RevenueCatUITests/Templates/__Snapshots__/PaywallViewDynamicTypeTests/iOS16-testAccessibility3.1.png index b058529f8f..4cf31b23bb 100644 Binary files a/Tests/RevenueCatUITests/Templates/__Snapshots__/PaywallViewDynamicTypeTests/iOS16-testAccessibility3.1.png and b/Tests/RevenueCatUITests/Templates/__Snapshots__/PaywallViewDynamicTypeTests/iOS16-testAccessibility3.1.png differ diff --git a/Tests/RevenueCatUITests/Templates/__Snapshots__/PaywallViewDynamicTypeTests/iOS16-testLarge.1.png b/Tests/RevenueCatUITests/Templates/__Snapshots__/PaywallViewDynamicTypeTests/iOS16-testLarge.1.png index 9046d5609b..bfa7d0d7df 100644 Binary files a/Tests/RevenueCatUITests/Templates/__Snapshots__/PaywallViewDynamicTypeTests/iOS16-testLarge.1.png and b/Tests/RevenueCatUITests/Templates/__Snapshots__/PaywallViewDynamicTypeTests/iOS16-testLarge.1.png differ diff --git a/Tests/RevenueCatUITests/Templates/__Snapshots__/PaywallViewDynamicTypeTests/iOS16-testMedium.1.png b/Tests/RevenueCatUITests/Templates/__Snapshots__/PaywallViewDynamicTypeTests/iOS16-testMedium.1.png index b84a734bda..9249251fe0 100644 Binary files a/Tests/RevenueCatUITests/Templates/__Snapshots__/PaywallViewDynamicTypeTests/iOS16-testMedium.1.png and b/Tests/RevenueCatUITests/Templates/__Snapshots__/PaywallViewDynamicTypeTests/iOS16-testMedium.1.png differ diff --git a/Tests/RevenueCatUITests/Templates/__Snapshots__/PaywallViewDynamicTypeTests/iOS16-testSmall.1.png b/Tests/RevenueCatUITests/Templates/__Snapshots__/PaywallViewDynamicTypeTests/iOS16-testSmall.1.png index a83d0836fa..97954abb8a 100644 Binary files a/Tests/RevenueCatUITests/Templates/__Snapshots__/PaywallViewDynamicTypeTests/iOS16-testSmall.1.png and b/Tests/RevenueCatUITests/Templates/__Snapshots__/PaywallViewDynamicTypeTests/iOS16-testSmall.1.png differ diff --git a/Tests/RevenueCatUITests/Templates/__Snapshots__/PaywallViewDynamicTypeTests/iOS16-testXLarge.1.png b/Tests/RevenueCatUITests/Templates/__Snapshots__/PaywallViewDynamicTypeTests/iOS16-testXLarge.1.png index 9046d5609b..bfa7d0d7df 100644 Binary files a/Tests/RevenueCatUITests/Templates/__Snapshots__/PaywallViewDynamicTypeTests/iOS16-testXLarge.1.png and b/Tests/RevenueCatUITests/Templates/__Snapshots__/PaywallViewDynamicTypeTests/iOS16-testXLarge.1.png differ diff --git a/Tests/RevenueCatUITests/Templates/__Snapshots__/PaywallViewDynamicTypeTests/iOS16-testXSmall.1.png b/Tests/RevenueCatUITests/Templates/__Snapshots__/PaywallViewDynamicTypeTests/iOS16-testXSmall.1.png index a73c0752ee..f2560f560b 100644 Binary files a/Tests/RevenueCatUITests/Templates/__Snapshots__/PaywallViewDynamicTypeTests/iOS16-testXSmall.1.png and b/Tests/RevenueCatUITests/Templates/__Snapshots__/PaywallViewDynamicTypeTests/iOS16-testXSmall.1.png differ diff --git a/Tests/RevenueCatUITests/Templates/__Snapshots__/PaywallViewDynamicTypeTests/iOS16-testXXLarge.1.png b/Tests/RevenueCatUITests/Templates/__Snapshots__/PaywallViewDynamicTypeTests/iOS16-testXXLarge.1.png index 92358998c0..e393deb13e 100644 Binary files a/Tests/RevenueCatUITests/Templates/__Snapshots__/PaywallViewDynamicTypeTests/iOS16-testXXLarge.1.png and b/Tests/RevenueCatUITests/Templates/__Snapshots__/PaywallViewDynamicTypeTests/iOS16-testXXLarge.1.png differ diff --git a/Tests/RevenueCatUITests/Templates/__Snapshots__/PaywallViewDynamicTypeTests/iOS16-testXXXLarge.1.png b/Tests/RevenueCatUITests/Templates/__Snapshots__/PaywallViewDynamicTypeTests/iOS16-testXXXLarge.1.png index b059dd18a1..135d8e8596 100644 Binary files a/Tests/RevenueCatUITests/Templates/__Snapshots__/PaywallViewDynamicTypeTests/iOS16-testXXXLarge.1.png and b/Tests/RevenueCatUITests/Templates/__Snapshots__/PaywallViewDynamicTypeTests/iOS16-testXXXLarge.1.png differ