diff --git a/CHANGELOG.md b/CHANGELOG.md index 8b31bae32..f19576063 100644 --- 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/appyx-components/experimental/cards/android/src/main/kotlin/com/bumble/appyx/components/experimental/cards/android/DatingCards.kt b/appyx-components/experimental/cards/android/src/main/kotlin/com/bumble/appyx/components/experimental/cards/android/DatingCards.kt index a78e0887b..ec17e5128 100644 --- a/appyx-components/experimental/cards/android/src/main/kotlin/com/bumble/appyx/components/experimental/cards/android/DatingCards.kt +++ b/appyx-components/experimental/cards/android/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/appyx-components/experimental/cards/common/src/commonMain/kotlin/com/bumble/appyx/components/experimental/cards/Cards.kt b/appyx-components/experimental/cards/common/src/commonMain/kotlin/com/bumble/appyx/components/experimental/cards/Cards.kt index bc93704da..784529efd 100644 --- a/appyx-components/experimental/cards/common/src/commonMain/kotlin/com/bumble/appyx/components/experimental/cards/Cards.kt +++ b/appyx-components/experimental/cards/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( model: CardsModel, 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 cf631e013..979f7bfa0 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 @@ -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/appyx-components/experimental/cards/common/src/commonMain/kotlin/com/bumble/appyx/components/experimental/cards/operation/TopCardOperation.kt b/appyx-components/experimental/cards/common/src/commonMain/kotlin/com/bumble/appyx/components/experimental/cards/operation/TopCardOperation.kt index 40024c6fe..9d35439c8 100644 --- a/appyx-components/experimental/cards/common/src/commonMain/kotlin/com/bumble/appyx/components/experimental/cards/operation/TopCardOperation.kt +++ b/appyx-components/experimental/cards/common/src/commonMain/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 : BaseOperation>() { diff --git a/appyx-components/experimental/cards/common/src/commonMain/kotlin/com/bumble/appyx/components/experimental/cards/operation/VoteLike.kt b/appyx-components/experimental/cards/common/src/commonMain/kotlin/com/bumble/appyx/components/experimental/cards/operation/VoteLike.kt index 325d07ab1..055ad3721 100644 --- a/appyx-components/experimental/cards/common/src/commonMain/kotlin/com/bumble/appyx/components/experimental/cards/operation/VoteLike.kt +++ b/appyx-components/experimental/cards/common/src/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/appyx-components/experimental/cards/common/src/commonMain/kotlin/com/bumble/appyx/components/experimental/cards/operation/VotePass.kt b/appyx-components/experimental/cards/common/src/commonMain/kotlin/com/bumble/appyx/components/experimental/cards/operation/VotePass.kt index fe7167116..56f76fd93 100644 --- a/appyx-components/experimental/cards/common/src/commonMain/kotlin/com/bumble/appyx/components/experimental/cards/operation/VotePass.kt +++ b/appyx-components/experimental/cards/common/src/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/appyx-components/experimental/cards/common/src/commonMain/kotlin/com/bumble/appyx/components/experimental/cards/ui/CardsVisualisation.kt b/appyx-components/experimental/cards/common/src/commonMain/kotlin/com/bumble/appyx/components/experimental/cards/ui/CardsVisualisation.kt index 8933757d4..92a416904 100644 --- a/appyx-components/experimental/cards/common/src/commonMain/kotlin/com/bumble/appyx/components/experimental/cards/ui/CardsVisualisation.kt +++ b/appyx-components/experimental/cards/common/src/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/appyx-components/experimental/cards/common/src/commonMain/kotlin/com/bumble/appyx/components/experimental/cards/ui/TargetUiState.kt b/appyx-components/experimental/cards/common/src/commonMain/kotlin/com/bumble/appyx/components/experimental/cards/ui/TargetUiState.kt index ae37f327b..81f3d4e5b 100644 --- a/appyx-components/experimental/cards/common/src/commonMain/kotlin/com/bumble/appyx/components/experimental/cards/ui/TargetUiState.kt +++ b/appyx-components/experimental/cards/common/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/appyx-components/experimental/cards/common/src/commonTest/kotlin/com/bumble/appyx/components/experimental/cards/operation/VoteTest.kt b/appyx-components/experimental/cards/common/src/commonTest/kotlin/com/bumble/appyx/components/experimental/cards/operation/VoteTest.kt index d1b13eb23..c7f657b2f 100644 --- a/appyx-components/experimental/cards/common/src/commonTest/kotlin/com/bumble/appyx/components/experimental/cards/operation/VoteTest.kt +++ b/appyx-components/experimental/cards/common/src/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/appyx-components/experimental/cards/common/src/commonTest/kotlin/com/bumble/appyx/components/experimental/cards/restore/CardsRestoreTest.kt b/appyx-components/experimental/cards/common/src/commonTest/kotlin/com/bumble/appyx/components/experimental/cards/restore/CardsRestoreTest.kt index dd68e457a..c3429ce95 100644 --- a/appyx-components/experimental/cards/common/src/commonTest/kotlin/com/bumble/appyx/components/experimental/cards/restore/CardsRestoreTest.kt +++ b/appyx-components/experimental/cards/common/src/commonTest/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/appyx-components/experimental/promoter/android/src/main/kotlin/com/bumble/appyx/components/experimental/promoter/android/PromoterExperiment.kt b/appyx-components/experimental/promoter/android/src/main/kotlin/com/bumble/appyx/components/experimental/promoter/android/PromoterExperiment.kt index 743d1c05b..dd23935e3 100644 --- a/appyx-components/experimental/promoter/android/src/main/kotlin/com/bumble/appyx/components/experimental/promoter/android/PromoterExperiment.kt +++ b/appyx-components/experimental/promoter/android/src/main/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/appyx-components/experimental/promoter/common/src/commonMain/kotlin/com/bumble/appyx/components/experimental/promoter/Promoter.kt b/appyx-components/experimental/promoter/common/src/commonMain/kotlin/com/bumble/appyx/components/experimental/promoter/Promoter.kt index ab8d274dc..7ac9d9661 100644 --- a/appyx-components/experimental/promoter/common/src/commonMain/kotlin/com/bumble/appyx/components/experimental/promoter/Promoter.kt +++ b/appyx-components/experimental/promoter/common/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/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 393cbb104..3863cd381 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 @@ -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/appyx-components/experimental/promoter/common/src/commonMain/kotlin/com/bumble/appyx/components/experimental/promoter/operation/AddFirst.kt b/appyx-components/experimental/promoter/common/src/commonMain/kotlin/com/bumble/appyx/components/experimental/promoter/operation/AddFirst.kt index 2c2c2791a..54baaed16 100644 --- a/appyx-components/experimental/promoter/common/src/commonMain/kotlin/com/bumble/appyx/components/experimental/promoter/operation/AddFirst.kt +++ b/appyx-components/experimental/promoter/common/src/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/appyx-components/experimental/promoter/common/src/commonMain/kotlin/com/bumble/appyx/components/experimental/promoter/ui/PromoterVisualisation.kt b/appyx-components/experimental/promoter/common/src/commonMain/kotlin/com/bumble/appyx/components/experimental/promoter/ui/PromoterVisualisation.kt index 2b1f14d4b..ac14ddfcb 100644 --- a/appyx-components/experimental/promoter/common/src/commonMain/kotlin/com/bumble/appyx/components/experimental/promoter/ui/PromoterVisualisation.kt +++ b/appyx-components/experimental/promoter/common/src/commonMain/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/appyx-components/experimental/promoter/common/src/commonMain/kotlin/com/bumble/appyx/components/experimental/promoter/ui/TargetUiState.kt b/appyx-components/experimental/promoter/common/src/commonMain/kotlin/com/bumble/appyx/components/experimental/promoter/ui/TargetUiState.kt index ef101fa25..9cf1e3fbf 100644 --- a/appyx-components/experimental/promoter/common/src/commonMain/kotlin/com/bumble/appyx/components/experimental/promoter/ui/TargetUiState.kt +++ b/appyx-components/experimental/promoter/common/src/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/appyx-components/experimental/promoter/common/src/commonTest/kotlin/com/bumble/appyx/components/experimental/promoter/operation/AddFirstTest.kt b/appyx-components/experimental/promoter/common/src/commonTest/kotlin/com/bumble/appyx/components/experimental/promoter/operation/AddFirstTest.kt index 577e1a479..c94b4958e 100644 --- a/appyx-components/experimental/promoter/common/src/commonTest/kotlin/com/bumble/appyx/components/experimental/promoter/operation/AddFirstTest.kt +++ b/appyx-components/experimental/promoter/common/src/commonTest/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/appyx-components/experimental/promoter/common/src/commonTest/kotlin/com/bumble/appyx/components/experimental/promoter/restore/PromoterRestoreTest.kt b/appyx-components/experimental/promoter/common/src/commonTest/kotlin/com/bumble/appyx/components/experimental/promoter/restore/PromoterRestoreTest.kt index 7a4807639..c55916305 100644 --- a/appyx-components/experimental/promoter/common/src/commonTest/kotlin/com/bumble/appyx/components/experimental/promoter/restore/PromoterRestoreTest.kt +++ b/appyx-components/experimental/promoter/common/src/commonTest/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/appyx-components/experimental/puzzle15/common/src/commonMain/kotlin/com/bumble/appyx/components/experimental/puzzle15/Puzzle15.kt b/appyx-components/experimental/puzzle15/common/src/commonMain/kotlin/com/bumble/appyx/components/experimental/puzzle15/Puzzle15.kt index 14618211a..7a8572cf0 100644 --- a/appyx-components/experimental/puzzle15/common/src/commonMain/kotlin/com/bumble/appyx/components/experimental/puzzle15/Puzzle15.kt +++ b/appyx-components/experimental/puzzle15/common/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/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 1f5b323c4..146b6eded 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 @@ -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/appyx-components/experimental/puzzle15/common/src/commonMain/kotlin/com/bumble/appyx/components/experimental/puzzle15/operation/Shuffle.kt b/appyx-components/experimental/puzzle15/common/src/commonMain/kotlin/com/bumble/appyx/components/experimental/puzzle15/operation/Shuffle.kt index 08cdebe08..899939a9a 100644 --- a/appyx-components/experimental/puzzle15/common/src/commonMain/kotlin/com/bumble/appyx/components/experimental/puzzle15/operation/Shuffle.kt +++ b/appyx-components/experimental/puzzle15/common/src/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/appyx-components/experimental/puzzle15/common/src/commonMain/kotlin/com/bumble/appyx/components/experimental/puzzle15/operation/Swap.kt b/appyx-components/experimental/puzzle15/common/src/commonMain/kotlin/com/bumble/appyx/components/experimental/puzzle15/operation/Swap.kt index 51968a4d2..64ccb3c14 100644 --- a/appyx-components/experimental/puzzle15/common/src/commonMain/kotlin/com/bumble/appyx/components/experimental/puzzle15/operation/Swap.kt +++ b/appyx-components/experimental/puzzle15/common/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/appyx-components/experimental/puzzle15/common/src/commonMain/kotlin/com/bumble/appyx/components/experimental/puzzle15/ui/Puzzle15Ui.kt b/appyx-components/experimental/puzzle15/common/src/commonMain/kotlin/com/bumble/appyx/components/experimental/puzzle15/ui/Puzzle15Ui.kt index 1c36ad14e..668eb125d 100644 --- a/appyx-components/experimental/puzzle15/common/src/commonMain/kotlin/com/bumble/appyx/components/experimental/puzzle15/ui/Puzzle15Ui.kt +++ b/appyx-components/experimental/puzzle15/common/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 diff --git a/appyx-components/experimental/puzzle15/common/src/commonMain/kotlin/com/bumble/appyx/components/experimental/puzzle15/ui/Puzzle15Visualisation.kt b/appyx-components/experimental/puzzle15/common/src/commonMain/kotlin/com/bumble/appyx/components/experimental/puzzle15/ui/Puzzle15Visualisation.kt index bf726deb7..281316d5e 100644 --- a/appyx-components/experimental/puzzle15/common/src/commonMain/kotlin/com/bumble/appyx/components/experimental/puzzle15/ui/Puzzle15Visualisation.kt +++ b/appyx-components/experimental/puzzle15/common/src/commonMain/kotlin/com/bumble/appyx/components/experimental/puzzle15/ui/Puzzle15Visualisation.kt @@ -7,16 +7,16 @@ import androidx.compose.ui.unit.Density import com.bumble.appyx.components.experimental.puzzle15.Puzzle15Model import com.bumble.appyx.components.experimental.puzzle15.Puzzle15Model.Tile import com.bumble.appyx.components.experimental.puzzle15.operation.Swap -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.dragDirection4 -import com.bumble.appyx.interactions.core.ui.DefaultAnimationSpec -import com.bumble.appyx.interactions.core.ui.property.impl.position.BiasAlignment.InsideAlignment.Companion.fractionAlignment -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.dragDirection4 +import com.bumble.appyx.interactions.ui.DefaultAnimationSpec +import com.bumble.appyx.interactions.ui.property.impl.position.BiasAlignment.InsideAlignment.Companion.fractionAlignment +import com.bumble.appyx.interactions.ui.property.impl.position.PositionAlignment +import com.bumble.appyx.interactions.ui.state.MatchedTargetUiState import com.bumble.appyx.transitionmodel.BaseVisualisation class Puzzle15Visualisation( diff --git a/appyx-components/experimental/puzzle15/common/src/commonMain/kotlin/com/bumble/appyx/components/experimental/puzzle15/ui/TargetUiState.kt b/appyx-components/experimental/puzzle15/common/src/commonMain/kotlin/com/bumble/appyx/components/experimental/puzzle15/ui/TargetUiState.kt index 619f8da6a..485d90039 100644 --- a/appyx-components/experimental/puzzle15/common/src/commonMain/kotlin/com/bumble/appyx/components/experimental/puzzle15/ui/TargetUiState.kt +++ b/appyx-components/experimental/puzzle15/common/src/commonMain/kotlin/com/bumble/appyx/components/experimental/puzzle15/ui/TargetUiState.kt @@ -1,7 +1,7 @@ package com.bumble.appyx.components.experimental.puzzle15.ui -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.position.PositionAlignment +import com.bumble.appyx.interactions.ui.state.MutableUiStateSpecs @MutableUiStateSpecs class TargetUiState( diff --git a/appyx-components/internal/test-drive/android/src/androidTest/kotlin/com/bumble/appyx/components/internal/testdrive/android/KeyframesTest.kt b/appyx-components/internal/test-drive/android/src/androidTest/kotlin/com/bumble/appyx/components/internal/testdrive/android/KeyframesTest.kt index 98362945f..c85695292 100644 --- a/appyx-components/internal/test-drive/android/src/androidTest/kotlin/com/bumble/appyx/components/internal/testdrive/android/KeyframesTest.kt +++ b/appyx-components/internal/test-drive/android/src/androidTest/kotlin/com/bumble/appyx/components/internal/testdrive/android/KeyframesTest.kt @@ -5,7 +5,7 @@ import androidx.compose.ui.test.onNodeWithText import androidx.compose.ui.test.performClick import com.bumble.appyx.components.internal.testdrive.android.helper.createTestDrive import com.bumble.appyx.components.internal.testdrive.operation.Next -import com.bumble.appyx.interactions.core.model.transition.Operation +import com.bumble.appyx.interactions.model.transition.Operation import com.bumble.appyx.interactions.utils.testing.snapshot import org.junit.Ignore import org.junit.Rule diff --git a/appyx-components/internal/test-drive/android/src/androidTest/kotlin/com/bumble/appyx/components/internal/testdrive/android/KeyframesToUpdateTest.kt b/appyx-components/internal/test-drive/android/src/androidTest/kotlin/com/bumble/appyx/components/internal/testdrive/android/KeyframesToUpdateTest.kt index f4b9d84c2..5bbd76be7 100644 --- a/appyx-components/internal/test-drive/android/src/androidTest/kotlin/com/bumble/appyx/components/internal/testdrive/android/KeyframesToUpdateTest.kt +++ b/appyx-components/internal/test-drive/android/src/androidTest/kotlin/com/bumble/appyx/components/internal/testdrive/android/KeyframesToUpdateTest.kt @@ -4,7 +4,7 @@ import androidx.compose.animation.core.spring import androidx.compose.ui.test.junit4.createComposeRule import com.bumble.appyx.components.internal.testdrive.android.helper.createTestDrive import com.bumble.appyx.components.internal.testdrive.operation.Next -import com.bumble.appyx.interactions.core.model.transition.Operation +import com.bumble.appyx.interactions.model.transition.Operation import com.bumble.appyx.interactions.utils.testing.snapshot import org.junit.Rule import org.junit.Test diff --git a/appyx-components/internal/test-drive/android/src/androidTest/kotlin/com/bumble/appyx/components/internal/testdrive/android/UpdateTest.kt b/appyx-components/internal/test-drive/android/src/androidTest/kotlin/com/bumble/appyx/components/internal/testdrive/android/UpdateTest.kt index ef15e8e0a..d07cc3400 100644 --- a/appyx-components/internal/test-drive/android/src/androidTest/kotlin/com/bumble/appyx/components/internal/testdrive/android/UpdateTest.kt +++ b/appyx-components/internal/test-drive/android/src/androidTest/kotlin/com/bumble/appyx/components/internal/testdrive/android/UpdateTest.kt @@ -3,7 +3,7 @@ package com.bumble.appyx.components.internal.testdrive.android import androidx.compose.ui.test.junit4.createComposeRule import com.bumble.appyx.components.internal.testdrive.android.helper.createTestDrive import com.bumble.appyx.components.internal.testdrive.operation.Next -import com.bumble.appyx.interactions.core.model.transition.Operation +import com.bumble.appyx.interactions.model.transition.Operation import com.bumble.appyx.interactions.utils.testing.snapshot import org.junit.Rule import org.junit.Test diff --git a/appyx-components/internal/test-drive/android/src/androidTest/kotlin/com/bumble/appyx/components/internal/testdrive/android/UpdateToKeyframesTest.kt b/appyx-components/internal/test-drive/android/src/androidTest/kotlin/com/bumble/appyx/components/internal/testdrive/android/UpdateToKeyframesTest.kt index 18f6fedec..f43544fad 100644 --- a/appyx-components/internal/test-drive/android/src/androidTest/kotlin/com/bumble/appyx/components/internal/testdrive/android/UpdateToKeyframesTest.kt +++ b/appyx-components/internal/test-drive/android/src/androidTest/kotlin/com/bumble/appyx/components/internal/testdrive/android/UpdateToKeyframesTest.kt @@ -3,7 +3,7 @@ package com.bumble.appyx.components.internal.testdrive.android import androidx.compose.ui.test.junit4.createComposeRule import com.bumble.appyx.components.internal.testdrive.android.helper.createTestDrive import com.bumble.appyx.components.internal.testdrive.operation.Next -import com.bumble.appyx.interactions.core.model.transition.Operation +import com.bumble.appyx.interactions.model.transition.Operation import com.bumble.appyx.interactions.utils.testing.snapshot import org.junit.Rule import org.junit.Test diff --git a/appyx-components/internal/test-drive/android/src/androidTest/kotlin/com/bumble/appyx/components/internal/testdrive/android/helper/TestDriveUtils.kt b/appyx-components/internal/test-drive/android/src/androidTest/kotlin/com/bumble/appyx/components/internal/testdrive/android/helper/TestDriveUtils.kt index d83da3988..f716186ec 100644 --- a/appyx-components/internal/test-drive/android/src/androidTest/kotlin/com/bumble/appyx/components/internal/testdrive/android/helper/TestDriveUtils.kt +++ b/appyx-components/internal/test-drive/android/src/androidTest/kotlin/com/bumble/appyx/components/internal/testdrive/android/helper/TestDriveUtils.kt @@ -15,8 +15,8 @@ import com.bumble.appyx.components.internal.testdrive.TestDrive import com.bumble.appyx.components.internal.testdrive.TestDriveModel import com.bumble.appyx.components.internal.testdrive.TestDriveUi import com.bumble.appyx.components.internal.testdrive.ui.simple.TestDriveSimpleVisualisation -import com.bumble.appyx.interactions.core.gesture.GestureValidator.Companion.permissiveValidator -import com.bumble.appyx.interactions.core.ui.helper.AppyxComponentSetup +import com.bumble.appyx.interactions.gesture.GestureValidator.Companion.permissiveValidator +import com.bumble.appyx.interactions.ui.helper.AppyxComponentSetup import com.bumble.appyx.interactions.utils.testing.TestTarget import com.bumble.appyx.interactions.utils.ui.theme.appyx_dark import kotlinx.coroutines.CoroutineScope diff --git a/appyx-components/internal/test-drive/common/src/commonMain/kotlin/com/bumble/appyx/components/internal/testdrive/TestDrive.kt b/appyx-components/internal/test-drive/common/src/commonMain/kotlin/com/bumble/appyx/components/internal/testdrive/TestDrive.kt index cb4321988..a026e51b6 100644 --- a/appyx-components/internal/test-drive/common/src/commonMain/kotlin/com/bumble/appyx/components/internal/testdrive/TestDrive.kt +++ b/appyx-components/internal/test-drive/common/src/commonMain/kotlin/com/bumble/appyx/components/internal/testdrive/TestDrive.kt @@ -2,12 +2,12 @@ package com.bumble.appyx.components.internal.testdrive 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 import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.SupervisorJob diff --git a/appyx-components/internal/test-drive/common/src/commonMain/kotlin/com/bumble/appyx/components/internal/testdrive/TestDriveExperiment.kt b/appyx-components/internal/test-drive/common/src/commonMain/kotlin/com/bumble/appyx/components/internal/testdrive/TestDriveExperiment.kt index 536154b33..f6b9e8154 100644 --- a/appyx-components/internal/test-drive/common/src/commonMain/kotlin/com/bumble/appyx/components/internal/testdrive/TestDriveExperiment.kt +++ b/appyx-components/internal/test-drive/common/src/commonMain/kotlin/com/bumble/appyx/components/internal/testdrive/TestDriveExperiment.kt @@ -29,14 +29,14 @@ import com.bumble.appyx.components.internal.testdrive.operation.next import com.bumble.appyx.components.internal.testdrive.ui.rotation.TestDriveRotationVisualisation import com.bumble.appyx.components.internal.testdrive.ui.rotation.TestDriveRotationVisualisation.Companion.toTargetUiState import com.bumble.appyx.components.internal.testdrive.ui.simple.TestDriveSimpleVisualisation -import com.bumble.appyx.interactions.core.AppyxInteractionsContainer -import com.bumble.appyx.interactions.core.gesture.GestureValidator -import com.bumble.appyx.interactions.core.gesture.GestureValidator.Companion.defaultValidator -import com.bumble.appyx.interactions.core.model.transition.Keyframes -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.model.transition.Update -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.gesture.GestureValidator.Companion.defaultValidator +import com.bumble.appyx.interactions.model.transition.Keyframes +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.model.transition.Update +import com.bumble.appyx.interactions.ui.helper.AppyxComponentSetup @Suppress("MagicNumber", "LongMethod") @Composable 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 c1fecc2b8..cde0906e6 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 @@ -1,9 +1,9 @@ package com.bumble.appyx.components.internal.testdrive import com.bumble.appyx.components.internal.testdrive.TestDriveModel.State.ElementState.A -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.SavedStateMap diff --git a/appyx-components/internal/test-drive/common/src/commonMain/kotlin/com/bumble/appyx/components/internal/testdrive/operation/MoveTo.kt b/appyx-components/internal/test-drive/common/src/commonMain/kotlin/com/bumble/appyx/components/internal/testdrive/operation/MoveTo.kt index c911eca43..0c349bbaf 100644 --- a/appyx-components/internal/test-drive/common/src/commonMain/kotlin/com/bumble/appyx/components/internal/testdrive/operation/MoveTo.kt +++ b/appyx-components/internal/test-drive/common/src/commonMain/kotlin/com/bumble/appyx/components/internal/testdrive/operation/MoveTo.kt @@ -3,8 +3,8 @@ package com.bumble.appyx.components.internal.testdrive.operation import androidx.compose.animation.core.AnimationSpec import com.bumble.appyx.components.internal.testdrive.TestDrive import com.bumble.appyx.components.internal.testdrive.TestDriveModel -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/appyx-components/internal/test-drive/common/src/commonMain/kotlin/com/bumble/appyx/components/internal/testdrive/operation/Next.kt b/appyx-components/internal/test-drive/common/src/commonMain/kotlin/com/bumble/appyx/components/internal/testdrive/operation/Next.kt index 52f45db02..df8a3aa40 100644 --- a/appyx-components/internal/test-drive/common/src/commonMain/kotlin/com/bumble/appyx/components/internal/testdrive/operation/Next.kt +++ b/appyx-components/internal/test-drive/common/src/commonMain/kotlin/com/bumble/appyx/components/internal/testdrive/operation/Next.kt @@ -3,8 +3,8 @@ package com.bumble.appyx.components.internal.testdrive.operation import androidx.compose.animation.core.AnimationSpec import com.bumble.appyx.components.internal.testdrive.TestDrive import com.bumble.appyx.components.internal.testdrive.TestDriveModel -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/appyx-components/internal/test-drive/common/src/commonMain/kotlin/com/bumble/appyx/components/internal/testdrive/ui/rotation/TargetUiState.kt b/appyx-components/internal/test-drive/common/src/commonMain/kotlin/com/bumble/appyx/components/internal/testdrive/ui/rotation/TargetUiState.kt index 307febd78..b8bb47790 100644 --- a/appyx-components/internal/test-drive/common/src/commonMain/kotlin/com/bumble/appyx/components/internal/testdrive/ui/rotation/TargetUiState.kt +++ b/appyx-components/internal/test-drive/common/src/commonMain/kotlin/com/bumble/appyx/components/internal/testdrive/ui/rotation/TargetUiState.kt @@ -1,9 +1,9 @@ package com.bumble.appyx.components.internal.testdrive.ui.rotation -import com.bumble.appyx.interactions.core.ui.property.impl.BackgroundColor -import com.bumble.appyx.interactions.core.ui.property.impl.RotationZ -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.BackgroundColor +import com.bumble.appyx.interactions.ui.property.impl.RotationZ +import com.bumble.appyx.interactions.ui.property.impl.position.PositionAlignment +import com.bumble.appyx.interactions.ui.state.MutableUiStateSpecs @Suppress("unused") @MutableUiStateSpecs diff --git a/appyx-components/internal/test-drive/common/src/commonMain/kotlin/com/bumble/appyx/components/internal/testdrive/ui/rotation/TestDriveRotationVisualisation.kt b/appyx-components/internal/test-drive/common/src/commonMain/kotlin/com/bumble/appyx/components/internal/testdrive/ui/rotation/TestDriveRotationVisualisation.kt index 6965cf128..ce285c7a7 100644 --- a/appyx-components/internal/test-drive/common/src/commonMain/kotlin/com/bumble/appyx/components/internal/testdrive/ui/rotation/TestDriveRotationVisualisation.kt +++ b/appyx-components/internal/test-drive/common/src/commonMain/kotlin/com/bumble/appyx/components/internal/testdrive/ui/rotation/TestDriveRotationVisualisation.kt @@ -10,13 +10,13 @@ import com.bumble.appyx.components.internal.testdrive.ui.md_light_blue_500 import com.bumble.appyx.components.internal.testdrive.ui.md_light_green_500 import com.bumble.appyx.components.internal.testdrive.ui.md_red_500 import com.bumble.appyx.components.internal.testdrive.ui.md_yellow_500 -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.BackgroundColor -import com.bumble.appyx.interactions.core.ui.property.impl.RotationZ -import com.bumble.appyx.interactions.core.ui.property.impl.position.BiasAlignment.InsideAlignment -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.UiContext +import com.bumble.appyx.interactions.ui.DefaultAnimationSpec +import com.bumble.appyx.interactions.ui.property.impl.BackgroundColor +import com.bumble.appyx.interactions.ui.property.impl.RotationZ +import com.bumble.appyx.interactions.ui.property.impl.position.BiasAlignment.InsideAlignment +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/appyx-components/internal/test-drive/common/src/commonMain/kotlin/com/bumble/appyx/components/internal/testdrive/ui/simple/TargetUiState.kt b/appyx-components/internal/test-drive/common/src/commonMain/kotlin/com/bumble/appyx/components/internal/testdrive/ui/simple/TargetUiState.kt index e922c29e2..0bc8b7ee8 100644 --- a/appyx-components/internal/test-drive/common/src/commonMain/kotlin/com/bumble/appyx/components/internal/testdrive/ui/simple/TargetUiState.kt +++ b/appyx-components/internal/test-drive/common/src/commonMain/kotlin/com/bumble/appyx/components/internal/testdrive/ui/simple/TargetUiState.kt @@ -1,8 +1,8 @@ package com.bumble.appyx.components.internal.testdrive.ui.simple -import com.bumble.appyx.interactions.core.ui.property.impl.BackgroundColor -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.BackgroundColor +import com.bumble.appyx.interactions.ui.property.impl.position.PositionAlignment +import com.bumble.appyx.interactions.ui.state.MutableUiStateSpecs @Suppress("unused") @MutableUiStateSpecs diff --git a/appyx-components/internal/test-drive/common/src/commonMain/kotlin/com/bumble/appyx/components/internal/testdrive/ui/simple/TestDriveSimpleVisualisation.kt b/appyx-components/internal/test-drive/common/src/commonMain/kotlin/com/bumble/appyx/components/internal/testdrive/ui/simple/TestDriveSimpleVisualisation.kt index 7cd5d306c..4a4bef211 100644 --- a/appyx-components/internal/test-drive/common/src/commonMain/kotlin/com/bumble/appyx/components/internal/testdrive/ui/simple/TestDriveSimpleVisualisation.kt +++ b/appyx-components/internal/test-drive/common/src/commonMain/kotlin/com/bumble/appyx/components/internal/testdrive/ui/simple/TestDriveSimpleVisualisation.kt @@ -13,24 +13,24 @@ import com.bumble.appyx.components.internal.testdrive.ui.md_light_blue_500 import com.bumble.appyx.components.internal.testdrive.ui.md_light_green_500 import com.bumble.appyx.components.internal.testdrive.ui.md_red_500 import com.bumble.appyx.components.internal.testdrive.ui.md_yellow_500 -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.Direction8.DOWN -import com.bumble.appyx.interactions.core.ui.gesture.Drag.Direction8.DOWNLEFT -import com.bumble.appyx.interactions.core.ui.gesture.Drag.Direction8.DOWNRIGHT -import com.bumble.appyx.interactions.core.ui.gesture.Drag.Direction8.LEFT -import com.bumble.appyx.interactions.core.ui.gesture.Drag.Direction8.RIGHT -import com.bumble.appyx.interactions.core.ui.gesture.Drag.Direction8.UP -import com.bumble.appyx.interactions.core.ui.gesture.Drag.Direction8.UPLEFT -import com.bumble.appyx.interactions.core.ui.gesture.Drag.Direction8.UPRIGHT -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.dragDirection8 -import com.bumble.appyx.interactions.core.ui.DefaultAnimationSpec -import com.bumble.appyx.interactions.core.ui.property.impl.BackgroundColor -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.Direction8.DOWN +import com.bumble.appyx.interactions.gesture.Drag.Direction8.DOWNLEFT +import com.bumble.appyx.interactions.gesture.Drag.Direction8.DOWNRIGHT +import com.bumble.appyx.interactions.gesture.Drag.Direction8.LEFT +import com.bumble.appyx.interactions.gesture.Drag.Direction8.RIGHT +import com.bumble.appyx.interactions.gesture.Drag.Direction8.UP +import com.bumble.appyx.interactions.gesture.Drag.Direction8.UPLEFT +import com.bumble.appyx.interactions.gesture.Drag.Direction8.UPRIGHT +import com.bumble.appyx.interactions.gesture.Gesture +import com.bumble.appyx.interactions.gesture.GestureFactory +import com.bumble.appyx.interactions.gesture.dragDirection8 +import com.bumble.appyx.interactions.ui.DefaultAnimationSpec +import com.bumble.appyx.interactions.ui.property.impl.BackgroundColor +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/appyx-components/internal/test-drive/common/src/commonTest/kotlin/com/bumble/appyx/components/internal/testdrive/KeyframeTest.kt b/appyx-components/internal/test-drive/common/src/commonTest/kotlin/com/bumble/appyx/components/internal/testdrive/KeyframeTest.kt index cf2cd435f..86d5d3bc8 100644 --- a/appyx-components/internal/test-drive/common/src/commonTest/kotlin/com/bumble/appyx/components/internal/testdrive/KeyframeTest.kt +++ b/appyx-components/internal/test-drive/common/src/commonTest/kotlin/com/bumble/appyx/components/internal/testdrive/KeyframeTest.kt @@ -1,7 +1,7 @@ package com.bumble.appyx.components.internal.testdrive import com.bumble.appyx.components.internal.testdrive.operation.Next -import com.bumble.appyx.interactions.core.model.transition.Keyframes +import com.bumble.appyx.interactions.model.transition.Keyframes import kotlin.test.Test import kotlin.test.assertEquals import kotlin.test.assertTrue diff --git a/appyx-components/internal/test-drive/common/src/commonTest/kotlin/com/bumble/appyx/components/internal/testdrive/KeyframeToUpdateTest.kt b/appyx-components/internal/test-drive/common/src/commonTest/kotlin/com/bumble/appyx/components/internal/testdrive/KeyframeToUpdateTest.kt index 681e5ccd7..72bd84195 100644 --- a/appyx-components/internal/test-drive/common/src/commonTest/kotlin/com/bumble/appyx/components/internal/testdrive/KeyframeToUpdateTest.kt +++ b/appyx-components/internal/test-drive/common/src/commonTest/kotlin/com/bumble/appyx/components/internal/testdrive/KeyframeToUpdateTest.kt @@ -1,9 +1,9 @@ package com.bumble.appyx.components.internal.testdrive import com.bumble.appyx.components.internal.testdrive.operation.Next -import com.bumble.appyx.interactions.core.model.transition.Keyframes -import com.bumble.appyx.interactions.core.model.transition.TransitionModel -import com.bumble.appyx.interactions.core.model.transition.Update +import com.bumble.appyx.interactions.model.transition.Keyframes +import com.bumble.appyx.interactions.model.transition.TransitionModel +import com.bumble.appyx.interactions.model.transition.Update import kotlin.test.Test import kotlin.test.assertTrue diff --git a/appyx-components/internal/test-drive/common/src/commonTest/kotlin/com/bumble/appyx/components/internal/testdrive/UpdateToKeyframeTest.kt b/appyx-components/internal/test-drive/common/src/commonTest/kotlin/com/bumble/appyx/components/internal/testdrive/UpdateToKeyframeTest.kt index b26df680c..ea80cf416 100644 --- a/appyx-components/internal/test-drive/common/src/commonTest/kotlin/com/bumble/appyx/components/internal/testdrive/UpdateToKeyframeTest.kt +++ b/appyx-components/internal/test-drive/common/src/commonTest/kotlin/com/bumble/appyx/components/internal/testdrive/UpdateToKeyframeTest.kt @@ -1,9 +1,9 @@ package com.bumble.appyx.components.internal.testdrive import com.bumble.appyx.components.internal.testdrive.operation.Next -import com.bumble.appyx.interactions.core.model.transition.Keyframes -import com.bumble.appyx.interactions.core.model.transition.Operation -import com.bumble.appyx.interactions.core.model.transition.Update +import com.bumble.appyx.interactions.model.transition.Keyframes +import com.bumble.appyx.interactions.model.transition.Operation +import com.bumble.appyx.interactions.model.transition.Update import kotlin.test.Test import kotlin.test.assertTrue diff --git a/appyx-components/standard/backstack/android/src/androidTest/kotlin/com/bumble/appyx/components/backstack/android/BackStackTest.kt b/appyx-components/standard/backstack/android/src/androidTest/kotlin/com/bumble/appyx/components/backstack/android/BackStackTest.kt index 01f9552cf..c95ce1a49 100644 --- a/appyx-components/standard/backstack/android/src/androidTest/kotlin/com/bumble/appyx/components/backstack/android/BackStackTest.kt +++ b/appyx-components/standard/backstack/android/src/androidTest/kotlin/com/bumble/appyx/components/backstack/android/BackStackTest.kt @@ -11,9 +11,9 @@ import com.bumble.appyx.components.backstack.ui.fader.BackStackFader import com.bumble.appyx.components.backstack.ui.parallax.BackStackParallax import com.bumble.appyx.components.backstack.ui.slider.BackStackSlider import com.bumble.appyx.components.backstack.ui.stack3d.BackStack3D -import com.bumble.appyx.interactions.core.model.transition.Operation -import com.bumble.appyx.interactions.core.ui.Visualisation -import com.bumble.appyx.interactions.core.ui.context.UiContext +import com.bumble.appyx.interactions.model.transition.Operation +import com.bumble.appyx.interactions.ui.Visualisation +import com.bumble.appyx.interactions.ui.context.UiContext import com.bumble.appyx.interactions.utils.testing.setupAppyxComponent import com.bumble.appyx.interactions.utils.testing.waitUntilAnimationEnded import com.bumble.appyx.interactions.utils.testing.waitUntilAnimationStarted diff --git a/appyx-components/standard/backstack/android/src/androidTest/kotlin/com/bumble/appyx/components/backstack/ui/parallax/BackStackParallaxTest.kt b/appyx-components/standard/backstack/android/src/androidTest/kotlin/com/bumble/appyx/components/backstack/ui/parallax/BackStackParallaxTest.kt index fbe397c28..5797332e8 100644 --- a/appyx-components/standard/backstack/android/src/androidTest/kotlin/com/bumble/appyx/components/backstack/ui/parallax/BackStackParallaxTest.kt +++ b/appyx-components/standard/backstack/android/src/androidTest/kotlin/com/bumble/appyx/components/backstack/ui/parallax/BackStackParallaxTest.kt @@ -4,7 +4,7 @@ import androidx.compose.ui.test.junit4.createComposeRule import com.bumble.appyx.components.backstack.BackStack import com.bumble.appyx.components.backstack.BackStackModel import com.bumble.appyx.components.backstack.operation.push -import com.bumble.appyx.interactions.core.model.transition.Update +import com.bumble.appyx.interactions.model.transition.Update import com.bumble.appyx.interactions.utils.testing.setupAppyxComponent import com.bumble.appyx.interactions.utils.testing.TestTarget import kotlinx.coroutines.CoroutineScope diff --git a/appyx-components/standard/backstack/common/src/commonMain/kotlin/com/bumble/appyx/components/backstack/BackStack.kt b/appyx-components/standard/backstack/common/src/commonMain/kotlin/com/bumble/appyx/components/backstack/BackStack.kt index 3a298b2fd..ce5af8dcf 100644 --- a/appyx-components/standard/backstack/common/src/commonMain/kotlin/com/bumble/appyx/components/backstack/BackStack.kt +++ b/appyx-components/standard/backstack/common/src/commonMain/kotlin/com/bumble/appyx/components/backstack/BackStack.kt @@ -3,13 +3,13 @@ package com.bumble.appyx.components.backstack import androidx.compose.animation.core.AnimationSpec import androidx.compose.animation.core.spring import com.bumble.appyx.components.backstack.backpresshandler.PopBackstackStrategy -import com.bumble.appyx.interactions.core.model.BaseAppyxComponent -import com.bumble.appyx.interactions.core.model.backpresshandlerstrategies.BackPressHandlerStrategy -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.model.backpresshandlerstrategies.BackPressHandlerStrategy +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 import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.SupervisorJob diff --git a/appyx-components/standard/backstack/common/src/commonMain/kotlin/com/bumble/appyx/components/backstack/BackStackModel.kt b/appyx-components/standard/backstack/common/src/commonMain/kotlin/com/bumble/appyx/components/backstack/BackStackModel.kt index 033032b55..6c323212e 100644 --- a/appyx-components/standard/backstack/common/src/commonMain/kotlin/com/bumble/appyx/components/backstack/BackStackModel.kt +++ b/appyx-components/standard/backstack/common/src/commonMain/kotlin/com/bumble/appyx/components/backstack/BackStackModel.kt @@ -1,10 +1,10 @@ package com.bumble.appyx.components.backstack import com.bumble.appyx.components.backstack.BackStackModel.State -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.model.Element +import com.bumble.appyx.interactions.model.Elements +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.SavedStateMap diff --git a/appyx-components/standard/backstack/common/src/commonMain/kotlin/com/bumble/appyx/components/backstack/BackStackModelExt.kt b/appyx-components/standard/backstack/common/src/commonMain/kotlin/com/bumble/appyx/components/backstack/BackStackModelExt.kt index dfbb1610f..df6b6f44d 100644 --- a/appyx-components/standard/backstack/common/src/commonMain/kotlin/com/bumble/appyx/components/backstack/BackStackModelExt.kt +++ b/appyx-components/standard/backstack/common/src/commonMain/kotlin/com/bumble/appyx/components/backstack/BackStackModelExt.kt @@ -1,6 +1,6 @@ package com.bumble.appyx.components.backstack -import com.bumble.appyx.interactions.core.Element +import com.bumble.appyx.interactions.model.Element val BackStackModel.activeElement: Element get() = output.value.currentTargetState.active diff --git a/appyx-components/standard/backstack/common/src/commonMain/kotlin/com/bumble/appyx/components/backstack/backpresshandler/PopBackstackStrategy.kt b/appyx-components/standard/backstack/common/src/commonMain/kotlin/com/bumble/appyx/components/backstack/backpresshandler/PopBackstackStrategy.kt index abb19ac78..efb402e27 100644 --- a/appyx-components/standard/backstack/common/src/commonMain/kotlin/com/bumble/appyx/components/backstack/backpresshandler/PopBackstackStrategy.kt +++ b/appyx-components/standard/backstack/common/src/commonMain/kotlin/com/bumble/appyx/components/backstack/backpresshandler/PopBackstackStrategy.kt @@ -3,7 +3,7 @@ package com.bumble.appyx.components.backstack.backpresshandler import androidx.compose.animation.core.AnimationSpec import com.bumble.appyx.components.backstack.BackStackModel import com.bumble.appyx.components.backstack.operation.Pop -import com.bumble.appyx.interactions.core.model.backpresshandlerstrategies.BaseBackPressHandlerStrategy +import com.bumble.appyx.interactions.model.backpresshandlerstrategies.BaseBackPressHandlerStrategy import com.bumble.appyx.mapState import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.flow.StateFlow diff --git a/appyx-components/standard/backstack/common/src/commonMain/kotlin/com/bumble/appyx/components/backstack/node/backStackNode.kt b/appyx-components/standard/backstack/common/src/commonMain/kotlin/com/bumble/appyx/components/backstack/node/backStackNode.kt index 79a3a5439..5b8a88879 100644 --- a/appyx-components/standard/backstack/common/src/commonMain/kotlin/com/bumble/appyx/components/backstack/node/backStackNode.kt +++ b/appyx-components/standard/backstack/common/src/commonMain/kotlin/com/bumble/appyx/components/backstack/node/backStackNode.kt @@ -6,10 +6,10 @@ import com.bumble.appyx.components.backstack.BackStack import com.bumble.appyx.components.backstack.BackStackModel import com.bumble.appyx.components.backstack.BackStackModel.State import com.bumble.appyx.components.backstack.ui.fader.BackStackFader -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.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.navigation.composable.AppyxNavigationContainer import com.bumble.appyx.navigation.modality.NodeContext import com.bumble.appyx.navigation.node.ComponentNode diff --git a/appyx-components/standard/backstack/common/src/commonMain/kotlin/com/bumble/appyx/components/backstack/operation/NewRoot.kt b/appyx-components/standard/backstack/common/src/commonMain/kotlin/com/bumble/appyx/components/backstack/operation/NewRoot.kt index 3f510c269..17be2941a 100644 --- a/appyx-components/standard/backstack/common/src/commonMain/kotlin/com/bumble/appyx/components/backstack/operation/NewRoot.kt +++ b/appyx-components/standard/backstack/common/src/commonMain/kotlin/com/bumble/appyx/components/backstack/operation/NewRoot.kt @@ -3,9 +3,9 @@ package com.bumble.appyx.components.backstack.operation import androidx.compose.animation.core.AnimationSpec import com.bumble.appyx.components.backstack.BackStack import com.bumble.appyx.components.backstack.BackStackModel -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/appyx-components/standard/backstack/common/src/commonMain/kotlin/com/bumble/appyx/components/backstack/operation/Pop.kt b/appyx-components/standard/backstack/common/src/commonMain/kotlin/com/bumble/appyx/components/backstack/operation/Pop.kt index 36247362b..31abbeb9c 100644 --- a/appyx-components/standard/backstack/common/src/commonMain/kotlin/com/bumble/appyx/components/backstack/operation/Pop.kt +++ b/appyx-components/standard/backstack/common/src/commonMain/kotlin/com/bumble/appyx/components/backstack/operation/Pop.kt @@ -3,8 +3,8 @@ package com.bumble.appyx.components.backstack.operation import androidx.compose.animation.core.AnimationSpec import com.bumble.appyx.components.backstack.BackStack import com.bumble.appyx.components.backstack.BackStackModel.State -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 /** diff --git a/appyx-components/standard/backstack/common/src/commonMain/kotlin/com/bumble/appyx/components/backstack/operation/Push.kt b/appyx-components/standard/backstack/common/src/commonMain/kotlin/com/bumble/appyx/components/backstack/operation/Push.kt index 36f91d73c..6c6eda479 100644 --- a/appyx-components/standard/backstack/common/src/commonMain/kotlin/com/bumble/appyx/components/backstack/operation/Push.kt +++ b/appyx-components/standard/backstack/common/src/commonMain/kotlin/com/bumble/appyx/components/backstack/operation/Push.kt @@ -3,9 +3,9 @@ package com.bumble.appyx.components.backstack.operation import androidx.compose.animation.core.AnimationSpec import com.bumble.appyx.components.backstack.BackStack import com.bumble.appyx.components.backstack.BackStackModel -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/appyx-components/standard/backstack/common/src/commonMain/kotlin/com/bumble/appyx/components/backstack/operation/Replace.kt b/appyx-components/standard/backstack/common/src/commonMain/kotlin/com/bumble/appyx/components/backstack/operation/Replace.kt index 01de2f41f..c973aa721 100644 --- a/appyx-components/standard/backstack/common/src/commonMain/kotlin/com/bumble/appyx/components/backstack/operation/Replace.kt +++ b/appyx-components/standard/backstack/common/src/commonMain/kotlin/com/bumble/appyx/components/backstack/operation/Replace.kt @@ -3,9 +3,9 @@ package com.bumble.appyx.components.backstack.operation import androidx.compose.animation.core.AnimationSpec import com.bumble.appyx.components.backstack.BackStack import com.bumble.appyx.components.backstack.BackStackModel.State -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/appyx-components/standard/backstack/common/src/commonMain/kotlin/com/bumble/appyx/components/backstack/ui/fader/BackStackFader.kt b/appyx-components/standard/backstack/common/src/commonMain/kotlin/com/bumble/appyx/components/backstack/ui/fader/BackStackFader.kt index ddeddfec4..266457507 100644 --- a/appyx-components/standard/backstack/common/src/commonMain/kotlin/com/bumble/appyx/components/backstack/ui/fader/BackStackFader.kt +++ b/appyx-components/standard/backstack/common/src/commonMain/kotlin/com/bumble/appyx/components/backstack/ui/fader/BackStackFader.kt @@ -2,10 +2,10 @@ package com.bumble.appyx.components.backstack.ui.fader import androidx.compose.animation.core.SpringSpec import com.bumble.appyx.components.backstack.BackStackModel -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.Alpha -import com.bumble.appyx.interactions.core.ui.state.MatchedTargetUiState +import com.bumble.appyx.interactions.ui.context.UiContext +import com.bumble.appyx.interactions.ui.DefaultAnimationSpec +import com.bumble.appyx.interactions.ui.property.impl.Alpha +import com.bumble.appyx.interactions.ui.state.MatchedTargetUiState import com.bumble.appyx.transitionmodel.BaseVisualisation class BackStackFader( diff --git a/appyx-components/standard/backstack/common/src/commonMain/kotlin/com/bumble/appyx/components/backstack/ui/fader/TargetUiState.kt b/appyx-components/standard/backstack/common/src/commonMain/kotlin/com/bumble/appyx/components/backstack/ui/fader/TargetUiState.kt index 0dccb1c72..1eb3233ee 100644 --- a/appyx-components/standard/backstack/common/src/commonMain/kotlin/com/bumble/appyx/components/backstack/ui/fader/TargetUiState.kt +++ b/appyx-components/standard/backstack/common/src/commonMain/kotlin/com/bumble/appyx/components/backstack/ui/fader/TargetUiState.kt @@ -1,7 +1,7 @@ package com.bumble.appyx.components.backstack.ui.fader -import com.bumble.appyx.interactions.core.ui.property.impl.Alpha -import com.bumble.appyx.interactions.core.ui.state.MutableUiStateSpecs +import com.bumble.appyx.interactions.ui.property.impl.Alpha +import com.bumble.appyx.interactions.ui.state.MutableUiStateSpecs @Suppress("unused") @MutableUiStateSpecs diff --git a/appyx-components/standard/backstack/common/src/commonMain/kotlin/com/bumble/appyx/components/backstack/ui/parallax/BackStackParallax.kt b/appyx-components/standard/backstack/common/src/commonMain/kotlin/com/bumble/appyx/components/backstack/ui/parallax/BackStackParallax.kt index cb34cfe92..fb3e35161 100644 --- a/appyx-components/standard/backstack/common/src/commonMain/kotlin/com/bumble/appyx/components/backstack/ui/parallax/BackStackParallax.kt +++ b/appyx-components/standard/backstack/common/src/commonMain/kotlin/com/bumble/appyx/components/backstack/ui/parallax/BackStackParallax.kt @@ -6,17 +6,17 @@ import androidx.compose.ui.geometry.Offset import androidx.compose.ui.unit.Density import com.bumble.appyx.components.backstack.BackStackModel.State import com.bumble.appyx.components.backstack.operation.Pop -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.Alpha -import com.bumble.appyx.interactions.core.ui.property.impl.ColorOverlay -import com.bumble.appyx.interactions.core.ui.property.impl.Shadow -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.Alpha +import com.bumble.appyx.interactions.ui.property.impl.ColorOverlay +import com.bumble.appyx.interactions.ui.property.impl.Shadow +import com.bumble.appyx.interactions.ui.state.MatchedTargetUiState import com.bumble.appyx.transitionmodel.BaseVisualisation @Suppress("MagicNumber") diff --git a/appyx-components/standard/backstack/common/src/commonMain/kotlin/com/bumble/appyx/components/backstack/ui/parallax/TargetUiState.kt b/appyx-components/standard/backstack/common/src/commonMain/kotlin/com/bumble/appyx/components/backstack/ui/parallax/TargetUiState.kt index dd0e4cd00..661864bb4 100644 --- a/appyx-components/standard/backstack/common/src/commonMain/kotlin/com/bumble/appyx/components/backstack/ui/parallax/TargetUiState.kt +++ b/appyx-components/standard/backstack/common/src/commonMain/kotlin/com/bumble/appyx/components/backstack/ui/parallax/TargetUiState.kt @@ -1,12 +1,12 @@ package com.bumble.appyx.components.backstack.ui.parallax -import com.bumble.appyx.interactions.core.ui.property.impl.Alpha -import com.bumble.appyx.interactions.core.ui.property.impl.ColorOverlay -import com.bumble.appyx.interactions.core.ui.property.impl.Shadow -import com.bumble.appyx.interactions.core.ui.property.impl.position.BiasAlignment.OutsideAlignment -import com.bumble.appyx.interactions.core.ui.property.impl.position.BiasAlignment.OutsideAlignment.Companion.InContainer -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.Alpha +import com.bumble.appyx.interactions.ui.property.impl.ColorOverlay +import com.bumble.appyx.interactions.ui.property.impl.Shadow +import com.bumble.appyx.interactions.ui.property.impl.position.BiasAlignment.OutsideAlignment +import com.bumble.appyx.interactions.ui.property.impl.position.BiasAlignment.OutsideAlignment.Companion.InContainer +import com.bumble.appyx.interactions.ui.property.impl.position.PositionAlignment +import com.bumble.appyx.interactions.ui.state.MutableUiStateSpecs @Suppress("unused", "MemberVisibilityCanBePrivate", "MagicNumber") @MutableUiStateSpecs diff --git a/appyx-components/standard/backstack/common/src/commonMain/kotlin/com/bumble/appyx/components/backstack/ui/slider/BackStackSlider.kt b/appyx-components/standard/backstack/common/src/commonMain/kotlin/com/bumble/appyx/components/backstack/ui/slider/BackStackSlider.kt index dd13c35c7..c28bd1472 100644 --- a/appyx-components/standard/backstack/common/src/commonMain/kotlin/com/bumble/appyx/components/backstack/ui/slider/BackStackSlider.kt +++ b/appyx-components/standard/backstack/common/src/commonMain/kotlin/com/bumble/appyx/components/backstack/ui/slider/BackStackSlider.kt @@ -1,11 +1,11 @@ package com.bumble.appyx.components.backstack.ui.slider import com.bumble.appyx.components.backstack.BackStackModel -import com.bumble.appyx.interactions.core.ui.context.UiContext -import com.bumble.appyx.interactions.core.ui.property.impl.Alpha -import com.bumble.appyx.interactions.core.ui.property.impl.position.BiasAlignment.OutsideAlignment.Companion.InContainer -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.UiContext +import com.bumble.appyx.interactions.ui.property.impl.Alpha +import com.bumble.appyx.interactions.ui.property.impl.position.BiasAlignment.OutsideAlignment.Companion.InContainer +import com.bumble.appyx.interactions.ui.property.impl.position.PositionAlignment +import com.bumble.appyx.interactions.ui.state.MatchedTargetUiState import com.bumble.appyx.transitionmodel.BaseVisualisation class BackStackSlider( diff --git a/appyx-components/standard/backstack/common/src/commonMain/kotlin/com/bumble/appyx/components/backstack/ui/slider/TargetUiState.kt b/appyx-components/standard/backstack/common/src/commonMain/kotlin/com/bumble/appyx/components/backstack/ui/slider/TargetUiState.kt index b6479be28..8a7fa6f6c 100644 --- a/appyx-components/standard/backstack/common/src/commonMain/kotlin/com/bumble/appyx/components/backstack/ui/slider/TargetUiState.kt +++ b/appyx-components/standard/backstack/common/src/commonMain/kotlin/com/bumble/appyx/components/backstack/ui/slider/TargetUiState.kt @@ -1,11 +1,11 @@ package com.bumble.appyx.components.backstack.ui.slider -import com.bumble.appyx.interactions.core.ui.property.impl.Alpha -import com.bumble.appyx.interactions.core.ui.property.impl.position.BiasAlignment -import com.bumble.appyx.interactions.core.ui.property.impl.position.BiasAlignment.OutsideAlignment.Companion.InContainer -import com.bumble.appyx.interactions.core.ui.property.impl.position.BiasAlignment.OutsideAlignment.Companion.OutsideRight -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.Alpha +import com.bumble.appyx.interactions.ui.property.impl.position.BiasAlignment +import com.bumble.appyx.interactions.ui.property.impl.position.BiasAlignment.OutsideAlignment.Companion.InContainer +import com.bumble.appyx.interactions.ui.property.impl.position.BiasAlignment.OutsideAlignment.Companion.OutsideRight +import com.bumble.appyx.interactions.ui.property.impl.position.PositionAlignment +import com.bumble.appyx.interactions.ui.state.MutableUiStateSpecs @MutableUiStateSpecs class TargetUiState( diff --git a/appyx-components/standard/backstack/common/src/commonMain/kotlin/com/bumble/appyx/components/backstack/ui/stack3d/BackStack3D.kt b/appyx-components/standard/backstack/common/src/commonMain/kotlin/com/bumble/appyx/components/backstack/ui/stack3d/BackStack3D.kt index 6cd978dd9..1c45c96a1 100644 --- a/appyx-components/standard/backstack/common/src/commonMain/kotlin/com/bumble/appyx/components/backstack/ui/stack3d/BackStack3D.kt +++ b/appyx-components/standard/backstack/common/src/commonMain/kotlin/com/bumble/appyx/components/backstack/ui/stack3d/BackStack3D.kt @@ -9,19 +9,19 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.times import com.bumble.appyx.components.backstack.BackStackModel.State import com.bumble.appyx.components.backstack.operation.Pop -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.dragVerticalDirection -import com.bumble.appyx.interactions.core.ui.property.impl.Alpha -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.InsideAlignment.Companion.TopCenter -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.gesture.Drag +import com.bumble.appyx.interactions.gesture.Gesture +import com.bumble.appyx.interactions.gesture.GestureFactory +import com.bumble.appyx.interactions.gesture.dragVerticalDirection +import com.bumble.appyx.interactions.ui.property.impl.Alpha +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.InsideAlignment.Companion.TopCenter +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 @Suppress("MagicNumber") diff --git a/appyx-components/standard/backstack/common/src/commonMain/kotlin/com/bumble/appyx/components/backstack/ui/stack3d/TargetUiState.kt b/appyx-components/standard/backstack/common/src/commonMain/kotlin/com/bumble/appyx/components/backstack/ui/stack3d/TargetUiState.kt index 49ea5e535..eb4030b3c 100644 --- a/appyx-components/standard/backstack/common/src/commonMain/kotlin/com/bumble/appyx/components/backstack/ui/stack3d/TargetUiState.kt +++ b/appyx-components/standard/backstack/common/src/commonMain/kotlin/com/bumble/appyx/components/backstack/ui/stack3d/TargetUiState.kt @@ -1,11 +1,11 @@ package com.bumble.appyx.components.backstack.ui.stack3d -import com.bumble.appyx.interactions.core.ui.property.impl.Alpha -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.property.impl.position.PositionOffset -import com.bumble.appyx.interactions.core.ui.state.MutableUiStateSpecs +import com.bumble.appyx.interactions.ui.property.impl.Alpha +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.property.impl.position.PositionOffset +import com.bumble.appyx.interactions.ui.state.MutableUiStateSpecs @Suppress("unused") @MutableUiStateSpecs diff --git a/appyx-components/standard/backstack/common/src/commonTest/kotlin/com/bumble/appyx/components/stable/backstack/operation/NewRootTest.kt b/appyx-components/standard/backstack/common/src/commonTest/kotlin/com/bumble/appyx/components/stable/backstack/operation/NewRootTest.kt index 2323887a7..91f7e2462 100644 --- a/appyx-components/standard/backstack/common/src/commonTest/kotlin/com/bumble/appyx/components/stable/backstack/operation/NewRootTest.kt +++ b/appyx-components/standard/backstack/common/src/commonTest/kotlin/com/bumble/appyx/components/stable/backstack/operation/NewRootTest.kt @@ -5,7 +5,7 @@ import com.bumble.appyx.components.stable.backstack.TestTarget.Child2 import com.bumble.appyx.components.stable.backstack.TestTarget.Child3 import com.bumble.appyx.components.stable.backstack.TestTarget.Child4 import com.bumble.appyx.components.stable.backstack.TestTarget.Child5 -import com.bumble.appyx.interactions.core.asElement +import com.bumble.appyx.interactions.model.asElement import com.bumble.appyx.components.backstack.BackStackModel import com.bumble.appyx.components.backstack.operation.NewRoot import kotlin.test.Test diff --git a/appyx-components/standard/backstack/common/src/commonTest/kotlin/com/bumble/appyx/components/stable/backstack/operation/PopTest.kt b/appyx-components/standard/backstack/common/src/commonTest/kotlin/com/bumble/appyx/components/stable/backstack/operation/PopTest.kt index 87a26690c..ffacffa1b 100644 --- a/appyx-components/standard/backstack/common/src/commonTest/kotlin/com/bumble/appyx/components/stable/backstack/operation/PopTest.kt +++ b/appyx-components/standard/backstack/common/src/commonTest/kotlin/com/bumble/appyx/components/stable/backstack/operation/PopTest.kt @@ -5,7 +5,7 @@ import com.bumble.appyx.components.backstack.BackStackModel import com.bumble.appyx.components.stable.backstack.TestTarget import com.bumble.appyx.components.stable.backstack.TestTarget.Child1 import com.bumble.appyx.components.stable.backstack.TestTarget.Child2 -import com.bumble.appyx.interactions.core.Element +import com.bumble.appyx.interactions.model.Element import kotlin.test.Test import kotlin.test.assertEquals import kotlin.test.assertFalse diff --git a/appyx-components/standard/backstack/common/src/commonTest/kotlin/com/bumble/appyx/components/stable/backstack/operation/PushTest.kt b/appyx-components/standard/backstack/common/src/commonTest/kotlin/com/bumble/appyx/components/stable/backstack/operation/PushTest.kt index 9595462cf..ce5fe1ed8 100644 --- a/appyx-components/standard/backstack/common/src/commonTest/kotlin/com/bumble/appyx/components/stable/backstack/operation/PushTest.kt +++ b/appyx-components/standard/backstack/common/src/commonTest/kotlin/com/bumble/appyx/components/stable/backstack/operation/PushTest.kt @@ -4,7 +4,7 @@ import com.bumble.appyx.components.backstack.BackStackModel import com.bumble.appyx.components.backstack.operation.Push import com.bumble.appyx.components.stable.backstack.TestTarget.Child1 import com.bumble.appyx.components.stable.backstack.TestTarget.Child2 -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/appyx-components/standard/backstack/common/src/commonTest/kotlin/com/bumble/appyx/components/stable/backstack/operation/ReplaceTest.kt b/appyx-components/standard/backstack/common/src/commonTest/kotlin/com/bumble/appyx/components/stable/backstack/operation/ReplaceTest.kt index ff186ae3c..ed43e633a 100644 --- a/appyx-components/standard/backstack/common/src/commonTest/kotlin/com/bumble/appyx/components/stable/backstack/operation/ReplaceTest.kt +++ b/appyx-components/standard/backstack/common/src/commonTest/kotlin/com/bumble/appyx/components/stable/backstack/operation/ReplaceTest.kt @@ -6,7 +6,7 @@ import com.bumble.appyx.components.stable.backstack.TestTarget.Child1 import com.bumble.appyx.components.stable.backstack.TestTarget.Child2 import com.bumble.appyx.components.stable.backstack.TestTarget.Child3 import com.bumble.appyx.components.stable.backstack.TestTarget.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/appyx-components/standard/backstack/common/src/commonTest/kotlin/com/bumble/appyx/components/stable/backstack/restore/BackstackRestoreTest.kt b/appyx-components/standard/backstack/common/src/commonTest/kotlin/com/bumble/appyx/components/stable/backstack/restore/BackstackRestoreTest.kt index e5d6587fc..428878d3b 100644 --- a/appyx-components/standard/backstack/common/src/commonTest/kotlin/com/bumble/appyx/components/stable/backstack/restore/BackstackRestoreTest.kt +++ b/appyx-components/standard/backstack/common/src/commonTest/kotlin/com/bumble/appyx/components/stable/backstack/restore/BackstackRestoreTest.kt @@ -4,7 +4,7 @@ import com.bumble.appyx.components.backstack.BackStackModel import com.bumble.appyx.components.stable.backstack.TestTarget.Child1 import com.bumble.appyx.components.stable.backstack.TestTarget.Child2 import com.bumble.appyx.components.backstack.operation.Push -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/appyx-components/standard/spotlight/android/src/androidTest/kotlin/com/bumble/appyx/components/spotlight/android/SpotlightTest.kt b/appyx-components/standard/spotlight/android/src/androidTest/kotlin/com/bumble/appyx/components/spotlight/android/SpotlightTest.kt index fc9f6bb02..de8ac0d7c 100644 --- a/appyx-components/standard/spotlight/android/src/androidTest/kotlin/com/bumble/appyx/components/spotlight/android/SpotlightTest.kt +++ b/appyx-components/standard/spotlight/android/src/androidTest/kotlin/com/bumble/appyx/components/spotlight/android/SpotlightTest.kt @@ -6,7 +6,7 @@ import com.bumble.appyx.components.spotlight.Spotlight import com.bumble.appyx.components.spotlight.SpotlightModel import com.bumble.appyx.components.spotlight.operation.last import com.bumble.appyx.components.spotlight.ui.slider.SpotlightSlider -import com.bumble.appyx.interactions.core.model.transition.Operation +import com.bumble.appyx.interactions.model.transition.Operation import com.bumble.appyx.interactions.utils.testing.TestTarget import com.bumble.appyx.interactions.utils.testing.setupAppyxComponent import com.bumble.appyx.interactions.utils.testing.waitUntilAnimationEnded diff --git a/appyx-components/standard/spotlight/android/src/androidTest/kotlin/com/bumble/appyx/components/spotlight/android/SpotlightViewpointTest.kt b/appyx-components/standard/spotlight/android/src/androidTest/kotlin/com/bumble/appyx/components/spotlight/android/SpotlightViewpointTest.kt index 16d3f3574..5905a2293 100644 --- a/appyx-components/standard/spotlight/android/src/androidTest/kotlin/com/bumble/appyx/components/spotlight/android/SpotlightViewpointTest.kt +++ b/appyx-components/standard/spotlight/android/src/androidTest/kotlin/com/bumble/appyx/components/spotlight/android/SpotlightViewpointTest.kt @@ -7,7 +7,7 @@ import androidx.compose.ui.test.performTouchInput import com.bumble.appyx.components.spotlight.android.utils.SPOTLIGHT_EXPERIMENT_TEST_HELPER import com.bumble.appyx.components.spotlight.android.utils.createSpotlight import com.bumble.appyx.components.spotlight.operation.next -import com.bumble.appyx.interactions.core.model.transition.Operation +import com.bumble.appyx.interactions.model.transition.Operation import com.bumble.appyx.interactions.utils.testing.TestTarget.Child1 import com.bumble.appyx.interactions.utils.testing.TestTarget.Child2 import com.bumble.appyx.interactions.utils.testing.TestTarget.Child3 diff --git a/appyx-components/standard/spotlight/android/src/androidTest/kotlin/com/bumble/appyx/components/spotlight/android/utils/SpotlightUtils.kt b/appyx-components/standard/spotlight/android/src/androidTest/kotlin/com/bumble/appyx/components/spotlight/android/utils/SpotlightUtils.kt index 4ba16e3ab..0ae6bc1b8 100644 --- a/appyx-components/standard/spotlight/android/src/androidTest/kotlin/com/bumble/appyx/components/spotlight/android/utils/SpotlightUtils.kt +++ b/appyx-components/standard/spotlight/android/src/androidTest/kotlin/com/bumble/appyx/components/spotlight/android/utils/SpotlightUtils.kt @@ -14,7 +14,7 @@ import androidx.compose.ui.unit.dp import com.bumble.appyx.components.spotlight.Spotlight import com.bumble.appyx.components.spotlight.SpotlightModel import com.bumble.appyx.components.spotlight.ui.slider.SpotlightSlider -import com.bumble.appyx.interactions.core.ui.helper.AppyxComponentSetup +import com.bumble.appyx.interactions.ui.helper.AppyxComponentSetup import com.bumble.appyx.interactions.utils.testing.TestTarget import com.bumble.appyx.interactions.utils.ui.Element import com.bumble.appyx.interactions.utils.ui.SampleAppyxContainer diff --git a/appyx-components/standard/spotlight/common/src/commonMain/kotlin/com/bumble/appyx/components/spotlight/Spotlight.kt b/appyx-components/standard/spotlight/common/src/commonMain/kotlin/com/bumble/appyx/components/spotlight/Spotlight.kt index d95621849..f2d79a5ec 100644 --- a/appyx-components/standard/spotlight/common/src/commonMain/kotlin/com/bumble/appyx/components/spotlight/Spotlight.kt +++ b/appyx-components/standard/spotlight/common/src/commonMain/kotlin/com/bumble/appyx/components/spotlight/Spotlight.kt @@ -2,12 +2,12 @@ package com.bumble.appyx.components.spotlight 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 import com.bumble.appyx.mapState import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers diff --git a/appyx-components/standard/spotlight/common/src/commonMain/kotlin/com/bumble/appyx/components/spotlight/SpotlightModel.kt b/appyx-components/standard/spotlight/common/src/commonMain/kotlin/com/bumble/appyx/components/spotlight/SpotlightModel.kt index 969ba6199..a8ff435b1 100644 --- a/appyx-components/standard/spotlight/common/src/commonMain/kotlin/com/bumble/appyx/components/spotlight/SpotlightModel.kt +++ b/appyx-components/standard/spotlight/common/src/commonMain/kotlin/com/bumble/appyx/components/spotlight/SpotlightModel.kt @@ -3,9 +3,9 @@ package com.bumble.appyx.components.spotlight import com.bumble.appyx.components.spotlight.SpotlightModel.State import com.bumble.appyx.components.spotlight.SpotlightModel.State.ElementState.DESTROYED import com.bumble.appyx.components.spotlight.SpotlightModel.State.ElementState.STANDARD -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/appyx-components/standard/spotlight/common/src/commonMain/kotlin/com/bumble/appyx/components/spotlight/node/spotlightNode.kt b/appyx-components/standard/spotlight/common/src/commonMain/kotlin/com/bumble/appyx/components/spotlight/node/spotlightNode.kt index b83a512f7..8694d2a10 100644 --- a/appyx-components/standard/spotlight/common/src/commonMain/kotlin/com/bumble/appyx/components/spotlight/node/spotlightNode.kt +++ b/appyx-components/standard/spotlight/common/src/commonMain/kotlin/com/bumble/appyx/components/spotlight/node/spotlightNode.kt @@ -6,10 +6,10 @@ import com.bumble.appyx.components.spotlight.Spotlight import com.bumble.appyx.components.spotlight.SpotlightModel import com.bumble.appyx.components.spotlight.SpotlightModel.State import com.bumble.appyx.components.spotlight.ui.slider.SpotlightSlider -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.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.navigation.composable.AppyxNavigationContainer import com.bumble.appyx.navigation.modality.NodeContext import com.bumble.appyx.navigation.node.ComponentNode diff --git a/appyx-components/standard/spotlight/common/src/commonMain/kotlin/com/bumble/appyx/components/spotlight/operation/Activate.kt b/appyx-components/standard/spotlight/common/src/commonMain/kotlin/com/bumble/appyx/components/spotlight/operation/Activate.kt index 4731725f3..00a69cde7 100644 --- a/appyx-components/standard/spotlight/common/src/commonMain/kotlin/com/bumble/appyx/components/spotlight/operation/Activate.kt +++ b/appyx-components/standard/spotlight/common/src/commonMain/kotlin/com/bumble/appyx/components/spotlight/operation/Activate.kt @@ -3,8 +3,8 @@ package com.bumble.appyx.components.spotlight.operation import androidx.compose.animation.core.AnimationSpec import com.bumble.appyx.components.spotlight.Spotlight import com.bumble.appyx.components.spotlight.SpotlightModel -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/appyx-components/standard/spotlight/common/src/commonMain/kotlin/com/bumble/appyx/components/spotlight/operation/First.kt b/appyx-components/standard/spotlight/common/src/commonMain/kotlin/com/bumble/appyx/components/spotlight/operation/First.kt index 4e798bfd4..a42d92bb6 100644 --- a/appyx-components/standard/spotlight/common/src/commonMain/kotlin/com/bumble/appyx/components/spotlight/operation/First.kt +++ b/appyx-components/standard/spotlight/common/src/commonMain/kotlin/com/bumble/appyx/components/spotlight/operation/First.kt @@ -3,8 +3,8 @@ package com.bumble.appyx.components.spotlight.operation import androidx.compose.animation.core.AnimationSpec import com.bumble.appyx.components.spotlight.Spotlight import com.bumble.appyx.components.spotlight.SpotlightModel -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 diff --git a/appyx-components/standard/spotlight/common/src/commonMain/kotlin/com/bumble/appyx/components/spotlight/operation/Last.kt b/appyx-components/standard/spotlight/common/src/commonMain/kotlin/com/bumble/appyx/components/spotlight/operation/Last.kt index ca443d8e5..aa2b7b87d 100644 --- a/appyx-components/standard/spotlight/common/src/commonMain/kotlin/com/bumble/appyx/components/spotlight/operation/Last.kt +++ b/appyx-components/standard/spotlight/common/src/commonMain/kotlin/com/bumble/appyx/components/spotlight/operation/Last.kt @@ -3,8 +3,8 @@ package com.bumble.appyx.components.spotlight.operation import androidx.compose.animation.core.AnimationSpec import com.bumble.appyx.components.spotlight.Spotlight import com.bumble.appyx.components.spotlight.SpotlightModel -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 diff --git a/appyx-components/standard/spotlight/common/src/commonMain/kotlin/com/bumble/appyx/components/spotlight/operation/Next.kt b/appyx-components/standard/spotlight/common/src/commonMain/kotlin/com/bumble/appyx/components/spotlight/operation/Next.kt index 4ea1c5bfb..e9cc017f8 100644 --- a/appyx-components/standard/spotlight/common/src/commonMain/kotlin/com/bumble/appyx/components/spotlight/operation/Next.kt +++ b/appyx-components/standard/spotlight/common/src/commonMain/kotlin/com/bumble/appyx/components/spotlight/operation/Next.kt @@ -3,8 +3,8 @@ package com.bumble.appyx.components.spotlight.operation import androidx.compose.animation.core.AnimationSpec import com.bumble.appyx.components.spotlight.Spotlight import com.bumble.appyx.components.spotlight.SpotlightModel -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/appyx-components/standard/spotlight/common/src/commonMain/kotlin/com/bumble/appyx/components/spotlight/operation/Previous.kt b/appyx-components/standard/spotlight/common/src/commonMain/kotlin/com/bumble/appyx/components/spotlight/operation/Previous.kt index cbc0942d8..33616e6f6 100644 --- a/appyx-components/standard/spotlight/common/src/commonMain/kotlin/com/bumble/appyx/components/spotlight/operation/Previous.kt +++ b/appyx-components/standard/spotlight/common/src/commonMain/kotlin/com/bumble/appyx/components/spotlight/operation/Previous.kt @@ -3,8 +3,8 @@ package com.bumble.appyx.components.spotlight.operation import androidx.compose.animation.core.AnimationSpec import com.bumble.appyx.components.spotlight.Spotlight import com.bumble.appyx.components.spotlight.SpotlightModel -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 diff --git a/appyx-components/standard/spotlight/common/src/commonMain/kotlin/com/bumble/appyx/components/spotlight/operation/UpdateElements.kt b/appyx-components/standard/spotlight/common/src/commonMain/kotlin/com/bumble/appyx/components/spotlight/operation/UpdateElements.kt index 773bdb9a8..e3acf1b7f 100644 --- a/appyx-components/standard/spotlight/common/src/commonMain/kotlin/com/bumble/appyx/components/spotlight/operation/UpdateElements.kt +++ b/appyx-components/standard/spotlight/common/src/commonMain/kotlin/com/bumble/appyx/components/spotlight/operation/UpdateElements.kt @@ -7,10 +7,10 @@ import com.bumble.appyx.components.spotlight.SpotlightModel.State.ElementState.C import com.bumble.appyx.components.spotlight.SpotlightModel.State.ElementState.DESTROYED import com.bumble.appyx.components.spotlight.SpotlightModel.State.ElementState.STANDARD import com.bumble.appyx.components.spotlight.SpotlightModel.State.Position -import com.bumble.appyx.interactions.core.Element -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.Element +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 import kotlin.math.max diff --git a/appyx-components/standard/spotlight/common/src/commonMain/kotlin/com/bumble/appyx/components/spotlight/ui/fader/SpotlightFader.kt b/appyx-components/standard/spotlight/common/src/commonMain/kotlin/com/bumble/appyx/components/spotlight/ui/fader/SpotlightFader.kt index 70cd3a2e3..b95f2260b 100644 --- a/appyx-components/standard/spotlight/common/src/commonMain/kotlin/com/bumble/appyx/components/spotlight/ui/fader/SpotlightFader.kt +++ b/appyx-components/standard/spotlight/common/src/commonMain/kotlin/com/bumble/appyx/components/spotlight/ui/fader/SpotlightFader.kt @@ -5,10 +5,10 @@ import com.bumble.appyx.components.spotlight.SpotlightModel import com.bumble.appyx.components.spotlight.SpotlightModel.State.ElementState.CREATED import com.bumble.appyx.components.spotlight.SpotlightModel.State.ElementState.DESTROYED import com.bumble.appyx.components.spotlight.SpotlightModel.State.ElementState.STANDARD -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.Alpha -import com.bumble.appyx.interactions.core.ui.state.MatchedTargetUiState +import com.bumble.appyx.interactions.ui.context.UiContext +import com.bumble.appyx.interactions.ui.DefaultAnimationSpec +import com.bumble.appyx.interactions.ui.property.impl.Alpha +import com.bumble.appyx.interactions.ui.state.MatchedTargetUiState import com.bumble.appyx.transitionmodel.BaseVisualisation diff --git a/appyx-components/standard/spotlight/common/src/commonMain/kotlin/com/bumble/appyx/components/spotlight/ui/fader/TargetUiState.kt b/appyx-components/standard/spotlight/common/src/commonMain/kotlin/com/bumble/appyx/components/spotlight/ui/fader/TargetUiState.kt index e09c25039..770c98927 100644 --- a/appyx-components/standard/spotlight/common/src/commonMain/kotlin/com/bumble/appyx/components/spotlight/ui/fader/TargetUiState.kt +++ b/appyx-components/standard/spotlight/common/src/commonMain/kotlin/com/bumble/appyx/components/spotlight/ui/fader/TargetUiState.kt @@ -1,8 +1,8 @@ package com.bumble.appyx.components.spotlight.ui.fader -import com.bumble.appyx.interactions.core.ui.context.UiContext -import com.bumble.appyx.interactions.core.ui.property.impl.Alpha -import com.bumble.appyx.interactions.core.ui.state.MutableUiStateSpecs +import com.bumble.appyx.interactions.ui.context.UiContext +import com.bumble.appyx.interactions.ui.property.impl.Alpha +import com.bumble.appyx.interactions.ui.state.MutableUiStateSpecs @MutableUiStateSpecs class TargetUiState( diff --git a/appyx-components/standard/spotlight/common/src/commonMain/kotlin/com/bumble/appyx/components/spotlight/ui/slider/SpotlightSlider.kt b/appyx-components/standard/spotlight/common/src/commonMain/kotlin/com/bumble/appyx/components/spotlight/ui/slider/SpotlightSlider.kt index 6e87e6d48..4107a2a24 100644 --- a/appyx-components/standard/spotlight/common/src/commonMain/kotlin/com/bumble/appyx/components/spotlight/ui/slider/SpotlightSlider.kt +++ b/appyx-components/standard/spotlight/common/src/commonMain/kotlin/com/bumble/appyx/components/spotlight/ui/slider/SpotlightSlider.kt @@ -9,22 +9,22 @@ import com.bumble.appyx.components.spotlight.SpotlightModel.State.ElementState.D import com.bumble.appyx.components.spotlight.SpotlightModel.State.ElementState.STANDARD import com.bumble.appyx.components.spotlight.operation.Next import com.bumble.appyx.components.spotlight.operation.Previous -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.gesture.dragVerticalDirection -import com.bumble.appyx.interactions.core.ui.property.impl.Alpha -import com.bumble.appyx.interactions.core.ui.property.impl.GenericFloatProperty -import com.bumble.appyx.interactions.core.ui.property.impl.GenericFloatProperty.Target -import com.bumble.appyx.interactions.core.ui.property.impl.Scale -import com.bumble.appyx.interactions.core.ui.property.impl.position.BiasAlignment.OutsideAlignment.Companion.InContainer -import com.bumble.appyx.interactions.core.ui.property.impl.position.BiasAlignment.OutsideAlignment.Companion.OutsideBottom -import com.bumble.appyx.interactions.core.ui.property.impl.position.BiasAlignment.OutsideAlignment.Companion.OutsideTop -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.gesture.dragVerticalDirection +import com.bumble.appyx.interactions.ui.property.impl.Alpha +import com.bumble.appyx.interactions.ui.property.impl.GenericFloatProperty +import com.bumble.appyx.interactions.ui.property.impl.GenericFloatProperty.Target +import com.bumble.appyx.interactions.ui.property.impl.Scale +import com.bumble.appyx.interactions.ui.property.impl.position.BiasAlignment.OutsideAlignment.Companion.InContainer +import com.bumble.appyx.interactions.ui.property.impl.position.BiasAlignment.OutsideAlignment.Companion.OutsideBottom +import com.bumble.appyx.interactions.ui.property.impl.position.BiasAlignment.OutsideAlignment.Companion.OutsideTop +import com.bumble.appyx.interactions.ui.property.impl.position.PositionAlignment +import com.bumble.appyx.interactions.ui.state.MatchedTargetUiState import com.bumble.appyx.transitionmodel.BaseVisualisation class SpotlightSlider( diff --git a/appyx-components/standard/spotlight/common/src/commonMain/kotlin/com/bumble/appyx/components/spotlight/ui/slider/TargetUiState.kt b/appyx-components/standard/spotlight/common/src/commonMain/kotlin/com/bumble/appyx/components/spotlight/ui/slider/TargetUiState.kt index 76453b69c..16b6138e4 100644 --- a/appyx-components/standard/spotlight/common/src/commonMain/kotlin/com/bumble/appyx/components/spotlight/ui/slider/TargetUiState.kt +++ b/appyx-components/standard/spotlight/common/src/commonMain/kotlin/com/bumble/appyx/components/spotlight/ui/slider/TargetUiState.kt @@ -1,12 +1,12 @@ package com.bumble.appyx.components.spotlight.ui.slider -import com.bumble.appyx.interactions.core.ui.context.UiContext -import com.bumble.appyx.interactions.core.ui.property.impl.Alpha -import com.bumble.appyx.interactions.core.ui.property.impl.Scale -import com.bumble.appyx.interactions.core.ui.property.impl.position.BiasAlignment.InsideAlignment -import com.bumble.appyx.interactions.core.ui.property.impl.position.BiasAlignment.OutsideAlignment -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.context.UiContext +import com.bumble.appyx.interactions.ui.property.impl.Alpha +import com.bumble.appyx.interactions.ui.property.impl.Scale +import com.bumble.appyx.interactions.ui.property.impl.position.BiasAlignment.InsideAlignment +import com.bumble.appyx.interactions.ui.property.impl.position.BiasAlignment.OutsideAlignment +import com.bumble.appyx.interactions.ui.property.impl.position.PositionAlignment +import com.bumble.appyx.interactions.ui.state.MutableUiStateSpecs import com.bumble.appyx.mapState import kotlinx.coroutines.flow.StateFlow diff --git a/appyx-components/standard/spotlight/common/src/commonMain/kotlin/com/bumble/appyx/components/spotlight/ui/sliderrotation/SpotlightSliderRotation.kt b/appyx-components/standard/spotlight/common/src/commonMain/kotlin/com/bumble/appyx/components/spotlight/ui/sliderrotation/SpotlightSliderRotation.kt index ae4179d6a..82b5b873b 100644 --- a/appyx-components/standard/spotlight/common/src/commonMain/kotlin/com/bumble/appyx/components/spotlight/ui/sliderrotation/SpotlightSliderRotation.kt +++ b/appyx-components/standard/spotlight/common/src/commonMain/kotlin/com/bumble/appyx/components/spotlight/ui/sliderrotation/SpotlightSliderRotation.kt @@ -5,17 +5,17 @@ import com.bumble.appyx.components.spotlight.SpotlightModel.State import com.bumble.appyx.components.spotlight.SpotlightModel.State.ElementState.CREATED import com.bumble.appyx.components.spotlight.SpotlightModel.State.ElementState.DESTROYED import com.bumble.appyx.components.spotlight.SpotlightModel.State.ElementState.STANDARD -import com.bumble.appyx.interactions.core.ui.context.UiContext -import com.bumble.appyx.interactions.core.ui.property.impl.Alpha -import com.bumble.appyx.interactions.core.ui.property.impl.GenericFloatProperty -import com.bumble.appyx.interactions.core.ui.property.impl.GenericFloatProperty.Target -import com.bumble.appyx.interactions.core.ui.property.impl.position.PositionAlignment -import com.bumble.appyx.interactions.core.ui.property.impl.RotationY -import com.bumble.appyx.interactions.core.ui.property.impl.Scale -import com.bumble.appyx.interactions.core.ui.property.impl.position.BiasAlignment.OutsideAlignment.Companion.InContainer -import com.bumble.appyx.interactions.core.ui.property.impl.position.BiasAlignment.OutsideAlignment.Companion.OutsideBottom -import com.bumble.appyx.interactions.core.ui.property.impl.position.BiasAlignment.OutsideAlignment.Companion.OutsideTop -import com.bumble.appyx.interactions.core.ui.state.MatchedTargetUiState +import com.bumble.appyx.interactions.ui.context.UiContext +import com.bumble.appyx.interactions.ui.property.impl.Alpha +import com.bumble.appyx.interactions.ui.property.impl.GenericFloatProperty +import com.bumble.appyx.interactions.ui.property.impl.GenericFloatProperty.Target +import com.bumble.appyx.interactions.ui.property.impl.position.PositionAlignment +import com.bumble.appyx.interactions.ui.property.impl.RotationY +import com.bumble.appyx.interactions.ui.property.impl.Scale +import com.bumble.appyx.interactions.ui.property.impl.position.BiasAlignment.OutsideAlignment.Companion.InContainer +import com.bumble.appyx.interactions.ui.property.impl.position.BiasAlignment.OutsideAlignment.Companion.OutsideBottom +import com.bumble.appyx.interactions.ui.property.impl.position.BiasAlignment.OutsideAlignment.Companion.OutsideTop +import com.bumble.appyx.interactions.ui.state.MatchedTargetUiState import com.bumble.appyx.transitionmodel.BaseVisualisation class SpotlightSliderRotation( diff --git a/appyx-components/standard/spotlight/common/src/commonMain/kotlin/com/bumble/appyx/components/spotlight/ui/sliderrotation/TargetUiState.kt b/appyx-components/standard/spotlight/common/src/commonMain/kotlin/com/bumble/appyx/components/spotlight/ui/sliderrotation/TargetUiState.kt index 9c8a2bf37..5e84f2c4d 100644 --- a/appyx-components/standard/spotlight/common/src/commonMain/kotlin/com/bumble/appyx/components/spotlight/ui/sliderrotation/TargetUiState.kt +++ b/appyx-components/standard/spotlight/common/src/commonMain/kotlin/com/bumble/appyx/components/spotlight/ui/sliderrotation/TargetUiState.kt @@ -1,15 +1,15 @@ package com.bumble.appyx.components.spotlight.ui.sliderrotation -import com.bumble.appyx.interactions.core.ui.context.UiContext -import com.bumble.appyx.interactions.core.ui.math.cutOffCenter -import com.bumble.appyx.interactions.core.ui.math.cutOffCenterSigned -import com.bumble.appyx.interactions.core.ui.math.scaleUpTo -import com.bumble.appyx.interactions.core.ui.property.impl.Alpha -import com.bumble.appyx.interactions.core.ui.property.impl.RotationY -import com.bumble.appyx.interactions.core.ui.property.impl.Scale -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.MutableUiStateSpecs +import com.bumble.appyx.interactions.ui.context.UiContext +import com.bumble.appyx.interactions.ui.math.cutOffCenter +import com.bumble.appyx.interactions.ui.math.cutOffCenterSigned +import com.bumble.appyx.interactions.ui.math.scaleUpTo +import com.bumble.appyx.interactions.ui.property.impl.Alpha +import com.bumble.appyx.interactions.ui.property.impl.RotationY +import com.bumble.appyx.interactions.ui.property.impl.Scale +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.MutableUiStateSpecs import com.bumble.appyx.mapState import kotlinx.coroutines.flow.StateFlow diff --git a/appyx-components/standard/spotlight/common/src/commonMain/kotlin/com/bumble/appyx/components/spotlight/ui/sliderscale/SpotlightSliderScale.kt b/appyx-components/standard/spotlight/common/src/commonMain/kotlin/com/bumble/appyx/components/spotlight/ui/sliderscale/SpotlightSliderScale.kt index 39d14d859..a26d53e0e 100644 --- a/appyx-components/standard/spotlight/common/src/commonMain/kotlin/com/bumble/appyx/components/spotlight/ui/sliderscale/SpotlightSliderScale.kt +++ b/appyx-components/standard/spotlight/common/src/commonMain/kotlin/com/bumble/appyx/components/spotlight/ui/sliderscale/SpotlightSliderScale.kt @@ -5,15 +5,15 @@ import com.bumble.appyx.components.spotlight.SpotlightModel.State import com.bumble.appyx.components.spotlight.SpotlightModel.State.ElementState.CREATED import com.bumble.appyx.components.spotlight.SpotlightModel.State.ElementState.DESTROYED import com.bumble.appyx.components.spotlight.SpotlightModel.State.ElementState.STANDARD -import com.bumble.appyx.interactions.core.ui.context.UiContext -import com.bumble.appyx.interactions.core.ui.property.impl.GenericFloatProperty -import com.bumble.appyx.interactions.core.ui.property.impl.GenericFloatProperty.Target -import com.bumble.appyx.interactions.core.ui.property.impl.Scale -import com.bumble.appyx.interactions.core.ui.property.impl.position.BiasAlignment.OutsideAlignment.Companion.InContainer -import com.bumble.appyx.interactions.core.ui.property.impl.position.BiasAlignment.OutsideAlignment.Companion.OutsideBottom -import com.bumble.appyx.interactions.core.ui.property.impl.position.BiasAlignment.OutsideAlignment.Companion.OutsideTop -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.UiContext +import com.bumble.appyx.interactions.ui.property.impl.GenericFloatProperty +import com.bumble.appyx.interactions.ui.property.impl.GenericFloatProperty.Target +import com.bumble.appyx.interactions.ui.property.impl.Scale +import com.bumble.appyx.interactions.ui.property.impl.position.BiasAlignment.OutsideAlignment.Companion.InContainer +import com.bumble.appyx.interactions.ui.property.impl.position.BiasAlignment.OutsideAlignment.Companion.OutsideBottom +import com.bumble.appyx.interactions.ui.property.impl.position.BiasAlignment.OutsideAlignment.Companion.OutsideTop +import com.bumble.appyx.interactions.ui.property.impl.position.PositionAlignment +import com.bumble.appyx.interactions.ui.state.MatchedTargetUiState import com.bumble.appyx.transitionmodel.BaseVisualisation class SpotlightSliderScale( diff --git a/appyx-components/standard/spotlight/common/src/commonMain/kotlin/com/bumble/appyx/components/spotlight/ui/sliderscale/TargetUiState.kt b/appyx-components/standard/spotlight/common/src/commonMain/kotlin/com/bumble/appyx/components/spotlight/ui/sliderscale/TargetUiState.kt index 4c044e4e1..a5f972682 100644 --- a/appyx-components/standard/spotlight/common/src/commonMain/kotlin/com/bumble/appyx/components/spotlight/ui/sliderscale/TargetUiState.kt +++ b/appyx-components/standard/spotlight/common/src/commonMain/kotlin/com/bumble/appyx/components/spotlight/ui/sliderscale/TargetUiState.kt @@ -1,10 +1,10 @@ package com.bumble.appyx.components.spotlight.ui.sliderscale -import com.bumble.appyx.interactions.core.ui.context.UiContext -import com.bumble.appyx.interactions.core.ui.property.impl.Scale -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.MutableUiStateSpecs +import com.bumble.appyx.interactions.ui.context.UiContext +import com.bumble.appyx.interactions.ui.property.impl.Scale +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.MutableUiStateSpecs import com.bumble.appyx.mapState import kotlinx.coroutines.flow.StateFlow import kotlin.math.abs diff --git a/appyx-components/standard/spotlight/common/src/commonMain/kotlin/com/bumble/appyx/components/spotlight/ui/stack3d/SpotlightStack3D.kt b/appyx-components/standard/spotlight/common/src/commonMain/kotlin/com/bumble/appyx/components/spotlight/ui/stack3d/SpotlightStack3D.kt index 05e1e5770..69ecbdc30 100644 --- a/appyx-components/standard/spotlight/common/src/commonMain/kotlin/com/bumble/appyx/components/spotlight/ui/stack3d/SpotlightStack3D.kt +++ b/appyx-components/standard/spotlight/common/src/commonMain/kotlin/com/bumble/appyx/components/spotlight/ui/stack3d/SpotlightStack3D.kt @@ -7,18 +7,18 @@ import com.bumble.appyx.components.spotlight.SpotlightModel.State import com.bumble.appyx.components.spotlight.SpotlightModel.State.ElementState.CREATED import com.bumble.appyx.components.spotlight.SpotlightModel.State.ElementState.DESTROYED import com.bumble.appyx.components.spotlight.SpotlightModel.State.ElementState.STANDARD -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.property.impl.Alpha -import com.bumble.appyx.interactions.core.ui.property.impl.GenericFloatProperty -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.OutsideAlignment.Companion.InContainer -import com.bumble.appyx.interactions.core.ui.property.impl.position.BiasAlignment.OutsideAlignment.Companion.OutsideBottom -import com.bumble.appyx.interactions.core.ui.property.impl.position.BiasAlignment.OutsideAlignment.Companion.OutsideTop -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.property.impl.Alpha +import com.bumble.appyx.interactions.ui.property.impl.GenericFloatProperty +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.OutsideAlignment.Companion.InContainer +import com.bumble.appyx.interactions.ui.property.impl.position.BiasAlignment.OutsideAlignment.Companion.OutsideBottom +import com.bumble.appyx.interactions.ui.property.impl.position.BiasAlignment.OutsideAlignment.Companion.OutsideTop +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.mapState import com.bumble.appyx.transitionmodel.BaseVisualisation diff --git a/appyx-components/standard/spotlight/common/src/commonMain/kotlin/com/bumble/appyx/components/spotlight/ui/stack3d/TargetUiState.kt b/appyx-components/standard/spotlight/common/src/commonMain/kotlin/com/bumble/appyx/components/spotlight/ui/stack3d/TargetUiState.kt index 9b6be3a6c..be9e118f5 100644 --- a/appyx-components/standard/spotlight/common/src/commonMain/kotlin/com/bumble/appyx/components/spotlight/ui/stack3d/TargetUiState.kt +++ b/appyx-components/standard/spotlight/common/src/commonMain/kotlin/com/bumble/appyx/components/spotlight/ui/stack3d/TargetUiState.kt @@ -3,15 +3,15 @@ package com.bumble.appyx.components.spotlight.ui.stack3d import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.DpOffset import androidx.compose.ui.unit.dp -import com.bumble.appyx.interactions.core.ui.context.UiContext -import com.bumble.appyx.interactions.core.ui.math.clamp -import com.bumble.appyx.interactions.core.ui.math.smoothstep -import com.bumble.appyx.interactions.core.ui.property.impl.Alpha -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.property.impl.position.PositionOffset -import com.bumble.appyx.interactions.core.ui.state.MutableUiStateSpecs +import com.bumble.appyx.interactions.ui.context.UiContext +import com.bumble.appyx.interactions.ui.math.clamp +import com.bumble.appyx.interactions.ui.math.smoothstep +import com.bumble.appyx.interactions.ui.property.impl.Alpha +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.property.impl.position.PositionOffset +import com.bumble.appyx.interactions.ui.state.MutableUiStateSpecs import com.bumble.appyx.mapState import kotlinx.coroutines.flow.StateFlow diff --git a/appyx-components/standard/spotlight/common/src/commonTest/kotlin/com/bumble/appyx/components/spotlight/model/SpotlightModelTest.kt b/appyx-components/standard/spotlight/common/src/commonTest/kotlin/com/bumble/appyx/components/spotlight/model/SpotlightModelTest.kt index fc5c70c61..1e27c275f 100644 --- a/appyx-components/standard/spotlight/common/src/commonTest/kotlin/com/bumble/appyx/components/spotlight/model/SpotlightModelTest.kt +++ b/appyx-components/standard/spotlight/common/src/commonTest/kotlin/com/bumble/appyx/components/spotlight/model/SpotlightModelTest.kt @@ -6,7 +6,7 @@ import com.bumble.appyx.components.spotlight.TestTarget.Child3 import com.bumble.appyx.components.spotlight.SpotlightModel import com.bumble.appyx.components.spotlight.operation.Next import com.bumble.appyx.components.spotlight.operation.UpdateElements -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/appyx-components/standard/spotlight/common/src/commonTest/kotlin/com/bumble/appyx/components/spotlight/operation/ActivateTest.kt b/appyx-components/standard/spotlight/common/src/commonTest/kotlin/com/bumble/appyx/components/spotlight/operation/ActivateTest.kt index 183773623..a7d346be0 100644 --- a/appyx-components/standard/spotlight/common/src/commonTest/kotlin/com/bumble/appyx/components/spotlight/operation/ActivateTest.kt +++ b/appyx-components/standard/spotlight/common/src/commonTest/kotlin/com/bumble/appyx/components/spotlight/operation/ActivateTest.kt @@ -3,7 +3,7 @@ package com.bumble.appyx.components.spotlight.operation import com.bumble.appyx.components.spotlight.TestTarget.Child1 import com.bumble.appyx.components.spotlight.TestTarget.Child2 import com.bumble.appyx.components.spotlight.TestTarget.Child3 -import com.bumble.appyx.interactions.core.asElement +import com.bumble.appyx.interactions.model.asElement import com.bumble.appyx.components.spotlight.SpotlightModel import com.bumble.appyx.components.spotlight.SpotlightModel.State.ElementState.STANDARD import com.bumble.appyx.components.spotlight.SpotlightModel.State.Position diff --git a/appyx-components/standard/spotlight/common/src/commonTest/kotlin/com/bumble/appyx/components/spotlight/operation/FirstTest.kt b/appyx-components/standard/spotlight/common/src/commonTest/kotlin/com/bumble/appyx/components/spotlight/operation/FirstTest.kt index 903fc4cbd..205db4cd3 100644 --- a/appyx-components/standard/spotlight/common/src/commonTest/kotlin/com/bumble/appyx/components/spotlight/operation/FirstTest.kt +++ b/appyx-components/standard/spotlight/common/src/commonTest/kotlin/com/bumble/appyx/components/spotlight/operation/FirstTest.kt @@ -6,7 +6,7 @@ import com.bumble.appyx.components.spotlight.SpotlightModel import com.bumble.appyx.components.spotlight.SpotlightModel.State.ElementState.STANDARD import com.bumble.appyx.components.spotlight.SpotlightModel.State.Position import com.bumble.appyx.components.spotlight.TestTarget -import com.bumble.appyx.interactions.core.asElement +import com.bumble.appyx.interactions.model.asElement import kotlin.test.Test import kotlin.test.assertEquals diff --git a/appyx-components/standard/spotlight/common/src/commonTest/kotlin/com/bumble/appyx/components/spotlight/operation/LastTest.kt b/appyx-components/standard/spotlight/common/src/commonTest/kotlin/com/bumble/appyx/components/spotlight/operation/LastTest.kt index 0d074ecda..61f7a2cb0 100644 --- a/appyx-components/standard/spotlight/common/src/commonTest/kotlin/com/bumble/appyx/components/spotlight/operation/LastTest.kt +++ b/appyx-components/standard/spotlight/common/src/commonTest/kotlin/com/bumble/appyx/components/spotlight/operation/LastTest.kt @@ -2,7 +2,7 @@ package com.bumble.appyx.components.spotlight.operation import com.bumble.appyx.components.spotlight.TestTarget.Child1 import com.bumble.appyx.components.spotlight.TestTarget.Child2 -import com.bumble.appyx.interactions.core.asElement +import com.bumble.appyx.interactions.model.asElement import com.bumble.appyx.components.spotlight.SpotlightModel import com.bumble.appyx.components.spotlight.SpotlightModel.State.ElementState.STANDARD import com.bumble.appyx.components.spotlight.SpotlightModel.State.Position diff --git a/appyx-components/standard/spotlight/common/src/commonTest/kotlin/com/bumble/appyx/components/spotlight/operation/NextTest.kt b/appyx-components/standard/spotlight/common/src/commonTest/kotlin/com/bumble/appyx/components/spotlight/operation/NextTest.kt index e59de147e..4a22785d9 100644 --- a/appyx-components/standard/spotlight/common/src/commonTest/kotlin/com/bumble/appyx/components/spotlight/operation/NextTest.kt +++ b/appyx-components/standard/spotlight/common/src/commonTest/kotlin/com/bumble/appyx/components/spotlight/operation/NextTest.kt @@ -3,7 +3,7 @@ package com.bumble.appyx.components.spotlight.operation import com.bumble.appyx.components.spotlight.TestTarget.Child1 import com.bumble.appyx.components.spotlight.TestTarget.Child2 import com.bumble.appyx.components.spotlight.TestTarget.Child3 -import com.bumble.appyx.interactions.core.asElement +import com.bumble.appyx.interactions.model.asElement import com.bumble.appyx.components.spotlight.SpotlightModel import com.bumble.appyx.components.spotlight.SpotlightModel.State.ElementState.STANDARD import com.bumble.appyx.components.spotlight.SpotlightModel.State.Position diff --git a/appyx-components/standard/spotlight/common/src/commonTest/kotlin/com/bumble/appyx/components/spotlight/operation/PreviousTest.kt b/appyx-components/standard/spotlight/common/src/commonTest/kotlin/com/bumble/appyx/components/spotlight/operation/PreviousTest.kt index 48f078ac1..5c90027ca 100644 --- a/appyx-components/standard/spotlight/common/src/commonTest/kotlin/com/bumble/appyx/components/spotlight/operation/PreviousTest.kt +++ b/appyx-components/standard/spotlight/common/src/commonTest/kotlin/com/bumble/appyx/components/spotlight/operation/PreviousTest.kt @@ -6,7 +6,7 @@ import com.bumble.appyx.components.spotlight.TestTarget.Child3 import com.bumble.appyx.components.spotlight.TestTarget.Child4 import com.bumble.appyx.components.spotlight.TestTarget.Child5 import com.bumble.appyx.components.spotlight.TestTarget.Child6 -import com.bumble.appyx.interactions.core.asElement +import com.bumble.appyx.interactions.model.asElement import com.bumble.appyx.components.spotlight.SpotlightModel import com.bumble.appyx.components.spotlight.TestTarget import kotlin.test.Test diff --git a/appyx-components/standard/spotlight/common/src/commonTest/kotlin/com/bumble/appyx/components/spotlight/operation/UpdateElementsTest.kt b/appyx-components/standard/spotlight/common/src/commonTest/kotlin/com/bumble/appyx/components/spotlight/operation/UpdateElementsTest.kt index cd433c0c4..692af9100 100644 --- a/appyx-components/standard/spotlight/common/src/commonTest/kotlin/com/bumble/appyx/components/spotlight/operation/UpdateElementsTest.kt +++ b/appyx-components/standard/spotlight/common/src/commonTest/kotlin/com/bumble/appyx/components/spotlight/operation/UpdateElementsTest.kt @@ -10,7 +10,7 @@ import com.bumble.appyx.components.spotlight.SpotlightModel import com.bumble.appyx.components.spotlight.SpotlightModel.State.ElementState.DESTROYED import com.bumble.appyx.components.spotlight.SpotlightModel.State.ElementState.STANDARD import com.bumble.appyx.components.spotlight.SpotlightModel.State.Position -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.assertTrue diff --git a/appyx-interactions/android-utils/src/main/java/com/bumble/appyx/interactions/utils/testing/ComposeContentTestRuleExt.kt b/appyx-interactions/android-utils/src/main/java/com/bumble/appyx/interactions/utils/testing/ComposeContentTestRuleExt.kt index 65bb7799e..b248aeb1d 100644 --- a/appyx-interactions/android-utils/src/main/java/com/bumble/appyx/interactions/utils/testing/ComposeContentTestRuleExt.kt +++ b/appyx-interactions/android-utils/src/main/java/com/bumble/appyx/interactions/utils/testing/ComposeContentTestRuleExt.kt @@ -1,7 +1,7 @@ package com.bumble.appyx.interactions.utils.testing import androidx.compose.ui.test.junit4.ComposeContentTestRule -import com.bumble.appyx.interactions.core.model.BaseAppyxComponent +import com.bumble.appyx.interactions.model.BaseAppyxComponent fun BaseAppyxComponent<*, *>.waitUntilAnimationStarted(rule: ComposeContentTestRule) { rule.mainClock.advanceTimeUntil { diff --git a/appyx-interactions/android-utils/src/main/java/com/bumble/appyx/interactions/utils/testing/Utils.kt b/appyx-interactions/android-utils/src/main/java/com/bumble/appyx/interactions/utils/testing/Utils.kt index 258a8a42d..a407dfc50 100644 --- a/appyx-interactions/android-utils/src/main/java/com/bumble/appyx/interactions/utils/testing/Utils.kt +++ b/appyx-interactions/android-utils/src/main/java/com/bumble/appyx/interactions/utils/testing/Utils.kt @@ -12,8 +12,8 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color import androidx.compose.ui.test.junit4.ComposeContentTestRule -import com.bumble.appyx.interactions.core.model.BaseAppyxComponent -import com.bumble.appyx.interactions.core.ui.helper.AppyxComponentSetup +import com.bumble.appyx.interactions.model.BaseAppyxComponent +import com.bumble.appyx.interactions.ui.helper.AppyxComponentSetup import com.bumble.appyx.interactions.utils.ui.SampleAppyxContainer import com.bumble.appyx.interactions.utils.ui.theme.appyx_dark import kotlin.random.Random diff --git a/appyx-interactions/android-utils/src/main/java/com/bumble/appyx/interactions/utils/ui/SampleChildren.kt b/appyx-interactions/android-utils/src/main/java/com/bumble/appyx/interactions/utils/ui/SampleChildren.kt index 60e9c7332..10617fe10 100644 --- a/appyx-interactions/android-utils/src/main/java/com/bumble/appyx/interactions/utils/ui/SampleChildren.kt +++ b/appyx-interactions/android-utils/src/main/java/com/bumble/appyx/interactions/utils/ui/SampleChildren.kt @@ -6,9 +6,9 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color import androidx.compose.ui.platform.LocalConfiguration import androidx.compose.ui.platform.LocalDensity -import com.bumble.appyx.interactions.core.AppyxInteractionsContainer -import com.bumble.appyx.interactions.core.Element -import com.bumble.appyx.interactions.core.model.BaseAppyxComponent +import com.bumble.appyx.interactions.composable.AppyxInteractionsContainer +import com.bumble.appyx.interactions.model.Element +import com.bumble.appyx.interactions.model.BaseAppyxComponent import com.bumble.appyx.interactions.sample.SampleElement import kotlin.math.roundToInt diff --git a/appyx-interactions/android/src/androidTest/kotlin/com/bumble/appyx/interactions/ui/state/MutableUiStateTest.kt b/appyx-interactions/android/src/androidTest/kotlin/com/bumble/appyx/interactions/ui/state/MutableUiStateTest.kt index 4f76c51bf..238ff1593 100644 --- a/appyx-interactions/android/src/androidTest/kotlin/com/bumble/appyx/interactions/ui/state/MutableUiStateTest.kt +++ b/appyx-interactions/android/src/androidTest/kotlin/com/bumble/appyx/interactions/ui/state/MutableUiStateTest.kt @@ -15,13 +15,13 @@ import androidx.compose.ui.platform.LocalDensity import androidx.compose.ui.test.junit4.createComposeRule import androidx.compose.ui.unit.DpOffset import androidx.compose.ui.unit.dp -import com.bumble.appyx.interactions.core.ui.LocalBoxScope -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.property.impl.position.BiasAlignment -import com.bumble.appyx.interactions.core.ui.property.impl.position.BiasAlignment.InsideAlignment.Companion.TopStart -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.ui.LocalBoxScope +import com.bumble.appyx.interactions.ui.context.TransitionBounds +import com.bumble.appyx.interactions.ui.context.UiContext +import com.bumble.appyx.interactions.ui.property.impl.position.BiasAlignment +import com.bumble.appyx.interactions.ui.property.impl.position.BiasAlignment.InsideAlignment.Companion.TopStart +import com.bumble.appyx.interactions.ui.property.impl.position.PositionAlignment +import com.bumble.appyx.interactions.ui.property.impl.position.PositionOffset import junit.framework.TestCase.assertFalse import junit.framework.TestCase.assertTrue import kotlinx.coroutines.CoroutineScope diff --git a/appyx-interactions/android/src/androidTest/kotlin/com/bumble/appyx/interactions/ui/state/TestMutableUiState.kt b/appyx-interactions/android/src/androidTest/kotlin/com/bumble/appyx/interactions/ui/state/TestMutableUiState.kt index 2514e29d8..eba2fd35d 100644 --- a/appyx-interactions/android/src/androidTest/kotlin/com/bumble/appyx/interactions/ui/state/TestMutableUiState.kt +++ b/appyx-interactions/android/src/androidTest/kotlin/com/bumble/appyx/interactions/ui/state/TestMutableUiState.kt @@ -3,10 +3,10 @@ package com.bumble.appyx.interactions.ui.state import androidx.compose.animation.core.SpringSpec import androidx.compose.animation.core.spring import androidx.compose.ui.Modifier -import com.bumble.appyx.interactions.core.ui.context.UiContext -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.BaseMutableUiState +import com.bumble.appyx.interactions.ui.context.UiContext +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.BaseMutableUiState import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.async import kotlinx.coroutines.awaitAll diff --git a/appyx-interactions/android/src/androidTest/kotlin/com/bumble/appyx/interactions/ui/state/TestTargetUiState.kt b/appyx-interactions/android/src/androidTest/kotlin/com/bumble/appyx/interactions/ui/state/TestTargetUiState.kt index 0898ac778..97f5cff40 100644 --- a/appyx-interactions/android/src/androidTest/kotlin/com/bumble/appyx/interactions/ui/state/TestTargetUiState.kt +++ b/appyx-interactions/android/src/androidTest/kotlin/com/bumble/appyx/interactions/ui/state/TestTargetUiState.kt @@ -1,7 +1,7 @@ package com.bumble.appyx.interactions.ui.state -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.ui.property.impl.position.PositionAlignment +import com.bumble.appyx.interactions.ui.property.impl.position.PositionOffset class TestTargetUiState( val positionAlignment: PositionAlignment.Target, diff --git a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/annotations/FloatRange.kt b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/annotations/FloatRange.kt similarity index 97% rename from appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/annotations/FloatRange.kt rename to appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/annotations/FloatRange.kt index 5c85b677c..f5640de54 100644 --- a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/annotations/FloatRange.kt +++ b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/annotations/FloatRange.kt @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.bumble.appyx.interactions.core.annotations +package com.bumble.appyx.interactions.annotations /** * Denotes that the annotated element should be a float or double in the given range diff --git a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/AppyxInteractionsContainer.kt b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/composable/AppyxInteractionsContainer.kt similarity index 90% rename from appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/AppyxInteractionsContainer.kt rename to appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/composable/AppyxInteractionsContainer.kt index f27eed8ff..ce7120d0b 100644 --- a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/AppyxInteractionsContainer.kt +++ b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/composable/AppyxInteractionsContainer.kt @@ -1,4 +1,4 @@ -package com.bumble.appyx.interactions.core +package com.bumble.appyx.interactions.composable import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.BoxScope @@ -34,27 +34,24 @@ import androidx.compose.ui.unit.IntOffset import androidx.compose.ui.unit.IntSize import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.round -import com.bumble.appyx.interactions.core.gesture.GestureValidator -import com.bumble.appyx.interactions.core.gesture.GestureValidator.Companion.defaultValidator -import com.bumble.appyx.interactions.core.gesture.detectDragGesturesOrCancellation -import com.bumble.appyx.interactions.core.model.BaseAppyxComponent -import com.bumble.appyx.interactions.core.model.removedElements -import com.bumble.appyx.interactions.core.modifiers.onPointerEvent -import com.bumble.appyx.interactions.core.ui.LocalBoxScope -import com.bumble.appyx.interactions.core.ui.LocalMotionProperties -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.output.ElementUiModel -import com.bumble.appyx.interactions.core.ui.property.impl.position.PositionAlignment -import com.bumble.appyx.interactions.core.ui.property.motionPropertyRenderValue +import com.bumble.appyx.interactions.model.Element +import com.bumble.appyx.interactions.gesture.GestureValidator +import com.bumble.appyx.interactions.gesture.GestureValidator.Companion.defaultValidator +import com.bumble.appyx.interactions.gesture.detectDragGesturesOrCancellation +import com.bumble.appyx.interactions.gesture.onPointerEvent +import com.bumble.appyx.interactions.model.BaseAppyxComponent +import com.bumble.appyx.interactions.model.removedElements +import com.bumble.appyx.interactions.ui.LocalBoxScope +import com.bumble.appyx.interactions.ui.LocalMotionProperties +import com.bumble.appyx.interactions.ui.context.TransitionBounds +import com.bumble.appyx.interactions.ui.context.UiContext +import com.bumble.appyx.interactions.ui.output.ElementUiModel +import com.bumble.appyx.interactions.ui.property.impl.position.PositionAlignment +import com.bumble.appyx.interactions.ui.property.motionPropertyRenderValue +import com.bumble.appyx.interactions.gesture.GestureReferencePoint private val defaultExtraTouch = 48f.dp -enum class GestureReferencePoint { - Container, - Element -} - @Suppress("LongMethod") @Composable fun AppyxInteractionsContainer( diff --git a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/model/progress/ProgressController.kt b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/model/progress/ProgressController.kt deleted file mode 100644 index 8b6d4eb9d..000000000 --- a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/model/progress/ProgressController.kt +++ /dev/null @@ -1,8 +0,0 @@ -package com.bumble.appyx.interactions.core.model.progress - -import com.bumble.appyx.interactions.core.model.transition.Operation - -interface ProgressController { - - fun operation(operation: Operation) -} diff --git a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/ui/gesture/Drag.kt b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/ui/gesture/Drag.kt deleted file mode 100644 index 51a4fb045..000000000 --- a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/ui/gesture/Drag.kt +++ /dev/null @@ -1,114 +0,0 @@ -package com.bumble.appyx.interactions.core.ui.gesture - -import androidx.compose.ui.geometry.Offset -import com.bumble.appyx.interactions.core.ui.math.angleDegrees -import kotlin.math.abs - -interface Drag { - - enum class VerticalDirection { - UP, DOWN - } - - enum class HorizontalDirection { - LEFT, RIGHT - } - - enum class Direction4 { - UP, DOWN, LEFT, RIGHT - } - - enum class Direction8 { - UP, UPRIGHT, RIGHT, DOWNRIGHT, DOWN, DOWNLEFT, LEFT, UPLEFT - } - - @Suppress("MagicNumber") - enum class ClockDirection(val digit: Int) { - Clock1(1), - Clock2(2), - Clock3(3), - Clock4(4), - Clock5(5), - Clock6(6), - Clock7(7), - Clock8(8), - Clock9(9), - Clock10(10), - Clock11(11), - Clock12(12) - } -} - -/** - * The angle of the drag such that: - * - * - 12 o'clock = 0 degrees - * - 3 o'clock = 90 degrees - */ -fun dragAngleDegrees(delta: Offset): Float = - angleDegrees(delta) - -/** - * The horizontal aspect of the drag (LEFT or RIGHT), regardless of the dominant direction - */ -fun dragHorizontalDirection(delta: Offset): Drag.HorizontalDirection = - if (delta.x < 0) Drag.HorizontalDirection.LEFT else Drag.HorizontalDirection.RIGHT - -/** - * The vertical aspect of the drag (UP or DOWN), regardless of the dominant direction - */ -fun dragVerticalDirection(delta: Offset): Drag.VerticalDirection = - if (delta.y < 0) Drag.VerticalDirection.UP else Drag.VerticalDirection.DOWN - -/** - * The dominant direction of the drag of 4 possible directions - */ -fun dragDirection4(delta: Offset) = - if (abs(delta.x) > abs(delta.y)) { - if (delta.x < 0) Drag.Direction4.LEFT else Drag.Direction4.RIGHT - } else { - if (delta.y < 0) Drag.Direction4.UP else Drag.Direction4.DOWN - } - -/** - * The dominant direction of the drag of 8 possible directions - */ -@Suppress("MagicNumber") -fun dragDirection8(delta: Offset): Drag.Direction8 { - val angle = dragAngleDegrees(delta) - return when { - (0.0..22.5).contains(angle) -> Drag.Direction8.UP - (22.5..67.5).contains(angle) -> Drag.Direction8.UPRIGHT - (67.5..112.5).contains(angle) -> Drag.Direction8.RIGHT - (112.5..157.5).contains(angle) -> Drag.Direction8.DOWNRIGHT - (157.5..202.5).contains(angle) -> Drag.Direction8.DOWN - (202.5..247.5).contains(angle) -> Drag.Direction8.DOWNLEFT - (247.5..292.5).contains(angle) -> Drag.Direction8.LEFT - (292.5..337.5).contains(angle) -> Drag.Direction8.UPLEFT - else -> Drag.Direction8.UP - } -} - -/** - * The drag direction interpreted on the clock - */ -@Suppress("MagicNumber") -fun dragClockDirection(delta: Offset): Drag.ClockDirection { - val angle = dragAngleDegrees(delta) - return when { - (0.0..15.0).contains(angle) -> Drag.ClockDirection.Clock12 - (15.0..45.0).contains(angle) -> Drag.ClockDirection.Clock1 - (45.0..75.0).contains(angle) -> Drag.ClockDirection.Clock2 - (75.0..105.0).contains(angle) -> Drag.ClockDirection.Clock3 - (105.0..135.0).contains(angle) -> Drag.ClockDirection.Clock4 - (135.0..165.0).contains(angle) -> Drag.ClockDirection.Clock5 - (165.0..195.0).contains(angle) -> Drag.ClockDirection.Clock6 - (195.0..225.0).contains(angle) -> Drag.ClockDirection.Clock7 - (225.0..255.0).contains(angle) -> Drag.ClockDirection.Clock8 - (255.0..285.0).contains(angle) -> Drag.ClockDirection.Clock9 - (285.0..315.0).contains(angle) -> Drag.ClockDirection.Clock10 - (315.0..345.0).contains(angle) -> Drag.ClockDirection.Clock11 - else -> Drag.ClockDirection.Clock12 - } -} - diff --git a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/gesture/Drag.kt b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/gesture/Drag.kt new file mode 100644 index 000000000..5e7cafcd3 --- /dev/null +++ b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/gesture/Drag.kt @@ -0,0 +1,139 @@ +package com.bumble.appyx.interactions.gesture + +import androidx.compose.ui.geometry.Offset +import com.bumble.appyx.interactions.gesture.Drag.ClockDirection +import com.bumble.appyx.interactions.gesture.Drag.ClockDirection.Clock1 +import com.bumble.appyx.interactions.gesture.Drag.ClockDirection.Clock10 +import com.bumble.appyx.interactions.gesture.Drag.ClockDirection.Clock11 +import com.bumble.appyx.interactions.gesture.Drag.ClockDirection.Clock12 +import com.bumble.appyx.interactions.gesture.Drag.ClockDirection.Clock2 +import com.bumble.appyx.interactions.gesture.Drag.ClockDirection.Clock3 +import com.bumble.appyx.interactions.gesture.Drag.ClockDirection.Clock4 +import com.bumble.appyx.interactions.gesture.Drag.ClockDirection.Clock5 +import com.bumble.appyx.interactions.gesture.Drag.ClockDirection.Clock6 +import com.bumble.appyx.interactions.gesture.Drag.ClockDirection.Clock7 +import com.bumble.appyx.interactions.gesture.Drag.ClockDirection.Clock8 +import com.bumble.appyx.interactions.gesture.Drag.ClockDirection.Clock9 +import com.bumble.appyx.interactions.gesture.Drag.Direction4 +import com.bumble.appyx.interactions.gesture.Drag.Direction8 +import com.bumble.appyx.interactions.gesture.Drag.Direction8.DOWNLEFT +import com.bumble.appyx.interactions.gesture.Drag.Direction8.DOWNRIGHT +import com.bumble.appyx.interactions.gesture.Drag.Direction8.UPLEFT +import com.bumble.appyx.interactions.gesture.Drag.Direction8.UPRIGHT +import com.bumble.appyx.interactions.gesture.Drag.HorizontalDirection +import com.bumble.appyx.interactions.gesture.Drag.HorizontalDirection.LEFT +import com.bumble.appyx.interactions.gesture.Drag.HorizontalDirection.RIGHT +import com.bumble.appyx.interactions.gesture.Drag.VerticalDirection +import com.bumble.appyx.interactions.gesture.Drag.VerticalDirection.DOWN +import com.bumble.appyx.interactions.gesture.Drag.VerticalDirection.UP +import com.bumble.appyx.interactions.ui.math.angleDegrees +import kotlin.math.abs + +interface Drag { + + enum class VerticalDirection { + UP, DOWN + } + + enum class HorizontalDirection { + LEFT, RIGHT + } + + enum class Direction4 { + UP, DOWN, LEFT, RIGHT + } + + enum class Direction8 { + UP, UPRIGHT, RIGHT, DOWNRIGHT, DOWN, DOWNLEFT, LEFT, UPLEFT + } + + @Suppress("MagicNumber") + enum class ClockDirection(val digit: Int) { + Clock1(1), + Clock2(2), + Clock3(3), + Clock4(4), + Clock5(5), + Clock6(6), + Clock7(7), + Clock8(8), + Clock9(9), + Clock10(10), + Clock11(11), + Clock12(12) + } +} + +/** + * The angle of the drag such that: + * + * - 12 o'clock = 0 degrees + * - 3 o'clock = 90 degrees + */ +fun dragAngleDegrees(delta: Offset): Float = + angleDegrees(delta) + +/** + * The horizontal aspect of the drag (LEFT or RIGHT), regardless of the dominant direction + */ +fun dragHorizontalDirection(delta: Offset): HorizontalDirection = + if (delta.x < 0) LEFT else RIGHT + +/** + * The vertical aspect of the drag (UP or DOWN), regardless of the dominant direction + */ +fun dragVerticalDirection(delta: Offset): VerticalDirection = + if (delta.y < 0) UP else DOWN + +/** + * The dominant direction of the drag of 4 possible directions + */ +fun dragDirection4(delta: Offset) = + if (abs(delta.x) > abs(delta.y)) { + if (delta.x < 0) Direction4.LEFT else Direction4.RIGHT + } else { + if (delta.y < 0) Direction4.UP else Direction4.DOWN + } + +/** + * The dominant direction of the drag of 8 possible directions + */ +@Suppress("MagicNumber") +fun dragDirection8(delta: Offset): Direction8 { + val angle = dragAngleDegrees(delta) + return when { + (0.0..22.5).contains(angle) -> Direction8.UP + (22.5..67.5).contains(angle) -> UPRIGHT + (67.5..112.5).contains(angle) -> Direction8.RIGHT + (112.5..157.5).contains(angle) -> DOWNRIGHT + (157.5..202.5).contains(angle) -> Direction8.DOWN + (202.5..247.5).contains(angle) -> DOWNLEFT + (247.5..292.5).contains(angle) -> Direction8.LEFT + (292.5..337.5).contains(angle) -> UPLEFT + else -> Direction8.UP + } +} + +/** + * The drag direction interpreted on the clock + */ +@Suppress("MagicNumber") +fun dragClockDirection(delta: Offset): ClockDirection { + val angle = dragAngleDegrees(delta) + return when { + (0.0..15.0).contains(angle) -> Clock12 + (15.0..45.0).contains(angle) -> Clock1 + (45.0..75.0).contains(angle) -> Clock2 + (75.0..105.0).contains(angle) -> Clock3 + (105.0..135.0).contains(angle) -> Clock4 + (135.0..165.0).contains(angle) -> Clock5 + (165.0..195.0).contains(angle) -> Clock6 + (195.0..225.0).contains(angle) -> Clock7 + (225.0..255.0).contains(angle) -> Clock8 + (255.0..285.0).contains(angle) -> Clock9 + (285.0..315.0).contains(angle) -> Clock10 + (315.0..345.0).contains(angle) -> Clock11 + else -> Clock12 + } +} + diff --git a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/ui/gesture/Gesture.kt b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/gesture/Gesture.kt similarity index 82% rename from appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/ui/gesture/Gesture.kt rename to appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/gesture/Gesture.kt index 60c9864d5..ea98d7f28 100644 --- a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/ui/gesture/Gesture.kt +++ b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/gesture/Gesture.kt @@ -1,8 +1,8 @@ -package com.bumble.appyx.interactions.core.ui.gesture +package com.bumble.appyx.interactions.gesture import androidx.compose.ui.geometry.Offset -import com.bumble.appyx.interactions.core.model.transition.Operation -import com.bumble.appyx.interactions.core.ui.math.proportionOf +import com.bumble.appyx.interactions.model.transition.Operation +import com.bumble.appyx.interactions.ui.math.proportionOf open class Gesture internal constructor( val operation: Operation, diff --git a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/ui/gesture/GestureFactory.kt b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/gesture/GestureFactory.kt similarity index 94% rename from appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/ui/gesture/GestureFactory.kt rename to appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/gesture/GestureFactory.kt index b9b5419f5..9e67690aa 100644 --- a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/ui/gesture/GestureFactory.kt +++ b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/gesture/GestureFactory.kt @@ -1,4 +1,4 @@ -package com.bumble.appyx.interactions.core.ui.gesture +package com.bumble.appyx.interactions.gesture import androidx.compose.ui.geometry.Offset import androidx.compose.ui.unit.Density diff --git a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/gesture/GestureReferencePoint.kt b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/gesture/GestureReferencePoint.kt new file mode 100644 index 000000000..618460385 --- /dev/null +++ b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/gesture/GestureReferencePoint.kt @@ -0,0 +1,6 @@ +package com.bumble.appyx.interactions.gesture + +enum class GestureReferencePoint { + Container, + Element +} diff --git a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/ui/gesture/GestureSettleConfig.kt b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/gesture/GestureSettleConfig.kt similarity index 73% rename from appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/ui/gesture/GestureSettleConfig.kt rename to appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/gesture/GestureSettleConfig.kt index 76286232c..3a4d6d365 100644 --- a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/ui/gesture/GestureSettleConfig.kt +++ b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/gesture/GestureSettleConfig.kt @@ -1,8 +1,8 @@ -package com.bumble.appyx.interactions.core.ui.gesture +package com.bumble.appyx.interactions.gesture import androidx.compose.animation.core.AnimationSpec import androidx.compose.runtime.Immutable -import com.bumble.appyx.interactions.core.ui.DefaultAnimationSpec +import com.bumble.appyx.interactions.ui.DefaultAnimationSpec @Immutable data class GestureSettleConfig( diff --git a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/gesture/GestureValidator.kt b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/gesture/GestureValidator.kt similarity index 90% rename from appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/gesture/GestureValidator.kt rename to appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/gesture/GestureValidator.kt index 10fe2875b..b00e8a674 100644 --- a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/gesture/GestureValidator.kt +++ b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/gesture/GestureValidator.kt @@ -1,4 +1,4 @@ -package com.bumble.appyx.interactions.core.gesture +package com.bumble.appyx.interactions.gesture import androidx.compose.runtime.Stable import androidx.compose.ui.geometry.Offset diff --git a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/gesture/detectDragGesturesOrCancellation.kt b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/gesture/detectDragGesturesOrCancellation.kt similarity index 97% rename from appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/gesture/detectDragGesturesOrCancellation.kt rename to appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/gesture/detectDragGesturesOrCancellation.kt index 6f1c10e1e..e848cc0db 100644 --- a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/gesture/detectDragGesturesOrCancellation.kt +++ b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/gesture/detectDragGesturesOrCancellation.kt @@ -1,4 +1,4 @@ -package com.bumble.appyx.interactions.core.gesture +package com.bumble.appyx.interactions.gesture import androidx.compose.foundation.gestures.awaitDragOrCancellation import androidx.compose.foundation.gestures.awaitEachGesture diff --git a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/modifiers/OnPointerEventNode.kt b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/gesture/onPointerEvent.kt similarity index 85% rename from appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/modifiers/OnPointerEventNode.kt rename to appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/gesture/onPointerEvent.kt index 64333bc34..000e8529f 100644 --- a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/modifiers/OnPointerEventNode.kt +++ b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/gesture/onPointerEvent.kt @@ -1,4 +1,4 @@ -package com.bumble.appyx.interactions.core.modifiers +package com.bumble.appyx.interactions.gesture import androidx.compose.ui.Modifier import androidx.compose.ui.input.pointer.PointerEvent @@ -8,8 +8,29 @@ import androidx.compose.ui.node.PointerInputModifierNode import androidx.compose.ui.platform.InspectorInfo import androidx.compose.ui.unit.IntSize -class OnPointerEventNode(var callback: (PointerEvent) -> Unit) : - PointerInputModifierNode, Modifier.Node() { +fun Modifier.onPointerEvent(callback: (PointerEvent) -> Unit) = + this then PointerInputElement(callback) + + +private data class PointerInputElement( + val callback: (PointerEvent) -> Unit +) : ModifierNodeElement() { + + override fun create() = OnPointerEventNode(callback) + + override fun update(node: OnPointerEventNode) { + node.callback = callback + } + override fun InspectorInfo.inspectableProperties() { + name = "onPointerEvent" + properties["callback"] = callback + } +} + +private class OnPointerEventNode( + var callback: (PointerEvent) -> Unit +) : PointerInputModifierNode, Modifier.Node() { + override fun onPointerEvent( pointerEvent: PointerEvent, pass: PointerEventPass, @@ -26,20 +47,3 @@ class OnPointerEventNode(var callback: (PointerEvent) -> Unit) : // Do nothing } } - -data class PointerInputElement( - val callback: (PointerEvent) -> Unit -) : ModifierNodeElement() { - override fun create() = OnPointerEventNode(callback) - override fun update(node: OnPointerEventNode) { - node.callback = callback - } - - override fun InspectorInfo.inspectableProperties() { - name = "onPointerEvent" - properties["callback"] = callback - } -} - -fun Modifier.onPointerEvent(callback: (PointerEvent) -> Unit) = - this then PointerInputElement(callback) diff --git a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/model/AppyxComponent.kt b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/model/AppyxComponent.kt similarity index 85% rename from appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/model/AppyxComponent.kt rename to appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/model/AppyxComponent.kt index df896b751..3122a21f7 100644 --- a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/model/AppyxComponent.kt +++ b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/model/AppyxComponent.kt @@ -1,8 +1,7 @@ -package com.bumble.appyx.interactions.core.model +package com.bumble.appyx.interactions.model import androidx.compose.runtime.Stable -import com.bumble.appyx.interactions.core.Element -import com.bumble.appyx.interactions.core.plugin.SavesInstanceState +import com.bumble.appyx.interactions.plugin.SavesInstanceState import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.flow.StateFlow diff --git a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/model/BaseAppyxComponent.kt b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/model/BaseAppyxComponent.kt similarity index 86% rename from appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/model/BaseAppyxComponent.kt rename to appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/model/BaseAppyxComponent.kt index ff00363e1..defaab659 100644 --- a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/model/BaseAppyxComponent.kt +++ b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/model/BaseAppyxComponent.kt @@ -1,30 +1,29 @@ -package com.bumble.appyx.interactions.core.model +package com.bumble.appyx.interactions.model import androidx.compose.animation.core.AnimationSpec import androidx.compose.animation.core.SpringSpec import androidx.compose.ui.geometry.Offset import androidx.compose.ui.unit.Density -import com.bumble.appyx.interactions.core.Element -import com.bumble.appyx.interactions.core.model.backpresshandlerstrategies.BackPressHandlerStrategy -import com.bumble.appyx.interactions.core.model.backpresshandlerstrategies.DontHandleBackPress -import com.bumble.appyx.interactions.core.model.progress.AnimatedProgressController -import com.bumble.appyx.interactions.core.model.progress.DragProgressController -import com.bumble.appyx.interactions.core.model.progress.Draggable -import com.bumble.appyx.interactions.core.model.progress.HasDefaultAnimationSpec -import com.bumble.appyx.interactions.core.model.progress.InstantProgressController -import com.bumble.appyx.interactions.core.model.transition.Operation -import com.bumble.appyx.interactions.core.model.transition.Operation.Mode.IMMEDIATE -import com.bumble.appyx.interactions.core.model.transition.TransitionModel -import com.bumble.appyx.interactions.core.state.MutableSavedStateMap -import com.bumble.appyx.interactions.core.ui.DefaultAnimationSpec -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.TransitionBoundsAware -import com.bumble.appyx.interactions.core.ui.context.UiContext -import com.bumble.appyx.interactions.core.ui.context.UiContextAware -import com.bumble.appyx.interactions.core.ui.gesture.GestureFactory -import com.bumble.appyx.interactions.core.ui.gesture.GestureSettleConfig -import com.bumble.appyx.interactions.core.ui.output.ElementUiModel +import com.bumble.appyx.interactions.gesture.GestureFactory +import com.bumble.appyx.interactions.gesture.GestureSettleConfig +import com.bumble.appyx.interactions.model.backpresshandlerstrategies.BackPressHandlerStrategy +import com.bumble.appyx.interactions.model.backpresshandlerstrategies.DontHandleBackPress +import com.bumble.appyx.interactions.model.progress.AnimatedProgressController +import com.bumble.appyx.interactions.model.progress.DragProgressController +import com.bumble.appyx.interactions.model.progress.Draggable +import com.bumble.appyx.interactions.model.progress.HasDefaultAnimationSpec +import com.bumble.appyx.interactions.model.progress.InstantProgressController +import com.bumble.appyx.interactions.model.transition.Operation +import com.bumble.appyx.interactions.model.transition.Operation.Mode.IMMEDIATE +import com.bumble.appyx.interactions.model.transition.TransitionModel +import com.bumble.appyx.interactions.state.MutableSavedStateMap +import com.bumble.appyx.interactions.ui.DefaultAnimationSpec +import com.bumble.appyx.interactions.ui.Visualisation +import com.bumble.appyx.interactions.ui.context.TransitionBounds +import com.bumble.appyx.interactions.ui.context.TransitionBoundsAware +import com.bumble.appyx.interactions.ui.context.UiContext +import com.bumble.appyx.interactions.ui.context.UiContextAware +import com.bumble.appyx.interactions.ui.output.ElementUiModel import com.bumble.appyx.utils.multiplatform.AppyxLogger import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers diff --git a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/model/CombinedAppyxComponent.kt b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/model/CombinedAppyxComponent.kt similarity index 97% rename from appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/model/CombinedAppyxComponent.kt rename to appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/model/CombinedAppyxComponent.kt index e442ca76b..fc51aa3ce 100644 --- a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/model/CombinedAppyxComponent.kt +++ b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/model/CombinedAppyxComponent.kt @@ -1,4 +1,4 @@ -package com.bumble.appyx.interactions.core.model +package com.bumble.appyx.interactions.model import com.bumble.appyx.combineState import kotlinx.coroutines.CoroutineScope diff --git a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/Element.kt b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/model/Element.kt similarity index 93% rename from appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/Element.kt rename to appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/model/Element.kt index 2bc89c617..5ce13e4d8 100644 --- a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/Element.kt +++ b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/model/Element.kt @@ -1,4 +1,4 @@ -package com.bumble.appyx.interactions.core +package com.bumble.appyx.interactions.model import androidx.compose.runtime.Immutable diff --git a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/Elements.kt b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/model/Elements.kt similarity index 62% rename from appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/Elements.kt rename to appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/model/Elements.kt index c8368620a..17a62d4df 100644 --- a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/Elements.kt +++ b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/model/Elements.kt @@ -1,3 +1,3 @@ -package com.bumble.appyx.interactions.core +package com.bumble.appyx.interactions.model typealias Elements = List> diff --git a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/model/EmptyAppyxComponent.kt b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/model/EmptyAppyxComponent.kt similarity index 79% rename from appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/model/EmptyAppyxComponent.kt rename to appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/model/EmptyAppyxComponent.kt index 04914f048..8bc65c409 100644 --- a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/model/EmptyAppyxComponent.kt +++ b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/model/EmptyAppyxComponent.kt @@ -1,10 +1,11 @@ -package com.bumble.appyx.interactions.core.model +package com.bumble.appyx.interactions.model import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow -class EmptyAppyxComponent : AppyxComponent { +class EmptyAppyxComponent : + AppyxComponent { override val elements: StateFlow> get() = MutableStateFlow(AppyxComponent.Elements()) diff --git a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/model/InteractionModelExt.kt b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/model/InteractionModelExt.kt similarity index 90% rename from appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/model/InteractionModelExt.kt rename to appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/model/InteractionModelExt.kt index 0d906be83..560ccb94c 100644 --- a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/model/InteractionModelExt.kt +++ b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/model/InteractionModelExt.kt @@ -1,4 +1,4 @@ -package com.bumble.appyx.interactions.core.model +package com.bumble.appyx.interactions.model import com.bumble.appyx.withPrevious import kotlinx.coroutines.flow.map diff --git a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/model/backpresshandlerstrategies/BackPressHandlerStrategy.kt b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/model/backpresshandlerstrategies/BackPressHandlerStrategy.kt similarity index 62% rename from appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/model/backpresshandlerstrategies/BackPressHandlerStrategy.kt rename to appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/model/backpresshandlerstrategies/BackPressHandlerStrategy.kt index ce654e280..b11572a93 100644 --- a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/model/backpresshandlerstrategies/BackPressHandlerStrategy.kt +++ b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/model/backpresshandlerstrategies/BackPressHandlerStrategy.kt @@ -1,7 +1,7 @@ -package com.bumble.appyx.interactions.core.model.backpresshandlerstrategies +package com.bumble.appyx.interactions.model.backpresshandlerstrategies -import com.bumble.appyx.interactions.core.model.BaseAppyxComponent -import com.bumble.appyx.interactions.core.model.transition.TransitionModel +import com.bumble.appyx.interactions.model.BaseAppyxComponent +import com.bumble.appyx.interactions.model.transition.TransitionModel import kotlinx.coroutines.flow.StateFlow interface BackPressHandlerStrategy { diff --git a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/model/backpresshandlerstrategies/BaseBackPressHandlerStrategy.kt b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/model/backpresshandlerstrategies/BaseBackPressHandlerStrategy.kt similarity index 72% rename from appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/model/backpresshandlerstrategies/BaseBackPressHandlerStrategy.kt rename to appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/model/backpresshandlerstrategies/BaseBackPressHandlerStrategy.kt index 612360e35..f447f4635 100644 --- a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/model/backpresshandlerstrategies/BaseBackPressHandlerStrategy.kt +++ b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/model/backpresshandlerstrategies/BaseBackPressHandlerStrategy.kt @@ -1,7 +1,7 @@ -package com.bumble.appyx.interactions.core.model.backpresshandlerstrategies +package com.bumble.appyx.interactions.model.backpresshandlerstrategies -import com.bumble.appyx.interactions.core.model.BaseAppyxComponent -import com.bumble.appyx.interactions.core.model.transition.TransitionModel +import com.bumble.appyx.interactions.model.BaseAppyxComponent +import com.bumble.appyx.interactions.model.transition.TransitionModel abstract class BaseBackPressHandlerStrategy : BackPressHandlerStrategy { diff --git a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/model/backpresshandlerstrategies/DontHandleBackPress.kt b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/model/backpresshandlerstrategies/DontHandleBackPress.kt similarity index 82% rename from appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/model/backpresshandlerstrategies/DontHandleBackPress.kt rename to appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/model/backpresshandlerstrategies/DontHandleBackPress.kt index d506972f9..cf4e137b7 100644 --- a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/model/backpresshandlerstrategies/DontHandleBackPress.kt +++ b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/model/backpresshandlerstrategies/DontHandleBackPress.kt @@ -1,4 +1,4 @@ -package com.bumble.appyx.interactions.core.model.backpresshandlerstrategies +package com.bumble.appyx.interactions.model.backpresshandlerstrategies import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow diff --git a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/model/progress/AnimatedProgressController.kt b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/model/progress/AnimatedProgressController.kt similarity index 89% rename from appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/model/progress/AnimatedProgressController.kt rename to appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/model/progress/AnimatedProgressController.kt index 2322cd13a..f1b28137b 100644 --- a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/model/progress/AnimatedProgressController.kt +++ b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/model/progress/AnimatedProgressController.kt @@ -1,13 +1,13 @@ -package com.bumble.appyx.interactions.core.model.progress +package com.bumble.appyx.interactions.model.progress import androidx.compose.animation.core.Animatable import androidx.compose.animation.core.AnimationSpec import androidx.compose.animation.core.spring -import com.bumble.appyx.interactions.core.model.transition.Keyframes -import com.bumble.appyx.interactions.core.model.transition.Operation -import com.bumble.appyx.interactions.core.model.transition.TransitionModel -import com.bumble.appyx.interactions.core.model.transition.TransitionModel.SettleDirection.COMPLETE -import com.bumble.appyx.interactions.core.model.transition.TransitionModel.SettleDirection.REVERT +import com.bumble.appyx.interactions.model.transition.Keyframes +import com.bumble.appyx.interactions.model.transition.Operation +import com.bumble.appyx.interactions.model.transition.TransitionModel +import com.bumble.appyx.interactions.model.transition.TransitionModel.SettleDirection.COMPLETE +import com.bumble.appyx.interactions.model.transition.TransitionModel.SettleDirection.REVERT import com.bumble.appyx.utils.multiplatform.AppyxLogger import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers diff --git a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/model/progress/DragProgressController.kt b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/model/progress/DragProgressController.kt similarity index 90% rename from appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/model/progress/DragProgressController.kt rename to appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/model/progress/DragProgressController.kt index cff026566..c862f5f96 100644 --- a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/model/progress/DragProgressController.kt +++ b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/model/progress/DragProgressController.kt @@ -1,15 +1,15 @@ -package com.bumble.appyx.interactions.core.model.progress +package com.bumble.appyx.interactions.model.progress import androidx.compose.animation.core.AnimationSpec import androidx.compose.ui.geometry.Offset import androidx.compose.ui.unit.Density -import com.bumble.appyx.interactions.core.model.transition.Keyframes -import com.bumble.appyx.interactions.core.model.transition.Operation.Mode.KEYFRAME -import com.bumble.appyx.interactions.core.model.transition.TransitionModel -import com.bumble.appyx.interactions.core.model.transition.TransitionModel.SettleDirection.COMPLETE -import com.bumble.appyx.interactions.core.model.transition.TransitionModel.SettleDirection.REVERT -import com.bumble.appyx.interactions.core.ui.gesture.Gesture -import com.bumble.appyx.interactions.core.ui.gesture.GestureFactory +import com.bumble.appyx.interactions.model.transition.Keyframes +import com.bumble.appyx.interactions.model.transition.Operation.Mode.KEYFRAME +import com.bumble.appyx.interactions.model.transition.TransitionModel +import com.bumble.appyx.interactions.model.transition.TransitionModel.SettleDirection.COMPLETE +import com.bumble.appyx.interactions.model.transition.TransitionModel.SettleDirection.REVERT +import com.bumble.appyx.interactions.gesture.Gesture +import com.bumble.appyx.interactions.gesture.GestureFactory import com.bumble.appyx.utils.multiplatform.AppyxLogger internal class DragProgressController( diff --git a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/model/progress/Draggable.kt b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/model/progress/Draggable.kt similarity index 81% rename from appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/model/progress/Draggable.kt rename to appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/model/progress/Draggable.kt index 662f4f2f3..6fd62165f 100644 --- a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/model/progress/Draggable.kt +++ b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/model/progress/Draggable.kt @@ -1,4 +1,4 @@ -package com.bumble.appyx.interactions.core.model.progress +package com.bumble.appyx.interactions.model.progress import androidx.compose.ui.geometry.Offset import androidx.compose.ui.unit.Density diff --git a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/model/progress/HasDefaultAnimationSpec.kt b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/model/progress/HasDefaultAnimationSpec.kt similarity index 71% rename from appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/model/progress/HasDefaultAnimationSpec.kt rename to appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/model/progress/HasDefaultAnimationSpec.kt index 7b9101248..a0d9cc4b8 100644 --- a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/model/progress/HasDefaultAnimationSpec.kt +++ b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/model/progress/HasDefaultAnimationSpec.kt @@ -1,4 +1,4 @@ -package com.bumble.appyx.interactions.core.model.progress +package com.bumble.appyx.interactions.model.progress import androidx.compose.animation.core.AnimationSpec diff --git a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/model/progress/InstantProgressController.kt b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/model/progress/InstantProgressController.kt similarity index 59% rename from appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/model/progress/InstantProgressController.kt rename to appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/model/progress/InstantProgressController.kt index 189e54701..717ee11aa 100644 --- a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/model/progress/InstantProgressController.kt +++ b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/model/progress/InstantProgressController.kt @@ -1,9 +1,9 @@ -package com.bumble.appyx.interactions.core.model.progress +package com.bumble.appyx.interactions.model.progress -import com.bumble.appyx.interactions.core.model.transition.Keyframes -import com.bumble.appyx.interactions.core.model.transition.Operation -import com.bumble.appyx.interactions.core.model.transition.TransitionModel -import com.bumble.appyx.interactions.core.model.transition.TransitionModel.SettleDirection.COMPLETE +import com.bumble.appyx.interactions.model.transition.Keyframes +import com.bumble.appyx.interactions.model.transition.Operation +import com.bumble.appyx.interactions.model.transition.TransitionModel +import com.bumble.appyx.interactions.model.transition.TransitionModel.SettleDirection.COMPLETE class InstantProgressController( private val model: TransitionModel, diff --git a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/model/progress/ProgressController.kt b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/model/progress/ProgressController.kt new file mode 100644 index 000000000..96fca7c09 --- /dev/null +++ b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/model/progress/ProgressController.kt @@ -0,0 +1,8 @@ +package com.bumble.appyx.interactions.model.progress + +import com.bumble.appyx.interactions.model.transition.Operation + +interface ProgressController { + + fun operation(operation: Operation) +} diff --git a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/model/transition/BaseOperation.kt b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/model/transition/BaseOperation.kt similarity index 93% rename from appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/model/transition/BaseOperation.kt rename to appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/model/transition/BaseOperation.kt index 7226154d7..86afe7461 100644 --- a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/model/transition/BaseOperation.kt +++ b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/model/transition/BaseOperation.kt @@ -1,4 +1,4 @@ -package com.bumble.appyx.interactions.core.model.transition +package com.bumble.appyx.interactions.model.transition abstract class BaseOperation : Operation { 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/model/transition/BaseTransitionModel.kt similarity index 92% rename from appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/model/transition/BaseTransitionModel.kt rename to appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/model/transition/BaseTransitionModel.kt index 30c8449d8..6969c1f49 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/model/transition/BaseTransitionModel.kt @@ -1,12 +1,12 @@ -package com.bumble.appyx.interactions.core.model.transition - -import com.bumble.appyx.interactions.core.Element -import com.bumble.appyx.interactions.core.model.transition.Operation.Mode.IMMEDIATE -import com.bumble.appyx.interactions.core.model.transition.Operation.Mode.IMPOSED -import com.bumble.appyx.interactions.core.model.transition.Operation.Mode.KEYFRAME -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 +package com.bumble.appyx.interactions.model.transition + +import com.bumble.appyx.interactions.model.Element +import com.bumble.appyx.interactions.model.transition.Operation.Mode.IMMEDIATE +import com.bumble.appyx.interactions.model.transition.Operation.Mode.IMPOSED +import com.bumble.appyx.interactions.model.transition.Operation.Mode.KEYFRAME +import com.bumble.appyx.interactions.model.transition.TransitionModel.Output +import com.bumble.appyx.interactions.model.transition.TransitionModel.SettleDirection +import com.bumble.appyx.interactions.state.MutableSavedStateMap import com.bumble.appyx.utils.multiplatform.AppyxLogger import com.bumble.appyx.utils.multiplatform.Parcelable import com.bumble.appyx.utils.multiplatform.SavedStateMap @@ -217,7 +217,7 @@ abstract class BaseTransitionModel( //Do not produce new state because progress is observed currentState.setProgress(progress) { // TODO uncomment when method is merged here - // com.bumble.appyx.interactions.core.navigation.BaseNavModel.onTransitionFinished + // com.bumble.appyx.interactions.navigation.BaseNavModel.onTransitionFinished // onTransitionFinished(state.value.fromState.map { it.key }) } } diff --git a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/model/transition/Keyframes.kt b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/model/transition/Keyframes.kt similarity index 98% rename from appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/model/transition/Keyframes.kt rename to appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/model/transition/Keyframes.kt index 09ea98d8c..9fae72f91 100644 --- a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/model/transition/Keyframes.kt +++ b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/model/transition/Keyframes.kt @@ -1,4 +1,4 @@ -package com.bumble.appyx.interactions.core.model.transition +package com.bumble.appyx.interactions.model.transition import com.bumble.appyx.utils.multiplatform.AppyxLogger import kotlinx.coroutines.flow.Flow diff --git a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/model/transition/Operation.kt b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/model/transition/Operation.kt similarity index 96% rename from appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/model/transition/Operation.kt rename to appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/model/transition/Operation.kt index a3bf7d1ac..ab7470146 100644 --- a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/model/transition/Operation.kt +++ b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/model/transition/Operation.kt @@ -1,4 +1,4 @@ -package com.bumble.appyx.interactions.core.model.transition +package com.bumble.appyx.interactions.model.transition import com.bumble.appyx.utils.multiplatform.Parcelable import com.bumble.appyx.utils.multiplatform.Parcelize diff --git a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/model/transition/Segment.kt b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/model/transition/Segment.kt similarity index 80% rename from appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/model/transition/Segment.kt rename to appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/model/transition/Segment.kt index 5f4d0c5a3..db4aa20a4 100644 --- a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/model/transition/Segment.kt +++ b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/model/transition/Segment.kt @@ -1,4 +1,4 @@ -package com.bumble.appyx.interactions.core.model.transition +package com.bumble.appyx.interactions.model.transition data class Segment( val stateTransition: StateTransition, diff --git a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/model/transition/StateTransition.kt b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/model/transition/StateTransition.kt similarity index 63% rename from appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/model/transition/StateTransition.kt rename to appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/model/transition/StateTransition.kt index 87839e697..d03da63f7 100644 --- a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/model/transition/StateTransition.kt +++ b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/model/transition/StateTransition.kt @@ -1,4 +1,4 @@ -package com.bumble.appyx.interactions.core.model.transition +package com.bumble.appyx.interactions.model.transition data class StateTransition( val fromState: ModelState, diff --git a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/model/transition/TransitionModel.kt b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/model/transition/TransitionModel.kt similarity index 86% rename from appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/model/transition/TransitionModel.kt rename to appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/model/transition/TransitionModel.kt index a4a013516..100eedff3 100644 --- a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/model/transition/TransitionModel.kt +++ b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/model/transition/TransitionModel.kt @@ -1,7 +1,7 @@ -package com.bumble.appyx.interactions.core.model.transition +package com.bumble.appyx.interactions.model.transition -import com.bumble.appyx.interactions.core.Element -import com.bumble.appyx.interactions.core.plugin.SavesInstanceState +import com.bumble.appyx.interactions.model.Element +import com.bumble.appyx.interactions.plugin.SavesInstanceState import kotlinx.coroutines.flow.StateFlow import kotlinx.serialization.Serializable diff --git a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/model/transition/Update.kt b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/model/transition/Update.kt similarity index 92% rename from appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/model/transition/Update.kt rename to appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/model/transition/Update.kt index ebdfc97e0..0a0f00bc8 100644 --- a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/model/transition/Update.kt +++ b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/model/transition/Update.kt @@ -1,4 +1,4 @@ -package com.bumble.appyx.interactions.core.model.transition +package com.bumble.appyx.interactions.model.transition data class Update( override val currentTargetState: ModelState, 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 1dcef6afa..a5af41e4c 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 @@ -1,9 +1,9 @@ package com.bumble.appyx.interactions.permanent -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.model.AppyxComponent +import com.bumble.appyx.interactions.model.progress.InstantProgressController +import com.bumble.appyx.interactions.model.transition.Operation +import com.bumble.appyx.interactions.state.MutableSavedStateMap import com.bumble.appyx.interactions.permanent.PermanentModel.State import com.bumble.appyx.mapState import com.bumble.appyx.utils.multiplatform.SavedStateMap 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 5e159856a..794671d44 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 @@ -1,9 +1,9 @@ package com.bumble.appyx.interactions.permanent -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.model.Element +import com.bumble.appyx.interactions.model.Elements +import com.bumble.appyx.interactions.model.asElement +import com.bumble.appyx.interactions.model.transition.BaseTransitionModel import com.bumble.appyx.interactions.permanent.PermanentModel.State import com.bumble.appyx.utils.multiplatform.Parcelable import com.bumble.appyx.utils.multiplatform.Parcelize diff --git a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/permanent/operation/AddUnique.kt b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/permanent/operation/AddUnique.kt index d1c759d3d..ceae4a5dd 100644 --- a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/permanent/operation/AddUnique.kt +++ b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/permanent/operation/AddUnique.kt @@ -1,8 +1,8 @@ package com.bumble.appyx.interactions.permanent.operation -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.interactions.permanent.PermanentAppyxComponent import com.bumble.appyx.interactions.permanent.PermanentModel import com.bumble.appyx.utils.multiplatform.Parcelize diff --git a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/plugin/Plugins.kt b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/plugin/Plugins.kt similarity index 68% rename from appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/plugin/Plugins.kt rename to appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/plugin/Plugins.kt index 7a83a178c..5d8a9a114 100644 --- a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/plugin/Plugins.kt +++ b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/plugin/Plugins.kt @@ -1,6 +1,6 @@ -package com.bumble.appyx.interactions.core.plugin +package com.bumble.appyx.interactions.plugin -import com.bumble.appyx.interactions.core.state.MutableSavedStateMap +import com.bumble.appyx.interactions.state.MutableSavedStateMap /** * Bundle for future state restoration. diff --git a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/sample/Children.kt b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/sample/Children.kt index 9df8dbba5..863a789da 100644 --- a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/sample/Children.kt +++ b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/sample/Children.kt @@ -16,7 +16,7 @@ import androidx.compose.ui.semantics.semantics import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import com.bumble.appyx.interactions.core.Element +import com.bumble.appyx.interactions.model.Element @Suppress( "MagicNumber", diff --git a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/state/MutableSavedStateMap.kt b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/state/MutableSavedStateMap.kt similarity index 75% rename from appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/state/MutableSavedStateMap.kt rename to appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/state/MutableSavedStateMap.kt index 262ce7f9c..324468d84 100644 --- a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/state/MutableSavedStateMap.kt +++ b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/state/MutableSavedStateMap.kt @@ -1,4 +1,4 @@ -package com.bumble.appyx.interactions.core.state +package com.bumble.appyx.interactions.state import androidx.compose.runtime.saveable.SaverScope 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/state/MutableSavedStateMapImpl.kt similarity index 96% rename from appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/state/MutableSavedStateMapImpl.kt rename to appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/state/MutableSavedStateMapImpl.kt index 00d7f3d6a..fad6cab60 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/state/MutableSavedStateMapImpl.kt @@ -1,4 +1,4 @@ -package com.bumble.appyx.interactions.core.state +package com.bumble.appyx.interactions.state import androidx.compose.runtime.saveable.SaverScope import com.bumble.appyx.utils.multiplatform.SavedStateMap diff --git a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/ui/CompositionLocals.kt b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/ui/CompositionLocals.kt similarity index 74% rename from appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/ui/CompositionLocals.kt rename to appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/ui/CompositionLocals.kt index dd12ed36f..b68f870e7 100644 --- a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/ui/CompositionLocals.kt +++ b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/ui/CompositionLocals.kt @@ -1,8 +1,8 @@ -package com.bumble.appyx.interactions.core.ui +package com.bumble.appyx.interactions.ui import androidx.compose.foundation.layout.BoxScope import androidx.compose.runtime.compositionLocalOf -import com.bumble.appyx.interactions.core.ui.property.MotionProperty +import com.bumble.appyx.interactions.ui.property.MotionProperty @Suppress("CompositionLocalAllowlist") val LocalMotionProperties = compositionLocalOf>?> { null } diff --git a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/ui/Defaults.kt b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/ui/Defaults.kt similarity index 76% rename from appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/ui/Defaults.kt rename to appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/ui/Defaults.kt index 9f077d5c6..e5484582d 100644 --- a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/ui/Defaults.kt +++ b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/ui/Defaults.kt @@ -1,4 +1,4 @@ -package com.bumble.appyx.interactions.core.ui +package com.bumble.appyx.interactions.ui import androidx.compose.animation.core.SpringSpec import androidx.compose.animation.core.spring diff --git a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/ui/DpExt.kt b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/ui/DpExt.kt similarity index 76% rename from appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/ui/DpExt.kt rename to appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/ui/DpExt.kt index 32fdad1f5..087ba15c7 100644 --- a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/ui/DpExt.kt +++ b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/ui/DpExt.kt @@ -1,4 +1,4 @@ -package com.bumble.appyx.interactions.core.ui +package com.bumble.appyx.interactions.ui import androidx.compose.ui.unit.Density import androidx.compose.ui.unit.Dp diff --git a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/ui/Visualisation.kt b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/ui/Visualisation.kt similarity index 74% rename from appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/ui/Visualisation.kt rename to appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/ui/Visualisation.kt index 3fa630c65..da67eee2a 100644 --- a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/ui/Visualisation.kt +++ b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/ui/Visualisation.kt @@ -1,14 +1,14 @@ -package com.bumble.appyx.interactions.core.ui +package com.bumble.appyx.interactions.ui import androidx.compose.animation.core.SpringSpec -import com.bumble.appyx.interactions.core.model.transition.Keyframes -import com.bumble.appyx.interactions.core.Element -import com.bumble.appyx.interactions.core.model.transition.Segment -import com.bumble.appyx.interactions.core.model.transition.TransitionModel -import com.bumble.appyx.interactions.core.model.transition.Update -import com.bumble.appyx.interactions.core.model.transition.toSegmentProgress -import com.bumble.appyx.interactions.core.ui.context.TransitionBoundsAware -import com.bumble.appyx.interactions.core.ui.output.ElementUiModel +import com.bumble.appyx.interactions.model.transition.Keyframes +import com.bumble.appyx.interactions.model.Element +import com.bumble.appyx.interactions.model.transition.Segment +import com.bumble.appyx.interactions.model.transition.TransitionModel +import com.bumble.appyx.interactions.model.transition.Update +import com.bumble.appyx.interactions.model.transition.toSegmentProgress +import com.bumble.appyx.interactions.ui.context.TransitionBoundsAware +import com.bumble.appyx.interactions.ui.output.ElementUiModel import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow diff --git a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/ui/context/TransitionBounds.kt b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/ui/context/TransitionBounds.kt similarity index 93% rename from appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/ui/context/TransitionBounds.kt rename to appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/ui/context/TransitionBounds.kt index 1983ffcc1..ff7d95683 100644 --- a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/ui/context/TransitionBounds.kt +++ b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/ui/context/TransitionBounds.kt @@ -1,4 +1,4 @@ -package com.bumble.appyx.interactions.core.ui.context +package com.bumble.appyx.interactions.ui.context import androidx.compose.runtime.Immutable import androidx.compose.ui.unit.Density diff --git a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/ui/context/TransitionBoundsAware.kt b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/ui/context/TransitionBoundsAware.kt similarity index 63% rename from appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/ui/context/TransitionBoundsAware.kt rename to appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/ui/context/TransitionBoundsAware.kt index 181b22361..e218ba8df 100644 --- a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/ui/context/TransitionBoundsAware.kt +++ b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/ui/context/TransitionBoundsAware.kt @@ -1,4 +1,4 @@ -package com.bumble.appyx.interactions.core.ui.context +package com.bumble.appyx.interactions.ui.context interface TransitionBoundsAware { diff --git a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/ui/context/UiContext.kt b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/ui/context/UiContext.kt similarity index 77% rename from appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/ui/context/UiContext.kt rename to appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/ui/context/UiContext.kt index 6e23571f4..98842c41b 100644 --- a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/ui/context/UiContext.kt +++ b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/ui/context/UiContext.kt @@ -1,4 +1,4 @@ -package com.bumble.appyx.interactions.core.ui.context +package com.bumble.appyx.interactions.ui.context import androidx.compose.runtime.Immutable import kotlinx.coroutines.CoroutineScope diff --git a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/ui/context/UiContextAware.kt b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/ui/context/UiContextAware.kt similarity index 58% rename from appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/ui/context/UiContextAware.kt rename to appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/ui/context/UiContextAware.kt index 97e5c1ec2..66c962880 100644 --- a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/ui/context/UiContextAware.kt +++ b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/ui/context/UiContextAware.kt @@ -1,4 +1,4 @@ -package com.bumble.appyx.interactions.core.ui.context +package com.bumble.appyx.interactions.ui.context interface UiContextAware { diff --git a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/ui/easing/MappedEasing.kt b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/ui/easing/MappedEasing.kt similarity index 88% rename from appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/ui/easing/MappedEasing.kt rename to appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/ui/easing/MappedEasing.kt index aabb8f103..7032cc016 100644 --- a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/ui/easing/MappedEasing.kt +++ b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/ui/easing/MappedEasing.kt @@ -1,7 +1,7 @@ -package com.bumble.appyx.interactions.core.ui.easing +package com.bumble.appyx.interactions.ui.easing import androidx.compose.animation.core.Easing -import com.bumble.appyx.interactions.core.ui.math.mapFloat +import com.bumble.appyx.interactions.ui.math.mapFloat /** * Expects two params such that: 0 <= min < max <= 1 diff --git a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/ui/helper/InteractionModelSetup.kt b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/ui/helper/InteractionModelSetup.kt similarity index 80% rename from appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/ui/helper/InteractionModelSetup.kt rename to appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/ui/helper/InteractionModelSetup.kt index 9a10e0636..3b5ca9f14 100644 --- a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/ui/helper/InteractionModelSetup.kt +++ b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/ui/helper/InteractionModelSetup.kt @@ -1,9 +1,9 @@ -package com.bumble.appyx.interactions.core.ui.helper +package com.bumble.appyx.interactions.ui.helper import androidx.compose.runtime.Composable import androidx.compose.runtime.DisposableEffect import androidx.compose.runtime.rememberCoroutineScope -import com.bumble.appyx.interactions.core.model.AppyxComponent +import com.bumble.appyx.interactions.model.AppyxComponent @Composable fun AppyxComponentSetup(appyxComponent: AppyxComponent<*, *>) { diff --git a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/ui/math/Lerp.kt b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/ui/math/Lerp.kt similarity index 92% rename from appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/ui/math/Lerp.kt rename to appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/ui/math/Lerp.kt index eaf5ae08b..68d541faa 100644 --- a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/ui/math/Lerp.kt +++ b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/ui/math/Lerp.kt @@ -1,4 +1,4 @@ -package com.bumble.appyx.interactions.core.ui.math +package com.bumble.appyx.interactions.ui.math import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.DpOffset diff --git a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/ui/math/Map.kt b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/ui/math/Map.kt similarity index 87% rename from appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/ui/math/Map.kt rename to appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/ui/math/Map.kt index 4d7a2106c..add2bec88 100644 --- a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/ui/math/Map.kt +++ b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/ui/math/Map.kt @@ -1,4 +1,4 @@ -package com.bumble.appyx.interactions.core.ui.math +package com.bumble.appyx.interactions.ui.math /** diff --git a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/ui/math/Norm.kt b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/ui/math/Norm.kt similarity index 79% rename from appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/ui/math/Norm.kt rename to appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/ui/math/Norm.kt index 565ef3868..4cce905b1 100644 --- a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/ui/math/Norm.kt +++ b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/ui/math/Norm.kt @@ -1,4 +1,4 @@ -package com.bumble.appyx.interactions.core.ui.math +package com.bumble.appyx.interactions.ui.math /** diff --git a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/ui/math/Signals.kt b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/ui/math/Signals.kt similarity index 97% rename from appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/ui/math/Signals.kt rename to appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/ui/math/Signals.kt index 46ed4da30..0f13e73a9 100644 --- a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/ui/math/Signals.kt +++ b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/ui/math/Signals.kt @@ -1,4 +1,4 @@ -package com.bumble.appyx.interactions.core.ui.math +package com.bumble.appyx.interactions.ui.math import kotlin.math.abs import kotlin.math.sign diff --git a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/ui/math/Vector.kt b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/ui/math/Vector.kt similarity index 95% rename from appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/ui/math/Vector.kt rename to appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/ui/math/Vector.kt index 74bf345d0..0e54a261f 100644 --- a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/ui/math/Vector.kt +++ b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/ui/math/Vector.kt @@ -1,4 +1,4 @@ -package com.bumble.appyx.interactions.core.ui.math +package com.bumble.appyx.interactions.ui.math import androidx.compose.ui.geometry.Offset import kotlin.math.PI diff --git a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/ui/output/ElementUiModel.kt b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/ui/output/ElementUiModel.kt similarity index 85% rename from appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/ui/output/ElementUiModel.kt rename to appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/ui/output/ElementUiModel.kt index bae9a5fd5..ef4c4b896 100644 --- a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/ui/output/ElementUiModel.kt +++ b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/ui/output/ElementUiModel.kt @@ -1,10 +1,10 @@ -package com.bumble.appyx.interactions.core.ui.output +package com.bumble.appyx.interactions.ui.output import androidx.compose.runtime.Composable import androidx.compose.runtime.Immutable import androidx.compose.ui.Modifier -import com.bumble.appyx.interactions.core.Element -import com.bumble.appyx.interactions.core.ui.property.MotionProperty +import com.bumble.appyx.interactions.model.Element +import com.bumble.appyx.interactions.ui.property.MotionProperty import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.StateFlow diff --git a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/ui/property/Interpolatable.kt b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/ui/property/Interpolatable.kt similarity index 62% rename from appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/ui/property/Interpolatable.kt rename to appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/ui/property/Interpolatable.kt index 8a1bc8679..c3faab9ff 100644 --- a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/ui/property/Interpolatable.kt +++ b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/ui/property/Interpolatable.kt @@ -1,4 +1,4 @@ -package com.bumble.appyx.interactions.core.ui.property +package com.bumble.appyx.interactions.ui.property interface Interpolatable { diff --git a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/ui/property/MotionProperty.kt b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/ui/property/MotionProperty.kt similarity index 99% rename from appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/ui/property/MotionProperty.kt rename to appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/ui/property/MotionProperty.kt index 38eb32119..715712547 100644 --- a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/ui/property/MotionProperty.kt +++ b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/ui/property/MotionProperty.kt @@ -1,4 +1,4 @@ -package com.bumble.appyx.interactions.core.ui.property +package com.bumble.appyx.interactions.ui.property import androidx.compose.animation.core.Animatable import androidx.compose.animation.core.AnimationSpec diff --git a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/ui/property/MotionPropertyComposables.kt b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/ui/property/MotionPropertyComposables.kt similarity index 88% rename from appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/ui/property/MotionPropertyComposables.kt rename to appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/ui/property/MotionPropertyComposables.kt index 4855a021a..9677a849d 100644 --- a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/ui/property/MotionPropertyComposables.kt +++ b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/ui/property/MotionPropertyComposables.kt @@ -1,9 +1,9 @@ -package com.bumble.appyx.interactions.core.ui.property +package com.bumble.appyx.interactions.ui.property import androidx.compose.runtime.Composable import androidx.compose.runtime.collectAsState import androidx.compose.runtime.getValue -import com.bumble.appyx.interactions.core.ui.LocalMotionProperties +import com.bumble.appyx.interactions.ui.LocalMotionProperties import kotlinx.coroutines.flow.StateFlow @Composable diff --git a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/ui/property/impl/Alpha.kt b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/ui/property/impl/Alpha.kt similarity index 86% rename from appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/ui/property/impl/Alpha.kt rename to appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/ui/property/impl/Alpha.kt index df7dc208d..bcdcc8b65 100644 --- a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/ui/property/impl/Alpha.kt +++ b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/ui/property/impl/Alpha.kt @@ -1,4 +1,4 @@ -package com.bumble.appyx.interactions.core.ui.property.impl +package com.bumble.appyx.interactions.ui.property.impl import androidx.compose.animation.core.Animatable import androidx.compose.animation.core.AnimationVector1D @@ -7,9 +7,9 @@ import androidx.compose.runtime.collectAsState import androidx.compose.ui.Modifier import androidx.compose.ui.composed import androidx.compose.ui.draw.alpha -import com.bumble.appyx.interactions.core.ui.math.lerpFloat -import com.bumble.appyx.interactions.core.ui.property.Interpolatable -import com.bumble.appyx.interactions.core.ui.property.MotionProperty +import com.bumble.appyx.interactions.ui.math.lerpFloat +import com.bumble.appyx.interactions.ui.property.Interpolatable +import com.bumble.appyx.interactions.ui.property.MotionProperty import com.bumble.appyx.mapState import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.flow.MutableStateFlow diff --git a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/ui/property/impl/AngularPosition.kt b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/ui/property/impl/AngularPosition.kt similarity index 90% rename from appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/ui/property/impl/AngularPosition.kt rename to appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/ui/property/impl/AngularPosition.kt index 35e347b10..93dac834d 100644 --- a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/ui/property/impl/AngularPosition.kt +++ b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/ui/property/impl/AngularPosition.kt @@ -1,4 +1,4 @@ -package com.bumble.appyx.interactions.core.ui.property.impl +package com.bumble.appyx.interactions.ui.property.impl import androidx.compose.animation.core.Animatable import androidx.compose.animation.core.AnimationVector2D @@ -10,10 +10,10 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.composed import androidx.compose.ui.unit.DpOffset import androidx.compose.ui.unit.dp -import com.bumble.appyx.interactions.core.ui.math.lerpFloat -import com.bumble.appyx.interactions.core.ui.property.Interpolatable -import com.bumble.appyx.interactions.core.ui.property.MotionProperty -import com.bumble.appyx.interactions.core.ui.property.impl.AngularPosition.Value +import com.bumble.appyx.interactions.ui.math.lerpFloat +import com.bumble.appyx.interactions.ui.property.Interpolatable +import com.bumble.appyx.interactions.ui.property.MotionProperty +import com.bumble.appyx.interactions.ui.property.impl.AngularPosition.Value import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow diff --git a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/ui/property/impl/AspectRatio.kt b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/ui/property/impl/AspectRatio.kt similarity index 85% rename from appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/ui/property/impl/AspectRatio.kt rename to appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/ui/property/impl/AspectRatio.kt index f37a3d37c..ba39c258a 100644 --- a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/ui/property/impl/AspectRatio.kt +++ b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/ui/property/impl/AspectRatio.kt @@ -1,4 +1,4 @@ -package com.bumble.appyx.interactions.core.ui.property.impl +package com.bumble.appyx.interactions.ui.property.impl import androidx.compose.animation.core.Animatable import androidx.compose.animation.core.AnimationVector1D @@ -7,9 +7,9 @@ import androidx.compose.foundation.layout.aspectRatio import androidx.compose.runtime.collectAsState import androidx.compose.ui.Modifier import androidx.compose.ui.composed -import com.bumble.appyx.interactions.core.ui.math.lerpFloat -import com.bumble.appyx.interactions.core.ui.property.Interpolatable -import com.bumble.appyx.interactions.core.ui.property.MotionProperty +import com.bumble.appyx.interactions.ui.math.lerpFloat +import com.bumble.appyx.interactions.ui.property.Interpolatable +import com.bumble.appyx.interactions.ui.property.MotionProperty import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow diff --git a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/ui/property/impl/BackgroundColor.kt b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/ui/property/impl/BackgroundColor.kt similarity index 87% rename from appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/ui/property/impl/BackgroundColor.kt rename to appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/ui/property/impl/BackgroundColor.kt index 769c8ad13..54649a283 100644 --- a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/ui/property/impl/BackgroundColor.kt +++ b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/ui/property/impl/BackgroundColor.kt @@ -1,4 +1,4 @@ -package com.bumble.appyx.interactions.core.ui.property.impl +package com.bumble.appyx.interactions.ui.property.impl import androidx.compose.animation.VectorConverter import androidx.compose.animation.core.Animatable @@ -9,9 +9,9 @@ import androidx.compose.runtime.collectAsState import androidx.compose.ui.Modifier import androidx.compose.ui.composed import androidx.compose.ui.graphics.Color -import com.bumble.appyx.interactions.core.ui.property.Interpolatable -import com.bumble.appyx.interactions.core.ui.property.MotionProperty -import com.bumble.appyx.interactions.core.ui.property.impl.BackgroundColor.Target +import com.bumble.appyx.interactions.ui.property.Interpolatable +import com.bumble.appyx.interactions.ui.property.MotionProperty +import com.bumble.appyx.interactions.ui.property.impl.BackgroundColor.Target import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow diff --git a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/ui/property/impl/ColorOverlay.kt b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/ui/property/impl/ColorOverlay.kt similarity index 87% rename from appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/ui/property/impl/ColorOverlay.kt rename to appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/ui/property/impl/ColorOverlay.kt index 51380cf13..9ed7a6f9d 100644 --- a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/ui/property/impl/ColorOverlay.kt +++ b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/ui/property/impl/ColorOverlay.kt @@ -1,4 +1,4 @@ -package com.bumble.appyx.interactions.core.ui.property.impl +package com.bumble.appyx.interactions.ui.property.impl import androidx.compose.animation.core.Animatable import androidx.compose.animation.core.AnimationVector1D @@ -8,9 +8,9 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.composed import androidx.compose.ui.draw.drawWithContent import androidx.compose.ui.graphics.Color -import com.bumble.appyx.interactions.core.ui.math.lerpFloat -import com.bumble.appyx.interactions.core.ui.property.Interpolatable -import com.bumble.appyx.interactions.core.ui.property.MotionProperty +import com.bumble.appyx.interactions.ui.math.lerpFloat +import com.bumble.appyx.interactions.ui.property.Interpolatable +import com.bumble.appyx.interactions.ui.property.MotionProperty import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow diff --git a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/ui/property/impl/GenericFloatProperty.kt b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/ui/property/impl/GenericFloatProperty.kt similarity index 82% rename from appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/ui/property/impl/GenericFloatProperty.kt rename to appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/ui/property/impl/GenericFloatProperty.kt index ffa5fca5e..773551641 100644 --- a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/ui/property/impl/GenericFloatProperty.kt +++ b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/ui/property/impl/GenericFloatProperty.kt @@ -1,11 +1,11 @@ -package com.bumble.appyx.interactions.core.ui.property.impl +package com.bumble.appyx.interactions.ui.property.impl import androidx.compose.animation.core.Animatable import androidx.compose.animation.core.AnimationVector1D import androidx.compose.ui.Modifier -import com.bumble.appyx.interactions.core.ui.math.lerpFloat -import com.bumble.appyx.interactions.core.ui.property.Interpolatable -import com.bumble.appyx.interactions.core.ui.property.MotionProperty +import com.bumble.appyx.interactions.ui.math.lerpFloat +import com.bumble.appyx.interactions.ui.property.Interpolatable +import com.bumble.appyx.interactions.ui.property.MotionProperty import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow diff --git a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/ui/property/impl/Height.kt b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/ui/property/impl/Height.kt similarity index 86% rename from appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/ui/property/impl/Height.kt rename to appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/ui/property/impl/Height.kt index c14a8ebe9..9dfb753e2 100644 --- a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/ui/property/impl/Height.kt +++ b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/ui/property/impl/Height.kt @@ -1,4 +1,4 @@ -package com.bumble.appyx.interactions.core.ui.property.impl +package com.bumble.appyx.interactions.ui.property.impl import androidx.compose.animation.core.Animatable import androidx.compose.animation.core.AnimationVector1D @@ -8,9 +8,9 @@ import androidx.compose.foundation.layout.fillMaxHeight import androidx.compose.runtime.collectAsState import androidx.compose.ui.Modifier import androidx.compose.ui.composed -import com.bumble.appyx.interactions.core.ui.math.lerpFloat -import com.bumble.appyx.interactions.core.ui.property.Interpolatable -import com.bumble.appyx.interactions.core.ui.property.MotionProperty +import com.bumble.appyx.interactions.ui.math.lerpFloat +import com.bumble.appyx.interactions.ui.property.Interpolatable +import com.bumble.appyx.interactions.ui.property.MotionProperty import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow diff --git a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/ui/property/impl/RotationX.kt b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/ui/property/impl/RotationX.kt similarity index 85% rename from appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/ui/property/impl/RotationX.kt rename to appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/ui/property/impl/RotationX.kt index 78185f867..bbce71b06 100644 --- a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/ui/property/impl/RotationX.kt +++ b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/ui/property/impl/RotationX.kt @@ -1,4 +1,4 @@ -package com.bumble.appyx.interactions.core.ui.property.impl +package com.bumble.appyx.interactions.ui.property.impl import androidx.compose.animation.core.Animatable import androidx.compose.animation.core.AnimationVector1D @@ -10,10 +10,10 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.composed import androidx.compose.ui.graphics.TransformOrigin import androidx.compose.ui.graphics.graphicsLayer -import com.bumble.appyx.interactions.core.ui.math.lerpFloat -import com.bumble.appyx.interactions.core.ui.property.Interpolatable -import com.bumble.appyx.interactions.core.ui.property.MotionProperty -import com.bumble.appyx.interactions.core.ui.property.impl.RotationX.Target +import com.bumble.appyx.interactions.ui.math.lerpFloat +import com.bumble.appyx.interactions.ui.property.Interpolatable +import com.bumble.appyx.interactions.ui.property.MotionProperty +import com.bumble.appyx.interactions.ui.property.impl.RotationX.Target import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow diff --git a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/ui/property/impl/RotationY.kt b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/ui/property/impl/RotationY.kt similarity index 85% rename from appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/ui/property/impl/RotationY.kt rename to appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/ui/property/impl/RotationY.kt index 84f3e80a8..1bc7d5049 100644 --- a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/ui/property/impl/RotationY.kt +++ b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/ui/property/impl/RotationY.kt @@ -1,4 +1,4 @@ -package com.bumble.appyx.interactions.core.ui.property.impl +package com.bumble.appyx.interactions.ui.property.impl import androidx.compose.animation.core.Animatable import androidx.compose.animation.core.AnimationVector1D @@ -10,10 +10,10 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.composed import androidx.compose.ui.graphics.TransformOrigin import androidx.compose.ui.graphics.graphicsLayer -import com.bumble.appyx.interactions.core.ui.math.lerpFloat -import com.bumble.appyx.interactions.core.ui.property.Interpolatable -import com.bumble.appyx.interactions.core.ui.property.MotionProperty -import com.bumble.appyx.interactions.core.ui.property.impl.RotationY.Target +import com.bumble.appyx.interactions.ui.math.lerpFloat +import com.bumble.appyx.interactions.ui.property.Interpolatable +import com.bumble.appyx.interactions.ui.property.MotionProperty +import com.bumble.appyx.interactions.ui.property.impl.RotationY.Target import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow diff --git a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/ui/property/impl/RotationZ.kt b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/ui/property/impl/RotationZ.kt similarity index 85% rename from appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/ui/property/impl/RotationZ.kt rename to appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/ui/property/impl/RotationZ.kt index 2e69e87af..3e7f907ee 100644 --- a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/ui/property/impl/RotationZ.kt +++ b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/ui/property/impl/RotationZ.kt @@ -1,4 +1,4 @@ -package com.bumble.appyx.interactions.core.ui.property.impl +package com.bumble.appyx.interactions.ui.property.impl import androidx.compose.animation.core.Animatable import androidx.compose.animation.core.AnimationVector1D @@ -10,10 +10,10 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.composed import androidx.compose.ui.graphics.TransformOrigin import androidx.compose.ui.graphics.graphicsLayer -import com.bumble.appyx.interactions.core.ui.math.lerpFloat -import com.bumble.appyx.interactions.core.ui.property.Interpolatable -import com.bumble.appyx.interactions.core.ui.property.MotionProperty -import com.bumble.appyx.interactions.core.ui.property.impl.RotationZ.Target +import com.bumble.appyx.interactions.ui.math.lerpFloat +import com.bumble.appyx.interactions.ui.property.Interpolatable +import com.bumble.appyx.interactions.ui.property.MotionProperty +import com.bumble.appyx.interactions.ui.property.impl.RotationZ.Target import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow diff --git a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/ui/property/impl/RoundedCorners.kt b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/ui/property/impl/RoundedCorners.kt similarity index 84% rename from appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/ui/property/impl/RoundedCorners.kt rename to appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/ui/property/impl/RoundedCorners.kt index 23e9968c3..6039de0df 100644 --- a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/ui/property/impl/RoundedCorners.kt +++ b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/ui/property/impl/RoundedCorners.kt @@ -1,4 +1,4 @@ -package com.bumble.appyx.interactions.core.ui.property.impl +package com.bumble.appyx.interactions.ui.property.impl import androidx.compose.animation.core.Animatable import androidx.compose.animation.core.AnimationVector1D @@ -10,10 +10,10 @@ import androidx.compose.runtime.getValue import androidx.compose.ui.Modifier import androidx.compose.ui.composed import androidx.compose.ui.draw.clip -import com.bumble.appyx.interactions.core.ui.math.lerpInt -import com.bumble.appyx.interactions.core.ui.property.Interpolatable -import com.bumble.appyx.interactions.core.ui.property.MotionProperty -import com.bumble.appyx.interactions.core.ui.property.impl.RoundedCorners.Target +import com.bumble.appyx.interactions.ui.math.lerpInt +import com.bumble.appyx.interactions.ui.property.Interpolatable +import com.bumble.appyx.interactions.ui.property.MotionProperty +import com.bumble.appyx.interactions.ui.property.impl.RoundedCorners.Target import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow diff --git a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/ui/property/impl/Scale.kt b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/ui/property/impl/Scale.kt similarity index 85% rename from appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/ui/property/impl/Scale.kt rename to appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/ui/property/impl/Scale.kt index 75f6511ef..7765a4896 100644 --- a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/ui/property/impl/Scale.kt +++ b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/ui/property/impl/Scale.kt @@ -1,4 +1,4 @@ -package com.bumble.appyx.interactions.core.ui.property.impl +package com.bumble.appyx.interactions.ui.property.impl import androidx.compose.animation.core.Animatable import androidx.compose.animation.core.AnimationVector1D @@ -9,10 +9,10 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.composed import androidx.compose.ui.graphics.TransformOrigin import androidx.compose.ui.graphics.graphicsLayer -import com.bumble.appyx.interactions.core.ui.math.lerpFloat -import com.bumble.appyx.interactions.core.ui.property.Interpolatable -import com.bumble.appyx.interactions.core.ui.property.MotionProperty -import com.bumble.appyx.interactions.core.ui.property.impl.Scale.Target +import com.bumble.appyx.interactions.ui.math.lerpFloat +import com.bumble.appyx.interactions.ui.property.Interpolatable +import com.bumble.appyx.interactions.ui.property.MotionProperty +import com.bumble.appyx.interactions.ui.property.impl.Scale.Target import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow diff --git a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/ui/property/impl/Shadow.kt b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/ui/property/impl/Shadow.kt similarity index 86% rename from appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/ui/property/impl/Shadow.kt rename to appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/ui/property/impl/Shadow.kt index af30b8f13..9e439689f 100644 --- a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/ui/property/impl/Shadow.kt +++ b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/ui/property/impl/Shadow.kt @@ -1,4 +1,4 @@ -package com.bumble.appyx.interactions.core.ui.property.impl +package com.bumble.appyx.interactions.ui.property.impl import androidx.compose.animation.core.Animatable import androidx.compose.animation.core.AnimationVector1D @@ -8,9 +8,9 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.composed import androidx.compose.ui.draw.shadow import androidx.compose.ui.unit.dp -import com.bumble.appyx.interactions.core.ui.math.lerpFloat -import com.bumble.appyx.interactions.core.ui.property.Interpolatable -import com.bumble.appyx.interactions.core.ui.property.MotionProperty +import com.bumble.appyx.interactions.ui.math.lerpFloat +import com.bumble.appyx.interactions.ui.property.Interpolatable +import com.bumble.appyx.interactions.ui.property.MotionProperty import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow diff --git a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/ui/property/impl/Width.kt b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/ui/property/impl/Width.kt similarity index 86% rename from appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/ui/property/impl/Width.kt rename to appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/ui/property/impl/Width.kt index 75e97d4f6..6c995b6c3 100644 --- a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/ui/property/impl/Width.kt +++ b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/ui/property/impl/Width.kt @@ -1,4 +1,4 @@ -package com.bumble.appyx.interactions.core.ui.property.impl +package com.bumble.appyx.interactions.ui.property.impl import androidx.compose.animation.core.Animatable import androidx.compose.animation.core.AnimationVector1D @@ -8,9 +8,9 @@ import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.runtime.collectAsState import androidx.compose.ui.Modifier import androidx.compose.ui.composed -import com.bumble.appyx.interactions.core.ui.math.lerpFloat -import com.bumble.appyx.interactions.core.ui.property.Interpolatable -import com.bumble.appyx.interactions.core.ui.property.MotionProperty +import com.bumble.appyx.interactions.ui.math.lerpFloat +import com.bumble.appyx.interactions.ui.property.Interpolatable +import com.bumble.appyx.interactions.ui.property.MotionProperty import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow diff --git a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/ui/property/impl/ZIndex.kt b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/ui/property/impl/ZIndex.kt similarity index 82% rename from appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/ui/property/impl/ZIndex.kt rename to appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/ui/property/impl/ZIndex.kt index 353bc8b92..bd307f63b 100644 --- a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/ui/property/impl/ZIndex.kt +++ b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/ui/property/impl/ZIndex.kt @@ -1,4 +1,4 @@ -package com.bumble.appyx.interactions.core.ui.property.impl +package com.bumble.appyx.interactions.ui.property.impl import androidx.compose.animation.core.Animatable import androidx.compose.animation.core.AnimationVector1D @@ -8,10 +8,10 @@ import androidx.compose.runtime.collectAsState import androidx.compose.ui.Modifier import androidx.compose.ui.composed import androidx.compose.ui.zIndex -import com.bumble.appyx.interactions.core.ui.math.lerpFloat -import com.bumble.appyx.interactions.core.ui.property.Interpolatable -import com.bumble.appyx.interactions.core.ui.property.MotionProperty -import com.bumble.appyx.interactions.core.ui.property.impl.ZIndex.Target +import com.bumble.appyx.interactions.ui.math.lerpFloat +import com.bumble.appyx.interactions.ui.property.Interpolatable +import com.bumble.appyx.interactions.ui.property.MotionProperty +import com.bumble.appyx.interactions.ui.property.impl.ZIndex.Target import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow diff --git a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/ui/property/impl/position/BiasAlignment.kt b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/ui/property/impl/position/BiasAlignment.kt similarity index 97% rename from appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/ui/property/impl/position/BiasAlignment.kt rename to appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/ui/property/impl/position/BiasAlignment.kt index 91b190bf4..9bfb07f1d 100644 --- a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/ui/property/impl/position/BiasAlignment.kt +++ b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/ui/property/impl/position/BiasAlignment.kt @@ -1,11 +1,11 @@ -package com.bumble.appyx.interactions.core.ui.property.impl.position +package com.bumble.appyx.interactions.ui.property.impl.position import androidx.compose.runtime.Stable import androidx.compose.ui.Alignment import androidx.compose.ui.unit.IntOffset import androidx.compose.ui.unit.IntSize import androidx.compose.ui.unit.LayoutDirection -import com.bumble.appyx.interactions.core.annotations.FloatRange +import com.bumble.appyx.interactions.annotations.FloatRange import kotlin.math.roundToInt sealed class BiasAlignment( diff --git a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/ui/property/impl/position/PositionAlignment.kt b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/ui/property/impl/position/PositionAlignment.kt similarity index 87% rename from appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/ui/property/impl/position/PositionAlignment.kt rename to appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/ui/property/impl/position/PositionAlignment.kt index 60e3f8003..e9dbe98ea 100644 --- a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/ui/property/impl/position/PositionAlignment.kt +++ b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/ui/property/impl/position/PositionAlignment.kt @@ -1,4 +1,4 @@ -package com.bumble.appyx.interactions.core.ui.property.impl.position +package com.bumble.appyx.interactions.ui.property.impl.position import androidx.compose.animation.core.Animatable import androidx.compose.animation.core.AnimationVector4D @@ -11,15 +11,15 @@ import androidx.compose.ui.composed import androidx.compose.ui.unit.IntOffset import androidx.compose.ui.unit.IntSize import androidx.compose.ui.unit.LayoutDirection -import com.bumble.appyx.interactions.core.ui.LocalBoxScope -import com.bumble.appyx.interactions.core.ui.math.lerpFloat -import com.bumble.appyx.interactions.core.ui.property.Interpolatable -import com.bumble.appyx.interactions.core.ui.property.MotionProperty -import com.bumble.appyx.interactions.core.ui.property.impl.position.BiasAlignment.InsideAlignment -import com.bumble.appyx.interactions.core.ui.property.impl.position.BiasAlignment.InsideAlignment.Companion.TopStart -import com.bumble.appyx.interactions.core.ui.property.impl.position.BiasAlignment.OutsideAlignment -import com.bumble.appyx.interactions.core.ui.property.impl.position.BiasAlignment.OutsideAlignment.Companion.InContainer -import com.bumble.appyx.interactions.core.ui.property.impl.position.PositionAlignment.Value +import com.bumble.appyx.interactions.ui.LocalBoxScope +import com.bumble.appyx.interactions.ui.math.lerpFloat +import com.bumble.appyx.interactions.ui.property.Interpolatable +import com.bumble.appyx.interactions.ui.property.MotionProperty +import com.bumble.appyx.interactions.ui.property.impl.position.BiasAlignment.InsideAlignment +import com.bumble.appyx.interactions.ui.property.impl.position.BiasAlignment.InsideAlignment.Companion.TopStart +import com.bumble.appyx.interactions.ui.property.impl.position.BiasAlignment.OutsideAlignment +import com.bumble.appyx.interactions.ui.property.impl.position.BiasAlignment.OutsideAlignment.Companion.InContainer +import com.bumble.appyx.interactions.ui.property.impl.position.PositionAlignment.Value import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow diff --git a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/ui/property/impl/position/PositionOffset.kt b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/ui/property/impl/position/PositionOffset.kt similarity index 88% rename from appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/ui/property/impl/position/PositionOffset.kt rename to appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/ui/property/impl/position/PositionOffset.kt index 5f53ac11f..d4ea51e48 100644 --- a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/ui/property/impl/position/PositionOffset.kt +++ b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/ui/property/impl/position/PositionOffset.kt @@ -1,4 +1,4 @@ -package com.bumble.appyx.interactions.core.ui.property.impl.position +package com.bumble.appyx.interactions.ui.property.impl.position import androidx.compose.animation.core.Animatable import androidx.compose.animation.core.AnimationVector2D @@ -11,11 +11,11 @@ import androidx.compose.ui.composed import androidx.compose.ui.unit.DpOffset import androidx.compose.ui.unit.IntOffset import androidx.compose.ui.unit.dp -import com.bumble.appyx.interactions.core.ui.LocalBoxScope -import com.bumble.appyx.interactions.core.ui.math.lerpDpOffset -import com.bumble.appyx.interactions.core.ui.property.Interpolatable -import com.bumble.appyx.interactions.core.ui.property.MotionProperty -import com.bumble.appyx.interactions.core.ui.property.impl.position.PositionOffset.Value +import com.bumble.appyx.interactions.ui.LocalBoxScope +import com.bumble.appyx.interactions.ui.math.lerpDpOffset +import com.bumble.appyx.interactions.ui.property.Interpolatable +import com.bumble.appyx.interactions.ui.property.MotionProperty +import com.bumble.appyx.interactions.ui.property.impl.position.PositionOffset.Value import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow diff --git a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/ui/state/BaseMutableUiState.kt b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/ui/state/BaseMutableUiState.kt similarity index 94% rename from appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/ui/state/BaseMutableUiState.kt rename to appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/ui/state/BaseMutableUiState.kt index 98c228686..da774653b 100644 --- a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/ui/state/BaseMutableUiState.kt +++ b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/ui/state/BaseMutableUiState.kt @@ -1,4 +1,4 @@ -package com.bumble.appyx.interactions.core.ui.state +package com.bumble.appyx.interactions.ui.state import androidx.compose.animation.core.SpringSpec import androidx.compose.foundation.layout.fillMaxSize @@ -21,10 +21,10 @@ import androidx.compose.ui.unit.DpSize import androidx.compose.ui.unit.IntSize import androidx.compose.ui.unit.dp import com.bumble.appyx.combineState -import com.bumble.appyx.interactions.core.ui.context.TransitionBounds -import com.bumble.appyx.interactions.core.ui.context.TransitionBoundsAware -import com.bumble.appyx.interactions.core.ui.context.UiContext -import com.bumble.appyx.interactions.core.ui.property.MotionProperty +import com.bumble.appyx.interactions.ui.context.TransitionBounds +import com.bumble.appyx.interactions.ui.context.TransitionBoundsAware +import com.bumble.appyx.interactions.ui.context.UiContext +import com.bumble.appyx.interactions.ui.property.MotionProperty import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.MutableStateFlow diff --git a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/ui/state/MatchedTargetUiState.kt b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/ui/state/MatchedTargetUiState.kt similarity index 60% rename from appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/ui/state/MatchedTargetUiState.kt rename to appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/ui/state/MatchedTargetUiState.kt index 8b254de04..f6d5b2f3b 100644 --- a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/ui/state/MatchedTargetUiState.kt +++ b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/ui/state/MatchedTargetUiState.kt @@ -1,6 +1,6 @@ -package com.bumble.appyx.interactions.core.ui.state +package com.bumble.appyx.interactions.ui.state -import com.bumble.appyx.interactions.core.Element +import com.bumble.appyx.interactions.model.Element data class MatchedTargetUiState( val element: Element, diff --git a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/ui/state/MutableUiStateSpecs.kt b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/ui/state/MutableUiStateSpecs.kt similarity index 83% rename from appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/ui/state/MutableUiStateSpecs.kt rename to appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/ui/state/MutableUiStateSpecs.kt index 3c2d46d67..673a84c3a 100644 --- a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/ui/state/MutableUiStateSpecs.kt +++ b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/ui/state/MutableUiStateSpecs.kt @@ -1,4 +1,4 @@ -package com.bumble.appyx.interactions.core.ui.state +package com.bumble.appyx.interactions.ui.state @Target(AnnotationTarget.CLASS) @Retention(AnnotationRetention.SOURCE) diff --git a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/transitionmodel/BaseVisualisation.kt b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/transitionmodel/BaseVisualisation.kt index 79738770a..f772c6ef1 100644 --- a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/transitionmodel/BaseVisualisation.kt +++ b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/transitionmodel/BaseVisualisation.kt @@ -8,18 +8,18 @@ import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.collectAsState import androidx.compose.runtime.getValue import com.bumble.appyx.combineState -import com.bumble.appyx.interactions.core.Element -import com.bumble.appyx.interactions.core.model.transition.Segment -import com.bumble.appyx.interactions.core.model.transition.Update -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.DefaultAnimationSpec -import com.bumble.appyx.interactions.core.ui.math.lerpFloat -import com.bumble.appyx.interactions.core.ui.output.ElementUiModel -import com.bumble.appyx.interactions.core.ui.property.impl.GenericFloatProperty -import com.bumble.appyx.interactions.core.ui.state.BaseMutableUiState -import com.bumble.appyx.interactions.core.ui.state.MatchedTargetUiState +import com.bumble.appyx.interactions.model.Element +import com.bumble.appyx.interactions.model.transition.Segment +import com.bumble.appyx.interactions.model.transition.Update +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.ui.DefaultAnimationSpec +import com.bumble.appyx.interactions.ui.math.lerpFloat +import com.bumble.appyx.interactions.ui.output.ElementUiModel +import com.bumble.appyx.interactions.ui.property.impl.GenericFloatProperty +import com.bumble.appyx.interactions.ui.state.BaseMutableUiState +import com.bumble.appyx.interactions.ui.state.MatchedTargetUiState import com.bumble.appyx.utils.multiplatform.AppyxLogger import com.bumble.appyx.withPrevious import kotlinx.coroutines.flow.Flow diff --git a/appyx-interactions/common/src/commonTest/kotlin/com/bumble/appyx/interactions/core/KeyFramesTest.kt b/appyx-interactions/common/src/commonTest/kotlin/com/bumble/appyx/interactions/KeyFramesTest.kt similarity index 93% rename from appyx-interactions/common/src/commonTest/kotlin/com/bumble/appyx/interactions/core/KeyFramesTest.kt rename to appyx-interactions/common/src/commonTest/kotlin/com/bumble/appyx/interactions/KeyFramesTest.kt index 9af8672e8..28285aa91 100644 --- a/appyx-interactions/common/src/commonTest/kotlin/com/bumble/appyx/interactions/core/KeyFramesTest.kt +++ b/appyx-interactions/common/src/commonTest/kotlin/com/bumble/appyx/interactions/KeyFramesTest.kt @@ -1,15 +1,16 @@ -package com.bumble.appyx.interactions.core +package com.bumble.appyx.interactions import com.bumble.appyx.InteractionTarget import com.bumble.appyx.InteractionTarget.Child1 import com.bumble.appyx.InteractionTarget.Child2 import com.bumble.appyx.InteractionTarget.Child3 -import com.bumble.appyx.interactions.core.TestTransitionModel.State -import com.bumble.appyx.interactions.core.model.transition.Keyframes -import com.bumble.appyx.interactions.core.model.transition.StateTransition -import com.bumble.appyx.interactions.core.model.transition.Segment -import com.bumble.appyx.interactions.core.model.transition.Update -import com.bumble.appyx.interactions.core.model.transition.toSegmentProgress +import com.bumble.appyx.interactions.TestTransitionModel.State +import com.bumble.appyx.interactions.model.asElement +import com.bumble.appyx.interactions.model.transition.Keyframes +import com.bumble.appyx.interactions.model.transition.StateTransition +import com.bumble.appyx.interactions.model.transition.Segment +import com.bumble.appyx.interactions.model.transition.Update +import com.bumble.appyx.interactions.model.transition.toSegmentProgress import kotlin.test.Test import kotlin.test.assertEquals diff --git a/appyx-interactions/common/src/commonTest/kotlin/com/bumble/appyx/interactions/core/TestTransitionModel.kt b/appyx-interactions/common/src/commonTest/kotlin/com/bumble/appyx/interactions/TestTransitionModel.kt similarity index 81% rename from appyx-interactions/common/src/commonTest/kotlin/com/bumble/appyx/interactions/core/TestTransitionModel.kt rename to appyx-interactions/common/src/commonTest/kotlin/com/bumble/appyx/interactions/TestTransitionModel.kt index 3dbe650e0..a26507887 100644 --- a/appyx-interactions/common/src/commonTest/kotlin/com/bumble/appyx/interactions/core/TestTransitionModel.kt +++ b/appyx-interactions/common/src/commonTest/kotlin/com/bumble/appyx/interactions/TestTransitionModel.kt @@ -1,13 +1,15 @@ -package com.bumble.appyx.interactions.core +package com.bumble.appyx.interactions import androidx.compose.ui.geometry.Offset import androidx.compose.ui.unit.Density -import com.bumble.appyx.interactions.core.TestTransitionModel.State -import com.bumble.appyx.interactions.core.model.transition.BaseOperation -import com.bumble.appyx.interactions.core.model.transition.BaseTransitionModel -import com.bumble.appyx.interactions.core.model.transition.Operation -import com.bumble.appyx.interactions.core.ui.gesture.Gesture -import com.bumble.appyx.interactions.core.ui.gesture.GestureFactory +import com.bumble.appyx.interactions.TestTransitionModel.State +import com.bumble.appyx.interactions.model.transition.BaseOperation +import com.bumble.appyx.interactions.model.transition.BaseTransitionModel +import com.bumble.appyx.interactions.model.transition.Operation +import com.bumble.appyx.interactions.gesture.Gesture +import com.bumble.appyx.interactions.gesture.GestureFactory +import com.bumble.appyx.interactions.model.Element +import com.bumble.appyx.interactions.model.asElement import com.bumble.appyx.utils.multiplatform.Parcelable import com.bumble.appyx.utils.multiplatform.Parcelize import com.bumble.appyx.utils.multiplatform.RawValue diff --git a/appyx-interactions/common/src/commonTest/kotlin/com/bumble/appyx/interactions/core/UpdateTest.kt b/appyx-interactions/common/src/commonTest/kotlin/com/bumble/appyx/interactions/UpdateTest.kt similarity index 78% rename from appyx-interactions/common/src/commonTest/kotlin/com/bumble/appyx/interactions/core/UpdateTest.kt rename to appyx-interactions/common/src/commonTest/kotlin/com/bumble/appyx/interactions/UpdateTest.kt index a9738fd20..7bbc14674 100644 --- a/appyx-interactions/common/src/commonTest/kotlin/com/bumble/appyx/interactions/core/UpdateTest.kt +++ b/appyx-interactions/common/src/commonTest/kotlin/com/bumble/appyx/interactions/UpdateTest.kt @@ -1,12 +1,13 @@ -package com.bumble.appyx.interactions.core +package com.bumble.appyx.interactions import com.bumble.appyx.InteractionTarget.Child1 import com.bumble.appyx.InteractionTarget.Child2 -import com.bumble.appyx.interactions.core.TestTransitionModel.State -import com.bumble.appyx.interactions.core.model.transition.Keyframes -import com.bumble.appyx.interactions.core.model.transition.Segment -import com.bumble.appyx.interactions.core.model.transition.StateTransition -import com.bumble.appyx.interactions.core.model.transition.Update +import com.bumble.appyx.interactions.TestTransitionModel.State +import com.bumble.appyx.interactions.model.asElement +import com.bumble.appyx.interactions.model.transition.Keyframes +import com.bumble.appyx.interactions.model.transition.Segment +import com.bumble.appyx.interactions.model.transition.StateTransition +import com.bumble.appyx.interactions.model.transition.Update import kotlin.test.Test import kotlin.test.assertEquals diff --git a/appyx-interactions/common/src/commonTest/kotlin/com/bumble/appyx/interactions/core/model/progress/DragProgressControllerTest.kt b/appyx-interactions/common/src/commonTest/kotlin/com/bumble/appyx/interactions/model/progress/DragProgressControllerTest.kt similarity index 79% rename from appyx-interactions/common/src/commonTest/kotlin/com/bumble/appyx/interactions/core/model/progress/DragProgressControllerTest.kt rename to appyx-interactions/common/src/commonTest/kotlin/com/bumble/appyx/interactions/model/progress/DragProgressControllerTest.kt index b5cafca18..bfedc90b6 100644 --- a/appyx-interactions/common/src/commonTest/kotlin/com/bumble/appyx/interactions/core/model/progress/DragProgressControllerTest.kt +++ b/appyx-interactions/common/src/commonTest/kotlin/com/bumble/appyx/interactions/model/progress/DragProgressControllerTest.kt @@ -1,12 +1,12 @@ -package com.bumble.appyx.interactions.core.model.progress +package com.bumble.appyx.interactions.model.progress import androidx.compose.ui.geometry.Offset import androidx.compose.ui.unit.Density import com.bumble.appyx.InteractionTarget.Child1 import com.bumble.appyx.InteractionTarget.Child2 -import com.bumble.appyx.interactions.core.TestGestures -import com.bumble.appyx.interactions.core.TestTransitionModel -import com.bumble.appyx.interactions.core.ui.DefaultAnimationSpec +import com.bumble.appyx.interactions.TestGestures +import com.bumble.appyx.interactions.TestTransitionModel +import com.bumble.appyx.interactions.ui.DefaultAnimationSpec import kotlin.test.Test import kotlin.test.asserter diff --git a/appyx-interactions/common/src/commonTest/kotlin/com/bumble/appyx/interactions/permanent/PermanentModelTest.kt b/appyx-interactions/common/src/commonTest/kotlin/com/bumble/appyx/interactions/permanent/PermanentModelTest.kt index bce4c1831..6f1de0e6f 100644 --- a/appyx-interactions/common/src/commonTest/kotlin/com/bumble/appyx/interactions/permanent/PermanentModelTest.kt +++ b/appyx-interactions/common/src/commonTest/kotlin/com/bumble/appyx/interactions/permanent/PermanentModelTest.kt @@ -1,7 +1,7 @@ package com.bumble.appyx.interactions.permanent import com.bumble.appyx.InteractionTarget -import com.bumble.appyx.interactions.core.state.MutableSavedStateMapImpl +import com.bumble.appyx.interactions.state.MutableSavedStateMapImpl import com.bumble.appyx.interactions.permanent.operation.AddUnique import kotlin.test.Test import kotlin.test.assertEquals diff --git a/appyx-interactions/common/src/commonTest/kotlin/com/bumble/appyx/interactions/core/ui/easing/MappedEasingTest.kt b/appyx-interactions/common/src/commonTest/kotlin/com/bumble/appyx/interactions/ui/easing/MappedEasingTest.kt similarity index 97% rename from appyx-interactions/common/src/commonTest/kotlin/com/bumble/appyx/interactions/core/ui/easing/MappedEasingTest.kt rename to appyx-interactions/common/src/commonTest/kotlin/com/bumble/appyx/interactions/ui/easing/MappedEasingTest.kt index 33b45f0f7..f4875eff0 100644 --- a/appyx-interactions/common/src/commonTest/kotlin/com/bumble/appyx/interactions/core/ui/easing/MappedEasingTest.kt +++ b/appyx-interactions/common/src/commonTest/kotlin/com/bumble/appyx/interactions/ui/easing/MappedEasingTest.kt @@ -1,4 +1,4 @@ -package com.bumble.appyx.interactions.core.ui.easing +package com.bumble.appyx.interactions.ui.easing import androidx.compose.animation.core.LinearEasing import kotlin.math.abs diff --git a/appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/navigation/children/ChildAwareImpl.kt b/appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/navigation/children/ChildAwareImpl.kt index 363b4025f..8685af1ea 100644 --- a/appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/navigation/children/ChildAwareImpl.kt +++ b/appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/navigation/children/ChildAwareImpl.kt @@ -1,6 +1,6 @@ package com.bumble.appyx.navigation.children -import com.bumble.appyx.interactions.core.Element +import com.bumble.appyx.interactions.model.Element import com.bumble.appyx.navigation.lifecycle.DefaultPlatformLifecycleObserver import com.bumble.appyx.navigation.lifecycle.Lifecycle import com.bumble.appyx.navigation.lifecycle.isDestroyed 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 733eb4693..be7835ee8 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 @@ -1,6 +1,6 @@ package com.bumble.appyx.navigation.children -import com.bumble.appyx.interactions.core.Element +import com.bumble.appyx.interactions.model.Element import com.bumble.appyx.navigation.node.Node import com.bumble.appyx.utils.multiplatform.SavedStateMap diff --git a/appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/navigation/children/ChildEntryMap.kt b/appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/navigation/children/ChildEntryMap.kt index ec77961d3..034f270b4 100644 --- a/appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/navigation/children/ChildEntryMap.kt +++ b/appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/navigation/children/ChildEntryMap.kt @@ -1,5 +1,5 @@ package com.bumble.appyx.navigation.children -import com.bumble.appyx.interactions.core.Element +import com.bumble.appyx.interactions.model.Element typealias ChildEntryMap = Map, 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 ff5197b41..412621736 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 @@ -1,7 +1,7 @@ package com.bumble.appyx.navigation.children -import com.bumble.appyx.interactions.core.Element -import com.bumble.appyx.interactions.core.state.MutableSavedStateMap +import com.bumble.appyx.interactions.model.Element +import com.bumble.appyx.interactions.state.MutableSavedStateMap import com.bumble.appyx.navigation.modality.AncestryInfo import com.bumble.appyx.navigation.modality.NodeContext import com.bumble.appyx.navigation.node.Node diff --git a/appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/navigation/composable/AppyxNavigationContainer.kt b/appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/navigation/composable/AppyxNavigationContainer.kt index 1b5609f1e..11178523a 100644 --- a/appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/navigation/composable/AppyxNavigationContainer.kt +++ b/appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/navigation/composable/AppyxNavigationContainer.kt @@ -5,11 +5,11 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalDensity import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp -import com.bumble.appyx.interactions.core.AppyxInteractionsContainer -import com.bumble.appyx.interactions.core.Element -import com.bumble.appyx.interactions.core.GestureReferencePoint -import com.bumble.appyx.interactions.core.gesture.GestureValidator -import com.bumble.appyx.interactions.core.model.BaseAppyxComponent +import com.bumble.appyx.interactions.composable.AppyxInteractionsContainer +import com.bumble.appyx.interactions.model.Element +import com.bumble.appyx.interactions.gesture.GestureReferencePoint +import com.bumble.appyx.interactions.model.BaseAppyxComponent +import com.bumble.appyx.interactions.gesture.GestureValidator import com.bumble.appyx.navigation.integration.LocalScreenSize import com.bumble.appyx.navigation.node.LocalNode import com.bumble.appyx.navigation.node.Node diff --git a/appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/navigation/composable/Child.kt b/appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/navigation/composable/Child.kt index cca2acbd4..f843dd8b2 100644 --- a/appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/navigation/composable/Child.kt +++ b/appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/navigation/composable/Child.kt @@ -3,7 +3,7 @@ package com.bumble.appyx.navigation.composable import androidx.compose.runtime.Composable import androidx.compose.runtime.remember import androidx.compose.ui.Modifier -import com.bumble.appyx.interactions.core.Element +import com.bumble.appyx.interactions.model.Element import com.bumble.appyx.navigation.node.Node @Composable diff --git a/appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/navigation/lifecycle/ChildNodeLifecycleManager.kt b/appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/navigation/lifecycle/ChildNodeLifecycleManager.kt index f0005aba0..fb81ce83c 100644 --- a/appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/navigation/lifecycle/ChildNodeLifecycleManager.kt +++ b/appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/navigation/lifecycle/ChildNodeLifecycleManager.kt @@ -1,6 +1,6 @@ package com.bumble.appyx.navigation.lifecycle -import com.bumble.appyx.interactions.core.model.AppyxComponent +import com.bumble.appyx.interactions.model.AppyxComponent import com.bumble.appyx.navigation.children.ChildEntry import com.bumble.appyx.navigation.children.ChildEntryMap import com.bumble.appyx.navigation.children.nodeOrNull diff --git a/appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/navigation/modality/NodeContext.kt b/appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/navigation/modality/NodeContext.kt index 68a7e5521..6ac815bdc 100644 --- a/appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/navigation/modality/NodeContext.kt +++ b/appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/navigation/modality/NodeContext.kt @@ -1,7 +1,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.interactions.state.MutableSavedStateMap import com.bumble.appyx.utils.multiplatform.SavedStateMap import com.bumble.appyx.utils.customisations.NodeCustomisation import com.bumble.appyx.utils.customisations.NodeCustomisationDirectory diff --git a/appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/navigation/node/ComponentNode.kt b/appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/navigation/node/ComponentNode.kt index 4f280e715..28f4cc7f2 100644 --- a/appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/navigation/node/ComponentNode.kt +++ b/appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/navigation/node/ComponentNode.kt @@ -2,7 +2,7 @@ package com.bumble.appyx.navigation.node import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier -import com.bumble.appyx.interactions.core.model.AppyxComponent +import com.bumble.appyx.interactions.model.AppyxComponent import com.bumble.appyx.navigation.modality.NodeContext /** diff --git a/appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/navigation/node/LeafNode.kt b/appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/navigation/node/LeafNode.kt index 12435540c..4490cb00b 100644 --- a/appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/navigation/node/LeafNode.kt +++ b/appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/navigation/node/LeafNode.kt @@ -1,7 +1,7 @@ package com.bumble.appyx.navigation.node -import com.bumble.appyx.interactions.core.model.EmptyAppyxComponent -import com.bumble.appyx.interactions.core.plugin.Plugin +import com.bumble.appyx.interactions.model.EmptyAppyxComponent +import com.bumble.appyx.interactions.plugin.Plugin import com.bumble.appyx.navigation.modality.NodeContext open class LeafNode( 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 df7229a3d..5d1c605ae 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 @@ -6,13 +6,13 @@ import androidx.compose.runtime.Stable import androidx.compose.runtime.collectAsState import androidx.compose.runtime.saveable.SaverScope import androidx.compose.ui.Modifier -import com.bumble.appyx.interactions.core.Element -import com.bumble.appyx.interactions.core.model.AppyxComponent -import com.bumble.appyx.interactions.core.plugin.Plugin -import com.bumble.appyx.interactions.core.plugin.SavesInstanceState -import com.bumble.appyx.interactions.core.state.MutableSavedStateMap -import com.bumble.appyx.interactions.core.state.MutableSavedStateMapImpl -import com.bumble.appyx.interactions.core.ui.helper.AppyxComponentSetup +import com.bumble.appyx.interactions.model.AppyxComponent +import com.bumble.appyx.interactions.model.Element +import com.bumble.appyx.interactions.plugin.Plugin +import com.bumble.appyx.interactions.plugin.SavesInstanceState +import com.bumble.appyx.interactions.state.MutableSavedStateMap +import com.bumble.appyx.interactions.state.MutableSavedStateMapImpl +import com.bumble.appyx.interactions.ui.helper.AppyxComponentSetup import com.bumble.appyx.navigation.Appyx import com.bumble.appyx.navigation.children.ChildAware import com.bumble.appyx.navigation.children.ChildAwareImpl diff --git a/appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/navigation/plugin/Plugins.kt b/appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/navigation/plugin/Plugins.kt index f335d72bd..8ef7d330b 100644 --- a/appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/navigation/plugin/Plugins.kt +++ b/appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/navigation/plugin/Plugins.kt @@ -1,6 +1,6 @@ package com.bumble.appyx.navigation.plugin -import com.bumble.appyx.interactions.core.plugin.Plugin +import com.bumble.appyx.interactions.plugin.Plugin import com.bumble.appyx.navigation.lifecycle.Lifecycle import com.bumble.appyx.navigation.node.Node import com.bumble.appyx.navigation.plugin.BackPressHandler.OnBackPressedCallback 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 43ebd6ce1..f9ee79c8c 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 @@ -2,8 +2,8 @@ package com.bumble.appyx.benchmark.app.mosaic 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.DefaultAnimationSpec +import com.bumble.appyx.interactions.model.BaseAppyxComponent +import com.bumble.appyx.interactions.ui.DefaultAnimationSpec import com.bumble.appyx.utils.multiplatform.SavedStateMap import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers 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 302eed238..26efc8510 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 @@ -1,10 +1,10 @@ package com.bumble.appyx.benchmark.app.mosaic import com.bumble.appyx.benchmark.app.mosaic.MosaicModel.MosaicMode.SCATTERED -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.interactions.model.Element +import com.bumble.appyx.interactions.model.Elements +import com.bumble.appyx.interactions.model.asElements +import com.bumble.appyx.interactions.model.transition.BaseTransitionModel import com.bumble.appyx.utils.multiplatform.SavedStateMap import com.bumble.appyx.utils.multiplatform.Parcelable import com.bumble.appyx.utils.multiplatform.Parcelize diff --git a/benchmark/benchmark-app/src/main/kotlin/com/bumble/appyx/benchmark/app/mosaic/MosaicVisualisation.kt b/benchmark/benchmark-app/src/main/kotlin/com/bumble/appyx/benchmark/app/mosaic/MosaicVisualisation.kt index 12c7f162b..f79739a41 100644 --- a/benchmark/benchmark-app/src/main/kotlin/com/bumble/appyx/benchmark/app/mosaic/MosaicVisualisation.kt +++ b/benchmark/benchmark-app/src/main/kotlin/com/bumble/appyx/benchmark/app/mosaic/MosaicVisualisation.kt @@ -10,17 +10,17 @@ import com.bumble.appyx.benchmark.app.mosaic.MosaicModel.MosaicMode.CAROUSEL import com.bumble.appyx.benchmark.app.mosaic.MosaicModel.MosaicMode.FLIPPED import com.bumble.appyx.benchmark.app.mosaic.MosaicModel.MosaicMode.SCATTERED import com.bumble.appyx.benchmark.app.mosaic.MosaicModel.State -import com.bumble.appyx.interactions.core.ui.context.UiContext -import com.bumble.appyx.interactions.core.ui.math.smoothstep -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.RoundedCorners -import com.bumble.appyx.interactions.core.ui.property.impl.position.BiasAlignment.InsideAlignment.Companion.Center -import com.bumble.appyx.interactions.core.ui.property.impl.position.BiasAlignment.InsideAlignment.Companion.fractionAlignment -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.UiContext +import com.bumble.appyx.interactions.ui.math.smoothstep +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.RoundedCorners +import com.bumble.appyx.interactions.ui.property.impl.position.BiasAlignment.InsideAlignment.Companion.Center +import com.bumble.appyx.interactions.ui.property.impl.position.BiasAlignment.InsideAlignment.Companion.fractionAlignment +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 import kotlin.random.Random diff --git a/benchmark/benchmark-app/src/main/kotlin/com/bumble/appyx/benchmark/app/mosaic/MutableUiState.kt b/benchmark/benchmark-app/src/main/kotlin/com/bumble/appyx/benchmark/app/mosaic/MutableUiState.kt index abe0812c6..fc04101fa 100644 --- a/benchmark/benchmark-app/src/main/kotlin/com/bumble/appyx/benchmark/app/mosaic/MutableUiState.kt +++ b/benchmark/benchmark-app/src/main/kotlin/com/bumble/appyx/benchmark/app/mosaic/MutableUiState.kt @@ -3,14 +3,14 @@ package com.bumble.appyx.benchmark.app.mosaic import androidx.compose.animation.core.SpringSpec import androidx.compose.animation.core.spring import androidx.compose.ui.Modifier -import com.bumble.appyx.interactions.core.ui.context.UiContext -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.RoundedCorners -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.BaseMutableUiState +import com.bumble.appyx.interactions.ui.context.UiContext +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.RoundedCorners +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.BaseMutableUiState import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.async import kotlinx.coroutines.awaitAll diff --git a/benchmark/benchmark-app/src/main/kotlin/com/bumble/appyx/benchmark/app/mosaic/TargetUiState.kt b/benchmark/benchmark-app/src/main/kotlin/com/bumble/appyx/benchmark/app/mosaic/TargetUiState.kt index aee50dc26..d3f2e7dd6 100644 --- a/benchmark/benchmark-app/src/main/kotlin/com/bumble/appyx/benchmark/app/mosaic/TargetUiState.kt +++ b/benchmark/benchmark-app/src/main/kotlin/com/bumble/appyx/benchmark/app/mosaic/TargetUiState.kt @@ -1,11 +1,11 @@ package com.bumble.appyx.benchmark.app.mosaic -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.RoundedCorners -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.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.RoundedCorners +import com.bumble.appyx.interactions.ui.property.impl.position.PositionAlignment +import com.bumble.appyx.interactions.ui.property.impl.position.PositionOffset data class TargetUiState( val position: PositionAlignment.Target, diff --git a/benchmark/benchmark-app/src/main/kotlin/com/bumble/appyx/benchmark/app/mosaic/operation/Assemble.kt b/benchmark/benchmark-app/src/main/kotlin/com/bumble/appyx/benchmark/app/mosaic/operation/Assemble.kt index aba4472fd..731482fa6 100644 --- a/benchmark/benchmark-app/src/main/kotlin/com/bumble/appyx/benchmark/app/mosaic/operation/Assemble.kt +++ b/benchmark/benchmark-app/src/main/kotlin/com/bumble/appyx/benchmark/app/mosaic/operation/Assemble.kt @@ -4,8 +4,8 @@ import androidx.compose.animation.core.AnimationSpec import com.bumble.appyx.benchmark.app.mosaic.MosaicComponent import com.bumble.appyx.benchmark.app.mosaic.MosaicModel import com.bumble.appyx.benchmark.app.mosaic.MosaicModel.State -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/benchmark/benchmark-app/src/main/kotlin/com/bumble/appyx/benchmark/app/mosaic/operation/Carousel.kt b/benchmark/benchmark-app/src/main/kotlin/com/bumble/appyx/benchmark/app/mosaic/operation/Carousel.kt index 400829fda..e8191ba63 100644 --- a/benchmark/benchmark-app/src/main/kotlin/com/bumble/appyx/benchmark/app/mosaic/operation/Carousel.kt +++ b/benchmark/benchmark-app/src/main/kotlin/com/bumble/appyx/benchmark/app/mosaic/operation/Carousel.kt @@ -4,8 +4,8 @@ import androidx.compose.animation.core.AnimationSpec import com.bumble.appyx.benchmark.app.mosaic.MosaicComponent import com.bumble.appyx.benchmark.app.mosaic.MosaicModel import com.bumble.appyx.benchmark.app.mosaic.MosaicModel.State -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/benchmark/benchmark-app/src/main/kotlin/com/bumble/appyx/benchmark/app/mosaic/operation/Flip.kt b/benchmark/benchmark-app/src/main/kotlin/com/bumble/appyx/benchmark/app/mosaic/operation/Flip.kt index 419591a50..4c789cc87 100644 --- a/benchmark/benchmark-app/src/main/kotlin/com/bumble/appyx/benchmark/app/mosaic/operation/Flip.kt +++ b/benchmark/benchmark-app/src/main/kotlin/com/bumble/appyx/benchmark/app/mosaic/operation/Flip.kt @@ -4,8 +4,8 @@ import androidx.compose.animation.core.AnimationSpec import com.bumble.appyx.benchmark.app.mosaic.MosaicComponent import com.bumble.appyx.benchmark.app.mosaic.MosaicModel import com.bumble.appyx.benchmark.app.mosaic.MosaicModel.State -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/benchmark/benchmark-app/src/main/kotlin/com/bumble/appyx/benchmark/app/mosaic/operation/Scatter.kt b/benchmark/benchmark-app/src/main/kotlin/com/bumble/appyx/benchmark/app/mosaic/operation/Scatter.kt index b1dbb579d..22d98f314 100644 --- a/benchmark/benchmark-app/src/main/kotlin/com/bumble/appyx/benchmark/app/mosaic/operation/Scatter.kt +++ b/benchmark/benchmark-app/src/main/kotlin/com/bumble/appyx/benchmark/app/mosaic/operation/Scatter.kt @@ -4,8 +4,8 @@ import androidx.compose.animation.core.AnimationSpec import com.bumble.appyx.benchmark.app.mosaic.MosaicComponent import com.bumble.appyx.benchmark.app.mosaic.MosaicModel import com.bumble.appyx.benchmark.app.mosaic.MosaicModel.State -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/benchmark/benchmark-app/src/main/kotlin/com/bumble/appyx/benchmark/app/node/MosaicNode.kt b/benchmark/benchmark-app/src/main/kotlin/com/bumble/appyx/benchmark/app/node/MosaicNode.kt index be0c29712..002a3f1a5 100644 --- a/benchmark/benchmark-app/src/main/kotlin/com/bumble/appyx/benchmark/app/node/MosaicNode.kt +++ b/benchmark/benchmark-app/src/main/kotlin/com/bumble/appyx/benchmark/app/node/MosaicNode.kt @@ -34,7 +34,7 @@ import com.bumble.appyx.benchmark.app.mosaic.operation.carousel import com.bumble.appyx.benchmark.app.mosaic.operation.flip import com.bumble.appyx.benchmark.app.mosaic.operation.scatter import com.bumble.appyx.benchmark.app.ui.FlashCard -import com.bumble.appyx.interactions.core.model.transition.Operation.Mode.KEYFRAME +import com.bumble.appyx.interactions.model.transition.Operation.Mode.KEYFRAME import com.bumble.appyx.navigation.composable.AppyxNavigationContainer import com.bumble.appyx.navigation.modality.NodeContext import com.bumble.appyx.navigation.node.Node diff --git a/benchmark/benchmark-app/src/main/kotlin/com/bumble/appyx/benchmark/app/ui/FlashCard.kt b/benchmark/benchmark-app/src/main/kotlin/com/bumble/appyx/benchmark/app/ui/FlashCard.kt index 9ef00cc8b..861a4939d 100644 --- a/benchmark/benchmark-app/src/main/kotlin/com/bumble/appyx/benchmark/app/ui/FlashCard.kt +++ b/benchmark/benchmark-app/src/main/kotlin/com/bumble/appyx/benchmark/app/ui/FlashCard.kt @@ -5,8 +5,8 @@ import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.graphicsLayer -import com.bumble.appyx.interactions.core.ui.property.impl.RotationY -import com.bumble.appyx.interactions.core.ui.property.motionPropertyRenderValue +import com.bumble.appyx.interactions.ui.property.impl.RotationY +import com.bumble.appyx.interactions.ui.property.motionPropertyRenderValue @Suppress("MagicNumber") diff --git a/demos/appyx-interactions/android/src/main/kotlin/com/bumble/appyx/interactions/sample/SpotlightExperiment.kt b/demos/appyx-interactions/android/src/main/kotlin/com/bumble/appyx/interactions/sample/SpotlightExperiment.kt index f543d91a3..34dec5488 100644 --- a/demos/appyx-interactions/android/src/main/kotlin/com/bumble/appyx/interactions/sample/SpotlightExperiment.kt +++ b/demos/appyx-interactions/android/src/main/kotlin/com/bumble/appyx/interactions/sample/SpotlightExperiment.kt @@ -24,8 +24,8 @@ import com.bumble.appyx.components.spotlight.operation.next import com.bumble.appyx.components.spotlight.operation.previous import com.bumble.appyx.components.spotlight.operation.updateElements import com.bumble.appyx.components.spotlight.ui.slider.SpotlightSlider -import com.bumble.appyx.interactions.core.ui.gesture.GestureSettleConfig -import com.bumble.appyx.interactions.core.ui.helper.AppyxComponentSetup +import com.bumble.appyx.interactions.gesture.GestureSettleConfig +import com.bumble.appyx.interactions.ui.helper.AppyxComponentSetup import com.bumble.appyx.interactions.utils.testing.TestTarget import com.bumble.appyx.interactions.utils.ui.Element import com.bumble.appyx.interactions.utils.ui.SampleAppyxContainer diff --git a/demos/appyx-interactions/android/src/main/kotlin/com/bumble/appyx/interactions/sample/SpotlightVisualisationType.kt b/demos/appyx-interactions/android/src/main/kotlin/com/bumble/appyx/interactions/sample/SpotlightVisualisationType.kt index 70fd77f9a..7a577b6a0 100644 --- a/demos/appyx-interactions/android/src/main/kotlin/com/bumble/appyx/interactions/sample/SpotlightVisualisationType.kt +++ b/demos/appyx-interactions/android/src/main/kotlin/com/bumble/appyx/interactions/sample/SpotlightVisualisationType.kt @@ -2,7 +2,7 @@ package com.bumble.appyx.interactions.sample import com.bumble.appyx.components.spotlight.SpotlightModel import com.bumble.appyx.components.spotlight.ui.sliderrotation.SpotlightSliderRotation -import com.bumble.appyx.interactions.core.ui.context.UiContext +import com.bumble.appyx.interactions.ui.context.UiContext import com.bumble.appyx.interactions.utils.testing.TestTarget enum class SpotlightVisualisationType { diff --git a/demos/appyx-interactions/desktop/src/desktopMain/kotlin/com/bumble/appyx/interactions/widgets/Widgets.kt b/demos/appyx-interactions/desktop/src/desktopMain/kotlin/com/bumble/appyx/interactions/widgets/Widgets.kt index 07ec5b46f..3571a2464 100644 --- a/demos/appyx-interactions/desktop/src/desktopMain/kotlin/com/bumble/appyx/interactions/widgets/Widgets.kt +++ b/demos/appyx-interactions/desktop/src/desktopMain/kotlin/com/bumble/appyx/interactions/widgets/Widgets.kt @@ -22,10 +22,10 @@ import com.bumble.appyx.demos.common.widget.CalendarWidget import com.bumble.appyx.demos.common.widget.TimerWidget import com.bumble.appyx.demos.common.widget.WeatherWidget import com.bumble.appyx.interactions.Events -import com.bumble.appyx.interactions.core.Element -import com.bumble.appyx.interactions.core.AppyxInteractionsContainer -import com.bumble.appyx.interactions.core.ui.gesture.GestureSettleConfig -import com.bumble.appyx.interactions.core.ui.helper.AppyxComponentSetup +import com.bumble.appyx.interactions.model.Element +import com.bumble.appyx.interactions.composable.AppyxInteractionsContainer +import com.bumble.appyx.interactions.gesture.GestureSettleConfig +import com.bumble.appyx.interactions.ui.helper.AppyxComponentSetup import com.bumble.appyx.interactions.widgets.ui.WidgetsStack3D import kotlinx.coroutines.flow.Flow diff --git a/demos/appyx-interactions/desktop/src/desktopMain/kotlin/com/bumble/appyx/interactions/widgets/ui/TargetUiState.kt b/demos/appyx-interactions/desktop/src/desktopMain/kotlin/com/bumble/appyx/interactions/widgets/ui/TargetUiState.kt index 9d262827a..dc8713e77 100644 --- a/demos/appyx-interactions/desktop/src/desktopMain/kotlin/com/bumble/appyx/interactions/widgets/ui/TargetUiState.kt +++ b/demos/appyx-interactions/desktop/src/desktopMain/kotlin/com/bumble/appyx/interactions/widgets/ui/TargetUiState.kt @@ -4,15 +4,15 @@ import androidx.compose.ui.graphics.TransformOrigin import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.DpOffset import androidx.compose.ui.unit.dp -import com.bumble.appyx.interactions.core.ui.context.UiContext -import com.bumble.appyx.interactions.core.ui.math.clamp -import com.bumble.appyx.interactions.core.ui.math.smoothstep -import com.bumble.appyx.interactions.core.ui.property.impl.Alpha -import com.bumble.appyx.interactions.core.ui.property.impl.RotationX -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.PositionOffset -import com.bumble.appyx.interactions.core.ui.state.MutableUiStateSpecs +import com.bumble.appyx.interactions.ui.context.UiContext +import com.bumble.appyx.interactions.ui.math.clamp +import com.bumble.appyx.interactions.ui.math.smoothstep +import com.bumble.appyx.interactions.ui.property.impl.Alpha +import com.bumble.appyx.interactions.ui.property.impl.RotationX +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.PositionOffset +import com.bumble.appyx.interactions.ui.state.MutableUiStateSpecs import com.bumble.appyx.mapState import kotlinx.coroutines.flow.StateFlow diff --git a/demos/appyx-interactions/desktop/src/desktopMain/kotlin/com/bumble/appyx/interactions/widgets/ui/WidgetsStack3D.kt b/demos/appyx-interactions/desktop/src/desktopMain/kotlin/com/bumble/appyx/interactions/widgets/ui/WidgetsStack3D.kt index aa5cb877d..bcadfc209 100644 --- a/demos/appyx-interactions/desktop/src/desktopMain/kotlin/com/bumble/appyx/interactions/widgets/ui/WidgetsStack3D.kt +++ b/demos/appyx-interactions/desktop/src/desktopMain/kotlin/com/bumble/appyx/interactions/widgets/ui/WidgetsStack3D.kt @@ -2,14 +2,14 @@ package com.bumble.appyx.interactions.widgets.ui import androidx.compose.ui.unit.DpOffset import com.bumble.appyx.components.spotlight.SpotlightModel -import com.bumble.appyx.interactions.core.ui.context.UiContext -import com.bumble.appyx.interactions.core.ui.property.impl.Alpha -import com.bumble.appyx.interactions.core.ui.property.impl.GenericFloatProperty -import com.bumble.appyx.interactions.core.ui.property.impl.RotationX -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.PositionOffset -import com.bumble.appyx.interactions.core.ui.state.MatchedTargetUiState +import com.bumble.appyx.interactions.ui.context.UiContext +import com.bumble.appyx.interactions.ui.property.impl.Alpha +import com.bumble.appyx.interactions.ui.property.impl.GenericFloatProperty +import com.bumble.appyx.interactions.ui.property.impl.RotationX +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.PositionOffset +import com.bumble.appyx.interactions.ui.state.MatchedTargetUiState import com.bumble.appyx.mapState import com.bumble.appyx.transitionmodel.BaseVisualisation diff --git a/demos/appyx-interactions/ios/src/iosMain/kotlin/AppyxSample.kt b/demos/appyx-interactions/ios/src/iosMain/kotlin/AppyxSample.kt index f7f1824a3..7da2bccd0 100644 --- a/demos/appyx-interactions/ios/src/iosMain/kotlin/AppyxSample.kt +++ b/demos/appyx-interactions/ios/src/iosMain/kotlin/AppyxSample.kt @@ -18,10 +18,10 @@ import androidx.compose.ui.draw.clipToBounds import androidx.compose.ui.graphics.Color import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import com.bumble.appyx.interactions.core.AppyxInteractionsContainer -import com.bumble.appyx.interactions.core.Element -import com.bumble.appyx.interactions.core.model.BaseAppyxComponent -import com.bumble.appyx.interactions.core.ui.helper.AppyxComponentSetup +import com.bumble.appyx.interactions.composable.AppyxInteractionsContainer +import com.bumble.appyx.interactions.model.Element +import com.bumble.appyx.interactions.model.BaseAppyxComponent +import com.bumble.appyx.interactions.ui.helper.AppyxComponentSetup import theme.color_primary import theme.md_amber_500 import theme.md_blue_500 diff --git a/demos/appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/demos/navigation/component/spotlighthero/ExitHeroModeStrategy.kt b/demos/appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/demos/navigation/component/spotlighthero/ExitHeroModeStrategy.kt index e1b2ba32e..296becd78 100644 --- a/demos/appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/demos/navigation/component/spotlighthero/ExitHeroModeStrategy.kt +++ b/demos/appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/demos/navigation/component/spotlighthero/ExitHeroModeStrategy.kt @@ -2,7 +2,7 @@ package com.bumble.appyx.demos.navigation.component.spotlighthero import androidx.compose.animation.core.AnimationSpec -import com.bumble.appyx.interactions.core.model.backpresshandlerstrategies.BaseBackPressHandlerStrategy +import com.bumble.appyx.interactions.model.backpresshandlerstrategies.BaseBackPressHandlerStrategy import com.bumble.appyx.mapState import com.bumble.appyx.demos.navigation.component.spotlighthero.SpotlightHeroModel.Mode.HERO import com.bumble.appyx.demos.navigation.component.spotlighthero.SpotlightHeroModel.Mode.LIST diff --git a/demos/appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/demos/navigation/component/spotlighthero/SpotlightHero.kt b/demos/appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/demos/navigation/component/spotlighthero/SpotlightHero.kt index ee562e119..72a61e4c6 100644 --- a/demos/appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/demos/navigation/component/spotlighthero/SpotlightHero.kt +++ b/demos/appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/demos/navigation/component/spotlighthero/SpotlightHero.kt @@ -6,12 +6,12 @@ import androidx.compose.runtime.Composable import androidx.compose.runtime.collectAsState import com.bumble.appyx.demos.navigation.component.spotlighthero.SpotlightHeroModel.State import com.bumble.appyx.demos.navigation.component.spotlighthero.visualisation.SpotlightHeroVisualisation -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 import com.bumble.appyx.mapState import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers diff --git a/demos/appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/demos/navigation/component/spotlighthero/SpotlightHeroModel.kt b/demos/appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/demos/navigation/component/spotlighthero/SpotlightHeroModel.kt index 7bef512b1..b17487f83 100644 --- a/demos/appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/demos/navigation/component/spotlighthero/SpotlightHeroModel.kt +++ b/demos/appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/demos/navigation/component/spotlighthero/SpotlightHeroModel.kt @@ -1,9 +1,9 @@ package com.bumble.appyx.demos.navigation.component.spotlighthero import com.bumble.appyx.demos.navigation.component.spotlighthero.SpotlightHeroModel.State -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/demos/appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/demos/navigation/component/spotlighthero/operation/Activate.kt b/demos/appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/demos/navigation/component/spotlighthero/operation/Activate.kt index 64ea43a9e..b6a7a179e 100644 --- a/demos/appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/demos/navigation/component/spotlighthero/operation/Activate.kt +++ b/demos/appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/demos/navigation/component/spotlighthero/operation/Activate.kt @@ -3,8 +3,8 @@ package com.bumble.appyx.demos.navigation.component.spotlighthero.operation import androidx.compose.animation.core.AnimationSpec import com.bumble.appyx.demos.navigation.component.spotlighthero.SpotlightHero import com.bumble.appyx.demos.navigation.component.spotlighthero.SpotlightHeroModel -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/demos/appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/demos/navigation/component/spotlighthero/operation/First.kt b/demos/appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/demos/navigation/component/spotlighthero/operation/First.kt index 9ea297746..d099fe0d1 100644 --- a/demos/appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/demos/navigation/component/spotlighthero/operation/First.kt +++ b/demos/appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/demos/navigation/component/spotlighthero/operation/First.kt @@ -3,8 +3,8 @@ package com.bumble.appyx.demos.navigation.component.spotlighthero.operation import androidx.compose.animation.core.AnimationSpec import com.bumble.appyx.demos.navigation.component.spotlighthero.SpotlightHero import com.bumble.appyx.demos.navigation.component.spotlighthero.SpotlightHeroModel -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 diff --git a/demos/appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/demos/navigation/component/spotlighthero/operation/Last.kt b/demos/appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/demos/navigation/component/spotlighthero/operation/Last.kt index 94ecf5cfe..3e5e9d6a0 100644 --- a/demos/appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/demos/navigation/component/spotlighthero/operation/Last.kt +++ b/demos/appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/demos/navigation/component/spotlighthero/operation/Last.kt @@ -3,8 +3,8 @@ package com.bumble.appyx.demos.navigation.component.spotlighthero.operation import androidx.compose.animation.core.AnimationSpec import com.bumble.appyx.demos.navigation.component.spotlighthero.SpotlightHero import com.bumble.appyx.demos.navigation.component.spotlighthero.SpotlightHeroModel -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 diff --git a/demos/appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/demos/navigation/component/spotlighthero/operation/Next.kt b/demos/appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/demos/navigation/component/spotlighthero/operation/Next.kt index 1c4757aaa..550a79a2e 100644 --- a/demos/appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/demos/navigation/component/spotlighthero/operation/Next.kt +++ b/demos/appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/demos/navigation/component/spotlighthero/operation/Next.kt @@ -3,8 +3,8 @@ package com.bumble.appyx.demos.navigation.component.spotlighthero.operation import androidx.compose.animation.core.AnimationSpec import com.bumble.appyx.demos.navigation.component.spotlighthero.SpotlightHero import com.bumble.appyx.demos.navigation.component.spotlighthero.SpotlightHeroModel -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/demos/appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/demos/navigation/component/spotlighthero/operation/Previous.kt b/demos/appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/demos/navigation/component/spotlighthero/operation/Previous.kt index a2e481bd0..a59b87e0a 100644 --- a/demos/appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/demos/navigation/component/spotlighthero/operation/Previous.kt +++ b/demos/appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/demos/navigation/component/spotlighthero/operation/Previous.kt @@ -3,8 +3,8 @@ package com.bumble.appyx.demos.navigation.component.spotlighthero.operation import androidx.compose.animation.core.AnimationSpec import com.bumble.appyx.demos.navigation.component.spotlighthero.SpotlightHero import com.bumble.appyx.demos.navigation.component.spotlighthero.SpotlightHeroModel -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 diff --git a/demos/appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/demos/navigation/component/spotlighthero/operation/SetHeroMode.kt b/demos/appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/demos/navigation/component/spotlighthero/operation/SetHeroMode.kt index c07882dad..e12bad06f 100644 --- a/demos/appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/demos/navigation/component/spotlighthero/operation/SetHeroMode.kt +++ b/demos/appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/demos/navigation/component/spotlighthero/operation/SetHeroMode.kt @@ -4,8 +4,8 @@ import androidx.compose.animation.core.AnimationSpec import com.bumble.appyx.demos.navigation.component.spotlighthero.SpotlightHero import com.bumble.appyx.demos.navigation.component.spotlighthero.SpotlightHeroModel import com.bumble.appyx.demos.navigation.component.spotlighthero.SpotlightHeroModel.State -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/demos/appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/demos/navigation/component/spotlighthero/operation/ToggleHeroMode.kt b/demos/appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/demos/navigation/component/spotlighthero/operation/ToggleHeroMode.kt index fec63b3ef..85b0ee4bf 100644 --- a/demos/appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/demos/navigation/component/spotlighthero/operation/ToggleHeroMode.kt +++ b/demos/appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/demos/navigation/component/spotlighthero/operation/ToggleHeroMode.kt @@ -5,8 +5,8 @@ import com.bumble.appyx.demos.navigation.component.spotlighthero.SpotlightHero import com.bumble.appyx.demos.navigation.component.spotlighthero.SpotlightHeroModel.Mode.HERO import com.bumble.appyx.demos.navigation.component.spotlighthero.SpotlightHeroModel.Mode.LIST import com.bumble.appyx.demos.navigation.component.spotlighthero.SpotlightHeroModel.State -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/demos/appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/demos/navigation/component/spotlighthero/visualisation/SpotlightHeroGestures.kt b/demos/appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/demos/navigation/component/spotlighthero/visualisation/SpotlightHeroGestures.kt index a36456390..cbdc5f276 100644 --- a/demos/appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/demos/navigation/component/spotlighthero/visualisation/SpotlightHeroGestures.kt +++ b/demos/appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/demos/navigation/component/spotlighthero/visualisation/SpotlightHeroGestures.kt @@ -8,11 +8,11 @@ import com.bumble.appyx.demos.navigation.component.spotlighthero.SpotlightHeroMo import com.bumble.appyx.demos.navigation.component.spotlighthero.operation.Next import com.bumble.appyx.demos.navigation.component.spotlighthero.operation.Previous import com.bumble.appyx.demos.navigation.component.spotlighthero.operation.SetHeroMode -import com.bumble.appyx.interactions.core.ui.context.TransitionBounds -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.dragDirection4 +import com.bumble.appyx.interactions.ui.context.TransitionBounds +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.dragDirection4 class SpotlightHeroGestures( transitionBounds: TransitionBounds, diff --git a/demos/appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/demos/navigation/component/spotlighthero/visualisation/SpotlightHeroVisualisation.kt b/demos/appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/demos/navigation/component/spotlighthero/visualisation/SpotlightHeroVisualisation.kt index 0bac9a32f..86f0e4879 100644 --- a/demos/appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/demos/navigation/component/spotlighthero/visualisation/SpotlightHeroVisualisation.kt +++ b/demos/appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/demos/navigation/component/spotlighthero/visualisation/SpotlightHeroVisualisation.kt @@ -2,7 +2,7 @@ package com.bumble.appyx.demos.navigation.component.spotlighthero.visualisation import com.bumble.appyx.demos.navigation.component.spotlighthero.SpotlightHeroModel import com.bumble.appyx.demos.navigation.component.spotlighthero.visualisation.property.HeroProgress -import com.bumble.appyx.interactions.core.ui.Visualisation +import com.bumble.appyx.interactions.ui.Visualisation interface SpotlightHeroVisualisation : Visualisation> { diff --git a/demos/appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/demos/navigation/component/spotlighthero/visualisation/default/SpotlightHeroDefaultVisualisation.kt b/demos/appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/demos/navigation/component/spotlighthero/visualisation/default/SpotlightHeroDefaultVisualisation.kt index 6ed145c3c..7c4a8c2a0 100644 --- a/demos/appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/demos/navigation/component/spotlighthero/visualisation/default/SpotlightHeroDefaultVisualisation.kt +++ b/demos/appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/demos/navigation/component/spotlighthero/visualisation/default/SpotlightHeroDefaultVisualisation.kt @@ -7,18 +7,18 @@ import com.bumble.appyx.demos.navigation.component.spotlighthero.SpotlightHeroMo import com.bumble.appyx.demos.navigation.component.spotlighthero.SpotlightHeroModel.State import com.bumble.appyx.demos.navigation.component.spotlighthero.visualisation.SpotlightHeroVisualisation import com.bumble.appyx.demos.navigation.component.spotlighthero.visualisation.property.HeroProgress -import com.bumble.appyx.interactions.core.ui.context.UiContext -import com.bumble.appyx.interactions.core.ui.property.impl.AspectRatio -import com.bumble.appyx.interactions.core.ui.property.impl.GenericFloatProperty -import com.bumble.appyx.interactions.core.ui.property.impl.Height -import com.bumble.appyx.interactions.core.ui.property.impl.RoundedCorners -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.BiasAlignment.InsideAlignment.Companion.TopCenter -import com.bumble.appyx.interactions.core.ui.property.impl.position.BiasAlignment.InsideAlignment.Companion.TopEnd -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.UiContext +import com.bumble.appyx.interactions.ui.property.impl.AspectRatio +import com.bumble.appyx.interactions.ui.property.impl.GenericFloatProperty +import com.bumble.appyx.interactions.ui.property.impl.Height +import com.bumble.appyx.interactions.ui.property.impl.RoundedCorners +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.BiasAlignment.InsideAlignment.Companion.TopCenter +import com.bumble.appyx.interactions.ui.property.impl.position.BiasAlignment.InsideAlignment.Companion.TopEnd +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 class SpotlightHeroDefaultVisualisation( diff --git a/demos/appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/demos/navigation/component/spotlighthero/visualisation/default/TargetUiState.kt b/demos/appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/demos/navigation/component/spotlighthero/visualisation/default/TargetUiState.kt index d2156dff5..36d3e8926 100644 --- a/demos/appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/demos/navigation/component/spotlighthero/visualisation/default/TargetUiState.kt +++ b/demos/appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/demos/navigation/component/spotlighthero/visualisation/default/TargetUiState.kt @@ -1,20 +1,20 @@ package com.bumble.appyx.demos.navigation.component.spotlighthero.visualisation.default import androidx.compose.ui.unit.DpOffset -import com.bumble.appyx.interactions.core.ui.context.UiContext -import com.bumble.appyx.interactions.core.ui.math.cutOffCenterSigned -import com.bumble.appyx.interactions.core.ui.math.scaleUpTo -import com.bumble.appyx.interactions.core.ui.property.impl.Alpha -import com.bumble.appyx.interactions.core.ui.property.impl.AspectRatio -import com.bumble.appyx.interactions.core.ui.property.impl.Height -import com.bumble.appyx.interactions.core.ui.property.impl.RotationY -import com.bumble.appyx.interactions.core.ui.property.impl.RoundedCorners -import com.bumble.appyx.interactions.core.ui.property.impl.Scale -import com.bumble.appyx.interactions.core.ui.property.impl.position.BiasAlignment -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.MutableUiStateSpecs +import com.bumble.appyx.interactions.ui.context.UiContext +import com.bumble.appyx.interactions.ui.math.cutOffCenterSigned +import com.bumble.appyx.interactions.ui.math.scaleUpTo +import com.bumble.appyx.interactions.ui.property.impl.Alpha +import com.bumble.appyx.interactions.ui.property.impl.AspectRatio +import com.bumble.appyx.interactions.ui.property.impl.Height +import com.bumble.appyx.interactions.ui.property.impl.RotationY +import com.bumble.appyx.interactions.ui.property.impl.RoundedCorners +import com.bumble.appyx.interactions.ui.property.impl.Scale +import com.bumble.appyx.interactions.ui.property.impl.position.BiasAlignment +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.MutableUiStateSpecs import com.bumble.appyx.mapState import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow diff --git a/demos/appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/demos/navigation/component/spotlighthero/visualisation/property/HeroProgress.kt b/demos/appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/demos/navigation/component/spotlighthero/visualisation/property/HeroProgress.kt index 293fec66c..294ea4537 100644 --- a/demos/appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/demos/navigation/component/spotlighthero/visualisation/property/HeroProgress.kt +++ b/demos/appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/demos/navigation/component/spotlighthero/visualisation/property/HeroProgress.kt @@ -1,6 +1,6 @@ package com.bumble.appyx.demos.navigation.component.spotlighthero.visualisation.property -import com.bumble.appyx.interactions.core.ui.property.impl.GenericFloatProperty +import com.bumble.appyx.interactions.ui.property.impl.GenericFloatProperty import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow diff --git a/demos/appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/demos/navigation/node/cakes/CakeBackdropNode.kt b/demos/appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/demos/navigation/node/cakes/CakeBackdropNode.kt index 8b4f23217..e6bf0ec4a 100644 --- a/demos/appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/demos/navigation/node/cakes/CakeBackdropNode.kt +++ b/demos/appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/demos/navigation/node/cakes/CakeBackdropNode.kt @@ -14,8 +14,8 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.dp import com.bumble.appyx.demos.navigation.component.spotlighthero.visualisation.property.HeroProgress -import com.bumble.appyx.interactions.core.ui.math.smoothstep -import com.bumble.appyx.interactions.core.ui.property.motionPropertyRenderValue +import com.bumble.appyx.interactions.ui.math.smoothstep +import com.bumble.appyx.interactions.ui.property.motionPropertyRenderValue import com.bumble.appyx.navigation.modality.NodeContext import com.bumble.appyx.navigation.node.LeafNode diff --git a/demos/appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/demos/navigation/node/cakes/CakeListNode.kt b/demos/appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/demos/navigation/node/cakes/CakeListNode.kt index 9e438b7b1..1dd9447ea 100644 --- a/demos/appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/demos/navigation/node/cakes/CakeListNode.kt +++ b/demos/appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/demos/navigation/node/cakes/CakeListNode.kt @@ -29,7 +29,7 @@ import com.bumble.appyx.demos.navigation.component.spotlighthero.visualisation.S import com.bumble.appyx.demos.navigation.component.spotlighthero.visualisation.default.SpotlightHeroDefaultVisualisation import com.bumble.appyx.demos.navigation.node.cakes.CakeListNode.NavTarget import com.bumble.appyx.demos.navigation.node.cart.Cart -import com.bumble.appyx.interactions.core.ui.math.lerpFloat +import com.bumble.appyx.interactions.ui.math.lerpFloat import com.bumble.appyx.navigation.composable.AppyxNavigationContainer import com.bumble.appyx.navigation.modality.NodeContext import com.bumble.appyx.navigation.node.Node diff --git a/demos/appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/demos/navigation/node/checkout/CheckoutNode.kt b/demos/appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/demos/navigation/node/checkout/CheckoutNode.kt index b2adf090c..cfa49fab5 100644 --- a/demos/appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/demos/navigation/node/checkout/CheckoutNode.kt +++ b/demos/appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/demos/navigation/node/checkout/CheckoutNode.kt @@ -11,7 +11,7 @@ import com.bumble.appyx.demos.navigation.node.checkout.NavTarget.CartItems import com.bumble.appyx.demos.navigation.node.checkout.NavTarget.Payment import com.bumble.appyx.demos.navigation.node.checkout.NavTarget.Shipping import com.bumble.appyx.demos.navigation.node.checkout.NavTarget.Success -import com.bumble.appyx.interactions.core.ui.gesture.GestureFactory +import com.bumble.appyx.interactions.gesture.GestureFactory import com.bumble.appyx.navigation.modality.NodeContext import com.bumble.appyx.navigation.node.Node import com.bumble.appyx.demos.navigation.platform.IOS_PLATFORM_NAME as IOS diff --git a/demos/appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/demos/navigation/node/loggedout/LoggedOutNode.kt b/demos/appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/demos/navigation/node/loggedout/LoggedOutNode.kt index 9b7cc4026..cfcdb991c 100644 --- a/demos/appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/demos/navigation/node/loggedout/LoggedOutNode.kt +++ b/demos/appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/demos/navigation/node/loggedout/LoggedOutNode.kt @@ -27,7 +27,7 @@ import com.bumble.appyx.demos.navigation.node.loggedout.LoggedOutNode.NavTarget import com.bumble.appyx.demos.navigation.node.profile.User import com.bumble.appyx.demos.navigation.platform.IOS_PLATFORM_NAME import com.bumble.appyx.demos.navigation.platform.getPlatformName -import com.bumble.appyx.interactions.core.ui.gesture.GestureFactory +import com.bumble.appyx.interactions.gesture.GestureFactory import com.bumble.appyx.navigation.composable.AppyxNavigationContainer import com.bumble.appyx.navigation.modality.NodeContext import com.bumble.appyx.navigation.node.Node diff --git a/demos/appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/demos/navigation/node/main/MainNode.kt b/demos/appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/demos/navigation/node/main/MainNode.kt index fb68f0bcb..b47afc25b 100644 --- a/demos/appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/demos/navigation/node/main/MainNode.kt +++ b/demos/appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/demos/navigation/node/main/MainNode.kt @@ -9,7 +9,7 @@ import com.bumble.appyx.demos.navigation.node.main.MainNavItem.HOME import com.bumble.appyx.demos.navigation.node.main.MainNavItem.PROFILE import com.bumble.appyx.demos.navigation.node.profile.ProfileNode import com.bumble.appyx.demos.navigation.node.profile.User -import com.bumble.appyx.interactions.core.plugin.Plugin +import com.bumble.appyx.interactions.plugin.Plugin import com.bumble.appyx.navigation.modality.NodeContext import com.bumble.appyx.navigation.store.getRetainedInstance import com.bumble.appyx.utils.material3.AppyxMaterial3NavNode diff --git a/demos/appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/demos/navigation/node/root/RootNode.kt b/demos/appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/demos/navigation/node/root/RootNode.kt index fa3211a35..a5209f1c6 100644 --- a/demos/appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/demos/navigation/node/root/RootNode.kt +++ b/demos/appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/demos/navigation/node/root/RootNode.kt @@ -10,7 +10,7 @@ import com.bumble.appyx.demos.navigation.node.loggedout.LoggedOutNode import com.bumble.appyx.demos.navigation.node.main.MainNode import com.bumble.appyx.demos.navigation.node.profile.User import com.bumble.appyx.demos.navigation.node.root.RootNode.NavTarget -import com.bumble.appyx.interactions.core.plugin.Plugin +import com.bumble.appyx.interactions.plugin.Plugin import com.bumble.appyx.navigation.composable.AppyxNavigationContainer import com.bumble.appyx.navigation.modality.NodeContext import com.bumble.appyx.navigation.node.Node diff --git a/demos/mkdocs/appyx-components/backstack/fader/web/src/jsMain/kotlin/com/bumble/appyx/demos/backstack/fader/BackStackFaderSample.kt b/demos/mkdocs/appyx-components/backstack/fader/web/src/jsMain/kotlin/com/bumble/appyx/demos/backstack/fader/BackStackFaderSample.kt index 4941ba415..9dec56871 100644 --- a/demos/mkdocs/appyx-components/backstack/fader/web/src/jsMain/kotlin/com/bumble/appyx/demos/backstack/fader/BackStackFaderSample.kt +++ b/demos/mkdocs/appyx-components/backstack/fader/web/src/jsMain/kotlin/com/bumble/appyx/demos/backstack/fader/BackStackFaderSample.kt @@ -14,7 +14,7 @@ import com.bumble.appyx.components.backstack.ui.fader.BackStackFader import com.bumble.appyx.demos.common.AppyxWebSample import com.bumble.appyx.demos.common.ChildSize import com.bumble.appyx.demos.common.InteractionTarget -import com.bumble.appyx.interactions.core.ui.gesture.GestureFactory +import com.bumble.appyx.interactions.gesture.GestureFactory @Composable fun BackStackFaderSample( diff --git a/demos/mkdocs/appyx-components/backstack/slider/web/src/jsMain/kotlin/com/bumble/appyx/demos/backstack/slider/BackStackSliderSample.kt b/demos/mkdocs/appyx-components/backstack/slider/web/src/jsMain/kotlin/com/bumble/appyx/demos/backstack/slider/BackStackSliderSample.kt index 2e7c17f81..22c4b1571 100644 --- a/demos/mkdocs/appyx-components/backstack/slider/web/src/jsMain/kotlin/com/bumble/appyx/demos/backstack/slider/BackStackSliderSample.kt +++ b/demos/mkdocs/appyx-components/backstack/slider/web/src/jsMain/kotlin/com/bumble/appyx/demos/backstack/slider/BackStackSliderSample.kt @@ -14,7 +14,7 @@ import com.bumble.appyx.components.backstack.ui.slider.BackStackSlider import com.bumble.appyx.demos.common.AppyxWebSample import com.bumble.appyx.demos.common.ChildSize import com.bumble.appyx.demos.common.InteractionTarget -import com.bumble.appyx.interactions.core.ui.gesture.GestureFactory +import com.bumble.appyx.interactions.gesture.GestureFactory @Composable fun BackStackSliderSample( diff --git a/demos/mkdocs/appyx-components/common/src/commonMain/kotlin/com/bumble/appyx/demos/common/AppyxWebSample.kt b/demos/mkdocs/appyx-components/common/src/commonMain/kotlin/com/bumble/appyx/demos/common/AppyxWebSample.kt index 0f6c716fb..673274ba1 100644 --- a/demos/mkdocs/appyx-components/common/src/commonMain/kotlin/com/bumble/appyx/demos/common/AppyxWebSample.kt +++ b/demos/mkdocs/appyx-components/common/src/commonMain/kotlin/com/bumble/appyx/demos/common/AppyxWebSample.kt @@ -24,10 +24,10 @@ import androidx.compose.ui.draw.clip import androidx.compose.ui.graphics.Color import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import com.bumble.appyx.interactions.core.AppyxInteractionsContainer -import com.bumble.appyx.interactions.core.Element -import com.bumble.appyx.interactions.core.model.BaseAppyxComponent -import com.bumble.appyx.interactions.core.ui.helper.AppyxComponentSetup +import com.bumble.appyx.interactions.composable.AppyxInteractionsContainer +import com.bumble.appyx.interactions.model.Element +import com.bumble.appyx.interactions.model.BaseAppyxComponent +import com.bumble.appyx.interactions.ui.helper.AppyxComponentSetup import kotlin.random.Random import com.bumble.appyx.demos.common.InteractionTarget.Element as SampleElement diff --git a/demos/mkdocs/appyx-components/spotlight/fader/web/src/jsMain/kotlin/com/bumble/appyx/demos/spotlight/fader/SpotlightFaderSample.kt b/demos/mkdocs/appyx-components/spotlight/fader/web/src/jsMain/kotlin/com/bumble/appyx/demos/spotlight/fader/SpotlightFaderSample.kt index 41c68207c..1f1866f45 100644 --- a/demos/mkdocs/appyx-components/spotlight/fader/web/src/jsMain/kotlin/com/bumble/appyx/demos/spotlight/fader/SpotlightFaderSample.kt +++ b/demos/mkdocs/appyx-components/spotlight/fader/web/src/jsMain/kotlin/com/bumble/appyx/demos/spotlight/fader/SpotlightFaderSample.kt @@ -16,7 +16,7 @@ import com.bumble.appyx.components.spotlight.ui.slider.SpotlightSlider import com.bumble.appyx.demos.common.AppyxWebSample import com.bumble.appyx.demos.common.ChildSize import com.bumble.appyx.demos.common.InteractionTarget -import com.bumble.appyx.interactions.core.model.transition.Operation +import com.bumble.appyx.interactions.model.transition.Operation @Composable fun SpotlightFaderSample( diff --git a/demos/mkdocs/appyx-components/spotlight/stack3d/web/src/jsMain/kotlin/com/bumble/appyx/demos/spotlight/stack3d/SpotlightStack3DSample.kt b/demos/mkdocs/appyx-components/spotlight/stack3d/web/src/jsMain/kotlin/com/bumble/appyx/demos/spotlight/stack3d/SpotlightStack3DSample.kt index 7a68f5942..12279a8ce 100644 --- a/demos/mkdocs/appyx-components/spotlight/stack3d/web/src/jsMain/kotlin/com/bumble/appyx/demos/spotlight/stack3d/SpotlightStack3DSample.kt +++ b/demos/mkdocs/appyx-components/spotlight/stack3d/web/src/jsMain/kotlin/com/bumble/appyx/demos/spotlight/stack3d/SpotlightStack3DSample.kt @@ -17,7 +17,7 @@ import com.bumble.appyx.components.spotlight.ui.stack3d.SpotlightStack3D import com.bumble.appyx.demos.common.AppyxWebSample import com.bumble.appyx.demos.common.ChildSize import com.bumble.appyx.demos.common.InteractionTarget -import com.bumble.appyx.interactions.core.model.transition.Operation +import com.bumble.appyx.interactions.model.transition.Operation @Composable fun SpotlightStack3DSample( diff --git a/demos/mkdocs/appyx-interactions/gestures/dragprediction/web/src/jsMain/kotlin/com/bumble/appyx/demos/dragprediction/DragPrediction.kt b/demos/mkdocs/appyx-interactions/gestures/dragprediction/web/src/jsMain/kotlin/com/bumble/appyx/demos/dragprediction/DragPrediction.kt index c5581944e..563c27997 100644 --- a/demos/mkdocs/appyx-interactions/gestures/dragprediction/web/src/jsMain/kotlin/com/bumble/appyx/demos/dragprediction/DragPrediction.kt +++ b/demos/mkdocs/appyx-interactions/gestures/dragprediction/web/src/jsMain/kotlin/com/bumble/appyx/demos/dragprediction/DragPrediction.kt @@ -46,11 +46,11 @@ import com.bumble.appyx.components.internal.testdrive.TestDriveModel.State.Eleme import com.bumble.appyx.components.internal.testdrive.TestDriveModel.State.ElementState.D import com.bumble.appyx.demos.dragprediction.DragPredictionVisualisation.Companion.toTargetUiState import com.bumble.appyx.demos.dragprediction.InteractionTarget.Child1 -import com.bumble.appyx.interactions.core.AppyxInteractionsContainer -import com.bumble.appyx.interactions.core.model.transition.Keyframes -import com.bumble.appyx.interactions.core.model.transition.Update -import com.bumble.appyx.interactions.core.ui.gesture.GestureSettleConfig -import com.bumble.appyx.interactions.core.ui.helper.AppyxComponentSetup +import com.bumble.appyx.interactions.composable.AppyxInteractionsContainer +import com.bumble.appyx.interactions.model.transition.Keyframes +import com.bumble.appyx.interactions.model.transition.Update +import com.bumble.appyx.interactions.gesture.GestureSettleConfig +import com.bumble.appyx.interactions.ui.helper.AppyxComponentSetup enum class InteractionTarget { Child1 diff --git a/demos/mkdocs/appyx-interactions/gestures/dragprediction/web/src/jsMain/kotlin/com/bumble/appyx/demos/dragprediction/DragPredictionVisualisation.kt b/demos/mkdocs/appyx-interactions/gestures/dragprediction/web/src/jsMain/kotlin/com/bumble/appyx/demos/dragprediction/DragPredictionVisualisation.kt index 30383f1cc..66caff8c7 100644 --- a/demos/mkdocs/appyx-interactions/gestures/dragprediction/web/src/jsMain/kotlin/com/bumble/appyx/demos/dragprediction/DragPredictionVisualisation.kt +++ b/demos/mkdocs/appyx-interactions/gestures/dragprediction/web/src/jsMain/kotlin/com/bumble/appyx/demos/dragprediction/DragPredictionVisualisation.kt @@ -12,23 +12,23 @@ import com.bumble.appyx.components.internal.testdrive.TestDriveModel.State.Eleme import com.bumble.appyx.components.internal.testdrive.TestDriveModel.State.ElementState.C import com.bumble.appyx.components.internal.testdrive.TestDriveModel.State.ElementState.D import com.bumble.appyx.components.internal.testdrive.operation.MoveTo -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.Direction8.DOWN -import com.bumble.appyx.interactions.core.ui.gesture.Drag.Direction8.DOWNRIGHT -import com.bumble.appyx.interactions.core.ui.gesture.Drag.Direction8.LEFT -import com.bumble.appyx.interactions.core.ui.gesture.Drag.Direction8.RIGHT -import com.bumble.appyx.interactions.core.ui.gesture.Drag.Direction8.UP -import com.bumble.appyx.interactions.core.ui.gesture.Drag.Direction8.UPLEFT -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.dragDirection8 -import com.bumble.appyx.interactions.core.ui.DefaultAnimationSpec -import com.bumble.appyx.interactions.core.ui.property.impl.BackgroundColor -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.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.gesture.Drag.Direction8.DOWN +import com.bumble.appyx.interactions.gesture.Drag.Direction8.DOWNRIGHT +import com.bumble.appyx.interactions.gesture.Drag.Direction8.LEFT +import com.bumble.appyx.interactions.gesture.Drag.Direction8.RIGHT +import com.bumble.appyx.interactions.gesture.Drag.Direction8.UP +import com.bumble.appyx.interactions.gesture.Drag.Direction8.UPLEFT +import com.bumble.appyx.interactions.gesture.Gesture +import com.bumble.appyx.interactions.gesture.GestureFactory +import com.bumble.appyx.interactions.gesture.dragDirection8 +import com.bumble.appyx.interactions.ui.DefaultAnimationSpec +import com.bumble.appyx.interactions.ui.property.impl.BackgroundColor +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.PositionOffset +import com.bumble.appyx.interactions.ui.state.MatchedTargetUiState import com.bumble.appyx.transitionmodel.BaseVisualisation import com.bumble.appyx.utils.multiplatform.AppyxLogger diff --git a/demos/mkdocs/appyx-interactions/gestures/dragprediction/web/src/jsMain/kotlin/com/bumble/appyx/demos/dragprediction/TargetUiState.kt b/demos/mkdocs/appyx-interactions/gestures/dragprediction/web/src/jsMain/kotlin/com/bumble/appyx/demos/dragprediction/TargetUiState.kt index 12857bff0..e79f03f3a 100644 --- a/demos/mkdocs/appyx-interactions/gestures/dragprediction/web/src/jsMain/kotlin/com/bumble/appyx/demos/dragprediction/TargetUiState.kt +++ b/demos/mkdocs/appyx-interactions/gestures/dragprediction/web/src/jsMain/kotlin/com/bumble/appyx/demos/dragprediction/TargetUiState.kt @@ -1,11 +1,11 @@ package com.bumble.appyx.demos.dragprediction -import com.bumble.appyx.interactions.core.ui.property.impl.BackgroundColor -import com.bumble.appyx.interactions.core.ui.property.impl.RotationZ -import com.bumble.appyx.interactions.core.ui.property.impl.RoundedCorners -import com.bumble.appyx.interactions.core.ui.property.impl.Scale -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.BackgroundColor +import com.bumble.appyx.interactions.ui.property.impl.RotationZ +import com.bumble.appyx.interactions.ui.property.impl.RoundedCorners +import com.bumble.appyx.interactions.ui.property.impl.Scale +import com.bumble.appyx.interactions.ui.property.impl.position.PositionOffset +import com.bumble.appyx.interactions.ui.state.MutableUiStateSpecs @Suppress("unused") @MutableUiStateSpecs diff --git a/demos/mkdocs/appyx-interactions/gestures/incompletedrag/web/src/jsMain/kotlin/com/bumble/appyx/demos/incompletedrag/IncompleteDrag.kt b/demos/mkdocs/appyx-interactions/gestures/incompletedrag/web/src/jsMain/kotlin/com/bumble/appyx/demos/incompletedrag/IncompleteDrag.kt index 354cf4289..064e9b164 100644 --- a/demos/mkdocs/appyx-interactions/gestures/incompletedrag/web/src/jsMain/kotlin/com/bumble/appyx/demos/incompletedrag/IncompleteDrag.kt +++ b/demos/mkdocs/appyx-interactions/gestures/incompletedrag/web/src/jsMain/kotlin/com/bumble/appyx/demos/incompletedrag/IncompleteDrag.kt @@ -37,11 +37,11 @@ import com.bumble.appyx.components.internal.testdrive.TestDriveModel.State.Eleme import com.bumble.appyx.components.internal.testdrive.TestDriveModel.State.ElementState.D import com.bumble.appyx.components.internal.testdrive.operation.next import com.bumble.appyx.demos.incompletedrag.InteractionTarget.Child1 -import com.bumble.appyx.interactions.core.AppyxInteractionsContainer -import com.bumble.appyx.interactions.core.GestureReferencePoint -import com.bumble.appyx.interactions.core.model.transition.Operation.Mode.IMMEDIATE -import com.bumble.appyx.interactions.core.ui.gesture.GestureSettleConfig -import com.bumble.appyx.interactions.core.ui.helper.AppyxComponentSetup +import com.bumble.appyx.interactions.composable.AppyxInteractionsContainer +import com.bumble.appyx.interactions.gesture.GestureReferencePoint +import com.bumble.appyx.interactions.model.transition.Operation.Mode.IMMEDIATE +import com.bumble.appyx.interactions.gesture.GestureSettleConfig +import com.bumble.appyx.interactions.ui.helper.AppyxComponentSetup enum class InteractionTarget { Child1 diff --git a/demos/mkdocs/appyx-interactions/gestures/incompletedrag/web/src/jsMain/kotlin/com/bumble/appyx/demos/incompletedrag/IncompleteDragVisualisation.kt b/demos/mkdocs/appyx-interactions/gestures/incompletedrag/web/src/jsMain/kotlin/com/bumble/appyx/demos/incompletedrag/IncompleteDragVisualisation.kt index e190cfe16..0716497d1 100644 --- a/demos/mkdocs/appyx-interactions/gestures/incompletedrag/web/src/jsMain/kotlin/com/bumble/appyx/demos/incompletedrag/IncompleteDragVisualisation.kt +++ b/demos/mkdocs/appyx-interactions/gestures/incompletedrag/web/src/jsMain/kotlin/com/bumble/appyx/demos/incompletedrag/IncompleteDragVisualisation.kt @@ -11,29 +11,29 @@ import com.bumble.appyx.components.internal.testdrive.TestDriveModel.State.Eleme import com.bumble.appyx.components.internal.testdrive.TestDriveModel.State.ElementState.C import com.bumble.appyx.components.internal.testdrive.TestDriveModel.State.ElementState.D import com.bumble.appyx.components.internal.testdrive.operation.MoveTo -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.Direction8.DOWN -import com.bumble.appyx.interactions.core.ui.gesture.Drag.Direction8.DOWNLEFT -import com.bumble.appyx.interactions.core.ui.gesture.Drag.Direction8.DOWNRIGHT -import com.bumble.appyx.interactions.core.ui.gesture.Drag.Direction8.LEFT -import com.bumble.appyx.interactions.core.ui.gesture.Drag.Direction8.RIGHT -import com.bumble.appyx.interactions.core.ui.gesture.Drag.Direction8.UP -import com.bumble.appyx.interactions.core.ui.gesture.Drag.Direction8.UPLEFT -import com.bumble.appyx.interactions.core.ui.gesture.Drag.Direction8.UPRIGHT -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.dragDirection8 -import com.bumble.appyx.interactions.core.ui.DefaultAnimationSpec -import com.bumble.appyx.interactions.core.ui.property.impl.BackgroundColor -import com.bumble.appyx.interactions.core.ui.property.impl.RotationZ -import com.bumble.appyx.interactions.core.ui.property.impl.position.BiasAlignment.InsideAlignment.Companion.BottomEnd -import com.bumble.appyx.interactions.core.ui.property.impl.position.BiasAlignment.InsideAlignment.Companion.BottomStart -import com.bumble.appyx.interactions.core.ui.property.impl.position.BiasAlignment.InsideAlignment.Companion.TopEnd -import com.bumble.appyx.interactions.core.ui.property.impl.position.BiasAlignment.InsideAlignment.Companion.TopStart -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.gesture.Drag.Direction8.DOWN +import com.bumble.appyx.interactions.gesture.Drag.Direction8.DOWNLEFT +import com.bumble.appyx.interactions.gesture.Drag.Direction8.DOWNRIGHT +import com.bumble.appyx.interactions.gesture.Drag.Direction8.LEFT +import com.bumble.appyx.interactions.gesture.Drag.Direction8.RIGHT +import com.bumble.appyx.interactions.gesture.Drag.Direction8.UP +import com.bumble.appyx.interactions.gesture.Drag.Direction8.UPLEFT +import com.bumble.appyx.interactions.gesture.Drag.Direction8.UPRIGHT +import com.bumble.appyx.interactions.gesture.Gesture +import com.bumble.appyx.interactions.gesture.GestureFactory +import com.bumble.appyx.interactions.gesture.dragDirection8 +import com.bumble.appyx.interactions.ui.DefaultAnimationSpec +import com.bumble.appyx.interactions.ui.property.impl.BackgroundColor +import com.bumble.appyx.interactions.ui.property.impl.RotationZ +import com.bumble.appyx.interactions.ui.property.impl.position.BiasAlignment.InsideAlignment.Companion.BottomEnd +import com.bumble.appyx.interactions.ui.property.impl.position.BiasAlignment.InsideAlignment.Companion.BottomStart +import com.bumble.appyx.interactions.ui.property.impl.position.BiasAlignment.InsideAlignment.Companion.TopEnd +import com.bumble.appyx.interactions.ui.property.impl.position.BiasAlignment.InsideAlignment.Companion.TopStart +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 com.bumble.appyx.utils.multiplatform.AppyxLogger diff --git a/demos/mkdocs/appyx-interactions/gestures/incompletedrag/web/src/jsMain/kotlin/com/bumble/appyx/demos/incompletedrag/TargetUiState.kt b/demos/mkdocs/appyx-interactions/gestures/incompletedrag/web/src/jsMain/kotlin/com/bumble/appyx/demos/incompletedrag/TargetUiState.kt index a921859e3..421759948 100644 --- a/demos/mkdocs/appyx-interactions/gestures/incompletedrag/web/src/jsMain/kotlin/com/bumble/appyx/demos/incompletedrag/TargetUiState.kt +++ b/demos/mkdocs/appyx-interactions/gestures/incompletedrag/web/src/jsMain/kotlin/com/bumble/appyx/demos/incompletedrag/TargetUiState.kt @@ -1,11 +1,11 @@ package com.bumble.appyx.demos.incompletedrag -import com.bumble.appyx.interactions.core.ui.property.impl.BackgroundColor -import com.bumble.appyx.interactions.core.ui.property.impl.RotationZ -import com.bumble.appyx.interactions.core.ui.property.impl.RoundedCorners -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.BackgroundColor +import com.bumble.appyx.interactions.ui.property.impl.RotationZ +import com.bumble.appyx.interactions.ui.property.impl.RoundedCorners +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 @Suppress("unused") @MutableUiStateSpecs diff --git a/demos/mkdocs/appyx-interactions/interactions/observemp/web/src/jsMain/kotlin/com/bumble/appyx/demos/observemp/ObserveMotionPropertiesSample.kt b/demos/mkdocs/appyx-interactions/interactions/observemp/web/src/jsMain/kotlin/com/bumble/appyx/demos/observemp/ObserveMotionPropertiesSample.kt index 46b3e2629..3223c42a8 100644 --- a/demos/mkdocs/appyx-interactions/interactions/observemp/web/src/jsMain/kotlin/com/bumble/appyx/demos/observemp/ObserveMotionPropertiesSample.kt +++ b/demos/mkdocs/appyx-interactions/interactions/observemp/web/src/jsMain/kotlin/com/bumble/appyx/demos/observemp/ObserveMotionPropertiesSample.kt @@ -27,10 +27,10 @@ import com.bumble.appyx.components.spotlight.ui.sliderrotation.SpotlightSliderRo import com.bumble.appyx.demos.common.AppyxWebSample import com.bumble.appyx.demos.common.InteractionTarget import com.bumble.appyx.demos.common.colors -import com.bumble.appyx.interactions.core.Element -import com.bumble.appyx.interactions.core.ui.property.impl.RotationY -import com.bumble.appyx.interactions.core.ui.property.impl.position.PositionAlignment -import com.bumble.appyx.interactions.core.ui.property.motionPropertyRenderValue +import com.bumble.appyx.interactions.model.Element +import com.bumble.appyx.interactions.ui.property.impl.RotationY +import com.bumble.appyx.interactions.ui.property.impl.position.PositionAlignment +import com.bumble.appyx.interactions.ui.property.motionPropertyRenderValue import kotlin.math.roundToInt @Composable diff --git a/demos/mkdocs/appyx-interactions/interactions/sample1/web/src/jsMain/kotlin/com/bumble/appyx/demos/sample1/Sample1.kt b/demos/mkdocs/appyx-interactions/interactions/sample1/web/src/jsMain/kotlin/com/bumble/appyx/demos/sample1/Sample1.kt index 761111964..b6db13809 100644 --- a/demos/mkdocs/appyx-interactions/interactions/sample1/web/src/jsMain/kotlin/com/bumble/appyx/demos/sample1/Sample1.kt +++ b/demos/mkdocs/appyx-interactions/interactions/sample1/web/src/jsMain/kotlin/com/bumble/appyx/demos/sample1/Sample1.kt @@ -36,10 +36,10 @@ import com.bumble.appyx.components.internal.testdrive.TestDriveModel.State.Eleme import com.bumble.appyx.components.internal.testdrive.TestDriveModel.State.ElementState.D import com.bumble.appyx.components.internal.testdrive.operation.next import com.bumble.appyx.demos.sample1.InteractionTarget.Child1 -import com.bumble.appyx.interactions.core.AppyxInteractionsContainer -import com.bumble.appyx.interactions.core.GestureReferencePoint -import com.bumble.appyx.interactions.core.model.transition.Operation.Mode.IMMEDIATE -import com.bumble.appyx.interactions.core.ui.helper.AppyxComponentSetup +import com.bumble.appyx.interactions.composable.AppyxInteractionsContainer +import com.bumble.appyx.interactions.gesture.GestureReferencePoint +import com.bumble.appyx.interactions.model.transition.Operation.Mode.IMMEDIATE +import com.bumble.appyx.interactions.ui.helper.AppyxComponentSetup enum class InteractionTarget { Child1 diff --git a/demos/mkdocs/appyx-interactions/interactions/sample1/web/src/jsMain/kotlin/com/bumble/appyx/demos/sample1/Sample1Visualisation.kt b/demos/mkdocs/appyx-interactions/interactions/sample1/web/src/jsMain/kotlin/com/bumble/appyx/demos/sample1/Sample1Visualisation.kt index 793baad1b..8fd3e1764 100644 --- a/demos/mkdocs/appyx-interactions/interactions/sample1/web/src/jsMain/kotlin/com/bumble/appyx/demos/sample1/Sample1Visualisation.kt +++ b/demos/mkdocs/appyx-interactions/interactions/sample1/web/src/jsMain/kotlin/com/bumble/appyx/demos/sample1/Sample1Visualisation.kt @@ -11,28 +11,28 @@ import com.bumble.appyx.components.internal.testdrive.TestDriveModel.State.Eleme import com.bumble.appyx.components.internal.testdrive.TestDriveModel.State.ElementState.C import com.bumble.appyx.components.internal.testdrive.TestDriveModel.State.ElementState.D import com.bumble.appyx.components.internal.testdrive.operation.MoveTo -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.Direction8.DOWN -import com.bumble.appyx.interactions.core.ui.gesture.Drag.Direction8.DOWNLEFT -import com.bumble.appyx.interactions.core.ui.gesture.Drag.Direction8.DOWNRIGHT -import com.bumble.appyx.interactions.core.ui.gesture.Drag.Direction8.LEFT -import com.bumble.appyx.interactions.core.ui.gesture.Drag.Direction8.RIGHT -import com.bumble.appyx.interactions.core.ui.gesture.Drag.Direction8.UP -import com.bumble.appyx.interactions.core.ui.gesture.Drag.Direction8.UPLEFT -import com.bumble.appyx.interactions.core.ui.gesture.Drag.Direction8.UPRIGHT -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.dragDirection8 -import com.bumble.appyx.interactions.core.ui.DefaultAnimationSpec -import com.bumble.appyx.interactions.core.ui.property.impl.BackgroundColor -import com.bumble.appyx.interactions.core.ui.property.impl.position.BiasAlignment.InsideAlignment -import com.bumble.appyx.interactions.core.ui.property.impl.position.BiasAlignment.InsideAlignment.Companion.BottomEnd -import com.bumble.appyx.interactions.core.ui.property.impl.position.BiasAlignment.InsideAlignment.Companion.TopEnd -import com.bumble.appyx.interactions.core.ui.property.impl.position.BiasAlignment.InsideAlignment.Companion.TopStart -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.gesture.Drag.Direction8.DOWN +import com.bumble.appyx.interactions.gesture.Drag.Direction8.DOWNLEFT +import com.bumble.appyx.interactions.gesture.Drag.Direction8.DOWNRIGHT +import com.bumble.appyx.interactions.gesture.Drag.Direction8.LEFT +import com.bumble.appyx.interactions.gesture.Drag.Direction8.RIGHT +import com.bumble.appyx.interactions.gesture.Drag.Direction8.UP +import com.bumble.appyx.interactions.gesture.Drag.Direction8.UPLEFT +import com.bumble.appyx.interactions.gesture.Drag.Direction8.UPRIGHT +import com.bumble.appyx.interactions.gesture.Gesture +import com.bumble.appyx.interactions.gesture.GestureFactory +import com.bumble.appyx.interactions.gesture.dragDirection8 +import com.bumble.appyx.interactions.ui.DefaultAnimationSpec +import com.bumble.appyx.interactions.ui.property.impl.BackgroundColor +import com.bumble.appyx.interactions.ui.property.impl.position.BiasAlignment.InsideAlignment +import com.bumble.appyx.interactions.ui.property.impl.position.BiasAlignment.InsideAlignment.Companion.BottomEnd +import com.bumble.appyx.interactions.ui.property.impl.position.BiasAlignment.InsideAlignment.Companion.TopEnd +import com.bumble.appyx.interactions.ui.property.impl.position.BiasAlignment.InsideAlignment.Companion.TopStart +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 com.bumble.appyx.utils.multiplatform.AppyxLogger diff --git a/demos/mkdocs/appyx-interactions/interactions/sample1/web/src/jsMain/kotlin/com/bumble/appyx/demos/sample1/TargetUiState.kt b/demos/mkdocs/appyx-interactions/interactions/sample1/web/src/jsMain/kotlin/com/bumble/appyx/demos/sample1/TargetUiState.kt index 79c5a24ce..4312ea1b6 100644 --- a/demos/mkdocs/appyx-interactions/interactions/sample1/web/src/jsMain/kotlin/com/bumble/appyx/demos/sample1/TargetUiState.kt +++ b/demos/mkdocs/appyx-interactions/interactions/sample1/web/src/jsMain/kotlin/com/bumble/appyx/demos/sample1/TargetUiState.kt @@ -1,10 +1,10 @@ package com.bumble.appyx.demos.sample1 -import com.bumble.appyx.interactions.core.ui.property.impl.BackgroundColor -import com.bumble.appyx.interactions.core.ui.property.impl.RoundedCorners -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.BackgroundColor +import com.bumble.appyx.interactions.ui.property.impl.RoundedCorners +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 @Suppress("unused") @MutableUiStateSpecs diff --git a/demos/mkdocs/appyx-interactions/interactions/sample2/web/src/jsMain/kotlin/com/bumble/appyx/demos/sample2/Sample2.kt b/demos/mkdocs/appyx-interactions/interactions/sample2/web/src/jsMain/kotlin/com/bumble/appyx/demos/sample2/Sample2.kt index 2e55d8ca8..be07cd535 100644 --- a/demos/mkdocs/appyx-interactions/interactions/sample2/web/src/jsMain/kotlin/com/bumble/appyx/demos/sample2/Sample2.kt +++ b/demos/mkdocs/appyx-interactions/interactions/sample2/web/src/jsMain/kotlin/com/bumble/appyx/demos/sample2/Sample2.kt @@ -37,10 +37,10 @@ import com.bumble.appyx.components.internal.testdrive.TestDriveModel.State.Eleme import com.bumble.appyx.components.internal.testdrive.TestDriveModel.State.ElementState.D import com.bumble.appyx.components.internal.testdrive.operation.next import com.bumble.appyx.demos.sample2.InteractionTarget.Child1 -import com.bumble.appyx.interactions.core.AppyxInteractionsContainer -import com.bumble.appyx.interactions.core.GestureReferencePoint -import com.bumble.appyx.interactions.core.model.transition.Operation.Mode.IMMEDIATE -import com.bumble.appyx.interactions.core.ui.helper.AppyxComponentSetup +import com.bumble.appyx.interactions.composable.AppyxInteractionsContainer +import com.bumble.appyx.interactions.gesture.GestureReferencePoint +import com.bumble.appyx.interactions.model.transition.Operation.Mode.IMMEDIATE +import com.bumble.appyx.interactions.ui.helper.AppyxComponentSetup enum class InteractionTarget { Child1 diff --git a/demos/mkdocs/appyx-interactions/interactions/sample2/web/src/jsMain/kotlin/com/bumble/appyx/demos/sample2/Sample2Visualisation.kt b/demos/mkdocs/appyx-interactions/interactions/sample2/web/src/jsMain/kotlin/com/bumble/appyx/demos/sample2/Sample2Visualisation.kt index 8bb13318a..2d7474fb3 100644 --- a/demos/mkdocs/appyx-interactions/interactions/sample2/web/src/jsMain/kotlin/com/bumble/appyx/demos/sample2/Sample2Visualisation.kt +++ b/demos/mkdocs/appyx-interactions/interactions/sample2/web/src/jsMain/kotlin/com/bumble/appyx/demos/sample2/Sample2Visualisation.kt @@ -11,29 +11,29 @@ import com.bumble.appyx.components.internal.testdrive.TestDriveModel.State.Eleme import com.bumble.appyx.components.internal.testdrive.TestDriveModel.State.ElementState.C import com.bumble.appyx.components.internal.testdrive.TestDriveModel.State.ElementState.D import com.bumble.appyx.components.internal.testdrive.operation.MoveTo -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.Direction8.DOWN -import com.bumble.appyx.interactions.core.ui.gesture.Drag.Direction8.DOWNLEFT -import com.bumble.appyx.interactions.core.ui.gesture.Drag.Direction8.DOWNRIGHT -import com.bumble.appyx.interactions.core.ui.gesture.Drag.Direction8.LEFT -import com.bumble.appyx.interactions.core.ui.gesture.Drag.Direction8.RIGHT -import com.bumble.appyx.interactions.core.ui.gesture.Drag.Direction8.UP -import com.bumble.appyx.interactions.core.ui.gesture.Drag.Direction8.UPLEFT -import com.bumble.appyx.interactions.core.ui.gesture.Drag.Direction8.UPRIGHT -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.dragDirection8 -import com.bumble.appyx.interactions.core.ui.DefaultAnimationSpec -import com.bumble.appyx.interactions.core.ui.property.impl.BackgroundColor -import com.bumble.appyx.interactions.core.ui.property.impl.RotationZ -import com.bumble.appyx.interactions.core.ui.property.impl.position.BiasAlignment.InsideAlignment -import com.bumble.appyx.interactions.core.ui.property.impl.position.BiasAlignment.InsideAlignment.Companion.BottomEnd -import com.bumble.appyx.interactions.core.ui.property.impl.position.BiasAlignment.InsideAlignment.Companion.TopEnd -import com.bumble.appyx.interactions.core.ui.property.impl.position.BiasAlignment.InsideAlignment.Companion.TopStart -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.gesture.Drag.Direction8.DOWN +import com.bumble.appyx.interactions.gesture.Drag.Direction8.DOWNLEFT +import com.bumble.appyx.interactions.gesture.Drag.Direction8.DOWNRIGHT +import com.bumble.appyx.interactions.gesture.Drag.Direction8.LEFT +import com.bumble.appyx.interactions.gesture.Drag.Direction8.RIGHT +import com.bumble.appyx.interactions.gesture.Drag.Direction8.UP +import com.bumble.appyx.interactions.gesture.Drag.Direction8.UPLEFT +import com.bumble.appyx.interactions.gesture.Drag.Direction8.UPRIGHT +import com.bumble.appyx.interactions.gesture.Gesture +import com.bumble.appyx.interactions.gesture.GestureFactory +import com.bumble.appyx.interactions.gesture.dragDirection8 +import com.bumble.appyx.interactions.ui.DefaultAnimationSpec +import com.bumble.appyx.interactions.ui.property.impl.BackgroundColor +import com.bumble.appyx.interactions.ui.property.impl.RotationZ +import com.bumble.appyx.interactions.ui.property.impl.position.BiasAlignment.InsideAlignment +import com.bumble.appyx.interactions.ui.property.impl.position.BiasAlignment.InsideAlignment.Companion.BottomEnd +import com.bumble.appyx.interactions.ui.property.impl.position.BiasAlignment.InsideAlignment.Companion.TopEnd +import com.bumble.appyx.interactions.ui.property.impl.position.BiasAlignment.InsideAlignment.Companion.TopStart +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 com.bumble.appyx.utils.multiplatform.AppyxLogger diff --git a/demos/mkdocs/appyx-interactions/interactions/sample2/web/src/jsMain/kotlin/com/bumble/appyx/demos/sample2/TargetUiState.kt b/demos/mkdocs/appyx-interactions/interactions/sample2/web/src/jsMain/kotlin/com/bumble/appyx/demos/sample2/TargetUiState.kt index c72f6b037..bd86cc384 100644 --- a/demos/mkdocs/appyx-interactions/interactions/sample2/web/src/jsMain/kotlin/com/bumble/appyx/demos/sample2/TargetUiState.kt +++ b/demos/mkdocs/appyx-interactions/interactions/sample2/web/src/jsMain/kotlin/com/bumble/appyx/demos/sample2/TargetUiState.kt @@ -1,11 +1,11 @@ package com.bumble.appyx.demos.sample2 -import com.bumble.appyx.interactions.core.ui.property.impl.BackgroundColor -import com.bumble.appyx.interactions.core.ui.property.impl.RotationZ -import com.bumble.appyx.interactions.core.ui.property.impl.RoundedCorners -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.BackgroundColor +import com.bumble.appyx.interactions.ui.property.impl.RotationZ +import com.bumble.appyx.interactions.ui.property.impl.RoundedCorners +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 @Suppress("unused") @MutableUiStateSpecs diff --git a/demos/mkdocs/appyx-interactions/interactions/sample3/web/src/jsMain/kotlin/com/bumble/appyx/demos/sample3/Sample3.kt b/demos/mkdocs/appyx-interactions/interactions/sample3/web/src/jsMain/kotlin/com/bumble/appyx/demos/sample3/Sample3.kt index 69f201c47..c94fa7ad5 100644 --- a/demos/mkdocs/appyx-interactions/interactions/sample3/web/src/jsMain/kotlin/com/bumble/appyx/demos/sample3/Sample3.kt +++ b/demos/mkdocs/appyx-interactions/interactions/sample3/web/src/jsMain/kotlin/com/bumble/appyx/demos/sample3/Sample3.kt @@ -45,13 +45,13 @@ import com.bumble.appyx.components.internal.testdrive.TestDriveModel.State.Eleme import com.bumble.appyx.components.internal.testdrive.operation.next import com.bumble.appyx.demos.sample3.InteractionTarget.Child1 import com.bumble.appyx.demos.sample3.Sample3Visualisation.Companion.toTargetUiState -import com.bumble.appyx.interactions.core.AppyxInteractionsContainer -import com.bumble.appyx.interactions.core.GestureReferencePoint -import com.bumble.appyx.interactions.core.model.transition.Keyframes -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.model.transition.Update -import com.bumble.appyx.interactions.core.ui.helper.AppyxComponentSetup +import com.bumble.appyx.interactions.composable.AppyxInteractionsContainer +import com.bumble.appyx.interactions.gesture.GestureReferencePoint +import com.bumble.appyx.interactions.model.transition.Keyframes +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.model.transition.Update +import com.bumble.appyx.interactions.ui.helper.AppyxComponentSetup enum class InteractionTarget { Child1 diff --git a/demos/mkdocs/appyx-interactions/interactions/sample3/web/src/jsMain/kotlin/com/bumble/appyx/demos/sample3/Sample3Visualisation.kt b/demos/mkdocs/appyx-interactions/interactions/sample3/web/src/jsMain/kotlin/com/bumble/appyx/demos/sample3/Sample3Visualisation.kt index 3af8bb9ce..00dd57a56 100644 --- a/demos/mkdocs/appyx-interactions/interactions/sample3/web/src/jsMain/kotlin/com/bumble/appyx/demos/sample3/Sample3Visualisation.kt +++ b/demos/mkdocs/appyx-interactions/interactions/sample3/web/src/jsMain/kotlin/com/bumble/appyx/demos/sample3/Sample3Visualisation.kt @@ -11,28 +11,28 @@ import com.bumble.appyx.components.internal.testdrive.TestDriveModel.State.Eleme import com.bumble.appyx.components.internal.testdrive.TestDriveModel.State.ElementState.C import com.bumble.appyx.components.internal.testdrive.TestDriveModel.State.ElementState.D import com.bumble.appyx.components.internal.testdrive.operation.MoveTo -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.Direction8.DOWN -import com.bumble.appyx.interactions.core.ui.gesture.Drag.Direction8.DOWNLEFT -import com.bumble.appyx.interactions.core.ui.gesture.Drag.Direction8.DOWNRIGHT -import com.bumble.appyx.interactions.core.ui.gesture.Drag.Direction8.LEFT -import com.bumble.appyx.interactions.core.ui.gesture.Drag.Direction8.RIGHT -import com.bumble.appyx.interactions.core.ui.gesture.Drag.Direction8.UP -import com.bumble.appyx.interactions.core.ui.gesture.Drag.Direction8.UPLEFT -import com.bumble.appyx.interactions.core.ui.gesture.Drag.Direction8.UPRIGHT -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.dragDirection8 -import com.bumble.appyx.interactions.core.ui.DefaultAnimationSpec -import com.bumble.appyx.interactions.core.ui.property.impl.BackgroundColor -import com.bumble.appyx.interactions.core.ui.property.impl.position.BiasAlignment.InsideAlignment.Companion.BottomEnd -import com.bumble.appyx.interactions.core.ui.property.impl.position.BiasAlignment.InsideAlignment.Companion.BottomStart -import com.bumble.appyx.interactions.core.ui.property.impl.position.BiasAlignment.InsideAlignment.Companion.TopEnd -import com.bumble.appyx.interactions.core.ui.property.impl.position.BiasAlignment.InsideAlignment.Companion.TopStart -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.gesture.Drag.Direction8.DOWN +import com.bumble.appyx.interactions.gesture.Drag.Direction8.DOWNLEFT +import com.bumble.appyx.interactions.gesture.Drag.Direction8.DOWNRIGHT +import com.bumble.appyx.interactions.gesture.Drag.Direction8.LEFT +import com.bumble.appyx.interactions.gesture.Drag.Direction8.RIGHT +import com.bumble.appyx.interactions.gesture.Drag.Direction8.UP +import com.bumble.appyx.interactions.gesture.Drag.Direction8.UPLEFT +import com.bumble.appyx.interactions.gesture.Drag.Direction8.UPRIGHT +import com.bumble.appyx.interactions.gesture.Gesture +import com.bumble.appyx.interactions.gesture.GestureFactory +import com.bumble.appyx.interactions.gesture.dragDirection8 +import com.bumble.appyx.interactions.ui.DefaultAnimationSpec +import com.bumble.appyx.interactions.ui.property.impl.BackgroundColor +import com.bumble.appyx.interactions.ui.property.impl.position.BiasAlignment.InsideAlignment.Companion.BottomEnd +import com.bumble.appyx.interactions.ui.property.impl.position.BiasAlignment.InsideAlignment.Companion.BottomStart +import com.bumble.appyx.interactions.ui.property.impl.position.BiasAlignment.InsideAlignment.Companion.TopEnd +import com.bumble.appyx.interactions.ui.property.impl.position.BiasAlignment.InsideAlignment.Companion.TopStart +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 com.bumble.appyx.utils.multiplatform.AppyxLogger diff --git a/demos/mkdocs/appyx-interactions/interactions/sample3/web/src/jsMain/kotlin/com/bumble/appyx/demos/sample3/TargetUiState.kt b/demos/mkdocs/appyx-interactions/interactions/sample3/web/src/jsMain/kotlin/com/bumble/appyx/demos/sample3/TargetUiState.kt index 36df79cd4..9e00c3688 100644 --- a/demos/mkdocs/appyx-interactions/interactions/sample3/web/src/jsMain/kotlin/com/bumble/appyx/demos/sample3/TargetUiState.kt +++ b/demos/mkdocs/appyx-interactions/interactions/sample3/web/src/jsMain/kotlin/com/bumble/appyx/demos/sample3/TargetUiState.kt @@ -1,10 +1,10 @@ package com.bumble.appyx.demos.sample3 -import com.bumble.appyx.interactions.core.ui.property.impl.BackgroundColor -import com.bumble.appyx.interactions.core.ui.property.impl.RoundedCorners -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.BackgroundColor +import com.bumble.appyx.interactions.ui.property.impl.RoundedCorners +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 @Suppress("unused") @MutableUiStateSpecs diff --git a/demos/sandbox-appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/demos/sandbox/navigation/node/backstack/BackStackExamplesNode.kt b/demos/sandbox-appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/demos/sandbox/navigation/node/backstack/BackStackExamplesNode.kt index 29458efb5..ce425a5aa 100644 --- a/demos/sandbox-appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/demos/sandbox/navigation/node/backstack/BackStackExamplesNode.kt +++ b/demos/sandbox-appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/demos/sandbox/navigation/node/backstack/BackStackExamplesNode.kt @@ -23,7 +23,7 @@ import com.bumble.appyx.components.backstack.ui.stack3d.BackStack3D import com.bumble.appyx.demos.sandbox.navigation.node.backstack.BackStackExamplesNode.NavTarget import com.bumble.appyx.demos.sandbox.navigation.ui.TextButton import com.bumble.appyx.demos.sandbox.navigation.ui.appyx_dark -import com.bumble.appyx.interactions.core.ui.gesture.GestureSettleConfig +import com.bumble.appyx.interactions.gesture.GestureSettleConfig import com.bumble.appyx.navigation.composable.AppyxNavigationContainer import com.bumble.appyx.navigation.modality.NodeContext import com.bumble.appyx.navigation.node.Node diff --git a/demos/sandbox-appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/demos/sandbox/navigation/node/backstack/BackStackNode.kt b/demos/sandbox-appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/demos/sandbox/navigation/node/backstack/BackStackNode.kt index 9d52e6915..dc33fbd2c 100644 --- a/demos/sandbox-appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/demos/sandbox/navigation/node/backstack/BackStackNode.kt +++ b/demos/sandbox-appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/demos/sandbox/navigation/node/backstack/BackStackNode.kt @@ -29,11 +29,11 @@ import com.bumble.appyx.demos.sandbox.navigation.ColorSaver import com.bumble.appyx.demos.sandbox.navigation.colors import com.bumble.appyx.demos.sandbox.navigation.ui.TextButton import com.bumble.appyx.demos.sandbox.navigation.ui.appyx_dark -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.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 import com.bumble.appyx.navigation.composable.AppyxNavigationContainer import com.bumble.appyx.navigation.modality.NodeContext import com.bumble.appyx.navigation.node.Node diff --git a/demos/sandbox-appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/demos/sandbox/navigation/node/promoter/PromoterNode.kt b/demos/sandbox-appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/demos/sandbox/navigation/node/promoter/PromoterNode.kt index 773dc51b6..6978c22c1 100644 --- a/demos/sandbox-appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/demos/sandbox/navigation/node/promoter/PromoterNode.kt +++ b/demos/sandbox-appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/demos/sandbox/navigation/node/promoter/PromoterNode.kt @@ -33,8 +33,8 @@ import com.bumble.appyx.components.experimental.promoter.ui.PromoterVisualisatio import com.bumble.appyx.demos.sandbox.navigation.colors import com.bumble.appyx.demos.sandbox.navigation.node.promoter.PromoterNode.NavTarget import com.bumble.appyx.demos.sandbox.navigation.node.promoter.PromoterNode.NavTarget.Child -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.model.transition.Operation.Mode.IMMEDIATE +import com.bumble.appyx.interactions.model.transition.Operation.Mode.KEYFRAME import com.bumble.appyx.navigation.composable.AppyxNavigationContainer import com.bumble.appyx.navigation.modality.NodeContext import com.bumble.appyx.navigation.node.Node diff --git a/demos/sandbox-appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/demos/sandbox/navigation/node/spotlight/SpotlightObserveTransitionsExampleNode.kt b/demos/sandbox-appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/demos/sandbox/navigation/node/spotlight/SpotlightObserveTransitionsExampleNode.kt index f6affcb0c..281746cf7 100644 --- a/demos/sandbox-appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/demos/sandbox/navigation/node/spotlight/SpotlightObserveTransitionsExampleNode.kt +++ b/demos/sandbox-appyx-navigation/common/src/commonMain/kotlin/com/bumble/appyx/demos/sandbox/navigation/node/spotlight/SpotlightObserveTransitionsExampleNode.kt @@ -32,9 +32,9 @@ import com.bumble.appyx.components.spotlight.ui.sliderrotation.SpotlightSliderRo import com.bumble.appyx.demos.sandbox.navigation.colors import com.bumble.appyx.demos.sandbox.navigation.node.spotlight.SpotlightObserveTransitionsExampleNode.NavTarget import com.bumble.appyx.demos.sandbox.navigation.ui.appyx_dark -import com.bumble.appyx.interactions.core.ui.property.impl.RotationY -import com.bumble.appyx.interactions.core.ui.property.impl.position.PositionAlignment -import com.bumble.appyx.interactions.core.ui.property.motionPropertyRenderValue +import com.bumble.appyx.interactions.ui.property.impl.RotationY +import com.bumble.appyx.interactions.ui.property.impl.position.PositionAlignment +import com.bumble.appyx.interactions.ui.property.motionPropertyRenderValue import com.bumble.appyx.navigation.composable.AppyxNavigationContainer import com.bumble.appyx.navigation.modality.NodeContext import com.bumble.appyx.navigation.node.Node diff --git a/documentation/releases/2.0.0-alpha11.md b/documentation/releases/2.0.0-alpha11.md index 2e8ae1f18..65cf5d38a 100644 --- a/documentation/releases/2.0.0-alpha11.md +++ b/documentation/releases/2.0.0-alpha11.md @@ -4,6 +4,33 @@ title: 2.0.0-alpha11 – Migration guide # 2.0.0-alpha11 – Migration guide +## Package changes + +```diff +// Moved all classes: +-com.bumble.appyx.interactions.core.gesture.* +-com.bumble.appyx.interactions.ui.gesture.* ++com.bumble.appyx.interactions.gesture.* + +// Moved specific classes: +-com.bumble.appyx.interactions.AppyxInteractionContainer ++com.bumble.appyx.interactions.composable.AppyxInteractionContainer + +-com.bumble.appyx.interactions.GestureReferencePoint ++com.bumble.appyx.interactions.gesture.GestureReferencePoint + +-com.bumble.appyx.interactions.Element +-com.bumble.appyx.interactions.Elements ++com.bumble.appyx.interactions.model.Element ++com.bumble.appyx.interactions.model.Elements + + +// Moved all remaining packages in core to interactions root: +-com.bumble.appyx.interactions.core.* ++com.bumble.appyx.interactions.* + +``` + ## Fixed `canHandeBackPress` typo ```diff @@ -28,4 +55,4 @@ If you were depending on these classes being part of appyx-navigation, you’ll - import com.bumble.appyx.navigation.clienthelper.interactor.Interactor + import com.bumble.appyx.utils.ribshelpers.interactor.Interactor -``` \ No newline at end of file +``` diff --git a/ksp/mutable-ui-processor/src/commonMain/kotlin/com/bumble/appyx/interactions/ksp/MutableUiStateProcessor.kt b/ksp/mutable-ui-processor/src/commonMain/kotlin/com/bumble/appyx/interactions/ksp/MutableUiStateProcessor.kt index 0d3cdcf87..faedddaf4 100644 --- a/ksp/mutable-ui-processor/src/commonMain/kotlin/com/bumble/appyx/interactions/ksp/MutableUiStateProcessor.kt +++ b/ksp/mutable-ui-processor/src/commonMain/kotlin/com/bumble/appyx/interactions/ksp/MutableUiStateProcessor.kt @@ -2,10 +2,10 @@ package com.bumble.appyx.interactions.ksp import androidx.compose.animation.core.SpringSpec import androidx.compose.ui.Modifier -import com.bumble.appyx.interactions.core.ui.context.UiContext -import com.bumble.appyx.interactions.core.ui.property.MotionProperty -import com.bumble.appyx.interactions.core.ui.state.BaseMutableUiState -import com.bumble.appyx.interactions.core.ui.state.MutableUiStateSpecs +import com.bumble.appyx.interactions.ui.context.UiContext +import com.bumble.appyx.interactions.ui.property.MotionProperty +import com.bumble.appyx.interactions.ui.state.BaseMutableUiState +import com.bumble.appyx.interactions.ui.state.MutableUiStateSpecs import com.google.devtools.ksp.processing.CodeGenerator import com.google.devtools.ksp.processing.KSPLogger import com.google.devtools.ksp.processing.Resolver diff --git a/utils/interop-rx2/src/main/kotlin/com/bumble/appyx/utils/interop/rx2/plugin/DisposeOnDestroy.kt b/utils/interop-rx2/src/main/kotlin/com/bumble/appyx/utils/interop/rx2/plugin/DisposeOnDestroy.kt index 0f2a9565c..cd1698f57 100644 --- a/utils/interop-rx2/src/main/kotlin/com/bumble/appyx/utils/interop/rx2/plugin/DisposeOnDestroy.kt +++ b/utils/interop-rx2/src/main/kotlin/com/bumble/appyx/utils/interop/rx2/plugin/DisposeOnDestroy.kt @@ -1,6 +1,6 @@ package com.bumble.appyx.utils.interop.rx2.plugin -import com.bumble.appyx.interactions.core.plugin.Plugin +import com.bumble.appyx.interactions.plugin.Plugin import com.bumble.appyx.navigation.plugin.Destroyable import io.reactivex.disposables.CompositeDisposable import io.reactivex.disposables.Disposable diff --git a/utils/interop-rx3/src/main/kotlin/com/bumble/appyx/utils/interop/rx3/plugin/DisposeOnDestroy.kt b/utils/interop-rx3/src/main/kotlin/com/bumble/appyx/utils/interop/rx3/plugin/DisposeOnDestroy.kt index 99aecb49f..85a7178a2 100644 --- a/utils/interop-rx3/src/main/kotlin/com/bumble/appyx/utils/interop/rx3/plugin/DisposeOnDestroy.kt +++ b/utils/interop-rx3/src/main/kotlin/com/bumble/appyx/utils/interop/rx3/plugin/DisposeOnDestroy.kt @@ -1,6 +1,6 @@ package com.bumble.appyx.utils.interop.rx3.plugin -import com.bumble.appyx.interactions.core.plugin.Plugin +import com.bumble.appyx.interactions.plugin.Plugin import com.bumble.appyx.navigation.plugin.Destroyable import io.reactivex.rxjava3.disposables.CompositeDisposable import io.reactivex.rxjava3.disposables.Disposable diff --git a/utils/material3/src/commonMain/kotlin/com/bumble/appyx/utils/material3/AppyxMaterial3NavNode.kt b/utils/material3/src/commonMain/kotlin/com/bumble/appyx/utils/material3/AppyxMaterial3NavNode.kt index 8c83bc090..3d8318ae4 100644 --- a/utils/material3/src/commonMain/kotlin/com/bumble/appyx/utils/material3/AppyxMaterial3NavNode.kt +++ b/utils/material3/src/commonMain/kotlin/com/bumble/appyx/utils/material3/AppyxMaterial3NavNode.kt @@ -29,9 +29,9 @@ import com.bumble.appyx.components.spotlight.SpotlightModel import com.bumble.appyx.components.spotlight.SpotlightModel.State import com.bumble.appyx.components.spotlight.operation.activate import com.bumble.appyx.components.spotlight.ui.fader.SpotlightFader -import com.bumble.appyx.interactions.core.plugin.Plugin -import com.bumble.appyx.interactions.core.ui.Visualisation -import com.bumble.appyx.interactions.core.ui.context.UiContext +import com.bumble.appyx.interactions.plugin.Plugin +import com.bumble.appyx.interactions.ui.Visualisation +import com.bumble.appyx.interactions.ui.context.UiContext import com.bumble.appyx.navigation.Appyx import com.bumble.appyx.navigation.children.ChildAware import com.bumble.appyx.navigation.children.ChildAwareImpl diff --git a/utils/ribs-helpers/src/main/kotlin/com/bumble/appyx/utils/ribshelpers/interactor/Interactor.kt b/utils/ribs-helpers/src/main/kotlin/com/bumble/appyx/utils/ribshelpers/interactor/Interactor.kt index e0182aca9..af91cbbef 100644 --- a/utils/ribs-helpers/src/main/kotlin/com/bumble/appyx/utils/ribshelpers/interactor/Interactor.kt +++ b/utils/ribs-helpers/src/main/kotlin/com/bumble/appyx/utils/ribshelpers/interactor/Interactor.kt @@ -1,6 +1,6 @@ package com.bumble.appyx.utils.ribshelpers.interactor -import com.bumble.appyx.interactions.core.plugin.SavesInstanceState +import com.bumble.appyx.interactions.plugin.SavesInstanceState import com.bumble.appyx.navigation.children.ChildAware import com.bumble.appyx.navigation.children.ChildAwareImpl import com.bumble.appyx.navigation.node.Node diff --git a/utils/testing-ui/src/main/kotlin/com/bumble/appyx/utils/testing/ui/utils/DummyNode.kt b/utils/testing-ui/src/main/kotlin/com/bumble/appyx/utils/testing/ui/utils/DummyNode.kt index 9e516c306..2c8c9594f 100644 --- a/utils/testing-ui/src/main/kotlin/com/bumble/appyx/utils/testing/ui/utils/DummyNode.kt +++ b/utils/testing-ui/src/main/kotlin/com/bumble/appyx/utils/testing/ui/utils/DummyNode.kt @@ -1,6 +1,6 @@ package com.bumble.appyx.utils.testing.ui.utils -import com.bumble.appyx.interactions.core.model.EmptyAppyxComponent +import com.bumble.appyx.interactions.model.EmptyAppyxComponent import com.bumble.appyx.navigation.modality.NodeContext import com.bumble.appyx.navigation.node.Node import com.bumble.appyx.navigation.node.node