[Paywalls V2] Moves more state to PaywallState

purchases/src/main/kotlin/com/revenuecat/purchases/paywalls/components/common/Localization.kt

@@ -13,6 +13,9 @@ import kotlinx.serialization.descriptors.buildSerialDescriptor
 import kotlinx.serialization.encoding.Decoder
 import kotlinx.serialization.encoding.Encoder
 
+/**
+ * @property value The language tag of this locale, with an underscore separating the language from the region.
+ */
 @InternalRevenueCatAPI
 @Serializable
 @JvmInline

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

@@ -13,6 +13,7 @@ import com.revenuecat.purchases.ui.revenuecatui.components.style.ImageComponentS
 import com.revenuecat.purchases.ui.revenuecatui.components.style.StackComponentStyle
 import com.revenuecat.purchases.ui.revenuecatui.components.style.TextComponentStyle
 import com.revenuecat.purchases.ui.revenuecatui.components.text.TextComponentView
+import com.revenuecat.purchases.ui.revenuecatui.data.PaywallState
 
 /**
  * A Composable that can show any [ComponentStyle].
@@ -21,10 +22,11 @@ import com.revenuecat.purchases.ui.revenuecatui.components.text.TextComponentVie
 @Composable
 internal fun ComponentView(
     style: ComponentStyle,
+    state: PaywallState.Loaded.Components,
     modifier: Modifier = Modifier,
 ) = when (style) {
-    is StackComponentStyle -> StackComponentView(style = style, modifier = modifier)
-    is TextComponentStyle -> TextComponentView(style = style, modifier = modifier)
+    is StackComponentStyle -> StackComponentView(style = style, state = state, modifier = modifier)
+    is TextComponentStyle -> TextComponentView(style = style, state = state, modifier = modifier)
     is ImageComponentStyle -> ImageComponentView(style = style, modifier = modifier)
-    is ButtonComponentStyle -> ButtonComponentView(style = style, modifier = modifier)
+    is ButtonComponentStyle -> ButtonComponentView(style = style, state = state, modifier = modifier)
 }

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

@@ -3,7 +3,6 @@
 package com.revenuecat.purchases.ui.revenuecatui.components
 
 import android.content.res.Configuration
-import android.os.LocaleList
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.material3.adaptive.currentWindowAdaptiveInfo
 import androidx.compose.runtime.Composable
@@ -50,30 +49,24 @@ import com.revenuecat.purchases.ui.revenuecatui.components.style.StyleFactory
 import com.revenuecat.purchases.ui.revenuecatui.data.PaywallState
 import com.revenuecat.purchases.ui.revenuecatui.helpers.getOrThrow
 import java.net.URL
-import java.util.Locale
 
 @Composable
 internal fun LoadedPaywallComponents(
     state: PaywallState.Loaded.Components,
     modifier: Modifier = Modifier,
 ) {
     val configuration = LocalConfiguration.current
-    // Configured locales take precedence over the default one.
-    val preferredIds = configuration.locales.mapToLocaleIds() + state.data.defaultLocaleIdentifier
-    // Find the first locale we have a LocalizationDictionary for.
-    val localeId = preferredIds.first { id -> state.data.componentsLocalizations.containsKey(id) }
-    val localizationDictionary = state.data.componentsLocalizations.getValue(localeId)
-    val locale = localeId.toLocale()
+    state.update(localeList = configuration.locales)
 
     val windowSizeClass: WindowSizeClass = currentWindowAdaptiveInfo().windowSizeClass
     val windowSize = ScreenCondition.from(windowSizeClass.windowWidthSizeClass)
 
-    val styleFactory = remember(locale, windowSize) {
+    val styleFactory = remember(state.locale, windowSize) {
         StyleFactory(
             windowSize = windowSize,
             isEligibleForIntroOffer = false,
             componentState = ComponentViewState.DEFAULT,
-            localizationDictionary = localizationDictionary,
+            localizationDictionary = state.localizationDictionary,
         )
     }
 
@@ -83,27 +76,13 @@ internal fun LoadedPaywallComponents(
 
     ComponentView(
         style = style,
+        state = state,
         modifier = modifier
             .fillMaxSize()
             .background(background),
     )
 }
 
-private fun LocaleList.mapToLocaleIds(): List<LocaleId> {
-    val result = ArrayList<LocaleId>(size())
-    for (i in 0 until size()) {
-        val locale = get(i)
-        if (locale != null) result.add(locale.toLocaleId())
-    }
-    return result
-}
-
-private fun LocaleId.toLocale(): Locale =
-    Locale.forLanguageTag(value)
-
-private fun Locale.toLocaleId(): LocaleId =
-    LocaleId(toLanguageTag())
-
 @Suppress("LongMethod")
 @Preview(uiMode = Configuration.UI_MODE_NIGHT_NO or Configuration.UI_MODE_TYPE_NORMAL)
 @Preview(uiMode = Configuration.UI_MODE_NIGHT_YES or Configuration.UI_MODE_TYPE_NORMAL)
@@ -184,7 +163,7 @@ private fun LoadedPaywallComponents_Preview() {
 }
 
 @Suppress("LongMethod")
-@Preview()
+@Preview
 @Composable
 private fun LoadedPaywallComponents_Preview_Bless() {
     val textColor = ColorScheme(

ui/revenuecatui/src/main/kotlin/com/revenuecat/purchases/ui/revenuecatui/components/button/ButtonComponentView.kt

@@ -16,6 +16,13 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.toArgb
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import com.revenuecat.purchases.Offering
+import com.revenuecat.purchases.paywalls.components.StackComponent
+import com.revenuecat.purchases.paywalls.components.common.Background
+import com.revenuecat.purchases.paywalls.components.common.ComponentsConfig
+import com.revenuecat.purchases.paywalls.components.common.LocaleId
+import com.revenuecat.purchases.paywalls.components.common.PaywallComponentsConfig
+import com.revenuecat.purchases.paywalls.components.common.PaywallComponentsData
 import com.revenuecat.purchases.paywalls.components.properties.Border
 import com.revenuecat.purchases.paywalls.components.properties.ColorInfo
 import com.revenuecat.purchases.paywalls.components.properties.ColorScheme
@@ -37,17 +44,21 @@ import com.revenuecat.purchases.ui.revenuecatui.components.stack.StackComponentV
 import com.revenuecat.purchases.ui.revenuecatui.components.style.ButtonComponentStyle
 import com.revenuecat.purchases.ui.revenuecatui.components.style.StackComponentStyle
 import com.revenuecat.purchases.ui.revenuecatui.components.style.TextComponentStyle
+import com.revenuecat.purchases.ui.revenuecatui.data.PaywallState
 import kotlinx.coroutines.launch
+import java.net.URL
 
 @Composable
 internal fun ButtonComponentView(
     style: ButtonComponentStyle,
+    state: PaywallState.Loaded.Components,
     modifier: Modifier = Modifier,
 ) {
     val coroutineScope = rememberCoroutineScope()
     var isClickable by remember { mutableStateOf(true) }
     StackComponentView(
         style.stackComponentStyle,
+        state,
         modifier.clickable(enabled = isClickable) {
             isClickable = false
             coroutineScope.launch {
@@ -61,7 +72,7 @@ internal fun ButtonComponentView(
 @Preview
 @Composable
 private fun ButtonComponentView_Preview_Default() {
-    ButtonComponentView(previewButtonComponentStyle())
+    ButtonComponentView(previewButtonComponentStyle(), previewEmptyState())
 }
 
 @Composable
@@ -112,3 +123,29 @@ private fun previewButtonComponentStyle(
         actionHandler = actionHandler,
     )
 }
+
+private fun previewEmptyState(): PaywallState.Loaded.Components {
+    val data = PaywallComponentsData(
+        templateName = "template",
+        assetBaseURL = URL("https://assets.pawwalls.com"),
+        componentsConfig = ComponentsConfig(
+            base = PaywallComponentsConfig(
+                // This would normally contain at least one ButtonComponent, but that's not needed for previews.
+                stack = StackComponent(components = emptyList()),
+                background = Background.Color(ColorScheme(light = ColorInfo.Hex(Color.White.toArgb()))),
+                stickyFooter = null,
+            ),
+        ),
+        componentsLocalizations = emptyMap(),
+        defaultLocaleIdentifier = LocaleId("en_US"),
+    )
+    val offering = Offering(
+        identifier = "identifier",
+        serverDescription = "serverDescription",
+        metadata = emptyMap(),
+        availablePackages = emptyList(),
+        paywallComponents = data,
+    )
+
+    return PaywallState.Loaded.Components(offering, data)
+}

ui/revenuecatui/src/main/kotlin/com/revenuecat/purchases/ui/revenuecatui/components/stack/StackComponentView.kt

@@ -17,6 +17,13 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.toArgb
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import com.revenuecat.purchases.Offering
+import com.revenuecat.purchases.paywalls.components.StackComponent
+import com.revenuecat.purchases.paywalls.components.common.Background
+import com.revenuecat.purchases.paywalls.components.common.ComponentsConfig
+import com.revenuecat.purchases.paywalls.components.common.LocaleId
+import com.revenuecat.purchases.paywalls.components.common.PaywallComponentsConfig
+import com.revenuecat.purchases.paywalls.components.common.PaywallComponentsData
 import com.revenuecat.purchases.paywalls.components.properties.Border
 import com.revenuecat.purchases.paywalls.components.properties.ColorInfo
 import com.revenuecat.purchases.paywalls.components.properties.ColorScheme
@@ -49,12 +56,15 @@ import com.revenuecat.purchases.ui.revenuecatui.components.properties.rememberCo
 import com.revenuecat.purchases.ui.revenuecatui.components.properties.rememberShadowStyle
 import com.revenuecat.purchases.ui.revenuecatui.components.style.StackComponentStyle
 import com.revenuecat.purchases.ui.revenuecatui.components.style.TextComponentStyle
+import com.revenuecat.purchases.ui.revenuecatui.data.PaywallState
 import com.revenuecat.purchases.ui.revenuecatui.extensions.applyIfNotNull
+import java.net.URL
 
 @Suppress("LongMethod")
 @Composable
 internal fun StackComponentView(
     style: StackComponentStyle,
+    state: PaywallState.Loaded.Components,
     modifier: Modifier = Modifier,
 ) {
     if (style.visible) {
@@ -74,7 +84,7 @@ internal fun StackComponentView(
         }
 
         val content: @Composable () -> Unit = remember(style.children) {
-            @Composable { style.children.forEach { child -> ComponentView(style = child) } }
+            @Composable { style.children.forEach { child -> ComponentView(style = child, state = state) } }
         }
 
         // Show the right container composable depending on the dimension.
@@ -142,6 +152,7 @@ private fun StackComponentView_Preview_Vertical() {
                     y = 3.0,
                 ),
             ),
+            state = previewEmptyState(),
         )
     }
 }
@@ -175,6 +186,7 @@ private fun StackComponentView_Preview_Horizontal() {
                     y = 5.0,
                 ),
             ),
+            state = previewEmptyState(),
         )
     }
 }
@@ -247,6 +259,7 @@ private fun StackComponentView_Preview_ZLayer() {
                     y = 5.0,
                 ),
             ),
+            state = previewEmptyState(),
         )
     }
 }
@@ -290,3 +303,29 @@ private fun previewChildren() = listOf(
         margin = Padding(top = 0.0, bottom = 0.0, leading = 0.0, trailing = 0.0).toPaddingValues(),
     ),
 )
+
+private fun previewEmptyState(): PaywallState.Loaded.Components {
+    val data = PaywallComponentsData(
+        templateName = "template",
+        assetBaseURL = URL("https://assets.pawwalls.com"),
+        componentsConfig = ComponentsConfig(
+            base = PaywallComponentsConfig(
+                // This would normally contain at least one StackComponent, but that's not needed for previews.
+                stack = StackComponent(components = emptyList()),
+                background = Background.Color(ColorScheme(light = ColorInfo.Hex(Color.White.toArgb()))),
+                stickyFooter = null,
+            ),
+        ),
+        componentsLocalizations = emptyMap(),
+        defaultLocaleIdentifier = LocaleId("en_US"),
+    )
+    val offering = Offering(
+        identifier = "identifier",
+        serverDescription = "serverDescription",
+        metadata = emptyMap(),
+        availablePackages = emptyList(),
+        paywallComponents = data,
+    )
+
+    return PaywallState.Loaded.Components(offering, data)
+}