Merge pull request #5 from HugoGresse/develop

v 1.0.11
HugoGresse · Dec 10, 2015 · 8a243c5 · 8a243c5
2 parents e99844e + 985409e
commit 8a243c5
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 201 deletions.
diff --git a/.gitignore b/.gitignore
@@ -5,3 +5,7 @@
 .DS_Store
 /build
 /captures
+
+vumeterlibrary/vumeterlibrary.iml
+app/app.iml
+app/*.apk
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/app/app.iml b/app/app.iml
diff --git a/build.gradle b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.3.1'
+        classpath 'com.android.tools.build:gradle:1.5.0'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.2'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
 

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.8-all.zip
diff --git a/vumeterlibrary/build.gradle b/vumeterlibrary/build.gradle
@@ -6,13 +6,13 @@ apply plugin: 'com.github.dcendents.android-maven'
 
 android {
     compileSdkVersion 23
-    buildToolsVersion "23.0.0"
+    buildToolsVersion "23.0.1"
 
     defaultConfig {
         minSdkVersion 9
         targetSdkVersion 23
-        versionCode 11
-        versionName "1.0.10"
+        versionCode 12
+        versionName "1.0.11"
     }
     buildTypes {
         release {
@@ -24,7 +24,7 @@ android {
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support:appcompat-v7:23.0.0'
+    compile 'com.android.support:appcompat-v7:23.1.1'
 }
 
 ///////////////////////////////////////////

diff --git a/vumeterlibrary/src/main/java/io/gresse/hugo/vumeterlibrary/VuMeterView.java b/vumeterlibrary/src/main/java/io/gresse/hugo/vumeterlibrary/VuMeterView.java
@@ -311,6 +311,9 @@ public void pause(){
      * @param withAnimation if you want to have an animation from current state to stop state
      */
     public void stop(boolean withAnimation){
+        if(mDestinationValues == null){
+            initialiseCollections();
+        }
         mState = STATE_STOP;
         int collapseSize = (int) (mContentHeight - mStopSize);
         for(int i = 0; i < mBlockNumber; i++){

diff --git a/vumeterlibrary/vumeterlibrary.iml b/vumeterlibrary/vumeterlibrary.iml