add option for radius & degree

dacer · dacer · commit 53f05d26be72 · 2016-11-18T22:18:24.000+08:00
diff --git a/androidarcmenu/src/main/java/com/hackplan/androidarcmenu/ArcMenu.java b/androidarcmenu/src/main/java/com/hackplan/androidarcmenu/ArcMenu.java
@@ -3,7 +3,6 @@
 import android.app.Activity;
 import android.graphics.Rect;
 import android.support.annotation.DrawableRes;
-import android.support.v7.widget.RecyclerView;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
@@ -33,10 +32,7 @@ public void showOn(View view) {
         if (view == null) return;
         Rect rect = new Rect();
         view.getGlobalVisibleRect(rect);
-        builder.arcMenuLayout.show(this, rect.centerX(),
-                rect.centerY(),
-                builder.btnList,
-                builder.hideOnTouchUp);
+        builder.show(rect.centerX(), rect.centerY());
     }
 
     public int getId() {
@@ -49,19 +45,22 @@ public static class Builder{
         private ArrayList<ArcButton.Builder> btnList = new ArrayList<>();
         private OnClickMenuListener onClickMenuListener;
         private Activity activity;
-        private ArcMenuInterceptLayout arcMenuLayout;
+        private ArcMenuInterceptLayout arcMenuInterceptLayout;
         private HashSet<View> onTouchViews = new HashSet<>();
         private boolean hideOnTouchUp = true;
+        private int radius;
+        private double degree = 90;
 
 
         public Builder(Activity activity) {
             this.activity = activity;
+            radius = activity.getResources().getDimensionPixelSize(R.dimen.default_radius);
         }
 
         public ArcMenu build() {
             if (arcMenu != null) throw new RuntimeException("ArcMenu.Build already built");
-            arcMenuLayout = attachToActivity(activity);
-            arcMenuLayout.setOnClickBtnListener(onClickMenuListener);
+            arcMenuInterceptLayout = attachToActivity(activity);
+            arcMenuInterceptLayout.setOnClickBtnListener(onClickMenuListener);
             arcMenu = new ArcMenu(this);
             return arcMenu;
         }
@@ -71,6 +70,16 @@ public Builder setId(int id){
             return this;
         }
 
+        public Builder setRadius(int radius) {
+            this.radius = radius;
+            return this;
+        }
+
+        public Builder setDegree(double degree) {
+            this.degree = degree;
+            return this;
+        }
+
         public Builder setListener(OnClickMenuListener listener) {
             this.onClickMenuListener = listener;
             return this;
@@ -103,11 +112,15 @@ public Builder hideOnTouchUp(boolean h) {
             return this;
         }
 
+        private void show(int x, int y) {
+            arcMenuInterceptLayout.show(arcMenu, x, y,
+                    btnList, hideOnTouchUp, radius, degree);
+        }
 
         private View.OnLongClickListener longClickListener = new View.OnLongClickListener() {
             @Override
             public boolean onLongClick(View v) {
-                arcMenuLayout.show(arcMenu, lastTouchX, lastTouchY, btnList, hideOnTouchUp);
+                show(lastTouchX, lastTouchY);
                 return true;
             }
         };
@@ -118,10 +131,7 @@ public boolean onLongClick(View v) {
             public boolean onTouch(View v, MotionEvent event) {
                 if (event.getAction() == MotionEvent.ACTION_DOWN){
                     if (onTouchViews.contains(v)) {
-                        arcMenuLayout.show(arcMenu,
-                                (int) event.getRawX(),
-                                (int) event.getRawY(),
-                                btnList, hideOnTouchUp);
+                        show((int) event.getRawX(), (int) event.getRawY());
                     }else {
                         //Used in onLongClick(View v)
                         lastTouchX = (int) event.getRawX();
diff --git a/androidarcmenu/src/main/java/com/hackplan/androidarcmenu/ArcMenuInterceptLayout.java b/androidarcmenu/src/main/java/com/hackplan/androidarcmenu/ArcMenuInterceptLayout.java
@@ -35,15 +35,16 @@ private void init() {
         childViewParams = new LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT);
     }
 
-    public void show(ArcMenu arcMenu, int x, int y, ArrayList<ArcButton.Builder> btnList, boolean hideOnTouchUp) {
+    public void show(ArcMenu arcMenu, int x, int y, ArrayList<ArcButton.Builder> btnList,
+                     boolean hideOnTouchUp, int radius, double degree) {
         if (indexOfChild(arcMenuLayout) == -1) {
             addView(arcMenuLayout);
         }
         arcMenuLayout.removeAllViews();
         for (ArcButton.Builder builder : btnList) {
             arcMenuLayout.addView(builder.getButton(getContext()), childViewParams);
         }
-        arcMenuLayout.show(arcMenu, x, y, hideOnTouchUp);
+        arcMenuLayout.show(arcMenu, x, y, hideOnTouchUp, radius, degree);
 
     }
 
diff --git a/androidarcmenu/src/main/java/com/hackplan/androidarcmenu/ArcMenuLayout.java b/androidarcmenu/src/main/java/com/hackplan/androidarcmenu/ArcMenuLayout.java
@@ -52,11 +52,11 @@ public boolean isShow() {
     }
 
     private ArrayList<PointF> menuPoints = new ArrayList<>();
-    private int radius = (int) dpToPx(80f);
-    private double arcRadians = Math.toRadians(90d);
 
-    public void show(ArcMenu arcMenu, int x, int y, boolean hideOnTouchUp) {
+    public void show(ArcMenu arcMenu, int x, int y, boolean hideOnTouchUp,
+                     int radius, double degree) {
         if (getChildCount() <= 0) return;
+        double arcRadians = Math.toRadians(degree);
         this.hideOnTouchUp = hideOnTouchUp;
         this.arcMenu = arcMenu;
         show = true;
@@ -173,11 +173,6 @@ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
         setMeasuredDimension(w, h);
     }
 
-    public float dpToPx(float dipValue) {
-        DisplayMetrics metrics = getContext().getResources().getDisplayMetrics();
-        return TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, dipValue, metrics);
-    }
-
     private boolean animFinished = true;
 
     private AnimatorListenerAdapter animListener = new AnimatorListenerAdapter() {
diff --git a/androidarcmenu/src/main/res/values/dimens.xml b/androidarcmenu/src/main/res/values/dimens.xml
@@ -0,0 +1,3 @@
+<resources>
+    <dimen name="default_radius">80dp</dimen>
+</resources>
diff --git a/app/src/main/java/com/hackplan/androidarcmenu/demo/MainActivity.java b/app/src/main/java/com/hackplan/androidarcmenu/demo/MainActivity.java
@@ -41,10 +41,15 @@ protected void onCreate(Bundle savedInstanceState) {
         arcMenu2 = new ArcMenu.Builder(MainActivity.this)
                 .setId(ARC_MENU_ID_2)
                 .addBtn(R.drawable.w, 6)
+                .addBtn(R.drawable.w, 6)
+                .addBtn(R.drawable.w, 6)
+                .addBtn(R.drawable.w, 6)
                 .addBtns(new ArcButton.Builder(menuBtn, 2))
                 .setListener(MainActivity.this)
                 .showOnTouch(btn2)
                 .hideOnTouchUp(true)
+                .setDegree(160)
+                .setRadius(222)
                 .build();
 
         btn3.setOnLongClickListener(this);
@@ -58,7 +63,7 @@ public void onClick(View v) {
 
         LinearLayoutManager mLayoutManager = new LinearLayoutManager(this);
         mRecyclerView.setLayoutManager(mLayoutManager);
-        MyAdapter mAdapter = new MyAdapter(new String[]{"Pomotodo", "hackplan", "http://one.hackplan.com/", "Dacer"}, this, this);
+        MyAdapter mAdapter = new MyAdapter(new String[]{"HACKPLAN", "Pomotodo", "http://one.hackplan.com/", "Dacer"}, this, this);
         mRecyclerView.setAdapter(mAdapter);
 
     }
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -14,7 +14,7 @@
         android:layout_alignParentStart="true"
         android:layout_alignParentLeft="true"
         android:layout_centerVertical="true"
-        android:text="btn1"/>
+        android:text="HOLD(btn1)"/>
 
     <Button
         android:id="@+id/btn2"
@@ -23,27 +23,27 @@
         android:layout_alignParentEnd="true"
         android:layout_alignParentRight="true"
         android:layout_centerVertical="true"
-        android:text="btn2"/>
+        android:text="TOUCH(btn2)"/>
 
     <Button
         android:id="@+id/btn3"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_centerInParent="true"
-        android:text="btn3"/>
+        android:layout_alignParentTop="true"
+        android:text="ANOTHER HOLD(btn3)"/>
 
     <Button
         android:id="@+id/btn4"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_above="@+id/btn3"
+        android:layout_above="@+id/btn1"
         android:layout_marginBottom="20dp"
-        android:text="btn4"/>
+        android:text="CLICK(btn4)"/>
 
 
     <android.support.v7.widget.RecyclerView
         android:id="@+id/my_recycler_view"
-        android:layout_below="@+id/btn3"
+        android:layout_below="@+id/btn2"
         android:scrollbars="vertical"
         android:layout_width="match_parent"
         android:layout_height="match_parent"/>

Original file line number	Diff line number	Diff line change
`@@ -35,15 +35,16 @@ private void init() {`
`35`	`35`	`childViewParams = new LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT);`
`36`	`36`	`}`
`37`	`37`
`38`		`- public void show(ArcMenu arcMenu, int x, int y, ArrayList<ArcButton.Builder> btnList, boolean hideOnTouchUp) {`
	`38`	`+ public void show(ArcMenu arcMenu, int x, int y, ArrayList<ArcButton.Builder> btnList,`
	`39`	`+ boolean hideOnTouchUp, int radius, double degree) {`
`39`	`40`	`if (indexOfChild(arcMenuLayout) == -1) {`
`40`	`41`	`addView(arcMenuLayout);`
`41`	`42`	`}`
`42`	`43`	`arcMenuLayout.removeAllViews();`
`43`	`44`	`for (ArcButton.Builder builder : btnList) {`
`44`	`45`	`arcMenuLayout.addView(builder.getButton(getContext()), childViewParams);`
`45`	`46`	`}`
`46`		`- arcMenuLayout.show(arcMenu, x, y, hideOnTouchUp);`
	`47`	`+ arcMenuLayout.show(arcMenu, x, y, hideOnTouchUp, radius, degree);`
`47`	`48`
`48`	`49`	`}`
`49`	`50`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+<resources>`
	`2`	`+ <dimen name="default_radius">80dp</dimen>`
	`3`	`+</resources>`