diff options
3 files changed, 6 insertions, 1 deletions
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/textfield/CustomTextField.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/textfield/CustomTextField.kt index 4535971a69..4b3138b7ea 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/textfield/CustomTextField.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/textfield/CustomTextField.kt @@ -46,6 +46,7 @@ private const val NEWLINE_STRING = "\n" @OptIn(ExperimentalComposeUiApi::class) fun CustomTextField( value: String, + keyboardType: KeyboardType, modifier: Modifier = Modifier, onValueChanged: (String) -> Unit, onFocusChange: (Boolean) -> Unit, @@ -110,7 +111,7 @@ fun CustomTextField( maxLines = 1, keyboardOptions = KeyboardOptions( - keyboardType = KeyboardType.Number, + keyboardType = keyboardType, imeAction = ImeAction.Done, autoCorrect = false, ), diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/textfield/DnsTextField.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/textfield/DnsTextField.kt index 3454f48792..bbd9755d2b 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/textfield/DnsTextField.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/textfield/DnsTextField.kt @@ -2,6 +2,7 @@ package net.mullvad.mullvadvpn.compose.textfield import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier +import androidx.compose.ui.text.input.KeyboardType import androidx.compose.ui.text.style.TextAlign @Composable @@ -17,6 +18,7 @@ fun DnsTextField( ) { CustomTextField( value = value, + keyboardType = KeyboardType.Text, modifier = modifier, onValueChanged = onValueChanged, onFocusChange = onFocusChanges, diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/textfield/MtuTextField.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/textfield/MtuTextField.kt index 787c502908..4e6e4fc63c 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/textfield/MtuTextField.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/textfield/MtuTextField.kt @@ -2,6 +2,7 @@ package net.mullvad.mullvadvpn.compose.textfield import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier +import androidx.compose.ui.text.input.KeyboardType @Composable fun MtuTextField( @@ -17,6 +18,7 @@ fun MtuTextField( ) { CustomTextField( value = value, + keyboardType = KeyboardType.Number, modifier = modifier, onValueChanged = onValueChanged, onFocusChange = onFocusChange, |