Added viewEditMode check in the progressDrawable builder. should fix c…

…astorflex#41
caspervice · Feb 23, 2015 · b644cd5 · b644cd5
1 parent 688c322
commit b644cd5
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 18 deletions.
diff --git a/...circular/src/main/java/fr.castorflex.android.circularprogressbar/CircularProgressBar.java b/...circular/src/main/java/fr.castorflex.android.circularprogressbar/CircularProgressBar.java
@@ -24,7 +24,7 @@ public CircularProgressBar(Context context, AttributeSet attrs, int defStyle) {
     super(context, attrs, defStyle);
 
     if (isInEditMode()) {
-      setIndeterminateDrawable(new CircularProgressDrawable.Builder(context).build());
+      setIndeterminateDrawable(new CircularProgressDrawable.Builder(context, true).build());
       return;
     }
 

diff --git a/...lar/src/main/java/fr.castorflex.android.circularprogressbar/CircularProgressDrawable.java b/...lar/src/main/java/fr.castorflex.android.circularprogressbar/CircularProgressDrawable.java
@@ -5,24 +5,24 @@
 import android.animation.ValueAnimator;
 import android.content.Context;
 import android.graphics.Canvas;
+import android.graphics.Color;
 import android.graphics.ColorFilter;
 import android.graphics.Paint;
 import android.graphics.PixelFormat;
 import android.graphics.Rect;
 import android.graphics.RectF;
 import android.graphics.drawable.Animatable;
 import android.graphics.drawable.Drawable;
-import android.util.Log;
 import android.view.animation.DecelerateInterpolator;
 import android.view.animation.Interpolator;
 import android.view.animation.LinearInterpolator;
 
 import static fr.castorflex.android.circularprogressbar.CircularProgressBarUtils.checkAngle;
-import static fr.castorflex.android.circularprogressbar.CircularProgressBarUtils.getAnimatedFraction;
 import static fr.castorflex.android.circularprogressbar.CircularProgressBarUtils.checkColors;
 import static fr.castorflex.android.circularprogressbar.CircularProgressBarUtils.checkNotNull;
 import static fr.castorflex.android.circularprogressbar.CircularProgressBarUtils.checkPositiveOrZero;
 import static fr.castorflex.android.circularprogressbar.CircularProgressBarUtils.checkSpeed;
+import static fr.castorflex.android.circularprogressbar.CircularProgressBarUtils.getAnimatedFraction;
 
 public class CircularProgressDrawable extends Drawable
     implements Animatable {
@@ -395,16 +395,26 @@ public static class Builder {
     private Interpolator mAngleInterpolator = DEFAULT_ROTATION_INTERPOLATOR;
 
     public Builder(Context context) {
-      initValues(context);
+      this(context, false);
     }
 
-    private void initValues(Context context) {
+    public Builder(Context context, boolean editMode) {
+      initValues(context, editMode);
+    }
+
+    private void initValues(Context context, boolean editMode) {
       mStrokeWidth = context.getResources().getDimension(R.dimen.cpb_default_stroke_width);
       mSweepSpeed = 1f;
       mRotationSpeed = 1f;
-      mColors = new int[]{context.getResources().getColor(R.color.cpb_default_color)};
-      mMinSweepAngle = context.getResources().getInteger(R.integer.cpb_default_min_sweep_angle);
-      mMaxSweepAngle = context.getResources().getInteger(R.integer.cpb_default_max_sweep_angle);
+      if (editMode) {
+        mColors = new int[]{Color.BLUE};
+        mMinSweepAngle = 20;
+        mMaxSweepAngle = 300;
+      } else {
+        mColors = new int[]{context.getResources().getColor(R.color.cpb_default_color)};
+        mMinSweepAngle = context.getResources().getInteger(R.integer.cpb_default_min_sweep_angle);
+        mMaxSweepAngle = context.getResources().getInteger(R.integer.cpb_default_max_sweep_angle);
+      }
       mStyle = Style.ROUNDED;
     }
 

diff --git a/library/src/main/java/fr/castorflex/android/smoothprogressbar/SmoothProgressBar.java b/library/src/main/java/fr/castorflex/android/smoothprogressbar/SmoothProgressBar.java
@@ -35,7 +35,7 @@ public SmoothProgressBar(Context context, AttributeSet attrs, int defStyle) {
     super(context, attrs, defStyle);
 
     if (isInEditMode()) {
-      setIndeterminateDrawable(new SmoothProgressDrawable.Builder(context).build());
+      setIndeterminateDrawable(new SmoothProgressDrawable.Builder(context, true).build());
       return;
     }
 

diff --git a/library/src/main/java/fr/castorflex/android/smoothprogressbar/SmoothProgressDrawable.java b/library/src/main/java/fr/castorflex/android/smoothprogressbar/SmoothProgressDrawable.java
@@ -626,7 +626,11 @@ public static class Builder {
     private Callbacks mOnProgressiveStopEndedListener;
 
     public Builder(Context context) {
-      initValues(context);
+      this(context, false);
+    }
+
+    public Builder(Context context, boolean editMode) {
+      initValues(context, editMode);
     }
 
     public SmoothProgressDrawable build() {
@@ -651,18 +655,28 @@ public SmoothProgressDrawable build() {
       return ret;
     }
 
-    private void initValues(Context context) {
+    private void initValues(Context context, boolean editMode) {
       Resources res = context.getResources();
       mInterpolator = new AccelerateInterpolator();
-      mSectionsCount = res.getInteger(R.integer.spb_default_sections_count);
-      mColors = new int[]{res.getColor(R.color.spb_default_color)};
-      mSpeed = Float.parseFloat(res.getString(R.string.spb_default_speed));
+      if (!editMode) {
+        mSectionsCount = res.getInteger(R.integer.spb_default_sections_count);
+        mSpeed = Float.parseFloat(res.getString(R.string.spb_default_speed));
+        mReversed = res.getBoolean(R.bool.spb_default_reversed);
+        mProgressiveStartActivated = res.getBoolean(R.bool.spb_default_progressiveStart_activated);
+        mColors = new int[]{res.getColor(R.color.spb_default_color)};
+        mStrokeSeparatorLength = res.getDimensionPixelSize(R.dimen.spb_default_stroke_separator_length);
+        mStrokeWidth = res.getDimensionPixelOffset(R.dimen.spb_default_stroke_width);
+      } else {
+        mSectionsCount = 4;
+        mSpeed = 1f;
+        mReversed = false;
+        mProgressiveStartActivated = false;
+        mColors = new int[]{0xff33b5e5};
+        mStrokeSeparatorLength = 4;
+        mStrokeWidth = 4;
+      }
       mProgressiveStartSpeed = mSpeed;
       mProgressiveStopSpeed = mSpeed;
-      mReversed = res.getBoolean(R.bool.spb_default_reversed);
-      mStrokeSeparatorLength = res.getDimensionPixelSize(R.dimen.spb_default_stroke_separator_length);
-      mStrokeWidth = res.getDimensionPixelOffset(R.dimen.spb_default_stroke_width);
-      mProgressiveStartActivated = res.getBoolean(R.bool.spb_default_progressiveStart_activated);
       mGradients = false;
     }