Paywalls: simplify PurchaseButton (#3362)

This moves some of the modifications outside of `ConsistentPackageContentView` so they're not duplicated in the hierarchy for each package.
RevenueCat · Oct 31, 2023 · 485bd71 · 485bd71
1 parent 9670f7e
commit 485bd71
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 59 deletions.
diff --git a/RevenueCatUI/Views/IntroEligibilityStateView.swift b/RevenueCatUI/Views/IntroEligibilityStateView.swift
@@ -134,27 +134,6 @@ private extension IntroEligibilityStateView.Display {
 
 }
 
-// MARK: - Private
-
-@available(iOS 15.0, macOS 12.0, tvOS 15.0, *)
-private extension IntroEligibilityStateView.Display {
-
-    func textWithNoIntroOffer(_ localization: ProcessedLocalizedConfiguration) -> String? {
-        switch self {
-        case .callToAction: return localization.callToAction
-        case .offerDetails: return localization.offerDetails
-        }
-    }
-
-    func textWithIntroOffer(_ localization: ProcessedLocalizedConfiguration) -> String? {
-        switch self {
-        case .callToAction: return localization.callToActionWithIntroOffer
-        case .offerDetails: return localization.offerDetailsWithIntroOffer
-        }
-    }
-
-}
-
 // MARK: - Extensions
 
 @available(iOS 15.0, macOS 12.0, tvOS 15.0, *)

diff --git a/RevenueCatUI/Views/PurchaseButton.swift b/RevenueCatUI/Views/PurchaseButton.swift
@@ -28,6 +28,8 @@ struct PurchaseButton: View {
     private var introEligibilityViewModel: IntroEligibilityViewModel
     @EnvironmentObject
     private var purchaseHandler: PurchaseHandler
+    @Environment(\.isEnabled)
+    private var isEnabled
 
     init(
         packages: TemplateViewConfiguration.PackageConfiguration,
@@ -75,12 +77,21 @@ struct PurchaseButton: View {
                 PurchaseButtonLabel(
                     package: package,
                     colors: self.colors,
-                    introEligibility: self.introEligibilityViewModel.allEligibility[package.content],
-                    mode: self.mode
+                    introEligibility: self.introEligibilityViewModel.allEligibility[package.content]
                 )
             }
+            .frame(maxWidth: .infinity)
+            .padding()
+            .hidden(if: !self.isEnabled)
+            .overlay {
+                if !self.isEnabled {
+                    ProgressView()
+                        .progressViewStyle(.circular)
+                        .tint(self.colors.callToActionForegroundColor)
+                }
+            }
         }
-        .font(self.fonts.font(for: self.mode.buttonFont).weight(.semibold))
+        .font(self.fonts.font(for: .title3).weight(.semibold))
         .background(self.backgroundView)
         .tint(.clear)
         .frame(maxWidth: .infinity)
@@ -143,10 +154,6 @@ private struct PurchaseButtonLabel: View {
     let package: TemplateViewConfiguration.Package
     let colors: PaywallData.Configuration.Colors
     let introEligibility: IntroEligibilityStatus?
-    let mode: PaywallViewMode
-
-    @Environment(\.isEnabled)
-    private var isEnabled
 
     var body: some View {
         IntroEligibilityStateView(
@@ -155,37 +162,6 @@ private struct PurchaseButtonLabel: View {
             introEligibility: self.introEligibility,
             foregroundColor: self.colors.callToActionForegroundColor
         )
-            .frame(
-                maxWidth: self.mode.fullWidthButton
-                   ? .infinity
-                    : nil
-            )
-            .padding()
-            .hidden(if: !self.isEnabled)
-            .overlay {
-                if !self.isEnabled {
-                    ProgressView()
-                        .progressViewStyle(.circular)
-                        .tint(self.colors.callToActionForegroundColor)
-                }
-            }
-    }
-
-}
-
-@available(iOS 15.0, macOS 12.0, tvOS 15.0, *)
-private extension PaywallViewMode {
-
-    var buttonFont: Font.TextStyle {
-        switch self {
-        case .fullScreen, .footer, .condensedFooter: return .title3
-        }
-    }
-
-    var fullWidthButton: Bool {
-        switch self {
-        case .fullScreen, .footer, .condensedFooter: return true
-        }
     }
 
 }