From 7713da08539c360f65bdf9962726e162e1e01b0c Mon Sep 17 00:00:00 2001 From: Iván Ávalos Date: Thu, 17 Feb 2022 21:16:19 -0600 Subject: Branded iOS app --- iosApp/iosApp.xcodeproj/project.pbxproj | 4 ++-- .../AppIcon.appiconset/icon-1024.png | Bin 63957 -> 49831 bytes .../AppIcon.appiconset/icon-120.png | Bin 6715 -> 5065 bytes .../AppIcon.appiconset/icon-128.png | Bin 7245 -> 5485 bytes .../AppIcon.appiconset/icon-152.png | Bin 8725 -> 6474 bytes .../Assets.xcassets/AppIcon.appiconset/icon-16.png | Bin 655 -> 700 bytes .../AppIcon.appiconset/icon-167.png | Bin 9663 -> 7147 bytes .../AppIcon.appiconset/icon-180.png | Bin 10482 -> 7741 bytes .../Assets.xcassets/AppIcon.appiconset/icon-20.png | Bin 839 -> 885 bytes .../AppIcon.appiconset/icon-256.png | Bin 15765 -> 11838 bytes .../Assets.xcassets/AppIcon.appiconset/icon-29.png | Bin 1327 -> 1344 bytes .../Assets.xcassets/AppIcon.appiconset/icon-32.png | Bin 1435 -> 1424 bytes .../Assets.xcassets/AppIcon.appiconset/icon-40.png | Bin 1895 -> 1843 bytes .../AppIcon.appiconset/icon-512.png | Bin 36087 -> 27306 bytes .../Assets.xcassets/AppIcon.appiconset/icon-58.png | Bin 2897 -> 2469 bytes .../Assets.xcassets/AppIcon.appiconset/icon-60.png | Bin 2963 -> 2629 bytes .../Assets.xcassets/AppIcon.appiconset/icon-64.png | Bin 3273 -> 2845 bytes .../Assets.xcassets/AppIcon.appiconset/icon-76.png | Bin 3989 -> 3370 bytes .../Assets.xcassets/AppIcon.appiconset/icon-80.png | Bin 4250 -> 3490 bytes .../Assets.xcassets/AppIcon.appiconset/icon-87.png | Bin 4706 -> 3843 bytes .../MapBackhoe.imageset/Contents.json | 21 +++++++++++++++++++++ .../MapBackhoe.imageset/backhoe.png | Bin 0 -> 150858 bytes .../Assets.xcassets/MapCar.imageset/Contents.json | 2 +- .../iosApp/Assets.xcassets/MapCar.imageset/car.png | Bin 0 -> 134339 bytes .../iosApp/Assets.xcassets/MapCar.imageset/car.svg | 7 ------- .../MapPickup.imageset/Contents.json | 2 +- .../Assets.xcassets/MapPickup.imageset/pickup.png | Bin 0 -> 87502 bytes .../Assets.xcassets/MapPickup.imageset/pickup.svg | 7 ------- .../MapTractor.imageset/Contents.json | 2 +- .../MapTractor.imageset/tractor.png | Bin 0 -> 171258 bytes .../MapTractor.imageset/tractor.svg | 7 ------- .../MapTruck.imageset/Contents.json | 2 +- .../Assets.xcassets/MapTruck.imageset/camion.png | Bin 0 -> 182128 bytes .../Assets.xcassets/MapTruck.imageset/truck.svg | 7 ------- iosApp/iosApp/Info.plist | 10 +++++----- iosApp/iosApp/Session/AboutView.swift | 10 ---------- iosApp/iosApp/Session/AccountView.swift | 2 +- iosApp/iosApp/Session/RootView.swift | 2 ++ iosApp/iosApp/Shared/MarkerTransformations.swift | 1 + iosApp/iosApp/Units/UnitsView.swift | 6 ++++-- iosApp/iosApp/en.lproj/Localizable.strings | 11 ++++++----- iosApp/iosApp/es-419.lproj/Localizable.strings | 11 ++++++----- .../trackermap/TrackerMap/client/models/Marker.kt | 2 +- 43 files changed, 53 insertions(+), 63 deletions(-) create mode 100644 iosApp/iosApp/Assets.xcassets/MapBackhoe.imageset/Contents.json create mode 100644 iosApp/iosApp/Assets.xcassets/MapBackhoe.imageset/backhoe.png create mode 100644 iosApp/iosApp/Assets.xcassets/MapCar.imageset/car.png delete mode 100644 iosApp/iosApp/Assets.xcassets/MapCar.imageset/car.svg create mode 100644 iosApp/iosApp/Assets.xcassets/MapPickup.imageset/pickup.png delete mode 100644 iosApp/iosApp/Assets.xcassets/MapPickup.imageset/pickup.svg create mode 100644 iosApp/iosApp/Assets.xcassets/MapTractor.imageset/tractor.png delete mode 100644 iosApp/iosApp/Assets.xcassets/MapTractor.imageset/tractor.svg create mode 100644 iosApp/iosApp/Assets.xcassets/MapTruck.imageset/camion.png delete mode 100644 iosApp/iosApp/Assets.xcassets/MapTruck.imageset/truck.svg diff --git a/iosApp/iosApp.xcodeproj/project.pbxproj b/iosApp/iosApp.xcodeproj/project.pbxproj index 9bd7b9a..addb554 100644 --- a/iosApp/iosApp.xcodeproj/project.pbxproj +++ b/iosApp/iosApp.xcodeproj/project.pbxproj @@ -559,7 +559,7 @@ "-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 = ""; @@ -595,7 +595,7 @@ "-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 = ""; 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 Binary files a/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-1024.png and b/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-1024.png 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 Binary files a/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-120.png and b/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-120.png 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 Binary files a/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-128.png and b/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-128.png 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 Binary files a/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-152.png and b/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-152.png 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 Binary files a/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-16.png and b/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-16.png 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 Binary files a/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-167.png and b/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-167.png 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 Binary files a/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-180.png and b/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-180.png 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 Binary files a/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-20.png and b/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-20.png 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 Binary files a/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-256.png and b/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-256.png 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 Binary files a/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-29.png and b/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-29.png 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 Binary files a/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-32.png and b/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-32.png 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 Binary files a/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-40.png and b/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-40.png 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 Binary files a/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-512.png and b/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-512.png 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 Binary files a/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-58.png and b/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-58.png 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 Binary files a/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-60.png and b/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-60.png 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 Binary files a/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-64.png and b/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-64.png 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 Binary files a/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-76.png and b/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-76.png 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 Binary files a/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-80.png and b/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-80.png 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 Binary files a/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-87.png and b/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/icon-87.png 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 Binary files /dev/null and b/iosApp/iosApp/Assets.xcassets/MapBackhoe.imageset/backhoe.png 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 Binary files /dev/null and b/iosApp/iosApp/Assets.xcassets/MapCar.imageset/car.png 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 @@ - - - - - - - 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 Binary files /dev/null and b/iosApp/iosApp/Assets.xcassets/MapPickup.imageset/pickup.png 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 @@ - - - - - - - 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 Binary files /dev/null and b/iosApp/iosApp/Assets.xcassets/MapTractor.imageset/tractor.png 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 @@ - - - - - - - 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 Binary files /dev/null and b/iosApp/iosApp/Assets.xcassets/MapTruck.imageset/camion.png 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 @@ - - - - - - - diff --git a/iosApp/iosApp/Info.plist b/iosApp/iosApp/Info.plist index bf9db74..6ea961a 100644 --- a/iosApp/iosApp/Info.plist +++ b/iosApp/iosApp/Info.plist @@ -4,12 +4,8 @@ CFBundleDevelopmentRegion $(DEVELOPMENT_LANGUAGE) - UIBackgroundModes - - remote-notification - CFBundleDisplayName - TrackerMap + ETBSA CFBundleExecutable $(EXECUTABLE_NAME) CFBundleIdentifier @@ -31,6 +27,10 @@ UIApplicationSupportsMultipleScenes + UIBackgroundModes + + remote-notification + UILaunchScreen UIRequiredDeviceCapabilities 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 @@ -25,16 +25,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) { 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 2e71980..6291823 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 a91511e..2d51f53 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 392bc1c..ae8a3b2 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 . */ -"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" = "https://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"; @@ -62,7 +63,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 401582e..0eebe07 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 . */ -"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" = "https://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"; @@ -62,7 +63,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/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 -- cgit v1.2.3