Merge pull request #56 from synonymdev/fix/send_btc_input_layout

Send BTC screen Polishing

Author: jvsena42

app/src/main/java/to/bitkit/ext/String.kt

@@ -17,3 +17,5 @@ fun String.truncate(length: Int): String {
         this
     }.trim()
 }
+
+fun String.removeSpaces() = this.filterNot { it.isWhitespace() }

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

@@ -16,17 +16,16 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.focus.FocusRequester
 import androidx.compose.ui.focus.focusRequester
 import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import to.bitkit.R
-import to.bitkit.viewmodels.SendEvent
-import to.bitkit.viewmodels.SendUiState
+import to.bitkit.ui.components.Caption13Up
 import to.bitkit.ui.components.PrimaryButton
 import to.bitkit.ui.scaffold.SheetTopBar
-import to.bitkit.ui.shared.util.DarkModePreview
-import to.bitkit.ui.shared.util.LightModePreview
 import to.bitkit.ui.theme.AppTextFieldDefaults
 import to.bitkit.ui.theme.AppThemeSurface
+import to.bitkit.viewmodels.SendEvent
+import to.bitkit.viewmodels.SendUiState
 
 @Composable
 fun SendAddressScreen(
@@ -47,25 +46,21 @@ fun SendAddressScreen(
             val focusRequester = remember { FocusRequester() }
             LaunchedEffect(Unit) { focusRequester.requestFocus() }
 
-            Text(
-                text = stringResource(R.string.wallet__send_to),
-                style = MaterialTheme.typography.labelSmall,
-                fontWeight = FontWeight.Normal,
-            )
-            Spacer(modifier = Modifier.height(4.dp))
+            Caption13Up(text = stringResource(R.string.wallet__send_to))
+            Spacer(modifier = Modifier.height(16.dp))
             TextField(
                 placeholder = { Text(stringResource(R.string.address_placeholder)) },
                 value = uiState.addressInput,
                 onValueChange = { onEvent(SendEvent.AddressChange(it)) },
                 minLines = 12,
-                maxLines = 12,
                 colors = AppTextFieldDefaults.noIndicatorColors,
-                shape = MaterialTheme.shapes.medium,
+                shape = MaterialTheme.shapes.small,
                 modifier = Modifier
                     .fillMaxWidth()
+                    .weight(1f)
                     .focusRequester(focusRequester),
             )
-            Spacer(modifier = Modifier.weight(1f))
+            Spacer(modifier = Modifier.height(16.dp))
             PrimaryButton(
                 text = stringResource(R.string.continue_button),
                 enabled = uiState.isAddressInputValid,
@@ -77,10 +72,9 @@ fun SendAddressScreen(
 
 }
 
-@LightModePreview
-@DarkModePreview
+@Preview(showSystemUi = true)
 @Composable
-private fun SendEnterManuallyScreenPreview() {
+private fun Preview() {
     AppThemeSurface {
         SendAddressScreen(
             uiState = SendUiState(),
@@ -89,3 +83,19 @@ private fun SendEnterManuallyScreenPreview() {
         )
     }
 }
+
+@Preview(showSystemUi = true)
+@Composable
+private fun Preview2() {
+    AppThemeSurface {
+        SendAddressScreen(
+            uiState = SendUiState(
+                address = "bc1q5f29hzkgp6hqla63m32pa0jyfqq32c20837cz4",
+                addressInput = "bc1q5f29hzkgp6hqla63m32pa0jyfqq32c20837cz4",
+                isAddressInputValid = true
+            ),
+            onBack = {},
+            onEvent = {},
+        )
+    }
+}

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

@@ -24,6 +24,7 @@ import org.lightningdevkit.ldknode.PaymentId
 import org.lightningdevkit.ldknode.Txid
 import to.bitkit.data.SettingsStore
 import to.bitkit.data.keychain.Keychain
+import to.bitkit.ext.removeSpaces
 import to.bitkit.models.NewTransactionSheetDetails
 import to.bitkit.models.NewTransactionSheetDirection
 import to.bitkit.models.NewTransactionSheetType
@@ -221,11 +222,12 @@ class AppViewModel @Inject constructor(
     }
 
     private fun onAddressChange(value: String) {
+        val valueWithoutSpaces = value.removeSpaces()
         viewModelScope.launch {
-            val result = runCatching { scannerService.decode(value) }
+            val result = runCatching { scannerService.decode(valueWithoutSpaces) }
             _sendUiState.update {
                 it.copy(
-                    addressInput = value,
+                    addressInput = valueWithoutSpaces,
                     isAddressInputValid = result.isSuccess,
                 )
             }