Merge pull request #680 from zsoltk/package-reorg

Appyx interactions package reorg
bumble-tech · Feb 12, 2024 · 33aa424 · 33aa424
2 parents e18d59c + f04ee2b
commit 33aa424
Show file tree

Hide file tree

Showing 274 changed files with 1,240 additions and 1,177 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,7 @@
 ### API breaking changes
 
 - [#677](https://github.com/bumble-tech/appyx/pull/677) – Moved Builder, SimpleBuilder, Interactor to separate module
+- [#680](https://github.com/bumble-tech/appyx/pull/680) – Appyx interactions package reorg
 
 ### Fixed
 

diff --git a/...oid/src/main/kotlin/com/bumble/appyx/components/experimental/cards/android/DatingCards.kt b/...oid/src/main/kotlin/com/bumble/appyx/components/experimental/cards/android/DatingCards.kt
@@ -14,9 +14,9 @@ import com.bumble.appyx.components.experimental.cards.CardsModel
 import com.bumble.appyx.components.experimental.cards.ui.CardsVisualisation
 import com.bumble.appyx.demos.common.profile.Profile
 import com.bumble.appyx.demos.common.profile.ProfileCard
-import com.bumble.appyx.interactions.core.AppyxInteractionsContainer
-import com.bumble.appyx.interactions.core.gesture.GestureValidator.Companion.permissiveValidator
-import com.bumble.appyx.interactions.core.ui.helper.AppyxComponentSetup
+import com.bumble.appyx.interactions.composable.AppyxInteractionsContainer
+import com.bumble.appyx.interactions.gesture.GestureValidator.Companion.permissiveValidator
+import com.bumble.appyx.interactions.ui.helper.AppyxComponentSetup
 import com.bumble.appyx.interactions.utils.ui.theme.appyx_dark
 import kotlin.math.roundToInt
 

diff --git a/...ards/common/src/commonMain/kotlin/com/bumble/appyx/components/experimental/cards/Cards.kt b/...ards/common/src/commonMain/kotlin/com/bumble/appyx/components/experimental/cards/Cards.kt
@@ -2,12 +2,12 @@ package com.bumble.appyx.components.experimental.cards
 
 import androidx.compose.animation.core.AnimationSpec
 import androidx.compose.animation.core.spring
-import com.bumble.appyx.interactions.core.model.BaseAppyxComponent
-import com.bumble.appyx.interactions.core.ui.Visualisation
-import com.bumble.appyx.interactions.core.ui.context.TransitionBounds
-import com.bumble.appyx.interactions.core.ui.context.UiContext
-import com.bumble.appyx.interactions.core.ui.gesture.GestureFactory
-import com.bumble.appyx.interactions.core.ui.gesture.GestureSettleConfig
+import com.bumble.appyx.interactions.model.BaseAppyxComponent
+import com.bumble.appyx.interactions.ui.Visualisation
+import com.bumble.appyx.interactions.ui.context.TransitionBounds
+import com.bumble.appyx.interactions.ui.context.UiContext
+import com.bumble.appyx.interactions.gesture.GestureFactory
+import com.bumble.appyx.interactions.gesture.GestureSettleConfig
 
 open class Cards<InteractionTarget : Any>(
     model: CardsModel<InteractionTarget>,

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
@@ -3,9 +3,9 @@ package com.bumble.appyx.components.experimental.cards
 import com.bumble.appyx.components.experimental.cards.CardsModel.State.Card.InvisibleCard.Queued
 import com.bumble.appyx.components.experimental.cards.CardsModel.State.Card.VisibleCard.BottomCard
 import com.bumble.appyx.components.experimental.cards.CardsModel.State.Card.VisibleCard.TopCard
-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.model.Element
+import com.bumble.appyx.interactions.model.asElement
+import com.bumble.appyx.interactions.model.transition.BaseTransitionModel
 import com.bumble.appyx.utils.multiplatform.Parcelable
 import com.bumble.appyx.utils.multiplatform.Parcelize
 import com.bumble.appyx.utils.multiplatform.RawValue

diff --git a/...nMain/kotlin/com/bumble/appyx/components/experimental/cards/operation/TopCardOperation.kt b/...nMain/kotlin/com/bumble/appyx/components/experimental/cards/operation/TopCardOperation.kt
@@ -1,6 +1,6 @@
 package com.bumble.appyx.components.experimental.cards.operation
 
-import com.bumble.appyx.interactions.core.model.transition.BaseOperation
+import com.bumble.appyx.interactions.model.transition.BaseOperation
 import com.bumble.appyx.components.experimental.cards.CardsModel
 
 abstract class TopCardOperation<InteractionTarget> : BaseOperation<CardsModel.State<InteractionTarget>>() {

diff --git a/...rc/commonMain/kotlin/com/bumble/appyx/components/experimental/cards/operation/VoteLike.kt b/...rc/commonMain/kotlin/com/bumble/appyx/components/experimental/cards/operation/VoteLike.kt
@@ -7,7 +7,7 @@ import com.bumble.appyx.components.experimental.cards.CardsModel.State.Card.Invi
 import com.bumble.appyx.components.experimental.cards.CardsModel.State.Card.VisibleCard.BottomCard
 import com.bumble.appyx.components.experimental.cards.CardsModel.State.Card.VisibleCard.TopCard
 import com.bumble.appyx.components.experimental.cards.CardsModel.State.Card.VisibleCard.TopCard.TOP_CARD_STATE.STANDARD
-import com.bumble.appyx.interactions.core.model.transition.Operation
+import com.bumble.appyx.interactions.model.transition.Operation
 import com.bumble.appyx.utils.multiplatform.Parcelize
 
 @Parcelize

diff --git a/...rc/commonMain/kotlin/com/bumble/appyx/components/experimental/cards/operation/VotePass.kt b/...rc/commonMain/kotlin/com/bumble/appyx/components/experimental/cards/operation/VotePass.kt
@@ -4,7 +4,7 @@ import androidx.compose.animation.core.AnimationSpec
 import com.bumble.appyx.components.experimental.cards.Cards
 import com.bumble.appyx.components.experimental.cards.CardsModel
 import com.bumble.appyx.components.experimental.cards.CardsModel.State.Card.InvisibleCard.VotedCard.VOTED_CARD_STATE.PASSED
-import com.bumble.appyx.interactions.core.model.transition.Operation
+import com.bumble.appyx.interactions.model.transition.Operation
 import com.bumble.appyx.utils.multiplatform.Parcelize
 
 @Parcelize

diff --git a/...commonMain/kotlin/com/bumble/appyx/components/experimental/cards/ui/CardsVisualisation.kt b/...commonMain/kotlin/com/bumble/appyx/components/experimental/cards/ui/CardsVisualisation.kt
@@ -7,19 +7,19 @@ import com.bumble.appyx.components.experimental.cards.CardsModel
 import com.bumble.appyx.components.experimental.cards.CardsModel.State.Card.InvisibleCard.VotedCard.VOTED_CARD_STATE.LIKED
 import com.bumble.appyx.components.experimental.cards.operation.VoteLike
 import com.bumble.appyx.components.experimental.cards.operation.VotePass
-import com.bumble.appyx.interactions.core.ui.context.TransitionBounds
-import com.bumble.appyx.interactions.core.ui.context.UiContext
-import com.bumble.appyx.interactions.core.ui.gesture.Drag
-import com.bumble.appyx.interactions.core.ui.gesture.Gesture
-import com.bumble.appyx.interactions.core.ui.gesture.GestureFactory
-import com.bumble.appyx.interactions.core.ui.gesture.dragHorizontalDirection
-import com.bumble.appyx.interactions.core.ui.DefaultAnimationSpec
-import com.bumble.appyx.interactions.core.ui.property.impl.RotationZ
-import com.bumble.appyx.interactions.core.ui.property.impl.Scale
-import com.bumble.appyx.interactions.core.ui.property.impl.ZIndex
-import com.bumble.appyx.interactions.core.ui.property.impl.position.BiasAlignment
-import com.bumble.appyx.interactions.core.ui.property.impl.position.PositionAlignment
-import com.bumble.appyx.interactions.core.ui.state.MatchedTargetUiState
+import com.bumble.appyx.interactions.ui.context.TransitionBounds
+import com.bumble.appyx.interactions.ui.context.UiContext
+import com.bumble.appyx.interactions.gesture.Drag
+import com.bumble.appyx.interactions.gesture.Gesture
+import com.bumble.appyx.interactions.gesture.GestureFactory
+import com.bumble.appyx.interactions.gesture.dragHorizontalDirection
+import com.bumble.appyx.interactions.ui.DefaultAnimationSpec
+import com.bumble.appyx.interactions.ui.property.impl.RotationZ
+import com.bumble.appyx.interactions.ui.property.impl.Scale
+import com.bumble.appyx.interactions.ui.property.impl.ZIndex
+import com.bumble.appyx.interactions.ui.property.impl.position.BiasAlignment
+import com.bumble.appyx.interactions.ui.property.impl.position.PositionAlignment
+import com.bumble.appyx.interactions.ui.state.MatchedTargetUiState
 import com.bumble.appyx.transitionmodel.BaseVisualisation
 import com.bumble.appyx.utils.multiplatform.AppyxLogger
 

diff --git a/.../src/commonMain/kotlin/com/bumble/appyx/components/experimental/cards/ui/TargetUiState.kt b/.../src/commonMain/kotlin/com/bumble/appyx/components/experimental/cards/ui/TargetUiState.kt
@@ -1,10 +1,10 @@
 package com.bumble.appyx.components.experimental.cards.ui
 
-import com.bumble.appyx.interactions.core.ui.property.impl.RotationZ
-import com.bumble.appyx.interactions.core.ui.property.impl.Scale
-import com.bumble.appyx.interactions.core.ui.property.impl.ZIndex
-import com.bumble.appyx.interactions.core.ui.property.impl.position.PositionAlignment
-import com.bumble.appyx.interactions.core.ui.state.MutableUiStateSpecs
+import com.bumble.appyx.interactions.ui.property.impl.RotationZ
+import com.bumble.appyx.interactions.ui.property.impl.Scale
+import com.bumble.appyx.interactions.ui.property.impl.ZIndex
+import com.bumble.appyx.interactions.ui.property.impl.position.PositionAlignment
+import com.bumble.appyx.interactions.ui.state.MutableUiStateSpecs
 
 @Suppress("unused")
 @MutableUiStateSpecs

diff --git a/...rc/commonTest/kotlin/com/bumble/appyx/components/experimental/cards/operation/VoteTest.kt b/...rc/commonTest/kotlin/com/bumble/appyx/components/experimental/cards/operation/VoteTest.kt
@@ -12,7 +12,7 @@ import com.bumble.appyx.components.experimental.cards.InteractionTarget.Child1
 import com.bumble.appyx.components.experimental.cards.InteractionTarget.Child2
 import com.bumble.appyx.components.experimental.cards.InteractionTarget.Child3
 import com.bumble.appyx.components.experimental.cards.InteractionTarget.Child4
-import com.bumble.appyx.interactions.core.asElement
+import com.bumble.appyx.interactions.model.asElement
 import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertFalse

diff --git a/...monTest/kotlin/com/bumble/appyx/components/experimental/cards/restore/CardsRestoreTest.kt b/...monTest/kotlin/com/bumble/appyx/components/experimental/cards/restore/CardsRestoreTest.kt
@@ -3,7 +3,7 @@ package com.bumble.appyx.components.experimental.cards.restore
 import com.bumble.appyx.components.experimental.cards.CardsModel
 import com.bumble.appyx.components.experimental.cards.InteractionTarget
 import com.bumble.appyx.components.experimental.cards.operation.VotePass
-import com.bumble.appyx.interactions.core.state.MutableSavedStateMapImpl
+import com.bumble.appyx.interactions.state.MutableSavedStateMapImpl
 import kotlin.test.Test
 import kotlin.test.assertEquals
 

diff --git a/...in/kotlin/com/bumble/appyx/components/experimental/promoter/android/PromoterExperiment.kt b/...in/kotlin/com/bumble/appyx/components/experimental/promoter/android/PromoterExperiment.kt
@@ -25,10 +25,10 @@ import com.bumble.appyx.components.experimental.promoter.Promoter
 import com.bumble.appyx.components.experimental.promoter.PromoterModel
 import com.bumble.appyx.components.experimental.promoter.operation.addFirst
 import com.bumble.appyx.components.experimental.promoter.ui.PromoterVisualisation
-import com.bumble.appyx.interactions.core.AppyxInteractionsContainer
-import com.bumble.appyx.interactions.core.model.transition.Operation.Mode.IMMEDIATE
-import com.bumble.appyx.interactions.core.model.transition.Operation.Mode.KEYFRAME
-import com.bumble.appyx.interactions.core.ui.helper.AppyxComponentSetup
+import com.bumble.appyx.interactions.composable.AppyxInteractionsContainer
+import com.bumble.appyx.interactions.model.transition.Operation.Mode.IMMEDIATE
+import com.bumble.appyx.interactions.model.transition.Operation.Mode.KEYFRAME
+import com.bumble.appyx.interactions.ui.helper.AppyxComponentSetup
 import com.bumble.appyx.interactions.utils.ui.Element
 import com.bumble.appyx.interactions.utils.testing.TestTarget
 import com.bumble.appyx.interactions.utils.testing.TestTarget.Child1

diff --git a/...ommon/src/commonMain/kotlin/com/bumble/appyx/components/experimental/promoter/Promoter.kt b/...ommon/src/commonMain/kotlin/com/bumble/appyx/components/experimental/promoter/Promoter.kt
@@ -2,11 +2,11 @@ package com.bumble.appyx.components.experimental.promoter
 
 import androidx.compose.animation.core.AnimationSpec
 import androidx.compose.animation.core.spring
-import com.bumble.appyx.interactions.core.model.BaseAppyxComponent
-import com.bumble.appyx.interactions.core.ui.Visualisation
-import com.bumble.appyx.interactions.core.ui.context.TransitionBounds
-import com.bumble.appyx.interactions.core.ui.context.UiContext
-import com.bumble.appyx.interactions.core.ui.gesture.GestureFactory
+import com.bumble.appyx.interactions.model.BaseAppyxComponent
+import com.bumble.appyx.interactions.ui.Visualisation
+import com.bumble.appyx.interactions.ui.context.TransitionBounds
+import com.bumble.appyx.interactions.ui.context.UiContext
+import com.bumble.appyx.interactions.gesture.GestureFactory
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob

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
@@ -1,8 +1,8 @@
 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.model.Element
+import com.bumble.appyx.interactions.model.transition.BaseTransitionModel
 import com.bumble.appyx.utils.multiplatform.Parcelable
 import com.bumble.appyx.utils.multiplatform.Parcelize
 import com.bumble.appyx.utils.multiplatform.SavedStateMap

diff --git a/...commonMain/kotlin/com/bumble/appyx/components/experimental/promoter/operation/AddFirst.kt b/...commonMain/kotlin/com/bumble/appyx/components/experimental/promoter/operation/AddFirst.kt
@@ -3,9 +3,9 @@ package com.bumble.appyx.components.experimental.promoter.operation
 import androidx.compose.animation.core.AnimationSpec
 import com.bumble.appyx.components.experimental.promoter.Promoter
 import com.bumble.appyx.components.experimental.promoter.PromoterModel
-import com.bumble.appyx.interactions.core.asElement
-import com.bumble.appyx.interactions.core.model.transition.BaseOperation
-import com.bumble.appyx.interactions.core.model.transition.Operation
+import com.bumble.appyx.interactions.model.asElement
+import com.bumble.appyx.interactions.model.transition.BaseOperation
+import com.bumble.appyx.interactions.model.transition.Operation
 import com.bumble.appyx.utils.multiplatform.Parcelize
 import com.bumble.appyx.utils.multiplatform.RawValue
 

diff --git a/...Main/kotlin/com/bumble/appyx/components/experimental/promoter/ui/PromoterVisualisation.kt b/...Main/kotlin/com/bumble/appyx/components/experimental/promoter/ui/PromoterVisualisation.kt
@@ -7,17 +7,17 @@ import androidx.compose.ui.unit.DpOffset
 import androidx.compose.ui.unit.dp
 import com.bumble.appyx.components.experimental.promoter.PromoterModel
 import com.bumble.appyx.components.experimental.promoter.PromoterModel.State.ElementState
-import com.bumble.appyx.interactions.core.ui.context.TransitionBounds
-import com.bumble.appyx.interactions.core.ui.context.UiContext
-import com.bumble.appyx.interactions.core.ui.DefaultAnimationSpec
-import com.bumble.appyx.interactions.core.ui.property.impl.AngularPosition
-import com.bumble.appyx.interactions.core.ui.property.impl.RotationY
-import com.bumble.appyx.interactions.core.ui.property.impl.RotationZ
-import com.bumble.appyx.interactions.core.ui.property.impl.Scale
-import com.bumble.appyx.interactions.core.ui.property.impl.position.BiasAlignment.InsideAlignment.Companion.Center
-import com.bumble.appyx.interactions.core.ui.property.impl.position.PositionAlignment
-import com.bumble.appyx.interactions.core.ui.property.impl.position.PositionOffset
-import com.bumble.appyx.interactions.core.ui.state.MatchedTargetUiState
+import com.bumble.appyx.interactions.ui.context.TransitionBounds
+import com.bumble.appyx.interactions.ui.context.UiContext
+import com.bumble.appyx.interactions.ui.DefaultAnimationSpec
+import com.bumble.appyx.interactions.ui.property.impl.AngularPosition
+import com.bumble.appyx.interactions.ui.property.impl.RotationY
+import com.bumble.appyx.interactions.ui.property.impl.RotationZ
+import com.bumble.appyx.interactions.ui.property.impl.Scale
+import com.bumble.appyx.interactions.ui.property.impl.position.BiasAlignment.InsideAlignment.Companion.Center
+import com.bumble.appyx.interactions.ui.property.impl.position.PositionAlignment
+import com.bumble.appyx.interactions.ui.property.impl.position.PositionOffset
+import com.bumble.appyx.interactions.ui.state.MatchedTargetUiState
 import com.bumble.appyx.transitionmodel.BaseVisualisation
 import kotlin.math.min
 

diff --git a/...c/commonMain/kotlin/com/bumble/appyx/components/experimental/promoter/ui/TargetUiState.kt b/...c/commonMain/kotlin/com/bumble/appyx/components/experimental/promoter/ui/TargetUiState.kt
@@ -1,12 +1,12 @@
 package com.bumble.appyx.components.experimental.promoter.ui
 
-import com.bumble.appyx.interactions.core.ui.property.impl.AngularPosition
-import com.bumble.appyx.interactions.core.ui.property.impl.RotationY
-import com.bumble.appyx.interactions.core.ui.property.impl.RotationZ
-import com.bumble.appyx.interactions.core.ui.property.impl.Scale
-import com.bumble.appyx.interactions.core.ui.property.impl.position.PositionAlignment
-import com.bumble.appyx.interactions.core.ui.property.impl.position.PositionOffset
-import com.bumble.appyx.interactions.core.ui.state.MutableUiStateSpecs
+import com.bumble.appyx.interactions.ui.property.impl.AngularPosition
+import com.bumble.appyx.interactions.ui.property.impl.RotationY
+import com.bumble.appyx.interactions.ui.property.impl.RotationZ
+import com.bumble.appyx.interactions.ui.property.impl.Scale
+import com.bumble.appyx.interactions.ui.property.impl.position.PositionAlignment
+import com.bumble.appyx.interactions.ui.property.impl.position.PositionOffset
+import com.bumble.appyx.interactions.ui.state.MutableUiStateSpecs
 
 @MutableUiStateSpecs
 class TargetUiState(

diff --git a/...onTest/kotlin/com/bumble/appyx/components/experimental/promoter/operation/AddFirstTest.kt b/...onTest/kotlin/com/bumble/appyx/components/experimental/promoter/operation/AddFirstTest.kt
@@ -15,7 +15,7 @@ import com.bumble.appyx.components.experimental.promoter.PromoterModel.State.Ele
 import com.bumble.appyx.components.experimental.promoter.PromoterModel.State.ElementState.STAGE3
 import com.bumble.appyx.components.experimental.promoter.PromoterModel.State.ElementState.STAGE4
 import com.bumble.appyx.components.experimental.promoter.PromoterModel.State.ElementState.STAGE5
-import com.bumble.appyx.interactions.core.Element
+import com.bumble.appyx.interactions.model.Element
 import kotlin.test.Test
 import kotlin.test.assertEquals
 

diff --git a/...t/kotlin/com/bumble/appyx/components/experimental/promoter/restore/PromoterRestoreTest.kt b/...t/kotlin/com/bumble/appyx/components/experimental/promoter/restore/PromoterRestoreTest.kt
@@ -3,7 +3,7 @@ package com.bumble.appyx.components.experimental.promoter.restore
 import com.bumble.appyx.components.experimental.promoter.PromoterModel
 import com.bumble.appyx.components.experimental.promoter.operation.AddFirst
 import com.bumble.appyx.components.experimental.promoter.InteractionTarget
-import com.bumble.appyx.interactions.core.state.MutableSavedStateMapImpl
+import com.bumble.appyx.interactions.state.MutableSavedStateMapImpl
 import kotlin.test.Test
 import kotlin.test.assertEquals
 

diff --git a/...ommon/src/commonMain/kotlin/com/bumble/appyx/components/experimental/puzzle15/Puzzle15.kt b/...ommon/src/commonMain/kotlin/com/bumble/appyx/components/experimental/puzzle15/Puzzle15.kt
@@ -4,11 +4,11 @@ import androidx.compose.animation.core.AnimationSpec
 import androidx.compose.animation.core.spring
 import com.bumble.appyx.components.experimental.puzzle15.Puzzle15Model.Tile
 import com.bumble.appyx.components.experimental.puzzle15.ui.Puzzle15Visualisation
-import com.bumble.appyx.interactions.core.model.BaseAppyxComponent
-import com.bumble.appyx.interactions.core.ui.Visualisation
-import com.bumble.appyx.interactions.core.ui.context.TransitionBounds
-import com.bumble.appyx.interactions.core.ui.context.UiContext
-import com.bumble.appyx.interactions.core.ui.gesture.GestureFactory
+import com.bumble.appyx.interactions.model.BaseAppyxComponent
+import com.bumble.appyx.interactions.ui.Visualisation
+import com.bumble.appyx.interactions.ui.context.TransitionBounds
+import com.bumble.appyx.interactions.ui.context.UiContext
+import com.bumble.appyx.interactions.gesture.GestureFactory
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob

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
@@ -1,9 +1,9 @@
 package com.bumble.appyx.components.experimental.puzzle15
 
 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.model.Element
+import com.bumble.appyx.interactions.model.asElement
+import com.bumble.appyx.interactions.model.transition.BaseTransitionModel
 import com.bumble.appyx.utils.multiplatform.Parcelable
 import com.bumble.appyx.utils.multiplatform.Parcelize
 import com.bumble.appyx.utils.multiplatform.RawValue

diff --git a/.../commonMain/kotlin/com/bumble/appyx/components/experimental/puzzle15/operation/Shuffle.kt b/.../commonMain/kotlin/com/bumble/appyx/components/experimental/puzzle15/operation/Shuffle.kt
@@ -1,8 +1,8 @@
 package com.bumble.appyx.components.experimental.puzzle15.operation
 
 import com.bumble.appyx.components.experimental.puzzle15.Puzzle15Model
-import com.bumble.appyx.interactions.core.model.transition.BaseOperation
-import com.bumble.appyx.interactions.core.model.transition.Operation
+import com.bumble.appyx.interactions.model.transition.BaseOperation
+import com.bumble.appyx.interactions.model.transition.Operation
 import com.bumble.appyx.utils.multiplatform.Parcelize
 
 @Parcelize

diff --git a/...src/commonMain/kotlin/com/bumble/appyx/components/experimental/puzzle15/operation/Swap.kt b/...src/commonMain/kotlin/com/bumble/appyx/components/experimental/puzzle15/operation/Swap.kt
@@ -2,9 +2,9 @@ package com.bumble.appyx.components.experimental.puzzle15.operation
 
 import com.bumble.appyx.components.experimental.puzzle15.Puzzle15Model
 import com.bumble.appyx.components.experimental.puzzle15.Puzzle15Model.Tile
-import com.bumble.appyx.interactions.core.Element
-import com.bumble.appyx.interactions.core.model.transition.BaseOperation
-import com.bumble.appyx.interactions.core.model.transition.Operation
+import com.bumble.appyx.interactions.model.Element
+import com.bumble.appyx.interactions.model.transition.BaseOperation
+import com.bumble.appyx.interactions.model.transition.Operation
 import com.bumble.appyx.utils.multiplatform.Parcelize
 
 @Suppress("MagicNumber")

diff --git a/.../src/commonMain/kotlin/com/bumble/appyx/components/experimental/puzzle15/ui/Puzzle15Ui.kt b/.../src/commonMain/kotlin/com/bumble/appyx/components/experimental/puzzle15/ui/Puzzle15Ui.kt
@@ -37,9 +37,9 @@ import com.bumble.appyx.components.experimental.puzzle15.operation.Swap.Directio
 import com.bumble.appyx.components.experimental.puzzle15.operation.Swap.Direction.LEFT
 import com.bumble.appyx.components.experimental.puzzle15.operation.Swap.Direction.RIGHT
 import com.bumble.appyx.components.experimental.puzzle15.operation.Swap.Direction.UP
-import com.bumble.appyx.interactions.core.AppyxInteractionsContainer
-import com.bumble.appyx.interactions.core.gesture.GestureValidator
-import com.bumble.appyx.interactions.core.ui.helper.AppyxComponentSetup
+import com.bumble.appyx.interactions.composable.AppyxInteractionsContainer
+import com.bumble.appyx.interactions.gesture.GestureValidator
+import com.bumble.appyx.interactions.ui.helper.AppyxComponentSetup
 
 @Suppress("MagicNumber", "LongMethod")
 @Composable