Merge pull request #71 from synonymdev/feat/send-amount-implement-keyboard

Implement the keyboard in the Send Amount Screen

Author: ovitrif

app/src/main/java/to/bitkit/ui/screens/wallets/send/SendAmountScreen.kt

@@ -24,6 +24,7 @@ import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.unit.dp
 import to.bitkit.R
 import to.bitkit.ui.LocalBalances
+import to.bitkit.ui.components.Keyboard
 import to.bitkit.ui.components.OutlinedColorButton
 import to.bitkit.ui.components.PrimaryButton
 import to.bitkit.ui.components.Text13Up
@@ -56,14 +57,14 @@ fun SendAmountScreen(
             val focusRequester = remember { FocusRequester() }
             LaunchedEffect(Unit) { focusRequester.requestFocus() }
 
-            TextField(
+            TextField( //TODO UPDATE IN OTHER PR
                 placeholder = { Text(stringResource(R.string.amount_placeholder)) },
+                readOnly = true,
                 value = uiState.amountInput,
-                onValueChange = { onEvent(SendEvent.AmountChange(it)) },
+                onValueChange = {  },
                 colors = AppTextFieldDefaults.noIndicatorColors,
                 shape = MaterialTheme.shapes.small,
                 singleLine = true,
-                keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Number),
                 modifier = Modifier
                     .fillMaxWidth()
                     .focusRequester(focusRequester)
@@ -104,15 +105,25 @@ fun SendAmountScreen(
                     )
                 }
             }
-            HorizontalDivider()
 
             Spacer(modifier = Modifier.weight(1f))
 
+            HorizontalDivider(modifier = Modifier.padding(vertical = 32.dp))
+
+            Keyboard(
+                onClick = { number -> onEvent(SendEvent.AmountChange(number)) },
+                isDecimal = false, //TODO UPDATE IN OTHER PR
+                modifier = Modifier.fillMaxWidth(),
+            )
+
+            Spacer(modifier = Modifier.height(41.dp))
+
             PrimaryButton(
                 text = stringResource(R.string.continue_button),
                 enabled = uiState.isAmountInputValid,
                 onClick = { onEvent(SendEvent.AmountContinue(uiState.amountInput)) },
             )
+
             Spacer(modifier = Modifier.height(16.dp))
         }
     }

app/src/main/java/to/bitkit/viewmodels/AppViewModel.kt

@@ -271,13 +271,12 @@ class AppViewModel @Inject constructor(
     }
 
     private fun onAmountChange(value: String) {
-        val isAmountValid = validateAmount(value)
-        _sendUiState.update {
-            it.copy(
-                amountInput = value,
-                isAmountInputValid = isAmountValid,
-            )
+        val newInput = if (_sendUiState.value.amountInput == "0") value else _sendUiState.value.amountInput + value
+        val isAmountValid = validateAmount(newInput)
+        if (isAmountValid) {
+            _sendUiState.update { it.copy( amountInput = newInput,) }
         }
+        _sendUiState.update { it.copy(isAmountInputValid = isAmountValid,) }
     }
 
     private fun onPaymentMethodSwitch() {