From bfb06b4f78da38abf6dfb97c0fdc69c6207bc944 Mon Sep 17 00:00:00 2001 From: Him188 Date: Wed, 3 Apr 2024 20:23:12 +0100 Subject: [PATCH] Add animation label for SeekPositionIndicator and add previews --- .../ui/VideoGestureHost.android.kt | 37 +++++++++++++++++-- .../ui/guesture/VideoGestureHost.kt | 3 +- 2 files changed, 36 insertions(+), 4 deletions(-) diff --git a/app/shared/video-player/androidMain/ui/VideoGestureHost.android.kt b/app/shared/video-player/androidMain/ui/VideoGestureHost.android.kt index a0363e0ebf..6891c8f571 100644 --- a/app/shared/video-player/androidMain/ui/VideoGestureHost.android.kt +++ b/app/shared/video-player/androidMain/ui/VideoGestureHost.android.kt @@ -1,6 +1,10 @@ package me.him188.ani.app.videoplayer.ui +import androidx.compose.foundation.background +import androidx.compose.foundation.layout.Box import androidx.compose.runtime.Composable +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color import androidx.compose.ui.tooling.preview.PreviewLightDark import me.him188.ani.app.ui.foundation.ProvideCompositionLocalsForPreview import me.him188.ani.app.videoplayer.ui.guesture.SeekPositionIndicator @@ -10,7 +14,16 @@ import me.him188.ani.app.videoplayer.ui.guesture.SeekPositionIndicator @Composable private fun PreviewSeekPositionIndicatorForward() { ProvideCompositionLocalsForPreview { - SeekPositionIndicator(deltaDuration = 10) + Box { + Box( + modifier = Modifier + .matchParentSize() + .background(Color.Transparent) + ) { + + } + SeekPositionIndicator(deltaDuration = 10) + } } } @@ -18,7 +31,16 @@ private fun PreviewSeekPositionIndicatorForward() { @Composable private fun PreviewSeekPositionIndicatorBackward() { ProvideCompositionLocalsForPreview { - SeekPositionIndicator(deltaDuration = -10) + Box { + Box( + modifier = Modifier + .matchParentSize() + .background(Color.Transparent) + ) { + + } + SeekPositionIndicator(deltaDuration = -10) + } } } @@ -26,6 +48,15 @@ private fun PreviewSeekPositionIndicatorBackward() { @Composable private fun PreviewSeekPositionIndicatorBackwardMinutes() { ProvideCompositionLocalsForPreview { - SeekPositionIndicator(deltaDuration = -90) + Box { + Box( + modifier = Modifier + .matchParentSize() + .background(Color.Transparent) + ) { + + } + SeekPositionIndicator(deltaDuration = -90) + } } } diff --git a/app/shared/video-player/commonMain/ui/guesture/VideoGestureHost.kt b/app/shared/video-player/commonMain/ui/guesture/VideoGestureHost.kt index d1600ae170..211a61f522 100644 --- a/app/shared/video-player/commonMain/ui/guesture/VideoGestureHost.kt +++ b/app/shared/video-player/commonMain/ui/guesture/VideoGestureHost.kt @@ -112,7 +112,8 @@ fun VideoGestureHost( AnimatedVisibility( visible = seekerState.isSeeking, enter = fadeIn(tween(durationMillis = 100)), - exit = fadeOut(tween(durationMillis = 500, delayMillis = 250)) + exit = fadeOut(tween(durationMillis = 500, delayMillis = 250)), + label = "SeekPositionIndicator" ) { SeekPositionIndicator(seekerState.deltaSeconds) }