unit_item.xml data fields are generated programmatically, and DevicesAdapter code was refactored into UnitRenderData to be shared with UnitMapFragment.

2 files changed, 33 insertions, 192 deletions

diff --git a/androidApp/src/main/res/layout/unit_item.xml b/androidApp/src/main/res/layout/unit_item.xml
index d9432ba..d46e7a1 100644
--- a/androidApp/src/main/res/layout/unit_item.xml
+++ b/androidApp/src/main/res/layout/unit_item.xml
@@ -15,9 +15,7 @@
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:layout_gravity="end"
-        android:paddingTop="@dimen/card_padding"
-        android:paddingBottom="@dimen/card_padding"
-        android:paddingHorizontal="@dimen/card_padding"
+        android:padding="@dimen/card_padding"
         android:gravity="center"
         android:orientation="horizontal"
         android:visibility="visible">
@@ -31,18 +29,17 @@
             android:text="@string/unit_details"
             android:textColor="@color/colorAccent"
             android:textSize="@dimen/card_action_text"
-            style="?borderlessButtonStyle"/>
+            style="?android:borderlessButtonStyle"/>
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/reportsButton"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
-            android:layout_marginHorizontal="8dp"
             android:layout_weight="1"
             android:text="@string/unit_reports"
             android:textColor="@color/colorAccent"
             android:textSize="@dimen/card_action_text"
-            style="?borderlessButtonStyle" />
+            style="?android:borderlessButtonStyle"/>
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/commandsButton"
@@ -52,7 +49,7 @@
             android:text="@string/unit_commands"
             android:textColor="@color/colorAccent"
             android:textSize="@dimen/card_action_text"
-            style="?borderlessButtonStyle" />
+            style="?android:borderlessButtonStyle" />
 
     </LinearLayout>
 
@@ -70,127 +67,52 @@
         android:clickable="true"
         android:focusable="true">
 
-        <RelativeLayout
+        <LinearLayout
             android:id="@+id/mainContent"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:animateLayoutChanges="true">
+            android:orientation="vertical">
 
-            <ImageView
-                android:id="@+id/statusIcon"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginEnd="5dp"
-                android:src="@drawable/device_status"
-                app:tint="?android:textColorPrimary"
-                tools:ignore="ContentDescription" />
-
-            <ImageView
-                android:id="@+id/engineStopIcon"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_toEndOf="@id/statusIcon"
-                android:visibility="gone"
-                android:layout_marginEnd="5dp"
-                android:src="@drawable/device_unlocked"
-                tools:ignore="ContentDescription" />
-
-            <TextView
-                android:id="@+id/unitName"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_toEndOf="@id/engineStopIcon"
-                style="@style/TextAppearance.AppCompat.Body2"
-                tools:text="1AAUTO" />
-
-            <GridLayout
-                android:id="@+id/gridLayout"
+            <LinearLayout
+                android:id="@+id/titleLayout"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_below="@id/unitName">
-
-                <ImageView
-                    android:id="@+id/driverNameIcon"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginEnd="6dp"
-                    android:layout_column="0"
-                    android:layout_row="1"
-                    android:contentDescription="@string/unit_driver_name"
-                    android:src="@drawable/device_contact"
-                    app:tint="?android:textColorSecondary" />
-
-                <TextView
-                    android:id="@+id/driverName"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_column="1"
-                    android:layout_row="1"
-                    style="@style/TextAppearance.AppCompat.Caption"
-                    tools:text="Javier Zavala" />
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
 
                 <ImageView
-                    android:id="@+id/unitSpeedIcon"
+                    android:id="@+id/statusIcon"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_column="0"
-                    android:layout_row="2"
-                    style="@style/TextAppearance.MaterialComponents.Caption"
-                    android:contentDescription="@string/unit_speed"
-                    android:src="@drawable/position_speed"
-                    app:tint="?android:textColorSecondary" />
-
-                <TextView
-                    android:id="@+id/unitSpeed"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_column="1"
-                    android:layout_row="2"
-                    style="@style/TextAppearance.AppCompat.Caption"
-                    tools:text="0 Km/h - Stopped" />
+                    android:layout_marginEnd="5dp"
+                    android:src="@drawable/device_status"
+                    app:tint="?android:textColorPrimary"
+                    tools:ignore="ContentDescription" />
 
                 <ImageView
-                    android:id="@+id/lastAddressIcon"
+                    android:id="@+id/engineStopIcon"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_column="0"
-                    android:layout_row="3"
-                    android:contentDescription="@string/unit_last_address"
-                    android:src="@drawable/position_address"
-                    app:tint="?android:textColorSecondary" />
+                    android:visibility="gone"
+                    android:layout_marginEnd="5dp"
+                    android:src="@drawable/device_unlocked"
+                    tools:ignore="ContentDescription" />
 
                 <TextView
