Mostly added voiceover features

This commit is contained in:
Max Hunt 2019-06-07 10:14:27 +01:00
parent 157b8cc40b
commit 876250fb2f
18 changed files with 158 additions and 18 deletions

View File

@ -10,5 +10,13 @@
<integer>0</integer> <integer>0</integer>
</dict> </dict>
</dict> </dict>
<key>SuppressBuildableAutocreation</key>
<dict>
<key>50A7ADD0229D6A4200D58743</key>
<dict>
<key>primary</key>
<true/>
</dict>
</dict>
</dict> </dict>
</plist> </plist>

View File

@ -48,6 +48,10 @@ class S3artViewController: UIViewController, CLLocationManagerDelegate {
override func viewDidLoad() { override func viewDidLoad() {
super.viewDidLoad() super.viewDidLoad()
// self.locationManager.delegate = self // self.locationManager.delegate = self
getStartedBtn.accessibilityLabel = "Get started"
playAgainBtn.accessibilityLabel = "Play again"
nextBtn.accessibilityLabel = "Next"
self.locationManager.requestAlwaysAuthorization() self.locationManager.requestAlwaysAuthorization()

View File

@ -10,6 +10,9 @@ import UIKit
class H5ndChoiceViewController: UIViewController { class H5ndChoiceViewController: UIViewController {
@IBOutlet weak var lBtn: UIButton!
@IBOutlet weak var rBtn: UIButton!
let defaults = UserDefaults.standard let defaults = UserDefaults.standard
@IBAction func lftHandPressed(_ sender: Any) { @IBAction func lftHandPressed(_ sender: Any) {
@ -27,6 +30,8 @@ class H5ndChoiceViewController: UIViewController {
override func viewDidLoad() { override func viewDidLoad() {
super.viewDidLoad() super.viewDidLoad()
lBtn.accessibilityLabel = "Left Hand"
rBtn.accessibilityLabel = "Right Hand"
// Do any additional setup after loading the view. // Do any additional setup after loading the view.
} }

View File

@ -10,6 +10,9 @@ import UIKit
class S6deChoiceViewController: UIViewController { class S6deChoiceViewController: UIViewController {
@IBOutlet weak var bTtn: UIButton!
@IBOutlet weak var sBtn: UIButton!
let defaults = UserDefaults.standard let defaults = UserDefaults.standard
@IBAction func topBigPressed(_ sender: Any) { @IBAction func topBigPressed(_ sender: Any) {
@ -28,6 +31,8 @@ class S6deChoiceViewController: UIViewController {
override func viewDidLoad() { override func viewDidLoad() {
super.viewDidLoad() super.viewDidLoad()
bTtn.accessibilityLabel = "Big on top"
sBtn.accessibilityLabel = "Small on top"
// Do any additional setup after loading the view. // Do any additional setup after loading the view.
} }

View File

@ -2,17 +2,17 @@
"images" : [ "images" : [
{ {
"idiom" : "universal", "idiom" : "universal",
"filename" : "todelete.png", "filename" : "headingButton.png",
"scale" : "1x" "scale" : "1x"
}, },
{ {
"idiom" : "universal", "idiom" : "universal",
"filename" : "todelete-1.png", "filename" : "headingButton-1.png",
"scale" : "2x" "scale" : "2x"
}, },
{ {
"idiom" : "universal", "idiom" : "universal",
"filename" : "todelete-2.png", "filename" : "headingButton-2.png",
"scale" : "3x" "scale" : "3x"
} }
], ],

Binary file not shown.

After

Width:  |  Height:  |  Size: 65 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 65 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 65 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 87 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 87 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 87 KiB

View File

@ -103,7 +103,7 @@
</connections> </connections>
</button> </button>
<button opaque="NO" contentMode="scaleAspectFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="gt2-6x-6Ha"> <button opaque="NO" contentMode="scaleAspectFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="gt2-6x-6Ha">
<rect key="frame" x="96" y="607" width="223" height="227"/> <rect key="frame" x="96" y="609" width="223" height="227"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<state key="normal" backgroundImage="s1r"/> <state key="normal" backgroundImage="s1r"/>
@ -111,10 +111,22 @@
<action selector="ritHandPressed:" destination="1fA-dZ-9ei" eventType="touchUpInside" id="lim-hM-PE5"/> <action selector="ritHandPressed:" destination="1fA-dZ-9ei" eventType="touchUpInside" id="lim-hM-PE5"/>
</connections> </connections>
</button> </button>
<textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" fixedFrame="YES" bounces="NO" scrollEnabled="NO" bouncesZoom="NO" editable="NO" text="Where would you like to wear Guibe?" textAlignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="Y4u-0e-LuF">
<rect key="frame" x="27" y="98" width="361" height="88"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<fontDescription key="fontDescription" type="system" pointSize="30"/>
<textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
</textView>
</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="DBZ-Gw-djK"/> <viewLayoutGuide key="safeArea" id="DBZ-Gw-djK"/>
</view> </view>
<connections>
<outlet property="lBtn" destination="WEN-tY-jI4" id="BzR-OW-zgd"/>
<outlet property="rBtn" destination="gt2-6x-6Ha" id="DLS-p6-M6G"/>
</connections>
</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>
@ -150,10 +162,22 @@
<action selector="bottomBigPressed:" destination="Y31-kj-JwL" eventType="touchUpInside" id="0z4-tt-ChI"/> <action selector="bottomBigPressed:" destination="Y31-kj-JwL" eventType="touchUpInside" id="0z4-tt-ChI"/>
</connections> </connections>
</button> </button>
<textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" fixedFrame="YES" bounces="NO" scrollEnabled="NO" bouncesZoom="NO" editable="NO" text="How would you like to wear Guibe?" textAlignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="Ae0-G2-a7h">
<rect key="frame" x="26" y="91" width="361" height="88"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<fontDescription key="fontDescription" type="system" pointSize="30"/>
<textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
</textView>
</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="gsS-aw-PgA"/> <viewLayoutGuide key="safeArea" id="gsS-aw-PgA"/>
</view> </view>
<connections>
<outlet property="bTtn" destination="knf-O9-7aw" id="CAA-EC-Zwl"/>
<outlet property="sBtn" destination="tvs-dW-FeO" id="wnO-hf-lXr"/>
</connections>
</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>
@ -256,12 +280,12 @@
<rect key="frame" x="328" y="798" width="66" height="64"/> <rect key="frame" x="328" y="798" width="66" height="64"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="52"/> <fontDescription key="fontDescription" type="system" pointSize="52"/>
<state key="normal" backgroundImage="todelete"/> <state key="normal" backgroundImage="headingButton"/>
<connections> <connections>
<action selector="headingBtnPressed:" destination="Ovf-sw-BKp" eventType="touchUpInside" id="ZlX-6a-RgF"/> <action selector="headingBtnPressed:" destination="Ovf-sw-BKp" eventType="touchUpInside" id="ZlX-6a-RgF"/>
</connections> </connections>
</button> </button>
<view contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="J48-J9-3Mc"> <view alpha="0.0" contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="J48-J9-3Mc">
<rect key="frame" x="-34" y="-24" width="347" height="399"/> <rect key="frame" x="-34" y="-24" width="347" height="399"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<subviews> <subviews>
@ -381,10 +405,6 @@
</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>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" alpha="0.0" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" image="naviStartedImg" translatesAutoresizingMaskIntoConstraints="NO" id="zO0-ni-hEa">
<rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
</imageView>
<button hidden="YES" opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Giw-Yg-RCh"> <button hidden="YES" opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Giw-Yg-RCh">
<rect key="frame" x="0.0" y="262" width="414" height="377"/> <rect key="frame" x="0.0" y="262" width="414" height="377"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
@ -393,6 +413,10 @@
<action selector="keybDismissBtnPressed:" destination="Ovf-sw-BKp" eventType="touchUpInside" id="LM8-uw-rfe"/> <action selector="keybDismissBtnPressed:" destination="Ovf-sw-BKp" eventType="touchUpInside" id="LM8-uw-rfe"/>
</connections> </connections>
</button> </button>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" alpha="0.0" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" image="naviStartedImg" translatesAutoresizingMaskIntoConstraints="NO" id="zO0-ni-hEa">
<rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
</imageView>
</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"/>
@ -402,6 +426,7 @@
<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"/>
<outlet property="etaView" destination="wbi-cI-xnq" id="pXR-sx-Wgh"/> <outlet property="etaView" destination="wbi-cI-xnq" id="pXR-sx-Wgh"/>
<outlet property="headingButton" destination="hPs-7x-Bl0" id="TEs-2a-UCP"/>
<outlet property="keybDismissBtn" destination="Giw-Yg-RCh" id="YE4-8g-jOa"/> <outlet property="keybDismissBtn" destination="Giw-Yg-RCh" id="YE4-8g-jOa"/>
<outlet property="mapView" destination="Bex-Mk-DDO" id="2Ww-7N-bZc"/> <outlet property="mapView" destination="Bex-Mk-DDO" id="2Ww-7N-bZc"/>
<outlet property="menuBtn" destination="m8G-AJ-moq" id="QXG-rH-6Lm"/> <outlet property="menuBtn" destination="m8G-AJ-moq" id="QXG-rH-6Lm"/>
@ -414,6 +439,7 @@
<outlet property="searchView" destination="bKl-Ku-mh1" id="d0n-Pl-NrK"/> <outlet property="searchView" destination="bKl-Ku-mh1" id="d0n-Pl-NrK"/>
<outlet property="startNaviBtn" destination="vzP-jK-6zt" id="pc2-d2-rNL"/> <outlet property="startNaviBtn" destination="vzP-jK-6zt" id="pc2-d2-rNL"/>
<outlet property="startNaviImg" destination="zO0-ni-hEa" id="DY1-rU-X2g"/> <outlet property="startNaviImg" destination="zO0-ni-hEa" id="DY1-rU-X2g"/>
<outlet property="xNaviBtn" destination="ClP-uQ-1Va" id="RLr-8w-8Zs"/>
</connections> </connections>
</viewController> </viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="a4w-SB-1GS" userLabel="First Responder" sceneMemberID="firstResponder"/> <placeholder placeholderIdentifier="IBFirstResponder" id="a4w-SB-1GS" userLabel="First Responder" sceneMemberID="firstResponder"/>
@ -465,6 +491,7 @@
</subviews> </subviews>
</tableViewCellContentView> </tableViewCellContentView>
<connections> <connections>
<outlet property="goBtn" destination="9iK-CB-Rc6" id="dPk-h5-E7a"/>
<outlet property="primaryLbl" destination="mlZ-q9-9a8" id="Rh6-Gy-EV3"/> <outlet property="primaryLbl" destination="mlZ-q9-9a8" id="Rh6-Gy-EV3"/>
<outlet property="secondaryLbl" destination="bBb-Ag-DTw" id="dQc-es-DNn"/> <outlet property="secondaryLbl" destination="bBb-Ag-DTw" id="dQc-es-DNn"/>
</connections> </connections>
@ -498,6 +525,7 @@
<viewLayoutGuide key="safeArea" id="WeT-3n-RQD"/> <viewLayoutGuide key="safeArea" id="WeT-3n-RQD"/>
</view> </view>
<connections> <connections>
<outlet property="backBtn" destination="mbK-My-hrd" id="0wI-cT-Cp5"/>
<outlet property="tableView" destination="402-5S-nhO" id="Qnx-3U-4Gl"/> <outlet property="tableView" destination="402-5S-nhO" id="Qnx-3U-4Gl"/>
</connections> </connections>
</viewController> </viewController>
@ -601,15 +629,38 @@
<action selector="resetCfgPressed:" destination="C7R-cA-IIg" eventType="touchUpInside" id="yTQ-3x-JnU"/> <action selector="resetCfgPressed:" destination="C7R-cA-IIg" eventType="touchUpInside" id="yTQ-3x-JnU"/>
</connections> </connections>
</button> </button>
<textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" fixedFrame="YES" bounces="NO" scrollEnabled="NO" bouncesZoom="NO" editable="NO" text="Where would you like to wear Guibe?" textAlignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="Ppx-kH-Zyc">
<rect key="frame" x="27" y="116" width="361" height="88"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<fontDescription key="fontDescription" type="system" pointSize="30"/>
<textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
</textView>
<textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" fixedFrame="YES" bounces="NO" scrollEnabled="NO" bouncesZoom="NO" editable="NO" text="How would you like to wear Guibe?" textAlignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="qiS-sb-sRk">
<rect key="frame" x="27" y="522" width="361" height="88"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<fontDescription key="fontDescription" type="system" pointSize="30"/>
<textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
</textView>
</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"/>
</view> </view>
<connections> <connections>
<outlet property="CSTop" destination="fn6-xO-kaN" id="lVs-zO-Wtb"/> <outlet property="CSTop" destination="fn6-xO-kaN" id="lVs-zO-Wtb"/>
<outlet property="bTopBtn" destination="THO-p7-oiF" id="1di-ay-EdS"/>
<outlet property="backBtn" destination="omH-ol-EuT" id="fi3-4U-yb5"/>
<outlet property="cBTop" destination="0ZX-JT-JpQ" id="Tyb-6u-Zls"/> <outlet property="cBTop" destination="0ZX-JT-JpQ" id="Tyb-6u-Zls"/>
<outlet property="cLeft" destination="WDv-sY-oOi" id="zwL-Wg-cRa"/> <outlet property="cLeft" destination="WDv-sY-oOi" id="zwL-Wg-cRa"/>
<outlet property="cRight" destination="ZDz-GQ-0Cc" id="ULK-qC-VTO"/> <outlet property="cRight" destination="ZDz-GQ-0Cc" id="ULK-qC-VTO"/>
<outlet property="leftBtn" destination="yUo-9A-eP3" id="bKX-rJ-30b"/>
<outlet property="rightBtn" destination="wdb-kA-JMS" id="Ilb-qL-nNL"/>
<outlet property="sTopBtn" destination="Nvb-Td-arP" id="GR6-cP-aaS"/>
<outlet property="sideText" destination="Ppx-kH-Zyc" id="h5k-oI-gEB"/>
<outlet property="teoSideText" destination="qiS-sb-sRk" id="MBQ-mx-rK8"/>
</connections> </connections>
</viewController> </viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="C73-06-ntv" userLabel="First Responder" sceneMemberID="firstResponder"/> <placeholder placeholderIdentifier="IBFirstResponder" id="C73-06-ntv" userLabel="First Responder" sceneMemberID="firstResponder"/>
@ -684,6 +735,7 @@
<viewLayoutGuide key="safeArea" id="qYW-KB-ok9"/> <viewLayoutGuide key="safeArea" id="qYW-KB-ok9"/>
</view> </view>
<connections> <connections>
<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>
</viewController> </viewController>
@ -735,6 +787,13 @@
<action selector="backBtnPressed:" destination="Obs-kC-EBO" eventType="touchUpInside" id="i0x-QD-V69"/> <action selector="backBtnPressed:" destination="Obs-kC-EBO" eventType="touchUpInside" id="i0x-QD-V69"/>
</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">
<rect key="frame" x="119" y="48" width="180" 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="u6V-N4-N8W"/> <viewLayoutGuide key="safeArea" id="u6V-N4-N8W"/>
@ -821,6 +880,14 @@
<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>
<button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="vQd-t2-gfk">
<rect key="frame" x="69" y="251" width="277" height="56"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" name="Helvetica" family="Helvetica" pointSize="25"/>
<state key="normal" title="Compliance">
<color key="titleColor" white="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</state>
</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="ipt-6K-zfd"/> <viewLayoutGuide key="safeArea" id="ipt-6K-zfd"/>
@ -837,6 +904,7 @@
<image name="blank" width="314.66665649414062" height="76"/> <image name="blank" width="314.66665649414062" height="76"/>
<image name="circle" width="575.33331298828125" height="568.33331298828125"/> <image name="circle" width="575.33331298828125" height="568.33331298828125"/>
<image name="guibeWord" width="250.66667175292969" height="100"/> <image name="guibeWord" width="250.66667175292969" height="100"/>
<image name="headingButton" width="341.66665649414062" height="341.66665649414062"/>
<image name="menuBtnImg" width="341.33334350585938" height="341.33334350585938"/> <image name="menuBtnImg" width="341.33334350585938" height="341.33334350585938"/>
<image name="naviStartedImg" width="386" height="838.66668701171875"/> <image name="naviStartedImg" width="386" height="838.66668701171875"/>
<image name="nextBtn" width="495.33334350585938" height="181.33332824707031"/> <image name="nextBtn" width="495.33334350585938" height="181.33332824707031"/>
@ -852,7 +920,6 @@
<image name="settingsScreen" width="280" height="608"/> <image name="settingsScreen" width="280" height="608"/>
<image name="startBtn" width="173.33332824707031" height="47.666667938232422"/> <image name="startBtn" width="173.33332824707031" height="47.666667938232422"/>
<image name="startScreen" width="297.33334350585938" height="645.33331298828125"/> <image name="startScreen" width="297.33334350585938" height="645.33331298828125"/>
<image name="todelete" width="319" height="318"/>
<image name="welcome2Screen" width="282.66665649414062" height="616.66668701171875"/> <image name="welcome2Screen" width="282.66665649414062" height="616.66668701171875"/>
</resources> </resources>
</document> </document>

View File

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

View File

@ -58,12 +58,15 @@ class MainViewController: UIViewController, AVAudioPlayerDelegate, myProtocol {
@IBOutlet weak var startNaviBtn: UIButton! @IBOutlet weak var startNaviBtn: UIButton!
@IBOutlet weak var etaLabel: UILabel! @IBOutlet weak var etaLabel: UILabel!
@IBOutlet weak var startNaviImg: UIImageView! @IBOutlet weak var startNaviImg: UIImageView!
@IBOutlet weak var xNaviBtn: UIButton!
// --------------------- // ---------------------
@IBOutlet weak var cancelBtn: UIButton! @IBOutlet weak var cancelBtn: UIButton!
// --------------------- // ---------------------
@IBOutlet weak var persEtaView: UIView! @IBOutlet weak var persEtaView: UIView!
@IBOutlet weak var persEtaLbl: UILabel! @IBOutlet weak var persEtaLbl: UILabel!
// OUTLETS--------------OUTLETS // ---------------------
@IBOutlet weak var headingButton: UIButton!
// OUTLETS--------------OUTLETS
// ACTIONS--------------ACTIONS // ACTIONS--------------ACTIONS
@IBAction func menuBtnPressed(_ sender: Any) { @IBAction func menuBtnPressed(_ sender: Any) {
@ -184,6 +187,21 @@ class MainViewController: UIViewController, AVAudioPlayerDelegate, myProtocol {
persEtaView.layer.shadowRadius = 7 persEtaView.layer.shadowRadius = 7
persEtaView.layer.shadowOpacity = 0.2 persEtaView.layer.shadowOpacity = 0.2
headingButton.layer.shadowColor = UIColor.black.cgColor
headingButton.layer.cornerRadius = 7
headingButton.layer.shadowOffset = CGSize(width: 5, height: 7)
headingButton.layer.shadowRadius = 7
headingButton.layer.shadowOpacity = 0.2
menuBtn.accessibilityLabel = "Menu"
headingButton.accessibilityLabel = "Heading"
searchBar.accessibilityLabel = "Search destination"
cancelBtn.accessibilityLabel = "Cancel navigation"
xNaviBtn.accessibilityLabel = "Cancel"
startNaviBtn.accessibilityLabel = "Start Navigation"
dismissBtn.accessibilityLabel = "Dismiss menu"
keybDismissBtn.accessibilityLabel = "Dismiss keyboard"
mapView.accessibilityElementsHidden = true
} //END OF VIEW DID LOAD } //END OF VIEW DID LOAD

View File

@ -18,6 +18,7 @@ class NewTableViewCell: UITableViewCell {
@IBOutlet weak var primaryLbl: UILabel! @IBOutlet weak var primaryLbl: UILabel!
@IBOutlet weak var secondaryLbl: UILabel! @IBOutlet weak var secondaryLbl: UILabel!
@IBOutlet weak var goBtn: UIButton!
@IBAction func goPressed(_ sender: Any) { @IBAction func goPressed(_ sender: Any) {

View File

@ -21,6 +21,7 @@ class TableViewController: UIViewController {
var myProtocol: myProtocol? var myProtocol: myProtocol?
@IBOutlet weak var tableView: UITableView! @IBOutlet weak var tableView: UITableView!
@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)
@ -28,7 +29,7 @@ class TableViewController: UIViewController {
override func viewDidLoad() { override func viewDidLoad() {
super.viewDidLoad() super.viewDidLoad()
backBtn.accessibilityLabel = "Back"
// let testData = appDelegate.navigationResults // let testData = appDelegate.navigationResults
} }
@ -64,6 +65,7 @@ extension TableViewController: UITableViewDataSource, UITableViewDelegate {
cell.secondaryLbl.text = result.placemark.title cell.secondaryLbl.text = result.placemark.title
cell.cellDelegate = self cell.cellDelegate = self
cell.index = indexPath cell.index = indexPath
cell.goBtn.accessibilityLabel = result.name
} }
return cell return cell

View File

@ -40,9 +40,14 @@ class WrittenInstructionsViewController: UIViewController, UITableViewDelegate,
else { else {
cell.textLabel?.text = "Then in \(focusDistance)m, \(focusInstruction)" } cell.textLabel?.text = "Then in \(focusDistance)m, \(focusInstruction)" }
if indexPath.row == currentStep { if indexPath.row == currentStep {
cell.backgroundColor = .green } cell.backgroundColor = .green
cell.accessibilityLabel = "\(cell.textLabel?.text), current step"
}
else { else {
cell.backgroundColor = .white } cell.accessibilityLabel = cell.textLabel?.text
cell.backgroundColor = .white
}
return cell return cell
} }

View File

@ -16,6 +16,16 @@ class settingsViewController: UIViewController {
@IBOutlet weak var cRight: UIImageView! @IBOutlet weak var cRight: UIImageView!
@IBOutlet weak var cBTop: UIImageView! @IBOutlet weak var cBTop: UIImageView!
@IBOutlet weak var CSTop: UIImageView! @IBOutlet weak var CSTop: UIImageView!
@IBOutlet weak var backBtn: UIButton!
@IBOutlet weak var leftBtn: UIButton!
@IBOutlet weak var rightBtn: UIButton!
@IBOutlet weak var bTopBtn: UIButton!
@IBOutlet weak var sTopBtn: UIButton!
@IBOutlet weak var sideText: UITextView!
@IBOutlet weak var teoSideText: UITextView!
// OUTLETS--------------OUTLETS // OUTLETS--------------OUTLETS
@ -80,7 +90,20 @@ class settingsViewController: UIViewController {
default: default:
print("ERROR, THIS CANNOT HAPPEN!!!!!") print("ERROR, THIS CANNOT HAPPEN!!!!!")
} }
// Do any additional setup after loading the view.
backBtn.accessibilityLabel = "Back"
cLeft.accessibilityLabel = "Left hand"
leftBtn.accessibilityLabel = "Left hand"
cRight.accessibilityLabel = "Right hand"
rightBtn.accessibilityLabel = "Right hand"
cBTop.accessibilityLabel = "Big side on top"
bTopBtn.accessibilityLabel = "Big side on top"
CSTop.accessibilityLabel = "Small side on top"
sTopBtn.accessibilityLabel = "Small side on top"
sideText.accessibilityLabel = "Where would you like to wear Guibe"
teoSideText.accessibilityLabel = "How would you like to wear Guibe?"
} }