这是indexloc提供的服务，不要输入任何密码
Skip to content

Simplify modifier chain for movable shared elements #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 23, 2024
Merged

Simplify modifier chain for movable shared elements #12

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 18 additions & 33 deletions ...Main/kotlin/com/tunjid/treenav/compose/moveablesharedelement/MovableSharedElementState.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ internal class MovableSharedElementState<State, Pane, Destination : Node>(

var paneScope by mutableStateOf(paneScope)

private var inCount by mutableIntStateOf(0)
private var composedRefCount by mutableIntStateOf(0)

private var layer: GraphicsLayer? = null
var animInProgress by mutableStateOf(false)
Expand All @@ -61,21 +61,32 @@ internal class MovableSharedElementState<State, Pane, Destination : Node>(
val moveableSharedElement: @Composable (Any?, Modifier) -> Unit =
movableContentOf { state, modifier ->
animInProgress = isInProgress()
val layer = rememberGraphicsLayer().also {
this.layer = it
}
@Suppress("UNCHECKED_CAST")
sharedElement(
// The shared element composable will be created by the first screen and reused by
// subsequent screens. This updates the state from other screens so changes are seen.
state as State,
Modifier
.movableSharedElement(
state = this,
) then modifier,
modifier
.animateBounds(
state = animatedBoundsState
)
.drawWithContent {
layer.record {
this@drawWithContent.drawContent()
}
if (!canDrawInOverlay) {
drawLayer(layer)
}
},
)

DisposableEffect(Unit) {
++inCount
++composedRefCount
onDispose {
if (--inCount <= 0) onRemoved()
if (--composedRefCount <= 0) onRemoved()
}
}
}
Expand All @@ -98,32 +109,6 @@ internal class MovableSharedElementState<State, Pane, Destination : Node>(
private val hasBeenShared get() = panesKeysToSeenCount.size > 1

companion object {
/**
* Allows a custom modifier to animate the local position and size of the layout within the
* LookaheadLayout, whenever there's a change in the layout.
*/
@OptIn(
ExperimentalSharedTransitionApi::class
)
@Composable
internal fun <Pane, Destination : Node> Modifier.movableSharedElement(
state: MovableSharedElementState<*, Pane, Destination>,
): Modifier {
val layer = rememberGraphicsLayer().also {
state.layer = it
}
return animateBounds(
state = state.animatedBoundsState
)
.drawWithContent {
layer.record {
this@drawWithContent.drawContent()
}
if (!state.canDrawInOverlay) {
drawLayer(layer)
}
}
}

@Composable
private fun <Pane, Destination : Node> MovableSharedElementState<*, Pane, Destination>.isInProgress(): Boolean {
Expand Down
Loading