aboutsummaryrefslogtreecommitdiff
path: root/iosApp
diff options
context:
space:
mode:
Diffstat (limited to 'iosApp')
-rw-r--r--iosApp/iosApp.xcodeproj/project.pbxproj14
-rw-r--r--iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-1024.pngbin63957 -> 49831 bytes
-rw-r--r--iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-120.pngbin6715 -> 5065 bytes
-rw-r--r--iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-128.pngbin7245 -> 5485 bytes
-rw-r--r--iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-152.pngbin8725 -> 6474 bytes
-rw-r--r--iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-16.pngbin655 -> 700 bytes
-rw-r--r--iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-167.pngbin9663 -> 7147 bytes
-rw-r--r--iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-180.pngbin10482 -> 7741 bytes
-rw-r--r--iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-20.pngbin839 -> 885 bytes
-rw-r--r--iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-256.pngbin15765 -> 11838 bytes
-rw-r--r--iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-29.pngbin1327 -> 1344 bytes
-rw-r--r--iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-32.pngbin1435 -> 1424 bytes
-rw-r--r--iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-40.pngbin1895 -> 1843 bytes
-rw-r--r--iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-512.pngbin36087 -> 27306 bytes
-rw-r--r--iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-58.pngbin2897 -> 2469 bytes
-rw-r--r--iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-60.pngbin2963 -> 2629 bytes
-rw-r--r--iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-64.pngbin3273 -> 2845 bytes
-rw-r--r--iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-76.pngbin3989 -> 3370 bytes
-rw-r--r--iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-80.pngbin4250 -> 3490 bytes
-rw-r--r--iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-87.pngbin4706 -> 3843 bytes
-rw-r--r--iosApp/iosApp/Assets.xcassets/MapBackhoe.imageset/Contents.json21
-rw-r--r--iosApp/iosApp/Assets.xcassets/MapBackhoe.imageset/backhoe.pngbin0 -> 150858 bytes
-rw-r--r--iosApp/iosApp/Assets.xcassets/MapCar.imageset/Contents.json2
-rw-r--r--iosApp/iosApp/Assets.xcassets/MapCar.imageset/car.pngbin0 -> 134339 bytes
-rw-r--r--iosApp/iosApp/Assets.xcassets/MapCar.imageset/car.svg7
-rw-r--r--iosApp/iosApp/Assets.xcassets/MapPickup.imageset/Contents.json2
-rw-r--r--iosApp/iosApp/Assets.xcassets/MapPickup.imageset/pickup.pngbin0 -> 87502 bytes
-rw-r--r--iosApp/iosApp/Assets.xcassets/MapPickup.imageset/pickup.svg7
-rw-r--r--iosApp/iosApp/Assets.xcassets/MapTractor.imageset/Contents.json2
-rw-r--r--iosApp/iosApp/Assets.xcassets/MapTractor.imageset/tractor.pngbin0 -> 171258 bytes
-rw-r--r--iosApp/iosApp/Assets.xcassets/MapTractor.imageset/tractor.svg7
-rw-r--r--iosApp/iosApp/Assets.xcassets/MapTruck.imageset/Contents.json2
-rw-r--r--iosApp/iosApp/Assets.xcassets/MapTruck.imageset/camion.pngbin0 -> 182128 bytes
-rw-r--r--iosApp/iosApp/Assets.xcassets/MapTruck.imageset/truck.svg7
-rw-r--r--iosApp/iosApp/Details/Reports/UnitReportsViewModel.swift2
-rw-r--r--iosApp/iosApp/Info.plist10
-rw-r--r--iosApp/iosApp/Session/AboutView.swift10
-rw-r--r--iosApp/iosApp/Session/AccountView.swift2
-rw-r--r--iosApp/iosApp/Session/RootView.swift2
-rw-r--r--iosApp/iosApp/Shared/MarkerTransformations.swift1
-rw-r--r--iosApp/iosApp/Units/UnitsView.swift6
-rw-r--r--iosApp/iosApp/en.lproj/Localizable.strings11
-rw-r--r--iosApp/iosApp/es-419.lproj/Localizable.strings11
43 files changed, 62 insertions, 64 deletions
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
index 7c53b0c..bd82b68 100644
--- a/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-1024.png
+++ b/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-1024.png
Binary files differ
diff --git a/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-120.png b/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-120.png
index a4743e4..78c399e 100644
--- a/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-120.png
+++ b/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-120.png
Binary files differ
diff --git a/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-128.png b/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-128.png
index 25cdaa0..12c4926 100644
--- a/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-128.png
+++ b/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-128.png
Binary files differ
diff --git a/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-152.png b/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-152.png
index 5987065..e2f96ea 100644
--- a/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-152.png
+++ b/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-152.png
Binary files differ
diff --git a/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-16.png b/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-16.png
index b43c1b2..5464ecc 100644
--- a/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-16.png
+++ b/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-16.png
Binary files differ
diff --git a/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-167.png b/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-167.png
index af7bcd5..6502a54 100644
--- a/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-167.png
+++ b/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-167.png
Binary files differ
diff --git a/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-180.png b/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-180.png
index 4d85db7..4cd91b9 100644
--- a/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-180.png
+++ b/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-180.png
Binary files differ
diff --git a/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-20.png b/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-20.png
index bf72c03..999ea06 100644
--- a/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-20.png
+++ b/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-20.png
Binary files differ
diff --git a/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-256.png b/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-256.png
index 54a55e4..e1bdc94 100644
--- a/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-256.png
+++ b/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-256.png
Binary files differ
diff --git a/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-29.png b/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-29.png
index d33b7b0..7bd88e0 100644
--- a/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-29.png
+++ b/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-29.png
Binary files differ
diff --git a/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-32.png b/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-32.png
index c81e46d..e1def7e 100644
--- a/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-32.png
+++ b/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-32.png
Binary files differ
diff --git a/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-40.png b/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-40.png
index b9ecaf2..b2a5e21 100644
--- a/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-40.png
+++ b/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-40.png
Binary files differ
diff --git a/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-512.png b/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-512.png
index 3895874..df6e0ce 100644
--- a/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-512.png
+++ b/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-512.png
Binary files differ
diff --git a/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-58.png b/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-58.png
index 1fbb039..0e653cb 100644
--- a/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-58.png
+++ b/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-58.png
Binary files differ
diff --git a/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-60.png b/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-60.png
index e7c3960..13f67d9 100644
--- a/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-60.png
+++ b/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-60.png
Binary files differ
diff --git a/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-64.png b/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-64.png
index 9f37f06..c168d67 100644
--- a/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-64.png
+++ b/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-64.png
Binary files differ
diff --git a/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-76.png b/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-76.png
index 0408826..86bca4b 100644
--- a/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-76.png
+++ b/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-76.png
Binary files differ
diff --git a/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-80.png b/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-80.png
index 44083db..d6b31d5 100644
--- a/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-80.png
+++ b/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-80.png
Binary files differ
diff --git a/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-87.png b/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-87.png
index c6ca1cf..25fc17d 100644
--- a/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-87.png
+++ b/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-87.png
Binary files differ
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
new file mode 100644
index 0000000..273b57f
--- /dev/null
+++ b/iosApp/iosApp/Assets.xcassets/MapBackhoe.imageset/backhoe.png
Binary files differ
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
new file mode 100644
index 0000000..0797f17
--- /dev/null
+++ b/iosApp/iosApp/Assets.xcassets/MapCar.imageset/car.png
Binary files differ
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
new file mode 100644
index 0000000..76abbec
--- /dev/null
+++ b/iosApp/iosApp/Assets.xcassets/MapPickup.imageset/pickup.png
Binary files differ
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
new file mode 100644
index 0000000..a62d467
--- /dev/null
+++ b/iosApp/iosApp/Assets.xcassets/MapTractor.imageset/tractor.png
Binary files differ
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
new file mode 100644
index 0000000..13ca722
--- /dev/null
+++ b/iosApp/iosApp/Assets.xcassets/MapTruck.imageset/camion.png
Binary files differ
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";