[Paywalls V2] Support custom fonts with UIConfig (#4631)

* Support custom fonts with UIConfig * Added log to google fonts
RevenueCat · Jan 7, 2025 · 68bf247 · 68bf247
1 parent 9ef833b
commit 68bf247
Show file tree

Hide file tree

Showing 24 changed files with 259 additions and 293 deletions.
diff --git a/RevenueCat.xcodeproj/project.pbxproj b/RevenueCat.xcodeproj/project.pbxproj
diff --git a/RevenueCatUI/Templates/V2/Components/Button/ButtonComponentView.swift b/RevenueCatUI/Templates/V2/Components/Button/ButtonComponentView.swift
@@ -155,6 +155,7 @@ fileprivate extension ButtonComponentViewModel {
         let stackViewModel = try factory.toStackViewModel(
             component: component.stack,
             localizationProvider: localizationProvider,
+            uiConfigProvider: .init(uiConfig: PreviewUIConfig.make()),
             offering: offering
         )
 

diff --git a/RevenueCatUI/Templates/V2/Components/ComponentsView.swift b/RevenueCatUI/Templates/V2/Components/ComponentsView.swift
@@ -41,12 +41,8 @@ struct ComponentsView: View {
                 TextComponentView(viewModel: viewModel)
             case .image(let viewModel):
                 ImageComponentView(viewModel: viewModel)
-            case .spacer(let viewModel):
-                SpacerComponentView(viewModel: viewModel)
             case .stack(let viewModel):
                 StackComponentView(viewModel: viewModel, onDismiss: onDismiss)
-            case .linkButton(let viewModel):
-                LinkButtonComponentView(viewModel: viewModel)
             case .button(let viewModel):
                 ButtonComponentView(viewModel: viewModel, onDismiss: onDismiss)
             case .package(let viewModel):

diff --git a/RevenueCatUI/Templates/V2/Components/Image/ImageComponentView.swift b/RevenueCatUI/Templates/V2/Components/Image/ImageComponentView.swift
@@ -117,6 +117,7 @@ struct ImageComponentView_Previews: PreviewProvider {
                         locale: Locale.current,
                         localizedStrings: [:]
                     ),
+                    uiConfigProvider: .init(uiConfig: PreviewUIConfig.make()),
                     component: .init(
                         source: .init(
                             light: .init(
@@ -145,6 +146,7 @@ struct ImageComponentView_Previews: PreviewProvider {
                         locale: Locale.current,
                         localizedStrings: [:]
                     ),
+                    uiConfigProvider: .init(uiConfig: PreviewUIConfig.make()),
                     component: .init(
                         source: .init(
                             light: .init(
@@ -173,6 +175,7 @@ struct ImageComponentView_Previews: PreviewProvider {
                         locale: Locale.current,
                         localizedStrings: [:]
                     ),
+                    uiConfigProvider: .init(uiConfig: PreviewUIConfig.make()),
                     component: .init(
                         source: .init(
                             light: .init(
@@ -204,6 +207,7 @@ struct ImageComponentView_Previews: PreviewProvider {
                         locale: Locale.current,
                         localizedStrings: [:]
                     ),
+                    uiConfigProvider: .init(uiConfig: PreviewUIConfig.make()),
                     component: .init(
                         source: .init(
                             light: .init(

diff --git a/RevenueCatUI/Templates/V2/Components/Image/ImageComponentViewModel.swift b/RevenueCatUI/Templates/V2/Components/Image/ImageComponentViewModel.swift
@@ -24,13 +24,19 @@ class ImageComponentViewModel {
     private var introOfferEligibilityContext: IntroOfferEligibilityContext
 
     private let localizationProvider: LocalizationProvider
+    private let uiConfigProvider: UIConfigProvider
     private let component: PaywallComponent.ImageComponent
 
     private let imageInfo: PaywallComponent.ThemeImageUrls
     private let presentedOverrides: PresentedOverrides<LocalizedImagePartial>?
 
-    init(localizationProvider: LocalizationProvider, component: PaywallComponent.ImageComponent) throws {
+    init(
+        localizationProvider: LocalizationProvider,
+        uiConfigProvider: UIConfigProvider,
+        component: PaywallComponent.ImageComponent
+    ) throws {
         self.localizationProvider = localizationProvider
+        self.uiConfigProvider = uiConfigProvider
         self.component = component
 
         if let overrideSourceLid = component.overrideSourceLid {

diff --git a/RevenueCatUI/Templates/V2/Components/LinkButton/LinkButtonComponentView.swift b/RevenueCatUI/Templates/V2/Components/LinkButton/LinkButtonComponentView.swift
diff --git a/RevenueCatUI/Templates/V2/Components/LinkButton/LinkButtonComponentViewModel.swift b/RevenueCatUI/Templates/V2/Components/LinkButton/LinkButtonComponentViewModel.swift
diff --git a/RevenueCatUI/Templates/V2/Components/Packages/Package/PackageComponentView.swift b/RevenueCatUI/Templates/V2/Components/Packages/Package/PackageComponentView.swift
@@ -204,6 +204,7 @@ fileprivate extension PackageComponentViewModel {
         let stackViewModel = try factory.toStackViewModel(
             component: component.stack,
             localizationProvider: localizationProvider,
+            uiConfigProvider: .init(uiConfig: PreviewUIConfig.make()),
             offering: offering
         )
 

diff --git a/...ueCatUI/Templates/V2/Components/Packages/PurchaseButton/PurchaseButtonComponentView.swift b/...ueCatUI/Templates/V2/Components/Packages/PurchaseButton/PurchaseButtonComponentView.swift
@@ -152,6 +152,7 @@ fileprivate extension PurchaseButtonComponentViewModel {
         let stackViewModel = try factory.toStackViewModel(
             component: component.stack,
             localizationProvider: localizationProvider,
+            uiConfigProvider: .init(uiConfig: PreviewUIConfig.make()),
             offering: offering
         )
 

diff --git a/RevenueCatUI/Templates/V2/Components/Spacer/SpacerComponentView.swift b/RevenueCatUI/Templates/V2/Components/Spacer/SpacerComponentView.swift
diff --git a/RevenueCatUI/Templates/V2/Components/Spacer/SpacerComponentViewModel.swift b/RevenueCatUI/Templates/V2/Components/Spacer/SpacerComponentViewModel.swift
diff --git a/RevenueCatUI/Templates/V2/Components/Stack/StackComponentView.swift b/RevenueCatUI/Templates/V2/Components/Stack/StackComponentView.swift
@@ -449,7 +449,8 @@ fileprivate extension StackComponentViewModel {
                 component: component,
                 packageValidator: validator,
                 offering: offering,
-                localizationProvider: localizationProvider
+                localizationProvider: localizationProvider,
+                uiConfigProvider: .init(uiConfig: PreviewUIConfig.make())
             )
         }