diff --git a/.idea/.name b/.idea/.name
index 5c650700e9b66f0c1d66c75d3390011727f4810c..d3be8eb1c4ca8c4e7072b2165d0887dffc3670c4 100644
--- a/.idea/.name
+++ b/.idea/.name
@@ -1 +1 @@
-Medtronic640gUploader
\ No newline at end of file
+640gAndroidUploader
\ No newline at end of file
diff --git a/.idea/libraries/appcompat_v7_21_0_3.xml b/.idea/libraries/appcompat_v7_21_0_3.xml
index 3139fdd38024854d25f4a58894601a1ee8e740b2..52ea574e89cf839e9ed2760007ab7219830ba164 100644
--- a/.idea/libraries/appcompat_v7_21_0_3.xml
+++ b/.idea/libraries/appcompat_v7_21_0_3.xml
@@ -1,8 +1,8 @@
<component name="libraryTable">
<library name="appcompat-v7-21.0.3">
<CLASSES>
- <root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.android.support/appcompat-v7/21.0.3/jars/classes.jar!/" />
<root url="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.android.support/appcompat-v7/21.0.3/res" />
+ <root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.android.support/appcompat-v7/21.0.3/jars/classes.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
diff --git a/.idea/libraries/support_v4_21_0_3.xml b/.idea/libraries/support_v4_21_0_3.xml
index 177d8fd0e9fae145d8b114e0a137b57187b6497c..064682a5d37ef40677a278bf6451f8faaf831377 100644
--- a/.idea/libraries/support_v4_21_0_3.xml
+++ b/.idea/libraries/support_v4_21_0_3.xml
@@ -1,9 +1,9 @@
<component name="libraryTable">
<library name="support-v4-21.0.3">
<CLASSES>
- <root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.android.support/support-v4/21.0.3/jars/classes.jar!/" />
<root url="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.android.support/support-v4/21.0.3/res" />
<root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.android.support/support-v4/21.0.3/jars/libs/internal_impl-21.0.3.jar!/" />
+ <root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.android.support/support-v4/21.0.3/jars/classes.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 5d19981032aa01b060f5a568641d7a8840cc90dc..7c1371c54da8eafc01d4252c2465d08c996e6451 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
- <component name="EntryPointsManager">
- <entry_points version="2.0" />
- </component>
<component name="NullableNotNullManager">
<option name="myDefaultNullable" value="android.support.annotation.Nullable" />
<option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 49852060b7acfb7b360cd7f6c8a09e9505350860..6a153d59bb2fd59118c64a730add619af8d20ca0 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,7 +2,7 @@
<project version="4">
<component name="ProjectModuleManager">
<modules>
- <module fileurl="file://$PROJECT_DIR$/Medtronic640gUploader.iml" filepath="$PROJECT_DIR$/Medtronic640gUploader.iml" />
+ <module fileurl="file://$PROJECT_DIR$/640gAndroidUploader.iml" filepath="$PROJECT_DIR$/640gAndroidUploader.iml" />
<module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
</modules>
</component>
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 94a25f7f4cb416c083d265558da75d457237d671..35eb1ddfbbc029bcab630581847471d7f238ec53 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
- <mapping directory="$PROJECT_DIR$" vcs="Git" />
+ <mapping directory="" vcs="Git" />
</component>
</project>
\ No newline at end of file
diff --git a/Medtronic640gUploader.iml b/640gAndroidUploader.iml
similarity index 64%
rename from Medtronic640gUploader.iml
rename to 640gAndroidUploader.iml
index ecac07ef6afaa43b593e91b76dc0d42d8c2200f5..dd11c422309587fbfb2c40dcfbc1c5c64bb0d573 100644
--- a/Medtronic640gUploader.iml
+++ b/640gAndroidUploader.iml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="Medtronic640gUploader" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="640gAndroidUploader" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="java-gradle" name="Java-Gradle">
<configuration>
@@ -13,7 +13,7 @@
<content url="file://$MODULE_DIR$">
<excludeFolder url="file://$MODULE_DIR$/.gradle" />
</content>
- <orderEntry type="inheritedJdk" />
+ <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f12e676a6323b661cb0950c3c5dfe4b7f9e0433e..0447fc508f24290d8e414a6bbe5f6db49edc0013 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,5 +13,5 @@ This project adheres to [Semantic Versioning](http://semver.org/).
### Added
- Initial public beta release
-[Unreleased]: https://github.com/pazaan/Medtronic640gUploader/compare/v0.1.1...HEAD
-[v0.1.1]: https://github.com/pazaan/Medtronic640gUploader/compare/v0.1.0...v0.1.1
+[Unreleased]: https://github.com/pazaan/640gAndroidUploader/compare/v0.1.1...HEAD
+[v0.1.1]: https://github.com/pazaan/640gAndroidUploader/compare/v0.1.0...v0.1.1
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 1bf27b699dceb609121f4fb246bab2aed61b74a2..37930a1d061aa0fc311d87040fb7d6d22336bcb9 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -2,9 +2,9 @@
#### **Did you find a bug?**
-* **Ensure the bug was not already reported** by searching on GitHub under [Issues](https://github.com/pazaan/Medtronic640gUploader/issues).
+* **Ensure the bug was not already reported** by searching on GitHub under [Issues](https://github.com/pazaan/640gAndroidUploader/issues).
-* If you're unable to find an open issue addressing the problem, [open a new one](https://github.com/pazaan/Medtronic640gUploader/issues/new). Be sure to include a **title and clear description**, as much relevant information as possible, and any **log information** to help us reproduce the problem on our own gear.
+* If you're unable to find an open issue addressing the problem, [open a new one](https://github.com/pazaan/640gAndroidUploader/issues/new). Be sure to include a **title and clear description**, as much relevant information as possible, and any **log information** to help us reproduce the problem on our own gear.
#### **Did you write a patch that fixes a bug?**
@@ -15,9 +15,9 @@
</br>
640gAndroidUploader is a volunteer effort. We encourage you to pitch in and [join the team](https://gitter.im/pazaan/decoding-contour-next-link)
-Thanks! :heart: :heart: :heart:
+Thanks! :heart: :squirrel: :heart:
-The 640g Nightscout Support Team
+**The 640g Nightscout Support Team**
Lennart Goedhart (@pazaan)
Matt Guy (@LittleDMatt)
David Wright (@wright-david)
diff --git a/README.md b/README.md
index 73564711724c0c2c6fa5d16014011cf75073479f..1252901487b68b3f1e9d71919dcd9f7b81250741 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# Medtronic640gUploader
+# 640gAndroidUploader
Android app to upload data from the Medtronic 640g
App framework based on the Android app at https://github.com/arbox0/MedtronicUploader, through the internals are completely changed for the Medtronic 640g
diff --git a/app/app.iml b/app/app.iml
index 9a64822a65a4d03265a046c848d0dd7f61c9843a..f64eb4dcc617f8a77e76420415ebeeaf7bc35043 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":app" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="Medtronic640gUploader" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+<module external.linked.project.id=":app" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="640gAndroidUploader" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="android-gradle" name="Android-Gradle">
<configuration>
@@ -82,7 +82,6 @@
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
- <excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
diff --git a/app/build.gradle b/app/build.gradle
index a0a2b832805fef1461872a3108f80b1d162c68ad..3814fc0b58ebfd5e3cf3d03e0b4c8c61064aea20 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
android {
compileSdkVersion 21
- buildToolsVersion "23.0.1"
+ buildToolsVersion "23.0.3"
defaultConfig {
applicationId "info.nightscout.android"
@@ -25,4 +25,4 @@ dependencies {
compile files('libs/mongo-java-driver-3.0.2.jar')
compile files('libs/physicaloidlibrary.jar')
compile files('libs/slf4j-api-1.7.2.jar')
-}
+}
\ No newline at end of file
diff --git a/app/src/main/assets/logback.xml b/app/src/main/assets/logback.xml
index 9da743253fac15059bee47491e111b7850fd5eec..c6459d39ae7475308c13b18602fdbd9fbd217d83 100644
--- a/app/src/main/assets/logback.xml
+++ b/app/src/main/assets/logback.xml
@@ -1,9 +1,9 @@
<configuration>
<appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
- <file>/sdcard/Medtronic640gUploader.log</file>
+ <file>/sdcard/640gAndroidUploader.log</file>
<append>true</append>
<rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
- <fileNamePattern>/sdcard/Medtronic640gUploader.%i.log.zip</fileNamePattern>
+ <fileNamePattern>/sdcard/640gAndroidUploader.%i.log.zip</fileNamePattern>
<minIndex>1</minIndex>
<maxIndex>3</maxIndex>
</rollingPolicy>
diff --git a/build.gradle b/build.gradle
index 856d3d7f82e637e3d8a677102d5b860e113a2810..03bced9f3fb18a90b91401e6547e9ed4896de30e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,10 +1,14 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
+
buildscript {
repositories {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:2.1.0'
+
+ // NOTE: Do not place your application dependencies here; they belong
+ // in the individual module build.gradle files
}
}
@@ -13,3 +17,7 @@ allprojects {
jcenter()
}
}
+
+task clean(type: Delete) {
+ delete rootProject.buildDir
+}