ETBSA branding

10 files changed, 14 insertions, 106 deletions

diff --git a/androidApp/src/main/res/drawable/ic_launcher_foreground.xml b/androidApp/src/main/res/drawable/ic_launcher_foreground.xml
index 3174b26..34d920c 100644
--- a/androidApp/src/main/res/drawable/ic_launcher_foreground.xml
+++ b/androidApp/src/main/res/drawable/ic_launcher_foreground.xml
@@ -1,53 +1,21 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
     android:width="108dp"
     android:height="108dp"
     android:viewportWidth="108"
     android:viewportHeight="108">
-  <group android:scaleX="0.12654202"
-      android:scaleY="0.12654202"
-      android:translateX="22.364494"
-      android:translateY="22.657415">
-    <group>
-      <clip-path
-          android:pathData="M-765.634,-361.759L1265.715,-361.759L1265.715,857.051L-765.634,857.051Z"/>
-      <group>
-        <clip-path
-            android:pathData="m55.112,40.448l389.775,-0L444.888,495.552L55.112,495.552Z"/>
-        <group>
-          <clip-path
-              android:pathData="m55.112,40.448l389.775,-0L444.888,495.552L55.112,495.552Z"/>
-        </group>
-      </group>
-      <path
-          android:pathData="m262.667,242.804c75.688,14.782 105.225,206.038 105.225,206.038 0,-0 -5.564,-148.685 -120.187,-163.921 -91.485,-12.16 -156.964,106.516 -156.964,106.516 0,-0 97.576,-163.154 171.926,-148.633"
-          android:fillColor="#ff3232"
-          android:strokeColor="#00000000"
-          android:fillType="nonZero"/>
-      <path
-          android:pathData="M234.344,271.309C239.277,271.309 244.282,271.637 249.384,272.312 269.004,274.921 286.811,281.291 302.58,291.248 290.423,272.143 276.287,258.424 260.227,255.292 243.377,252 223.989,260.572 204.573,275.231 214.086,272.72 224.023,271.309 234.344,271.309m120.97,179.472c-2.795,-18.084 -8.713,-46.744 -17.659,-76.648 -19.13,-45.298 -49.947,-71.066 -91.625,-76.603 -63.985,-8.429 -115.956,57.207 -135.638,86.48 -3.345,5.146 -6.282,9.858 -8.74,13.957l-22.05,-12.68c0.665,-1.198 4.871,-8.705 12.192,-19.344 29.85,-45.325 106.178,-148.753 173.314,-135.621 49.558,9.681 80.17,79.16 97.349,137.2 0.044,0.107 0.088,0.221 0.124,0.319 16.363,40.667 17.96,78.91 18.021,80.517z"
-          android:fillColor="#ff3232"
-          android:strokeColor="#00000000"
-          android:fillType="nonZero"/>
-      <path
-          android:pathData="m283.652,150.472c75.687,14.782 105.224,206.038 105.224,206.038 0,-0 -5.563,-148.685 -120.186,-163.921 -91.486,-12.161 -156.965,106.515 -156.965,106.515 0,-0 97.576,-163.153 171.927,-148.632"
-          android:fillColor="#ff3232"
-          android:strokeColor="#00000000"
-          android:fillType="nonZero"/>
-      <path
-          android:pathData="M255.329,178.973C260.262,178.973 265.266,179.301 270.369,179.976 289.988,182.585 307.797,188.965 323.573,198.92 311.409,179.816 297.273,166.098 281.212,162.957 264.363,159.674 244.974,168.245 225.559,182.895 235.072,180.384 245.009,178.973 255.329,178.973m120.97,179.48c-2.795,-18.074 -8.714,-46.735 -17.64,-76.611 -19.139,-45.325 -49.957,-71.102 -91.643,-76.648 -64.013,-8.395 -115.948,57.197 -135.638,86.479 -3.346,5.147 -6.282,9.85 -8.74,13.958l-22.05,-12.68c0.665,-1.197 4.871,-8.705 12.192,-19.345 29.85,-45.324 106.187,-148.69 173.314,-135.62 49.575,9.681 80.187,79.195 97.358,137.253 0.036,0.089 0.079,0.186 0.115,0.275 16.353,40.666 17.959,78.911 18.022,80.517z"
-          android:fillColor="#ff3232"
-          android:strokeColor="#00000000"
-          android:fillType="nonZero"/>
-      <path
-          android:pathData="m302.538,58.139c75.687,14.782 105.224,206.037 105.224,206.037 0,-0 -5.563,-148.684 -120.186,-163.92 -91.486,-12.16 -156.965,106.516 -156.965,106.516 0,-0 97.576,-163.154 171.927,-148.633"
-          android:fillColor="#ff3232"
-          android:strokeColor="#00000000"
-          android:fillType="nonZero"/>
-      <path
-          android:pathData="M274.203,86.646C279.136,86.646 284.15,86.966 289.252,87.649 308.871,90.258 326.689,96.637 342.456,106.594 330.299,87.48 316.156,73.762 300.095,70.621 283.227,67.338 263.856,75.9 244.441,90.569 253.953,88.057 263.892,86.646 274.203,86.646m120.988,179.473c-2.795,-18.085 -8.713,-46.745 -17.649,-76.631 -19.14,-45.307 -49.965,-71.084 -91.643,-76.621 -63.241,-8.483 -114.528,55.298 -134.777,85.175 -3.7,5.66 -6.93,10.816 -9.592,15.262l-22.05,-12.68c0.665,-1.197 4.88,-8.713 12.209,-19.371 29.859,-45.334 106.108,-148.716 173.287,-135.602 49.567,9.68 80.189,79.177 97.357,137.235 0.045,0.098 0.08,0.195 0.124,0.293 16.354,40.667 17.96,78.911 18.023,80.517z"
-          android:fillColor="#ff3232"
-          android:strokeColor="#00000000"
-          android:fillType="nonZero"/>
-    </group>
+  <group android:scaleX="0.928125"
+      android:scaleY="0.928125"
+      android:translateX="24.3"
+      android:translateY="24.3">
+    <path
+        android:pathData="M64,-0l-64,0l-0,64l64,0z"
+        android:strokeWidth="0"
+        android:strokeColor="#00000000">
+    </path>
+    <path
+        android:pathData="m16.2113,5.3829c-5.9984,0 -10.8284,4.8301 -10.8284,10.8284l0,31.5791c0,5.9984 4.8301,10.8266 10.8284,10.8266l31.5791,0c5.9984,0 10.8266,-4.8283 10.8266,-10.8266L58.6171,16.2113c0,-5.9984 -4.8283,-10.8284 -10.8266,-10.8284zM27.2707,15.0121 L31.2538,15.037 35.237,15.0601 35.7042,15.2893c0.5547,0.2724 1.1487,0.8983 1.32,1.3911 0.0665,0.1914 2.4894,6.9893 5.3849,15.1065 2.8955,8.1171 5.3344,15.0317 5.4204,15.3659 0.4609,1.7899 -0.0931,3.2803 -1.4835,3.9849 -0.7542,0.3822 -1.2651,0.4476 -3.4431,0.4442 -1.8437,-0.0029 -2.0597,-0.0184 -2.624,-0.1883 -0.3382,-0.1018 -0.7838,-0.2756 -0.9914,-0.3855 -0.2075,-0.11 -2.1117,-1.325 -4.2319,-2.7004l-3.8552,-2.4997 3.4608,-0.0213 3.4608,-0.0213 -4.676,-13.3618c-2.572,-7.349 -4.6865,-13.3531 -4.6991,-13.3405 -0.0126,0.0126 0.4107,2.8345 0.9416,6.2696l0.9665,6.2448 -2.0093,5.742 -2.0093,5.742l-4.6973,0c-2.5842,0 -4.699,-0.0284 -4.6991,-0.0622 -0.0001,-0.0338 2.2566,-6.3451 5.0154,-14.0245z"
+        android:strokeWidth="5.137609"
+        android:fillColor="#337729"/>
   </group>
 </vector>
