Paywalls: improve error handling

examples/paywall-tester/src/main/java/com/revenuecat/paywallstester/PaywallTesterApp.kt

@@ -52,7 +52,7 @@ private fun AppNavHost(
             route = AppScreen.Paywall.route.plus("/{${PaywallScreenViewModel.OFFERING_ID_KEY}}"),
             arguments = listOf(navArgument(PaywallScreenViewModel.OFFERING_ID_KEY) { type = NavType.StringType }),
         ) {
-            PaywallScreen()
+            PaywallScreen(dismissRequest = navController::popBackStack)
         }
         composable(
             route = AppScreen.PaywallFooter.route
@@ -68,7 +68,9 @@ private fun AppNavHost(
                 },
             ),
         ) {
-            PaywallFooterScreen()
+            PaywallFooterScreen(
+                dismissRequest = navController::popBackStack,
+            )
         }
     }
 }

examples/paywall-tester/src/main/java/com/revenuecat/paywallstester/ui/screens/main/paywalls/PaywallsScreen.kt

@@ -117,7 +117,7 @@ private fun FooterDialog(currentState: DisplayPaywallState.Footer, onDismiss: ()
         Scaffold { scaffoldPadding ->
             Box(modifier = Modifier.padding(scaffoldPadding)) {
                 PaywallFooter(
-                    options = PaywallOptions.Builder()
+                    options = PaywallOptions.Builder(dismissRequest = onDismiss)
                         .setOffering(currentState.offering)
                         .setListener(PaywallListenerImpl(onDismiss))
                         .build(),

examples/paywall-tester/src/main/java/com/revenuecat/paywallstester/ui/screens/paywall/PaywallScreen.kt

@@ -17,6 +17,7 @@ import com.revenuecat.purchases.ui.revenuecatui.PaywallOptions
 @Composable
 fun PaywallScreen(
     viewModel: PaywallScreenViewModel = viewModel<PaywallScreenViewModelImpl>(),
+    dismissRequest: () -> Unit,
 ) {
     Column(
         modifier = Modifier.fillMaxSize(),
@@ -32,7 +33,7 @@ fun PaywallScreen(
             }
             is PaywallScreenState.Loaded -> {
                 Paywall(
-                    PaywallOptions.Builder()
+                    PaywallOptions.Builder(dismissRequest)
                         .setOffering(state.offering)
                         .setListener(viewModel)
                         .build(),

examples/paywall-tester/src/main/java/com/revenuecat/paywallstester/ui/screens/paywallfooter/PaywallFooterScreen.kt

@@ -25,6 +25,7 @@ import com.revenuecat.purchases.ui.revenuecatui.PaywallOptions
 @Composable
 fun PaywallFooterScreen(
     viewModel: PaywallScreenViewModel = viewModel<PaywallScreenViewModelImpl>(),
+    dismissRequest: () -> Unit,
 ) {
     Column(
         modifier = Modifier.fillMaxSize(),
@@ -40,7 +41,7 @@ fun PaywallFooterScreen(
             }
             is PaywallScreenState.Loaded -> {
                 PaywallFooter(
-                    options = PaywallOptions.Builder()
+                    options = PaywallOptions.Builder(dismissRequest)
                         .setOffering(state.offering)
                         .setListener(viewModel)
                         .build(),

ui/revenuecatui/src/main/kotlin/com/revenuecat/purchases/ui/revenuecatui/InternalPaywall.kt

@@ -4,13 +4,19 @@ import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.AlertDialog
+import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.style.TextAlign
 import androidx.lifecycle.viewmodel.compose.viewModel
 import com.revenuecat.purchases.ui.revenuecatui.data.PaywallState
 import com.revenuecat.purchases.ui.revenuecatui.data.PaywallViewModel
@@ -33,16 +39,20 @@ internal fun InternalPaywall(
 ) {
     PaywallTheme(fontProvider = options.fontProvider) {
         viewModel.refreshStateIfLocaleChanged()
-        val colors = MaterialTheme.colorScheme
-        viewModel.refreshStateIfColorsChanged(colors)
+        viewModel.refreshStateIfColorsChanged(MaterialTheme.colorScheme)
 
         when (val state = viewModel.state.collectAsState().value) {
             is PaywallState.Loading -> {
                 LoadingPaywall(mode = options.mode)
             }
 
             is PaywallState.Error -> {
-                Text(text = "Error: ${state.errorMessage}")
+                LoadingPaywall(mode = options.mode)
+
+                ErrorDialog(
+                    dismissRequest = options.dismissRequest,
+                    error = state.errorMessage,
+                )
             }
 
             is PaywallState.Loaded -> {
@@ -104,3 +114,27 @@ private fun getPaywallViewModel(
         ),
     )
 }
+
+@Composable
+private fun ErrorDialog(
+    dismissRequest: () -> Unit,
+    error: String,
+) {
+    AlertDialog(
+        onDismissRequest = dismissRequest,
+        confirmButton = {
+            TextButton(
+                onClick = dismissRequest,
+            ) {
+                Text(
+                    text = stringResource(id = R.string.OK),
+                    textAlign = TextAlign.Center
+                )
+            }
+        },
+        icon = { Icon(painter = painterResource(id = R.drawable.error), contentDescription = null) },
+        text = {
+            Text(text = error)
+        },
+    )
+}

ui/revenuecatui/src/main/kotlin/com/revenuecat/purchases/ui/revenuecatui/Paywall.kt

@@ -6,10 +6,7 @@ import androidx.compose.runtime.Composable
  * Composable offering a full screen Paywall UI configured from the RevenueCat dashboard.
  * @param options The options to configure the [Paywall] if needed.
  */
-@Suppress("unused")
 @Composable
-fun Paywall(
-    options: PaywallOptions = PaywallOptions.Builder().build(),
-) {
+fun Paywall(options: PaywallOptions) {
     InternalPaywall(options)
 }

ui/revenuecatui/src/main/kotlin/com/revenuecat/purchases/ui/revenuecatui/PaywallDialogOptions.kt

@@ -24,7 +24,7 @@ class PaywallDialogOptions(builder: Builder) {
     }
 
     internal fun toPaywallOptions(): PaywallOptions {
-        return PaywallOptions.Builder()
+        return PaywallOptions.Builder(dismissRequest)
             .setOffering(offering)
             .setShouldDisplayDismissButton(shouldDisplayDismissButton)
             .setFontProvider(fontProvider)

ui/revenuecatui/src/main/kotlin/com/revenuecat/purchases/ui/revenuecatui/PaywallFooter.kt

@@ -26,7 +26,7 @@ import androidx.compose.ui.tooling.preview.Preview
  */
 @Composable
 fun PaywallFooter(
-    options: PaywallOptions = PaywallOptions.Builder().build(),
+    options: PaywallOptions,
     condensed: Boolean = false,
     mainContent: @Composable (PaddingValues) -> Unit,
 ) {
@@ -52,7 +52,9 @@ fun PaywallFooter(
 @Preview(showBackground = true)
 @Composable
 private fun PaywallFooterPreview() {
-    PaywallFooter {
+    PaywallFooter(
+        options = PaywallOptions.Builder(dismissRequest = {}).build(),
+    ) {
         Column(
             modifier = Modifier
                 .fillMaxWidth()

ui/revenuecatui/src/main/kotlin/com/revenuecat/purchases/ui/revenuecatui/PaywallOptions.kt

@@ -26,19 +26,23 @@ internal sealed class OfferingSelection {
 class PaywallOptions(builder: Builder) {
 
     internal val offeringSelection: OfferingSelection
-    val shouldDisplayDismissButton: Boolean
+    private val shouldDisplayDismissButton: Boolean
     val fontProvider: FontProvider?
     val listener: PaywallListener?
     internal var mode: PaywallMode = PaywallMode.default
+    val dismissRequest: () -> Unit
 
     init {
         this.offeringSelection = builder.offeringSelection
         this.shouldDisplayDismissButton = builder.shouldDisplayDismissButton
         this.fontProvider = builder.fontProvider
         this.listener = builder.listener
+        this.dismissRequest = builder.dismissRequest
     }
 
-    class Builder {
+    class Builder(
+        internal val dismissRequest: () -> Unit,
+    ) {
         internal var offeringSelection: OfferingSelection = OfferingSelection.None
         internal var shouldDisplayDismissButton: Boolean = false
         internal var fontProvider: FontProvider? = null

ui/revenuecatui/src/main/kotlin/com/revenuecat/purchases/ui/revenuecatui/activity/PaywallActivity.kt

@@ -74,7 +74,7 @@ internal class PaywallActivity : ComponentActivity(), PaywallListener {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        val paywallOptions = PaywallOptions.Builder()
+        val paywallOptions = PaywallOptions.Builder(dismissRequest = ::finish)
             .setOfferingId(getArgs()?.offeringId)
             .setFontProvider(getFontProvider())
             .setListener(this)

ui/revenuecatui/src/main/kotlin/com/revenuecat/purchases/ui/revenuecatui/extensions/PaywallDataExtensions.kt

@@ -141,7 +141,7 @@ internal fun DefaultPaywallPreview() {
         serverDescription = "",
     )
     InternalPaywall(
-        options = PaywallOptions.Builder().build(),
+        options = PaywallOptions.Builder(dismissRequest = {}).build(),
         viewModel = MockViewModel(offering = template2Offering),
     )
 }

ui/revenuecatui/src/main/kotlin/com/revenuecat/purchases/ui/revenuecatui/templates/Template1.kt

@@ -174,34 +174,34 @@ private object Template1UIConstants {
 
 @Preview(showBackground = true)
 @Composable
-internal fun Template1PaywallPreview() {
+private fun Template1PaywallPreview() {
     InternalPaywall(
-        options = PaywallOptions.Builder().build(),
+        options = PaywallOptions.Builder(dismissRequest = {}).build(),
         viewModel = MockViewModel(offering = TestData.template1Offering),
     )
 }
 
 @Preview(showBackground = true)
 @Composable
-internal fun Template1FooterPaywallPreview() {
+private fun Template1FooterPaywallPreview() {
     InternalPaywall(
-        options = PaywallOptions.Builder().build(),
+        options = PaywallOptions.Builder(dismissRequest = {}).build(),
         viewModel = MockViewModel(mode = PaywallMode.FOOTER, offering = TestData.template1Offering),
     )
 }
 
 @Preview(showBackground = true)
 @Composable
-internal fun Template1CondensedFooterPaywallPreview() {
+private fun Template1CondensedFooterPaywallPreview() {
     InternalPaywall(
-        options = PaywallOptions.Builder().build(),
+        options = PaywallOptions.Builder(dismissRequest = {}).build(),
         viewModel = MockViewModel(mode = PaywallMode.FOOTER_CONDENSED, offering = TestData.template1Offering),
     )
 }
 
 @Preview(heightDp = 700, widthDp = 400)
 @Composable
-internal fun CircleMaskPreview() {
+private fun CircleMaskPreview() {
     Box {
         Box(
             modifier = Modifier

ui/revenuecatui/src/main/kotlin/com/revenuecat/purchases/ui/revenuecatui/templates/Template2.kt

@@ -290,7 +290,7 @@ private fun CheckmarkBox(isSelected: Boolean, colors: TemplateConfiguration.Colo
 @Composable
 private fun Template2PaywallPreview() {
     InternalPaywall(
-        options = PaywallOptions.Builder().build(),
+        options = PaywallOptions.Builder(dismissRequest = {}).build(),
         viewModel = MockViewModel(offering = TestData.template2Offering),
     )
 }
@@ -300,7 +300,7 @@ private fun Template2PaywallPreview() {
 @Composable
 private fun Template2PaywallFooterPreview() {
     InternalPaywall(
-        options = PaywallOptions.Builder().build(),
+        options = PaywallOptions.Builder(dismissRequest = {}).build(),
         viewModel = MockViewModel(mode = PaywallMode.FOOTER, offering = TestData.template2Offering),
     )
 }
@@ -310,7 +310,7 @@ private fun Template2PaywallFooterPreview() {
 @Composable
 private fun Template2PaywallFooterCondensedPreview() {
     InternalPaywall(
-        options = PaywallOptions.Builder().build(),
+        options = PaywallOptions.Builder(dismissRequest = {}).build(),
         viewModel = MockViewModel(mode = PaywallMode.FOOTER_CONDENSED, offering = TestData.template2Offering),
     )
 }

ui/revenuecatui/src/main/kotlin/com/revenuecat/purchases/ui/revenuecatui/templates/Template3.kt

@@ -182,7 +182,7 @@ private fun Feature(
 @Composable
 private fun Template3Preview() {
     InternalPaywall(
-        options = PaywallOptions.Builder().build(),
+        options = PaywallOptions.Builder(dismissRequest = {}).build(),
         viewModel = MockViewModel(offering = TestData.template3Offering),
     )
 }
@@ -191,7 +191,7 @@ private fun Template3Preview() {
 @Composable
 private fun Template3FooterPreview() {
     InternalPaywall(
-        options = PaywallOptions.Builder().build(),
+        options = PaywallOptions.Builder(dismissRequest = {}).build(),
         viewModel = MockViewModel(mode = PaywallMode.FOOTER, offering = TestData.template3Offering),
     )
 }
@@ -200,7 +200,7 @@ private fun Template3FooterPreview() {
 @Composable
 private fun Template3CondensedFooterPreview() {
     InternalPaywall(
-        options = PaywallOptions.Builder().build(),
+        options = PaywallOptions.Builder(dismissRequest = {}).build(),
         viewModel = MockViewModel(mode = PaywallMode.FOOTER_CONDENSED, offering = TestData.template3Offering),
     )
 }

ui/revenuecatui/src/main/res/values-ar/strings.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <string name="OK">نعم</string>
     <string name="all_plans">كل الاشتراكات</string>
     <string name="privacy">خصوصية</string>
     <string name="privacy_policy">سياسة الخصوصية</string>

ui/revenuecatui/src/main/res/values-bg/strings.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <string name="OK">Добре</string>
     <string name="all_plans">Всички абонаменти</string>
     <string name="privacy">поверителност</string>
     <string name="privacy_policy">Политика за поверителност</string>

ui/revenuecatui/src/main/res/values-ca/strings.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <string name="OK">D\'acord</string>
     <string name="all_plans">Totes les subscripcions</string>
     <string name="privacy">Privadesa</string>
     <string name="privacy_policy">Política de privacitat</string>

ui/revenuecatui/src/main/res/values-cs/strings.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <string name="OK">OK</string>
     <string name="all_plans">Všechna předplatná</string>
     <string name="privacy">Soukromí</string>
     <string name="privacy_policy">Zásady ochrany osobních údajů</string>

ui/revenuecatui/src/main/res/values-da/strings.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <string name="OK">Okay</string>
     <string name="all_plans">Alle abonnementer</string>
     <string name="privacy">Privatliv</string>
     <string name="privacy_policy">Fortrolighedspolitik</string>

ui/revenuecatui/src/main/res/values-de/strings.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <string name="OK">OK</string>
     <string name="all_plans">Alle Abonnements</string>
     <string name="privacy">Privatsphäre</string>
     <string name="privacy_policy">Datenschutzrichtlinie</string>

ui/revenuecatui/src/main/res/values-el/strings.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <string name="OK">Εντάξει</string>
     <string name="all_plans">Όλες οι συνδρομές</string>
     <string name="privacy">Μυστικότητα</string>
     <string name="privacy_policy">Πολιτική απορρήτου</string>

ui/revenuecatui/src/main/res/values-es/strings.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <string name="OK">OK</string>
     <string name="restore_purchases">Restaurar las compras</string>
     <string name="restore">Restaurar</string>
     <string name="terms_and_conditions">Términos y condiciones</string>

ui/revenuecatui/src/main/res/values-fi/strings.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <string name="OK">OK</string>
     <string name="all_plans">Kaikki tilaukset</string>
     <string name="privacy">Yksityisyys</string>
     <string name="privacy_policy">Tietosuojakäytäntö</string>

ui/revenuecatui/src/main/res/values-fr/strings.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <string name="OK">D\'ACCORD</string>
     <string name="privacy">Confidentialité</string>
     <string name="privacy_policy">Politique de confidentialité</string>
     <string name="restore">Restaurer</string>

ui/revenuecatui/src/main/res/values-he/strings.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <string name="OK">בסדר</string>
     <string name="all_plans">כל המנויים</string>
     <string name="privacy">פְּרָטִיוּת</string>
     <string name="privacy_policy">מדיניות הפרטיות</string>

ui/revenuecatui/src/main/res/values-hi/strings.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <string name="OK">ठीक है</string>
     <string name="all_plans">सभी सदस्यताएँ</string>
     <string name="privacy">गोपनीयता</string>
     <string name="privacy_policy">गोपनीयता नीति</string>