Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/root"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clipChildren="false"
android:clipToPadding="false">
android:layout_height="match_parent">

<ImageView
android:id="@+id/logo"
Expand Down
19 changes: 13 additions & 6 deletions auth/src/main/res/layout/fui_auth_method_picker_layout.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,26 +5,33 @@
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/root"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clipChildren="false"
android:clipToPadding="false">
android:layout_height="match_parent">

<ImageView
android:id="@+id/logo"
style="@style/FirebaseUI.AuthMethodPicker.Logo"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toTopOf="@+id/container"
app:layout_constraintBottom_toTopOf="@+id/barrier"
tools:ignore="ContentDescription" /> <!-- TODO remove once the bug is fixed: https://issuetracker.google.com/issues/38281866-->

<android.support.constraint.Barrier
android:id="@+id/barrier"
android:layout_width="0dp"
android:layout_height="0dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toStartOf="parent"
app:barrierDirection="bottom"
app:constraint_referenced_ids="logo, parent" />

<ScrollView
android:id="@+id/container"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_height="0dp"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintTop_toBottomOf="@id/barrier"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintVertical_bias="0.9">

Expand Down
3 changes: 2 additions & 1 deletion auth/src/main/res/values/styles.xml
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@

<style name="FirebaseUI.AuthMethodPicker.Logo">
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">0dp</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:contentDescription">@string/fui_accessibility_logo</item>
</style>

Expand All @@ -176,6 +176,7 @@
<item name="android:layout_height">wrap_content</item>
<item name="android:minWidth">@dimen/fui_auth_method_button_width</item>
<item name="android:orientation">vertical</item>
<item name="android:clipChildren">false</item>
<item name="android:clipToPadding">false</item>
<item name="android:paddingLeft">4dp</item>
<item name="android:paddingRight">4dp</item>
Expand Down