File tree Expand file tree Collapse file tree 7 files changed +15
-13
lines changed Expand file tree Collapse file tree 7 files changed +15
-13
lines changed Original file line number Diff line number Diff line change @@ -50,6 +50,9 @@ dependencies {
50
50
implementation " com.android.support:customtabs:$supportLibraryVersion "
51
51
compileOnly(" com.twitter.sdk.android:twitter-core:3.1.1@aar" ) { transitive = true }
52
52
53
+ // Material progress bar for loading indicators
54
+ implementation ' me.zhanghai.android.materialprogressbar:library:1.4.2'
55
+
53
56
testImplementation ' junit:junit:4.12'
54
57
// noinspection GradleDynamicVersion
55
58
testImplementation ' org.mockito:mockito-core:2.15.+'
Original file line number Diff line number Diff line change 1
1
<?xml version =" 1.0" encoding =" utf-8" ?>
2
+ <!-- See InvisibleActivityBase -->
2
3
<FrameLayout
3
4
xmlns : android =" http://schemas.android.com/apk/res/android"
5
+ xmlns : tools =" http://schemas.android.com/tools"
4
6
android : id =" @+id/invisible_frame"
5
7
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" />
Original file line number Diff line number Diff line change 11
11
android : layout_height =" wrap_content"
12
12
android : orientation =" vertical" >
13
13
14
- <ProgressBar
14
+ <me .zhanghai.android.materialprogressbar.MaterialProgressBar
15
15
android : id =" @+id/top_progress_bar"
16
16
style =" @style/FirebaseUI.TopProgressBar"
17
17
android : visibility =" invisible"
Original file line number Diff line number Diff line change 11
11
android : layout_height =" wrap_content"
12
12
android : orientation =" vertical" >
13
13
14
- <ProgressBar
14
+ <me .zhanghai.android.materialprogressbar.MaterialProgressBar
15
15
android : id =" @+id/top_progress_bar"
16
16
style =" @style/FirebaseUI.TopProgressBar"
17
17
android : visibility =" invisible"
Original file line number Diff line number Diff line change 5
5
android : layout_width =" match_parent"
6
6
android : layout_height =" match_parent" >
7
7
8
-
9
8
<LinearLayout
10
9
android : layout_width =" match_parent"
11
10
android : layout_height =" wrap_content"
12
11
android : orientation =" vertical" >
13
12
14
- <ProgressBar
13
+ <me .zhanghai.android.materialprogressbar.MaterialProgressBar
15
14
android : id =" @+id/top_progress_bar"
16
15
style =" @style/FirebaseUI.TopProgressBar"
17
16
android : visibility =" invisible"
Original file line number Diff line number Diff line change 11
11
android : layout_height =" wrap_content"
12
12
android : orientation =" vertical" >
13
13
14
- <ProgressBar
14
+ <me .zhanghai.android.materialprogressbar.MaterialProgressBar
15
15
android : id =" @+id/top_progress_bar"
16
16
style =" @style/FirebaseUI.TopProgressBar"
17
17
android : visibility =" invisible"
Original file line number Diff line number Diff line change 230
230
<item name =" android:textColor" >#FFFFFFFF</item >
231
231
</style >
232
232
233
- <style name =" FirebaseUI.TopProgressBar" parent =" Base. Widget.AppCompat .ProgressBar.Horizontal" >
233
+ <style name =" FirebaseUI.TopProgressBar" parent =" @style/ Widget.MaterialProgressBar .ProgressBar.Horizontal" >
234
234
<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 >
237
236
<item name =" android:indeterminate" >true</item >
237
+ <item name =" mpb_progressStyle" >horizontal</item >
238
+ <item name =" mpb_useIntrinsicPadding" >false</item >
238
239
</style >
239
240
240
241
</resources >
You can’t perform that action at this time.
0 commit comments