From c8c4e10822c3738a34dc1332c1bb312b8681725a Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 14 Dec 2020 15:46:31 +0100
Subject: [PATCH] Cleanup layout

---
 vector/src/main/res/layout/fragment_login.xml |  6 ++--
 ...fragment_login_signup_signin_selection.xml | 28 +++++++++----------
 2 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/vector/src/main/res/layout/fragment_login.xml b/vector/src/main/res/layout/fragment_login.xml
index 2559e6d177..da41878365 100644
--- a/vector/src/main/res/layout/fragment_login.xml
+++ b/vector/src/main/res/layout/fragment_login.xml
@@ -144,8 +144,6 @@
                 android:gravity="center"
                 android:orientation="vertical"
                 android:padding="8dp"
-                android:clipToPadding="false"
-                android:clipChildren="false"
                 android:visibility="gone"
                 tools:visibility="visible">
 
@@ -160,10 +158,10 @@
                     android:textSize="14sp" />
 
                 <im.vector.app.features.login.SocialLoginButtonsView
-                    app:signMode="signin"
                     android:id="@+id/loginSocialLoginButtons"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content" />
+                    android:layout_height="wrap_content"
+                    tools:signMode="signin" />
 
             </LinearLayout>
 
diff --git a/vector/src/main/res/layout/fragment_login_signup_signin_selection.xml b/vector/src/main/res/layout/fragment_login_signup_signin_selection.xml
index 2505802ab8..097e5c1f52 100644
--- a/vector/src/main/res/layout/fragment_login_signup_signin_selection.xml
+++ b/vector/src/main/res/layout/fragment_login_signup_signin_selection.xml
@@ -26,10 +26,10 @@
                 android:visibility="gone"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/loginLogo"
-                tools:src="@drawable/ic_logo_matrix_org"
-                tools:visibility="visible"
                 app:tint="?riotx_text_primary"
-                tools:ignore="MissingPrefix,UnknownId" />
+                tools:ignore="MissingPrefix,UnknownId"
+                tools:src="@drawable/ic_logo_matrix_org"
+                tools:visibility="visible" />
 
             <TextView
                 android:id="@+id/loginSignupSigninTitle"
@@ -83,18 +83,16 @@
 
             <!-- Social Logins buttons -->
             <LinearLayout
-                android:orientation="vertical"
                 android:id="@+id/loginSignupSigninSignInSocialLoginContainer"
-                app:layout_constraintTop_toBottomOf="@id/loginSignupSigninSignIn"
-                app:layout_constraintBottom_toBottomOf="parent"
                 android:layout_width="0dp"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
+                android:layout_height="wrap_content"
                 android:gravity="center"
-                android:clipToPadding="false"
-                android:clipChildren="false"
+                android:orientation="vertical"
                 android:padding="8dp"
-                android:layout_height="wrap_content">
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/loginSignupSigninSignIn">
 
                 <TextView
                     android:id="@+id/loginSignupSigninSocialLoginHeader"
@@ -102,15 +100,15 @@
                     android:layout_height="wrap_content"
                     android:layout_marginTop="27dp"
                     android:gravity="center"
-                    android:textSize="14sp"
+                    android:text="@string/login_social_continue"
                     android:textAppearance="@style/TextAppearance.Vector.Login.Text"
-                    android:text="@string/login_social_continue" />
+                    android:textSize="14sp" />
 
                 <im.vector.app.features.login.SocialLoginButtonsView
-                    app:signMode="continue_with"
                     android:id="@+id/loginSignupSigninSocialLoginButtons"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content" />
+                    android:layout_height="wrap_content"
+                    tools:signMode="continue_with" />
 
             </LinearLayout>