summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesse Bounds <jesse@rebounds.net>2017-11-21 15:32:06 -0800
committerJesse Bounds <jesse@rebounds.net>2017-11-21 15:32:06 -0800
commitabfe76a948c41c5592ab43029a583b23fc0497d5 (patch)
tree0bdbd5713c334663a186c99717ef3ac3575d9a52
parent424a287255e5764e1180c14fdffaaaff68d8ae26 (diff)
downloadqtlocation-mapboxgl-upstream/boundsj-add-embedded-demo.tar.gz
Add more code review changesupstream/boundsj-add-embedded-demo
Rename things related to the view related to the annotation's context Remove link to versioned docs
-rw-r--r--platform/ios/scripts/script_resources/MapboxDemo/MapboxDemo/Base.lproj/Main.storyboard6
-rw-r--r--platform/ios/scripts/script_resources/MapboxDemo/MapboxDemo/ViewController.swift28
2 files changed, 17 insertions, 17 deletions
diff --git a/platform/ios/scripts/script_resources/MapboxDemo/MapboxDemo/Base.lproj/Main.storyboard b/platform/ios/scripts/script_resources/MapboxDemo/MapboxDemo/Base.lproj/Main.storyboard
index 1b1e94ef38..9caacf9d02 100644
--- a/platform/ios/scripts/script_resources/MapboxDemo/MapboxDemo/Base.lproj/Main.storyboard
+++ b/platform/ios/scripts/script_resources/MapboxDemo/MapboxDemo/Base.lproj/Main.storyboard
@@ -22,7 +22,7 @@
<rect key="frame" x="0.0" y="0.0" width="375" height="812"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
</view>
- <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="lwK-ip-Hxt">
+ <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="lwK-ip-Hxt" userLabel="Annotation Context View">
<rect key="frame" x="8" y="589" width="359" height="184"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" alignment="top" spacing="4" translatesAutoresizingMaskIntoConstraints="NO" id="ZvJ-iH-zYi">
@@ -174,7 +174,7 @@
</view>
<connections>
<outlet property="accessTokenWarningView" destination="3ue-Nm-4DV" id="p7e-Ux-82T"/>
- <outlet property="calloutView" destination="lwK-ip-Hxt" id="P3x-YR-HxK"/>
+ <outlet property="annotationContextView" destination="lwK-ip-Hxt" id="53f-xt-pJT"/>
<outlet property="mapViewContainer" destination="XSu-1W-VIV" id="CyQ-EP-Qwf"/>
</connections>
</viewController>
@@ -184,6 +184,6 @@
</scene>
</scenes>
<resources>
- <image name="yose" width="170" height="176"/>
+ <image name="yose" width="234" height="209"/>
</resources>
</document>
diff --git a/platform/ios/scripts/script_resources/MapboxDemo/MapboxDemo/ViewController.swift b/platform/ios/scripts/script_resources/MapboxDemo/MapboxDemo/ViewController.swift
index 30263274d4..34bbcb7666 100644
--- a/platform/ios/scripts/script_resources/MapboxDemo/MapboxDemo/ViewController.swift
+++ b/platform/ios/scripts/script_resources/MapboxDemo/MapboxDemo/ViewController.swift
@@ -17,7 +17,7 @@ import Mapbox
class ViewController: UIViewController {
@IBOutlet weak var mapViewContainer: UIView!
- @IBOutlet weak var calloutView: UIView!
+ @IBOutlet weak var annotationContextView: UIView!
@IBOutlet weak var accessTokenWarningView: UIView!
var mapView: MGLMapView!
@@ -36,7 +36,7 @@ class ViewController: UIViewController {
override func viewDidLoad() {
super.viewDidLoad()
- setupCalloutView()
+ setupAnnotationContextView()
setupAndAddMapView()
setupGestureHandling()
}
@@ -56,13 +56,13 @@ class ViewController: UIViewController {
layer.fillExtrusionHeight = MGLStyleValue(rawValue: 5000)
let camera = MGLMapCamera(lookingAtCenter: centerCoordinate, fromDistance: 100000, pitch: 60, heading: 180)
mapView.fly(to: camera, withDuration: 8, completionHandler: nil)
- calloutView.alpha = 1.0
+ annotationContextView.alpha = 1.0
} else {
layer.fillExtrusionOpacity = MGLStyleValue(rawValue: 0.5)
layer.fillExtrusionHeight = MGLStyleValue(rawValue: 0)
let camera = MGLMapCamera(lookingAtCenter: centerCoordinate, fromDistance: 100000, pitch: 60, heading: 0)
mapView.fly(to: camera, withDuration: 1, completionHandler: nil)
- calloutView.alpha = 0
+ annotationContextView.alpha = 0
}
}
}
@@ -73,18 +73,18 @@ class ViewController: UIViewController {
Simple (but somewhat styled) stub of a view to present
contextual information about tapped objects on the map.
*/
- fileprivate func setupCalloutView() {
- calloutView.alpha = 0
+ fileprivate func setupAnnotationContextView() {
+ annotationContextView.alpha = 0
let blurView = UIVisualEffectView(effect: UIBlurEffect(style: .light))
- blurView.frame = calloutView.bounds
+ blurView.frame = annotationContextView.bounds
blurView.layer.cornerRadius = 5
blurView.clipsToBounds = true
blurView.translatesAutoresizingMaskIntoConstraints = false
- calloutView.insertSubview(blurView, at: 0)
- blurView.topAnchor.constraint(equalTo: calloutView.topAnchor).isActive = true
- blurView.leftAnchor.constraint(equalTo: calloutView.leftAnchor).isActive = true
- blurView.rightAnchor.constraint(equalTo: calloutView.rightAnchor).isActive = true
- blurView.bottomAnchor.constraint(equalTo: calloutView.bottomAnchor).isActive = true
+ annotationContextView.insertSubview(blurView, at: 0)
+ blurView.topAnchor.constraint(equalTo: annotationContextView.topAnchor).isActive = true
+ blurView.leftAnchor.constraint(equalTo: annotationContextView.leftAnchor).isActive = true
+ blurView.rightAnchor.constraint(equalTo: annotationContextView.rightAnchor).isActive = true
+ blurView.bottomAnchor.constraint(equalTo: annotationContextView.bottomAnchor).isActive = true
}
/*
@@ -163,8 +163,8 @@ extension ViewController: MGLMapViewDelegate {
/*
An extention of the Mapbox map view class that offers a simplified
- API for a small subset of Runtime Styling (https://www.mapbox.com/ios-sdk/api/3.6.4/runtime-styling.html)
- used in this application. This could be extended.
+ API for a small subset of the runtime styling APIs used in this application.
+ This could be extended.
*/
extension MGLMapView {