[Paywalls V2] Fixes various deserialization issues (#2018)

RevenueCat · Jan 3, 2025 · 07b8391 · 07b8391
1 parent af72255
commit 07b8391
Show file tree

Hide file tree

Showing 5 changed files with 104 additions and 6 deletions.
diff --git a/purchases/src/main/kotlin/com/revenuecat/purchases/paywalls/components/properties/Font.kt b/purchases/src/main/kotlin/com/revenuecat/purchases/paywalls/components/properties/Font.kt
@@ -22,7 +22,7 @@ enum class FontWeight {
     @SerialName("medium")
     MEDIUM,
 
-    @SerialName("semi_bold")
+    @SerialName("semibold")
     SEMI_BOLD,
 
     @SerialName("bold")

diff --git a/purchases/src/main/kotlin/com/revenuecat/purchases/paywalls/components/properties/Padding.kt b/purchases/src/main/kotlin/com/revenuecat/purchases/paywalls/components/properties/Padding.kt
@@ -14,19 +14,19 @@ class Padding(
     /**
      * The top padding, in dp.
      */
-    @get:JvmSynthetic val top: Double,
+    @get:JvmSynthetic val top: Double = 0.0,
     /**
      * The bottom padding, in dp.
      */
-    @get:JvmSynthetic val bottom: Double,
+    @get:JvmSynthetic val bottom: Double = 0.0,
     /**
      * The leading, or start, padding, in dp.
      */
-    @get:JvmSynthetic val leading: Double,
+    @get:JvmSynthetic val leading: Double = 0.0,
     /**
      * The trailing, or end, padding, in dp.
      */
-    @get:JvmSynthetic val trailing: Double,
+    @get:JvmSynthetic val trailing: Double = 0.0,
 ) {
     companion object {
         @get:JvmSynthetic

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
@@ -187,6 +187,44 @@ internal class StackComponentTests {
                         )
                     ),
                 ),
+                arrayOf(
+                    "empty margin and padding",
+                    Args(
+                        json = """
+                        {
+                          "components": [
+                            {
+                              "color": {
+                                "light": {
+                                  "type": "alias",
+                                  "value": "primary"
+                                }
+                              },
+                              "components": [],
+                              "id": "xmpgCrN9Rb",
+                              "name": "Text",
+                              "text_lid": "7bkohQjzIE",
+                              "type": "text"
+                            }
+                          ],
+                          "margin": {},
+                          "name": "Stack",
+                          "padding": {},
+                          "type": "stack"
+                        }
+                        """.trimIndent(),
+                        expected = StackComponent(
+                            components = listOf(
+                                TextComponent(
+                                    text = LocalizationKey("7bkohQjzIE"),
+                                    color = ColorScheme(light = ColorInfo.Alias("primary"))
+                                )
+                            ),
+                            margin = Padding.zero,
+                            padding = Padding.zero,
+                        )
+                    ),
+                ),
             )
         }
 
@@ -326,6 +364,21 @@ internal class StackComponentTests {
                         expected = PartialStackComponent()
                     )
                 ),
+                arrayOf(
+                    "empty padding and margin",
+                    Args(
+                        json = """
+                        {
+                          "padding": {},
+                          "margin": {}
+                        }
+                        """.trimIndent(),
+                        expected = PartialStackComponent(
+                            padding = Padding.zero,
+                            margin = Padding.zero,
+                        )
+                    )
+                ),
             )
         }
 

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
@@ -129,6 +129,36 @@ internal class TextComponentTests {
                         )
                     )
                 ),
+                arrayOf(
+                    "empty margin and padding",
+                    Args(
+                        json = """
+                        {
+                          "color": {
+                            "light": {
+                              "type": "hex",
+                              "value": "#ffffff"
+                            }
+                          },
+                          "components": [],
+                          "id": "xmpgCrN9Rb",
+                          "margin": {},
+                          "name": "Text",
+                          "padding": {},
+                          "text_lid": "7bkohQjzIE",
+                          "type": "text"
+                        }
+                        """.trimIndent(),
+                        expected = TextComponent(
+                            text = LocalizationKey("7bkohQjzIE"),
+                            color = ColorScheme(
+                                light = ColorInfo.Hex(colorInt(alpha = 0xff, red = 0xff, green = 0xff, blue = 0xff))
+                            ),
+                            padding = Padding.zero,
+                            margin = Padding.zero,
+                        )
+                    )
+                ),
             )
         }
 
@@ -244,6 +274,21 @@ internal class TextComponentTests {
                         expected = PartialTextComponent()
                     )
                 ),
+                arrayOf(
+                    "empty margin and padding",
+                    Args(
+                        json = """
+                        {
+                          "margin": {},
+                          "padding": {}
+                        }
+                        """.trimIndent(),
+                        expected = PartialTextComponent(
+                            padding = Padding.zero,
+                            margin = Padding.zero,
+                        )
+                    )
+                ),
             )
         }
 

diff --git a/purchases/src/test/java/com/revenuecat/purchases/paywalls/components/properties/FontTests.kt b/purchases/src/test/java/com/revenuecat/purchases/paywalls/components/properties/FontTests.kt
@@ -23,7 +23,7 @@ internal class FontTests {
                     FontWeight.LIGHT -> "\"light\""
                     FontWeight.REGULAR -> "\"regular\""
                     FontWeight.MEDIUM -> "\"medium\""
-                    FontWeight.SEMI_BOLD -> "\"semi_bold\""
+                    FontWeight.SEMI_BOLD -> "\"semibold\""
                     FontWeight.BOLD -> "\"bold\""
                     FontWeight.EXTRA_BOLD -> "\"extra_bold\""
                     FontWeight.BLACK -> "\"black\""