diff --git a/.idea/.name b/.idea/.name deleted file mode 100644 index 2a5f5db..0000000 --- a/.idea/.name +++ /dev/null @@ -1 +0,0 @@ -BoomMenu \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 7f1491e..ccc7084 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -12,13 +12,7 @@ - + diff --git a/.idea/misc.xml b/.idea/misc.xml index a5e911e..5d19981 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -27,28 +27,6 @@ - - - - - - - - - Android > Lint > Correctness - - - Android > Lint > Performance - - - - - Android - - - - - @@ -59,36 +37,10 @@ - + - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/java/com/nightonke/boommenusample/BuilderActivity.java b/app/src/main/java/com/nightonke/boommenusample/BuilderActivity.java index e353c32..839ec34 100644 --- a/app/src/main/java/com/nightonke/boommenusample/BuilderActivity.java +++ b/app/src/main/java/com/nightonke/boommenusample/BuilderActivity.java @@ -2,9 +2,9 @@ import android.graphics.Color; import android.graphics.drawable.Drawable; +import android.os.Bundle; import android.support.v4.content.ContextCompat; import android.support.v7.app.AppCompatActivity; -import android.os.Bundle; import android.widget.TextView; import com.nightonke.boommenu.BoomMenuButton; diff --git a/app/src/main/java/com/nightonke/boommenusample/EasyUseActivity.java b/app/src/main/java/com/nightonke/boommenusample/EasyUseActivity.java index 7f2887c..9a8d22e 100644 --- a/app/src/main/java/com/nightonke/boommenusample/EasyUseActivity.java +++ b/app/src/main/java/com/nightonke/boommenusample/EasyUseActivity.java @@ -1,9 +1,9 @@ package com.nightonke.boommenusample; import android.graphics.drawable.Drawable; +import android.os.Bundle; import android.support.v4.content.ContextCompat; import android.support.v7.app.AppCompatActivity; -import android.os.Bundle; import com.nightonke.boommenu.BoomMenuButton; import com.nightonke.boommenu.Types.BoomType; diff --git a/app/src/main/java/com/nightonke/boommenusample/ListViewActivity.java b/app/src/main/java/com/nightonke/boommenusample/ListViewActivity.java index 6f014d1..424ae6d 100644 --- a/app/src/main/java/com/nightonke/boommenusample/ListViewActivity.java +++ b/app/src/main/java/com/nightonke/boommenusample/ListViewActivity.java @@ -2,9 +2,9 @@ import android.graphics.Color; import android.graphics.drawable.Drawable; +import android.os.Bundle; import android.support.v4.content.ContextCompat; import android.support.v7.app.AppCompatActivity; -import android.os.Bundle; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/nightonke/boommenusample/ShareActivity.java b/app/src/main/java/com/nightonke/boommenusample/ShareActivity.java index 5a80272..374d0e5 100644 --- a/app/src/main/java/com/nightonke/boommenusample/ShareActivity.java +++ b/app/src/main/java/com/nightonke/boommenusample/ShareActivity.java @@ -2,9 +2,9 @@ import android.graphics.Color; import android.graphics.drawable.Drawable; +import android.os.Bundle; import android.support.v4.content.ContextCompat; import android.support.v7.app.AppCompatActivity; -import android.os.Bundle; import android.view.ViewGroup; import android.widget.RadioButton; import android.widget.RadioGroup; diff --git a/boommenu/src/main/java/com/nightonke/boommenu/BoomMenuButton.java b/boommenu/src/main/java/com/nightonke/boommenu/BoomMenuButton.java index 5cb4634..af5ca6a 100644 --- a/boommenu/src/main/java/com/nightonke/boommenu/BoomMenuButton.java +++ b/boommenu/src/main/java/com/nightonke/boommenu/BoomMenuButton.java @@ -7,6 +7,7 @@ import android.animation.ValueAnimator; import android.app.Activity; import android.content.Context; +import android.content.ContextWrapper; import android.content.res.TypedArray; import android.graphics.Canvas; import android.graphics.Color; @@ -1299,6 +1300,16 @@ public void setCancelable(boolean cancelable) { this.cancelable = cancelable; } + /** + * Set dot width and height size. + * + * @param size + */ + public void setDotSize(int size) { + this.dotWidth = size; + this.dotHeight = size; + } + /** * Set frames for animaitons. * @@ -1586,14 +1597,14 @@ public void setTextViewColor(int color) { public void setTextViewColor(int[] colors) { int length = Math.min(buttonNum, colors.length); if (buttonType.equals(ButtonType.CIRCLE)) { - for (int i = 0; i < length; i++) { - if (circleButtons[i] != null) - circleButtons[i].getTextView().setTextColor(colors[i]); - } + for (int i = 0; i < length; i++) { + if (circleButtons[i] != null) + circleButtons[i].getTextView().setTextColor(colors[i]); + } } else if (buttonType.equals(ButtonType.HAM)) { - for (int i = 0; i < length; i++) { - if (hamButtons[i] != null) hamButtons[i].getTextView().setTextColor(colors[i]); - } + for (int i = 0; i < length; i++) { + if (hamButtons[i] != null) hamButtons[i].getTextView().setTextColor(colors[i]); + } } } @@ -1790,6 +1801,8 @@ public static class Builder { private ArrayList colors = null; private ArrayList strings = null; + private int dotSize = (int) Util.getInstance().dp2px(8); + private int frames = 80; private int duration = 800; @@ -1854,6 +1867,11 @@ public Builder subButtons(Drawable[] drawables, int[][] colors, String[] strings return this; } + public Builder dotSise(int size) { + this.dotSize = size; + return this; + } + public Builder frames(int frames) { this.frames = frames; return this; @@ -2083,6 +2101,7 @@ public BoomMenuButton init(BoomMenuButton boomMenuButton) { hideScaleEaseType, hideRotateEaseType, rotateDegree); + boomMenuButton.setDotSize(dotSize); boomMenuButton.setFrames(frames); boomMenuButton.setDuration(duration); boomMenuButton.setDelay(delay); @@ -2105,8 +2124,8 @@ public BoomMenuButton init(BoomMenuButton boomMenuButton) { return boomMenuButton; } } - - private static Activity scanForActivity(Context cont) { + + private static Activity scanForActivity(Context cont) { if (cont == null) return null; else if (cont instanceof Activity) diff --git a/boommenu/src/main/java/com/nightonke/boommenu/ShadowLayout.java b/boommenu/src/main/java/com/nightonke/boommenu/ShadowLayout.java index 9eee3d0..c768110 100644 --- a/boommenu/src/main/java/com/nightonke/boommenu/ShadowLayout.java +++ b/boommenu/src/main/java/com/nightonke/boommenu/ShadowLayout.java @@ -2,7 +2,11 @@ import android.content.Context; import android.content.res.TypedArray; -import android.graphics.*; +import android.graphics.Bitmap; +import android.graphics.Canvas; +import android.graphics.Color; +import android.graphics.Paint; +import android.graphics.RectF; import android.graphics.drawable.BitmapDrawable; import android.os.Build; import android.support.v4.content.ContextCompat; diff --git a/boommenu/src/main/java/com/nightonke/boommenu/ShareLines.java b/boommenu/src/main/java/com/nightonke/boommenu/ShareLines.java index 715e2f4..5f167bf 100644 --- a/boommenu/src/main/java/com/nightonke/boommenu/ShareLines.java +++ b/boommenu/src/main/java/com/nightonke/boommenu/ShareLines.java @@ -5,7 +5,6 @@ import android.graphics.Color; import android.graphics.Paint; import android.util.AttributeSet; -import android.util.Log; import android.view.View; /** diff --git a/boommenu/src/main/java/com/nightonke/boommenu/Util.java b/boommenu/src/main/java/com/nightonke/boommenu/Util.java index 751c82a..825fa11 100644 --- a/boommenu/src/main/java/com/nightonke/boommenu/Util.java +++ b/boommenu/src/main/java/com/nightonke/boommenu/Util.java @@ -2,6 +2,7 @@ import android.app.Activity; import android.content.Context; +import android.content.ContextWrapper; import android.content.res.Resources; import android.graphics.Bitmap; import android.graphics.Canvas; diff --git a/build.gradle b/build.gradle index d0070db..7ad418e 100644 --- a/build.gradle +++ b/build.gradle @@ -5,13 +5,13 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.1.2' + classpath 'com.android.tools.build:gradle:2.2.2' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.4' - classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3' + classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1' } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 122a0dc..7260397 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Dec 28 10:00:20 PST 2015 +#Thu Nov 24 12:26:15 CET 2016 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip