diff options
80 files changed, 151 insertions, 300 deletions
diff --git a/androidApp/build.gradle.kts b/androidApp/build.gradle.kts index 099d4a3..f4fb316 100644 --- a/androidApp/build.gradle.kts +++ b/androidApp/build.gradle.kts @@ -8,11 +8,11 @@ plugins { android { compileSdk = 31 defaultConfig { - applicationId = "mx.trackermap.TrackerMap" + applicationId = "net.etbsa.etbsa" minSdk = 21 targetSdk = 31 - versionCode = 1 - versionName = "1.0" + versionCode = 1403 + versionName = "1.3.3" ndk { abiFilters.clear() //abiFilters += listOf("armeabi-v7a", "arm64-v8a") diff --git a/androidApp/src/main/ic_launcher-playstore.png b/androidApp/src/main/ic_launcher-playstore.png Binary files differindex f4a2c02..1390973 100644 --- a/androidApp/src/main/ic_launcher-playstore.png +++ b/androidApp/src/main/ic_launcher-playstore.png diff --git a/androidApp/src/main/java/mx/trackermap/TrackerMap/android/shared/MarkerTransformations.kt b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/shared/MarkerTransformations.kt index 1e5c4de..4dd1ea7 100644 --- a/androidApp/src/main/java/mx/trackermap/TrackerMap/android/shared/MarkerTransformations.kt +++ b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/shared/MarkerTransformations.kt @@ -24,6 +24,7 @@ object MarkerTransformations { fun markerTypeToResourceId(markerType: Marker.Type): Int { return when (markerType) { Marker.Type.ANIMAL -> R.drawable.map_animal + Marker.Type.BACKHOE -> R.drawable.map_backhoe Marker.Type.BICYCLE -> R.drawable.map_bicycle Marker.Type.BOAT -> R.drawable.map_boat Marker.Type.BUS -> R.drawable.map_bus @@ -54,6 +55,7 @@ object MarkerTransformations { fun markerTypeToStringId(markerType: Marker.Type): Int { return when (markerType) { Marker.Type.ANIMAL -> R.string.unit_category_animal + Marker.Type.BACKHOE -> R.string.unit_category_backhoe Marker.Type.BICYCLE -> R.string.unit_category_bicycle Marker.Type.BOAT -> R.string.unit_category_boat Marker.Type.BUS -> R.string.unit_category_bus diff --git a/androidApp/src/main/java/mx/trackermap/TrackerMap/android/shared/Utils.kt b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/shared/Utils.kt index fefb67e..dfe0681 100644 --- a/androidApp/src/main/java/mx/trackermap/TrackerMap/android/shared/Utils.kt +++ b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/shared/Utils.kt @@ -39,7 +39,8 @@ class Utils { popOver.setOnMenuItemClickListener { item -> val layer = when (item.itemId) { R.id.layerStreets -> MapLayer.Type.STREETS - R.id.layerSatellite -> MapLayer.Type.SATELLITE + R.id.layerGmapsStreets -> MapLayer.Type.GMAPS_STREETS + R.id.layerGmapsSatellite -> MapLayer.Type.GMAPS_SATELLITE else -> MapLayer.Type.STREETS } callback(layer) diff --git a/androidApp/src/main/res/drawable/about_logo.xml b/androidApp/src/main/res/drawable/about_logo.xml index d905fa7..b41f9af 100644 --- a/androidApp/src/main/res/drawable/about_logo.xml +++ b/androidApp/src/main/res/drawable/about_logo.xml @@ -1,71 +1,19 @@ <vector xmlns:android="http://schemas.android.com/apk/res/android" - android:width="180dp" - android:height="120dp" - android:viewportWidth="47.625" - android:viewportHeight="31.75"> - <path - android:pathData="M0,0h47.625v31.75h-47.625z" - android:strokeWidth="0.269399" - android:fillColor="#ffffff"/> - <path - android:pathData="M6.8531,17.8839L6.8531,17.1112L10.5715,17.1112L10.5715,17.8839L9.153,17.8839L9.153,21.3366L8.2777,21.3366L8.2777,17.8839Z" - android:fillColor="#000000" - android:strokeColor="#00000000"/> - <path - android:pathData="M10.7488,21.3366L10.7488,18.1917l0.827,0l0,0.3441q0.1509,-0.2052 0.3622,-0.3078 0.2173,-0.1087 0.4769,-0.1087 0.1207,0.006 0.1992,0.0241 0.0845,0.0121 0.1449,0.0483L12.7589,18.9161Q12.6683,18.8738 12.5597,18.8557 12.451,18.8316 12.3363,18.8316q-0.2415,0 -0.4467,0.1207 -0.1992,0.1207 -0.3139,0.3501l0,2.0342z" - android:fillColor="#000000" - android:strokeColor="#00000000"/> - <path - android:pathData="m14.1027,21.3909q-0.507,0 -0.827,-0.2656 -0.3199,-0.2716 -0.3199,-0.7002 0,-0.4467 0.3441,-0.7002 0.3441,-0.2535 0.9477,-0.2535 0.1932,0 0.3863,0.0302 0.1932,0.0302 0.3803,0.0905L15.0142,19.3688q0,-0.2716 -0.169,-0.4105 -0.169,-0.1388 -0.495,-0.1388 -0.1992,0 -0.4346,0.0664 -0.2294,0.0604 -0.5252,0.1932L13.0886,18.4694q0.3682,-0.169 0.7123,-0.2535 0.3501,-0.0845 0.6881,-0.0845 0.6338,0 0.9839,0.3078 0.3561,0.3018 0.3561,0.8571l0,2.0403l-0.8149,0l0,-0.2173q-0.1992,0.1388 -0.4225,0.2052 -0.2173,0.0664 -0.4889,0.0664zM13.7466,20.407q0,0.1811 0.1569,0.2897 0.1569,0.1026 0.4165,0.1026 0.2052,0 0.3742,-0.0483 0.1751,-0.0543 0.3199,-0.1509L15.0142,20.1294q-0.1509,-0.0604 -0.3199,-0.0845 -0.163,-0.0302 -0.3441,-0.0302 -0.2837,0 -0.4467,0.1087 -0.1569,0.1026 -0.1569,0.2837z" - android:fillColor="#000000" - android:strokeColor="#00000000"/> - <path - android:pathData="m17.9942,20.6726q0.2113,0 0.3924,-0.0845 0.1871,-0.0845 0.3561,-0.2656l0.495,0.5131q-0.2415,0.2656 -0.5795,0.4165 -0.338,0.1449 -0.7002,0.1449 -0.3441,0 -0.6519,-0.1268 -0.3018,-0.1268 -0.5252,-0.3441 -0.2173,-0.2173 -0.3441,-0.5131 -0.1268,-0.3018 -0.1268,-0.6459 0,-0.3441 0.1268,-0.6398 0.1268,-0.3018 0.3441,-0.5191 0.2233,-0.2233 0.5252,-0.3501 0.3078,-0.1268 0.6519,-0.1268 0.3742,0 0.7183,0.1509 0.3441,0.1449 0.5855,0.4105L18.7548,19.23Q18.5858,19.0428 18.3926,18.9463 18.1994,18.8497 17.9761,18.8497q-0.3561,0 -0.6036,0.2656 -0.2415,0.2656 -0.2415,0.6519 0,0.3863 0.2475,0.6459 0.2535,0.2596 0.6157,0.2596z" - android:fillColor="#000000" - android:strokeColor="#00000000"/> - <path - android:pathData="M19.6617,21.3366L19.6617,17.1112l0.827,-0.1811l0,2.5896l1.3582,-1.328l0.9356,0l-1.4728,1.4427 1.5634,1.7022L21.8167,21.3366L20.4887,19.9l0,1.4366z" - android:fillColor="#000000" - android:strokeColor="#00000000"/> - <path - android:pathData="m25.6756,20.9443q-0.2897,0.2354 -0.5976,0.3441 -0.3018,0.1087 -0.6761,0.1087 -0.3561,0 -0.67,-0.1268 -0.3078,-0.1268 -0.5372,-0.3441 -0.2233,-0.2173 -0.3561,-0.5131 -0.1268,-0.3018 -0.1268,-0.6459 0,-0.338 0.1207,-0.6338 0.1268,-0.3018 0.3441,-0.5191 0.2173,-0.2233 0.5131,-0.3501 0.3018,-0.1268 0.6398,-0.1268 0.332,0 0.6157,0.1328 0.2897,0.1268 0.495,0.3501 0.2113,0.2233 0.326,0.5372 0.1207,0.3078 0.1207,0.67l0,0.2173l-2.3421,0q0.0845,0.2958 0.326,0.4769 0.2415,0.1811 0.5674,0.1811 0.2052,0 0.3863,-0.0664 0.1811,-0.0664 0.3078,-0.1871zM24.3114,18.8195q-0.2837,0 -0.4889,0.1751 -0.2052,0.169 -0.2837,0.4588l1.5392,0Q24.9996,19.1756 24.7883,19.0006 24.5831,18.8195 24.3114,18.8195Z" - android:fillColor="#000000" - android:strokeColor="#00000000"/> - <path - android:pathData="M26.3936,21.3366L26.3936,18.1917l0.827,0l0,0.3441q0.1509,-0.2052 0.3622,-0.3078 0.2173,-0.1087 0.4769,-0.1087 0.1207,0.006 0.1992,0.0241 0.0845,0.0121 0.1449,0.0483L28.4036,18.9161Q28.3131,18.8738 28.2044,18.8557 28.0958,18.8316 27.9811,18.8316q-0.2415,0 -0.4467,0.1207 -0.1992,0.1207 -0.3139,0.3501l0,2.0342z" - android:fillColor="#000000" - android:strokeColor="#00000000"/> - <path - android:pathData="M31.1698,21.0348 L29.709,18.2279l0,3.1087L28.9001,21.3366L28.9001,17.1112l1.1227,0l1.159,2.2696 1.159,-2.2696l1.1227,0L33.4635,21.3366L32.6366,21.3366L32.6366,18.234Z" - android:fillColor="#ff3232" - android:strokeColor="#00000000"/> - <path - android:pathData="m35.1117,21.3909q-0.507,0 -0.827,-0.2656 -0.3199,-0.2716 -0.3199,-0.7002 0,-0.4467 0.3441,-0.7002 0.3441,-0.2535 0.9477,-0.2535 0.1932,0 0.3863,0.0302 0.1932,0.0302 0.3803,0.0905L36.0232,19.3688q0,-0.2716 -0.169,-0.4105 -0.169,-0.1388 -0.495,-0.1388 -0.1992,0 -0.4346,0.0664 -0.2294,0.0604 -0.5252,0.1932L34.0976,18.4694q0.3682,-0.169 0.7123,-0.2535 0.3501,-0.0845 0.6881,-0.0845 0.6338,0 0.9839,0.3078 0.3561,0.3018 0.3561,0.8571l0,2.0403l-0.8149,0l0,-0.2173q-0.1992,0.1388 -0.4225,0.2052 -0.2173,0.0664 -0.4889,0.0664zM34.7556,20.407q0,0.1811 0.1569,0.2897 0.1569,0.1026 0.4165,0.1026 0.2052,0 0.3742,-0.0483 0.1751,-0.0543 0.3199,-0.1509L36.0232,20.1294q-0.1509,-0.0604 -0.3199,-0.0845 -0.163,-0.0302 -0.3441,-0.0302 -0.2837,0 -0.4467,0.1087 -0.1569,0.1026 -0.1569,0.2837z" - android:fillColor="#ff3232" - android:strokeColor="#00000000"/> - <path - android:pathData="M37.464,22.5982L37.464,18.1917l0.8149,0l0,0.2596q0.1871,-0.1509 0.4165,-0.2233 0.2294,-0.0785 0.4769,-0.0785 0.332,0 0.6217,0.1268 0.2958,0.1268 0.5131,0.3441 0.2173,0.2173 0.338,0.5131 0.1268,0.2958 0.1268,0.6338 0,0.338 -0.1268,0.6338 -0.1268,0.2958 -0.3441,0.5131 -0.2173,0.2173 -0.5191,0.3441 -0.2958,0.1207 -0.6338,0.1207 -0.2294,0 -0.4527,-0.0604 -0.2173,-0.0664 -0.4044,-0.1871l0,1.4668zM39.0394,18.8557q-0.2233,0 -0.4165,0.0785 -0.1932,0.0724 -0.332,0.2173l0,1.2374q0.1328,0.1328 0.326,0.2113 0.1992,0.0785 0.4225,0.0785 0.3863,0 0.6519,-0.2596 0.2656,-0.2656 0.2656,-0.6519 0,-0.3863 -0.2716,-0.6459 -0.2656,-0.2656 -0.6459,-0.2656z" - android:fillColor="#ff3232" - android:strokeColor="#00000000"/> - <path - android:pathData="m27.0493,11.3526c1.6477,0.3218 2.2907,4.4853 2.2907,4.4853 0,0 -0.1211,-3.2368 -2.6164,-3.5685 -1.9916,-0.2647 -3.4171,2.3188 -3.4171,2.3188 0,0 2.1242,-3.5518 3.7428,-3.2356z" - android:strokeLineJoin="bevel" - android:strokeWidth="0.55385" - android:fillColor="#ff3232" - android:strokeColor="#ff3232" - android:strokeLineCap="butt"/> - <path - android:pathData="m27.5061,9.3425c1.6477,0.3218 2.2907,4.4853 2.2907,4.4853 0,0 -0.1211,-3.2368 -2.6164,-3.5685 -1.9916,-0.2647 -3.4171,2.3188 -3.4171,2.3188 0,0 2.1242,-3.5518 3.7428,-3.2356z" - android:strokeLineJoin="bevel" - android:strokeWidth="0.55385" - android:fillColor="#ff3232" - android:strokeColor="#ff3232" - android:strokeLineCap="butt"/> - <path - android:pathData="m27.9173,7.3325c1.6477,0.3218 2.2907,4.4853 2.2907,4.4853 0,0 -0.1211,-3.2368 -2.6164,-3.5685 -1.9916,-0.2647 -3.4171,2.3188 -3.4171,2.3188 0,0 2.1242,-3.5518 3.7428,-3.2356z" - android:strokeLineJoin="bevel" - android:strokeWidth="0.55385" - android:fillColor="#ff3232" - android:strokeColor="#ff3232" - android:strokeLineCap="butt"/> + android:width="240dp" + android:height="64dp" + android:viewportWidth="240" + android:viewportHeight="64"> + <path + android:pathData="M40.9,8.741h158.357v47.117h-158.357z" + android:strokeWidth="0" + android:fillColor="#ffffff" + android:strokeColor="#efdb1e"/> + <path + android:pathData="m49.498,62.965c-2.683,-0.418 -5.121,-1.669 -7.094,-3.642 -1.973,-1.972 -3.25,-4.469 -3.653,-7.142 -0.113,-0.752 -0.128,-3.65 -0.105,-20.596 0.025,-18.664 0.035,-19.757 0.19,-20.396 0.665,-2.749 1.694,-4.624 3.567,-6.498 1.832,-1.833 3.703,-2.881 6.315,-3.538L49.482,0.959 119.564,0.933c61.608,-0.024 70.186,-0.011 70.938,0.107 1.29,0.201 2.361,0.541 3.56,1.127 3.719,1.818 6.266,5.129 7.095,9.221l0.206,1.015v19.56c0,18.372 -0.01,19.612 -0.16,20.416 -0.519,2.769 -1.694,5 -3.658,6.942 -0.577,0.571 -1.355,1.247 -1.728,1.502 -1.387,0.947 -2.985,1.644 -4.661,2.032l-0.88,0.204 -69.992,0.015C61.253,63.086 50.169,63.069 49.498,62.965ZM190.013,61.026c2.844,-0.396 5.66,-2.123 7.373,-4.524 0.88,-1.233 1.593,-2.941 1.873,-4.484 0.101,-0.556 0.123,-4.114 0.123,-20.056 0,-18.254 -0.01,-19.426 -0.161,-20.171 -0.463,-2.273 -1.419,-4.048 -3.076,-5.71 -1.434,-1.439 -3.007,-2.354 -4.985,-2.9l-0.883,-0.244L119.97,2.939 49.663,2.939L48.761,3.187C47.626,3.499 45.915,4.336 44.972,5.04 42.761,6.692 41.208,9.225 40.741,11.942c-0.12,0.701 -0.138,3.206 -0.138,20.066 0,16.986 0.017,19.361 0.14,20.066 0.788,4.521 4.353,8.079 8.919,8.902 0.624,0.113 10.078,0.131 70.188,0.138 48.988,0.006 69.672,-0.02 70.162,-0.089zM59.963,53.756c0.162,-0.02 0.405,-0.02 0.541,0.001 0.135,0.021 0.003,0.037 -0.295,0.036 -0.297,-0.001 -0.408,-0.017 -0.246,-0.037zM77.764,53.757c0.137,-0.021 0.34,-0.02 0.451,0.001 0.111,0.021 -0.001,0.038 -0.249,0.038 -0.248,-0.001 -0.339,-0.018 -0.202,-0.039zM84.164,53.757c0.137,-0.021 0.34,-0.02 0.451,0.001 0.111,0.021 -0.001,0.038 -0.249,0.038 -0.248,-0.001 -0.339,-0.018 -0.202,-0.039zM49.82,53.665c0.235,-0.019 0.621,-0.019 0.856,0 0.235,0.019 0.043,0.034 -0.428,0.034 -0.471,0 -0.664,-0.015 -0.428,-0.034zM55.139,53.665c0.235,-0.019 0.621,-0.019 0.856,0 0.235,0.019 0.043,0.034 -0.428,0.034 -0.471,0 -0.664,-0.015 -0.428,-0.034zM64.786,53.665c0.237,-0.019 0.602,-0.018 0.811,0.001 0.209,0.019 0.015,0.034 -0.431,0.034 -0.446,-0 -0.617,-0.016 -0.38,-0.034zM68.425,53.664c-0.023,-0.037 0.248,-0.057 0.603,-0.043 1.098,0.042 1.225,0.081 0.312,0.096 -0.48,0.008 -0.892,-0.016 -0.916,-0.053zM70.476,53.606c-0.027,-0.069 -0.032,-0.282 -0.012,-0.473 0.034,-0.332 0.037,-0.328 0.051,0.079l0.015,0.426 1.645,0.027 1.645,0.027 -1.648,0.02c-1.34,0.017 -1.657,-0.003 -1.696,-0.105zM89.229,53.619c-0.024,-0.062 -0.032,-1.695 -0.019,-3.628l0.025,-3.515 0.021,3.581 0.021,3.581 2.231,0.026 2.231,0.026 -2.234,0.021c-1.722,0.016 -2.244,-0.005 -2.277,-0.092zM94.281,53.674c0.637,-0.067 1.467,-0.073 1.429,-0.01 -0.023,0.037 -0.415,0.061 -0.871,0.053 -0.456,-0.008 -0.707,-0.027 -0.558,-0.043zM99.757,53.665c0.235,-0.019 0.621,-0.019 0.856,0 0.235,0.019 0.043,0.034 -0.428,0.034 -0.471,0 -0.664,-0.015 -0.428,-0.034zM61.187,51.658c0,-0.421 0.016,-0.594 0.035,-0.383 0.019,0.211 0.019,0.555 0,0.766 -0.019,0.211 -0.035,0.038 -0.035,-0.383zM52.299,51.952c0.359,-0.017 0.948,-0.017 1.307,0 0.359,0.017 0.065,0.031 -0.653,0.031 -0.719,0 -1.013,-0.014 -0.653,-0.031zM96.876,51.952c0.386,-0.017 0.995,-0.017 1.352,0 0.357,0.017 0.041,0.031 -0.703,0.031 -0.744,-0 -1.036,-0.014 -0.649,-0.031zM56.766,50.081c0.001,-0.297 0.017,-0.408 0.037,-0.246 0.02,0.162 0.02,0.405 -0.001,0.541 -0.021,0.135 -0.037,0.003 -0.036,-0.295zM179.236,50.273c-0.372,-0.112 -0.863,-0.302 -1.091,-0.423 -0.228,-0.121 -2.322,-1.457 -4.653,-2.969l-4.238,-2.749 3.805,-0.023 3.805,-0.023 -5.141,-14.689c-2.828,-8.079 -5.152,-14.678 -5.166,-14.664 -0.014,0.014 0.452,3.115 1.036,6.891l1.061,6.866 -2.208,6.312 -2.208,6.312h-5.165c-2.841,0 -5.166,-0.03 -5.166,-0.068 -0,-0.037 2.481,-6.975 5.514,-15.418l5.514,-15.35 4.379,0.026 4.379,0.026 0.514,0.252c0.61,0.299 1.262,0.987 1.45,1.528 0.073,0.21 2.737,7.684 5.921,16.607 3.183,8.924 5.865,16.525 5.96,16.893 0.507,1.968 -0.104,3.606 -1.632,4.381 -0.829,0.42 -1.39,0.493 -3.784,0.489 -2.027,-0.003 -2.264,-0.02 -2.884,-0.207zM76.226,50.081c0.002,-0.149 0.022,-0.199 0.045,-0.111 0.023,0.088 0.021,0.209 -0.003,0.27 -0.025,0.061 -0.043,-0.011 -0.042,-0.159zM69.375,48.639c0.002,-0.149 0.022,-0.199 0.045,-0.111 0.023,0.088 0.021,0.209 -0.003,0.27 -0.025,0.061 -0.043,-0.011 -0.042,-0.159zM66.18,47.719c0.112,-0.021 0.294,-0.021 0.406,0 0.112,0.021 0.02,0.039 -0.203,0.039 -0.223,0 -0.314,-0.018 -0.203,-0.039zM60.458,47.63c0.088,-0.023 0.209,-0.021 0.27,0.003 0.061,0.025 -0.011,0.043 -0.159,0.042 -0.149,-0.002 -0.199,-0.022 -0.111,-0.045zM77.898,47.633c0.062,-0.025 0.163,-0.025 0.225,0 0.062,0.025 0.011,0.045 -0.113,0.045 -0.124,0 -0.175,-0.02 -0.113,-0.045zM84.163,47.63c0.087,-0.023 0.229,-0.023 0.315,0 0.087,0.023 0.016,0.041 -0.158,0.041 -0.174,0 -0.244,-0.019 -0.158,-0.041zM70.465,46.926c0.001,-0.248 0.018,-0.339 0.039,-0.202 0.021,0.137 0.02,0.34 -0.001,0.451 -0.021,0.111 -0.038,-0.001 -0.038,-0.249zM66.997,46.459c0.065,-0.026 0.143,-0.023 0.173,0.007 0.03,0.03 -0.023,0.051 -0.118,0.047 -0.105,-0.004 -0.126,-0.026 -0.054,-0.054zM139.419,41.32c0.088,-0.023 0.209,-0.021 0.27,0.003 0.061,0.025 -0.011,0.043 -0.159,0.042 -0.149,-0.002 -0.199,-0.022 -0.111,-0.045zM141.763,41.32c0.088,-0.023 0.209,-0.021 0.27,0.003 0.061,0.025 -0.011,0.043 -0.159,0.042 -0.149,-0.002 -0.199,-0.022 -0.111,-0.045zM90.223,29.665c0,-6.222 0.011,-8.767 0.024,-5.656 0.013,3.111 0.013,8.201 0,11.312 -0.013,3.111 -0.024,0.566 -0.024,-5.656zM100.86,26.059c0,-8.205 0.011,-11.561 0.024,-7.459 0.013,4.102 0.013,10.815 0,14.918 -0.013,4.102 -0.024,0.746 -0.024,-7.459zM190.39,40.512c0.062,-0.025 0.163,-0.025 0.225,0 0.062,0.025 0.011,0.045 -0.113,0.045 -0.124,0 -0.175,-0.02 -0.113,-0.045zM189.188,38.138c0,-0.868 0.014,-1.222 0.03,-0.789 0.016,0.434 0.016,1.144 0,1.577 -0.016,0.434 -0.03,0.079 -0.03,-0.789zM187.997,38.093c0.001,-0.149 0.022,-0.199 0.045,-0.111 0.023,0.088 0.021,0.209 -0.004,0.27 -0.025,0.061 -0.043,-0.011 -0.041,-0.159zM189.986,37.893c0.137,-0.021 0.34,-0.02 0.451,0.001 0.111,0.021 -0.001,0.038 -0.249,0.038 -0.248,-0.001 -0.339,-0.018 -0.202,-0.039zM144.45,32.496c0.004,-0.105 0.026,-0.126 0.054,-0.054 0.026,0.065 0.023,0.143 -0.007,0.173 -0.03,0.03 -0.051,-0.023 -0.047,-0.118zM116.891,31.467c0,-0.372 0.016,-0.524 0.035,-0.338 0.019,0.186 0.019,0.49 0,0.676 -0.019,0.186 -0.035,0.034 -0.035,-0.338zM153.834,31.693c0.001,-0.149 0.022,-0.199 0.045,-0.111 0.023,0.088 0.021,0.209 -0.004,0.27 -0.025,0.061 -0.043,-0.011 -0.041,-0.159zM153.83,30.386c0,-0.124 0.021,-0.175 0.045,-0.113 0.025,0.062 0.025,0.163 0,0.225 -0.025,0.062 -0.045,0.011 -0.045,-0.113zM128.585,21.319c0.004,-0.105 0.026,-0.126 0.054,-0.054 0.026,0.065 0.023,0.143 -0.007,0.173 -0.03,0.03 -0.051,-0.023 -0.047,-0.118zM153.303,19.93c0,-0.273 0.017,-0.384 0.038,-0.248 0.021,0.136 0.021,0.359 0,0.496 -0.021,0.136 -0.038,0.025 -0.038,-0.248zM73.635,14.747c0,-1.983 0.012,-2.781 0.026,-1.774 0.015,1.007 0.014,2.63 -0,3.606 -0.015,0.976 -0.026,0.152 -0.026,-1.831zM140.634,17.346c0.062,-0.025 0.163,-0.025 0.225,0 0.062,0.025 0.011,0.045 -0.113,0.045 -0.124,0 -0.175,-0.02 -0.113,-0.045zM141.812,17.344c0.065,-0.026 0.143,-0.023 0.173,0.007 0.03,0.03 -0.023,0.051 -0.118,0.047 -0.105,-0.004 -0.126,-0.026 -0.054,-0.054zM139.558,10.764c0.065,-0.026 0.143,-0.023 0.173,0.007 0.03,0.03 -0.023,0.051 -0.118,0.047 -0.105,-0.004 -0.126,-0.026 -0.054,-0.054zM142.713,10.764c0.065,-0.026 0.143,-0.023 0.173,0.007 0.03,0.03 -0.023,0.051 -0.118,0.047 -0.105,-0.004 -0.126,-0.026 -0.054,-0.054z" + android:strokeWidth="0.0901377" + android:fillColor="#efdb1e"/> + <path + android:pathData="M49.663,60.976C48.554,60.777 47.766,60.519 46.751,60.024 44.108,58.737 42.073,56.426 41.146,53.661 40.573,51.95 40.604,53.174 40.604,32.008c0,-16.86 0.017,-19.366 0.138,-20.066C41.208,9.225 42.761,6.692 44.972,5.04 45.915,4.336 47.626,3.499 48.761,3.187L49.663,2.939L119.97,2.939 190.278,2.939l0.883,0.244c1.977,0.546 3.551,1.461 4.985,2.9 1.657,1.662 2.613,3.437 3.076,5.71 0.152,0.745 0.161,1.916 0.161,20.171 0,21.038 0.027,19.875 -0.503,21.543 -1.247,3.927 -4.819,6.957 -8.866,7.52 -0.49,0.068 -21.174,0.094 -70.162,0.089 -60.111,-0.007 -69.564,-0.026 -70.188,-0.138zM62.032,53.568 L62.642,53.416 62.667,51.501 62.691,49.585h-1.444,-1.444v0.676,0.676h0.676,0.676v0.711c0,0.814 -0.005,0.818 -0.895,0.821 -1.029,0.003 -1.601,-0.542 -1.819,-1.735 -0.206,-1.128 0.173,-2.248 0.932,-2.75 0.514,-0.341 1.592,-0.397 2.317,-0.121 0.27,0.103 0.499,0.177 0.509,0.166 0.112,-0.121 0.471,-1.2 0.417,-1.253 -0.039,-0.039 -0.391,-0.153 -0.781,-0.253 -2.086,-0.533 -3.984,0.172 -4.696,1.746 -0.293,0.646 -0.43,1.513 -0.358,2.254 0.226,2.321 1.472,3.384 3.809,3.248 0.458,-0.027 1.107,-0.117 1.442,-0.201zM79.386,53.582 L79.904,53.437v-0.674c0,-0.605 -0.016,-0.668 -0.158,-0.613 -0.912,0.351 -1.987,0.4 -2.547,0.116 -0.598,-0.304 -0.84,-0.837 -0.885,-1.953 -0.051,-1.276 0.196,-1.956 0.879,-2.416 0.417,-0.281 1.162,-0.277 1.925,0.01l0.57,0.215 0.195,-0.508c0.107,-0.279 0.219,-0.573 0.248,-0.652 0.092,-0.249 -1.087,-0.576 -2.074,-0.576 -1.147,0.001 -1.651,0.192 -2.351,0.893 -0.719,0.719 -0.945,1.289 -1.006,2.533 -0.11,2.245 0.755,3.608 2.49,3.924 0.544,0.099 1.545,0.029 2.198,-0.153zM85.637,53.598c0.866,-0.257 1.516,-0.908 1.892,-1.895 0.138,-0.363 0.171,-0.687 0.17,-1.668 -0.002,-1.548 -0.168,-2.043 -0.94,-2.804 -0.688,-0.678 -1.174,-0.846 -2.439,-0.846 -1.27,0 -1.763,0.172 -2.441,0.849 -0.671,0.671 -0.902,1.269 -0.962,2.487 -0.112,2.279 0.799,3.686 2.593,4.003 0.611,0.108 1.522,0.054 2.127,-0.126zM83.546,52.303c-0.473,-0.222 -0.72,-0.574 -0.903,-1.289 -0.328,-1.279 0.029,-2.71 0.781,-3.133 0.497,-0.28 1.514,-0.249 1.946,0.059 0.419,0.298 0.678,0.929 0.731,1.781 0.075,1.208 -0.195,2.054 -0.8,2.503 -0.354,0.262 -1.278,0.305 -1.755,0.081zM51.357,52.85 L51.615,52.014 52.933,52.039 54.251,52.064 54.507,52.898 54.762,53.731h0.808c0.587,0 0.808,-0.031 0.807,-0.113 -0,-0.062 -0.56,-1.695 -1.244,-3.628L53.89,46.475 52.937,46.45c-0.845,-0.023 -0.961,-0.007 -1.017,0.135 -0.15,0.379 -2.482,7.048 -2.482,7.098 0,0.03 0.374,0.043 0.831,0.029l0.831,-0.026zM52.055,50.599c0.006,-0.107 0.889,-2.96 0.894,-2.887 0.003,0.056 0.746,2.508 0.861,2.842 0.029,0.085 -0.18,0.113 -0.86,0.113 -0.494,0 -0.897,-0.03 -0.895,-0.068zM65.933,52.329L65.933,50.927l0.423,0.027 0.423,0.027 0.85,1.375 0.85,1.375h0.846c0.465,0 0.846,-0.023 0.846,-0.052 0,-0.029 -0.468,-0.745 -1.041,-1.592 -0.756,-1.119 -1.009,-1.558 -0.924,-1.608 1.09,-0.633 1.429,-1.517 1.054,-2.749 -0.095,-0.312 -0.532,-0.762 -0.939,-0.967 -0.457,-0.23 -1.277,-0.334 -2.629,-0.334h-1.29v3.651,3.651h0.766,0.766zM66,49.625c-0.037,-0.038 -0.068,-0.468 -0.068,-0.956v-0.886l0.608,0c1.001,0.001 1.421,0.395 1.23,1.157 -0.054,0.216 -0.172,0.375 -0.359,0.483 -0.299,0.174 -1.3,0.317 -1.412,0.202zM73.775,53.247v-0.485l-0.451,-0.194 -0.451,-0.194v-2.294,-2.294l0.451,-0.228c0.45,-0.228 0.451,-0.229 0.451,-0.68v-0.451l-1.645,0.025 -1.645,0.025 -0.028,0.434 -0.028,0.434 0.456,0.193 0.456,0.193v2.324,2.324L70.89,52.605c-0.436,0.221 -0.451,0.241 -0.451,0.617 0,0.214 0.027,0.416 0.06,0.449 0.033,0.033 0.783,0.06 1.668,0.06h1.607zM93.695,53.055v-0.676h-1.442,-1.442v-2.978,-2.978l-0.789,0.026 -0.789,0.026 -0.024,3.515c-0.013,1.933 -0.004,3.566 0.02,3.628 0.033,0.086 0.566,0.113 2.255,0.113h2.211zM95.949,52.875 L96.196,52.064 97.51,52.039 98.824,52.014 99.081,52.85 99.337,53.686 100.167,53.712c0.456,0.014 0.829,-0.01 0.829,-0.053 0,-0.043 -0.564,-1.678 -1.253,-3.631l-1.253,-3.553h-0.97,-0.97l-1.242,3.515c-0.683,1.933 -1.244,3.568 -1.247,3.631 -0.003,0.088 0.192,0.11 0.818,0.09l0.823,-0.026zM96.669,50.599c-0.001,-0.144 0.851,-2.925 0.872,-2.85 0.013,0.043 0.222,0.717 0.465,1.498l0.441,1.42h-0.889c-0.489,0 -0.889,-0.03 -0.889,-0.068zM184.894,50.351c0.678,-0.16 1.34,-0.483 1.779,-0.868 0.927,-0.814 1.264,-2.322 0.864,-3.872 -0.095,-0.367 -2.776,-7.969 -5.96,-16.893 -3.183,-8.924 -5.847,-16.397 -5.921,-16.607 -0.188,-0.542 -0.84,-1.229 -1.45,-1.528l-0.514,-0.252 -4.379,-0.026 -4.379,-0.026 -5.514,15.35c-3.033,8.442 -5.514,15.38 -5.514,15.418 0,0.037 2.325,0.068 5.166,0.068h5.165l2.208,-6.312 2.208,-6.312 -1.061,-6.866c-0.584,-3.776 -1.05,-6.878 -1.036,-6.891 0.014,-0.014 2.339,6.585 5.166,14.664l5.141,14.689 -3.805,0.023 -3.805,0.023 4.238,2.749c2.331,1.512 4.424,2.848 4.653,2.969 0.228,0.121 0.719,0.311 1.091,0.423 0.62,0.187 0.858,0.204 2.884,0.207 1.644,0.003 2.353,-0.031 2.773,-0.13zM73.166,45.162c0.483,-0.398 0.879,-0.763 0.879,-0.81 0,-0.048 -0.37,-0.086 -0.839,-0.086h-0.839l-0.596,0.758c-0.328,0.417 -0.572,0.782 -0.543,0.811 0.029,0.029 0.279,0.052 0.556,0.051 0.495,-0.002 0.517,-0.013 1.382,-0.726zM143.721,41.203c4.504,-0.585 7.62,-2.352 9.049,-5.133 0.786,-1.529 1.083,-2.902 1.082,-5.008 0,-1.096 -0.038,-1.505 -0.201,-2.16 -0.682,-2.74 -2.593,-4.595 -5.931,-5.757 -0.494,-0.172 -2.276,-0.625 -3.958,-1.008 -4.117,-0.935 -5.215,-1.347 -5.707,-2.143 -0.648,-1.048 -0.018,-2.068 1.52,-2.463 0.888,-0.228 2.659,-0.205 3.439,0.045 1.085,0.347 1.778,1.186 1.93,2.335l0.062,0.47h4.18,4.18l-0,-0.248c0,-1.353 -0.393,-3.25 -0.868,-4.197 -1.394,-2.776 -4.681,-4.627 -9.066,-5.105 -1.103,-0.12 -3.381,-0.122 -4.443,-0.003 -4.62,0.516 -8.035,2.473 -9.515,5.451 -0.589,1.186 -0.807,2.06 -0.871,3.492 -0.123,2.755 0.491,4.6 2.084,6.267 1.755,1.835 3.589,2.639 8.572,3.758 4.116,0.924 5.182,1.481 5.182,2.708 0,0.817 -0.52,1.342 -1.622,1.637 -0.447,0.12 -0.961,0.158 -2.163,0.161 -1.435,0.004 -1.638,-0.015 -2.253,-0.216 -0.563,-0.183 -0.76,-0.304 -1.18,-0.722 -0.591,-0.588 -0.823,-1.16 -0.831,-2.045l-0.005,-0.573h-4.232,-4.232l0.047,1.42c0.039,1.179 0.087,1.554 0.283,2.212 0.541,1.817 1.595,3.264 3.282,4.506 1.618,1.191 4.295,2.104 7.048,2.404 0.941,0.103 4.095,0.05 5.138,-0.085zM191.701,40.727c1.02,-0.467 1.607,-1.346 1.667,-2.499 0.049,-0.924 -0.198,-1.582 -0.831,-2.214 -1.428,-1.428 -3.875,-0.996 -4.711,0.832 -0.624,1.362 -0.134,2.952 1.154,3.748 0.761,0.47 1.866,0.525 2.721,0.134zM189.345,40.203c-0.859,-0.429 -1.277,-1.149 -1.274,-2.192 0.004,-0.924 0.464,-1.674 1.294,-2.106 0.9,-0.469 2.125,-0.281 2.843,0.437 0.718,0.718 0.906,1.943 0.437,2.843 -0.635,1.217 -2.037,1.65 -3.301,1.018zM189.692,39.036c0,-0.7 0.075,-0.796 0.515,-0.655 0.167,0.053 0.384,0.283 0.648,0.685 0.359,0.547 0.426,0.604 0.7,0.604h0.303l-0.24,-0.383c-0.132,-0.211 -0.359,-0.535 -0.504,-0.721 -0.194,-0.248 -0.228,-0.338 -0.127,-0.338 0.249,0 0.603,-0.394 0.656,-0.731 0.044,-0.275 0.01,-0.373 -0.221,-0.631l-0.273,-0.305h-0.976,-0.976l-0.025,1.555 -0.025,1.555h0.273,0.273zM189.692,37.416v-0.451h0.521c0.571,0 0.921,0.171 0.921,0.449 0,0.323 -0.247,0.452 -0.863,0.452h-0.579zM71.791,37.372v-3.56l-6.693,-0.023 -6.693,-0.023 -0.024,-2.366 -0.024,-2.366h6.041,6.041v-3.334,-3.334l-6.017,-0.023 -6.017,-0.023 -0.024,-2.141 -0.024,-2.141h6.717,6.717L71.791,14.612 71.791,11.186L60.614,11.186 49.437,11.186L49.437,26.059 49.437,40.932L60.614,40.932 71.791,40.932ZM90.27,29.62L90.27,18.307h3.741,3.741L97.751,14.747 97.751,11.186L85.673,11.186 73.594,11.186v3.56,3.56h3.786,3.786v11.312,11.312h4.552,4.552zM119.61,40.682c0.811,-0.228 2.005,-0.773 2.62,-1.197 1.49,-1.025 2.712,-2.717 3.197,-4.429 0.248,-0.874 0.328,-2.435 0.18,-3.519 -0.248,-1.82 -0.759,-2.912 -1.89,-4.039 -0.859,-0.854 -1.624,-1.313 -2.845,-1.706 -0.397,-0.128 -0.741,-0.265 -0.766,-0.305 -0.025,-0.04 0.242,-0.185 0.593,-0.322 2.12,-0.825 3.443,-2.201 4.009,-4.171 0.242,-0.841 0.34,-2.908 0.181,-3.823 -0.243,-1.4 -0.886,-2.56 -2.069,-3.739 -0.778,-0.774 -0.971,-0.913 -1.902,-1.371 -1.821,-0.894 -0.883,-0.822 -11.109,-0.854l-8.991,-0.028v14.878,14.878l9.036,-0.026 9.036,-0.026zM109.289,31.467v-2.524h2.977c3.267,0 3.292,0.004 3.916,0.551 0.54,0.474 0.674,0.866 0.674,1.973 0,0.727 -0.038,1.031 -0.166,1.312 -0.202,0.444 -0.829,1 -1.266,1.122 -0.181,0.05 -1.587,0.09 -3.228,0.09l-2.907,0.001zM109.289,20.02L109.289,17.496l2.546,0.002c1.401,0.001 2.706,0.039 2.9,0.084 0.506,0.117 1.041,0.526 1.357,1.036 0.259,0.418 0.272,0.49 0.272,1.394 -0.001,1.061 -0.103,1.378 -0.612,1.901 -0.591,0.607 -0.703,0.626 -3.737,0.628l-2.727,0.002z" + android:strokeWidth="0.0901377" + android:fillColor="#337729"/> </vector> 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/icon_notify.xml b/androidApp/src/main/res/drawable/icon_notify.xml index c92915e..8bbfd73 100644 --- a/androidApp/src/main/res/drawable/icon_notify.xml +++ b/androidApp/src/main/res/drawable/icon_notify.xml @@ -1,28 +1,5 @@ -<vector xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:aapt="http://schemas.android.com/aapt" - android:width="24dp" - android:height="24dp" - android:viewportWidth="31.75" - android:viewportHeight="31.75"> - <path - android:pathData="m16.7714,15.5323c5.3724,1.0493 7.469,14.6249 7.469,14.6249 0,0 -0.3949,-10.5539 -8.531,-11.6354 -6.4938,-0.8632 -11.1417,7.5606 -11.1417,7.5606 0,0 6.9261,-11.581 12.2037,-10.5502z" - android:strokeLineJoin="bevel" - android:strokeWidth="1.8058915" - android:fillColor="#ff3232" - android:strokeColor="#ff3232" - android:strokeLineCap="butt"/> - <path - android:pathData="m18.261,8.9784c5.3724,1.0493 7.469,14.6249 7.469,14.6249 0,0 -0.3949,-10.5539 -8.531,-11.6354 -6.4938,-0.8632 -11.1417,7.5606 -11.1417,7.5606 0,0 6.9261,-11.581 12.2037,-10.5502z" - android:strokeLineJoin="bevel" - android:strokeWidth="1.8058915" - android:fillColor="#ff3232" - android:strokeColor="#ff3232" - android:strokeLineCap="butt"/> - <path - android:pathData="m19.6015,2.4245c5.3724,1.0493 7.469,14.6249 7.469,14.6249 0,0 -0.3949,-10.5539 -8.531,-11.6354 -6.4938,-0.8632 -11.1417,7.5606 -11.1417,7.5606 0,0 6.9261,-11.581 12.2037,-10.5502z" - android:strokeLineJoin="bevel" - android:strokeWidth="1.8058915" - android:fillColor="#ff3232" - android:strokeColor="#ff3232" - android:strokeLineCap="butt"/> +<vector android:height="24dp" android:viewportHeight="64" + android:viewportWidth="64" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> + <path android:fillColor="#FF337729" + 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" /> </vector> diff --git a/androidApp/src/main/res/drawable/map_backhoe.png b/androidApp/src/main/res/drawable/map_backhoe.png Binary files differnew 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 Binary files differnew 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 Binary files differnew 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 Binary files differnew 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 Binary files differnew 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> diff --git a/androidApp/src/main/res/layout/login.xml b/androidApp/src/main/res/layout/login.xml index 78c3e46..1de3f12 100644 --- a/androidApp/src/main/res/layout/login.xml +++ b/androidApp/src/main/res/layout/login.xml @@ -92,7 +92,8 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/passwordInputLayout" app:layout_constraintBottom_toTopOf="@id/signinButton" - android:layout_marginTop="@dimen/fields_spacing"> + android:layout_marginTop="@dimen/fields_spacing" + android:visibility="gone"> <com.google.android.material.textfield.TextInputEditText android:id="@+id/urlEditText" diff --git a/androidApp/src/main/res/layout/user_information_activity.xml b/androidApp/src/main/res/layout/user_information_activity.xml index f223522..4fb44ef 100644 --- a/androidApp/src/main/res/layout/user_information_activity.xml +++ b/androidApp/src/main/res/layout/user_information_activity.xml @@ -136,14 +136,16 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/login_url" - android:textAppearance="@style/TextAppearance.AppCompat.Body2"/> + android:textAppearance="@style/TextAppearance.AppCompat.Body2" + android:visibility="gone"/> <TextView android:id="@+id/serverInfo" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/fields_spacing" - tools:text="@string/default_server_url" /> + tools:text="@string/default_server_url" + android:visibility="gone"/> <com.google.android.material.button.MaterialButton android:id="@+id/signoutButton" @@ -207,7 +209,8 @@ android:id="@+id/sourceCodeButton" android:layout_width="match_parent" android:layout_height="wrap_content" - android:text="@string/source_code" /> + android:text="@string/source_code" + android:visibility="gone" /> <com.google.android.material.button.MaterialButton android:id="@+id/websiteButton" diff --git a/androidApp/src/main/res/menu/map_layers.xml b/androidApp/src/main/res/menu/map_layers.xml index 334b9f9..db0a813 100644 --- a/androidApp/src/main/res/menu/map_layers.xml +++ b/androidApp/src/main/res/menu/map_layers.xml @@ -7,7 +7,11 @@ android:title="@string/layer_streets"/> <item - android:id="@+id/layerSatellite" - android:title="@string/layer_satellite"/> + android:id="@+id/layerGmapsStreets" + android:title="@string/layer_gmaps_streets"/> + + <item + android:id="@+id/layerGmapsSatellite" + android:title="@string/layer_gmaps_satellite"/> </menu>
\ No newline at end of file diff --git a/androidApp/src/main/res/mipmap-hdpi/ic_launcher.png b/androidApp/src/main/res/mipmap-hdpi/ic_launcher.png Binary files differdeleted file mode 100644 index 06eb10f..0000000 --- a/androidApp/src/main/res/mipmap-hdpi/ic_launcher.png +++ /dev/null diff --git a/androidApp/src/main/res/mipmap-hdpi/ic_launcher_round.png b/androidApp/src/main/res/mipmap-hdpi/ic_launcher_round.png Binary files differdeleted file mode 100644 index 06eb10f..0000000 --- a/androidApp/src/main/res/mipmap-hdpi/ic_launcher_round.png +++ /dev/null diff --git a/androidApp/src/main/res/mipmap-mdpi/ic_launcher.png b/androidApp/src/main/res/mipmap-mdpi/ic_launcher.png Binary files differdeleted file mode 100644 index 1203ad2..0000000 --- a/androidApp/src/main/res/mipmap-mdpi/ic_launcher.png +++ /dev/null diff --git a/androidApp/src/main/res/mipmap-mdpi/ic_launcher_round.png b/androidApp/src/main/res/mipmap-mdpi/ic_launcher_round.png Binary files differdeleted file mode 100644 index 1203ad2..0000000 --- a/androidApp/src/main/res/mipmap-mdpi/ic_launcher_round.png +++ /dev/null diff --git a/androidApp/src/main/res/mipmap-xhdpi/ic_launcher.png b/androidApp/src/main/res/mipmap-xhdpi/ic_launcher.png Binary files differdeleted file mode 100644 index 8473bd8..0000000 --- a/androidApp/src/main/res/mipmap-xhdpi/ic_launcher.png +++ /dev/null diff --git a/androidApp/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/androidApp/src/main/res/mipmap-xhdpi/ic_launcher_round.png Binary files differdeleted file mode 100644 index 8473bd8..0000000 --- a/androidApp/src/main/res/mipmap-xhdpi/ic_launcher_round.png +++ /dev/null diff --git a/androidApp/src/main/res/mipmap-xxhdpi/ic_launcher.png b/androidApp/src/main/res/mipmap-xxhdpi/ic_launcher.png Binary files differdeleted file mode 100644 index eb23754..0000000 --- a/androidApp/src/main/res/mipmap-xxhdpi/ic_launcher.png +++ /dev/null diff --git a/androidApp/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/androidApp/src/main/res/mipmap-xxhdpi/ic_launcher_round.png Binary files differdeleted file mode 100644 index eb23754..0000000 --- a/androidApp/src/main/res/mipmap-xxhdpi/ic_launcher_round.png +++ /dev/null diff --git a/androidApp/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/androidApp/src/main/res/mipmap-xxxhdpi/ic_launcher.png Binary files differdeleted file mode 100644 index 7f67e44..0000000 --- a/androidApp/src/main/res/mipmap-xxxhdpi/ic_launcher.png +++ /dev/null diff --git a/androidApp/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/androidApp/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png Binary files differdeleted file mode 100644 index 7f67e44..0000000 --- a/androidApp/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png +++ /dev/null diff --git a/androidApp/src/main/res/values-es-rMX/map_layers.xml b/androidApp/src/main/res/values-es-rMX/map_layers.xml index eff37d9..8afadc4 100644 --- a/androidApp/src/main/res/values-es-rMX/map_layers.xml +++ b/androidApp/src/main/res/values-es-rMX/map_layers.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <resources> - <string name="layer_streets">Calles</string> - <string name="layer_satellite">Satélite</string> + <string name="layer_streets">OpenStreetMap</string> + <string name="layer_gmaps_streets">Google Calles</string> + <string name="layer_gmaps_satellite">Google Satélite</string> </resources>
\ No newline at end of file diff --git a/androidApp/src/main/res/values-es-rMX/strings.xml b/androidApp/src/main/res/values-es-rMX/strings.xml index 912a5d9..5612e77 100644 --- a/androidApp/src/main/res/values-es-rMX/strings.xml +++ b/androidApp/src/main/res/values-es-rMX/strings.xml @@ -43,6 +43,7 @@ <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_backhoe">Retro</string> <string name="unit_category_bicycle">Bicicleta</string> <string name="unit_category_boat">Bote</string> <string name="unit_category_bus">Autobús</string> @@ -79,7 +80,7 @@ <string name="unit_info_longitude">Longitud</string> <string name="unit_info_datetime">Fecha y hora</string> <string name="unit_info_protocol">Protocolo</string> - <string name="unit_info_map_button">Abrir ubicación en navegador</string> + <string name="unit_info_map_button">Abrir en Google Maps</string> <!-- Commands --> <string name="send_command">Enviar comando</string> @@ -154,10 +155,9 @@ <string name="sign_out">Cerrar sesión</string> <string name="about_details">Acerca de</string> - <string name="about_logo">Logo de TrackerMap</string> + <string name="about_logo">Logo de ETBSA</string> <string name="about_text"> - TrackerMap es una aplicación de software libre para rastrear y gestionar dispositivos GPS en servidores de Traccar. - \n\nEl código fuente de TrackerMap está disponible bajo la licencia GNU General Public License versión 3. + ETBSA Tracker es una aplicación para rastrear y gestionar unidades GPS. </string> <string name="app_version">Versión</string> <string name="source_code">Código fuente</string> diff --git a/androidApp/src/main/res/values/ic_launcher_background.xml b/androidApp/src/main/res/values/ic_launcher_background.xml index c5d5899..276c9ab 100644 --- a/androidApp/src/main/res/values/ic_launcher_background.xml +++ b/androidApp/src/main/res/values/ic_launcher_background.xml @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> <resources> - <color name="ic_launcher_background">#FFFFFF</color> + <color name="ic_launcher_background">#EFDB1E</color> </resources>
\ No newline at end of file diff --git a/androidApp/src/main/res/values/map_layers.xml b/androidApp/src/main/res/values/map_layers.xml index 034f3e5..50e1a7c 100644 --- a/androidApp/src/main/res/values/map_layers.xml +++ b/androidApp/src/main/res/values/map_layers.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <resources> - <string name="layer_streets">Streets</string> - <string name="layer_satellite">Satellite</string> + <string name="layer_streets">OpenStreetMap</string> + <string name="layer_gmaps_streets">Google Streets</string> + <string name="layer_gmaps_satellite">Google Satellite</string> </resources>
\ No newline at end of file diff --git a/androidApp/src/main/res/values/strings.xml b/androidApp/src/main/res/values/strings.xml index 57eaf66..a946cf8 100644 --- a/androidApp/src/main/res/values/strings.xml +++ b/androidApp/src/main/res/values/strings.xml @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <resources> - <string name="app_name" translatable="false">TrackerMap</string> - <string name="default_server_url" translatable="false">https://gps.trackermap.mx/api</string> + <string name="app_name" translatable="false">ETBSA</string> + <string name="default_server_url" translatable="false">https://etbsa.net/api</string> <!-- Non translatable --> - <string name="app_website_url" translatable="false">https://trackermap.mx/</string> - <string name="app_source_code_url" translatable="false">https://sr.ht/~avalos/trackermap/</string> + <string name="app_website_url" translatable="false">https://etbsa.com.mx/</string> + <string name="app_source_code_url" translatable="false">https://git.avalos.me/etbsa-trackermap-mobile</string> <string name="maps_url_template" translatable="false"> https://www.google.com/maps/place/%1$f,%2$f?z=19 @@ -57,6 +57,7 @@ <string name="unit_last_date">Last position datetime</string> <string name="unit_category_animal">Animal</string> + <string name="unit_category_backhoe">Backhoe</string> <string name="unit_category_bicycle">Bicycle</string> <string name="unit_category_boat">Boat</string> <string name="unit_category_bus">Bus</string> @@ -93,7 +94,7 @@ <string name="unit_info_longitude">Longitude</string> <string name="unit_info_datetime">Datetime</string> <string name="unit_info_protocol">Protocol</string> - <string name="unit_info_map_button">Open location in browser</string> + <string name="unit_info_map_button">Open in Google Maps</string> <!-- Commands --> <string name="send_command">Send Command</string> @@ -168,10 +169,9 @@ <string name="sign_out">Sign out</string> <string name="about_details">About</string> - <string name="about_logo">TrackerMap logo</string> + <string name="about_logo">ETBSA logo</string> <string name="about_text"> - TrackerMap is a free (as in freedom) software app for tracking and managing GPS devices in Traccar servers. - \n\nTrackerMap source code is licensed under the GNU General Public License Version 3. + ETBSA Tracker is an app for tracking and managing GPS devices. </string> <string name="app_version">Version</string> <string name="source_code">Source code</string> diff --git a/iosApp/iosApp.xcodeproj/project.pbxproj b/iosApp/iosApp.xcodeproj/project.pbxproj index 6706004..77f0fc0 100644 --- a/iosApp/iosApp.xcodeproj/project.pbxproj +++ b/iosApp/iosApp.xcodeproj/project.pbxproj @@ -577,6 +577,7 @@ CODE_SIGN_ENTITLEMENTS = iosApp/iosApp.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; + CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_ASSET_PATHS = "\"iosApp/Preview Content\""; DEVELOPMENT_TEAM = 358YRZ9P3L; ENABLE_PREVIEWS = YES; @@ -590,19 +591,19 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.1; + MARKETING_VERSION = 1.3; OTHER_LDFLAGS = ( "$(inherited)", "-framework", shared, ); - PRODUCT_BUNDLE_IDENTIFIER = mx.trackermap.trackermap.ios; + PRODUCT_BUNDLE_IDENTIFIER = net.etbsa.etbsa; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_OBJC_BRIDGING_HEADER = ""; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; + TARGETED_DEVICE_FAMILY = 1; }; name = Debug; }; @@ -615,6 +616,7 @@ CODE_SIGN_ENTITLEMENTS = iosApp/iosApp.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; + CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_ASSET_PATHS = "\"iosApp/Preview Content\""; DEVELOPMENT_TEAM = 358YRZ9P3L; ENABLE_PREVIEWS = YES; @@ -628,18 +630,18 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.1; + MARKETING_VERSION = 1.3; OTHER_LDFLAGS = ( "$(inherited)", "-framework", shared, ); - PRODUCT_BUNDLE_IDENTIFIER = mx.trackermap.trackermap.ios; + PRODUCT_BUNDLE_IDENTIFIER = net.etbsa.etbsa; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_OBJC_BRIDGING_HEADER = ""; SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; + TARGETED_DEVICE_FAMILY = 1; }; name = Release; }; diff --git a/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-1024.png b/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-1024.png Binary files differindex 7c53b0c..bd82b68 100644 --- a/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-1024.png +++ b/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-1024.png diff --git a/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-120.png b/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-120.png Binary files differindex a4743e4..78c399e 100644 --- a/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-120.png +++ b/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-120.png diff --git a/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-128.png b/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-128.png Binary files differindex 25cdaa0..12c4926 100644 --- a/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-128.png +++ b/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-128.png diff --git a/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-152.png b/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-152.png Binary files differindex 5987065..e2f96ea 100644 --- a/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-152.png +++ b/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-152.png diff --git a/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-16.png b/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-16.png Binary files differindex b43c1b2..5464ecc 100644 --- a/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-16.png +++ b/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-16.png diff --git a/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-167.png b/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-167.png Binary files differindex af7bcd5..6502a54 100644 --- a/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-167.png +++ b/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-167.png diff --git a/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-180.png b/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-180.png Binary files differindex 4d85db7..4cd91b9 100644 --- a/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-180.png +++ b/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-180.png diff --git a/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-20.png b/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-20.png Binary files differindex bf72c03..999ea06 100644 --- a/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-20.png +++ b/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-20.png diff --git a/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-256.png b/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-256.png Binary files differindex 54a55e4..e1bdc94 100644 --- a/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-256.png +++ b/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-256.png diff --git a/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-29.png b/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-29.png Binary files differindex d33b7b0..7bd88e0 100644 --- a/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-29.png +++ b/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-29.png diff --git a/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-32.png b/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-32.png Binary files differindex c81e46d..e1def7e 100644 --- a/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-32.png +++ b/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-32.png diff --git a/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-40.png b/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-40.png Binary files differindex b9ecaf2..b2a5e21 100644 --- a/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-40.png +++ b/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-40.png diff --git a/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-512.png b/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-512.png Binary files differindex 3895874..df6e0ce 100644 --- a/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-512.png +++ b/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-512.png diff --git a/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-58.png b/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-58.png Binary files differindex 1fbb039..0e653cb 100644 --- a/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-58.png +++ b/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-58.png diff --git a/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-60.png b/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-60.png Binary files differindex e7c3960..13f67d9 100644 --- a/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-60.png +++ b/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-60.png diff --git a/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-64.png b/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-64.png Binary files differindex 9f37f06..c168d67 100644 --- a/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-64.png +++ b/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-64.png diff --git a/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-76.png b/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-76.png Binary files differindex 0408826..86bca4b 100644 --- a/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-76.png +++ b/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-76.png diff --git a/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-80.png b/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-80.png Binary files differindex 44083db..d6b31d5 100644 --- a/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-80.png +++ b/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-80.png diff --git a/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-87.png b/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-87.png Binary files differindex c6ca1cf..25fc17d 100644 --- a/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-87.png +++ b/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-87.png diff --git a/iosApp/iosApp/Assets.xcassets/MapBackhoe.imageset/Contents.json b/iosApp/iosApp/Assets.xcassets/MapBackhoe.imageset/Contents.json new file mode 100644 index 0000000..b34dc78 --- /dev/null +++ b/iosApp/iosApp/Assets.xcassets/MapBackhoe.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "backhoe.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/iosApp/iosApp/Assets.xcassets/MapBackhoe.imageset/backhoe.png b/iosApp/iosApp/Assets.xcassets/MapBackhoe.imageset/backhoe.png Binary files differnew file mode 100644 index 0000000..273b57f --- /dev/null +++ b/iosApp/iosApp/Assets.xcassets/MapBackhoe.imageset/backhoe.png diff --git a/iosApp/iosApp/Assets.xcassets/MapCar.imageset/Contents.json b/iosApp/iosApp/Assets.xcassets/MapCar.imageset/Contents.json index 99d7aad..ea6514b 100644 --- a/iosApp/iosApp/Assets.xcassets/MapCar.imageset/Contents.json +++ b/iosApp/iosApp/Assets.xcassets/MapCar.imageset/Contents.json @@ -9,7 +9,7 @@ "scale" : "2x" }, { - "filename" : "car.svg", + "filename" : "car.png", "idiom" : "universal", "scale" : "3x" } diff --git a/iosApp/iosApp/Assets.xcassets/MapCar.imageset/car.png b/iosApp/iosApp/Assets.xcassets/MapCar.imageset/car.png Binary files differnew file mode 100644 index 0000000..0797f17 --- /dev/null +++ b/iosApp/iosApp/Assets.xcassets/MapCar.imageset/car.png diff --git a/iosApp/iosApp/Assets.xcassets/MapCar.imageset/car.svg b/iosApp/iosApp/Assets.xcassets/MapCar.imageset/car.svg deleted file mode 100644 index da5b555..0000000 --- a/iosApp/iosApp/Assets.xcassets/MapCar.imageset/car.svg +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<svg id="svg4145" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="40" width="40" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" viewBox="0 0 40 40"> - <g id="layer1" stroke="#333"> - <path id="background" d="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.3848zm-0.002 3.9434a12.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" stroke-width="1.9" fill="#008000"/> - <path id="icon" d="m15.029 22.296q0.39535-0.39535 0.39535-0.95053t-0.39535-0.95053q-0.396-0.395-0.951-0.395-0.55518 0-0.95053 0.39535t-0.39535 0.95053 0.39535 0.95053 0.95053 0.39535 0.95053-0.39535zm0.69818-3.6423h8.5463l-0.74865-3.003q-0.01682-0.06729-0.11777-0.143-0.10094-0.08412-0.17665-0.08412h-6.4602q-0.07572 0-0.17665 0.08412-0.10095 0.07571-0.11777 0.143l-0.74865 3.003zm11.146 3.6423q0.39535-0.39535 0.39535-0.95053t-0.39535-0.95053q-0.396-0.395-0.951-0.395-0.55518 0-0.95053 0.39535t-0.39535 0.95053 0.39535 0.95053 0.95053 0.39535 0.95053-0.39535zm1.7412-1.7581v3.2301q0 0.11777-0.07571 0.19347-0.07572 0.07571-0.19347 0.07571h-0.80753v1.0767q0 0.67294-0.47106 1.144t-1.144 0.47106-1.144-0.47106-0.47106-1.144v-1.0767h-8.6136v1.0767q0 0.67294-0.47106 1.144t-1.144 0.47106-1.144-0.47106-0.47106-1.144v-1.0767h-0.80753q-0.11777 0-0.19347-0.07571-0.07571-0.07572-0.07571-0.19347v-3.2301q0-0.78229 0.54676-1.3291 0.55518-0.55518 1.3375-0.55518h0.23553l0.88324-3.5245q0.19347-0.7907 0.87482-1.3206 0.68135-0.53835 1.5057-0.53835h6.4602q0.82435 0 1.5057 0.53835 0.68135 0.52994 0.87482 1.3206l0.88323 3.5245h0.23553q0.78229 0 1.3291 0.55518 0.55518 0.54676 0.55518 1.3291z" stroke-width=".1"/> - </g> -</svg> diff --git a/iosApp/iosApp/Assets.xcassets/MapPickup.imageset/Contents.json b/iosApp/iosApp/Assets.xcassets/MapPickup.imageset/Contents.json index 004cfb7..db6022b 100644 --- a/iosApp/iosApp/Assets.xcassets/MapPickup.imageset/Contents.json +++ b/iosApp/iosApp/Assets.xcassets/MapPickup.imageset/Contents.json @@ -9,7 +9,7 @@ "scale" : "2x" }, { - "filename" : "pickup.svg", + "filename" : "pickup.png", "idiom" : "universal", "scale" : "3x" } diff --git a/iosApp/iosApp/Assets.xcassets/MapPickup.imageset/pickup.png b/iosApp/iosApp/Assets.xcassets/MapPickup.imageset/pickup.png Binary files differnew file mode 100644 index 0000000..76abbec --- /dev/null +++ b/iosApp/iosApp/Assets.xcassets/MapPickup.imageset/pickup.png diff --git a/iosApp/iosApp/Assets.xcassets/MapPickup.imageset/pickup.svg b/iosApp/iosApp/Assets.xcassets/MapPickup.imageset/pickup.svg deleted file mode 100644 index 50bf57b..0000000 --- a/iosApp/iosApp/Assets.xcassets/MapPickup.imageset/pickup.svg +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<svg id="svg4145" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="40" width="40" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" viewBox="0 0 40 40"> - <g id="layer1"> - <path id="background" d="m20.002 3.6816-1.1309 3.3906a12.374 12.374 0 0 1 1.1309 -0.0625 12.374 12.374 0 0 1 1.1289 0.056641l-1.129-3.3847zm-0.002 3.9434a12.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" stroke="#333" stroke-width="1.9" fill="#008000"/> - <path id="icon" stroke-width=".88152" d="m17.19 14.711a0.8816 0.8816 0 0 0 -0.68868 0.66114l-0.71623 2.8649h-3.2781c-0.96967 0-1.763 0.79336-1.763 1.763v2.1211c0 0.35261 0.17079 0.62257 0.5234 0.79887l1.2672 0.4683c0.14704 1.0824 1.0477 1.9008 2.1762 1.9008 1.0799 0 1.9462-0.75066 2.1487-1.763h7.1623c0.20247 1.0124 1.0688 1.763 2.1487 1.763 1.157 0 2.0652-0.85999 2.1762-1.9834l0.4683-0.30302c0.26446-0.1763 0.44076-0.52891 0.44076-0.88152v-1.5151c0-0.35261-0.25344-0.68318-0.60604-0.77133l-3.9668-1.3498-2.1762-2.7272-0.0551-0.08264-0.02755 0.02755c-0.44623-0.66103-1.2059-0.99171-1.9008-0.99171h-3.1679a0.8816 0.8816 0 0 0 -0.08265 0 0.8816 0.8816 0 0 0 -0.08264 0zm0.85397 1.763h2.4793c0.33302 0 0.40036 0.03368 0.49585 0.19283a0.8816 0.8816 0 0 0 0.0551 0.08264l1.1845 1.4876h-4.6555l0.44076-1.763zm-3.3332 5.8125c0.44076 0 0.79887 0.35812 0.79887 0.79887 0 0.44076-0.35812 0.79887-0.79887 0.79887-0.44076 0-0.79887-0.35812-0.79887-0.79887 0-0.44076 0.35812-0.79887 0.79887-0.79887zm11.46 0c0.44076 0 0.79887 0.35812 0.79887 0.79887 0 0.44076-0.35812 0.79887-0.79887 0.79887-0.44076 0-0.79887-0.35812-0.79887-0.79887 0-0.44076 0.35812-0.79887 0.79887-0.79887z"/> - </g> -</svg> diff --git a/iosApp/iosApp/Assets.xcassets/MapTractor.imageset/Contents.json b/iosApp/iosApp/Assets.xcassets/MapTractor.imageset/Contents.json index 0774718..b089633 100644 --- a/iosApp/iosApp/Assets.xcassets/MapTractor.imageset/Contents.json +++ b/iosApp/iosApp/Assets.xcassets/MapTractor.imageset/Contents.json @@ -9,7 +9,7 @@ "scale" : "2x" }, { - "filename" : "tractor.svg", + "filename" : "tractor.png", "idiom" : "universal", "scale" : "3x" } diff --git a/iosApp/iosApp/Assets.xcassets/MapTractor.imageset/tractor.png b/iosApp/iosApp/Assets.xcassets/MapTractor.imageset/tractor.png Binary files differnew file mode 100644 index 0000000..a62d467 --- /dev/null +++ b/iosApp/iosApp/Assets.xcassets/MapTractor.imageset/tractor.png diff --git a/iosApp/iosApp/Assets.xcassets/MapTractor.imageset/tractor.svg b/iosApp/iosApp/Assets.xcassets/MapTractor.imageset/tractor.svg deleted file mode 100644 index 96643ef..0000000 --- a/iosApp/iosApp/Assets.xcassets/MapTractor.imageset/tractor.svg +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<svg id="svg4145" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="40" width="40" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" viewBox="0 0 40 40"> - <g id="layer1"> - <path id="background" d="m20.002 3.6816-1.1309 3.3906a12.374 12.374 0 0 1 1.1309 -0.0625 12.374 12.374 0 0 1 1.1289 0.056641l-1.129-3.3847zm-0.002 3.9434a12.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" stroke="#333" stroke-width="1.9" fill="#008000"/> - <path id="icon" stroke-width=".84153" d="m13.105 12.427a0.84162 0.84162 0 0 0 -0.68375 0.84153v5.0492a0.84162 0.84162 0 0 0 0 0.07889v1.8672c0.84153-0.67323 1.8514-1.1045 2.9454-1.1045 2.5246 0 4.6284 2.1038 4.6284 4.6284v0.42077h3.7869c-0.25895 0.34961-0.42077 0.78515-0.42077 1.2623 0 1.1781 0.92569 2.1038 2.1038 2.1038s2.1038-0.92569 2.1038-2.1038c0-0.55373-0.21318-1.0478-0.55226-1.4201 0.49718-0.2262 0.85521-0.67323 0.97302-1.2623l0.42077-2.7087c0.08415-0.42077-0.33661-0.92043-0.84153-0.92043l-7.1267-0.78894-1.3149-5.3122a0.84162 0.84162 0 0 0 -0.81524 -0.63115h-5.0492a0.84162 0.84162 0 0 0 -0.07889 0 0.84162 0.84162 0 0 0 -0.07889 0zm0.99932 1.6831h3.5502l1.0256 4.0499-4.5758-0.49966v-3.5502zm10.098 0v3.6291l1.6831 0.23668v-3.8658h-1.6831zm-8.8361 5.8907c-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.7869zm0 1.2623c1.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.5246zm10.098 3.3661c0.50492 0 0.84154 0.33661 0.84154 0.84154 0 0.50492-0.33661 0.84153-0.84154 0.84153-0.50492 0-0.84153-0.33661-0.84153-0.84153s0.33661-0.84154 0.84153-0.84154z"/> - </g> -</svg> diff --git a/iosApp/iosApp/Assets.xcassets/MapTruck.imageset/Contents.json b/iosApp/iosApp/Assets.xcassets/MapTruck.imageset/Contents.json index c95213a..dc71687 100644 --- a/iosApp/iosApp/Assets.xcassets/MapTruck.imageset/Contents.json +++ b/iosApp/iosApp/Assets.xcassets/MapTruck.imageset/Contents.json @@ -9,7 +9,7 @@ "scale" : "2x" }, { - "filename" : "truck.svg", + "filename" : "camion.png", "idiom" : "universal", "scale" : "3x" } diff --git a/iosApp/iosApp/Assets.xcassets/MapTruck.imageset/camion.png b/iosApp/iosApp/Assets.xcassets/MapTruck.imageset/camion.png Binary files differnew file mode 100644 index 0000000..13ca722 --- /dev/null +++ b/iosApp/iosApp/Assets.xcassets/MapTruck.imageset/camion.png diff --git a/iosApp/iosApp/Assets.xcassets/MapTruck.imageset/truck.svg b/iosApp/iosApp/Assets.xcassets/MapTruck.imageset/truck.svg deleted file mode 100644 index 708744d..0000000 --- a/iosApp/iosApp/Assets.xcassets/MapTruck.imageset/truck.svg +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<svg id="svg4145" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="40" width="40" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" viewBox="0 0 40 40"> - <g id="layer1"> - <path id="background" d="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.3848zm-0.002 3.9434a12.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" stroke="#333" stroke-width="1.9" fill="#008000"/> - <path id="icon" d="m17.031 24.899q0.34603-0.34603 0.34603-0.81955t-0.34603-0.81955-0.81955-0.34603-0.81955 0.34603-0.34603 0.81955 0.34603 0.81955 0.81955 0.34603 0.81955-0.34603zm-3.1507-5.4819h3.4968v-2.3312h-1.4388q-0.11838 0-0.20034 0.08196l-1.7757 1.7757q-0.08196 0.08196-0.08196 0.20033v0.27318zm11.31 5.4819q0.34603-0.34603 0.34603-0.81955t-0.34603-0.81955-0.81955-0.34603-0.81955 0.34603-0.34603 0.81955 0.34603 0.81955 0.81955 0.34603 0.81955-0.34603zm2.6772-10.727v9.3247q0 0.13659-0.03642 0.24587-0.03642 0.10017-0.12749 0.16391-0.08196 0.06375-0.1457 0.10927-0.06374 0.03642-0.21855 0.05463-0.1457 0.0091-0.20034 0.01821-0.05463 0-0.23676 0-0.17302-0.0091-0.20034-0.0091 0 0.96525-0.68296 1.6482-0.68296 0.68296-1.6482 0.68296-0.96525 0-1.6482-0.68296-0.68296-0.68292-0.68296-1.6482h-3.4968q0 0.96525-0.68296 1.6482-0.68296 0.68296-1.6482 0.68296-0.96525 0-1.6482-0.68296-0.68296-0.68296-0.68296-1.6482h-0.58279q-0.02732 0-0.20944 0.0091-0.17302 0-0.22765 0-0.05463-0.0091-0.20944-0.01821-0.1457-0.01821-0.20944-0.05463-0.06375-0.04553-0.1548-0.10927-0.08196-0.06375-0.11838-0.16391-0.03642-0.10927-0.03642-0.24586 0-0.23676 0.17302-0.40978t0.40978-0.17302v-2.914q0-0.07285-0.0091-0.31871 0-0.24587 0-0.34603 0.0091-0.10017 0.02732-0.30961 0.01821-0.21855 0.05463-0.33693 0.04554-0.12749 0.12749-0.28229 0.09106-0.1548 0.20944-0.27318l1.803-1.803q0.17302-0.17302 0.45531-0.2914 0.2914-0.11838 0.53726-0.11838h1.457v-1.7484q0-0.23676 0.17302-0.40978t0.40978-0.17302h9.3247q0.23676 0 0.40978 0.17302t0.17302 0.40978z"/> - </g> -</svg> diff --git a/iosApp/iosApp/Details/Reports/UnitReportsViewModel.swift b/iosApp/iosApp/Details/Reports/UnitReportsViewModel.swift index 5cdf21e..0592f71 100644 --- a/iosApp/iosApp/Details/Reports/UnitReportsViewModel.swift +++ b/iosApp/iosApp/Details/Reports/UnitReportsViewModel.swift @@ -89,7 +89,7 @@ class UnitReportsViewModel: ObservableObject { } } } - @Published var layer = MapLayer.companion.layers[MapLayer.Type_.satellite]! + @Published var layer = MapLayer.companion.layers[MapLayer.Type_.gmapsSatellite]! @Published var markers = [Marker]() @Published var selectedMarker: Marker? = nil diff --git a/iosApp/iosApp/Info.plist b/iosApp/iosApp/Info.plist index da4a45d..bd5287d 100644 --- a/iosApp/iosApp/Info.plist +++ b/iosApp/iosApp/Info.plist @@ -5,7 +5,7 @@ <key>CFBundleDevelopmentRegion</key> <string>$(DEVELOPMENT_LANGUAGE)</string> <key>CFBundleDisplayName</key> - <string>TrackerMap</string> + <string>ETBSA</string> <key>CFBundleExecutable</key> <string>$(EXECUTABLE_NAME)</string> <key>CFBundleIdentifier</key> @@ -19,9 +19,15 @@ <key>CFBundleShortVersionString</key> <string>$(MARKETING_VERSION)</string> <key>CFBundleVersion</key> - <string>1</string> + <string>$(CURRENT_PROJECT_VERSION)</string> <key>LSRequiresIPhoneOS</key> <true/> + <key>NSLocationAlwaysAndWhenInUseUsageDescription</key> + <string>Su ubicación no es necesaria. Este permiso es solicitado por un tercero. Favor de rechazarlo.</string> + <key>NSLocationAlwaysUsageDescription</key> + <string>Su ubicación no es necesaria. Este permiso es solicitado por un tercero. Favor de rechazarlo.</string> + <key>NSLocationWhenInUseUsageDescription</key> + <string>Su ubicación no es necesaria. Este permiso es solicitado por un tercero. Favor de rechazarlo.</string> <key>UIApplicationSceneManifest</key> <dict> <key>UIApplicationSupportsMultipleScenes</key> diff --git a/iosApp/iosApp/Session/AboutView.swift b/iosApp/iosApp/Session/AboutView.swift index 7e5325b..1f0c4c7 100644 --- a/iosApp/iosApp/Session/AboutView.swift +++ b/iosApp/iosApp/Session/AboutView.swift @@ -26,16 +26,6 @@ struct AboutView: View { } Button { - if let url = URL(string: NSLocalizedString("app-source-code", comment: "")) { - if UIApplication.shared.canOpenURL(url) { - UIApplication.shared.open(url, options: [:]) - } - } - } label: { - Label("source-code", systemImage: "chevron.left.forwardslash.chevron.right") - } - - Button { if let url = URL(string: NSLocalizedString("app-website", comment: "")) { if UIApplication.shared.canOpenURL(url) { UIApplication.shared.open(url, options: [:]) diff --git a/iosApp/iosApp/Session/AccountView.swift b/iosApp/iosApp/Session/AccountView.swift index 4ca453a..fae3d6e 100644 --- a/iosApp/iosApp/Session/AccountView.swift +++ b/iosApp/iosApp/Session/AccountView.swift @@ -53,7 +53,7 @@ struct AccountView: View { Text("server-url") Spacer() Text(server).foregroundColor(.secondaryLabel) - } + }.visible(false) } } diff --git a/iosApp/iosApp/Session/RootView.swift b/iosApp/iosApp/Session/RootView.swift index 297a2aa..960187a 100644 --- a/iosApp/iosApp/Session/RootView.swift +++ b/iosApp/iosApp/Session/RootView.swift @@ -107,8 +107,10 @@ struct LoginForm: View { #if os(macOS) FormTextField(title: "server-url", text: $server) + .visible(false) #else FormTextField(title: "server-url", text: $server, keyboardType: .URL) + .visible(false) #endif } } diff --git a/iosApp/iosApp/Shared/MarkerTransformations.swift b/iosApp/iosApp/Shared/MarkerTransformations.swift index 1e51907..7291a58 100644 --- a/iosApp/iosApp/Shared/MarkerTransformations.swift +++ b/iosApp/iosApp/Shared/MarkerTransformations.swift @@ -24,6 +24,7 @@ class MarkerTransformations { switch markerType { case .animal: imageName = "MapAnimal" case .bicycle: imageName = "MapBicycle" + case .backhoe: imageName = "MapBackhoe" case .boat: imageName = "MapBoat" case .bus: imageName = "MapBus" case .car: imageName = "MapCar" diff --git a/iosApp/iosApp/Units/UnitsView.swift b/iosApp/iosApp/Units/UnitsView.swift index c14ae43..7ddf5aa 100644 --- a/iosApp/iosApp/Units/UnitsView.swift +++ b/iosApp/iosApp/Units/UnitsView.swift @@ -58,8 +58,10 @@ struct UnitsView: View { Picker (selection: $unitsViewModel.mapLayerType, label: Text("map-layer")) { Text("openstreetmap") .tag(MapLayer.companion.layers[MapLayer.Type_.streets]!) - Text("satellite") - .tag(MapLayer.companion.layers[MapLayer.Type_.satellite]!) + Text("gmaps-streets") + .tag(MapLayer.companion.layers[MapLayer.Type_.gmapsStreets]!) + Text("gmaps-satellite") + .tag(MapLayer.companion.layers[MapLayer.Type_.gmapsSatellite]!) } } label: { Image(systemName: "square.stack.3d.up") diff --git a/iosApp/iosApp/en.lproj/Localizable.strings b/iosApp/iosApp/en.lproj/Localizable.strings index ca1c3b8..0959a1f 100644 --- a/iosApp/iosApp/en.lproj/Localizable.strings +++ b/iosApp/iosApp/en.lproj/Localizable.strings @@ -15,9 +15,9 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -"app-name" = "TrackerMap"; -"app-server-url" = "https://gps.trackermap.mx/api"; -"app-website" = "https://trackermap.mx"; +"app-name" = "ETBSA"; +"app-server-url" = "https://etbsa.net/api"; +"app-website" = "http://etbsa.com.mx/"; "app-source-code" = "https://git.sr.ht/~avalos/trackermap-mobile"; "loading" = "Loading"; @@ -39,7 +39,8 @@ "map-layer" = "Map layer"; "openstreetmap" = "OpenStreetMap"; -"satellite" = "Satellite"; +"gmaps-streets" = "Google Streets"; +"gmaps-satellite" = "Google Satellite"; "contact" = "Contact"; "unique-id" = "Unique ID"; @@ -104,7 +105,7 @@ "admin" = "Administrator"; "signout" = "Sign out"; -"about-text" = "TrackerMap is a free (as in freedom) software app for tracking and managing GPS devices in Traccar servers.\n\nTrackerMap source code is licensed under the GNU General Public License Version 3."; +"about-text" = "ETBSA Tracker is an app for tracking and managing GPS devices."; "version" = "Version"; "website" = "Website"; "source-code" = "Source code"; diff --git a/iosApp/iosApp/es-419.lproj/Localizable.strings b/iosApp/iosApp/es-419.lproj/Localizable.strings index 146da98..52267cc 100644 --- a/iosApp/iosApp/es-419.lproj/Localizable.strings +++ b/iosApp/iosApp/es-419.lproj/Localizable.strings @@ -15,9 +15,9 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -"app-name" = "TrackerMap"; -"app-server-url" = "https://gps.trackermap.mx/api"; -"app-website" = "https://trackermap.mx"; +"app-name" = "ETBSA"; +"app-server-url" = "https://etbsa.net/api"; +"app-website" = "http://etbsa.com.mx/"; "app-source-code" = "https://git.sr.ht/~avalos/trackermap-mobile"; "loading" = "Cargando"; @@ -39,7 +39,8 @@ "map-layer" = "Capa del mapa"; "openstreetmap" = "OpenStreetMap"; -"satellite" = "Satélite"; +"gmaps-streets" = "Google Calles"; +"gmaps-satellite" = "Google Satélite"; "contact" = "Contacto"; "unique-id" = "ID único"; @@ -104,7 +105,7 @@ "admin" = "Administrador"; "signout" = "Cerrar sesión"; -"about-text" = "TrackerMap es una aplicación de software libre para rastrear y gestionar dispositivos GPS en servidores de Traccar.\n\nEl código fuente de TrackerMap está disponible bajo la licencia GNU General Public License versión 3."; +"about-text" = "ETBSA Tracker es una aplicación para rastrear y gestionar unidades GPS."; "version" = "Versión"; "website" = "Sitio web"; "source-code" = "Código fuente"; diff --git a/settings.gradle.kts b/settings.gradle.kts index f9dbd2f..c63c782 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -6,6 +6,6 @@ pluginManagement { } } -rootProject.name = "TrackerMap" +rootProject.name = "ETBSA TrackerMap" include(":androidApp") include(":shared")
\ No newline at end of file diff --git a/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/client/models/MapLayer.kt b/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/client/models/MapLayer.kt index 3266c0b..7bb41ae 100644 --- a/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/client/models/MapLayer.kt +++ b/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/client/models/MapLayer.kt @@ -25,7 +25,8 @@ data class MapLayer( ) { enum class Type { STREETS, - SATELLITE + GMAPS_STREETS, + GMAPS_SATELLITE } companion object { @@ -36,11 +37,17 @@ data class MapLayer( maxZoom = 23, attribution = "© OpenStreetMap France | © <a href=\"https://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors" ), - Type.SATELLITE to MapLayer( - url = "https://server.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer/tile/{z}/{y}/{x}", + Type.GMAPS_STREETS to MapLayer( + url = "https://mt0.google.com/vt/lyrs=m&hl=en&x={x}&y={y}&z={z}&s=Ga", minZoom = 1, - maxZoom = 20, - attribution = "Tiles © Esri — Source: Esri, i-cubed, USDA, USGS, AEX, GeoEye, Getmapping, Aerogrid, IGN, IGP, UPR-EGP, and the GIS User Community" + maxZoom = 23, + attribution = "© Google" + ), + Type.GMAPS_SATELLITE to MapLayer( + url = "https://mt0.google.com/vt/lyrs=y&hl=en&x={x}&y={y}&z={z}&s=Ga", + minZoom = 1, + maxZoom = 23, + attribution = "© Google" ) ) diff --git a/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/client/models/Marker.kt b/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/client/models/Marker.kt index ff3fb29..2145409 100644 --- a/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/client/models/Marker.kt +++ b/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/client/models/Marker.kt @@ -26,7 +26,7 @@ data class Marker( val type: Type = Type.DEFAULT ) { enum class Type { - ANIMAL, BICYCLE, BOAT, BUS, CAR, CRANE, DEFAULT, HELICOPTER, MOTORCYCLE, OFFROAD, PERSON, + ANIMAL, BACKHOE, BICYCLE, BOAT, BUS, CAR, CRANE, DEFAULT, HELICOPTER, MOTORCYCLE, OFFROAD, PERSON, PICKUP, PLANE, SCOOTER, SHIP, TRACTOR, TRAIN, TRAM, TROLLEYBUS, TRUCK, VAN, REPORT_POSITION, REPORT_START, REPORT_END |
