Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Paywalls: presentPaywallIfNecessary -> presentPaywallIfNeeded #2953

Merged
merged 1 commit into from
Aug 2, 2023
Merged

Paywalls: presentPaywallIfNecessary -> presentPaywallIfNeeded #2953

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions RevenueCatUI/View+PresentPaywall.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,16 @@ extension View {
/// ```swift
/// var body: some View {
/// YourApp()
/// .presentPaywallIfNecessary(requiredEntitlementIdentifier: "pro")
/// .presentPaywallIfNeeded(requiredEntitlementIdentifier: "pro")
/// }
/// ```
/// - Note: If loading the `CustomerInfo` fails (for example, if Internet is offline),
/// the paywall won't be displayed.
public func presentPaywallIfNecessary(
public func presentPaywallIfNeeded(
requiredEntitlementIdentifier: String,
purchaseCompleted: PurchaseCompletedHandler? = nil
) -> some View {
return self.presentPaywallIfNecessary(
return self.presentPaywallIfNeeded(
shouldDisplay: { info in
!info.entitlements
.activeInCurrentEnvironment
Expand All @@ -44,7 +44,7 @@ extension View {
/// ```swift
/// var body: some View {
/// YourApp()
/// .presentPaywallIfNecessary {
/// .presentPaywallIfNeeded {
/// !$0.entitlements.active.keys.contains("entitlement_identifier")
/// } purchaseCompleted: { customerInfo in
/// print("Customer info unlocked entitlement: \(customerInfo.entitlements)")
Expand All @@ -53,11 +53,11 @@ extension View {
/// ```
/// - Note: If loading the `CustomerInfo` fails (for example, if Internet is offline),
/// the paywall won't be displayed.
public func presentPaywallIfNecessary(
public func presentPaywallIfNeeded(
shouldDisplay: @escaping @Sendable (CustomerInfo) -> Bool,
purchaseCompleted: PurchaseCompletedHandler? = nil
) -> some View {
return self.presentPaywallIfNecessary(
return self.presentPaywallIfNeeded(
shouldDisplay: shouldDisplay,
purchaseCompleted: purchaseCompleted,
customerInfoFetcher: {
Expand All @@ -71,7 +71,7 @@ extension View {
}

// Visible overload for tests
func presentPaywallIfNecessary(
func presentPaywallIfNeeded(
offering: Offering? = nil,
introEligibility: TrialOrIntroEligibilityChecker? = nil,
purchaseHandler: PurchaseHandler? = nil,
Expand Down
10 changes: 5 additions & 5 deletions Tests/APITesters/RevenueCatUIAPITester/SwiftAPITester/PaywallViewAPI.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,12 @@ struct App: View {
}

@ViewBuilder
var checkPresentPaywallIfNecessary: some View {
var checkPresentPaywallIfNeeded: some View {
Text("")
.presentPaywallIfNecessary(requiredEntitlementIdentifier: "")
.presentPaywallIfNecessary(requiredEntitlementIdentifier: "", purchaseCompleted: completed)
.presentPaywallIfNecessary { (_: CustomerInfo) in false }
.presentPaywallIfNecessary { (_: CustomerInfo) in false } purchaseCompleted: { completed($0) }
.presentPaywallIfNeeded(requiredEntitlementIdentifier: "")
.presentPaywallIfNeeded(requiredEntitlementIdentifier: "", purchaseCompleted: completed)
.presentPaywallIfNeeded { (_: CustomerInfo) in false }
.presentPaywallIfNeeded { (_: CustomerInfo) in false } purchaseCompleted: { completed($0) }
}

@ViewBuilder
Expand Down
10 changes: 5 additions & 5 deletions ...eCatUITests/PresentIfNecessaryTests.swift → ...enueCatUITests/PresentIfNeededTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//
// PresentIfNecessaryTests.swift
// PresentIfNeededTests.swift
//
//
// Created by Nacho Soto on 7/31/23.
Expand All @@ -15,15 +15,15 @@ import XCTest

@available(iOS 16.0, macOS 13.0, tvOS 16.0, watchOS 9.0, *)
@MainActor
class PresentIfNecessaryTests: TestCase {
class PresentIfNeededTests: TestCase {

func testPresentWithPurchaseHandler() throws {
var customerInfo: CustomerInfo?

Text("")
.presentPaywallIfNecessary(offering: Self.offering,
introEligibility: .producing(eligibility: .eligible),
purchaseHandler: Self.purchaseHandler) { _ in
.presentPaywallIfNeeded(offering: Self.offering,
introEligibility: .producing(eligibility: .eligible),
purchaseHandler: Self.purchaseHandler) { _ in
return true
} purchaseCompleted: {
customerInfo = $0
Expand Down
2 changes: 1 addition & 1 deletion Tests/TestingApps/SimpleApp/SimpleApp/Views/AppContentView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ struct AppContentView: View {
Label("All paywalls", systemImage: "network")
}
}
.presentPaywallIfNecessary {
.presentPaywallIfNeeded {
!$0.hasPro
} purchaseCompleted: { _ in
self.didPurchase = true
Expand Down