Merge pull request #297 from enviroCar/develop

Develop

build.gradle

@@ -8,7 +8,7 @@ buildscript {
 
     dependencies {
         classpath 'me.tatarka:gradle-retrolambda:3.2.3'
-        classpath 'com.android.tools.build:gradle:1.5.0'
+        classpath 'com.android.tools.build:gradle:2.0.0-beta6'
         classpath 'com.neenbedankt.gradle.plugins:android-apt:1.7+'
         classpath "gradle.plugin.nl.javadude.gradle.plugins:license-gradle-plugin:0.12.1"
     }
@@ -28,29 +28,30 @@ allprojects {
     }
 
     repositories {
+        maven { url "https://jitpack.io" }
         mavenCentral()
         jcenter()
-        maven { url "https://jitpack.io" }
+
     }
 }
 
 ext {
-    androidPlugin = 'com.android.tools.build:gradle:1.3.0'
+    androidPlugin = 'com.android.tools.build:gradle:2.0.0-beta6'
     minSdkVersion = 16
     compileSdkVersion = 23
     targetSdkVersion = 23
     buildToolsVersion = '23.0.2'
-    versionCode = 25
-    versionName = "0.20.1"
+    versionCode = 29
+    versionName = "0.22.0"
 
     javaCompileVersion = JavaVersion.VERSION_1_8
 
     // Android dependencies.
-    supportV4 = 'com.android.support:support-v4:23.1.1'
-    supportV7 = 'com.android.support:appcompat-v7:23.1.1'
-    supportDesign = 'com.android.support:design:23.1.1'
-    supportCardview = 'com.android.support:cardview-v7:23.1.1'
-    supportRecyclerview = 'com.android.support:recyclerview-v7:23.1.1'
+    supportV4 = 'com.android.support:support-v4:23.2.0'
+    supportV7 = 'com.android.support:appcompat-v7:23.2.0'
+    supportDesign = 'com.android.support:design:23.2.0'
+    supportCardview = 'com.android.support:cardview-v7:23.2.0'
+    supportRecyclerview = 'com.android.support:recyclerview-v7:23.2.0'
 
     // Dependency injection, view injection, event bus...
     dagger = 'com.squareup.dagger:dagger:1.2.2'
@@ -80,7 +81,7 @@ ext {
     acra = 'ch.acra:acra:4.6.2'
 
     // other third party dependencies.
-    materialDialogs = 'com.afollestad:material-dialogs:0.8.5.0'
+    materialDialogs = 'com.github.afollestad.material-dialogs:core:0.8.5.6@aar'
     helloCharts = 'com.github.lecho:hellocharts-library:1.5.5@aar'
     fabProgressCircle = 'com.github.jorgecastilloprz:fabprogresscircle:1.01@aar'
     mapbox = 'com.mapbox.mapboxsdk:mapbox-android-sdk:0.7.4@aar'

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip

org.envirocar.algorithm/src/test/java/org/envirocar/algorithm/InterpolationMeasurementProviderTest.java

@@ -1,9 +1,6 @@
 package org.envirocar.algorithm;
 
 import org.envirocar.core.entity.Measurement;
-import org.envirocar.obd.commands.PID;
-import org.envirocar.obd.commands.response.DataResponse;
-import org.envirocar.obd.commands.response.entity.LambdaProbeVoltageResponse;
 import org.envirocar.obd.events.PropertyKeyEvent;
 import org.hamcrest.CoreMatchers;
 import org.junit.Assert;
@@ -20,7 +17,7 @@ public class InterpolationMeasurementProviderTest {
 
     @Test
     public void testInterpolateTwo() {
-        InterpolationMeasurementProvider imp = new InterpolationMeasurementProvider(null);
+        InterpolationMeasurementProvider imp = new InterpolationMeasurementProvider();
 
         PropertyKeyEvent s1 = new PropertyKeyEvent(Measurement.PropertyKey.SPEED, 52, 1000);
         PropertyKeyEvent s2 = new PropertyKeyEvent(Measurement.PropertyKey.SPEED, 95, 4000);
@@ -41,7 +38,7 @@ public void testInterpolateTwo() {
 
     @Test
     public void testInterpolation() {
-        InterpolationMeasurementProvider imp = new InterpolationMeasurementProvider(null);
+        InterpolationMeasurementProvider imp = new InterpolationMeasurementProvider();
 
         PropertyKeyEvent m1 = new PropertyKeyEvent(Measurement.PropertyKey.MAF, 16.0, 1000);
         PropertyKeyEvent m2 = new PropertyKeyEvent(Measurement.PropertyKey.MAF, 48.0, 3500); // this should be the result

org.envirocar.app/AndroidManifest.xml

@@ -3,8 +3,8 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.envirocar.app"
     android:installLocation="internalOnly"
-    android:versionCode="28"
-    android:versionName="0.21.0">
+    android:versionCode="29"
+    android:versionName="0.22.0">
 
     <uses-sdk
         android:minSdkVersion="16"
@@ -45,7 +45,8 @@
             android:name="org.envirocar.app.BaseMainActivity"
             android:configChanges="keyboard|keyboardHidden|orientation"
             android:label="@string/app_name"
-            android:screenOrientation="portrait">
+            android:screenOrientation="portrait"
+            android:theme="@style/Theme.Cario">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />