[Compose] Refactory internal MotionLayout API

Makes it so that all public MotionLayout calls converge to the same
method.

This way, manipulating the layout internally is more consistent and
works over the same API (see MotionProgress).

For consistency with Link functionality, LayoutInformationReceiver now
has all Link related methods.

Marked ConstraintSet classes as Immutable.

Author: oscar-ad

constraintlayout/compose/src/main/java/androidx/constraintlayout/compose/ConstraintLayout.kt

@@ -658,7 +658,7 @@ fun Dimension.MaxCoercible.atMost(dp: Dp): Dimension =
     (this as DimensionDescription).also { it.max = dp }
 
 /**
- * Sets the upper bound of the current [Dimension] to be the [Wrap] size of the child.
+ * Sets the upper bound of the current [Dimension] to be the [WRAP_DIMENSION] size of the child.
  */
 val Dimension.MaxCoercible.atMostWrapContent: Dimension
     get() = (this as DimensionDescription).also { it.maxSymbol = WRAP_DIMENSION }
@@ -779,7 +779,7 @@ internal abstract class EditableJSONLayout(@Language("json5") content: String) :
     }
 
     // region Accessors
-    fun setUpdateFlag(needsUpdate: MutableState<Long>) {
+    override fun setUpdateFlag(needsUpdate: MutableState<Long>) {
         updateFlag = needsUpdate
     }
 
@@ -805,7 +805,7 @@ internal abstract class EditableJSONLayout(@Language("json5") content: String) :
         return debugName
     }
 
-    fun getForcedDrawDebug(): MotionLayoutDebugFlags {
+    override fun getForcedDrawDebug(): MotionLayoutDebugFlags {
         return forcedDrawDebug
     }
 
@@ -856,10 +856,6 @@ internal abstract class EditableJSONLayout(@Language("json5") content: String) :
         }
     }
 
-    protected open fun onNewProgress(progress: Float) {
-        // nothing for ConstraintSet
-    }
-
     fun onNewDimensions(width: Int, height: Int) {
         forcedWidth = width
         forcedHeight = height
@@ -959,6 +955,20 @@ interface LayoutInformationReceiver {
     fun getLayoutInformationMode(): LayoutInfoFlags
     fun getForcedWidth(): Int
     fun getForcedHeight(): Int
+    fun setUpdateFlag(needsUpdate: MutableState<Long>)
+    fun getForcedDrawDebug(): MotionLayoutDebugFlags
+
+    /**
+     * reset the force progress flag
+     */
+    fun resetForcedProgress()
+
+    /**
+     * Get the progress of the force progress
+     */
+    fun getForcedProgress(): Float
+
+    fun onNewProgress(progress: Float)
 }
 
 @PublishedApi

constraintlayout/compose/src/main/java/androidx/constraintlayout/compose/ConstraintSet.kt

@@ -38,6 +38,7 @@ interface ConstraintSet {
     fun isDirty(measurables: List<Measurable>): Boolean = true
 }
 
+@Immutable
 internal interface DerivedConstraintSet : ConstraintSet {
     /**
      * [ConstraintSet] that this instance will derive its constraints from.

constraintlayout/compose/src/main/java/androidx/constraintlayout/compose/DslConstraintSet.kt

@@ -16,9 +16,12 @@
 
 package androidx.constraintlayout.compose
 
+import androidx.compose.runtime.Immutable
+
 /**
  * [ConstraintSet] implementation used in the kotlin DSL.
  */
+@Immutable
 internal class DslConstraintSet constructor(
     val description: ConstraintSetScope.() -> Unit,
     override val extendFrom: ConstraintSet? = null

constraintlayout/compose/src/main/java/androidx/constraintlayout/compose/JSONConstraintSet.kt

@@ -16,6 +16,7 @@
 
 package androidx.constraintlayout.compose
 
+import androidx.compose.runtime.Immutable
 import androidx.compose.ui.layout.Measurable
 import androidx.constraintlayout.core.parser.CLKey
 import androidx.constraintlayout.core.parser.CLParser
@@ -24,6 +25,7 @@ import androidx.constraintlayout.core.state.ConstraintSetParser
 import androidx.constraintlayout.core.state.Transition
 import org.intellij.lang.annotations.Language
 
+@Immutable
 internal class JSONConstraintSet(
     @Language("json5") content: String,
     @Language("json5") overrideVariables: String? = null,
@@ -71,7 +73,6 @@ internal class JSONConstraintSet(
         // TODO: Need to better handle half parsed JSON and/or incorrect states.
         try {
             ConstraintSetParser.parseJSON(getCurrentContent(), state, layoutVariables)
-
             _isDirty = false
         } catch (e: Exception) {
             // nothing (content might be invalid, sent by live edit)
@@ -107,4 +108,17 @@ internal class JSONConstraintSet(
             layoutVariables.putOverride(name, overridedVariables[name]!!)
         }
     }
+
+    override fun resetForcedProgress() {
+        // Nothing for ConstraintSet
+    }
+
+    override fun getForcedProgress(): Float {
+        // Nothing for ConstraintSet
+        return 0f
+    }
+
+    override fun onNewProgress(progress: Float) {
+        // Nothing for ConstraintSet
+    }
 }

constraintlayout/compose/src/main/java/androidx/constraintlayout/compose/MotionDragHandler.kt

@@ -19,7 +19,6 @@ package androidx.constraintlayout.compose
 import android.annotation.SuppressLint
 import androidx.compose.foundation.gestures.detectDragGestures
 import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.MutableState
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.composed
@@ -32,32 +31,6 @@ import kotlinx.coroutines.channels.Channel
 import kotlinx.coroutines.ensureActive
 import kotlinx.coroutines.isActive
 
-/**
- * Helper modifier for MotionLayout to support OnSwipe in Transitions.
- *
- * @see Modifier.pointerInput
- * @see TransitionHandler
- */
-@SuppressLint("UnnecessaryComposedModifier")
-@Suppress("NOTHING_TO_INLINE")
-@PublishedApi
-internal inline fun Modifier.motionPointerInput(
-    key: Any = Unit,
-    progressState: MutableState<Float>,
-    measurer: MotionMeasurer
-): Modifier {
-    val motionProgress: MotionProgress =
-        object : MotionProgress {
-            override val progress: Float
-                get() = progressState.value
-
-            override suspend fun updateProgress(newProgress: Float) {
-                progressState.value = newProgress
-            }
-        }
-    return this.motionPointerInput(key, motionProgress, measurer)
-}
-
 /**
  * Helper modifier for MotionLayout to support OnSwipe in Transitions.
  *