mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-27 12:53:55 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Madhur Gupta 2019-03-17 21:44:58 +05:30 • committed by Adam Jones
parent 40568eccf8
commit 21f2e088fa
1 changed files with 203 additions and 203 deletions
Download patch file Download diff file Expand all files Collapse all files

404
app/src/main/res/layout-xlarge/activity_login.xml
View file

@ -5,243 +5,243 @@
android:layout_height="match_parent"> android:layout_height="match_parent">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<FrameLayout
android:layout_width="400sp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:orientation="vertical">
android:layout_marginTop="@dimen/small_gap">
<androidx.cardview.widget.CardView <FrameLayout
android:layout_width="match_parent" android:layout_width="400sp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/standard_gap" android:layout_gravity="center"
android:layout_marginEnd="@dimen/standard_gap" android:layout_marginTop="@dimen/small_gap">
android:layout_marginLeft="@dimen/standard_gap"
android:layout_marginRight="@dimen/standard_gap"
android:layout_marginStart="@dimen/standard_gap"
android:layout_marginTop="@dimen/large_gap"
app:cardCornerRadius="4dp"
app:cardElevation="4dp">
<RelativeLayout <androidx.cardview.widget.CardView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center" android:layout_marginBottom="@dimen/standard_gap"
android:orientation="vertical"> android:layout_marginEnd="@dimen/standard_gap"
android:layout_marginLeft="@dimen/standard_gap"
android:layout_marginRight="@dimen/standard_gap"
android:layout_marginStart="@dimen/standard_gap"
android:layout_marginTop="@dimen/large_gap"
app:cardCornerRadius="4dp"
app:cardElevation="4dp">
<TextView <RelativeLayout
android:id="@+id/title"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@color/primaryColor"
android:gravity="center" android:gravity="center"
android:paddingBottom="@dimen/large_gap" android:orientation="vertical">
android:paddingTop="@dimen/large_gap"
android:text="@string/login_to_your_account"
android:textColor="@android:color/white"
android:textSize="@dimen/heading_text_size" />
<TextView
android:id="@+id/login_credentials"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/title"
android:layout_marginEnd="@dimen/standard_gap"
android:layout_marginLeft="@dimen/standard_gap"
android:layout_marginRight="@dimen/standard_gap"
android:layout_marginStart="@dimen/standard_gap"
android:paddingBottom="@dimen/small_gap"
android:paddingTop="@dimen/small_gap"
android:textAlignment="center"
android:textColor="@color/secondaryDarkColor"
tools:text="@string/login_credential" />
<FrameLayout
android:id="@+id/error_message_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/title"
android:visibility="gone"
tools:visibility="visible">
<TextView <TextView
android:id="@+id/error_message" android:id="@+id/title"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@color/primaryColor"
android:gravity="center"
android:paddingBottom="@dimen/large_gap"
android:paddingTop="@dimen/large_gap"
android:text="@string/login_to_your_account"
android:textColor="@android:color/white"
android:textSize="@dimen/heading_text_size" />
<TextView
android:id="@+id/login_credentials"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/title"
android:layout_marginEnd="@dimen/standard_gap" android:layout_marginEnd="@dimen/standard_gap"
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:gravity="center" android:paddingBottom="@dimen/standard_gap"
android:paddingBottom="@dimen/small_gap"
android:paddingTop="@dimen/small_gap" android:paddingTop="@dimen/small_gap"
android:textAlignment="center"
android:textColor="@color/secondaryDarkColor" android:textColor="@color/secondaryDarkColor"
tools:text="Check your password, something doesnt look right" /> tools:text="@string/login_credential" />
</FrameLayout>
<com.google.android.material.textfield.TextInputLayout <FrameLayout
android:id="@+id/username_container" android:id="@+id/error_message_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/error_message_container"
android:layout_marginBottom="@dimen/standard_gap"
android:layout_marginEnd="@dimen/standard_gap"
android:layout_marginLeft="@dimen/standard_gap"
android:layout_marginRight="@dimen/standard_gap"
android:layout_marginStart="@dimen/standard_gap"
android:layout_marginTop="@dimen/standard_gap">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/loginUsername"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:hint="@string/username" android:layout_below="@id/login_credentials"
android:imeOptions="flagNoExtractUi"
android:inputType="textNoSuggestions">
<requestFocus />
</com.google.android.material.textfield.TextInputEditText>
</com.google.android.material.textfield.TextInputLayout>
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/password_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/username_container"
android:layout_marginBottom="@dimen/standard_gap"
android:layout_marginEnd="@dimen/standard_gap"
android:layout_marginLeft="@dimen/standard_gap"
android:layout_marginRight="@dimen/standard_gap"
android:layout_marginStart="@dimen/standard_gap"
app:passwordToggleEnabled="false">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/loginPassword"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/password"
android:imeOptions="flagNoExtractUi"
android:inputType="textPassword" />
</com.google.android.material.textfield.TextInputLayout>
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/two_factor_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/password_container"
android:layout_marginBottom="@dimen/standard_gap"
android:layout_marginEnd="@dimen/standard_gap"
android:layout_marginLeft="@dimen/standard_gap"
android:layout_marginRight="@dimen/standard_gap"
android:layout_marginStart="@dimen/standard_gap"
android:visibility="gone"
app:passwordToggleEnabled="true"
tools:visibility="visible">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/loginTwoFactor"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/_2fa_code"
android:imeOptions="flagNoExtractUi"
android:inputType="textNoSuggestions"
android:visibility="gone" android:visibility="gone"
tools:visibility="visible" /> tools:visibility="visible">
</com.google.android.material.textfield.TextInputLayout> <TextView
android:id="@+id/error_message"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/standard_gap"
android:layout_marginLeft="@dimen/standard_gap"
android:layout_marginRight="@dimen/standard_gap"
android:layout_marginStart="@dimen/standard_gap"
android:gravity="center"
android:paddingBottom="@dimen/small_gap"
android:paddingTop="@dimen/small_gap"
android:textColor="@color/secondaryDarkColor"
tools:text="Check your password, something doesnt look right" />
</FrameLayout>
<LinearLayout <com.google.android.material.textfield.TextInputLayout
android:id="@+id/buttonFrame" android:id="@+id/username_container"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/two_factor_container"
android:layout_marginBottom="@dimen/standard_gap"
android:layout_marginEnd="@dimen/standard_gap"
android:layout_marginLeft="@dimen/standard_gap"
android:layout_marginRight="@dimen/standard_gap"
android:layout_marginStart="@dimen/standard_gap">
<Button
android:id="@+id/signupButton"
style="@style/Widget.AppCompat.Button.Borderless.Colored"
android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_horizontal" android:layout_below="@id/error_message_container"
android:layout_marginEnd="@dimen/small_gap" android:layout_marginBottom="@dimen/standard_gap"
android:layout_marginRight="@dimen/small_gap" android:layout_marginEnd="@dimen/standard_gap"
android:layout_weight="1" android:layout_marginLeft="@dimen/standard_gap"
android:text="@string/signup" /> android:layout_marginRight="@dimen/standard_gap"
android:layout_marginStart="@dimen/standard_gap"
android:layout_marginTop="@dimen/standard_gap">
<Button <com.google.android.material.textfield.TextInputEditText
android:id="@+id/loginButton" android:id="@+id/loginUsername"
style="@style/Widget.AppCompat.Button.Colored" android:layout_width="match_parent"
android:layout_width="0dp" android:layout_height="wrap_content"
android:hint="@string/username"
android:imeOptions="flagNoExtractUi"
android:inputType="textNoSuggestions">
<requestFocus />
</com.google.android.material.textfield.TextInputEditText>
</com.google.android.material.textfield.TextInputLayout>
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/password_container"
android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/small_gap" android:layout_below="@id/username_container"
android:layout_marginStart="@dimen/small_gap" android:layout_marginBottom="@dimen/standard_gap"
android:layout_weight="1" android:layout_marginEnd="@dimen/standard_gap"
android:enabled="false" android:layout_marginLeft="@dimen/standard_gap"
android:text="@string/login" /> android:layout_marginRight="@dimen/standard_gap"
android:layout_marginStart="@dimen/standard_gap"
app:passwordToggleEnabled="true">
</LinearLayout> <android.support.design.widget.TextInputEditText
android:id="@+id/loginPassword"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/password"
android:imeOptions="flagNoExtractUi"
android:inputType="textPassword" />
<fr.free.nrw.commons.ui.widget.HtmlTextView </com.google.android.material.textfield.TextInputLayout>
android:visibility="visible"
android:id="@+id/forgotPassword"
android:layout_width="match_parent"
android:gravity="center_horizontal"
android:layout_height="wrap_content"
android:layout_below="@id/buttonFrame"
android:layout_marginBottom="@dimen/standard_gap"
android:text="@string/forgot_password"
android:textColor="@color/status_bar_blue" />
<fr.free.nrw.commons.ui.widget.HtmlTextView <com.google.android.material.textfield.TextInputLayout
android:id="@+id/skipLogin" android:id="@+id/two_factor_container"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/standard_gap" android:layout_below="@id/password_container"
android:layout_below="@id/forgotPassword" android:layout_marginBottom="@dimen/standard_gap"
android:gravity="center_horizontal" android:layout_marginEnd="@dimen/standard_gap"
android:text="@string/skip_login" android:layout_marginLeft="@dimen/standard_gap"
android:visibility="visible"/> android:layout_marginRight="@dimen/standard_gap"
android:layout_marginStart="@dimen/standard_gap"
android:visibility="gone"
app:passwordToggleEnabled="false"
tools:visibility="visible">
</RelativeLayout> <android.support.design.widget.TextInputEditText
</androidx.cardview.widget.CardView> android:id="@+id/loginTwoFactor"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/_2fa_code"
android:imeOptions="flagNoExtractUi"
android:inputType="textNoSuggestions"
android:visibility="gone"
tools:visibility="visible" />
<androidx.appcompat.widget.AppCompatImageView </com.google.android.material.textfield.TextInputLayout>
android:layout_width="64dp"
android:layout_height="64dp" <LinearLayout
android:id="@+id/buttonFrame"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/two_factor_container"
android:layout_marginBottom="@dimen/standard_gap"
android:layout_marginEnd="@dimen/standard_gap"
android:layout_marginLeft="@dimen/standard_gap"
android:layout_marginRight="@dimen/standard_gap"
android:layout_marginStart="@dimen/standard_gap">
<Button
android:id="@+id/signupButton"
style="@style/Widget.AppCompat.Button.Borderless.Colored"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginEnd="@dimen/small_gap"
android:layout_marginRight="@dimen/small_gap"
android:layout_weight="1"
android:text="@string/signup" />
<Button
android:id="@+id/loginButton"
style="@style/Widget.AppCompat.Button.Colored"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/small_gap"
android:layout_marginStart="@dimen/small_gap"
android:layout_weight="1"
android:enabled="false"
android:text="@string/login" />
</LinearLayout>
<fr.free.nrw.commons.ui.widget.HtmlTextView
android:visibility="visible"
android:id="@+id/forgotPassword"
android:layout_width="match_parent"
android:gravity="center_horizontal"
android:layout_height="wrap_content"
android:layout_below="@id/buttonFrame"
android:layout_marginBottom="@dimen/standard_gap"
android:text="@string/forgot_password"
android:textColor="@color/status_bar_blue"/>
<fr.free.nrw.commons.ui.widget.HtmlTextView
android:id="@+id/skipLogin"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/standard_gap"
android:layout_below="@id/forgotPassword"
android:gravity="center_horizontal"
android:text="@string/skip_login"
android:visibility="visible"/>
</RelativeLayout>
</androidx.cardview.widget.CardView>
<androidx.appcompat.widget.AppCompatImageView
android:layout_width="64dp"
android:layout_height="64dp"
android:layout_gravity="center_horizontal"
android:elevation="8dp"
app:srcCompat="@drawable/blue_rinse_circle"
tools:ignore="UnusedAttribute" />
<androidx.appcompat.widget.AppCompatImageView
android:layout_width="42dp"
android:layout_height="42dp"
android:layout_gravity="center_horizontal"
android:layout_marginTop="8dp"
android:elevation="8dp"
app:srcCompat="@drawable/commons_logo_large"
tools:ignore="UnusedAttribute" />
</FrameLayout>
<fr.free.nrw.commons.ui.widget.HtmlTextView
android:id="@+id/about_privacy_policy"
style="?android:textAppearanceSmall"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/standard_gap"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:elevation="8dp" android:text="@string/about_privacy_policy"/>
app:srcCompat="@drawable/blue_rinse_circle"
tools:ignore="UnusedAttribute" />
<androidx.appcompat.widget.AppCompatImageView
android:layout_width="42dp"
android:layout_height="42dp"
android:layout_gravity="center_horizontal"
android:layout_marginTop="8dp"
android:elevation="8dp"
app:srcCompat="@drawable/commons_logo_large"
tools:ignore="UnusedAttribute" />
</FrameLayout>
<fr.free.nrw.commons.ui.widget.HtmlTextView
android:id="@+id/about_privacy_policy"
style="?android:textAppearanceSmall"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/standard_gap"
android:layout_gravity="center_horizontal"
android:text="@string/about_privacy_policy"/>
</LinearLayout> </LinearLayout>
</ScrollView> </ScrollView>