diff options
| author | Jonatan Rhodin <jonatan.rhodin@mullvad.net> | 2024-06-18 17:16:33 +0200 |
|---|---|---|
| committer | Jonatan Rhodin <jonatan.rhodin@mullvad.net> | 2024-06-18 17:16:33 +0200 |
| commit | 05e102263c2755ba87ef628b164196d6ffe6c92c (patch) | |
| tree | 356ae0e040a91ab7da80be9e7b258cbc4f26099e /android/app/src | |
| parent | a05655b41935da6f3e5a219841a03ca49e7e6d06 (diff) | |
| parent | 0e6f5f741401e4449b352ec5f8bb494d03c9422f (diff) | |
| download | mullvadvpn-05e102263c2755ba87ef628b164196d6ffe6c92c.tar.xz mullvadvpn-05e102263c2755ba87ef628b164196d6ffe6c92c.zip | |
Merge branch 'keyboard-doesnt-auto-capitalize-custom-list-name-droid-971'
Diffstat (limited to 'android/app/src')
2 files changed, 6 insertions, 1 deletions
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/CustomListNameTextField.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/CustomListNameTextField.kt index bb4339a1f7..f0cb0e8209 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/CustomListNameTextField.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/CustomListNameTextField.kt @@ -10,6 +10,7 @@ import androidx.compose.ui.focus.FocusRequester import androidx.compose.ui.focus.focusRequester import androidx.compose.ui.focus.onFocusChanged import androidx.compose.ui.platform.LocalSoftwareKeyboardController +import androidx.compose.ui.text.input.KeyboardCapitalization import androidx.compose.ui.text.input.KeyboardType import net.mullvad.mullvadvpn.compose.textfield.CustomTextField import net.mullvad.mullvadvpn.lib.model.CustomListName @@ -50,6 +51,7 @@ fun CustomListNameTextField( ) } }, + capitalization = KeyboardCapitalization.Words, modifier = modifier.focusRequester(focusRequester).onFocusChanged { focusState -> if (focusState.hasFocus) { 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 ac73e9fa34..fb325ffb46 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 @@ -19,6 +19,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip import androidx.compose.ui.text.TextRange import androidx.compose.ui.text.input.ImeAction +import androidx.compose.ui.text.input.KeyboardCapitalization import androidx.compose.ui.text.input.KeyboardType import androidx.compose.ui.text.input.TextFieldValue import androidx.compose.ui.text.input.VisualTransformation @@ -43,12 +44,14 @@ fun CustomTextField( visualTransformation: VisualTransformation = VisualTransformation.None, supportingText: @Composable (() -> Unit)? = null, colors: TextFieldColors = mullvadDarkTextFieldColors(), + capitalization: KeyboardCapitalization = KeyboardCapitalization.None, keyboardOptions: KeyboardOptions = KeyboardOptions( keyboardType = keyboardType, imeAction = ImeAction.Done, autoCorrect = false, - ) + capitalization = capitalization + ), ) { val scope = rememberCoroutineScope() |