Added device icon to unit_item.xml (+ a11y) and moved category logic to MarkerTransformations

4 files changed, 72 insertions, 8 deletions

diff --git a/androidApp/src/main/res/layout/unit_item.xml b/androidApp/src/main/res/layout/unit_item.xml
index e827940..833e56b 100644
--- a/androidApp/src/main/res/layout/unit_item.xml
+++ b/androidApp/src/main/res/layout/unit_item.xml
@@ -57,18 +57,33 @@
         android:clickable="true"
         android:focusable="true">
 
-        <LinearLayout
+        <androidx.constraintlayout.widget.ConstraintLayout
             android:id="@+id/mainContent"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical">
 
+            <ImageView
+                android:id="@+id/unitIcon"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:padding="@dimen/card_icon_padding"
+                android:paddingStart="0dp"
+                android:src="@drawable/map_default"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintBottom_toBottomOf="parent"
+                tools:ignore="ContentDescription,RtlSymmetry" />
+
             <LinearLayout
                 android:id="@+id/titleLayout"
-                android:layout_width="match_parent"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:gravity="center_vertical"
-                android:orientation="horizontal">
+                android:orientation="horizontal"
+                app:layout_constraintStart_toEndOf="@id/unitIcon"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toTopOf="parent">
 
                 <ImageView
                     android:id="@+id/statusIcon"
@@ -83,26 +98,30 @@
                     android:id="@+id/engineStopIcon"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:visibility="gone"
                     android:layout_marginEnd="5dp"
                     android:src="@drawable/device_unlocked"
+                    android:visibility="gone"
                     tools:ignore="ContentDescription" />
 
                 <TextView
                     android:id="@+id/unitName"
+                    style="@style/TextAppearance.AppCompat.Body2"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    style="@style/TextAppearance.AppCompat.Body2"
                     tools:text="1AAUTO" />
 
             </LinearLayout>
 
             <GridLayout
                 android:id="@+id/gridLayout"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content" />
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toEndOf="@id/unitIcon"
+                app:layout_constraintTop_toBottomOf="@id/titleLayout"
+                app:layout_constraintBottom_toBottomOf="parent"/>
 
-        </LinearLayout>
+        </androidx.constraintlayout.widget.ConstraintLayout>
 
     </com.google.android.material.card.MaterialCardView>
 
diff --git a/androidApp/src/main/res/values-es-rMX/strings.xml b/androidApp/src/main/res/values-es-rMX/strings.xml
index a57d66a..6aee861 100644
--- a/androidApp/src/main/res/values-es-rMX/strings.xml
+++ b/androidApp/src/main/res/values-es-rMX/strings.xml
@@ -31,6 +31,28 @@
     <string name="unit_last_address">Dirección de la última posición</string>
     <string name="unit_last_date">Fecha y hora de la última posición</string>
 
+    <string name="unit_category_animal">Animal</string>
+    <string name="unit_category_bicycle">Bicicleta</string>
+    <string name="unit_category_boat">Bote</string>
+    <string name="unit_category_bus">Autobús</string>
+    <string name="unit_category_car">Automóvil</string>
+    <string name="unit_category_crane">Grúa</string>
+    <string name="unit_category_default">Predeterminado</string>
+    <string name="unit_category_helicopter">Helicóptero</string>
+    <string name="unit_category_motorcycle">Motocicleta</string>
+    <string name="unit_category_offroad">Todoterreno</string>
+    <string name="unit_category_person">Persona</string>
+    <string name="unit_category_pickup">Pickup</string>
+    <string name="unit_category_plane">Avión</string>
+    <string name="unit_category_scooter">Moto</string>
+    <string name="unit_category_ship">Barco</string>
+    <string name="unit_category_tractor">Tractor</string>
+    <string name="unit_category_train">Tren</string>
+    <string name="unit_category_tram">Tranvía</string>
+    <string name="unit_category_trolleybus">Trolebús</string>
+    <string name="unit_category_truck">Camión</string>
+    <string name="unit_category_van">Furgoneta</string>
+
     <!-- Details -->
     <string name="unit_details">Detalles</string>
     <string name="unit_reports">Reportes</string>
diff --git a/androidApp/src/main/res/values/dimen.xml b/androidApp/src/main/res/values/dimen.xml
index a016dbd..d557010 100644
--- a/androidApp/src/main/res/values/dimen.xml
+++ b/androidApp/src/main/res/values/dimen.xml
@@ -9,6 +9,7 @@
     <dimen name="card_large_padding">32dp</dimen>
     <dimen name="card_padding">16dp</dimen>
     <dimen name="card_margin">16dp</dimen>
+    <dimen name="card_icon_padding">5dp</dimen>
 
     <!-- Card Buttons -->
     <dimen name="card_action_text">12sp</dimen>
diff --git a/androidApp/src/main/res/values/strings.xml b/androidApp/src/main/res/values/strings.xml
index e078b39..b8080f5 100644
--- a/androidApp/src/main/res/values/strings.xml
+++ b/androidApp/src/main/res/values/strings.xml
@@ -49,6 +49,28 @@
     <string name="unit_last_address">Last position address</string>
     <string name="unit_last_date">Last position datetime</string>
 
+    <string name="unit_category_animal">Animal</string>
+    <string name="unit_category_bicycle">Bicycle</string>
+    <string name="unit_category_boat">Boat</string>
+    <string name="unit_category_bus">Bus</string>
+    <string name="unit_category_car">Car</string>
+    <string name="unit_category_crane">Crane</string>
+    <string name="unit_category_default">Default</string>
+    <string name="unit_category_helicopter">Helicopter</string>
+    <string name="unit_category_motorcycle">Motorcycle</string>
+    <string name="unit_category_offroad">Offroad</string>
+    <string name="unit_category_person">Person</string>
+    <string name="unit_category_pickup">Pickup</string>
+    <string name="unit_category_plane">Plane</string>
+    <string name="unit_category_scooter">Scooter</string>
+    <string name="unit_category_ship">Ship</string>
+    <string name="unit_category_tractor">Tractor</string>
+    <string name="unit_category_train">Train</string>
+    <string name="unit_category_tram">Tram</string>
+    <string name="unit_category_trolleybus">Trolleybus</string>
+    <string name="unit_category_truck">Truck</string>
+    <string name="unit_category_van">Van</string>
+
     <!-- Details -->
     <string name="unit_details">Details</string>
     <string name="unit_reports">Reports</string>