Merge pull request #43 from dropbox/parcelable

matt-ramotar · web-flow · commit cec9f9d3a8c0 · 2022-04-09T14:14:09.000-04:00
Add Parcelable
diff --git a/componentbox/build.gradle.kts b/componentbox/build.gradle.kts
@@ -14,6 +14,7 @@ plugins {
     id("org.jetbrains.kotlin.native.cocoapods")
     id("com.rickclephas.kmp.nativecoroutines")
     id("com.chromaticnoise.multiplatform-swiftpackage") version "2.0.3"
+    id("kotlin-android-extensions")
 }
 
 multiplatformSwiftPackage {
diff --git a/componentbox/src/androidMain/kotlin/com/dropbox/componentbox/foundation/Parcelable.kt b/componentbox/src/androidMain/kotlin/com/dropbox/componentbox/foundation/Parcelable.kt
@@ -0,0 +1,3 @@
+package com.dropbox.componentbox.foundation
+
+actual typealias Parcelable = android.os.Parcelable
diff --git a/componentbox/src/androidMain/kotlin/com/dropbox/componentbox/foundation/Parcelize.kt b/componentbox/src/androidMain/kotlin/com/dropbox/componentbox/foundation/Parcelize.kt
@@ -0,0 +1,3 @@
+package com.dropbox.componentbox.foundation
+
+actual typealias Parcelize = kotlinx.android.parcel.Parcelize
diff --git a/componentbox/src/commonMain/kotlin/com/dropbox/componentbox/foundation/BorderStroke.kt b/componentbox/src/commonMain/kotlin/com/dropbox/componentbox/foundation/BorderStroke.kt
@@ -2,8 +2,9 @@ package com.dropbox.componentbox.foundation
 
 import kotlinx.serialization.Serializable
 
+@Parcelize
 @Serializable
 data class BorderStroke(
     val width: Int,
     val color: Color
-)
+): Parcelable
diff --git a/componentbox/src/commonMain/kotlin/com/dropbox/componentbox/foundation/ButtonVariant.kt b/componentbox/src/commonMain/kotlin/com/dropbox/componentbox/foundation/ButtonVariant.kt
@@ -1,8 +1,10 @@
 package com.dropbox.componentbox.foundation
 
+import kotlinx.serialization.Serializable
 
-@kotlinx.serialization.Serializable
-enum class ButtonVariant {
+@Parcelize
+@Serializable
+enum class ButtonVariant: Parcelable {
     Contained,
     Text,
     Outlined,
diff --git a/componentbox/src/commonMain/kotlin/com/dropbox/componentbox/foundation/Component.kt b/componentbox/src/commonMain/kotlin/com/dropbox/componentbox/foundation/Component.kt
@@ -3,8 +3,9 @@ package com.dropbox.componentbox.foundation
 import kotlinx.serialization.Serializable
 
 @Serializable
-sealed class Component {
+sealed class Component: Parcelable {
 
+    @Parcelize
     @Serializable
     data class Box(
         val id: String,
@@ -13,8 +14,9 @@ sealed class Component {
         var horizontalArrangement: Arrangement? = null,
         var verticalAlignment: Alignment? = null,
         var action: String? = null,
-    ) : Component()
+    ) : Component(), Parcelable
 
+    @Parcelize
     @Serializable
     data class Row(
         val id: String,
@@ -24,8 +26,9 @@ sealed class Component {
         var verticalAlignment: Alignment? = null,
         var action: String? = null,
         var isLazy: Boolean? = null
-    ) : Component()
+    ) : Component(), Parcelable
 
+    @Parcelize
     @Serializable
     data class Column(
         val id: String,
@@ -36,17 +39,19 @@ sealed class Component {
         var isLazy: Boolean? = null,
         var isTable: Boolean? = null,
         var action: String? = null
-    ) : Component()
+    ) : Component(), Parcelable
 
+    @Parcelize
     @Serializable
     data class Text(
         val id: String,
         var modifier: Modifier? = null,
         var text: String? = null,
         var color: Color? = null,
         var textStyle: String? = null
-    ) : Component()
+    ) : Component(), Parcelable
 
+    @Parcelize
     @Serializable
     data class Button(
         val id: String,
@@ -55,16 +60,18 @@ sealed class Component {
         var isEnabled: Boolean? = null,
         var action: String? = null,
         var variant: String? = null,
-    ) : Component()
+    ) : Component(), Parcelable
 
+    @Parcelize
     @Serializable
     data class Switch(
         val id: String,
         var isChecked: Boolean? = null,
         var modifier: Modifier? = null,
         var action: String? = null,
-    ) : Component()
+    ) : Component(), Parcelable
 
+    @Parcelize
     @Serializable
     data class Drawable(
         val id: String,
@@ -74,8 +81,9 @@ sealed class Component {
         var modifier: Modifier? = null,
         var alignment: Alignment? = null,
         var contentScale: ContentScale? = null
-    ) : Component()
+    ) : Component(), Parcelable
 
+    @Parcelize
     @Serializable
     data class Vector(
         val id: String,
@@ -84,8 +92,9 @@ sealed class Component {
         var alignment: Alignment? = null,
         var contentScale: ContentScale? = null,
         var color: Color? = null
-    ) : Component()
+    ) : Component(), Parcelable
 
+    @Parcelize
     @Serializable
     data class Surface(
         val id: String,
@@ -96,6 +105,6 @@ sealed class Component {
         var borderStroke: BorderStroke? = null,
         var elevation: Int? = null,
         var components: MutableList<Component>? = null,
-    ) : Component()
+    ) : Component(), Parcelable
 }
 
diff --git a/componentbox/src/commonMain/kotlin/com/dropbox/componentbox/foundation/ComponentBox.kt b/componentbox/src/commonMain/kotlin/com/dropbox/componentbox/foundation/ComponentBox.kt
@@ -3,26 +3,29 @@ package com.dropbox.componentbox.foundation
 import kotlinx.serialization.Serializable
 
 @Serializable
-sealed class ComponentBox {
+sealed class ComponentBox: Parcelable {
+    @Parcelize
     @Serializable
     data class Screen(
         val title: String?,
         val verticalArrangement: Arrangement,
         val horizontalAlignment: Alignment,
         val components: List<Component>
-    ) : ComponentBox()
+    ) : ComponentBox(), Parcelable
 
+    @Parcelize
     @Serializable
     data class Modal(
         val verticalArrangement: Arrangement,
         val horizontalAlignment: Alignment,
         val components: List<Component>
-    ) : ComponentBox()
+    ) : ComponentBox(), Parcelable
 
+    @Parcelize
     @Serializable
     data class Banner(
         val verticalArrangement: Arrangement,
         val horizontalAlignment: Alignment,
         val components: List<Component>
-    ) : ComponentBox()
+    ) : ComponentBox(), Parcelable
 }
