feat(chat): reverse reply gesture direction

outadoc · Oct 22, 2024 · 62ecec4 · 62ecec4
1 parent f108c4d
commit 62ecec4
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 10 deletions.
diff --git a/...rc/commonMain/kotlin/fr/outadoc/justchatting/feature/chat/presentation/mobile/ChatList.kt b/...rc/commonMain/kotlin/fr/outadoc/justchatting/feature/chat/presentation/mobile/ChatList.kt
@@ -171,7 +171,10 @@ internal fun ChatList(
 
                 SwipeToReply(
                     modifier = Modifier.animateItem(),
-                    onDismiss = { onReplyToMessage(item) },
+                    onDismiss = {
+                        haptic.performHapticFeedback(HapticFeedbackType.LongPress)
+                        onReplyToMessage(item)
+                    },
                     enabled = canBeRepliedTo,
                 ) {
                     ChatMessage(

diff --git a/...ommonMain/kotlin/fr/outadoc/justchatting/feature/chat/presentation/mobile/SwipeToReply.kt b/...ommonMain/kotlin/fr/outadoc/justchatting/feature/chat/presentation/mobile/SwipeToReply.kt
@@ -18,6 +18,7 @@ import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.alpha
 import androidx.compose.ui.draw.scale
 import androidx.compose.ui.hapticfeedback.HapticFeedbackType
 import androidx.compose.ui.platform.LocalHapticFeedback
@@ -30,21 +31,22 @@ internal fun SwipeToReply(
     onDismiss: () -> Unit,
     content: @Composable () -> Unit,
 ) {
+    val direction: SwipeToDismissBoxValue = SwipeToDismissBoxValue.EndToStart
     val dismissState: SwipeToDismissBoxState =
         rememberSwipeToDismissBoxState(
             confirmValueChange = { value ->
-                if (value == SwipeToDismissBoxValue.StartToEnd) {
+                if (value == direction) {
                     onDismiss()
                 }
-                value != SwipeToDismissBoxValue.StartToEnd
+                value != direction
             },
         )
 
     SwipeToDismissBox(
         modifier = modifier,
         state = dismissState,
-        enableDismissFromStartToEnd = enabled,
-        enableDismissFromEndToStart = false,
+        enableDismissFromStartToEnd = false,
+        enableDismissFromEndToStart = enabled,
         backgroundContent = {
             val scale by animateFloatAsState(
                 when (dismissState.targetValue) {
@@ -56,28 +58,30 @@ internal fun SwipeToReply(
 
             val haptic = LocalHapticFeedback.current
             LaunchedEffect(dismissState.targetValue) {
-                if (dismissState.targetValue == SwipeToDismissBoxValue.StartToEnd) {
+                if (dismissState.targetValue == direction) {
                     haptic.performHapticFeedback(HapticFeedbackType.LongPress)
                 }
             }
 
             Box(
                 Modifier
                     .fillMaxSize()
-                    .padding(start = 8.dp),
-                contentAlignment = Alignment.CenterStart,
+                    .padding(end = 8.dp),
+                contentAlignment = Alignment.CenterEnd,
             ) {
                 Icon(
                     Icons.AutoMirrored.Filled.Reply,
                     contentDescription = "Reply",
-                    modifier = Modifier.scale(scale),
+                    modifier = Modifier
+                        .scale(scale)
+                        .alpha(scale),
                 )
             }
         },
         content = {
             val elevation by animateDpAsState(
                 targetValue = when (dismissState.targetValue) {
-                    SwipeToDismissBoxValue.StartToEnd -> 1.dp
+                    direction -> 2.dp
                     else -> 0.dp
                 },
                 label = "Reply item elevation",