From 0d9ff4bde3442f391dbaacdab7a884bfe2879e09 Mon Sep 17 00:00:00 2001
From: Onuray Sahin <onurays@matrix.org>
Date: Fri, 10 Jul 2020 12:04:48 +0300
Subject: [PATCH] Add branch name to login splash screen.

---
 .../main/res/layout/fragment_login_splash.xml | 27 ++++++++++++++-----
 vector/src/main/res/values/strings.xml        |  2 ++
 2 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/vector/src/main/res/layout/fragment_login_splash.xml b/vector/src/main/res/layout/fragment_login_splash.xml
index 25484a64bb..f6d4e9636b 100644
--- a/vector/src/main/res/layout/fragment_login_splash.xml
+++ b/vector/src/main/res/layout/fragment_login_splash.xml
@@ -20,28 +20,43 @@
 
             <ImageView
                 android:id="@+id/loginSplashLogo"
-                android:layout_width="80dp"
-                android:layout_height="80dp"
+                android:layout_width="64dp"
+                android:layout_height="64dp"
                 android:src="@drawable/element_logo_green"
                 android:transitionName="loginLogoTransition"
-                app:layout_constraintBottom_toTopOf="@+id/loginSplashTitle"
+                app:layout_constraintBottom_toTopOf="@+id/brandTextView"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintVertical_chainStyle="packed" />
 
+            <TextView
+                android:id="@+id/brandTextView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                app:layout_constraintTop_toBottomOf="@id/loginSplashLogo"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                android:textStyle="bold"
+                android:textSize="40sp"
+                android:layout_marginTop="8dp"
+                android:gravity="center"
+                android:textColor="?colorAccent"
+                android:text="@string/element_login_splash_brand"/>
+
             <TextView
                 android:id="@+id/loginSplashTitle"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="120dp"
+                android:layout_marginTop="16dp"
                 android:text="@string/login_splash_title"
                 android:textAppearance="@style/TextAppearance.Vector.Login.Title"
+                android:gravity="center"
                 android:transitionName="loginTitleTransition"
                 app:layout_constraintBottom_toTopOf="@+id/loginSplashText1"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/loginSplashLogo" />
+                app:layout_constraintTop_toBottomOf="@+id/brandTextView" />
 
             <!-- TODO check relative dimension -->
             <ImageView
@@ -60,7 +75,7 @@
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="36dp"
-                android:layout_marginTop="32dp"
+                android:layout_marginTop="96dp"
                 android:gravity="start"
                 android:text="@string/login_splash_text1"
                 android:textAppearance="@style/TextAppearance.Vector.Login.Text"
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index 009b54b80b..14fc635869 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -2531,5 +2531,7 @@ Not all features in Riot are implemented in RiotX yet. Main missing (and coming
     <string name="element_disclaimer_content">We’re excited to announce we’ve changed name! Your app is up to date and you’re signed in to your account.</string>
     <string name="element_disclaimer_negative_button">GOT IT</string>
     <string name="element_disclaimer_positive_button">LEARN MORE</string>
+    
+    <string name="element_login_splash_brand">element</string>
 
 </resources>
\ No newline at end of file