Skip to content

Android paywall custom package tag #1875

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

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Android paywall custom package tag #1875

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6da5888
Adds ability to provide a custom `SubscriptionOption` to purchases UI
simonmitchell Sep 27, 2024
fe104c5
Fixes compiling
simonmitchell Sep 27, 2024
1ceff9e
Merge main into android-paywall-custom-package-tag
simonmitchell Oct 9, 2024
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
7 changes: 7 additions & 0 deletions ui/revenuecatui/src/main/kotlin/com/revenuecat/purchases/ui/revenuecatui/PaywallOptions.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ data class PaywallOptions internal constructor(
val fontProvider: FontProvider?,
val listener: PaywallListener?,
val purchaseLogic: PurchaseLogic?,
val subscriptionOptionProvider: SubscriptionOptionProvider?,
internal val mode: PaywallMode,
val dismissRequest: () -> Unit,
) {
Expand All @@ -42,6 +43,7 @@ data class PaywallOptions internal constructor(
fontProvider = builder.fontProvider,
listener = builder.listener,
purchaseLogic = builder.purchaseLogic,
subscriptionOptionProvider = builder.subscriptionOptionProvider,
mode = builder.mode,
dismissRequest = builder.dismissRequest,
)
Expand All @@ -64,6 +66,7 @@ data class PaywallOptions internal constructor(
internal var fontProvider: FontProvider? = null
internal var listener: PaywallListener? = null
internal var purchaseLogic: PurchaseLogic? = null
internal var subscriptionOptionProvider: SubscriptionOptionProvider? = null
internal var mode: PaywallMode = PaywallMode.default

fun setOffering(offering: Offering?) = apply {
Expand Down Expand Up @@ -92,6 +95,10 @@ data class PaywallOptions internal constructor(
this.listener = listener
}

fun setSubscriptionOptionProvider(provider: SubscriptionOptionProvider?) = apply {
this.subscriptionOptionProvider = provider
}

fun setPurchaseLogic(purchaseLogic: PurchaseLogic?) = apply {
this.purchaseLogic = purchaseLogic
}
Expand Down
13 changes: 13 additions & 0 deletions ...ui/src/main/kotlin/com/revenuecat/purchases/ui/revenuecatui/SubscriptionOptionProvider.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
package com.revenuecat.purchases.ui.revenuecatui

import com.revenuecat.purchases.Package
import com.revenuecat.purchases.models.SubscriptionOption

/**
* Interface for providing custom subscription options when purchasing a Package within a RevenueCat paywall
*
* This is useful when for example using `SubscriptionOptions` tags to provide discounts using promo codes
*/
interface SubscriptionOptionProvider {
fun subscriptionOption(rcPackage: Package): SubscriptionOption?
}
18 changes: 15 additions & 3 deletions ...uecatui/src/main/kotlin/com/revenuecat/purchases/ui/revenuecatui/data/PaywallViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import com.revenuecat.purchases.ui.revenuecatui.PaywallMode
import com.revenuecat.purchases.ui.revenuecatui.PaywallOptions
import com.revenuecat.purchases.ui.revenuecatui.PurchaseLogic
import com.revenuecat.purchases.ui.revenuecatui.PurchaseLogicResult
import com.revenuecat.purchases.ui.revenuecatui.SubscriptionOptionProvider
import com.revenuecat.purchases.ui.revenuecatui.data.processed.TemplateConfiguration
import com.revenuecat.purchases.ui.revenuecatui.data.processed.VariableDataProvider
import com.revenuecat.purchases.ui.revenuecatui.helpers.Logger
Expand Down Expand Up @@ -97,6 +98,9 @@ internal class PaywallViewModelImpl(
private val purchaseLogic: PurchaseLogic?
get() = options.purchaseLogic

private val subscriptionOptionProvider: SubscriptionOptionProvider?
get() = options.subscriptionOptionProvider

private var paywallPresentationData: PaywallEvent.Data? = null

init {
Expand Down Expand Up @@ -296,9 +300,17 @@ internal class PaywallViewModelImpl(
"myAppPurchaseLogic.performPurchase will not be executed.",
)
}
val purchaseResult = purchases.awaitPurchase(
PurchaseParams.Builder(activity, packageToPurchase),
)
val subscriptionOption = subscriptionOptionProvider?.subscriptionOption(packageToPurchase)
val purchaseResult = if (subscriptionOption != null) {
purchases.awaitPurchase(
PurchaseParams.Builder(activity, subscriptionOption)
)
} else {
purchases.awaitPurchase(
PurchaseParams.Builder(activity, packageToPurchase),
)
}

listener?.onPurchaseCompleted(purchaseResult.customerInfo, purchaseResult.storeTransaction)
Logger.d("Dismissing paywall after purchase")
options.dismissRequest()
Expand Down