MapFragment properly draws reports and renamed icons

4 files changed, 15 insertions, 15 deletions

diff --git a/androidApp/src/main/res/layout/unit_details_reports.xml b/androidApp/src/main/res/layout/unit_details_reports.xml
index 1eaf68c..dc649e4 100644
--- a/androidApp/src/main/res/layout/unit_details_reports.xml
+++ b/androidApp/src/main/res/layout/unit_details_reports.xml
@@ -10,7 +10,7 @@
         android:name="mx.trackermap.TrackerMap.android.map.MapFragment"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        android:layout_margin="@dimen/margin"
+        android:layout_marginBottom="@dimen/margin"
         app:layout_constraintBottom_toTopOf="@id/periodSection"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -21,7 +21,7 @@
         android:id="@+id/eventsScroll"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        android:layout_margin="@dimen/margin"
+        android:layout_marginBottom="@dimen/margin"
         android:visibility="gone"
         app:layout_constraintBottom_toTopOf="@id/periodSection"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/androidApp/src/main/res/layout/unit_item.xml b/androidApp/src/main/res/layout/unit_item.xml
index 96011b9..261a7a6 100644
--- a/androidApp/src/main/res/layout/unit_item.xml
+++ b/androidApp/src/main/res/layout/unit_item.xml
@@ -82,7 +82,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="5dp"
-                android:src="@drawable/ic_baseline_fiber_manual_record_24"
+                android:src="@drawable/device_status"
                 app:tint="?android:textColorPrimary"
                 tools:ignore="ContentDescription" />
 
@@ -93,7 +93,7 @@
                 android:layout_toEndOf="@id/statusIcon"
                 android:visibility="gone"
                 android:layout_marginEnd="5dp"
-                android:src="@drawable/ic_baseline_lock_24"
+                android:src="@drawable/device_unlocked"
                 tools:ignore="ContentDescription" />
 
             <TextView
@@ -118,7 +118,7 @@
                     android:layout_column="0"
                     android:layout_row="1"
                     android:contentDescription="@string/unit_driver_name"
-                    android:src="@drawable/ic_baseline_person_24"
+                    android:src="@drawable/device_contact"
                     app:tint="?android:textColorSecondary" />
 
                 <TextView
@@ -138,7 +138,7 @@
                     android:layout_row="2"
                     style="@style/TextAppearance.MaterialComponents.Caption"
                     android:contentDescription="@string/unit_speed"
-                    android:src="@drawable/ic_baseline_speed_24"
+                    android:src="@drawable/position_speed"
                     app:tint="?android:textColorSecondary" />
 
                 <TextView
@@ -157,7 +157,7 @@
                     android:layout_column="0"
                     android:layout_row="3"
                     android:contentDescription="@string/unit_last_address"
-                    android:src="@drawable/ic_baseline_location_on_24"
+                    android:src="@drawable/position_address"
                     app:tint="?android:textColorSecondary" />
 
                 <TextView
@@ -176,7 +176,7 @@
                     android:layout_column="0"
                     android:layout_row="4"
                     android:contentDescription="@string/unit_last_date"
-                    android:src="@drawable/ic_baseline_calendar_today_24"
+                    android:src="@drawable/position_datetime"
                     app:tint="?android:textColorSecondary" />
 
 
diff --git a/androidApp/src/main/res/layout/unit_map_fragment.xml b/androidApp/src/main/res/layout/unit_map_fragment.xml
index 35643eb..6c2720b 100644
--- a/androidApp/src/main/res/layout/unit_map_fragment.xml
+++ b/androidApp/src/main/res/layout/unit_map_fragment.xml
@@ -40,7 +40,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="5dp"
-                android:src="@drawable/ic_baseline_fiber_manual_record_24"
+                android:src="@drawable/device_status"
                 app:tint="?android:textColorPrimary"
                 tools:ignore="ContentDescription" />
 
@@ -51,7 +51,7 @@
                 android:layout_toEndOf="@id/statusIcon"
                 android:visibility="gone"
                 android:layout_marginEnd="5dp"
-                android:src="@drawable/ic_baseline_lock_24"
+                android:src="@drawable/device_unlocked"
                 tools:ignore="ContentDescription" />
 
             <TextView
@@ -76,7 +76,7 @@
                     android:layout_column="0"
                     android:layout_row="1"
                     android:contentDescription="@string/unit_driver_name"
-                    android:src="@drawable/ic_baseline_person_24"
+                    android:src="@drawable/device_contact"
                     app:tint="?android:textColorSecondary" />
 
                 <TextView
@@ -96,7 +96,7 @@
                     android:layout_row="2"
                     style="@style/TextAppearance.MaterialComponents.Caption"
                     android:contentDescription="@string/unit_speed"
-                    android:src="@drawable/ic_baseline_speed_24"
+                    android:src="@drawable/position_speed"
                     app:tint="?android:textColorSecondary" />
 
                 <TextView
@@ -115,7 +115,7 @@
                     android:layout_column="0"
                     android:layout_row="3"
                     android:contentDescription="@string/unit_last_address"
-                    android:src="@drawable/ic_baseline_location_on_24"
+                    android:src="@drawable/position_address"
                     app:tint="?android:textColorSecondary" />
 
                 <TextView
@@ -134,7 +134,7 @@
                     android:layout_column="0"
                     android:layout_row="4"
                     android:contentDescription="@string/unit_last_date"
-                    android:src="@drawable/ic_baseline_calendar_today_24"
+                    android:src="@drawable/position_datetime"
                     app:tint="?android:textColorSecondary" />
 
 
diff --git a/androidApp/src/main/res/layout/units_activity.xml b/androidApp/src/main/res/layout/units_activity.xml
index bff3789..f0fd2ee 100644
--- a/androidApp/src/main/res/layout/units_activity.xml
+++ b/androidApp/src/main/res/layout/units_activity.xml
@@ -28,7 +28,7 @@
         android:layout_marginStart="@dimen/fab_margin"
         android:layout_marginTop="@dimen/fab_margin"
         app:elevation="@dimen/fab_elevation"
-        android:src="@drawable/ic_baseline_menu_24"
+        android:src="@drawable/icon_menu"
         android:contentDescription="@string/open_drawer"/>
 
     <com.google.android.material.card.MaterialCardView