From 7db62ac3f5e0b02571ddb8c7b9ad218179bf4899 Mon Sep 17 00:00:00 2001 From: Zhang Hai Date: Sun, 4 Oct 2015 00:15:56 +0800 Subject: [PATCH] Use custom tintMode attribute instead of API 21's. --- README.md | 2 +- art/app_icon_base.sh | 0 library/library.iml | 3 +++ .../android/materialprogressbar/MaterialProgressBar.java | 4 ++-- library/src/main/res/values/attrs.xml | 2 +- sample/sample.iml | 3 +++ 6 files changed, 10 insertions(+), 4 deletions(-) mode change 100644 => 100755 art/app_icon_base.sh diff --git a/README.md b/README.md index 45cfc9c..910476a 100644 --- a/README.md +++ b/README.md @@ -60,7 +60,7 @@ Available custom attributes: - `app:mpb_useIntrinsicPadding`: Whether progress drawable should use its intrinsic padding. Defaults to `true`. - `app:mpb_showTrack`: Whether progress drawable should show a track. Defaults to `true` for horizontal progress drawable, `false` otherwise. -`android:tint` and `android:tintMode` are also backported so that they can control the tinting of progress drawables. The default tint color is `?colorControlActivated`, and the default tint mode is `src_in`. +`android:tint` and `app:mpb_tintMode` are also backported so that they can control the tinting of progress drawables. The default tint color is `?colorControlActivated`, and the default tint mode is `src_in`. ### Using Drawable diff --git a/art/app_icon_base.sh b/art/app_icon_base.sh old mode 100644 new mode 100755 diff --git a/library/library.iml b/library/library.iml index d36114d..c83dff5 100644 --- a/library/library.iml +++ b/library/library.iml @@ -89,6 +89,9 @@ + + + diff --git a/library/src/main/java/me/zhanghai/android/materialprogressbar/MaterialProgressBar.java b/library/src/main/java/me/zhanghai/android/materialprogressbar/MaterialProgressBar.java index fe0c47e..662640d 100644 --- a/library/src/main/java/me/zhanghai/android/materialprogressbar/MaterialProgressBar.java +++ b/library/src/main/java/me/zhanghai/android/materialprogressbar/MaterialProgressBar.java @@ -76,9 +76,9 @@ private void init(Context context, AttributeSet attrs, int defStyleAttr, int def R.styleable.MaterialProgressBar_android_tint); mProgressTint.mHasTintList = true; } - if (a.hasValue(R.styleable.MaterialProgressBar_android_tintMode)) { + if (a.hasValue(R.styleable.MaterialProgressBar_mpb_tintMode)) { mProgressTint.mTintMode = DrawableCompat.parseTintMode(a.getInt( - R.styleable.MaterialProgressBar_android_tintMode, -1), null); + R.styleable.MaterialProgressBar_mpb_tintMode, -1), null); mProgressTint.mHasTintMode = true; } a.recycle(); diff --git a/library/src/main/res/values/attrs.xml b/library/src/main/res/values/attrs.xml index 3da8276..17ae6e2 100644 --- a/library/src/main/res/values/attrs.xml +++ b/library/src/main/res/values/attrs.xml @@ -25,6 +25,6 @@ --> - + diff --git a/sample/sample.iml b/sample/sample.iml index f2c857a..e88e614 100644 --- a/sample/sample.iml +++ b/sample/sample.iml @@ -84,6 +84,9 @@ + + +