Merge pull request #206 from Glucosio/develop

Releasing 0.10.0

Author: Paolo Rotolo

.travis.yml

@@ -23,7 +23,7 @@ after_success:
 
 script:
  - cd $TRAVIS_BUILD_DIR/
- - ./gradlew clean build
+ - ./gradlew assembleDebug
 
 notifications:
   slack: glucosio:uk2xb9sAxOaVedj7zePyuBqa

README.md

@@ -18,9 +18,7 @@ Glucosio for Android, an user centered free and open source app for Diabetes man
   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>
+<a href="https://play.google.com/store/apps/details?id=org.glucosio.android&utm_source=global_co&utm_medium=prtnr&utm_content=Mar2515&utm_campaign=PartBadge&pcampaignid=MKT-AC-global-none-all-co-pr-py-PartBadges-Oct1515-1"><img alt="Get it on Google Play" height="100" src="https://play.google.com/intl/en_us/badges/images/apps/en-play-badge.png" /></a>
 
 ## Test Drive Glucosio Daily
 http://daily.glucosio.org

app/build.gradle

@@ -9,8 +9,8 @@ android {
     defaultConfig {
         minSdkVersion 16
         targetSdkVersion 23
-        versionCode 10
-        versionName '0.9.4'
+        versionCode 11
+        versionName '0.10.0'
 
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
@@ -62,7 +62,7 @@ dependencies {
     compile 'com.google.android.gms:play-services-wearable:8.4.0'
 
     // Other libraries
-    compile 'io.realm:realm-android:0.87.2'
+    compile 'io.realm:realm-android:0.87.4'
     compile 'com.github.clans:fab:1.6.2'
     compile 'com.wdullaer:materialdatetimepicker:2.1.1'
     compile 'com.github.PhilJay:MPAndroidChart:v2.1.6'
@@ -71,10 +71,9 @@ dependencies {
     compile('com.mikepenz:materialdrawer:4.6.4@aar') {
         transitive = true
     }
-    compile ("com.instabug.library:instabugsupport:1.7.3")
+    compile 'com.instabug.library:instabugcompat:2.1.1'
 
     wearApp project(':wear')
-
     // Testing libraries
     androidTestCompile 'com.android.support.test:rules:0.4.1'
     androidTestCompile 'com.android.support.test:runner:0.4.1'

app/proguard-rules.pro

@@ -23,9 +23,40 @@
 -dontwarn javax.**
 -dontwarn io.realm.**
 
--dontwarn android.support.**
--keep class android.support.v7.** { *; }
--keep interface android.support.v7.** { *; }
--keep class com.google.android.gms.** { *; }
+# RxAndroid
+-dontwarn rx.internal.util.unsafe.**
+
+## Instabug
+-dontwarn org.apache.http.**
+-dontwarn android.net.http.AndroidHttpClient
 -dontwarn com.google.android.gms.**
--keep class com.instabug.** { *; }
+-dontwarn com.android.volley.toolbox.**
+-dontwarn com.instabug.**
+
+## AppCompat
+-keep public class android.support.v7.widget.** { *; }
+-keep public class android.support.v7.internal.widget.** { *; }
+-keep public class android.support.v7.internal.view.menu.** { *; }
+
+-keep public class * extends android.support.v4.view.ActionProvider {
+    public <init>(android.content.Context);
+}
+
+## Google Play Services
+-dontnote com.google.vending.licensing.ILicensingService
+-keep class * extends java.util.ListResourceBundle {
+    protected Object[][] getContents();
+}
+
+-keep public class com.google.android.gms.common.internal.safeparcel.SafeParcelable {
+    public static final *** NULL;
+}
+
+-keepnames @com.google.android.gms.common.annotation.KeepName class *
+-keepclassmembernames class * {
+    @com.google.android.gms.common.annotation.KeepName *;
+}
+
+-keepnames class * implements android.os.Parcelable {
+    public static final ** CREATOR;
+}

app/src/main/AndroidManifest.xml

@@ -2,8 +2,15 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.glucosio.android">
 
+    <uses-permission android:name="android.permission.NFC" />
+    <uses-feature android:name="android.hardware.nfc" android:required="true" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <!-- Required for Instabug -->
+    <uses-permission android:name="${applicationId}.permission.C2D_MESSAGE"/>
+    <permission
+        android:name="${applicationId}.permission.C2D_MESSAGE"
+        android:protectionLevel="signature"/>
 
     <application
         android:name=".GlucosioApplication"
@@ -98,6 +105,7 @@
         <activity
             android:name=".activity.AddGlucoseActivity"
             android:label="@string/title_activity_add_glucose"
+            android:windowSoftInputMode="stateVisible"
             android:parentActivityName=".activity.MainActivity">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
@@ -106,6 +114,7 @@
         <activity
             android:name=".activity.AddWeightActivity"
             android:label="@string/title_activity_add_weight"
+            android:windowSoftInputMode="stateVisible"
             android:parentActivityName=".activity.MainActivity">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
@@ -114,6 +123,7 @@
         <activity
             android:name=".activity.AddCholesterolActivity"
             android:label="@string/title_activity_add_cholesterol"
+            android:windowSoftInputMode="stateVisible"
             android:parentActivityName=".activity.MainActivity">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
@@ -122,6 +132,7 @@
         <activity
             android:name=".activity.AddKetoneActivity"
             android:label="@string/title_activity_add_ketone"
+            android:windowSoftInputMode="stateVisible"
             android:parentActivityName=".activity.MainActivity">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
@@ -130,6 +141,7 @@
         <activity
             android:name=".activity.AddPressureActivity"
             android:label="@string/title_activity_add_pressure"
+            android:windowSoftInputMode="stateVisible"
             android:parentActivityName=".activity.MainActivity">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
@@ -138,6 +150,24 @@
         <activity
             android:name=".activity.AddHB1ACActivity"
             android:label="@string/title_activity_add_hb1ac"
+            android:windowSoftInputMode="stateVisible"
+            android:parentActivityName=".activity.MainActivity">
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                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" />
+        </activity>
+        <activity android:name=".activity.A1Calculator"
+            android:label="@string/activity_converter_title"
+            android:windowSoftInputMode="stateVisible"
+            android:screenOrientation="portrait"
             android:parentActivityName=".activity.MainActivity">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"

app/src/main/assets/fonts/lato-light.ttf

@@ -1,15 +1,16 @@
 package org.glucosio.android;
 
 import android.app.Application;
-import android.content.Context;
+import android.content.SharedPreferences;
+import android.preference.PreferenceManager;
 import android.util.Log;
 
 import com.google.android.gms.analytics.GoogleAnalytics;
 import com.google.android.gms.analytics.Tracker;
+import com.instabug.library.IBGInvocationEvent;
 import com.instabug.library.Instabug;
 
 import uk.co.chrisjenx.calligraphy.CalligraphyConfig;
-import uk.co.chrisjenx.calligraphy.CalligraphyContextWrapper;
 
 public class GlucosioApplication extends Application {
 
@@ -39,11 +40,31 @@ synchronized public Tracker getDefaultTracker() {
     public void onCreate() {
         super.onCreate();
 
+        // Get Dyslexia preference and adjust font
+        SharedPreferences sharedPref = PreferenceManager.getDefaultSharedPreferences(this);
+        boolean isDyslexicModeOn = sharedPref.getBoolean("pref_font_dyslexia", false);
+
+        if (isDyslexicModeOn) {
+            setFont("fonts/opendyslexic.otf");
+        } else {
+            setFont("fonts/lato.ttf");
+        }
+
+        if (BuildConfig.DEBUG) {
+            new Instabug.Builder(this, "b2226aa30fec24f6f4bed6ad68964e9b")
+                    .setInvocationEvent(IBGInvocationEvent.IBGInvocationEventShake)
+                    .build();
+        } else {
+            new Instabug.Builder(this, "820ee7db3118d03fd5f4249b5a73672e")
+                    .setInvocationEvent(IBGInvocationEvent.IBGInvocationEventShake)
+                    .build();
+        }
+    }
+
+    private void setFont(String font){
         CalligraphyConfig.initDefault(new CalligraphyConfig.Builder()
-                .setDefaultFontPath("fonts/lato.ttf")
+                .setDefaultFontPath(font)
                 .setFontAttrId(R.attr.fontPath)
                 .build());
-        Instabug.initialize(this, "b2226aa30fec24f6f4bed6ad68964e9b");
-
     }
 }

app/src/main/assets/fonts/opendyslexic-bold.otf

@@ -0,0 +1,129 @@
+package org.glucosio.android.activity;
+
+import android.content.Context;
+import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.Toolbar;
+import android.text.Editable;
+import android.text.TextWatcher;
+import android.view.KeyEvent;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.inputmethod.EditorInfo;
+import android.view.inputmethod.InputMethodManager;
+import android.widget.EditText;
+import android.widget.TextView;
+
+import org.glucosio.android.R;
+import org.glucosio.android.presenter.A1CCalculatorPresenter;
+
+import uk.co.chrisjenx.calligraphy.CalligraphyContextWrapper;
+
+public class A1Calculator extends AppCompatActivity {
+
+    A1CCalculatorPresenter presenter;
+    TextView glucoseUnit;
+    double convertedA1C = 0;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_a1_calculator);
+        Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
+
+        if (toolbar != null) {
+            setSupportActionBar(toolbar);
+            getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+            getSupportActionBar().setElevation(2);
+        }
+
+        presenter = new A1CCalculatorPresenter(this);
+
+        EditText glucoseEditText = (EditText) findViewById(R.id.activity_converter_a1c_glucose);
+        glucoseUnit = (TextView) findViewById(R.id.activity_converter_a1c_glucose_unit);
+        final TextView A1CTextView = (TextView) findViewById(R.id.activity_converter_a1c_a1c);
+
+        presenter.checkUnit();
+        glucoseEditText.addTextChangedListener(new TextWatcher() {
+            @Override
+            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+
+            }
+
+            @Override
+            public void onTextChanged(CharSequence s, int start, int before, int count) {
+
+            }
+
+            @Override
+            public void afterTextChanged(Editable s) {
+                if (!s.toString().equals("")) {
+                    convertedA1C = presenter.calculateA1C(s.toString());
+                    A1CTextView.setText(convertedA1C+"");
+                }
+            }
+        });
+
+        glucoseEditText.setOnEditorActionListener(
+            new TextView.OnEditorActionListener() {
+
+                public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
+                    if (actionId == EditorInfo.IME_ACTION_DONE) {
+                        // your additional processing...
+                        return true;
+                    } else {
+                        return false;
+                    }
+                }
+            });
+        glucoseEditText.setFocusable(true);
+    }
+
+    public void setMmol(){
+        glucoseUnit.setText("mmol/L");
+    }
+
+    @Override
+    public boolean onKeyUp(int keyCode, KeyEvent event) {
+        if (keyCode == KeyEvent.KEYCODE_BACK)
+        {
+            ((InputMethodManager)getSystemService(Context.INPUT_METHOD_SERVICE)).toggleSoftInput
+                    (InputMethodManager.SHOW_FORCED,InputMethodManager.HIDE_IMPLICIT_ONLY);
+        }
+        return super.onKeyUp(keyCode, event);
+    }
+
+    @Override
+    public boolean onKeyDown(int keyCode, KeyEvent event) {
+        if (keyCode == KeyEvent.KEYCODE_BACK)
+        {
+            ((InputMethodManager)getSystemService(Context.INPUT_METHOD_SERVICE)).toggleSoftInput
+                    (InputMethodManager.SHOW_FORCED, InputMethodManager.HIDE_IMPLICIT_ONLY);
+        }
+        return super.onKeyDown(keyCode, event);
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.menu_converter_a1c, menu);
+        return true;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case R.id.action_menu_save:
+                presenter.saveA1C(convertedA1C);
+                break;
+            case android.R.id.home:
+                finish();
+                break;
+        }
+        return true;
+    }
+
+    @Override
+    protected void attachBaseContext(Context newBase) {
+        super.attachBaseContext(CalligraphyContextWrapper.wrap(newBase));
+    }
+}