From 9af0a3aa648aade55e347bf868cde409e560bbce Mon Sep 17 00:00:00 2001 From: Mark Dostal Date: Thu, 18 Oct 2018 11:59:04 -0500 Subject: [PATCH 1/4] fix pathname to framework --- Examples/ArcGISToolkitExamples.xcodeproj/project.pbxproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Examples/ArcGISToolkitExamples.xcodeproj/project.pbxproj b/Examples/ArcGISToolkitExamples.xcodeproj/project.pbxproj index f13c52cf..e92730f1 100644 --- a/Examples/ArcGISToolkitExamples.xcodeproj/project.pbxproj +++ b/Examples/ArcGISToolkitExamples.xcodeproj/project.pbxproj @@ -71,7 +71,7 @@ 883904451DF6022A001F3188 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 883904481DF6022A001F3188 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; 8839044A1DF6022A001F3188 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 883904501DF60296001F3188 /* ArcGIS.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ArcGIS.framework; path = "~/Library/SDKs/ArcGIS/iOS/Frameworks/Dynamic/ArcGIS.framework"; sourceTree = ""; }; + 883904501DF60296001F3188 /* ArcGIS.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ArcGIS.framework; path = "$HOME/Library/SDKs/ArcGIS/iOS/Frameworks/Dynamic/ArcGIS.framework"; sourceTree = ""; }; 88B6899F1E96E9AB00B67FAB /* ArcGISToolkit.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = ArcGISToolkit.xcodeproj; path = ../Toolkit/ArcGISToolkit.xcodeproj; sourceTree = ""; }; 88B689BE1E96EDF400B67FAB /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 88B689BF1E96EDF400B67FAB /* ExamplesViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ExamplesViewController.swift; sourceTree = ""; }; From a7018fcfaa8cdfacfeb4323ba7ce7bd24542482e Mon Sep 17 00:00:00 2001 From: Mark Dostal Date: Thu, 18 Oct 2018 13:22:14 -0500 Subject: [PATCH 2/4] Fix LogoView height in measure toolbar --- Examples/ArcGISToolkitExamples/MeasureExample.swift | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/Examples/ArcGISToolkitExamples/MeasureExample.swift b/Examples/ArcGISToolkitExamples/MeasureExample.swift index 5dce6fa9..d28b9912 100644 --- a/Examples/ArcGISToolkitExamples/MeasureExample.swift +++ b/Examples/ArcGISToolkitExamples/MeasureExample.swift @@ -46,14 +46,7 @@ class MeasureExample: MapViewController{ super.viewDidLayoutSubviews() // update content inset for mapview - let tbHeight = measureToolbar.frame.height - - if #available(iOS 11.0, *) { - mapView.contentInset = UIEdgeInsetsMake(0, 0, view.safeAreaInsets.bottom + tbHeight, 0) - } - else{ - mapView.contentInset = UIEdgeInsetsMake(0, 0, tbHeight, 0) - } + mapView.contentInset = UIEdgeInsetsMake(0, 0, measureToolbar.frame.height, 0) } override func didReceiveMemoryWarning() { From 0af968b1ed4fc5cbff8337af3874d8971deb173e Mon Sep 17 00:00:00 2001 From: Mark Dostal Date: Thu, 18 Oct 2018 13:27:13 -0500 Subject: [PATCH 3/4] Update required SDK version to 100.4.0 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 1d4beb1f..27597577 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ Toolkit components that will simplify your iOS app development with ArcGIS Runti * [TimeSlider](Documentation/TimeSlider) ## Requirements -* [ArcGIS Runtime SDK for iOS](https://developers.arcgis.com/en/ios/) 100.3.0 (or higher) +* [ArcGIS Runtime SDK for iOS](https://developers.arcgis.com/en/ios/) 100.4.0 (or higher) * Xcode 9.3 (or higher) * Apple iOS SDK 10 (or higher) From cda89251082f2306432df0af6c245538624f2dec Mon Sep 17 00:00:00 2001 From: Philip Ridgeway Date: Thu, 18 Oct 2018 14:04:16 -0500 Subject: [PATCH 4/4] Update Examples/ArcGISToolkitExamples/MeasureExample.swift --- Examples/ArcGISToolkitExamples/MeasureExample.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Examples/ArcGISToolkitExamples/MeasureExample.swift b/Examples/ArcGISToolkitExamples/MeasureExample.swift index d28b9912..b4246d9c 100644 --- a/Examples/ArcGISToolkitExamples/MeasureExample.swift +++ b/Examples/ArcGISToolkitExamples/MeasureExample.swift @@ -46,7 +46,7 @@ class MeasureExample: MapViewController{ super.viewDidLayoutSubviews() // update content inset for mapview - mapView.contentInset = UIEdgeInsetsMake(0, 0, measureToolbar.frame.height, 0) + mapView.contentInset = UIEdgeInsets(top: 0, left: 0, bottom: measureToolbar.frame.height, right: 0) } override func didReceiveMemoryWarning() {