Merge remote-tracking branch 'remotes/origin/freestyle-libre' into develop

# Conflicts:
#	app/src/main/AndroidManifest.xml
#	app/src/main/java/org/glucosio/android/activity/AddGlucoseActivity.java
#	app/src/main/java/org/glucosio/android/presenter/AddGlucosePresenter.java

Author: paolorotolo

app/build.gradle

@@ -129,6 +129,9 @@ dependencies {
         transitive = true
     }
 
+    // https://mvnrepository.com/artifact/org.apache.commons/commons-math3
+    compile files('libs/commons-math3-3.6.jar')
+
     // Butterknife
     compile "com.jakewharton:butterknife:${butterKnifeVer}"
     apt "com.jakewharton:butterknife-compiler:${butterKnifeVer}"

app/src/main/AndroidManifest.xml

@@ -20,6 +20,15 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.glucosio.android">
 
+    <!-- Required to read FreeStyle Libre -->
+    <uses-permission
+        android:name="android.permission.NFC"
+        android:required="false" />
+
+    <uses-feature
+        android:name="android.hardware.nfc"
+        android:required="false" />
+
     <!-- Required to export and save CSV or graph -->
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
@@ -137,6 +146,19 @@
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value="org.glucosio.android.activity.MainActivity" />
         </activity>
+        <activity android:name=".activity.FreestyleLibreActivity">
+
+            <!-- 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.A1cCalculatorActivity"
             android:label="@string/activity_converter_title"

app/src/main/java/org/glucosio/android/activity/AddGlucoseActivity.java

@@ -22,6 +22,9 @@
 
 import android.os.Bundle;
 import android.support.design.widget.Snackbar;
+import android.support.design.widget.TextInputLayout;
+import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.AppCompatButton;
 import android.support.v7.widget.Toolbar;
 import android.view.View;
 import android.widget.AdapterView;
@@ -49,6 +52,8 @@ public class AddGlucoseActivity extends AddReadingActivity {
     private TextView readingTextView;
     private EditText typeCustomEditText;
     private EditText notesEditText;
+    private AppCompatButton addFreeStyleButton;
+    private TextInputLayout readingInputLayout;
     private LabelledSpinner readingTypeSpinner;
     private boolean isCustomType = false;
 
@@ -74,6 +79,8 @@ protected void onCreate(Bundle savedInstanceState) {
         readingTypeSpinner.setItemsArray(R.array.dialog_add_measured_list);
         readingTextView = (TextView) findViewById(R.id.glucose_add_concentration);
         typeCustomEditText = (EditText) findViewById(R.id.glucose_type_custom);
+        readingInputLayout = (TextInputLayout) findViewById(R.id.glucose_add_concentration_layout);
+        addFreeStyleButton = (AppCompatButton) findViewById(R.id.glucose_add_freestyle_button);
         notesEditText = (EditText) findViewById(R.id.glucose_add_notes);
 
         this.createDateTimeViewAndListener();
@@ -138,7 +145,38 @@ public void onNothingChosen(View labelledSpinner, AdapterView<?> adapterView) {
             presenter.updateSpinnerTypeTime();
         }
 
-        this.getDoneFAB().postDelayed(this.getFabAnimationRunnable(), 600);
+        this.getDoneFAB().postDelayed(this.getFabAnimationRunnable(), 600)
+
+        // Check if activity was started from a NFC sensor
+        if (getIntent().getExtras() != null) {
+            Bundle p;
+            String reading;
+
+            p = getIntent().getExtras();
+            reading = p.getString("reading");
+            if (reading!=null) {
+                // If yes, first convert the decimal value from Freestyle to Integer
+                double d = Double.parseDouble(reading);
+                int glucoseValue = (int) d;
+                readingTextView.setText(glucoseValue + "");
+                readingInputLayout.setErrorEnabled(true);
+                readingInputLayout.setError(getResources().getString(R.string.dialog_add_glucose_freestylelibre_added));
+                addFreeStyleButton.setVisibility(View.GONE);
+
+                addAnalyticsEvent();
+            }
+        }
+
+        // Check if FreeStyle support is enabled in Preferences
+        if (presenter.isFreeStyleLibreEnabled()) {
+            addFreeStyleButton.setVisibility(View.VISIBLE);
+            addFreeStyleButton.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View view) {
+                    startLibreActivity();
+                }
+            });
+        }
     }
 
     private void addAnalyticsEvent() {
@@ -172,6 +210,10 @@ public void showErrorMessage() {
         Snackbar.make(rootLayout, getString(R.string.dialog_error2), Snackbar.LENGTH_SHORT).show();
     }
 
+    public void startLibreActivity() {
+        Intent intent = new Intent(this, FreestyleLibreActivity.class);
+        startActivity(intent);
+    }
 
     public void showDuplicateErrorMessage() {
         View rootLayout = findViewById(android.R.id.content);
@@ -193,4 +235,5 @@ public void onTimeSet(RadialPickerLayout view, int hourOfDay, int minute, int se
         DecimalFormat df = new DecimalFormat("00");
         updateSpinnerTypeHour(Integer.parseInt(df.format(hourOfDay)));
     }
+
 }