Paywalls: Add PaywallFooter composable to present a minified paywall UI that allows for custom paywalls #1314

tonidero · 2023-10-05T14:06:13Z

Description

This provides a new PaywallFooter composable in the API that allows to display a minified paywall UI overlaying the user's custom paywall.

…lows for custom paywalls

tonidero · 2023-10-05T14:07:53Z

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

-                PaywallTemplate.TEMPLATE_3 -> Template3(state = state, viewModel = viewModel)
-                PaywallTemplate.TEMPLATE_4 -> Text(text = "Error: Template 4 not supported")
-                PaywallTemplate.TEMPLATE_5 -> Text(text = "Error: Template 5 not supported")
+            val backgroundColor = state.templateConfiguration.getCurrentColors().background


This wasn't currently used so I added it here to be able to test the footer better. Note that I'm applying to the view wrapping the templates, so it applies to all templates. We might want to move it inside the templates, depending on its usage.

No this is great! iOS does this too for all templates: https://github.com/RevenueCat/purchases-ios/blob/main/RevenueCatUI/Templates/TemplateViewType.swift#L179

tonidero · 2023-10-05T14:09:57Z

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

-    offering: Offering? = null,
-    listener: PaywallViewListener? = null,
-    viewModel: PaywallViewModel = getPaywallViewModel(offering = offering, listener = listener, mode = mode),
+    options: PaywallViewOptions,


Note how I've changed from passing each of these separately to passing them all as part of the PaywallViewOptions. Since we need most of these from the view model anyway, I think this is cleaner.

Nice good refactor.

tonidero · 2023-10-05T14:10:52Z

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

