diff options
| author | David Göransson <david.goransson@mullvad.net> | 2024-10-07 09:05:52 +0200 |
|---|---|---|
| committer | David Göransson <david.goransson@mullvad.net> | 2024-10-07 09:05:52 +0200 |
| commit | b57b3fad33ae4046f04017aedbf04616d0361669 (patch) | |
| tree | 3622d9f2bfc22355bd73c5472c1265cbe9db6c9e | |
| parent | a0839b7eefa9b6a415e74aeb1e3ffd07895acb59 (diff) | |
| parent | 3f5fc036ff8e8d644b4ad36f83b2bcd80a29538e (diff) | |
| download | mullvadvpn-b57b3fad33ae4046f04017aedbf04616d0361669.tar.xz mullvadvpn-b57b3fad33ae4046f04017aedbf04616d0361669.zip | |
Merge branch 'ime-does-not-work-correctly-in-creating-custom-listings-droid-1403'
2 files changed, 4 insertions, 7 deletions
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/CreateCustomListDialog.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/CreateCustomListDialog.kt index a7656573b1..fc9109cf4d 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/CreateCustomListDialog.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/CreateCustomListDialog.kt @@ -2,10 +2,9 @@ package net.mullvad.mullvadvpn.compose.dialog import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect -import androidx.compose.runtime.derivedStateOf import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf -import androidx.compose.runtime.remember +import androidx.compose.runtime.saveable.rememberSaveable import androidx.compose.ui.Modifier import androidx.compose.ui.platform.testTag import androidx.compose.ui.res.stringResource @@ -97,8 +96,8 @@ fun CreateCustomListDialog( onInputChanged: () -> Unit = {}, onDismiss: () -> Unit = {}, ) { - val name = remember { mutableStateOf("") } - val isValidName by remember { derivedStateOf { name.value.isNotBlank() } } + val name = rememberSaveable { mutableStateOf("") } + val isValidName = name.value.isNotBlank() InputDialog( title = stringResource(id = R.string.create_new_list), diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/textfield/CustomListNameTextField.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/textfield/CustomListNameTextField.kt index d8439a5c0d..ddbd1fd8d0 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/textfield/CustomListNameTextField.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/textfield/CustomListNameTextField.kt @@ -33,9 +33,7 @@ fun CustomListNameTextField( onSubmit(it) } }, - // This can not be set to KeyboardType.Text because it will show the - // suggestions, this will cause an infinite loop on Android TV with Gboard - keyboardType = KeyboardType.Password, + keyboardType = KeyboardType.Text, placeholderText = null, isValidValue = error == null, isDigitsOnlyAllowed = false, |