diff --git a/androidApp/src/main/res/drawable/map_backhoe.png b/androidApp/src/main/res/drawable/map_backhoe.png
new file mode 100644
index 0000000..7347b06
--- /dev/null
+++ b/androidApp/src/main/res/drawable/map_backhoe.png
diff --git a/androidApp/src/main/res/drawable/map_car.png b/androidApp/src/main/res/drawable/map_car.png
new file mode 100644
index 0000000..9865312
--- /dev/null
+++ b/androidApp/src/main/res/drawable/map_car.png
diff --git a/androidApp/src/main/res/drawable/map_car.xml b/androidApp/src/main/res/drawable/map_car.xml
deleted file mode 100644
index 0837918..0000000
--- a/androidApp/src/main/res/drawable/map_car.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="40dp"
-    android:height="40dp"
-    android:viewportWidth="40"
-    android:viewportHeight="40">
-  <path
-      android:pathData="m20.002,3.6816l-1.131,3.3907a12.374,12.374 0,0 1,1.131 -0.0625,12.374 12.374,0 0,1 1.129,0.0566l-1.129,-3.3848zM20,7.625a12.374,12.374 0,0 0,-12.375 12.375,12.374 12.374,0 0,0 12.375,12.375 12.374,12.374 0,0 0,12.375 -12.375,12.374 12.374,0 0,0 -12.375,-12.375z"
-      android:strokeWidth="1.9"
-      android:fillColor="#008000"
-      android:strokeColor="#333"/>
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="m15.029,22.296q0.3954,-0.3954 0.3954,-0.9505t-0.3954,-0.9505q-0.396,-0.395 -0.951,-0.395 -0.5552,0 -0.9505,0.3954t-0.3954,0.9505 0.3954,0.9505 0.9505,0.3954 0.9505,-0.3954zM15.7272,18.6537h8.5463l-0.7487,-3.003q-0.0168,-0.0673 -0.1178,-0.143 -0.1009,-0.0841 -0.1767,-0.0841h-6.4602q-0.0757,0 -0.1767,0.0841 -0.101,0.0757 -0.1178,0.143l-0.7487,3.003zM26.8732,22.296q0.3954,-0.3954 0.3954,-0.9505t-0.3954,-0.9505q-0.396,-0.395 -0.951,-0.395 -0.5552,0 -0.9505,0.3954t-0.3954,0.9505 0.3954,0.9505 0.9505,0.3954 0.9505,-0.3954zM28.6144,20.5379v3.2301q0,0.1178 -0.0757,0.1935 -0.0757,0.0757 -0.1935,0.0757h-0.8075v1.0767q0,0.6729 -0.4711,1.144t-1.144,0.4711 -1.144,-0.4711 -0.4711,-1.144v-1.0767h-8.6136v1.0767q0,0.6729 -0.4711,1.144t-1.144,0.4711 -1.144,-0.4711 -0.4711,-1.144v-1.0767h-0.8075q-0.1178,0 -0.1935,-0.0757 -0.0757,-0.0757 -0.0757,-0.1935v-3.2301q0,-0.7823 0.5468,-1.3291 0.5552,-0.5552 1.3375,-0.5552h0.2355l0.8832,-3.5245q0.1935,-0.7907 0.8748,-1.3206 0.6813,-0.5383 1.5057,-0.5383h6.4602q0.8243,0 1.5057,0.5383 0.6813,0.5299 0.8748,1.3206l0.8832,3.5245h0.2355q0.7823,0 1.3291,0.5552 0.5552,0.5468 0.5552,1.3291z"
-      android:strokeWidth=".1"
-      android:strokeColor="#333"/>
-</vector>
diff --git a/androidApp/src/main/res/drawable/map_pickup.png b/androidApp/src/main/res/drawable/map_pickup.png
new file mode 100644
index 0000000..60c005d
--- /dev/null
+++ b/androidApp/src/main/res/drawable/map_pickup.png
diff --git a/androidApp/src/main/res/drawable/map_pickup.xml b/androidApp/src/main/res/drawable/map_pickup.xml
deleted file mode 100644
index 8b92c06..0000000
--- a/androidApp/src/main/res/drawable/map_pickup.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="40dp"
-    android:height="40dp"
-    android:viewportWidth="40"
-    android:viewportHeight="40">
-  <path
-      android:pathData="m20.002,3.6816 l-1.1309,3.3906a12.374,12.374 0,0 1,1.1309 -0.0625,12.374 12.374,0 0,1 1.1289,0.0566l-1.129,-3.3847zM20,7.625a12.374,12.374 0,0 0,-12.375 12.375,12.374 12.374,0 0,0 12.375,12.375 12.374,12.374 0,0 0,12.375 -12.375,12.374 12.374,0 0,0 -12.375,-12.375z"
-      android:strokeWidth="1.9"
-      android:fillColor="#008000"
-      android:strokeColor="#333"/>
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="m17.19,14.711a0.8816,0.8816 0,0 0,-0.6887 0.6611l-0.7162,2.8649h-3.2781c-0.9697,0 -1.763,0.7934 -1.763,1.763v2.1211c0,0.3526 0.1708,0.6226 0.5234,0.7989l1.2672,0.4683c0.147,1.0824 1.0477,1.9008 2.1762,1.9008 1.0799,0 1.9462,-0.7507 2.1487,-1.763h7.1623c0.2025,1.0124 1.0688,1.763 2.1487,1.763 1.157,0 2.0652,-0.86 2.1762,-1.9834l0.4683,-0.303c0.2645,-0.1763 0.4408,-0.5289 0.4408,-0.8815v-1.5151c0,-0.3526 -0.2534,-0.6832 -0.606,-0.7713l-3.9668,-1.3498 -2.1762,-2.7272 -0.0551,-0.0826 -0.0276,0.0276c-0.4462,-0.661 -1.2059,-0.9917 -1.9008,-0.9917h-3.1679a0.8816,0.8816 0,0 0,-0.0826 0,0.8816 0.8816,0 0,0 -0.0826,0zM18.044,16.474h2.4793c0.333,0 0.4004,0.0337 0.4958,0.1928a0.8816,0.8816 0,0 0,0.0551 0.0826l1.1845,1.4876h-4.6555l0.4408,-1.763zM14.7108,22.2865c0.4408,0 0.7989,0.3581 0.7989,0.7989 0,0.4408 -0.3581,0.7989 -0.7989,0.7989 -0.4408,0 -0.7989,-0.3581 -0.7989,-0.7989 0,-0.4408 0.3581,-0.7989 0.7989,-0.7989zM26.1708,22.2865c0.4408,0 0.7989,0.3581 0.7989,0.7989 0,0.4408 -0.3581,0.7989 -0.7989,0.7989 -0.4408,0 -0.7989,-0.3581 -0.7989,-0.7989 0,-0.4408 0.3581,-0.7989 0.7989,-0.7989z"
-      android:strokeWidth=".88152"/>
-</vector>
diff --git a/androidApp/src/main/res/drawable/map_tractor.png b/androidApp/src/main/res/drawable/map_tractor.png
new file mode 100644
index 0000000..9eaa214
--- /dev/null
+++ b/androidApp/src/main/res/drawable/map_tractor.png
diff --git a/androidApp/src/main/res/drawable/map_tractor.xml b/androidApp/src/main/res/drawable/map_tractor.xml
deleted file mode 100644
index 3ef45d2..0000000
--- a/androidApp/src/main/res/drawable/map_tractor.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="40dp"
-    android:height="40dp"
-    android:viewportWidth="40"
-    android:viewportHeight="40">
-  <path
-      android:pathData="m20.002,3.6816 l-1.1309,3.3906a12.374,12.374 0,0 1,1.1309 -0.0625,12.374 12.374,0 0,1 1.1289,0.0566l-1.129,-3.3847zM20,7.625a12.374,12.374 0,0 0,-12.375 12.375,12.374 12.374,0 0,0 12.375,12.375 12.374,12.374 0,0 0,12.375 -12.375,12.374 12.374,0 0,0 -12.375,-12.375z"
-      android:strokeWidth="1.9"
-      android:fillColor="#008000"
-      android:strokeColor="#333"/>
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="m13.105,12.427a0.8416,0.8416 0,0 0,-0.6837 0.8415v5.0492a0.8416,0.8416 0,0 0,0 0.0789v1.8672c0.8415,-0.6732 1.8514,-1.1045 2.9454,-1.1045 2.5246,0 4.6284,2.1038 4.6284,4.6284v0.4208h3.7869c-0.2589,0.3496 -0.4208,0.7851 -0.4208,1.2623 0,1.1781 0.9257,2.1038 2.1038,2.1038s2.1038,-0.9257 2.1038,-2.1038c0,-0.5537 -0.2132,-1.0478 -0.5523,-1.4201 0.4972,-0.2262 0.8552,-0.6732 0.973,-1.2623l0.4208,-2.7087c0.0842,-0.4208 -0.3366,-0.9204 -0.8415,-0.9204l-7.1267,-0.7889 -1.3149,-5.3122a0.8416,0.8416 0,0 0,-0.8152 -0.6312h-5.0492a0.8416,0.8416 0,0 0,-0.0789 0,0.8416 0.8416,0 0,0 -0.0789,0zM14.1043,14.1101h3.5502l1.0256,4.0499 -4.5758,-0.4997v-3.5502zM24.2023,14.1101v3.6291l1.6831,0.2367v-3.8658h-1.6831zM15.3662,20.0008c-2.1038,0 -3.7869,1.6831 -3.7869,3.7869s1.6831,3.7869 3.7869,3.7869 3.7869,-1.6831 3.7869,-3.7869 -1.6831,-3.7869 -3.7869,-3.7869zM15.3662,21.2631c1.4306,0 2.5246,1.094 2.5246,2.5246s-1.094,2.5246 -2.5246,2.5246 -2.5246,-1.094 -2.5246,-2.5246 1.094,-2.5246 2.5246,-2.5246zM25.4642,24.6292c0.5049,0 0.8415,0.3366 0.8415,0.8415 0,0.5049 -0.3366,0.8415 -0.8415,0.8415 -0.5049,0 -0.8415,-0.3366 -0.8415,-0.8415s0.3366,-0.8415 0.8415,-0.8415z"
-      android:strokeWidth=".84153"/>
-</vector>
diff --git a/androidApp/src/main/res/drawable/map_truck.png b/androidApp/src/main/res/drawable/map_truck.png
new file mode 100644
index 0000000..dc42323
--- /dev/null
+++ b/androidApp/src/main/res/drawable/map_truck.png
diff --git a/androidApp/src/main/res/drawable/map_truck.xml b/androidApp/src/main/res/drawable/map_truck.xml
deleted file mode 100644
index c0b7fc1..0000000
--- a/androidApp/src/main/res/drawable/map_truck.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="40dp"
-    android:height="40dp"
-    android:viewportWidth="40"
-    android:viewportHeight="40">
-  <path
-      android:pathData="m20.002,3.6816l-1.131,3.3907a12.374,12.374 0,0 1,1.131 -0.0625,12.374 12.374,0 0,1 1.129,0.0566l-1.129,-3.3848zM20,7.625a12.374,12.374 0,0 0,-12.375 12.375,12.374 12.374,0 0,0 12.375,12.375 12.374,12.374 0,0 0,12.375 -12.375,12.374 12.374,0 0,0 -12.375,-12.375z"
-      android:strokeWidth="1.9"
-      android:fillColor="#008000"
-      android:strokeColor="#333"/>
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="m17.031,24.899q0.346,-0.346 0.346,-0.8195t-0.346,-0.8195 -0.8195,-0.346 -0.8195,0.346 -0.346,0.8195 0.346,0.8195 0.8195,0.346 0.8195,-0.346zM13.8803,19.4171h3.4968v-2.3312h-1.4388q-0.1184,0 -0.2003,0.082l-1.7757,1.7757q-0.082,0.082 -0.082,0.2003v0.2732zM25.1903,24.899q0.346,-0.346 0.346,-0.8195t-0.346,-0.8195 -0.8195,-0.346 -0.8195,0.346 -0.346,0.8195 0.346,0.8195 0.8195,0.346 0.8195,-0.346zM27.8675,14.172v9.3247q0,0.1366 -0.0364,0.2459 -0.0364,0.1002 -0.1275,0.1639 -0.082,0.0637 -0.1457,0.1093 -0.0637,0.0364 -0.2185,0.0546 -0.1457,0.0091 -0.2003,0.0182 -0.0546,0 -0.2368,0 -0.173,-0.0091 -0.2003,-0.0091 0,0.9653 -0.683,1.6482 -0.683,0.683 -1.6482,0.683 -0.9653,0 -1.6482,-0.683 -0.683,-0.6829 -0.683,-1.6482h-3.4968q0,0.9653 -0.683,1.6482 -0.683,0.683 -1.6482,0.683 -0.9653,0 -1.6482,-0.683 -0.683,-0.683 -0.683,-1.6482h-0.5828q-0.0273,0 -0.2094,0.0091 -0.173,0 -0.2277,0 -0.0546,-0.0091 -0.2094,-0.0182 -0.1457,-0.0182 -0.2094,-0.0546 -0.0637,-0.0455 -0.1548,-0.1093 -0.082,-0.0637 -0.1184,-0.1639 -0.0364,-0.1093 -0.0364,-0.2459 0,-0.2368 0.173,-0.4098t0.4098,-0.173v-2.914q0,-0.0728 -0.0091,-0.3187 0,-0.2459 0,-0.346 0.0091,-0.1002 0.0273,-0.3096 0.0182,-0.2185 0.0546,-0.3369 0.0455,-0.1275 0.1275,-0.2823 0.0911,-0.1548 0.2094,-0.2732l1.803,-1.803q0.173,-0.173 0.4553,-0.2914 0.2914,-0.1184 0.5373,-0.1184h1.457v-1.7484q0,-0.2368 0.173,-0.4098t0.4098,-0.173h9.3247q0.2368,0 0.4098,0.173t0.173,0.4098z"/>
-</vector>