adding I already have an account functionality to the ftue auth splash

vector/src/main/java/im/vector/app/features/onboarding/OnboardingAction.kt

@@ -26,7 +26,8 @@ import org.matrix.android.sdk.api.auth.registration.RegisterThreePid
 import org.matrix.android.sdk.internal.network.ssl.Fingerprint
 
 sealed class OnboardingAction : VectorViewModelAction {
-    data class OnGetStarted(val resetLoginConfig: Boolean) : OnboardingAction()
+    data class OnGetStarted(val resetLoginConfig: Boolean, val onboardingFlow: OnboardingFlow) : OnboardingAction()
+    data class OnIAlreadyHaveAnAccount(val resetLoginConfig: Boolean, val onboardingFlow: OnboardingFlow) : OnboardingAction()
 
     data class UpdateServerType(val serverType: ServerType) : OnboardingAction()
     data class UpdateHomeServer(val homeServerUrl: String) : OnboardingAction()

vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewModel.kt

@@ -121,7 +121,8 @@ class OnboardingViewModel @AssistedInject constructor(
 
     override fun handle(action: OnboardingAction) {
         when (action) {
-            is OnboardingAction.OnGetStarted               -> handleOnGetStarted(action)
+            is OnboardingAction.OnGetStarted               -> handleSplashAction(action.resetLoginConfig, action.onboardingFlow)
+            is OnboardingAction.OnIAlreadyHaveAnAccount    -> handleSplashAction(action.resetLoginConfig, action.onboardingFlow)
             is OnboardingAction.UpdateServerType           -> handleUpdateServerType(action)
             is OnboardingAction.UpdateSignMode             -> handleUpdateSignMode(action)
             is OnboardingAction.InitWith                   -> handleInitWith(action)
@@ -140,10 +141,11 @@ class OnboardingViewModel @AssistedInject constructor(
         }.exhaustive
     }
 
-    private fun handleOnGetStarted(action: OnboardingAction.OnGetStarted) {
-        if (action.resetLoginConfig) {
+    private fun handleSplashAction(resetConfig: Boolean, onboardingFlow: OnboardingFlow) {
+        if (resetConfig) {
             loginConfig = null
         }
+        setState { copy(onboardingFlow = onboardingFlow) }
 
         val configUrl = loginConfig?.homeServerUrl?.takeIf { it.isNotEmpty() }
         if (configUrl != null) {
@@ -822,7 +824,17 @@ class OnboardingViewModel @AssistedInject constructor(
                 // Notify the UI
                 _viewEvents.post(OnboardingViewEvents.OutdatedHomeserver)
             }
-            _viewEvents.post(OnboardingViewEvents.OnLoginFlowRetrieved)
+
+            withState {
+                when (it.onboardingFlow) {
+                    OnboardingFlow.SignIn -> handleUpdateSignMode(OnboardingAction.UpdateSignMode(SignMode.SignIn))
+                    OnboardingFlow.SignUp -> handleUpdateSignMode(OnboardingAction.UpdateSignMode(SignMode.SignUp))
+                    OnboardingFlow.SignInSignUp,
+                    null                  -> {
+                        _viewEvents.post(OnboardingViewEvents.OnLoginFlowRetrieved)
+                    }
+                }
+            }
         }
     }
 

vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewState.kt

@@ -33,6 +33,9 @@ data class OnboardingViewState(
         val asyncResetMailConfirmed: Async<Unit> = Uninitialized,
         val asyncRegistration: Async<Unit> = Uninitialized,
 
+        @PersistState
+        val onboardingFlow: OnboardingFlow? = null,
+
         // User choices
         @PersistState
         val serverType: ServerType = ServerType.Unknown,
@@ -74,3 +77,9 @@ data class OnboardingViewState(
         return asyncLoginAction is Success
     }
 }
+
+enum class OnboardingFlow {
+    SignIn,
+    SignUp,
+    SignInSignUp
+}

vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthSplashFragment.kt

@@ -22,11 +22,13 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.core.view.isVisible
+import com.airbnb.mvrx.withState
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import im.vector.app.BuildConfig
 import im.vector.app.R
-import im.vector.app.databinding.FragmentLoginSplashBinding
+import im.vector.app.databinding.FragmentFtueSplashBinding
 import im.vector.app.features.onboarding.OnboardingAction
+import im.vector.app.features.onboarding.OnboardingFlow
 import im.vector.app.features.settings.VectorPreferences
 import org.matrix.android.sdk.api.failure.Failure
 import java.net.UnknownHostException
@@ -35,22 +37,22 @@ import javax.inject.Inject
 /**
  * In this screen, the user is viewing an introduction to what he can do with this application
  */
-class FtueAuthSplashFragment @Inject constructor(
-        private val vectorPreferences: VectorPreferences
-) : AbstractFtueAuthFragment<FragmentLoginSplashBinding>() {
+class FtueAuthSplashFragment : AbstractFtueAuthFragment<FragmentFtueSplashBinding>() {
 
-    override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentLoginSplashBinding {
-        return FragmentLoginSplashBinding.inflate(inflater, container, false)
+    @Inject lateinit var vectorPreferences: VectorPreferences
+
+    override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentFtueSplashBinding {
+        return FragmentFtueSplashBinding.inflate(inflater, container, false)
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-
         setupViews()
     }
 
     private fun setupViews() {
         views.loginSplashSubmit.debouncedClicks { getStarted() }
+        views.loginSplashAlreadyHaveAccount.debouncedClicks { alreadyHaveAnAccount() }
 
         if (BuildConfig.DEBUG || vectorPreferences.developerMode()) {
             views.loginSplashVersion.isVisible = true
@@ -58,11 +60,16 @@ class FtueAuthSplashFragment @Inject constructor(
             views.loginSplashVersion.text = "Version : ${BuildConfig.VERSION_NAME}\n" +
                     "Branch: ${BuildConfig.GIT_BRANCH_NAME}\n" +
                     "Build: ${BuildConfig.BUILD_NUMBER}"
+            views.loginSplashVersion.debouncedClicks { navigator.openDebug(requireContext()) }
         }
     }
 
     private fun getStarted() {
-        viewModel.handle(OnboardingAction.OnGetStarted(resetLoginConfig = false))
+        viewModel.handle(OnboardingAction.OnGetStarted(resetLoginConfig = false, onboardingFlow = OnboardingFlow.SignUp))
+    }
+
+    private fun alreadyHaveAnAccount() {
+        viewModel.handle(OnboardingAction.OnIAlreadyHaveAnAccount(resetLoginConfig = false, onboardingFlow = OnboardingFlow.SignIn))
     }
 
     override fun resetViewModel() {
@@ -78,7 +85,8 @@ class FtueAuthSplashFragment @Inject constructor(
                     .setTitle(R.string.dialog_title_error)
                     .setMessage(getString(R.string.login_error_homeserver_from_url_not_found, url))
                     .setPositiveButton(R.string.login_error_homeserver_from_url_not_found_enter_manual) { _, _ ->
-                        viewModel.handle(OnboardingAction.OnGetStarted(resetLoginConfig = true))
+                        val flow = withState(viewModel) { it.onboardingFlow } ?: OnboardingFlow.SignInSignUp
+                        viewModel.handle(OnboardingAction.OnGetStarted(resetLoginConfig = true, flow))
                     }
                     .setNegativeButton(R.string.action_cancel, null)
                     .show()

vector/src/main/res/layout/fragment_ftue_auth_splash.xml

@@ -0,0 +1,212 @@
+<?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"
+    android:background="?android:colorBackground"
+    android:paddingStart="36dp"
+    android:paddingTop="@dimen/layout_vertical_margin"
+    android:paddingEnd="36dp"
+    android:paddingBottom="@dimen/layout_vertical_margin">
+
+    <!-- Strategy: 5 Spaces are used to spread the remaining space, using weight -->
+
+    <Space
+        android:id="@+id/loginSplashSpace1"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        app:layout_constraintBottom_toTopOf="@id/loginSplashLogoContainer"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_chainStyle="spread_inside"
+        app:layout_constraintVertical_weight="4" />
+
+    <LinearLayout
+        android:id="@+id/loginSplashLogoContainer"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:gravity="center_horizontal"
+        android:orientation="vertical"
+        app:layout_constraintBottom_toTopOf="@id/loginSplashSpace2"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/loginSplashSpace1">
+
+        <ImageView
+            android:id="@+id/loginSplashLogo"
+            android:layout_width="64dp"
+            android:layout_height="64dp"
+            android:importantForAccessibility="no"
+            android:src="@drawable/element_logo_green"
+            android:transitionName="loginLogoTransition" />
+
+        <ImageView
+            android:id="@+id/logoType"
+            android:layout_width="wrap_content"
+            android:layout_height="44dp"
+            android:layout_marginTop="8dp"
+            android:contentDescription="@string/app_name"
+            android:src="@drawable/element_logotype"
+            app:tint="?colorSecondary"
+            tools:ignore="MissingPrefix" />
+
+    </LinearLayout>
+
+    <Space
+        android:id="@+id/loginSplashSpace2"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        app:layout_constraintBottom_toTopOf="@id/loginSplashTitle"
+        app:layout_constraintTop_toBottomOf="@id/loginSplashLogoContainer"
+        app:layout_constraintVertical_weight="1" />
+
+    <TextView
+        android:id="@+id/loginSplashTitle"
+        style="@style/Widget.Vector.TextView.Title"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:text="@string/login_splash_title"
+        android:textColor="?vctr_content_primary"
+        android:transitionName="loginTitleTransition"
+        app:layout_constraintBottom_toTopOf="@id/loginSplashSpace3"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/loginSplashSpace2" />
+
+    <Space
+        android:id="@+id/loginSplashSpace3"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        app:layout_constraintBottom_toTopOf="@id/loginSplashContent"
+        app:layout_constraintTop_toBottomOf="@id/loginSplashTitle"
+        app:layout_constraintVertical_weight="2" />
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/loginSplashContent"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        app:layout_constraintBottom_toTopOf="@id/loginSplashSpace4"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/loginSplashSpace3">
+
+        <ImageView
+            android:id="@+id/loginSplashPicto1"
+            android:layout_width="32dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="2dp"
+            android:importantForAccessibility="no"
+            android:src="@drawable/ic_login_splash_message_circle"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="@id/loginSplashText1"
+            app:tint="?vctr_content_secondary"
+            tools:ignore="MissingPrefix" />
+
+        <TextView
+            android:id="@+id/loginSplashText1"
+            style="@style/Widget.Vector.TextView.Body"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="8dp"
+            android:gravity="start"
+            android:text="@string/login_splash_text1"
+            android:textColor="?vctr_content_secondary"
+            app:layout_constraintBottom_toTopOf="@id/loginSplashText2"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@id/loginSplashPicto1"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <ImageView
+            android:id="@+id/loginSplashPicto2"
+            android:layout_width="32dp"
+            android:layout_height="wrap_content"
+            android:importantForAccessibility="no"
+            android:src="@drawable/ic_login_splash_lock"
+            app:layout_constraintStart_toStartOf="@id/loginSplashPicto1"
+            app:layout_constraintTop_toTopOf="@id/loginSplashText2"
+            app:tint="?vctr_content_secondary"
+            tools:ignore="MissingPrefix" />
+
+        <TextView
+            android:id="@+id/loginSplashText2"
+            style="@style/Widget.Vector.TextView.Body"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
+            android:gravity="start"
+            android:text="@string/login_splash_text2"
+            android:textColor="?vctr_content_secondary"
+            app:layout_constraintBottom_toTopOf="@id/loginSplashText3"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="@id/loginSplashText1"
+            app:layout_constraintTop_toBottomOf="@id/loginSplashText1" />
+
+        <ImageView
+            android:id="@+id/loginSplashPicto3"
+            android:layout_width="32dp"
+            android:layout_height="wrap_content"
+            android:importantForAccessibility="no"
+            android:src="@drawable/ic_login_splash_sliders"
+            app:layout_constraintStart_toStartOf="@id/loginSplashPicto1"
+            app:layout_constraintTop_toTopOf="@id/loginSplashText3"
+            app:tint="?vctr_content_secondary"
+            tools:ignore="MissingPrefix" />
+
+        <TextView
+            android:id="@+id/loginSplashText3"
+            style="@style/Widget.Vector.TextView.Body"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
+            android:gravity="start"
+            android:text="@string/login_splash_text3"
+            android:textColor="?vctr_content_secondary"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="@id/loginSplashText1"
+            app:layout_constraintTop_toBottomOf="@id/loginSplashText2" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+    <Space
+        android:id="@+id/loginSplashSpace4"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        app:layout_constraintBottom_toTopOf="@id/loginSplashSubmit"
+        app:layout_constraintTop_toBottomOf="@id/loginSplashContent"
+        app:layout_constraintVertical_weight="2" />
+
+    <Button
+        android:id="@+id/loginSplashSubmit"
+        style="@style/Widget.Vector.Button.Login"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:text="@string/login_splash_submit"
+        android:transitionName="loginSubmitTransition"
+        app:layout_constraintBottom_toTopOf="@id/loginSplashSpace5"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/loginSplashSpace4" />
+
+    <Space
+        android:id="@+id/loginSplashSpace5"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/loginSplashSubmit"
+        app:layout_constraintVertical_weight="4" />
+
+    <TextView
+        android:id="@+id/loginSplashVersion"
+        style="@style/Widget.Vector.TextView.Caption"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textColor="?vctr_content_secondary"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        tools:text="@string/settings_version"
+        tools:visibility="visible" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>

vector/src/main/res/layout/fragment_ftue_splash.xml

@@ -183,12 +183,26 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:text="@string/login_splash_submit"
+        android:textAllCaps="true"
         android:transitionName="loginSubmitTransition"
         app:layout_constraintBottom_toTopOf="@id/loginSplashSpace5"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/loginSplashSpace4" />
 
+    <TextView
+        android:id="@+id/loginSplashAlreadyHaveAccount"
+        style="@style/Widget.Vector.Button.Text.Login"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:text="@string/login_splash_already_have_account"
+        android:textAllCaps="true"
+        android:transitionName="loginSubmitTransition"
+        app:layout_constraintBottom_toTopOf="@id/loginSplashSpace5"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/loginSplashSubmit" />
+
     <Space
         android:id="@+id/loginSplashSpace5"
         android:layout_width="match_parent"

vector/src/main/res/values/strings.xml

@@ -2521,6 +2521,7 @@
     <string name="login_splash_text2">Keep conversations private with encryption</string>
     <string name="login_splash_text3">Extend &amp; customise your experience</string>
     <string name="login_splash_submit">Get started</string>
+    <string name="login_splash_already_have_account">I already have an account</string>
 
     <string name="login_server_title">Select a server</string>
     <string name="login_server_text">Just like email, accounts have one home, although you can talk to anyone</string>