exceeding max progress fix

Schibsted-Tech-Polska · Oct 14, 2015 · 6c44f04 · 6c44f04
1 parent c329adb
commit 6c44f04
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 4 deletions.
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/library/build.gradle b/library/build.gradle
@@ -8,8 +8,8 @@ android {
     defaultConfig {
         minSdkVersion 14
         targetSdkVersion 22
-        versionCode 7
-        versionName "1.0.6"
+        versionCode 8
+        versionName "1.0.7"
     }
     buildTypes {
         release {

diff --git a/library/src/main/java/pl/schibsted/roundoverlayprogress/RoundOverlayProgressView.java b/library/src/main/java/pl/schibsted/roundoverlayprogress/RoundOverlayProgressView.java
@@ -68,7 +68,7 @@ private void init(AttributeSet attrs) {
         int src = attrs.getAttributeResourceValue("http://schemas.android.com/apk/res/android", "src", 0);
         BitmapDrawable bitmapDrawable = (BitmapDrawable) getResources().getDrawable(src);
 
-        progressColor = a.getColor(R.styleable.RoundOverlayProgressView_progressColor, R.color.default_progress);
+        progressColor = a.getColor(R.styleable.RoundOverlayProgressView_progressColor, getResources().getColor(R.color.default_progress));
         maxProgress = a.getInteger(R.styleable.RoundOverlayProgressView_maxProgress, 100);
         animationDuration = a.getInteger(R.styleable.RoundOverlayProgressView_animationDuration, 300);
         animate = a.getBoolean(R.styleable.RoundOverlayProgressView_animate, true);
@@ -127,6 +127,8 @@ private float calculateStartAngle(int progress) {
     }
 
     public void setProgress(int newProgress) {
+        if (newProgress > maxProgress) newProgress = maxProgress;
+
         if (animate) {
             ObjectAnimator anim = ObjectAnimator.ofInt(this, "currentProgress", currentProgress, newProgress);
             anim.setDuration(animationDuration);