diff --git a/arcgis-ios-sdk-samples.xcodeproj/project.pbxproj b/arcgis-ios-sdk-samples.xcodeproj/project.pbxproj index 097685a29..2b0be3551 100644 --- a/arcgis-ios-sdk-samples.xcodeproj/project.pbxproj +++ b/arcgis-ios-sdk-samples.xcodeproj/project.pbxproj @@ -163,7 +163,7 @@ 3E1E5EF21D9F0E6F00F4913C /* HillshadeRendererViewController.swift in CopyFiles */ = {isa = PBXBuildFile; fileRef = 3E1E5EE41D9F08ED00F4913C /* HillshadeRendererViewController.swift */; }; 3E1E5EF31D9F0E6F00F4913C /* HillshadeSettingsViewController.swift in CopyFiles */ = {isa = PBXBuildFile; fileRef = 3E1E5EE61D9F095A00F4913C /* HillshadeSettingsViewController.swift */; }; 3E23A9E61AFC28F6002E2214 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3E23A9E51AFC28F6002E2214 /* AppDelegate.swift */; }; - 3E23A9EF1AFC28F6002E2214 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 3E23A9EE1AFC28F6002E2214 /* Images.xcassets */; }; + 3E23A9EF1AFC28F6002E2214 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 3E23A9EE1AFC28F6002E2214 /* Assets.xcassets */; }; 3E23A9F21AFC28F6002E2214 /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3E23A9F01AFC28F6002E2214 /* LaunchScreen.xib */; }; 3E24E6741BFE560B00322DAC /* LayerStatusViewController.swift in CopyFiles */ = {isa = PBXBuildFile; fileRef = 3ECCFE391BD0401A00CE256D /* LayerStatusViewController.swift */; }; 3E2A680E1B0D2A7000A318AA /* ListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3E2A680D1B0D2A7000A318AA /* ListViewController.swift */; }; @@ -826,6 +826,9 @@ F1F62C4022E64FFF00EFD599 /* FeatureLayerDictionaryRenderer.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F1F62C3F22E64FFF00EFD599 /* FeatureLayerDictionaryRenderer.storyboard */; }; F1F62C4222E6560C00EFD599 /* FeatureLayerDictionaryRendererViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F1F62C4122E6560C00EFD599 /* FeatureLayerDictionaryRendererViewController.swift */; }; F1F62C4422E65E0900EFD599 /* militaryoverlay.geodatabase in Resources */ = {isa = PBXBuildFile; fileRef = F1F62C4322E65E0900EFD599 /* militaryoverlay.geodatabase */; settings = {ASSET_TAGS = (militaryoverlay, ); }; }; + F1F651AA24984850006DF277 /* ShowPopupViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F1F651A924984850006DF277 /* ShowPopupViewController.swift */; }; + F1F651AC2498485C006DF277 /* ShowPopup.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F1F651AB2498485C006DF277 /* ShowPopup.storyboard */; }; + F1F651AD24995294006DF277 /* ShowPopupViewController.swift in CopyFiles */ = {isa = PBXBuildFile; fileRef = F1F651A924984850006DF277 /* ShowPopupViewController.swift */; }; F1FA9DED22DE74C600234601 /* ColormapRendererViewController.swift in CopyFiles */ = {isa = PBXBuildFile; fileRef = F1E4B11022D6AF5D005FDB4D /* ColormapRendererViewController.swift */; }; F4159C6B209257B50016E53D /* FeatureLayerRenderingModeMap.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F4159C6A209257B50016E53D /* FeatureLayerRenderingModeMap.storyboard */; }; F4159C6F20925AAE0016E53D /* OpenScene.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F4159C6E20925AAE0016E53D /* OpenScene.storyboard */; }; @@ -874,6 +877,7 @@ dstSubfolderSpec = 7; files = ( 00166C8C24D236A300DD317E /* RealisticLightingAndShadowsViewController.swift in CopyFiles */, + F1F651AD24995294006DF277 /* ShowPopupViewController.swift in CopyFiles */, 001ECB062486DDF3009AC6C0 /* NavigateARCalibrationViewController.swift in CopyFiles */, 00686FD52481CF4D00EDA705 /* NavigateARRoutePlannerViewController.swift in CopyFiles */, 00686FD62481CF4D00EDA705 /* NavigateARNavigatorViewController.swift in CopyFiles */, @@ -1257,7 +1261,7 @@ 3E23A9E01AFC28F6002E2214 /* ArcGIS Runtime SDK Samples.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "ArcGIS Runtime SDK Samples.app"; sourceTree = BUILT_PRODUCTS_DIR; }; 3E23A9E41AFC28F6002E2214 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 3E23A9E51AFC28F6002E2214 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = AppDelegate.swift; path = "arcgis-ios-sdk-samples/AppDelegate.swift"; sourceTree = ""; }; - 3E23A9EE1AFC28F6002E2214 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = "arcgis-ios-sdk-samples/Images.xcassets"; sourceTree = ""; }; + 3E23A9EE1AFC28F6002E2214 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Assets.xcassets; path = "arcgis-ios-sdk-samples/Assets.xcassets"; sourceTree = ""; }; 3E23A9F11AFC28F6002E2214 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/LaunchScreen.xib; sourceTree = ""; }; 3E2A680D1B0D2A7000A318AA /* ListViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ListViewController.swift; sourceTree = ""; }; 3E2A68171B153CDE00A318AA /* SourceCodeBarButtonItem.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SourceCodeBarButtonItem.swift; sourceTree = ""; }; @@ -1724,6 +1728,8 @@ F1F62C3F22E64FFF00EFD599 /* FeatureLayerDictionaryRenderer.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = FeatureLayerDictionaryRenderer.storyboard; sourceTree = ""; }; F1F62C4122E6560C00EFD599 /* FeatureLayerDictionaryRendererViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FeatureLayerDictionaryRendererViewController.swift; sourceTree = ""; }; F1F62C4322E65E0900EFD599 /* militaryoverlay.geodatabase */ = {isa = PBXFileReference; lastKnownFileType = file; path = militaryoverlay.geodatabase; sourceTree = ""; }; + F1F651A924984850006DF277 /* ShowPopupViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShowPopupViewController.swift; sourceTree = ""; }; + F1F651AB2498485C006DF277 /* ShowPopup.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = ShowPopup.storyboard; sourceTree = ""; }; F4159C6A209257B50016E53D /* FeatureLayerRenderingModeMap.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = FeatureLayerRenderingModeMap.storyboard; sourceTree = ""; }; F4159C6E20925AAE0016E53D /* OpenScene.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = OpenScene.storyboard; sourceTree = ""; }; F4159C7020925B710016E53D /* OpenSceneViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OpenSceneViewController.swift; sourceTree = ""; }; @@ -2160,7 +2166,7 @@ isa = PBXGroup; children = ( 3E23A9E21AFC28F6002E2214 /* arcgis-ios-sdk-samples */, - 3E23A9EE1AFC28F6002E2214 /* Images.xcassets */, + 3E23A9EE1AFC28F6002E2214 /* Assets.xcassets */, 3E23A9E51AFC28F6002E2214 /* AppDelegate.swift */, 4CD2B5552142EAF900767D87 /* arcgis-ios-sdk-samplesTests */, 4CB506D3224C2DBC006A3471 /* Portal Data */, @@ -2892,6 +2898,7 @@ 3ED027FD1B8E392500ACA70D /* Display information */ = { isa = PBXGroup; children = ( + F1F651A724984742006DF277 /* Show a popup */, 00DAE5D924213D6B00D51281 /* Custom dictionary style */, 3ED028FD1B8E3AB300ACA70D /* Add graphics with renderer */, 3E71621D1BA0D7C2008DE398 /* Add graphics with symbols */, @@ -4350,6 +4357,15 @@ path = "Dictionary renderer with feature layer"; sourceTree = ""; }; + F1F651A724984742006DF277 /* Show a popup */ = { + isa = PBXGroup; + children = ( + F1F651A924984850006DF277 /* ShowPopupViewController.swift */, + F1F651AB2498485C006DF277 /* ShowPopup.storyboard */, + ); + path = "Show a popup"; + sourceTree = ""; + }; F4159C6D20925A8D0016E53D /* Open a scene (portal item) */ = { isa = PBXGroup; children = ( @@ -4560,7 +4576,7 @@ 3E4BF45A1C5BD77300D85919 /* OfflineGeocode.storyboard in Resources */, 3EABC7C31DB191BC00C161C6 /* Shasta_Elevation.tif.aux.xml in Resources */, 3E6AE3EC1C6D11BA0026E59C /* OfflineRouting.storyboard in Resources */, - 3E23A9EF1AFC28F6002E2214 /* Images.xcassets in Resources */, + 3E23A9EF1AFC28F6002E2214 /* Assets.xcassets in Resources */, 3EBA25611D34178200AB0703 /* SimpleMarkerSymbol.storyboard in Resources */, 2182C9821FDA01A0003E3A0F /* StatisticalQuery.storyboard in Resources */, 3ED0286C1B8E3A8500ACA70D /* DisplayLocation.storyboard in Resources */, @@ -4681,6 +4697,7 @@ 4C783F422252DBAC00609B9C /* philadelphia.mspk in Resources */, F4159C6F20925AAE0016E53D /* OpenScene.storyboard in Resources */, 00C6D421246CA8FD00C63EAF /* SA_EVI_8Day_03May20.tif.aux.xml in Resources */, + F1F651AC2498485C006DF277 /* ShowPopup.storyboard in Resources */, 00D4E8DE241AA18E002689DB /* ConvexHull.storyboard in Resources */, 4CCA30CF22399A91009D2AEF /* AddIntegratedMeshLayer.storyboard in Resources */, 3E4B05F81B39EF250072E514 /* SVProgressHUD.bundle in Resources */, @@ -5109,6 +5126,7 @@ 00E5B7D22458FE7900B11973 /* PerformValveIsolationTraceViewController.swift in Sources */, 3EAF09451D7108DC00F8538F /* ChangeMapViewBackgroundViewController.swift in Sources */, 3EEE1D701E4935FC003263FC /* GroupUsersViewController.swift in Sources */, + F1F651AA24984850006DF277 /* ShowPopupViewController.swift in Sources */, 3ED028591B8E3A8500ACA70D /* CreateOptionsViewController.swift in Sources */, C7AF466521B1DCD60050CC49 /* SyncMapAndSceneViewsViewController.swift in Sources */, F1C81C4722FCEC3C00229CAA /* GetElevationPointViewController.swift in Sources */, diff --git a/arcgis-ios-sdk-samples/Images.xcassets/AppIcon.appiconset/Contents.json b/arcgis-ios-sdk-samples/Assets.xcassets/AppIcon.appiconset/Contents.json similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/AppIcon.appiconset/Contents.json rename to arcgis-ios-sdk-samples/Assets.xcassets/AppIcon.appiconset/Contents.json diff --git a/arcgis-ios-sdk-samples/Images.xcassets/AppIcon.appiconset/iOS_1024.png b/arcgis-ios-sdk-samples/Assets.xcassets/AppIcon.appiconset/iOS_1024.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/AppIcon.appiconset/iOS_1024.png rename to arcgis-ios-sdk-samples/Assets.xcassets/AppIcon.appiconset/iOS_1024.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/AppIcon.appiconset/iOS_120-1.png b/arcgis-ios-sdk-samples/Assets.xcassets/AppIcon.appiconset/iOS_120-1.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/AppIcon.appiconset/iOS_120-1.png rename to arcgis-ios-sdk-samples/Assets.xcassets/AppIcon.appiconset/iOS_120-1.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/AppIcon.appiconset/iOS_120.png b/arcgis-ios-sdk-samples/Assets.xcassets/AppIcon.appiconset/iOS_120.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/AppIcon.appiconset/iOS_120.png rename to arcgis-ios-sdk-samples/Assets.xcassets/AppIcon.appiconset/iOS_120.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/AppIcon.appiconset/iOS_152.png b/arcgis-ios-sdk-samples/Assets.xcassets/AppIcon.appiconset/iOS_152.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/AppIcon.appiconset/iOS_152.png rename to arcgis-ios-sdk-samples/Assets.xcassets/AppIcon.appiconset/iOS_152.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/AppIcon.appiconset/iOS_167.png b/arcgis-ios-sdk-samples/Assets.xcassets/AppIcon.appiconset/iOS_167.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/AppIcon.appiconset/iOS_167.png rename to arcgis-ios-sdk-samples/Assets.xcassets/AppIcon.appiconset/iOS_167.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/AppIcon.appiconset/iOS_180.png b/arcgis-ios-sdk-samples/Assets.xcassets/AppIcon.appiconset/iOS_180.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/AppIcon.appiconset/iOS_180.png rename to arcgis-ios-sdk-samples/Assets.xcassets/AppIcon.appiconset/iOS_180.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/AppIcon.appiconset/iOS_29.png b/arcgis-ios-sdk-samples/Assets.xcassets/AppIcon.appiconset/iOS_29.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/AppIcon.appiconset/iOS_29.png rename to arcgis-ios-sdk-samples/Assets.xcassets/AppIcon.appiconset/iOS_29.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/AppIcon.appiconset/iOS_40.png b/arcgis-ios-sdk-samples/Assets.xcassets/AppIcon.appiconset/iOS_40.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/AppIcon.appiconset/iOS_40.png rename to arcgis-ios-sdk-samples/Assets.xcassets/AppIcon.appiconset/iOS_40.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/AppIcon.appiconset/iOS_58-1.png b/arcgis-ios-sdk-samples/Assets.xcassets/AppIcon.appiconset/iOS_58-1.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/AppIcon.appiconset/iOS_58-1.png rename to arcgis-ios-sdk-samples/Assets.xcassets/AppIcon.appiconset/iOS_58-1.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/AppIcon.appiconset/iOS_58.png b/arcgis-ios-sdk-samples/Assets.xcassets/AppIcon.appiconset/iOS_58.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/AppIcon.appiconset/iOS_58.png rename to arcgis-ios-sdk-samples/Assets.xcassets/AppIcon.appiconset/iOS_58.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/AppIcon.appiconset/iOS_76.png b/arcgis-ios-sdk-samples/Assets.xcassets/AppIcon.appiconset/iOS_76.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/AppIcon.appiconset/iOS_76.png rename to arcgis-ios-sdk-samples/Assets.xcassets/AppIcon.appiconset/iOS_76.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/AppIcon.appiconset/iOS_80-1.png b/arcgis-ios-sdk-samples/Assets.xcassets/AppIcon.appiconset/iOS_80-1.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/AppIcon.appiconset/iOS_80-1.png rename to arcgis-ios-sdk-samples/Assets.xcassets/AppIcon.appiconset/iOS_80-1.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/AppIcon.appiconset/iOS_80.png b/arcgis-ios-sdk-samples/Assets.xcassets/AppIcon.appiconset/iOS_80.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/AppIcon.appiconset/iOS_80.png rename to arcgis-ios-sdk-samples/Assets.xcassets/AppIcon.appiconset/iOS_80.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/AppIcon.appiconset/iOS_87.png b/arcgis-ios-sdk-samples/Assets.xcassets/AppIcon.appiconset/iOS_87.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/AppIcon.appiconset/iOS_87.png rename to arcgis-ios-sdk-samples/Assets.xcassets/AppIcon.appiconset/iOS_87.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/AppIcon2.imageset/Contents.json b/arcgis-ios-sdk-samples/Assets.xcassets/AppIcon2.imageset/Contents.json similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/AppIcon2.imageset/Contents.json rename to arcgis-ios-sdk-samples/Assets.xcassets/AppIcon2.imageset/Contents.json diff --git a/arcgis-ios-sdk-samples/Images.xcassets/AppIcon2.imageset/iOS_160.png b/arcgis-ios-sdk-samples/Assets.xcassets/AppIcon2.imageset/iOS_160.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/AppIcon2.imageset/iOS_160.png rename to arcgis-ios-sdk-samples/Assets.xcassets/AppIcon2.imageset/iOS_160.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/AppIcon2.imageset/iOS_240.png b/arcgis-ios-sdk-samples/Assets.xcassets/AppIcon2.imageset/iOS_240.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/AppIcon2.imageset/iOS_240.png rename to arcgis-ios-sdk-samples/Assets.xcassets/AppIcon2.imageset/iOS_240.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/AppIcon2.imageset/iOS_80-1.png b/arcgis-ios-sdk-samples/Assets.xcassets/AppIcon2.imageset/iOS_80-1.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/AppIcon2.imageset/iOS_80-1.png rename to arcgis-ios-sdk-samples/Assets.xcassets/AppIcon2.imageset/iOS_80-1.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Ascending.imageset/Ascending.png b/arcgis-ios-sdk-samples/Assets.xcassets/Ascending.imageset/Ascending.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Ascending.imageset/Ascending.png rename to arcgis-ios-sdk-samples/Assets.xcassets/Ascending.imageset/Ascending.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Ascending.imageset/Ascending@2x.png b/arcgis-ios-sdk-samples/Assets.xcassets/Ascending.imageset/Ascending@2x.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Ascending.imageset/Ascending@2x.png rename to arcgis-ios-sdk-samples/Assets.xcassets/Ascending.imageset/Ascending@2x.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Ascending.imageset/Ascending@3x.png b/arcgis-ios-sdk-samples/Assets.xcassets/Ascending.imageset/Ascending@3x.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Ascending.imageset/Ascending@3x.png rename to arcgis-ios-sdk-samples/Assets.xcassets/Ascending.imageset/Ascending@3x.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Ascending.imageset/Contents.json b/arcgis-ios-sdk-samples/Assets.xcassets/Ascending.imageset/Contents.json similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Ascending.imageset/Contents.json rename to arcgis-ios-sdk-samples/Assets.xcassets/Ascending.imageset/Contents.json diff --git a/arcgis-ios-sdk-samples/Images.xcassets/BackIcon.imageset/Contents.json b/arcgis-ios-sdk-samples/Assets.xcassets/BackIcon.imageset/Contents.json similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/BackIcon.imageset/Contents.json rename to arcgis-ios-sdk-samples/Assets.xcassets/BackIcon.imageset/Contents.json diff --git a/arcgis-ios-sdk-samples/Images.xcassets/BackIcon.imageset/iOS7_TabBar_BackNavigation30s.png b/arcgis-ios-sdk-samples/Assets.xcassets/BackIcon.imageset/iOS7_TabBar_BackNavigation30s.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/BackIcon.imageset/iOS7_TabBar_BackNavigation30s.png rename to arcgis-ios-sdk-samples/Assets.xcassets/BackIcon.imageset/iOS7_TabBar_BackNavigation30s.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/BackIcon.imageset/iOS7_TabBar_BackNavigation60s.png b/arcgis-ios-sdk-samples/Assets.xcassets/BackIcon.imageset/iOS7_TabBar_BackNavigation60s.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/BackIcon.imageset/iOS7_TabBar_BackNavigation60s.png rename to arcgis-ios-sdk-samples/Assets.xcassets/BackIcon.imageset/iOS7_TabBar_BackNavigation60s.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/BlueMarker.imageset/Contents.json b/arcgis-ios-sdk-samples/Assets.xcassets/BlueMarker.imageset/Contents.json similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/BlueMarker.imageset/Contents.json rename to arcgis-ios-sdk-samples/Assets.xcassets/BlueMarker.imageset/Contents.json diff --git a/arcgis-ios-sdk-samples/Images.xcassets/BlueMarker.imageset/pin_blank_blue@1x.png b/arcgis-ios-sdk-samples/Assets.xcassets/BlueMarker.imageset/pin_blank_blue@1x.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/BlueMarker.imageset/pin_blank_blue@1x.png rename to arcgis-ios-sdk-samples/Assets.xcassets/BlueMarker.imageset/pin_blank_blue@1x.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/BlueMarker.imageset/pin_blank_blue@2x.png b/arcgis-ios-sdk-samples/Assets.xcassets/BlueMarker.imageset/pin_blank_blue@2x.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/BlueMarker.imageset/pin_blank_blue@2x.png rename to arcgis-ios-sdk-samples/Assets.xcassets/BlueMarker.imageset/pin_blank_blue@2x.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/BlueMarker.imageset/pin_blank_blue@3x.png b/arcgis-ios-sdk-samples/Assets.xcassets/BlueMarker.imageset/pin_blank_blue@3x.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/BlueMarker.imageset/pin_blank_blue@3x.png rename to arcgis-ios-sdk-samples/Assets.xcassets/BlueMarker.imageset/pin_blank_blue@3x.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/CompassIcon.imageset/Contents.json b/arcgis-ios-sdk-samples/Assets.xcassets/CompassIcon.imageset/Contents.json similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/CompassIcon.imageset/Contents.json rename to arcgis-ios-sdk-samples/Assets.xcassets/CompassIcon.imageset/Contents.json diff --git a/arcgis-ios-sdk-samples/Images.xcassets/CompassIcon.imageset/iOS8_NorthCompass108.png b/arcgis-ios-sdk-samples/Assets.xcassets/CompassIcon.imageset/iOS8_NorthCompass108.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/CompassIcon.imageset/iOS8_NorthCompass108.png rename to arcgis-ios-sdk-samples/Assets.xcassets/CompassIcon.imageset/iOS8_NorthCompass108.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/CompassIcon.imageset/iOS8_NorthCompass36_D.png b/arcgis-ios-sdk-samples/Assets.xcassets/CompassIcon.imageset/iOS8_NorthCompass36_D.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/CompassIcon.imageset/iOS8_NorthCompass36_D.png rename to arcgis-ios-sdk-samples/Assets.xcassets/CompassIcon.imageset/iOS8_NorthCompass36_D.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/CompassIcon.imageset/iOS8_NorthCompass72.png b/arcgis-ios-sdk-samples/Assets.xcassets/CompassIcon.imageset/iOS8_NorthCompass72.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/CompassIcon.imageset/iOS8_NorthCompass72.png rename to arcgis-ios-sdk-samples/Assets.xcassets/CompassIcon.imageset/iOS8_NorthCompass72.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Analysis_bg.imageset/Analysis_bg@2x.png b/arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Analysis_bg.imageset/Analysis_bg@2x.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Analysis_bg.imageset/Analysis_bg@2x.png rename to arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Analysis_bg.imageset/Analysis_bg@2x.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Analysis_bg.imageset/Analysis_bg@3x.png b/arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Analysis_bg.imageset/Analysis_bg@3x.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Analysis_bg.imageset/Analysis_bg@3x.png rename to arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Analysis_bg.imageset/Analysis_bg@3x.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Analysis_bg.imageset/Contents.json b/arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Analysis_bg.imageset/Contents.json similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Analysis_bg.imageset/Contents.json rename to arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Analysis_bg.imageset/Contents.json diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Analysis_icon.imageset/Contents.json b/arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Analysis_icon.imageset/Contents.json similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Analysis_icon.imageset/Contents.json rename to arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Analysis_icon.imageset/Contents.json diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Analysis_icon.imageset/analysis.png b/arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Analysis_icon.imageset/analysis.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Analysis_icon.imageset/analysis.png rename to arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Analysis_icon.imageset/analysis.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Analysis_icon.imageset/analysis@2x.png b/arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Analysis_icon.imageset/analysis@2x.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Analysis_icon.imageset/analysis@2x.png rename to arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Analysis_icon.imageset/analysis@2x.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Analysis_icon.imageset/analysis@3x.png b/arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Analysis_icon.imageset/analysis@3x.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Analysis_icon.imageset/analysis@3x.png rename to arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Analysis_icon.imageset/analysis@3x.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Augmented reality_bg.imageset/Augmented_reality@1x.png b/arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Augmented reality_bg.imageset/Augmented_reality@1x.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Augmented reality_bg.imageset/Augmented_reality@1x.png rename to arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Augmented reality_bg.imageset/Augmented_reality@1x.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Augmented reality_bg.imageset/Augmented_reality@2x.png b/arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Augmented reality_bg.imageset/Augmented_reality@2x.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Augmented reality_bg.imageset/Augmented_reality@2x.png rename to arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Augmented reality_bg.imageset/Augmented_reality@2x.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Augmented reality_bg.imageset/Augmented_reality@3x.png b/arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Augmented reality_bg.imageset/Augmented_reality@3x.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Augmented reality_bg.imageset/Augmented_reality@3x.png rename to arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Augmented reality_bg.imageset/Augmented_reality@3x.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Augmented reality_bg.imageset/Contents.json b/arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Augmented reality_bg.imageset/Contents.json similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Augmented reality_bg.imageset/Contents.json rename to arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Augmented reality_bg.imageset/Contents.json diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Augmented reality_icon.imageset/3d.png b/arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Augmented reality_icon.imageset/3d.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Augmented reality_icon.imageset/3d.png rename to arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Augmented reality_icon.imageset/3d.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Augmented reality_icon.imageset/3d@2x.png b/arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Augmented reality_icon.imageset/3d@2x.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Augmented reality_icon.imageset/3d@2x.png rename to arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Augmented reality_icon.imageset/3d@2x.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Augmented reality_icon.imageset/3d@3x.png b/arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Augmented reality_icon.imageset/3d@3x.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Augmented reality_icon.imageset/3d@3x.png rename to arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Augmented reality_icon.imageset/3d@3x.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Augmented reality_icon.imageset/Contents.json b/arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Augmented reality_icon.imageset/Contents.json similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Augmented reality_icon.imageset/Contents.json rename to arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Augmented reality_icon.imageset/Contents.json diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Cloud & Portal_bg.imageset/Cloud & Portal_bg@2x.png b/arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Cloud & Portal_bg.imageset/Cloud & Portal_bg@2x.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Cloud & Portal_bg.imageset/Cloud & Portal_bg@2x.png rename to arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Cloud & Portal_bg.imageset/Cloud & Portal_bg@2x.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Cloud & Portal_bg.imageset/Cloud & Portal_bg@3x.png b/arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Cloud & Portal_bg.imageset/Cloud & Portal_bg@3x.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Cloud & Portal_bg.imageset/Cloud & Portal_bg@3x.png rename to arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Cloud & Portal_bg.imageset/Cloud & Portal_bg@3x.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Cloud & Portal_bg.imageset/Contents.json b/arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Cloud & Portal_bg.imageset/Contents.json similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Cloud & Portal_bg.imageset/Contents.json rename to arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Cloud & Portal_bg.imageset/Contents.json diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Cloud & Portal_icon.imageset/Contents.json b/arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Cloud & Portal_icon.imageset/Contents.json similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Cloud & Portal_icon.imageset/Contents.json rename to arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Cloud & Portal_icon.imageset/Contents.json diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Cloud & Portal_icon.imageset/cloud.png b/arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Cloud & Portal_icon.imageset/cloud.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Cloud & Portal_icon.imageset/cloud.png rename to arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Cloud & Portal_icon.imageset/cloud.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Cloud & Portal_icon.imageset/cloud@2x.png b/arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Cloud & Portal_icon.imageset/cloud@2x.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Cloud & Portal_icon.imageset/cloud@2x.png rename to arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Cloud & Portal_icon.imageset/cloud@2x.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Cloud & Portal_icon.imageset/cloud@3x.png b/arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Cloud & Portal_icon.imageset/cloud@3x.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Cloud & Portal_icon.imageset/cloud@3x.png rename to arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Cloud & Portal_icon.imageset/cloud@3x.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Contents.json b/arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Contents.json similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Contents.json rename to arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Contents.json diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Display information_bg.imageset/Contents.json b/arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Display information_bg.imageset/Contents.json similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Display information_bg.imageset/Contents.json rename to arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Display information_bg.imageset/Contents.json diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Display information_bg.imageset/bg_displayinfo@2x.png b/arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Display information_bg.imageset/bg_displayinfo@2x.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Display information_bg.imageset/bg_displayinfo@2x.png rename to arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Display information_bg.imageset/bg_displayinfo@2x.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Display information_bg.imageset/bg_displayinfo@3x.png b/arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Display information_bg.imageset/bg_displayinfo@3x.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Display information_bg.imageset/bg_displayinfo@3x.png rename to arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Display information_bg.imageset/bg_displayinfo@3x.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Display information_icon.imageset/Contents.json b/arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Display information_icon.imageset/Contents.json similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Display information_icon.imageset/Contents.json rename to arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Display information_icon.imageset/Contents.json diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Display information_icon.imageset/displayinfo.png b/arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Display information_icon.imageset/displayinfo.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Display information_icon.imageset/displayinfo.png rename to arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Display information_icon.imageset/displayinfo.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Display information_icon.imageset/displayinfo@2x.png b/arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Display information_icon.imageset/displayinfo@2x.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Display information_icon.imageset/displayinfo@2x.png rename to arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Display information_icon.imageset/displayinfo@2x.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Display information_icon.imageset/displayinfo@3x.png b/arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Display information_icon.imageset/displayinfo@3x.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Display information_icon.imageset/displayinfo@3x.png rename to arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Display information_icon.imageset/displayinfo@3x.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Edit data_bg.imageset/Contents.json b/arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Edit data_bg.imageset/Contents.json similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Edit data_bg.imageset/Contents.json rename to arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Edit data_bg.imageset/Contents.json diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Edit data_bg.imageset/bg_editdata@2x.png b/arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Edit data_bg.imageset/bg_editdata@2x.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Edit data_bg.imageset/bg_editdata@2x.png rename to arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Edit data_bg.imageset/bg_editdata@2x.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Edit data_bg.imageset/bg_editdata@3x.png b/arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Edit data_bg.imageset/bg_editdata@3x.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Edit data_bg.imageset/bg_editdata@3x.png rename to arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Edit data_bg.imageset/bg_editdata@3x.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Edit data_icon.imageset/Contents.json b/arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Edit data_icon.imageset/Contents.json similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Edit data_icon.imageset/Contents.json rename to arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Edit data_icon.imageset/Contents.json diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Edit data_icon.imageset/iOS8_TabBar_Edit30.png b/arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Edit data_icon.imageset/iOS8_TabBar_Edit30.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Edit data_icon.imageset/iOS8_TabBar_Edit30.png rename to arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Edit data_icon.imageset/iOS8_TabBar_Edit30.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Edit data_icon.imageset/iOS8_TabBar_Edit60.png b/arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Edit data_icon.imageset/iOS8_TabBar_Edit60.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Edit data_icon.imageset/iOS8_TabBar_Edit60.png rename to arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Edit data_icon.imageset/iOS8_TabBar_Edit60.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Edit data_icon.imageset/iOS8_TabBar_Edit90.png b/arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Edit data_icon.imageset/iOS8_TabBar_Edit90.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Edit data_icon.imageset/iOS8_TabBar_Edit90.png rename to arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Edit data_icon.imageset/iOS8_TabBar_Edit90.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Features_bg.imageset/Contents.json b/arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Features_bg.imageset/Contents.json similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Features_bg.imageset/Contents.json rename to arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Features_bg.imageset/Contents.json diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Features_bg.imageset/bg_features@2x.png b/arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Features_bg.imageset/bg_features@2x.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Features_bg.imageset/bg_features@2x.png rename to arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Features_bg.imageset/bg_features@2x.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Features_bg.imageset/bg_features@3x.png b/arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Features_bg.imageset/bg_features@3x.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Features_bg.imageset/bg_features@3x.png rename to arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Features_bg.imageset/bg_features@3x.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Features_icon.imageset/Contents.json b/arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Features_icon.imageset/Contents.json similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Features_icon.imageset/Contents.json rename to arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Features_icon.imageset/Contents.json diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Features_icon.imageset/features.png b/arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Features_icon.imageset/features.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Features_icon.imageset/features.png rename to arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Features_icon.imageset/features.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Features_icon.imageset/features@2x.png b/arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Features_icon.imageset/features@2x.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Features_icon.imageset/features@2x.png rename to arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Features_icon.imageset/features@2x.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Features_icon.imageset/features@3x.png b/arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Features_icon.imageset/features@3x.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Features_icon.imageset/features@3x.png rename to arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Features_icon.imageset/features@3x.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Geometry_bg.imageset/Contents.json b/arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Geometry_bg.imageset/Contents.json similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Geometry_bg.imageset/Contents.json rename to arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Geometry_bg.imageset/Contents.json diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Geometry_bg.imageset/bg_geometry@2x.png b/arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Geometry_bg.imageset/bg_geometry@2x.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Geometry_bg.imageset/bg_geometry@2x.png rename to arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Geometry_bg.imageset/bg_geometry@2x.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Geometry_bg.imageset/bg_geometry@3x.png b/arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Geometry_bg.imageset/bg_geometry@3x.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Geometry_bg.imageset/bg_geometry@3x.png rename to arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Geometry_bg.imageset/bg_geometry@3x.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Geometry_icon.imageset/Contents.json b/arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Geometry_icon.imageset/Contents.json similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Geometry_icon.imageset/Contents.json rename to arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Geometry_icon.imageset/Contents.json diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Geometry_icon.imageset/geometry.png b/arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Geometry_icon.imageset/geometry.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Geometry_icon.imageset/geometry.png rename to arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Geometry_icon.imageset/geometry.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Geometry_icon.imageset/geometry@2x.png b/arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Geometry_icon.imageset/geometry@2x.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Geometry_icon.imageset/geometry@2x.png rename to arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Geometry_icon.imageset/geometry@2x.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Geometry_icon.imageset/geometry@3x.png b/arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Geometry_icon.imageset/geometry@3x.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Geometry_icon.imageset/geometry@3x.png rename to arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Geometry_icon.imageset/geometry@3x.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Layers_bg.imageset/Contents.json b/arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Layers_bg.imageset/Contents.json similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Layers_bg.imageset/Contents.json rename to arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Layers_bg.imageset/Contents.json diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Layers_bg.imageset/bg_layers@2x.png b/arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Layers_bg.imageset/bg_layers@2x.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Layers_bg.imageset/bg_layers@2x.png rename to arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Layers_bg.imageset/bg_layers@2x.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Layers_bg.imageset/bg_layers@3x.png b/arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Layers_bg.imageset/bg_layers@3x.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Layers_bg.imageset/bg_layers@3x.png rename to arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Layers_bg.imageset/bg_layers@3x.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Layers_icon.imageset/Contents.json b/arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Layers_icon.imageset/Contents.json similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Layers_icon.imageset/Contents.json rename to arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Layers_icon.imageset/Contents.json diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Layers_icon.imageset/layers.png b/arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Layers_icon.imageset/layers.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Layers_icon.imageset/layers.png rename to arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Layers_icon.imageset/layers.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Layers_icon.imageset/layers@2x.png b/arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Layers_icon.imageset/layers@2x.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Layers_icon.imageset/layers@2x.png rename to arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Layers_icon.imageset/layers@2x.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Layers_icon.imageset/layers@3x.png b/arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Layers_icon.imageset/layers@3x.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Layers_icon.imageset/layers@3x.png rename to arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Layers_icon.imageset/layers@3x.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Maps_bg.imageset/Contents.json b/arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Maps_bg.imageset/Contents.json similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Maps_bg.imageset/Contents.json rename to arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Maps_bg.imageset/Contents.json diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Maps_bg.imageset/bg_maps@2x.png b/arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Maps_bg.imageset/bg_maps@2x.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Maps_bg.imageset/bg_maps@2x.png rename to arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Maps_bg.imageset/bg_maps@2x.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Maps_bg.imageset/bg_maps@3x.png b/arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Maps_bg.imageset/bg_maps@3x.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Maps_bg.imageset/bg_maps@3x.png rename to arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Maps_bg.imageset/bg_maps@3x.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Maps_icon.imageset/Contents.json b/arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Maps_icon.imageset/Contents.json similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Maps_icon.imageset/Contents.json rename to arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Maps_icon.imageset/Contents.json diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Maps_icon.imageset/maps.png b/arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Maps_icon.imageset/maps.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Maps_icon.imageset/maps.png rename to arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Maps_icon.imageset/maps.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Maps_icon.imageset/maps@2x.png b/arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Maps_icon.imageset/maps@2x.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Maps_icon.imageset/maps@2x.png rename to arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Maps_icon.imageset/maps@2x.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Maps_icon.imageset/maps@3x.png b/arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Maps_icon.imageset/maps@3x.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Maps_icon.imageset/maps@3x.png rename to arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Maps_icon.imageset/maps@3x.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Route & Directions_bg.imageset/Contents.json b/arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Route & Directions_bg.imageset/Contents.json similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Route & Directions_bg.imageset/Contents.json rename to arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Route & Directions_bg.imageset/Contents.json diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Route & Directions_bg.imageset/bg_routenav@2x.png b/arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Route & Directions_bg.imageset/bg_routenav@2x.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Route & Directions_bg.imageset/bg_routenav@2x.png rename to arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Route & Directions_bg.imageset/bg_routenav@2x.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Route & Directions_bg.imageset/bg_routenav@3x.png b/arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Route & Directions_bg.imageset/bg_routenav@3x.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Route & Directions_bg.imageset/bg_routenav@3x.png rename to arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Route & Directions_bg.imageset/bg_routenav@3x.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Route & Directions_icon.imageset/Contents.json b/arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Route & Directions_icon.imageset/Contents.json similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Route & Directions_icon.imageset/Contents.json rename to arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Route & Directions_icon.imageset/Contents.json diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Route & Directions_icon.imageset/navdirections.png b/arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Route & Directions_icon.imageset/navdirections.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Route & Directions_icon.imageset/navdirections.png rename to arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Route & Directions_icon.imageset/navdirections.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Route & Directions_icon.imageset/navdirections@2x.png b/arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Route & Directions_icon.imageset/navdirections@2x.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Route & Directions_icon.imageset/navdirections@2x.png rename to arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Route & Directions_icon.imageset/navdirections@2x.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Route & Directions_icon.imageset/navdirections@3x.png b/arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Route & Directions_icon.imageset/navdirections@3x.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Route & Directions_icon.imageset/navdirections@3x.png rename to arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Route & Directions_icon.imageset/navdirections@3x.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Scenes_bg.imageset/3D_bg@2x.png b/arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Scenes_bg.imageset/3D_bg@2x.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Scenes_bg.imageset/3D_bg@2x.png rename to arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Scenes_bg.imageset/3D_bg@2x.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Scenes_bg.imageset/3D_bg@3x.png b/arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Scenes_bg.imageset/3D_bg@3x.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Scenes_bg.imageset/3D_bg@3x.png rename to arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Scenes_bg.imageset/3D_bg@3x.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Scenes_bg.imageset/Contents.json b/arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Scenes_bg.imageset/Contents.json similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Scenes_bg.imageset/Contents.json rename to arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Scenes_bg.imageset/Contents.json diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Scenes_icon.imageset/3d.png b/arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Scenes_icon.imageset/3d.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Scenes_icon.imageset/3d.png rename to arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Scenes_icon.imageset/3d.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Scenes_icon.imageset/3d@2x.png b/arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Scenes_icon.imageset/3d@2x.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Scenes_icon.imageset/3d@2x.png rename to arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Scenes_icon.imageset/3d@2x.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Scenes_icon.imageset/3d@3x.png b/arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Scenes_icon.imageset/3d@3x.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Scenes_icon.imageset/3d@3x.png rename to arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Scenes_icon.imageset/3d@3x.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Scenes_icon.imageset/Contents.json b/arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Scenes_icon.imageset/Contents.json similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Scenes_icon.imageset/Contents.json rename to arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Scenes_icon.imageset/Contents.json diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Search_bg.imageset/Contents.json b/arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Search_bg.imageset/Contents.json similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Search_bg.imageset/Contents.json rename to arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Search_bg.imageset/Contents.json diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Search_bg.imageset/bg_search@2x.png b/arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Search_bg.imageset/bg_search@2x.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Search_bg.imageset/bg_search@2x.png rename to arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Search_bg.imageset/bg_search@2x.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Search_bg.imageset/bg_search@3x.png b/arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Search_bg.imageset/bg_search@3x.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Search_bg.imageset/bg_search@3x.png rename to arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Search_bg.imageset/bg_search@3x.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Search_icon.imageset/Contents.json b/arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Search_icon.imageset/Contents.json similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Search_icon.imageset/Contents.json rename to arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Search_icon.imageset/Contents.json diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Search_icon.imageset/iOS8_TabBar_Find30.png b/arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Search_icon.imageset/iOS8_TabBar_Find30.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Search_icon.imageset/iOS8_TabBar_Find30.png rename to arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Search_icon.imageset/iOS8_TabBar_Find30.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Search_icon.imageset/iOS8_TabBar_Find60.png b/arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Search_icon.imageset/iOS8_TabBar_Find60.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Search_icon.imageset/iOS8_TabBar_Find60.png rename to arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Search_icon.imageset/iOS8_TabBar_Find60.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Search_icon.imageset/iOS8_TabBar_Find90.png b/arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Search_icon.imageset/iOS8_TabBar_Find90.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Search_icon.imageset/iOS8_TabBar_Find90.png rename to arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Search_icon.imageset/iOS8_TabBar_Find90.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Utility Network_bg.imageset/Contents.json b/arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Utility Network_bg.imageset/Contents.json similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Utility Network_bg.imageset/Contents.json rename to arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Utility Network_bg.imageset/Contents.json diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Utility Network_bg.imageset/UtilityNetwork@2x.png b/arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Utility Network_bg.imageset/UtilityNetwork@2x.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Utility Network_bg.imageset/UtilityNetwork@2x.png rename to arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Utility Network_bg.imageset/UtilityNetwork@2x.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Utility Network_bg.imageset/UtilityNetwork@3x.png b/arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Utility Network_bg.imageset/UtilityNetwork@3x.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Utility Network_bg.imageset/UtilityNetwork@3x.png rename to arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Utility Network_bg.imageset/UtilityNetwork@3x.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Utility Network_icon.imageset/Contents.json b/arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Utility Network_icon.imageset/Contents.json similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Utility Network_icon.imageset/Contents.json rename to arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Utility Network_icon.imageset/Contents.json diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Utility Network_icon.imageset/geometry.png b/arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Utility Network_icon.imageset/geometry.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Utility Network_icon.imageset/geometry.png rename to arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Utility Network_icon.imageset/geometry.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Utility Network_icon.imageset/geometry@2x.png b/arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Utility Network_icon.imageset/geometry@2x.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Utility Network_icon.imageset/geometry@2x.png rename to arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Utility Network_icon.imageset/geometry@2x.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Utility Network_icon.imageset/geometry@3x.png b/arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Utility Network_icon.imageset/geometry@3x.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Content display logic/Utility Network_icon.imageset/geometry@3x.png rename to arcgis-ios-sdk-samples/Assets.xcassets/Content display logic/Utility Network_icon.imageset/geometry@3x.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Contents.json b/arcgis-ios-sdk-samples/Assets.xcassets/Contents.json similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Contents.json rename to arcgis-ios-sdk-samples/Assets.xcassets/Contents.json diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Descending.imageset/Contents.json b/arcgis-ios-sdk-samples/Assets.xcassets/Descending.imageset/Contents.json similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Descending.imageset/Contents.json rename to arcgis-ios-sdk-samples/Assets.xcassets/Descending.imageset/Contents.json diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Descending.imageset/Descending.png b/arcgis-ios-sdk-samples/Assets.xcassets/Descending.imageset/Descending.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Descending.imageset/Descending.png rename to arcgis-ios-sdk-samples/Assets.xcassets/Descending.imageset/Descending.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Descending.imageset/Descending@2x.png b/arcgis-ios-sdk-samples/Assets.xcassets/Descending.imageset/Descending@2x.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Descending.imageset/Descending@2x.png rename to arcgis-ios-sdk-samples/Assets.xcassets/Descending.imageset/Descending@2x.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Descending.imageset/Descending@3x.png b/arcgis-ios-sdk-samples/Assets.xcassets/Descending.imageset/Descending@3x.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Descending.imageset/Descending@3x.png rename to arcgis-ios-sdk-samples/Assets.xcassets/Descending.imageset/Descending@3x.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/DirectionsList.imageset/Contents.json b/arcgis-ios-sdk-samples/Assets.xcassets/DirectionsList.imageset/Contents.json similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/DirectionsList.imageset/Contents.json rename to arcgis-ios-sdk-samples/Assets.xcassets/DirectionsList.imageset/Contents.json diff --git a/arcgis-ios-sdk-samples/Images.xcassets/DirectionsList.imageset/iOS7_Toolbar_OpenDirectionsTool22.png b/arcgis-ios-sdk-samples/Assets.xcassets/DirectionsList.imageset/iOS7_Toolbar_OpenDirectionsTool22.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/DirectionsList.imageset/iOS7_Toolbar_OpenDirectionsTool22.png rename to arcgis-ios-sdk-samples/Assets.xcassets/DirectionsList.imageset/iOS7_Toolbar_OpenDirectionsTool22.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/DirectionsList.imageset/iOS7_Toolbar_OpenDirectionsTool44.png b/arcgis-ios-sdk-samples/Assets.xcassets/DirectionsList.imageset/iOS7_Toolbar_OpenDirectionsTool44.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/DirectionsList.imageset/iOS7_Toolbar_OpenDirectionsTool44.png rename to arcgis-ios-sdk-samples/Assets.xcassets/DirectionsList.imageset/iOS7_Toolbar_OpenDirectionsTool44.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Discard.imageset/Contents.json b/arcgis-ios-sdk-samples/Assets.xcassets/Discard.imageset/Contents.json similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Discard.imageset/Contents.json rename to arcgis-ios-sdk-samples/Assets.xcassets/Discard.imageset/Contents.json diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Discard.imageset/iOS8_TabBar_Discard22.png b/arcgis-ios-sdk-samples/Assets.xcassets/Discard.imageset/iOS8_TabBar_Discard22.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Discard.imageset/iOS8_TabBar_Discard22.png rename to arcgis-ios-sdk-samples/Assets.xcassets/Discard.imageset/iOS8_TabBar_Discard22.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Discard.imageset/iOS8_TabBar_Discard44.png b/arcgis-ios-sdk-samples/Assets.xcassets/Discard.imageset/iOS8_TabBar_Discard44.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Discard.imageset/iOS8_TabBar_Discard44.png rename to arcgis-ios-sdk-samples/Assets.xcassets/Discard.imageset/iOS8_TabBar_Discard44.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Discard.imageset/iOS8_TabBar_Discard66.png b/arcgis-ios-sdk-samples/Assets.xcassets/Discard.imageset/iOS8_TabBar_Discard66.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Discard.imageset/iOS8_TabBar_Discard66.png rename to arcgis-ios-sdk-samples/Assets.xcassets/Discard.imageset/iOS8_TabBar_Discard66.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Facility.imageset/Contents.json b/arcgis-ios-sdk-samples/Assets.xcassets/Facility.imageset/Contents.json similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Facility.imageset/Contents.json rename to arcgis-ios-sdk-samples/Assets.xcassets/Facility.imageset/Contents.json diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Facility.imageset/Facility.png b/arcgis-ios-sdk-samples/Assets.xcassets/Facility.imageset/Facility.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Facility.imageset/Facility.png rename to arcgis-ios-sdk-samples/Assets.xcassets/Facility.imageset/Facility.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Facility.imageset/Facility@2x.png b/arcgis-ios-sdk-samples/Assets.xcassets/Facility.imageset/Facility@2x.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Facility.imageset/Facility@2x.png rename to arcgis-ios-sdk-samples/Assets.xcassets/Facility.imageset/Facility@2x.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Facility.imageset/Facility@3x.png b/arcgis-ios-sdk-samples/Assets.xcassets/Facility.imageset/Facility@3x.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Facility.imageset/Facility@3x.png rename to arcgis-ios-sdk-samples/Assets.xcassets/Facility.imageset/Facility@3x.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/ForwardIcon.imageset/Contents.json b/arcgis-ios-sdk-samples/Assets.xcassets/ForwardIcon.imageset/Contents.json similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/ForwardIcon.imageset/Contents.json rename to arcgis-ios-sdk-samples/Assets.xcassets/ForwardIcon.imageset/Contents.json diff --git a/arcgis-ios-sdk-samples/Images.xcassets/ForwardIcon.imageset/iOS7_TabBar_ForwardNavigation30s.png b/arcgis-ios-sdk-samples/Assets.xcassets/ForwardIcon.imageset/iOS7_TabBar_ForwardNavigation30s.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/ForwardIcon.imageset/iOS7_TabBar_ForwardNavigation30s.png rename to arcgis-ios-sdk-samples/Assets.xcassets/ForwardIcon.imageset/iOS7_TabBar_ForwardNavigation30s.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/ForwardIcon.imageset/iOS7_TabBar_ForwardNavigation60s.png b/arcgis-ios-sdk-samples/Assets.xcassets/ForwardIcon.imageset/iOS7_TabBar_ForwardNavigation60s.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/ForwardIcon.imageset/iOS7_TabBar_ForwardNavigation60s.png rename to arcgis-ios-sdk-samples/Assets.xcassets/ForwardIcon.imageset/iOS7_TabBar_ForwardNavigation60s.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/ForwardNavigation.imageset/Contents.json b/arcgis-ios-sdk-samples/Assets.xcassets/ForwardNavigation.imageset/Contents.json similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/ForwardNavigation.imageset/Contents.json rename to arcgis-ios-sdk-samples/Assets.xcassets/ForwardNavigation.imageset/Contents.json diff --git a/arcgis-ios-sdk-samples/Images.xcassets/ForwardNavigation.imageset/iOS7_TabBar_ForwardNavigation30s.png b/arcgis-ios-sdk-samples/Assets.xcassets/ForwardNavigation.imageset/iOS7_TabBar_ForwardNavigation30s.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/ForwardNavigation.imageset/iOS7_TabBar_ForwardNavigation30s.png rename to arcgis-ios-sdk-samples/Assets.xcassets/ForwardNavigation.imageset/iOS7_TabBar_ForwardNavigation30s.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/ForwardNavigation.imageset/iOS7_TabBar_ForwardNavigation60s.png b/arcgis-ios-sdk-samples/Assets.xcassets/ForwardNavigation.imageset/iOS7_TabBar_ForwardNavigation60s.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/ForwardNavigation.imageset/iOS7_TabBar_ForwardNavigation60s.png rename to arcgis-ios-sdk-samples/Assets.xcassets/ForwardNavigation.imageset/iOS7_TabBar_ForwardNavigation60s.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/FreehandPolygon.imageset/Contents.json b/arcgis-ios-sdk-samples/Assets.xcassets/FreehandPolygon.imageset/Contents.json similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/FreehandPolygon.imageset/Contents.json rename to arcgis-ios-sdk-samples/Assets.xcassets/FreehandPolygon.imageset/Contents.json diff --git a/arcgis-ios-sdk-samples/Images.xcassets/FreehandPolygon.imageset/FreehandPolygon.png b/arcgis-ios-sdk-samples/Assets.xcassets/FreehandPolygon.imageset/FreehandPolygon.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/FreehandPolygon.imageset/FreehandPolygon.png rename to arcgis-ios-sdk-samples/Assets.xcassets/FreehandPolygon.imageset/FreehandPolygon.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/FreehandPolygon.imageset/FreehandPolygon@2x.png b/arcgis-ios-sdk-samples/Assets.xcassets/FreehandPolygon.imageset/FreehandPolygon@2x.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/FreehandPolygon.imageset/FreehandPolygon@2x.png rename to arcgis-ios-sdk-samples/Assets.xcassets/FreehandPolygon.imageset/FreehandPolygon@2x.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/FreehandPolygon.imageset/FreehandPolygon@3x.png b/arcgis-ios-sdk-samples/Assets.xcassets/FreehandPolygon.imageset/FreehandPolygon@3x.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/FreehandPolygon.imageset/FreehandPolygon@3x.png rename to arcgis-ios-sdk-samples/Assets.xcassets/FreehandPolygon.imageset/FreehandPolygon@3x.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/FreehandPolyline.imageset/Contents.json b/arcgis-ios-sdk-samples/Assets.xcassets/FreehandPolyline.imageset/Contents.json similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/FreehandPolyline.imageset/Contents.json rename to arcgis-ios-sdk-samples/Assets.xcassets/FreehandPolyline.imageset/Contents.json diff --git a/arcgis-ios-sdk-samples/Images.xcassets/FreehandPolyline.imageset/iOS7_Toolbar_FreehandSketch22.png b/arcgis-ios-sdk-samples/Assets.xcassets/FreehandPolyline.imageset/iOS7_Toolbar_FreehandSketch22.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/FreehandPolyline.imageset/iOS7_Toolbar_FreehandSketch22.png rename to arcgis-ios-sdk-samples/Assets.xcassets/FreehandPolyline.imageset/iOS7_Toolbar_FreehandSketch22.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/FreehandPolyline.imageset/iOS7_Toolbar_FreehandSketch44.png b/arcgis-ios-sdk-samples/Assets.xcassets/FreehandPolyline.imageset/iOS7_Toolbar_FreehandSketch44.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/FreehandPolyline.imageset/iOS7_Toolbar_FreehandSketch44.png rename to arcgis-ios-sdk-samples/Assets.xcassets/FreehandPolyline.imageset/iOS7_Toolbar_FreehandSketch44.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/FreehandSketchIcon.imageset/Contents.json b/arcgis-ios-sdk-samples/Assets.xcassets/FreehandSketchIcon.imageset/Contents.json similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/FreehandSketchIcon.imageset/Contents.json rename to arcgis-ios-sdk-samples/Assets.xcassets/FreehandSketchIcon.imageset/Contents.json diff --git a/arcgis-ios-sdk-samples/Images.xcassets/FreehandSketchIcon.imageset/iOS7_Special_Sketch25.png b/arcgis-ios-sdk-samples/Assets.xcassets/FreehandSketchIcon.imageset/iOS7_Special_Sketch25.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/FreehandSketchIcon.imageset/iOS7_Special_Sketch25.png rename to arcgis-ios-sdk-samples/Assets.xcassets/FreehandSketchIcon.imageset/iOS7_Special_Sketch25.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/FreehandSketchIcon.imageset/iOS7_Special_Sketch50.png b/arcgis-ios-sdk-samples/Assets.xcassets/FreehandSketchIcon.imageset/iOS7_Special_Sketch50.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/FreehandSketchIcon.imageset/iOS7_Special_Sketch50.png rename to arcgis-ios-sdk-samples/Assets.xcassets/FreehandSketchIcon.imageset/iOS7_Special_Sketch50.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/FreehandSketchIcon.imageset/iOS7_Special_Sketch75.png b/arcgis-ios-sdk-samples/Assets.xcassets/FreehandSketchIcon.imageset/iOS7_Special_Sketch75.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/FreehandSketchIcon.imageset/iOS7_Special_Sketch75.png rename to arcgis-ios-sdk-samples/Assets.xcassets/FreehandSketchIcon.imageset/iOS7_Special_Sketch75.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/GreenMarker.imageset/Contents.json b/arcgis-ios-sdk-samples/Assets.xcassets/GreenMarker.imageset/Contents.json similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/GreenMarker.imageset/Contents.json rename to arcgis-ios-sdk-samples/Assets.xcassets/GreenMarker.imageset/Contents.json diff --git a/arcgis-ios-sdk-samples/Images.xcassets/GreenMarker.imageset/pin_blank_green@1x.png b/arcgis-ios-sdk-samples/Assets.xcassets/GreenMarker.imageset/pin_blank_green@1x.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/GreenMarker.imageset/pin_blank_green@1x.png rename to arcgis-ios-sdk-samples/Assets.xcassets/GreenMarker.imageset/pin_blank_green@1x.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/GreenMarker.imageset/pin_blank_green@2x.png b/arcgis-ios-sdk-samples/Assets.xcassets/GreenMarker.imageset/pin_blank_green@2x.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/GreenMarker.imageset/pin_blank_green@2x.png rename to arcgis-ios-sdk-samples/Assets.xcassets/GreenMarker.imageset/pin_blank_green@2x.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/GreenMarker.imageset/pin_blank_green@3x.png b/arcgis-ios-sdk-samples/Assets.xcassets/GreenMarker.imageset/pin_blank_green@3x.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/GreenMarker.imageset/pin_blank_green@3x.png rename to arcgis-ios-sdk-samples/Assets.xcassets/GreenMarker.imageset/pin_blank_green@3x.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Imagery.imageset/Contents.json b/arcgis-ios-sdk-samples/Assets.xcassets/Imagery.imageset/Contents.json similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Imagery.imageset/Contents.json rename to arcgis-ios-sdk-samples/Assets.xcassets/Imagery.imageset/Contents.json diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Imagery.imageset/Imagery_Labels2x.jpeg b/arcgis-ios-sdk-samples/Assets.xcassets/Imagery.imageset/Imagery_Labels2x.jpeg similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Imagery.imageset/Imagery_Labels2x.jpeg rename to arcgis-ios-sdk-samples/Assets.xcassets/Imagery.imageset/Imagery_Labels2x.jpeg diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Imagery.imageset/Imagery_Labels3x-1.jpeg b/arcgis-ios-sdk-samples/Assets.xcassets/Imagery.imageset/Imagery_Labels3x-1.jpeg similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Imagery.imageset/Imagery_Labels3x-1.jpeg rename to arcgis-ios-sdk-samples/Assets.xcassets/Imagery.imageset/Imagery_Labels3x-1.jpeg diff --git a/arcgis-ios-sdk-samples/Images.xcassets/InfoIcon.imageset/Contents.json b/arcgis-ios-sdk-samples/Assets.xcassets/InfoIcon.imageset/Contents.json similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/InfoIcon.imageset/Contents.json rename to arcgis-ios-sdk-samples/Assets.xcassets/InfoIcon.imageset/Contents.json diff --git a/arcgis-ios-sdk-samples/Images.xcassets/InfoIcon.imageset/iOS7_Toolbar_About22.png b/arcgis-ios-sdk-samples/Assets.xcassets/InfoIcon.imageset/iOS7_Toolbar_About22.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/InfoIcon.imageset/iOS7_Toolbar_About22.png rename to arcgis-ios-sdk-samples/Assets.xcassets/InfoIcon.imageset/iOS7_Toolbar_About22.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/InfoIcon.imageset/iOS7_Toolbar_About44.png b/arcgis-ios-sdk-samples/Assets.xcassets/InfoIcon.imageset/iOS7_Toolbar_About44.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/InfoIcon.imageset/iOS7_Toolbar_About44.png rename to arcgis-ios-sdk-samples/Assets.xcassets/InfoIcon.imageset/iOS7_Toolbar_About44.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/LocationDisplayDefaultIcon.imageset/Contents.json b/arcgis-ios-sdk-samples/Assets.xcassets/LocationDisplayDefaultIcon.imageset/Contents.json similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/LocationDisplayDefaultIcon.imageset/Contents.json rename to arcgis-ios-sdk-samples/Assets.xcassets/LocationDisplayDefaultIcon.imageset/Contents.json diff --git a/arcgis-ios-sdk-samples/Images.xcassets/LocationDisplayDefaultIcon.imageset/LocationDisplayDefaultIcon.png b/arcgis-ios-sdk-samples/Assets.xcassets/LocationDisplayDefaultIcon.imageset/LocationDisplayDefaultIcon.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/LocationDisplayDefaultIcon.imageset/LocationDisplayDefaultIcon.png rename to arcgis-ios-sdk-samples/Assets.xcassets/LocationDisplayDefaultIcon.imageset/LocationDisplayDefaultIcon.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/LocationDisplayDefaultIcon.imageset/LocationDisplayDefaultIcon@2x.png b/arcgis-ios-sdk-samples/Assets.xcassets/LocationDisplayDefaultIcon.imageset/LocationDisplayDefaultIcon@2x.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/LocationDisplayDefaultIcon.imageset/LocationDisplayDefaultIcon@2x.png rename to arcgis-ios-sdk-samples/Assets.xcassets/LocationDisplayDefaultIcon.imageset/LocationDisplayDefaultIcon@2x.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/LocationDisplayDefaultIcon.imageset/LocationDisplayDefaultIcon@3x.png b/arcgis-ios-sdk-samples/Assets.xcassets/LocationDisplayDefaultIcon.imageset/LocationDisplayDefaultIcon@3x.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/LocationDisplayDefaultIcon.imageset/LocationDisplayDefaultIcon@3x.png rename to arcgis-ios-sdk-samples/Assets.xcassets/LocationDisplayDefaultIcon.imageset/LocationDisplayDefaultIcon@3x.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/LocationDisplayHeadingIcon.imageset/Contents.json b/arcgis-ios-sdk-samples/Assets.xcassets/LocationDisplayHeadingIcon.imageset/Contents.json similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/LocationDisplayHeadingIcon.imageset/Contents.json rename to arcgis-ios-sdk-samples/Assets.xcassets/LocationDisplayHeadingIcon.imageset/Contents.json diff --git a/arcgis-ios-sdk-samples/Images.xcassets/LocationDisplayHeadingIcon.imageset/LocationDisplayHeadingIcon2@2x.png b/arcgis-ios-sdk-samples/Assets.xcassets/LocationDisplayHeadingIcon.imageset/LocationDisplayHeadingIcon2@2x.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/LocationDisplayHeadingIcon.imageset/LocationDisplayHeadingIcon2@2x.png rename to arcgis-ios-sdk-samples/Assets.xcassets/LocationDisplayHeadingIcon.imageset/LocationDisplayHeadingIcon2@2x.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/LocationDisplayHeadingIcon.imageset/LocationDisplayHeadingIcon2@3x.png b/arcgis-ios-sdk-samples/Assets.xcassets/LocationDisplayHeadingIcon.imageset/LocationDisplayHeadingIcon2@3x.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/LocationDisplayHeadingIcon.imageset/LocationDisplayHeadingIcon2@3x.png rename to arcgis-ios-sdk-samples/Assets.xcassets/LocationDisplayHeadingIcon.imageset/LocationDisplayHeadingIcon2@3x.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/LocationDisplayNavigationIcon.imageset/Contents.json b/arcgis-ios-sdk-samples/Assets.xcassets/LocationDisplayNavigationIcon.imageset/Contents.json similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/LocationDisplayNavigationIcon.imageset/Contents.json rename to arcgis-ios-sdk-samples/Assets.xcassets/LocationDisplayNavigationIcon.imageset/Contents.json diff --git a/arcgis-ios-sdk-samples/Images.xcassets/LocationDisplayNavigationIcon.imageset/LocationDisplayNavigationIcon2@2x.png b/arcgis-ios-sdk-samples/Assets.xcassets/LocationDisplayNavigationIcon.imageset/LocationDisplayNavigationIcon2@2x.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/LocationDisplayNavigationIcon.imageset/LocationDisplayNavigationIcon2@2x.png rename to arcgis-ios-sdk-samples/Assets.xcassets/LocationDisplayNavigationIcon.imageset/LocationDisplayNavigationIcon2@2x.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/LocationDisplayNavigationIcon.imageset/LocationDisplayNavigationIcon2@3x.png b/arcgis-ios-sdk-samples/Assets.xcassets/LocationDisplayNavigationIcon.imageset/LocationDisplayNavigationIcon2@3x.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/LocationDisplayNavigationIcon.imageset/LocationDisplayNavigationIcon2@3x.png rename to arcgis-ios-sdk-samples/Assets.xcassets/LocationDisplayNavigationIcon.imageset/LocationDisplayNavigationIcon2@3x.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/LocationDisplayOffIcon.imageset/Contents.json b/arcgis-ios-sdk-samples/Assets.xcassets/LocationDisplayOffIcon.imageset/Contents.json similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/LocationDisplayOffIcon.imageset/Contents.json rename to arcgis-ios-sdk-samples/Assets.xcassets/LocationDisplayOffIcon.imageset/Contents.json diff --git a/arcgis-ios-sdk-samples/Images.xcassets/LocationDisplayOffIcon.imageset/LocationDisplayDefaultIcon.png b/arcgis-ios-sdk-samples/Assets.xcassets/LocationDisplayOffIcon.imageset/LocationDisplayDefaultIcon.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/LocationDisplayOffIcon.imageset/LocationDisplayDefaultIcon.png rename to arcgis-ios-sdk-samples/Assets.xcassets/LocationDisplayOffIcon.imageset/LocationDisplayDefaultIcon.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/LocationDisplayOffIcon.imageset/LocationDisplayDefaultIcon@2x.png b/arcgis-ios-sdk-samples/Assets.xcassets/LocationDisplayOffIcon.imageset/LocationDisplayDefaultIcon@2x.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/LocationDisplayOffIcon.imageset/LocationDisplayDefaultIcon@2x.png rename to arcgis-ios-sdk-samples/Assets.xcassets/LocationDisplayOffIcon.imageset/LocationDisplayDefaultIcon@2x.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/LocationDisplayOffIcon.imageset/LocationDisplayDefaultIcon@3x.png b/arcgis-ios-sdk-samples/Assets.xcassets/LocationDisplayOffIcon.imageset/LocationDisplayDefaultIcon@3x.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/LocationDisplayOffIcon.imageset/LocationDisplayDefaultIcon@3x.png rename to arcgis-ios-sdk-samples/Assets.xcassets/LocationDisplayOffIcon.imageset/LocationDisplayDefaultIcon@3x.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Oceans.imageset/Contents.json b/arcgis-ios-sdk-samples/Assets.xcassets/Oceans.imageset/Contents.json similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Oceans.imageset/Contents.json rename to arcgis-ios-sdk-samples/Assets.xcassets/Oceans.imageset/Contents.json diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Oceans.imageset/oceans_5_0_gulf.jpg b/arcgis-ios-sdk-samples/Assets.xcassets/Oceans.imageset/oceans_5_0_gulf.jpg similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Oceans.imageset/oceans_5_0_gulf.jpg rename to arcgis-ios-sdk-samples/Assets.xcassets/Oceans.imageset/oceans_5_0_gulf.jpg diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Oceans.imageset/oceans_5_0_gulf2x.jpeg b/arcgis-ios-sdk-samples/Assets.xcassets/Oceans.imageset/oceans_5_0_gulf2x.jpeg similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Oceans.imageset/oceans_5_0_gulf2x.jpeg rename to arcgis-ios-sdk-samples/Assets.xcassets/Oceans.imageset/oceans_5_0_gulf2x.jpeg diff --git a/arcgis-ios-sdk-samples/Images.xcassets/OpenMapURLThumbnail1.imageset/Contents.json b/arcgis-ios-sdk-samples/Assets.xcassets/OpenMapURLThumbnail1.imageset/Contents.json similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/OpenMapURLThumbnail1.imageset/Contents.json rename to arcgis-ios-sdk-samples/Assets.xcassets/OpenMapURLThumbnail1.imageset/Contents.json diff --git a/arcgis-ios-sdk-samples/Images.xcassets/OpenMapURLThumbnail1.imageset/Screenshot_2015-05-24_11.23.51.png b/arcgis-ios-sdk-samples/Assets.xcassets/OpenMapURLThumbnail1.imageset/Screenshot_2015-05-24_11.23.51.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/OpenMapURLThumbnail1.imageset/Screenshot_2015-05-24_11.23.51.png rename to arcgis-ios-sdk-samples/Assets.xcassets/OpenMapURLThumbnail1.imageset/Screenshot_2015-05-24_11.23.51.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/OpenMapURLThumbnail2.imageset/Contents.json b/arcgis-ios-sdk-samples/Assets.xcassets/OpenMapURLThumbnail2.imageset/Contents.json similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/OpenMapURLThumbnail2.imageset/Contents.json rename to arcgis-ios-sdk-samples/Assets.xcassets/OpenMapURLThumbnail2.imageset/Contents.json diff --git a/arcgis-ios-sdk-samples/Images.xcassets/OpenMapURLThumbnail2.imageset/Tapestry.png b/arcgis-ios-sdk-samples/Assets.xcassets/OpenMapURLThumbnail2.imageset/Tapestry.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/OpenMapURLThumbnail2.imageset/Tapestry.png rename to arcgis-ios-sdk-samples/Assets.xcassets/OpenMapURLThumbnail2.imageset/Tapestry.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/OpenMapURLThumbnail3.imageset/Contents.json b/arcgis-ios-sdk-samples/Assets.xcassets/OpenMapURLThumbnail3.imageset/Contents.json similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/OpenMapURLThumbnail3.imageset/Contents.json rename to arcgis-ios-sdk-samples/Assets.xcassets/OpenMapURLThumbnail3.imageset/Contents.json diff --git a/arcgis-ios-sdk-samples/Images.xcassets/OpenMapURLThumbnail3.imageset/geology.jpg b/arcgis-ios-sdk-samples/Assets.xcassets/OpenMapURLThumbnail3.imageset/geology.jpg similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/OpenMapURLThumbnail3.imageset/geology.jpg rename to arcgis-ios-sdk-samples/Assets.xcassets/OpenMapURLThumbnail3.imageset/geology.jpg diff --git a/arcgis-ios-sdk-samples/Images.xcassets/PinBlueStar.imageset/Contents.json b/arcgis-ios-sdk-samples/Assets.xcassets/PinBlueStar.imageset/Contents.json similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/PinBlueStar.imageset/Contents.json rename to arcgis-ios-sdk-samples/Assets.xcassets/PinBlueStar.imageset/Contents.json diff --git a/arcgis-ios-sdk-samples/Images.xcassets/PinBlueStar.imageset/iOS_Pin_BlueStar24.png b/arcgis-ios-sdk-samples/Assets.xcassets/PinBlueStar.imageset/iOS_Pin_BlueStar24.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/PinBlueStar.imageset/iOS_Pin_BlueStar24.png rename to arcgis-ios-sdk-samples/Assets.xcassets/PinBlueStar.imageset/iOS_Pin_BlueStar24.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/PinBlueStar.imageset/iOS_Pin_BlueStar48.png b/arcgis-ios-sdk-samples/Assets.xcassets/PinBlueStar.imageset/iOS_Pin_BlueStar48.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/PinBlueStar.imageset/iOS_Pin_BlueStar48.png rename to arcgis-ios-sdk-samples/Assets.xcassets/PinBlueStar.imageset/iOS_Pin_BlueStar48.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/PinBlueStar.imageset/iOS_Pin_BlueStar72.png b/arcgis-ios-sdk-samples/Assets.xcassets/PinBlueStar.imageset/iOS_Pin_BlueStar72.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/PinBlueStar.imageset/iOS_Pin_BlueStar72.png rename to arcgis-ios-sdk-samples/Assets.xcassets/PinBlueStar.imageset/iOS_Pin_BlueStar72.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/PinIcon.imageset/Contents.json b/arcgis-ios-sdk-samples/Assets.xcassets/PinIcon.imageset/Contents.json similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/PinIcon.imageset/Contents.json rename to arcgis-ios-sdk-samples/Assets.xcassets/PinIcon.imageset/Contents.json diff --git a/arcgis-ios-sdk-samples/Images.xcassets/PinIcon.imageset/iOS7_Toolbar_PinOutline44.png b/arcgis-ios-sdk-samples/Assets.xcassets/PinIcon.imageset/iOS7_Toolbar_PinOutline44.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/PinIcon.imageset/iOS7_Toolbar_PinOutline44.png rename to arcgis-ios-sdk-samples/Assets.xcassets/PinIcon.imageset/iOS7_Toolbar_PinOutline44.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/PinOutline.imageset/Contents.json b/arcgis-ios-sdk-samples/Assets.xcassets/PinOutline.imageset/Contents.json similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/PinOutline.imageset/Contents.json rename to arcgis-ios-sdk-samples/Assets.xcassets/PinOutline.imageset/Contents.json diff --git a/arcgis-ios-sdk-samples/Images.xcassets/PinOutline.imageset/iOS7_Toolbar_PinOutline22.png b/arcgis-ios-sdk-samples/Assets.xcassets/PinOutline.imageset/iOS7_Toolbar_PinOutline22.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/PinOutline.imageset/iOS7_Toolbar_PinOutline22.png rename to arcgis-ios-sdk-samples/Assets.xcassets/PinOutline.imageset/iOS7_Toolbar_PinOutline22.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/PinOutline.imageset/iOS7_Toolbar_PinOutline44.png b/arcgis-ios-sdk-samples/Assets.xcassets/PinOutline.imageset/iOS7_Toolbar_PinOutline44.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/PinOutline.imageset/iOS7_Toolbar_PinOutline44.png rename to arcgis-ios-sdk-samples/Assets.xcassets/PinOutline.imageset/iOS7_Toolbar_PinOutline44.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Placeholder.imageset/Contents.json b/arcgis-ios-sdk-samples/Assets.xcassets/Placeholder.imageset/Contents.json similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Placeholder.imageset/Contents.json rename to arcgis-ios-sdk-samples/Assets.xcassets/Placeholder.imageset/Contents.json diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Placeholder.imageset/Placeholder.png b/arcgis-ios-sdk-samples/Assets.xcassets/Placeholder.imageset/Placeholder.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Placeholder.imageset/Placeholder.png rename to arcgis-ios-sdk-samples/Assets.xcassets/Placeholder.imageset/Placeholder.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Placeholder.imageset/Placeholder@2x.png b/arcgis-ios-sdk-samples/Assets.xcassets/Placeholder.imageset/Placeholder@2x.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Placeholder.imageset/Placeholder@2x.png rename to arcgis-ios-sdk-samples/Assets.xcassets/Placeholder.imageset/Placeholder@2x.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Placeholder.imageset/Placeholder@3x.png b/arcgis-ios-sdk-samples/Assets.xcassets/Placeholder.imageset/Placeholder@3x.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Placeholder.imageset/Placeholder@3x.png rename to arcgis-ios-sdk-samples/Assets.xcassets/Placeholder.imageset/Placeholder@3x.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Point.imageset/Contents.json b/arcgis-ios-sdk-samples/Assets.xcassets/Point.imageset/Contents.json similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Point.imageset/Contents.json rename to arcgis-ios-sdk-samples/Assets.xcassets/Point.imageset/Contents.json diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Point.imageset/Point.png b/arcgis-ios-sdk-samples/Assets.xcassets/Point.imageset/Point.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Point.imageset/Point.png rename to arcgis-ios-sdk-samples/Assets.xcassets/Point.imageset/Point.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Point.imageset/Point@2x.png b/arcgis-ios-sdk-samples/Assets.xcassets/Point.imageset/Point@2x.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Point.imageset/Point@2x.png rename to arcgis-ios-sdk-samples/Assets.xcassets/Point.imageset/Point@2x.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Point.imageset/Point@3x.png b/arcgis-ios-sdk-samples/Assets.xcassets/Point.imageset/Point@3x.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Point.imageset/Point@3x.png rename to arcgis-ios-sdk-samples/Assets.xcassets/Point.imageset/Point@3x.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Polygon.imageset/Contents.json b/arcgis-ios-sdk-samples/Assets.xcassets/Polygon.imageset/Contents.json similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Polygon.imageset/Contents.json rename to arcgis-ios-sdk-samples/Assets.xcassets/Polygon.imageset/Contents.json diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Polygon.imageset/Polygon.png b/arcgis-ios-sdk-samples/Assets.xcassets/Polygon.imageset/Polygon.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Polygon.imageset/Polygon.png rename to arcgis-ios-sdk-samples/Assets.xcassets/Polygon.imageset/Polygon.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Polygon.imageset/Polygon@2x.png b/arcgis-ios-sdk-samples/Assets.xcassets/Polygon.imageset/Polygon@2x.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Polygon.imageset/Polygon@2x.png rename to arcgis-ios-sdk-samples/Assets.xcassets/Polygon.imageset/Polygon@2x.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Polygon.imageset/Polygon@3x.png b/arcgis-ios-sdk-samples/Assets.xcassets/Polygon.imageset/Polygon@3x.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Polygon.imageset/Polygon@3x.png rename to arcgis-ios-sdk-samples/Assets.xcassets/Polygon.imageset/Polygon@3x.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Polyline.imageset/Contents.json b/arcgis-ios-sdk-samples/Assets.xcassets/Polyline.imageset/Contents.json similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Polyline.imageset/Contents.json rename to arcgis-ios-sdk-samples/Assets.xcassets/Polyline.imageset/Contents.json diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Polyline.imageset/Polyline.png b/arcgis-ios-sdk-samples/Assets.xcassets/Polyline.imageset/Polyline.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Polyline.imageset/Polyline.png rename to arcgis-ios-sdk-samples/Assets.xcassets/Polyline.imageset/Polyline.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Polyline.imageset/Polyline@2x.png b/arcgis-ios-sdk-samples/Assets.xcassets/Polyline.imageset/Polyline@2x.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Polyline.imageset/Polyline@2x.png rename to arcgis-ios-sdk-samples/Assets.xcassets/Polyline.imageset/Polyline@2x.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Polyline.imageset/Polyline@3x.png b/arcgis-ios-sdk-samples/Assets.xcassets/Polyline.imageset/Polyline@3x.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Polyline.imageset/Polyline@3x.png rename to arcgis-ios-sdk-samples/Assets.xcassets/Polyline.imageset/Polyline@3x.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/RedMarker.imageset/Contents.json b/arcgis-ios-sdk-samples/Assets.xcassets/RedMarker.imageset/Contents.json similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/RedMarker.imageset/Contents.json rename to arcgis-ios-sdk-samples/Assets.xcassets/RedMarker.imageset/Contents.json diff --git a/arcgis-ios-sdk-samples/Images.xcassets/RedMarker.imageset/iOS8_MapPin_RedCircle108.png b/arcgis-ios-sdk-samples/Assets.xcassets/RedMarker.imageset/iOS8_MapPin_RedCircle108.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/RedMarker.imageset/iOS8_MapPin_RedCircle108.png rename to arcgis-ios-sdk-samples/Assets.xcassets/RedMarker.imageset/iOS8_MapPin_RedCircle108.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/RedMarker.imageset/iOS8_MapPin_RedCircle36.png b/arcgis-ios-sdk-samples/Assets.xcassets/RedMarker.imageset/iOS8_MapPin_RedCircle36.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/RedMarker.imageset/iOS8_MapPin_RedCircle36.png rename to arcgis-ios-sdk-samples/Assets.xcassets/RedMarker.imageset/iOS8_MapPin_RedCircle36.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/RedMarker.imageset/iOS8_MapPin_RedCircle72.png b/arcgis-ios-sdk-samples/Assets.xcassets/RedMarker.imageset/iOS8_MapPin_RedCircle72.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/RedMarker.imageset/iOS8_MapPin_RedCircle72.png rename to arcgis-ios-sdk-samples/Assets.xcassets/RedMarker.imageset/iOS8_MapPin_RedCircle72.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/RedMarker2.imageset/Contents.json b/arcgis-ios-sdk-samples/Assets.xcassets/RedMarker2.imageset/Contents.json similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/RedMarker2.imageset/Contents.json rename to arcgis-ios-sdk-samples/Assets.xcassets/RedMarker2.imageset/Contents.json diff --git a/arcgis-ios-sdk-samples/Images.xcassets/RedMarker2.imageset/pin_blank_red@1x.png b/arcgis-ios-sdk-samples/Assets.xcassets/RedMarker2.imageset/pin_blank_red@1x.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/RedMarker2.imageset/pin_blank_red@1x.png rename to arcgis-ios-sdk-samples/Assets.xcassets/RedMarker2.imageset/pin_blank_red@1x.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/RedMarker2.imageset/pin_blank_red@2x.png b/arcgis-ios-sdk-samples/Assets.xcassets/RedMarker2.imageset/pin_blank_red@2x.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/RedMarker2.imageset/pin_blank_red@2x.png rename to arcgis-ios-sdk-samples/Assets.xcassets/RedMarker2.imageset/pin_blank_red@2x.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/RedMarker2.imageset/pin_blank_red@3x.png b/arcgis-ios-sdk-samples/Assets.xcassets/RedMarker2.imageset/pin_blank_red@3x.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/RedMarker2.imageset/pin_blank_red@3x.png rename to arcgis-ios-sdk-samples/Assets.xcassets/RedMarker2.imageset/pin_blank_red@3x.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Redo.imageset/Contents.json b/arcgis-ios-sdk-samples/Assets.xcassets/Redo.imageset/Contents.json similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Redo.imageset/Contents.json rename to arcgis-ios-sdk-samples/Assets.xcassets/Redo.imageset/Contents.json diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Redo.imageset/iOS8_TabBar_Redo22s.png b/arcgis-ios-sdk-samples/Assets.xcassets/Redo.imageset/iOS8_TabBar_Redo22s.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Redo.imageset/iOS8_TabBar_Redo22s.png rename to arcgis-ios-sdk-samples/Assets.xcassets/Redo.imageset/iOS8_TabBar_Redo22s.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Redo.imageset/iOS8_TabBar_Redo44s.png b/arcgis-ios-sdk-samples/Assets.xcassets/Redo.imageset/iOS8_TabBar_Redo44s.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Redo.imageset/iOS8_TabBar_Redo44s.png rename to arcgis-ios-sdk-samples/Assets.xcassets/Redo.imageset/iOS8_TabBar_Redo44s.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Redo.imageset/iOS8_TabBar_Redo66s.png b/arcgis-ios-sdk-samples/Assets.xcassets/Redo.imageset/iOS8_TabBar_Redo66s.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Redo.imageset/iOS8_TabBar_Redo66s.png rename to arcgis-ios-sdk-samples/Assets.xcassets/Redo.imageset/iOS8_TabBar_Redo66s.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/SearchIcon.imageset/Contents.json b/arcgis-ios-sdk-samples/Assets.xcassets/SearchIcon.imageset/Contents.json similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/SearchIcon.imageset/Contents.json rename to arcgis-ios-sdk-samples/Assets.xcassets/SearchIcon.imageset/Contents.json diff --git a/arcgis-ios-sdk-samples/Images.xcassets/SearchIcon.imageset/iOS7_Toolbar_Find44s.png b/arcgis-ios-sdk-samples/Assets.xcassets/SearchIcon.imageset/iOS7_Toolbar_Find44s.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/SearchIcon.imageset/iOS7_Toolbar_Find44s.png rename to arcgis-ios-sdk-samples/Assets.xcassets/SearchIcon.imageset/iOS7_Toolbar_Find44s.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Settings.imageset/Contents.json b/arcgis-ios-sdk-samples/Assets.xcassets/Settings.imageset/Contents.json similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Settings.imageset/Contents.json rename to arcgis-ios-sdk-samples/Assets.xcassets/Settings.imageset/Contents.json diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Settings.imageset/iOS7_TabBar_BAO-Nav_Settings30.png b/arcgis-ios-sdk-samples/Assets.xcassets/Settings.imageset/iOS7_TabBar_BAO-Nav_Settings30.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Settings.imageset/iOS7_TabBar_BAO-Nav_Settings30.png rename to arcgis-ios-sdk-samples/Assets.xcassets/Settings.imageset/iOS7_TabBar_BAO-Nav_Settings30.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Settings.imageset/iOS7_TabBar_BAO-Nav_Settings60.png b/arcgis-ios-sdk-samples/Assets.xcassets/Settings.imageset/iOS7_TabBar_BAO-Nav_Settings60.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Settings.imageset/iOS7_TabBar_BAO-Nav_Settings60.png rename to arcgis-ios-sdk-samples/Assets.xcassets/Settings.imageset/iOS7_TabBar_BAO-Nav_Settings60.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/SketchIcon.imageset/Contents.json b/arcgis-ios-sdk-samples/Assets.xcassets/SketchIcon.imageset/Contents.json similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/SketchIcon.imageset/Contents.json rename to arcgis-ios-sdk-samples/Assets.xcassets/SketchIcon.imageset/Contents.json diff --git a/arcgis-ios-sdk-samples/Images.xcassets/SketchIcon.imageset/iOS7_Special_Tap25.png b/arcgis-ios-sdk-samples/Assets.xcassets/SketchIcon.imageset/iOS7_Special_Tap25.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/SketchIcon.imageset/iOS7_Special_Tap25.png rename to arcgis-ios-sdk-samples/Assets.xcassets/SketchIcon.imageset/iOS7_Special_Tap25.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/SketchIcon.imageset/iOS7_Special_Tap50.png b/arcgis-ios-sdk-samples/Assets.xcassets/SketchIcon.imageset/iOS7_Special_Tap50.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/SketchIcon.imageset/iOS7_Special_Tap50.png rename to arcgis-ios-sdk-samples/Assets.xcassets/SketchIcon.imageset/iOS7_Special_Tap50.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/SketchIcon.imageset/iOS7_Special_Tap75.png b/arcgis-ios-sdk-samples/Assets.xcassets/SketchIcon.imageset/iOS7_Special_Tap75.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/SketchIcon.imageset/iOS7_Special_Tap75.png rename to arcgis-ios-sdk-samples/Assets.xcassets/SketchIcon.imageset/iOS7_Special_Tap75.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/StopA.imageset/Contents.json b/arcgis-ios-sdk-samples/Assets.xcassets/StopA.imageset/Contents.json similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/StopA.imageset/Contents.json rename to arcgis-ios-sdk-samples/Assets.xcassets/StopA.imageset/Contents.json diff --git a/arcgis-ios-sdk-samples/Images.xcassets/StopA.imageset/stopA108.png b/arcgis-ios-sdk-samples/Assets.xcassets/StopA.imageset/stopA108.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/StopA.imageset/stopA108.png rename to arcgis-ios-sdk-samples/Assets.xcassets/StopA.imageset/stopA108.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/StopA.imageset/stopA36.png b/arcgis-ios-sdk-samples/Assets.xcassets/StopA.imageset/stopA36.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/StopA.imageset/stopA36.png rename to arcgis-ios-sdk-samples/Assets.xcassets/StopA.imageset/stopA36.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/StopA.imageset/stopA72.png b/arcgis-ios-sdk-samples/Assets.xcassets/StopA.imageset/stopA72.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/StopA.imageset/stopA72.png rename to arcgis-ios-sdk-samples/Assets.xcassets/StopA.imageset/stopA72.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/StopB.imageset/Contents.json b/arcgis-ios-sdk-samples/Assets.xcassets/StopB.imageset/Contents.json similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/StopB.imageset/Contents.json rename to arcgis-ios-sdk-samples/Assets.xcassets/StopB.imageset/Contents.json diff --git a/arcgis-ios-sdk-samples/Images.xcassets/StopB.imageset/StopB108.png b/arcgis-ios-sdk-samples/Assets.xcassets/StopB.imageset/StopB108.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/StopB.imageset/StopB108.png rename to arcgis-ios-sdk-samples/Assets.xcassets/StopB.imageset/StopB108.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/StopB.imageset/StopB36.png b/arcgis-ios-sdk-samples/Assets.xcassets/StopB.imageset/StopB36.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/StopB.imageset/StopB36.png rename to arcgis-ios-sdk-samples/Assets.xcassets/StopB.imageset/StopB36.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/StopB.imageset/StopB72.png b/arcgis-ios-sdk-samples/Assets.xcassets/StopB.imageset/StopB72.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/StopB.imageset/StopB72.png rename to arcgis-ios-sdk-samples/Assets.xcassets/StopB.imageset/StopB72.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Streets.imageset/Contents.json b/arcgis-ios-sdk-samples/Assets.xcassets/Streets.imageset/Contents.json similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Streets.imageset/Contents.json rename to arcgis-ios-sdk-samples/Assets.xcassets/Streets.imageset/Contents.json diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Streets.imageset/world_street_map.jpg b/arcgis-ios-sdk-samples/Assets.xcassets/Streets.imageset/world_street_map.jpg similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Streets.imageset/world_street_map.jpg rename to arcgis-ios-sdk-samples/Assets.xcassets/Streets.imageset/world_street_map.jpg diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Streets.imageset/world_street_map2x.jpeg b/arcgis-ios-sdk-samples/Assets.xcassets/Streets.imageset/world_street_map2x.jpeg similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Streets.imageset/world_street_map2x.jpeg rename to arcgis-ios-sdk-samples/Assets.xcassets/Streets.imageset/world_street_map2x.jpeg diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Topographic.imageset/Contents.json b/arcgis-ios-sdk-samples/Assets.xcassets/Topographic.imageset/Contents.json similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Topographic.imageset/Contents.json rename to arcgis-ios-sdk-samples/Assets.xcassets/Topographic.imageset/Contents.json diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Topographic.imageset/topo_map_2.jpg b/arcgis-ios-sdk-samples/Assets.xcassets/Topographic.imageset/topo_map_2.jpg similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Topographic.imageset/topo_map_2.jpg rename to arcgis-ios-sdk-samples/Assets.xcassets/Topographic.imageset/topo_map_2.jpg diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Topographic.imageset/topo_map_2_2x.jpeg b/arcgis-ios-sdk-samples/Assets.xcassets/Topographic.imageset/topo_map_2_2x.jpeg similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Topographic.imageset/topo_map_2_2x.jpeg rename to arcgis-ios-sdk-samples/Assets.xcassets/Topographic.imageset/topo_map_2_2x.jpeg diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Undo.imageset/Contents.json b/arcgis-ios-sdk-samples/Assets.xcassets/Undo.imageset/Contents.json similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Undo.imageset/Contents.json rename to arcgis-ios-sdk-samples/Assets.xcassets/Undo.imageset/Contents.json diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Undo.imageset/iOS8_TabBar_Undo22s.png b/arcgis-ios-sdk-samples/Assets.xcassets/Undo.imageset/iOS8_TabBar_Undo22s.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Undo.imageset/iOS8_TabBar_Undo22s.png rename to arcgis-ios-sdk-samples/Assets.xcassets/Undo.imageset/iOS8_TabBar_Undo22s.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Undo.imageset/iOS8_TabBar_Undo44s.png b/arcgis-ios-sdk-samples/Assets.xcassets/Undo.imageset/iOS8_TabBar_Undo44s.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Undo.imageset/iOS8_TabBar_Undo44s.png rename to arcgis-ios-sdk-samples/Assets.xcassets/Undo.imageset/iOS8_TabBar_Undo44s.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/Undo.imageset/iOS8_TabBar_Undo66s.png b/arcgis-ios-sdk-samples/Assets.xcassets/Undo.imageset/iOS8_TabBar_Undo66s.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/Undo.imageset/iOS8_TabBar_Undo66s.png rename to arcgis-ios-sdk-samples/Assets.xcassets/Undo.imageset/iOS8_TabBar_Undo66s.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/VioletMarker.imageset/Contents.json b/arcgis-ios-sdk-samples/Assets.xcassets/VioletMarker.imageset/Contents.json similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/VioletMarker.imageset/Contents.json rename to arcgis-ios-sdk-samples/Assets.xcassets/VioletMarker.imageset/Contents.json diff --git a/arcgis-ios-sdk-samples/Images.xcassets/VioletMarker.imageset/pin_blank_violet@1x.png b/arcgis-ios-sdk-samples/Assets.xcassets/VioletMarker.imageset/pin_blank_violet@1x.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/VioletMarker.imageset/pin_blank_violet@1x.png rename to arcgis-ios-sdk-samples/Assets.xcassets/VioletMarker.imageset/pin_blank_violet@1x.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/VioletMarker.imageset/pin_blank_violet@2x.png b/arcgis-ios-sdk-samples/Assets.xcassets/VioletMarker.imageset/pin_blank_violet@2x.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/VioletMarker.imageset/pin_blank_violet@2x.png rename to arcgis-ios-sdk-samples/Assets.xcassets/VioletMarker.imageset/pin_blank_violet@2x.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/VioletMarker.imageset/pin_blank_violet@3x.png b/arcgis-ios-sdk-samples/Assets.xcassets/VioletMarker.imageset/pin_blank_violet@3x.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/VioletMarker.imageset/pin_blank_violet@3x.png rename to arcgis-ios-sdk-samples/Assets.xcassets/VioletMarker.imageset/pin_blank_violet@3x.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/testImage.imageset/Contents.json b/arcgis-ios-sdk-samples/Assets.xcassets/testImage.imageset/Contents.json similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/testImage.imageset/Contents.json rename to arcgis-ios-sdk-samples/Assets.xcassets/testImage.imageset/Contents.json diff --git a/arcgis-ios-sdk-samples/Images.xcassets/testImage.imageset/iOS7_Toolbar_Find44.png b/arcgis-ios-sdk-samples/Assets.xcassets/testImage.imageset/iOS7_Toolbar_Find44.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/testImage.imageset/iOS7_Toolbar_Find44.png rename to arcgis-ios-sdk-samples/Assets.xcassets/testImage.imageset/iOS7_Toolbar_Find44.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/testImage2.imageset/Contents.json b/arcgis-ios-sdk-samples/Assets.xcassets/testImage2.imageset/Contents.json similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/testImage2.imageset/Contents.json rename to arcgis-ios-sdk-samples/Assets.xcassets/testImage2.imageset/Contents.json diff --git a/arcgis-ios-sdk-samples/Images.xcassets/testImage2.imageset/iOS7_Toolbar_Folder44s.png b/arcgis-ios-sdk-samples/Assets.xcassets/testImage2.imageset/iOS7_Toolbar_Folder44s.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/testImage2.imageset/iOS7_Toolbar_Folder44s.png rename to arcgis-ios-sdk-samples/Assets.xcassets/testImage2.imageset/iOS7_Toolbar_Folder44s.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/trashBlue.imageset/Contents.json b/arcgis-ios-sdk-samples/Assets.xcassets/trashBlue.imageset/Contents.json similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/trashBlue.imageset/Contents.json rename to arcgis-ios-sdk-samples/Assets.xcassets/trashBlue.imageset/Contents.json diff --git a/arcgis-ios-sdk-samples/Images.xcassets/trashBlue.imageset/iOS7_Toolbar_Discard22.png b/arcgis-ios-sdk-samples/Assets.xcassets/trashBlue.imageset/iOS7_Toolbar_Discard22.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/trashBlue.imageset/iOS7_Toolbar_Discard22.png rename to arcgis-ios-sdk-samples/Assets.xcassets/trashBlue.imageset/iOS7_Toolbar_Discard22.png diff --git a/arcgis-ios-sdk-samples/Images.xcassets/trashBlue.imageset/iOS7_Toolbar_Discard44.png b/arcgis-ios-sdk-samples/Assets.xcassets/trashBlue.imageset/iOS7_Toolbar_Discard44.png similarity index 100% rename from arcgis-ios-sdk-samples/Images.xcassets/trashBlue.imageset/iOS7_Toolbar_Discard44.png rename to arcgis-ios-sdk-samples/Assets.xcassets/trashBlue.imageset/iOS7_Toolbar_Discard44.png diff --git a/arcgis-ios-sdk-samples/Augmented reality/Navigate in AR/NavigateARNavigatorViewController.swift b/arcgis-ios-sdk-samples/Augmented reality/Navigate in AR/NavigateARNavigatorViewController.swift index bf685caf4..e965a81d8 100644 --- a/arcgis-ios-sdk-samples/Augmented reality/Navigate in AR/NavigateARNavigatorViewController.swift +++ b/arcgis-ios-sdk-samples/Augmented reality/Navigate in AR/NavigateARNavigatorViewController.swift @@ -157,7 +157,7 @@ class NavigateARNavigatorViewController: UIViewController { // MARK: Actions @IBAction func startTurnByTurn(_ sender: UIBarButtonItem) { - routeTracker = AGSRouteTracker(routeResult: routeResult, routeIndex: 0) + routeTracker = AGSRouteTracker(routeResult: routeResult, routeIndex: 0, skipCoincidentStops: true) if routeTask.routeTaskInfo().supportsRerouting { routeTracker?.enableRerouting(with: routeTask, routeParameters: routeParameters, strategy: .toNextStop, visitFirstStopOnStart: true ) { [weak self] (error: Error?) in if let error = error { diff --git a/arcgis-ios-sdk-samples/Content Display Logic/ContentPList.plist b/arcgis-ios-sdk-samples/Content Display Logic/ContentPList.plist index fa03da1b3..bd36fe0d1 100644 --- a/arcgis-ios-sdk-samples/Content Display Logic/ContentPList.plist +++ b/arcgis-ios-sdk-samples/Content Display Logic/ContentPList.plist @@ -755,7 +755,7 @@ storyboardName FLSelection descriptionText - You can tap on the map to select or unselect features in a feature layer + Select features in a feature layer. displayName @@ -976,6 +976,14 @@ Restaurant + + displayName + Show a popup + descriptionText + Show a predefined popup from a web map. + storyboardName + ShowPopup + diff --git a/arcgis-ios-sdk-samples/Display information/Show a popup/README.md b/arcgis-ios-sdk-samples/Display information/Show a popup/README.md new file mode 100644 index 000000000..4851abb02 --- /dev/null +++ b/arcgis-ios-sdk-samples/Display information/Show a popup/README.md @@ -0,0 +1,35 @@ +# Show a popup + +Show a predefined popup from a web map. + +![Show a popup screenshot](show-popup.png) + +## Use case + +Many web maps contain predefined popups which are used to display the attributes associated with each feature layer in the map, such as hiking trails, land values, or unemployment rates. You can display text, attachments, images, charts, and web links. Rather than creating new popups to display information, you can easily access and display the predefined popups. + +## How to use the sample + +Tap on the features to prompt a popup that displays information about the feature. + +## How it works + +1. Create and load an `AGSMap` using a URL. +2. Set the map to an `AGSMapView` and set the `touchDelegate`. +3. Use the `AGSGeoView.identifyLayer(_:screenPoint:tolerance:returnPopupsOnly:completion:)` method to identify the top-most feature. +4. Create an `AGSPopupsViewController` with the result's `popups`. +5. Present the view controller. + +## Relevant API + +* AGSIdentifyLayerResult +* AGSMap +* AGSPopupsViewController + +## About the data + +This sample uses a [feature layer](https://sampleserver6.arcgisonline.com/arcgis/rest/services/SF311/FeatureServer/0) that displays reported incidents in San Francisco. + +## Tags + +feature, feature layer, popup, web map diff --git a/arcgis-ios-sdk-samples/Display information/Show a popup/README.metadata.json b/arcgis-ios-sdk-samples/Display information/Show a popup/README.metadata.json new file mode 100644 index 000000000..7c07d3c8f --- /dev/null +++ b/arcgis-ios-sdk-samples/Display information/Show a popup/README.metadata.json @@ -0,0 +1,27 @@ +{ + "category": "Display information", + "description": "Show a predefined popup from a web map.", + "ignore": false, + "images": [ + "show-popup.png" + ], + "keywords": [ + "feature", + "feature layer", + "popup", + "web map", + "AGSIdentifyLayerResult", + "AGSMap", + "AGSPopupsViewController" + ], + "redirect_from": [], + "relevant_apis": [ + "AGSIdentifyLayerResult", + "AGSMap", + "AGSPopupsViewController" + ], + "snippets": [ + "ShowPopupViewController.swift" + ], + "title": "Show a popup" +} diff --git a/arcgis-ios-sdk-samples/Display information/Show a popup/ShowPopup.storyboard b/arcgis-ios-sdk-samples/Display information/Show a popup/ShowPopup.storyboard new file mode 100644 index 000000000..8349a4b91 --- /dev/null +++ b/arcgis-ios-sdk-samples/Display information/Show a popup/ShowPopup.storyboard @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/arcgis-ios-sdk-samples/Display information/Show a popup/ShowPopupViewController.swift b/arcgis-ios-sdk-samples/Display information/Show a popup/ShowPopupViewController.swift new file mode 100644 index 000000000..335d99cd4 --- /dev/null +++ b/arcgis-ios-sdk-samples/Display information/Show a popup/ShowPopupViewController.swift @@ -0,0 +1,84 @@ +// Copyright 2020 Esri. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +import UIKit +import ArcGIS + +class ShowPopupViewController: UIViewController, AGSGeoViewTouchDelegate, AGSPopupsViewControllerDelegate { + @IBOutlet weak var mapView: AGSMapView! { + didSet { + mapView.map = makeMap() + } + } + + var featureLayer: AGSFeatureLayer? + + func makeMap() -> AGSMap { + // Create a map using a URL. + let mapURL = URL(string: "https://runtime.maps.arcgis.com/home/webmap/viewer.html?webmap=e4c6eb667e6c43b896691f10cc2f1580")! + let map = AGSMap(url: mapURL)! + // Load the map. + map.load { [weak self] (error) in + guard let self = self else { return } + if let error = error { + self.presentAlert(error: error) + } else { + // Set touch delegate. + self.mapView.touchDelegate = self + // Get the feature layer. + self.featureLayer = map.operationalLayers.firstObject as? AGSFeatureLayer + } + } + return map + } + + // MARK: - AGSGeoViewTouchDelegate + func geoView(_ geoView: AGSGeoView, didTapAtScreenPoint screenPoint: CGPoint, mapPoint: AGSPoint) { + guard let featureLayer = self.featureLayer else { return } + // Identify the specified feature layer. + mapView.identifyLayer(featureLayer, screenPoint: screenPoint, tolerance: 12, returnPopupsOnly: false) { [weak self] (result: AGSIdentifyLayerResult) in + guard let self = self else { return } + if let error = result.error { + self.presentAlert(error: error) + } else if !result.popups.isEmpty { + // Unselect the previous feature. + featureLayer.clearSelection() + // Select the new feature. + let features = result.geoElements as? [AGSFeature] + let selectedFeature = features?.first + featureLayer.select(selectedFeature!) + // Display a popup only if it exists. + let popupsViewController = AGSPopupsViewController(popups: result.popups) + // Display the popup as a formsheet -- specified for iPads. + popupsViewController.modalPresentationStyle = .formSheet + // Present the popup. + popupsViewController.delegate = self + self.present(popupsViewController, animated: true) + } + } + } + + // MARK: - AGSPopupsViewControllerDelegate methods + func popupsViewControllerDidFinishViewingPopups(_ popupsViewController: AGSPopupsViewController) { + // Dismiss the popups view controller. + dismiss(animated: true) + } + + override func viewDidLoad() { + super.viewDidLoad() + + // Add the source code button item to the right of navigation bar. + (self.navigationItem.rightBarButtonItem as! SourceCodeBarButtonItem).filenames = ["ShowPopupViewController"] + } +} diff --git a/arcgis-ios-sdk-samples/Display information/Show a popup/show-popup.png b/arcgis-ios-sdk-samples/Display information/Show a popup/show-popup.png new file mode 100644 index 000000000..86a95be9f Binary files /dev/null and b/arcgis-ios-sdk-samples/Display information/Show a popup/show-popup.png differ diff --git a/arcgis-ios-sdk-samples/Features/Feature layer selection/FLSelection.storyboard b/arcgis-ios-sdk-samples/Features/Feature layer selection/FLSelection.storyboard index 6d663cb64..5068783dc 100644 --- a/arcgis-ios-sdk-samples/Features/Feature layer selection/FLSelection.storyboard +++ b/arcgis-ios-sdk-samples/Features/Feature layer selection/FLSelection.storyboard @@ -1,11 +1,9 @@ - - - - + + - + @@ -13,23 +11,44 @@ - + - + - - + + + + + + + + + + + + + + + - + + + + @@ -40,6 +59,7 @@ + diff --git a/arcgis-ios-sdk-samples/Features/Feature layer selection/FLSelectionViewController.swift b/arcgis-ios-sdk-samples/Features/Feature layer selection/FLSelectionViewController.swift index d3e689c9d..87e8492d4 100644 --- a/arcgis-ios-sdk-samples/Features/Feature layer selection/FLSelectionViewController.swift +++ b/arcgis-ios-sdk-samples/Features/Feature layer selection/FLSelectionViewController.swift @@ -15,78 +15,83 @@ import UIKit import ArcGIS -class FLSelectionViewController: UIViewController, AGSGeoViewTouchDelegate { - @IBOutlet private weak var mapView: AGSMapView! +class FLSelectionViewController: UIViewController { + // MARK: Storyboard views - private var featureLayer: AGSFeatureLayer? - // the query is retained internally by the SDK so use a weak reference - private weak var activeSelectionQuery: AGSCancelable? - - override func viewDidLoad() { - super.viewDidLoad() - - //add the source code button item to the right of navigation bar - (navigationItem.rightBarButtonItem as! SourceCodeBarButtonItem).filenames = ["FLSelectionViewController"] - - //initialize map with topographic basemap - let map = AGSMap(basemap: .streets()) - //initial viewpoint - map.initialViewpoint = AGSViewpoint(targetExtent: AGSEnvelope(xMin: -180, yMin: -90, xMax: 180, yMax: 90, spatialReference: .wgs84())) - - //assign map to the map view - mapView.map = map - mapView.touchDelegate = self - + /// A label to show the selection status. + @IBOutlet weak var statusLabel: UILabel! + /// The map view managed by the view controller. + @IBOutlet weak var mapView: AGSMapView! { + didSet { + mapView.map = makeMap() + mapView.touchDelegate = self + mapView.selectionProperties.color = .cyan + } + } + + // MARK: Properties and methods + + /// An array of selected features. + var selectedFeatures = [AGSFeature]() + + /// The feature layer created from a feature service. + let featureLayer: AGSFeatureLayer = { + // Create feature table using a url. let featureServiceURL = URL(string: "https://services1.arcgis.com/4yjifSiIG17X0gW4/arcgis/rest/services/GDP_per_capita_1960_2016/FeatureServer/0")! - - //create feature table using a url let featureTable = AGSServiceFeatureTable(url: featureServiceURL) - - //create feature layer using this feature table + // Create feature layer using this feature table. let featureLayer = AGSFeatureLayer(featureTable: featureTable) - self.featureLayer = featureLayer - - //add feature layer to the map + return featureLayer + }() + + /// Create a map. + /// + /// - Returns: An `AGSMap` object. + func makeMap() -> AGSMap { + // Initialize map with topographic basemap. + let map = AGSMap(basemap: .streets()) + // Set initial viewpoint. + map.initialViewpoint = AGSViewpoint(targetExtent: AGSEnvelope(xMin: -180, yMin: -90, xMax: 180, yMax: 90, spatialReference: .wgs84())) + // Add feature layer to the map. map.operationalLayers.add(featureLayer) - - mapView.selectionProperties.color = .cyan + return map } - // MARK: - AGSGeoViewTouchDelegate + // MARK: UIViewController - func geoView(_ geoView: AGSGeoView, didTapAtScreenPoint screenPoint: CGPoint, mapPoint: AGSPoint) { - //cancel the active query if it hasn't been completed yet - if let activeSelectionQuery = activeSelectionQuery { - activeSelectionQuery.cancel() - } - - guard let map = mapView.map, - let featureLayer = featureLayer else { - return - } - - //tolerance level - let toleranceInPoints: Double = 12 - //use tolerance to compute the envelope for query - let toleranceInMapUnits = toleranceInPoints * mapView.unitsPerPoint - let envelope = AGSEnvelope(xMin: mapPoint.x - toleranceInMapUnits, - yMin: mapPoint.y - toleranceInMapUnits, - xMax: mapPoint.x + toleranceInMapUnits, - yMax: mapPoint.y + toleranceInMapUnits, - spatialReference: map.spatialReference) - - //create query parameters object - let queryParams = AGSQueryParameters() - queryParams.geometry = envelope - - //run the selection query - activeSelectionQuery = featureLayer.selectFeatures(withQuery: queryParams, mode: .new) { [weak self] (queryResult: AGSFeatureQueryResult?, error: Error?) in + override func viewDidLoad() { + super.viewDidLoad() + // Add the source code button item to the right of navigation bar. + (navigationItem.rightBarButtonItem as? SourceCodeBarButtonItem)?.filenames = ["FLSelectionViewController"] + // Load the feature layer. + featureLayer.load { [weak self] (error) in if let error = error { self?.presentAlert(error: error) + } else { + self?.mapView.setViewpointScale(2e8) } - if let result = queryResult { - print("\(result.featureEnumerator().allObjects.count) feature(s) selected") + } + } +} + +// MARK: - AGSGeoViewTouchDelegate + +extension FLSelectionViewController: AGSGeoViewTouchDelegate { + func geoView(_ geoView: AGSGeoView, didTapAtScreenPoint screenPoint: CGPoint, mapPoint: AGSPoint) { + // Identify features at the tapped location. + mapView.identifyLayer(featureLayer, screenPoint: screenPoint, tolerance: 12.0, returnPopupsOnly: false, maximumResults: 10) { [weak self] result in + guard let self = self else { return } + if let error = result.error { + self.presentAlert(error: error) + return } + // Un-select previous results. + self.featureLayer.unselectFeatures(self.selectedFeatures) + // Select current results. + self.selectedFeatures = result.geoElements as! [AGSFeature] + self.featureLayer.select(self.selectedFeatures) + // Show status. + self.statusLabel.text = "\(result.geoElements.count) feature(s) selected." } } } diff --git a/arcgis-ios-sdk-samples/Features/Feature layer selection/README.md b/arcgis-ios-sdk-samples/Features/Feature layer selection/README.md index 541a76d46..cf2cdd8c9 100644 --- a/arcgis-ios-sdk-samples/Features/Feature layer selection/README.md +++ b/arcgis-ios-sdk-samples/Features/Feature layer selection/README.md @@ -1,15 +1,35 @@ # Feature layer selection -This sample demonstrates how to select features in a feature layer +Select features in a feature layer. -## How to use the sample +![Map with features](feature-layer-selection-1.png) +![Selected features](feature-layer-selection-2.png) + +## Use case -Tap on a feature on the map to select it +Selecting features, whether by query or identify, can be an important step both in editing data and in visualizing results. One possible use case would be to query a feature layer containing street furniture. A query might look for type "bench" and return a list of bench features contained in the features with an attribute of type bench. These might be selected for further editing or may just be highlighted visually. -![](image1.png) -![](image2.png) +## How to use the sample + +Tap on a feature in the map. All features within a given tolerance (in pixels) of the tap will be selected. ## How it works -`AGSGeoViewDelegate` provides a method called `geoView(_:didTapAtScreenPoint:mapPoint:)`, which is fired every time the user taps on the map. The app uses the `mapPoint` passed in the method and creates an envelope around that point based on the tolerance. It then creates an `AGSQueryParameter` object and sets it `geometry` property to the envelope it just created. This query parameter object signifies all the features present in that area/envelope. It then calls the `selectFeatures(withQuery:mode:completion)` by passing the query object to select those features. +1. Create an `AGSServiceFeatureTable` from a feature service URL. +2. Create an `AGSFeatureLayer` from the service feature table. +3. Identify nearby features at the tapped location using `AGSGeoView.identifyLayer(_:screenPoint:tolerance:returnPopupsOnly:maximumResults:completion:)` method on the map view. +4. Select all identified features in the feature layer with `AGSFeatureLayer.select(_:)`. + +## Relevant API + +* AGSFeature +* AGSFeatureLayer +* AGSServiceFeatureTable + +## About the data + +This sample uses the [Gross Domestic Product, 1960-2016](https://www.arcgis.com/home/item.html?id=0c4b6b70a56b40b08c5b0420c570a6ac) feature service. Only the 2016 GDP values are shown. + +## Tags +features, layers, select, selection, tolerance diff --git a/arcgis-ios-sdk-samples/Features/Feature layer selection/README.metadata.json b/arcgis-ios-sdk-samples/Features/Feature layer selection/README.metadata.json index 4d292651c..39c54e9ea 100644 --- a/arcgis-ios-sdk-samples/Features/Feature layer selection/README.metadata.json +++ b/arcgis-ios-sdk-samples/Features/Feature layer selection/README.metadata.json @@ -1,15 +1,28 @@ { "category": "Features", - "description": "This sample demonstrates how to select features in a feature layer", + "description": "Select features in a feature layer.", "ignore": false, "images": [ - "image1.png", - "image2.png" + "feature-layer-selection-1.png", + "feature-layer-selection-2.png" ], "keywords": [ + "features", + "layers", + "select", + "selection", + "tolerance", + "AGSFeature", + "AGSFeatureLayer", + "AGSServiceFeatureTable" + ], + "redirect_from": [ + "/ios/latest/swift/sample-code/feature-layer-selection.htm" ], - "redirect_from": "/ios/latest/swift/sample-code/feature-layer-selection.htm", "relevant_apis": [ + "AGSFeature", + "AGSFeatureLayer", + "AGSServiceFeatureTable" ], "snippets": [ "FLSelectionViewController.swift" diff --git a/arcgis-ios-sdk-samples/Features/Feature layer selection/feature-layer-selection-1.png b/arcgis-ios-sdk-samples/Features/Feature layer selection/feature-layer-selection-1.png new file mode 100644 index 000000000..a003db8a7 Binary files /dev/null and b/arcgis-ios-sdk-samples/Features/Feature layer selection/feature-layer-selection-1.png differ diff --git a/arcgis-ios-sdk-samples/Features/Feature layer selection/feature-layer-selection-2.png b/arcgis-ios-sdk-samples/Features/Feature layer selection/feature-layer-selection-2.png new file mode 100644 index 000000000..e26c1ced6 Binary files /dev/null and b/arcgis-ios-sdk-samples/Features/Feature layer selection/feature-layer-selection-2.png differ diff --git a/arcgis-ios-sdk-samples/Features/Feature layer selection/image1.png b/arcgis-ios-sdk-samples/Features/Feature layer selection/image1.png deleted file mode 100644 index 3c8ac43c1..000000000 Binary files a/arcgis-ios-sdk-samples/Features/Feature layer selection/image1.png and /dev/null differ diff --git a/arcgis-ios-sdk-samples/Features/Feature layer selection/image2.png b/arcgis-ios-sdk-samples/Features/Feature layer selection/image2.png deleted file mode 100644 index d81b01d9a..000000000 Binary files a/arcgis-ios-sdk-samples/Features/Feature layer selection/image2.png and /dev/null differ diff --git a/arcgis-ios-sdk-samples/Route & Directions/Navigate route/NavigateRouteViewController.swift b/arcgis-ios-sdk-samples/Route & Directions/Navigate route/NavigateRouteViewController.swift index 53000639d..cb762ebca 100644 --- a/arcgis-ios-sdk-samples/Route & Directions/Navigate route/NavigateRouteViewController.swift +++ b/arcgis-ios-sdk-samples/Route & Directions/Navigate route/NavigateRouteViewController.swift @@ -120,7 +120,7 @@ class NavigateRouteViewController: UIViewController { /// - Parameter result: An `AGSRouteResult` object used to configure the route tracker. /// - Returns: An `AGSRouteTracker` object. func makeRouteTracker(result: AGSRouteResult) -> AGSRouteTracker { - let tracker = AGSRouteTracker(routeResult: result, routeIndex: 0)! + let tracker = AGSRouteTracker(routeResult: result, routeIndex: 0, skipCoincidentStops: true)! tracker.delegate = self return tracker }