Adds FontSpec to TextComponentStyle and LocalizedTextPartial.

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

@@ -1,17 +1,22 @@
 package com.revenuecat.purchases.ui.revenuecatui.components
 
 import com.revenuecat.purchases.ColorAlias
+import com.revenuecat.purchases.FontAlias
 import com.revenuecat.purchases.paywalls.components.PartialTextComponent
 import com.revenuecat.purchases.paywalls.components.common.LocaleId
 import com.revenuecat.purchases.paywalls.components.properties.ColorScheme
 import com.revenuecat.purchases.ui.revenuecatui.components.ktx.LocalizationDictionary
 import com.revenuecat.purchases.ui.revenuecatui.components.ktx.stringForAllLocales
 import com.revenuecat.purchases.ui.revenuecatui.components.properties.ColorStyles
+import com.revenuecat.purchases.ui.revenuecatui.components.properties.FontSpec
+import com.revenuecat.purchases.ui.revenuecatui.components.properties.getFontSpec
 import com.revenuecat.purchases.ui.revenuecatui.components.properties.toColorStyles
 import com.revenuecat.purchases.ui.revenuecatui.errors.PaywallValidationError
 import com.revenuecat.purchases.ui.revenuecatui.helpers.NonEmptyList
 import com.revenuecat.purchases.ui.revenuecatui.helpers.NonEmptyMap
 import com.revenuecat.purchases.ui.revenuecatui.helpers.Result
+import com.revenuecat.purchases.ui.revenuecatui.helpers.mapError
+import com.revenuecat.purchases.ui.revenuecatui.helpers.nonEmptyListOf
 import com.revenuecat.purchases.ui.revenuecatui.helpers.orSuccessfullyNull
 import com.revenuecat.purchases.ui.revenuecatui.helpers.zipOrAccumulate
 import dev.drewhamilton.poko.Poko
