ehealthsolutions/element-x-android
3
0
Fork 0
mirror of https://github.com/Novaloop-AG/element-x-android.git synced 2026-11-02 21:05:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve the reset identity password field (#7850)

Browse Source 
Use the password keyboard type, mark the field as a password for
autofill, and submit the reset with the IME "Done" action, matching
the login password field.
This commit is contained in:
Bardi Harborow
2026-10-05 18:38:32 +11:00
committed by GitHub
parent a6d9d27c68
commit 48d6b5cadf
1 changed files with 31 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/reset/password/ResetIdentityPasswordView.kt
+31 -3
View File
@@ -9,14 +9,21 @@
package io.element.android.features.securebackup.impl.reset.password
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.text.KeyboardActions
import androidx.compose.foundation.text.KeyboardOptions
import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue
import androidx.compose.ui.Modifier
import androidx.compose.ui.autofill.ContentType
import androidx.compose.ui.platform.LocalFocusManager
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.semantics.contentType
import androidx.compose.ui.semantics.semantics
import androidx.compose.ui.text.input.ImeAction
import androidx.compose.ui.text.input.KeyboardType
import androidx.compose.ui.text.input.PasswordVisualTransformation
import androidx.compose.ui.text.input.VisualTransformation
import androidx.compose.ui.tooling.preview.PreviewParameter
@@ -42,6 +49,11 @@ fun ResetIdentityPasswordView(
modifier: Modifier = Modifier,
) {
val passwordState = textFieldState(stateValue = "")
val submit = {
if (passwordState.value.isNotEmpty()) {
state.eventSink(ResetIdentityPasswordEvent.Reset(passwordState.value))
}
}
FlowStepPage(
modifier = modifier,
iconStyle = BigIcon.Style.Default(CompoundIcons.LockSolid()),
@@ -58,13 +70,14 @@ fun ResetIdentityPasswordView(
passwordState.value = newText
},
hasError = state.resetAction.isFailure(),
onSubmit = submit,
)
},
buttons = {
Button(
modifier = Modifier.fillMaxWidth(),
text = stringResource(CommonStrings.action_reset_identity),
onClick = { state.eventSink(ResetIdentityPasswordEvent.Reset(passwordState.value)) },
onClick = submit,
destructive = true,
enabled = passwordState.value.isNotEmpty(),
)
@@ -78,12 +91,20 @@ fun ResetIdentityPasswordView(
}
@Composable
private fun Content(text: String, onTextChange: (String) -> Unit, hasError: Boolean) {
private fun Content(
text: String,
onTextChange: (String) -> Unit,
hasError: Boolean,
onSubmit: () -> Unit,
) {
var showPassword by remember { mutableStateOf(false) }
TextField(
modifier = Modifier
.fillMaxWidth()
.onTabOrEnterKeyFocusNext(LocalFocusManager.current),
.onTabOrEnterKeyFocusNext(LocalFocusManager.current)
.semantics {
contentType = ContentType.Password
},
value = text,
onValueChange = onTextChange,
placeholder = stringResource(CommonStrings.common_password),
@@ -95,6 +116,13 @@ private fun Content(text: String, onTextChange: (String) -> Unit, hasError: Bool
onToggle = { showPassword = !showPassword },
)
},
keyboardOptions = KeyboardOptions(
keyboardType = KeyboardType.Password,
imeAction = ImeAction.Done,
),
keyboardActions = KeyboardActions(
onDone = { onSubmit() }
),
validity = if (hasError) TextFieldValidity.Invalid else TextFieldValidity.None,
supportingText = if (hasError) {
stringResource(R.string.screen_reset_encryption_password_error)