Skip to content

Commit 670b363

Browse files
committed
Fixes lint errors and auth method picker landscape issues.
1 parent 5793bd8 commit 670b363

7 files changed

+31
-15
lines changed

auth/src/main/AndroidManifest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,13 @@
3939
android:name=".ui.email.EmailActivity"
4040
android:label="@string/fui_sign_in_default"
4141
android:exported="false"
42-
android:windowSoftInputMode="adjustResize" />
42+
android:windowSoftInputMode="adjustPan" />
4343

4444
<activity
4545
android:name=".ui.phone.PhoneActivity"
4646
android:label="@string/fui_sign_in_with_phone_number"
4747
android:exported="false"
48-
android:windowSoftInputMode="adjustResize|stateAlwaysVisible" />
48+
android:windowSoftInputMode="adjustPan|stateAlwaysVisible" />
4949

5050
<activity
5151
android:name=".ui.idp.WelcomeBackIdpPrompt"

auth/src/main/res/layout-land/fui_auth_method_picker_layout.xml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,16 @@
3737
<TextView
3838
android:id="@+id/main_tos_and_pp"
3939
style="@style/FirebaseUI.Text.BodyText"
40-
android:layout_width="match_parent"
40+
android:layout_width="0dp"
4141
android:layout_height="wrap_content"
42+
android:layout_marginLeft="32dp"
43+
android:layout_marginRight="32dp"
4244
android:layout_marginTop="@dimen/fui_field_padding_vert"
45+
android:layout_marginBottom="16dp"
46+
android:gravity="center"
4347
android:textColor="?android:attr/textColorTertiary"
44-
app:layout_constraintTop_toBottomOf="parent" />
45-
48+
android:textIsSelectable="true"
49+
app:layout_constraintLeft_toLeftOf="parent"
50+
app:layout_constraintRight_toLeftOf="@id/container"
51+
app:layout_constraintBottom_toBottomOf="parent" />
4652
</android.support.constraint.ConstraintLayout>

auth/src/main/res/layout/fui_auth_method_picker_layout.xml

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
<ImageView
1414
android:id="@+id/logo"
1515
style="@style/FirebaseUI.AuthMethodPicker.Logo"
16+
android:layout_marginTop="16dp"
17+
android:layout_marginBottom="16dp"
1618
app:layout_constraintStart_toStartOf="parent"
1719
app:layout_constraintEnd_toEndOf="parent"
1820
app:layout_constraintTop_toTopOf="parent"
@@ -26,24 +28,25 @@
2628
app:layout_constraintStart_toStartOf="parent"
2729
app:layout_constraintEnd_toEndOf="parent"
2830
app:layout_constraintTop_toTopOf="parent"
29-
app:layout_constraintBottom_toBottomOf="parent"
31+
app:layout_constraintBottom_toTopOf="@id/main_tos_and_pp"
3032
app:layout_constraintVertical_bias="0.7">
3133

3234
<LinearLayout
3335
android:id="@+id/btn_holder"
34-
style="@style/FirebaseUI.AuthMethodPicker.ButtonHolder"/>
36+
style="@style/FirebaseUI.AuthMethodPicker.ButtonHolder" />
37+
3538
</ScrollView>
39+
3640
<TextView
3741
android:id="@+id/main_tos_and_pp"
3842
style="@style/FirebaseUI.Text.BodyText"
3943
android:layout_width="wrap_content"
4044
android:layout_height="wrap_content"
4145
android:layout_marginTop="@dimen/fui_field_padding_vert"
42-
android:textColor="?android:textColorTertiary"
43-
android:textIsSelectable="false"
46+
android:layout_marginBottom="16dp"
4447
android:gravity="center"
45-
app:layout_constraintTop_toBottomOf="@id/container"/>
46-
</android.support.constraint.ConstraintLayout>
47-
48-
48+
android:textColor="?android:textColorTertiary"
49+
android:textIsSelectable="true"
50+
app:layout_constraintBottom_toBottomOf="parent" />
4951

52+
</android.support.constraint.ConstraintLayout>

auth/src/main/res/layout/fui_check_email_layout.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,11 @@
5656
android:layout_width="match_parent"
5757
android:layout_height="wrap_content"
5858
android:layout_marginTop="@dimen/fui_field_padding_vert"
59+
android:paddingLeft="16dp"
5960
android:paddingRight="16dp"
6061
android:paddingBottom="16dp"
6162
android:gravity="end"
63+
android:textIsSelectable="true"
6264
app:layout_constraintBottom_toBottomOf="parent" />
6365

6466
</android.support.constraint.ConstraintLayout>

auth/src/main/res/layout/fui_confirmation_code_layout.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,6 @@
9595
tools:text="Resend code" />
9696

9797
<android.support.constraint.Barrier
98-
android:id="@+id/tos_barrier"
9998
android:layout_width="0dp"
10099
android:layout_height="0dp"
101100
app:barrierDirection="bottom"
@@ -110,8 +109,10 @@
110109
android:layout_width="match_parent"
111110
android:layout_height="wrap_content"
112111
android:layout_marginTop="@dimen/fui_field_padding_vert"
112+
android:paddingLeft="16dp"
113113
android:paddingRight="16dp"
114114
android:paddingBottom="16dp"
115115
android:gravity="end"
116+
android:textIsSelectable="true"
116117
app:layout_constraintBottom_toBottomOf="parent" />
117118
</android.support.constraint.ConstraintLayout>

auth/src/main/res/layout/fui_phone_layout.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,11 @@
6262
android:layout_width="match_parent"
6363
android:layout_height="wrap_content"
6464
android:layout_marginTop="@dimen/fui_field_padding_vert"
65+
android:paddingLeft="16dp"
6566
android:paddingRight="16dp"
6667
android:paddingBottom="16dp"
6768
android:gravity="end"
69+
android:textIsSelectable="true"
6870
app:layout_constraintBottom_toBottomOf="parent" />
6971
</android.support.constraint.ConstraintLayout>
7072

auth/src/main/res/layout/fui_register_email_layout.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@
6868
style="@style/FirebaseUI.Button"
6969
android:text="@string/fui_button_text_save"
7070
tools:ignore="RtlHardcoded" />
71-
7271
</LinearLayout>
7372

7473
</ScrollView>
@@ -78,9 +77,12 @@
7877
android:layout_width="match_parent"
7978
android:layout_height="wrap_content"
8079
android:layout_marginTop="@dimen/fui_field_padding_vert"
80+
android:paddingLeft="16dp"
8181
android:paddingRight="16dp"
8282
android:paddingBottom="16dp"
8383
android:gravity="end"
84+
android:textIsSelectable="true"
8485
app:layout_constraintBottom_toBottomOf="parent" />
86+
8587
</android.support.constraint.ConstraintLayout>
8688

0 commit comments

Comments
 (0)