commit

GreatGarlic · GreatGarlic · commit 32692377ee87 · 2016-07-29T16:34:32.000+08:00
diff --git a/library/src/main/java/me/itangqi/waveloadingview/WaveLoadingView.java b/library/src/main/java/me/itangqi/waveloadingview/WaveLoadingView.java
@@ -46,6 +46,7 @@ public class WaveLoadingView extends View {
     private static final float DEFAULT_WAVE_SHIFT_RATIO = 0.0f;
     private static final int DEFAULT_WAVE_PROGRESS_VALUE = 50;
     private static final int DEFAULT_WAVE_COLOR = Color.parseColor("#212121");
+    private static final int DEFAULT_WAVE_BACKGROUND_COLOR = Color.parseColor("#00000000");
     private static final int DEFAULT_TITLE_COLOR = Color.parseColor("#212121");
     private static final int DEFAULT_STROKE_COLOR = Color.TRANSPARENT;
     private static final float DEFAULT_BORDER_WIDTH = 0;
@@ -77,6 +78,7 @@ public enum TriangleDirection {
     private int mCanvasHeight;
     private int mCanvasWidth;
     private float mAmplitudeRatio;
+    private int mWaveBgColor;
     private int mWaveColor;
     private int mShapeType;
     private int mTriangleDirection;
@@ -100,6 +102,8 @@ public enum TriangleDirection {
     private Matrix mShaderMatrix;
     // Paint to draw wave.
     private Paint mWavePaint;
+    //Paint to draw waveBackground.
+    private Paint mWaveBgPaint;
     // Paint to draw border.
     private Paint mBorderPaint;
     // Point to draw title.
@@ -138,7 +142,8 @@ private void init(Context context, AttributeSet attrs, int defStyleAttr) {
         // The ANTI_ALIAS_FLAG bit AntiAliasing smooths out the edges of what is being drawn,
         // but is has no impact on the interior of the shape.
         mWavePaint.setAntiAlias(true);
-
+        mWaveBgPaint = new Paint();
+        mWaveBgPaint.setAntiAlias(true);
         // Init Animation
         initAnimation();
 
@@ -150,6 +155,9 @@ private void init(Context context, AttributeSet attrs, int defStyleAttr) {
 
         // Init Wave
         mWaveColor = attributes.getColor(R.styleable.WaveLoadingView_wlv_waveColor, DEFAULT_WAVE_COLOR);
+        mWaveBgColor = attributes.getColor(R.styleable.WaveLoadingView_wlv_wave_background_Color, DEFAULT_WAVE_BACKGROUND_COLOR);
+
+        mWaveBgPaint.setColor(mWaveBgColor);
 
         // Init AmplitudeRatio
         float amplitudeRatioAttr = attributes.getFloat(R.styleable.WaveLoadingView_wlv_waveAmplitude, DEFAULT_AMPLITUDE_VALUE) / 1000;
@@ -267,7 +275,10 @@ public void onDraw(Canvas canvas) {
                         canvas.drawCircle(getWidth() / 2f, getHeight() / 2f,
                                 (getWidth() - borderWidth) / 2f - 1f, mBorderPaint);
                     }
+
                     float radius = getWidth() / 2f - borderWidth;
+                    // Draw background
+                    canvas.drawCircle(getWidth() / 2f, getHeight() / 2f, radius, mWaveBgPaint);
                     canvas.drawCircle(getWidth() / 2f, getHeight() / 2f, radius, mWavePaint);
                     break;
                 // Draw square
@@ -288,12 +299,12 @@ public void onDraw(Canvas canvas) {
                     if (mIsRoundRectangle) {
                         if (borderWidth > 0) {
                             RectF rect = new RectF(borderWidth / 2f, borderWidth / 2f, getWidth() - borderWidth / 2f - 0.5f, getHeight() - borderWidth / 2f - 0.5f);
-                            canvas.drawRoundRect(rect, mRoundRectangleXY, mRoundRectangleXY,  mWavePaint);
+                            canvas.drawRoundRect(rect, mRoundRectangleXY, mRoundRectangleXY, mWavePaint);
                         } else {
                             RectF rect = new RectF(0, 0, getWidth(), getHeight());
-                            canvas.drawRoundRect(rect, mRoundRectangleXY, mRoundRectangleXY,  mWavePaint);
+                            canvas.drawRoundRect(rect, mRoundRectangleXY, mRoundRectangleXY, mWavePaint);
                         }
-                    }else {
+                    } else {
                         if (borderWidth > 0) {
                             canvas.drawRect(borderWidth / 2f, borderWidth / 2f, getWidth() - borderWidth / 2f - 0.5f, getHeight() - borderWidth / 2f - 0.5f, mWavePaint);
                         } else {
@@ -359,11 +370,11 @@ private void updateWaveShader() {
         // IllegalArgumentException: width and height must be > 0 while loading Bitmap from View
         // http://stackoverflow.com/questions/17605662/illegalargumentexception-width-and-height-must-be-0-while-loading-bitmap-from
         if (bitmapBuffer == null || haveBoundsChanged()) {
-            if(bitmapBuffer != null)
+            if (bitmapBuffer != null)
                 bitmapBuffer.recycle();
             int width = getMeasuredWidth();
             int height = getMeasuredHeight();
-            if(width > 0 && height > 0) {
+            if (width > 0 && height > 0) {
                 double defaultAngularFrequency = 2.0f * Math.PI / DEFAULT_WAVE_LENGTH_RATIO / width;
                 float defaultAmplitude = height * DEFAULT_AMPLITUDE_RATIO;
                 mDefaultWaterLevel = height * DEFAULT_WATER_LEVEL_RATIO;
@@ -459,6 +470,15 @@ private int measureHeight(int measureSpecHeight) {
         return (result + 2);
     }
 
+
+    public void setWaveBgColor(int color) {
+        this.mWaveBgColor = color;
+    }
+
+    public int getWaveBgColor() {
+        return mWaveBgColor;
+    }
+
     public void setWaveColor(int color) {
         mWaveColor = color;
         // Need to recreate shader when color changed ?
@@ -726,9 +746,10 @@ private int dp2px(float dp) {
 
     /**
      * Draw EquilateralTriangle
-     * @param p1 Start point
-     * @param width The width of triangle
-     * @param height The height of triangle
+     *
+     * @param p1        Start point
+     * @param width     The width of triangle
+     * @param height    The height of triangle
      * @param direction The direction of triangle
      * @return Path
      */
diff --git a/library/src/main/res/values/attrs.xml b/library/src/main/res/values/attrs.xml
@@ -20,6 +20,7 @@
         <attr name="wlv_round_rectangle" format="boolean"/>
         <attr name="wlv_round_rectangle_x_and_y" format="integer"/>
         <attr name="wlv_waveColor" format="color"/>
+        <attr name="wlv_wave_background_Color" format="color"/>
         <attr name="wlv_waveAmplitude" format="float"/>
         <attr name="wlv_titleTop" format="string"/>
         <attr name="wlv_titleCenter" format="string"/>
diff --git a/sample/src/main/res/layout/activity_main.xml b/sample/src/main/res/layout/activity_main.xml
@@ -21,6 +21,7 @@
             app:wlv_borderWidth="3dp"
             app:wlv_progressValue="40"
             app:wlv_shapeType="circle"
+            app:wlv_wave_background_Color="@android:color/holo_blue_light"
             app:wlv_round_rectangle="true"
             app:wlv_triangle_direction="north"
             app:wlv_titleCenter="Center Title"
