xfy/yayacal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(date-recorder): enforce layer-level graphicsLayer RenderNode clip to retain rounded corners during shared element transition

Browse Source
This commit is contained in:
xfy 2026-07-24 11:29:17 +08:00
parent d40c6d59b3
commit 94a4ba1e2a
1 changed files with 18 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
core/src/main/kotlin/plus/rua/project/ui/DateRecorderScreen.kt
View File

@ -959,15 +959,16 @@ private fun SharedTransitionScope.TimelineRecordCard(
elevation = CardDefaults.cardElevation(defaultElevation = 1.dp), elevation = CardDefaults.cardElevation(defaultElevation = 1.dp),
modifier = modifier modifier = modifier
.fillMaxWidth() .fillMaxWidth()
.clip(RoundedCornerShape(16.dp)) .graphicsLayer {
scaleX = cardScale
scaleY = cardScale
clip = true
shape = RoundedCornerShape(16.dp)
}
.sharedBounds( .sharedBounds(
sharedContentState = rememberSharedContentState(key = "card_${record.id}"), sharedContentState = rememberSharedContentState(key = "card_${record.id}"),
animatedVisibilityScope = animatedVisibilityScope animatedVisibilityScope = animatedVisibilityScope
) )
.graphicsLayer {
scaleX = cardScale
scaleY = cardScale
}
) { ) {
Column(modifier = Modifier.fillMaxWidth()) { Column(modifier = Modifier.fillMaxWidth()) {
Box { Box {
@ -979,10 +980,6 @@ private fun SharedTransitionScope.TimelineRecordCard(
.fillMaxWidth() .fillMaxWidth()
.height(180.dp) .height(180.dp)
.clip(RoundedCornerShape(topStart = 16.dp, topEnd = 16.dp)) .clip(RoundedCornerShape(topStart = 16.dp, topEnd = 16.dp))
.sharedElement(
sharedContentState = rememberSharedContentState(key = "photo_${record.id}"),
animatedVisibilityScope = animatedVisibilityScope
)
) )
// 顶端多选 Badge // 顶端多选 Badge
@ -1080,15 +1077,16 @@ private fun SharedTransitionScope.GridRecordCard(
elevation = CardDefaults.cardElevation(defaultElevation = 1.dp), elevation = CardDefaults.cardElevation(defaultElevation = 1.dp),
modifier = modifier modifier = modifier
.fillMaxWidth() .fillMaxWidth()
.clip(RoundedCornerShape(14.dp)) .graphicsLayer {
scaleX = cardScale
scaleY = cardScale
clip = true
shape = RoundedCornerShape(14.dp)
}
.sharedBounds( .sharedBounds(
sharedContentState = rememberSharedContentState(key = "card_${record.id}"), sharedContentState = rememberSharedContentState(key = "card_${record.id}"),
animatedVisibilityScope = animatedVisibilityScope animatedVisibilityScope = animatedVisibilityScope
) )
.graphicsLayer {
scaleX = cardScale
scaleY = cardScale
}
) { ) {
Box { Box {
AsyncImage( AsyncImage(
@ -1099,10 +1097,6 @@ private fun SharedTransitionScope.GridRecordCard(
.fillMaxWidth() .fillMaxWidth()
.aspectRatio(1f) .aspectRatio(1f)
.clip(RoundedCornerShape(14.dp)) .clip(RoundedCornerShape(14.dp))
.sharedElement(
sharedContentState = rememberSharedContentState(key = "photo_${record.id}"),
animatedVisibilityScope = animatedVisibilityScope
)
) )
// 底部蒙层与文字信息 // 底部蒙层与文字信息
@ -1185,19 +1179,18 @@ private fun SharedTransitionScope.CompactRecordCard(
Card( Card(
onClick = onClick, onClick = onClick,
shape = RoundedCornerShape(8.dp),
border = BorderStroke(borderWidth, MaterialTheme.colorScheme.primary),
modifier = modifier modifier = modifier
.fillMaxWidth() .fillMaxWidth()
.clip(RoundedCornerShape(8.dp)) .graphicsLayer {
scaleX = cardScale
scaleY = cardScale
clip = true
shape = RoundedCornerShape(8.dp)
}
.sharedBounds( .sharedBounds(
sharedContentState = rememberSharedContentState(key = "card_${record.id}"), sharedContentState = rememberSharedContentState(key = "card_${record.id}"),
animatedVisibilityScope = animatedVisibilityScope animatedVisibilityScope = animatedVisibilityScope
) )
.graphicsLayer {
scaleX = cardScale
scaleY = cardScale
}
) { ) {
Box { Box {
AsyncImage( AsyncImage(
@ -1208,10 +1201,6 @@ private fun SharedTransitionScope.CompactRecordCard(
.fillMaxWidth() .fillMaxWidth()
.aspectRatio(1f) .aspectRatio(1f)
.clip(RoundedCornerShape(8.dp)) .clip(RoundedCornerShape(8.dp))
.sharedElement(
sharedContentState = rememberSharedContentState(key = "photo_${record.id}"),
animatedVisibilityScope = animatedVisibilityScope
)
) )
androidx.compose.animation.AnimatedVisibility( androidx.compose.animation.AnimatedVisibility(