From 0a7f558cf29a8d1130de8536e3f82d29259fb021 Mon Sep 17 00:00:00 2001 From: Manel Martos Date: Thu, 11 Jan 2024 09:57:52 +0100 Subject: [PATCH 1/2] Keep only one typealias for SavedStateMap and moved it to utils-multiplatform --- .../appyx/components/experimental/cards/CardsModel.kt | 2 +- .../kotlin/com/bumble/appyx/components/modal/ModalModel.kt | 2 +- .../appyx/components/experimental/promoter/PromoterModel.kt | 2 +- .../appyx/components/experimental/puzzle15/Puzzle15Model.kt | 2 +- .../appyx/components/internal/testdrive/TestDriveModel.kt | 2 +- .../com/bumble/appyx/components/backstack/BackStackModel.kt | 2 +- .../com/bumble/appyx/components/spotlight/SpotlightModel.kt | 2 +- .../core/model/transition/BaseTransitionModel.kt | 2 +- .../interactions/core/state/MutableSavedStateMapImpl.kt | 1 + .../bumble/appyx/interactions/core/state/SavedStateMap.kt | 6 ------ .../appyx/interactions/permanent/PermanentAppyxComponent.kt | 2 +- .../bumble/appyx/interactions/permanent/PermanentModel.kt | 2 +- .../com/bumble/appyx/navigation/children/ChildEntry.kt | 2 +- .../appyx/navigation/children/ChildNodeCreationManager.kt | 2 +- .../com/bumble/appyx/navigation/integration/NodeHost.kt | 2 +- .../com/bumble/appyx/navigation/modality/BuildContext.kt | 2 +- .../kotlin/com/bumble/appyx/navigation/node/Node.kt | 2 +- .../bumble/appyx/benchmark/app/mosaic/MosaicComponent.kt | 2 +- .../com/bumble/appyx/benchmark/app/mosaic/MosaicModel.kt | 2 +- .../component/spotlighthero/SpotlightHeroModel.kt | 2 +- .../com/bumble/appyx/utils/multiplatform}/SavedStateMap.kt | 2 +- 21 files changed, 20 insertions(+), 25 deletions(-) delete mode 100644 appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/state/SavedStateMap.kt rename {appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/navigation/state => utils/multiplatform/src/commonMain/kotlin/com/bumble/appyx/utils/multiplatform}/SavedStateMap.kt (68%) diff --git a/appyx-components/experimental/cards/common/src/commonMain/kotlin/com/bumble/appyx/components/experimental/cards/CardsModel.kt b/appyx-components/experimental/cards/common/src/commonMain/kotlin/com/bumble/appyx/components/experimental/cards/CardsModel.kt index a89941f85..cf631e013 100644 --- a/appyx-components/experimental/cards/common/src/commonMain/kotlin/com/bumble/appyx/components/experimental/cards/CardsModel.kt +++ b/appyx-components/experimental/cards/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( initialItems: List = listOf(), diff --git a/appyx-components/experimental/modal/common/src/commonMain/kotlin/com/bumble/appyx/components/modal/ModalModel.kt b/appyx-components/experimental/modal/common/src/commonMain/kotlin/com/bumble/appyx/components/modal/ModalModel.kt index 544936e5a..949448494 100644 --- a/appyx-components/experimental/modal/common/src/commonMain/kotlin/com/bumble/appyx/components/modal/ModalModel.kt +++ b/appyx-components/experimental/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( initialElements: List, diff --git a/appyx-components/experimental/promoter/common/src/commonMain/kotlin/com/bumble/appyx/components/experimental/promoter/PromoterModel.kt b/appyx-components/experimental/promoter/common/src/commonMain/kotlin/com/bumble/appyx/components/experimental/promoter/PromoterModel.kt index 141e8753d..393cbb104 100644 --- a/appyx-components/experimental/promoter/common/src/commonMain/kotlin/com/bumble/appyx/components/experimental/promoter/PromoterModel.kt +++ b/appyx-components/experimental/promoter/common/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( savedStateMap: SavedStateMap?, diff --git a/appyx-components/experimental/puzzle15/common/src/commonMain/kotlin/com/bumble/appyx/components/experimental/puzzle15/Puzzle15Model.kt b/appyx-components/experimental/puzzle15/common/src/commonMain/kotlin/com/bumble/appyx/components/experimental/puzzle15/Puzzle15Model.kt index 44bd1d522..1f5b323c4 100644 --- a/appyx-components/experimental/puzzle15/common/src/commonMain/kotlin/com/bumble/appyx/components/experimental/puzzle15/Puzzle15Model.kt +++ b/appyx-components/experimental/puzzle15/common/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/appyx-components/internal/test-drive/common/src/commonMain/kotlin/com/bumble/appyx/components/internal/testdrive/TestDriveModel.kt b/appyx-components/internal/test-drive/common/src/commonMain/kotlin/com/bumble/appyx/components/internal/testdrive/TestDriveModel.kt index baced4d6f..c1fecc2b8 100644 --- a/appyx-components/internal/test-drive/common/src/commonMain/kotlin/com/bumble/appyx/components/internal/testdrive/TestDriveModel.kt +++ b/appyx-components/internal/test-drive/common/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( val element: InteractionTarget, diff --git a/appyx-components/stable/backstack/common/src/commonMain/kotlin/com/bumble/appyx/components/backstack/BackStackModel.kt b/appyx-components/stable/backstack/common/src/commonMain/kotlin/com/bumble/appyx/components/backstack/BackStackModel.kt index e5eaa06ee..e9e95d03e 100644 --- a/appyx-components/stable/backstack/common/src/commonMain/kotlin/com/bumble/appyx/components/backstack/BackStackModel.kt +++ b/appyx-components/stable/backstack/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( initialTargets: List, diff --git a/appyx-components/stable/spotlight/common/src/commonMain/kotlin/com/bumble/appyx/components/spotlight/SpotlightModel.kt b/appyx-components/stable/spotlight/common/src/commonMain/kotlin/com/bumble/appyx/components/spotlight/SpotlightModel.kt index d2fa28a02..2a15ff5b7 100644 --- a/appyx-components/stable/spotlight/common/src/commonMain/kotlin/com/bumble/appyx/components/spotlight/SpotlightModel.kt +++ b/appyx-components/stable/spotlight/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( items: List, diff --git a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/model/transition/BaseTransitionModel.kt b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/model/transition/BaseTransitionModel.kt index bd04dc6c0..30c8449d8 100644 --- a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/model/transition/BaseTransitionModel.kt +++ b/appyx-interactions/common/src/commonMain/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/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/state/MutableSavedStateMapImpl.kt b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/state/MutableSavedStateMapImpl.kt index c62d69a2c..00d7f3d6a 100644 --- a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/state/MutableSavedStateMapImpl.kt +++ b/appyx-interactions/common/src/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 = HashMap(), diff --git a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/state/SavedStateMap.kt b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/state/SavedStateMap.kt deleted file mode 100644 index af65db58c..000000000 --- a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/state/SavedStateMap.kt +++ /dev/null @@ -1,6 +0,0 @@ -package com.bumble.appyx.interactions.core.state - -/** - * Restored from [android.os.Bundle] state. - */ -typealias SavedStateMap = Map diff --git a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/permanent/PermanentAppyxComponent.kt b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/permanent/PermanentAppyxComponent.kt index 4b146365d..664407e02 100644 --- a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/permanent/PermanentAppyxComponent.kt +++ b/appyx-interactions/common/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/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/permanent/PermanentModel.kt b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/permanent/PermanentModel.kt index 949e3eda2..5e159856a 100644 --- a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/permanent/PermanentModel.kt +++ b/appyx-interactions/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( savedStateMap: SavedStateMap?, diff --git a/appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/navigation/children/ChildEntry.kt b/appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/navigation/children/ChildEntry.kt index 22fa83b92..3e9912355 100644 --- a/appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/navigation/children/ChildEntry.kt +++ b/appyx-navigation/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 { diff --git a/appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/navigation/children/ChildNodeCreationManager.kt b/appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/navigation/children/ChildNodeCreationManager.kt index e46aae2a7..9df0be434 100644 --- a/appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/navigation/children/ChildNodeCreationManager.kt +++ b/appyx-navigation/common/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/appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/navigation/integration/NodeHost.kt b/appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/navigation/integration/NodeHost.kt index 715e9e752..303582896 100644 --- a/appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/navigation/integration/NodeHost.kt +++ b/appyx-navigation/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/appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/navigation/modality/BuildContext.kt b/appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/navigation/modality/BuildContext.kt index 5c5fe7984..57ab34e44 100644 --- a/appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/navigation/modality/BuildContext.kt +++ b/appyx-navigation/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 index f63214468..cfc17420e 100644 --- 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/benchmark/benchmark-app/src/main/kotlin/com/bumble/appyx/benchmark/app/mosaic/MosaicComponent.kt b/benchmark/benchmark-app/src/main/kotlin/com/bumble/appyx/benchmark/app/mosaic/MosaicComponent.kt index 50986718c..dd94a53db 100644 --- a/benchmark/benchmark-app/src/main/kotlin/com/bumble/appyx/benchmark/app/mosaic/MosaicComponent.kt +++ b/benchmark/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 index a059438b8..302eed238 100644 --- 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/demos/appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/navigation/component/spotlighthero/SpotlightHeroModel.kt b/demos/appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/navigation/component/spotlighthero/SpotlightHeroModel.kt index fce44d52b..e5e92482b 100644 --- a/demos/appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/navigation/component/spotlighthero/SpotlightHeroModel.kt +++ b/demos/appyx-navigation/common/src/commonMain/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( items: List>, diff --git a/appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/navigation/state/SavedStateMap.kt b/utils/multiplatform/src/commonMain/kotlin/com/bumble/appyx/utils/multiplatform/SavedStateMap.kt similarity index 68% rename from appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/navigation/state/SavedStateMap.kt rename to utils/multiplatform/src/commonMain/kotlin/com/bumble/appyx/utils/multiplatform/SavedStateMap.kt index ab5a8fca0..6925b3174 100644 --- a/appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/navigation/state/SavedStateMap.kt +++ b/utils/multiplatform/src/commonMain/kotlin/com/bumble/appyx/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. From b1ae293d31b8217761b0676a5919eda69a7a081d Mon Sep 17 00:00:00 2001 From: Manel Martos Date: Thu, 11 Jan 2024 10:05:44 +0100 Subject: [PATCH 2/2] Add breaking change into CHANGELOG --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4d8752e27..022766e63 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ - [#630](https://github.com/bumble-tech/appyx/pull/630) – Pass initial state into Spotlights visualisations - [#643](https://github.com/bumble-tech/appyx/pull/643) – Unify AppyxComponent composable between appyx-navigation and appyx-interactions modules +- [#651](https://github.com/bumble-tech/appyx/pull/651) - Keep only one instance of SaveStateMap typealias and moved it to `com.bumble.appyx.utils.multiplatform` package ### Fixed