Skip to content

Commit

Permalink
needed to change version for the next upload to the Play Store
Browse files Browse the repository at this point in the history
Robert Fisch authored and Robert Fisch committed Nov 1, 2015
1 parent 69b97df commit beebf5b
Showing 4 changed files with 18 additions and 12 deletions.
7 changes: 4 additions & 3 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -3,20 +3,21 @@ 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 {
minifyEnabled true
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}
productFlavors {
}
}

dependencies {
7 changes: 6 additions & 1 deletion app/src/main/java/lu/fisch/awt/Color.java
Original file line number Diff line number Diff line change
@@ -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()
{
}
6 changes: 3 additions & 3 deletions app/src/main/java/lu/fisch/canze/widgets/Timeplot.java
Original file line number Diff line number Diff line change
@@ -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
10 changes: 5 additions & 5 deletions app/src/main/res/layout/activity_consumption.xml
Original file line number Diff line number Diff line change
@@ -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)"
/>

</TableRow>

0 comments on commit beebf5b

Please sign in to comment.