mobile/element-android
mobile/element-android
1
0
Fork 0
mirror of https://github.com/element-hq/element-android synced 2024-07-21 01:54:35 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #6741 from vector-im/feature/adm/focus-errors

Browse source 
FTUE - Focus errors showing on wrong page
This commit is contained in:
Adam Brown 2022-08-05 15:12:47 +01:00 committed by GitHub
parent 03afd2932c b375dd14f7
commit 81897a179e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog.d/6737.bugfix Normal file
View file

@ -0,0 +1 @@
Fixes onboarding login/account creation errors showing after navigation

8
vector/src/main/java/im/vector/app/core/extensions/TextInputLayout.kt
View file

@ -78,10 +78,14 @@ fun TextInputLayout.setOnImeDoneListener(action: () -> Unit) {
}
}
fun TextInputLayout.setOnFocusLostListener(action: () -> Unit) {
/**
* Set a listener for when the input has lost focus, such as moving to the another input field.
* The listener is only called when the view is in a resumed state to avoid triggers when exiting a screen.
*/
fun TextInputLayout.setOnFocusLostListener(lifecycleOwner: LifecycleOwner, action: () -> Unit) {
editText().setOnFocusChangeListener { _, hasFocus ->
when (hasFocus) {
false -> action()
false -> lifecycleOwner.lifecycleScope.launchWhenResumed { action() }
else -> {
// do nothing
}

4
vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthCombinedLoginFragment.kt
View file

@ -63,7 +63,9 @@ class FtueAuthCombinedLoginFragment @Inject constructor(
views.loginRoot.realignPercentagesToParent()
views.editServerButton.debouncedClicks { viewModel.handle(OnboardingAction.PostViewEvent(OnboardingViewEvents.EditServerSelection)) }
views.loginPasswordInput.setOnImeDoneListener { submit() }
views.loginInput.setOnFocusLostListener { viewModel.handle(OnboardingAction.UserNameEnteredAction.Login(views.loginInput.content())) }
views.loginInput.setOnFocusLostListener(viewLifecycleOwner) {
viewModel.handle(OnboardingAction.UserNameEnteredAction.Login(views.loginInput.content()))
}
views.loginForgotPassword.debouncedClicks { viewModel.handle(OnboardingAction.PostViewEvent(OnboardingViewEvents.OnForgetPasswordClicked)) }
}

2
vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthCombinedRegisterFragment.kt
View file

@ -86,7 +86,7 @@ class FtueAuthCombinedRegisterFragment @Inject constructor() : AbstractSSOFtueAu
views.createAccountEntryFooter.text = ""
}
views.createAccountInput.setOnFocusLostListener {
views.createAccountInput.setOnFocusLostListener(viewLifecycleOwner) {
viewModel.handle(OnboardingAction.UserNameEnteredAction.Registration(views.createAccountInput.content()))
}
}

2
vector/src/main/res/layout/fragment_ftue_combined_login.xml
View file

@ -147,6 +147,7 @@
app:layout_constraintTop_toBottomOf="@id/serverSelectionSpacing">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/loginEditText"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:imeOptions="actionNext"
@ -176,6 +177,7 @@
app:layout_constraintTop_toBottomOf="@id/entrySpacing">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/loginPasswordEditText"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:imeOptions="actionDone"

2
vector/src/main/res/layout/fragment_ftue_combined_register.xml
View file

@ -145,6 +145,7 @@
app:layout_constraintTop_toBottomOf="@id/serverSelectionSpacing">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/createAccountEditText"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:imeOptions="actionNext"
@ -186,6 +187,7 @@
app:layout_constraintTop_toBottomOf="@id/entrySpacing">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/createAccountPassword"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:imeOptions="actionDone"