From 4cd7c60032d47d1184daac54099adffb661cf120 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jorge=20Mart=C3=ADn?= <jorgem@element.io>
Date: Tue, 30 Jan 2024 12:20:56 +0100
Subject: [PATCH] Make 'sign in' flow more important in the initial screen

---
 changelog.d/+update-login-splash-screen.bugfix     |  1 +
 library/ui-strings/src/main/res/values/strings.xml |  1 +
 .../res/layout/fragment_ftue_splash_carousel.xml   | 14 +++++++-------
 3 files changed, 9 insertions(+), 7 deletions(-)
 create mode 100644 changelog.d/+update-login-splash-screen.bugfix

diff --git a/changelog.d/+update-login-splash-screen.bugfix b/changelog.d/+update-login-splash-screen.bugfix
new file mode 100644
index 0000000000..1ea90a7eab
--- /dev/null
+++ b/changelog.d/+update-login-splash-screen.bugfix
@@ -0,0 +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'.
diff --git a/library/ui-strings/src/main/res/values/strings.xml b/library/ui-strings/src/main/res/values/strings.xml
index 9f842a5741..577101b0d3 100644
--- a/library/ui-strings/src/main/res/values/strings.xml
+++ b/library/ui-strings/src/main/res/values/strings.xml
@@ -2095,6 +2095,7 @@
     <string name="login_splash_text2">Keep conversations private with encryption</string>
     <string name="login_splash_text3">Extend &amp; customize your experience</string>
     <string name="login_splash_submit">Get started</string>
+    <string name="login_splash_sign_in">Sign In</string>
     <string name="login_splash_create_account">Create account</string>
     <string name="login_splash_already_have_account">I already have an account</string>
 
diff --git a/vector/src/main/res/layout/fragment_ftue_splash_carousel.xml b/vector/src/main/res/layout/fragment_ftue_splash_carousel.xml
index c6b27f5d09..bb44af1221 100644
--- a/vector/src/main/res/layout/fragment_ftue_splash_carousel.xml
+++ b/vector/src/main/res/layout/fragment_ftue_splash_carousel.xml
@@ -57,30 +57,30 @@
         app:layout_constraintTop_toBottomOf="@id/carouselIndicator" />
 
     <Button
-        android:id="@+id/loginSplashSubmit"
+        android:id="@+id/loginSplashAlreadyHaveAccount"
         style="@style/Widget.Vector.Button.Login"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
+        android:text="@string/login_splash_sign_in"
         android:textAllCaps="true"
         android:transitionName="loginSubmitTransition"
-        app:layout_constraintBottom_toTopOf="@id/loginSplashAlreadyHaveAccount"
+        app:layout_constraintBottom_toTopOf="@id/loginSplashSubmit"
         app:layout_constraintEnd_toEndOf="@id/splashCarouselGutterEnd"
         app:layout_constraintStart_toStartOf="@id/splashCarouselGutterStart"
-        app:layout_constraintTop_toBottomOf="@id/loginSplashButtonsSpace"
-        tools:text="@string/login_splash_create_account" />
+        app:layout_constraintTop_toBottomOf="@id/loginSplashButtonsSpace" />
 
     <Button
-        android:id="@+id/loginSplashAlreadyHaveAccount"
+        android:id="@+id/loginSplashSubmit"
         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/loginSplashBottomSpace"
         app:layout_constraintEnd_toEndOf="@id/splashCarouselGutterEnd"
         app:layout_constraintStart_toStartOf="@id/splashCarouselGutterStart"
-        app:layout_constraintTop_toBottomOf="@id/loginSplashSubmit" />
+        app:layout_constraintTop_toBottomOf="@id/loginSplashAlreadyHaveAccount"
+        tools:text="@string/login_splash_create_account" />
 
     <Space
         android:id="@+id/loginSplashBottomSpace"