From dcffc350413ef72ae8fe2dd666099736be96c46d Mon Sep 17 00:00:00 2001
From: Adam Brown <adampsbrown@gmail.com>
Date: Tue, 10 May 2022 13:02:49 +0100
Subject: [PATCH 01/24] adding forgot password button to login screen

---
 .../layout/fragment_ftue_combined_login.xml    | 18 ++++++++++++++++--
 vector/src/main/res/values/donottranslate.xml  |  1 +
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/vector/src/main/res/layout/fragment_ftue_combined_login.xml b/vector/src/main/res/layout/fragment_ftue_combined_login.xml
index 8037f207fc..d50fdb6394 100644
--- a/vector/src/main/res/layout/fragment_ftue_combined_login.xml
+++ b/vector/src/main/res/layout/fragment_ftue_combined_login.xml
@@ -170,7 +170,7 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:hint="@string/login_signup_password_hint"
-            app:layout_constraintBottom_toTopOf="@id/actionSpacing"
+            app:layout_constraintBottom_toTopOf="@id/loginForgotPassword"
             app:layout_constraintEnd_toEndOf="@id/loginGutterEnd"
             app:layout_constraintStart_toStartOf="@id/loginGutterStart"
             app:layout_constraintTop_toBottomOf="@id/entrySpacing">
@@ -184,13 +184,27 @@
 
         </com.google.android.material.textfield.TextInputLayout>
 
+        <Button
+            android:id="@+id/loginForgotPassword"
+            style="@style/Widget.Vector.Button.Text.Login"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/ftue_auth_forgot_password"
+            android:textAllCaps="true"
+            android:textColor="?colorSecondary"
+            app:layout_constraintHorizontal_bias="1"
+            app:layout_constraintBottom_toTopOf="@id/actionSpacing"
+            app:layout_constraintEnd_toEndOf="@id/loginGutterEnd"
+            app:layout_constraintStart_toStartOf="@id/loginGutterStart"
+            app:layout_constraintTop_toBottomOf="@id/loginPasswordInput" />
+
         <Space
             android:id="@+id/actionSpacing"
             android:layout_width="match_parent"
             android:layout_height="0dp"
             app:layout_constraintBottom_toTopOf="@id/loginSubmit"
             app:layout_constraintHeight_percent="0.02"
-            app:layout_constraintTop_toBottomOf="@id/loginPasswordInput" />
+            app:layout_constraintTop_toBottomOf="@id/loginForgotPassword" />
 
         <Button
             android:id="@+id/loginSubmit"
diff --git a/vector/src/main/res/values/donottranslate.xml b/vector/src/main/res/values/donottranslate.xml
index d58bdbadfb..e5b5c88929 100755
--- a/vector/src/main/res/values/donottranslate.xml
+++ b/vector/src/main/res/values/donottranslate.xml
@@ -42,6 +42,7 @@
     <string name="ftue_auth_email_verification_subtitle">To confirm your email address, tap the button in the email we just sent to %s</string>
     <string name="ftue_auth_email_verification_footer">Did not receive an email?</string>
     <string name="ftue_auth_email_resend_email">Resend email</string>
+    <string name="ftue_auth_forgot_password">Forgot password</string>
 
     <string name="location_map_view_copyright" translatable="false">© MapTiler © OpenStreetMap contributors</string>
 </resources>

From 9abf6e37d1d15d90bf543efe0905808b4a2ae96f Mon Sep 17 00:00:00 2001
From: Adam Brown <adampsbrown@gmail.com>
Date: Mon, 6 Jun 2022 15:33:00 +0100
Subject: [PATCH 02/24] adding updated forgot password email input and breaker
 screens

---
 .../features/onboarding/OnboardingAction.kt   |   2 +-
 .../onboarding/OnboardingViewEvents.kt        |   2 +-
 .../onboarding/OnboardingViewModel.kt         |   2 +-
 .../ftueauth/FtueAuthCombinedLoginFragment.kt |   1 +
 .../FtueAuthResetPasswordBreakerFragment.kt   |  74 ++++++++++
 ...FtueAuthResetPasswordEmailEntryFragment.kt |  73 ++++++++++
 .../onboarding/ftueauth/FtueAuthVariant.kt    |  35 +++--
 .../fragment_ftue_reset_password_breaker.xml  | 130 +++++++++++++++++
 ...agment_ftue_reset_password_email_input.xml | 131 ++++++++++++++++++
 vector/src/main/res/values/donottranslate.xml |   2 +
 .../onboarding/OnboardingViewModelTest.kt     |   2 +-
 11 files changed, 440 insertions(+), 14 deletions(-)
 create mode 100644 vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthResetPasswordBreakerFragment.kt
 create mode 100644 vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthResetPasswordEmailEntryFragment.kt
 create mode 100644 vector/src/main/res/layout/fragment_ftue_reset_password_breaker.xml
 create mode 100644 vector/src/main/res/layout/fragment_ftue_reset_password_email_input.xml

