Merge pull request android#186 from android/fm/pass_validation

[Jetsurvey] Password validation errors fixed
bentrengrove · Sep 22, 2020 · aca46a3 · aca46a3
2 parents 7293cdc + b5d306a
commit aca46a3
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/Jetsurvey/app/src/main/java/com/example/compose/jetsurvey/signinsignup/SignInScreen.kt b/Jetsurvey/app/src/main/java/com/example/compose/jetsurvey/signinsignup/SignInScreen.kt
@@ -136,7 +136,7 @@ fun SignInContent(
         Button(
             onClick = { onSignInSubmitted(emailState.text, passwordState.text) },
             modifier = Modifier.fillMaxWidth().padding(vertical = 16.dp),
-            enabled = emailState.isValid
+            enabled = emailState.isValid && passwordState.isValid
         ) {
             Text(
                 text = stringResource(id = R.string.sign_in)

diff --git a/Jetsurvey/app/src/main/java/com/example/compose/jetsurvey/signinsignup/SignInSignUp.kt b/Jetsurvey/app/src/main/java/com/example/compose/jetsurvey/signinsignup/SignInSignUp.kt
@@ -145,6 +145,7 @@ fun Email(
     emailState.getError()?.let { error -> TextFieldError(textError = error) }
 }
 
+@OptIn(ExperimentalFocus::class)
 @Composable
 fun Password(
     label: String,
@@ -160,7 +161,13 @@ fun Password(
             passwordState.text = it
             passwordState.enableShowErrors()
         },
-        modifier = modifier.fillMaxWidth(),
+        modifier = modifier.fillMaxWidth().focusObserver { focusState ->
+            val focused = focusState == FocusState.Active
+            passwordState.onFocusChange(focused)
+            if (!focused) {
+                passwordState.enableShowErrors()
+            }
+        },
         textStyle = MaterialTheme.typography.body2,
         label = {
             ProvideEmphasis(emphasis = EmphasisAmbient.current.medium) {