Merge pull request #115 from Glucosio/develop

Merge develop to master

Author: Paolo Rotolo

README.md

@@ -1,4 +1,3 @@
-[![Stories in Ready](https://badge.waffle.io/Glucosio/android.png?label=ready&title=Ready)](https://waffle.io/Glucosio/android)
 [![Crowdin](https://d322cqt584bo4o.cloudfront.net/glucosio/localized.png)](https://crowdin.com/project/glucosio)
 [![Build Status](https://travis-ci.org/Glucosio/android.svg)](https://travis-ci.org/Glucosio/android)
 # Glucosio for Android
@@ -17,5 +16,13 @@ Glucosio for Android, an user centered free and open source app for diabetes man
 - Import the project in Android Studio: **File > New > Import Project**.
   Alternatively, from the Welcome screen, select **Import project**.
 
+## Download on Google Play Store
+<a href="https://play.google.com/store/apps/details?id=org.glucosio.android" alt="Download from Google Play">
+  <img src="http://www.android.com/images/brand/android_app_on_play_large.png">
+</a>
+
+## Test Drive Glucosio Daily
+http://daily.glucosio.org
+
 
 

app/build.gradle

@@ -1,25 +1,27 @@
 apply plugin: 'com.android.application'
+apply plugin: 'com.google.gms.google-services'
 
 android {
     compileSdkVersion 23
     buildToolsVersion "23.0.0"
-
     lintOptions {
         abortOnError false
     }
-
     defaultConfig {
-        applicationId "org.glucosio.android"
         minSdkVersion 16
         targetSdkVersion 23
-        versionCode 1
-        versionName "1.0"
+        versionCode 2
+        versionName '0.8.1'
     }
     buildTypes {
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
+        debug {
+            applicationIdSuffix '.daily'
+            versionNameSuffix '-DEVEL'
+        }
     }
     lintOptions {
         abortOnError false
@@ -33,18 +35,17 @@ repositories {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support:appcompat-v7:23.0.1'
-    compile 'com.android.support:design:23.0.1'
-    compile 'com.android.support:cardview-v7:23.0.1'
-    compile 'com.android.support:recyclerview-v7:23.0.1'
+    compile fileTree(include: ['*.jar'], dir: 'libs')
+    compile 'com.android.support:appcompat-v7:23.1.0'
+    compile 'com.android.support:design:23.1.0'
+    compile 'com.android.support:cardview-v7:23.1.0'
+    compile 'com.android.support:recyclerview-v7:23.1.0'
+    compile 'com.android.support:percent:23.1.0'
+    compile 'com.google.android.gms:play-services-analytics:8.1.0'
     compile 'com.wdullaer:materialdatetimepicker:1.5.3'
-    compile 'com.android.support:percent:23.0.1'
     compile 'com.github.PhilJay:MPAndroidChart:v2.1.4'
     compile 'uk.co.chrisjenx:calligraphy:2.1.0'
-    compile 'com.github.paolorotolo:gitty_reporter:1.1.1'
-    compile 'com.michaelpardo:activeandroid:3.1.0-SNAPSHOT'
-    compile 'com.wnafee:vector-compat:1.0.5'
+    compile 'com.github.paolorotolo:gitty_reporter:1.2.1'
     compile 'io.realm:realm-android:0.83.0'
     compile 'net.danlew:android.joda:2.8.2'
 }

app/google-services.json

@@ -0,0 +1 @@
+{"project_info":{"project_id":"glucosio-15798","project_number":"45702392997","name":"Glucosio"},"client":[{"client_info":{"mobilesdk_app_id":"1:45702392997:android:f3028c79631bec51","client_id":"android:org.glucosio.android","client_type":1,"android_client_info":{"package_name":"org.glucosio.android"}},"oauth_client":[],"api_key":[],"services":{"analytics_service":{"status":2,"analytics_property":{"tracking_id":"UA-68882401-2"}},"cloud_messaging_service":{"status":1,"apns_config":[]},"appinvite_service":{"status":1,"other_platform_oauth_client":[]},"google_signin_service":{"status":1},"ads_service":{"status":1}}}],"client_info":[],"ARTIFACT_VERSION":"1"}

app/src/debug/res/mipmap-hdpi/ic_launcher.png

@@ -0,0 +1,3 @@
+<resources>
+    <string name="app_name">Glucosio Daily</string>
+</resources>

app/src/debug/res/mipmap-mdpi/ic_launcher.png

@@ -34,7 +34,7 @@
         </activity>
         <activity
             android:name=".activity.LicenceActivity"
-            android:theme="@style/GlucosioTheme">
+            android:theme="@style/GlucosioSettings">
         </activity>
     </application>