`Paywalls`: override locale with paywall localization #1418

NachoSoto · 2023-10-30T20:52:56Z

This avoids a potential issue where the developer hasn't provided a particular localization, but the SDK could localize parts of the paywall:

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

NachoSoto · 2023-10-31T01:59:36Z

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

@@ -234,7 +234,7 @@ private fun SelectPackageButton(

    var columnModifier = modifier.clip(RoundedCornerShape(UIConstant.defaultCornerRadius))

-    val applicationContext = LocalContext.current.applicationContext.toAndroidContext()
+    val applicationContext = LocalContext.current.toAndroidContext()


Any reason why we were using Context.applicationContext in several places?

Yeah... With this change, we will be holding a reference to the current activity context instead of the application context, which may be leaked. Since the view model holds a reference to this context, if there is a configuration change, the VM will keep a reference to the old activity, causing a leak.

Thanks for explaining that! I refactored the implementation to remove the reference to Context. Would this approach work?

NachoSoto · 2023-10-31T02:00:54Z

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

@@ -111,7 +116,11 @@ private fun LoadedPaywall(state: PaywallState.Loaded, viewModel: PaywallViewMode
                    .background(backgroundColor)
            },
    ) {
-        TemplatePaywall(state = state, viewModel = viewModel)
+        CompositionLocalProvider(
+            LocalContext provides state.contextWithOverriddenLocale(),


This is the key line.

codecov · 2023-10-31T22:12:42Z

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (16e69d3) 83.95% compared to head (a7e0085) 84.27%.
Report is 1 commits behind head on main.

❗ Current head a7e0085 differs from pull request most recent head 9b384b8. Consider uploading reports for the commit 9b384b8 to get more accurate results

Additional details and impacted files

@@            Coverage Diff             @@
##             main    #1418      +/-   ##
==========================================
+ Coverage   83.95%   84.27%   +0.31%     
==========================================
  Files         203      197       -6     
  Lines        6712     6626      -86     
  Branches      974      960      -14     
==========================================
- Hits         5635     5584      -51     
+ Misses        697      674      -23     
+ Partials      380      368      -12

see 18 files with indirect coverage changes

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

NachoSoto · 2023-11-08T19:26:18Z

TODO: test if changing locale while paywall is displayed updates it.

NachoSoto · 2023-11-08T23:12:41Z

@tonidero I just tested this:

Open paywall in English
Change language in Settings
Re-open the app

For some reason when I open it again the paywall is gone and I see the main screen of paywalls tester. When I open the paywall again, it's in Spanish as expected.

What do you think?

tonidero · 2023-11-09T10:14:56Z

Yeah, seems like the dialog is not surviving configuration changes for some reason.. That doesn't happen when navigating to the paywall using navigation component.

In any case, I tested it with that, and the locale changes appropriately, so I think this should be good for now!

tonidero

Just some rename suggestions, but seems to work fine! 👍

tonidero · 2023-11-09T10:17:44Z

...rc/main/kotlin/com/revenuecat/purchases/ui/revenuecatui/helpers/AndroidApplicationContext.kt

@@ -13,20 +14,31 @@ internal interface ApplicationContext {
    fun getLocale(): Locale
 }

-internal class AndroidApplicationContext(private val applicationContext: Context) : ApplicationContext {
+internal class AndroidApplicationContext(


This is not an application context anymore... How about renaming to ResourceProvider or something like that? We do have the application name as well, but I think that's ok.

tonidero · 2023-11-09T10:19:40Z

...rc/main/kotlin/com/revenuecat/purchases/ui/revenuecatui/helpers/AndroidApplicationContext.kt

    }

    override fun getLocale(): Locale {
-        return applicationContext.resources.configuration.locales.get(0)
+        return resources.configuration.locales.get(0)
    }
 }

 internal fun Context.toAndroidContext(): ApplicationContext {


If we rename the above, we will also need to rename a few things like this extension function.

NachoSoto · 2023-11-09T17:40:35Z

@tonidero renamed it to ResourceProvider and PaywallResourceProvider.

tonidero

Looks like we need to update the screenshots? Other than that, looks good!

NachoSoto · 2023-11-09T20:57:37Z

@tonidero thanks! I think they failed to generate, I believe this should fix it: #1455

NachoSoto · 2023-11-09T21:50:49Z

@tonidero no idea why it still didn't work :/ https://app.circleci.com/pipelines/github/RevenueCat/purchases-android/8733/workflows/98ffd3bc-7365-4364-b64a-ebfe948f330f/jobs/31537

NachoSoto · 2023-11-09T21:58:53Z

Generated it manually: RevenueCat/purchases-android-snapshots#5

tonidero · 2023-11-10T08:44:00Z

We're setting the git credentials in the purchases-android repo but not on the purchases-android-snapshots repo. Will try to fix that today.

tonidero · 2023-11-10T08:50:07Z

I believe it should be fixed with: #1456

### Description With #1418, we are overriding the context in order to provide our own locale to make sure the screen has the same locale in the whole screen. However, with the current implementation, the context becomes a `ContextImpl` which can't be converted to the original activity. This was causing a crash when starting the purchase process This PR fixes the issue by providing a new `LocalActivity` local composition that is performed before the overriden context takes place so we can access the activity in our composable tree.

@NachoSoto

**This is an automatic release.** ### RevenueCatUI * Paywalls: fix template 5 header aspect ratio (#1465) via NachoSoto (@NachoSoto) * Paywalls: Fix template 1 header aspect ratio (#1466) via Toni Rico (@tonidero) * Paywalls: Support condensed footer in template 4 (#1469) via Toni Rico (@tonidero) * `Paywalls`: improve image loading (#1464) via NachoSoto (@NachoSoto) * `Paywalls`: override locale with paywall localization (#1418) via NachoSoto (@NachoSoto) ### Other Changes * Paywalls: Fix purchasing regression by providing real activity (#1467) via Toni Rico (@tonidero) * Bump compile/target version to 34 (#1462) via Toni Rico (@tonidero) * Update circleci orb to latest version (#1456) via Toni Rico (@tonidero) * `Snapshots`: fix Fastlane job (#1461) via NachoSoto (@NachoSoto) * Update gradle plugin to version 8.1.1 (#1458) via Toni Rico (@tonidero) Co-authored-by: revenuecat-ops <ops@revenuecat.com>

NachoSoto added the pr:RevenueCatUI label Oct 30, 2023

NachoSoto requested a review from a team October 30, 2023 20:52

NachoSoto force-pushed the nacho/pwl-336-prevent-automatically-translating-strings-if-paywall-isnt branch from d4184b6 to d833f0f Compare October 31, 2023 01:27

NachoSoto commented Oct 31, 2023

View reviewed changes

ui/revenuecatui/src/main/kotlin/com/revenuecat/purchases/ui/revenuecatui/InternalPaywall.kt Outdated Show resolved Hide resolved

NachoSoto force-pushed the nacho/pwl-336-prevent-automatically-translating-strings-if-paywall-isnt branch 2 times, most recently from 31529cf to 20a5d55 Compare October 31, 2023 01:45

NachoSoto changed the title ~~[WIP] Paywalls: override locale~~ Paywalls: override locale Oct 31, 2023

NachoSoto changed the title ~~Paywalls: override locale~~ Paywalls: override locale with paywall localization Oct 31, 2023

NachoSoto marked this pull request as ready for review October 31, 2023 01:48

NachoSoto commented Oct 31, 2023

View reviewed changes

Base automatically changed from paywalls to main October 31, 2023 17:37

NachoSoto force-pushed the nacho/pwl-336-prevent-automatically-translating-strings-if-paywall-isnt branch from 7742836 to 132e7a8 Compare October 31, 2023 17:41

NachoSoto requested a review from tonidero October 31, 2023 21:49

NachoSoto added the WIP label Nov 3, 2023

NachoSoto force-pushed the nacho/pwl-336-prevent-automatically-translating-strings-if-paywall-isnt branch from a7e0085 to e4751b9 Compare November 8, 2023 23:12

tonidero approved these changes Nov 9, 2023

View reviewed changes

NachoSoto removed the WIP label Nov 9, 2023

NachoSoto enabled auto-merge (squash) November 9, 2023 17:53

tonidero approved these changes Nov 9, 2023

View reviewed changes

NachoSoto force-pushed the nacho/pwl-336-prevent-automatically-translating-strings-if-paywall-isnt branch from 9b384b8 to 8d99e37 Compare November 9, 2023 21:34

NachoSoto force-pushed the nacho/pwl-336-prevent-automatically-translating-strings-if-paywall-isnt branch 2 times, most recently from 77fcab9 to da34036 Compare November 10, 2023 17:48

Paywalls: override locale

69b06ba

NachoSoto force-pushed the nacho/pwl-336-prevent-automatically-translating-strings-if-paywall-isnt branch from da34036 to 9bd03d2 Compare November 10, 2023 18:08

Update snapshots

a959c01

NachoSoto force-pushed the nacho/pwl-336-prevent-automatically-translating-strings-if-paywall-isnt branch from 9bd03d2 to a959c01 Compare November 10, 2023 18:16

NachoSoto merged commit 7c04213 into main Nov 10, 2023

NachoSoto deleted the nacho/pwl-336-prevent-automatically-translating-strings-if-paywall-isnt branch November 10, 2023 18:41

tonidero mentioned this pull request Nov 14, 2023

Paywalls: Fix purchasing regression by providing real activity #1467

Merged

RCGitBot mentioned this pull request Nov 14, 2023

[AUTOMATIC] Release/7.2.3 #1471

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

`Paywalls`: override locale with paywall localization #1418

`Paywalls`: override locale with paywall localization #1418

NachoSoto commented Oct 30, 2023 •

edited

Loading

NachoSoto Oct 31, 2023

tonidero Oct 31, 2023

NachoSoto Oct 31, 2023

NachoSoto Oct 31, 2023

codecov bot commented Oct 31, 2023 •

edited

Loading

NachoSoto commented Nov 8, 2023

NachoSoto commented Nov 8, 2023

tonidero commented Nov 9, 2023

tonidero left a comment

tonidero Nov 9, 2023

tonidero Nov 9, 2023

NachoSoto commented Nov 9, 2023

tonidero left a comment

NachoSoto commented Nov 9, 2023

NachoSoto commented Nov 9, 2023

NachoSoto commented Nov 9, 2023

tonidero commented Nov 10, 2023

tonidero commented Nov 10, 2023

Paywalls: override locale with paywall localization #1418

Paywalls: override locale with paywall localization #1418

Conversation

NachoSoto commented Oct 30, 2023 • edited Loading

NachoSoto Oct 31, 2023

Choose a reason for hiding this comment

tonidero Oct 31, 2023

Choose a reason for hiding this comment

NachoSoto Oct 31, 2023

Choose a reason for hiding this comment

NachoSoto Oct 31, 2023

Choose a reason for hiding this comment

codecov bot commented Oct 31, 2023 • edited Loading

Codecov Report

NachoSoto commented Nov 8, 2023

NachoSoto commented Nov 8, 2023

tonidero commented Nov 9, 2023

tonidero left a comment

Choose a reason for hiding this comment

tonidero Nov 9, 2023

Choose a reason for hiding this comment

tonidero Nov 9, 2023

Choose a reason for hiding this comment

NachoSoto commented Nov 9, 2023

tonidero left a comment

Choose a reason for hiding this comment

NachoSoto commented Nov 9, 2023

NachoSoto commented Nov 9, 2023

NachoSoto commented Nov 9, 2023

tonidero commented Nov 10, 2023

tonidero commented Nov 10, 2023

`Paywalls`: override locale with paywall localization #1418

`Paywalls`: override locale with paywall localization #1418

NachoSoto commented Oct 30, 2023 •

edited

Loading

codecov bot commented Oct 31, 2023 •

edited

Loading