diff --git a/app/build.gradle b/app/build.gradle index 3fec67db..3dc2dab4 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -3,13 +3,12 @@ apply plugin: 'com.android.application' android { compileSdkVersion 22 buildToolsVersion "22.0.1" - defaultConfig { applicationId "lu.fisch.canze" minSdkVersion 15 targetSdkVersion 22 - versionCode 1 - versionName "1.0" + versionName '1.01' + versionCode 2 } buildTypes { release { @@ -17,6 +16,8 @@ android { proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } + productFlavors { + } } dependencies { diff --git a/app/src/main/java/lu/fisch/awt/Color.java b/app/src/main/java/lu/fisch/awt/Color.java index 27ab6feb..e26e5cbf 100644 --- a/app/src/main/java/lu/fisch/awt/Color.java +++ b/app/src/main/java/lu/fisch/awt/Color.java @@ -17,7 +17,12 @@ public class Color public static final Color GRAY_LIGHT= new Color(204,204,204); public static final Color GRAY_DARK = new Color(80,80,80); public static final Color YELLOW = new Color(255,255,128); - + + public static final Color RENAULT_RED = new Color(250,36,4); + public static final Color RENAULT_BLUE = new Color(11,198,209); + public static final Color RENAULT_GREEN = new Color(133,196,26); + public static final Color RENAULT_YELLOW = new Color(251,207,00); + public Color() { } diff --git a/app/src/main/java/lu/fisch/canze/widgets/Timeplot.java b/app/src/main/java/lu/fisch/canze/widgets/Timeplot.java index 5948bd1b..9b571497 100644 --- a/app/src/main/java/lu/fisch/canze/widgets/Timeplot.java +++ b/app/src/main/java/lu/fisch/canze/widgets/Timeplot.java @@ -82,9 +82,9 @@ public void addValue(String fieldSID, double value) private Color getColor(int i) { - if(i==1) return Color.BLUE; - else if (i==2) return Color.GREEN_DARK; - else return Color.RED; + if(i==0) return Color.RENAULT_RED; + else if (i==1) return Color.BLUE; + else return Color.GREEN_DARK; } @Override diff --git a/app/src/main/res/layout/activity_consumption.xml b/app/src/main/res/layout/activity_consumption.xml index 39b3bff7..7472afdc 100644 --- a/app/src/main/res/layout/activity_consumption.xml +++ b/app/src/main/res/layout/activity_consumption.xml @@ -32,9 +32,9 @@ custom:max="125" custom:majorTicks="25" custom:minorTicks="5" - custom:fieldSID="186.40,18a.16" + custom:fieldSID="42e.0,654.24" custom:widget="timeplot" - custom:text="Acceleration pedal (%) / Power train set point (%)" + custom:text="True State of Charge (%) / Indicated State of Charge (%)" /> @@ -84,12 +84,12 @@ android:layout_marginRight="8dp" android:layout_marginBottom="8dp" custom:min="0" - custom:max="140" + custom:max="160" custom:majorTicks="20" custom:minorTicks="10" - custom:fieldSID="5d7.0,42e.0,654.24" + custom:fieldSID="5d7.0,654.42" custom:widget="timeplot" - custom:text="Speed (km/h) / True State of Charge (%) / Indicated State of Charge (%)" + custom:text="Speed (km/h) / Available distance (km)" />