Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 17 additions & 1 deletion Navigation-Examples.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,11 @@
2B521D4E24090A3A00984CF8 /* CustomBarsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2B521D4D24090A3A00984CF8 /* CustomBarsViewController.swift */; };
2B521D502409240E00984CF8 /* CustomBottomBannerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2B521D4F2409240E00984CF8 /* CustomBottomBannerView.swift */; };
2B521D522409242A00984CF8 /* CustomBottomBannerView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 2B521D512409242A00984CF8 /* CustomBottomBannerView.xib */; };
8A0B182326553482005107DE /* CustomSegue.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 8A0B182226553482005107DE /* CustomSegue.storyboard */; };
8A2DFA57261650A60034A87E /* CustomCameraStateTransition.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8A2DFA55261650A60034A87E /* CustomCameraStateTransition.swift */; };
8A2DFA58261650A60034A87E /* CustomViewportDataSource.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8A2DFA56261650A60034A87E /* CustomViewportDataSource.swift */; };
8A2DFA6C261651600034A87E /* Custom-Navigation-Camera.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8A2DFA6B261651600034A87E /* Custom-Navigation-Camera.swift */; };
8A31388726402DF400763714 /* Navigation-From-Segue.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8A31388626402DF400763714 /* Navigation-From-Segue.swift */; };
8A33629624E4844E0086C647 /* Building-Extrusion.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8A33629524E4844E0086C647 /* Building-Extrusion.swift */; };
8A96379C2492B366008DEF2A /* Route-Deserialization.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8A96379A2492B366008DEF2A /* Route-Deserialization.swift */; };
8A96379D2492B366008DEF2A /* route.json in Resources */ = {isa = PBXBuildFile; fileRef = 8A96379B2492B366008DEF2A /* route.json */; };
Expand Down Expand Up @@ -57,9 +59,11 @@
2B521D4D24090A3A00984CF8 /* CustomBarsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CustomBarsViewController.swift; sourceTree = "<group>"; };
2B521D4F2409240E00984CF8 /* CustomBottomBannerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CustomBottomBannerView.swift; sourceTree = "<group>"; };
2B521D512409242A00984CF8 /* CustomBottomBannerView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = CustomBottomBannerView.xib; sourceTree = "<group>"; };
8A0B182226553482005107DE /* CustomSegue.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = CustomSegue.storyboard; sourceTree = "<group>"; };
8A2DFA55261650A60034A87E /* CustomCameraStateTransition.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CustomCameraStateTransition.swift; sourceTree = "<group>"; };
8A2DFA56261650A60034A87E /* CustomViewportDataSource.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CustomViewportDataSource.swift; sourceTree = "<group>"; };
8A2DFA6B261651600034A87E /* Custom-Navigation-Camera.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Custom-Navigation-Camera.swift"; sourceTree = "<group>"; };
8A31388626402DF400763714 /* Navigation-From-Segue.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Navigation-From-Segue.swift"; sourceTree = "<group>"; };
8A33629524E4844E0086C647 /* Building-Extrusion.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Building-Extrusion.swift"; sourceTree = "<group>"; };
8A96379A2492B366008DEF2A /* Route-Deserialization.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Route-Deserialization.swift"; sourceTree = "<group>"; };
8A96379B2492B366008DEF2A /* route.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = route.json; sourceTree = "<group>"; };
Expand Down Expand Up @@ -173,6 +177,15 @@
path = TestData;
sourceTree = "<group>";
};
8AFBF217265E851700468551 /* CustomSegue */ = {
isa = PBXGroup;
children = (
8A31388626402DF400763714 /* Navigation-From-Segue.swift */,
8A0B182226553482005107DE /* CustomSegue.storyboard */,
);
path = CustomSegue;
sourceTree = "<group>";
};
961FC4E622E0260A00C72877 /* DocsCode */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -249,11 +262,12 @@
8A96379A2492B366008DEF2A /* Route-Deserialization.swift */,
8AC9129C2494106100B6941E /* Route-Initialization.swift */,
8A33629524E4844E0086C647 /* Building-Extrusion.swift */,
8A2DFA52261650600034A87E /* NavigationCamera */,
B480E423261E4C3500C16FA0 /* Predictive-Caching.swift */,
B480E427261E4C4600C16FA0 /* Route-Alerts.swift */,
11DC36F126161DAF0042CD4A /* Location-Snapping.swift */,
11B6E81626176F3600872E4D /* Upcoming-Intersection.swift */,
8AFBF217265E851700468551 /* CustomSegue */,
8A2DFA52261650600034A87E /* NavigationCamera */,
8AC9129E2494118400B6941E /* TestData */,
2B521D5324094F2500984CF8 /* CustomBars */,
);
Expand Down Expand Up @@ -372,6 +386,7 @@
8A96379D2492B366008DEF2A /* route.json in Resources */,
2B521D522409242A00984CF8 /* CustomBottomBannerView.xib in Resources */,
C58FB8611FE899B800C4B491 /* Assets.xcassets in Resources */,
8A0B182326553482005107DE /* CustomSegue.storyboard in Resources */,
9639244A22E02A520010FE73 /* Main.storyboard in Resources */,
9639244B22E02A820010FE73 /* EmbeddedExamples.storyboard in Resources */,
);
Expand Down Expand Up @@ -557,6 +572,7 @@
B480E424261E4C3500C16FA0 /* Predictive-Caching.swift in Sources */,
C5C0D63820589422003A3B1D /* Custom-Server.swift in Sources */,
C3893F1C25F96BDC0058A987 /* Custom-Waypoints.swift in Sources */,
8A31388726402DF400763714 /* Navigation-From-Segue.swift in Sources */,
2B521D4E24090A3A00984CF8 /* CustomBarsViewController.swift in Sources */,
8A96379C2492B366008DEF2A /* Route-Deserialization.swift in Sources */,
2B521D502409240E00984CF8 /* CustomBottomBannerView.swift in Sources */,
Expand Down
37 changes: 20 additions & 17 deletions Navigation-Examples/Base.lproj/Main.storyboard
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="UOD-Rw-pRx">
<device id="retina4_7" orientation="portrait">
<adaptation id="fullscreen"/>
</device>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="18122" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="UOD-Rw-pRx">
<device id="retina4_7" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/>
<capability name="Constraints to layout margins" minToolsVersion="6.0"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="18093"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<scenes>
Expand All @@ -20,7 +17,7 @@
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<prototypes>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="ExampleCell" textLabel="O7s-1i-rdk" style="IBUITableViewCellStyleDefault" id="VPi-y5-cTO">
<rect key="frame" x="0.0" y="28" width="375" height="44"/>
<rect key="frame" x="0.0" y="24.5" width="375" height="43.5"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="VPi-y5-cTO" id="LbA-O6-5Ev">
<rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/>
Expand Down Expand Up @@ -58,25 +55,25 @@
<tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="static" style="grouped" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="18" sectionFooterHeight="18" id="UY6-xd-kAF">
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
<color key="backgroundColor" systemColor="groupTableViewBackgroundColor"/>
<sections>
<tableViewSection headerTitle="Options" id="ClP-0m-aen">
<cells>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" rowHeight="44" id="dk9-XH-gkp">
<rect key="frame" x="0.0" y="55.5" width="375" height="44"/>
<rect key="frame" x="0.0" y="49.5" width="375" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="dk9-XH-gkp" id="6Q0-6N-gZT">
<rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/>
<rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Simulate Navigation" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="XC1-9i-Xpr">
<rect key="frame" x="16" y="11" width="152" height="21"/>
<rect key="frame" x="16" y="12" width="286" height="20.5"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="ATb-Gd-gQN">
<rect key="frame" x="310" y="6" width="51" height="31"/>
<rect key="frame" x="310" y="6.5" width="51" height="31"/>
<connections>
<action selector="didToggleSimulateNavigation:" destination="iC2-bI-Gbp" eventType="valueChanged" id="845-zY-8dY"/>
</connections>
Expand All @@ -87,6 +84,7 @@
<constraint firstItem="XC1-9i-Xpr" firstAttribute="centerY" secondItem="6Q0-6N-gZT" secondAttribute="centerY" id="6dB-82-JnE"/>
<constraint firstItem="ATb-Gd-gQN" firstAttribute="centerY" secondItem="6Q0-6N-gZT" secondAttribute="centerY" id="mLO-pn-r8q"/>
<constraint firstItem="XC1-9i-Xpr" firstAttribute="leading" secondItem="6Q0-6N-gZT" secondAttribute="leadingMargin" id="thk-z1-xaQ"/>
<constraint firstItem="ATb-Gd-gQN" firstAttribute="leading" secondItem="XC1-9i-Xpr" secondAttribute="trailing" constant="8" symbolic="YES" id="yLg-YU-dA5"/>
</constraints>
</tableViewCellContentView>
</tableViewCell>
Expand All @@ -95,13 +93,13 @@
<tableViewSection footerTitle="Description of example" id="8Ns-lx-NZ7">
<cells>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" rowHeight="44" id="pIW-xf-bP3">
<rect key="frame" x="0.0" y="135.5" width="375" height="44"/>
<rect key="frame" x="0.0" y="129.5" width="375" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="pIW-xf-bP3" id="HSk-Kc-kxa">
<rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/>
<rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ML5-Ps-XGz">
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ML5-Ps-XGz">
<rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
<state key="normal" title="Start Example"/>
<connections>
Expand Down Expand Up @@ -132,14 +130,14 @@
</tableViewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="a50-fI-rRt" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="542" y="24"/>
<point key="canvasLocation" x="541.60000000000002" y="23.838080959520241"/>
</scene>
<!--Navigation Controller-->
<scene sceneID="wbS-fH-Dim">
<objects>
<navigationController id="UOD-Rw-pRx" sceneMemberID="viewController">
<navigationBar key="navigationBar" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" id="cS0-1G-txg">
<rect key="frame" x="0.0" y="20" width="375" height="44"/>
<rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
<autoresizingMask key="autoresizingMask"/>
</navigationBar>
<connections>
Expand All @@ -151,4 +149,9 @@
<point key="canvasLocation" x="-1076" y="24"/>
</scene>
</scenes>
<resources>
<systemColor name="groupTableViewBackgroundColor">
<color red="0.94901960784313721" green="0.94901960784313721" blue="0.96862745098039216" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</systemColor>
</resources>
</document>
7 changes: 7 additions & 0 deletions Navigation-Examples/Constants.swift
Original file line number Diff line number Diff line change
Expand Up @@ -146,5 +146,12 @@ let listOfExamples: [NamedController] = [
controller: RouteLinesStylingViewController.self,
storyboard: nil,
pushExampleToViewController: true
),
(
name: "Custom Segue",
description: "Demonstrates how to create an instance of NavigationViewController from UIStoryboardSegue.",
controller: SegueViewController.self,
storyboard: UIStoryboard(name: "CustomSegue", bundle: nil),
pushExampleToViewController: true
)
]
Loading