Skip to content

Commit 076b865

Browse files
SUPERCILEXSUPERCILEX
committed
Merge remote-tracking branch 'upstream/version-4.1.0-dev' into tests
2 parents 5c78b88 + 2fb28a1 commit 076b865

18 files changed

+338
-141
lines changed

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

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,26 @@
2121
app:layout_constraintStart_toStartOf="parent"
2222
app:layout_constraintEnd_toStartOf="@+id/container"
2323
app:layout_constraintTop_toTopOf="parent"
24-
app:layout_constraintBottom_toBottomOf="parent"
24+
app:layout_constraintBottom_toTopOf="@+id/main_tos_and_pp"
2525
tools:ignore="ContentDescription" /> <!-- TODO remove once the bug is fixed: https://issuetracker.google.com/issues/38281866-->
2626

27+
<TextView
28+
android:id="@+id/main_tos_and_pp"
29+
style="@style/FirebaseUI.Text.BodyText"
30+
android:layout_width="0dp"
31+
android:layout_height="0dp"
32+
android:layout_marginLeft="@dimen/fui_wrapper_padding_horiz"
33+
android:layout_marginRight="@dimen/fui_wrapper_padding_horiz"
34+
android:layout_marginTop="@dimen/fui_field_padding_vert"
35+
android:layout_marginBottom="@dimen/fui_field_padding_vert"
36+
android:gravity="center"
37+
android:textColor="?android:attr/textColorTertiary"
38+
android:textIsSelectable="false"
39+
app:layout_constraintStart_toStartOf="parent"
40+
app:layout_constraintEnd_toStartOf="@+id/container"
41+
app:layout_constraintTop_toBottomOf="@+id/logo"
42+
app:layout_constraintBottom_toBottomOf="parent" />
43+
2744
<ScrollView
2845
android:id="@+id/container"
2946
android:layout_width="wrap_content"
@@ -40,20 +57,4 @@
4057

4158
</ScrollView>
4259

43-
<TextView
44-
android:id="@+id/main_tos_and_pp"
45-
style="@style/FirebaseUI.Text.BodyText"
46-
android:layout_width="0dp"
47-
android:layout_height="wrap_content"
48-
android:layout_marginLeft="32dp"
49-
android:layout_marginRight="32dp"
50-
android:layout_marginTop="@dimen/fui_field_padding_vert"
51-
android:layout_marginBottom="@dimen/fui_field_padding_vert"
52-
android:gravity="center"
53-
android:textColor="?android:attr/textColorTertiary"
54-
android:textIsSelectable="true"
55-
app:layout_constraintLeft_toLeftOf="parent"
56-
app:layout_constraintRight_toLeftOf="@+id/container"
57-
app:layout_constraintBottom_toBottomOf="parent" />
58-
5960
</android.support.constraint.ConstraintLayout>

‎auth/src/main/res/layout/fui_activity_register_email.xml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,4 @@
55
android:id="@+id/fragment_register_email"
66
android:layout_width="match_parent"
77
android:layout_height="match_parent"
8-
tools:ignore="MergeRootFrame">
9-
</FrameLayout>
10-
8+
tools:ignore="MergeRootFrame" />

‎auth/src/main/res/layout/fui_activity_register_phone.xml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,4 @@
55
android:id="@+id/fragment_phone"
66
android:layout_width="match_parent"
77
android:layout_height="match_parent"
8-
tools:ignore="MergeRootFrame">
9-
</FrameLayout>
10-
8+
tools:ignore="MergeRootFrame" />

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
android:id="@+id/root"
77
android:layout_width="match_parent"
88
android:layout_height="match_parent"
9-
android:clipChildren="false"
109
android:clipToPadding="false">
1110

1211
<me.zhanghai.android.materialprogressbar.MaterialProgressBar
@@ -29,10 +28,10 @@
2928
<ScrollView
3029
android:id="@+id/container"
3130
android:layout_width="wrap_content"
32-
android:layout_height="wrap_content"
31+
android:layout_height="0dp"
3332
app:layout_constraintStart_toStartOf="parent"
3433
app:layout_constraintEnd_toEndOf="parent"
35-
app:layout_constraintTop_toTopOf="parent"
34+
app:layout_constraintTop_toBottomOf="@+id/logo"
3635
app:layout_constraintBottom_toTopOf="@+id/main_tos_and_pp"
3736
app:layout_constraintVertical_bias="0.7">
3837

@@ -52,6 +51,7 @@
5251
android:gravity="center"
5352
android:textColor="?android:textColorTertiary"
5453
android:textIsSelectable="true"
54+
app:layout_constraintTop_toBottomOf="@+id/container"
5555
app:layout_constraintBottom_toBottomOf="parent" />
5656

5757
</android.support.constraint.ConstraintLayout>

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@
1414

1515
<ScrollView
1616
android:layout_width="match_parent"
17-
android:layout_height="match_parent"
18-
tools:ignore="UselessParent">
17+
android:layout_height="match_parent">
1918

2019
<LinearLayout
2120
style="@style/FirebaseUI.WrapperStyle"

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,11 @@
6161
<TextView
6262
android:id="@+id/email_footer_tos_and_pp_text"
6363
style="@style/FirebaseUI.PrivacyFooter"
64-
app:layout_constraintTop_toBottomOf="@+id/send_sms_tos" />
64+
app:layout_constraintTop_toBottomOf="@+id/send_sms_tos"
65+
app:layout_constraintBottom_toBottomOf="parent" />
6566

6667
</android.support.constraint.ConstraintLayout>
6768

6869
</ScrollView>
6970

7071
</android.support.constraint.ConstraintLayout>
71-

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,7 @@
1515
<ScrollView
1616
android:layout_width="match_parent"
1717
android:layout_height="match_parent"
18-
android:layout_marginTop="8dp"
19-
android:paddingBottom="16dp"
20-
android:clipToPadding="false"
21-
tools:ignore="UselessParent">
18+
android:clipToPadding="false">
2219

2320
<LinearLayout
2421
style="@style/FirebaseUI.WrapperStyle"

‎auth/src/main/res/layout/fui_welcome_back_idp_prompt_layout.xml

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
2+
<LinearLayout
3+
xmlns:android="http://schemas.android.com/apk/res/android"
34
xmlns:tools="http://schemas.android.com/tools"
45
android:layout_width="match_parent"
5-
android:layout_height="match_parent">
6+
android:layout_height="match_parent"
7+
android:orientation="vertical">
68

7-
<LinearLayout
8-
android:layout_width="match_parent"
9-
android:layout_height="wrap_content"
10-
android:orientation="vertical">
9+
<me.zhanghai.android.materialprogressbar.MaterialProgressBar
10+
android:id="@+id/top_progress_bar"
11+
style="@style/FirebaseUI.TopProgressBar"
12+
tools:visibility="visible" />
1113

12-
<me.zhanghai.android.materialprogressbar.MaterialProgressBar
13-
android:id="@+id/top_progress_bar"
14-
style="@style/FirebaseUI.TopProgressBar"
15-
tools:visibility="visible" />
14+
<ScrollView
15+
android:layout_width="match_parent"
16+
android:layout_height="match_parent">
1617

1718
<LinearLayout
1819
style="@style/FirebaseUI.WrapperStyle"
@@ -44,6 +45,6 @@
4445

4546
</LinearLayout>
4647

47-
</LinearLayout>
48+
</ScrollView>
4849

49-
</ScrollView>
50+
</LinearLayout>

‎auth/src/main/res/layout/fui_welcome_back_password_prompt_layout.xml

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<ScrollView
2+
<LinearLayout
33
xmlns:android="http://schemas.android.com/apk/res/android"
44
xmlns:app="http://schemas.android.com/apk/res-auto"
55
xmlns:tools="http://schemas.android.com/tools"
66
android:layout_width="match_parent"
7-
android:layout_height="match_parent">
7+
android:layout_height="match_parent"
8+
android:orientation="vertical">
89

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

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

1919
<android.support.constraint.ConstraintLayout
2020
style="@style/FirebaseUI.WrapperStyle"
@@ -74,10 +74,11 @@
7474
<TextView
7575
android:id="@+id/email_footer_tos_and_pp_text"
7676
style="@style/FirebaseUI.PrivacyFooter"
77-
app:layout_constraintTop_toBottomOf="@+id/button_done" />
77+
app:layout_constraintTop_toBottomOf="@+id/button_done"
78+
app:layout_constraintBottom_toBottomOf="parent" />
7879

7980
</android.support.constraint.ConstraintLayout>
8081

81-
</LinearLayout>
82+
</ScrollView>
8283

83-
</ScrollView>
84+
</LinearLayout>

‎build.gradle.kts

Lines changed: 58 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import com.android.build.gradle.BaseExtension
22
import com.jfrog.bintray.gradle.BintrayExtension
3-
import com.jfrog.bintray.gradle.RecordingCopyTask
3+
import com.jfrog.bintray.gradle.tasks.RecordingCopyTask
44
import org.jfrog.gradle.plugin.artifactory.dsl.ArtifactoryPluginConvention
55
import org.jfrog.gradle.plugin.artifactory.dsl.DoubleDelegateWrapper
66
import org.jfrog.gradle.plugin.artifactory.dsl.PublisherConfig
@@ -52,6 +52,10 @@ allprojects {
5252
}
5353
}
5454

