Skip to content

Commit 05e1022

Browse files
committed
Merge branch 'keyboard-doesnt-auto-capitalize-custom-list-name-droid-971'
2 parents a05655b + 0e6f5f7 commit 05e1022

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/CustomListNameTextField.kt

+2
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import androidx.compose.ui.focus.FocusRequester
1010
import androidx.compose.ui.focus.focusRequester
1111
import androidx.compose.ui.focus.onFocusChanged
1212
import androidx.compose.ui.platform.LocalSoftwareKeyboardController
13+
import androidx.compose.ui.text.input.KeyboardCapitalization
1314
import androidx.compose.ui.text.input.KeyboardType
1415
import net.mullvad.mullvadvpn.compose.textfield.CustomTextField
1516
import net.mullvad.mullvadvpn.lib.model.CustomListName
@@ -50,6 +51,7 @@ fun CustomListNameTextField(
5051
)
5152
}
5253
},
54+
capitalization = KeyboardCapitalization.Words,
5355
modifier =
5456
modifier.focusRequester(focusRequester).onFocusChanged { focusState ->
5557
if (focusState.hasFocus) {

android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/textfield/CustomTextField.kt

+4-1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ import androidx.compose.ui.Modifier
1919
import androidx.compose.ui.draw.clip
2020
import androidx.compose.ui.text.TextRange
2121
import androidx.compose.ui.text.input.ImeAction
22+
import androidx.compose.ui.text.input.KeyboardCapitalization
2223
import androidx.compose.ui.text.input.KeyboardType
2324
import androidx.compose.ui.text.input.TextFieldValue
2425
import androidx.compose.ui.text.input.VisualTransformation
@@ -43,12 +44,14 @@ fun CustomTextField(
4344
visualTransformation: VisualTransformation = VisualTransformation.None,
4445
supportingText: @Composable (() -> Unit)? = null,
4546
colors: TextFieldColors = mullvadDarkTextFieldColors(),
47+
capitalization: KeyboardCapitalization = KeyboardCapitalization.None,
4648
keyboardOptions: KeyboardOptions =
4749
KeyboardOptions(
4850
keyboardType = keyboardType,
4951
imeAction = ImeAction.Done,
5052
autoCorrect = false,
51-
)
53+
capitalization = capitalization
54+
),
5255
) {
5356

5457
val scope = rememberCoroutineScope()

0 commit comments

Comments
 (0)