Merge pull request #44 from dropbox/parcelable

matt-ramotar · web-flow · commit fe905036f38d · 2022-04-09T15:20:09.000-04:00
Rename to passable
diff --git a/componentbox/src/androidMain/kotlin/com/dropbox/componentbox/foundation/IsPassable.kt b/componentbox/src/androidMain/kotlin/com/dropbox/componentbox/foundation/IsPassable.kt
@@ -0,0 +1,3 @@
+package com.dropbox.componentbox.foundation
+
+actual typealias IsPassable = kotlinx.android.parcel.Parcelize
diff --git a/componentbox/src/androidMain/kotlin/com/dropbox/componentbox/foundation/Parcelable.kt b/componentbox/src/androidMain/kotlin/com/dropbox/componentbox/foundation/Parcelable.kt
diff --git a/componentbox/src/androidMain/kotlin/com/dropbox/componentbox/foundation/Parcelize.kt b/componentbox/src/androidMain/kotlin/com/dropbox/componentbox/foundation/Parcelize.kt
diff --git a/componentbox/src/androidMain/kotlin/com/dropbox/componentbox/foundation/Passable.kt b/componentbox/src/androidMain/kotlin/com/dropbox/componentbox/foundation/Passable.kt
@@ -0,0 +1,3 @@
+package com.dropbox.componentbox.foundation
+
+actual typealias Passable = android.os.Parcelable
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,9 +2,9 @@ package com.dropbox.componentbox.foundation
 
 import kotlinx.serialization.Serializable
 
-@Parcelize
+@IsPassable
 @Serializable
 data class BorderStroke(
     val width: Int,
     val color: Color
-): Parcelable
+): Passable
diff --git a/componentbox/src/commonMain/kotlin/com/dropbox/componentbox/foundation/ButtonVariant.kt b/componentbox/src/commonMain/kotlin/com/dropbox/componentbox/foundation/ButtonVariant.kt
@@ -2,9 +2,9 @@ package com.dropbox.componentbox.foundation
 
 import kotlinx.serialization.Serializable
 
-@Parcelize
+@IsPassable
 @Serializable
