aboutsummaryrefslogtreecommitdiff
path: root/iosApp
diff options
context:
space:
mode:
Diffstat (limited to 'iosApp')
-rw-r--r--iosApp/iosApp.xcodeproj/project.pbxproj13
-rw-r--r--iosApp/iosApp.xcodeproj/xcshareddata/xcschemes/iosApp.xcscheme2
-rw-r--r--iosApp/iosApp/Map/MapViewController.swift12
-rw-r--r--iosApp/iosApp/Map/UnitMapView.swift4
-rw-r--r--iosApp/iosApp/Session/RootView.swift8
5 files changed, 25 insertions, 14 deletions
diff --git a/iosApp/iosApp.xcodeproj/project.pbxproj b/iosApp/iosApp.xcodeproj/project.pbxproj
index 28bf50a..2ba44a3 100644
--- a/iosApp/iosApp.xcodeproj/project.pbxproj
+++ b/iosApp/iosApp.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
- objectVersion = 52;
+ objectVersion = 53;
objects = {
/* Begin PBXBuildFile section */
@@ -66,14 +66,14 @@
name = "Embed Frameworks";
runOnlyForDeploymentPostprocessing = 0;
};
- E3B5741D27F6A3C70018AFCF /* Embed App Extensions */ = {
+ E3B5741D27F6A3C70018AFCF /* Embed Foundation Extensions */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
dstPath = "";
dstSubfolderSpec = 13;
files = (
);
- name = "Embed App Extensions";
+ name = "Embed Foundation Extensions";
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXCopyFilesBuildPhase section */
@@ -306,7 +306,7 @@
7555FF78242A565900829871 /* Frameworks */,
7555FF79242A565900829871 /* Resources */,
E33A236F27A7545500DD647F /* Embed Frameworks */,
- E3B5741D27F6A3C70018AFCF /* Embed App Extensions */,
+ E3B5741D27F6A3C70018AFCF /* Embed Foundation Extensions */,
);
buildRules = (
);
@@ -329,8 +329,9 @@
7555FF73242A565900829871 /* Project object */ = {
isa = PBXProject;
attributes = {
+ BuildIndependentTargetsInParallel = YES;
LastSwiftUpdateCheck = 1320;
- LastUpgradeCheck = 1130;
+ LastUpgradeCheck = 1430;
ORGANIZATIONNAME = orgName;
TargetAttributes = {
7555FF7A242A565900829871 = {
@@ -460,6 +461,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
+ CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_ANALYZER_NONNULL = YES;
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
@@ -521,6 +523,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
+ CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_ANALYZER_NONNULL = YES;
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
diff --git a/iosApp/iosApp.xcodeproj/xcshareddata/xcschemes/iosApp.xcscheme b/iosApp/iosApp.xcodeproj/xcshareddata/xcschemes/iosApp.xcscheme
index 5b29c0a..9ece2b5 100644
--- a/iosApp/iosApp.xcodeproj/xcshareddata/xcschemes/iosApp.xcscheme
+++ b/iosApp/iosApp.xcodeproj/xcshareddata/xcschemes/iosApp.xcscheme
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
- LastUpgradeVersion = "1320"
+ LastUpgradeVersion = "1430"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
diff --git a/iosApp/iosApp/Map/MapViewController.swift b/iosApp/iosApp/Map/MapViewController.swift
index c7bc91d..a320781 100644
--- a/iosApp/iosApp/Map/MapViewController.swift
+++ b/iosApp/iosApp/Map/MapViewController.swift
@@ -311,14 +311,14 @@ class OurMaplyViewController: MaplyViewController {
"features": [
[
"type": "Feature",
- "properties": [],
+ "properties": [] as [Any],
"geometry": [
"type": "LineString",
"coordinates": markers.map({ marker in
[marker.longitude, marker.latitude]
})
- ]
- ]
+ ] as [String : Any]
+ ] as [String : Any]
]
]
if let vector = MaplyVectorObject(fromGeoJSONDictionary: geoJSON) {
@@ -375,7 +375,7 @@ class OurMaplyViewController: MaplyViewController {
"features": [
[
"type": "Feature",
- "properties": [],
+ "properties": [] as [Any],
"geometry": [
"type": "Polygon",
"coordinates": [
@@ -383,8 +383,8 @@ class OurMaplyViewController: MaplyViewController {
[coordinate.y, coordinate.x]
}
]
- ]
- ]
+ ] as [String : Any]
+ ] as [String : Any]
]
]
if let vector = MaplyVectorObject(fromGeoJSONDictionary: geoJSON) {
diff --git a/iosApp/iosApp/Map/UnitMapView.swift b/iosApp/iosApp/Map/UnitMapView.swift
index 5a1e2f0..8444e36 100644
--- a/iosApp/iosApp/Map/UnitMapView.swift
+++ b/iosApp/iosApp/Map/UnitMapView.swift
@@ -27,7 +27,9 @@ struct UnitMapView: View {
markers: $unitsViewModel.markers,
geofences: $unitsViewModel.flatGeofences,
selected: $unitsViewModel.selectedMarker,
- markerCallback: unitsViewModel.selectUnitWith)
+ markerCallback: { p1, p2 in
+ unitsViewModel.selectUnitWith(position: p1, switchToMap: p2)
+ })
if let unit = unitsViewModel.selectedUnit {
VStack {
DeviceRow(unit: unit, callback: { action in
diff --git a/iosApp/iosApp/Session/RootView.swift b/iosApp/iosApp/Session/RootView.swift
index d4f28f5..beb8f11 100644
--- a/iosApp/iosApp/Session/RootView.swift
+++ b/iosApp/iosApp/Session/RootView.swift
@@ -54,7 +54,13 @@ struct RootView: View {
LoginContentView(username: $username,
password: $password,
server: $server,
- onLogin: rootViewModel.login)
+ onLogin: { username, password, server in
+ rootViewModel.login(
+ username: username,
+ password: password,
+ url: server
+ )
+ })
}
}
}