Merge branch 'develop'

Author: Paolo Rotolo

.travis.yml

@@ -6,7 +6,7 @@ jdk:
 android:
   components:
     - tools
-    - build-tools-25.0.0
+    - build-tools-25.0.1
     - android-25
     - extra-android-support
     - extra-google-google_play_services
@@ -39,4 +39,4 @@ before_cache:
 cache:
   directories:
     - $HOME/.gradle/caches/
-    - $HOME/.gradle/wrapper/
+    - $HOME/.gradle/wrapper/

app/build.gradle

@@ -34,8 +34,8 @@ android {
     defaultConfig {
         minSdkVersion 16
         targetSdkVersion 25
-        versionCode 38
-        versionName '1.3.0'
+        versionCode 39
+        versionName '1.3.1'
         applicationId 'org.glucosio.android'
 
         vectorDrawables.useSupportLibrary = true
@@ -124,13 +124,13 @@ dependencies {
     compile 'com.wdullaer:materialdatetimepicker:2.4.0'
     compile 'com.github.PhilJay:MPAndroidChart:v2.2.5'
     compile 'uk.co.chrisjenx:calligraphy:2.2.0'
-    compile 'net.danlew:android.joda:2.9.4.1'
-    compile('com.mikepenz:materialdrawer:5.4.0@aar') {
+    compile 'net.danlew:android.joda:2.9.5.1'
+    compile('com.mikepenz:materialdrawer:5.8.1@aar') {
         transitive = true
     }
 
     // https://mvnrepository.com/artifact/org.apache.commons/commons-math3
-    compile files('libs/commons-math3-3.6.jar')
+    compile files('libs/commons-math3-3.6.1.jar')
 
     // Butterknife
     compile "com.jakewharton:butterknife:${butterKnifeVer}"
@@ -147,7 +147,12 @@ dependencies {
         exclude group: 'commons-logging', module: 'commons-logging'
         exclude group: 'org.apache.httpcomponents', module: 'httpclient'
     }
-    testCompile 'io.reactivex:rxjava:1.1.8'
+    testCompile 'io.reactivex:rxjava:1.2.4'
+
+    testCompile "org.powermock:powermock-module-junit4:1.6.4"
+    testCompile "org.powermock:powermock-module-junit4-rule:1.6.4"
+    testCompile "org.powermock:powermock-api-mockito:1.6.4"
+    testCompile "org.powermock:powermock-classloading-xstream:1.6.4"
 
     // Testing libraries
     androidTestCompile 'com.android.support.test:rules:0.4.1'

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

@@ -81,7 +81,6 @@ protected void onCreate(Bundle savedInstanceState) {
             this.getAddTimeTextView().setText(formatDateTime.getCurrentTime());
         }
 
-        this.getDoneFAB().postDelayed(this.getFabAnimationRunnable(), 600);
     }
 
     @Override

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

@@ -83,7 +83,6 @@ protected void onCreate(Bundle savedInstanceState) {
             this.getAddTimeTextView().setText(formatDateTime.getCurrentTime());
         }
 
-        this.getDoneFAB().postDelayed(this.getFabAnimationRunnable(), 600);
     }
 
     @Override

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

@@ -39,6 +39,7 @@
 import org.glucosio.android.db.GlucoseReading;
 import org.glucosio.android.presenter.AddGlucosePresenter;
 import org.glucosio.android.tools.FormatDateTime;
+import org.glucosio.android.tools.GlucosioConverter;
 import org.glucosio.android.tools.LabelledSpinner;
 
 import java.text.DecimalFormat;
@@ -124,7 +125,7 @@ public void onNothingChosen(View labelledSpinner, AdapterView<?> adapterView) {
             if (presenter.getUnitMeasuerement().equals("mg/dL")) {
                 readingString = String.valueOf(readingToEdit.getReading());
             } else {
-                readingString = String.valueOf(presenter.convertToMmol(readingToEdit.getReading()));
+                readingString = String.valueOf(GlucosioConverter.glucoseToMmolL(readingToEdit.getReading()));
             }
 
             readingTextView.setText(readingString);
@@ -151,7 +152,6 @@ public void onNothingChosen(View labelledSpinner, AdapterView<?> adapterView) {
             presenter.updateSpinnerTypeTime();
         }
 
-        this.getDoneFAB().postDelayed(this.getFabAnimationRunnable(), 600);
 
         // Check if activity was started from a NFC sensor
         if (getIntent().getExtras() != null) {

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

@@ -74,9 +74,6 @@ protected void onCreate(Bundle savedInstanceState) {
             this.getAddDateTextView().setText(formatDateTime.getCurrentDate());
             this.getAddTimeTextView().setText(formatDateTime.getCurrentTime());
         }
-
-        //TODO try to do this in AddReadingActivity.createFANViewAndListener
-        this.getDoneFAB().postDelayed(this.getFabAnimationRunnable(), 600);
     }
 
     @Override

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

@@ -83,7 +83,6 @@ protected void onCreate(Bundle savedInstanceState) {
             this.getAddTimeTextView().setText(formatDateTime.getCurrentTime());
         }
 
-        this.getDoneFAB().postDelayed(this.getFabAnimationRunnable(), 600);
     }
 
     @Override

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

@@ -134,6 +134,7 @@ public void run() {
                 AnimationTools.startCircularReveal(doneFAB);
             }
         };
+        doneFAB.postDelayed(fabAnimationRunnable, 600);
     }
 
     protected abstract void dialogOnAddButtonPressed();
@@ -228,11 +229,4 @@ public void setAddDateTextView(TextView addDateTextView) {
         this.addDateTextView = addDateTextView;
     }
 
-    public FloatingActionButton getDoneFAB() {
-        return doneFAB;
-    }
-
-    public Runnable getFabAnimationRunnable() {
-        return fabAnimationRunnable;
-    }
 }

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

@@ -80,7 +80,6 @@ protected void onCreate(Bundle savedInstanceState) {
             this.getAddTimeTextView().setText(formatDateTime.getCurrentTime());
         }
 
-        this.getDoneFAB().postDelayed(this.getFabAnimationRunnable(), 600);
     }
 
     @Override

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

@@ -246,9 +246,8 @@ public void onResult(@NonNull DriveApi.MetadataBufferResult result) {
                             Date modifiedDate = metadata.getModifiedDate();
                             long backupSize = metadata.getFileSize();
                             backupsArray.add(new GlucosioBackup(driveId, modifiedDate, backupSize));
-                            backupListView.setAdapter(new BackupAdapter(activity, R.layout.preferences_backup, backupsArray));
                         }
-
+                        backupListView.setAdapter(new BackupAdapter(activity, R.layout.activity_backup_drive_restore_item, backupsArray));
                     }
                 });
     }
@@ -499,4 +498,4 @@ public boolean onOptionsItemSelected(MenuItem item) {
     protected void attachBaseContext(Context newBase) {
         super.attachBaseContext(CalligraphyContextWrapper.wrap(newBase));
     }
-}
+}