cyy/Fairscan_cyy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Small refactoring of the animation code

Browse Source
This commit is contained in:
Pierre-Yves Nicolas
2025-06-27 07:57:17 +02:00
parent 3ca8854f45
commit d51f407f07
1 changed files with 7 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
app/src/main/java/org/mydomain/myscan/view/CameraScreen.kt
View File

@@ -201,24 +201,16 @@ private fun CapturedImage(image: ImageBitmap, thumbnailCoords: MutableState<Offs
delay(CAPTURED_IMAGE_DISPLAY_DURATION - ANIMATION_DURATION) delay(CAPTURED_IMAGE_DISPLAY_DURATION - ANIMATION_DURATION)
isAnimating = true isAnimating = true
} }
val transition = updateTransition(targetState = isAnimating, label = "captureAnimation")
val density = LocalDensity.current
var targetOffsetX by remember { mutableFloatStateOf(0f) } var targetOffsetX by remember { mutableFloatStateOf(0f) }
var targetOffsetY by remember { mutableFloatStateOf(0f) } var targetOffsetY by remember { mutableFloatStateOf(0f) }
val offsetX by transition.animateFloat( val transition = updateTransition(targetState = isAnimating, label = "captureAnimation")
transitionSpec = { tween(durationMillis = ANIMATION_DURATION) }, val tween = tween<Float>(durationMillis = ANIMATION_DURATION)
label = "offsetX" val offsetX by transition.animateFloat({ tween }, "offsetX") { if (it) targetOffsetX else 0f }
) { if (it) targetOffsetX else 0f } val offsetY by transition.animateFloat({ tween }, "offsetY") { if (it) targetOffsetY else 0f }
val offsetY by transition.animateFloat( val scale by transition.animateFloat({ tween }, "scale") { if (it) 0.3f else 1f }
transitionSpec = { tween(durationMillis = ANIMATION_DURATION) },
label = "offsetY"
) { if (it) targetOffsetY else 0f }
val scale by transition.animateFloat(
transitionSpec = { tween(durationMillis = ANIMATION_DURATION) },
label = "scale"
) { if (it) 0.3f else 1f }
val density = LocalDensity.current
Box (contentAlignment = Alignment.BottomStart, Box (contentAlignment = Alignment.BottomStart,
modifier = Modifier modifier = Modifier
.fillMaxHeight(0.8f) .fillMaxHeight(0.8f)
@@ -353,7 +345,7 @@ fun CameraScreenPreview() {
ScreenPreview(CaptureState()) ScreenPreview(CaptureState())
} }
@Preview(showBackground = true) @Preview(showBackground = true, showSystemUi = true)
@Composable @Composable
fun CameraScreenPreviewWithProcessedImage() { fun CameraScreenPreviewWithProcessedImage() {
ScreenPreview(CaptureState(processedImage = debugImage("gallica.bnf.fr-bpt6k5530456s-1.jpg"))) ScreenPreview(CaptureState(processedImage = debugImage("gallica.bnf.fr-bpt6k5530456s-1.jpg")))