Various fixes to new data elements

jilleb · Dec 22, 2018 · 0aa336a · 0aa336a
1 parent f064839
commit 0aa336a
Show file tree

Hide file tree

Showing 22 changed files with 684 additions and 675 deletions.
diff --git a/app/src/main/java/com/mqbcoding/stats/DashboardFragment.java b/app/src/main/java/com/mqbcoding/stats/DashboardFragment.java
diff --git a/app/src/main/res/drawable/ic_battery.png b/app/src/main/res/drawable/ic_battery.png
diff --git a/app/src/main/res/drawable/ic_distance.png b/app/src/main/res/drawable/ic_distance.png
diff --git a/app/src/main/res/drawable/ic_eco.png b/app/src/main/res/drawable/ic_eco.png
diff --git a/app/src/main/res/drawable/ic_ecoavg.png b/app/src/main/res/drawable/ic_ecoavg.png
diff --git a/app/src/main/res/drawable/ic_fuel.png b/app/src/main/res/drawable/ic_fuel.png
diff --git a/app/src/main/res/drawable/ic_fuelprimary.png b/app/src/main/res/drawable/ic_fuelprimary.png
diff --git a/app/src/main/res/drawable/ic_fuelsecondary.png b/app/src/main/res/drawable/ic_fuelsecondary.png
diff --git a/app/src/main/res/drawable/ic_gearbox.png b/app/src/main/res/drawable/ic_gearbox.png
diff --git a/app/src/main/res/drawable/ic_heading.png b/app/src/main/res/drawable/ic_heading.png
diff --git a/app/src/main/res/drawable/ic_lateral.png b/app/src/main/res/drawable/ic_lateral.png
diff --git a/app/src/main/res/drawable/ic_longitudinal.png b/app/src/main/res/drawable/ic_longitudinal.png
diff --git a/app/src/main/res/drawable/ic_measurement.png b/app/src/main/res/drawable/ic_measurement.png
diff --git a/app/src/main/res/drawable/ic_obd2.png b/app/src/main/res/drawable/ic_obd2.png
diff --git a/app/src/main/res/drawable/ic_odometer.png b/app/src/main/res/drawable/ic_odometer.png
diff --git a/app/src/main/res/drawable/ic_oil.png b/app/src/main/res/drawable/ic_oil.png
diff --git a/app/src/main/res/drawable/ic_outsidetemperature.png b/app/src/main/res/drawable/ic_outsidetemperature.png
diff --git a/app/src/main/res/drawable/ic_pedalposition.png b/app/src/main/res/drawable/ic_pedalposition.png
diff --git a/app/src/main/res/drawable/ic_powermeter.png b/app/src/main/res/drawable/ic_powermeter.png
diff --git a/app/src/main/res/drawable/ic_radio.png b/app/src/main/res/drawable/ic_radio.png
diff --git a/app/src/main/res/drawable/ic_spanner.png b/app/src/main/res/drawable/ic_spanner.png
diff --git a/app/src/main/res/layout/layout_dashboard_gauges.xml b/app/src/main/res/layout/layout_dashboard_gauges.xml
@@ -75,8 +75,8 @@
 
     <TextView
         android:id="@+id/icon_Element1"
-        android:layout_width="32dp"
-        android:layout_height="32dp"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
         android:layout_marginStart="8dp"
         android:layout_marginEnd="8dp"
         android:alpha="1.0"
@@ -91,8 +91,8 @@
 
     <TextView
         android:id="@+id/icon_ClockCenter"
-        android:layout_width="32dp"
-        android:layout_height="32dp"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
         android:layout_marginTop="8dp"
         android:layout_marginBottom="8dp"
         android:alpha="1.0"
@@ -113,8 +113,8 @@
 
     <TextView
         android:id="@+id/icon_ClockLeft"
-        android:layout_width="32dp"
-        android:layout_height="32dp"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
         android:layout_marginTop="8dp"
         android:layout_marginBottom="8dp"
         android:alpha="1.0"
