TextComponentView processes variables with VariableProcessorV2.

ui/revenuecatui/src/main/kotlin/com/revenuecat/purchases/ui/revenuecatui/components/style/StyleFactory.kt

@@ -17,6 +17,7 @@ import com.revenuecat.purchases.paywalls.components.TextComponent
 import com.revenuecat.purchases.paywalls.components.TimelineComponent
 import com.revenuecat.purchases.paywalls.components.common.LocaleId
 import com.revenuecat.purchases.paywalls.components.common.LocalizationKey
+import com.revenuecat.purchases.paywalls.components.common.VariableLocalizationKey
 import com.revenuecat.purchases.paywalls.components.properties.Shape
 import com.revenuecat.purchases.paywalls.components.properties.ThemeImageUrls
 import com.revenuecat.purchases.ui.revenuecatui.components.LocalizedTextPartial
@@ -59,6 +60,7 @@ internal class StyleFactory(
     private val localizations: NonEmptyMap<LocaleId, LocalizationDictionary>,
     private val uiConfig: UiConfig,
     private val fontAliases: Map<FontAlias, FontSpec>,
+    private val variableLocalizations: NonEmptyMap<LocaleId, NonEmptyMap<VariableLocalizationKey, String>>,
     private val offering: Offering,
 ) {
 
@@ -256,6 +258,7 @@ internal class StyleFactory(
             padding = component.padding.toPaddingValues(),
             margin = component.margin.toPaddingValues(),
             rcPackage = rcPackage,
+            variableLocalizations = variableLocalizations,
             overrides = presentedOverrides,
         )
     }

ui/revenuecatui/src/main/kotlin/com/revenuecat/purchases/ui/revenuecatui/components/style/TextComponentStyle.kt

@@ -7,6 +7,7 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextAlign
 import com.revenuecat.purchases.Package
 import com.revenuecat.purchases.paywalls.components.common.LocaleId
+import com.revenuecat.purchases.paywalls.components.common.VariableLocalizationKey
 import com.revenuecat.purchases.paywalls.components.properties.Size
 import com.revenuecat.purchases.ui.revenuecatui.components.LocalizedTextPartial
 import com.revenuecat.purchases.ui.revenuecatui.components.PresentedOverrides
@@ -47,5 +48,7 @@ internal class TextComponentStyle(
     @get:JvmSynthetic
     val rcPackage: Package?,
     @get:JvmSynthetic
+    val variableLocalizations: NonEmptyMap<LocaleId, NonEmptyMap<VariableLocalizationKey, String>>,
+    @get:JvmSynthetic
     val overrides: PresentedOverrides<LocalizedTextPartial>?,
 ) : ComponentStyle

ui/revenuecatui/src/main/kotlin/com/revenuecat/purchases/ui/revenuecatui/components/text/TextComponentState.kt

