Fix #2592: Overlapping text bug on tablet login screen (#2600)

This commit is contained in:
Madhur Gupta 2019-03-17 21:44:58 +05:30 committed by Adam Jones
parent 40568eccf8
commit 21f2e088fa

View file

@ -6,7 +6,7 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="wrap_content"
android:orientation="vertical"> android:orientation="vertical">
<FrameLayout <FrameLayout
@ -54,7 +54,7 @@
android:layout_marginLeft="@dimen/standard_gap" android:layout_marginLeft="@dimen/standard_gap"
android:layout_marginRight="@dimen/standard_gap" android:layout_marginRight="@dimen/standard_gap"
android:layout_marginStart="@dimen/standard_gap" android:layout_marginStart="@dimen/standard_gap"
android:paddingBottom="@dimen/small_gap" android:paddingBottom="@dimen/standard_gap"
android:paddingTop="@dimen/small_gap" android:paddingTop="@dimen/small_gap"
android:textAlignment="center" android:textAlignment="center"
android:textColor="@color/secondaryDarkColor" android:textColor="@color/secondaryDarkColor"
@ -64,7 +64,7 @@
android:id="@+id/error_message_container" android:id="@+id/error_message_container"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@id/title" android:layout_below="@id/login_credentials"
android:visibility="gone" android:visibility="gone"
tools:visibility="visible"> tools:visibility="visible">
@ -119,9 +119,9 @@
android:layout_marginLeft="@dimen/standard_gap" android:layout_marginLeft="@dimen/standard_gap"
android:layout_marginRight="@dimen/standard_gap" android:layout_marginRight="@dimen/standard_gap"
android:layout_marginStart="@dimen/standard_gap" android:layout_marginStart="@dimen/standard_gap"
app:passwordToggleEnabled="false"> app:passwordToggleEnabled="true">
<com.google.android.material.textfield.TextInputEditText <android.support.design.widget.TextInputEditText
android:id="@+id/loginPassword" android:id="@+id/loginPassword"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -142,10 +142,10 @@
android:layout_marginRight="@dimen/standard_gap" android:layout_marginRight="@dimen/standard_gap"
android:layout_marginStart="@dimen/standard_gap" android:layout_marginStart="@dimen/standard_gap"
android:visibility="gone" android:visibility="gone"
app:passwordToggleEnabled="true" app:passwordToggleEnabled="false"
tools:visibility="visible"> tools:visibility="visible">
<com.google.android.material.textfield.TextInputEditText <android.support.design.widget.TextInputEditText
android:id="@+id/loginTwoFactor" android:id="@+id/loginTwoFactor"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -201,7 +201,7 @@
android:layout_below="@id/buttonFrame" android:layout_below="@id/buttonFrame"
android:layout_marginBottom="@dimen/standard_gap" android:layout_marginBottom="@dimen/standard_gap"
android:text="@string/forgot_password" android:text="@string/forgot_password"
android:textColor="@color/status_bar_blue" /> android:textColor="@color/status_bar_blue"/>
<fr.free.nrw.commons.ui.widget.HtmlTextView <fr.free.nrw.commons.ui.widget.HtmlTextView
android:id="@+id/skipLogin" android:id="@+id/skipLogin"