Keep only one typealias for SavedStateMap and moved it to utils-multi…

…platform
bumble-tech · Jan 11, 2024 · 0a7f558 · 0a7f558
1 parent 8a9dac7
commit 0a7f558
Show file tree

Hide file tree

Showing 21 changed files with 20 additions and 25 deletions.
diff --git a/...common/src/commonMain/kotlin/com/bumble/appyx/components/experimental/cards/CardsModel.kt b/...common/src/commonMain/kotlin/com/bumble/appyx/components/experimental/cards/CardsModel.kt
@@ -6,10 +6,10 @@ import com.bumble.appyx.components.experimental.cards.CardsModel.State.Card.Visi
 import com.bumble.appyx.interactions.core.Element
 import com.bumble.appyx.interactions.core.asElement
 import com.bumble.appyx.interactions.core.model.transition.BaseTransitionModel
-import com.bumble.appyx.interactions.core.state.SavedStateMap
 import com.bumble.appyx.utils.multiplatform.Parcelable
 import com.bumble.appyx.utils.multiplatform.Parcelize
 import com.bumble.appyx.utils.multiplatform.RawValue
+import com.bumble.appyx.utils.multiplatform.SavedStateMap
 
 class CardsModel<InteractionTarget : Any>(
     initialItems: List<InteractionTarget> = listOf(),

diff --git a/...mental/modal/common/src/commonMain/kotlin/com/bumble/appyx/components/modal/ModalModel.kt b/...mental/modal/common/src/commonMain/kotlin/com/bumble/appyx/components/modal/ModalModel.kt
@@ -4,9 +4,9 @@ import com.bumble.appyx.interactions.core.Element
 import com.bumble.appyx.interactions.core.Elements
 import com.bumble.appyx.interactions.core.asElement
 import com.bumble.appyx.interactions.core.model.transition.BaseTransitionModel
-import com.bumble.appyx.interactions.core.state.SavedStateMap
 import com.bumble.appyx.utils.multiplatform.Parcelable
 import com.bumble.appyx.utils.multiplatform.Parcelize
+import com.bumble.appyx.utils.multiplatform.SavedStateMap
 
 class ModalModel<InteractionTarget : Any>(
     initialElements: List<InteractionTarget>,

diff --git a/.../src/commonMain/kotlin/com/bumble/appyx/components/experimental/promoter/PromoterModel.kt b/.../src/commonMain/kotlin/com/bumble/appyx/components/experimental/promoter/PromoterModel.kt
@@ -3,9 +3,9 @@ package com.bumble.appyx.components.experimental.promoter
 import com.bumble.appyx.components.experimental.promoter.PromoterModel.State.ElementState.DESTROYED
 import com.bumble.appyx.interactions.core.Element
 import com.bumble.appyx.interactions.core.model.transition.BaseTransitionModel
-import com.bumble.appyx.interactions.core.state.SavedStateMap
 import com.bumble.appyx.utils.multiplatform.Parcelable
 import com.bumble.appyx.utils.multiplatform.Parcelize
+import com.bumble.appyx.utils.multiplatform.SavedStateMap
 
 class PromoterModel<InteractionTarget : Any>(
     savedStateMap: SavedStateMap?,

diff --git a/.../src/commonMain/kotlin/com/bumble/appyx/components/experimental/puzzle15/Puzzle15Model.kt b/.../src/commonMain/kotlin/com/bumble/appyx/components/experimental/puzzle15/Puzzle15Model.kt
@@ -4,10 +4,10 @@ import com.bumble.appyx.components.experimental.puzzle15.Puzzle15Model.Tile
 import com.bumble.appyx.interactions.core.Element
 import com.bumble.appyx.interactions.core.asElement
 import com.bumble.appyx.interactions.core.model.transition.BaseTransitionModel
-import com.bumble.appyx.interactions.core.state.SavedStateMap
 import com.bumble.appyx.utils.multiplatform.Parcelable
 import com.bumble.appyx.utils.multiplatform.Parcelize
 import com.bumble.appyx.utils.multiplatform.RawValue
+import com.bumble.appyx.utils.multiplatform.SavedStateMap
 
 class Puzzle15Model(
     savedStateMap: SavedStateMap?

diff --git a/...on/src/commonMain/kotlin/com/bumble/appyx/components/internal/testdrive/TestDriveModel.kt b/...on/src/commonMain/kotlin/com/bumble/appyx/components/internal/testdrive/TestDriveModel.kt
@@ -4,9 +4,9 @@ import com.bumble.appyx.components.internal.testdrive.TestDriveModel.State.Eleme
 import com.bumble.appyx.interactions.core.Element
 import com.bumble.appyx.interactions.core.asElement
 import com.bumble.appyx.interactions.core.model.transition.BaseTransitionModel
-import com.bumble.appyx.interactions.core.state.SavedStateMap
 import com.bumble.appyx.utils.multiplatform.Parcelable
 import com.bumble.appyx.utils.multiplatform.Parcelize
+import com.bumble.appyx.utils.multiplatform.SavedStateMap
 
 class TestDriveModel<InteractionTarget : Any>(
     val element: InteractionTarget,

diff --git a/...tack/common/src/commonMain/kotlin/com/bumble/appyx/components/backstack/BackStackModel.kt b/...tack/common/src/commonMain/kotlin/com/bumble/appyx/components/backstack/BackStackModel.kt
@@ -5,9 +5,9 @@ import com.bumble.appyx.interactions.core.Element
 import com.bumble.appyx.interactions.core.Elements
 import com.bumble.appyx.interactions.core.asElement
 import com.bumble.appyx.interactions.core.model.transition.BaseTransitionModel
-import com.bumble.appyx.interactions.core.state.SavedStateMap
 import com.bumble.appyx.utils.multiplatform.Parcelable
 import com.bumble.appyx.utils.multiplatform.Parcelize
+import com.bumble.appyx.utils.multiplatform.SavedStateMap
 
 class BackStackModel<InteractionTarget : Any>(
     initialTargets: List<InteractionTarget>,

diff --git a/...ight/common/src/commonMain/kotlin/com/bumble/appyx/components/spotlight/SpotlightModel.kt b/...ight/common/src/commonMain/kotlin/com/bumble/appyx/components/spotlight/SpotlightModel.kt
@@ -6,10 +6,10 @@ import com.bumble.appyx.components.spotlight.SpotlightModel.State.ElementState.S
 import com.bumble.appyx.interactions.core.Element
 import com.bumble.appyx.interactions.core.asElement
 import com.bumble.appyx.interactions.core.model.transition.BaseTransitionModel
-import com.bumble.appyx.interactions.core.state.SavedStateMap
 import com.bumble.appyx.utils.multiplatform.Parcelable
 import com.bumble.appyx.utils.multiplatform.Parcelize
 import com.bumble.appyx.utils.multiplatform.RawValue
+import com.bumble.appyx.utils.multiplatform.SavedStateMap
 
 class SpotlightModel<InteractionTarget : Any>(
     items: List<InteractionTarget>,

diff --git a/...monMain/kotlin/com/bumble/appyx/interactions/core/model/transition/BaseTransitionModel.kt b/...monMain/kotlin/com/bumble/appyx/interactions/core/model/transition/BaseTransitionModel.kt
@@ -7,9 +7,9 @@ import com.bumble.appyx.interactions.core.model.transition.Operation.Mode.KEYFRA
 import com.bumble.appyx.interactions.core.model.transition.TransitionModel.Output
 import com.bumble.appyx.interactions.core.model.transition.TransitionModel.SettleDirection
 import com.bumble.appyx.interactions.core.state.MutableSavedStateMap
-import com.bumble.appyx.interactions.core.state.SavedStateMap
 import com.bumble.appyx.utils.multiplatform.AppyxLogger
 import com.bumble.appyx.utils.multiplatform.Parcelable
+import com.bumble.appyx.utils.multiplatform.SavedStateMap
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableStateFlow

diff --git a/...rc/commonMain/kotlin/com/bumble/appyx/interactions/core/state/MutableSavedStateMapImpl.kt b/...rc/commonMain/kotlin/com/bumble/appyx/interactions/core/state/MutableSavedStateMapImpl.kt
@@ -1,6 +1,7 @@
 package com.bumble.appyx.interactions.core.state
 
 import androidx.compose.runtime.saveable.SaverScope
+import com.bumble.appyx.utils.multiplatform.SavedStateMap
 
 class MutableSavedStateMapImpl(
     private val map: MutableMap<String, Any?> = HashMap(),

diff --git a/...ns/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/state/SavedStateMap.kt b/...ns/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/state/SavedStateMap.kt
diff --git a/.../src/commonMain/kotlin/com/bumble/appyx/interactions/permanent/PermanentAppyxComponent.kt b/.../src/commonMain/kotlin/com/bumble/appyx/interactions/permanent/PermanentAppyxComponent.kt
@@ -4,9 +4,9 @@ import com.bumble.appyx.interactions.core.model.AppyxComponent
 import com.bumble.appyx.interactions.core.model.progress.InstantProgressController
 import com.bumble.appyx.interactions.core.model.transition.Operation
 import com.bumble.appyx.interactions.core.state.MutableSavedStateMap
-import com.bumble.appyx.interactions.core.state.SavedStateMap
 import com.bumble.appyx.interactions.permanent.PermanentModel.State
 import com.bumble.appyx.mapState
+import com.bumble.appyx.utils.multiplatform.SavedStateMap
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob

diff --git a/...ns/common/src/commonMain/kotlin/com/bumble/appyx/interactions/permanent/PermanentModel.kt b/...ns/common/src/commonMain/kotlin/com/bumble/appyx/interactions/permanent/PermanentModel.kt
@@ -4,10 +4,10 @@ import com.bumble.appyx.interactions.core.Element
 import com.bumble.appyx.interactions.core.Elements
 import com.bumble.appyx.interactions.core.asElement
 import com.bumble.appyx.interactions.core.model.transition.BaseTransitionModel
-import com.bumble.appyx.interactions.core.state.SavedStateMap
 import com.bumble.appyx.interactions.permanent.PermanentModel.State
 import com.bumble.appyx.utils.multiplatform.Parcelable
 import com.bumble.appyx.utils.multiplatform.Parcelize
+import com.bumble.appyx.utils.multiplatform.SavedStateMap
 
 class PermanentModel<InteractionTarget : Any>(
     savedStateMap: SavedStateMap?,

diff --git a/...avigation/common/src/commonMain/kotlin/com/bumble/appyx/navigation/children/ChildEntry.kt b/...avigation/common/src/commonMain/kotlin/com/bumble/appyx/navigation/children/ChildEntry.kt
@@ -2,7 +2,7 @@ package com.bumble.appyx.navigation.children
 
 import com.bumble.appyx.interactions.core.Element
 import com.bumble.appyx.navigation.node.Node
-import com.bumble.appyx.navigation.state.SavedStateMap
+import com.bumble.appyx.utils.multiplatform.SavedStateMap
 
 // custom equals/hashCode for MutableStateFlow and equality checks
 sealed class ChildEntry<T> {

diff --git a/...on/src/commonMain/kotlin/com/bumble/appyx/navigation/children/ChildNodeCreationManager.kt b/...on/src/commonMain/kotlin/com/bumble/appyx/navigation/children/ChildNodeCreationManager.kt
@@ -6,7 +6,7 @@ import com.bumble.appyx.navigation.modality.AncestryInfo
 import com.bumble.appyx.navigation.modality.BuildContext
 import com.bumble.appyx.navigation.node.ParentNode
 import com.bumble.appyx.navigation.node.build
-import com.bumble.appyx.navigation.state.SavedStateMap
+import com.bumble.appyx.utils.multiplatform.SavedStateMap
 import com.bumble.appyx.utils.customisations.NodeCustomisationDirectory
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow

diff --git a/...vigation/common/src/commonMain/kotlin/com/bumble/appyx/navigation/integration/NodeHost.kt b/...vigation/common/src/commonMain/kotlin/com/bumble/appyx/navigation/integration/NodeHost.kt
@@ -16,7 +16,7 @@ import com.bumble.appyx.navigation.lifecycle.PlatformLifecycleEventObserver
 import com.bumble.appyx.navigation.modality.BuildContext
 import com.bumble.appyx.navigation.node.Node
 import com.bumble.appyx.navigation.node.build
-import com.bumble.appyx.navigation.state.SavedStateMap
+import com.bumble.appyx.utils.multiplatform.SavedStateMap
 import com.bumble.appyx.utils.customisations.NodeCustomisationDirectory
 import com.bumble.appyx.utils.customisations.NodeCustomisationDirectoryImpl
 

diff --git a/...igation/common/src/commonMain/kotlin/com/bumble/appyx/navigation/modality/BuildContext.kt b/...igation/common/src/commonMain/kotlin/com/bumble/appyx/navigation/modality/BuildContext.kt
@@ -2,7 +2,7 @@ package com.bumble.appyx.navigation.modality
 
 import com.bumble.appyx.interactions.UUID
 import com.bumble.appyx.interactions.core.state.MutableSavedStateMap
-import com.bumble.appyx.navigation.state.SavedStateMap
+import com.bumble.appyx.utils.multiplatform.SavedStateMap
 import com.bumble.appyx.utils.customisations.NodeCustomisation
 import com.bumble.appyx.utils.customisations.NodeCustomisationDirectory
 import com.bumble.appyx.utils.customisations.NodeCustomisationDirectoryImpl

diff --git a/appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/navigation/node/Node.kt b/appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/navigation/node/Node.kt
@@ -25,7 +25,7 @@ import com.bumble.appyx.navigation.plugin.NodeLifecycleAware
 import com.bumble.appyx.navigation.plugin.NodeReadyObserver
 import com.bumble.appyx.navigation.plugin.UpNavigationHandler
 import com.bumble.appyx.navigation.plugin.plugins
-import com.bumble.appyx.navigation.state.SavedStateMap
+import com.bumble.appyx.utils.multiplatform.SavedStateMap
 import com.bumble.appyx.navigation.store.RetainedInstanceStore
 import com.bumble.appyx.utils.multiplatform.BuildFlags
 import kotlinx.coroutines.CoroutineScope

diff --git a/...rk/benchmark-app/src/main/kotlin/com/bumble/appyx/benchmark/app/mosaic/MosaicComponent.kt b/...rk/benchmark-app/src/main/kotlin/com/bumble/appyx/benchmark/app/mosaic/MosaicComponent.kt
@@ -4,7 +4,7 @@ import androidx.compose.animation.core.SpringSpec
 import com.bumble.appyx.benchmark.app.mosaic.MosaicModel.State
 import com.bumble.appyx.interactions.core.model.BaseAppyxComponent
 import com.bumble.appyx.interactions.core.ui.helper.DefaultAnimationSpec
-import com.bumble.appyx.navigation.state.SavedStateMap
+import com.bumble.appyx.utils.multiplatform.SavedStateMap
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob

diff --git a/benchmark/benchmark-app/src/main/kotlin/com/bumble/appyx/benchmark/app/mosaic/MosaicModel.kt b/benchmark/benchmark-app/src/main/kotlin/com/bumble/appyx/benchmark/app/mosaic/MosaicModel.kt
@@ -5,7 +5,7 @@ import com.bumble.appyx.interactions.core.Element
 import com.bumble.appyx.interactions.core.Elements
 import com.bumble.appyx.interactions.core.asElements
 import com.bumble.appyx.interactions.core.model.transition.BaseTransitionModel
-import com.bumble.appyx.navigation.state.SavedStateMap
+import com.bumble.appyx.utils.multiplatform.SavedStateMap
 import com.bumble.appyx.utils.multiplatform.Parcelable
 import com.bumble.appyx.utils.multiplatform.Parcelize
 import com.bumble.appyx.utils.multiplatform.RawValue

diff --git a/...mmonMain/kotlin/com/bumble/appyx/navigation/component/spotlighthero/SpotlightHeroModel.kt b/...mmonMain/kotlin/com/bumble/appyx/navigation/component/spotlighthero/SpotlightHeroModel.kt
@@ -3,11 +3,11 @@ package com.bumble.appyx.navigation.component.spotlighthero
 import com.bumble.appyx.interactions.core.Element
 import com.bumble.appyx.interactions.core.asElement
 import com.bumble.appyx.interactions.core.model.transition.BaseTransitionModel
-import com.bumble.appyx.interactions.core.state.SavedStateMap
 import com.bumble.appyx.navigation.component.spotlighthero.SpotlightHeroModel.State
 import com.bumble.appyx.utils.multiplatform.Parcelable
 import com.bumble.appyx.utils.multiplatform.Parcelize
 import com.bumble.appyx.utils.multiplatform.RawValue
+import com.bumble.appyx.utils.multiplatform.SavedStateMap
 
 class SpotlightHeroModel<InteractionTarget : Any>(
     items: List<Pair<InteractionTarget, InteractionTarget>>,

diff --git a/...e/appyx/navigation/state/SavedStateMap.kt → ...ppyx/utils/multiplatform/SavedStateMap.kt b/...e/appyx/navigation/state/SavedStateMap.kt → ...ppyx/utils/multiplatform/SavedStateMap.kt
@@ -1,4 +1,4 @@
-package com.bumble.appyx.navigation.state
+package com.bumble.appyx.utils.multiplatform
 
 /**
  * Restored from [android.os.Bundle] state.