@@ -75,6 +75,7 @@ internal class TextComponentState(
     private val selected by derivedStateOf {
         if (style.rcPackage != null) style.rcPackage.identifier == selectedPackageProvider()?.identifier else false
     }
+    private val localeId by derivedStateOf { localeProvider().toLocaleId() }
 
     /**
      * The package to take variable values from and to consider for intro offer eligibility.
@@ -96,12 +97,15 @@ internal class TextComponentState(
 
     @get:JvmSynthetic
     val text by derivedStateOf {
-        val localeId = localeProvider().toLocaleId()
-
         presentedPartial?.texts?.run { getOrDefault(localeId, entry.value) }
             ?: style.texts.run { getOrDefault(localeId, entry.value) }
     }
 
+    @get:JvmSynthetic
+    val localizedVariableKeys by derivedStateOf {
+        style.variableLocalizations.run { getOrDefault(localeId, entry.value) }
+    }
+
     @get:JvmSynthetic
     val color by derivedStateOf { presentedPartial?.color ?: style.color }
 

ui/revenuecatui/src/main/kotlin/com/revenuecat/purchases/ui/revenuecatui/components/text/TextComponentView.kt

@@ -26,6 +26,7 @@ import com.revenuecat.purchases.paywalls.components.properties.Padding
 import com.revenuecat.purchases.paywalls.components.properties.Size
 import com.revenuecat.purchases.paywalls.components.properties.SizeConstraint
 import com.revenuecat.purchases.paywalls.components.properties.SizeConstraint.Fit
+import com.revenuecat.purchases.ui.revenuecatui.components.ktx.toJavaLocale
 import com.revenuecat.purchases.ui.revenuecatui.components.modifier.background
 import com.revenuecat.purchases.ui.revenuecatui.components.modifier.size
 import com.revenuecat.purchases.ui.revenuecatui.components.previewEmptyState
@@ -41,9 +42,11 @@ import com.revenuecat.purchases.ui.revenuecatui.composables.Markdown
 import com.revenuecat.purchases.ui.revenuecatui.data.PaywallState
 import com.revenuecat.purchases.ui.revenuecatui.data.processed.VariableDataProvider
 import com.revenuecat.purchases.ui.revenuecatui.data.processed.VariableProcessor
+import com.revenuecat.purchases.ui.revenuecatui.data.processed.VariableProcessorV2
 import com.revenuecat.purchases.ui.revenuecatui.extensions.applyIfNotNull
 import com.revenuecat.purchases.ui.revenuecatui.extensions.introEligibility
 import com.revenuecat.purchases.ui.revenuecatui.helpers.toResourceProvider
+import java.util.Date
 
 @Composable
 internal fun TextComponentView(
@@ -117,6 +120,7 @@ private fun rememberProcessedText(
     val processedText by remember(state, textState) {
         derivedStateOf {
             textState.applicablePackage?.let { packageToUse ->
+                val locale = state.locale.toJavaLocale()
 
                 val introEligibility = packageToUse.introEligibility
 
@@ -134,12 +138,26 @@ private fun rememberProcessedText(
                     discountRelativeToMostExpensivePerMonth = discount,
                     showZeroDecimalPlacePrices = !state.showPricesWithDecimals,
                 )
+
+                val processedWithV2 = VariableProcessorV2.processVariables(
+                    template = textState.text,
+                    localizedVariableKeys = textState.localizedVariableKeys,
+                    variableConfig = state.variableConfig,
+                    variableDataProvider = variables,
+                    packageContext = variableContext,
+                    rcPackage = packageToUse,
+                    locale = locale,
+                    date = Date(),
+                )
+
+                // Note: we temporarily process with both V2 and V1 until no more paywalls have V1 variables.
+                // V2 paywalls only had V1 variables during closed beta.
                 VariableProcessor.processVariables(
                     variableDataProvider = variables,
                     context = variableContext,
-                    originalString = textState.text,
+                    originalString = processedWithV2,
                     rcPackage = packageToUse,
-                    locale = java.util.Locale.forLanguageTag(state.locale.toLanguageTag()),
+                    locale = locale,
                 )
             } ?: textState.text
         }

ui/revenuecatui/src/main/kotlin/com/revenuecat/purchases/ui/revenuecatui/data/PaywallState.kt

@@ -11,6 +11,7 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.text.intl.LocaleList
 import com.revenuecat.purchases.Offering
 import com.revenuecat.purchases.Package
+import com.revenuecat.purchases.UiConfig.VariableConfig
 import com.revenuecat.purchases.paywalls.components.common.LocaleId
 import com.revenuecat.purchases.ui.revenuecatui.components.ktx.toComposeLocale
 import com.revenuecat.purchases.ui.revenuecatui.components.ktx.toLocaleId
@@ -72,6 +73,7 @@ internal sealed interface PaywallState {
              * for that.
              */
             val showPricesWithDecimals: Boolean,
+            val variableConfig: VariableConfig,
             override val offering: Offering,
             /**
              * All locales that this paywall supports, with `locales.head` being the default one.

ui/revenuecatui/src/main/kotlin/com/revenuecat/purchases/ui/revenuecatui/helpers/OfferingToStateMapper.kt

@@ -9,6 +9,7 @@ import com.revenuecat.purchases.paywalls.PaywallData
 import com.revenuecat.purchases.paywalls.components.common.LocalizationData
 import com.revenuecat.purchases.paywalls.components.common.LocalizationKey
 import com.revenuecat.purchases.paywalls.components.common.PaywallComponentsData
+import com.revenuecat.purchases.paywalls.components.common.VariableLocalizationKey
 import com.revenuecat.purchases.ui.revenuecatui.PaywallMode
 import com.revenuecat.purchases.ui.revenuecatui.components.properties.FontSpec
 import com.revenuecat.purchases.ui.revenuecatui.components.properties.determineFontSpecs
@@ -114,6 +115,27 @@ internal fun Offering.validatePaywallComponentsDataOrNull(
     }.mapValuesOrAccumulate { it }
         .getOrElse { error -> return RcResult.Error(error) }
 
+    // Check that the default variable localization is present in the localizations map.
+    val defaultVariableLocalization = paywallComponents.defaultVariableLocalization
+        .errorIfNull(
+            PaywallValidationError.AllVariableLocalizationsMissing(paywallComponents.data.defaultLocaleIdentifier),
+        )
+        .mapError { nonEmptyListOf(it) }
+        .getOrElse { error -> return RcResult.Error(error) }
+
+    // Build a NonEmptyMap of variable localizations, ensuring that we always have the default localization as fallback.
+    val variableLocalizations = nonEmptyMapOf(
+        paywallComponents.data.defaultLocaleIdentifier to defaultVariableLocalization,
+        paywallComponents.uiConfig.localizations,
+    ).mapValues { (locale, map) ->
+        // We need to turn our NonEmptyMap<LocaleId, Map> into NonEmptyMap<LocaleId, NonEmptyMap>. If a certain locale
+        // has an empty Map, we add an AllLocalizationsMissing error for that locale to our list of errors.
+        map.toNonEmptyMapOrNull()
+            .errorIfNull(PaywallValidationError.AllLocalizationsMissing(locale))
+            .mapError { nonEmptyListOf(it) }
+    }.mapValuesOrAccumulate { it }
+        .getOrElse { error -> return RcResult.Error(error) }
+
     // Build a map of FontAliases to FontSpecs.
     val fontAliases: Map<FontAlias, FontSpec> =
         paywallComponents.uiConfig.app.fonts.determineFontSpecs(resourceProvider)
@@ -123,6 +145,7 @@ internal fun Offering.validatePaywallComponentsDataOrNull(
         localizations = localizations,
         uiConfig = paywallComponents.uiConfig,
         fontAliases = fontAliases,
+        variableLocalizations = variableLocalizations,
         offering = this,
     )
     val config = paywallComponents.data.componentsConfig.base
@@ -139,6 +162,7 @@ internal fun Offering.validatePaywallComponentsDataOrNull(
             background = background,
             locales = localizations.keys,
             zeroDecimalPlaceCountries = paywallComponents.data.zeroDecimalPlaceCountries.toSet(),
+            variableConfig = paywallComponents.uiConfig.variableConfig,
         )
     }
 }
@@ -269,6 +293,7 @@ internal fun Offering.toComponentsPaywallState(
         stickyFooter = validationResult.stickyFooter,
         background = validationResult.background,
         showPricesWithDecimals = showPricesWithDecimals,
+        variableConfig = validationResult.variableConfig,
         offering = this,
         locales = validationResult.locales,
         activelySubscribedProductIds = activelySubscribedProductIds,
@@ -333,3 +358,6 @@ private fun PaywallData.validateTemplate(): PaywallTemplate? {
 
 private val PaywallComponentsData.defaultLocalization: Map<LocalizationKey, LocalizationData>?
     get() = componentsLocalizations[defaultLocaleIdentifier]
+
+private val Offering.PaywallComponents.defaultVariableLocalization: Map<VariableLocalizationKey, String>?
+    get() = uiConfig.localizations[data.defaultLocaleIdentifier]

ui/revenuecatui/src/main/kotlin/com/revenuecat/purchases/ui/revenuecatui/helpers/PaywallValidationResult.kt

@@ -1,5 +1,6 @@
 package com.revenuecat.purchases.ui.revenuecatui.helpers
 
+import com.revenuecat.purchases.UiConfig
 import com.revenuecat.purchases.paywalls.PaywallData
 import com.revenuecat.purchases.paywalls.components.common.LocaleId
 import com.revenuecat.purchases.ui.revenuecatui.components.properties.BackgroundStyles
@@ -38,6 +39,7 @@ internal sealed interface PaywallValidationResult {
          * Any countries whose currencies should not show any decimals when displaying prices.
          */
         val zeroDecimalPlaceCountries: Set<String>,
+        val variableConfig: UiConfig.VariableConfig,
     ) : PaywallValidationResult {
         // If a Components Paywall has an error, it will be reflected as a Legacy type so we can use the Legacy
         // fallback.

ui/revenuecatui/src/test/kotlin/com/revenuecat/purchases/ui/revenuecatui/components/style/StyleFactoryTests.kt

@@ -6,7 +6,6 @@ import androidx.compose.ui.unit.dp
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.revenuecat.purchases.FontAlias
 import com.revenuecat.purchases.Offering
-import com.revenuecat.purchases.UiConfig
 import com.revenuecat.purchases.paywalls.components.ButtonComponent
 import com.revenuecat.purchases.paywalls.components.ImageComponent
 import com.revenuecat.purchases.paywalls.components.PartialImageComponent
@@ -27,11 +26,13 @@ import com.revenuecat.purchases.ui.revenuecatui.components.properties.ColorStyle
 import com.revenuecat.purchases.ui.revenuecatui.components.properties.FontSpec
 import com.revenuecat.purchases.ui.revenuecatui.errors.PaywallValidationError
 import com.revenuecat.purchases.ui.revenuecatui.helpers.Result
+import com.revenuecat.purchases.ui.revenuecatui.helpers.UiConfig
 import com.revenuecat.purchases.ui.revenuecatui.helpers.errorOrNull
 import com.revenuecat.purchases.ui.revenuecatui.helpers.getOrThrow
 import com.revenuecat.purchases.ui.revenuecatui.helpers.isError
 import com.revenuecat.purchases.ui.revenuecatui.helpers.isSuccess
 import com.revenuecat.purchases.ui.revenuecatui.helpers.nonEmptyMapOf
+import com.revenuecat.purchases.ui.revenuecatui.helpers.variableLocalizationKeysForEnUs
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.Before
 import org.junit.Test
@@ -57,6 +58,7 @@ class StyleFactoryTests {
     )
     private val uiConfig = UiConfig()
     private val fontAliases = emptyMap<FontAlias, FontSpec>()
+    private val variableLocalizations = nonEmptyMapOf(localeId to variableLocalizationKeysForEnUs())
     private val offering = Offering(
         identifier = "identifier",
         serverDescription = "description",
@@ -66,7 +68,13 @@ class StyleFactoryTests {
 
     @Before
     fun setup() {
-        styleFactory = StyleFactory(localizations, uiConfig, fontAliases, offering)
+        styleFactory = StyleFactory(
+            localizations = localizations,
+            uiConfig = uiConfig,
+            fontAliases = fontAliases,
+            variableLocalizations = variableLocalizations,
+            offering = offering
+        )
     }
 
     @Test
@@ -147,6 +155,7 @@ class StyleFactoryTests {
             ),
             uiConfig = uiConfig,
             fontAliases = fontAliases,
+            variableLocalizations = variableLocalizations,
             offering = offering,
         )
 
@@ -188,6 +197,7 @@ class StyleFactoryTests {
             ),
             uiConfig = uiConfig,
             fontAliases = fontAliases,
+            variableLocalizations = variableLocalizations,
             offering = offering,
         )
 
@@ -223,6 +233,7 @@ class StyleFactoryTests {
                 fontAliasBase to FontSpec.Generic.Serif,
                 fontAliasOverride to FontSpec.Generic.Monospace,
             ),
+            variableLocalizations = variableLocalizations,
             offering = offering,
         )
 
@@ -253,6 +264,7 @@ class StyleFactoryTests {
             uiConfig = uiConfig,
             // Empty on purpose
             fontAliases = emptyMap(),
+            variableLocalizations = variableLocalizations,
             offering = offering,
         )
 
@@ -281,6 +293,7 @@ class StyleFactoryTests {
             uiConfig = uiConfig,
             // Empty on purpose
             fontAliases = emptyMap(),
+            variableLocalizations = variableLocalizations,
             offering = offering,
         )
 
@@ -324,6 +337,7 @@ class StyleFactoryTests {
             ),
             uiConfig = uiConfig,
             fontAliases = fontAliases,
+            variableLocalizations = variableLocalizations,
             offering = offering,
         )
 
@@ -381,6 +395,7 @@ class StyleFactoryTests {
             ),
             uiConfig = uiConfig,
             fontAliases = fontAliases,
+            variableLocalizations = variableLocalizations,
             offering = offering,
         )