Merge branch 'main' of https://github.com/vitorpamplona/amethyst

* 'main' of https://github.com/vitorpamplona/amethyst:
  feat: replace dialog with swipe-to-reveal delete button for drafts
  feat: add confirmation dialog when swiping to delete a draft

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/components/SwipeToDelete.kt

@@ -22,6 +22,7 @@ package com.vitorpamplona.amethyst.ui.components
 
 import androidx.compose.animation.animateColorAsState
 import androidx.compose.foundation.background
+import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.RowScope
@@ -38,10 +39,12 @@ import androidx.compose.material3.SwipeToDismissBoxState
 import androidx.compose.material3.SwipeToDismissBoxValue.EndToStart
 import androidx.compose.material3.SwipeToDismissBoxValue.Settled
 import androidx.compose.material3.SwipeToDismissBoxValue.StartToEnd
+import androidx.compose.material3.Text
 import androidx.compose.material3.rememberSwipeToDismissBoxState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
@@ -50,6 +53,7 @@ import androidx.compose.ui.platform.LocalHapticFeedback
 import androidx.compose.ui.unit.dp
 import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.ui.stringRes
+import kotlinx.coroutines.launch
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
@@ -88,6 +92,34 @@ fun SwipeToDeleteContainer(
     )
 }
 
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun SwipeToDeleteWithConfirmation(
+    modifier: Modifier = Modifier,
+    onDelete: () -> Unit,
+    content: @Composable (RowScope.() -> Unit),
+) {
+    val scope = rememberCoroutineScope()
+
+    val dismissState =
+        rememberSwipeToDismissBoxState(
+            positionalThreshold = { it * .40f },
+        )
+
+    SwipeToDismissBox(
+        state = dismissState,
+        modifier = modifier,
+        backgroundContent = {
+            ConfirmDeleteBackground(dismissState) {
+                onDelete()
+                scope.launch { dismissState.reset() }
+            }
+        },
+        enableDismissFromEndToStart = true,
+        content = content,
+    )
+}
+
 @Composable
 fun DismissBackground(dismissState: SwipeToDismissBoxState) {
     val color by animateColorAsState(
@@ -127,3 +159,53 @@ fun DismissBackground(dismissState: SwipeToDismissBoxState) {
         )
     }
 }
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun ConfirmDeleteBackground(
+    dismissState: SwipeToDismissBoxState,
+    onConfirmDelete: () -> Unit,
+) {
+    val settled = dismissState.currentValue == Settled && dismissState.targetValue == Settled
+
+    val color by animateColorAsState(
+        if (!settled) {
+            Color(0xFFFF1744)
+        } else {
+            MaterialTheme.colorScheme.surfaceVariant
+        },
+        label = "ConfirmDeleteBackground",
+    )
+
+    val haptic = LocalHapticFeedback.current
+    LaunchedEffect(key1 = dismissState.currentValue > dismissState.targetValue) {
+        if (dismissState.progress > 0 && dismissState.progress < 1) {
+            haptic.performHapticFeedback(HapticFeedbackType.LongPress)
+        }
+    }
+
+    Row(
+        modifier =
+            Modifier
+                .fillMaxSize()
+                .background(color)
+                .clickable(enabled = !settled) { onConfirmDelete() }
+                .padding(20.dp, 8.dp),
+        verticalAlignment = Alignment.CenterVertically,
+        horizontalArrangement = Arrangement.SpaceBetween,
+    ) {
+        Icon(
+            Icons.Default.Delete,
+            contentDescription = stringRes(id = R.string.request_deletion),
+        )
+        Text(
+            text = stringRes(id = R.string.request_deletion),
+            color = Color.White,
+            style = MaterialTheme.typography.titleMedium,
+        )
+        Icon(
+            Icons.Default.Delete,
+            contentDescription = stringRes(id = R.string.request_deletion),
+        )
+    }
+}

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/drafts/DraftListScreen.kt

@@ -48,7 +48,7 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.commons.ui.feeds.FeedContentState
 import com.vitorpamplona.amethyst.commons.ui.feeds.FeedState
-import com.vitorpamplona.amethyst.ui.components.SwipeToDeleteContainer
+import com.vitorpamplona.amethyst.ui.components.SwipeToDeleteWithConfirmation
 import com.vitorpamplona.amethyst.ui.feeds.RefresheableBox
 import com.vitorpamplona.amethyst.ui.feeds.RenderFeedContentState
 import com.vitorpamplona.amethyst.ui.feeds.ScrollStateKeys.DRAFTS
@@ -168,9 +168,9 @@ private fun DraftFeedLoaded(
         }
         itemsIndexed(items.list, key = { _, item -> item.idHex }) { _, item ->
             Row(Modifier.fillMaxWidth().animateItem()) {
-                SwipeToDeleteContainer(
+                SwipeToDeleteWithConfirmation(
                     modifier = Modifier.fillMaxWidth().animateContentSize(),
-                    onStartToEnd = { accountViewModel.delete(item) },
+                    onDelete = { accountViewModel.delete(item) },
                 ) {
                     NoteCompose(
                         item,