NavigationView Hookup #1063
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -18,6 +18,9 @@ enum ExampleMode { | |
|
|
||
| class ViewController: UIViewController, MGLMapViewDelegate, CLLocationManagerDelegate, VoiceControllerDelegate { | ||
|
|
||
| // MARK: - Class Constants | ||
| static let mapInsets = UIEdgeInsets(top: 25, left: 25, bottom: 25, right: 25) | ||
|
|
||
| // MARK: - IBOutlets | ||
| @IBOutlet weak var longPressHintView: UIView! | ||
|
|
||
|
|
@@ -91,8 +94,6 @@ class ViewController: UIViewController, MGLMapViewDelegate, CLLocationManagerDel | |
| simulationButton.isSelected = true | ||
| startButton.isEnabled = false | ||
|
|
||
| alertController = UIAlertController(title: "Start Navigation", message: "Select the navigation type", preferredStyle: .actionSheet) | ||
| alertController.addAction(UIAlertAction(title: "Default UI", style: .default, handler: { (action) in | ||
| self.startBasicNavigation() | ||
|
|
@@ -120,8 +121,14 @@ class ViewController: UIViewController, MGLMapViewDelegate, CLLocationManagerDel | |
| override func viewWillAppear(_ animated: Bool) { | ||
| super.viewWillAppear(animated) | ||
|
|
||
| //Reload the mapView. | ||
| setupMapView() | ||
|
|
||
| // Reset the navigation styling to the defaults if we are returning from a presentation. | ||
| if (presentedViewController != nil) { | ||
| DayStyle().apply() | ||
| } | ||
|
|
||
| } | ||
|
|
||
| // MARK: Gesture Recognizer Handlers | ||
|
|
@@ -298,21 +305,32 @@ class ViewController: UIViewController, MGLMapViewDelegate, CLLocationManagerDel | |
| } | ||
|
|
||
| func setupMapView() { | ||
| guard self.mapView == nil else { return } | ||
| let mapView = NavigationMapView(frame: view.bounds) | ||
| self.mapView = mapView | ||
|
There was a problem hiding this comment. maybe if we're explicitly dictating There was a problem hiding this comment. There's actually a reason for this pattern -- |
||
|
|
||
|
|
||
| mapView.autoresizingMask = [.flexibleWidth, .flexibleHeight] | ||
| mapView.delegate = self | ||
| mapView.navigationMapDelegate = self | ||
| mapView.userTrackingMode = .follow | ||
| let bottomPadding = (view.frame.height + view.frame.origin.y) - bottomBar.frame.origin.y | ||
|
|
||
| var topPadding: CGFloat = 0.0 | ||
| if #available(iOS 11.0, *) { | ||
|
There was a problem hiding this comment. There is a convenient There was a problem hiding this comment. This is setting up the map inset, not an auto layout constraint. There was a problem hiding this comment.
There was a problem hiding this comment. Is this still actionable? There was a problem hiding this comment. @bsudekum @frederoni Looked into this -- bringing the creation of the mapView into storyboard doesn't look like a good idea right now, as the storyboard will likely keep a reference to it while the navigation scene is presented. There may be ways to get around this, but it's non-trivial enough to look out-of-scope for this PR. |
||
| topPadding = view.safeAreaInsets.top | ||
| } else if let navCon = navigationController { | ||
| topPadding = navCon.navigationBar.frame.size.height | ||
| } | ||
|
|
||
| let subviewMask = UIEdgeInsets(top: topPadding, left: 0, bottom: bottomPadding, right: 0) | ||
| mapView.contentInset = ViewController.mapInsets + subviewMask | ||
|
|
||
| view.insertSubview(mapView, belowSubview: bottomBar) | ||
|
|
||
| let singleTap = UILongPressGestureRecognizer(target: self, action: #selector(didLongPress(tap:))) | ||
| mapView.gestureRecognizers?.filter({ $0 is UILongPressGestureRecognizer }).forEach(singleTap.require(toFail:)) | ||
| mapView.addGestureRecognizer(singleTap) | ||
|
|
||
| } | ||
|
|
||
| func mapView(_ mapView: MGLMapView, didFinishLoading style: MGLStyle) { | ||
|
|
@@ -414,7 +432,6 @@ extension ViewController: NavigationViewControllerDelegate { | |
| // Called when the user hits the exit button. | ||
| // If implemented, you are responsible for also dismissing the UI. | ||
| func navigationViewControllerDidCancelNavigation(_ navigationViewController: NavigationViewController) { | ||
| navigationViewController.dismiss(animated: true, completion: nil) | ||
| } | ||
| } | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| import Foundation | ||
| import UIKit | ||
|
|
||
| extension CGSize: ExpressibleByFloatLiteral { | ||
| public typealias FloatLiteralType = Double | ||
|
|
||
| public init(size: Double) { | ||
| self.init(width: size, height: size) | ||
| } | ||
|
|
||
| public init(floatLiteral value: FloatLiteralType) { | ||
|
There was a problem hiding this comment. Do these need to be public? There was a problem hiding this comment.
|
||
| self.init(size: value) | ||
| } | ||
| } | ||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I believe the right way to reset styling to the defaults is use a
styleManagerand probably calltimeOfDayChanged()... right?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This approach won't work because the
ViewControllerwill always show aDayStyletheme, regardless of the time-of-day.In reality, the call isn't strictly necessary because the only thing the
DayStyledoes that affects theViewControlleris that it changes the style of the status bar, a thing we could do directly. But I digress.