MapFragment properly draws reports and renamed icons

17 files changed, 51 insertions, 15 deletions

diff --git a/androidApp/src/main/res/drawable/ic_baseline_person_24.xml b/androidApp/src/main/res/drawable/device_contact.xml
index 0faf05d..0faf05d 100644
--- a/androidApp/src/main/res/drawable/ic_baseline_person_24.xml
+++ b/androidApp/src/main/res/drawable/device_contact.xml
diff --git a/androidApp/src/main/res/drawable/ic_baseline_lock_open_24.xml b/androidApp/src/main/res/drawable/device_locked.xml
index 1fe62c8..1fe62c8 100644
--- a/androidApp/src/main/res/drawable/ic_baseline_lock_open_24.xml
+++ b/androidApp/src/main/res/drawable/device_locked.xml
diff --git a/androidApp/src/main/res/drawable/ic_baseline_fiber_manual_record_24.xml b/androidApp/src/main/res/drawable/device_status.xml
index 13890d5..13890d5 100644
--- a/androidApp/src/main/res/drawable/ic_baseline_fiber_manual_record_24.xml
+++ b/androidApp/src/main/res/drawable/device_status.xml
diff --git a/androidApp/src/main/res/drawable/ic_baseline_lock_24.xml b/androidApp/src/main/res/drawable/device_unlocked.xml
index ed352bf..ed352bf 100644
--- a/androidApp/src/main/res/drawable/ic_baseline_lock_24.xml
+++ b/androidApp/src/main/res/drawable/device_unlocked.xml
diff --git a/androidApp/src/main/res/drawable/ic_baseline_list_24.xml b/androidApp/src/main/res/drawable/icon_list.xml
index b0e68e0..b0e68e0 100644
--- a/androidApp/src/main/res/drawable/ic_baseline_list_24.xml
+++ b/androidApp/src/main/res/drawable/icon_list.xml
diff --git a/androidApp/src/main/res/drawable/ic_baseline_map_24.xml b/androidApp/src/main/res/drawable/icon_map.xml
index d1274d8..d1274d8 100644
--- a/androidApp/src/main/res/drawable/ic_baseline_map_24.xml
+++ b/androidApp/src/main/res/drawable/icon_map.xml
diff --git a/androidApp/src/main/res/drawable/ic_baseline_menu_24.xml b/androidApp/src/main/res/drawable/icon_menu.xml
index 4350ba9..4350ba9 100644
--- a/androidApp/src/main/res/drawable/ic_baseline_menu_24.xml
+++ b/androidApp/src/main/res/drawable/icon_menu.xml
diff --git a/androidApp/src/main/res/drawable/map_report_end.xml b/androidApp/src/main/res/drawable/map_report_end.xml
new file mode 100644
index 0000000..de4d015
--- /dev/null
+++ b/androidApp/src/main/res/drawable/map_report_end.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#008000"
+      android:pathData="M12.36,6H7v6h7.24l0.4,2H18V8h-5.24z"/>
+  <path
+      android:fillColor="@android:color/black"
+      android:pathData="M14.4,6L14,4L5,4v17h2v-7h5.6l0.4,2h7L20,6h-5.6zM18,14h-3.36l-0.4,-2L7,12L7,6h5.36l0.4,2L18,8v6z"/>
+</vector>
diff --git a/androidApp/src/main/res/drawable/map_report_position.xml b/androidApp/src/main/res/drawable/map_report_position.xml
new file mode 100644
index 0000000..fab1db5
--- /dev/null
+++ b/androidApp/src/main/res/drawable/map_report_position.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#008000"
+      android:pathData="M12,18c3.31,0 6,-2.69 6,-6s-2.69,-6 -6,-6 -6,2.69 -6,6 2.69,6 6,6z"/>
+  <path
+      android:fillColor="@android:color/black"
+      android:pathData="M12,20c4.42,0 8,-3.58 8,-8s-3.58,-8 -8,-8 -8,3.58 -8,8 3.58,8 8,8zM12,6c3.31,0 6,2.69 6,6s-2.69,6 -6,6 -6,-2.69 -6,-6 2.69,-6 6,-6z"/>
+</vector>
diff --git a/androidApp/src/main/res/drawable/map_report_start.xml b/androidApp/src/main/res/drawable/map_report_start.xml
new file mode 100644
index 0000000..fc29b53
--- /dev/null
+++ b/androidApp/src/main/res/drawable/map_report_start.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#008000"
+      android:pathData="M12,20c4.41,0 8,-3.59 8,-8s-3.59,-8 -8,-8 -8,3.59 -8,8 3.59,8 8,8zM10,7.5l6,4.5 -6,4.5v-9z"/>
+  <path
+      android:fillColor="@android:color/black"
+      android:pathData="M12,22c5.52,0 10,-4.48 10,-10S17.52,2 12,2 2,6.48 2,12s4.48,10 10,10zM12,4c4.41,0 8,3.59 8,8s-3.59,8 -8,8 -8,-3.59 -8,-8 3.59,-8 8,-8zM10,7.5v9l6,-4.5z"/>
+</vector>
diff --git a/androidApp/src/main/res/drawable/ic_baseline_location_on_24.xml b/androidApp/src/main/res/drawable/position_address.xml
index 71ef7bc..71ef7bc 100644
--- a/androidApp/src/main/res/drawable/ic_baseline_location_on_24.xml
+++ b/androidApp/src/main/res/drawable/position_address.xml
diff --git a/androidApp/src/main/res/drawable/ic_baseline_calendar_today_24.xml b/androidApp/src/main/res/drawable/position_datetime.xml
index e059617..e059617 100644
--- a/androidApp/src/main/res/drawable/ic_baseline_calendar_today_24.xml
+++ b/androidApp/src/main/res/drawable/position_datetime.xml
diff --git a/androidApp/src/main/res/drawable/ic_baseline_speed_24.xml b/androidApp/src/main/res/drawable/position_speed.xml
index febd057..febd057 100644
--- a/androidApp/src/main/res/drawable/ic_baseline_speed_24.xml
+++ b/androidApp/src/main/res/drawable/position_speed.xml
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