From 922fd1d85920410a518ee288e26be4206e91feb8 Mon Sep 17 00:00:00 2001
From: Alireza Afkar <afkar@divar.ir>
Date: Fri, 9 Jul 2021 04:48:53 +0430
Subject: [PATCH 1/3] Fix crash when wheelItems list is empty

---
 .../main/java/com/bluehomestudio/luckywheel/WheelView.java   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/luckywheel/src/main/java/com/bluehomestudio/luckywheel/WheelView.java b/luckywheel/src/main/java/com/bluehomestudio/luckywheel/WheelView.java
index e878ca3..c3835bc 100644
--- a/luckywheel/src/main/java/com/bluehomestudio/luckywheel/WheelView.java
+++ b/luckywheel/src/main/java/com/bluehomestudio/luckywheel/WheelView.java
@@ -237,7 +237,10 @@ protected void onDraw(Canvas canvas) {
         initComponents();
 
         float tempAngle = 0;
-        float sweepAngle = 360 / mWheelItems.size();
+        float sweepAngle = 360;
+        if (!mWheelItems.isEmpty()) {
+            sweepAngle = 360f / mWheelItems.size();
+        }
 
         for (int i = 0; i < mWheelItems.size(); i++) {
             archPaint.setColor(mWheelItems.get(i).color);

From 1e27aa1ae13d9d0bcc8d9c75c7316f89eb800f5f Mon Sep 17 00:00:00 2001
From: Alireza Afkar <afkar@divar.ir>
Date: Fri, 9 Jul 2021 04:49:29 +0430
Subject: [PATCH 2/3] Add textSize & typeface to WheelView

---
 .../luckywheeldemo/MainActivity.java          | 27 +++++----
 app/src/main/res/layout/activity_main.xml     | 20 +++----
 .../bluehomestudio/luckywheel/LuckyWheel.java | 13 ++++-
 .../OnLuckyWheelReachTheTarget.java           |  2 +-
 .../bluehomestudio/luckywheel/WheelItem.java  | 13 ++++-
 .../bluehomestudio/luckywheel/WheelView.java  | 56 +++++++++++++------
 luckywheel/src/main/res/values/attrs.xml      |  4 +-
 7 files changed, 87 insertions(+), 48 deletions(-)

diff --git a/app/src/main/java/com/bluehomestudio/luckywheeldemo/MainActivity.java b/app/src/main/java/com/bluehomestudio/luckywheeldemo/MainActivity.java
index a9f344c..817d98b 100644
--- a/app/src/main/java/com/bluehomestudio/luckywheeldemo/MainActivity.java
+++ b/app/src/main/java/com/bluehomestudio/luckywheeldemo/MainActivity.java
@@ -7,8 +7,6 @@
 import android.widget.Button;
 import android.widget.Toast;
 
-import androidx.appcompat.app.AppCompatActivity;
-
 import com.bluehomestudio.luckywheel.LuckyWheel;
 import com.bluehomestudio.luckywheel.OnLuckyWheelReachTheTarget;
 import com.bluehomestudio.luckywheel.WheelItem;
@@ -16,10 +14,12 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import androidx.appcompat.app.AppCompatActivity;
+
 public class MainActivity extends AppCompatActivity {
 
     private LuckyWheel lw;
-    List<WheelItem> wheelItems ;
+    List<WheelItem> wheelItems;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -35,8 +35,8 @@ protected void onCreate(Bundle savedInstanceState) {
 
         lw.setLuckyWheelReachTheTarget(new OnLuckyWheelReachTheTarget() {
             @Override
-            public void onReachTarget() {
-                Toast.makeText(MainActivity.this, "Target Reached", Toast.LENGTH_LONG).show();
+            public void onReachTarget(WheelItem item) {
+                Toast.makeText(MainActivity.this, "Target Reached " + item.text, Toast.LENGTH_LONG).show();
             }
         });
 
@@ -44,7 +44,7 @@ public void onReachTarget() {
         start.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                lw.rotateWheelTo(1);
+                lw.rotateWheelTo(5);
             }
         });
 
@@ -52,17 +52,16 @@ public void onClick(View v) {
 
     private void generateWheelItems() {
         wheelItems = new ArrayList<>();
-        wheelItems.add(new WheelItem(Color.parseColor("#fc6c6c"), BitmapFactory.decodeResource(getResources(),
-                R.drawable.chat) , "100 $"));
-        wheelItems.add(new WheelItem(Color.parseColor("#00E6FF"), BitmapFactory.decodeResource(getResources(),
-                R.drawable.coupon) , "0 $"));
-        wheelItems.add(new WheelItem(Color.parseColor("#F00E6F"), BitmapFactory.decodeResource(getResources(),
+        wheelItems.add(new WheelItem(1, Color.parseColor("#fc6c6c"), BitmapFactory.decodeResource(getResources(),
+                R.drawable.chat), "100 $"));
+        wheelItems.add(new WheelItem(2, Color.parseColor("#00E6FF"), "0 $"));
+        wheelItems.add(new WheelItem(3, Color.parseColor("#F00E6F"), BitmapFactory.decodeResource(getResources(),
                 R.drawable.ice_cream), "30 $"));
-        wheelItems.add(new WheelItem(Color.parseColor("#00E6FF"), BitmapFactory.decodeResource(getResources(),
+        wheelItems.add(new WheelItem(4, Color.parseColor("#00E6FF"), BitmapFactory.decodeResource(getResources(),
                 R.drawable.lemonade), "6000 $"));
-        wheelItems.add(new WheelItem(Color.parseColor("#fc6c6c"), BitmapFactory.decodeResource(getResources(),
+        wheelItems.add(new WheelItem(5, Color.parseColor("#fc6c6c"), BitmapFactory.decodeResource(getResources(),
                 R.drawable.orange), "9 $"));
-        wheelItems.add(new WheelItem(Color.parseColor("#00E6FF"), BitmapFactory.decodeResource(getResources(),
+        wheelItems.add(new WheelItem(6, Color.parseColor("#00E6FF"), BitmapFactory.decodeResource(getResources(),
                 R.drawable.shop), "20 $"));
     }
 }
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 1ccb442..1cae2b5 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,19 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:LuckyWheel="http://schemas.android.com/apk/res-auto"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context="com.bluehomestudio.luckywheeldemo.MainActivity">
 
-    <com.bluehomestudio.luckywheel.LuckyWheel
-        android:id="@+id/lwv"
-        android:layout_width="250dp"
-        android:layout_height="250dp"
-        android:layout_centerInParent="true"
-        LuckyWheel:background_color="@color/colorPrimary" />
-
     <Button
         android:id="@+id/start"
         android:layout_width="match_parent"
@@ -21,7 +13,15 @@
         android:layout_alignParentBottom="true"
         android:layout_margin="10dp"
         android:background="#00E6FF"
-        android:textColor="@android:color/white"
-        android:text="@string/start"/>
+        android:text="@string/start"
+        android:textColor="@android:color/white" />
+
+    <com.bluehomestudio.luckywheel.LuckyWheel
+        android:id="@+id/lwv"
+        android:layout_width="250dp"
+        android:layout_height="250dp"
+        android:layout_centerInParent="true"
+        LuckyWheel:background_color="@color/colorPrimary"
+        LuckyWheel:text_size="16dp" />
 
 </RelativeLayout>
diff --git a/luckywheel/src/main/java/com/bluehomestudio/luckywheel/LuckyWheel.java b/luckywheel/src/main/java/com/bluehomestudio/luckywheel/LuckyWheel.java
index 5398bd7..6e4edc0 100644
--- a/luckywheel/src/main/java/com/bluehomestudio/luckywheel/LuckyWheel.java
+++ b/luckywheel/src/main/java/com/bluehomestudio/luckywheel/LuckyWheel.java
@@ -9,11 +9,12 @@
 import android.widget.FrameLayout;
 import android.widget.ImageView;
 
+import java.util.List;
+
 import androidx.annotation.AttrRes;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-
-import java.util.List;
+import androidx.core.content.res.ResourcesCompat;
 
 /**
  * Created by mohamed on 22/04/17.
@@ -60,9 +61,15 @@ public void applyAttribute(AttributeSet attrs) {
             int backgroundColor = typedArray.getColor(R.styleable.LuckyWheel_background_color, Color.GREEN);
             int arrowImage = typedArray.getResourceId(R.styleable.LuckyWheel_arrow_image, R.drawable.arrow);
             int imagePadding = typedArray.getDimensionPixelSize(R.styleable.LuckyWheel_image_padding , 0);
-            wheelView.setWheelBackgoundWheel(backgroundColor);
+            int textSize = typedArray.getDimensionPixelSize(R.styleable.LuckyWheel_text_size, 30);
+            int fontFamilyId = typedArray.getResourceId(R.styleable.LuckyWheel_android_fontFamily, 0);
+            wheelView.setWheelBackgroundWheel(backgroundColor);
             wheelView.setItemsImagePadding(imagePadding);
             arrow.setImageResource(arrowImage);
+            wheelView.setTextSize(textSize);
+            if (fontFamilyId > 0) {
+                wheelView.setTypeface(ResourcesCompat.getFont(getContext(), fontFamilyId));
+            }
         } catch (Exception e) {
             e.printStackTrace();
         }
diff --git a/luckywheel/src/main/java/com/bluehomestudio/luckywheel/OnLuckyWheelReachTheTarget.java b/luckywheel/src/main/java/com/bluehomestudio/luckywheel/OnLuckyWheelReachTheTarget.java
index a00936b..ff711cb 100644
--- a/luckywheel/src/main/java/com/bluehomestudio/luckywheel/OnLuckyWheelReachTheTarget.java
+++ b/luckywheel/src/main/java/com/bluehomestudio/luckywheel/OnLuckyWheelReachTheTarget.java
@@ -5,5 +5,5 @@
  */
 
 public interface OnLuckyWheelReachTheTarget {
-    void onReachTarget();
+    void onReachTarget(WheelItem item);
 }
diff --git a/luckywheel/src/main/java/com/bluehomestudio/luckywheel/WheelItem.java b/luckywheel/src/main/java/com/bluehomestudio/luckywheel/WheelItem.java
index 8f5cfe8..9fcf93a 100644
--- a/luckywheel/src/main/java/com/bluehomestudio/luckywheel/WheelItem.java
+++ b/luckywheel/src/main/java/com/bluehomestudio/luckywheel/WheelItem.java
@@ -8,16 +8,25 @@
 
 public class WheelItem {
 
+    public int id;
     public int color;
     public Bitmap bitmap;
     public String text;
 
-        public WheelItem(int color, Bitmap bitmap) {
+    public WheelItem(int id, int color, Bitmap bitmap) {
+        this.id = id;
         this.color = color;
         this.bitmap = bitmap;
     }
 
-    public WheelItem(int color, Bitmap bitmap, String text) {
+    public WheelItem(int id, int color, String text) {
+        this.id = id;
+        this.color = color;
+        this.text = text;
+    }
+
+    public WheelItem(int id, int color, Bitmap bitmap, String text) {
+        this.id = id;
         this.color = color;
         this.bitmap = bitmap;
         this.text = text;
diff --git a/luckywheel/src/main/java/com/bluehomestudio/luckywheel/WheelView.java b/luckywheel/src/main/java/com/bluehomestudio/luckywheel/WheelView.java
index c3835bc..359d702 100644
--- a/luckywheel/src/main/java/com/bluehomestudio/luckywheel/WheelView.java
+++ b/luckywheel/src/main/java/com/bluehomestudio/luckywheel/WheelView.java
@@ -10,15 +10,17 @@
 import android.graphics.Path;
 import android.graphics.Rect;
 import android.graphics.RectF;
+import android.graphics.Typeface;
 import android.util.AttributeSet;
-import android.util.Log;
 import android.view.View;
 import android.view.animation.DecelerateInterpolator;
 
-import androidx.annotation.Nullable;
-
+import java.util.ArrayList;
 import java.util.List;
 
+import androidx.annotation.IntRange;
+import androidx.annotation.Nullable;
+
 /**
  * Created by mohamed on 22/04/17.
  */
@@ -27,10 +29,13 @@ final class WheelView extends View {
     private RectF range = new RectF();
     private Paint archPaint, textPaint;
     private int padding, radius, center, mWheelBackground, mImagePadding;
-    private List<WheelItem> mWheelItems;
+    private List<WheelItem> mWheelItems = new ArrayList<>();
     private OnLuckyWheelReachTheTarget mOnLuckyWheelReachTheTarget;
     private OnRotationListener onRotationListener;
 
+    private float textSize = 30;
+    private Typeface typeface;
+
     public WheelView(Context context, @Nullable AttributeSet attrs) {
         super(context, attrs);
     }
@@ -49,7 +54,12 @@ private void initComponents() {
         textPaint.setColor(Color.WHITE);
         textPaint.setAntiAlias(true);
         textPaint.setDither(true);
-        textPaint.setTextSize(30);
+        textPaint.setTextSize(textSize);
+
+        if (typeface != null) {
+            textPaint.setTypeface(typeface);
+        }
+
         //rect rang of the arc
         range = new RectF(padding, padding, padding + radius, padding + radius);
     }
@@ -59,8 +69,8 @@ private void initComponents() {
      *
      * @return Number of angle
      */
-    private float getAngleOfIndexTarget(int target) {
-        return (360 / mWheelItems.size()) * target;
+    private float getAngleOfIndexTarget(@IntRange(from = 1) int target) {
+        return (360f / mWheelItems.size()) * target;
     }
 
     /**
@@ -68,7 +78,7 @@ private float getAngleOfIndexTarget(int target) {
      *
      * @param wheelBackground Wheel background color
      */
-    public void setWheelBackgoundWheel(int wheelBackground) {
+    public void setWheelBackgroundWheel(int wheelBackground) {
         mWheelBackground = wheelBackground;
         invalidate();
     }
@@ -130,11 +140,10 @@ private void drawImage(Canvas canvas, float tempAngle, Bitmap bitmap) {
         float px = rect.exactCenterX();
         float py = rect.exactCenterY();
         Matrix matrix = new Matrix();
-        matrix.postTranslate(-bitmap.getWidth() / 2, -bitmap.getHeight() / 2);
+        matrix.postTranslate(-bitmap.getWidth() / 2f, -bitmap.getHeight() / 2f);
         matrix.postRotate(tempAngle + 120);
         matrix.postTranslate(px, py);
-        canvas.drawBitmap(bitmap, matrix, new Paint( Paint.ANTI_ALIAS_FLAG | Paint.DITHER_FLAG | Paint.FILTER_BITMAP_FLAG ));
-        Log.d("sadsdsddssd" , bitmap.getWidth() + " : "+bitmap.getHeight());
+        canvas.drawBitmap(bitmap, matrix, new Paint(Paint.ANTI_ALIAS_FLAG | Paint.DITHER_FLAG | Paint.FILTER_BITMAP_FLAG));
         matrix.reset();
     }
 
@@ -161,9 +170,9 @@ private void drawText(Canvas canvas, float tempAngle, float sweepAngle, String t
      *
      * @param target target number
      */
-    public void rotateWheelToTarget(int target) {
+    public void rotateWheelToTarget(final int target) {
 
-        float wheelItemCenter = 270 - getAngleOfIndexTarget(target) + (360 / mWheelItems.size()) / 2;
+        float wheelItemCenter = 270 - getAngleOfIndexTarget(target) + (360f / mWheelItems.size()) / 2;
         int DEFAULT_ROTATION_TIME = 9000;
         animate().setInterpolator(new DecelerateInterpolator())
                 .setDuration(DEFAULT_ROTATION_TIME)
@@ -177,7 +186,7 @@ public void onAnimationStart(Animator animation) {
                     @Override
                     public void onAnimationEnd(Animator animation) {
                         if (mOnLuckyWheelReachTheTarget != null) {
-                            mOnLuckyWheelReachTheTarget.onReachTarget();
+                            mOnLuckyWheelReachTheTarget.onReachTarget(mWheelItems.get(target - 1));
                         }
                         if (onRotationListener != null) {
                             onRotationListener.onFinishRotation();
@@ -229,6 +238,16 @@ public void onAnimationRepeat(Animator animation) {
         });
     }
 
+    public void setTypeface(Typeface typeface) {
+        this.typeface = typeface;
+        invalidate();
+    }
+
+    public void setTextSize(float textSize) {
+        this.textSize = textSize;
+        invalidate();
+    }
+
     @Override
     protected void onDraw(Canvas canvas) {
         super.onDraw(canvas);
@@ -243,10 +262,13 @@ protected void onDraw(Canvas canvas) {
         }
 
         for (int i = 0; i < mWheelItems.size(); i++) {
-            archPaint.setColor(mWheelItems.get(i).color);
+            WheelItem item = mWheelItems.get(i);
+            archPaint.setColor(item.color);
             canvas.drawArc(range, tempAngle, sweepAngle, true, archPaint);
-            drawImage(canvas, tempAngle, mWheelItems.get(i).bitmap);
-            drawText(canvas, tempAngle, sweepAngle, mWheelItems.get(i).text == null ? "" : mWheelItems.get(i).text);
+            if (item.bitmap != null) {
+                drawImage(canvas, tempAngle, item.bitmap);
+            }
+            drawText(canvas, tempAngle, sweepAngle, item.text == null ? "" : mWheelItems.get(i).text);
             tempAngle += sweepAngle;
         }
 
diff --git a/luckywheel/src/main/res/values/attrs.xml b/luckywheel/src/main/res/values/attrs.xml
index 1d8841f..83cfbde 100644
--- a/luckywheel/src/main/res/values/attrs.xml
+++ b/luckywheel/src/main/res/values/attrs.xml
@@ -7,6 +7,8 @@
         <attr name="arrow_image" format="reference"/>
         <attr name="square_layout" format="boolean"/>
         <attr name="image_padding" format="dimension"/>
+        <attr name="text_size" format="dimension"/>
+        <attr name="android:fontFamily" />
     </declare-styleable>
 
-</resources>
\ No newline at end of file
+</resources>

From 7cf579a4a08b6864771f0fc04aac380a76c694b4 Mon Sep 17 00:00:00 2001
From: Alireza Afkar <afkar@divar.ir>
Date: Fri, 16 Jul 2021 15:02:28 +0430
Subject: [PATCH 3/3] Set arc style in attrs

---
 .../java/com/bluehomestudio/luckywheel/LuckyWheel.java     | 3 +++
 .../main/java/com/bluehomestudio/luckywheel/WheelView.java | 7 +++++++
 luckywheel/src/main/res/values/attrs.xml                   | 5 +++++
 3 files changed, 15 insertions(+)

diff --git a/luckywheel/src/main/java/com/bluehomestudio/luckywheel/LuckyWheel.java b/luckywheel/src/main/java/com/bluehomestudio/luckywheel/LuckyWheel.java
index 6e4edc0..9045397 100644
--- a/luckywheel/src/main/java/com/bluehomestudio/luckywheel/LuckyWheel.java
+++ b/luckywheel/src/main/java/com/bluehomestudio/luckywheel/LuckyWheel.java
@@ -3,6 +3,7 @@
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.graphics.Color;
+import android.graphics.Paint;
 import android.util.AttributeSet;
 import android.view.MotionEvent;
 import android.view.View;
@@ -63,10 +64,12 @@ public void applyAttribute(AttributeSet attrs) {
             int imagePadding = typedArray.getDimensionPixelSize(R.styleable.LuckyWheel_image_padding , 0);
             int textSize = typedArray.getDimensionPixelSize(R.styleable.LuckyWheel_text_size, 30);
             int fontFamilyId = typedArray.getResourceId(R.styleable.LuckyWheel_android_fontFamily, 0);
+            int archStyle = typedArray.getInt(R.styleable.LuckyWheel_style, 0);
             wheelView.setWheelBackgroundWheel(backgroundColor);
             wheelView.setItemsImagePadding(imagePadding);
             arrow.setImageResource(arrowImage);
             wheelView.setTextSize(textSize);
+            wheelView.setStyle(Paint.Style.values()[archStyle]);
             if (fontFamilyId > 0) {
                 wheelView.setTypeface(ResourcesCompat.getFont(getContext(), fontFamilyId));
             }
diff --git a/luckywheel/src/main/java/com/bluehomestudio/luckywheel/WheelView.java b/luckywheel/src/main/java/com/bluehomestudio/luckywheel/WheelView.java
index 359d702..250134e 100644
--- a/luckywheel/src/main/java/com/bluehomestudio/luckywheel/WheelView.java
+++ b/luckywheel/src/main/java/com/bluehomestudio/luckywheel/WheelView.java
@@ -35,6 +35,7 @@ final class WheelView extends View {
 
     private float textSize = 30;
     private Typeface typeface;
+    private Paint.Style archStyle = Paint.Style.FILL;
 
     public WheelView(Context context, @Nullable AttributeSet attrs) {
         super(context, attrs);
@@ -49,6 +50,7 @@ private void initComponents() {
         archPaint = new Paint();
         archPaint.setAntiAlias(true);
         archPaint.setDither(true);
+        archPaint.setStyle(archStyle);
         //text paint object
         textPaint = new Paint();
         textPaint.setColor(Color.WHITE);
@@ -248,6 +250,11 @@ public void setTextSize(float textSize) {
         invalidate();
     }
 
+    public void setStyle(Paint.Style style) {
+        this.archStyle = style;
+        invalidate();
+    }
+
     @Override
     protected void onDraw(Canvas canvas) {
         super.onDraw(canvas);
diff --git a/luckywheel/src/main/res/values/attrs.xml b/luckywheel/src/main/res/values/attrs.xml
index 83cfbde..557acbd 100644
--- a/luckywheel/src/main/res/values/attrs.xml
+++ b/luckywheel/src/main/res/values/attrs.xml
@@ -2,6 +2,11 @@
 <resources>
 
     <declare-styleable name="LuckyWheel">
+        <attr name="style" format="enum">
+            <enum name="fill" value="0"/>
+            <enum name="stroke" value="1"/>
+            <enum name="fill_and_stroke" value="2"/>
+        </attr>
 
         <attr name="background_color" format="color"/>
         <attr name="arrow_image" format="reference"/>