Merge pull request #10 from HugoGresse/develop

Develop 1.0.15

app/build.gradle

@@ -1,15 +1,15 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.0"
+    compileSdkVersion 24
+    buildToolsVersion "24.0.0"
 
     defaultConfig {
         applicationId "io.gresse.hugo.vumeter"
         minSdkVersion 9
-        targetSdkVersion 23
-        versionCode 2
-        versionName "1.0.10"
+        targetSdkVersion 24
+        versionCode 3
+        versionName "1.0.11"
         archivesBaseName = "VuMeterLibrary-demo-" + versionName
     }
     buildTypes {
@@ -22,6 +22,6 @@ android {
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support:appcompat-v7:23.0.0'
+    compile 'com.android.support:appcompat-v7:24.0.0'
     compile project(':vumeterlibrary')
 }

app/src/main/res/layout/activity_main.xml

@@ -16,11 +16,11 @@
         android:paddingRight="20dp"
         android:paddingBottom="40dp"
         android:id="@+id/vumeter"
-        vumeter:stopSize="5dp"
-        vumeter:speed="10"
-        vumeter:blockNumber="5"
-        vumeter:blockSpacing="20dp"
-        vumeter:backgroundColor="#33b5e5"/>
+        vumeter:vumeter_stopSize="5dp"
+        vumeter:vumeter_speed="10"
+        vumeter:vumeter_blockNumber="5"
+        vumeter:vumeter_blockSpacing="20dp"
+        vumeter:vumeter_backgroundColor="#33b5e5"/>
 
     <Switch
         android:layout_width="wrap_content"

build.gradle

@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.5.0'
+        classpath 'com.android.tools.build:gradle:2.1.2'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.2'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Wed Aug 12 14:38:26 CEST 2015
+#Tue Aug 16 09:17:41 CEST 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.8-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip

vumeterlibrary/build.gradle

@@ -5,14 +5,16 @@ apply plugin: 'com.jfrog.bintray'
 apply plugin: 'com.github.dcendents.android-maven'
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.1"
+    compileSdkVersion 24
+    buildToolsVersion "24.0.0"
+
+    resourcePrefix "vumeter_"
 
     defaultConfig {
         minSdkVersion 9
-        targetSdkVersion 23
-        versionCode 15
-        versionName "1.0.14"
+        versionCode 16
+        versionName "1.0.15"
+        targetSdkVersion 24
     }
     buildTypes {
         release {
@@ -24,7 +26,7 @@ android {
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support:appcompat-v7:23.1.1'
+    compile 'com.android.support:appcompat-v7:24.0.0'
 }
 
 ///////////////////////////////////////////

vumeterlibrary/src/main/java/io/gresse/hugo/vumeterlibrary/VuMeterView.java

@@ -77,13 +77,13 @@ public VuMeterView(Context context, AttributeSet attrs, int defStyle) {
 
     private void init(AttributeSet attrs, int defStyle) {
         // Load attributes
-        final TypedArray a = getContext().obtainStyledAttributes(attrs, R.styleable.VuMeterView, defStyle, 0);
-        mColor = a.getColor(R.styleable.VuMeterView_backgroundColor, Color.BLACK);
-        mBlockNumber = a.getInt(R.styleable.VuMeterView_blockNumber, DEFAULT_NUMBER_BLOCK);
-        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);
+        final TypedArray a = getContext().obtainStyledAttributes(attrs, R.styleable.vumeter_VuMeterView, defStyle, 0);
+        mColor = a.getColor(R.styleable.vumeter_VuMeterView_vumeter_backgroundColor, Color.BLACK);
+        mBlockNumber = a.getInt(R.styleable.vumeter_VuMeterView_vumeter_blockNumber, DEFAULT_NUMBER_BLOCK);
+        mBlockSpacing = a.getDimension(R.styleable.vumeter_VuMeterView_vumeter_blockSpacing, DEFAULT_BLOCK_SPACING);
+        mSpeed = a.getInt(R.styleable.vumeter_VuMeterView_vumeter_speed, DEFAULT_SPEED);
+        mStopSize = a.getDimension(R.styleable.vumeter_VuMeterView_vumeter_stopSize, DEFAULT_STOP_SIZE);
+        boolean startOff = a.getBoolean(R.styleable.vumeter_VuMeterView_vumeter_startOff, DEFAULT_START_OFF);
         a.recycle();
 
         // Init

vumeterlibrary/src/main/res/values/attrs_vu_meter_view.xml

@@ -1,10 +1,10 @@
 <resources>
-    <declare-styleable name="VuMeterView">
-        <attr name="backgroundColor" format="color"/>
-        <attr name="blockNumber" format="integer"/>
-        <attr name="blockSpacing" format="dimension"/>
-        <attr name="speed" format="integer"/>
-        <attr name="stopSize" format="dimension"/>
-        <attr name="startOff" format="boolean"/>
+    <declare-styleable name="vumeter_VuMeterView">
+        <attr name="vumeter_backgroundColor" format="color"/>
+        <attr name="vumeter_blockNumber" format="integer"/>
+        <attr name="vumeter_blockSpacing" format="dimension"/>
+        <attr name="vumeter_speed" format="integer"/>
+        <attr name="vumeter_stopSize" format="dimension"/>
+        <attr name="vumeter_startOff" format="boolean"/>
     </declare-styleable>
 </resources>