Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .idea/.name

This file was deleted.

8 changes: 1 addition & 7 deletions .idea/gradle.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

50 changes: 1 addition & 49 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
37 changes: 28 additions & 9 deletions boommenu/src/main/java/com/nightonke/boommenu/BoomMenuButton.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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.
*
Expand Down Expand Up @@ -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]);
}
}
}

Expand Down Expand Up @@ -1790,6 +1801,8 @@ public static class Builder {
private ArrayList<int[]> colors = null;
private ArrayList<String> strings = null;

private int dotSize = (int) Util.getInstance().dp2px(8);

private int frames = 80;

private int duration = 800;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -2083,6 +2101,7 @@ public BoomMenuButton init(BoomMenuButton boomMenuButton) {
hideScaleEaseType,
hideRotateEaseType,
rotateDegree);
boomMenuButton.setDotSize(dotSize);
boomMenuButton.setFrames(frames);
boomMenuButton.setDuration(duration);
boomMenuButton.setDelay(delay);
Expand All @@ -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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
import android.graphics.Color;
import android.graphics.Paint;
import android.util.AttributeSet;
import android.util.Log;
import android.view.View;

/**
Expand Down
1 change: 1 addition & 0 deletions boommenu/src/main/java/com/nightonke/boommenu/Util.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
}

Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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