Skip to content

Commit 526529c

Browse files
committed
Move to 3p material progress bar library
Change-Id: I04e32ea437446ba4240187a3cb2d42b0a706b338
1 parent ee7f6dd commit 526529c

7 files changed

+15
-13
lines changed

auth/build.gradle

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,9 @@ dependencies {
5050
implementation "com.android.support:customtabs:$supportLibraryVersion"
5151
compileOnly("com.twitter.sdk.android:twitter-core:3.1.1@aar") { transitive = true }
5252

53+
// Material progress bar for loading indicators
54+
implementation 'me.zhanghai.android.materialprogressbar:library:1.4.2'
55+
5356
testImplementation 'junit:junit:4.12'
5457
//noinspection GradleDynamicVersion
5558
testImplementation 'org.mockito:mockito-core:2.15.+'
Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
2+
<!-- See InvisibleActivityBase -->
23
<FrameLayout
34
xmlns:android="http://schemas.android.com/apk/res/android"
5+
xmlns:tools="http://schemas.android.com/tools"
46
android:id="@+id/invisible_frame"
57
android:layout_width="match_parent"
6-
android:layout_height="match_parent">
7-
8-
<!-- See InvisibleActivityBase -->
9-
10-
</FrameLayout>
8+
android:layout_height="match_parent"
9+
tools:ignore="MergeRootFrame" />

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
android:layout_height="wrap_content"
1212
android:orientation="vertical">
1313

14-
<ProgressBar
14+
<me.zhanghai.android.materialprogressbar.MaterialProgressBar
1515
android:id="@+id/top_progress_bar"
1616
style="@style/FirebaseUI.TopProgressBar"
1717
android:visibility="invisible"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
android:layout_height="wrap_content"
1212
android:orientation="vertical">
1313

14-
<ProgressBar
14+
<me.zhanghai.android.materialprogressbar.MaterialProgressBar
1515
android:id="@+id/top_progress_bar"
1616
style="@style/FirebaseUI.TopProgressBar"
1717
android:visibility="invisible"

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,12 @@
55
android:layout_width="match_parent"
66
android:layout_height="match_parent">
77

8-
98
<LinearLayout
109
android:layout_width="match_parent"
1110
android:layout_height="wrap_content"
1211
android:orientation="vertical">
1312

14-
<ProgressBar
13+
<me.zhanghai.android.materialprogressbar.MaterialProgressBar
1514
android:id="@+id/top_progress_bar"
1615
style="@style/FirebaseUI.TopProgressBar"
1716
android:visibility="invisible"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
android:layout_height="wrap_content"
1212
android:orientation="vertical">
1313

14-
<ProgressBar
14+
<me.zhanghai.android.materialprogressbar.MaterialProgressBar
1515
android:id="@+id/top_progress_bar"
1616
style="@style/FirebaseUI.TopProgressBar"
1717
android:visibility="invisible"

auth/src/main/res/values/styles.xml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -230,11 +230,12 @@
230230
<item name="android:textColor">#FFFFFFFF</item>
231231
</style>
232232

233-
<style name="FirebaseUI.TopProgressBar" parent="Base.Widget.AppCompat.ProgressBar.Horizontal">
233+
<style name="FirebaseUI.TopProgressBar" parent="@style/Widget.MaterialProgressBar.ProgressBar.Horizontal">
234234
<item name="android:layout_width">match_parent</item>
235-
<item name="android:layout_height">wrap_content</item>
236-
<item name="android:layout_marginTop">-7dp</item>
235+
<item name="android:layout_height">4dp</item>
237236
<item name="android:indeterminate">true</item>
237+
<item name="mpb_progressStyle">horizontal</item>
238+
<item name="mpb_useIntrinsicPadding">false</item>
238239
</style>
239240

240241
</resources>

0 commit comments

Comments
 (0)