From 17dfabd441d030a25f68ece35c1436a8810a8503 Mon Sep 17 00:00:00 2001 From: Zachary Kjellberg Date: Wed, 2 Dec 2015 11:11:23 +0100 Subject: [PATCH 1/3] Fixed object name in Label Converter of README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 3285c33..b7978f5 100644 --- a/README.md +++ b/README.md @@ -64,7 +64,7 @@ Configure SpeedometerGuge: speedometer = (SpeedometerGauge) v.findViewById(R.id.speedometer); // Add label converter - speedometer.setLabelConverter(new SpeedometerView.LabelConverter() { + speedometer.setLabelConverter(new SpeedometerGauge.LabelConverter() { @Override public String getLabelFor(double progress, double maxProgress) { return String.valueOf((int) Math.round(progress)); From 313041a7b040208086c4b9acee66bb6b450d7c56 Mon Sep 17 00:00:00 2001 From: Zachary Kjellberg Date: Wed, 2 Dec 2015 12:40:42 +0100 Subject: [PATCH 2/3] Updated build.gradle to use latest gradle, android targets and build tools. Updated .gitignore files. Removed unnecessary IntelliJ files. (Import to generate a clean workspace. --- .gitignore | 3 + .idea/.name | 1 - .idea/compiler.xml | 24 ---- .idea/copyright/profiles_settings.xml | 3 - .idea/encodings.xml | 5 - .idea/gradle.xml | 20 --- .idea/libraries/appcompat_v7_21_0_2.xml | 10 -- .../libraries/support_annotations_21_0_2.xml | 11 -- .idea/libraries/support_v4_21_0_2.xml | 13 -- .idea/misc.xml | 118 ------------------ .idea/modules.xml | 11 -- .idea/scopes/scope_settings.xml | 5 - .idea/vcs.xml | 7 -- build.gradle | 2 +- demoapp/.gitignore | 1 + demoapp/build.gradle | 9 +- demoapp/demoapp.iml | 92 -------------- main/.gitignore | 1 + main/build.gradle | 8 +- main/main.iml | 91 -------------- 20 files changed, 15 insertions(+), 420 deletions(-) delete mode 100644 .idea/.name delete mode 100644 .idea/compiler.xml delete mode 100644 .idea/copyright/profiles_settings.xml delete mode 100644 .idea/encodings.xml delete mode 100644 .idea/gradle.xml delete mode 100644 .idea/libraries/appcompat_v7_21_0_2.xml delete mode 100644 .idea/libraries/support_annotations_21_0_2.xml delete mode 100644 .idea/libraries/support_v4_21_0_2.xml delete mode 100644 .idea/misc.xml delete mode 100644 .idea/modules.xml delete mode 100644 .idea/scopes/scope_settings.xml delete mode 100644 .idea/vcs.xml delete mode 100644 demoapp/demoapp.iml delete mode 100644 main/main.iml diff --git a/.gitignore b/.gitignore index 9068cd0..03bd28f 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,6 @@ proguard/ # Log Files *.log + +.idea/ +AndroidWidgets.iml \ No newline at end of file diff --git a/.idea/.name b/.idea/.name deleted file mode 100644 index 4812255..0000000 --- a/.idea/.name +++ /dev/null @@ -1 +0,0 @@ -AndroidWidgets \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml deleted file mode 100644 index 115fa49..0000000 --- a/.idea/compiler.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml deleted file mode 100644 index e7bedf3..0000000 --- a/.idea/copyright/profiles_settings.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml deleted file mode 100644 index e206d70..0000000 --- a/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/.idea/gradle.xml b/.idea/gradle.xml deleted file mode 100644 index c97898a..0000000 --- a/.idea/gradle.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - diff --git a/.idea/libraries/appcompat_v7_21_0_2.xml b/.idea/libraries/appcompat_v7_21_0_2.xml deleted file mode 100644 index 47b58b5..0000000 --- a/.idea/libraries/appcompat_v7_21_0_2.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/support_annotations_21_0_2.xml b/.idea/libraries/support_annotations_21_0_2.xml deleted file mode 100644 index 97c95b7..0000000 --- a/.idea/libraries/support_annotations_21_0_2.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/support_v4_21_0_2.xml b/.idea/libraries/support_v4_21_0_2.xml deleted file mode 100644 index d47e05b..0000000 --- a/.idea/libraries/support_v4_21_0_2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index ff33377..0000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,118 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - localhost - 5050 - - - - - - - Android API 19 Platform - - - - - - - - - diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index d16846e..0000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml deleted file mode 100644 index 922003b..0000000 --- a/.idea/scopes/scope_settings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index c80f219..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/build.gradle b/build.gradle index 6356aab..a6fcfe1 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:1.0.0' + classpath 'com.android.tools.build:gradle:1.5.0' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/demoapp/.gitignore b/demoapp/.gitignore index 796b96d..3896018 100644 --- a/demoapp/.gitignore +++ b/demoapp/.gitignore @@ -1 +1,2 @@ /build +demoapp.iml \ No newline at end of file diff --git a/demoapp/build.gradle b/demoapp/build.gradle index 3f336eb..ac5c6bd 100644 --- a/demoapp/build.gradle +++ b/demoapp/build.gradle @@ -1,13 +1,13 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 21 - buildToolsVersion "20.0.0" + compileSdkVersion 23 + buildToolsVersion "23.0.2" defaultConfig { applicationId "com.cardiomood.andoid.demo" minSdkVersion 9 - targetSdkVersion 21 + targetSdkVersion 23 versionCode 1 versionName "1.0" } @@ -21,6 +21,7 @@ android { dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) - compile 'com.android.support:appcompat-v7:21.0.2' + compile 'com.android.support:appcompat-v7:23.1.1' compile project(":main") + //compile 'com.cardiomood.android:android-widgets:0.1.1' } diff --git a/demoapp/demoapp.iml b/demoapp/demoapp.iml deleted file mode 100644 index a748ece..0000000 --- a/demoapp/demoapp.iml +++ /dev/null @@ -1,92 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/main/.gitignore b/main/.gitignore index 796b96d..9120ae2 100644 --- a/main/.gitignore +++ b/main/.gitignore @@ -1 +1,2 @@ /build +main.iml \ No newline at end of file diff --git a/main/build.gradle b/main/build.gradle index 6f1cd35..66ca326 100644 --- a/main/build.gradle +++ b/main/build.gradle @@ -1,12 +1,12 @@ apply plugin: 'com.android.library' android { - compileSdkVersion 21 - buildToolsVersion "20.0.0" + compileSdkVersion 23 + buildToolsVersion "23.0.2" defaultConfig { minSdkVersion 9 - targetSdkVersion 21 + targetSdkVersion 23 versionCode 1 versionName "0.1.1" } @@ -25,4 +25,4 @@ dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) } -apply from: 'https://raw.github.com/chrisbanes/gradle-mvn-push/master/gradle-mvn-push.gradle' +//apply from: 'https://raw.github.com/chrisbanes/gradle-mvn-push/master/gradle-mvn-push.gradle' diff --git a/main/main.iml b/main/main.iml deleted file mode 100644 index f912af9..0000000 --- a/main/main.iml +++ /dev/null @@ -1,91 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - From 5402c27885c71e0aa177430aa00935872274f6fd Mon Sep 17 00:00:00 2001 From: Zachary Kjellberg Date: Wed, 2 Dec 2015 12:41:10 +0100 Subject: [PATCH 3/3] Adding gradle changes --- demoapp/build.gradle | 1 - main/build.gradle | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/demoapp/build.gradle b/demoapp/build.gradle index ac5c6bd..692e9f1 100644 --- a/demoapp/build.gradle +++ b/demoapp/build.gradle @@ -23,5 +23,4 @@ dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) compile 'com.android.support:appcompat-v7:23.1.1' compile project(":main") - //compile 'com.cardiomood.android:android-widgets:0.1.1' } diff --git a/main/build.gradle b/main/build.gradle index 66ca326..85fa23e 100644 --- a/main/build.gradle +++ b/main/build.gradle @@ -25,4 +25,4 @@ dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) } -//apply from: 'https://raw.github.com/chrisbanes/gradle-mvn-push/master/gradle-mvn-push.gradle' +apply from: 'https://raw.github.com/chrisbanes/gradle-mvn-push/master/gradle-mvn-push.gradle'