Fix static imports

bumble-tech · Jan 15, 2024 · c46208d · c46208d
1 parent a9ed3a8
commit c46208d
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 11 deletions.
diff --git a/.../kotlin/com/bumble/appyx/demos/navigation/component/spotlighthero/ExitHeroModeStrategy.kt b/.../kotlin/com/bumble/appyx/demos/navigation/component/spotlighthero/ExitHeroModeStrategy.kt
@@ -13,7 +13,7 @@ import kotlinx.coroutines.flow.StateFlow
 class ExitHeroModeStrategy<NavTarget : Any>(
     val scope: CoroutineScope,
     val animationSpec: AnimationSpec<Float>? = null
-) : BaseBackPressHandlerStrategy<NavTarget, com.bumble.appyx.demos.navigation.component.spotlighthero.SpotlightHeroModel.State<NavTarget>>() {
+) : BaseBackPressHandlerStrategy<NavTarget, SpotlightHeroModel.State<NavTarget>>() {
 
     override val canHandleBackPress: StateFlow<Boolean> by lazy {
         transitionModel.output.mapState(scope) { output ->

diff --git a/...mmonMain/kotlin/com/bumble/appyx/demos/sandbox/navigation/node/backstack/BackStackNode.kt b/...mmonMain/kotlin/com/bumble/appyx/demos/sandbox/navigation/node/backstack/BackStackNode.kt
@@ -25,6 +25,8 @@ import com.bumble.appyx.components.backstack.operation.newRoot
 import com.bumble.appyx.components.backstack.operation.pop
 import com.bumble.appyx.components.backstack.operation.push
 import com.bumble.appyx.components.backstack.operation.replace
+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
@@ -73,7 +75,7 @@ class BackStackNode(
         when (navTarget) {
             is NavTarget.Child -> node(nodeContext) {
                 val backgroundColor =
-                    rememberSaveable(saver = com.bumble.appyx.demos.sandbox.navigation.ColorSaver) { com.bumble.appyx.demos.sandbox.navigation.colors.shuffled().random() }
+                    rememberSaveable(saver = ColorSaver) { colors.shuffled().random() }
 
                 Box(
                     modifier = Modifier

diff --git a/...tlin/com/bumble/appyx/demos/sandbox/navigation/node/backstack/debug/BackstackDebugNode.kt b/...tlin/com/bumble/appyx/demos/sandbox/navigation/node/backstack/debug/BackstackDebugNode.kt
@@ -24,6 +24,7 @@ import com.bumble.appyx.components.backstack.operation.pop
 import com.bumble.appyx.components.backstack.operation.push
 import com.bumble.appyx.components.backstack.operation.replace
 import com.bumble.appyx.components.backstack.ui.slider.BackStackSlider
+import com.bumble.appyx.demos.sandbox.navigation.colors
 import com.bumble.appyx.demos.sandbox.navigation.composable.KnobControl
 import com.bumble.appyx.demos.sandbox.navigation.node.backstack.debug.BackstackDebugNode.NavTarget
 import com.bumble.appyx.demos.sandbox.navigation.ui.appyx_dark
@@ -68,7 +69,7 @@ class BackstackDebugNode(
     override fun buildChildNode(navTarget: NavTarget, nodeContext: NodeContext): Node =
         when (navTarget) {
             is NavTarget.Child -> node(nodeContext) {
-                val backgroundColor = remember { com.bumble.appyx.demos.sandbox.navigation.colors.shuffled().random() }
+                val backgroundColor = remember { colors.shuffled().random() }
 
                 Box(
                     modifier = Modifier

diff --git a/...mmonMain/kotlin/com/bumble/appyx/demos/sandbox/navigation/node/modal/ModalExamplesNode.kt b/...mmonMain/kotlin/com/bumble/appyx/demos/sandbox/navigation/node/modal/ModalExamplesNode.kt
@@ -22,6 +22,7 @@ import com.bumble.appyx.components.modal.operation.fullScreen
 import com.bumble.appyx.components.modal.operation.revert
 import com.bumble.appyx.components.modal.operation.show
 import com.bumble.appyx.components.modal.ui.ModalVisualisation
+import com.bumble.appyx.demos.sandbox.navigation.colors
 import com.bumble.appyx.demos.sandbox.navigation.node.modal.ModalExamplesNode.NavTarget
 import com.bumble.appyx.demos.sandbox.navigation.ui.TextButton
 import com.bumble.appyx.demos.sandbox.navigation.ui.appyx_dark
@@ -57,7 +58,7 @@ class ModalExamplesNode(
     override fun buildChildNode(navTarget: NavTarget, nodeContext: NodeContext): Node =
         when (navTarget) {
             is NavTarget.Child -> node(nodeContext) {
-                val backgroundColor = remember { com.bumble.appyx.demos.sandbox.navigation.colors.shuffled().random() }
+                val backgroundColor = remember { colors.shuffled().random() }
 
                 Box(
                     modifier = Modifier

diff --git a/...otlin/com/bumble/appyx/demos/sandbox/navigation/node/permanentchild/PermanentChildNode.kt b/...otlin/com/bumble/appyx/demos/sandbox/navigation/node/permanentchild/PermanentChildNode.kt
@@ -16,6 +16,7 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
+import com.bumble.appyx.demos.sandbox.navigation.colors
 import com.bumble.appyx.demos.sandbox.navigation.ui.appyx_dark
 import com.bumble.appyx.interactions.permanent.PermanentAppyxComponent
 import com.bumble.appyx.navigation.composable.PermanentChild
@@ -51,7 +52,7 @@ class PermanentChildNode(
     override fun buildChildNode(navTarget: NavTarget, nodeContext: NodeContext): Node =
         when (navTarget) {
             is NavTarget.Child1 -> node(nodeContext) {
-                val backgroundColor = remember { com.bumble.appyx.demos.sandbox.navigation.colors.shuffled().random() }
+                val backgroundColor = remember { colors.shuffled().random() }
                 Box(
                     modifier = Modifier
                         .fillMaxWidth()
@@ -70,7 +71,7 @@ class PermanentChildNode(
             }
 
             is NavTarget.Child2 -> node(nodeContext) {
-                val backgroundColor = remember { com.bumble.appyx.demos.sandbox.navigation.colors.shuffled().random() }
+                val backgroundColor = remember { colors.shuffled().random() }
                 Box(
                     modifier = Modifier
                         .fillMaxWidth()

diff --git a/...commonMain/kotlin/com/bumble/appyx/demos/sandbox/navigation/node/promoter/PromoterNode.kt b/...commonMain/kotlin/com/bumble/appyx/demos/sandbox/navigation/node/promoter/PromoterNode.kt
@@ -30,6 +30,7 @@ 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.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
@@ -75,7 +76,7 @@ class PromoterNode(
     override fun buildChildNode(navTarget: NavTarget, nodeContext: NodeContext): Node =
         when (navTarget) {
             is Child -> node(nodeContext) {
-                val backgroundColor = remember { com.bumble.appyx.demos.sandbox.navigation.colors.shuffled().random() }
+                val backgroundColor = remember { colors.shuffled().random() }
 
                 Box(
                     modifier = Modifier

diff --git a/...mmonMain/kotlin/com/bumble/appyx/demos/sandbox/navigation/node/spotlight/SpotlightNode.kt b/...mmonMain/kotlin/com/bumble/appyx/demos/sandbox/navigation/node/spotlight/SpotlightNode.kt
@@ -33,6 +33,7 @@ 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.demos.sandbox.navigation.colors
 import com.bumble.appyx.demos.sandbox.navigation.node.spotlight.SpotlightNode.NavTarget
 import com.bumble.appyx.demos.sandbox.navigation.ui.appyx_dark
 import com.bumble.appyx.navigation.composable.AppyxNavigationContainer
@@ -69,8 +70,8 @@ class SpotlightNode(
     override fun buildChildNode(navTarget: NavTarget, nodeContext: NodeContext): Node =
         when (navTarget) {
             is NavTarget.Child -> node(nodeContext) { modifier ->
-                val backgroundColorIdx = rememberSaveable { com.bumble.appyx.demos.sandbox.navigation.colors.shuffled().indices.random() }
-                val backgroundColor = com.bumble.appyx.demos.sandbox.navigation.colors[backgroundColorIdx]
+                val backgroundColorIdx = rememberSaveable { colors.shuffled().indices.random() }
+                val backgroundColor = colors[backgroundColorIdx]
                 var clicked by rememberSaveable { mutableStateOf(false) }
 
                 Box(

diff --git a/...e/appyx/demos/sandbox/navigation/node/spotlight/SpotlightObserveTransitionsExampleNode.kt b/...e/appyx/demos/sandbox/navigation/node/spotlight/SpotlightObserveTransitionsExampleNode.kt
@@ -29,6 +29,7 @@ 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.components.spotlight.ui.sliderrotation.SpotlightSliderRotation
+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
@@ -68,7 +69,7 @@ class SpotlightObserveTransitionsExampleNode(
     override fun buildChildNode(navTarget: NavTarget, nodeContext: NodeContext): Node =
         when (navTarget) {
             is NavTarget.Child -> node(nodeContext) { modifier ->
-                val backgroundColor = remember { com.bumble.appyx.demos.sandbox.navigation.colors.shuffled().random() }
+                val backgroundColor = remember { colors.shuffled().random() }
                 Box(
                     modifier = modifier
                         .fillMaxSize()

diff --git a/...tlin/com/bumble/appyx/demos/sandbox/navigation/node/spotlight/debug/SpotlightDebugNode.kt b/...tlin/com/bumble/appyx/demos/sandbox/navigation/node/spotlight/debug/SpotlightDebugNode.kt
@@ -24,6 +24,7 @@ import com.bumble.appyx.components.spotlight.operation.last
 import com.bumble.appyx.components.spotlight.operation.next
 import com.bumble.appyx.components.spotlight.operation.previous
 import com.bumble.appyx.components.spotlight.ui.slider.SpotlightSlider
+import com.bumble.appyx.demos.sandbox.navigation.colors
 import com.bumble.appyx.demos.sandbox.navigation.composable.KnobControl
 import com.bumble.appyx.demos.sandbox.navigation.node.spotlight.debug.SpotlightDebugNode.NavTarget
 import com.bumble.appyx.demos.sandbox.navigation.ui.appyx_dark
@@ -69,7 +70,7 @@ class SpotlightDebugNode(
     override fun buildChildNode(navTarget: NavTarget, nodeContext: NodeContext): Node =
         when (navTarget) {
             is NavTarget.Child -> node(nodeContext) {
-                val backgroundColor = remember { com.bumble.appyx.demos.sandbox.navigation.colors.shuffled().random() }
+                val backgroundColor = remember { colors.shuffled().random() }
                 Box(
                     modifier = Modifier
                         .fillMaxSize()