+@Composable
+fun PaywallFooter(
+    paywallViewOptions: PaywallViewOptions = PaywallViewOptions.Builder().build(),
+    condensed: Boolean = false,


This condensed parameter right now doesn't affect the UI. That will happen in future PRs

tonidero · 2023-10-05T14:32:06Z

...ui/src/main/kotlin/com/revenuecat/purchases/ui/revenuecatui/composables/PaywallBackground.kt

    templateConfiguration.images.backgroundUri?.let {
        RemoteImage(
            urlString = it.toString(),
            modifier = Modifier
-                .fillMaxSize()
+                .matchParentSize()


I was running into a few issues with the fillMaxSize in the footer, since that's not actually what we want. This works within a BoxScope so I just added that since we will probably always be using the PaywallBackground from within a Box

Makes sense 👍🏻

codecov · 2023-10-05T14:50:04Z

Codecov Report

All modified lines are covered by tests ✅

Comparison is base (946bb9e) 85.06% compared to head (a1bb3e5) 85.06%.
Report is 1 commits behind head on paywalls.

❗ Current head a1bb3e5 differs from pull request most recent head 67e7910. Consider uploading reports for the commit 67e7910 to get more accurate results

Additional details and impacted files

@@            Coverage Diff            @@
##           paywalls    #1314   +/-   ##
=========================================
  Coverage     85.06%   85.06%           
=========================================
  Files           193      193           
  Lines          6475     6475           
  Branches        942      942           
=========================================
  Hits           5508     5508           
  Misses          600      600           
  Partials        367      367

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

NachoSoto

Love it

NachoSoto · 2023-10-05T16:12:31Z

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

@@ -7,6 +7,7 @@ class PaywallViewOptions(builder: Builder) {
    val offering: Offering?
    val shouldDisplayDismissButton: Boolean
    val listener: PaywallViewListener?
+    internal var mode: PaywallViewMode = PaywallViewMode.default


NachoSoto · 2023-10-05T16:19:26Z

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

-    offering: Offering? = null,
-    listener: PaywallViewListener? = null,
-    viewModel: PaywallViewModel = getPaywallViewModel(offering = offering, listener = listener, mode = mode),
+    options: PaywallViewOptions,


Nice good refactor.

NachoSoto · 2023-10-05T16:20:35Z

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

-                PaywallTemplate.TEMPLATE_3 -> Template3(state = state, viewModel = viewModel)
-                PaywallTemplate.TEMPLATE_4 -> Text(text = "Error: Template 4 not supported")
-                PaywallTemplate.TEMPLATE_5 -> Text(text = "Error: Template 5 not supported")
+            val backgroundColor = state.templateConfiguration.getCurrentColors().background


No this is great! iOS does this too for all templates: https://github.com/RevenueCat/purchases-ios/blob/main/RevenueCatUI/Templates/TemplateViewType.swift#L179

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

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

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

NachoSoto · 2023-10-05T16:24:13Z

...ui/src/main/kotlin/com/revenuecat/purchases/ui/revenuecatui/composables/PaywallBackground.kt

    templateConfiguration.images.backgroundUri?.let {
        RemoteImage(
            urlString = it.toString(),
            modifier = Modifier
-                .fillMaxSize()
+                .matchParentSize()


Makes sense 👍🏻

NachoSoto · 2023-10-05T16:25:08Z

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

-            color = colors.text1,
-            modifier = childModifier,
-        )
+        if (state.isInFullScreenMode) {


…1315) ### Description Followup to #1314 in order to be able to use the new `PaywallFooter` in the paywalls tester app

…UI that allows for custom paywalls (#1314) ### Description This provides a new `PaywallFooter` composable in the API that allows to display a minified paywall UI overlaying the user's custom paywall. ![image](https://github.com/RevenueCat/purchases-android/assets/808417/254dd230-080a-4352-96f5-3f3e3680c72f)

…1315) ### Description Followup to #1314 in order to be able to use the new `PaywallFooter` in the paywalls tester app

@tonidero

### New Features #### ✨📱 Introducing Android Paywalls 🐾🧱 RevenueCat's Paywalls allow you to remotely configure your entire paywall view without any code changes or app updates. Our paywall templates use native code to deliver smooth, intuitive experiences to your customers when you’re ready to deliver them an Offering; and you can use our Dashboard to pick the right template and configuration to meet your needs. To use RevenueCat Paywalls on Android, simply: 1. Create a Paywall on the Dashboard for the `Offering` you intend to serve to your customers 2. Add the `RevenueCatUI` dependency to your project: ```groovy build.gradle implementation 'com.revenuecat.purchases:purchases:7.1.0' implementation 'com.revenuecat.purchases:purchases-ui:7.1.0' ``` 3. Display a paywall: ```kotlin @OptIn(ExperimentalPreviewRevenueCatUIPurchasesAPI::class) @composable private fun LockedScreen() { YourContent() PaywallDialog( PaywallDialogOptions.Builder() .setRequiredEntitlementIdentifier(Constants.ENTITLEMENT_ID) .build() ) } ``` > **Note** > Android paywalls is currently behind an experimental flag: `ExperimentalPreviewRevenueCatUIPurchasesAPI`. > It is safe to release app updates with it. We guarantee that paywalls will continue to work and any changes will always be backwards compatible. > They are stable, but migration steps may be required in the future. We'll do our best to minimize any changes you have to make. You can find more information in [our documentation](https://rev.cat/paywalls). <details> <summary>List of changes</summary> * `Paywalls`: Improve PaywallDialog look on tablets (#1419) via Toni Rico (@tonidero) * `Paywalls`: disallow Markdown links in PurchaseButton (#1421) via NachoSoto (@NachoSoto) * `Paywalls`: implemented template 5 (#1412) via NachoSoto (@NachoSoto) * `Paywalls`: Fix wrong view model data after configuration changes (#1417) via Toni Rico (@tonidero) * `Paywalls`: update template 4 colors (#1410) via NachoSoto (@NachoSoto) * `Paywalls`: Add bundled font to paywall tester (#1415) via Toni Rico (@tonidero) * `Paywalls`: Fix purchase button text flashing when changing selected package (#1416) via Toni Rico (@tonidero) * `Paywalls`: support text3 and accent3 colors (#1409) via NachoSoto (@NachoSoto) * `Paywalls`: PaywallData errors shouldn't make Offerings fail to decode (#1402) via NachoSoto (@NachoSoto) * `Paywalls`: convert empty strings to null via NachoSoto (@NachoSoto) * `Paywalls`: footer view should not render background image via NachoSoto (@NachoSoto) * `Paywalls`: improve template 4 A11y support via NachoSoto (@NachoSoto) * `Paywalls`: Add close button option (#1390) via Toni Rico (@tonidero) * `Paywalls`: fix MarkdownText stealing touches from package buttons (#1411) via NachoSoto (@NachoSoto) * Fix onDismiss getting called twice in PaywallDialogs (#1408) via Cesar de la Vega (@vegaro) * `Paywalls`: ignore URL deserialization errors (#1399) via NachoSoto (@NachoSoto) * Animate transition between loading and loaded paywall (#1404) via Cesar de la Vega (@vegaro) * Fix button padding in Loading paywall (#1405) via Cesar de la Vega (@vegaro) * Add test for `packageInfo.localizedDiscount` (#1407) via Cesar de la Vega (@vegaro) * `Paywalls`: RemoteImage always renders a placeholder on previews via NachoSoto (@NachoSoto) * `Paywalls`: decode empty images as null via NachoSoto (@NachoSoto) * `Paywalls`: Allow trigger manual paywall tester release (#1406) via Toni Rico (@tonidero) * Fix navigation after closing paywall in Paywalls screen (#1403) via Cesar de la Vega (@vegaro) * `Paywalls`: Add experimental annotation to all public APIs in RevenueCat UI (#1400) via Toni Rico (@tonidero) * `Paywalls`: improve template 2 layout (#1396) via NachoSoto (@NachoSoto) * `Paywalls`: template 4 (#1349) via NachoSoto (@NachoSoto) * `Paywalls`: fix template 3 offer details color (#1394) via NachoSoto (@NachoSoto) * `Paywalls`: PaywallDialogOptions no longer requires dismissRequest (#1386) via NachoSoto (@NachoSoto) * `Paywalls`: fixed accessibility across templates (#1392) via NachoSoto (@NachoSoto) * `Paywalls`: increase PaywallBackground blur radius to match iOS via NachoSoto (@NachoSoto) * `Paywalls`: use LocalUriHandler for opening links (#1388) via NachoSoto (@NachoSoto) * `Paywalls`: support for Markdown links (#1387) via NachoSoto (@NachoSoto) * `Paywalls`: display purchase/restore errors (#1384) via NachoSoto (@NachoSoto) * `Paywalls`: improve error handling (#1383) via NachoSoto (@NachoSoto) * `Paywalls`: fixed incorrect background on footer (#1382) via NachoSoto (@NachoSoto) * `Paywalls`: fix backwards-compatible blurring of default paywall background (#1380) via NachoSoto (@NachoSoto) * `Paywalls`: polish template 2 spacing (#1381) via NachoSoto (@NachoSoto) * `Paywalls`: optimize backwards compatible blurring (#1379) via NachoSoto (@NachoSoto) * `Paywalls`: Predownload offering images if paywalls sdk exists (#1372) via Toni Rico (@tonidero) * `Paywalls`: PurchaseButton supports gradients (#1378) via NachoSoto (@NachoSoto) * `Paywalls`: optimize AdaptiveComposable (#1377) via NachoSoto (@NachoSoto) * `Paywalls`: improve FooterDialog corner radius (#1374) via NachoSoto (@NachoSoto) * `Paywalls`: optimize PurchaseButton (#1376) via NachoSoto (@NachoSoto) * `Paywalls`: Enable footer modes in paywall tester paywalls tab (#1368) via Toni Rico (@tonidero) * `Paywalls`: Support footer in template 3 (#1367) via Toni Rico (@tonidero) * `Paywalls`: calculate discountRelativeToMostExpensivePerMonth (#1370) via NachoSoto (@NachoSoto) * `Paywalls`: Add offer details in template 2 when in condensed form (#1371) via Toni Rico (@tonidero) * `Paywalls`: improve handling of lifetime/custom packages (#1363) via NachoSoto (@NachoSoto) * `Paywalls`: Support footer in template 1 (#1366) via Toni Rico (@tonidero) * Add `StoreProduct.pricePerMonth` (#1369) via NachoSoto (@NachoSoto) * `Paywalls`: Support condensed footer presentation in template 2 (#1365) via Toni Rico (@tonidero) * `Paywalls`: finished localization support (#1362) via NachoSoto (@NachoSoto) * `Paywalls`: backwards compatible blurring (#1327) via Andy Boedo (@AndyBoedo) * `Paywalls`: PaywallViewModel tests (#1357) via NachoSoto (@NachoSoto) * `Paywalls`: improve LoadingPaywall (#1364) via NachoSoto (@NachoSoto) * `Paywalls`: Fix paywall compose previews (#1360) via Toni Rico (@tonidero) * `Paywalls`: Fix proguard rules kotlinx serialization (#1356) via Toni Rico (@tonidero) * `Paywalls`: Add custom font example to paywalls screen (#1358) via Toni Rico (@tonidero) * `Paywalls`: Support Google fonts and font families with multiple fonts (#1338) via Toni Rico (@tonidero) * `Paywalls`: Support custom fonts through FontProvider (#1328) via Toni Rico (@tonidero) * `Paywalls`: fixed Footer padding (#1354) via NachoSoto (@NachoSoto) * `Paywalls`: Rename PaywallView to Paywall (#1351) via Toni Rico (@tonidero) * `Paywalls`: disable PurchaseButton during purchases (#1352) via NachoSoto (@NachoSoto) * `Paywalls`: enable library publishing (#1353) via NachoSoto (@NachoSoto) * `Paywalls`: handle "action in progress" state (#1346) via NachoSoto (@NachoSoto) * `Paywalls`: support {{ sub_duration_in_months }} (#1348) via NachoSoto (@NachoSoto) * `Paywalls`: disallow purchasing currently subscribed products (#1334) via NachoSoto (@NachoSoto) * `Paywalls`: new PaywallActivityLauncher.launchIfNeeded methods (#1335) via NachoSoto (@NachoSoto) * `Paywalls`: PaywallColor supports RGBA (#1332) via NachoSoto (@NachoSoto) * `Paywalls`: Make DialogScaffold private (#1329) via Toni Rico (@tonidero) * Add `revenuecatui` `gradle.properties` to specify name of dependency (#1324) via Toni Rico (@tonidero) * `Paywalls`: log error when failing to load images (#1321) via NachoSoto (@NachoSoto) * Log errors when displaying default paywall (#1318) via Cesar de la Vega (@vegaro) * Rename packages to packageIds in `PaywallData` (#1309) via Cesar de la Vega (@vegaro) * Add support for multiple intro offers in `IntroEligibilityStateView` (#1319) via Cesar de la Vega (@vegaro) * Fix material theme references to use Material3 versions (#1326) via Toni Rico (@tonidero) * `Paywalls`: Add support to launch paywall as activity (#1317) via Toni Rico (@tonidero) * Parse `{{ sub_offer_price_2 }}` and `{{ sub_offer_duration_2 }}` variables (#1313) via Cesar de la Vega (@vegaro) * `Paywalls`: changed PaywallsTester app icon (#1323) via NachoSoto (@NachoSoto) * `Paywalls`: fixed PaywallDialog.setRequiredEntitlementIdentifier (#1322) via NachoSoto (@NachoSoto) * `Paywalls`: Markdown support (#1312) via NachoSoto (@NachoSoto) * `PaywallsTester`: added template name to offerings list (#1316) via NachoSoto (@NachoSoto) * `Paywalls`: Update paywall tester to be able to display paywall footer (#1315) via Toni Rico (@tonidero) * `Paywalls`: Add PaywallFooter composable to present a minified paywall UI that allows for custom paywalls (#1314) via Toni Rico (@tonidero) * `Paywalls`: use IntroEligibilityStateView (#1311) via NachoSoto (@NachoSoto) * `PaywallData` validation tests (#1310) via Cesar de la Vega (@vegaro) * `Paywalls`: implemented LoadingPaywallView with placeholder (#1284) via NachoSoto (@NachoSoto) * `Paywalls`: created LoadingPaywallView (#1282) via NachoSoto (@NachoSoto) * Fix template test data (#1308) via Cesar de la Vega (@vegaro) </details> ### Other Changes Add `purchases.setOnesignalUserID` (#1304) via Raquel Diez (@Raquel10-RevenueCat) --------- Co-authored-by: revenuecat-ops <ops@revenuecat.com> Co-authored-by: NachoSoto <ignaciosoto90@gmail.com>

Add PaywallFooter composable to present a minified paywall UI that al…

c34ca05

…lows for custom paywalls

tonidero added pr:feat A new feature pr:RevenueCatUI labels Oct 5, 2023

tonidero added 3 commits October 5, 2023 16:13

Add docstring explaining how to use new composable

6240530

Some cleanup to avoid issues later when copying the paywallViewOptions

b2168f1

remove unused property

a1bb3e5

tonidero commented Oct 5, 2023

View reviewed changes

tonidero marked this pull request as ready for review October 5, 2023 14:37

tonidero requested a review from a team October 5, 2023 14:37

tonidero mentioned this pull request Oct 5, 2023

Paywalls: Update paywall tester to be able to display paywall footer #1315

Merged

tonidero requested a review from a team October 5, 2023 14:41

NachoSoto approved these changes Oct 5, 2023

View reviewed changes

Changes from review

67e7910

tonidero enabled auto-merge (squash) October 6, 2023 07:13

tonidero merged commit 4b105c8 into paywalls Oct 6, 2023

tonidero deleted the toniricodiez/pwl-161-sdk-support-normal-ui branch October 6, 2023 07:28

tonidero added a commit that referenced this pull request Oct 6, 2023

Paywalls: Update paywall tester to be able to display paywall footer (#…

58c3502

…1315) ### Description Followup to #1314 in order to be able to use the new `PaywallFooter` in the paywalls tester app

This was referenced Oct 16, 2023

[DO NOT MERGE] Release/7.1.0-beta.1 #1355

Closed

[DO NOT MERGE] Release/7.1.0-beta.2 #1373

Closed

tonidero added a commit that referenced this pull request Oct 31, 2023

Paywalls: Update paywall tester to be able to display paywall footer (#…

fe36fa7

…1315) ### Description Followup to #1314 in order to be able to use the new `PaywallFooter` in the paywalls tester app

NachoSoto mentioned this pull request Oct 31, 2023

[AUTOMATIC] Release/7.1.0 #1423

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Paywalls: Add PaywallFooter composable to present a minified paywall UI that allows for custom paywalls #1314

Paywalls: Add PaywallFooter composable to present a minified paywall UI that allows for custom paywalls #1314

tonidero commented Oct 5, 2023 •

edited

Loading

tonidero Oct 5, 2023

NachoSoto Oct 5, 2023

tonidero Oct 5, 2023

NachoSoto Oct 5, 2023

tonidero Oct 5, 2023

tonidero Oct 5, 2023

NachoSoto Oct 5, 2023

codecov bot commented Oct 5, 2023 •

edited

Loading

NachoSoto left a comment

NachoSoto Oct 5, 2023

NachoSoto Oct 5, 2023

NachoSoto Oct 5, 2023

NachoSoto Oct 5, 2023

NachoSoto Oct 5, 2023

Paywalls: Add PaywallFooter composable to present a minified paywall UI that allows for custom paywalls #1314

Paywalls: Add PaywallFooter composable to present a minified paywall UI that allows for custom paywalls #1314

Conversation

tonidero commented Oct 5, 2023 • edited Loading

Description

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

codecov bot commented Oct 5, 2023 • edited Loading

Codecov Report

NachoSoto left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

tonidero commented Oct 5, 2023 •

edited

Loading

codecov bot commented Oct 5, 2023 •

edited

Loading