diff --git a/purchases/src/main/kotlin/com/revenuecat/purchases/paywalls/components/Localization.kt b/purchases/src/main/kotlin/com/revenuecat/purchases/paywalls/components/Localization.kt index 8e47355701..0d2d092bf1 100644 --- a/purchases/src/main/kotlin/com/revenuecat/purchases/paywalls/components/Localization.kt +++ b/purchases/src/main/kotlin/com/revenuecat/purchases/paywalls/components/Localization.kt @@ -16,7 +16,9 @@ import kotlinx.serialization.encoding.Encoder @JvmInline internal value class LocaleId(val value: String) -internal typealias LocalizationKey = String +@Serializable +@JvmInline +internal value class LocalizationKey(val value: String) internal typealias LocalizationDictionary = Map diff --git a/purchases/src/test/java/com/revenuecat/purchases/paywalls/components/ButtonComponentTests.kt b/purchases/src/test/java/com/revenuecat/purchases/paywalls/components/ButtonComponentTests.kt index 90a5908634..e5c0492339 100644 --- a/purchases/src/test/java/com/revenuecat/purchases/paywalls/components/ButtonComponentTests.kt +++ b/purchases/src/test/java/com/revenuecat/purchases/paywalls/components/ButtonComponentTests.kt @@ -62,7 +62,7 @@ internal class ButtonComponentTests { stack = StackComponent( components = listOf( TextComponent( - text = "7bkohQjzIE", + text = LocalizationKey("7bkohQjzIE"), color = ColorScheme(light = ColorInfo.Alias("primary")) ) ), @@ -104,7 +104,7 @@ internal class ButtonComponentTests { stack = StackComponent( components = listOf( TextComponent( - text = "7bkohQjzIE", + text = LocalizationKey("7bkohQjzIE"), color = ColorScheme(light = ColorInfo.Alias("primary")) ) ), @@ -149,7 +149,7 @@ internal class ButtonComponentTests { stack = StackComponent( components = listOf( TextComponent( - text = "7bkohQjzIE", + text = LocalizationKey("7bkohQjzIE"), color = ColorScheme(light = ColorInfo.Alias("primary")) ) ), @@ -201,7 +201,7 @@ internal class ButtonComponentTests { stack = StackComponent( components = listOf( TextComponent( - text = "7bkohQjzIE", + text = LocalizationKey("7bkohQjzIE"), color = ColorScheme(light = ColorInfo.Alias("primary")) ) ), @@ -253,7 +253,7 @@ internal class ButtonComponentTests { stack = StackComponent( components = listOf( TextComponent( - text = "7bkohQjzIE", + text = LocalizationKey("7bkohQjzIE"), color = ColorScheme(light = ColorInfo.Alias("primary")) ) ), @@ -305,7 +305,7 @@ internal class ButtonComponentTests { stack = StackComponent( components = listOf( TextComponent( - text = "7bkohQjzIE", + text = LocalizationKey("7bkohQjzIE"), color = ColorScheme(light = ColorInfo.Alias("primary")) ) ), diff --git a/purchases/src/test/java/com/revenuecat/purchases/paywalls/components/ComponentOverridesTests.kt b/purchases/src/test/java/com/revenuecat/purchases/paywalls/components/ComponentOverridesTests.kt index f665a39c16..b0a91446de 100644 --- a/purchases/src/test/java/com/revenuecat/purchases/paywalls/components/ComponentOverridesTests.kt +++ b/purchases/src/test/java/com/revenuecat/purchases/paywalls/components/ComponentOverridesTests.kt @@ -137,14 +137,14 @@ internal class ComponentOverridesTests { } """.trimIndent(), expected = ComponentOverrides( - introOffer = PartialImageComponent(overrideSourceLid = "intro"), + introOffer = PartialImageComponent(overrideSourceLid = LocalizationKey("intro")), states = ComponentStates( - selected = PartialImageComponent(overrideSourceLid = "selected") + selected = PartialImageComponent(overrideSourceLid = LocalizationKey("selected")) ), conditions = ComponentConditions( - compact = PartialImageComponent(overrideSourceLid = "compact"), - medium = PartialImageComponent(overrideSourceLid = "medium"), - expanded = PartialImageComponent(overrideSourceLid = "expanded"), + compact = PartialImageComponent(overrideSourceLid = LocalizationKey("compact")), + medium = PartialImageComponent(overrideSourceLid = LocalizationKey("medium")), + expanded = PartialImageComponent(overrideSourceLid = LocalizationKey("expanded")), ) ) ) diff --git a/purchases/src/test/java/com/revenuecat/purchases/paywalls/components/ComponentsConfigTests.kt b/purchases/src/test/java/com/revenuecat/purchases/paywalls/components/ComponentsConfigTests.kt index 8da0ee4aab..3afbd60b03 100644 --- a/purchases/src/test/java/com/revenuecat/purchases/paywalls/components/ComponentsConfigTests.kt +++ b/purchases/src/test/java/com/revenuecat/purchases/paywalls/components/ComponentsConfigTests.kt @@ -56,7 +56,7 @@ internal class ComponentsConfigTests { stack = StackComponent( components = listOf( TextComponent( - text = "7bkohQjzIE", + text = LocalizationKey("7bkohQjzIE"), color = ColorScheme(light = ColorInfo.Alias("primary")) ) ), @@ -154,7 +154,7 @@ internal class ComponentsConfigTests { stack = StackComponent( components = listOf( TextComponent( - text = "7bkohQjzIE", + text = LocalizationKey("7bkohQjzIE"), color = ColorScheme(light = ColorInfo.Alias("primary")) ) ), @@ -168,7 +168,7 @@ internal class ComponentsConfigTests { stack = StackComponent( components = listOf( TextComponent( - text = "7bkohQjzIE", + text = LocalizationKey("7bkohQjzIE"), color = ColorScheme(light = ColorInfo.Alias("primary")) ) ), @@ -215,7 +215,7 @@ internal class ComponentsConfigTests { stack = StackComponent( components = listOf( TextComponent( - text = "7bkohQjzIE", + text = LocalizationKey("7bkohQjzIE"), color = ColorScheme(light = ColorInfo.Alias("primary")) ) ), @@ -267,7 +267,7 @@ internal class ComponentsConfigTests { stack = StackComponent( components = listOf( TextComponent( - text = "7bkohQjzIE", + text = LocalizationKey("7bkohQjzIE"), color = ColorScheme(light = ColorInfo.Alias("primary")) ) ), diff --git a/purchases/src/test/java/com/revenuecat/purchases/paywalls/components/ImageComponentTests.kt b/purchases/src/test/java/com/revenuecat/purchases/paywalls/components/ImageComponentTests.kt index 4266786b96..4f2d9e8372 100644 --- a/purchases/src/test/java/com/revenuecat/purchases/paywalls/components/ImageComponentTests.kt +++ b/purchases/src/test/java/com/revenuecat/purchases/paywalls/components/ImageComponentTests.kt @@ -100,7 +100,7 @@ internal class ImageComponentTests { ) ), size = Size(width = SizeConstraint.Fill, height = SizeConstraint.Fit), - overrideSourceLid = "abc123", + overrideSourceLid = LocalizationKey("abc123"), maskShape = MaskShape.Rectangle( corners = CornerRadiuses( topLeading = 3.0, @@ -248,7 +248,7 @@ internal class ImageComponentTests { ) ), size = Size(width = SizeConstraint.Fill, height = SizeConstraint.Fit), - overrideSourceLid = "abc123", + overrideSourceLid = LocalizationKey("abc123"), fitMode = FitMode.FILL, maskShape = MaskShape.Rectangle( corners = CornerRadiuses( diff --git a/purchases/src/test/java/com/revenuecat/purchases/paywalls/components/PackageComponentTests.kt b/purchases/src/test/java/com/revenuecat/purchases/paywalls/components/PackageComponentTests.kt index eea35328a0..143ed4c039 100644 --- a/purchases/src/test/java/com/revenuecat/purchases/paywalls/components/PackageComponentTests.kt +++ b/purchases/src/test/java/com/revenuecat/purchases/paywalls/components/PackageComponentTests.kt @@ -57,7 +57,7 @@ internal class PackageComponentTests(@Suppress("UNUSED_PARAMETER") name: String, stack = StackComponent( components = listOf( TextComponent( - text = "7bkohQjzIE", + text = LocalizationKey("7bkohQjzIE"), color = ColorScheme(light = ColorInfo.Alias("primary")) ) ), diff --git a/purchases/src/test/java/com/revenuecat/purchases/paywalls/components/PaywallComponentsDataTests.kt b/purchases/src/test/java/com/revenuecat/purchases/paywalls/components/PaywallComponentsDataTests.kt index a173e3244b..5d755355bb 100644 --- a/purchases/src/test/java/com/revenuecat/purchases/paywalls/components/PaywallComponentsDataTests.kt +++ b/purchases/src/test/java/com/revenuecat/purchases/paywalls/components/PaywallComponentsDataTests.kt @@ -78,7 +78,7 @@ internal class PaywallComponentsDataTests( ), componentsLocalizations = mapOf( LocaleId("en_US") to mapOf( - "ZvS4Ck5hGM" to LocalizationData.Text("Hello") + LocalizationKey("ZvS4Ck5hGM") to LocalizationData.Text("Hello") ) ), defaultLocaleIdentifier = LocaleId("en_US"), @@ -136,7 +136,7 @@ internal class PaywallComponentsDataTests( ), componentsLocalizations = mapOf( LocaleId("en_US") to mapOf( - "ZvS4Ck5hGM" to LocalizationData.Text("Hello") + LocalizationKey("ZvS4Ck5hGM") to LocalizationData.Text("Hello") ) ), defaultLocaleIdentifier = LocaleId("en_US"), diff --git a/purchases/src/test/java/com/revenuecat/purchases/paywalls/components/PurchaseButtonComponentTests.kt b/purchases/src/test/java/com/revenuecat/purchases/paywalls/components/PurchaseButtonComponentTests.kt index d978213c5b..1e7fcbbaf4 100644 --- a/purchases/src/test/java/com/revenuecat/purchases/paywalls/components/PurchaseButtonComponentTests.kt +++ b/purchases/src/test/java/com/revenuecat/purchases/paywalls/components/PurchaseButtonComponentTests.kt @@ -56,7 +56,7 @@ internal class PurchaseButtonComponentTests( stack = StackComponent( components = listOf( TextComponent( - text = "7bkohQjzIE", + text = LocalizationKey("7bkohQjzIE"), color = ColorScheme(light = ColorInfo.Alias("primary")) ) ), diff --git a/purchases/src/test/java/com/revenuecat/purchases/paywalls/components/StackComponentTests.kt b/purchases/src/test/java/com/revenuecat/purchases/paywalls/components/StackComponentTests.kt index f379d7d676..d378bf580b 100644 --- a/purchases/src/test/java/com/revenuecat/purchases/paywalls/components/StackComponentTests.kt +++ b/purchases/src/test/java/com/revenuecat/purchases/paywalls/components/StackComponentTests.kt @@ -127,7 +127,7 @@ internal class StackComponentTests { expected = StackComponent( components = listOf( TextComponent( - text = "7bkohQjzIE", + text = LocalizationKey("7bkohQjzIE"), color = ColorScheme(light = ColorInfo.Alias("primary")) ) ), @@ -179,7 +179,7 @@ internal class StackComponentTests { expected = StackComponent( components = listOf( TextComponent( - text = "7bkohQjzIE", + text = LocalizationKey("7bkohQjzIE"), color = ColorScheme(light = ColorInfo.Alias("primary")) ) ), diff --git a/purchases/src/test/java/com/revenuecat/purchases/paywalls/components/StickyFooterComponentTests.kt b/purchases/src/test/java/com/revenuecat/purchases/paywalls/components/StickyFooterComponentTests.kt index f8bd91ec10..c44c9633d9 100644 --- a/purchases/src/test/java/com/revenuecat/purchases/paywalls/components/StickyFooterComponentTests.kt +++ b/purchases/src/test/java/com/revenuecat/purchases/paywalls/components/StickyFooterComponentTests.kt @@ -56,7 +56,7 @@ internal class StickyFooterComponentTests( stack = StackComponent( components = listOf( TextComponent( - text = "7bkohQjzIE", + text = LocalizationKey("7bkohQjzIE"), color = ColorScheme(light = ColorInfo.Alias("primary")) ) ), diff --git a/purchases/src/test/java/com/revenuecat/purchases/paywalls/components/TextComponentTests.kt b/purchases/src/test/java/com/revenuecat/purchases/paywalls/components/TextComponentTests.kt index ea18f1909e..2e199e79cf 100644 --- a/purchases/src/test/java/com/revenuecat/purchases/paywalls/components/TextComponentTests.kt +++ b/purchases/src/test/java/com/revenuecat/purchases/paywalls/components/TextComponentTests.kt @@ -85,7 +85,7 @@ internal class TextComponentTests { } """.trimIndent(), expected = TextComponent( - text = "7bkohQjzIE", + text = LocalizationKey("7bkohQjzIE"), color = ColorScheme( light = ColorInfo.Hex(colorInt(alpha = 0xff, red = 0, green = 0, blue = 0)) ), @@ -121,7 +121,7 @@ internal class TextComponentTests { } """.trimIndent(), expected = TextComponent( - text = "7bkohQjzIE", + text = LocalizationKey("7bkohQjzIE"), color = ColorScheme( light = ColorInfo.Hex(colorInt(alpha = 0xff, red = 0xff, green = 0xff, blue = 0xff)) ), @@ -217,7 +217,7 @@ internal class TextComponentTests { """.trimIndent(), expected = PartialTextComponent( visible = false, - text = "7bkohQjzIE", + text = LocalizationKey("7bkohQjzIE"), color = ColorScheme( light = ColorInfo.Hex(colorInt(alpha = 0xff, red = 0, green = 0, blue = 0)) ),