Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix overlapping view and padding issues #1324

Merged
merged 18 commits into from
Jun 12, 2018
Merged

Fix overlapping view and padding issues #1324

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
39c738c
Rewrite phone auth with new architecture
SUPERCILEX Apr 12, 2018
5521766
Merge remote-tracking branch 'upstream/version-3.4.0-dev' into phone-…
SUPERCILEX May 5, 2018
9db26b3
Merge remote-tracking branch 'upstream/version-4.0.0-dev' into phone-…
SUPERCILEX May 5, 2018
5f173bf
Fix merge mistakes
SUPERCILEX May 5, 2018
acbe856
Finalize rewrite
SUPERCILEX May 5, 2018
e3a0e20
Fix AssistStructure memory leak
SUPERCILEX May 5, 2018
ea57741
Final tweaks before review
SUPERCILEX May 6, 2018
5ffedde
Address review feedback
SUPERCILEX May 8, 2018
bfb3b22
Remove `getPhoneNumber` mess
SUPERCILEX May 8, 2018
f7d0d8d
Fix build
SUPERCILEX May 8, 2018
55cb384
Merge remote-tracking branch 'upstream/master' into phone-rewrite
SUPERCILEX May 29, 2018
077ba85
Fix merge mistakes
SUPERCILEX May 29, 2018
813079f
Use require instead of get
SUPERCILEX May 29, 2018
55cee9a
Address small feedback
SUPERCILEX May 29, 2018
ff73ae8
Revamp progress updates
SUPERCILEX May 29, 2018
e76acab
Fix numerous overlapping view and padding issues
SUPERCILEX May 29, 2018
54b0240
Merge remote-tracking branch 'upstream/version-4.1.0-dev' into layout…
SUPERCILEX May 31, 2018
5ced908
Merge remote-tracking branch 'upstream/version-4.1.0-dev' into layout…
SUPERCILEX Jun 6, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 18 additions & 17 deletions auth/src/main/res/layout-land/fui_auth_method_picker_layout.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,26 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toStartOf="@+id/container"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintBottom_toTopOf="@+id/main_tos_and_pp"
tools:ignore="ContentDescription" /> <!-- TODO remove once the bug is fixed: https://issuetracker.google.com/issues/38281866-->

<TextView
android:id="@+id/main_tos_and_pp"
style="@style/FirebaseUI.Text.BodyText"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginLeft="@dimen/fui_wrapper_padding_horiz"
android:layout_marginRight="@dimen/fui_wrapper_padding_horiz"
android:layout_marginTop="@dimen/fui_field_padding_vert"
android:layout_marginBottom="@dimen/fui_field_padding_vert"
android:gravity="center"
android:textColor="?android:attr/textColorTertiary"
android:textIsSelectable="false"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toStartOf="@+id/container"
app:layout_constraintTop_toBottomOf="@+id/logo"
app:layout_constraintBottom_toBottomOf="parent" />

<ScrollView
android:id="@+id/container"
android:layout_width="wrap_content"
Expand All @@ -40,20 +57,4 @@

</ScrollView>

<TextView
android:id="@+id/main_tos_and_pp"
style="@style/FirebaseUI.Text.BodyText"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginLeft="32dp"
android:layout_marginRight="32dp"
android:layout_marginTop="@dimen/fui_field_padding_vert"
android:layout_marginBottom="@dimen/fui_field_padding_vert"
android:gravity="center"
android:textColor="?android:attr/textColorTertiary"
android:textIsSelectable="true"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toLeftOf="@+id/container"
app:layout_constraintBottom_toBottomOf="parent" />

</android.support.constraint.ConstraintLayout>
4 changes: 1 addition & 3 deletions auth/src/main/res/layout/fui_activity_register_email.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,4 @@
android:id="@+id/fragment_register_email"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:ignore="MergeRootFrame">
</FrameLayout>

tools:ignore="MergeRootFrame" />
4 changes: 1 addition & 3 deletions auth/src/main/res/layout/fui_activity_register_phone.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,4 @@
android:id="@+id/fragment_phone"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:ignore="MergeRootFrame">
</FrameLayout>

