Skip to content

Commit

Permalink
Merge pull request #46 from Esri/mhd/Release_fixes
Browse files Browse the repository at this point in the history
Mhd/release fixes
  • Loading branch information
mhdostal committed Oct 18, 2018
2 parents 0577faa + cda8925 commit c2f9494
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 10 deletions.
2 changes: 1 addition & 1 deletion Examples/ArcGISToolkitExamples.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
883904451DF6022A001F3188 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
883904481DF6022A001F3188 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
8839044A1DF6022A001F3188 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
883904501DF60296001F3188 /* ArcGIS.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ArcGIS.framework; path = "~/Library/SDKs/ArcGIS/iOS/Frameworks/Dynamic/ArcGIS.framework"; sourceTree = "<absolute>"; };
883904501DF60296001F3188 /* ArcGIS.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ArcGIS.framework; path = "$HOME/Library/SDKs/ArcGIS/iOS/Frameworks/Dynamic/ArcGIS.framework"; sourceTree = "<absolute>"; };
88B6899F1E96E9AB00B67FAB /* ArcGISToolkit.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = ArcGISToolkit.xcodeproj; path = ../Toolkit/ArcGISToolkit.xcodeproj; sourceTree = "<group>"; };
88B689BE1E96EDF400B67FAB /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
88B689BF1E96EDF400B67FAB /* ExamplesViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ExamplesViewController.swift; sourceTree = "<group>"; };
Expand Down
9 changes: 1 addition & 8 deletions Examples/ArcGISToolkitExamples/MeasureExample.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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 = UIEdgeInsets(top: 0, left: 0, bottom: measureToolbar.frame.height, right: 0)
}

override func didReceiveMemoryWarning() {
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down

0 comments on commit c2f9494

Please sign in to comment.