Run ktfmt 0.52 on SceneTransitionLayout sources
> external/ktfmt/ktfmt.sh --kotlinlang-style packages/SystemUI/compose/scene/src/
Test: No tests. Ktfmt refactor
Bug: 336710600
Flag: com.android.systemui.scene_container
Change-Id: I67cc153efa34c88f367bc80b217f047bef8bf236
diff --git a/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/AnimateSharedAsState.kt b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/AnimateSharedAsState.kt
index b30f2b7..0fc88b2 100644
--- a/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/AnimateSharedAsState.kt
+++ b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/AnimateSharedAsState.kt
@@ -121,7 +121,7 @@
@Deprecated(
"Use animateContentFloatAsState() instead",
- replaceWith = ReplaceWith("animateContentFloatAsState(value, key, canOverflow)")
+ replaceWith = ReplaceWith("animateContentFloatAsState(value, key, canOverflow)"),
)
@Composable
fun ContentScope.animateSceneFloatAsState(
@@ -172,14 +172,11 @@
@Deprecated(
"Use animateContentDpAsState() instead",
- replaceWith = ReplaceWith("animateContentDpAsState(value, key, canOverflow)")
+ replaceWith = ReplaceWith("animateContentDpAsState(value, key, canOverflow)"),
)
@Composable
-fun ContentScope.animateSceneDpAsState(
- value: Dp,
- key: ValueKey,
- canOverflow: Boolean = true,
-) = animateContentDpAsState(value, key, canOverflow)
+fun ContentScope.animateSceneDpAsState(value: Dp, key: ValueKey, canOverflow: Boolean = true) =
+ animateContentDpAsState(value, key, canOverflow)
/**
* Animate a shared element Dp value.
@@ -214,10 +211,7 @@
* @see ContentScope.animateContentValueAsState
*/
@Composable
-fun ContentScope.animateContentColorAsState(
- value: Color,
- key: ValueKey,
-): AnimatedState<Color> {
+fun ContentScope.animateContentColorAsState(value: Color, key: ValueKey): AnimatedState<Color> {
return animateContentValueAsState(value, key, SharedColorType, canOverflow = false)
}
@@ -227,10 +221,7 @@
* @see ElementScope.animateElementValueAsState
*/
@Composable
-fun ElementScope<*>.animateElementColorAsState(
- value: Color,
- key: ValueKey,
-): AnimatedState<Color> {
+fun ElementScope<*>.animateElementColorAsState(value: Color, key: ValueKey): AnimatedState<Color> {
return animateElementValueAsState(value, key, SharedColorType, canOverflow = false)
}
@@ -274,12 +265,7 @@
* Note: This class is necessary because Color() checks the bounds of its values and UncheckedColor
* is internal.
*/
-private class ColorDelta(
- val red: Float,
- val green: Float,
- val blue: Float,
- val alpha: Float,
-)
+private class ColorDelta(val red: Float, val green: Float, val blue: Float, val alpha: Float)
@Composable
internal fun <T> animateSharedValueAsState(
@@ -331,7 +317,7 @@
private fun <T, Delta> sharedValue(
layoutImpl: SceneTransitionLayoutImpl,
key: ValueKey,
- element: ElementKey?
+ element: ElementKey?,
): SharedValue<T, Delta> {
return layoutImpl.sharedValues[key]?.get(element)?.let { it as SharedValue<T, Delta> }
?: error(valueReadTooEarlyMessage(key))
@@ -342,9 +328,7 @@
"means that you are reading it during composition, which you should not do. See the " +
"documentation of AnimatedState for more information."
-internal class SharedValue<T, Delta>(
- val type: SharedValueType<T, Delta>,
-) {
+internal class SharedValue<T, Delta>(val type: SharedValueType<T, Delta>) {
/** The target value of this shared value for each content. */
val targetValues = SnapshotStateMap<ContentKey, T>()
diff --git a/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/DraggableHandler.kt b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/DraggableHandler.kt
index 007b84a..f38a310 100644
--- a/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/DraggableHandler.kt
+++ b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/DraggableHandler.kt
@@ -109,12 +109,12 @@
return (upOrLeft != null &&
contentTransition.isTransitioningBetween(
fromContent.key,
- upOrLeft.toContent(currentScene)
+ upOrLeft.toContent(currentScene),
)) ||
(downOrRight != null &&
contentTransition.isTransitioningBetween(
fromContent.key,
- downOrRight.toContent(currentScene)
+ downOrRight.toContent(currentScene),
))
}
@@ -163,7 +163,7 @@
private fun updateDragController(
swipes: Swipes,
- swipeAnimation: SwipeAnimation<*>
+ swipeAnimation: SwipeAnimation<*>,
): DragControllerImpl {
val newDragController = DragControllerImpl(this, swipes, swipeAnimation)
newDragController.updateTransition(swipeAnimation, force = true)
@@ -171,10 +171,7 @@
return newDragController
}
- internal fun createSwipeAnimation(
- swipes: Swipes,
- result: UserActionResult,
- ): SwipeAnimation<*> {
+ internal fun createSwipeAnimation(swipes: Swipes, result: UserActionResult): SwipeAnimation<*> {
val upOrLeftResult = swipes.upOrLeftResult
val downOrRightResult = swipes.downOrRightResult
val isUpOrLeft =
@@ -266,7 +263,7 @@
layoutState.startTransitionImmediately(
animationScope = draggableHandler.layoutImpl.animationScope,
newTransition.contentTransition,
- true
+ true,
)
}
diff --git a/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/Element.kt b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/Element.kt
index a076f22..1061cc4 100644
--- a/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/Element.kt
+++ b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/Element.kt
@@ -263,7 +263,7 @@
@ExperimentalComposeUiApi
override fun MeasureScope.measure(
measurable: Measurable,
- constraints: Constraints
+ constraints: Constraints,
): MeasureResult {
check(isLookingAhead)
@@ -344,7 +344,7 @@
private fun ApproachMeasureScope.doNotPlace(
measurable: Measurable,
- constraints: Constraints
+ constraints: Constraints,
): MeasureResult {
recursivelyClearPlacementValues()
stateInContent.lastSize = Element.SizeUnspecified
@@ -355,7 +355,7 @@
private fun ApproachMeasureScope.placeNormally(
measurable: Measurable,
- constraints: Constraints
+ constraints: Constraints,
): MeasureResult {
val placeable = measurable.measure(constraints)
stateInContent.lastSize = placeable.size()
@@ -670,10 +670,7 @@
* Reconcile the state of [element] in the formContent and toContent of [transition] so that the
* values before interruption have their expected values, taking shared transitions into account.
*/
-private fun reconcileStates(
- element: Element,
- transition: TransitionState.Transition,
-) {
+private fun reconcileStates(element: Element, transition: TransitionState.Transition) {
val fromContentState = element.stateByContent[transition.fromContent] ?: return
val toContentState = element.stateByContent[transition.toContent] ?: return
if (!isSharedElementEnabled(element.key, transition)) {
@@ -1139,7 +1136,7 @@
Offset.Unspecified
} else {
a.pivot.specifiedOrCenter() - b.pivot.specifiedOrCenter()
- }
+ },
)
},
add = { a, b, bProgress ->
@@ -1151,9 +1148,9 @@
Offset.Unspecified
} else {
a.pivot.specifiedOrCenter() + b.pivot.specifiedOrCenter() * bProgress
- }
+ },
)
- }
+ },
)
stateInContent.lastScale = interruptedScale
@@ -1371,7 +1368,7 @@
lerp(
lerp(previewTargetValue, targetValueOrNull ?: idleValue, previewRangeProgress),
idleValue,
- transformation?.range?.progress(transition.progress) ?: transition.progress
+ transformation?.range?.progress(transition.progress) ?: transition.progress,
)
} else {
if (targetValueOrNull == null) {
@@ -1384,7 +1381,7 @@
lerp(
lerp(idleValue, previewTargetValue, previewRangeProgress),
targetValueOrNull,
- transformation.range?.progress(transition.progress) ?: transition.progress
+ transformation.range?.progress(transition.progress) ?: transition.progress,
)
}
}
@@ -1399,14 +1396,7 @@
val idleValue = contentValue(contentState)
val targetValue =
- transformation.transform(
- layoutImpl,
- content,
- element,
- contentState,
- transition,
- idleValue,
- )
+ transformation.transform(layoutImpl, content, element, contentState, transition, idleValue)
// Make sure we don't read progress if values are the same and we don't need to interpolate, so
// we don't invalidate the phase where this is read.
@@ -1433,7 +1423,7 @@
fromState: Element.State,
toState: Element.State,
isSpecified: (T) -> Boolean,
- lerp: (T, T, Float) -> T
+ lerp: (T, T, Float) -> T,
): T {
val start = contentValue(fromState)
val end = contentValue(toState)
diff --git a/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/InterruptionHandler.kt b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/InterruptionHandler.kt
index cb18c67..2057146 100644
--- a/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/InterruptionHandler.kt
+++ b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/InterruptionHandler.kt
@@ -79,9 +79,6 @@
interrupted: TransitionState.Transition.ChangeScene,
newTargetScene: SceneKey,
): InterruptionResult {
- return InterruptionResult(
- animateFrom = interrupted.currentScene,
- chain = true,
- )
+ return InterruptionResult(animateFrom = interrupted.currentScene, chain = true)
}
}
diff --git a/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/Key.kt b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/Key.kt
index ced177c..f9a9eeb 100644
--- a/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/Key.kt
+++ b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/Key.kt
@@ -49,10 +49,7 @@
}
/** Key for a scene. */
-class SceneKey(
- debugName: String,
- identity: Any = Object(),
-) : ContentKey(debugName, identity) {
+class SceneKey(debugName: String, identity: Any = Object()) : ContentKey(debugName, identity) {
override val testTag: String = "scene:$debugName"
/** The unique [ElementKey] identifying this scene's root element. */
@@ -64,10 +61,7 @@
}
/** Key for an overlay. */
-class OverlayKey(
- debugName: String,
- identity: Any = Object(),
-) : ContentKey(debugName, identity) {
+class OverlayKey(debugName: String, identity: Any = Object()) : ContentKey(debugName, identity) {
override val testTag: String = "overlay:$debugName"
override fun toString(): String {
diff --git a/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/MovableElement.kt b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/MovableElement.kt
index 471ad3f..1f26b71 100644
--- a/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/MovableElement.kt
+++ b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/MovableElement.kt
@@ -86,7 +86,7 @@
value: T,
key: ValueKey,
type: SharedValueType<T, *>,
- canOverflow: Boolean
+ canOverflow: Boolean,
): AnimatedState<T> {
return animateSharedValueAsState(
layoutImpl,
@@ -200,7 +200,7 @@
content,
element,
elementState,
- isInContent = { contents.contains(it) }
+ isInContent = { contents.contains(it) },
)
}
}
@@ -220,11 +220,7 @@
elementState: TransitionState.Idle,
): ContentKey {
val contents = element.contentPicker.contents
- return elementContentWhenIdle(
- layoutImpl,
- elementState,
- isInContent = { contents.contains(it) },
- )
+ return elementContentWhenIdle(layoutImpl, elementState, isInContent = { contents.contains(it) })
}
/**
diff --git a/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/ObservableTransitionState.kt b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/ObservableTransitionState.kt
index 8ae3a11..9f2ac24 100644
--- a/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/ObservableTransitionState.kt
+++ b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/ObservableTransitionState.kt
@@ -57,10 +57,8 @@
/** No transition/animation is currently running. */
data class Idle
@JvmOverloads
- constructor(
- val currentScene: SceneKey,
- val currentOverlays: Set<OverlayKey> = emptySet(),
- ) : ObservableTransitionState
+ constructor(val currentScene: SceneKey, val currentOverlays: Set<OverlayKey> = emptySet()) :
+ ObservableTransitionState
/** There is a transition animating between two scenes. */
sealed class Transition(
@@ -219,10 +217,7 @@
return snapshotFlow {
when (val state = transitionState) {
is TransitionState.Idle ->
- ObservableTransitionState.Idle(
- state.currentScene,
- state.currentOverlays,
- )
+ ObservableTransitionState.Idle(state.currentScene, state.currentOverlays)
is TransitionState.Transition.ChangeScene -> {
ObservableTransitionState.Transition.ChangeScene(
fromScene = state.fromScene,
diff --git a/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/PredictiveBackHandler.kt b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/PredictiveBackHandler.kt
index 8480d3a..b00c8ad 100644
--- a/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/PredictiveBackHandler.kt
+++ b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/PredictiveBackHandler.kt
@@ -35,9 +35,7 @@
layoutImpl: SceneTransitionLayoutImpl,
result: UserActionResult?,
) {
- PredictiveBackHandler(
- enabled = result != null,
- ) { events: Flow<BackEventCompat> ->
+ PredictiveBackHandler(enabled = result != null) { events: Flow<BackEventCompat> ->
if (result == null) {
// Note: We have to collect progress otherwise PredictiveBackHandler will throw.
events.first()
diff --git a/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/SceneTransitionLayout.kt b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/SceneTransitionLayout.kt
index 004bb40..f20548b 100644
--- a/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/SceneTransitionLayout.kt
+++ b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/SceneTransitionLayout.kt
@@ -585,7 +585,7 @@
*/
fun UserActionDistanceScope.absoluteDistance(
fromSceneSize: IntSize,
- orientation: Orientation
+ orientation: Orientation,
): Float
}
diff --git a/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/SceneTransitionLayoutImpl.kt b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/SceneTransitionLayoutImpl.kt
index f36c0fa..fe05234 100644
--- a/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/SceneTransitionLayoutImpl.kt
+++ b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/SceneTransitionLayoutImpl.kt
@@ -253,7 +253,7 @@
key: OverlayKey,
userActions: Map<UserAction, UserActionResult>,
alignment: Alignment,
- content: @Composable (ContentScope.() -> Unit)
+ content: @Composable (ContentScope.() -> Unit),
) {
overlaysDefined = true
overlaysToRemove.remove(key)
@@ -291,7 +291,7 @@
private fun resolveUserActions(
key: ContentKey,
userActions: Map<UserAction, UserActionResult>,
- layoutDirection: LayoutDirection
+ layoutDirection: LayoutDirection,
): Map<UserAction.Resolved, UserActionResult> {
return userActions
.mapKeys { it.key.resolve(layoutDirection) }
diff --git a/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/SceneTransitionLayoutState.kt b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/SceneTransitionLayoutState.kt
index c2d5dd05..dbff8a4 100644
--- a/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/SceneTransitionLayoutState.kt
+++ b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/SceneTransitionLayoutState.kt
@@ -328,9 +328,7 @@
): Job {
// Note that we start with UNDISPATCHED so that startTransition() is called directly and
// transition becomes the current [transitionState] right after this call.
- return animationScope.launch(
- start = CoroutineStart.UNDISPATCHED,
- ) {
+ return animationScope.launch(start = CoroutineStart.UNDISPATCHED) {
startTransition(transition, chain)
}
}
@@ -461,7 +459,7 @@
val indicator = if (finishedTransitions.contains(transition)) "x" else " "
appendLine(" [$indicator] $from => $to ($transition)")
}
- }
+ },
)
}
@@ -621,7 +619,7 @@
override fun showOverlay(
overlay: OverlayKey,
animationScope: CoroutineScope,
- transitionKey: TransitionKey?
+ transitionKey: TransitionKey?,
) {
checkThread()
@@ -654,7 +652,7 @@
) {
animate(
replacedTransition = currentState,
- reversed = overlay == currentState.fromContent
+ reversed = overlay == currentState.fromContent,
)
} else {
animate()
@@ -664,7 +662,7 @@
override fun hideOverlay(
overlay: OverlayKey,
animationScope: CoroutineScope,
- transitionKey: TransitionKey?
+ transitionKey: TransitionKey?,
) {
checkThread()
@@ -705,7 +703,7 @@
from: OverlayKey,
to: OverlayKey,
animationScope: CoroutineScope,
- transitionKey: TransitionKey?
+ transitionKey: TransitionKey?,
) {
checkThread()
diff --git a/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/SceneTransitions.kt b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/SceneTransitions.kt
index e65ed9b..b358faf 100644
--- a/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/SceneTransitions.kt
+++ b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/SceneTransitions.kt
@@ -50,7 +50,7 @@
private val transitionCache =
mutableMapOf<
ContentKey,
- MutableMap<ContentKey, MutableMap<TransitionKey?, TransitionSpecImpl>>
+ MutableMap<ContentKey, MutableMap<TransitionKey?, TransitionSpecImpl>>,
>()
private val overscrollCache =
@@ -70,7 +70,7 @@
private fun findSpec(
from: ContentKey,
to: ContentKey,
- key: TransitionKey?
+ key: TransitionKey?,
): TransitionSpecImpl {
val spec = transition(from, to, key) { it.from == from && it.to == to }
if (spec != null) {
@@ -250,7 +250,7 @@
override val to: ContentKey?,
private val previewTransformationSpec: (() -> TransformationSpecImpl)? = null,
private val reversePreviewTransformationSpec: (() -> TransformationSpecImpl)? = null,
- private val transformationSpec: () -> TransformationSpecImpl
+ private val transformationSpec: () -> TransformationSpecImpl,
) : TransitionSpec {
override fun reversed(): TransitionSpecImpl {
return TransitionSpecImpl(
@@ -265,9 +265,9 @@
progressSpec = reverse.progressSpec,
swipeSpec = reverse.swipeSpec,
distance = reverse.distance,
- transformations = reverse.transformations.map { it.reversed() }
+ transformations = reverse.transformations.map { it.reversed() },
)
- }
+ },
)
}
@@ -382,11 +382,7 @@
return ElementTransformations(shared, offset, size, drawScale, alpha)
}
- private fun throwIfNotNull(
- previous: Transformation?,
- element: ElementKey,
- name: String,
- ) {
+ private fun throwIfNotNull(previous: Transformation?, element: ElementKey, name: String) {
if (previous != null) {
error("$element has multiple $name transformations")
}
diff --git a/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/SwipeAnimation.kt b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/SwipeAnimation.kt
index 966bda4..84dce0d 100644
--- a/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/SwipeAnimation.kt
+++ b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/SwipeAnimation.kt
@@ -54,7 +54,7 @@
result: UserActionResult,
isUpOrLeft: Boolean,
orientation: Orientation,
- distance: Float = DistanceUnspecified
+ distance: Float = DistanceUnspecified,
): SwipeAnimation<*> {
var lastDistance = distance
diff --git a/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/SwipeToScene.kt b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/SwipeToScene.kt
index dc7eda5..98d4aaa 100644
--- a/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/SwipeToScene.kt
+++ b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/SwipeToScene.kt
@@ -39,14 +39,14 @@
@Stable
internal fun Modifier.swipeToScene(
draggableHandler: DraggableHandlerImpl,
- swipeDetector: SwipeDetector
+ swipeDetector: SwipeDetector,
): Modifier {
return this.then(SwipeToSceneElement(draggableHandler, swipeDetector))
}
private data class SwipeToSceneElement(
val draggableHandler: DraggableHandlerImpl,
- val swipeDetector: SwipeDetector
+ val swipeDetector: SwipeDetector,
) : ModifierNodeElement<SwipeToSceneNode>() {
override fun create(): SwipeToSceneNode = SwipeToSceneNode(draggableHandler, swipeDetector)
@@ -183,12 +183,12 @@
*/
private class ScrollBehaviorOwnerNode(
override val traverseKey: Any,
- val nestedScrollHandlerImpl: NestedScrollHandlerImpl
+ val nestedScrollHandlerImpl: NestedScrollHandlerImpl,
) : Modifier.Node(), TraversableNode, ScrollBehaviorOwner {
override fun updateScrollBehaviors(
topOrLeftBehavior: NestedScrollBehavior,
bottomOrRightBehavior: NestedScrollBehavior,
- isExternalOverscrollGesture: () -> Boolean
+ isExternalOverscrollGesture: () -> Boolean,
) {
nestedScrollHandlerImpl.topOrLeftBehavior = topOrLeftBehavior
nestedScrollHandlerImpl.bottomOrRightBehavior = bottomOrRightBehavior
diff --git a/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/TransitionDsl.kt b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/TransitionDsl.kt
index 1f82e0b..763dc6b 100644
--- a/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/TransitionDsl.kt
+++ b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/TransitionDsl.kt
@@ -333,7 +333,7 @@
element: ElementKey,
transition: TransitionState.Transition,
fromContentZIndex: Float,
- toContentZIndex: Float
+ toContentZIndex: Float,
): ContentKey {
return if (fromContentZIndex > toContentZIndex) {
transition.fromContent
@@ -354,7 +354,7 @@
element: ElementKey,
transition: TransitionState.Transition,
fromContentZIndex: Float,
- toContentZIndex: Float
+ toContentZIndex: Float,
): ContentKey {
return HighestZIndexContentPicker.contentDuringTransition(
element,
@@ -375,7 +375,7 @@
element: ElementKey,
transition: TransitionState.Transition,
fromContentZIndex: Float,
- toContentZIndex: Float
+ toContentZIndex: Float,
): ContentKey {
return if (fromContentZIndex < toContentZIndex) {
transition.fromContent
@@ -396,7 +396,7 @@
element: ElementKey,
transition: TransitionState.Transition,
fromContentZIndex: Float,
- toContentZIndex: Float
+ toContentZIndex: Float,
): ContentKey {
return LowestZIndexContentPicker.contentDuringTransition(
element,
@@ -423,9 +423,8 @@
* is not the same as when going from scene B to scene A, so it's not usable in situations where
* z-ordering during the transition matters.
*/
-class MovableElementContentPicker(
- override val contents: Set<ContentKey>,
-) : StaticElementContentPicker {
+class MovableElementContentPicker(override val contents: Set<ContentKey>) :
+ StaticElementContentPicker {
override fun contentDuringTransition(
element: ElementKey,
transition: TransitionState.Transition,
@@ -501,7 +500,7 @@
matcher: ElementMatcher,
scaleX: Float = 1f,
scaleY: Float = 1f,
- pivot: Offset = Offset.Unspecified
+ pivot: Offset = Offset.Unspecified,
)
/**
diff --git a/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/TransitionDslImpl.kt b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/TransitionDslImpl.kt
index da4c8d8..7ec5e4f 100644
--- a/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/TransitionDslImpl.kt
+++ b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/TransitionDslImpl.kt
@@ -41,9 +41,7 @@
import com.android.compose.animation.scene.transformation.TransformationRange
import com.android.compose.animation.scene.transformation.Translate
-internal fun transitionsImpl(
- builder: SceneTransitionsBuilder.() -> Unit,
-): SceneTransitions {
+internal fun transitionsImpl(builder: SceneTransitionsBuilder.() -> Unit): SceneTransitions {
val impl = SceneTransitionsBuilderImpl().apply(builder)
return SceneTransitions(
impl.defaultSwipeSpec,
@@ -67,7 +65,7 @@
key: TransitionKey?,
preview: (TransitionBuilder.() -> Unit)?,
reversePreview: (TransitionBuilder.() -> Unit)?,
- builder: TransitionBuilder.() -> Unit
+ builder: TransitionBuilder.() -> Unit,
): TransitionSpec {
return transition(from = null, to = to, key = key, preview, reversePreview, builder)
}
@@ -78,7 +76,7 @@
key: TransitionKey?,
preview: (TransitionBuilder.() -> Unit)?,
reversePreview: (TransitionBuilder.() -> Unit)?,
- builder: TransitionBuilder.() -> Unit
+ builder: TransitionBuilder.() -> Unit,
): TransitionSpec {
return transition(from = from, to = to, key = key, preview, reversePreview, builder)
}
@@ -86,7 +84,7 @@
override fun overscroll(
content: ContentKey,
orientation: Orientation,
- builder: OverscrollBuilder.() -> Unit
+ builder: OverscrollBuilder.() -> Unit,
): OverscrollSpec {
val impl = OverscrollBuilderImpl().apply(builder)
check(impl.transformations.isNotEmpty()) {
@@ -150,7 +148,7 @@
to,
previewTransformationSpec,
reversePreviewTransformationSpec,
- transformationSpec
+ transformationSpec,
)
transitionSpecs.add(spec)
return spec
@@ -167,7 +165,7 @@
start: Float?,
end: Float?,
easing: Easing,
- builder: PropertyTransformationBuilder.() -> Unit
+ builder: PropertyTransformationBuilder.() -> Unit,
) {
range = TransformationRange(start, end, easing)
builder()
@@ -202,7 +200,7 @@
override fun translate(
matcher: ElementMatcher,
edge: Edge,
- startsOutsideLayoutBounds: Boolean
+ startsOutsideLayoutBounds: Boolean,
) {
transformation(EdgeTranslate(matcher, edge, startsOutsideLayoutBounds))
}
@@ -256,7 +254,7 @@
startMillis: Int?,
endMillis: Int?,
easing: Easing,
- builder: PropertyTransformationBuilder.() -> Unit
+ builder: PropertyTransformationBuilder.() -> Unit,
) {
if (startMillis != null && (startMillis < 0 || startMillis > durationMillis)) {
error("invalid start value: startMillis=$startMillis durationMillis=$durationMillis")
@@ -278,7 +276,7 @@
override fun translate(
matcher: ElementMatcher,
x: OverscrollScope.() -> Float,
- y: OverscrollScope.() -> Float
+ y: OverscrollScope.() -> Float,
) {
transformation(OverscrollTranslate(matcher, x, y))
}
diff --git a/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/UserActionDistanceScopeImpl.kt b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/UserActionDistanceScopeImpl.kt
index 9851b32..b7fa0d4 100644
--- a/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/UserActionDistanceScopeImpl.kt
+++ b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/UserActionDistanceScopeImpl.kt
@@ -19,9 +19,8 @@
import androidx.compose.ui.geometry.Offset
import androidx.compose.ui.unit.IntSize
-internal class ElementStateScopeImpl(
- private val layoutImpl: SceneTransitionLayoutImpl,
-) : ElementStateScope {
+internal class ElementStateScopeImpl(private val layoutImpl: SceneTransitionLayoutImpl) :
+ ElementStateScope {
override fun ElementKey.targetSize(scene: SceneKey): IntSize? {
return layoutImpl.elements[this]?.stateByContent?.get(scene)?.targetSize.takeIf {
it != Element.SizeUnspecified
@@ -39,9 +38,8 @@
}
}
-internal class UserActionDistanceScopeImpl(
- private val layoutImpl: SceneTransitionLayoutImpl,
-) : UserActionDistanceScope, ElementStateScope by layoutImpl.elementStateScope {
+internal class UserActionDistanceScopeImpl(private val layoutImpl: SceneTransitionLayoutImpl) :
+ UserActionDistanceScope, ElementStateScope by layoutImpl.elementStateScope {
override val density: Float
get() = layoutImpl.density.density
diff --git a/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/content/Content.kt b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/content/Content.kt
index 59dd896..c8407b1 100644
--- a/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/content/Content.kt
+++ b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/content/Content.kt
@@ -106,7 +106,7 @@
override fun Element(
key: ElementKey,
modifier: Modifier,
- content: @Composable (ElementScope<ElementContentScope>.() -> Unit)
+ content: @Composable (ElementScope<ElementContentScope>.() -> Unit),
) {
Element(layoutImpl, [email protected], key, modifier, content)
}
@@ -115,7 +115,7 @@
override fun MovableElement(
key: MovableElementKey,
modifier: Modifier,
- content: @Composable (ElementScope<MovableElementContentScope>.() -> Unit)
+ content: @Composable (ElementScope<MovableElementContentScope>.() -> Unit),
) {
MovableElement(layoutImpl, [email protected], key, modifier, content)
}
diff --git a/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/content/state/TransitionState.kt b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/content/state/TransitionState.kt
index a47caaa..364c203 100644
--- a/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/content/state/TransitionState.kt
+++ b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/content/state/TransitionState.kt
@@ -184,7 +184,7 @@
private fun computeCurrentOverlays(
include: OverlayKey,
- exclude: OverlayKey
+ exclude: OverlayKey,
): Set<OverlayKey> {
return buildSet {
addAll(currentOverlaysWhenTransitionStarted)
@@ -336,9 +336,7 @@
return specForCurrentScene.transformationSpec.transformations.isNotEmpty()
}
- internal open fun interruptionProgress(
- layoutImpl: SceneTransitionLayoutImpl,
- ): Float {
+ internal open fun interruptionProgress(layoutImpl: SceneTransitionLayoutImpl): Float {
if (!layoutImpl.state.enableInterruptions) {
return 0f
}
diff --git a/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/modifiers/SizeMatcher.kt b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/modifiers/SizeMatcher.kt
index a4bd2be..4698e58 100644
--- a/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/modifiers/SizeMatcher.kt
+++ b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/modifiers/SizeMatcher.kt
@@ -119,9 +119,8 @@
return this.then(SizeMatcherDestinationElement(matcher))
}
-private data class SizeMatcherSourceNodeElement(
- private val matcher: SizeMatcher,
-) : ModifierNodeElement<SizeMatcherSourceNode>() {
+private data class SizeMatcherSourceNodeElement(private val matcher: SizeMatcher) :
+ ModifierNodeElement<SizeMatcherSourceNode>() {
override fun create(): SizeMatcherSourceNode = SizeMatcherSourceNode(matcher)
override fun update(node: SizeMatcherSourceNode) {
@@ -129,9 +128,8 @@
}
}
-private class SizeMatcherSourceNode(
- private var matcher: SizeMatcher,
-) : Modifier.Node(), LayoutModifierNode {
+private class SizeMatcherSourceNode(private var matcher: SizeMatcher) :
+ Modifier.Node(), LayoutModifierNode {
override fun onAttach() {
matcher.source = this
}
@@ -150,7 +148,7 @@
override fun MeasureScope.measure(
measurable: Measurable,
- constraints: Constraints
+ constraints: Constraints,
): MeasureResult {
return measurable.measure(constraints).run {
matcher.sourceSize = IntSize(width, height)
@@ -159,9 +157,8 @@
}
}
-private data class SizeMatcherDestinationElement(
- private val matcher: SizeMatcher,
-) : ModifierNodeElement<SizeMatcherDestinationNode>() {
+private data class SizeMatcherDestinationElement(private val matcher: SizeMatcher) :
+ ModifierNodeElement<SizeMatcherDestinationNode>() {
override fun create(): SizeMatcherDestinationNode = SizeMatcherDestinationNode(matcher)
override fun update(node: SizeMatcherDestinationNode) {
@@ -169,9 +166,8 @@
}
}
-private class SizeMatcherDestinationNode(
- private var matcher: SizeMatcher,
-) : Modifier.Node(), LayoutModifierNode {
+private class SizeMatcherDestinationNode(private var matcher: SizeMatcher) :
+ Modifier.Node(), LayoutModifierNode {
override fun onAttach() {
this.matcher.destinations.add(this)
}
@@ -190,7 +186,7 @@
override fun MeasureScope.measure(
measurable: Measurable,
- constraints: Constraints
+ constraints: Constraints,
): MeasureResult {
val preferredSize = matcher.sourceSize
val preferredConstraints = Constraints.fixed(preferredSize.width, preferredSize.height)
diff --git a/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/transformation/AnchoredTranslate.kt b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/transformation/AnchoredTranslate.kt
index 05878c2..86e06ab 100644
--- a/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/transformation/AnchoredTranslate.kt
+++ b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/transformation/AnchoredTranslate.kt
@@ -61,15 +61,9 @@
val offset = anchorToOffset - anchorFromOffset
return if (content == transition.toContent) {
- Offset(
- value.x - offset.x,
- value.y - offset.y,
- )
+ Offset(value.x - offset.x, value.y - offset.y)
} else {
- Offset(
- value.x + offset.x,
- value.y + offset.y,
- )
+ Offset(value.x + offset.x, value.y + offset.y)
}
}
}
diff --git a/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/transformation/EdgeTranslate.kt b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/transformation/EdgeTranslate.kt
index a32c7dd..031f50e 100644
--- a/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/transformation/EdgeTranslate.kt
+++ b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/transformation/EdgeTranslate.kt
@@ -36,7 +36,7 @@
element: Element,
stateInContent: Element.State,
transition: TransitionState.Transition,
- value: Offset
+ value: Offset,
): Offset {
val sceneSize = layoutImpl.content(content).targetSize
val elementSize = stateInContent.targetSize
diff --git a/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/transformation/Fade.kt b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/transformation/Fade.kt
index 4528eef..078aa0f 100644
--- a/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/transformation/Fade.kt
+++ b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/transformation/Fade.kt
@@ -23,16 +23,14 @@
import com.android.compose.animation.scene.content.state.TransitionState
/** Fade an element in or out. */
-internal class Fade(
- override val matcher: ElementMatcher,
-) : PropertyTransformation<Float> {
+internal class Fade(override val matcher: ElementMatcher) : PropertyTransformation<Float> {
override fun transform(
layoutImpl: SceneTransitionLayoutImpl,
content: ContentKey,
element: Element,
stateInContent: Element.State,
transition: TransitionState.Transition,
- value: Float
+ value: Float,
): Float {
// Return the alpha value of [element] either when it starts fading in or when it finished
// fading out, which is `0` in both cases.
diff --git a/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/transformation/Transformation.kt b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/transformation/Transformation.kt
index 505ad04..9bb3023 100644
--- a/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/transformation/Transformation.kt
+++ b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/transformation/Transformation.kt
@@ -83,17 +83,13 @@
override fun reversed(): Transformation {
return RangedPropertyTransformation(
delegate.reversed() as PropertyTransformation<T>,
- range.reversed()
+ range.reversed(),
)
}
}
/** The progress-based range of a [PropertyTransformation]. */
-data class TransformationRange(
- val start: Float,
- val end: Float,
- val easing: Easing,
-) {
+data class TransformationRange(val start: Float, val end: Float, val easing: Easing) {
constructor(
start: Float? = null,
end: Float? = null,
diff --git a/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/transformation/Translate.kt b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/transformation/Translate.kt
index 8f84586..7014271 100644
--- a/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/transformation/Translate.kt
+++ b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/transformation/Translate.kt
@@ -40,12 +40,7 @@
transition: TransitionState.Transition,
value: Offset,
): Offset {
- return with(layoutImpl.density) {
- Offset(
- value.x + x.toPx(),
- value.y + y.toPx(),
- )
- }
+ return with(layoutImpl.density) { Offset(value.x + x.toPx(), value.y + y.toPx()) }
}
}
@@ -71,10 +66,7 @@
val overscrollScope =
cachedOverscrollScope.getFromCacheOrCompute(layoutImpl.density, overscrollProperties)
- return Offset(
- x = value.x + overscrollScope.x(),
- y = value.y + overscrollScope.y(),
- )
+ return Offset(x = value.x + overscrollScope.x(), y = value.y + overscrollScope.y())
}
}
diff --git a/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/transition/link/StateLink.kt b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/transition/link/StateLink.kt
index c830ca4..2aec509 100644
--- a/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/transition/link/StateLink.kt
+++ b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/transition/link/StateLink.kt
@@ -50,9 +50,7 @@
error("From and To can't be the same")
}
- internal fun isMatchingLink(
- transition: TransitionState.Transition,
- ): Boolean {
+ internal fun isMatchingLink(transition: TransitionState.Transition): Boolean {
return (sourceFrom == null || sourceFrom == transition.fromContent) &&
(sourceTo == null || sourceTo == transition.toContent)
}
diff --git a/packages/SystemUI/compose/scene/src/com/android/compose/grid/Grids.kt b/packages/SystemUI/compose/scene/src/com/android/compose/grid/Grids.kt
index 790665a..f49939b 100644
--- a/packages/SystemUI/compose/scene/src/com/android/compose/grid/Grids.kt
+++ b/packages/SystemUI/compose/scene/src/com/android/compose/grid/Grids.kt
@@ -99,10 +99,7 @@
}
}
- Layout(
- modifier = modifier,
- content = content,
- ) { measurables, constraints ->
+ Layout(modifier = modifier, content = content) { measurables, constraints ->
val cells = measurables.size
val columns: Int
val rows: Int
@@ -142,7 +139,7 @@
(constraints.maxHeight - totalVerticalSpacingBetweenChildren) / rows
} else {
Constraints.Infinity
- }
+ },
)
val placeables = buildList {
diff --git a/packages/SystemUI/compose/scene/src/com/android/compose/ui/util/MathHelpers.kt b/packages/SystemUI/compose/scene/src/com/android/compose/ui/util/MathHelpers.kt
index e78ab29..0447c36 100644
--- a/packages/SystemUI/compose/scene/src/com/android/compose/ui/util/MathHelpers.kt
+++ b/packages/SystemUI/compose/scene/src/com/android/compose/ui/util/MathHelpers.kt
@@ -27,7 +27,7 @@
fun lerp(start: IntSize, stop: IntSize, fraction: Float): IntSize {
return IntSize(
lerp(start.width, stop.width, fraction),
- lerp(start.height, stop.height, fraction)
+ lerp(start.height, stop.height, fraction),
)
}
@@ -43,6 +43,6 @@
return Scale(
lerp(start.scaleX, stop.scaleX, fraction),
lerp(start.scaleY, stop.scaleY, fraction),
- pivot
+ pivot,
)
}
diff --git a/packages/SystemUI/compose/scene/src/com/android/compose/ui/util/SpaceVectorConverter.kt b/packages/SystemUI/compose/scene/src/com/android/compose/ui/util/SpaceVectorConverter.kt
index a13e944..f08a180 100644
--- a/packages/SystemUI/compose/scene/src/com/android/compose/ui/util/SpaceVectorConverter.kt
+++ b/packages/SystemUI/compose/scene/src/com/android/compose/ui/util/SpaceVectorConverter.kt
@@ -22,8 +22,11 @@
interface SpaceVectorConverter {
fun Offset.toFloat(): Float
+
fun Velocity.toFloat(): Float
+
fun Float.toOffset(): Offset
+
fun Float.toVelocity(): Velocity
}
@@ -36,15 +39,21 @@
private val HorizontalConverter =
object : SpaceVectorConverter {
override fun Offset.toFloat() = x
+
override fun Velocity.toFloat() = x
+
override fun Float.toOffset() = Offset(this, 0f)
+
override fun Float.toVelocity() = Velocity(this, 0f)
}
private val VerticalConverter =
object : SpaceVectorConverter {
override fun Offset.toFloat() = y
+
override fun Velocity.toFloat() = y
+
override fun Float.toOffset() = Offset(0f, this)
+
override fun Float.toVelocity() = Velocity(0f, this)
}
diff --git a/packages/SystemUI/compose/scene/src/com/android/systemui/communal/ui/compose/CommunalSwipeDetector.kt b/packages/SystemUI/compose/scene/src/com/android/systemui/communal/ui/compose/CommunalSwipeDetector.kt
index 41b015a..00e5405 100644
--- a/packages/SystemUI/compose/scene/src/com/android/systemui/communal/ui/compose/CommunalSwipeDetector.kt
+++ b/packages/SystemUI/compose/scene/src/com/android/systemui/communal/ui/compose/CommunalSwipeDetector.kt
@@ -43,7 +43,7 @@
layoutSize: IntSize,
position: IntOffset,
density: Density,
- orientation: Orientation
+ orientation: Orientation,
): SwipeSource.Resolved? {
return lastDirection
}
