Merge pull request #199 from Glucosio/develop

Releasing 0.9.3

Author: Paolo Rotolo

.travis.yml

@@ -1,5 +1,5 @@
 language: android
-sudo: false
+sudo: required
 
 android:
   components:

app/build.gradle

@@ -9,8 +9,8 @@ android {
     defaultConfig {
         minSdkVersion 16
         targetSdkVersion 23
-        versionCode 8
-        versionName '0.9.2'
+        versionCode 9
+        versionName '0.9.3'
 
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
@@ -62,16 +62,16 @@ dependencies {
     compile 'com.google.android.gms:play-services-wearable:8.4.0'
 
     // Other libraries
+    compile 'io.realm:realm-android:0.87.2'
     compile 'com.github.clans:fab:1.6.2'
-    compile 'com.wdullaer:materialdatetimepicker:1.5.3'
+    compile 'com.wdullaer:materialdatetimepicker:2.1.1'
     compile 'com.github.PhilJay:MPAndroidChart:v2.1.6'
     compile 'uk.co.chrisjenx:calligraphy:2.1.0'
-    compile 'com.github.paolorotolo:gitty_reporter:1.2.2'
-    compile 'io.realm:realm-android:0.87.1'
     compile 'net.danlew:android.joda:2.8.2'
-    compile('com.mikepenz:materialdrawer:4.4.3@aar') {
+    compile('com.mikepenz:materialdrawer:4.6.4@aar') {
         transitive = true
     }
+    compile ("com.instabug.library:instabugsupport:1.7.3")
 
     wearApp project(':wear')
 

app/proguard-rules.pro

@@ -21,4 +21,11 @@
 -keep class io.realm.internal.Keep
 -keep @io.realm.internal.Keep class * { *; }
 -dontwarn javax.**
--dontwarn io.realm.**
+-dontwarn io.realm.**
+
+-dontwarn android.support.**
+-keep class android.support.v7.** { *; }
+-keep interface android.support.v7.** { *; }
+-keep class com.google.android.gms.** { *; }
+-dontwarn com.google.android.gms.**
+-keep class com.instabug.** { *; }

app/src/main/java/org/glucosio/android/GlucosioApplication.java

@@ -6,6 +6,7 @@
 
 import com.google.android.gms.analytics.GoogleAnalytics;
 import com.google.android.gms.analytics.Tracker;
+import com.instabug.library.Instabug;
 
 import uk.co.chrisjenx.calligraphy.CalligraphyConfig;
 import uk.co.chrisjenx.calligraphy.CalligraphyContextWrapper;
@@ -42,6 +43,8 @@ public void onCreate() {
                 .setDefaultFontPath("fonts/lato.ttf")
                 .setFontAttrId(R.attr.fontPath)
                 .build());
+        Instabug.initialize(this, "b2226aa30fec24f6f4bed6ad68964e9b");
+
     }
 
     @Override

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

@@ -9,6 +9,8 @@
 import android.support.v7.app.AppCompatActivity;
 import android.view.MenuItem;
 
+import com.instabug.library.Instabug;
+
 import org.glucosio.android.R;
 
 import java.util.Locale;
@@ -84,8 +86,7 @@ public boolean onPreferenceClick(Preference preference) {
             feedbackPref.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
                 @Override
                 public boolean onPreferenceClick(Preference preference) {
-                    Intent intent = new Intent(getActivity(), GittyActivity.class);
-                    startActivity(intent);
+                    Instabug.getInstance().invoke();
 
                     return false;
                 }

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

@@ -18,22 +18,20 @@
 import org.glucosio.android.R;
 import org.glucosio.android.presenter.AddCholesterolPresenter;
 import org.glucosio.android.tools.FormatDateTime;
-import org.w3c.dom.Text;
 
 import java.text.DecimalFormat;
 import java.util.Calendar;
 
 public class AddCholesterolActivity extends AppCompatActivity implements TimePickerDialog.OnTimeSetListener, DatePickerDialog.OnDateSetListener {
 
+    AddCholesterolPresenter presenter;
     private FloatingActionButton doneFAB;
     private TextView addTimeTextView;
     private TextView addDateTextView;
     private TextView totalChoTextView;
     private TextView LDLChoTextView;
     private TextView HDLChoTextView;
 
-    AddCholesterolPresenter presenter;
-
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -111,7 +109,7 @@ public void finishActivity(){
     }
 
     @Override
-    public void onTimeSet(RadialPickerLayout view, int hourOfDay, int minute) {
+    public void onTimeSet(RadialPickerLayout view, int hourOfDay, int minute, int second) {
         TextView addTime = (TextView) findViewById(R.id.dialog_add_time);
         DecimalFormat df = new DecimalFormat("00");
 

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

@@ -3,6 +3,7 @@
 import android.content.Intent;
 import android.os.Bundle;
 import android.support.design.widget.FloatingActionButton;
+import android.support.design.widget.Snackbar;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
 import android.view.KeyEvent;
@@ -11,7 +12,6 @@
 import android.widget.AdapterView;
 import android.widget.EditText;
 import android.widget.TextView;
-import android.widget.Toast;
 
 import com.wdullaer.materialdatetimepicker.date.DatePickerDialog;
 import com.wdullaer.materialdatetimepicker.time.RadialPickerLayout;
@@ -27,6 +27,7 @@
 
 public class AddGlucoseActivity extends AppCompatActivity implements TimePickerDialog.OnTimeSetListener, DatePickerDialog.OnDateSetListener {
 
+    AddGlucosePresenter presenter;
     private FloatingActionButton doneFAB;
     private TextView addTimeTextView;
     private TextView addDateTextView;
@@ -35,8 +36,6 @@ public class AddGlucoseActivity extends AppCompatActivity implements TimePickerD
     private LabelledSpinner readingTypeSpinner;
     private boolean isCustomType;
 
-    AddGlucosePresenter presenter;
-
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -144,7 +143,14 @@ private void dialogOnAddButtonPressed() {
     }
 
     public void showErrorMessage() {
-        Toast.makeText(getApplicationContext(), getString(R.string.dialog_error2), Toast.LENGTH_SHORT).show();
+        View rootLayout = findViewById(android.R.id.content);
+        Snackbar.make(rootLayout, getString(R.string.dialog_error2), Snackbar.LENGTH_SHORT).show();
+    }
+
+
+    public void showDuplicateErrorMessage() {
+        View rootLayout = findViewById(android.R.id.content);
+        Snackbar.make(rootLayout, getString(R.string.dialog_error_duplicate), Snackbar.LENGTH_LONG).show();
     }
 
     public void updateSpinnerTypeTime(int selection) {
@@ -162,7 +168,7 @@ public void finishActivity(){
     }
 
     @Override
-    public void onTimeSet(RadialPickerLayout view, int hourOfDay, int minute) {
+    public void onTimeSet(RadialPickerLayout view, int hourOfDay, int minute, int seconds) {
         TextView addTime = (TextView) findViewById(R.id.glucose_add_time);
         DecimalFormat df = new DecimalFormat("00");
 

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

@@ -17,21 +17,19 @@
 
 import org.glucosio.android.R;
 import org.glucosio.android.presenter.AddHB1ACPresenter;
-import org.glucosio.android.presenter.AddWeightPresenter;
 import org.glucosio.android.tools.FormatDateTime;
 
 import java.text.DecimalFormat;
 import java.util.Calendar;
 
 public class AddHB1ACActivity extends AppCompatActivity implements TimePickerDialog.OnTimeSetListener, DatePickerDialog.OnDateSetListener {
 
+    AddHB1ACPresenter presenter;
     private FloatingActionButton doneFAB;
     private TextView addTimeTextView;
     private TextView addDateTextView;
     private TextView readingTextView;
 
-    AddHB1ACPresenter presenter;
-
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -107,7 +105,7 @@ public void finishActivity(){
     }
 
     @Override
-    public void onTimeSet(RadialPickerLayout view, int hourOfDay, int minute) {
+    public void onTimeSet(RadialPickerLayout view, int hourOfDay, int minute, int seconds) {
         TextView addTime = (TextView) findViewById(R.id.dialog_add_time);
         DecimalFormat df = new DecimalFormat("00");
 

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

@@ -24,13 +24,12 @@
 
 public class AddKetoneActivity extends AppCompatActivity implements TimePickerDialog.OnTimeSetListener, DatePickerDialog.OnDateSetListener {
 
+    AddKetonePresenter presenter;
     private FloatingActionButton doneFAB;
     private TextView addTimeTextView;
     private TextView addDateTextView;
     private TextView readingTextView;
 
-    AddKetonePresenter presenter;
-
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -106,7 +105,7 @@ public void finishActivity(){
     }
 
     @Override
-    public void onTimeSet(RadialPickerLayout view, int hourOfDay, int minute) {
+    public void onTimeSet(RadialPickerLayout view, int hourOfDay, int minute, int seconds) {
         TextView addTime = (TextView) findViewById(R.id.dialog_add_time);
         DecimalFormat df = new DecimalFormat("00");
 

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

@@ -17,22 +17,20 @@
 
 import org.glucosio.android.R;
 import org.glucosio.android.presenter.AddPressurePresenter;
-import org.glucosio.android.presenter.AddWeightPresenter;
 import org.glucosio.android.tools.FormatDateTime;
 
 import java.text.DecimalFormat;
 import java.util.Calendar;
 
 public class AddPressureActivity extends AppCompatActivity implements TimePickerDialog.OnTimeSetListener, DatePickerDialog.OnDateSetListener {
 
+    AddPressurePresenter presenter;
     private FloatingActionButton doneFAB;
     private TextView addTimeTextView;
     private TextView addDateTextView;
     private TextView minPressureTextView;
     private TextView maxPressureTextView;
 
-    AddPressurePresenter presenter;
-
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -109,7 +107,7 @@ public void finishActivity(){
     }
 
     @Override
-    public void onTimeSet(RadialPickerLayout view, int hourOfDay, int minute) {
+    public void onTimeSet(RadialPickerLayout view, int hourOfDay, int minute, int seconds) {
         TextView addTime = (TextView) findViewById(R.id.dialog_add_time);
         DecimalFormat df = new DecimalFormat("00");