diff --git a/purchases/src/main/kotlin/com/revenuecat/purchases/paywalls/PaywallData.kt b/purchases/src/main/kotlin/com/revenuecat/purchases/paywalls/PaywallData.kt index a07cd84346..c6b57b421c 100644 --- a/purchases/src/main/kotlin/com/revenuecat/purchases/paywalls/PaywallData.kt +++ b/purchases/src/main/kotlin/com/revenuecat/purchases/paywalls/PaywallData.kt @@ -91,7 +91,7 @@ data class PaywallData( /** * The list of package identifiers this paywall will display. */ - val packages: List, + @SerialName("packages") val packageIds: List, /** * The package to be selected by default. diff --git a/purchases/src/test/java/com/revenuecat/purchases/paywalls/PaywallDataTest.kt b/purchases/src/test/java/com/revenuecat/purchases/paywalls/PaywallDataTest.kt index 49da7d1446..dcf037161d 100644 --- a/purchases/src/test/java/com/revenuecat/purchases/paywalls/PaywallDataTest.kt +++ b/purchases/src/test/java/com/revenuecat/purchases/paywalls/PaywallDataTest.kt @@ -29,7 +29,7 @@ class PaywallDataTest { assertThat(paywall.templateName).isEqualTo("1") assertThat(paywall.assetBaseURL).isEqualTo(URL("https://rc-paywalls.s3.amazonaws.com")) assertThat(paywall.revision).isEqualTo(7) - assertThat(paywall.config.packages).containsExactly("\$rc_monthly", "\$rc_annual", "custom_package") + assertThat(paywall.config.packageIds).containsExactly("\$rc_monthly", "\$rc_annual", "custom_package") assertThat(paywall.config.defaultPackage).isEqualTo("\$rc_annual") assertThat(paywall.config.images.header).isEqualTo("header.jpg") assertThat(paywall.config.images.background).isEqualTo("background.jpg") diff --git a/ui/revenuecatui/src/main/kotlin/com/revenuecat/purchases/ui/revenuecatui/composables/Footer.kt b/ui/revenuecatui/src/main/kotlin/com/revenuecat/purchases/ui/revenuecatui/composables/Footer.kt index 133dbf2c4c..d2fd57517b 100644 --- a/ui/revenuecatui/src/main/kotlin/com/revenuecat/purchases/ui/revenuecatui/composables/Footer.kt +++ b/ui/revenuecatui/src/main/kotlin/com/revenuecat/purchases/ui/revenuecatui/composables/Footer.kt @@ -150,7 +150,7 @@ private fun RowScope.Button( private fun FooterPreview() { Footer( configuration = PaywallData.Configuration( - packages = listOf(), + packageIds = listOf(), termsOfServiceURL = URL("https://revenuecat.com/tos"), privacyURL = URL("https://revenuecat.com/privacy"), displayRestorePurchases = true, diff --git a/ui/revenuecatui/src/main/kotlin/com/revenuecat/purchases/ui/revenuecatui/data/processed/TemplateConfigurationFactory.kt b/ui/revenuecatui/src/main/kotlin/com/revenuecat/purchases/ui/revenuecatui/data/processed/TemplateConfigurationFactory.kt index 63d0a29cbc..b44f8cd68b 100644 --- a/ui/revenuecatui/src/main/kotlin/com/revenuecat/purchases/ui/revenuecatui/data/processed/TemplateConfigurationFactory.kt +++ b/ui/revenuecatui/src/main/kotlin/com/revenuecat/purchases/ui/revenuecatui/data/processed/TemplateConfigurationFactory.kt @@ -27,7 +27,7 @@ internal object TemplateConfigurationFactory { variableDataProvider = variableDataProvider, availablePackages = availablePackages, activelySubscribedProductIdentifiers = activelySubscribedProductIdentifiers, - packageIdsInConfig = paywallData.config.packages, + packageIdsInConfig = paywallData.config.packageIds, default = paywallData.config.defaultPackage, localization = localizedConfiguration, configurationType = template.configurationType, diff --git a/ui/revenuecatui/src/main/kotlin/com/revenuecat/purchases/ui/revenuecatui/data/testdata/templates/Template1TestData.kt b/ui/revenuecatui/src/main/kotlin/com/revenuecat/purchases/ui/revenuecatui/data/testdata/templates/Template1TestData.kt index 7bebf393b5..3138a71040 100644 --- a/ui/revenuecatui/src/main/kotlin/com/revenuecat/purchases/ui/revenuecatui/data/testdata/templates/Template1TestData.kt +++ b/ui/revenuecatui/src/main/kotlin/com/revenuecat/purchases/ui/revenuecatui/data/testdata/templates/Template1TestData.kt @@ -11,7 +11,7 @@ internal val TestData.template1: PaywallData get() = PaywallData( templateName = PaywallTemplate.TEMPLATE_1.id, config = PaywallData.Configuration( - packages = listOf( + packageIds = listOf( PackageType.MONTHLY.identifier!!, ), defaultPackage = PackageType.MONTHLY.identifier!!, diff --git a/ui/revenuecatui/src/main/kotlin/com/revenuecat/purchases/ui/revenuecatui/data/testdata/templates/Template2TestData.kt b/ui/revenuecatui/src/main/kotlin/com/revenuecat/purchases/ui/revenuecatui/data/testdata/templates/Template2TestData.kt index 3d56c3155f..f6039bd0ad 100644 --- a/ui/revenuecatui/src/main/kotlin/com/revenuecat/purchases/ui/revenuecatui/data/testdata/templates/Template2TestData.kt +++ b/ui/revenuecatui/src/main/kotlin/com/revenuecat/purchases/ui/revenuecatui/data/testdata/templates/Template2TestData.kt @@ -11,7 +11,7 @@ internal val TestData.template2: PaywallData get() = PaywallData( templateName = PaywallTemplate.TEMPLATE_2.id, config = PaywallData.Configuration( - packages = listOf( + packageIds = listOf( PackageType.ANNUAL.identifier!!, PackageType.MONTHLY.identifier!!, ), diff --git a/ui/revenuecatui/src/main/kotlin/com/revenuecat/purchases/ui/revenuecatui/data/testdata/templates/Template3TestData.kt b/ui/revenuecatui/src/main/kotlin/com/revenuecat/purchases/ui/revenuecatui/data/testdata/templates/Template3TestData.kt index b7dc5419c5..759613f89a 100644 --- a/ui/revenuecatui/src/main/kotlin/com/revenuecat/purchases/ui/revenuecatui/data/testdata/templates/Template3TestData.kt +++ b/ui/revenuecatui/src/main/kotlin/com/revenuecat/purchases/ui/revenuecatui/data/testdata/templates/Template3TestData.kt @@ -11,7 +11,7 @@ internal val TestData.template3: PaywallData get() = PaywallData( templateName = PaywallTemplate.TEMPLATE_3.id, config = PaywallData.Configuration( - packages = listOf( + packageIds = listOf( PackageType.MONTHLY.identifier!!, ), images = PaywallData.Configuration.Images( diff --git a/ui/revenuecatui/src/main/kotlin/com/revenuecat/purchases/ui/revenuecatui/extensions/PaywallDataExtensions.kt b/ui/revenuecatui/src/main/kotlin/com/revenuecat/purchases/ui/revenuecatui/extensions/PaywallDataExtensions.kt index 2f3f93d978..ba73383bfd 100644 --- a/ui/revenuecatui/src/main/kotlin/com/revenuecat/purchases/ui/revenuecatui/extensions/PaywallDataExtensions.kt +++ b/ui/revenuecatui/src/main/kotlin/com/revenuecat/purchases/ui/revenuecatui/extensions/PaywallDataExtensions.kt @@ -35,7 +35,7 @@ internal fun PaywallData.Companion.createDefaultForIdentifiers( return PaywallData( templateName = PaywallData.defaultTemplate.id, config = PaywallData.Configuration( - packages = packageIdentifiers, + packageIds = packageIdentifiers, images = PaywallData.Configuration.Images( background = PaywallData.defaultBackgroundImage, icon = PaywallData.defaultAppIconPlaceholder, diff --git a/ui/revenuecatui/src/main/kotlin/com/revenuecat/purchases/ui/revenuecatui/helpers/OfferingToStateMapper.kt b/ui/revenuecatui/src/main/kotlin/com/revenuecat/purchases/ui/revenuecatui/helpers/OfferingToStateMapper.kt index 3e82f80e9c..2a9c68553f 100644 --- a/ui/revenuecatui/src/main/kotlin/com/revenuecat/purchases/ui/revenuecatui/helpers/OfferingToStateMapper.kt +++ b/ui/revenuecatui/src/main/kotlin/com/revenuecat/purchases/ui/revenuecatui/helpers/OfferingToStateMapper.kt @@ -28,7 +28,7 @@ internal fun Offering.validatedPaywall( val template = paywallData.validate().getOrElse { return PaywallValidationResult( - PaywallData.createDefaultForIdentifiers(paywallData.config.packages, currentColorScheme), + PaywallData.createDefaultForIdentifiers(paywallData.config.packageIds, currentColorScheme), PaywallData.defaultTemplate, it as PaywallValidationError, ) diff --git a/ui/revenuecatui/src/test/kotlin/com/revenuecat/purchases/ui/revenuecatui/PaywallDataValidationTest.kt b/ui/revenuecatui/src/test/kotlin/com/revenuecat/purchases/ui/revenuecatui/PaywallDataValidationTest.kt index 69070f4530..f611010ae5 100644 --- a/ui/revenuecatui/src/test/kotlin/com/revenuecat/purchases/ui/revenuecatui/PaywallDataValidationTest.kt +++ b/ui/revenuecatui/src/test/kotlin/com/revenuecat/purchases/ui/revenuecatui/PaywallDataValidationTest.kt @@ -125,7 +125,7 @@ class PaywallDataValidationTest { ) private fun verifyPackages(actual: PaywallData, expectation: PaywallData) { - assertThat(actual.config.packages).isEqualTo(expectation.config.packages) + assertThat(actual.config.packageIds).isEqualTo(expectation.config.packageIds) } private fun compareWithDefaultTemplate(displayablePaywall: PaywallData) { @@ -144,7 +144,7 @@ class PaywallDataValidationTest { assertThat(config.images.background).isEqualTo(defaultConfig.images.background) assertThat(config.images.header).isEqualTo(defaultConfig.images.header) assertThat(config.images.icon).isEqualTo(defaultConfig.images.icon) - assertThat(config.packages).containsExactly(*defaultConfig.packages.toTypedArray()) + assertThat(config.packageIds).containsExactly(*defaultConfig.packageIds.toTypedArray()) assertThat(config.defaultPackage).isEqualTo(defaultConfig.defaultPackage) assertThat(config.termsOfServiceURL).isEqualTo(defaultConfig.termsOfServiceURL) assertThat(config.privacyURL).isEqualTo(defaultConfig.privacyURL)