Skip to content

Commit 1909145

Browse files
zhanghaizhanghai
committed
Add tinting to sample.
1 parent 95541b1 commit 1909145

File tree

3 files changed

+42
-12
lines changed

3 files changed

+42
-12
lines changed

‎sample/src/main/res/layout/main_activity.xml

+31-12
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737
android:textAppearance="@style/TextAppearance.AppCompat.Caption" />
3838

3939
<ProgressBar
40-
android:id="@+id/horizontal_progress_native"
4140
android:layout_width="match_parent"
4241
android:layout_height="wrap_content"
4342
android:progress="30"
@@ -51,14 +50,30 @@
5150
android:textAppearance="@style/TextAppearance.AppCompat.Caption" />
5251

5352
<me.zhanghai.android.materialprogressbar.MaterialProgressBar
54-
android:id="@+id/horizontal_progress_library"
5553
android:layout_width="match_parent"
5654
android:layout_height="wrap_content"
5755
android:progress="30"
5856
android:secondaryProgress="60"
5957
app:mpb_progressStyle="horizontal"
6058
style="@style/Widget.MaterialProgressBar.ProgressBar.Horizontal" />
6159

60+
<TextView
61+
android:text="@string/library_implementation_tinted"
62+
android:layout_width="match_parent"
63+
android:layout_height="wrap_content"
64+
android:textAppearance="@style/TextAppearance.AppCompat.Caption" />
65+
66+
<me.zhanghai.android.materialprogressbar.MaterialProgressBar
67+
android:layout_width="match_parent"
68+
android:layout_height="wrap_content"
69+
android:progress="30"
70+
android:secondaryProgress="60"
71+
app:mpb_progressStyle="horizontal"
72+
app:mpb_progressTint="@color/tint"
73+
app:mpb_secondaryProgressTint="@color/tint"
74+
app:mpb_progressBackgroundTint="@color/tint"
75+
style="@style/Widget.MaterialProgressBar.ProgressBar.Horizontal" />
76+
6277
<!-- Indeterminate horizontal progress -->
6378

6479
<TextView
@@ -74,7 +89,6 @@
7489
android:textAppearance="@style/TextAppearance.AppCompat.Caption" />
7590

7691
<ProgressBar
77-
android:id="@+id/indeterminate_horizontal_progress_native"
7892
android:layout_width="match_parent"
7993
android:layout_height="wrap_content"
8094
android:indeterminate="true"
@@ -87,13 +101,26 @@
87101
android:textAppearance="@style/TextAppearance.AppCompat.Caption" />
88102

89103
<me.zhanghai.android.materialprogressbar.MaterialProgressBar
90-
android:id="@+id/indeterminate_horizontal_progress_library"
91104
android:layout_width="match_parent"
92105
android:layout_height="wrap_content"
93106
android:indeterminate="true"
94107
app:mpb_progressStyle="horizontal"
95108
style="@style/Widget.MaterialProgressBar.ProgressBar.Horizontal" />
96109

110+
<TextView
111+
android:text="@string/library_implementation_tinted"
112+
android:layout_width="match_parent"
113+
android:layout_height="wrap_content"
114+
android:textAppearance="@style/TextAppearance.AppCompat.Caption" />
115+
116+
<me.zhanghai.android.materialprogressbar.MaterialProgressBar
117+
android:layout_width="match_parent"
118+
android:layout_height="wrap_content"
119+
android:indeterminate="true"
120+
app:mpb_progressStyle="horizontal"
121+
app:mpb_indeterminateTint="@color/tint"
122+
style="@style/Widget.MaterialProgressBar.ProgressBar.Horizontal" />
123+
97124
<!-- Indeterminate progress -->
98125

99126
<TextView
@@ -113,23 +140,20 @@
113140
android:layout_height="wrap_content">
114141

115142
<ProgressBar
116-
android:id="@+id/indeterminate_progress_large_native"
117143
android:layout_width="wrap_content"
118144
android:layout_height="wrap_content"
119145
android:layout_gravity="left|bottom"
120146
android:indeterminate="true"
121147
style="?android:progressBarStyleLarge" />
122148

123149
<ProgressBar
124-
android:id="@+id/indeterminate_progress_native"
125150
android:layout_width="wrap_content"
126151
android:layout_height="wrap_content"
127152
android:layout_gravity="center_horizontal|bottom"
128153
android:indeterminate="true"
129154
style="?android:progressBarStyle" />
130155

131156
<ProgressBar
132-
android:id="@+id/indeterminate_progress_small_native"
133157
android:layout_width="wrap_content"
134158
android:layout_height="wrap_content"
135159
android:layout_gravity="right|bottom"
@@ -148,23 +172,20 @@
148172
android:layout_height="wrap_content">
149173

150174
<me.zhanghai.android.materialprogressbar.MaterialProgressBar
151-
android:id="@+id/indeterminate_progress_large_library"
152175
android:layout_width="wrap_content"
153176
android:layout_height="wrap_content"
154177
android:layout_gravity="left|bottom"
155178
android:indeterminate="true"
156179
style="@style/Widget.MaterialProgressBar.ProgressBar.Large" />
157180

158181
<me.zhanghai.android.materialprogressbar.MaterialProgressBar
159-
android:id="@+id/indeterminate_progress_library"
160182
android:layout_width="wrap_content"
161183
android:layout_height="wrap_content"
162184
android:layout_gravity="center_horizontal|bottom"
163185
android:indeterminate="true"
164186
style="@style/Widget.MaterialProgressBar.ProgressBar" />
165187

166188
<me.zhanghai.android.materialprogressbar.MaterialProgressBar
167-
android:id="@+id/indeterminate_progress_small_library"
168189
android:layout_width="wrap_content"
169190
android:layout_height="wrap_content"
170191
android:layout_gravity="right|bottom"
@@ -204,7 +225,6 @@
204225
</FrameLayout>
205226

206227
<me.zhanghai.android.materialprogressbar.MaterialProgressBar
207-
android:id="@+id/horizontal_progress_toolbar"
208228
android:layout_width="match_parent"
209229
android:layout_height="wrap_content"
210230
android:layout_gravity="bottom"
@@ -240,7 +260,6 @@
240260
</FrameLayout>
241261

242262
<me.zhanghai.android.materialprogressbar.MaterialProgressBar
243-
android:id="@+id/indeterminate_horizontal_progress_toolbar"
244263
android:layout_width="match_parent"
245264
android:layout_height="wrap_content"
246265
android:layout_gravity="bottom"

‎sample/src/main/res/values/colors.xml

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
3+
<!--
4+
~ Copyright (c) 2016 Zhang Hai <[email protected]>
5+
~ All Rights Reserved.
6+
-->
7+
8+
<resources>
9+
<color name="tint">#f44336</color>
10+
</resources>

‎sample/src/main/res/values/strings.xml

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
<string name="native_implementation">Native Implementation</string>
1313
<string name="library_implementation">Library Implementation</string>
14+
<string name="library_implementation_tinted">Library Implementation (Tinted)</string>
1415
<string name="horizontal_progress">Horizontal ProgressBar</string>
1516
<string name="indeterminate_horizontal_progress">Indeterminate Horizontal ProgressBar</string>
1617
<string name="indeterminate_progress">Indeterminate ProgressBar</string>

0 commit comments

Comments
 (0)