fix: clear input on backspace hold

Author: ovitrif

app/src/main/java/to/bitkit/ui/components/NumberPad.kt

@@ -75,6 +75,7 @@ fun NumberPad(
     decimalSeparator: String = KEY_DECIMAL,
     errorKey: String? = null,
     includeNavigationBarsPadding: Boolean = false,
+    onDeleteLongPress: (() -> Unit)? = null,
 ) {
     val focusRequester = remember { FocusRequester() }
     LaunchedEffect(Unit) { focusRequester.requestFocus() }
@@ -152,6 +153,7 @@ fun NumberPad(
             item {
                 NumberPadDeleteButton(
                     onPress = { onPress(KEY_DELETE) },
+                    onLongPress = onDeleteLongPress,
                     height = buttonHeight,
                     modifier = Modifier.testTag("NRemove"),
                 )
@@ -182,6 +184,7 @@ fun NumberPad(
         decimalSeparator = decimalSeparator,
         errorKey = uiState.errorKey,
         includeNavigationBarsPadding = includeNavigationBarsPadding,
+        onDeleteLongPress = viewModel::clearInput,
     )
 }
 
@@ -242,13 +245,15 @@ internal fun NumberPadDeleteButton(
     onPress: () -> Unit,
     height: Dp,
     modifier: Modifier = Modifier,
+    onLongPress: (() -> Unit)? = null,
 ) {
     NumberPadKeyIcon(
         icon = R.drawable.ic_backspace,
         contentDescription = stringResource(R.string.common__delete),
         onClick = onPress,
+        onLongClick = onLongPress,
         height = height,
-        modifier = modifier,
+        modifier = modifier
     )
 }
 
@@ -259,11 +264,13 @@ fun NumberPadKeyIcon(
     onClick: () -> Unit,
     height: Dp,
     modifier: Modifier = Modifier,
+    onLongClick: (() -> Unit)? = null,
 ) {
     NumberPadKey(
         onClick = onClick,
+        onLongClick = onLongClick,
         height = height,
-        modifier = modifier,
+        modifier = modifier
     ) {
         Icon(
             painter = painterResource(icon),
@@ -278,6 +285,7 @@ fun NumberPadKey(
     height: Dp,
     modifier: Modifier = Modifier,
     haptic: HapticFeedbackType = pressHaptic,
+    onLongClick: (() -> Unit)? = null,
     content: @Composable (BoxScope.() -> Unit),
 ) {
     val haptics = LocalHapticFeedback.current
@@ -287,10 +295,20 @@ fun NumberPadKey(
         modifier = modifier
             .height(height)
             .fillMaxWidth()
-            .clickableAlpha(ALPHA_PRESSED, debounce = Duration.ZERO) {
-                haptics.performHapticFeedback(haptic)
-                onClick()
-            },
+            .clickableAlpha(
+                pressedAlpha = ALPHA_PRESSED,
+                debounce = Duration.ZERO,
+                onLongClick = onLongClick?.let {
+                    {
+                        haptics.performHapticFeedback(haptic)
+                        it()
+                    }
+                },
+                onClick = {
+                    haptics.performHapticFeedback(haptic)
+                    onClick()
+                },
+            ),
     )
 }
 

app/src/main/java/to/bitkit/ui/screens/widgets/calculator/components/CalculatorCard.kt

@@ -309,6 +309,13 @@ private fun ColumnScope.Numpad(
                     decimalSeparator = calculatorDecimalSeparator(),
                     errorKey = state.errorKey,
                     includeNavigationBarsPadding = true,
+                    onDeleteLongPress = {
+                        state.clearError()
+                        when (input) {
+                            MoneyType.BITCOIN -> onBtcChange("")
+                            MoneyType.FIAT -> onFiatChange("")
+                        }
+                    },
                     modifier = Modifier
                         .testTag("CalculatorNumberPad")
                 )

app/src/main/java/to/bitkit/ui/shared/modifiers/ClickableAlpha.kt

@@ -10,6 +10,7 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.rememberUpdatedState
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.graphics.graphicsLayer
 import androidx.compose.ui.input.pointer.SuspendingPointerInputModifierNode
 import androidx.compose.ui.input.pointer.pointerInput
@@ -29,6 +30,7 @@ import androidx.compose.ui.unit.Constraints
 import kotlinx.coroutines.launch
 import kotlin.time.Duration
 import kotlin.time.Duration.Companion.milliseconds
+import androidx.compose.ui.semantics.onLongClick as semanticsOnLongClick
 
 private val CLICK_DEBOUNCE = 500.milliseconds
 
@@ -69,41 +71,46 @@ fun Modifier.clickableAlpha(
     enabled: Boolean = true,
     ripple: Boolean = false,
     debounce: Duration = CLICK_DEBOUNCE,
+    onLongClick: (() -> Unit)? = null,
     onClick: (() -> Unit)?,
 ): Modifier = when {
     onClick == null || !enabled -> this
-    ripple ->
+    ripple && onLongClick == null ->
         this
             .alphaFeedback(pressedAlpha)
             .clickable(onClick = rememberDebouncedClick(debounce, onClick))
 
-    else -> this.then(ClickableAlphaElement(pressedAlpha, debounce, onClick))
+    else -> this.then(ClickableAlphaElement(pressedAlpha, debounce, onLongClick, onClick))
 }
 
 private data class ClickableAlphaElement(
     val pressedAlpha: Float,
     val debounce: Duration,
+    val onLongClick: (() -> Unit)?,
     val onClick: () -> Unit,
 ) : ModifierNodeElement<ClickableAlphaNode>() {
-    override fun create(): ClickableAlphaNode = ClickableAlphaNode(pressedAlpha, debounce, onClick)
+    override fun create(): ClickableAlphaNode = ClickableAlphaNode(pressedAlpha, debounce, onLongClick, onClick)
 
     override fun update(node: ClickableAlphaNode) {
         node.pressedAlpha = pressedAlpha
         node.debounce = debounce
+        node.onLongClick = onLongClick
         node.onClick = onClick
     }
 
     override fun InspectorInfo.inspectableProperties() {
         name = "clickableAlpha"
         properties["pressedAlpha"] = pressedAlpha
         properties["debounce"] = debounce
+        properties["onLongClick"] = onLongClick
         properties["onClick"] = onClick
     }
 }
 
 private class ClickableAlphaNode(
     var pressedAlpha: Float,
     var debounce: Duration,
+    var onLongClick: (() -> Unit)?,
     var onClick: () -> Unit,
 ) : DelegatingNode(), LayoutModifierNode, SemanticsModifierNode {
 
@@ -121,6 +128,7 @@ private class ClickableAlphaNode(
                             coroutineScope.launch { animatable.animateTo(1f) }
                         }
                     },
+                    onLongPress = if (onLongClick == null) null else ::handleLongPress,
                     onTap = {
                         if (debouncer.tryClick(debounce, onClick)) {
                             coroutineScope.launch {
@@ -136,6 +144,12 @@ private class ClickableAlphaNode(
         )
     }
 
+    @Suppress("UNUSED_PARAMETER")
+    private fun handleLongPress(offset: Offset) {
+        onLongClick?.invoke()
+        coroutineScope.launch { animatable.animateTo(1f) }
+    }
+
     override fun MeasureScope.measure(measurable: Measurable, constraints: Constraints): MeasureResult {
         val placeable = measurable.measure(constraints)
 
@@ -152,6 +166,12 @@ private class ClickableAlphaNode(
             debouncer.tryClick(debounce, onClick)
             true
         }
+        onLongClick?.let {
+            semanticsOnLongClick {
+                it()
+                true
+            }
+        }
     }
 }