Merge pull request #233 from Glucosio/develop

Releasing 1.0.1
Glucosio · May 24, 2016 · aee52c4 · aee52c4
2 parents ed53442 + 084f5e0
commit aee52c4
Show file tree

Hide file tree

Showing 160 changed files with 2,393 additions and 1,145 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,5 +1,7 @@
 language: android
-sudo: required
+
+jdk:
+  - oraclejdk8
 
 android:
   components:
@@ -14,6 +16,8 @@ android:
 
 before_install:
  - chmod +x gradlew
+ - export JAVA8_HOME=/usr/lib/jvm/java-8-oracle
+ - export JAVA_HOME=$JAVA8_HOME
 
 after_success:
  - chmod +x ./upload-gh-pages.sh

diff --git a/README.md b/README.md
@@ -3,7 +3,7 @@
 [![Codacy](https://img.shields.io/codacy/e27821fb6289410b8f58338c7e0bc686.svg)]()
 [![Coverage Status](https://coveralls.io/repos/github/Glucosio/glucosio-android/badge.svg?branch=develop)](https://coveralls.io/github/Glucosio/glucosio-android?branch=develop)
 # Glucosio for Android
-Glucosio for Android, an user centered free and open source app for Diabetes management and research for Android.
+Glucosio for Android, a user centered free and open source app for Diabetes management and research for Android.
 
 ![Glucosio Banner](https://cloud.githubusercontent.com/assets/5623301/14087778/f02be08c-f52b-11e5-9ff3-15bc5670cddb.png)
 

diff --git a/app/build.gradle b/app/build.gradle
@@ -32,10 +32,11 @@ android {
     defaultConfig {
         minSdkVersion 16
         targetSdkVersion 23
-        versionCode 20
-        versionName '0.12.0'
+        versionCode 25
+        versionName '1.0.1'
         applicationId "org.glucosio.android"
 
+        vectorDrawables.useSupportLibrary = true
         testInstrumentationRunner 'android.support.test.runner.AndroidJUnitRunner'
     }
 
@@ -88,28 +89,34 @@ dependencies {
     compile fileTree(include: ['*.jar'], dir: 'libs')
 
     // Android Support libraries
+    compile 'com.google.android.support:wearable:1.3.0'
+
     compile "com.android.support:appcompat-v7:${androidSupportVer}"
     compile "com.android.support:design:${androidSupportVer}"
     compile "com.android.support:cardview-v7:${androidSupportVer}"
     compile "com.android.support:recyclerview-v7:${androidSupportVer}"
     compile "com.android.support:percent:${androidSupportVer}"
 
-    compile 'com.google.android.support:wearable:1.3.0'
-
     // Google Play Services
-    compile "com.google.android.gms:play-services-appinvite:${googlePlayServicesVer}"
     compile "com.google.android.gms:play-services-analytics:${googlePlayServicesVer}"
     compile "com.google.android.gms:play-services-drive:${googlePlayServicesVer}"
     compile "com.google.android.gms:play-services-wearable:${googlePlayServicesVer}"
     compile "com.google.android.gms:play-services-gcm:${googlePlayServicesVer}"
 
+    // Firebase
+    compile "com.google.firebase:firebase-core:${googlePlayServicesVer}"
+    compile "com.google.firebase:firebase-crash:${googlePlayServicesVer}"
+    compile "com.google.firebase:firebase-invites:${googlePlayServicesVer}"
+    compile "com.google.firebase:firebase-messaging:${googlePlayServicesVer}"
+
     // Other libraries
+    compile 'com.github.paolorotolo:expandableheightlistview:1.0.0'
     compile 'com.github.clans:fab:1.6.3'
     compile 'com.wdullaer:materialdatetimepicker:2.3.0'
     compile 'com.github.PhilJay:MPAndroidChart:v2.2.4'
-    compile 'uk.co.chrisjenx:calligraphy:2.1.0'
+    compile 'uk.co.chrisjenx:calligraphy:2.2.0'
     compile 'net.danlew:android.joda:2.9.3'
-    compile('com.mikepenz:materialdrawer:5.2.1@aar') {
+    compile('com.mikepenz:materialdrawer:5.2.6@aar') {
         transitive = true
     }
 
@@ -141,4 +148,4 @@ configurations.all {
     resolutionStrategy.force "com.android.support:design:${androidSupportVer}"
     resolutionStrategy.force "com.android.support:appcompat-v7:${androidSupportVer}"
 }
-apply plugin: 'com.google.gms.google-services'
+apply plugin: 'com.google.gms.google-services'
diff --git a/app/google-services.json b/app/google-services.json
@@ -1,18 +1,16 @@
 {
   "project_info": {
-    "project_id": "glucosio-15798",
     "project_number": "45702392997",
-    "name": "Glucosio"
+    "firebase_url": "https://glucosio-15798.firebaseio.com",
+    "project_id": "glucosio-15798",
+    "storage_bucket": "glucosio-15798.appspot.com"
   },
   "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",
-          "certificate_hash": []
+          "package_name": "org.glucosio.android"
         }
       },
       "oauth_client": [
@@ -24,35 +22,36 @@
             "certificate_hash": "A18AA65A6EFE7F0DE3BA409A02EA6703E21CFEFD"
           }
         },
+        {
+          "client_id": "45702392997-8gb1fse9kp6leslqp2jil5hfqs5ls033.apps.googleusercontent.com",
+          "client_type": 3
+        },
         {
           "client_id": "45702392997-75lumfd1jtpvd7n2q7sac4ebrsjfcbp6.apps.googleusercontent.com",
           "client_type": 3
         }
       ],
-      "api_key": [],
+      "api_key": [
+        {
+          "current_key": "AIzaSyCXgRfFDiHPOB0fI8tJXWavDb3y51urRsI"
+        }
+      ],
       "services": {
         "analytics_service": {
           "status": 2,
           "analytics_property": {
             "tracking_id": "UA-68882401-2"
           }
         },
-        "cloud_messaging_service": {
-          "status": 2,
-          "apns_config": []
-        },
         "appinvite_service": {
           "status": 2,
           "other_platform_oauth_client": [
             {
-              "client_id": "45702392997-75lumfd1jtpvd7n2q7sac4ebrsjfcbp6.apps.googleusercontent.com",
+              "client_id": "45702392997-8gb1fse9kp6leslqp2jil5hfqs5ls033.apps.googleusercontent.com",
               "client_type": 3
             }
           ]
         },
-        "google_signin_service": {
-          "status": 2
-        },
         "ads_service": {
           "status": 1
         }
@@ -61,14 +60,19 @@
     {
       "client_info": {
         "mobilesdk_app_id": "1:45702392997:android:e595132614f4ec2a",
-        "client_id": "android:org.glucosio.android.daily",
-        "client_type": 1,
         "android_client_info": {
-          "package_name": "org.glucosio.android.daily",
-          "certificate_hash": []
+          "package_name": "org.glucosio.android.daily"
         }
       },
       "oauth_client": [
+        {
+          "client_id": "45702392997-riuobp0po7qf98ktcdcva39s2bhbpk49.apps.googleusercontent.com",
+          "client_type": 1,
+          "android_info": {
+            "package_name": "org.glucosio.android.daily",
+            "certificate_hash": "AB3309F7EB2D25BF7B007C54AF59A3D096F1C50E"
+          }
+        },
         {
           "client_id": "45702392997-le0hot86nfci96j5dn6lnlnahn6lg80e.apps.googleusercontent.com",
           "client_type": 1,
@@ -77,38 +81,38 @@
             "certificate_hash": "9DF65CBC6293EB82523180CAF03912C6CC301FBD"
           }
         },
+        {
+          "client_id": "45702392997-8gb1fse9kp6leslqp2jil5hfqs5ls033.apps.googleusercontent.com",
+          "client_type": 3
+        },
         {
           "client_id": "45702392997-75lumfd1jtpvd7n2q7sac4ebrsjfcbp6.apps.googleusercontent.com",
           "client_type": 3
         }
       ],
-      "api_key": [],
+      "api_key": [
+        {
+          "current_key": "AIzaSyAWcm8BiItil81kEEl3t3zwKnUvyR6yvJ4"
+        }
+      ],
       "services": {
         "analytics_service": {
           "status": 1
         },
-        "cloud_messaging_service": {
-          "status": 1,
-          "apns_config": []
-        },
         "appinvite_service": {
           "status": 2,
           "other_platform_oauth_client": [
             {
-              "client_id": "45702392997-75lumfd1jtpvd7n2q7sac4ebrsjfcbp6.apps.googleusercontent.com",
+              "client_id": "45702392997-8gb1fse9kp6leslqp2jil5hfqs5ls033.apps.googleusercontent.com",
               "client_type": 3
             }
           ]
         },
-        "google_signin_service": {
-          "status": 1
-        },
         "ads_service": {
           "status": 1
         }
       }
     }
   ],
-  "client_info": [],
-  "ARTIFACT_VERSION": "1"
+  "configuration_version": "1"
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -16,13 +16,14 @@
   ~ along with Glucosio.  If not, see <http://www.gnu.org/licenses/>.
   ~
   ~
-  -->
+-->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.glucosio.android">
 
     <uses-permission
         android:name="android.permission.NFC"
         android:required="false" />
+
     <uses-feature
         android:name="android.hardware.nfc"
         android:required="false" />
@@ -32,6 +33,7 @@
 
     <!-- Required for Google Cloud Messaging -->
     <uses-permission android:name="${applicationId}.permission.C2D_MESSAGE" />
+
     <permission
         android:name="${applicationId}.permission.C2D_MESSAGE"
         android:protectionLevel="signature" />
@@ -49,13 +51,7 @@
         <activity
             android:name=".activity.MainActivity"
             android:label="@string/app_name"
-            android:theme="@style/GlucosioTheme">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
+            android:theme="@style/GlucosioTheme"/>
         <activity
             android:name=".activity.HelloActivity"
             android:label="@string/title_activity_hello"
@@ -83,8 +79,8 @@
             android:name="android.support.v4.content.FileProvider"
             android:authorities="${applicationId}.provider.fileprovider"
             android:exported="false"
-            android:readPermission="${applicationId}.provider.fileprovider.READ"
-            android:grantUriPermissions="true">
+            android:grantUriPermissions="true"
+            android:readPermission="${applicationId}.provider.fileprovider.READ">
             <meta-data
                 android:name="android.support.FILE_PROVIDER_PATHS"
                 android:resource="@xml/my_paths" />
@@ -145,11 +141,14 @@
                 android:value="org.glucosio.android.activity.MainActivity" />
         </activity>
         <activity android:name=".activity.FreestyleLibre">
+
             <!-- NFC for FreeStyle -->
             <intent-filter>
                 <action android:name="android.nfc.action.TECH_DISCOVERED" />
+
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
+
             <meta-data
                 android:name="android.nfc.action.TECH_DISCOVERED"
                 android:resource="@xml/nfc_tech_filter" />
@@ -165,15 +164,14 @@
                 android:value="org.glucosio.android.activity.MainActivity" />
         </activity>
 
-        <!--
-            Google Cloud Messaging receiver
-         -->
+        <!--             Google Cloud Messaging receiver -->
         <receiver
             android:name="com.google.android.gms.gcm.GcmReceiver"
             android:exported="true"
             android:permission="com.google.android.c2dm.permission.SEND">
             <intent-filter>
                 <action android:name="com.google.android.c2dm.intent.RECEIVE" />
+
                 <category android:name="${applicationId}" />
             </intent-filter>
             <intent-filter>
@@ -186,6 +184,12 @@
                 <action android:name="com.google.android.gms.wearable.BIND_LISTENER" />
             </intent-filter>
         </service>
+        <service
+            android:name=".service.GlucosioFirebaseMessagingService">
+            <intent-filter>
+                <action android:name="com.google.firebase.MESSAGING_EVENT"/>
+            </intent-filter>
+        </service>
 
         <!--
          Register AnalyticsReceiver and AnalyticsService to support background
@@ -222,6 +226,15 @@
             android:name="com.google.android.gms.version"
             android:value="@integer/google_play_services_version" />
 
+        <activity
+            android:name=".activity.SplashActivity"
+            android:label="@string/app_name"
+            android:theme="@style/SplashTheme">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
     </application>
 
-</manifest>
+</manifest>
diff --git a/app/src/main/java/org/glucosio/android/GlucosioApplication.java b/app/src/main/java/org/glucosio/android/GlucosioApplication.java
@@ -31,8 +31,6 @@
 import org.glucosio.android.backup.Backup;
 import org.glucosio.android.backup.GoogleDriveBackup;
 import org.glucosio.android.db.DatabaseHandler;
-import org.glucosio.android.invitations.GoogleInvitation;
-import org.glucosio.android.invitations.Invitation;
 
 import uk.co.chrisjenx.calligraphy.CalligraphyConfig;
 
@@ -77,11 +75,6 @@ public Analytics getAnalytics() {
         return analytics;
     }
 
-    @NonNull
-    public Invitation getInvitation() {
-        return new GoogleInvitation();
-    }
-
     @NonNull
     public DatabaseHandler getDBHandler() {
         return new DatabaseHandler(getApplicationContext());