filippodb/SchildiChat-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

updating splash submit copy to use Create account when the I already have an account feature is enabled

Browse Source
This commit is contained in:
Adam Brown 2022-01-19 09:49:17 +00:00
parent 8f98f3e6d0
commit 211f184066
6 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vector/src/androidTest/java/im/vector/app/ui/robot/OnboardingRobot.kt
View File

@ -63,7 +63,7 @@ class OnboardingRobot {
password: String, password: String,
homeServerUrl: String) { homeServerUrl: String) {
waitUntilViewVisible(withId(R.id.loginSplashSubmit)) waitUntilViewVisible(withId(R.id.loginSplashSubmit))
assertDisplayed(R.id.loginSplashSubmit, R.string.login_splash_submit) assertDisplayed(R.id.loginSplashSubmit, R.string.login_splash_create_account)
if (createAccount) { if (createAccount) {
clickOn(R.id.loginSplashSubmit) clickOn(R.id.loginSplashSubmit)
} else { } else {

12
vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthSplashCarouselFragment.kt
View File

@ -68,9 +68,13 @@ class FtueAuthSplashCarouselFragment @Inject constructor(
TabLayoutMediator(views.carouselIndicator, views.splashCarousel) { _, _ -> }.attach() TabLayoutMediator(views.carouselIndicator, views.splashCarousel) { _, _ -> }.attach()
carouselController.setData(carouselStateFactory.create()) carouselController.setData(carouselStateFactory.create())
views.loginSplashSubmit.debouncedClicks { getStarted() } val isAlreadyHaveAccountEnabled = vectorFeatures.isOnboardingAlreadyHaveAccountSplashEnabled()
views.loginSplashSubmit.apply {
setText(if (isAlreadyHaveAccountEnabled) R.string.login_splash_create_account else R.string.login_splash_submit)
debouncedClicks { splashSubmit(isAlreadyHaveAccountEnabled) }
}
views.loginSplashAlreadyHaveAccount.apply { views.loginSplashAlreadyHaveAccount.apply {
isVisible = vectorFeatures.isOnboardingAlreadyHaveAccountSplashEnabled() isVisible = isAlreadyHaveAccountEnabled
debouncedClicks { alreadyHaveAnAccount() } debouncedClicks { alreadyHaveAnAccount() }
} }
@ -111,8 +115,8 @@ class FtueAuthSplashCarouselFragment @Inject constructor(
} }
} }
private fun getStarted() { private fun splashSubmit(isAlreadyHaveAccountEnabled: Boolean) {
val getStartedFlow = if (vectorFeatures.isOnboardingAlreadyHaveAccountSplashEnabled()) OnboardingFlow.SignUp else OnboardingFlow.SignInSignUp val getStartedFlow = if (isAlreadyHaveAccountEnabled) OnboardingFlow.SignUp else OnboardingFlow.SignInSignUp
viewModel.handle(OnboardingAction.OnGetStarted(resetLoginConfig = false, onboardingFlow = getStartedFlow)) viewModel.handle(OnboardingAction.OnGetStarted(resetLoginConfig = false, onboardingFlow = getStartedFlow))
} }

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

@ -53,7 +53,11 @@ class FtueAuthSplashFragment @Inject constructor(
} }
private fun setupViews() { private fun setupViews() {
views.loginSplashSubmit.debouncedClicks { getStarted() } val isAlreadyHaveAccountEnabled = vectorFeatures.isOnboardingAlreadyHaveAccountSplashEnabled()
views.loginSplashSubmit.apply {
setText(if (isAlreadyHaveAccountEnabled) R.string.login_splash_create_account else R.string.login_splash_submit)
debouncedClicks { splashSubmit(isAlreadyHaveAccountEnabled) }
}
views.loginSplashAlreadyHaveAccount.apply { views.loginSplashAlreadyHaveAccount.apply {
isVisible = vectorFeatures.isOnboardingAlreadyHaveAccountSplashEnabled() isVisible = vectorFeatures.isOnboardingAlreadyHaveAccountSplashEnabled()
debouncedClicks { alreadyHaveAnAccount() } debouncedClicks { alreadyHaveAnAccount() }
@ -69,8 +73,8 @@ class FtueAuthSplashFragment @Inject constructor(
} }
} }
private fun getStarted() { private fun splashSubmit(isAlreadyHaveAccountEnabled: Boolean) {
val getStartedFlow = if (vectorFeatures.isOnboardingAlreadyHaveAccountSplashEnabled()) OnboardingFlow.SignUp else OnboardingFlow.SignInSignUp val getStartedFlow = if (isAlreadyHaveAccountEnabled) OnboardingFlow.SignUp else OnboardingFlow.SignInSignUp
viewModel.handle(OnboardingAction.OnGetStarted(resetLoginConfig = false, onboardingFlow = getStartedFlow)) viewModel.handle(OnboardingAction.OnGetStarted(resetLoginConfig = false, onboardingFlow = getStartedFlow))
} }

1
vector/src/main/res/layout/fragment_ftue_auth_splash.xml
View File

@ -182,7 +182,6 @@
style="@style/Widget.Vector.Button.Login" style="@style/Widget.Vector.Button.Login"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/login_splash_submit"
android:textAllCaps="true" android:textAllCaps="true"
android:transitionName="loginSubmitTransition" android:transitionName="loginSubmitTransition"
app:layout_constraintBottom_toTopOf="@id/loginSplashSpace5" app:layout_constraintBottom_toTopOf="@id/loginSplashSpace5"

1
vector/src/main/res/layout/fragment_ftue_splash_carousel.xml
View File

@ -61,7 +61,6 @@
style="@style/Widget.Vector.Button.Login" style="@style/Widget.Vector.Button.Login"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/login_splash_submit"
android:textAllCaps="true" android:textAllCaps="true"
android:transitionName="loginSubmitTransition" android:transitionName="loginSubmitTransition"
app:layout_constraintBottom_toTopOf="@id/loginSplashAlreadyHaveAccount" app:layout_constraintBottom_toTopOf="@id/loginSplashAlreadyHaveAccount"

1
vector/src/main/res/values/strings.xml
View File

@ -2545,6 +2545,7 @@
<string name="login_splash_text2">Keep conversations private with encryption</string> <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_text3">Extend &amp; customise your experience</string>
<string name="login_splash_submit">Get started</string> <string name="login_splash_submit">Get started</string>
<string name="login_splash_create_account">Create account</string>
<string name="login_splash_already_have_account">I already have an account</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_title">Select a server</string>