Fix bugs related to the calculation metric

Author: widavies

app/build.gradle

@@ -4,9 +4,10 @@ buildscript {
     repositories {
         jcenter()
         mavenCentral()
+        google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.1'
+        classpath 'com.android.tools.build:gradle:3.1.0'
         classpath 'com.google.gms:google-services:3.1.1'
     }
 }
@@ -21,12 +22,12 @@ allprojects {
 
 android {
     compileSdkVersion 27
-    buildToolsVersion "27.0.2"
+    buildToolsVersion "27.0.3"
     defaultConfig {
         applicationId "com.cpjd.roblu"
         minSdkVersion 19
         targetSdkVersion 27
-        versionCode 60
+        versionCode 61
         versionName "4.4.6"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 
@@ -79,34 +80,34 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
-    testCompile 'junit:junit:4.12'
-    compile('com.mikepenz:aboutlibraries:5.9.6@aar') { transitive = true }
-    compile('com.mikepenz:materialdrawer:5.9.0@aar') {
+    androidTestImplementation 'junit:junit:4.12'
+    implementation('com.mikepenz:aboutlibraries:5.9.6@aar') { transitive = true }
+    implementation('com.mikepenz:materialdrawer:5.9.0@aar') {
         transitive = true
     }
-    compile "com.googlecode.json-simple:json-simple:1.1"
-    compile 'com.dlazaro66.qrcodereaderview:qrcodereaderview:2.0.3'
-    compile 'com.roughike:bottom-bar:2.1.1'
-    compile 'com.miguelcatalan:materialsearchview:1.4.0'
-    compile 'pub.devrel:easypermissions:0.2.1'
-    compile 'com.google.guava:guava:22.0-android'
-    compile 'com.jrummyapps:colorpicker:2.1.6'
-    compile 'com.github.infotech-group:CanvasView:release'
-    compile 'com.android.support:appcompat-v7:27.0.2'
-    compile 'com.android.support:recyclerview-v7:27.0.2'
-    compile 'com.android.support:preference-v7:27.0.2'
-    compile 'com.android.support:cardview-v7:27.0.2'
-    compile 'com.android.support:design:27.0.2'
-    compile 'pub.devrel:easypermissions:0.2.1'
-    compile 'com.squareup.picasso:picasso:2.5.2'
-    compile('com.mikepenz:aboutlibraries:5.9.5@aar') { transitive = true }
-    compile 'com.android.support:appcompat-v7:27.0.2'
+    implementation "com.googlecode.json-simple:json-simple:1.1"
+    implementation 'com.dlazaro66.qrcodereaderview:qrcodereaderview:2.0.3'
+    implementation 'com.roughike:bottom-bar:2.1.1'
+    implementation 'com.miguelcatalan:materialsearchview:1.4.0'
+    implementation 'pub.devrel:easypermissions:0.2.1'
+    implementation 'com.google.guava:guava:22.0-android'
+    implementation 'com.jrummyapps:colorpicker:2.1.6'
+    implementation 'com.github.infotech-group:CanvasView:release'
+    implementation 'com.android.support:appcompat-v7:27.0.2'
+    implementation 'com.android.support:recyclerview-v7:27.0.2'
+    implementation 'com.android.support:preference-v7:27.0.2'
+    implementation 'com.android.support:cardview-v7:27.0.2'
+    implementation 'com.android.support:design:27.0.2'
+    implementation 'pub.devrel:easypermissions:0.2.1'
+    implementation 'com.squareup.picasso:picasso:2.5.2'
+    implementation('com.mikepenz:aboutlibraries:5.9.5@aar') { transitive = true }
+    implementation 'com.android.support:appcompat-v7:27.0.2'
     implementation 'com.github.PhilJay:MPAndroidChart:v3.0.3'
-    compile "org.projectlombok:lombok:1.16.16"
+    implementation "org.projectlombok:lombok:1.16.16"
     annotationProcessor 'org.projectlombok:lombok:1.16.16'
-    compile 'javax.annotation:jsr250-api:1.0'
+    implementation 'javax.annotation:jsr250-api:1.0'
 }

app/src/main/java/com/cpjd/roblu/ui/team/fragments/Overview.java

@@ -19,6 +19,7 @@
 import com.cpjd.roblu.models.RTab;
 import com.cpjd.roblu.models.RTeam;
 import com.cpjd.roblu.models.metrics.RBoolean;
+import com.cpjd.roblu.models.metrics.RCalculation;
 import com.cpjd.roblu.models.metrics.RCheckbox;
 import com.cpjd.roblu.models.metrics.RChooser;
 import com.cpjd.roblu.models.metrics.RCounter;
@@ -115,7 +116,7 @@ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup c
                         pieValues.put(metric.getTitle(), temp);
                     }
                     // Line chart metrics
-                    else if(metric instanceof RCounter || metric instanceof RSlider || metric instanceof RStopwatch) {
+                    else if(metric instanceof RCounter || metric instanceof RSlider || metric instanceof RStopwatch || metric instanceof RCalculation) {
                         LinkedHashMap<String, Double> temp = lineValues.get(metric.getTitle());
                         if(temp == null) temp = new LinkedHashMap<>();
                         temp.put(tab.getTitle(), Double.parseDouble(metric.toString()));

build.gradle

@@ -6,7 +6,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.1'
+        classpath 'com.android.tools.build:gradle:3.1.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Sun Jan 07 20:25:48 CST 2018
+#Mon Apr 02 11:04:47 CDT 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip