Merge pull request #44 from Esri/mhd/Fix_Deprecated_Warnings

Fix deprecated warnings
Esri · Oct 11, 2018 · 0577faa · 0577faa
2 parents a420339 + 756f22e
commit 0577faa
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 deletions.
diff --git a/Examples/ArcGISToolkitExamples/Info.plist b/Examples/ArcGISToolkitExamples/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
+	<string>100.4</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>LSRequiresIPhoneOS</key>

diff --git a/Toolkit/ArcGISToolkit/Info.plist b/Toolkit/ArcGISToolkit/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
+	<string>100.4</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSPrincipalClass</key>

diff --git a/Toolkit/ArcGISToolkit/MeasureToolbar.swift b/Toolkit/ArcGISToolkit/MeasureToolbar.swift
@@ -174,8 +174,11 @@ public class MeasureToolbar: UIToolbar, AGSGeoViewTouchDelegate {
     // Exposed so that the symbology and selection colors can be customized.
     public private(set) var selectionLineSymbol : AGSSymbol?
     public private(set)var selectionFillSymbol : AGSSymbol?
-    public private(set) var selectionColor : UIColor?
-
+    @available(iOS, deprecated, message: "Use `color` property exposed through `AGSGeoView.selectionProperties`")
+    public var selectionColor : UIColor? {
+        return mapView?.selectionProperties.color
+    }
+
     public var mapView : AGSMapView? {
         didSet{
             guard mapView != oldValue else { return }
@@ -313,23 +316,20 @@ public class MeasureToolbar: UIToolbar, AGSGeoViewTouchDelegate {
         selectModeButtons = [segControlItem, leftHiddenPlaceholderButton, flexButton, rightHiddenPlaceholderButton]
 
         // notification
-
         NotificationCenter.default.addObserver(self, selector: #selector(sketchEditorGeometryDidChange(_:)), name: .AGSSketchEditorGeometryDidChange, object: nil)
-
-        // defaults for symbology
-        selectionLineSymbol = lineSketchEditor.style.lineSymbol
-        selectionColor = lineSketchEditor.style.selectionColor
-        let fillColor = (selectionColor ?? UIColor.cyan).withAlphaComponent(0.25)
-        let sfs = AGSSimpleFillSymbol(style: .solid, color: fillColor, outline: selectionLineSymbol as? AGSSimpleLineSymbol)
-        selectionFillSymbol = sfs
     }
 
     private func bindToMapView(mapView: AGSMapView?){
         mapView?.touchDelegate = self
 
         if let mapView = mapView{
+            // defaults for symbology
+            selectionLineSymbol = lineSketchEditor.style.lineSymbol
+            let fillColor = mapView.selectionProperties.color.withAlphaComponent(0.25)
+            let sfs = AGSSimpleFillSymbol(style: .solid, color: fillColor, outline: selectionLineSymbol as? AGSSimpleLineSymbol)
+            selectionFillSymbol = sfs
+
             let selectionOverlay = AGSGraphicsOverlay()
-            selectionOverlay.selectionColor = selectionColor
             self.selectionOverlay = selectionOverlay
             mapView.graphicsOverlays.add(selectionOverlay)