Draw ring effect with Path.lineTo

dvg4000 · dvg4000 · commit bc152b12fb3b · 2017-10-27T15:28:40.000+03:00
diff --git a/circle-menu/src/main/java/com/ramotion/circlemenu/CircleMenuView.java b/circle-menu/src/main/java/com/ramotion/circlemenu/CircleMenuView.java
@@ -284,6 +284,11 @@ protected void onLayout(boolean changed, int left, int top, int right, int botto
 
         mRingView.setStrokeWidth(mButtonRect.width());
         mRingView.setRadius(mRingRadius);
+
+        final LayoutParams lp = (LayoutParams) mRingView.getLayoutParams();//new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT);
+        lp.width = right - left;
+        lp.height = bottom - top;
+        mRingView.setLayoutParams(lp);
     }
 
     @Override
@@ -314,10 +319,11 @@ public void onAnimationEnd(Animator animation) {
     private Animator getButtonClickAnimation(final @NonNull FloatingActionButton button) {
         final int buttonNumber = mButtons.indexOf(button) + 1;
         final float stepAngle = 360f / mButtons.size();
-        final float startAngle = -90 - stepAngle + stepAngle * buttonNumber;
+        final float rOStartAngle = (270 - stepAngle + stepAngle * buttonNumber);
+        final float rStartAngle = rOStartAngle > 360 ? rOStartAngle % 360 : rOStartAngle;
 
-        final float x = (float) Math.cos(Math.toRadians(startAngle)) * mDistance;
-        final float y = (float) Math.sin(Math.toRadians(startAngle)) * mDistance;
+        final float x = (float) Math.cos(Math.toRadians(rStartAngle)) * mDistance;
+        final float y = (float) Math.sin(Math.toRadians(rStartAngle)) * mDistance;
 
         final float pivotX = button.getPivotX();
         final float pivotY = button.getPivotY();
@@ -336,8 +342,7 @@ public void onAnimationEnd(Animator animation) {
         final float elevation = mMenuButton.getCompatElevation();
 
         mRingView.setVisibility(View.INVISIBLE);
-        mRingView.setStartAngle(startAngle);
-        mRingView.setAngle(0);
+        mRingView.setStartAngle(rStartAngle);
 
         final ColorStateList csl = button.getBackgroundTintList();
         if (csl != null) {
diff --git a/circle-menu/src/main/java/com/ramotion/circlemenu/RingEffectView.java b/circle-menu/src/main/java/com/ramotion/circlemenu/RingEffectView.java
@@ -3,7 +3,7 @@
 import android.content.Context;
 import android.graphics.Canvas;
 import android.graphics.Paint;
-import android.graphics.RectF;
+import android.graphics.Path;
 import android.support.annotation.FloatRange;
 import android.support.annotation.Nullable;
 import android.util.AttributeSet;
@@ -12,9 +12,10 @@
 
 public class RingEffectView extends View {
 
-    private final Paint mPaint;
+    private static final int STEP_DEGREE = 5;
 
-    private RectF mRingRect;
+    private final Paint mPaint;
+    private final Path mPath = new Path();
 
     private float mAngle;
     private float mStartAngle;
@@ -35,8 +36,12 @@ public RingEffectView(Context context, @Nullable AttributeSet attrs) {
     @Override
     protected void onDraw(Canvas canvas) {
         super.onDraw(canvas);
-        if (mRingRect != null) {
-            canvas.drawArc(mRingRect, mStartAngle, mAngle, false, mPaint);
+
+        if (!mPath.isEmpty()) {
+            canvas.save();
+            canvas.translate(getWidth() / 2, getHeight() / 2);
+            canvas.drawPath(mPath, mPaint);
+            canvas.restore();
         }
     }
 
@@ -56,7 +61,27 @@ public float getAngle() {
     }
 
     public void setAngle(@FloatRange(from = 0.0, to = 360.0) float angle) {
+        final float diff = angle - mAngle;
+        final int stepCount = (int) (diff / STEP_DEGREE);
+        final float stepMod = diff % STEP_DEGREE;
+
+        final float sw = mPaint.getStrokeWidth() * 0.5f;
+        final float radius = mRadius - sw;
+
+        for (int i = 1; i <= stepCount; i++ ) {
+            final float stepAngel = mStartAngle + mAngle + STEP_DEGREE * i;
+            final float x = (float) Math.cos(Math.toRadians(stepAngel)) * radius;
+            final float y = (float) Math.sin(Math.toRadians(stepAngel)) * radius;
+            mPath.lineTo(x, y);
+        }
+
+        final float stepAngel = mStartAngle + mAngle + STEP_DEGREE * stepCount + stepMod;
+        final float x = (float) Math.cos(Math.toRadians(stepAngel)) * radius;
+        final float y = (float) Math.sin(Math.toRadians(stepAngel)) * radius;
+        mPath.lineTo(x, y);
+
         mAngle = angle;
+
         invalidate();
     }
 
@@ -66,6 +91,15 @@ public float getStartAngle() {
 
     public void setStartAngle(@FloatRange(from = 0.0, to = 360.0) float startAngle) {
         mStartAngle = startAngle;
+        mAngle = 0;
+
+        final float sw = mPaint.getStrokeWidth() * 0.5f;
+        final float radius = mRadius - sw;
+
+        mPath.reset();
+        final float x = (float) Math.cos(Math.toRadians(startAngle)) * radius;
+        final float y = (float) Math.sin(Math.toRadians(startAngle)) * radius;
+        mPath.moveTo(x, y);
     }
 
     public void setStrokeColor(int color) {
@@ -78,15 +112,6 @@ public void setStrokeWidth(int width) {
 
     public void setRadius(int radius) {
         mRadius = radius;
-        final int w = getMeasuredWidth();
-        final int h = getMeasuredHeight();
-
-        final int wo = (w - radius * 2) / 2;
-        final int ho = (h - radius * 2) / 2;
-
-        final float sw = mPaint.getStrokeWidth() * 0.5f;
-
-        mRingRect = new RectF(wo + sw, ho + sw, w - wo - sw, h - ho - sw);
     }
 
     public int getRadius() {