@@ -21,6 +26,7 @@ internal class LocalizedTextPartial private constructor(
     @get:JvmSynthetic val texts: NonEmptyMap<LocaleId, String>?,
     @get:JvmSynthetic val color: ColorStyles?,
     @get:JvmSynthetic val backgroundColor: ColorStyles?,
+    @get:JvmSynthetic val fontSpec: FontSpec?,
     @get:JvmSynthetic val partial: PartialTextComponent,
 ) : PresentedPartial<LocalizedTextPartial> {
 
@@ -35,18 +41,24 @@ internal class LocalizedTextPartial private constructor(
             from: PartialTextComponent,
             using: NonEmptyMap<LocaleId, LocalizationDictionary>,
             aliases: Map<ColorAlias, ColorScheme>,
+            fontAliases: Map<FontAlias, FontSpec>,
         ): Result<LocalizedTextPartial, NonEmptyList<PaywallValidationError>> =
             zipOrAccumulate(
                 first = from.text
                     ?.let { localizationKey -> using.stringForAllLocales(localizationKey) }
                     .orSuccessfullyNull(),
                 second = from.color?.toColorStyles(aliases).orSuccessfullyNull(),
                 third = from.backgroundColor?.toColorStyles(aliases).orSuccessfullyNull(),
-            ) { texts, color, backgroundColor ->
+                fourth = from.fontName
+                    ?.let { fontAliases.getFontSpec(it) }
+                    .orSuccessfullyNull()
+                    .mapError { nonEmptyListOf(it) },
+            ) { texts, color, backgroundColor, fontSpec ->
                 LocalizedTextPartial(
                     texts = texts,
                     color = color,
                     backgroundColor = backgroundColor,
+                    fontSpec = fontSpec,
                     partial = from,
                 )
             }
@@ -61,6 +73,7 @@ internal class LocalizedTextPartial private constructor(
             texts = with?.texts ?: texts,
             color = with?.color ?: color,
             backgroundColor = with?.backgroundColor ?: backgroundColor,
+            fontSpec = with?.fontSpec ?: fontSpec,
             partial = PartialTextComponent(
                 visible = otherPartial?.visible ?: partial.visible,
                 text = otherPartial?.text ?: partial.text,

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

@@ -104,7 +104,7 @@ private fun previewButtonComponentStyle(
                 ),
                 fontSize = 15,
                 fontWeight = FontWeight.REGULAR.toFontWeight(),
-                fontFamily = null,
+                fontSpec = null,
                 textAlign = HorizontalAlignment.CENTER.toTextAlign(),
                 horizontalAlignment = HorizontalAlignment.CENTER.toAlignment(),
                 backgroundColor = ColorStyles(

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

@@ -63,7 +63,6 @@ import com.revenuecat.purchases.paywalls.components.properties.TwoDimensionalAli
 import com.revenuecat.purchases.paywalls.components.properties.VerticalAlignment
 import com.revenuecat.purchases.ui.revenuecatui.components.ComponentView
 import com.revenuecat.purchases.ui.revenuecatui.components.PaywallAction
-import com.revenuecat.purchases.ui.revenuecatui.components.SystemFontFamily
 import com.revenuecat.purchases.ui.revenuecatui.components.ktx.toAlignment
 import com.revenuecat.purchases.ui.revenuecatui.components.ktx.toFontWeight
 import com.revenuecat.purchases.ui.revenuecatui.components.ktx.toHorizontalAlignmentOrNull
@@ -80,6 +79,7 @@ import com.revenuecat.purchases.ui.revenuecatui.components.modifier.size
 import com.revenuecat.purchases.ui.revenuecatui.components.properties.BorderStyles
 import com.revenuecat.purchases.ui.revenuecatui.components.properties.ColorStyle
 import com.revenuecat.purchases.ui.revenuecatui.components.properties.ColorStyles
+import com.revenuecat.purchases.ui.revenuecatui.components.properties.FontSpec
 import com.revenuecat.purchases.ui.revenuecatui.components.properties.ShadowStyles
 import com.revenuecat.purchases.ui.revenuecatui.components.properties.forCurrentTheme
 import com.revenuecat.purchases.ui.revenuecatui.components.properties.rememberBorderStyle
@@ -905,7 +905,7 @@ private fun StackComponentView_Preview_ZLayer() {
                         ),
                         fontSize = 15,
                         fontWeight = FontWeight.REGULAR.toFontWeight(),
-                        fontFamily = null,
+                        fontSpec = null,
                         textAlign = HorizontalAlignment.CENTER.toTextAlign(),
                         horizontalAlignment = HorizontalAlignment.CENTER.toAlignment(),
                         backgroundColor = ColorStyles(
@@ -925,7 +925,7 @@ private fun StackComponentView_Preview_ZLayer() {
                         ),
                         fontSize = 15,
                         fontWeight = FontWeight.REGULAR.toFontWeight(),
-                        fontFamily = null,
+                        fontSpec = null,
                         textAlign = HorizontalAlignment.CENTER.toTextAlign(),
                         horizontalAlignment = HorizontalAlignment.CENTER.toAlignment(),
                         backgroundColor = ColorStyles(
@@ -1110,7 +1110,7 @@ private fun previewChildren() = listOf(
         ),
         fontSize = 15,
         fontWeight = FontWeight.REGULAR.toFontWeight(),
-        fontFamily = null,
+        fontSpec = null,
         textAlign = HorizontalAlignment.CENTER.toTextAlign(),
         horizontalAlignment = HorizontalAlignment.CENTER.toAlignment(),
         backgroundColor = ColorStyles(
@@ -1129,7 +1129,7 @@ private fun previewChildren() = listOf(
         ),
         fontSize = 15,
         fontWeight = FontWeight.REGULAR.toFontWeight(),
-        fontFamily = null,
+        fontSpec = null,
         textAlign = HorizontalAlignment.CENTER.toTextAlign(),
         horizontalAlignment = HorizontalAlignment.CENTER.toAlignment(),
         backgroundColor = ColorStyles(
@@ -1149,7 +1149,7 @@ private fun previewTextComponentStyle(
     color: ColorStyles = ColorStyles(ColorStyle.Solid(Color.Black)),
     fontSize: Int = 15,
     fontWeight: FontWeight = FontWeight.REGULAR,
-    fontFamily: String? = null,
+    fontSpec: FontSpec? = null,
     textAlign: HorizontalAlignment = HorizontalAlignment.CENTER,
     horizontalAlignment: HorizontalAlignment = HorizontalAlignment.CENTER,
     backgroundColor: ColorStyles? = null,
@@ -1163,7 +1163,7 @@ private fun previewTextComponentStyle(
         color = color,
         fontSize = fontSize,
         fontWeight = weight,
-        fontFamily = fontFamily?.let { SystemFontFamily(it, weight) },
+        fontSpec = fontSpec,
         textAlign = textAlign.toTextAlign(),
         horizontalAlignment = horizontalAlignment.toAlignment(),
         backgroundColor = backgroundColor,
@@ -1222,7 +1222,7 @@ private fun previewBadge(style: Badge.Style, alignment: TwoDimensionalAlignment,
                     ),
                     fontSize = 15,
                     fontWeight = FontWeight.REGULAR.toFontWeight(),
-                    fontFamily = null,
+                    fontSpec = null,
                     textAlign = HorizontalAlignment.CENTER.toTextAlign(),
                     horizontalAlignment = HorizontalAlignment.CENTER.toAlignment(),
                     backgroundColor = null,

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

@@ -1,6 +1,5 @@
 package com.revenuecat.purchases.ui.revenuecatui.components.style
 
-import androidx.compose.ui.text.font.FontStyle
 import androidx.compose.ui.unit.dp
 import com.revenuecat.purchases.FontAlias
 import com.revenuecat.purchases.Offering
@@ -35,7 +34,6 @@ import com.revenuecat.purchases.ui.revenuecatui.components.ktx.toShape
 import com.revenuecat.purchases.ui.revenuecatui.components.ktx.toTextAlign
 import com.revenuecat.purchases.ui.revenuecatui.components.properties.FontSpec
 import com.revenuecat.purchases.ui.revenuecatui.components.properties.getFontSpec
-import com.revenuecat.purchases.ui.revenuecatui.components.properties.resolve
 import com.revenuecat.purchases.ui.revenuecatui.components.properties.toBorderStyles
 import com.revenuecat.purchases.ui.revenuecatui.components.properties.toColorStyles
 import com.revenuecat.purchases.ui.revenuecatui.components.properties.toShadowStyles
@@ -225,7 +223,14 @@ internal class StyleFactory(
         first = localizations.stringForAllLocales(component.text),
         second = component.overrides
             // Map all overrides to PresentedOverrides.
-            ?.toPresentedOverrides { LocalizedTextPartial(from = it, using = localizations, aliases = colorAliases) }
+            ?.toPresentedOverrides {
+                LocalizedTextPartial(
+                    from = it,
+                    using = localizations,
+                    aliases = colorAliases,
+                    fontAliases = fontAliases,
+                )
+            }
             .orSuccessfullyNull()
             .mapError { nonEmptyListOf(it) },
         third = component.color.toColorStyles(colorAliases),
@@ -241,7 +246,7 @@ internal class StyleFactory(
             color = color,
             fontSize = component.fontSize,
             fontWeight = weight,
-            fontFamily = fontSpec?.resolve(weight = weight, style = FontStyle.Normal),
+            fontSpec = fontSpec,
             textAlign = component.horizontalAlignment.toTextAlign(),
             horizontalAlignment = component.horizontalAlignment.toAlignment(),
             backgroundColor = backgroundColor,

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

@@ -3,7 +3,6 @@ package com.revenuecat.purchases.ui.revenuecatui.components.style
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.runtime.Immutable
 import androidx.compose.ui.Alignment
-import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextAlign
 import com.revenuecat.purchases.Package
@@ -12,6 +11,7 @@ import com.revenuecat.purchases.paywalls.components.properties.Size
 import com.revenuecat.purchases.ui.revenuecatui.components.LocalizedTextPartial
 import com.revenuecat.purchases.ui.revenuecatui.components.PresentedOverrides
 import com.revenuecat.purchases.ui.revenuecatui.components.properties.ColorStyles
+import com.revenuecat.purchases.ui.revenuecatui.components.properties.FontSpec
 import com.revenuecat.purchases.ui.revenuecatui.helpers.NonEmptyMap
 
 @Suppress("LongParameterList")
@@ -26,7 +26,7 @@ internal class TextComponentStyle(
     @get:JvmSynthetic
     val fontWeight: FontWeight?,
     @get:JvmSynthetic
-    val fontFamily: FontFamily?,
+    val fontSpec: FontSpec?,
     @get:JvmSynthetic
     val textAlign: TextAlign?,
     @get:JvmSynthetic

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

@@ -10,18 +10,20 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
+import androidx.compose.ui.text.font.FontStyle
+import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.intl.Locale
 import androidx.window.core.layout.WindowWidthSizeClass
 import com.revenuecat.purchases.Package
 import com.revenuecat.purchases.ui.revenuecatui.components.ComponentViewState
 import com.revenuecat.purchases.ui.revenuecatui.components.ScreenCondition
-import com.revenuecat.purchases.ui.revenuecatui.components.SystemFontFamily
 import com.revenuecat.purchases.ui.revenuecatui.components.buildPresentedPartial
 import com.revenuecat.purchases.ui.revenuecatui.components.ktx.toAlignment
 import com.revenuecat.purchases.ui.revenuecatui.components.ktx.toFontWeight
 import com.revenuecat.purchases.ui.revenuecatui.components.ktx.toLocaleId
 import com.revenuecat.purchases.ui.revenuecatui.components.ktx.toPaddingValues
 import com.revenuecat.purchases.ui.revenuecatui.components.ktx.toTextAlign
+import com.revenuecat.purchases.ui.revenuecatui.components.properties.resolve
 import com.revenuecat.purchases.ui.revenuecatui.components.style.TextComponentStyle
 import com.revenuecat.purchases.ui.revenuecatui.composables.IntroOfferEligibility
 import com.revenuecat.purchases.ui.revenuecatui.data.PaywallState
@@ -109,9 +111,13 @@ internal class TextComponentState(
     @get:JvmSynthetic
     val fontWeight by derivedStateOf { presentedPartial?.partial?.fontWeight?.toFontWeight() ?: style.fontWeight }
 
+    private val fontSpec by derivedStateOf {
+        presentedPartial?.fontSpec ?: style.fontSpec
+    }
+
     @get:JvmSynthetic
     val fontFamily by derivedStateOf {
-        presentedPartial?.partial?.fontName?.let { SystemFontFamily(it.value, fontWeight) } ?: style.fontFamily
+        fontSpec?.resolve(weight = fontWeight ?: FontWeight.Normal, style = FontStyle.Normal)
     }
 
     @get:JvmSynthetic

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

@@ -39,7 +39,6 @@ import com.revenuecat.purchases.paywalls.components.properties.Size
 import com.revenuecat.purchases.paywalls.components.properties.SizeConstraint
 import com.revenuecat.purchases.paywalls.components.properties.SizeConstraint.Fill
 import com.revenuecat.purchases.paywalls.components.properties.SizeConstraint.Fit
-import com.revenuecat.purchases.ui.revenuecatui.components.SystemFontFamily
 import com.revenuecat.purchases.ui.revenuecatui.components.ktx.toAlignment
 import com.revenuecat.purchases.ui.revenuecatui.components.ktx.toFontWeight
 import com.revenuecat.purchases.ui.revenuecatui.components.ktx.toPaddingValues
@@ -48,6 +47,7 @@ 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.properties.ColorStyle
 import com.revenuecat.purchases.ui.revenuecatui.components.properties.ColorStyles
+import com.revenuecat.purchases.ui.revenuecatui.components.properties.FontSpec
 import com.revenuecat.purchases.ui.revenuecatui.components.properties.forCurrentTheme
 import com.revenuecat.purchases.ui.revenuecatui.components.properties.toColorStyle
 import com.revenuecat.purchases.ui.revenuecatui.components.style.TextComponentStyle
@@ -215,7 +215,7 @@ private fun TextComponentView_Preview_SerifFont() {
         style = previewTextComponentStyle(
             text = "Hello, world",
             color = ColorStyles(light = ColorStyle.Solid(Color.Black)),
-            fontFamily = "serif",
+            fontSpec = FontSpec.Generic.Serif,
             size = Size(width = Fit, height = Fit),
         ),
         state = previewEmptyState(),
@@ -229,7 +229,7 @@ private fun TextComponentView_Preview_SansSerifFont() {
         style = previewTextComponentStyle(
             text = "Hello, world",
             color = ColorStyles(light = ColorStyle.Solid(Color.Black)),
-            fontFamily = "sans-serif",
+            fontSpec = FontSpec.Generic.SansSerif,
             size = Size(width = Fit, height = Fit),
         ),
         state = previewEmptyState(),
@@ -243,7 +243,7 @@ private fun TextComponentView_Preview_MonospaceFont() {
         style = previewTextComponentStyle(
             text = "Hello, world",
             color = ColorStyles(light = ColorStyle.Solid(Color.Black)),
-            fontFamily = "monospace",
+            fontSpec = FontSpec.Generic.Monospace,
             size = Size(width = Fit, height = Fit),
         ),
         state = previewEmptyState(),
@@ -257,7 +257,7 @@ private fun TextComponentView_Preview_CursiveFont() {
         style = previewTextComponentStyle(
             text = "Hello, world",
             color = ColorStyles(light = ColorStyle.Solid(Color.Black)),
-            fontFamily = "cursive",
+            fontSpec = FontSpec.Generic.Cursive,
             size = Size(width = Fit, height = Fit),
         ),
         state = previewEmptyState(),
@@ -407,7 +407,7 @@ private fun previewTextComponentStyle(
     color: ColorStyles,
     fontSize: Int = 15,
     fontWeight: FontWeight = FontWeight.REGULAR,
-    fontFamily: String? = null,
+    fontSpec: FontSpec? = null,
     textAlign: HorizontalAlignment = HorizontalAlignment.CENTER,
     horizontalAlignment: HorizontalAlignment = HorizontalAlignment.CENTER,
     backgroundColor: ColorStyles? = null,
@@ -421,7 +421,7 @@ private fun previewTextComponentStyle(
         color = color,
         fontSize = fontSize,
         fontWeight = weight,
-        fontFamily = fontFamily?.let { SystemFontFamily(it, weight) },
+        fontSpec = fontSpec,
         textAlign = textAlign.toTextAlign(),
         horizontalAlignment = horizontalAlignment.toAlignment(),
         backgroundColor = backgroundColor,