Skip to content

Commit d75ca51

Browse files
authored
Merge pull request #8741 from element-hq/fix/jme/update-login-splash-screen
Make 'sign in' flow more important in the initial screen
2 parents 1277f6f + 4cd7c60 commit d75ca51

File tree

3 files changed

+9
-7
lines changed

3 files changed

+9
-7
lines changed
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Switch the position and styles of the 'already have an account' and 'create account' buttons in the login splash screen. Also changes the 'already have an account one' to just say 'sign in'.

library/ui-strings/src/main/res/values/strings.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2095,6 +2095,7 @@
20952095
<string name="login_splash_text2">Keep conversations private with encryption</string>
20962096
<string name="login_splash_text3">Extend &amp; customize your experience</string>
20972097
<string name="login_splash_submit">Get started</string>
2098+
<string name="login_splash_sign_in">Sign In</string>
20982099
<string name="login_splash_create_account">Create account</string>
20992100
<string name="login_splash_already_have_account">I already have an account</string>
21002101

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -57,30 +57,30 @@
5757
app:layout_constraintTop_toBottomOf="@id/carouselIndicator" />
5858

5959
<Button
60-
android:id="@+id/loginSplashSubmit"
60+
android:id="@+id/loginSplashAlreadyHaveAccount"
6161
style="@style/Widget.Vector.Button.Login"
6262
android:layout_width="0dp"
6363
android:layout_height="wrap_content"
64+
android:text="@string/login_splash_sign_in"
6465
android:textAllCaps="true"
6566
android:transitionName="loginSubmitTransition"
66-
app:layout_constraintBottom_toTopOf="@id/loginSplashAlreadyHaveAccount"
67+
app:layout_constraintBottom_toTopOf="@id/loginSplashSubmit"
6768
app:layout_constraintEnd_toEndOf="@id/splashCarouselGutterEnd"
6869
app:layout_constraintStart_toStartOf="@id/splashCarouselGutterStart"
69-
app:layout_constraintTop_toBottomOf="@id/loginSplashButtonsSpace"
70-
tools:text="@string/login_splash_create_account" />
70+
app:layout_constraintTop_toBottomOf="@id/loginSplashButtonsSpace" />
7171

7272
<Button
73-
android:id="@+id/loginSplashAlreadyHaveAccount"
73+
android:id="@+id/loginSplashSubmit"
7474
style="@style/Widget.Vector.Button.Text.Login"
7575
android:layout_width="0dp"
7676
android:layout_height="wrap_content"
77-
android:text="@string/login_splash_already_have_account"
7877
android:textAllCaps="true"
7978
android:transitionName="loginSubmitTransition"
8079
app:layout_constraintBottom_toTopOf="@id/loginSplashBottomSpace"
8180
app:layout_constraintEnd_toEndOf="@id/splashCarouselGutterEnd"
8281
app:layout_constraintStart_toStartOf="@id/splashCarouselGutterStart"
83-
app:layout_constraintTop_toBottomOf="@id/loginSplashSubmit" />
82+
app:layout_constraintTop_toBottomOf="@id/loginSplashAlreadyHaveAccount"
83+
tools:text="@string/login_splash_create_account" />
8484

8585
<Space
8686
android:id="@+id/loginSplashBottomSpace"

0 commit comments

Comments
 (0)