diff --git a/vector/src/main/java/im/vector/app/features/onboarding/OnboardingAction.kt b/vector/src/main/java/im/vector/app/features/onboarding/OnboardingAction.kt
index b6a7550a58..dc8f260c13 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/OnboardingAction.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/OnboardingAction.kt
@@ -47,7 +47,7 @@ sealed interface OnboardingAction : VectorViewModelAction {
     data class LoginWithToken(val loginToken: String) : OnboardingAction
     data class WebLoginSuccess(val credentials: Credentials) : OnboardingAction
     data class InitWith(val loginConfig: LoginConfig?) : OnboardingAction
-    data class ResetPassword(val email: String, val newPassword: String) : OnboardingAction
+    data class ResetPassword(val email: String, val newPassword: String?) : OnboardingAction
     object ResetPasswordMailConfirmed : OnboardingAction
 
     data class MaybeUpdateHomeserverFromMatrixId(val userId: String) : OnboardingAction
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewEvents.kt b/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewEvents.kt
index bf53a72cc3..ffd65b1287 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewEvents.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewEvents.kt
@@ -47,7 +47,7 @@ sealed class OnboardingViewEvents : VectorViewEvents {
     object OnHomeserverEdited : OnboardingViewEvents()
     data class OnSignModeSelected(val signMode: SignMode) : OnboardingViewEvents()
     object OnForgetPasswordClicked : OnboardingViewEvents()
-    object OnResetPasswordSendThreePidDone : OnboardingViewEvents()
+    data class OnResetPasswordSendThreePidDone(val email: String) : OnboardingViewEvents()
     object OnResetPasswordMailConfirmationSuccess : OnboardingViewEvents()
     object OnResetPasswordMailConfirmationSuccessDone : OnboardingViewEvents()
 
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewModel.kt b/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewModel.kt
index 38a72441e0..5bac6ec0bc 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewModel.kt
@@ -451,7 +451,7 @@ class OnboardingViewModel @AssistedInject constructor(
                                     resetState = createResetState(action, state.selectedHomeserver)
                             )
                         }
-                        _viewEvents.post(OnboardingViewEvents.OnResetPasswordSendThreePidDone)
+                        _viewEvents.post(OnboardingViewEvents.OnResetPasswordSendThreePidDone(action.email))
                     },
                     onFailure = {
                         setState { copy(isLoading = false) }
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthCombinedLoginFragment.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthCombinedLoginFragment.kt
index 205a604aab..d9086952da 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthCombinedLoginFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthCombinedLoginFragment.kt
@@ -61,6 +61,7 @@ class FtueAuthCombinedLoginFragment @Inject constructor(
         views.editServerButton.debouncedClicks { viewModel.handle(OnboardingAction.PostViewEvent(OnboardingViewEvents.EditServerSelection)) }
         views.loginPasswordInput.setOnImeDoneListener { submit() }
         views.loginInput.setOnFocusLostListener { viewModel.handle(OnboardingAction.MaybeUpdateHomeserverFromMatrixId(views.loginInput.content())) }
+        views.loginForgotPassword.debouncedClicks { viewModel.handle(OnboardingAction.PostViewEvent(OnboardingViewEvents.OnForgetPasswordClicked)) }
     }
 
     private fun setupSubmitButton() {
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthResetPasswordBreakerFragment.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthResetPasswordBreakerFragment.kt
new file mode 100644
index 0000000000..07e628d9fb
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthResetPasswordBreakerFragment.kt
@@ -0,0 +1,74 @@
+/*
+ * Copyright (c) 2022 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.onboarding.ftueauth
+
+import android.os.Bundle
+import android.os.Parcelable
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import com.airbnb.mvrx.args
+import dagger.hilt.android.AndroidEntryPoint
+import im.vector.app.R
+import im.vector.app.core.utils.colorTerminatingFullStop
+import im.vector.app.databinding.FragmentFtueResetPasswordBreakerBinding
+import im.vector.app.features.onboarding.OnboardingAction
+import im.vector.app.features.onboarding.RegisterAction
+import im.vector.app.features.themes.ThemeProvider
+import im.vector.app.features.themes.ThemeUtils
+import kotlinx.parcelize.Parcelize
+import javax.inject.Inject
+
+@Parcelize
+data class FtueAuthResetPasswordBreakerArgument(
+        val email: String
+) : Parcelable
+
+@AndroidEntryPoint
+class FtueAuthResetPasswordBreakerFragment : AbstractFtueAuthFragment<FragmentFtueResetPasswordBreakerBinding>() {
+
+    @Inject lateinit var themeProvider: ThemeProvider
+    private val params: FtueAuthResetPasswordBreakerArgument by args()
+
+    override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentFtueResetPasswordBreakerBinding {
+        return FragmentFtueResetPasswordBreakerBinding.inflate(inflater, container, false)
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        setupUi()
+    }
+
+    private fun setupUi() {
+        views.emailVerificationGradientContainer.setBackgroundResource(
+                when (themeProvider.isLightTheme()) {
+                    true  -> R.drawable.bg_waiting_for_email_verification
+                    false -> R.drawable.bg_color_background
+                }
+        )
+        views.emailVerificationTitle.text = getString(R.string.ftue_auth_reset_password_breaker_title)
+                .colorTerminatingFullStop(ThemeUtils.getColor(requireContext(), R.attr.colorSecondary))
+        views.emailVerificationSubtitle.text = getString(R.string.ftue_auth_email_verification_subtitle, params.email)
+        views.emailVerificationResendEmail.debouncedClicks {
+            viewModel.handle(OnboardingAction.PostRegisterAction(RegisterAction.SendAgainThreePid))
+        }
+    }
+
+    override fun resetViewModel() {
+        viewModel.handle(OnboardingAction.ResetResetPassword)
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthResetPasswordEmailEntryFragment.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthResetPasswordEmailEntryFragment.kt
new file mode 100644
index 0000000000..9770d4c262
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthResetPasswordEmailEntryFragment.kt
@@ -0,0 +1,73 @@
+/*
+ * Copyright (c) 2022 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.onboarding.ftueauth
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.lifecycle.lifecycleScope
+import dagger.hilt.android.AndroidEntryPoint
+import im.vector.app.core.extensions.associateContentStateWith
+import im.vector.app.core.extensions.content
+import im.vector.app.core.extensions.editText
+import im.vector.app.core.extensions.isEmail
+import im.vector.app.core.extensions.setOnImeDoneListener
+import im.vector.app.databinding.FragmentFtueResetPasswordEmailInputBinding
+import im.vector.app.features.onboarding.OnboardingAction
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.onEach
+import reactivecircus.flowbinding.android.widget.textChanges
+
+@AndroidEntryPoint
+class FtueAuthResetPasswordEmailEntryFragment : AbstractFtueAuthFragment<FragmentFtueResetPasswordEmailInputBinding>() {
+
+    override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentFtueResetPasswordEmailInputBinding {
+        return FragmentFtueResetPasswordEmailInputBinding.inflate(inflater, container, false)
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        setupViews()
+    }
+
+    private fun setupViews() {
+        views.emailEntryInput.associateContentStateWith(button = views.emailEntrySubmit)
+        views.emailEntryInput.setOnImeDoneListener { startPasswordReset() }
+        views.emailEntrySubmit.debouncedClicks { startPasswordReset() }
+
+        views.emailEntryInput.editText().textChanges()
+                .onEach {
+                    views.emailEntryInput.error = null
+                    views.emailEntrySubmit.isEnabled = it.isEmail()
+                }
+                .launchIn(viewLifecycleOwner.lifecycleScope)
+    }
+
+    private fun startPasswordReset() {
+        val email = views.emailEntryInput.content()
+        viewModel.handle(OnboardingAction.ResetPassword(email = email, newPassword = null))
+    }
+
+    override fun onError(throwable: Throwable) {
+        views.emailEntryInput.error = errorFormatter.toHumanReadable(throwable)
+    }
+
+    override fun resetViewModel() {
+        viewModel.handle(OnboardingAction.ResetResetPassword)
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthVariant.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthVariant.kt
index fa37e2edce..49c937827e 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthVariant.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthVariant.kt
@@ -162,18 +162,33 @@ class FtueAuthVariant(
                 )
             is OnboardingViewEvents.OnWebLoginError -> onWebLoginError(viewEvents)
             is OnboardingViewEvents.OnForgetPasswordClicked ->
-                activity.addFragmentToBackstack(
-                        views.loginFragmentContainer,
-                        FtueAuthResetPasswordFragment::class.java,
-                        option = commonOption
-                )
+                when {
+                    vectorFeatures.isOnboardingCombinedLoginEnabled() -> activity.addFragmentToBackstack(
+                            views.loginFragmentContainer,
+                            FtueAuthResetPasswordEmailEntryFragment::class.java,
+                            option = commonOption
+                    )
+                    else                                              -> activity.addFragmentToBackstack(
+                            views.loginFragmentContainer,
+                            FtueAuthResetPasswordFragment::class.java,
+                            option = commonOption
+                    )
+                }
             is OnboardingViewEvents.OnResetPasswordSendThreePidDone -> {
                 supportFragmentManager.popBackStack(FRAGMENT_LOGIN_TAG, POP_BACK_STACK_EXCLUSIVE)
-                activity.addFragmentToBackstack(
-                        views.loginFragmentContainer,
-                        FtueAuthResetPasswordMailConfirmationFragment::class.java,
-                        option = commonOption
-                )
+                when {
+                    vectorFeatures.isOnboardingCombinedLoginEnabled() -> activity.addFragmentToBackstack(
+                            views.loginFragmentContainer,
+                            FtueAuthResetPasswordBreakerFragment::class.java,
+                            FtueAuthResetPasswordBreakerArgument(viewEvents.email),
+                            option = commonOption
+                    )
+                    else -> activity.addFragmentToBackstack(
+                            views.loginFragmentContainer,
+                            FtueAuthResetPasswordMailConfirmationFragment::class.java,
+                            option = commonOption
+                    )
+                }
             }
             is OnboardingViewEvents.OnResetPasswordMailConfirmationSuccess -> {
                 supportFragmentManager.popBackStack(FRAGMENT_LOGIN_TAG, POP_BACK_STACK_EXCLUSIVE)
diff --git a/vector/src/main/res/layout/fragment_ftue_reset_password_breaker.xml b/vector/src/main/res/layout/fragment_ftue_reset_password_breaker.xml
new file mode 100644
index 0000000000..96b276c5ce
--- /dev/null
+++ b/vector/src/main/res/layout/fragment_ftue_reset_password_breaker.xml
@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <androidx.constraintlayout.widget.Guideline
+        android:id="@+id/ftueAuthGutterStart"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        app:layout_constraintGuide_percent="@dimen/ftue_auth_gutter_start_percent" />
+
+    <androidx.constraintlayout.widget.Guideline
+        android:id="@+id/ftueAuthGutterEnd"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        app:layout_constraintGuide_percent="@dimen/ftue_auth_gutter_end_percent" />
+
+    <View
+        android:id="@+id/emailVerificationGradientContainer"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        app:layout_constraintHeight_percent="0.60"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:background="@drawable/bg_waiting_for_email_verification" />
+
+    <Space
+        android:id="@+id/emailVerificationSpace1"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        app:layout_constraintBottom_toTopOf="@id/emailVerificationLogo"
+        app:layout_constraintHeight_percent="0.10"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_chainStyle="spread_inside" />
+
+    <ImageView
+        android:id="@+id/emailVerificationLogo"
+        android:layout_width="wrap_content"
+        android:layout_height="0dp"
+        android:adjustViewBounds="true"
+        android:background="@drawable/circle"
+        android:backgroundTint="?colorSecondary"
+        android:importantForAccessibility="no"
+        android:src="@drawable/ic_email"
+        app:layout_constraintBottom_toTopOf="@id/emailVerificationSpace2"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHeight_percent="0.12"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/emailVerificationSpace1" />
+
+    <Space
+        android:id="@+id/emailVerificationSpace2"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        app:layout_constraintBottom_toTopOf="@id/emailVerificationTitle"
+        app:layout_constraintHeight_percent="0.05"
+        app:layout_constraintTop_toBottomOf="@id/emailVerificationLogo" />
+
+    <TextView
+        android:id="@+id/emailVerificationTitle"
+        style="@style/Widget.Vector.TextView.Title"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:transitionName="loginTitleTransition"
+        app:layout_constraintBottom_toTopOf="@id/emailVerificationSubtitle"
+        app:layout_constraintEnd_toEndOf="@id/ftueAuthGutterEnd"
+        app:layout_constraintStart_toStartOf="@id/ftueAuthGutterStart"
+        app:layout_constraintTop_toBottomOf="@id/emailVerificationSpace2"
+        tools:text="@string/ftue_auth_reset_password_breaker_title" />
+
+    <TextView
+        android:id="@+id/emailVerificationSubtitle"
+        style="@style/Widget.Vector.TextView.Subtitle"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        android:gravity="center"
+        app:layout_constraintBottom_toTopOf="@id/emailVerificationSpace4"
+        app:layout_constraintEnd_toEndOf="@id/ftueAuthGutterEnd"
+        app:layout_constraintStart_toStartOf="@id/ftueAuthGutterStart"
+        app:layout_constraintTop_toBottomOf="@id/emailVerificationTitle"
+        tools:text="@string/ftue_auth_email_verification_subtitle" />
+
+    <Space
+        android:id="@+id/emailVerificationSpace4"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        app:layout_constraintBottom_toTopOf="@id/emailVerificationResendEmail"
+        app:layout_constraintTop_toBottomOf="@id/emailVerificationSubtitle" />
+
+    <Button
+        android:id="@+id/emailVerificationFooter"
+        style="@style/Widget.Vector.Button.Login"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:text="@string/done"
+        android:textAllCaps="true"
+        app:layout_constraintBottom_toTopOf="@id/emailVerificationResendEmail"
+        app:layout_constraintEnd_toEndOf="@id/ftueAuthGutterEnd"
+        app:layout_constraintStart_toStartOf="@id/ftueAuthGutterStart"
+        app:layout_constraintTop_toBottomOf="@id/emailVerificationSpace4" />
+
+    <Button
+        android:id="@+id/emailVerificationResendEmail"
+        style="@style/Widget.Vector.Button.Text.Login"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:backgroundTint="@color/element_background_light"
+        android:text="@string/ftue_auth_email_resend_email"
+        android:textAllCaps="true"
+        android:textColor="?colorSecondary"
+        android:transitionName="loginSubmitTransition"
+        app:layout_constraintBottom_toTopOf="@id/emailVerificationSpace5"
+        app:layout_constraintEnd_toEndOf="@id/ftueAuthGutterEnd"
+        app:layout_constraintStart_toStartOf="@id/ftueAuthGutterStart"
+        app:layout_constraintTop_toBottomOf="@id/emailVerificationFooter" />
+
+    <Space
+        android:id="@+id/emailVerificationSpace5"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintHeight_percent="0.05"
+        app:layout_constraintTop_toBottomOf="@id/emailVerificationResendEmail" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/layout/fragment_ftue_reset_password_email_input.xml b/vector/src/main/res/layout/fragment_ftue_reset_password_email_input.xml
new file mode 100644
index 0000000000..0ab4d5b00d
--- /dev/null
+++ b/vector/src/main/res/layout/fragment_ftue_reset_password_email_input.xml
@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    style="@style/LoginFormScrollView"
+    android:layout_height="match_parent"
+    android:background="?android:colorBackground"
+    android:fillViewport="true"
+    android:paddingTop="0dp"
+    android:paddingBottom="0dp">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <androidx.constraintlayout.widget.Guideline
+            android:id="@+id/emailEntryGutterStart"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:orientation="vertical"
+            app:layout_constraintGuide_percent="@dimen/ftue_auth_gutter_start_percent" />
+
+        <androidx.constraintlayout.widget.Guideline
+            android:id="@+id/emailEntryGutterEnd"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:orientation="vertical"
+            app:layout_constraintGuide_percent="@dimen/ftue_auth_gutter_end_percent" />
+
+        <Space
+            android:id="@+id/headerSpacing"
+            android:layout_width="match_parent"
+            android:layout_height="52dp"
+            app:layout_constraintBottom_toTopOf="@id/emailEntryHeaderIcon"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <ImageView
+            android:id="@+id/emailEntryHeaderIcon"
+            android:layout_width="wrap_content"
+            android:layout_height="0dp"
+            android:adjustViewBounds="true"
+            android:background="@drawable/circle"
+            android:backgroundTint="?colorSecondary"
+            android:contentDescription="@null"
+            android:src="@drawable/ic_email"
+            app:layout_constraintBottom_toTopOf="@id/emailEntryHeaderTitle"
+            app:layout_constraintEnd_toEndOf="@id/emailEntryGutterEnd"
+            app:layout_constraintHeight_percent="0.12"
+            app:layout_constraintStart_toStartOf="@id/emailEntryGutterStart"
+            app:layout_constraintTop_toTopOf="parent"
+            app:tint="@color/palette_white" />
+
+        <TextView
+            android:id="@+id/emailEntryHeaderTitle"
+            style="@style/Widget.Vector.TextView.Title.Medium"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
+            android:gravity="center"
+            android:text="@string/ftue_auth_email_title"
+            android:textColor="?vctr_content_primary"
+            app:layout_constraintBottom_toTopOf="@id/emailEntryHeaderSubtitle"
+            app:layout_constraintEnd_toEndOf="@id/emailEntryGutterEnd"
+            app:layout_constraintStart_toStartOf="@id/emailEntryGutterStart"
+            app:layout_constraintTop_toBottomOf="@id/emailEntryHeaderIcon" />
+
+        <TextView
+            android:id="@+id/emailEntryHeaderSubtitle"
+            style="@style/Widget.Vector.TextView.Subtitle"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:gravity="center"
+            android:text="@string/ftue_auth_reset_password_email_subtitle"
+            android:textColor="?vctr_content_secondary"
+            app:layout_constraintBottom_toTopOf="@id/titleContentSpacing"
+            app:layout_constraintEnd_toEndOf="@id/emailEntryGutterEnd"
+            app:layout_constraintStart_toStartOf="@id/emailEntryGutterStart"
+            app:layout_constraintTop_toBottomOf="@id/emailEntryHeaderTitle" />
+
+        <Space
+            android:id="@+id/titleContentSpacing"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            app:layout_constraintBottom_toTopOf="@id/emailEntryInput"
+            app:layout_constraintHeight_percent="0.03"
+            app:layout_constraintTop_toBottomOf="@id/emailEntryHeaderSubtitle" />
+
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/emailEntryInput"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:hint="@string/ftue_auth_email_entry_title"
+            app:endIconMode="clear_text"
+            app:layout_constraintEnd_toEndOf="@id/emailEntryGutterEnd"
+            app:layout_constraintStart_toStartOf="@id/emailEntryGutterStart"
+            app:layout_constraintTop_toBottomOf="@id/titleContentSpacing">
+
+            <com.google.android.material.textfield.TextInputEditText
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:imeOptions="actionDone"
+                android:inputType="textEmailAddress"
+                android:maxLines="1" />
+
+        </com.google.android.material.textfield.TextInputLayout>
+
+        <Space
+            android:id="@+id/entrySpacing"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            app:layout_constraintBottom_toTopOf="@id/emailEntrySubmit"
+            app:layout_constraintHeight_percent="0.03"
+            app:layout_constraintTop_toBottomOf="@id/emailEntryInput"
+            app:layout_constraintVertical_bias="0"
+            app:layout_constraintVertical_chainStyle="packed" />
+
+        <Button
+            android:id="@+id/emailEntrySubmit"
+            style="@style/Widget.Vector.Button.Login"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:text="@string/login_set_email_submit"
+            android:textAllCaps="true"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="@id/emailEntryGutterEnd"
+            app:layout_constraintStart_toStartOf="@id/emailEntryGutterStart"
+            app:layout_constraintTop_toBottomOf="@id/entrySpacing" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+</androidx.core.widget.NestedScrollView>
diff --git a/vector/src/main/res/values/donottranslate.xml b/vector/src/main/res/values/donottranslate.xml
index e5b5c88929..447d0b2b9c 100755
--- a/vector/src/main/res/values/donottranslate.xml
+++ b/vector/src/main/res/values/donottranslate.xml
@@ -36,6 +36,8 @@
     <string name="ftue_auth_email_title">Enter your email address</string>
     <string name="ftue_auth_email_subtitle">This will help verify your account and enables password recovery.</string>
     <string name="ftue_auth_email_entry_title">Email Address</string>
+    <string name="ftue_auth_reset_password_email_subtitle">We will send you a verification link.</string>
+    <string name="ftue_auth_reset_password_breaker_title">Check your email.</string>
 
     <string name="ftue_auth_email_verification_title">Check your email to verify.</string>
     <!-- Note for translators, %s is the users email address -->
diff --git a/vector/src/test/java/im/vector/app/features/onboarding/OnboardingViewModelTest.kt b/vector/src/test/java/im/vector/app/features/onboarding/OnboardingViewModelTest.kt
index 933e9aa972..34c9116419 100644
--- a/vector/src/test/java/im/vector/app/features/onboarding/OnboardingViewModelTest.kt
+++ b/vector/src/test/java/im/vector/app/features/onboarding/OnboardingViewModelTest.kt
@@ -495,7 +495,7 @@ class OnboardingViewModelTest {
                             copy(isLoading = false, resetState = resetState)
                         }
                 )
-                .assertEvents(OnboardingViewEvents.OnResetPasswordSendThreePidDone)
+                .assertEvents(OnboardingViewEvents.OnResetPasswordSendThreePidDone(AN_EMAIL))
                 .finish()
     }
 

From 7a4a6030db8f766322ad01179e6dcf7aaef8b81e Mon Sep 17 00:00:00 2001
From: Adam Brown <adampsbrown@gmail.com>
Date: Mon, 6 Jun 2022 17:24:47 +0100
Subject: [PATCH 03/24] adding a password entry confirmation page for the reset
 password flow

---
 .../features/onboarding/OnboardingAction.kt   |   2 +
 .../onboarding/OnboardingViewEvents.kt        |   1 +
 .../onboarding/OnboardingViewModel.kt         |  60 ++++---
 .../FtueAuthResetPasswordBreakerFragment.kt   |   7 +-
 .../FtueAuthResetPasswordEntryFragment.kt     |  73 ++++++++
 .../onboarding/ftueauth/FtueAuthVariant.kt    |   8 +
 .../fragment_ftue_reset_password_input.xml    | 157 ++++++++++++++++++
 vector/src/main/res/values/donottranslate.xml |   5 +
 8 files changed, 291 insertions(+), 22 deletions(-)
 create mode 100644 vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthResetPasswordEntryFragment.kt
 create mode 100644 vector/src/main/res/layout/fragment_ftue_reset_password_input.xml

diff --git a/vector/src/main/java/im/vector/app/features/onboarding/OnboardingAction.kt b/vector/src/main/java/im/vector/app/features/onboarding/OnboardingAction.kt
index dc8f260c13..40900ca2b0 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/OnboardingAction.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/OnboardingAction.kt
@@ -48,6 +48,8 @@ sealed interface OnboardingAction : VectorViewModelAction {
     data class WebLoginSuccess(val credentials: Credentials) : OnboardingAction
     data class InitWith(val loginConfig: LoginConfig?) : OnboardingAction
     data class ResetPassword(val email: String, val newPassword: String?) : OnboardingAction
+    data class ConfirmNewPassword(val newPassword: String) : OnboardingAction
+    object ResendResetPassword : OnboardingAction
     object ResetPasswordMailConfirmed : OnboardingAction
 
     data class MaybeUpdateHomeserverFromMatrixId(val userId: String) : OnboardingAction
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewEvents.kt b/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewEvents.kt
index ffd65b1287..01de7c073a 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewEvents.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewEvents.kt
@@ -49,6 +49,7 @@ sealed class OnboardingViewEvents : VectorViewEvents {
     object OnForgetPasswordClicked : OnboardingViewEvents()
     data class OnResetPasswordSendThreePidDone(val email: String) : OnboardingViewEvents()
     object OnResetPasswordMailConfirmationSuccess : OnboardingViewEvents()
+    object OnResetPasswordBreakerConfirmed : OnboardingViewEvents()
     object OnResetPasswordMailConfirmationSuccessDone : OnboardingViewEvents()
 
     data class OnSendEmailSuccess(val email: String) : OnboardingViewEvents()
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewModel.kt b/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewModel.kt
index 5bac6ec0bc..b4257a0abf 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewModel.kt
@@ -149,6 +149,8 @@ class OnboardingViewModel @AssistedInject constructor(
             is OnboardingAction.LoginWithToken -> handleLoginWithToken(action)
             is OnboardingAction.WebLoginSuccess -> handleWebLoginSuccess(action)
             is OnboardingAction.ResetPassword -> handleResetPassword(action)
+            OnboardingAction.ResendResetPassword -> handleResendResetPassword()
+            is OnboardingAction.ConfirmNewPassword -> handleConfirmNewPassword(action)
             is OnboardingAction.ResetPasswordMailConfirmed -> handleResetPasswordMailConfirmed()
             is OnboardingAction.PostRegisterAction -> handleRegisterAction(action.registerAction)
             is OnboardingAction.ResetAction -> handleResetAction(action)
@@ -439,25 +441,9 @@ class OnboardingViewModel @AssistedInject constructor(
     }
 
     private fun handleResetPassword(action: OnboardingAction.ResetPassword) {
-        val safeLoginWizard = loginWizard
-        setState { copy(isLoading = true) }
-        currentJob = viewModelScope.launch {
-            runCatching { safeLoginWizard.resetPassword(action.email) }.fold(
-                    onSuccess = {
-                        val state = awaitState()
-                        setState {
-                            copy(
-                                    isLoading = false,
-                                    resetState = createResetState(action, state.selectedHomeserver)
-                            )
-                        }
-                        _viewEvents.post(OnboardingViewEvents.OnResetPasswordSendThreePidDone(action.email))
-                    },
-                    onFailure = {
-                        setState { copy(isLoading = false) }
-                        _viewEvents.post(OnboardingViewEvents.Failure(it))
-                    }
-            )
+        startResetPasswordFlow(action.email) {
+            setState { copy(isLoading = false, resetState = createResetState(action, selectedHomeserver)) }
+            _viewEvents.post(OnboardingViewEvents.OnResetPasswordSendThreePidDone(action.email))
         }
     }
 
@@ -467,6 +453,42 @@ class OnboardingViewModel @AssistedInject constructor(
             supportsLogoutAllDevices = selectedHomeserverState.isLogoutDevicesSupported
     )
 
+    private fun handleResendResetPassword() {
+        withState { state ->
+            val resetState = state.resetState
+            when (resetState.email) {
+                null -> {
+                    setState { copy(isLoading = false) }
+                    _viewEvents.post(OnboardingViewEvents.Failure(IllegalStateException("Developer error - No reset email has been set")))
+                }
+                else -> {
+                    startResetPasswordFlow(resetState.email) {
+                        setState { copy(isLoading = false) }
+                    }
+                }
+            }
+        }
+    }
+
+    private fun startResetPasswordFlow(email: String, onSuccess: suspend () -> Unit) {
+        val safeLoginWizard = loginWizard
+        setState { copy(isLoading = true) }
+        currentJob = viewModelScope.launch {
+            runCatching { safeLoginWizard.resetPassword(email) }.fold(
+                    onSuccess = { onSuccess.invoke() },
+                    onFailure = {
+                        setState { copy(isLoading = false) }
+                        _viewEvents.post(OnboardingViewEvents.Failure(it))
+                    }
+            )
+        }
+    }
+
+    private fun handleConfirmNewPassword(action: OnboardingAction.ConfirmNewPassword) {
+        setState { copy(resetState = resetState.copy(newPassword = action.newPassword)) }
+        handleResetPasswordMailConfirmed()
+    }
+
     private fun handleResetPasswordMailConfirmed() {
         setState { copy(isLoading = true) }
         currentJob = viewModelScope.launch {
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthResetPasswordBreakerFragment.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthResetPasswordBreakerFragment.kt
index 07e628d9fb..5a8ced28df 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthResetPasswordBreakerFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthResetPasswordBreakerFragment.kt
@@ -27,7 +27,7 @@ import im.vector.app.R
 import im.vector.app.core.utils.colorTerminatingFullStop
 import im.vector.app.databinding.FragmentFtueResetPasswordBreakerBinding
 import im.vector.app.features.onboarding.OnboardingAction
-import im.vector.app.features.onboarding.RegisterAction
+import im.vector.app.features.onboarding.OnboardingViewEvents
 import im.vector.app.features.themes.ThemeProvider
 import im.vector.app.features.themes.ThemeUtils
 import kotlinx.parcelize.Parcelize
@@ -63,8 +63,9 @@ class FtueAuthResetPasswordBreakerFragment : AbstractFtueAuthFragment<FragmentFt
         views.emailVerificationTitle.text = getString(R.string.ftue_auth_reset_password_breaker_title)
                 .colorTerminatingFullStop(ThemeUtils.getColor(requireContext(), R.attr.colorSecondary))
         views.emailVerificationSubtitle.text = getString(R.string.ftue_auth_email_verification_subtitle, params.email)
-        views.emailVerificationResendEmail.debouncedClicks {
-            viewModel.handle(OnboardingAction.PostRegisterAction(RegisterAction.SendAgainThreePid))
+        views.emailVerificationResendEmail.debouncedClicks { viewModel.handle(OnboardingAction.ResendResetPassword) }
+        views.emailVerificationFooter.debouncedClicks {
+            viewModel.handle(OnboardingAction.PostViewEvent(OnboardingViewEvents.OnResetPasswordBreakerConfirmed))
         }
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthResetPasswordEntryFragment.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthResetPasswordEntryFragment.kt
new file mode 100644
index 0000000000..6becce71d6
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthResetPasswordEntryFragment.kt
@@ -0,0 +1,73 @@
+/*
+ * Copyright (c) 2022 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.onboarding.ftueauth
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.lifecycle.lifecycleScope
+import dagger.hilt.android.AndroidEntryPoint
+import im.vector.app.core.extensions.associateContentStateWith
+import im.vector.app.core.extensions.content
+import im.vector.app.core.extensions.editText
+import im.vector.app.core.extensions.isEmail
+import im.vector.app.core.extensions.setOnImeDoneListener
+import im.vector.app.databinding.FragmentFtueResetPasswordInputBinding
+import im.vector.app.features.onboarding.OnboardingAction
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.onEach
+import reactivecircus.flowbinding.android.widget.textChanges
+
+@AndroidEntryPoint
+class FtueAuthResetPasswordEntryFragment : AbstractFtueAuthFragment<FragmentFtueResetPasswordInputBinding>() {
+
+    override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentFtueResetPasswordInputBinding {
+        return FragmentFtueResetPasswordInputBinding.inflate(inflater, container, false)
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        setupViews()
+    }
+
+    private fun setupViews() {
+        views.emailEntryInput.associateContentStateWith(button = views.emailEntrySubmit)
+        views.emailEntryInput.setOnImeDoneListener { resetPassword() }
+        views.emailEntrySubmit.debouncedClicks { resetPassword() }
+
+        views.emailEntryInput.editText().textChanges()
+                .onEach {
+                    views.emailEntryInput.error = null
+                    views.emailEntrySubmit.isEnabled = it.isEmail()
+                }
+                .launchIn(viewLifecycleOwner.lifecycleScope)
+    }
+
+    private fun resetPassword() {
+        val password = views.emailEntryInput.content()
+        viewModel.handle(OnboardingAction.ConfirmNewPassword(newPassword = password))
+    }
+
+    override fun onError(throwable: Throwable) {
+        views.emailEntryInput.error = errorFormatter.toHumanReadable(throwable)
+    }
+
+    override fun resetViewModel() {
+        viewModel.handle(OnboardingAction.ResetResetPassword)
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthVariant.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthVariant.kt
index 49c937827e..5f1c3d4314 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthVariant.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthVariant.kt
@@ -190,6 +190,14 @@ class FtueAuthVariant(
                     )
                 }
             }
+            OnboardingViewEvents.OnResetPasswordBreakerConfirmed -> {
+                supportFragmentManager.popBackStack(FRAGMENT_LOGIN_TAG, POP_BACK_STACK_EXCLUSIVE)
+                activity.addFragmentToBackstack(
+                        views.loginFragmentContainer,
+                        FtueAuthResetPasswordEntryFragment::class.java,
+                        option = commonOption
+                )
+            }
             is OnboardingViewEvents.OnResetPasswordMailConfirmationSuccess -> {
                 supportFragmentManager.popBackStack(FRAGMENT_LOGIN_TAG, POP_BACK_STACK_EXCLUSIVE)
                 activity.addFragmentToBackstack(
diff --git a/vector/src/main/res/layout/fragment_ftue_reset_password_input.xml b/vector/src/main/res/layout/fragment_ftue_reset_password_input.xml
new file mode 100644
index 0000000000..c9da572df5
--- /dev/null
+++ b/vector/src/main/res/layout/fragment_ftue_reset_password_input.xml
@@ -0,0 +1,157 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    style="@style/LoginFormScrollView"
+    android:layout_height="match_parent"
+    android:background="?android:colorBackground"
+    android:fillViewport="true"
+    android:paddingTop="0dp"
+    android:paddingBottom="0dp">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <androidx.constraintlayout.widget.Guideline
+            android:id="@+id/emailEntryGutterStart"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:orientation="vertical"
+            app:layout_constraintGuide_percent="@dimen/ftue_auth_gutter_start_percent" />
+
+        <androidx.constraintlayout.widget.Guideline
+            android:id="@+id/emailEntryGutterEnd"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:orientation="vertical"
+            app:layout_constraintGuide_percent="@dimen/ftue_auth_gutter_end_percent" />
+
+        <Space
+            android:id="@+id/headerSpacing"
+            android:layout_width="match_parent"
+            android:layout_height="52dp"
+            app:layout_constraintBottom_toTopOf="@id/emailEntryHeaderIcon"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintVertical_bias="0"
+            app:layout_constraintVertical_chainStyle="packed" />
+
+        <ImageView
+            android:id="@+id/emailEntryHeaderIcon"
+            android:layout_width="wrap_content"
+            android:layout_height="0dp"
+            android:adjustViewBounds="true"
+            android:background="@drawable/circle"
+            android:backgroundTint="?colorSecondary"
+            android:contentDescription="@null"
+            android:src="@drawable/ic_email"
+            app:layout_constraintBottom_toTopOf="@id/emailEntryHeaderTitle"
+            app:layout_constraintEnd_toEndOf="@id/emailEntryGutterEnd"
+            app:layout_constraintHeight_percent="0.12"
+            app:layout_constraintStart_toStartOf="@id/emailEntryGutterStart"
+            app:layout_constraintTop_toBottomOf="@id/headerSpacing"
+            app:tint="@color/palette_white" />
+
+        <TextView
+            android:id="@+id/emailEntryHeaderTitle"
+            style="@style/Widget.Vector.TextView.Title.Medium"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
+            android:gravity="center"
+            android:text="@string/ftue_auth_new_password_title"
+            android:textColor="?vctr_content_primary"
+            app:layout_constraintBottom_toTopOf="@id/emailEntryHeaderSubtitle"
+            app:layout_constraintEnd_toEndOf="@id/emailEntryGutterEnd"
+            app:layout_constraintStart_toStartOf="@id/emailEntryGutterStart"
+            app:layout_constraintTop_toBottomOf="@id/emailEntryHeaderIcon" />
+
+        <TextView
+            android:id="@+id/emailEntryHeaderSubtitle"
+            style="@style/Widget.Vector.TextView.Subtitle"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:gravity="center"
+            android:text="@string/ftue_auth_new_password_subtitle"
+            android:textColor="?vctr_content_secondary"
+            app:layout_constraintBottom_toTopOf="@id/titleContentSpacing"
+            app:layout_constraintEnd_toEndOf="@id/emailEntryGutterEnd"
+            app:layout_constraintStart_toStartOf="@id/emailEntryGutterStart"
+            app:layout_constraintTop_toBottomOf="@id/emailEntryHeaderTitle" />
+
+        <Space
+            android:id="@+id/titleContentSpacing"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            app:layout_constraintBottom_toTopOf="@id/emailEntryInput"
+            app:layout_constraintHeight_percent="0.03"
+            app:layout_constraintTop_toBottomOf="@id/emailEntryHeaderSubtitle" />
+
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/emailEntryInput"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:hint="@string/ftue_auth_new_password_entry_title"
+            app:endIconMode="clear_text"
+            app:layout_constraintBottom_toTopOf="@id/entrySignOutAll"
+            app:layout_constraintEnd_toEndOf="@id/emailEntryGutterEnd"
+            app:layout_constraintStart_toStartOf="@id/emailEntryGutterStart"
+            app:layout_constraintTop_toBottomOf="@id/titleContentSpacing">
+
+            <com.google.android.material.textfield.TextInputEditText
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:imeOptions="actionDone"
+                android:inputType="textEmailAddress"
+                android:maxLines="1" />
+
+        </com.google.android.material.textfield.TextInputLayout>
+
+        <com.google.android.material.checkbox.MaterialCheckBox
+            android:id="@+id/entrySignOutAll"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="-14dp"
+            android:buttonTint="@color/checkbox_tint_selector"
+            app:layout_constraintBottom_toTopOf="@id/entrySpacing"
+            app:layout_constraintEnd_toEndOf="@id/emailEntryGutterEnd"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="@id/emailEntryGutterStart"
+            app:layout_constraintTop_toBottomOf="@id/emailEntryInput" />
+
+        <TextView
+            style="@style/Widget.Vector.TextView.Subtitle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/ftue_auth_sign_out_all_devices"
+            app:layout_constraintBottom_toTopOf="@id/entrySpacing"
+            app:layout_constraintEnd_toEndOf="@id/emailEntryGutterEnd"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toEndOf="@id/entrySignOutAll"
+            app:layout_constraintTop_toBottomOf="@id/emailEntryInput" />
+
+        <Space
+            android:id="@+id/entrySpacing"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            app:layout_constraintBottom_toTopOf="@id/emailEntrySubmit"
+            app:layout_constraintHeight_percent="0.03"
+            app:layout_constraintTop_toBottomOf="@id/entrySignOutAll"
+            app:layout_constraintVertical_bias="0"
+            app:layout_constraintVertical_chainStyle="packed" />
+
+        <Button
+            android:id="@+id/emailEntrySubmit"
+            style="@style/Widget.Vector.Button.Login"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:text="@string/ftue_auth_reset_password"
+            android:textAllCaps="true"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="@id/emailEntryGutterEnd"
+            app:layout_constraintStart_toStartOf="@id/emailEntryGutterStart"
+            app:layout_constraintTop_toBottomOf="@id/entrySpacing" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+</androidx.core.widget.NestedScrollView>
diff --git a/vector/src/main/res/values/donottranslate.xml b/vector/src/main/res/values/donottranslate.xml
index 447d0b2b9c..943ef39313 100755
--- a/vector/src/main/res/values/donottranslate.xml
+++ b/vector/src/main/res/values/donottranslate.xml
@@ -38,6 +38,11 @@
     <string name="ftue_auth_email_entry_title">Email Address</string>
     <string name="ftue_auth_reset_password_email_subtitle">We will send you a verification link.</string>
     <string name="ftue_auth_reset_password_breaker_title">Check your email.</string>
+    <string name="ftue_auth_new_password_entry_title">New Password</string>
+    <string name="ftue_auth_new_password_title">Choose a new password</string>
+    <string name="ftue_auth_new_password_subtitle">Make sure it\'s 8 characters or more.</string>
+    <string name="ftue_auth_reset_password">Reset password</string>
+    <string name="ftue_auth_sign_out_all_devices">Sign out all devices</string>
 
     <string name="ftue_auth_email_verification_title">Check your email to verify.</string>
     <!-- Note for translators, %s is the users email address -->

From 4200b4b5e918d5bb328cbb93cc9708dbb9418603 Mon Sep 17 00:00:00 2001
From: Adam Brown <adampsbrown@gmail.com>
Date: Tue, 7 Jun 2022 16:19:22 +0100
Subject: [PATCH 04/24] taking into account the servers ability to sign out all
 devices

---
 .../features/onboarding/OnboardingAction.kt   |  2 +-
 .../onboarding/OnboardingViewModel.kt         | 46 +++++++++----------
 .../FtueAuthResetPasswordEntryFragment.kt     | 14 +++++-
 .../src/main/res/drawable/ic_new_password.xml | 10 ++++
 .../fragment_ftue_reset_password_input.xml    | 18 ++------
 5 files changed, 48 insertions(+), 42 deletions(-)
 create mode 100644 vector/src/main/res/drawable/ic_new_password.xml

diff --git a/vector/src/main/java/im/vector/app/features/onboarding/OnboardingAction.kt b/vector/src/main/java/im/vector/app/features/onboarding/OnboardingAction.kt
index 40900ca2b0..96b0bc45d6 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/OnboardingAction.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/OnboardingAction.kt
@@ -48,7 +48,7 @@ sealed interface OnboardingAction : VectorViewModelAction {
     data class WebLoginSuccess(val credentials: Credentials) : OnboardingAction
     data class InitWith(val loginConfig: LoginConfig?) : OnboardingAction
     data class ResetPassword(val email: String, val newPassword: String?) : OnboardingAction
-    data class ConfirmNewPassword(val newPassword: String) : OnboardingAction
+    data class ConfirmNewPassword(val newPassword: String, val signOutAllDevices: Boolean) : OnboardingAction
     object ResendResetPassword : OnboardingAction
     object ResetPasswordMailConfirmed : OnboardingAction
 
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewModel.kt b/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewModel.kt
index b4257a0abf..650b308937 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewModel.kt
@@ -150,7 +150,7 @@ class OnboardingViewModel @AssistedInject constructor(
             is OnboardingAction.WebLoginSuccess -> handleWebLoginSuccess(action)
             is OnboardingAction.ResetPassword -> handleResetPassword(action)
             OnboardingAction.ResendResetPassword -> handleResendResetPassword()
-            is OnboardingAction.ConfirmNewPassword -> handleConfirmNewPassword(action)
+            is OnboardingAction.ConfirmNewPassword -> handleResetPasswordConfirmed(action)
             is OnboardingAction.ResetPasswordMailConfirmed -> handleResetPasswordMailConfirmed()
             is OnboardingAction.PostRegisterAction -> handleRegisterAction(action.registerAction)
             is OnboardingAction.ResetAction -> handleResetAction(action)
@@ -457,10 +457,7 @@ class OnboardingViewModel @AssistedInject constructor(
         withState { state ->
             val resetState = state.resetState
             when (resetState.email) {
-                null -> {
-                    setState { copy(isLoading = false) }
-                    _viewEvents.post(OnboardingViewEvents.Failure(IllegalStateException("Developer error - No reset email has been set")))
-                }
+                null -> _viewEvents.post(OnboardingViewEvents.Failure(IllegalStateException("Developer error - No reset email has been set")))
                 else -> {
                     startResetPasswordFlow(resetState.email) {
                         setState { copy(isLoading = false) }
@@ -484,9 +481,11 @@ class OnboardingViewModel @AssistedInject constructor(
         }
     }
 
-    private fun handleConfirmNewPassword(action: OnboardingAction.ConfirmNewPassword) {
-        setState { copy(resetState = resetState.copy(newPassword = action.newPassword)) }
-        handleResetPasswordMailConfirmed()
+    private fun handleResetPasswordConfirmed(action: OnboardingAction.ConfirmNewPassword) {
+        setState { copy(isLoading = true) }
+        currentJob = viewModelScope.launch {
+            confirmPasswordReset(action.newPassword, action.signOutAllDevices)
+        }
     }
 
     private fun handleResetPasswordMailConfirmed() {
@@ -498,27 +497,24 @@ class OnboardingViewModel @AssistedInject constructor(
                     setState { copy(isLoading = false) }
                     _viewEvents.post(OnboardingViewEvents.Failure(IllegalStateException("Developer error - No new password has been set")))
                 }
-                else -> {
-                    runCatching { loginWizard.resetPasswordMailConfirmed(newPassword) }.fold(
-                            onSuccess = {
-                                setState {
-                                    copy(
-                                            isLoading = false,
-                                            resetState = ResetState()
-                                    )
-                                }
-                                _viewEvents.post(OnboardingViewEvents.OnResetPasswordMailConfirmationSuccess)
-                            },
-                            onFailure = {
-                                setState { copy(isLoading = false) }
-                                _viewEvents.post(OnboardingViewEvents.Failure(it))
-                            }
-                    )
-                }
+                else -> confirmPasswordReset(newPassword, logoutAllDevices = true)
             }
         }
     }
 
+    private suspend fun confirmPasswordReset(newPassword: String, logoutAllDevices: Boolean) {
+        runCatching { loginWizard.resetPasswordMailConfirmed(newPassword, logoutAllDevices = logoutAllDevices) }.fold(
+                onSuccess = {
+                    setState { copy(isLoading = false, resetState = ResetState()) }
+                    _viewEvents.post(OnboardingViewEvents.OnResetPasswordMailConfirmationSuccess)
+                },
+                onFailure = {
+                    setState { copy(isLoading = false) }
+                    _viewEvents.post(OnboardingViewEvents.Failure(it))
+                }
+        )
+    }
+
     private fun handleDirectLogin(action: AuthenticateAction.LoginDirect, homeServerConnectionConfig: HomeServerConnectionConfig?) {
         setState { copy(isLoading = true) }
         currentJob = viewModelScope.launch {
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthResetPasswordEntryFragment.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthResetPasswordEntryFragment.kt
index 6becce71d6..d8014c3f45 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthResetPasswordEntryFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthResetPasswordEntryFragment.kt
@@ -20,6 +20,7 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.core.view.isVisible
 import androidx.lifecycle.lifecycleScope
 import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.core.extensions.associateContentStateWith
@@ -29,6 +30,7 @@ import im.vector.app.core.extensions.isEmail
 import im.vector.app.core.extensions.setOnImeDoneListener
 import im.vector.app.databinding.FragmentFtueResetPasswordInputBinding
 import im.vector.app.features.onboarding.OnboardingAction
+import im.vector.app.features.onboarding.OnboardingViewState
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import reactivecircus.flowbinding.android.widget.textChanges
@@ -59,14 +61,22 @@ class FtueAuthResetPasswordEntryFragment : AbstractFtueAuthFragment<FragmentFtue
     }
 
     private fun resetPassword() {
-        val password = views.emailEntryInput.content()
-        viewModel.handle(OnboardingAction.ConfirmNewPassword(newPassword = password))
+        viewModel.handle(
+                OnboardingAction.ConfirmNewPassword(
+                        newPassword = views.emailEntryInput.content(),
+                        signOutAllDevices = views.entrySignOutAll.isChecked
+                )
+        )
     }
 
     override fun onError(throwable: Throwable) {
         views.emailEntryInput.error = errorFormatter.toHumanReadable(throwable)
     }
 
+    override fun updateWithState(state: OnboardingViewState) {
+        views.entrySignOutAll.isVisible = state.resetState.supportsLogoutAllDevices
+    }
+
     override fun resetViewModel() {
         viewModel.handle(OnboardingAction.ResetResetPassword)
     }
diff --git a/vector/src/main/res/drawable/ic_new_password.xml b/vector/src/main/res/drawable/ic_new_password.xml
new file mode 100644
index 0000000000..b6171642c8
--- /dev/null
+++ b/vector/src/main/res/drawable/ic_new_password.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="70dp"
+    android:height="70dp"
+    android:viewportWidth="70"
+    android:viewportHeight="70">
+  <path
+      android:pathData="M30.125,16.213C27.088,16.213 24.625,18.676 24.625,21.713V31.527H21.625C19.968,31.527 18.625,32.87 18.625,34.527V53.125C18.625,54.782 19.968,56.125 21.625,56.125H49.375C51.032,56.125 52.375,54.782 52.375,53.125V34.527C52.375,32.87 51.032,31.527 49.375,31.527H46.375V21.713C46.375,18.676 43.913,16.213 40.875,16.213H30.125ZM43.375,31.527V21.713C43.375,20.333 42.256,19.213 40.875,19.213H30.125C28.744,19.213 27.625,20.333 27.625,21.713V31.527H43.375Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/vector/src/main/res/layout/fragment_ftue_reset_password_input.xml b/vector/src/main/res/layout/fragment_ftue_reset_password_input.xml
index c9da572df5..4a9261c3b5 100644
--- a/vector/src/main/res/layout/fragment_ftue_reset_password_input.xml
+++ b/vector/src/main/res/layout/fragment_ftue_reset_password_input.xml
@@ -43,7 +43,7 @@
             android:background="@drawable/circle"
             android:backgroundTint="?colorSecondary"
             android:contentDescription="@null"
-            android:src="@drawable/ic_email"
+            android:src="@drawable/ic_new_password"
             app:layout_constraintBottom_toTopOf="@id/emailEntryHeaderTitle"
             app:layout_constraintEnd_toEndOf="@id/emailEntryGutterEnd"
             app:layout_constraintHeight_percent="0.12"
@@ -113,7 +113,7 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="-14dp"
             android:buttonTint="@color/checkbox_tint_selector"
-            app:layout_constraintBottom_toTopOf="@id/entrySpacing"
+            app:layout_constraintBottom_toTopOf="@id/emailEntrySubmit"
             app:layout_constraintEnd_toEndOf="@id/emailEntryGutterEnd"
             app:layout_constraintHorizontal_bias="0"
             app:layout_constraintStart_toStartOf="@id/emailEntryGutterStart"
@@ -124,22 +124,12 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/ftue_auth_sign_out_all_devices"
-            app:layout_constraintBottom_toTopOf="@id/entrySpacing"
+            app:layout_constraintBottom_toTopOf="@id/emailEntrySubmit"
             app:layout_constraintEnd_toEndOf="@id/emailEntryGutterEnd"
             app:layout_constraintHorizontal_bias="0"
             app:layout_constraintStart_toEndOf="@id/entrySignOutAll"
             app:layout_constraintTop_toBottomOf="@id/emailEntryInput" />
 
-        <Space
-            android:id="@+id/entrySpacing"
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            app:layout_constraintBottom_toTopOf="@id/emailEntrySubmit"
-            app:layout_constraintHeight_percent="0.03"
-            app:layout_constraintTop_toBottomOf="@id/entrySignOutAll"
-            app:layout_constraintVertical_bias="0"
-            app:layout_constraintVertical_chainStyle="packed" />
-
         <Button
             android:id="@+id/emailEntrySubmit"
             style="@style/Widget.Vector.Button.Login"
@@ -150,7 +140,7 @@
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="@id/emailEntryGutterEnd"
             app:layout_constraintStart_toStartOf="@id/emailEntryGutterStart"
-            app:layout_constraintTop_toBottomOf="@id/entrySpacing" />
+            app:layout_constraintTop_toBottomOf="@id/entrySignOutAll" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 

From 3c03bae4c5831359153b879dcd93744e3275cfe5 Mon Sep 17 00:00:00 2001
From: Adam Brown <adampsbrown@gmail.com>
Date: Tue, 7 Jun 2022 16:53:59 +0100
Subject: [PATCH 05/24] adding test around resending reset password email

---
 .../onboarding/OnboardingViewModelTest.kt     | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/vector/src/test/java/im/vector/app/features/onboarding/OnboardingViewModelTest.kt b/vector/src/test/java/im/vector/app/features/onboarding/OnboardingViewModelTest.kt
index 34c9116419..b0d539bdcc 100644
--- a/vector/src/test/java/im/vector/app/features/onboarding/OnboardingViewModelTest.kt
+++ b/vector/src/test/java/im/vector/app/features/onboarding/OnboardingViewModelTest.kt
@@ -499,6 +499,25 @@ class OnboardingViewModelTest {
                 .finish()
     }
 
+    @Test
+    fun `given reset state, when resending reset password email, then emits reset success`() = runTest {
+        viewModelWith(initialState.copy(resetState = ResetState(AN_EMAIL, A_PASSWORD)))
+        val test = viewModel.test()
+        fakeLoginWizard.givenResetPasswordSuccess(AN_EMAIL)
+        fakeAuthenticationService.givenLoginWizard(fakeLoginWizard)
+
+        viewModel.handle(OnboardingAction.ResendResetPassword)
+
+        test
+                .assertStatesChanges(
+                        initialState,
+                        { copy(isLoading = true) },
+                        { copy(isLoading = false) }
+                )
+                .assertNoEvents()
+                .finish()
+    }
+
     @Test
     fun `given can successfully confirm reset password, when confirm reset password, then emits reset success`() = runTest {
         viewModelWith(initialState.copy(resetState = ResetState(AN_EMAIL, A_PASSWORD)))

From 7ef8193a93776cf4e2560c581e6b3ae7f867168c Mon Sep 17 00:00:00 2001
From: Adam Brown <adampsbrown@gmail.com>
Date: Tue, 7 Jun 2022 17:18:18 +0100
Subject: [PATCH 06/24] fixing reset fragments not removing previous screens
 when moving to the next step

---
 .../onboarding/ftueauth/FtueAuthVariant.kt    | 41 ++++++++-----------
 1 file changed, 18 insertions(+), 23 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthVariant.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthVariant.kt
index 5f1c3d4314..80375ec6c5 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthVariant.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthVariant.kt
@@ -163,35 +163,24 @@ class FtueAuthVariant(
             is OnboardingViewEvents.OnWebLoginError -> onWebLoginError(viewEvents)
             is OnboardingViewEvents.OnForgetPasswordClicked ->
                 when {
-                    vectorFeatures.isOnboardingCombinedLoginEnabled() -> activity.addFragmentToBackstack(
-                            views.loginFragmentContainer,
-                            FtueAuthResetPasswordEmailEntryFragment::class.java,
-                            option = commonOption
-                    )
-                    else                                              -> activity.addFragmentToBackstack(
-                            views.loginFragmentContainer,
-                            FtueAuthResetPasswordFragment::class.java,
-                            option = commonOption
-                    )
+                    vectorFeatures.isOnboardingCombinedLoginEnabled() -> addLoginStageFragmentToBackstack(FtueAuthResetPasswordEmailEntryFragment::class.java)
+                    else                                              -> addLoginStageFragmentToBackstack(FtueAuthResetPasswordFragment::class.java)
                 }
             is OnboardingViewEvents.OnResetPasswordSendThreePidDone -> {
-                supportFragmentManager.popBackStack(FRAGMENT_LOGIN_TAG, POP_BACK_STACK_EXCLUSIVE)
+                supportFragmentManager.popBackStack(FRAGMENT_LOGIN_TAG, FragmentManager.POP_BACK_STACK_INCLUSIVE)
                 when {
-                    vectorFeatures.isOnboardingCombinedLoginEnabled() -> activity.addFragmentToBackstack(
-                            views.loginFragmentContainer,
+                    vectorFeatures.isOnboardingCombinedLoginEnabled() -> addLoginStageFragmentToBackstack(
                             FtueAuthResetPasswordBreakerFragment::class.java,
                             FtueAuthResetPasswordBreakerArgument(viewEvents.email),
-                            option = commonOption
                     )
                     else -> activity.addFragmentToBackstack(
                             views.loginFragmentContainer,
                             FtueAuthResetPasswordMailConfirmationFragment::class.java,
-                            option = commonOption
                     )
                 }
             }
             OnboardingViewEvents.OnResetPasswordBreakerConfirmed -> {
-                supportFragmentManager.popBackStack(FRAGMENT_LOGIN_TAG, POP_BACK_STACK_EXCLUSIVE)
+                supportFragmentManager.popBackStack(FRAGMENT_LOGIN_TAG, FragmentManager.POP_BACK_STACK_INCLUSIVE)
                 activity.addFragmentToBackstack(
                         views.loginFragmentContainer,
                         FtueAuthResetPasswordEntryFragment::class.java,
@@ -199,16 +188,12 @@ class FtueAuthVariant(
                 )
             }
             is OnboardingViewEvents.OnResetPasswordMailConfirmationSuccess -> {
-                supportFragmentManager.popBackStack(FRAGMENT_LOGIN_TAG, POP_BACK_STACK_EXCLUSIVE)
-                activity.addFragmentToBackstack(
-                        views.loginFragmentContainer,
-                        FtueAuthResetPasswordSuccessFragment::class.java,
-                        option = commonOption
-                )
+                supportFragmentManager.popBackStack(FRAGMENT_LOGIN_TAG, FragmentManager.POP_BACK_STACK_INCLUSIVE)
+                addLoginStageFragmentToBackstack(FtueAuthResetPasswordSuccessFragment::class.java)
             }
             is OnboardingViewEvents.OnResetPasswordMailConfirmationSuccessDone -> {
                 // Go back to the login fragment
-                supportFragmentManager.popBackStack(FRAGMENT_LOGIN_TAG, POP_BACK_STACK_EXCLUSIVE)
+                supportFragmentManager.popBackStack(FRAGMENT_LOGIN_TAG, FragmentManager.POP_BACK_STACK_INCLUSIVE)
             }
             is OnboardingViewEvents.OnSendEmailSuccess -> {
                 openWaitForEmailVerification(viewEvents.email)
@@ -519,4 +504,14 @@ class FtueAuthVariant(
                 option = commonOption
         )
     }
+
+    private fun addLoginStageFragmentToBackstack(fragmentClass: Class<out Fragment>, params: Parcelable? = null) {
+        activity.addFragmentToBackstack(
+                views.loginFragmentContainer,
+                fragmentClass,
+                params,
+                tag = FRAGMENT_LOGIN_TAG,
+                option = commonOption
+        )
+    }
 }

From 47cedfb522db103a5d036c8b0cee2f300c31f396 Mon Sep 17 00:00:00 2001
From: Adam Brown <adampsbrown@gmail.com>
Date: Wed, 8 Jun 2022 09:07:32 +0100
Subject: [PATCH 07/24] hiding the reset password input by default

---
 .../ftueauth/FtueAuthResetPasswordEntryFragment.kt     |  7 ++++++-
 .../res/layout/fragment_ftue_reset_password_input.xml  | 10 +++++++++-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthResetPasswordEntryFragment.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthResetPasswordEntryFragment.kt
index d8014c3f45..8cd2d2b3e0 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthResetPasswordEntryFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthResetPasswordEntryFragment.kt
@@ -26,6 +26,7 @@ import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.core.extensions.associateContentStateWith
 import im.vector.app.core.extensions.content
 import im.vector.app.core.extensions.editText
+import im.vector.app.core.extensions.hidePassword
 import im.vector.app.core.extensions.isEmail
 import im.vector.app.core.extensions.setOnImeDoneListener
 import im.vector.app.databinding.FragmentFtueResetPasswordInputBinding
@@ -74,7 +75,11 @@ class FtueAuthResetPasswordEntryFragment : AbstractFtueAuthFragment<FragmentFtue
     }
 
     override fun updateWithState(state: OnboardingViewState) {
-        views.entrySignOutAll.isVisible = state.resetState.supportsLogoutAllDevices
+        views.signedOutAllGroup.isVisible = state.resetState.supportsLogoutAllDevices
+
+        if (state.isLoading) {
+            views.emailEntryInput.editText().hidePassword()
+        }
     }
 
     override fun resetViewModel() {
diff --git a/vector/src/main/res/layout/fragment_ftue_reset_password_input.xml b/vector/src/main/res/layout/fragment_ftue_reset_password_input.xml
index 4a9261c3b5..d239532093 100644
--- a/vector/src/main/res/layout/fragment_ftue_reset_password_input.xml
+++ b/vector/src/main/res/layout/fragment_ftue_reset_password_input.xml
@@ -89,6 +89,7 @@
 
         <com.google.android.material.textfield.TextInputLayout
             android:id="@+id/emailEntryInput"
+            style="@style/Widget.Vector.TextInputLayout.Password"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:hint="@string/ftue_auth_new_password_entry_title"
@@ -102,11 +103,17 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:imeOptions="actionDone"
-                android:inputType="textEmailAddress"
+                android:inputType="textPassword"
                 android:maxLines="1" />
 
         </com.google.android.material.textfield.TextInputLayout>
 
+        <androidx.constraintlayout.widget.Group
+            android:id="@+id/signedOutAllGroup"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:constraint_referenced_ids="entrySignOutAll,signOutAllLabel" />
+
         <com.google.android.material.checkbox.MaterialCheckBox
             android:id="@+id/entrySignOutAll"
             android:layout_width="wrap_content"
@@ -120,6 +127,7 @@
             app:layout_constraintTop_toBottomOf="@id/emailEntryInput" />
 
         <TextView
+            android:id="@+id/signOutAllLabel"
             style="@style/Widget.Vector.TextView.Subtitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"

From 16481df0f765eaa07396e19e6d9c07658d6b0841 Mon Sep 17 00:00:00 2001
From: Adam Brown <adampsbrown@gmail.com>
Date: Wed, 8 Jun 2022 09:51:11 +0100
Subject: [PATCH 08/24] handling the reset password completion step within the
 view model and emitting view events to move the flow forwards

---
 .../onboarding/OnboardingViewEvents.kt        |  7 ++--
 .../onboarding/OnboardingViewModel.kt         |  8 +++--
 .../FtueAuthResetPasswordSuccessFragment.kt   |  2 +-
 .../onboarding/ftueauth/FtueAuthVariant.kt    |  8 ++---
 .../onboarding/OnboardingViewModelTest.kt     | 33 ++++++++++++++++---
 .../vector/app/test/fakes/FakeLoginWizard.kt  |  5 +++
 .../app/test/fakes/FakeVectorFeatures.kt      |  8 +++--
 7 files changed, 53 insertions(+), 18 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewEvents.kt b/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewEvents.kt
index 01de7c073a..ea6981a2b5 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewEvents.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewEvents.kt
@@ -47,10 +47,11 @@ sealed class OnboardingViewEvents : VectorViewEvents {
     object OnHomeserverEdited : OnboardingViewEvents()
     data class OnSignModeSelected(val signMode: SignMode) : OnboardingViewEvents()
     object OnForgetPasswordClicked : OnboardingViewEvents()
-    data class OnResetPasswordSendThreePidDone(val email: String) : OnboardingViewEvents()
-    object OnResetPasswordMailConfirmationSuccess : OnboardingViewEvents()
+
+    data class OnResetPasswordEmailConfirmationSent(val email: String) : OnboardingViewEvents()
+    object OpenResetPasswordComplete : OnboardingViewEvents()
     object OnResetPasswordBreakerConfirmed : OnboardingViewEvents()
-    object OnResetPasswordMailConfirmationSuccessDone : OnboardingViewEvents()
+    object OnResetPasswordComplete : OnboardingViewEvents()
 
     data class OnSendEmailSuccess(val email: String) : OnboardingViewEvents()
     data class OnSendMsisdnSuccess(val msisdn: String) : OnboardingViewEvents()
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewModel.kt b/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewModel.kt
index 650b308937..b5f5682be1 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewModel.kt
@@ -443,7 +443,7 @@ class OnboardingViewModel @AssistedInject constructor(
     private fun handleResetPassword(action: OnboardingAction.ResetPassword) {
         startResetPasswordFlow(action.email) {
             setState { copy(isLoading = false, resetState = createResetState(action, selectedHomeserver)) }
-            _viewEvents.post(OnboardingViewEvents.OnResetPasswordSendThreePidDone(action.email))
+            _viewEvents.post(OnboardingViewEvents.OnResetPasswordEmailConfirmationSent(action.email))
         }
     }
 
@@ -506,7 +506,11 @@ class OnboardingViewModel @AssistedInject constructor(
         runCatching { loginWizard.resetPasswordMailConfirmed(newPassword, logoutAllDevices = logoutAllDevices) }.fold(
                 onSuccess = {
                     setState { copy(isLoading = false, resetState = ResetState()) }
-                    _viewEvents.post(OnboardingViewEvents.OnResetPasswordMailConfirmationSuccess)
+                    val nextEvent = when {
+                        vectorFeatures.isOnboardingCombinedLoginEnabled() -> OnboardingViewEvents.OnResetPasswordComplete
+                        else                                              -> OnboardingViewEvents.OpenResetPasswordComplete
+                    }
+                    _viewEvents.post(nextEvent)
                 },
                 onFailure = {
                     setState { copy(isLoading = false) }
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthResetPasswordSuccessFragment.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthResetPasswordSuccessFragment.kt
index adc6e1b214..956566a587 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthResetPasswordSuccessFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthResetPasswordSuccessFragment.kt
@@ -41,7 +41,7 @@ class FtueAuthResetPasswordSuccessFragment @Inject constructor() : AbstractFtueA
     }
 
     private fun submit() {
-        viewModel.handle(OnboardingAction.PostViewEvent(OnboardingViewEvents.OnResetPasswordMailConfirmationSuccessDone))
+        viewModel.handle(OnboardingAction.PostViewEvent(OnboardingViewEvents.OnResetPasswordComplete))
     }
 
     override fun resetViewModel() {
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthVariant.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthVariant.kt
index 80375ec6c5..fa7de37650 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthVariant.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthVariant.kt
@@ -29,7 +29,6 @@ import androidx.fragment.app.FragmentTransaction
 import com.airbnb.mvrx.withState
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import im.vector.app.R
-import im.vector.app.core.extensions.POP_BACK_STACK_EXCLUSIVE
 import im.vector.app.core.extensions.addFragment
 import im.vector.app.core.extensions.addFragmentToBackstack
 import im.vector.app.core.extensions.popBackstack
@@ -166,7 +165,7 @@ class FtueAuthVariant(
                     vectorFeatures.isOnboardingCombinedLoginEnabled() -> addLoginStageFragmentToBackstack(FtueAuthResetPasswordEmailEntryFragment::class.java)
                     else                                              -> addLoginStageFragmentToBackstack(FtueAuthResetPasswordFragment::class.java)
                 }
-            is OnboardingViewEvents.OnResetPasswordSendThreePidDone -> {
+            is OnboardingViewEvents.OnResetPasswordEmailConfirmationSent -> {
                 supportFragmentManager.popBackStack(FRAGMENT_LOGIN_TAG, FragmentManager.POP_BACK_STACK_INCLUSIVE)
                 when {
                     vectorFeatures.isOnboardingCombinedLoginEnabled() -> addLoginStageFragmentToBackstack(
@@ -187,12 +186,11 @@ class FtueAuthVariant(
                         option = commonOption
                 )
             }
-            is OnboardingViewEvents.OnResetPasswordMailConfirmationSuccess -> {
+            is OnboardingViewEvents.OpenResetPasswordComplete    -> {
                 supportFragmentManager.popBackStack(FRAGMENT_LOGIN_TAG, FragmentManager.POP_BACK_STACK_INCLUSIVE)
                 addLoginStageFragmentToBackstack(FtueAuthResetPasswordSuccessFragment::class.java)
             }
-            is OnboardingViewEvents.OnResetPasswordMailConfirmationSuccessDone -> {
-                // Go back to the login fragment
+            OnboardingViewEvents.OnResetPasswordComplete         -> {
                 supportFragmentManager.popBackStack(FRAGMENT_LOGIN_TAG, FragmentManager.POP_BACK_STACK_INCLUSIVE)
             }
             is OnboardingViewEvents.OnSendEmailSuccess -> {
diff --git a/vector/src/test/java/im/vector/app/features/onboarding/OnboardingViewModelTest.kt b/vector/src/test/java/im/vector/app/features/onboarding/OnboardingViewModelTest.kt
index b0d539bdcc..c730c9b045 100644
--- a/vector/src/test/java/im/vector/app/features/onboarding/OnboardingViewModelTest.kt
+++ b/vector/src/test/java/im/vector/app/features/onboarding/OnboardingViewModelTest.kt
@@ -478,7 +478,7 @@ class OnboardingViewModelTest {
     }
 
     @Test
-    fun `given can successfully reset password, when resetting password, then emits reset done event`() = runTest {
+    fun `given can successfully start password reset, when resetting password, then emits confirmation email sent`() = runTest {
         viewModelWith(initialState.copy(selectedHomeserver = SELECTED_HOMESERVER_STATE_SUPPORTED_LOGOUT_DEVICES))
         val test = viewModel.test()
         fakeLoginWizard.givenResetPasswordSuccess(AN_EMAIL)
@@ -495,12 +495,12 @@ class OnboardingViewModelTest {
                             copy(isLoading = false, resetState = resetState)
                         }
                 )
-                .assertEvents(OnboardingViewEvents.OnResetPasswordSendThreePidDone(AN_EMAIL))
+                .assertEvents(OnboardingViewEvents.OnResetPasswordEmailConfirmationSent(AN_EMAIL))
                 .finish()
     }
 
     @Test
-    fun `given reset state, when resending reset password email, then emits reset success`() = runTest {
+    fun `given reset state, when resending reset password email, then triggers reset password and emits nothing`() = runTest {
         viewModelWith(initialState.copy(resetState = ResetState(AN_EMAIL, A_PASSWORD)))
         val test = viewModel.test()
         fakeLoginWizard.givenResetPasswordSuccess(AN_EMAIL)
@@ -516,12 +516,14 @@ class OnboardingViewModelTest {
                 )
                 .assertNoEvents()
                 .finish()
+        fakeLoginWizard.verifyResetPassword(AN_EMAIL)
     }
 
     @Test
-    fun `given can successfully confirm reset password, when confirm reset password, then emits reset success`() = runTest {
+    fun `given can successfully confirm reset password, when confirm reset password, then opens reset password complete`() = runTest {
         viewModelWith(initialState.copy(resetState = ResetState(AN_EMAIL, A_PASSWORD)))
         val test = viewModel.test()
+        fakeVectorFeatures.givenCombinedLoginDisabled()
         fakeLoginWizard.givenConfirmResetPasswordSuccess(A_PASSWORD)
         fakeAuthenticationService.givenLoginWizard(fakeLoginWizard)
 
@@ -533,10 +535,31 @@ class OnboardingViewModelTest {
                         { copy(isLoading = true) },
                         { copy(isLoading = false, resetState = ResetState()) }
                 )
-                .assertEvents(OnboardingViewEvents.OnResetPasswordMailConfirmationSuccess)
+                .assertEvents(OnboardingViewEvents.OpenResetPasswordComplete)
                 .finish()
     }
 
+    @Test
+    fun `given can successfully confirm reset password, when confirm reset password, then emits reset password complete`() = runTest {
+        viewModelWith(initialState.copy(resetState = ResetState(AN_EMAIL, A_PASSWORD)))
+        val test = viewModel.test()
+        fakeVectorFeatures.givenCombinedLoginEnabled()
+        fakeLoginWizard.givenConfirmResetPasswordSuccess(A_PASSWORD)
+        fakeAuthenticationService.givenLoginWizard(fakeLoginWizard)
+
+        viewModel.handle(OnboardingAction.ResetPasswordMailConfirmed)
+
+        test
+                .assertStatesChanges(
+                        initialState,
+                        { copy(isLoading = true) },
+                        { copy(isLoading = false, resetState = ResetState()) }
+                )
+                .assertEvents(OnboardingViewEvents.OnResetPasswordComplete)
+                .finish()
+    }
+
+
     private fun viewModelWith(state: OnboardingViewState) {
         OnboardingViewModel(
                 state,
diff --git a/vector/src/test/java/im/vector/app/test/fakes/FakeLoginWizard.kt b/vector/src/test/java/im/vector/app/test/fakes/FakeLoginWizard.kt
index 38bb75087c..07577ed61c 100644
--- a/vector/src/test/java/im/vector/app/test/fakes/FakeLoginWizard.kt
+++ b/vector/src/test/java/im/vector/app/test/fakes/FakeLoginWizard.kt
@@ -17,6 +17,7 @@
 package im.vector.app.test.fakes
 
 import io.mockk.coJustRun
+import io.mockk.coVerify
 import io.mockk.mockk
 import org.matrix.android.sdk.api.auth.login.LoginWizard
 
@@ -29,4 +30,8 @@ class FakeLoginWizard : LoginWizard by mockk() {
     fun givenConfirmResetPasswordSuccess(password: String) {
         coJustRun { resetPasswordMailConfirmed(password) }
     }
+
+    fun verifyResetPassword(email: String) {
+        coVerify { resetPassword(email) }
+    }
 }
diff --git a/vector/src/test/java/im/vector/app/test/fakes/FakeVectorFeatures.kt b/vector/src/test/java/im/vector/app/test/fakes/FakeVectorFeatures.kt
index e227a1a686..0b150ae9d0 100644
--- a/vector/src/test/java/im/vector/app/test/fakes/FakeVectorFeatures.kt
+++ b/vector/src/test/java/im/vector/app/test/fakes/FakeVectorFeatures.kt
@@ -27,7 +27,11 @@ class FakeVectorFeatures : VectorFeatures by spyk<DefaultVectorFeatures>() {
         every { isOnboardingPersonalizeEnabled() } returns true
     }
 
-    fun givenCombinedRegisterEnabled() {
-        every { isOnboardingCombinedRegisterEnabled() } returns true
+    fun givenCombinedLoginEnabled() {
+        every { isOnboardingCombinedLoginEnabled() } returns true
+    }
+
+    fun givenCombinedLoginDisabled() {
+        every { isOnboardingCombinedLoginEnabled() } returns false
     }
 }

From 0d80bdfd4140f3da2455dbe10574fafd8e8340f1 Mon Sep 17 00:00:00 2001
From: Adam Brown <adampsbrown@gmail.com>
Date: Wed, 8 Jun 2022 11:01:08 +0100
Subject: [PATCH 09/24] updating xml ids to reflect their context

---
 .../FtueAuthResetPasswordBreakerFragment.kt   | 10 +--
 .../FtueAuthResetPasswordEntryFragment.kt     | 18 +++---
 .../fragment_ftue_reset_password_breaker.xml  | 52 ++++++++--------
 .../fragment_ftue_reset_password_input.xml    | 62 +++++++++----------
 4 files changed, 71 insertions(+), 71 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthResetPasswordBreakerFragment.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthResetPasswordBreakerFragment.kt
index 5a8ced28df..31f934b356 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthResetPasswordBreakerFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthResetPasswordBreakerFragment.kt
@@ -54,17 +54,17 @@ class FtueAuthResetPasswordBreakerFragment : AbstractFtueAuthFragment<FragmentFt
     }
 
     private fun setupUi() {
-        views.emailVerificationGradientContainer.setBackgroundResource(
+        views.resetPasswordBreakerGradientContainer.setBackgroundResource(
                 when (themeProvider.isLightTheme()) {
                     true  -> R.drawable.bg_waiting_for_email_verification
                     false -> R.drawable.bg_color_background
                 }
         )
-        views.emailVerificationTitle.text = getString(R.string.ftue_auth_reset_password_breaker_title)
+        views.resetPasswordBreakerTitle.text = getString(R.string.ftue_auth_reset_password_breaker_title)
                 .colorTerminatingFullStop(ThemeUtils.getColor(requireContext(), R.attr.colorSecondary))
-        views.emailVerificationSubtitle.text = getString(R.string.ftue_auth_email_verification_subtitle, params.email)
-        views.emailVerificationResendEmail.debouncedClicks { viewModel.handle(OnboardingAction.ResendResetPassword) }
-        views.emailVerificationFooter.debouncedClicks {
+        views.resetPasswordBreakerSubtitle.text = getString(R.string.ftue_auth_email_verification_subtitle, params.email)
+        views.resetPasswordBreakerResendEmail.debouncedClicks { viewModel.handle(OnboardingAction.ResendResetPassword) }
+        views.resetPasswordBreakerFooter.debouncedClicks {
             viewModel.handle(OnboardingAction.PostViewEvent(OnboardingViewEvents.OnResetPasswordBreakerConfirmed))
         }
     }
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthResetPasswordEntryFragment.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthResetPasswordEntryFragment.kt
index 8cd2d2b3e0..b302a3e4fb 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthResetPasswordEntryFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthResetPasswordEntryFragment.kt
@@ -49,14 +49,14 @@ class FtueAuthResetPasswordEntryFragment : AbstractFtueAuthFragment<FragmentFtue
     }
 
     private fun setupViews() {
-        views.emailEntryInput.associateContentStateWith(button = views.emailEntrySubmit)
-        views.emailEntryInput.setOnImeDoneListener { resetPassword() }
-        views.emailEntrySubmit.debouncedClicks { resetPassword() }
+        views.newPasswordInput.associateContentStateWith(button = views.newPasswordSubmit)
+        views.newPasswordInput.setOnImeDoneListener { resetPassword() }
+        views.newPasswordSubmit.debouncedClicks { resetPassword() }
 
-        views.emailEntryInput.editText().textChanges()
+        views.newPasswordInput.editText().textChanges()
                 .onEach {
-                    views.emailEntryInput.error = null
-                    views.emailEntrySubmit.isEnabled = it.isEmail()
+                    views.newPasswordInput.error = null
+                    views.newPasswordSubmit.isEnabled = it.isEmail()
                 }
                 .launchIn(viewLifecycleOwner.lifecycleScope)
     }
@@ -64,21 +64,21 @@ class FtueAuthResetPasswordEntryFragment : AbstractFtueAuthFragment<FragmentFtue
     private fun resetPassword() {
         viewModel.handle(
                 OnboardingAction.ConfirmNewPassword(
-                        newPassword = views.emailEntryInput.content(),
+                        newPassword = views.newPasswordInput.content(),
                         signOutAllDevices = views.entrySignOutAll.isChecked
                 )
         )
     }
 
     override fun onError(throwable: Throwable) {
-        views.emailEntryInput.error = errorFormatter.toHumanReadable(throwable)
+        views.newPasswordInput.error = errorFormatter.toHumanReadable(throwable)
     }
 
     override fun updateWithState(state: OnboardingViewState) {
         views.signedOutAllGroup.isVisible = state.resetState.supportsLogoutAllDevices
 
         if (state.isLoading) {
-            views.emailEntryInput.editText().hidePassword()
+            views.newPasswordInput.editText().hidePassword()
         }
     }
 
diff --git a/vector/src/main/res/layout/fragment_ftue_reset_password_breaker.xml b/vector/src/main/res/layout/fragment_ftue_reset_password_breaker.xml
index 96b276c5ce..bd38f074b9 100644
--- a/vector/src/main/res/layout/fragment_ftue_reset_password_breaker.xml
+++ b/vector/src/main/res/layout/fragment_ftue_reset_password_breaker.xml
@@ -20,7 +20,7 @@
         app:layout_constraintGuide_percent="@dimen/ftue_auth_gutter_end_percent" />
 
     <View
-        android:id="@+id/emailVerificationGradientContainer"
+        android:id="@+id/resetPasswordBreakerGradientContainer"
         android:layout_width="match_parent"
         android:layout_height="0dp"
         app:layout_constraintHeight_percent="0.60"
@@ -28,16 +28,16 @@
         tools:background="@drawable/bg_waiting_for_email_verification" />
 
     <Space
-        android:id="@+id/emailVerificationSpace1"
+        android:id="@+id/resetPasswordBreakerSpace1"
         android:layout_width="match_parent"
         android:layout_height="0dp"
-        app:layout_constraintBottom_toTopOf="@id/emailVerificationLogo"
+        app:layout_constraintBottom_toTopOf="@id/resetPasswordBreakerLogo"
         app:layout_constraintHeight_percent="0.10"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_chainStyle="spread_inside" />
 
     <ImageView
-        android:id="@+id/emailVerificationLogo"
+        android:id="@+id/resetPasswordBreakerLogo"
         android:layout_width="wrap_content"
         android:layout_height="0dp"
         android:adjustViewBounds="true"
@@ -45,67 +45,67 @@
         android:backgroundTint="?colorSecondary"
         android:importantForAccessibility="no"
         android:src="@drawable/ic_email"
-        app:layout_constraintBottom_toTopOf="@id/emailVerificationSpace2"
+        app:layout_constraintBottom_toTopOf="@id/resetPasswordBreakerSpace2"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHeight_percent="0.12"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/emailVerificationSpace1" />
+        app:layout_constraintTop_toBottomOf="@id/resetPasswordBreakerSpace1" />
 
     <Space
-        android:id="@+id/emailVerificationSpace2"
+        android:id="@+id/resetPasswordBreakerSpace2"
         android:layout_width="match_parent"
         android:layout_height="0dp"
-        app:layout_constraintBottom_toTopOf="@id/emailVerificationTitle"
+        app:layout_constraintBottom_toTopOf="@id/resetPasswordBreakerTitle"
         app:layout_constraintHeight_percent="0.05"
-        app:layout_constraintTop_toBottomOf="@id/emailVerificationLogo" />
+        app:layout_constraintTop_toBottomOf="@id/resetPasswordBreakerLogo" />
 
     <TextView
-        android:id="@+id/emailVerificationTitle"
+        android:id="@+id/resetPasswordBreakerTitle"
         style="@style/Widget.Vector.TextView.Title"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:gravity="center"
         android:transitionName="loginTitleTransition"
-        app:layout_constraintBottom_toTopOf="@id/emailVerificationSubtitle"
+        app:layout_constraintBottom_toTopOf="@id/resetPasswordBreakerSubtitle"
         app:layout_constraintEnd_toEndOf="@id/ftueAuthGutterEnd"
         app:layout_constraintStart_toStartOf="@id/ftueAuthGutterStart"
-        app:layout_constraintTop_toBottomOf="@id/emailVerificationSpace2"
+        app:layout_constraintTop_toBottomOf="@id/resetPasswordBreakerSpace2"
         tools:text="@string/ftue_auth_reset_password_breaker_title" />
 
     <TextView
-        android:id="@+id/emailVerificationSubtitle"
+        android:id="@+id/resetPasswordBreakerSubtitle"
         style="@style/Widget.Vector.TextView.Subtitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
         android:gravity="center"
-        app:layout_constraintBottom_toTopOf="@id/emailVerificationSpace4"
+        app:layout_constraintBottom_toTopOf="@id/resetPasswordBreakerSpace4"
         app:layout_constraintEnd_toEndOf="@id/ftueAuthGutterEnd"
         app:layout_constraintStart_toStartOf="@id/ftueAuthGutterStart"
-        app:layout_constraintTop_toBottomOf="@id/emailVerificationTitle"
+        app:layout_constraintTop_toBottomOf="@id/resetPasswordBreakerTitle"
         tools:text="@string/ftue_auth_email_verification_subtitle" />
 
     <Space
-        android:id="@+id/emailVerificationSpace4"
+        android:id="@+id/resetPasswordBreakerSpace4"
         android:layout_width="match_parent"
         android:layout_height="0dp"
-        app:layout_constraintBottom_toTopOf="@id/emailVerificationResendEmail"
-        app:layout_constraintTop_toBottomOf="@id/emailVerificationSubtitle" />
+        app:layout_constraintBottom_toTopOf="@id/resetPasswordBreakerResendEmail"
+        app:layout_constraintTop_toBottomOf="@id/resetPasswordBreakerSubtitle" />
 
     <Button
-        android:id="@+id/emailVerificationFooter"
+        android:id="@+id/resetPasswordBreakerFooter"
         style="@style/Widget.Vector.Button.Login"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:text="@string/done"
         android:textAllCaps="true"
-        app:layout_constraintBottom_toTopOf="@id/emailVerificationResendEmail"
+        app:layout_constraintBottom_toTopOf="@id/resetPasswordBreakerResendEmail"
         app:layout_constraintEnd_toEndOf="@id/ftueAuthGutterEnd"
         app:layout_constraintStart_toStartOf="@id/ftueAuthGutterStart"
-        app:layout_constraintTop_toBottomOf="@id/emailVerificationSpace4" />
+        app:layout_constraintTop_toBottomOf="@id/resetPasswordBreakerSpace4" />
 
     <Button
-        android:id="@+id/emailVerificationResendEmail"
+        android:id="@+id/resetPasswordBreakerResendEmail"
         style="@style/Widget.Vector.Button.Text.Login"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
@@ -114,17 +114,17 @@
         android:textAllCaps="true"
         android:textColor="?colorSecondary"
         android:transitionName="loginSubmitTransition"
-        app:layout_constraintBottom_toTopOf="@id/emailVerificationSpace5"
+        app:layout_constraintBottom_toTopOf="@id/resetPasswordBreakerSpace5"
         app:layout_constraintEnd_toEndOf="@id/ftueAuthGutterEnd"
         app:layout_constraintStart_toStartOf="@id/ftueAuthGutterStart"
-        app:layout_constraintTop_toBottomOf="@id/emailVerificationFooter" />
+        app:layout_constraintTop_toBottomOf="@id/resetPasswordBreakerFooter" />
 
     <Space
-        android:id="@+id/emailVerificationSpace5"
+        android:id="@+id/resetPasswordBreakerSpace5"
         android:layout_width="match_parent"
         android:layout_height="0dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintHeight_percent="0.05"
-        app:layout_constraintTop_toBottomOf="@id/emailVerificationResendEmail" />
+        app:layout_constraintTop_toBottomOf="@id/resetPasswordBreakerResendEmail" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/layout/fragment_ftue_reset_password_input.xml b/vector/src/main/res/layout/fragment_ftue_reset_password_input.xml
index d239532093..7ca93982f2 100644
--- a/vector/src/main/res/layout/fragment_ftue_reset_password_input.xml
+++ b/vector/src/main/res/layout/fragment_ftue_reset_password_input.xml
@@ -13,14 +13,14 @@
         android:layout_height="wrap_content">
 
         <androidx.constraintlayout.widget.Guideline
-            android:id="@+id/emailEntryGutterStart"
+            android:id="@+id/newPasswordGutterStart"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:orientation="vertical"
             app:layout_constraintGuide_percent="@dimen/ftue_auth_gutter_start_percent" />
 
         <androidx.constraintlayout.widget.Guideline
-            android:id="@+id/emailEntryGutterEnd"
+            android:id="@+id/newPasswordGutterEnd"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:orientation="vertical"
@@ -30,13 +30,13 @@
             android:id="@+id/headerSpacing"
             android:layout_width="match_parent"
             android:layout_height="52dp"
-            app:layout_constraintBottom_toTopOf="@id/emailEntryHeaderIcon"
+            app:layout_constraintBottom_toTopOf="@id/newPasswordHeaderIcon"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintVertical_bias="0"
             app:layout_constraintVertical_chainStyle="packed" />
 
         <ImageView
-            android:id="@+id/emailEntryHeaderIcon"
+            android:id="@+id/newPasswordHeaderIcon"
             android:layout_width="wrap_content"
             android:layout_height="0dp"
             android:adjustViewBounds="true"
@@ -44,15 +44,15 @@
             android:backgroundTint="?colorSecondary"
             android:contentDescription="@null"
             android:src="@drawable/ic_new_password"
-            app:layout_constraintBottom_toTopOf="@id/emailEntryHeaderTitle"
-            app:layout_constraintEnd_toEndOf="@id/emailEntryGutterEnd"
+            app:layout_constraintBottom_toTopOf="@id/newPasswordHeaderTitle"
+            app:layout_constraintEnd_toEndOf="@id/newPasswordGutterEnd"
             app:layout_constraintHeight_percent="0.12"
-            app:layout_constraintStart_toStartOf="@id/emailEntryGutterStart"
+            app:layout_constraintStart_toStartOf="@id/newPasswordGutterStart"
             app:layout_constraintTop_toBottomOf="@id/headerSpacing"
             app:tint="@color/palette_white" />
 
         <TextView
-            android:id="@+id/emailEntryHeaderTitle"
+            android:id="@+id/newPasswordHeaderTitle"
             style="@style/Widget.Vector.TextView.Title.Medium"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -60,13 +60,13 @@
             android:gravity="center"
             android:text="@string/ftue_auth_new_password_title"
             android:textColor="?vctr_content_primary"
-            app:layout_constraintBottom_toTopOf="@id/emailEntryHeaderSubtitle"
-            app:layout_constraintEnd_toEndOf="@id/emailEntryGutterEnd"
-            app:layout_constraintStart_toStartOf="@id/emailEntryGutterStart"
-            app:layout_constraintTop_toBottomOf="@id/emailEntryHeaderIcon" />
+            app:layout_constraintBottom_toTopOf="@id/newPasswordHeaderSubtitle"
+            app:layout_constraintEnd_toEndOf="@id/newPasswordGutterEnd"
+            app:layout_constraintStart_toStartOf="@id/newPasswordGutterStart"
+            app:layout_constraintTop_toBottomOf="@id/newPasswordHeaderIcon" />
 
         <TextView
-            android:id="@+id/emailEntryHeaderSubtitle"
+            android:id="@+id/newPasswordHeaderSubtitle"
             style="@style/Widget.Vector.TextView.Subtitle"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -75,28 +75,28 @@
             android:text="@string/ftue_auth_new_password_subtitle"
             android:textColor="?vctr_content_secondary"
             app:layout_constraintBottom_toTopOf="@id/titleContentSpacing"
-            app:layout_constraintEnd_toEndOf="@id/emailEntryGutterEnd"
-            app:layout_constraintStart_toStartOf="@id/emailEntryGutterStart"
-            app:layout_constraintTop_toBottomOf="@id/emailEntryHeaderTitle" />
+            app:layout_constraintEnd_toEndOf="@id/newPasswordGutterEnd"
+            app:layout_constraintStart_toStartOf="@id/newPasswordGutterStart"
+            app:layout_constraintTop_toBottomOf="@id/newPasswordHeaderTitle" />
 
         <Space
             android:id="@+id/titleContentSpacing"
             android:layout_width="match_parent"
             android:layout_height="0dp"
-            app:layout_constraintBottom_toTopOf="@id/emailEntryInput"
+            app:layout_constraintBottom_toTopOf="@id/newPasswordInput"
             app:layout_constraintHeight_percent="0.03"
-            app:layout_constraintTop_toBottomOf="@id/emailEntryHeaderSubtitle" />
+            app:layout_constraintTop_toBottomOf="@id/newPasswordHeaderSubtitle" />
 
         <com.google.android.material.textfield.TextInputLayout
-            android:id="@+id/emailEntryInput"
+            android:id="@+id/newPasswordInput"
             style="@style/Widget.Vector.TextInputLayout.Password"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:hint="@string/ftue_auth_new_password_entry_title"
             app:endIconMode="clear_text"
             app:layout_constraintBottom_toTopOf="@id/entrySignOutAll"
-            app:layout_constraintEnd_toEndOf="@id/emailEntryGutterEnd"
-            app:layout_constraintStart_toStartOf="@id/emailEntryGutterStart"
+            app:layout_constraintEnd_toEndOf="@id/newPasswordGutterEnd"
+            app:layout_constraintStart_toStartOf="@id/newPasswordGutterStart"
             app:layout_constraintTop_toBottomOf="@id/titleContentSpacing">
 
             <com.google.android.material.textfield.TextInputEditText
@@ -120,11 +120,11 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="-14dp"
             android:buttonTint="@color/checkbox_tint_selector"
-            app:layout_constraintBottom_toTopOf="@id/emailEntrySubmit"
-            app:layout_constraintEnd_toEndOf="@id/emailEntryGutterEnd"
+            app:layout_constraintBottom_toTopOf="@id/newPasswordSubmit"
+            app:layout_constraintEnd_toEndOf="@id/newPasswordGutterEnd"
             app:layout_constraintHorizontal_bias="0"
-            app:layout_constraintStart_toStartOf="@id/emailEntryGutterStart"
-            app:layout_constraintTop_toBottomOf="@id/emailEntryInput" />
+            app:layout_constraintStart_toStartOf="@id/newPasswordGutterStart"
+            app:layout_constraintTop_toBottomOf="@id/newPasswordInput" />
 
         <TextView
             android:id="@+id/signOutAllLabel"
@@ -132,22 +132,22 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/ftue_auth_sign_out_all_devices"
-            app:layout_constraintBottom_toTopOf="@id/emailEntrySubmit"
-            app:layout_constraintEnd_toEndOf="@id/emailEntryGutterEnd"
+            app:layout_constraintBottom_toTopOf="@id/newPasswordSubmit"
+            app:layout_constraintEnd_toEndOf="@id/newPasswordGutterEnd"
             app:layout_constraintHorizontal_bias="0"
             app:layout_constraintStart_toEndOf="@id/entrySignOutAll"
-            app:layout_constraintTop_toBottomOf="@id/emailEntryInput" />
+            app:layout_constraintTop_toBottomOf="@id/newPasswordInput" />
 
         <Button
-            android:id="@+id/emailEntrySubmit"
+            android:id="@+id/newPasswordSubmit"
             style="@style/Widget.Vector.Button.Login"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:text="@string/ftue_auth_reset_password"
             android:textAllCaps="true"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="@id/emailEntryGutterEnd"
-            app:layout_constraintStart_toStartOf="@id/emailEntryGutterStart"
+            app:layout_constraintEnd_toEndOf="@id/newPasswordGutterEnd"
+            app:layout_constraintStart_toStartOf="@id/newPasswordGutterStart"
             app:layout_constraintTop_toBottomOf="@id/entrySignOutAll" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>

From 1d3b4e9829dbe0153ca634b17ebd261350581248 Mon Sep 17 00:00:00 2001
From: Adam Brown <adampsbrown@gmail.com>
Date: Wed, 8 Jun 2022 11:32:46 +0100
Subject: [PATCH 10/24] formatting

---
 .../app/features/onboarding/ftueauth/FtueAuthVariant.kt   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthVariant.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthVariant.kt
index fa7de37650..9cac492659 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthVariant.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthVariant.kt
@@ -178,7 +178,7 @@ class FtueAuthVariant(
                     )
                 }
             }
-            OnboardingViewEvents.OnResetPasswordBreakerConfirmed -> {
+            OnboardingViewEvents.OnResetPasswordBreakerConfirmed         -> {
                 supportFragmentManager.popBackStack(FRAGMENT_LOGIN_TAG, FragmentManager.POP_BACK_STACK_INCLUSIVE)
                 activity.addFragmentToBackstack(
                         views.loginFragmentContainer,
@@ -186,12 +186,12 @@ class FtueAuthVariant(
                         option = commonOption
                 )
             }
-            is OnboardingViewEvents.OpenResetPasswordComplete    -> {
+            is OnboardingViewEvents.OpenResetPasswordComplete            -> {
                 supportFragmentManager.popBackStack(FRAGMENT_LOGIN_TAG, FragmentManager.POP_BACK_STACK_INCLUSIVE)
                 addLoginStageFragmentToBackstack(FtueAuthResetPasswordSuccessFragment::class.java)
             }
-            OnboardingViewEvents.OnResetPasswordComplete         -> {
-                supportFragmentManager.popBackStack(FRAGMENT_LOGIN_TAG, FragmentManager.POP_BACK_STACK_INCLUSIVE)
+            OnboardingViewEvents.OnResetPasswordComplete                 -> {
+                activity.popBackstack()
             }
             is OnboardingViewEvents.OnSendEmailSuccess -> {
                 openWaitForEmailVerification(viewEvents.email)

From f40f838a9f8f817ebdb1d3bf83ae5fcad1601166 Mon Sep 17 00:00:00 2001
From: Adam Brown <adampsbrown@gmail.com>
Date: Wed, 8 Jun 2022 11:33:03 +0100
Subject: [PATCH 11/24] making the new password visibility toggleable

---
 .../src/main/res/layout/fragment_ftue_reset_password_input.xml  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vector/src/main/res/layout/fragment_ftue_reset_password_input.xml b/vector/src/main/res/layout/fragment_ftue_reset_password_input.xml
index 7ca93982f2..6c0480433d 100644
--- a/vector/src/main/res/layout/fragment_ftue_reset_password_input.xml
+++ b/vector/src/main/res/layout/fragment_ftue_reset_password_input.xml
@@ -93,7 +93,7 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:hint="@string/ftue_auth_new_password_entry_title"
-            app:endIconMode="clear_text"
+            app:endIconMode="password_toggle"
             app:layout_constraintBottom_toTopOf="@id/entrySignOutAll"
             app:layout_constraintEnd_toEndOf="@id/newPasswordGutterEnd"
             app:layout_constraintStart_toStartOf="@id/newPasswordGutterStart"

From eb84072a05ccc58704eabb1e09befeabc706d3b8 Mon Sep 17 00:00:00 2001
From: Adam Brown <adampsbrown@gmail.com>
Date: Wed, 8 Jun 2022 11:34:45 +0100
Subject: [PATCH 12/24] updating test names to read better

---
 .../app/features/onboarding/OnboardingViewModelTest.kt      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/vector/src/test/java/im/vector/app/features/onboarding/OnboardingViewModelTest.kt b/vector/src/test/java/im/vector/app/features/onboarding/OnboardingViewModelTest.kt
index c730c9b045..128b215e9c 100644
--- a/vector/src/test/java/im/vector/app/features/onboarding/OnboardingViewModelTest.kt
+++ b/vector/src/test/java/im/vector/app/features/onboarding/OnboardingViewModelTest.kt
@@ -500,7 +500,7 @@ class OnboardingViewModelTest {
     }
 
     @Test
-    fun `given reset state, when resending reset password email, then triggers reset password and emits nothing`() = runTest {
+    fun `given existing reset state, when resending reset password email, then triggers reset password and emits nothing`() = runTest {
         viewModelWith(initialState.copy(resetState = ResetState(AN_EMAIL, A_PASSWORD)))
         val test = viewModel.test()
         fakeLoginWizard.givenResetPasswordSuccess(AN_EMAIL)
@@ -520,7 +520,7 @@ class OnboardingViewModelTest {
     }
 
     @Test
-    fun `given can successfully confirm reset password, when confirm reset password, then opens reset password complete`() = runTest {
+    fun `given combined login disabled, when confirming password reset, then opens reset password complete`() = runTest {
         viewModelWith(initialState.copy(resetState = ResetState(AN_EMAIL, A_PASSWORD)))
         val test = viewModel.test()
         fakeVectorFeatures.givenCombinedLoginDisabled()
@@ -540,7 +540,7 @@ class OnboardingViewModelTest {
     }
 
     @Test
-    fun `given can successfully confirm reset password, when confirm reset password, then emits reset password complete`() = runTest {
+    fun `given combined login enabled, when confirming password reset, then emits reset password complete`() = runTest {
         viewModelWith(initialState.copy(resetState = ResetState(AN_EMAIL, A_PASSWORD)))
         val test = viewModel.test()
         fakeVectorFeatures.givenCombinedLoginEnabled()

From 71d1024fe9133788c4b9408c05522379279732f3 Mon Sep 17 00:00:00 2001
From: Adam Brown <adampsbrown@gmail.com>
Date: Wed, 8 Jun 2022 11:37:55 +0100
Subject: [PATCH 13/24] adding changelog entry

---
 changelog.d/5284.wip | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/5284.wip

diff --git a/changelog.d/5284.wip b/changelog.d/5284.wip
new file mode 100644
index 0000000000..a296de24af
--- /dev/null
+++ b/changelog.d/5284.wip
@@ -0,0 +1 @@
+FTUE - Adds support for resetting the password during the FTUE onboarding journey

From 7971a7461472ed0cb430a37db22776196bfe5c1d Mon Sep 17 00:00:00 2001
From: Adam Brown <adampsbrown@gmail.com>
Date: Wed, 8 Jun 2022 11:40:55 +0100
Subject: [PATCH 14/24] fixing code quality warnings

---
 .../src/main/res/layout/fragment_ftue_reset_password_input.xml  | 2 +-
 .../vector/app/features/onboarding/OnboardingViewModelTest.kt   | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/vector/src/main/res/layout/fragment_ftue_reset_password_input.xml b/vector/src/main/res/layout/fragment_ftue_reset_password_input.xml
index 6c0480433d..b0b28d40e9 100644
--- a/vector/src/main/res/layout/fragment_ftue_reset_password_input.xml
+++ b/vector/src/main/res/layout/fragment_ftue_reset_password_input.xml
@@ -114,7 +114,7 @@
             android:layout_height="wrap_content"
             app:constraint_referenced_ids="entrySignOutAll,signOutAllLabel" />
 
-        <com.google.android.material.checkbox.MaterialCheckBox
+        <CheckBox
             android:id="@+id/entrySignOutAll"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
diff --git a/vector/src/test/java/im/vector/app/features/onboarding/OnboardingViewModelTest.kt b/vector/src/test/java/im/vector/app/features/onboarding/OnboardingViewModelTest.kt
index 128b215e9c..16a3257b72 100644
--- a/vector/src/test/java/im/vector/app/features/onboarding/OnboardingViewModelTest.kt
+++ b/vector/src/test/java/im/vector/app/features/onboarding/OnboardingViewModelTest.kt
@@ -559,7 +559,6 @@ class OnboardingViewModelTest {
                 .finish()
     }
 
-
     private fun viewModelWith(state: OnboardingViewState) {
         OnboardingViewModel(
                 state,

From 0a0c32296395e86e147b3ee3c1407d3cbc7d0d19 Mon Sep 17 00:00:00 2001
From: Adam Brown <adampsbrown@gmail.com>
Date: Mon, 13 Jun 2022 12:03:23 +0100
Subject: [PATCH 15/24] adding extra padding between reset button and checkbox
 to match designs

---
 .../main/res/layout/fragment_ftue_reset_password_input.xml   | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/vector/src/main/res/layout/fragment_ftue_reset_password_input.xml b/vector/src/main/res/layout/fragment_ftue_reset_password_input.xml
index b0b28d40e9..c259180fd5 100644
--- a/vector/src/main/res/layout/fragment_ftue_reset_password_input.xml
+++ b/vector/src/main/res/layout/fragment_ftue_reset_password_input.xml
@@ -132,17 +132,18 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/ftue_auth_sign_out_all_devices"
-            app:layout_constraintBottom_toTopOf="@id/newPasswordSubmit"
+            app:layout_constraintBottom_toTopOf="@id/entrySignOutAll"
             app:layout_constraintEnd_toEndOf="@id/newPasswordGutterEnd"
             app:layout_constraintHorizontal_bias="0"
             app:layout_constraintStart_toEndOf="@id/entrySignOutAll"
-            app:layout_constraintTop_toBottomOf="@id/newPasswordInput" />
+            app:layout_constraintTop_toBottomOf="@id/entrySignOutAll" />
 
         <Button
             android:id="@+id/newPasswordSubmit"
             style="@style/Widget.Vector.Button.Login"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
             android:text="@string/ftue_auth_reset_password"
             android:textAllCaps="true"
             app:layout_constraintBottom_toBottomOf="parent"

From 5bb397f35ea1ca212a0d30a49c2f03479a4eb657 Mon Sep 17 00:00:00 2001
From: Adam Brown <adampsbrown@gmail.com>
Date: Mon, 13 Jun 2022 12:06:48 +0100
Subject: [PATCH 16/24] using next instead of done copy when confirming reset
 email link

---
 .../main/res/layout/fragment_ftue_reset_password_breaker.xml    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vector/src/main/res/layout/fragment_ftue_reset_password_breaker.xml b/vector/src/main/res/layout/fragment_ftue_reset_password_breaker.xml
index bd38f074b9..e395f67b4a 100644
--- a/vector/src/main/res/layout/fragment_ftue_reset_password_breaker.xml
+++ b/vector/src/main/res/layout/fragment_ftue_reset_password_breaker.xml
@@ -97,7 +97,7 @@
         style="@style/Widget.Vector.Button.Login"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:text="@string/done"
+        android:text="@string/login_set_email_submit"
         android:textAllCaps="true"
         app:layout_constraintBottom_toTopOf="@id/resetPasswordBreakerResendEmail"
         app:layout_constraintEnd_toEndOf="@id/ftueAuthGutterEnd"

From ef4889a1b37ae990bd69c866b2704a01e6c11902 Mon Sep 17 00:00:00 2001
From: Adam Brown <adampsbrown@gmail.com>
Date: Mon, 27 Jun 2022 15:19:29 +0100
Subject: [PATCH 17/24] fixing missing fake given

---
 .../test/java/im/vector/app/test/fakes/FakeVectorFeatures.kt  | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/vector/src/test/java/im/vector/app/test/fakes/FakeVectorFeatures.kt b/vector/src/test/java/im/vector/app/test/fakes/FakeVectorFeatures.kt
index 0b150ae9d0..18d7355aeb 100644
--- a/vector/src/test/java/im/vector/app/test/fakes/FakeVectorFeatures.kt
+++ b/vector/src/test/java/im/vector/app/test/fakes/FakeVectorFeatures.kt
@@ -27,6 +27,10 @@ class FakeVectorFeatures : VectorFeatures by spyk<DefaultVectorFeatures>() {
         every { isOnboardingPersonalizeEnabled() } returns true
     }
 
+    fun givenCombinedRegisterEnabled() {
+        every { isOnboardingCombinedRegisterEnabled() } returns true
+    }
+
     fun givenCombinedLoginEnabled() {
         every { isOnboardingCombinedLoginEnabled() } returns true
     }

From 2a46fbe77cb2ba1aea3a0fa4d2989a8f9f93e100 Mon Sep 17 00:00:00 2001
From: Adam Brown <adampsbrown@gmail.com>
Date: Mon, 27 Jun 2022 17:54:45 +0100
Subject: [PATCH 18/24] ignoring negative margin required by the checkbox
 alignment

---
 .../main/res/layout/fragment_ftue_reset_password_input.xml    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/vector/src/main/res/layout/fragment_ftue_reset_password_input.xml b/vector/src/main/res/layout/fragment_ftue_reset_password_input.xml
index c259180fd5..0907a517d9 100644
--- a/vector/src/main/res/layout/fragment_ftue_reset_password_input.xml
+++ b/vector/src/main/res/layout/fragment_ftue_reset_password_input.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     style="@style/LoginFormScrollView"
     android:layout_height="match_parent"
     android:background="?android:colorBackground"
@@ -124,7 +125,8 @@
             app:layout_constraintEnd_toEndOf="@id/newPasswordGutterEnd"
             app:layout_constraintHorizontal_bias="0"
             app:layout_constraintStart_toStartOf="@id/newPasswordGutterStart"
-            app:layout_constraintTop_toBottomOf="@id/newPasswordInput" />
+            app:layout_constraintTop_toBottomOf="@id/newPasswordInput"
+            tools:ignore="NegativeMargin" />
 
         <TextView
             android:id="@+id/signOutAllLabel"

From 382a936e0aa039bcc87b2339da6d16a120c706d2 Mon Sep 17 00:00:00 2001
From: Adam Brown <adampsbrown@gmail.com>
Date: Wed, 29 Jun 2022 13:35:02 +0100
Subject: [PATCH 19/24] fixing method call grouping

---
 .../ftueauth/FtueAuthResetPasswordEmailEntryFragment.kt        | 3 +--
 .../onboarding/ftueauth/FtueAuthResetPasswordEntryFragment.kt  | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthResetPasswordEmailEntryFragment.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthResetPasswordEmailEntryFragment.kt
index 9770d4c262..5119ba6179 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthResetPasswordEmailEntryFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthResetPasswordEmailEntryFragment.kt
@@ -48,14 +48,13 @@ class FtueAuthResetPasswordEmailEntryFragment : AbstractFtueAuthFragment<Fragmen
     private fun setupViews() {
         views.emailEntryInput.associateContentStateWith(button = views.emailEntrySubmit)
         views.emailEntryInput.setOnImeDoneListener { startPasswordReset() }
-        views.emailEntrySubmit.debouncedClicks { startPasswordReset() }
-
         views.emailEntryInput.editText().textChanges()
                 .onEach {
                     views.emailEntryInput.error = null
                     views.emailEntrySubmit.isEnabled = it.isEmail()
                 }
                 .launchIn(viewLifecycleOwner.lifecycleScope)
+        views.emailEntrySubmit.debouncedClicks { startPasswordReset() }
     }
 
     private fun startPasswordReset() {
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthResetPasswordEntryFragment.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthResetPasswordEntryFragment.kt
index b302a3e4fb..d5d6e508c8 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthResetPasswordEntryFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthResetPasswordEntryFragment.kt
@@ -51,14 +51,13 @@ class FtueAuthResetPasswordEntryFragment : AbstractFtueAuthFragment<FragmentFtue
     private fun setupViews() {
         views.newPasswordInput.associateContentStateWith(button = views.newPasswordSubmit)
         views.newPasswordInput.setOnImeDoneListener { resetPassword() }
-        views.newPasswordSubmit.debouncedClicks { resetPassword() }
-
         views.newPasswordInput.editText().textChanges()
                 .onEach {
                     views.newPasswordInput.error = null
                     views.newPasswordSubmit.isEnabled = it.isEmail()
                 }
                 .launchIn(viewLifecycleOwner.lifecycleScope)
+        views.newPasswordSubmit.debouncedClicks { resetPassword() }
     }
 
     private fun resetPassword() {

From 80ec0aaf05a78845c2f37dc51bf3ebe93b10e3a8 Mon Sep 17 00:00:00 2001
From: Adam Brown <adampsbrown@gmail.com>
Date: Wed, 29 Jun 2022 13:39:17 +0100
Subject: [PATCH 20/24] removing new password isEnabled check using the isEmail
 validator, this check is wrong but also not needed due to
 associateContentStateWith above

---
 .../ftueauth/FtueAuthResetPasswordEntryFragment.kt           | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthResetPasswordEntryFragment.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthResetPasswordEntryFragment.kt
index d5d6e508c8..493a60a3fc 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthResetPasswordEntryFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthResetPasswordEntryFragment.kt
@@ -52,10 +52,7 @@ class FtueAuthResetPasswordEntryFragment : AbstractFtueAuthFragment<FragmentFtue
         views.newPasswordInput.associateContentStateWith(button = views.newPasswordSubmit)
         views.newPasswordInput.setOnImeDoneListener { resetPassword() }
         views.newPasswordInput.editText().textChanges()
-                .onEach {
-                    views.newPasswordInput.error = null
-                    views.newPasswordSubmit.isEnabled = it.isEmail()
-                }
+                .onEach { views.newPasswordInput.error = null }
                 .launchIn(viewLifecycleOwner.lifecycleScope)
         views.newPasswordSubmit.debouncedClicks { resetPassword() }
     }

From 7c0d340bd0c19cb100979300d37ac28f2812d856 Mon Sep 17 00:00:00 2001
From: Adam Brown <adampsbrown@gmail.com>
Date: Wed, 29 Jun 2022 13:39:36 +0100
Subject: [PATCH 21/24] formatting

---
 .../app/features/onboarding/ftueauth/FtueAuthVariant.kt   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthVariant.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthVariant.kt
index 9cac492659..fbe32d97ed 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthVariant.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthVariant.kt
@@ -163,7 +163,7 @@ class FtueAuthVariant(
             is OnboardingViewEvents.OnForgetPasswordClicked ->
                 when {
                     vectorFeatures.isOnboardingCombinedLoginEnabled() -> addLoginStageFragmentToBackstack(FtueAuthResetPasswordEmailEntryFragment::class.java)
-                    else                                              -> addLoginStageFragmentToBackstack(FtueAuthResetPasswordFragment::class.java)
+                    else -> addLoginStageFragmentToBackstack(FtueAuthResetPasswordFragment::class.java)
                 }
             is OnboardingViewEvents.OnResetPasswordEmailConfirmationSent -> {
                 supportFragmentManager.popBackStack(FRAGMENT_LOGIN_TAG, FragmentManager.POP_BACK_STACK_INCLUSIVE)
@@ -178,7 +178,7 @@ class FtueAuthVariant(
                     )
                 }
             }
-            OnboardingViewEvents.OnResetPasswordBreakerConfirmed         -> {
+            OnboardingViewEvents.OnResetPasswordBreakerConfirmed -> {
                 supportFragmentManager.popBackStack(FRAGMENT_LOGIN_TAG, FragmentManager.POP_BACK_STACK_INCLUSIVE)
                 activity.addFragmentToBackstack(
                         views.loginFragmentContainer,
@@ -186,11 +186,11 @@ class FtueAuthVariant(
                         option = commonOption
                 )
             }
-            is OnboardingViewEvents.OpenResetPasswordComplete            -> {
+            is OnboardingViewEvents.OpenResetPasswordComplete -> {
                 supportFragmentManager.popBackStack(FRAGMENT_LOGIN_TAG, FragmentManager.POP_BACK_STACK_INCLUSIVE)
                 addLoginStageFragmentToBackstack(FtueAuthResetPasswordSuccessFragment::class.java)
             }
-            OnboardingViewEvents.OnResetPasswordComplete                 -> {
+            OnboardingViewEvents.OnResetPasswordComplete -> {
                 activity.popBackstack()
             }
             is OnboardingViewEvents.OnSendEmailSuccess -> {

From 136185272139a1f87ca14eeee2eb24884950ec99 Mon Sep 17 00:00:00 2001
From: Adam Brown <adampsbrown@gmail.com>
Date: Wed, 29 Jun 2022 14:11:39 +0100
Subject: [PATCH 22/24] triggering an initial enabled state when using
 associateContentStateWith and extracts the resetting of errors on content
 change to an extension

---
 .../app/core/extensions/TextInputLayout.kt       | 15 +++++++++++++--
 .../FtueAuthCombinedServerSelectionFragment.kt   |  9 ++-------
 .../ftueauth/FtueAuthEmailEntryFragment.kt       | 16 +++-------------
 .../FtueAuthResetPasswordEmailEntryFragment.kt   | 15 +++------------
 .../FtueAuthResetPasswordEntryFragment.kt        | 10 ++--------
 5 files changed, 23 insertions(+), 42 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/core/extensions/TextInputLayout.kt b/vector/src/main/java/im/vector/app/core/extensions/TextInputLayout.kt
index 41016365c0..40019c5d64 100644
--- a/vector/src/main/java/im/vector/app/core/extensions/TextInputLayout.kt
+++ b/vector/src/main/java/im/vector/app/core/extensions/TextInputLayout.kt
@@ -19,9 +19,13 @@ package im.vector.app.core.extensions
 import android.text.Editable
 import android.view.View
 import android.view.inputmethod.EditorInfo
+import androidx.lifecycle.LifecycleOwner
+import androidx.lifecycle.lifecycleScope
 import com.google.android.material.textfield.TextInputLayout
 import im.vector.app.core.platform.SimpleTextWatcher
+import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.onEach
 import reactivecircus.flowbinding.android.widget.textChanges
 
 fun TextInputLayout.editText() = this.editText!!
@@ -37,11 +41,18 @@ fun TextInputLayout.content() = editText().text.toString()
 
 fun TextInputLayout.hasContent() = !editText().text.isNullOrEmpty()
 
-fun TextInputLayout.associateContentStateWith(button: View) {
+fun TextInputLayout.clearErrorOnChange(lifecycleOwner: LifecycleOwner) {
+    editText().textChanges()
+            .onEach { error = null }
+            .launchIn(lifecycleOwner.lifecycleScope)
+}
+
+fun TextInputLayout.associateContentStateWith(button: View, enabledPredicate: (String) -> Boolean = { it.isNotEmpty() }) {
+    button.isEnabled = enabledPredicate(content())
     editText().addTextChangedListener(object : SimpleTextWatcher() {
         override fun afterTextChanged(s: Editable) {
             val newContent = s.toString()
-            button.isEnabled = newContent.isNotEmpty()
+            button.isEnabled = enabledPredicate(newContent)
         }
     })
 }
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthCombinedServerSelectionFragment.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthCombinedServerSelectionFragment.kt
index b689f40837..bc44a7dbdb 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthCombinedServerSelectionFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthCombinedServerSelectionFragment.kt
@@ -21,8 +21,8 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.view.inputmethod.EditorInfo
-import androidx.lifecycle.lifecycleScope
 import im.vector.app.R
+import im.vector.app.core.extensions.clearErrorOnChange
 import im.vector.app.core.extensions.content
 import im.vector.app.core.extensions.editText
 import im.vector.app.core.extensions.realignPercentagesToParent
@@ -34,10 +34,7 @@ import im.vector.app.databinding.FragmentFtueServerSelectionCombinedBinding
 import im.vector.app.features.onboarding.OnboardingAction
 import im.vector.app.features.onboarding.OnboardingViewEvents
 import im.vector.app.features.onboarding.OnboardingViewState
-import kotlinx.coroutines.flow.launchIn
-import kotlinx.coroutines.flow.onEach
 import org.matrix.android.sdk.api.failure.isHomeserverUnavailable
-import reactivecircus.flowbinding.android.widget.textChanges
 import javax.inject.Inject
 
 class FtueAuthCombinedServerSelectionFragment @Inject constructor() : AbstractFtueAuthFragment<FragmentFtueServerSelectionCombinedBinding>() {
@@ -66,9 +63,7 @@ class FtueAuthCombinedServerSelectionFragment @Inject constructor() : AbstractFt
         }
         views.chooseServerGetInTouch.debouncedClicks { openUrlInExternalBrowser(requireContext(), getString(R.string.ftue_ems_url)) }
         views.chooseServerSubmit.debouncedClicks { updateServerUrl() }
-        views.chooseServerInput.editText().textChanges()
-                .onEach { views.chooseServerInput.error = null }
-                .launchIn(viewLifecycleOwner.lifecycleScope)
+        views.chooseServerInput.clearErrorOnChange(viewLifecycleOwner)
     }
 
     private fun updateServerUrl() {
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthEmailEntryFragment.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthEmailEntryFragment.kt
index ea376709f5..523d576120 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthEmailEntryFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthEmailEntryFragment.kt
@@ -20,19 +20,15 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.lifecycle.lifecycleScope
 import im.vector.app.core.extensions.associateContentStateWith
+import im.vector.app.core.extensions.clearErrorOnChange
 import im.vector.app.core.extensions.content
-import im.vector.app.core.extensions.editText
 import im.vector.app.core.extensions.isEmail
 import im.vector.app.core.extensions.setOnImeDoneListener
 import im.vector.app.databinding.FragmentFtueEmailInputBinding
 import im.vector.app.features.onboarding.OnboardingAction
 import im.vector.app.features.onboarding.RegisterAction
-import kotlinx.coroutines.flow.launchIn
-import kotlinx.coroutines.flow.onEach
 import org.matrix.android.sdk.api.auth.registration.RegisterThreePid
-import reactivecircus.flowbinding.android.widget.textChanges
 import javax.inject.Inject
 
 class FtueAuthEmailEntryFragment @Inject constructor() : AbstractFtueAuthFragment<FragmentFtueEmailInputBinding>() {
@@ -47,16 +43,10 @@ class FtueAuthEmailEntryFragment @Inject constructor() : AbstractFtueAuthFragmen
     }
 
     private fun setupViews() {
-        views.emailEntryInput.associateContentStateWith(button = views.emailEntrySubmit)
+        views.emailEntryInput.associateContentStateWith(button = views.emailEntrySubmit, enabledPredicate = { it.isEmail() })
         views.emailEntryInput.setOnImeDoneListener { updateEmail() }
+        views.emailEntryInput.clearErrorOnChange(viewLifecycleOwner)
         views.emailEntrySubmit.debouncedClicks { updateEmail() }
-
-        views.emailEntryInput.editText().textChanges()
-                .onEach {
-                    views.emailEntryInput.error = null
-                    views.emailEntrySubmit.isEnabled = it.isEmail()
-                }
-                .launchIn(viewLifecycleOwner.lifecycleScope)
     }
 
     private fun updateEmail() {
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthResetPasswordEmailEntryFragment.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthResetPasswordEmailEntryFragment.kt
index 5119ba6179..e8110569a2 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthResetPasswordEmailEntryFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthResetPasswordEmailEntryFragment.kt
@@ -20,18 +20,14 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.lifecycle.lifecycleScope
 import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.core.extensions.associateContentStateWith
+import im.vector.app.core.extensions.clearErrorOnChange
 import im.vector.app.core.extensions.content
-import im.vector.app.core.extensions.editText
 import im.vector.app.core.extensions.isEmail
 import im.vector.app.core.extensions.setOnImeDoneListener
 import im.vector.app.databinding.FragmentFtueResetPasswordEmailInputBinding
 import im.vector.app.features.onboarding.OnboardingAction
-import kotlinx.coroutines.flow.launchIn
-import kotlinx.coroutines.flow.onEach
-import reactivecircus.flowbinding.android.widget.textChanges
 
 @AndroidEntryPoint
 class FtueAuthResetPasswordEmailEntryFragment : AbstractFtueAuthFragment<FragmentFtueResetPasswordEmailInputBinding>() {
@@ -46,14 +42,9 @@ class FtueAuthResetPasswordEmailEntryFragment : AbstractFtueAuthFragment<Fragmen
     }
 
     private fun setupViews() {
-        views.emailEntryInput.associateContentStateWith(button = views.emailEntrySubmit)
+        views.emailEntryInput.associateContentStateWith(button = views.emailEntrySubmit, enabledPredicate = { it.isEmail() })
         views.emailEntryInput.setOnImeDoneListener { startPasswordReset() }
-        views.emailEntryInput.editText().textChanges()
-                .onEach {
-                    views.emailEntryInput.error = null
-                    views.emailEntrySubmit.isEnabled = it.isEmail()
-                }
-                .launchIn(viewLifecycleOwner.lifecycleScope)
+        views.emailEntryInput.clearErrorOnChange(viewLifecycleOwner)
         views.emailEntrySubmit.debouncedClicks { startPasswordReset() }
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthResetPasswordEntryFragment.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthResetPasswordEntryFragment.kt
index 493a60a3fc..6282fded61 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthResetPasswordEntryFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthResetPasswordEntryFragment.kt
@@ -21,20 +21,16 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.core.view.isVisible
-import androidx.lifecycle.lifecycleScope
 import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.core.extensions.associateContentStateWith
+import im.vector.app.core.extensions.clearErrorOnChange
 import im.vector.app.core.extensions.content
 import im.vector.app.core.extensions.editText
 import im.vector.app.core.extensions.hidePassword
-import im.vector.app.core.extensions.isEmail
 import im.vector.app.core.extensions.setOnImeDoneListener
 import im.vector.app.databinding.FragmentFtueResetPasswordInputBinding
 import im.vector.app.features.onboarding.OnboardingAction
 import im.vector.app.features.onboarding.OnboardingViewState
-import kotlinx.coroutines.flow.launchIn
-import kotlinx.coroutines.flow.onEach
-import reactivecircus.flowbinding.android.widget.textChanges
 
 @AndroidEntryPoint
 class FtueAuthResetPasswordEntryFragment : AbstractFtueAuthFragment<FragmentFtueResetPasswordInputBinding>() {
@@ -51,9 +47,7 @@ class FtueAuthResetPasswordEntryFragment : AbstractFtueAuthFragment<FragmentFtue
     private fun setupViews() {
         views.newPasswordInput.associateContentStateWith(button = views.newPasswordSubmit)
         views.newPasswordInput.setOnImeDoneListener { resetPassword() }
-        views.newPasswordInput.editText().textChanges()
-                .onEach { views.newPasswordInput.error = null }
-                .launchIn(viewLifecycleOwner.lifecycleScope)
+        views.newPasswordInput.clearErrorOnChange(viewLifecycleOwner)
         views.newPasswordSubmit.debouncedClicks { resetPassword() }
     }
 

From c603b780cf594a29f5a38b19da2834e3753de989 Mon Sep 17 00:00:00 2001
From: Adam Brown <adampsbrown@gmail.com>
Date: Wed, 29 Jun 2022 17:47:28 +0100
Subject: [PATCH 23/24] extracting common breaker background selection to ftue
 extensions

---
 ...email_verification.xml => bg_gradient_ftue_breaker.xml} | 0
 .../ftueauth/FtueAuthResetPasswordBreakerFragment.kt       | 7 +------
 .../onboarding/ftueauth/FtueAuthWaitForEmailFragment.kt    | 7 +------
 .../app/features/onboarding/ftueauth/FtueExtensions.kt     | 7 +++++++
 .../res/layout/fragment_ftue_reset_password_breaker.xml    | 2 +-
 .../layout/fragment_ftue_wait_for_email_verification.xml   | 2 +-
 6 files changed, 11 insertions(+), 14 deletions(-)
 rename library/ui-styles/src/main/res/drawable/{bg_waiting_for_email_verification.xml => bg_gradient_ftue_breaker.xml} (100%)

diff --git a/library/ui-styles/src/main/res/drawable/bg_waiting_for_email_verification.xml b/library/ui-styles/src/main/res/drawable/bg_gradient_ftue_breaker.xml
similarity index 100%
rename from library/ui-styles/src/main/res/drawable/bg_waiting_for_email_verification.xml
rename to library/ui-styles/src/main/res/drawable/bg_gradient_ftue_breaker.xml
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthResetPasswordBreakerFragment.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthResetPasswordBreakerFragment.kt
index 31f934b356..41e24e96c2 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthResetPasswordBreakerFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthResetPasswordBreakerFragment.kt
@@ -54,12 +54,7 @@ class FtueAuthResetPasswordBreakerFragment : AbstractFtueAuthFragment<FragmentFt
     }
 
     private fun setupUi() {
-        views.resetPasswordBreakerGradientContainer.setBackgroundResource(
-                when (themeProvider.isLightTheme()) {
-                    true  -> R.drawable.bg_waiting_for_email_verification
-                    false -> R.drawable.bg_color_background
-                }
-        )
+        views.resetPasswordBreakerGradientContainer.setBackgroundResource(themeProvider.ftueBreakerBackground())
         views.resetPasswordBreakerTitle.text = getString(R.string.ftue_auth_reset_password_breaker_title)
                 .colorTerminatingFullStop(ThemeUtils.getColor(requireContext(), R.attr.colorSecondary))
         views.resetPasswordBreakerSubtitle.text = getString(R.string.ftue_auth_email_verification_subtitle, params.email)
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthWaitForEmailFragment.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthWaitForEmailFragment.kt
index 75090f2a55..4649c7c799 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthWaitForEmailFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthWaitForEmailFragment.kt
@@ -58,12 +58,7 @@ class FtueAuthWaitForEmailFragment @Inject constructor(
     }
 
     private fun setupUi() {
-        views.emailVerificationGradientContainer.setBackgroundResource(
-                when (themeProvider.isLightTheme()) {
-                    true -> R.drawable.bg_waiting_for_email_verification
-                    false -> R.drawable.bg_color_background
-                }
-        )
+        views.emailVerificationGradientContainer.setBackgroundResource(themeProvider.ftueBreakerBackground())
         views.emailVerificationTitle.text = getString(R.string.ftue_auth_email_verification_title)
                 .colorTerminatingFullStop(ThemeUtils.getColor(requireContext(), R.attr.colorSecondary))
         views.emailVerificationSubtitle.text = getString(R.string.ftue_auth_email_verification_subtitle, params.email)
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueExtensions.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueExtensions.kt
index 8d63fbf547..8deb10b7b8 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueExtensions.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueExtensions.kt
@@ -18,9 +18,11 @@ package im.vector.app.features.onboarding.ftueauth
 
 import android.widget.Button
 import com.google.android.material.textfield.TextInputLayout
+import im.vector.app.R
 import im.vector.app.core.extensions.hasContentFlow
 import im.vector.app.features.login.SignMode
 import im.vector.app.features.onboarding.OnboardingAction
+import im.vector.app.features.themes.ThemeProvider
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.onEach
@@ -49,3 +51,8 @@ fun observeContentChangesAndResetErrors(username: TextInputLayout, password: Tex
         submit.isEnabled = it
     }
 }
+
+fun ThemeProvider.ftueBreakerBackground() = when (isLightTheme()) {
+    true  -> R.drawable.bg_gradient_ftue_breaker
+    false -> R.drawable.bg_color_background
+}
diff --git a/vector/src/main/res/layout/fragment_ftue_reset_password_breaker.xml b/vector/src/main/res/layout/fragment_ftue_reset_password_breaker.xml
index e395f67b4a..240a0a9980 100644
--- a/vector/src/main/res/layout/fragment_ftue_reset_password_breaker.xml
+++ b/vector/src/main/res/layout/fragment_ftue_reset_password_breaker.xml
@@ -25,7 +25,7 @@
         android:layout_height="0dp"
         app:layout_constraintHeight_percent="0.60"
         app:layout_constraintTop_toTopOf="parent"
-        tools:background="@drawable/bg_waiting_for_email_verification" />
+        tools:background="@drawable/bg_gradient_ftue_breaker" />
 
     <Space
         android:id="@+id/resetPasswordBreakerSpace1"
diff --git a/vector/src/main/res/layout/fragment_ftue_wait_for_email_verification.xml b/vector/src/main/res/layout/fragment_ftue_wait_for_email_verification.xml
index 15aaf4d1b2..fff7d42720 100644
--- a/vector/src/main/res/layout/fragment_ftue_wait_for_email_verification.xml
+++ b/vector/src/main/res/layout/fragment_ftue_wait_for_email_verification.xml
@@ -25,7 +25,7 @@
         android:layout_height="0dp"
         app:layout_constraintHeight_percent="0.60"
         app:layout_constraintTop_toTopOf="parent"
-        tools:background="@drawable/bg_waiting_for_email_verification" />
+        tools:background="@drawable/bg_gradient_ftue_breaker" />
 
     <Space
         android:id="@+id/emailVerificationSpace1"

From 0d084648a35cd1e879028ee2eaf39344489954ff Mon Sep 17 00:00:00 2001
From: Adam Brown <adampsbrown@gmail.com>
Date: Thu, 30 Jun 2022 10:44:06 +0100
Subject: [PATCH 24/24] showing a toast on password reset confirmation

---
 .../vector/app/features/onboarding/ftueauth/FtueAuthVariant.kt  | 2 ++
 vector/src/main/res/values/donottranslate.xml                   | 1 +
 2 files changed, 3 insertions(+)

diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthVariant.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthVariant.kt
index fbe32d97ed..2880b16156 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthVariant.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthVariant.kt
@@ -20,6 +20,7 @@ import android.content.Intent
 import android.os.Parcelable
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Toast
 import androidx.core.view.ViewCompat
 import androidx.core.view.children
 import androidx.core.view.isVisible
@@ -191,6 +192,7 @@ class FtueAuthVariant(
                 addLoginStageFragmentToBackstack(FtueAuthResetPasswordSuccessFragment::class.java)
             }
             OnboardingViewEvents.OnResetPasswordComplete -> {
+                Toast.makeText(activity, R.string.ftue_auth_password_reset_confirmation, Toast.LENGTH_SHORT).show()
                 activity.popBackstack()
             }
             is OnboardingViewEvents.OnSendEmailSuccess -> {
diff --git a/vector/src/main/res/values/donottranslate.xml b/vector/src/main/res/values/donottranslate.xml
index 943ef39313..dda5edc58f 100755
--- a/vector/src/main/res/values/donottranslate.xml
+++ b/vector/src/main/res/values/donottranslate.xml
@@ -50,6 +50,7 @@
     <string name="ftue_auth_email_verification_footer">Did not receive an email?</string>
     <string name="ftue_auth_email_resend_email">Resend email</string>
     <string name="ftue_auth_forgot_password">Forgot password</string>
+    <string name="ftue_auth_password_reset_confirmation">Password reset</string>
 
     <string name="location_map_view_copyright" translatable="false">© MapTiler © OpenStreetMap contributors</string>
 </resources>