diff --git a/app/app.iml b/app/app.iml
index 0bd0484..614e53e 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -1,5 +1,5 @@
-
+
@@ -12,9 +12,9 @@
-
-
-
+
+ generateDebugSources
+
@@ -23,7 +23,7 @@
-
+
@@ -32,14 +32,16 @@
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
@@ -47,6 +49,15 @@
+
+
+
+
+
+
+
+
+
@@ -54,6 +65,7 @@
+
@@ -61,34 +73,39 @@
+
+
+
+
+
+
+
+
+
-
+
-
-
-
+
+
-
-
-
-
+
+
-
-
+
+
-
+
-
-
+
\ No newline at end of file
diff --git a/app/src/main/java/es/claucookie/miniequalizersample/MainActivity.java b/app/src/main/java/es/claucookie/miniequalizersample/MainActivity.java
index 37b5025..0dfc739 100644
--- a/app/src/main/java/es/claucookie/miniequalizersample/MainActivity.java
+++ b/app/src/main/java/es/claucookie/miniequalizersample/MainActivity.java
@@ -14,6 +14,12 @@ public class MainActivity extends ActionBarActivity {
EqualizerView equalizer;
Button toggleButton;
+ private Button toggleColorButton;
+ private Integer[] colors = new Integer[]{R.color.black, R.color.blue, R.color.pink};
+ private int colorIndex = 0;
+ private Integer[] durations = new Integer[]{100, 1000, 3000};
+ private int durationIndex = 0;
+ private Button toggleDurationButton;
@Override
protected void onCreate(Bundle savedInstanceState) {
@@ -22,6 +28,8 @@ protected void onCreate(Bundle savedInstanceState) {
equalizer = (EqualizerView) findViewById(R.id.equalizer_view);
toggleButton = (Button) findViewById(R.id.toggle_button);
+ toggleColorButton = (Button) findViewById(R.id.toggle_color_button);
+ toggleDurationButton = (Button) findViewById(R.id.toggle_duration_button);
showEqualizer();
initButton();
}
@@ -33,6 +41,26 @@ public void onClick(View v) {
toggleEqualizer();
}
});
+ toggleColorButton.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ equalizer.setForegroundColor(getResources().getColor(colors[colorIndex]));
+ colorIndex++;
+ if (colorIndex >= colors.length) {
+ colorIndex=0;
+ }
+ }
+ });
+ toggleDurationButton.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ equalizer.setDuration(durations[durationIndex]);
+ durationIndex++;
+ if (durationIndex >= durations.length) {
+ durationIndex=0;
+ }
+ }
+ });
}
private void toggleEqualizer() {
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 57ceac8..2f8779c 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -14,6 +14,18 @@
android:text="Toggle equalizer"
android:id="@+id/toggle_button"/>
+
+
+
+
+
+ #000000
+ #2196F3
+ #E91E63
+
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 741f70e..f46d653 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
jcenter()
}
dependencies {
- classpath 'com.android.tools.build:gradle:1.0.1'
+ classpath 'com.android.tools.build:gradle:2.2.3'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 0c71e76..5cb5833 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Apr 10 15:27:10 PDT 2013
+#Wed Jan 11 09:52:02 CET 2017
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
diff --git a/library/build.gradle b/library/build.gradle
index c0b4bb4..c466bc1 100644
--- a/library/build.gradle
+++ b/library/build.gradle
@@ -3,7 +3,7 @@ buildscript {
mavenCentral()
}
dependencies {
- classpath 'com.android.tools.build:gradle:1.0.1'
+ classpath 'com.android.tools.build:gradle:2.2.3'
}
}
diff --git a/library/library.iml b/library/library.iml
index c9dab58..9c70cec 100644
--- a/library/library.iml
+++ b/library/library.iml
@@ -1,5 +1,5 @@
-
+
@@ -12,9 +12,9 @@
-
-
-
+
+ generateDebugSources
+
@@ -24,7 +24,7 @@
-
+
@@ -33,14 +33,16 @@
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
@@ -48,6 +50,15 @@
+
+
+
+
+
+
+
+
+
@@ -55,6 +66,7 @@
+
@@ -62,30 +74,33 @@
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
-
-
-
+
+
-
-
+
\ No newline at end of file
diff --git a/library/src/main/java/es/claucookie/miniequalizerlibrary/EqualizerView.java b/library/src/main/java/es/claucookie/miniequalizerlibrary/EqualizerView.java
index 9d1977c..ee33424 100644
--- a/library/src/main/java/es/claucookie/miniequalizerlibrary/EqualizerView.java
+++ b/library/src/main/java/es/claucookie/miniequalizerlibrary/EqualizerView.java
@@ -33,19 +33,19 @@ public class EqualizerView extends LinearLayout {
public EqualizerView(Context context) {
super(context);
- initViews();
+ if (!isInEditMode()) initViews();
}
public EqualizerView(Context context, AttributeSet attrs) {
super(context, attrs);
setAttrs(context, attrs);
- initViews();
+ if (!isInEditMode()) initViews();
}
public EqualizerView(Context context, AttributeSet attrs, int defStyle) {
super(context, attrs, defStyle);
setAttrs(context, attrs);
- initViews();
+ if (!isInEditMode()) initViews();
}
private void setAttrs(Context context, AttributeSet attrs) {
@@ -170,5 +170,14 @@ public Boolean isAnimating() {
return animating;
}
+ public void setForegroundColor(int foregroundColor) {
+ this.foregroundColor = foregroundColor;
+ musicBar1.setBackgroundColor(foregroundColor);
+ musicBar2.setBackgroundColor(foregroundColor);
+ musicBar3.setBackgroundColor(foregroundColor);
+ }
+ public void setDuration(int duration) {
+ this.duration = duration;
+ }
}