@@ -128,12 +128,13 @@
         app:layout_constraintEnd_toEndOf="@+id/rayLeft"
         app:layout_constraintStart_toStartOf="@+id/rayLeft"
         app:layout_constraintTop_toTopOf="@+id/rayLeft"
-        app:layout_constraintVertical_bias="0.69" />
+        app:layout_constraintVertical_bias="0.69"
+        />
 
     <TextView
         android:id="@+id/icon_ClockRight"
-        android:layout_width="32dp"
-        android:layout_height="32dp"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
         android:layout_marginTop="8dp"
         android:layout_marginBottom="8dp"
         android:alpha="1.0"
@@ -151,8 +152,8 @@
 
     <TextView
         android:id="@+id/icon_Element2"
-        android:layout_width="32dp"
-        android:layout_height="32dp"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
         android:layout_marginStart="8dp"
         android:layout_marginEnd="8dp"
         android:alpha="1.0"
@@ -167,8 +168,8 @@
 
     <TextView
         android:id="@+id/icon_Element3"
-        android:layout_width="32dp"
-        android:layout_height="32dp"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
         android:layout_marginStart="8dp"
         android:layout_marginEnd="8dp"
         android:alpha="1.0"
@@ -183,8 +184,8 @@
 
     <TextView
         android:id="@+id/icon_Element4"
-        android:layout_width="32dp"
-        android:layout_height="32dp"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
         android:layout_marginStart="8dp"
         android:layout_marginEnd="8dp"
         android:alpha="1.0"
@@ -520,121 +521,84 @@
         android:id="@+id/textMinLeft"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="24dp"
-        android:layout_marginTop="8dp"
+        android:layout_marginStart="0dp"
+        android:layout_marginTop="260dp"
         android:drawableLeft="@drawable/ic_min"
         android:elevation="1dp"
         android:text="0"
-        android:textSize="30sp"
-        app:layout_constraintStart_toStartOf="@+id/image_MaxLeft"
-        app:layout_constraintTop_toTopOf="@+id/image_MaxLeft" />
+        android:textSize="24sp"
+        app:layout_constraintStart_toStartOf="@+id/dial_MinLeft"
+        app:layout_constraintTop_toTopOf="@+id/dial_MinLeft"
+        app:layout_constraintEnd_toEndOf="@+id/dial_MinLeft"/>
 
     <TextView
         android:id="@+id/textMaxLeft"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="8dp"
-        android:layout_marginEnd="24dp"
+        android:layout_marginTop="-80dp"
+        android:layout_marginEnd="0dp"
         android:drawableRight="@drawable/ic_max"
         android:elevation="1dp"
         android:text="0"
         android:textAlignment="textEnd"
-        android:textSize="30sp"
-        app:layout_constraintEnd_toEndOf="@+id/image_MaxLeft"
-        app:layout_constraintTop_toTopOf="@+id/image_MaxLeft" />
+        android:textSize="24sp"
+        app:layout_constraintStart_toStartOf="@+id/dial_MinLeft"
+        app:layout_constraintEnd_toEndOf="@+id/dial_MaxLeft"
+        app:layout_constraintTop_toTopOf="@+id/dial_MaxLeft" />
 
     <TextView
         android:id="@+id/textMinCenter"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="24dp"
-        android:layout_marginTop="8dp"
+        android:layout_marginStart="64dp"
+        android:layout_marginTop="260dp"
         android:drawableLeft="@drawable/ic_min"
         android:elevation="1dp"
         android:text="0"
-        android:textSize="30sp"
-        app:layout_constraintStart_toStartOf="@+id/image_MaxCenter"
-        app:layout_constraintTop_toTopOf="@+id/image_MaxCenter" />
+        android:textSize="24sp"
+        app:layout_constraintStart_toStartOf="@+id/dial_MinCenter"
+        app:layout_constraintTop_toTopOf="@+id/dial_MinCenter" />
 
     <TextView
         android:id="@+id/textMaxCenter"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="8dp"
