mirrors/element-android
1
0
Fork 0
mirror of https://github.com/element-hq/element-android synced 2024-11-24 10:25:35 +03:00
Code Issues Projects Releases Packages Wiki Activity

Cleanup layout

Browse source
This commit is contained in:
Benoit Marty 2020-12-14 15:46:31 +01:00
parent 2f616cb6c5
commit c8c4e10822
2 changed files with 15 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
vector/src/main/res/layout/fragment_login.xml
View file

@ -144,8 +144,6 @@
android:gravity="center" android:gravity="center"
android:orientation="vertical" android:orientation="vertical"
android:padding="8dp" android:padding="8dp"
android:clipToPadding="false"
android:clipChildren="false"
android:visibility="gone" android:visibility="gone"
tools:visibility="visible"> tools:visibility="visible">
@ -160,10 +158,10 @@
android:textSize="14sp" /> android:textSize="14sp" />
<im.vector.app.features.login.SocialLoginButtonsView <im.vector.app.features.login.SocialLoginButtonsView
app:signMode="signin"
android:id="@+id/loginSocialLoginButtons" android:id="@+id/loginSocialLoginButtons"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" /> android:layout_height="wrap_content"
tools:signMode="signin" />
</LinearLayout> </LinearLayout>

28
vector/src/main/res/layout/fragment_login_signup_signin_selection.xml
View file

@ -26,10 +26,10 @@
android:visibility="gone" android:visibility="gone"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/loginLogo" app:layout_constraintTop_toBottomOf="@id/loginLogo"
tools:src="@drawable/ic_logo_matrix_org"
tools:visibility="visible"
app:tint="?riotx_text_primary" app:tint="?riotx_text_primary"
tools:ignore="MissingPrefix,UnknownId" /> tools:ignore="MissingPrefix,UnknownId"
tools:src="@drawable/ic_logo_matrix_org"
tools:visibility="visible" />
<TextView <TextView
android:id="@+id/loginSignupSigninTitle" android:id="@+id/loginSignupSigninTitle"
@ -83,18 +83,16 @@
<!-- Social Logins buttons --> <!-- Social Logins buttons -->
<LinearLayout <LinearLayout
android:orientation="vertical"
android:id="@+id/loginSignupSigninSignInSocialLoginContainer" android:id="@+id/loginSignupSigninSignInSocialLoginContainer"
app:layout_constraintTop_toBottomOf="@id/loginSignupSigninSignIn"
app:layout_constraintBottom_toBottomOf="parent"
android:layout_width="0dp" android:layout_width="0dp"
app:layout_constraintStart_toStartOf="parent" android:layout_height="wrap_content"
app:layout_constraintEnd_toEndOf="parent"
android:gravity="center" android:gravity="center"
android:clipToPadding="false" android:orientation="vertical"
android:clipChildren="false"
android:padding="8dp" 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 <TextView
android:id="@+id/loginSignupSigninSocialLoginHeader" android:id="@+id/loginSignupSigninSocialLoginHeader"
@ -102,15 +100,15 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="27dp" android:layout_marginTop="27dp"
android:gravity="center" android:gravity="center"
android:textSize="14sp" android:text="@string/login_social_continue"
android:textAppearance="@style/TextAppearance.Vector.Login.Text" android:textAppearance="@style/TextAppearance.Vector.Login.Text"
android:text="@string/login_social_continue" /> android:textSize="14sp" />
<im.vector.app.features.login.SocialLoginButtonsView <im.vector.app.features.login.SocialLoginButtonsView
app:signMode="continue_with"
android:id="@+id/loginSignupSigninSocialLoginButtons" android:id="@+id/loginSignupSigninSocialLoginButtons"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" /> android:layout_height="wrap_content"
tools:signMode="continue_with" />
</LinearLayout> </LinearLayout>