diff --git a/componentbox/src/commonMain/kotlin/com/dropbox/componentbox/foundation/ComponentBoxType.kt b/componentbox/src/commonMain/kotlin/com/dropbox/componentbox/foundation/ComponentBoxType.kt
@@ -2,8 +2,9 @@ package com.dropbox.componentbox.foundation
 
 import kotlinx.serialization.Serializable
 
+@Parcelize
 @Serializable
-enum class ComponentBoxType {
+enum class ComponentBoxType: Parcelable {
     Screen,
     Modal,
     Banner
diff --git a/componentbox/src/commonMain/kotlin/com/dropbox/componentbox/foundation/ComponentType.kt b/componentbox/src/commonMain/kotlin/com/dropbox/componentbox/foundation/ComponentType.kt
@@ -2,8 +2,9 @@ package com.dropbox.componentbox.foundation
 
 import kotlinx.serialization.Serializable
 
+@Parcelize
 @Serializable
-enum class ComponentType {
+enum class ComponentType: Parcelable {
     Box,
     Button,
     Column,
diff --git a/componentbox/src/commonMain/kotlin/com/dropbox/componentbox/foundation/Parcelable.kt b/componentbox/src/commonMain/kotlin/com/dropbox/componentbox/foundation/Parcelable.kt
@@ -0,0 +1,3 @@
+package com.dropbox.componentbox.foundation
+
+expect interface Parcelable
diff --git a/componentbox/src/commonMain/kotlin/com/dropbox/componentbox/foundation/Parcelize.kt b/componentbox/src/commonMain/kotlin/com/dropbox/componentbox/foundation/Parcelize.kt
@@ -0,0 +1,7 @@
+package com.dropbox.componentbox.foundation
+
+@OptIn(ExperimentalMultiplatform::class)
+@OptionalExpectation
+@Target(AnnotationTarget.CLASS)
+@Retention(AnnotationRetention.BINARY)
+expect annotation class Parcelize()
diff --git a/componentbox/src/commonMain/kotlin/com/dropbox/componentbox/foundation/Shape.kt b/componentbox/src/commonMain/kotlin/com/dropbox/componentbox/foundation/Shape.kt
@@ -2,8 +2,9 @@ package com.dropbox.componentbox.foundation
 
 import kotlinx.serialization.Serializable
 
+@Parcelize
 @Serializable
-enum class Shape {
+enum class Shape: Parcelable {
     RectangleShape,
     RoundedCornerShape,
     CircleShape
diff --git a/componentbox/src/commonMain/kotlin/com/dropbox/componentbox/foundation/color.kt b/componentbox/src/commonMain/kotlin/com/dropbox/componentbox/foundation/color.kt
@@ -7,12 +7,13 @@ import kotlinx.serialization.json.JsonPrimitive
 import kotlinx.serialization.json.JsonTransformingSerializer
 import kotlinx.serialization.json.jsonPrimitive
 
+@Parcelize
 @Serializable
 data class Color(
     val title: String,
     val light: Long,
     val dark: Long
-)
+): Parcelable
 
 interface Colors {
     val primary: Color
diff --git a/componentbox/src/commonMain/kotlin/com/dropbox/componentbox/foundation/layout.kt b/componentbox/src/commonMain/kotlin/com/dropbox/componentbox/foundation/layout.kt
@@ -2,8 +2,9 @@ package com.dropbox.componentbox.foundation
 
 import kotlinx.serialization.Serializable
 
+@Parcelize
 @Serializable
-enum class Alignment {
+enum class Alignment: Parcelable {
     TopStart,
     TopCenter,
     TopEnd,
@@ -21,8 +22,9 @@ enum class Alignment {
     End
 }
 
+@Parcelize
 @Serializable
-enum class Arrangement {
+enum class Arrangement: Parcelable {
     Start,
     End,
     Top,
diff --git a/componentbox/src/commonMain/kotlin/com/dropbox/componentbox/foundation/modifier.kt b/componentbox/src/commonMain/kotlin/com/dropbox/componentbox/foundation/modifier.kt
@@ -2,6 +2,7 @@ package com.dropbox.componentbox.foundation
 
 import kotlinx.serialization.Serializable
 
+@Parcelize
 @Serializable
 data class Modifier(
     var fillMaxSize: Boolean? = null,
@@ -13,26 +14,29 @@ data class Modifier(
     var margin: Margin? = null,
     var background: Color? = null,
     var weight: Float? = null
-)
+): Parcelable
 
+@Parcelize
 @Serializable
 data class Margin(
     val start: Int? = null,
     val top: Int? = null,
     val end: Int? = null,
     val bottom: Int? = null
-)
+): Parcelable
 
+@Parcelize
 @Serializable
 data class Padding(
     val start: Int? = null,
     val top: Int? = null,
     val end: Int? = null,
     val bottom: Int? = null
-)
+): Parcelable
 
+@Parcelize
 @Serializable
-enum class ContentScale {
+enum class ContentScale: Parcelable {
     Crop,
     Fit,
     FillHeight,
diff --git a/componentbox/src/commonMain/kotlin/com/dropbox/componentbox/presentation/ComponentBoxViewModel.kt b/componentbox/src/commonMain/kotlin/com/dropbox/componentbox/presentation/ComponentBoxViewModel.kt
@@ -1,12 +1,15 @@
 package com.dropbox.componentbox.presentation
 
 import com.dropbox.componentbox.foundation.ComponentBox
+import com.dropbox.componentbox.foundation.Parcelable
+import com.dropbox.componentbox.foundation.Parcelize
 import kotlinx.serialization.Serializable
 
+@Parcelize
 @Serializable
 data class ComponentBoxViewModel<C : ComponentBox>(
     val root: C? = null
-)
+) : Parcelable
 
 
 
diff --git a/componentbox/src/iosArm64Main/kotlin/com/dropbox/componentbox/foundation/Parcelable.kt b/componentbox/src/iosArm64Main/kotlin/com/dropbox/componentbox/foundation/Parcelable.kt
@@ -0,0 +1,3 @@
+package com.dropbox.componentbox.foundation
+
+actual interface Parcelable
diff --git a/componentbox/src/iosSimulatorArm64Main/kotlin/com/dropbox/componentbox/foundation/Parcelable.kt b/componentbox/src/iosSimulatorArm64Main/kotlin/com/dropbox/componentbox/foundation/Parcelable.kt
@@ -0,0 +1,3 @@
+package com.dropbox.componentbox.foundation
+
+actual interface Parcelable
diff --git a/componentbox/src/iosX64Main/kotlin/com/dropbox/componentbox/foundation/Parcelable.kt b/componentbox/src/iosX64Main/kotlin/com/dropbox/componentbox/foundation/Parcelable.kt
@@ -0,0 +1,3 @@
+package com.dropbox.componentbox.foundation
+
+actual interface Parcelable
diff --git a/componentbox/src/jsMain/kotlin/com/dropbox/componentbox/foundation/Parcelable.kt b/componentbox/src/jsMain/kotlin/com/dropbox/componentbox/foundation/Parcelable.kt
@@ -0,0 +1,3 @@
+package com.dropbox.componentbox.foundation
+
+actual interface Parcelable
diff --git a/componentbox/src/jvmMain/kotlin/com/dropbox/componentbox/foundation/Parcelable.kt b/componentbox/src/jvmMain/kotlin/com/dropbox/componentbox/foundation/Parcelable.kt
@@ -0,0 +1,3 @@
+package com.dropbox.componentbox.foundation
+
+actual interface Parcelable

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@ plugins {`
`14`	`14`	`id("org.jetbrains.kotlin.native.cocoapods")`
`15`	`15`	`id("com.rickclephas.kmp.nativecoroutines")`
`16`	`16`	`id("com.chromaticnoise.multiplatform-swiftpackage") version "2.0.3"`
	`17`	`+ id("kotlin-android-extensions")`
`17`	`18`	`}`
`18`	`19`
`19`	`20`	`multiplatformSwiftPackage {`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+package com.dropbox.componentbox.foundation`
	`2`	`+`
	`3`	`+actual typealias Parcelable = android.os.Parcelable`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+package com.dropbox.componentbox.foundation`
	`2`	`+`
	`3`	`+actual typealias Parcelize = kotlinx.android.parcel.Parcelize`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+package com.dropbox.componentbox.foundation`
	`2`	`+`
	`3`	`+expect interface Parcelable`