55+
tasks.withType<Wrapper> {
56+
distributionType = Wrapper.DistributionType.ALL
57+
}
58+
5559
val Project.configDir get() = "$rootDir/library/quality"
5660
val Project.reportsDir get() = "$buildDir/reports"
5761

@@ -247,6 +251,50 @@ fun Project.setupPublishing() {
247251
artifact(sourcesJar)
248252

249253
pom {
254+
name.set("FirebaseUI ${project.name.capitalize()}")
255+
description.set("Firebase UI for Android")
256+
url.set("https://github.com/firebase/FirebaseUI-Android")
257+
258+
organization {
259+
name.set("Firebase")
260+
url.set("https://github.com/firebase")
261+
}
262+
263+
scm {
264+
val scmUrl = "scm:git:git@github.com/firebase/firebaseui-android.git"
265+
connection.set(scmUrl)
266+
developerConnection.set(scmUrl)
267+
url.set(this@pom.url)
268+
tag.set("HEAD")
269+
}
270+
271+
developers {
272+
developer {
273+
id.set("samtstern")
274+
name.set("Sam Stern")
275+
email.set("samstern@google.com")
276+
organization.set("Firebase")
277+
organizationUrl.set("https://firebase.google.com")
278+
roles.set(listOf("Project-Administrator", "Developer"))
279+
timezone.set("-8")
280+
}
281+
282+
developer {
283+
id.set("SUPERCILEX")
284+
name.set("Alex Saveau")
285+
email.set("saveau.alexandre@gmail.com")
286+
roles.set(listOf("Developer"))
287+
timezone.set("-8")
288+
}
289+
}
290+
291+
licenses {
292+
license {
293+
name.set("The Apache License, Version 2.0")
294+
url.set("https://www.apache.org/licenses/LICENSE-2.0.txt")
295+
}
296+
}
297+
250298
withXml {
251299
asNode().appendNode("dependencies").apply {
252300
fun Dependency.write(scope: String) = appendNode("dependency").apply {
@@ -267,54 +315,6 @@ fun Project.setupPublishing() {
267315
dependency.write("runtime")
268316
}
269317
}
270-
271-
// Common values
272-
val repoUrl = "https://github.com/firebase/FirebaseUI-Android"
273-
val scmUrl = "scm:git:git@github.com/firebase/firebaseui-android.git"
274-
275-
// Name
276-
asNode().appendNode("name", artifactId)
277-
278-
// Description
279-
asNode().appendNode("description", "Firebase UI for Android")
280-
281-
// Organization
282-
asNode().appendNode("organization").apply {
283-
appendNode("name", "FirebaseUI")
284-
appendNode("url", repoUrl)
285-
}
286-
287-
// URL
288-
asNode().appendNode("url", repoUrl)
289-
290-
// SCM
291-
asNode().appendNode("scm").apply {
292-
appendNode("connection", scmUrl)
293-
appendNode("developerConnection", scmUrl)
294-
appendNode("url", repoUrl)
295-
appendNode("tag", "HEAD")
296-
}
297-
298-
// Developers
299-
asNode().appendNode("developers").appendNode("developer").apply {
300-
appendNode("id", "samtstern")
301-
appendNode("email", "samstern@google.com")
302-
appendNode("organization", "Firebase")
303-
appendNode("organizationUrl", "https://firebase.google.com")
304-
305-
appendNode("roles").apply {
306-
appendNode("role", "Project-Administrator")
307-
appendNode("role", "Developer")
308-
}
309-
310-
appendNode("timezone", "-8")
311-
}
312-
313-
// Licenses
314-
asNode().appendNode("licenses").appendNode("license").apply {
315-
appendNode("name", "The Apache License, Version 2.0")
316-
appendNode("url", "http://www.apache.org/licenses/LICENSE-2.0.txt")
317-
}
318318
}
319319
}
320320
}
@@ -356,16 +356,16 @@ fun Project.setupPublishing() {
356356
"'$name': ${publishing.artifacts}"
357357
}
358358
logger.info("""
359-
|Bintray configuration for '$publicationName'
360-
| Artifact name: $artifactName
361-
| Artifacts: ${publications.joinToString(transform = pubLog)}
362-
""".trimMargin())
359+
|Bintray configuration for '$publicationName'
360+
| Artifact name: $artifactName
361+
| Artifacts: ${publications.joinToString(transform = pubLog)}
362+
""".trimMargin())
363363
logger.info("""
364-
|POM transformation
365-
| Src: $pomSrc
366-
| Dest: $pomDest
367-
| Name: $pomName
368-
""".trimMargin())
364+
|POM transformation
365+
| Src: $pomSrc
366+
| Dest: $pomDest
367+
| Name: $pomName
368+
""".trimMargin())
369369

370370
filesSpec(closureOf<RecordingCopyTask> {
371371
from(pomSrc)

0 commit comments

Comments
 (0)