From 8b5b7db24159676e5b3207e203fbfa1204364333 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoitm@matrix.org>
Date: Mon, 13 Jul 2020 17:21:33 +0200
Subject: [PATCH] Fix icons alignment issue

---
 .../main/res/layout/fragment_login_splash.xml | 32 ++++++++-----------
 1 file changed, 14 insertions(+), 18 deletions(-)

diff --git a/vector/src/main/res/layout/fragment_login_splash.xml b/vector/src/main/res/layout/fragment_login_splash.xml
index a57f3c487c..2a43ece5ec 100644
--- a/vector/src/main/res/layout/fragment_login_splash.xml
+++ b/vector/src/main/res/layout/fragment_login_splash.xml
@@ -34,31 +34,30 @@
                 android:id="@+id/logoType"
                 android:layout_width="wrap_content"
                 android:layout_height="44dp"
-                app:layout_constraintTop_toBottomOf="@id/loginSplashLogo"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
+                android:layout_marginTop="8dp"
                 android:src="@drawable/element_logotype"
                 android:tint="?colorAccent"
-                android:layout_marginTop="8dp"/>
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/loginSplashLogo" />
 
             <TextView
                 android:id="@+id/loginSplashTitle"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="32dp"
+                android:gravity="center"
                 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/logoType" />
 
-            <!-- TODO check relative dimension -->
             <ImageView
                 android:id="@+id/loginSplashPicto1"
-                android:layout_width="wrap_content"
+                android:layout_width="32dp"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="2dp"
                 android:importantForAccessibility="no"
@@ -71,63 +70,60 @@
                 android:id="@+id/loginSplashText1"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="36dp"
+                android:layout_marginStart="8dp"
                 android:layout_marginTop="96dp"
                 android:gravity="start"
                 android:text="@string/login_splash_text1"
                 android:textAppearance="@style/TextAppearance.Vector.Login.Text"
                 app:layout_constraintBottom_toTopOf="@+id/loginSplashText2"
                 app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintStart_toEndOf="@id/loginSplashPicto1"
                 app:layout_constraintTop_toBottomOf="@+id/loginSplashTitle" />
 
             <ImageView
                 android:id="@+id/loginSplashPicto2"
-                android:layout_width="wrap_content"
+                android:layout_width="32dp"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="2dp"
                 android:importantForAccessibility="no"
                 android:src="@drawable/ic_login_splash_lock"
                 android:tint="?riotx_text_secondary"
-                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintStart_toStartOf="@id/loginSplashPicto1"
                 app:layout_constraintTop_toTopOf="@+id/loginSplashText2" />
 
             <TextView
                 android:id="@+id/loginSplashText2"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="36dp"
                 android:layout_marginTop="16dp"
                 android:gravity="start"
                 android:text="@string/login_splash_text2"
                 android:textAppearance="@style/TextAppearance.Vector.Login.Text"
                 app:layout_constraintBottom_toTopOf="@id/loginSplashText3"
                 app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintStart_toStartOf="@id/loginSplashText1"
                 app:layout_constraintTop_toBottomOf="@+id/loginSplashText1" />
 
             <ImageView
                 android:id="@+id/loginSplashPicto3"
-                android:layout_width="wrap_content"
+                android:layout_width="32dp"
                 android:layout_height="wrap_content"
                 android:importantForAccessibility="no"
                 android:src="@drawable/ic_login_splash_sliders"
                 android:tint="?riotx_text_secondary"
-                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintStart_toStartOf="@+id/loginSplashPicto1"
                 app:layout_constraintTop_toTopOf="@+id/loginSplashText3" />
 
             <TextView
                 android:id="@+id/loginSplashText3"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="36dp"
                 android:layout_marginTop="16dp"
                 android:gravity="start"
                 android:text="@string/login_splash_text3"
                 android:textAppearance="@style/TextAppearance.Vector.Login.Text"
                 app:layout_constraintBottom_toTopOf="@+id/loginSplashSubmit"
                 app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintStart_toStartOf="@+id/loginSplashText1"
                 app:layout_constraintTop_toBottomOf="@+id/loginSplashText2" />
 
             <com.google.android.material.button.MaterialButton