refactor: simplify number pad input

Author: ovitrif

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

@@ -68,6 +68,8 @@ private const val ALPHA_PRESSED = 0.2f
 private val pressHaptic = HapticFeedbackType.VirtualKey
 private val errorHaptic = HapticFeedbackType.Reject
 
+typealias OnKeyPress = (key: String) -> Unit
+
 /** Pad dimming when disabled — white keys render at White64. */
 private const val DISABLED_ALPHA = 0.64f
 
@@ -76,7 +78,7 @@ private const val DISABLED_ALPHA = 0.64f
  */
 @Composable
 fun NumberPad(
-    onPress: (String) -> Unit,
+    onPress: OnKeyPress,
     modifier: Modifier = Modifier,
     type: NumberPadType = NumberPadType.SIMPLE,
     availableHeight: Dp = defaultHeight,
@@ -88,29 +90,25 @@ fun NumberPad(
 ) {
     val focusRequester = remember { FocusRequester() }
     LaunchedEffect(Unit) {
-        // Composing mid sheet/nav transition can drop the initial request, leaving
-        // hardware keyboard input dead; retry briefly until the focus node takes it.
+        // Composing mid-transition can drop the initial request, leaving input dead;
+        // retry briefly until the focus node takes it.
         repeat(FOCUS_RETRY_COUNT) {
             if (runCatching { focusRequester.requestFocus() }.isSuccess) return@LaunchedEffect
             delay(FOCUS_RETRY_DELAY)
         }
     }
-    val safeAreaModifier = if (includeNavigationBarsPadding) {
-        modifier.navigationBarsPadding()
-    } else {
-        modifier
-    }
     // Disabled: no-op input and dim the keys to White64.
-    val keyOnPress: (String) -> Unit = if (enabled) onPress else { _ -> }
+    val onPressIfEnabled: OnKeyPress = if (enabled) onPress else { _ -> }
 
     BoxWithConstraints(
-        modifier = safeAreaModifier
+        modifier = modifier
+            .let { if (includeNavigationBarsPadding) it.navigationBarsPadding() else it }
             .alpha(if (enabled) 1f else DISABLED_ALPHA)
             .focusRequester(focusRequester)
             .onPreviewKeyEvent { keyEvent ->
                 if (keyEvent.type != KeyEventType.KeyDown) return@onPreviewKeyEvent false
                 val mapped = mapHardwareKey(keyEvent.key, type) ?: return@onPreviewKeyEvent false
-                keyOnPress(mapped)
+                onPressIfEnabled(mapped)
                 true
             }
             .focusable()
@@ -130,7 +128,7 @@ fun NumberPad(
             items((1..9).map { "$it" }) { number ->
                 NumberPadKeyButton(
                     text = number,
-                    onPress = keyOnPress,
+                    onPress = onPressIfEnabled,
                     height = buttonHeight,
                     hasError = errorKey == number,
                 )
@@ -145,15 +143,15 @@ fun NumberPad(
 
                     NumberPadType.INTEGER -> NumberPadKeyButton(
                         text = KEY_000,
-                        onPress = keyOnPress,
+                        onPress = onPressIfEnabled,
                         height = buttonHeight,
                         hasError = errorKey == KEY_000,
                         testTag = "N000",
                     )
 
                     NumberPadType.DECIMAL -> NumberPadKeyButton(
                         text = decimalSeparator,
-                        onPress = keyOnPress,
+                        onPress = onPressIfEnabled,
                         height = buttonHeight,
                         key = KEY_DECIMAL,
                         hasError = errorKey == KEY_DECIMAL,
@@ -164,14 +162,14 @@ fun NumberPad(
             item {
                 NumberPadKeyButton(
                     text = "0",
-                    onPress = keyOnPress,
+                    onPress = onPressIfEnabled,
                     height = buttonHeight,
                     hasError = errorKey == "0",
                 )
             }
             item {
                 NumberPadDeleteButton(
-                    onPress = { keyOnPress(KEY_DELETE) },
+                    onPress = { onPressIfEnabled(KEY_DELETE) },
                     onLongPress = onDeleteLongPress,
                     height = buttonHeight,
                     modifier = Modifier.testTag("NRemove"),
@@ -234,7 +232,7 @@ private fun mapHardwareKey(key: Key, type: NumberPadType): String? {
 @Composable
 fun NumberPadKeyButton(
     text: String,
-    onPress: (String) -> Unit,
+    onPress: OnKeyPress,
     height: Dp,
     modifier: Modifier = Modifier,
     key: String = text,