-enum class ButtonVariant: Parcelable {
+enum class ButtonVariant: Passable {
     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,9 +3,9 @@ package com.dropbox.componentbox.foundation
 import kotlinx.serialization.Serializable
 
 @Serializable
-sealed class Component: Parcelable {
+sealed class Component: Passable {
 
-    @Parcelize
+    @IsPassable
     @Serializable
     data class Box(
         val id: String,
@@ -14,9 +14,9 @@ sealed class Component: Parcelable {
         var horizontalArrangement: Arrangement? = null,
         var verticalAlignment: Alignment? = null,
         var action: String? = null,
-    ) : Component(), Parcelable
+    ) : Component(), Passable
 
-    @Parcelize
+    @IsPassable
     @Serializable
     data class Row(
         val id: String,
@@ -26,9 +26,9 @@ sealed class Component: Parcelable {
         var verticalAlignment: Alignment? = null,
         var action: String? = null,
         var isLazy: Boolean? = null
-    ) : Component(), Parcelable
+    ) : Component(), Passable
 
-    @Parcelize
+    @IsPassable
     @Serializable
     data class Column(
         val id: String,
@@ -39,19 +39,19 @@ sealed class Component: Parcelable {
         var isLazy: Boolean? = null,
         var isTable: Boolean? = null,
         var action: String? = null
-    ) : Component(), Parcelable
+    ) : Component(), Passable
 
-    @Parcelize
+    @IsPassable
     @Serializable
     data class Text(
         val id: String,
         var modifier: Modifier? = null,
         var text: String? = null,
         var color: Color? = null,
         var textStyle: String? = null
-    ) : Component(), Parcelable
+    ) : Component(), Passable
 
-    @Parcelize
+    @IsPassable
     @Serializable
     data class Button(
         val id: String,
@@ -60,18 +60,18 @@ sealed class Component: Parcelable {
         var isEnabled: Boolean? = null,
         var action: String? = null,
         var variant: String? = null,
-    ) : Component(), Parcelable
+    ) : Component(), Passable
 
-    @Parcelize
+    @IsPassable
     @Serializable
     data class Switch(
         val id: String,
         var isChecked: Boolean? = null,
         var modifier: Modifier? = null,
         var action: String? = null,
-    ) : Component(), Parcelable
+    ) : Component(), Passable
 
-    @Parcelize
+    @IsPassable
     @Serializable
     data class Drawable(
         val id: String,
@@ -81,9 +81,9 @@ sealed class Component: Parcelable {
         var modifier: Modifier? = null,
         var alignment: Alignment? = null,
         var contentScale: ContentScale? = null
-    ) : Component(), Parcelable
+    ) : Component(), Passable
 
-    @Parcelize
+    @IsPassable
     @Serializable
     data class Vector(
         val id: String,
@@ -92,9 +92,9 @@ sealed class Component: Parcelable {
         var alignment: Alignment? = null,
         var contentScale: ContentScale? = null,
         var color: Color? = null
-    ) : Component(), Parcelable
+    ) : Component(), Passable
 
-    @Parcelize
+    @IsPassable
     @Serializable
     data class Surface(
         val id: String,
@@ -105,6 +105,6 @@ sealed class Component: Parcelable {
         var borderStroke: BorderStroke? = null,
         var elevation: Int? = null,
         var components: MutableList<Component>? = null,
-    ) : Component(), Parcelable
+    ) : Component(), Passable
 }
 
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,29 +3,29 @@ package com.dropbox.componentbox.foundation
 import kotlinx.serialization.Serializable
 
 @Serializable
-sealed class ComponentBox: Parcelable {
-    @Parcelize
+sealed class ComponentBox: Passable {
+    @IsPassable
     @Serializable
     data class Screen(
         val title: String?,
         val verticalArrangement: Arrangement,
         val horizontalAlignment: Alignment,
         val components: List<Component>
-    ) : ComponentBox(), Parcelable
+    ) : ComponentBox(), Passable
 
-    @Parcelize
+    @IsPassable
     @Serializable
     data class Modal(
         val verticalArrangement: Arrangement,
         val horizontalAlignment: Alignment,
         val components: List<Component>
-    ) : ComponentBox(), Parcelable
+    ) : ComponentBox(), Passable
 
-    @Parcelize
+    @IsPassable
     @Serializable
     data class Banner(
         val verticalArrangement: Arrangement,
         val horizontalAlignment: Alignment,
         val components: List<Component>
-    ) : ComponentBox(), Parcelable
+    ) : ComponentBox(), Passable
 }
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,9 +2,9 @@ package com.dropbox.componentbox.foundation
 
 import kotlinx.serialization.Serializable
 
-@Parcelize
+@IsPassable
 @Serializable
