Merge pull request #658 from zsoltk/cleanup

Remove unused code
bumble-tech · Jan 23, 2024 · 6c419cf · 6c419cf
2 parents d5a2406 + c4454ad
commit 6c419cf
Show file tree

Hide file tree

Showing 13 changed files with 14 additions and 496 deletions.
diff --git a/...xperimental/modal/common/src/commonMain/kotlin/com/bumble/appyx/components/modal/Modal.kt b/...xperimental/modal/common/src/commonMain/kotlin/com/bumble/appyx/components/modal/Modal.kt
@@ -30,7 +30,6 @@ class Modal<InteractionTarget : Any>(
         revertGestureSpec = animationSpec,
     ),
     disableAnimations: Boolean = false,
-    isDebug: Boolean = false,
 ) : BaseAppyxComponent<InteractionTarget, ModalModel.State<InteractionTarget>>(
     scope = scope,
     model = model,
@@ -39,6 +38,5 @@ class Modal<InteractionTarget : Any>(
     backPressStrategy = backPressStrategy,
     defaultAnimationSpec = animationSpec,
     gestureSettleConfig = gestureSettleConfig,
-    disableAnimations = disableAnimations,
-    isDebug = isDebug
+    disableAnimations = disableAnimations
 )
diff --git a/...backstack/common/src/commonMain/kotlin/com/bumble/appyx/components/backstack/BackStack.kt b/...backstack/common/src/commonMain/kotlin/com/bumble/appyx/components/backstack/BackStack.kt
@@ -26,7 +26,6 @@ class BackStack<InteractionTarget : Any>(
     backPressStrategy: BackPressHandlerStrategy<InteractionTarget, BackStackModel.State<InteractionTarget>> =
         PopBackstackStrategy(scope),
     disableAnimations: Boolean = false,
-    isDebug: Boolean = false
 ) : BaseAppyxComponent<InteractionTarget, BackStackModel.State<InteractionTarget>>(
     scope = scope,
     model = model,
@@ -35,7 +34,6 @@ class BackStack<InteractionTarget : Any>(
     gestureSettleConfig = gestureSettleConfig,
     backPressStrategy = backPressStrategy,
     defaultAnimationSpec = animationSpec,
-    disableAnimations = disableAnimations,
-    isDebug = isDebug
+    disableAnimations = disableAnimations
 )
 
diff --git a/...spotlight/common/src/commonMain/kotlin/com/bumble/appyx/components/spotlight/Spotlight.kt b/...spotlight/common/src/commonMain/kotlin/com/bumble/appyx/components/spotlight/Spotlight.kt
@@ -28,16 +28,14 @@ open class Spotlight<InteractionTarget : Any>(
         revertGestureSpec = animationSpec,
     ),
     disableAnimations: Boolean = false,
-    isDebug: Boolean = false
 ) : BaseAppyxComponent<InteractionTarget, SpotlightModel.State<InteractionTarget>>(
     scope = scope,
     model = model,
     visualisation = visualisation,
     gestureFactory = gestureFactory,
     defaultAnimationSpec = animationSpec,
     gestureSettleConfig = gestureSettleConfig,
-    disableAnimations = disableAnimations,
-    isDebug = isDebug
+    disableAnimations = disableAnimations
 ) {
     val activeIndex: StateFlow<Float> = model.output
         .mapState(scope) { it.currentTargetState.activeIndex }

diff --git a/...mmon/src/commonMain/kotlin/com/bumble/appyx/interactions/core/model/BaseAppyxComponent.kt b/...mmon/src/commonMain/kotlin/com/bumble/appyx/interactions/core/model/BaseAppyxComponent.kt
@@ -8,7 +8,6 @@ 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.DebugProgressInputSource
 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
@@ -57,7 +56,6 @@ open class BaseAppyxComponent<InteractionTarget : Any, ModelState : Any>(
     private val backPressStrategy: BackPressHandlerStrategy<InteractionTarget, ModelState> = DontHandleBackPress(),
     private val animateSettle: Boolean = false,
     private val disableAnimations: Boolean = false,
-    private val isDebug: Boolean = false
 ) : AppyxComponent<InteractionTarget, ModelState>,
     HasDefaultAnimationSpec<Float>,
     Draggable,
@@ -83,7 +81,6 @@ open class BaseAppyxComponent<InteractionTarget : Any, ModelState : Any>(
 
     private val instant = InstantProgressController(model = model)
     private var animated: AnimatedProgressController<InteractionTarget, ModelState>? = null
-    private var debug: DebugProgressInputSource<InteractionTarget, ModelState>? = null
     private val drag = DragProgressController(
         model = model,
         gestureFactory = { _gestureFactory },
@@ -140,12 +137,11 @@ open class BaseAppyxComponent<InteractionTarget : Any, ModelState : Any>(
     override fun onAddedToComposition(scope: CoroutineScope) {
         animationScope = scope
         createAnimatedProgressController(scope)
-        createdDebugInputSource()
     }
 
     override fun onRemovedFromComposition() {
         // TODO finish unfinished transitions
-        if (isDebug) debug?.stopModel() else animated?.stopModel()
+        animated?.stopModel()
         animationScope?.cancel()
     }
 
@@ -158,12 +154,6 @@ open class BaseAppyxComponent<InteractionTarget : Any, ModelState : Any>(
         )
     }
 
-    private fun createdDebugInputSource() {
-        debug = DebugProgressInputSource(
-            transitionModel = model,
-        )
-    }
-
     override fun updateContext(uiContext: UiContext) {
         if (this.uiContext != uiContext) {
             this.uiContext = uiContext
@@ -237,9 +227,7 @@ open class BaseAppyxComponent<InteractionTarget : Any, ModelState : Any>(
             animationSpec
         )
         val animatedSource = animated
-        val debugSource = debug
         when {
-            (isDebug && debugSource != null) -> debugSource.operation(operation)
             animatedSource == null || DisableAnimations || disableAnimations -> instant.operation(
                 operation
             )
@@ -281,15 +269,11 @@ open class BaseAppyxComponent<InteractionTarget : Any, ModelState : Any>(
     }
 
     private fun settle(gestureSettleConfig: GestureSettleConfig) {
-        if (isDebug) {
-            debug?.settle()
-        } else {
-            animated?.settle(
-                completionThreshold = gestureSettleConfig.completionThreshold,
-                completeGestureSpec = gestureSettleConfig.completeGestureSpec,
-                revertGestureSpec = gestureSettleConfig.revertGestureSpec,
-            )
-        }
+        animated?.settle(
+            completionThreshold = gestureSettleConfig.completionThreshold,
+            completeGestureSpec = gestureSettleConfig.completeGestureSpec,
+            revertGestureSpec = gestureSettleConfig.revertGestureSpec,
+        )
     }
 
     // TODO plugin?!
@@ -299,10 +283,6 @@ open class BaseAppyxComponent<InteractionTarget : Any, ModelState : Any>(
         scope.cancel()
     }
 
-    fun setNormalisedProgress(progress: Float) {
-        debug?.setNormalisedProgress(progress)
-    }
-
     override fun handleBackPress(): Boolean = backPressStrategy.handleBackPress()
 
     override fun canHandeBackPress(): StateFlow<Boolean> = backPressStrategy.canHandleBackPress

diff --git a/...Main/kotlin/com/bumble/appyx/interactions/core/model/progress/DebugProgressInputSource.kt b/...Main/kotlin/com/bumble/appyx/interactions/core/model/progress/DebugProgressInputSource.kt
diff --git a/demos/appyx-interactions/android/build.gradle.kts b/demos/appyx-interactions/android/build.gradle.kts
@@ -16,7 +16,6 @@ dependencies {
 
     implementation(composeBom)
     implementation(project(":appyx-interactions:android"))
-    implementation(project(":appyx-components:stable:backstack:backstack"))
     implementation(project(":appyx-components:stable:spotlight:spotlight"))
     implementation(project(":appyx-components:experimental:cards:android"))
     implementation(project(":appyx-components:experimental:modal:modal"))

diff --git a/.../android/src/main/kotlin/com/bumble/appyx/interactions/sample/BackstackExperimentDebug.kt b/.../android/src/main/kotlin/com/bumble/appyx/interactions/sample/BackstackExperimentDebug.kt
diff --git a/.../android/src/main/kotlin/com/bumble/appyx/interactions/sample/SpotlightExperimentDebug.kt b/.../android/src/main/kotlin/com/bumble/appyx/interactions/sample/SpotlightExperimentDebug.kt
diff --git a/...monMain/kotlin/com/bumble/appyx/demos/navigation/component/spotlighthero/SpotlightHero.kt b/...monMain/kotlin/com/bumble/appyx/demos/navigation/component/spotlighthero/SpotlightHero.kt
@@ -34,7 +34,6 @@ open class SpotlightHero<NavTarget : Any>(
         revertGestureSpec = animationSpec,
     ),
     disableAnimations: Boolean = false,
-    isDebug: Boolean = false
 ) : BaseAppyxComponent<NavTarget, State<NavTarget>>(
     scope = scope,
     model = model,
@@ -43,8 +42,7 @@ open class SpotlightHero<NavTarget : Any>(
     defaultAnimationSpec = animationSpec,
     gestureSettleConfig = gestureSettleConfig,
     disableAnimations = disableAnimations,
-    backPressStrategy = ExitHeroModeStrategy(scope),
-    isDebug = isDebug
+    backPressStrategy = ExitHeroModeStrategy(scope)
 ) {
     val currentState: State<NavTarget>
         get() = model.currentState