tools:ignore="MergeRootFrame" />
6 changes: 3 additions & 3 deletions auth/src/main/res/layout/fui_auth_method_picker_layout.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
android:id="@+id/root"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clipChildren="false"
android:clipToPadding="false">

<me.zhanghai.android.materialprogressbar.MaterialProgressBar
Expand All @@ -29,10 +28,10 @@
<ScrollView
android:id="@+id/container"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_height="0dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintTop_toBottomOf="@+id/logo"
app:layout_constraintBottom_toTopOf="@+id/main_tos_and_pp"
app:layout_constraintVertical_bias="0.7">

Expand All @@ -52,6 +51,7 @@
android:gravity="center"
android:textColor="?android:textColorTertiary"
android:textIsSelectable="true"
app:layout_constraintTop_toBottomOf="@+id/container"
app:layout_constraintBottom_toBottomOf="parent" />

</android.support.constraint.ConstraintLayout>
3 changes: 1 addition & 2 deletions auth/src/main/res/layout/fui_check_email_layout.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@

<ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:ignore="UselessParent">
android:layout_height="match_parent">

<LinearLayout
style="@style/FirebaseUI.WrapperStyle"
Expand Down
4 changes: 2 additions & 2 deletions auth/src/main/res/layout/fui_phone_layout.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,11 +61,11 @@
<TextView
android:id="@+id/email_footer_tos_and_pp_text"
style="@style/FirebaseUI.PrivacyFooter"
app:layout_constraintTop_toBottomOf="@+id/send_sms_tos" />
app:layout_constraintTop_toBottomOf="@+id/send_sms_tos"
app:layout_constraintBottom_toBottomOf="parent" />

</android.support.constraint.ConstraintLayout>

</ScrollView>

</android.support.constraint.ConstraintLayout>

5 changes: 1 addition & 4 deletions auth/src/main/res/layout/fui_register_email_layout.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,7 @@
<ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="8dp"
android:paddingBottom="16dp"
android:clipToPadding="false"
tools:ignore="UselessParent">
android:clipToPadding="false">

<LinearLayout
style="@style/FirebaseUI.WrapperStyle"
Expand Down
25 changes: 13 additions & 12 deletions auth/src/main/res/layout/fui_welcome_back_idp_prompt_layout.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:orientation="vertical">

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<me.zhanghai.android.materialprogressbar.MaterialProgressBar
android:id="@+id/top_progress_bar"
style="@style/FirebaseUI.TopProgressBar"
tools:visibility="visible" />

<me.zhanghai.android.materialprogressbar.MaterialProgressBar
android:id="@+id/top_progress_bar"
style="@style/FirebaseUI.TopProgressBar"
tools:visibility="visible" />
<ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent">

<LinearLayout
style="@style/FirebaseUI.WrapperStyle"
Expand Down Expand Up @@ -44,6 +45,6 @@

</LinearLayout>

</LinearLayout>
</ScrollView>

</ScrollView>
</LinearLayout>
27 changes: 14 additions & 13 deletions auth/src/main/res/layout/fui_welcome_back_password_prompt_layout.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<ScrollView
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:orientation="vertical">

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<me.zhanghai.android.materialprogressbar.MaterialProgressBar
android:id="@+id/top_progress_bar"
style="@style/FirebaseUI.TopProgressBar"
tools:visibility="visible" />

<me.zhanghai.android.materialprogressbar.MaterialProgressBar
android:id="@+id/top_progress_bar"
style="@style/FirebaseUI.TopProgressBar"
tools:visibility="visible" />
<ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent">

<android.support.constraint.ConstraintLayout
style="@style/FirebaseUI.WrapperStyle"
Expand Down Expand Up @@ -74,10 +74,11 @@
<TextView
android:id="@+id/email_footer_tos_and_pp_text"
style="@style/FirebaseUI.PrivacyFooter"
app:layout_constraintTop_toBottomOf="@+id/button_done" />
app:layout_constraintTop_toBottomOf="@+id/button_done"
app:layout_constraintBottom_toBottomOf="parent" />

</android.support.constraint.ConstraintLayout>

</LinearLayout>
</ScrollView>

</ScrollView>
</LinearLayout>