Merge pull request #3 from HugoGresse/develop

Release 1.0.10
HugoGresse · Aug 27, 2015 · e99844e · e99844e
2 parents d48a136 + 3421ae8
commit e99844e
Show file tree

Hide file tree

Showing 10 changed files with 61 additions and 39 deletions.
diff --git a/README.md b/README.md
@@ -28,7 +28,8 @@ Usage
         vumeter:speed="10"
         vumeter:blockNumber="5"
         vumeter:blockSpacing="20dp"
-        vumeter:backgroundColor="#33b5e5"/>
+        vumeter:backgroundColor="#33b5e5"
+        vumeter:startOff="false"/>
 ```
 
 See [DemoApp](https://github.com/HugoGresse/AndroidVuMeter/blob/master/app/src/main/java/io/gresse/hugo/vumeter/MainActivity.java) for complete usage example.
@@ -40,7 +41,7 @@ Download
 
 Using Gradle:
 ```
-compile 'io.gresse.hugo.vumeterlibrary:vumeterlibrary:1.0.9'
+compile 'io.gresse.hugo.vumeterlibrary:vumeterlibrary:1.0.10'
 ```
 
 *Hosted on jCenter only.* 

diff --git a/app/app.iml b/app/app.iml
@@ -36,13 +36,13 @@
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/debug" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/androidTest/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
@@ -71,8 +71,8 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/22.2.1/jars" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/22.2.1/jars" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.0.0/jars" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/23.0.0/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
@@ -86,12 +86,13 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
-    <orderEntry type="jdk" jdkName="Android API 22 Platform" jdkType="Android SDK" />
+    <orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" exported="" name="support-v4-22.2.1" level="project" />
-    <orderEntry type="library" exported="" name="support-annotations-22.2.1" level="project" />
-    <orderEntry type="library" exported="" name="appcompat-v7-22.2.1" level="project" />
+    <orderEntry type="library" exported="" name="appcompat-v7-23.0.0" level="project" />
+    <orderEntry type="library" exported="" name="support-v4-23.0.0" level="project" />
+    <orderEntry type="library" exported="" name="support-annotations-23.0.0" level="project" />
     <orderEntry type="module" module-name="vumeterlibrary" exported="" />
   </component>
 </module>
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,15 +1,16 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 22
-    buildToolsVersion "23.0.0 rc3"
+    compileSdkVersion 23
+    buildToolsVersion "23.0.0"
 
     defaultConfig {
         applicationId "io.gresse.hugo.vumeter"
         minSdkVersion 9
-        targetSdkVersion 22
-        versionCode 1
-        versionName "1.0"
+        targetSdkVersion 23
+        versionCode 2
+        versionName "1.0.10"
+        archivesBaseName = "VuMeterLibrary-demo-" + versionName
     }
     buildTypes {
         release {
@@ -21,6 +22,6 @@ android {
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support:appcompat-v7:22.2.1'
+    compile 'com.android.support:appcompat-v7:23.0.0'
     compile project(':vumeterlibrary')
 }
diff --git a/app/src/main/res/menu/menu_main.xml b/app/src/main/res/menu/menu_main.xml
@@ -7,17 +7,18 @@
         android:id="@+id/action_stop"
         android:orderInCategory="100"
         android:title="@string/action_stop"
-        app:showAsAction="ifRoom"/>
+        app:showAsAction="always"
+        tools:ignore="AlwaysShowAction"/>
 
     <item
         android:id="@+id/action_resume"
         android:orderInCategory="100"
         android:title="@string/action_resume"
-        app:showAsAction="ifRoom"/>
+        app:showAsAction="always"/>
     <item
         android:id="@+id/action_pause"
         android:orderInCategory="100"
         android:title="@string/action_pause"
-        app:showAsAction="ifRoom"/>
+        app:showAsAction="always"/>
 
 </menu>
diff --git a/build.gradle b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.2.3'
+        classpath 'com.android.tools.build:gradle:1.3.1'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.2'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
 

diff --git a/vumeterlibrary/build.gradle b/vumeterlibrary/build.gradle
@@ -5,14 +5,14 @@ apply plugin: 'com.jfrog.bintray'
 apply plugin: 'com.github.dcendents.android-maven'
 
 android {
-    compileSdkVersion 22
-    buildToolsVersion "23.0.0 rc3"
+    compileSdkVersion 23
+    buildToolsVersion "23.0.0"
 
     defaultConfig {
         minSdkVersion 9
-        targetSdkVersion 22
-        versionCode 10
-        versionName "1.0.9"
+        targetSdkVersion 23
+        versionCode 11
+        versionName "1.0.10"
     }
     buildTypes {
         release {
@@ -24,7 +24,7 @@ android {
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support:appcompat-v7:22.2.1'
+    compile 'com.android.support:appcompat-v7:23.0.0'
 }
 
 ///////////////////////////////////////////

diff --git a/vumeterlibrary/src/main/java/io/gresse/hugo/vumeterlibrary/Dynamics.java b/vumeterlibrary/src/main/java/io/gresse/hugo/vumeterlibrary/Dynamics.java
@@ -68,6 +68,10 @@ public boolean isAtRest() {
         return mIsToTarget;
     }
 
+    public void setAtRest(boolean atRest){
+        mIsToTarget = atRest;
+    }
+
     public float getPosition() {
         return mPosition;
     }

diff --git a/vumeterlibrary/src/main/java/io/gresse/hugo/vumeterlibrary/VuMeterView.java b/vumeterlibrary/src/main/java/io/gresse/hugo/vumeterlibrary/VuMeterView.java
@@ -1,12 +1,12 @@
 package io.gresse.hugo.vumeterlibrary;
 
+import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.Paint;
 import android.util.AttributeSet;
-import android.util.Log;
 import android.view.View;
 
 import java.util.Random;
@@ -26,6 +26,7 @@ public class VuMeterView extends View {
     public static final int DEFAULT_BLOCK_SPACING = 20;
     public static final int DEFAULT_SPEED = 10;
     public static final int DEFAULT_STOP_SIZE = 30;
+    public static final boolean DEFAULT_START_OFF = false;
     public static final int FPS = 60;
 
     public static final int STATE_PAUSE = 0;
@@ -82,18 +83,25 @@ private void init(AttributeSet attrs, int defStyle) {
         mBlockSpacing = a.getDimension(R.styleable.VuMeterView_blockSpacing, DEFAULT_BLOCK_SPACING);
         mSpeed = a.getInt(R.styleable.VuMeterView_speed, DEFAULT_SPEED);
         mStopSize = a.getDimension(R.styleable.VuMeterView_stopSize, DEFAULT_STOP_SIZE);
+        boolean startOff = a.getBoolean(R.styleable.VuMeterView_startOff, DEFAULT_START_OFF);
         a.recycle();
 
         // Init
         initialiseCollections();
         mPaint.setColor(mColor);
-        mState = STATE_PLAYING;
+
+        if(startOff){
+            mState = STATE_PAUSE;
+        } else {
+            mState = STATE_PLAYING;
+        }
 
         mDrawPass = mBlockPass = mContentHeight = mContentWidth = mPaddingLeft = mPaddingTop = mLeft = mTop =
                 mPaddingRight = mPaddingBottom = mRight = 0;
 
     }
 
+    @SuppressLint("DrawAllocation")
     @Override
     protected void onDraw(Canvas canvas) {
         super.onDraw(canvas);
@@ -107,6 +115,15 @@ protected void onDraw(Canvas canvas) {
 
         if (mBlockWidth == 0) {
             mBlockWidth = (int) ((mContentWidth - (mBlockNumber - 1) * mBlockSpacing) / mBlockNumber);
+
+            // called if startOff is true
+            if(mState == STATE_PAUSE){
+                int stopSize = (int) (mContentHeight - mStopSize);
+                for (int i = 0; i < mBlockNumber; i++) {
+                    mDestinationValues[i] = new Dynamics(mSpeed, stopSize);
+                    mDestinationValues[i].setAtRest(true);
+                }
+            }
         }
 
 
@@ -296,7 +313,6 @@ public void pause(){
     public void stop(boolean withAnimation){
         mState = STATE_STOP;
         int collapseSize = (int) (mContentHeight - mStopSize);
-        Log.d(LOG_TAG, "collapseSize: " + collapseSize);
         for(int i = 0; i < mBlockNumber; i++){
             if(withAnimation){
                 mDestinationValues[i].setTargetPosition(collapseSize);

diff --git a/vumeterlibrary/src/main/res/values/attrs_vu_meter_view.xml b/vumeterlibrary/src/main/res/values/attrs_vu_meter_view.xml
@@ -5,5 +5,6 @@
         <attr name="blockSpacing" format="dimension"/>
         <attr name="speed" format="integer"/>
         <attr name="stopSize" format="dimension"/>
+        <attr name="startOff" format="boolean"/>
     </declare-styleable>
 </resources>
diff --git a/vumeterlibrary/vumeterlibrary.iml b/vumeterlibrary/vumeterlibrary.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":vumeterlibrary" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="io.gresse.hugo.vumeterlibrary" external.system.module.version="1.0.9" type="JAVA_MODULE" version="4">
+<module external.linked.project.id=":vumeterlibrary" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="io.gresse.hugo.vumeterlibrary" external.system.module.version="1.0.10" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="android-gradle" name="Android-Gradle">
       <configuration>
@@ -37,13 +37,13 @@
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/debug" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/androidTest/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
@@ -65,7 +65,6 @@
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
-      <excludeFolder url="file://$MODULE_DIR$/build/docs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
@@ -85,15 +84,13 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
-      <excludeFolder url="file://$MODULE_DIR$/build/libs" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/poms" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
-    <orderEntry type="jdk" jdkName="Android API 22 Platform" jdkType="Android SDK" />
+    <orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" exported="" name="support-v4-22.2.1" level="project" />
-    <orderEntry type="library" exported="" name="support-annotations-22.2.1" level="project" />
-    <orderEntry type="library" exported="" name="appcompat-v7-22.2.1" level="project" />
+    <orderEntry type="library" exported="" name="appcompat-v7-23.0.0" level="project" />
+    <orderEntry type="library" exported="" name="support-v4-23.0.0" level="project" />
+    <orderEntry type="library" exported="" name="support-annotations-23.0.0" level="project" />
   </component>
 </module>