Make identifiers used in Screen constructor serializable

fmasa · Sep 8, 2023 · 4f7a2fe · 4f7a2fe
1 parent 9128fe3
commit 4f7a2fe
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 6 deletions.
diff --git a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/Identifier.kt b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/Identifier.kt
@@ -0,0 +1,6 @@
+package cz.frantisekmasa.wfrp_master.common.core.domain
+
+import dev.icerock.moko.parcelize.Parcelable
+import java.io.Serializable
+
+interface Identifier : Parcelable, Serializable
diff --git a/...monMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/identifiers/CharacterId.kt b/...monMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/identifiers/CharacterId.kt
@@ -1,8 +1,8 @@
 package cz.frantisekmasa.wfrp_master.common.core.domain.identifiers
 
+import cz.frantisekmasa.wfrp_master.common.core.domain.Identifier
 import cz.frantisekmasa.wfrp_master.common.core.domain.party.PartyId
-import dev.icerock.moko.parcelize.Parcelable
 import dev.icerock.moko.parcelize.Parcelize
 
 @Parcelize
-data class CharacterId(val partyId: PartyId, val id: String) : Parcelable
+data class CharacterId(val partyId: PartyId, val id: String) : Identifier
diff --git a/...monMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/identifiers/EncounterId.kt b/...monMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/identifiers/EncounterId.kt
@@ -1,8 +1,8 @@
 package cz.frantisekmasa.wfrp_master.common.core.domain.identifiers
 
 import androidx.compose.runtime.Immutable
+import cz.frantisekmasa.wfrp_master.common.core.domain.Identifier
 import cz.frantisekmasa.wfrp_master.common.core.domain.party.PartyId
-import dev.icerock.moko.parcelize.Parcelable
 import dev.icerock.moko.parcelize.Parcelize
 import kotlinx.serialization.Contextual
 import kotlinx.serialization.Serializable
@@ -14,4 +14,4 @@ import java.util.UUID
 data class EncounterId(
     val partyId: PartyId,
     @Contextual val encounterId: UUID,
-) : Parcelable
+) : Identifier
diff --git a/...on/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/party/PartyId.kt b/...on/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/party/PartyId.kt
@@ -3,7 +3,7 @@ package cz.frantisekmasa.wfrp_master.common.core.domain.party
 import androidx.compose.runtime.Immutable
 import com.benasher44.uuid.Uuid
 import com.benasher44.uuid.uuid4
-import dev.icerock.moko.parcelize.Parcelable
+import cz.frantisekmasa.wfrp_master.common.core.domain.Identifier
 import dev.icerock.moko.parcelize.Parcelize
 import kotlinx.serialization.Contextual
 import kotlinx.serialization.Serializable
@@ -13,7 +13,7 @@ import kotlin.jvm.JvmInline
 @Serializable
 @Parcelize
 @Immutable
-value class PartyId(@Contextual private val value: Uuid) : Parcelable {
+value class PartyId(@Contextual private val value: Uuid) : Identifier {
     companion object {
         fun generate(): PartyId = PartyId(uuid4())
     }