Paywalls: Support Google fonts and font families with multiple fonts #1338

tonidero · 2023-10-11T11:07:19Z

Description

Followup to #1328

This PR adds support for Google fonts when launching the paywall as an activity and modifies the API to better support both these and bundled fonts and font families with multiple fonts.

tonidero · 2023-10-11T11:49:25Z

...nuecatui/src/main/kotlin/com/revenuecat/purchases/ui/revenuecatui/fonts/PaywallFontFamily.kt

+ * Represents a font family. You can add one ore more [PaywallFont] with different weights and font styles.
+ */
+@Parcelize
+data class PaywallFontFamily(val fonts: List<PaywallFont>) : Parcelable


We could probably not have this and just have a list of fonts... But seemed like a better idea to have a wrapper to mimick what it looks like for Google.

tonidero · 2023-10-11T11:50:45Z

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

-                entry.value?.let { fontRes ->
-                    ResourcesCompat.getFont(this, fontRes)?.let { FontFamily(it) }
+        return getArgs()?.fonts?.let { fontFamilyMap ->
+            val googleFontProviders = mutableMapOf<GoogleFontProvider, GoogleFont.Provider>()


This is a small optimization... Honestly, it's probably not needed, but didn't want to create the provider multiple times.

tonidero · 2023-10-11T11:52:07Z

ui/revenuecatui/src/main/kotlin/com/revenuecat/purchases/ui/revenuecatui/fonts/PaywallFont.kt

+     * Represents a downloadable Google Font.
+     */
+    @Parcelize
+    data class GoogleFont(


I actually wondered whether we wanted to offer a similar API for compose... But I think it's ok to leave the responsibility of building the FontFamily (from any source) to the developer

What would that look like?

Basically it would be to allow using a ParcelableFontProvider in PaywallViewOptions, so both using a GoogleFont or a ResourceFont are allowed... This would complicate the API though. And again, I think if they are using a custom font from those places, it's easier for them to just pass us the FontFamily directly in compose world, where there is no need for this data to be parcelable.

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

vegaro · 2023-10-11T12:59:04Z

...uecatui/src/main/kotlin/com/revenuecat/purchases/ui/revenuecatui/fonts/GoogleFontProvider.kt

+ * Represents a Google font provider.
+ */
+@Parcelize
+data class GoogleFontProvider(


Why do we need this data class? Can we use GoogleFont.Provider directly? It's pretty much the same but with defaults right?

Oh and it's parcelable, is that the reason?

Yeah, GoogleFont.Provider is not parcelable... I thought about writing a custom parceler, but we don't have access to the underlying data.

codecov · 2023-10-11T13:59:18Z

Codecov Report

All modified lines are covered by tests ✅

❗ No coverage uploaded for pull request base (paywalls@39ab56c). Click here to learn what that means.

❗ Current head 2900104 differs from pull request most recent head 3a1f158. Consider uploading reports for the commit 3a1f158 to get more accurate results

Additional details and impacted files

@@             Coverage Diff             @@
##             paywalls    #1338   +/-   ##
===========================================
  Coverage            ?   84.54%           
===========================================
  Files               ?      194           
  Lines               ?     6535           
  Branches            ?      950           
===========================================
  Hits                ?     5525           
  Misses              ?      643           
  Partials            ?      367

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

NachoSoto · 2023-10-16T16:28:12Z

ui/revenuecatui/src/main/kotlin/com/revenuecat/purchases/ui/revenuecatui/fonts/FontProvider.kt

@@ -6,6 +6,7 @@ import com.revenuecat.purchases.ui.revenuecatui.PaywallView
 /**
 * Implement this interface to provide custom fonts to the [PaywallView]. If you don't, the current material3 theme
 * typography will be used.
+ * If you only want to use a single FontFamily for all text styles use [CustomFontProvider].


NachoSoto · 2023-10-16T16:28:38Z

ui/revenuecatui/src/main/kotlin/com/revenuecat/purchases/ui/revenuecatui/fonts/PaywallFont.kt

+     * Represents a downloadable Google Font.
+     */
+    @Parcelize
+    data class GoogleFont(


What would that look like?

…e used by all text styles

…1338) ### Description Followup to #1328 This PR adds support for Google fonts when launching the paywall as an activity and modifies the API to better support both these and bundled fonts and font families with multiple fonts.

@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 <[email protected]> Co-authored-by: NachoSoto <[email protected]>

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

tonidero marked this pull request as ready for review October 11, 2023 11:47

tonidero requested a review from a team October 11, 2023 11:47

tonidero commented Oct 11, 2023

View reviewed changes

vegaro reviewed Oct 11, 2023

View reviewed changes

tonidero force-pushed the toniricodiez/pwl-206-support-custom-fonts-through-a-fontprovider branch from 22992ca to d1d3842 Compare October 16, 2023 11:40

tonidero force-pushed the toniricodiez/pwl-206-support-custom-fonts-through-a-fontprovider-2 branch from 4976515 to 2900104 Compare October 16, 2023 11:53

tonidero requested review from vegaro and a team October 16, 2023 11:54

NachoSoto approved these changes Oct 16, 2023

View reviewed changes

tonidero force-pushed the toniricodiez/pwl-206-support-custom-fonts-through-a-fontprovider branch from d1d3842 to d83c25b Compare October 17, 2023 07:52

Base automatically changed from toniricodiez/pwl-206-support-custom-fonts-through-a-fontprovider to paywalls October 17, 2023 08:08

tonidero added 4 commits October 17, 2023 10:12

Support Google fonts and font families with multiple fonts

a5cb592

Some cleanup and docs

736d219

Use destructured entry

7cab8fb

Add CustomFontProvider implementations that accept a single font to b…

fa8be70

…e used by all text styles

tonidero force-pushed the toniricodiez/pwl-206-support-custom-fonts-through-a-fontprovider-2 branch from 2900104 to fa8be70 Compare October 17, 2023 08:14

Add font provider parameter for new launch activity methods

3a1f158

tonidero enabled auto-merge (squash) October 17, 2023 08:21

tonidero merged commit b521669 into paywalls Oct 17, 2023
5 checks passed

tonidero deleted the toniricodiez/pwl-206-support-custom-fonts-through-a-fontprovider-2 branch October 17, 2023 08:36

NachoSoto mentioned this pull request Oct 19, 2023

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

Closed

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: Support Google fonts and font families with multiple fonts #1338

Paywalls: Support Google fonts and font families with multiple fonts #1338

tonidero commented Oct 11, 2023 •

edited

Loading

tonidero Oct 11, 2023

tonidero Oct 11, 2023

tonidero Oct 11, 2023

NachoSoto Oct 16, 2023

tonidero Oct 16, 2023 •

edited

Loading

vegaro Oct 11, 2023

vegaro Oct 11, 2023

tonidero Oct 11, 2023

codecov bot commented Oct 11, 2023 •

edited

Loading

NachoSoto Oct 16, 2023

NachoSoto Oct 16, 2023

Paywalls: Support Google fonts and font families with multiple fonts #1338

Paywalls: Support Google fonts and font families with multiple fonts #1338

Conversation

tonidero commented Oct 11, 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

tonidero Oct 16, 2023 • edited Loading

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 11, 2023 • edited Loading

Codecov Report

Choose a reason for hiding this comment

Choose a reason for hiding this comment

tonidero commented Oct 11, 2023 •

edited

Loading

tonidero Oct 16, 2023 •

edited

Loading

codecov bot commented Oct 11, 2023 •

edited

Loading