-        android:layout_marginEnd="24dp"
+        android:layout_marginTop="260dp"
+        android:layout_marginEnd="64dp"
         android:drawableRight="@drawable/ic_max"
         android:elevation="1dp"
         android:text="0"
         android:textAlignment="textEnd"
-        android:textSize="30sp"
-        app:layout_constraintEnd_toEndOf="@+id/image_MaxCenter"
-        app:layout_constraintTop_toTopOf="@+id/image_MaxCenter" />
+        android:textSize="24sp"
+        app:layout_constraintEnd_toEndOf="@+id/dial_MinCenter"
+        app:layout_constraintTop_toTopOf="@+id/dial_MinCenter" />
 
     <TextView
         android:id="@+id/textMinRight"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="24dp"
-        android:layout_marginTop="8dp"
+        android:layout_marginStart="64dp"
+        android:layout_marginTop="260dp"
         android:drawableLeft="@drawable/ic_min"
         android:elevation="1dp"
         android:text="0"
-        android:textSize="30sp"
-        app:layout_constraintStart_toStartOf="@+id/image_MaxRight"
-        app:layout_constraintTop_toTopOf="@+id/image_MaxRight" />
+        android:textSize="24sp"
+        app:layout_constraintStart_toStartOf="@+id/dial_MinRight"
+        app:layout_constraintTop_toTopOf="@+id/dial_MinRight" />
 
     <TextView
         android:id="@+id/textMaxRight"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="8dp"
-        android:layout_marginEnd="24dp"
+        android:layout_marginTop="260dp"
+        android:layout_marginEnd="64dp"
         android:drawableRight="@drawable/ic_max"
         android:elevation="1dp"
         android:text="0"
         android:textAlignment="textEnd"
-        android:textSize="30sp"
-        app:layout_constraintEnd_toEndOf="@+id/image_MaxRight"
-        app:layout_constraintTop_toTopOf="@+id/image_MaxRight" />
-
-    <ImageView
-        android:id="@+id/image_MaxLeft"
-        android:layout_width="235dp"
-        android:layout_height="88dp"
-        android:layout_marginStart="8dp"
-        android:layout_marginEnd="8dp"
-        android:layout_marginBottom="80dp"
-        android:background="@drawable/minmax_bg"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="@+id/dial_MinLeft"
-        app:layout_constraintStart_toStartOf="@+id/dial_Left"
-        app:layout_constraintTop_toBottomOf="@+id/dial_Left" />
-
-    <ImageView
-        android:id="@+id/image_MaxRight"
-        android:layout_width="235dp"
-        android:layout_height="88dp"
-        android:layout_marginStart="8dp"
-        android:layout_marginEnd="8dp"
-        android:layout_marginBottom="80dp"
-        android:background="@drawable/minmax_bg"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="@+id/dial_Right"
-        app:layout_constraintStart_toStartOf="@+id/dial_Right"
-        app:layout_constraintTop_toBottomOf="@+id/dial_Right" />
-
-    <ImageView
-        android:id="@+id/image_MaxCenter"
-        android:layout_width="235dp"
-        android:layout_height="88dp"
-        android:layout_marginStart="8dp"
-        android:layout_marginEnd="8dp"
-        android:layout_marginBottom="80dp"
-        android:background="@drawable/minmax_bg"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="@+id/dial_MinCenter"
-        app:layout_constraintStart_toStartOf="@+id/dial_MinCenter"
-        app:layout_constraintTop_toBottomOf="@+id/dial_MinCenter" />
+        android:textSize="24sp"
+        app:layout_constraintEnd_toEndOf="@+id/dial_MinRight"
+        app:layout_constraintTop_toBottomOf="@+id/dial_MinRight" />
 
 
 </android.support.constraint.ConstraintLayout>