Skip to content

Commit 4a20021

Browse files
authored
Merge pull request #10 from HugoGresse/develop
Develop 1.0.15
2 parents b3d7f09 + bfb3eca commit 4a20021

11 files changed

Lines changed: 51 additions & 50 deletions

File tree

.idea/encodings.xml

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/gradle.xml

Lines changed: 8 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/misc.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/build.gradle

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
apply plugin: 'com.android.application'
22

33
android {
4-
compileSdkVersion 23
5-
buildToolsVersion "23.0.0"
4+
compileSdkVersion 24
5+
buildToolsVersion "24.0.0"
66

77
defaultConfig {
88
applicationId "io.gresse.hugo.vumeter"
99
minSdkVersion 9
10-
targetSdkVersion 23
11-
versionCode 2
12-
versionName "1.0.10"
10+
targetSdkVersion 24
11+
versionCode 3
12+
versionName "1.0.11"
1313
archivesBaseName = "VuMeterLibrary-demo-" + versionName
1414
}
1515
buildTypes {
@@ -22,6 +22,6 @@ android {
2222

2323
dependencies {
2424
compile fileTree(dir: 'libs', include: ['*.jar'])
25-
compile 'com.android.support:appcompat-v7:23.0.0'
25+
compile 'com.android.support:appcompat-v7:24.0.0'
2626
compile project(':vumeterlibrary')
2727
}

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@
1616
android:paddingRight="20dp"
1717
android:paddingBottom="40dp"
1818
android:id="@+id/vumeter"
19-
vumeter:stopSize="5dp"
20-
vumeter:speed="10"
21-
vumeter:blockNumber="5"
22-
vumeter:blockSpacing="20dp"
23-
vumeter:backgroundColor="#33b5e5"/>
19+
vumeter:vumeter_stopSize="5dp"
20+
vumeter:vumeter_speed="10"
21+
vumeter:vumeter_blockNumber="5"
22+
vumeter:vumeter_blockSpacing="20dp"
23+
vumeter:vumeter_backgroundColor="#33b5e5"/>
2424

2525
<Switch
2626
android:layout_width="wrap_content"

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ buildscript {
55
jcenter()
66
}
77
dependencies {
8-
classpath 'com.android.tools.build:gradle:1.5.0'
8+
classpath 'com.android.tools.build:gradle:2.1.2'
99
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.2'
1010
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
1111

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Wed Aug 12 14:38:26 CEST 2015
1+
#Tue Aug 16 09:17:41 CEST 2016
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-2.8-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip

vumeterlibrary/build.gradle

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,16 @@ apply plugin: 'com.jfrog.bintray'
55
apply plugin: 'com.github.dcendents.android-maven'
66

77
android {
8-
compileSdkVersion 23
9-
buildToolsVersion "23.0.1"
8+
compileSdkVersion 24
9+
buildToolsVersion "24.0.0"
10+
11+
resourcePrefix "vumeter_"
1012

1113
defaultConfig {
1214
minSdkVersion 9
13-
targetSdkVersion 23
14-
versionCode 15
15-
versionName "1.0.14"
15+
versionCode 16
16+
versionName "1.0.15"
17+
targetSdkVersion 24
1618
}
1719
buildTypes {
1820
release {
@@ -24,7 +26,7 @@ android {
2426

2527
dependencies {
2628
compile fileTree(dir: 'libs', include: ['*.jar'])
27-
compile 'com.android.support:appcompat-v7:23.1.1'
29+
compile 'com.android.support:appcompat-v7:24.0.0'
2830
}
2931

3032
///////////////////////////////////////////

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -77,13 +77,13 @@ public VuMeterView(Context context, AttributeSet attrs, int defStyle) {
7777

7878
private void init(AttributeSet attrs, int defStyle) {
7979
// Load attributes
80-
final TypedArray a = getContext().obtainStyledAttributes(attrs, R.styleable.VuMeterView, defStyle, 0);
81-
mColor = a.getColor(R.styleable.VuMeterView_backgroundColor, Color.BLACK);
82-
mBlockNumber = a.getInt(R.styleable.VuMeterView_blockNumber, DEFAULT_NUMBER_BLOCK);
83-
mBlockSpacing = a.getDimension(R.styleable.VuMeterView_blockSpacing, DEFAULT_BLOCK_SPACING);
84-
mSpeed = a.getInt(R.styleable.VuMeterView_speed, DEFAULT_SPEED);
85-
mStopSize = a.getDimension(R.styleable.VuMeterView_stopSize, DEFAULT_STOP_SIZE);
86-
boolean startOff = a.getBoolean(R.styleable.VuMeterView_startOff, DEFAULT_START_OFF);
80+
final TypedArray a = getContext().obtainStyledAttributes(attrs, R.styleable.vumeter_VuMeterView, defStyle, 0);
81+
mColor = a.getColor(R.styleable.vumeter_VuMeterView_vumeter_backgroundColor, Color.BLACK);
82+
mBlockNumber = a.getInt(R.styleable.vumeter_VuMeterView_vumeter_blockNumber, DEFAULT_NUMBER_BLOCK);
83+
mBlockSpacing = a.getDimension(R.styleable.vumeter_VuMeterView_vumeter_blockSpacing, DEFAULT_BLOCK_SPACING);
84+
mSpeed = a.getInt(R.styleable.vumeter_VuMeterView_vumeter_speed, DEFAULT_SPEED);
85+
mStopSize = a.getDimension(R.styleable.vumeter_VuMeterView_vumeter_stopSize, DEFAULT_STOP_SIZE);
86+
boolean startOff = a.getBoolean(R.styleable.vumeter_VuMeterView_vumeter_startOff, DEFAULT_START_OFF);
8787
a.recycle();
8888

8989
// Init

vumeterlibrary/src/main/res/layout/sample_vu_meter_view.xml

Lines changed: 0 additions & 14 deletions
This file was deleted.

0 commit comments

Comments
 (0)