From 380f079ab72c8b2597574d9f141e47c7f67b0373 Mon Sep 17 00:00:00 2001
From: Adam Brown <adampsbrown@gmail.com>
Date: Thu, 9 Dec 2021 16:35:49 +0000
Subject: [PATCH] taking the already have an account feature flag into account
in the ftue auth splash
---
.../vector/app/features/login/LoginSplashFragment.kt | 1 -
.../onboarding/ftueauth/FtueAuthSplashFragment.kt | 12 ++++++++++--
2 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/vector/src/main/java/im/vector/app/features/login/LoginSplashFragment.kt b/vector/src/main/java/im/vector/app/features/login/LoginSplashFragment.kt
index 3430ba28f2..2fab175168 100644
--- a/vector/src/main/java/im/vector/app/features/login/LoginSplashFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/login/LoginSplashFragment.kt
@@ -25,7 +25,6 @@ import androidx.core.view.isVisible
import com.google.android.material.dialog.MaterialAlertDialogBuilder
import im.vector.app.BuildConfig
import im.vector.app.R
-import im.vector.app.core.epoxy.onClick
import im.vector.app.databinding.FragmentLoginSplashBinding
import im.vector.app.features.settings.VectorPreferences
import org.matrix.android.sdk.api.failure.Failure
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthSplashFragment.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthSplashFragment.kt
index 5ef16afbf8..7fa54a1bad 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthSplashFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthSplashFragment.kt
@@ -24,9 +24,11 @@ import android.view.ViewGroup
import androidx.core.view.isVisible
import com.airbnb.mvrx.withState
import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import dagger.hilt.android.AndroidEntryPoint
import im.vector.app.BuildConfig
import im.vector.app.R
import im.vector.app.databinding.FragmentFtueSplashBinding
+import im.vector.app.features.VectorFeatures
import im.vector.app.features.onboarding.OnboardingAction
import im.vector.app.features.onboarding.OnboardingFlow
import im.vector.app.features.settings.VectorPreferences
@@ -37,9 +39,11 @@ import javax.inject.Inject
/**
* In this screen, the user is viewing an introduction to what he can do with this application
*/
+@AndroidEntryPoint
class FtueAuthSplashFragment : AbstractFtueAuthFragment<FragmentFtueSplashBinding>() {
@Inject lateinit var vectorPreferences: VectorPreferences
+ @Inject lateinit var vectorFeatures: VectorFeatures
override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentFtueSplashBinding {
return FragmentFtueSplashBinding.inflate(inflater, container, false)
@@ -52,7 +56,10 @@ class FtueAuthSplashFragment : AbstractFtueAuthFragment<FragmentFtueSplashBindin
private fun setupViews() {
views.loginSplashSubmit.debouncedClicks { getStarted() }
- views.loginSplashAlreadyHaveAccount.debouncedClicks { alreadyHaveAnAccount() }
+ views.loginSplashAlreadyHaveAccount.apply {
+ isVisible = vectorFeatures.isAlreadyHaveAccountSplashEnabled()
+ debouncedClicks { alreadyHaveAnAccount() }
+ }
if (BuildConfig.DEBUG || vectorPreferences.developerMode()) {
views.loginSplashVersion.isVisible = true
@@ -65,7 +72,8 @@ class FtueAuthSplashFragment : AbstractFtueAuthFragment<FragmentFtueSplashBindin
}
private fun getStarted() {
- viewModel.handle(OnboardingAction.OnGetStarted(resetLoginConfig = false, onboardingFlow = OnboardingFlow.SignUp))
+ val getStartedFlow = if (vectorFeatures.isAlreadyHaveAccountSplashEnabled()) OnboardingFlow.SignUp else OnboardingFlow.SignInSignUp
+ viewModel.handle(OnboardingAction.OnGetStarted(resetLoginConfig = false, onboardingFlow = getStartedFlow))
}
private fun alreadyHaveAnAccount() {