End sequence added

This commit is contained in:
Max Hunt 2019-06-08 23:36:52 +01:00
parent 810c820859
commit 3f5d07fd5a
10 changed files with 342 additions and 30 deletions

View File

@ -29,6 +29,8 @@
50B1485E22A46F7A008B16AF /* VideoInstrictionsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50B1485D22A46F7A008B16AF /* VideoInstrictionsViewController.swift */; }; 50B1485E22A46F7A008B16AF /* VideoInstrictionsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50B1485D22A46F7A008B16AF /* VideoInstrictionsViewController.swift */; };
50C69B1122A16A7100EA99C1 /* TableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50C69B1022A16A7100EA99C1 /* TableViewController.swift */; }; 50C69B1122A16A7100EA99C1 /* TableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50C69B1022A16A7100EA99C1 /* TableViewController.swift */; };
50C69B1322A19D8800EA99C1 /* NewTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50C69B1222A19D8800EA99C1 /* NewTableViewCell.swift */; }; 50C69B1322A19D8800EA99C1 /* NewTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50C69B1222A19D8800EA99C1 /* NewTableViewCell.swift */; };
50E3DDF122AC59EA00E04D0B /* placeholder.mp4 in Resources */ = {isa = PBXBuildFile; fileRef = 50E3DDF022AC59EA00E04D0B /* placeholder.mp4 */; };
50E3DDF322AC5F9200E04D0B /* setupTextInstructionsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50E3DDF222AC5F9200E04D0B /* setupTextInstructionsViewController.swift */; };
/* End PBXBuildFile section */ /* End PBXBuildFile section */
/* Begin PBXFileReference section */ /* Begin PBXFileReference section */
@ -57,6 +59,8 @@
50B1485D22A46F7A008B16AF /* VideoInstrictionsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VideoInstrictionsViewController.swift; sourceTree = "<group>"; }; 50B1485D22A46F7A008B16AF /* VideoInstrictionsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VideoInstrictionsViewController.swift; sourceTree = "<group>"; };
50C69B1022A16A7100EA99C1 /* TableViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TableViewController.swift; sourceTree = "<group>"; }; 50C69B1022A16A7100EA99C1 /* TableViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TableViewController.swift; sourceTree = "<group>"; };
50C69B1222A19D8800EA99C1 /* NewTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NewTableViewCell.swift; sourceTree = "<group>"; }; 50C69B1222A19D8800EA99C1 /* NewTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NewTableViewCell.swift; sourceTree = "<group>"; };
50E3DDF022AC59EA00E04D0B /* placeholder.mp4 */ = {isa = PBXFileReference; lastKnownFileType = file; path = placeholder.mp4; sourceTree = "<group>"; };
50E3DDF222AC5F9200E04D0B /* setupTextInstructionsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = setupTextInstructionsViewController.swift; sourceTree = "<group>"; };
/* End PBXFileReference section */ /* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */ /* Begin PBXFrameworksBuildPhase section */
@ -95,11 +99,13 @@
506421C322A339B7001E8877 /* xleft.mp3 */, 506421C322A339B7001E8877 /* xleft.mp3 */,
506421C422A339B7001E8877 /* xright.mp3 */, 506421C422A339B7001E8877 /* xright.mp3 */,
50A7AE05229D7B1E00D58743 /* Guibe.entitlements */, 50A7AE05229D7B1E00D58743 /* Guibe.entitlements */,
50E3DDF022AC59EA00E04D0B /* placeholder.mp4 */,
50A9B4E0229E115B00070F61 /* Video.mov */, 50A9B4E0229E115B00070F61 /* Video.mov */,
50A7ADD4229D6A4200D58743 /* AppDelegate.swift */, 50A7ADD4229D6A4200D58743 /* AppDelegate.swift */,
50A7ADD6229D6A4200D58743 /* ViewController.swift */, 50A7ADD6229D6A4200D58743 /* ViewController.swift */,
50A7ADE6229D6C7100D58743 /* Assets.xcassets */, 50A7ADE6229D6C7100D58743 /* Assets.xcassets */,
50A7ADD8229D6A4200D58743 /* Main.storyboard */, 50A7ADD8229D6A4200D58743 /* Main.storyboard */,
50E3DDF222AC5F9200E04D0B /* setupTextInstructionsViewController.swift */,
50B1485D22A46F7A008B16AF /* VideoInstrictionsViewController.swift */, 50B1485D22A46F7A008B16AF /* VideoInstrictionsViewController.swift */,
50B1485B22A46EBD008B16AF /* WrittenInstructionsViewController.swift */, 50B1485B22A46EBD008B16AF /* WrittenInstructionsViewController.swift */,
50A7ADFE229D768900D58743 /* MainViewController.swift */, 50A7ADFE229D768900D58743 /* MainViewController.swift */,
@ -199,6 +205,7 @@
buildActionMask = 2147483647; buildActionMask = 2147483647;
files = ( files = (
50A9B4E1229E115B00070F61 /* Video.mov in Resources */, 50A9B4E1229E115B00070F61 /* Video.mov in Resources */,
50E3DDF122AC59EA00E04D0B /* placeholder.mp4 in Resources */,
506421C522A339B7001E8877 /* xboth.mp3 in Resources */, 506421C522A339B7001E8877 /* xboth.mp3 in Resources */,
506421C622A339B7001E8877 /* xleft.mp3 in Resources */, 506421C622A339B7001E8877 /* xleft.mp3 in Resources */,
50A7ADDF229D6A4200D58743 /* LaunchScreen.storyboard in Resources */, 50A7ADDF229D6A4200D58743 /* LaunchScreen.storyboard in Resources */,
@ -219,6 +226,7 @@
506421CD22A33EA5001E8877 /* TechSpecsViewController.swift in Sources */, 506421CD22A33EA5001E8877 /* TechSpecsViewController.swift in Sources */,
50A7ADF9229D75C100D58743 /* 5_HandChoiceViewController.swift in Sources */, 50A7ADF9229D75C100D58743 /* 5_HandChoiceViewController.swift in Sources */,
50B1485E22A46F7A008B16AF /* VideoInstrictionsViewController.swift in Sources */, 50B1485E22A46F7A008B16AF /* VideoInstrictionsViewController.swift in Sources */,
50E3DDF322AC5F9200E04D0B /* setupTextInstructionsViewController.swift in Sources */,
50B1485C22A46EBD008B16AF /* WrittenInstructionsViewController.swift in Sources */, 50B1485C22A46EBD008B16AF /* WrittenInstructionsViewController.swift in Sources */,
50A7ADD7229D6A4200D58743 /* ViewController.swift in Sources */, 50A7ADD7229D6A4200D58743 /* ViewController.swift in Sources */,
50C69B1122A16A7100EA99C1 /* TableViewController.swift in Sources */, 50C69B1122A16A7100EA99C1 /* TableViewController.swift in Sources */,

View File

@ -29,7 +29,7 @@
</viewController> </viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/> <placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/>
</objects> </objects>
<point key="canvasLocation" x="47.826086956521742" y="20.758928571428569"/> <point key="canvasLocation" x="6" y="21"/>
</scene> </scene>
<!--3art View Controller--> <!--3art View Controller-->
<scene sceneID="xah-oV-ojV"> <scene sceneID="xah-oV-ojV">
@ -79,7 +79,7 @@
</viewController> </viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="OjR-hE-Zab" userLabel="First Responder" sceneMemberID="firstResponder"/> <placeholder placeholderIdentifier="IBFirstResponder" id="OjR-hE-Zab" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects> </objects>
<point key="canvasLocation" x="882.60869565217399" y="20.758928571428569"/> <point key="canvasLocation" x="883" y="21"/>
</scene> </scene>
<!--5nd Choice View Controller--> <!--5nd Choice View Controller-->
<scene sceneID="8Ym-Ub-aPL"> <scene sceneID="8Ym-Ub-aPL">
@ -130,7 +130,7 @@
</viewController> </viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="F9v-Vk-vwE" userLabel="First Responder" sceneMemberID="firstResponder"/> <placeholder placeholderIdentifier="IBFirstResponder" id="F9v-Vk-vwE" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects> </objects>
<point key="canvasLocation" x="1746" y="21"/> <point key="canvasLocation" x="1793" y="21"/>
</scene> </scene>
<!--6de Choice View Controller--> <!--6de Choice View Controller-->
<scene sceneID="QLR-Oe-vCm"> <scene sceneID="QLR-Oe-vCm">
@ -181,7 +181,7 @@
</viewController> </viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="dgq-NS-Hqn" userLabel="First Responder" sceneMemberID="firstResponder"/> <placeholder placeholderIdentifier="IBFirstResponder" id="dgq-NS-Hqn" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects> </objects>
<point key="canvasLocation" x="2688" y="21"/> <point key="canvasLocation" x="2687" y="21"/>
</scene> </scene>
<!--7ady View Controller--> <!--7ady View Controller-->
<scene sceneID="alI-ln-agi"> <scene sceneID="alI-ln-agi">
@ -206,7 +206,7 @@
</viewController> </viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="sFx-6a-7bc" userLabel="First Responder" sceneMemberID="firstResponder"/> <placeholder placeholderIdentifier="IBFirstResponder" id="sFx-6a-7bc" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects> </objects>
<point key="canvasLocation" x="3604" y="21"/> <point key="canvasLocation" x="3603" y="21"/>
</scene> </scene>
<!--Main View Controller--> <!--Main View Controller-->
<scene sceneID="55K-vG-ne9"> <scene sceneID="55K-vG-ne9">
@ -344,7 +344,7 @@
</subviews> </subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</view> </view>
<view contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="wbi-cI-xnq" userLabel="etaView"> <view alpha="0.0" contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="wbi-cI-xnq" userLabel="etaView">
<rect key="frame" x="0.0" y="658" width="414" height="238"/> <rect key="frame" x="0.0" y="658" width="414" height="238"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<subviews> <subviews>
@ -385,7 +385,7 @@
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</view> </view>
<view contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="BdX-f2-6nO"> <view contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="BdX-f2-6nO">
<rect key="frame" x="87" y="823" width="240" height="42"/> <rect key="frame" x="79" y="823" width="234" height="42"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<subviews> <subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="E. T. A." textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="nfu-Qy-9LC"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="E. T. A." textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="nfu-Qy-9LC">
@ -417,11 +417,41 @@
<rect key="frame" x="0.0" y="0.0" width="414" height="896"/> <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
</imageView> </imageView>
<view alpha="0.0" contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="4YN-LU-KP5">
<rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<subviews>
<button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="characterWrap" translatesAutoresizingMaskIntoConstraints="NO" id="6OI-Da-e6l">
<rect key="frame" x="25" y="709" width="364" height="120"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" red="1" green="0.19607843137254902" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<fontDescription key="fontDescription" type="system" pointSize="30"/>
<state key="normal">
<string key="title">You have arrived at
your destination</string>
<color key="titleColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</state>
<connections>
<action selector="arrivedAtDestinationBtnPressed:" destination="Ovf-sw-BKp" eventType="touchUpInside" id="QeR-zV-ksf"/>
</connections>
</button>
</subviews>
<color key="backgroundColor" white="0.0" alpha="0.50644798801369861" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</view>
<button hidden="YES" opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="zGG-vE-h8F">
<rect key="frame" x="372" y="618" width="30" height="30"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<state key="normal" title="xart"/>
<connections>
<action selector="xDebug:" destination="Ovf-sw-BKp" eventType="touchUpInside" id="Eoq-Hg-JAY"/>
</connections>
</button>
</subviews> </subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<viewLayoutGuide key="safeArea" id="Ut7-03-t0b"/> <viewLayoutGuide key="safeArea" id="Ut7-03-t0b"/>
</view> </view>
<connections> <connections>
<outlet property="arrivedAtDestinationBtn" destination="6OI-Da-e6l" id="uWB-lr-dUL"/>
<outlet property="cancelBtn" destination="AjN-o6-SNx" id="oAt-yu-hp4"/> <outlet property="cancelBtn" destination="AjN-o6-SNx" id="oAt-yu-hp4"/>
<outlet property="dismissBtn" destination="efK-Gw-gxB" id="upX-k6-K16"/> <outlet property="dismissBtn" destination="efK-Gw-gxB" id="upX-k6-K16"/>
<outlet property="etaLabel" destination="TUX-4j-j4B" id="jfr-9U-oct"/> <outlet property="etaLabel" destination="TUX-4j-j4B" id="jfr-9U-oct"/>
@ -432,6 +462,7 @@
<outlet property="menuBtn" destination="m8G-AJ-moq" id="QXG-rH-6Lm"/> <outlet property="menuBtn" destination="m8G-AJ-moq" id="QXG-rH-6Lm"/>
<outlet property="menuView" destination="VZj-Lm-Ems" id="IBs-mV-GJW"/> <outlet property="menuView" destination="VZj-Lm-Ems" id="IBs-mV-GJW"/>
<outlet property="menuWindowView" destination="J48-J9-3Mc" id="gnS-K2-H8d"/> <outlet property="menuWindowView" destination="J48-J9-3Mc" id="gnS-K2-H8d"/>
<outlet property="naviFinishedView" destination="4YN-LU-KP5" id="Q9V-Ji-xFS"/>
<outlet property="persEtaLbl" destination="O4h-DM-Zqh" id="UYm-pC-87I"/> <outlet property="persEtaLbl" destination="O4h-DM-Zqh" id="UYm-pC-87I"/>
<outlet property="persEtaView" destination="BdX-f2-6nO" id="4xT-MK-1za"/> <outlet property="persEtaView" destination="BdX-f2-6nO" id="4xT-MK-1za"/>
<outlet property="searchBar" destination="dRT-vj-1ew" id="nAa-5O-h0R"/> <outlet property="searchBar" destination="dRT-vj-1ew" id="nAa-5O-h0R"/>
@ -513,8 +544,8 @@
<action selector="backBtnPressed:" destination="jBr-V0-GbL" eventType="touchUpInside" id="ygE-xp-WAh"/> <action selector="backBtnPressed:" destination="jBr-V0-GbL" eventType="touchUpInside" id="ygE-xp-WAh"/>
</connections> </connections>
</button> </button>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Destinations" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="26H-72-eUL"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Destinations" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="4UW-t2-XCI">
<rect key="frame" x="119" y="56" width="177" height="36"/> <rect key="frame" x="217" y="56" width="177" height="36"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="boldSystem" pointSize="30"/> <fontDescription key="fontDescription" type="boldSystem" pointSize="30"/>
<nil key="textColor"/> <nil key="textColor"/>
@ -645,6 +676,13 @@
<fontDescription key="fontDescription" type="system" pointSize="30"/> <fontDescription key="fontDescription" type="system" pointSize="30"/>
<textInputTraits key="textInputTraits" autocapitalizationType="sentences"/> <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
</textView> </textView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Settings" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="aP7-6Y-OXC">
<rect key="frame" x="148" y="48" width="118" height="36"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="boldSystem" pointSize="30"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
</subviews> </subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<viewLayoutGuide key="safeArea" id="iMX-Fb-tJF"/> <viewLayoutGuide key="safeArea" id="iMX-Fb-tJF"/>
@ -692,7 +730,7 @@
</connections> </connections>
</button> </button>
<button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ZS9-iD-Y8a"> <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ZS9-iD-Y8a">
<rect key="frame" x="29" y="148" width="177" height="51"/> <rect key="frame" x="29" y="297" width="177" height="51"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="32"/> <fontDescription key="fontDescription" type="system" pointSize="32"/>
<state key="normal" title="Video/ Audio"> <state key="normal" title="Video/ Audio">
@ -706,7 +744,7 @@
</connections> </connections>
</button> </button>
<button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="iKA-Ec-DYO"> <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="iKA-Ec-DYO">
<rect key="frame" x="29" y="338" width="299" height="51"/> <rect key="frame" x="29" y="379" width="299" height="51"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="32"/> <fontDescription key="fontDescription" type="system" pointSize="32"/>
<state key="normal" title="More coming soon!!!!!"> <state key="normal" title="More coming soon!!!!!">
@ -717,10 +755,10 @@
</connections> </connections>
</button> </button>
<button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="fov-Ic-2dL"> <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="fov-Ic-2dL">
<rect key="frame" x="29" y="244" width="268" height="51"/> <rect key="frame" x="29" y="130" width="323" height="51"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="32"/> <fontDescription key="fontDescription" type="system" pointSize="32"/>
<state key="normal" title="Written Instructions"> <state key="normal" title="Step By Step Directions">
<color key="titleColor" cocoaTouchSystemColor="scrollViewTexturedBackgroundColor"/> <color key="titleColor" cocoaTouchSystemColor="scrollViewTexturedBackgroundColor"/>
</state> </state>
<connections> <connections>
@ -730,11 +768,32 @@
</segue> </segue>
</connections> </connections>
</button> </button>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Instructions" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="jE8-yt-tWJ">
<rect key="frame" x="225" y="48" width="169" height="36"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="boldSystem" pointSize="30"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="BB5-mU-ez6">
<rect key="frame" x="29" y="214" width="249" height="51"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="32"/>
<state key="normal" title="Setup Instructions">
<color key="titleColor" cocoaTouchSystemColor="scrollViewTexturedBackgroundColor"/>
</state>
<connections>
<segue destination="JpF-eY-5Vc" kind="popoverPresentation" popoverAnchorView="BB5-mU-ez6" id="feN-Dq-AdY">
<popoverArrowDirection key="popoverArrowDirection" up="YES" down="YES" left="YES" right="YES"/>
</segue>
</connections>
</button>
</subviews> </subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<viewLayoutGuide key="safeArea" id="qYW-KB-ok9"/> <viewLayoutGuide key="safeArea" id="qYW-KB-ok9"/>
</view> </view>
<connections> <connections>
<outlet property="backBtn" destination="uJJ-lQ-GmO" id="RxB-gt-5Gh"/>
<outlet property="easterEggBtn" destination="iKA-Ec-DYO" id="WMV-q0-eOT"/> <outlet property="easterEggBtn" destination="iKA-Ec-DYO" id="WMV-q0-eOT"/>
<outlet property="separator" destination="qeH-zn-8dI" id="YcR-E8-ps7"/> <outlet property="separator" destination="qeH-zn-8dI" id="YcR-E8-ps7"/>
</connections> </connections>
@ -788,7 +847,7 @@
</connections> </connections>
</button> </button>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Step By Step" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="gIi-bs-d6P"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Step By Step" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="gIi-bs-d6P">
<rect key="frame" x="119" y="48" width="180" height="36"/> <rect key="frame" x="214" y="48" width="180" height="36"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="boldSystem" pointSize="30"/> <fontDescription key="fontDescription" type="boldSystem" pointSize="30"/>
<nil key="textColor"/> <nil key="textColor"/>
@ -799,11 +858,78 @@
<viewLayoutGuide key="safeArea" id="u6V-N4-N8W"/> <viewLayoutGuide key="safeArea" id="u6V-N4-N8W"/>
</view> </view>
<connections> <connections>
<outlet property="backBtn" destination="sry-bt-iwt" id="26h-sk-0uT"/>
<outlet property="instructionsTable" destination="YPD-fc-WvS" id="v0N-yg-NsU"/> <outlet property="instructionsTable" destination="YPD-fc-WvS" id="v0N-yg-NsU"/>
</connections> </connections>
</viewController> </viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="rG2-rN-jui" userLabel="First Responder" sceneMemberID="firstResponder"/> <placeholder placeholderIdentifier="IBFirstResponder" id="rG2-rN-jui" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects> </objects>
<point key="canvasLocation" x="1793" y="1485"/>
</scene>
<!--Setup Text Instructions View Controller-->
<scene sceneID="Eog-7c-Prt">
<objects>
<viewController id="JpF-eY-5Vc" customClass="setupTextInstructionsViewController" customModule="Guibe" customModuleProvider="target" sceneMemberID="viewController">
<view key="view" contentMode="scaleToFill" id="nwg-o1-bZ9">
<rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" image="serparator" translatesAutoresizingMaskIntoConstraints="NO" id="VWq-dC-HGJ">
<rect key="frame" x="20" y="91" width="374" height="10"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
</imageView>
<button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="yZG-Xn-oYl">
<rect key="frame" x="20" y="44" width="84" height="44"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="26"/>
<state key="normal" title="&lt; Back">
<color key="titleColor" white="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</state>
<connections>
<action selector="backBtnPressed:" destination="C7R-cA-IIg" eventType="touchUpInside" id="14n-f9-bR9"/>
<action selector="backBtnPressed:" destination="Obs-kC-EBO" eventType="touchUpInside" id="BJ6-Vj-0lb"/>
<action selector="backBtnPressed:" destination="EcN-9C-GZO" eventType="touchUpInside" id="f3p-LP-6Yj"/>
<action selector="backBtnPressed:" destination="JpF-eY-5Vc" eventType="touchUpInside" id="n3E-MR-SZh"/>
<action selector="backBtnPressed:" destination="Z1d-IC-mUl" eventType="touchUpInside" id="yv2-CG-WeX"/>
</connections>
</button>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Setup Instructions" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="kFB-UI-rG1">
<rect key="frame" x="137" y="48" width="258" height="36"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="boldSystem" pointSize="30"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" fixedFrame="YES" textAlignment="natural" translatesAutoresizingMaskIntoConstraints="NO" id="Xmt-1u-pXu">
<rect key="frame" x="20" y="109" width="374" height="936"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<mutableString key="text">To turn on your guibe, press the button on the **side of the bracelet**. Your Guibe bracelet will vibrate to let you know that the connection has been successful.
Go to the main screen to search for a destination. When ready, select Begin Journey. You will feel 3 buzzes: ready, steady, go! You are now ready to start the journey and can begin walking.
If you feel 3 long buzzes, youve gone the wrong way! Check back on your home screen to see which direction you should head in.
When you are on your journey, you might feel a short buzz on your right side, this means you are approaching a right turn. When the long buzz comes shortly after, this means turn right now. If you feel a short buzz followed by a long buzz on your left side, this means turn left now.
You are almost set, just one more instruction! When you have arrived at your destination, you will feel a short buzz followed by a long buzz continually until you hop on the app to confirm the end of your journey.
The casing of your device serves as a portable charger. Charge the casing via the mains and simply slip the guibe onto the casing dock to charge it wirelessly.
And thats all you need to know to follow the vibe!</mutableString>
<fontDescription key="fontDescription" type="system" pointSize="20"/>
<textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
</textView>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<viewLayoutGuide key="safeArea" id="WYN-Km-FPc"/>
</view>
<connections>
<outlet property="backBtn" destination="yZG-Xn-oYl" id="QWb-M7-zbk"/>
</connections>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="qeV-kU-gAp" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="2686.9565217391305" y="1484.5982142857142"/> <point key="canvasLocation" x="2686.9565217391305" y="1484.5982142857142"/>
</scene> </scene>
<!--Video Instrictions View Controller--> <!--Video Instrictions View Controller-->
@ -814,13 +940,6 @@
<rect key="frame" x="0.0" y="0.0" width="414" height="896"/> <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews> <subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Video Instructions" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="A1I-wt-9qM">
<rect key="frame" x="72" y="160" width="270" height="42"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="35"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" image="serparator" translatesAutoresizingMaskIntoConstraints="NO" id="Jsy-ZZ-va0"> <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" image="serparator" translatesAutoresizingMaskIntoConstraints="NO" id="Jsy-ZZ-va0">
<rect key="frame" x="20" y="91" width="374" height="10"/> <rect key="frame" x="20" y="91" width="374" height="10"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
@ -839,14 +958,50 @@
<action selector="backBtnPressed:" destination="C7R-cA-IIg" eventType="touchUpInside" id="fmb-qB-nU9"/> <action selector="backBtnPressed:" destination="C7R-cA-IIg" eventType="touchUpInside" id="fmb-qB-nU9"/>
</connections> </connections>
</button> </button>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Video Instructions" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="asB-7K-LXF">
<rect key="frame" x="138" y="48" width="256" height="36"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="boldSystem" pointSize="30"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="VjP-SH-apr">
<rect key="frame" x="73" y="561" width="269" height="161"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" red="0.75425197838429625" green="0.0" blue="1" alpha="0.072185359589041098" colorSpace="custom" customColorSpace="displayP3"/>
<fontDescription key="fontDescription" type="system" pointSize="32"/>
<state key="normal" title="Setup">
<color key="titleColor" cocoaTouchSystemColor="scrollViewTexturedBackgroundColor"/>
</state>
<connections>
<action selector="setupBtnPressed:" destination="Z1d-IC-mUl" eventType="touchUpInside" id="u4a-KJ-vCd"/>
</connections>
</button>
<button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Vtx-Rm-O6r">
<rect key="frame" x="73" y="200" width="269" height="161"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" red="0.75425197840000002" green="0.0" blue="1" alpha="0.072185359589999998" colorSpace="custom" customColorSpace="displayP3"/>
<fontDescription key="fontDescription" type="system" pointSize="32"/>
<state key="normal" title="Tutorial">
<color key="titleColor" cocoaTouchSystemColor="scrollViewTexturedBackgroundColor"/>
</state>
<connections>
<action selector="tutorialBtnPressed:" destination="Z1d-IC-mUl" eventType="touchUpInside" id="2np-SF-9j4"/>
</connections>
</button>
</subviews> </subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<viewLayoutGuide key="safeArea" id="P0U-bD-d7i"/> <viewLayoutGuide key="safeArea" id="P0U-bD-d7i"/>
</view> </view>
<connections>
<outlet property="backBtn" destination="yyl-HX-94u" id="Sbl-3X-j2K"/>
<outlet property="setupBtn" destination="VjP-SH-apr" id="LRM-dm-hJe"/>
<outlet property="tuturialBtn" destination="Vtx-Rm-O6r" id="Jig-dY-7EH"/>
</connections>
</viewController> </viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="CaX-XU-gd4" userLabel="First Responder" sceneMemberID="firstResponder"/> <placeholder placeholderIdentifier="IBFirstResponder" id="CaX-XU-gd4" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects> </objects>
<point key="canvasLocation" x="3603" y="1485"/> <point key="canvasLocation" x="3602.898550724638" y="1484.5982142857142"/>
</scene> </scene>
<!--Tech Specs View Controller--> <!--Tech Specs View Controller-->
<scene sceneID="VE5-Dr-0hF"> <scene sceneID="VE5-Dr-0hF">
@ -888,10 +1043,20 @@
<color key="titleColor" white="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> <color key="titleColor" white="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</state> </state>
</button> </button>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Compliance" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="XgY-SU-rYe">
<rect key="frame" x="226" y="48" width="168" height="36"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="boldSystem" pointSize="30"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
</subviews> </subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<viewLayoutGuide key="safeArea" id="ipt-6K-zfd"/> <viewLayoutGuide key="safeArea" id="ipt-6K-zfd"/>
</view> </view>
<connections>
<outlet property="backBtn" destination="EdV-MP-P7V" id="ctw-tV-ndj"/>
</connections>
</viewController> </viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="wSV-AY-vef" userLabel="First Responder" sceneMemberID="firstResponder"/> <placeholder placeholderIdentifier="IBFirstResponder" id="wSV-AY-vef" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects> </objects>

View File

@ -12,6 +12,7 @@ import MapKit
class InstructionsViewController: UIViewController { class InstructionsViewController: UIViewController {
@IBOutlet weak var separator: UIImageView! @IBOutlet weak var separator: UIImageView!
@IBOutlet weak var easterEggBtn: UIButton! @IBOutlet weak var easterEggBtn: UIButton!
@IBOutlet weak var backBtn: UIButton!
@IBAction func backBtnPressed(_ sender: Any) { @IBAction func backBtnPressed(_ sender: Any) {
self.dismiss(animated: true, completion: nil) self.dismiss(animated: true, completion: nil)
@ -51,6 +52,7 @@ class InstructionsViewController: UIViewController {
super.viewDidLoad() super.viewDidLoad()
easterEggBtn.accessibilityLabel = "Easter egg, do not press" easterEggBtn.accessibilityLabel = "Easter egg, do not press"
backBtn.accessibilityLabel = "Back"
// let mvc = MainViewController() // let mvc = MainViewController()
// let ivc = WrittenInstructionsViewController() // let ivc = WrittenInstructionsViewController()
// //

View File

@ -66,6 +66,10 @@ class MainViewController: UIViewController, AVAudioPlayerDelegate, myProtocol {
@IBOutlet weak var persEtaLbl: UILabel! @IBOutlet weak var persEtaLbl: UILabel!
// --------------------- // ---------------------
@IBOutlet weak var headingButton: UIButton! @IBOutlet weak var headingButton: UIButton!
// ---------------------
@IBOutlet weak var naviFinishedView: UIView!
@IBOutlet weak var arrivedAtDestinationBtn: UIButton!
// OUTLETS--------------OUTLETS // OUTLETS--------------OUTLETS
// ACTIONS--------------ACTIONS // ACTIONS--------------ACTIONS
@ -128,7 +132,13 @@ class MainViewController: UIViewController, AVAudioPlayerDelegate, myProtocol {
} }
// -------------------------- // --------------------------
@IBAction func arrivedAtDestinationBtnPressed(_ sender: Any) {
UIView.animate(withDuration: 1, animations: {self.naviFinishedView.alpha = 0.0})
}
@IBAction func xDebug(_ sender: Any) {
finishedNavigationSuccessfully()
}
// ACTIONS--------------ACTIONS // ACTIONS--------------ACTIONS
override func viewDidLoad() { override func viewDidLoad() {
@ -193,6 +203,14 @@ class MainViewController: UIViewController, AVAudioPlayerDelegate, myProtocol {
headingButton.layer.shadowRadius = 7 headingButton.layer.shadowRadius = 7
headingButton.layer.shadowOpacity = 0.2 headingButton.layer.shadowOpacity = 0.2
naviFinishedView.alpha = 0.0
arrivedAtDestinationBtn.layer.shadowColor = UIColor.black.cgColor
arrivedAtDestinationBtn.layer.cornerRadius = 50
arrivedAtDestinationBtn.layer.shadowOffset = CGSize(width: 5, height: 7)
arrivedAtDestinationBtn.layer.shadowRadius = 50
arrivedAtDestinationBtn.layer.shadowOpacity = 0.6
menuBtn.accessibilityLabel = "Menu" menuBtn.accessibilityLabel = "Menu"
headingButton.accessibilityLabel = "Heading" headingButton.accessibilityLabel = "Heading"
searchBar.accessibilityLabel = "Search destination" searchBar.accessibilityLabel = "Search destination"
@ -203,6 +221,7 @@ class MainViewController: UIViewController, AVAudioPlayerDelegate, myProtocol {
keybDismissBtn.accessibilityLabel = "Dismiss keyboard" keybDismissBtn.accessibilityLabel = "Dismiss keyboard"
mapView.accessibilityElementsHidden = true mapView.accessibilityElementsHidden = true
startNaviImg.accessibilityLabel = "Follow the vibe" startNaviImg.accessibilityLabel = "Follow the vibe"
arrivedAtDestinationBtn.accessibilityLabel = "End Navigation"
} //END OF VIEW DID LOAD } //END OF VIEW DID LOAD
@ -314,6 +333,7 @@ extension MainViewController: CLLocationManagerDelegate {
break; break;
case "The destin": case "The destin":
playDone() playDone()
finishedNavigationSuccessfully()
default: default:
playErr() playErr()
@ -337,6 +357,22 @@ extension MainViewController: CLLocationManagerDelegate {
} }
func finishedNavigationSuccessfully(){
self.stepCounter = 0
self.startedNavigation = false
self.appDelegate.naviStarted = false
mapView.removeOverlays(mapView.overlays)
DispatchQueue.main.asyncAfter(deadline: .now() + 1){
UIView.animate(withDuration: 0.7, animations: {
self.searchView.alpha = 1.0
self.cancelBtn.alpha = 0.0
self.persEtaView.alpha = 0.0})
}
UIView.animate(withDuration: 1, animations: {self.naviFinishedView.alpha = 1.0})
//Animate alpha doneview and deanimate it
}
func playRight(){ func playRight(){
// currentStepLbl.text = "COM: RIGHT" // currentStepLbl.text = "COM: RIGHT"
let path = Bundle.main.path(forResource: "xright", ofType : "mp3")! let path = Bundle.main.path(forResource: "xright", ofType : "mp3")!

View File

@ -9,6 +9,7 @@
import UIKit import UIKit
class TechSpecsViewController: UIViewController { class TechSpecsViewController: UIViewController {
@IBOutlet weak var backBtn: UIButton!
@IBAction func goBackPressed(_ sender: Any) { @IBAction func goBackPressed(_ sender: Any) {
self.dismiss(animated: true, completion: nil) self.dismiss(animated: true, completion: nil)
@ -16,6 +17,7 @@ class TechSpecsViewController: UIViewController {
override func viewDidLoad() { override func viewDidLoad() {
super.viewDidLoad() super.viewDidLoad()
backBtn.accessibilityLabel = "Back"
// Do any additional setup after loading the view. // Do any additional setup after loading the view.
} }

View File

@ -7,20 +7,79 @@
// //
import UIKit import UIKit
import AVKit
class VideoInstrictionsViewController: UIViewController { class VideoInstrictionsViewController: UIViewController, AVAudioPlayerDelegate {
@IBOutlet weak var tuturialBtn: UIButton!
@IBOutlet weak var setupBtn: UIButton!
@IBOutlet weak var backBtn: UIButton!
@IBAction func backBtnPressed(_ sender: Any) { @IBAction func backBtnPressed(_ sender: Any) {
self.dismiss(animated: true, completion: nil) self.dismiss(animated: true, completion: nil)
} }
@IBAction func tutorialBtnPressed(_ sender: Any) {
playVideo1()
}
@IBAction func setupBtnPressed(_ sender: Any) {
playVideo2()
}
override func viewDidLoad() { override func viewDidLoad() {
super.viewDidLoad() super.viewDidLoad()
tuturialBtn.layer.shadowColor = UIColor.black.cgColor
tuturialBtn.layer.cornerRadius = 9
tuturialBtn.layer.shadowOffset = CGSize(width: 7, height: 9)
tuturialBtn.layer.shadowRadius = 9
tuturialBtn.layer.shadowOpacity = 0.4
setupBtn.layer.shadowColor = UIColor.black.cgColor
setupBtn.layer.cornerRadius = 9
setupBtn.layer.shadowOffset = CGSize(width: 7, height: 9)
setupBtn.layer.shadowRadius = 9
setupBtn.layer.shadowOpacity = 0.4
backBtn.accessibilityLabel = "Back"
tuturialBtn.accessibilityLabel = "Usage Tutorial"
setupBtn.accessibilityLabel = "Guibe bracelet setup tutorial"
// Do any additional setup after loading the view. // Do any additional setup after loading the view.
} }
private func playVideo1() {
guard let path = Bundle.main.path(forResource: "placeholder", ofType:"mp4") else {
debugPrint("404")
return }
let player = AVPlayer(url: URL(fileURLWithPath: path))
let playerController = AVPlayerViewController()
playerController.player = player
// playerController.modalPresentationStyle = .popover
present(playerController, animated: true) {
player.play()
}
}
private func playVideo2() {
guard let path = Bundle.main.path(forResource: "placeholder", ofType:"mp4") else {
debugPrint("404")
return }
let player = AVPlayer(url: URL(fileURLWithPath: path))
let playerController = AVPlayerViewController()
playerController.player = player
// playerController.modalPresentationStyle = .popover
present(playerController, animated: true) {
player.play()
}
}
/* /*
// MARK: - Navigation // MARK: - Navigation

View File

@ -64,10 +64,11 @@ class WrittenInstructionsViewController: UIViewController, UITableViewDelegate,
} }
@IBOutlet weak var instructionsTable: UITableView! @IBOutlet weak var instructionsTable: UITableView!
@IBOutlet weak var backBtn: UIButton!
override func viewDidLoad() { override func viewDidLoad() {
super.viewDidLoad() super.viewDidLoad()
backBtn.accessibilityLabel = "Back"
if appDelegate.naviStarted == false { if appDelegate.naviStarted == false {
DispatchQueue.main.asyncAfter(deadline: .now() + 0.2) { DispatchQueue.main.asyncAfter(deadline: .now() + 0.2) {
let alert = UIAlertController(title: "Not Navigating", message: "Please start navigation to see step by step instructions.", preferredStyle: .alert) let alert = UIAlertController(title: "Not Navigating", message: "Please start navigation to see step by step instructions.", preferredStyle: .alert)

BIN
Guibe/placeholder.mp4 Normal file

Binary file not shown.

View File

@ -100,8 +100,8 @@ class settingsViewController: UIViewController {
bTopBtn.accessibilityLabel = "Big side on top" bTopBtn.accessibilityLabel = "Big side on top"
CSTop.accessibilityLabel = "Small side on top" CSTop.accessibilityLabel = "Small side on top"
sTopBtn.accessibilityLabel = "Small side on top" sTopBtn.accessibilityLabel = "Small side on top"
sideText.accessibilityLabel = "Where would you like to wear Guibe" sideText.accessibilityLabel = "Where would you like to wear geibe"
teoSideText.accessibilityLabel = "How would you like to wear Guibe?" teoSideText.accessibilityLabel = "How would you like to wear geibe?"
} }

View File

@ -0,0 +1,39 @@
//
// setupTextInstructionsViewController.swift
// Guibe
//
// Created by Max Hunt on 08/06/2019.
// Copyright © 2019 8. All rights reserved.
//
import UIKit
class setupTextInstructionsViewController: UIViewController {
@IBOutlet weak var backBtn: UIButton!
@IBAction func backBtnPressed(_ sender: Any) {
self.dismiss(animated: true, completion: nil)
}
override func viewDidLoad() {
super.viewDidLoad()
backBtn.accessibilityLabel = "Back"
// Do any additional setup after loading the view.
}
/*
// MARK: - Navigation
// In a storyboard-based application, you will often want to do a little preparation before navigation
override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
// Get the new view controller using segue.destination.
// Pass the selected object to the new view controller.
}
*/
}