-enum class ComponentBoxType: Parcelable {
+enum class ComponentBoxType: Passable {
     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,9 +2,9 @@ package com.dropbox.componentbox.foundation
 
 import kotlinx.serialization.Serializable
 
-@Parcelize
+@IsPassable
 @Serializable
-enum class ComponentType: Parcelable {
+enum class ComponentType: Passable {
     Box,
     Button,
     Column,
diff --git a/componentbox/src/commonMain/kotlin/com/dropbox/componentbox/foundation/IsPassable.kt b/componentbox/src/commonMain/kotlin/com/dropbox/componentbox/foundation/IsPassable.kt
@@ -4,4 +4,4 @@ package com.dropbox.componentbox.foundation
 @OptionalExpectation
 @Target(AnnotationTarget.CLASS)
 @Retention(AnnotationRetention.BINARY)
-expect annotation class Parcelize()
+expect annotation class IsPassable()
diff --git a/componentbox/src/commonMain/kotlin/com/dropbox/componentbox/foundation/Passable.kt b/componentbox/src/commonMain/kotlin/com/dropbox/componentbox/foundation/Passable.kt
@@ -1,3 +1,3 @@
 package com.dropbox.componentbox.foundation
 
-actual interface Parcelable
+expect interface Passable
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,9 +2,9 @@ package com.dropbox.componentbox.foundation
 
 import kotlinx.serialization.Serializable
 
-@Parcelize
+@IsPassable
 @Serializable
-enum class Shape: Parcelable {
+enum class Shape: Passable {
     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,13 +7,13 @@ import kotlinx.serialization.json.JsonPrimitive
 import kotlinx.serialization.json.JsonTransformingSerializer
 import kotlinx.serialization.json.jsonPrimitive
 
-@Parcelize
+@IsPassable
 @Serializable
 data class Color(
     val title: String,
     val light: Long,
     val dark: Long
-): Parcelable
+): Passable
 
 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,9 +2,9 @@ package com.dropbox.componentbox.foundation
 
 import kotlinx.serialization.Serializable
 
-@Parcelize
+@IsPassable
 @Serializable
-enum class Alignment: Parcelable {
+enum class Alignment: Passable {
     TopStart,
     TopCenter,
     TopEnd,
@@ -22,9 +22,9 @@ enum class Alignment: Parcelable {
     End
 }
 
-@Parcelize
+@IsPassable
 @Serializable
-enum class Arrangement: Parcelable {
+enum class Arrangement: Passable {
     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,7 +2,7 @@ package com.dropbox.componentbox.foundation
 
 import kotlinx.serialization.Serializable
 
-@Parcelize
+@IsPassable
 @Serializable
 data class Modifier(
     var fillMaxSize: Boolean? = null,
@@ -14,29 +14,29 @@ data class Modifier(
     var margin: Margin? = null,
     var background: Color? = null,
     var weight: Float? = null
-): Parcelable
+): Passable
 
-@Parcelize
+@IsPassable
 @Serializable
 data class Margin(
     val start: Int? = null,
     val top: Int? = null,
     val end: Int? = null,
     val bottom: Int? = null
-): Parcelable
+): Passable
 
-@Parcelize
+@IsPassable
 @Serializable
 data class Padding(
     val start: Int? = null,
     val top: Int? = null,
     val end: Int? = null,
     val bottom: Int? = null
-): Parcelable
+): Passable
 
-@Parcelize
+@IsPassable
 @Serializable
-enum class ContentScale: Parcelable {
+enum class ContentScale: Passable {
     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,15 +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 com.dropbox.componentbox.foundation.Passable
+import com.dropbox.componentbox.foundation.IsPassable
 import kotlinx.serialization.Serializable
 
-@Parcelize
+@IsPassable
 @Serializable
 data class ComponentBoxViewModel<C : ComponentBox>(
     val root: C? = null
-) : Parcelable
+) : Passable
 
 
 
diff --git a/componentbox/src/iosArm64Main/kotlin/com/dropbox/componentbox/foundation/Passable.kt b/componentbox/src/iosArm64Main/kotlin/com/dropbox/componentbox/foundation/Passable.kt
@@ -1,3 +1,3 @@
 package com.dropbox.componentbox.foundation
 
-actual interface Parcelable
+actual interface Passable
diff --git a/componentbox/src/iosSimulatorArm64Main/kotlin/com/dropbox/componentbox/foundation/Passable.kt b/componentbox/src/iosSimulatorArm64Main/kotlin/com/dropbox/componentbox/foundation/Passable.kt
@@ -1,3 +1,3 @@
 package com.dropbox.componentbox.foundation
 
-expect interface Parcelable
+actual interface Passable
diff --git a/componentbox/src/iosX64Main/kotlin/com/dropbox/componentbox/foundation/Passable.kt b/componentbox/src/iosX64Main/kotlin/com/dropbox/componentbox/foundation/Passable.kt
@@ -1,3 +1,3 @@
 package com.dropbox.componentbox.foundation
 
-actual interface Parcelable
+actual interface Passable
diff --git a/componentbox/src/jsMain/kotlin/com/dropbox/componentbox/foundation/Parcelable.kt b/componentbox/src/jsMain/kotlin/com/dropbox/componentbox/foundation/Parcelable.kt
diff --git a/componentbox/src/jsMain/kotlin/com/dropbox/componentbox/foundation/Passable.kt b/componentbox/src/jsMain/kotlin/com/dropbox/componentbox/foundation/Passable.kt
@@ -0,0 +1,3 @@
+package com.dropbox.componentbox.foundation
+
+actual interface Passable
diff --git a/componentbox/src/jvmMain/kotlin/com/dropbox/componentbox/foundation/Parcelable.kt b/componentbox/src/jvmMain/kotlin/com/dropbox/componentbox/foundation/Parcelable.kt
diff --git a/componentbox/src/jvmMain/kotlin/com/dropbox/componentbox/foundation/Passable.kt b/componentbox/src/jvmMain/kotlin/com/dropbox/componentbox/foundation/Passable.kt
@@ -0,0 +1,5 @@
+package com.dropbox.componentbox.foundation
+
+import java.io.Serializable
+
+actual typealias Passable = Serializable

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+package com.dropbox.componentbox.foundation`
	`2`	`+`
	`3`	`+actual typealias IsPassable = 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`	`+actual typealias Passable = android.os.Parcelable`