-                    android:id="@+id/lastAddress"
+                    android:id="@+id/unitName"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_column="1"
-                    android:layout_row="3"
-                    style="@style/TextAppearance.AppCompat.Caption"
-                    tools:text="404 Av. Arboledas, Celaya, Gto." />
-
-                <ImageView
-                    android:id="@+id/lastDateIcon"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_column="0"
-                    android:layout_row="4"
-                    android:contentDescription="@string/unit_last_date"
-                    android:src="@drawable/position_datetime"
-                    app:tint="?android:textColorSecondary" />
+                    style="@style/TextAppearance.AppCompat.Body2"
+                    tools:text="1AAUTO" />
 
+            </LinearLayout>
 
-                <TextView
-                    android:id="@+id/lastDate"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_column="1"
-                    android:layout_row="4"
-                    style="@style/TextAppearance.AppCompat.Caption"
-                    tools:text="4 de Diciembre de 2021, 7:00 PM" />
-
-            </GridLayout>
+            <GridLayout
+                android:id="@+id/gridLayout"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" />
 
-        </RelativeLayout>
+        </LinearLayout>
 
     </com.google.android.material.card.MaterialCardView>
 
diff --git a/androidApp/src/main/res/layout/unit_map_fragment.xml b/androidApp/src/main/res/layout/unit_map_fragment.xml
index 213d33d..a920b14 100644
--- a/androidApp/src/main/res/layout/unit_map_fragment.xml
+++ b/androidApp/src/main/res/layout/unit_map_fragment.xml
@@ -68,87 +68,7 @@
                 android:id="@+id/gridLayout"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_below="@id/unitName">
-
-                <ImageView
-                    android:id="@+id/driverNameIcon"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginEnd="6dp"
-                    android:layout_column="0"
-                    android:layout_row="1"
-                    android:contentDescription="@string/unit_driver_name"
-                    android:src="@drawable/device_contact"
-                    app:tint="?android:textColorSecondary" />
-
-                <TextView
-                    android:id="@+id/driverName"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_column="1"
-                    android:layout_row="1"
-                    style="@style/TextAppearance.AppCompat.Caption"
-                    tools:text="Javier Zavala" />
-
-                <ImageView
-                    android:id="@+id/unitSpeedIcon"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_column="0"
-                    android:layout_row="2"
-                    style="@style/TextAppearance.MaterialComponents.Caption"
-                    android:contentDescription="@string/unit_speed"
-                    android:src="@drawable/position_speed"
-                    app:tint="?android:textColorSecondary" />
-
-                <TextView
-                    android:id="@+id/unitSpeed"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_column="1"
-                    android:layout_row="2"
-                    style="@style/TextAppearance.AppCompat.Caption"
-                    tools:text="0 Km/h - Stopped" />
-
-                <ImageView
-                    android:id="@+id/lastAddressIcon"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_column="0"
-                    android:layout_row="3"
-                    android:contentDescription="@string/unit_last_address"
-                    android:src="@drawable/position_address"
-                    app:tint="?android:textColorSecondary" />
-
-                <TextView
-                    android:id="@+id/lastAddress"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_column="1"
-                    android:layout_row="3"
-                    style="@style/TextAppearance.AppCompat.Caption"
-                    tools:text="404 Av. Arboledas, Celaya, Gto." />
-
-                <ImageView
-                    android:id="@+id/lastDateIcon"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_column="0"
-                    android:layout_row="4"
-                    android:contentDescription="@string/unit_last_date"
-                    android:src="@drawable/position_datetime"
-                    app:tint="?android:textColorSecondary" />
-
-                <TextView
-                    android:id="@+id/lastDate"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_column="1"
-                    android:layout_row="4"
-                    style="@style/TextAppearance.AppCompat.Caption"
-                    tools:text="4 de Diciembre de 2021, 7:00 PM" />
-
-            </GridLayout>
+                android:layout_below="@id/unitName" />
 
             <LinearLayout
                 android:id="@+id/itemOptions"
@@ -168,18 +88,17 @@
                     android:text="@string/unit_details"
                     android:textColor="@color/colorAccent"
                     android:textSize="@dimen/card_action_text"
-                    style="?borderlessButtonStyle" />
+                    style="?android:borderlessButtonStyle" />
 
                 <com.google.android.material.button.MaterialButton
                     android:id="@+id/reportsButton"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginHorizontal="8dp"
                     android:layout_weight="1"
                     android:text="@string/unit_reports"
                     android:textColor="@color/colorAccent"
                     android:textSize="@dimen/card_action_text"
-                    style="?borderlessButtonStyle" />
+                    style="?android:borderlessButtonStyle" />
 
                 <com.google.android.material.button.MaterialButton
                     android:id="@+id/commandsButton"
@@ -189,7 +108,7 @@
                     android:text="@string/unit_commands"
                     android:textColor="@color/colorAccent"
                     android:textSize="@dimen/card_action_text"
-                    style="?borderlessButtonStyle" />
+                    style="?android:borderlessButtonStyle" />
 
             </LinearLayout>