Skip to content

SearchPw screen UI based on Design QA #1093

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DongJun-H merged 2 commits into from
Mar 13, 2026
Merged

SearchPw screen UI based on Design QA #1093

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ab755c3
[QA] Prevent reset password email field error flicker
DongJun-H Mar 11, 2026
db7fb4e
[QA] Show TextField label only when input is not empty
DongJun-H Mar 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 19 additions & 3 deletions presentation/src/main/java/daily/dayo/presentation/screen/account/ResetPasswordScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -592,6 +592,14 @@ fun EmailInputLayout(
requestEmailCertification: (String) -> Unit = {},
) {
val lastErrorMessage = remember { mutableStateOf("") }
val isEmailError = when {
email.isBlank() -> null
emailCertification == EmailCertificationState.INVALID_FORMAT ||
emailCertification == EmailCertificationState.NOT_EXIST_EMAIL ||
emailCertification == EmailCertificationState.OAUTH_EMAIL -> true

else -> false
}

LaunchedEffect(emailCertification) {
lastErrorMessage.value = when (emailCertification) {
Expand All @@ -612,19 +620,27 @@ fun EmailInputLayout(
val formatValid = android.util.Patterns.EMAIL_ADDRESS.matcher(it).matches()
setNextButtonEnabled(formatValid)
setIsNextButtonClickable(formatValid)
if (!formatValid) {
if (it.isBlank()) {
setEmailCertification(EmailCertificationState.BEFORE_CERTIFICATION)
lastErrorMessage.value = ""
} else if (!formatValid) {
setEmailCertification(EmailCertificationState.INVALID_FORMAT)
} else {
setEmailCertification(EmailCertificationState.BEFORE_CERTIFICATION)
lastErrorMessage.value = ""
// INVALID FORMAT 에러 메시지가 다음 에러 메시지가 표시될 떄 남아 있지 않도록 value Clear
}
},
label = stringResource(R.string.email),
label = if (email.isNotEmpty()) {
stringResource(R.string.email)
} else {
" "
},
placeholder = stringResource(R.string.reset_password_email_placeholder),
trailingIconId = if (email.isNotBlank()) R.drawable.ic_trailing_check else null,
errorTrailingIconId = R.drawable.ic_trailing_error,
errorMessage = lastErrorMessage.value,
isError = if (email.isBlank()) null else !isNextButtonEnabled,
isError = isEmailError,
keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Email),
)
}
Expand Down
Loading