diff --git a/Examples/ArcGISToolkitExamples/Info.plist b/Examples/ArcGISToolkitExamples/Info.plist
index 73ff8857..1f6a165b 100644
--- a/Examples/ArcGISToolkitExamples/Info.plist
+++ b/Examples/ArcGISToolkitExamples/Info.plist
@@ -15,7 +15,7 @@
CFBundlePackageType
APPL
CFBundleShortVersionString
- 1.0
+ 100.4
CFBundleVersion
1
LSRequiresIPhoneOS
diff --git a/Toolkit/ArcGISToolkit/Info.plist b/Toolkit/ArcGISToolkit/Info.plist
index fbe1e6b3..70cb6a98 100644
--- a/Toolkit/ArcGISToolkit/Info.plist
+++ b/Toolkit/ArcGISToolkit/Info.plist
@@ -15,7 +15,7 @@
CFBundlePackageType
FMWK
CFBundleShortVersionString
- 1.0
+ 100.4
CFBundleVersion
$(CURRENT_PROJECT_VERSION)
NSPrincipalClass
diff --git a/Toolkit/ArcGISToolkit/MeasureToolbar.swift b/Toolkit/ArcGISToolkit/MeasureToolbar.swift
index 488694d1..e9886f2f 100644
--- 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)