From 3cab353c10a6721c96e6e2af5280a36f358fe519 Mon Sep 17 00:00:00 2001 From: Kevin Boulongne Date: Thu, 28 Nov 2024 09:49:29 +0100 Subject: [PATCH] refactor: Move configuration values to constants --- .../ui/components/SwipeToDismissComponent.kt | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/components/SwipeToDismissComponent.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/components/SwipeToDismissComponent.kt index 7195584a8..e5bab1259 100644 --- a/app/src/main/java/com/infomaniak/swisstransfer/ui/components/SwipeToDismissComponent.kt +++ b/app/src/main/java/com/infomaniak/swisstransfer/ui/components/SwipeToDismissComponent.kt @@ -44,6 +44,11 @@ import com.infomaniak.swisstransfer.ui.theme.Margin import com.infomaniak.swisstransfer.ui.theme.SwissTransferTheme import com.infomaniak.swisstransfer.ui.utils.PreviewLightAndDark +private const val DISMISS_THRESHOLD = 0.5f +private const val MIN_ICON_SCALE = 1.0f +private const val MAX_ICON_SCALE = 1.5f +private const val SWIPED_ELEVATION = 4 + @Composable fun SwipeToDismissComponent( contentShape: Shape, @@ -51,14 +56,8 @@ fun SwipeToDismissComponent( content: @Composable () -> Unit, ) { - // Configuration - val dismissThreshold = 0.5f - val minIconScale = 1.0f - val maxIconScale = 1.5f - val swipedElevation = 4.dp - val state = rememberSwipeToDismissBoxState( - positionalThreshold = { totalDistance -> totalDistance * dismissThreshold }, + positionalThreshold = { totalDistance -> totalDistance * DISMISS_THRESHOLD }, ) if (state.currentValue == SwipeToDismissBoxValue.EndToStart) onSwiped() @@ -72,11 +71,11 @@ fun SwipeToDismissComponent( label = "Background color animation", ) val iconScale by animateFloatAsState( - targetValue = if (state.targetValue == SwipeToDismissBoxValue.EndToStart) maxIconScale else minIconScale, + targetValue = if (state.targetValue == SwipeToDismissBoxValue.EndToStart) MAX_ICON_SCALE else MIN_ICON_SCALE, label = "Icon scale animation", ) val contentElevation by animateDpAsState( - targetValue = if (state.dismissDirection == SwipeToDismissBoxValue.EndToStart) swipedElevation else 0.dp, + targetValue = if (state.dismissDirection == SwipeToDismissBoxValue.EndToStart) SWIPED_ELEVATION.dp else 0.dp, label = "Content elevation animation", )