From ff98534e0d4b9d2780b030a3c6437e10b688fe5a Mon Sep 17 00:00:00 2001
From: "Daniel W. Steinbrook" <dsteinbrook@gmail.com>
Date: Sun, 15 Sep 2024 08:20:30 -0400
Subject: [PATCH] Keep just the changes necessary for this feature

---
 .../xcshareddata/IDEWorkspaceChecks.plist     |   8 --
 .../en-GB.lproj/Localizable.strings           | Bin 257922 -> 257894 bytes
 .../en-US.lproj/Localizable.strings           |   4 +-
 .../Default/Callouts/POICallout.swift         |   2 +-
 .../Default/ExplorationGenerator.swift        |   4 +-
 .../Helpers/CalloutStateMachine.swift         |   9 ++-
 .../CalloutButtonPanelViewController.swift    |   8 +-
 .../SearchResultsTableViewController.swift    |   4 +-
 .../Visual UI/Views/FirstLaunch.storyboard    |  72 ++++++++----------
 .../Code/Visual UI/Views/Map.storyboard       |  30 ++++----
 .../Code/Visual UI/Views/main.storyboard      |  38 ++++-----
 docs/Soundscape Lab Notebook.md               |  71 -----------------
 12 files changed, 80 insertions(+), 170 deletions(-)
 delete mode 100644 apps/ios/GuideDogs.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
 delete mode 100644 docs/Soundscape Lab Notebook.md

diff --git a/apps/ios/GuideDogs.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/apps/ios/GuideDogs.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
deleted file mode 100644
index 18d98100..00000000
--- a/apps/ios/GuideDogs.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>IDEDidComputeMac32BitWarning</key>
-	<true/>
-</dict>
-</plist>
diff --git a/apps/ios/GuideDogs/Assets/Localization/en-GB.lproj/Localizable.strings b/apps/ios/GuideDogs/Assets/Localization/en-GB.lproj/Localizable.strings
index 456bc2f5ff9078a2bd06999b0eb51b9bc447984d..c6441fcc5171d5464d110cc85c8bc98a1ebed1a1 100644
GIT binary patch
delta 85
zcmZp=&;RTmf5R5W9DB|nhE#?EAWocqv7T9Uy4);Aj_LF48G|^388R3W8L}Btr`tO)
oicc@%U^bf`<;bWv-E9ez()10B7`fUvI4}Y+)AkJx%$L>y0GGxax&QzG

delta 141
zcmaEMkH6_Yf5R5W9Q(;y0etMi3>gfG4B68Kw=s!M-?NC3W4f9%qtbLYdq$b*7wj2D
zI2{>sfH0q-eEP&HW>LcuAX9-Mi6Iq876HiuAWmc`0g@?T@k$_B3^9`-lOc~GefnE_
cM)Aof+@z*AxG;*eXE-ndG1K-82j+k40Q`w2^8f$<

diff --git a/apps/ios/GuideDogs/Assets/Localization/en-US.lproj/Localizable.strings b/apps/ios/GuideDogs/Assets/Localization/en-US.lproj/Localizable.strings
index 3596cb7e..46a811c7 100644
--- a/apps/ios/GuideDogs/Assets/Localization/en-US.lproj/Localizable.strings
+++ b/apps/ios/GuideDogs/Assets/Localization/en-US.lproj/Localizable.strings
@@ -1597,10 +1597,10 @@
 "callouts.audio_beacon.info" = "Updates about distance to the audio beacon when it's set";
 
 /* Shake callouts */
-"callouts.shake_callouts" = "Enable Shake Callouts";
+"callouts.shake_callouts" = "Repeat Callouts";
 
 /*  Shake callouts info */
-"callouts.shake_callouts.info" = "Allow callouts to be repeated by shaking the device";
+"callouts.shake_callouts.info" = "Shake the device to repeat the last callout";
 
 /* Callouts Title, Automatic Callouts */
 "callouts.automatic_callouts" = "Automatic Callouts";
diff --git a/apps/ios/GuideDogs/Code/Behaviors/Default/Callouts/POICallout.swift b/apps/ios/GuideDogs/Code/Behaviors/Default/Callouts/POICallout.swift
index 08b9c932..c630a8d2 100644
--- a/apps/ios/GuideDogs/Code/Behaviors/Default/Callouts/POICallout.swift
+++ b/apps/ios/GuideDogs/Code/Behaviors/Default/Callouts/POICallout.swift
@@ -111,7 +111,7 @@ struct POICallout: POICalloutProtocol {
         self.includeDistance = includeDistance
         self.includePrefixSound = includePrefixSound
     }
-   	 
+    
     /// Sounds to callout
     func sounds(for location: CLLocation?, isRepeat: Bool, automotive: Bool = false) -> Sounds {
         guard let location = location ?? self.location, let poi = poi else {
diff --git a/apps/ios/GuideDogs/Code/Behaviors/Default/ExplorationGenerator.swift b/apps/ios/GuideDogs/Code/Behaviors/Default/ExplorationGenerator.swift
index c615b252..4b93b3f7 100644
--- a/apps/ios/GuideDogs/Code/Behaviors/Default/ExplorationGenerator.swift
+++ b/apps/ios/GuideDogs/Code/Behaviors/Default/ExplorationGenerator.swift
@@ -8,7 +8,7 @@
 
 import CoreLocation
 
-struct ExplorationModeToggled: UserInitiatedEvent { //code handled when one of the four bottom buttons are pressed
+struct ExplorationModeToggled: UserInitiatedEvent {
     let sender: AnyObject?
     let mode: ExplorationGenerator.Mode
     let requiredMarkerKeys: [String]
@@ -25,7 +25,7 @@ struct ExplorationModeToggled: UserInitiatedEvent { //code handled when one of t
     ///       this mode are finished playing after having toggled a mode on
     init(_ mode: ExplorationGenerator.Mode, sender: AnyObject? = nil, requiredMarkerKeys: [String] = [], logContext: String? = nil, completion: ((Bool) -> Void)? = nil) {
         self.mode = mode
-        self.sender = sender //obtained from function call
+        self.sender = sender
         self.requiredMarkerKeys = requiredMarkerKeys
         self.completionHandler = completion
         
diff --git a/apps/ios/GuideDogs/Code/Behaviors/Helpers/CalloutStateMachine.swift b/apps/ios/GuideDogs/Code/Behaviors/Helpers/CalloutStateMachine.swift
index 2b4c62c8..95925c9a 100644
--- a/apps/ios/GuideDogs/Code/Behaviors/Helpers/CalloutStateMachine.swift
+++ b/apps/ios/GuideDogs/Code/Behaviors/Helpers/CalloutStateMachine.swift
@@ -336,29 +336,30 @@ extension CalloutStateMachine {
             } else {
                 sounds = callout.sounds(for: strongSelf.geo?.location, automotive: strongSelf.motionActivityContext.isInVehicle)
             }
-                     
+            
             strongSelf.audioEngine.play(sounds) { (success) in
                 calloutGroup.delegate?.calloutFinished(callout, completed: success)
-
+                
                 guard strongSelf.currentState != State.stopping.rawValue else {
                     GDLogVerbose(.stateMachine, "Callout interrupted. Stopping...")
                     strongSelf.stateMachine.fireEvent(.stopped)
                     calloutGroup.onComplete?(false)
                     return
                 }
-
+                
                 guard strongSelf.currentState != State.off.rawValue else {
                     GDLogVerbose(.stateMachine, "Callouts immediately interrupted. Cleaning up...")
                     calloutGroup.onComplete?(false)
                     return
                 }
-
+                
                 guard success else {
                     GDLogVerbose(.stateMachine, "Callout did not finish playing successfully. Terminating state machine...")
                     calloutGroup.onComplete?(false)
                     strongSelf.stateMachine.fireEvent(.failed)
                     return
                 }
+                
                 strongSelf.stateMachine.fireEvent(.delayCalloutAnnounced)
             }
             
diff --git a/apps/ios/GuideDogs/Code/Visual UI/View Controllers/Home/CalloutButtonPanelViewController.swift b/apps/ios/GuideDogs/Code/Visual UI/View Controllers/Home/CalloutButtonPanelViewController.swift
index beb3c0e5..5565e6b3 100644
--- a/apps/ios/GuideDogs/Code/Visual UI/View Controllers/Home/CalloutButtonPanelViewController.swift	
+++ b/apps/ios/GuideDogs/Code/Visual UI/View Controllers/Home/CalloutButtonPanelViewController.swift	
@@ -120,7 +120,7 @@ class CalloutButtonPanelViewController: UIViewController {
     
     // MARK: `IBAction`
     
-    @IBAction private func onLocateTouchUpInside(_ sender: AnyObject?) { //Triggered when user clicks 'My Location' on main menu
+    @IBAction private func onLocateTouchUpInside(_ sender: AnyObject?) {
         updateAnimation(locateImageView, locateAnimation, true)
         
         let completion: (Bool) -> Void = { [weak self] _ in
@@ -146,7 +146,7 @@ class CalloutButtonPanelViewController: UIViewController {
         AppContext.process(event)
     }
     
-    @IBAction private func onOrientateTouchUpInside(_ sender: AnyObject?) { //Triggered when user clicks 'Around Me'
+    @IBAction private func onOrientateTouchUpInside(_ sender: AnyObject?) {
         updateAnimation(orientateImageView, orientateAnimation, true)
 
         AppContext.process(ExplorationModeToggled(.aroundMe, sender: sender, logContext: logContext) { [weak self] _ in
@@ -162,7 +162,7 @@ class CalloutButtonPanelViewController: UIViewController {
         })
     }
     
-    @IBAction private func onLookAheadTouchUpInside(_ sender: AnyObject?) { //Triggered when user clicks 'Ahead of Me'
+    @IBAction private func onLookAheadTouchUpInside(_ sender: AnyObject?) {
         updateAnimation(exploreImageView, exploreAnimation, true)
         
         AppContext.process(ExplorationModeToggled(.aheadOfMe, sender: sender, logContext: logContext) { [weak self] _ in
@@ -178,7 +178,7 @@ class CalloutButtonPanelViewController: UIViewController {
         })
     }
     
-    @IBAction private func onMarkedPointsTouchUpInside(_ sender: AnyObject?) { //Triggered when user clicks 'Nearby Markers'
+    @IBAction private func onMarkedPointsTouchUpInside(_ sender: AnyObject?) {
         updateAnimation(markedPointImageView, markedPointsAnimation, true)
         
         AppContext.process(ExplorationModeToggled(.nearbyMarkers, sender: sender, logContext: logContext) { [weak self] _ in
diff --git a/apps/ios/GuideDogs/Code/Visual UI/View Controllers/POI Table/SearchResultsTableViewController.swift b/apps/ios/GuideDogs/Code/Visual UI/View Controllers/POI Table/SearchResultsTableViewController.swift
index 6f9bb8fb..b3a0f186 100644
--- a/apps/ios/GuideDogs/Code/Visual UI/View Controllers/POI Table/SearchResultsTableViewController.swift	
+++ b/apps/ios/GuideDogs/Code/Visual UI/View Controllers/POI Table/SearchResultsTableViewController.swift	
@@ -24,7 +24,7 @@ protocol SearchResultsTableViewControllerDelegate: LocationActionDelegate {
     var isAccessibilityActionsEnabled: Bool { get }
 }
 
-class SearchResultsTableViewController: UITableViewController{
+class SearchResultsTableViewController: UITableViewController {
     
     typealias ListItem = ListItemTableViewCellConfigurator.ListItem
     
@@ -148,7 +148,7 @@ class SearchResultsTableViewController: UITableViewController{
                 
                 return poi
             })
-           
+        
         let selectionDataSource = TableViewDataSource(header: nil, models: selections.asListItemWithoutIndex, cellConfigurator: configurator)
         let calloutDataSource = TableViewDataSource(header: GDLocalizedString("poi_screen.header.recent.callouts"), models: callouts.asListItemWithoutIndex, cellConfigurator: configurator)
         
diff --git a/apps/ios/GuideDogs/Code/Visual UI/Views/FirstLaunch.storyboard b/apps/ios/GuideDogs/Code/Visual UI/Views/FirstLaunch.storyboard
index 5a5c0cc4..da233535 100644
--- a/apps/ios/GuideDogs/Code/Visual UI/Views/FirstLaunch.storyboard	
+++ b/apps/ios/GuideDogs/Code/Visual UI/Views/FirstLaunch.storyboard	
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="22505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="SKe-a6-Z8X">
-    <device id="retina6_12" orientation="portrait" appearance="light"/>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="21507" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="SKe-a6-Z8X">
     <dependencies>
-        <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22504"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21505"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
@@ -16,14 +14,14 @@
                         <viewControllerLayoutGuide type="bottom" id="hbQ-Mk-BuJ"/>
                     </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="pqG-Vv-c6O">
-                        <rect key="frame" x="0.0" y="0.0" width="393" height="852"/>
+                        <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" showsHorizontalScrollIndicator="NO" indicatorStyle="white" translatesAutoresizingMaskIntoConstraints="NO" id="jms-Sa-E4o">
-                                <rect key="frame" x="0.0" y="59" width="393" height="759"/>
+                                <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
                                 <subviews>
                                     <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Terms of Use" textAlignment="center" lineBreakMode="middleTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="twL-2e-ZWU" userLabel="Header">
-                                        <rect key="frame" x="32" y="15.999999999999996" width="329" height="33.666666666666657"/>
+                                        <rect key="frame" x="32" y="15.999999999999996" width="536" height="33.666666666666657"/>
                                         <accessibility key="accessibilityConfiguration">
                                             <accessibilityTraits key="traits" staticText="YES" header="YES"/>
                                         </accessibility>
@@ -35,7 +33,7 @@
                                         </userDefinedRuntimeAttributes>
                                     </label>
                                     <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" indicatorStyle="white" editable="NO" adjustsFontForContentSizeCategory="YES" translatesAutoresizingMaskIntoConstraints="NO" id="wpe-rU-LYI" userLabel="Terms of Use" customClass="RoundedTextView" customModule="Soundscape" customModuleProvider="target">
-                                        <rect key="frame" x="32" y="77.666666666666629" width="329" height="426"/>
+                                        <rect key="frame" x="32" y="77.666666666666686" width="536" height="300"/>
                                         <color key="backgroundColor" red="0.1019607843" green="0.14901960780000001" blue="0.25098039220000001" alpha="1" colorSpace="calibratedRGB"/>
                                         <string key="text">Your use of Soundscape is subject to the terms of the Company Services Agreement. Please check the box below to agree and continue.</string>
                                         <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
@@ -55,14 +53,14 @@
                                         </userDefinedRuntimeAttributes>
                                     </textView>
                                     <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="ic_check_box_outline_blank_white" translatesAutoresizingMaskIntoConstraints="NO" id="7ku-Xj-JdJ">
-                                        <rect key="frame" x="28" y="541" width="36" height="36"/>
+                                        <rect key="frame" x="28" y="415" width="36" height="36"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="36" id="UMB-RL-8cC"/>
                                             <constraint firstAttribute="width" constant="36" id="xNx-1W-pSi"/>
                                         </constraints>
                                     </imageView>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Accept Terms of Use" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="J1n-YN-EcN" userLabel="Accept Label">
-                                        <rect key="frame" x="80" y="548.66666666666663" width="281" height="20.333333333333371"/>
+                                        <rect key="frame" x="80" y="422.66666666666669" width="488" height="20.333333333333314"/>
                                         <accessibility key="accessibilityConfiguration">
                                             <bool key="isElement" value="NO"/>
                                         </accessibility>
@@ -74,7 +72,7 @@
                                         </userDefinedRuntimeAttributes>
                                     </label>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="4VC-CC-mKm" userLabel="Terms of Use Button">
-                                        <rect key="frame" x="28" y="538.66666666666663" width="333" height="40.333333333333371"/>
+                                        <rect key="frame" x="28" y="412.66666666666669" width="540" height="40.333333333333314"/>
                                         <accessibility key="accessibilityConfiguration" hint="Double tap to check the \&quot;accept the terms of use\&quot; checkbox" label="Accept Terms of Use"/>
                                         <userDefinedRuntimeAttributes>
                                             <userDefinedRuntimeAttribute type="string" keyPath="accLabelLocalization" value="terms_of_use.accept_checkbox.acc_label"/>
@@ -85,7 +83,7 @@
                                         </connections>
                                     </button>
                                     <button opaque="NO" contentMode="scaleToFill" enabled="NO" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="JPX-Dl-x02" customClass="RoundedSolidButton" customModule="Soundscape" customModuleProvider="target">
-                                        <rect key="frame" x="32" y="614" width="329" height="45"/>
+                                        <rect key="frame" x="32" y="488" width="536" height="45"/>
                                         <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
                                         <constraints>
                                             <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="45" id="W01-cF-5zB"/>
@@ -108,7 +106,7 @@
                                         </connections>
                                     </button>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Next" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="L3y-RA-xLy">
-                                        <rect key="frame" x="32" y="614" width="329" height="45"/>
+                                        <rect key="frame" x="32" y="488" width="536" height="45"/>
                                         <accessibility key="accessibilityConfiguration">
                                             <bool key="isElement" value="NO"/>
                                         </accessibility>
@@ -191,11 +189,11 @@
                         <viewControllerLayoutGuide type="bottom" id="QfL-6n-YYP"/>
                     </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="DUe-2e-Op7">
-                        <rect key="frame" x="0.0" y="0.0" width="393" height="852"/>
+                        <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <activityIndicatorView opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" animating="YES" style="whiteLarge" translatesAutoresizingMaskIntoConstraints="NO" id="i6W-1a-Meu">
-                                <rect key="frame" x="178" y="407.66666666666669" width="37" height="37"/>
+                                <rect key="frame" x="281.66666666666669" y="281.66666666666669" width="37" height="37"/>
                             </activityIndicatorView>
                         </subviews>
                         <color key="backgroundColor" red="0.12867569919999999" green="0.13345718379999999" blue="0.20067968959999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -223,6 +221,7 @@
                 <navigationController navigationBarHidden="YES" id="SKe-a6-Z8X" sceneMemberID="viewController">
                     <nil key="simulatedTopBarMetrics"/>
                     <navigationBar key="navigationBar" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" translucent="NO" id="PQs-yu-UxM">
+                        <rect key="frame" x="0.0" y="0.0" width="1000" height="1000"/>
                         <autoresizingMask key="autoresizingMask"/>
                     </navigationBar>
                     <userDefinedRuntimeAttributes>
@@ -245,14 +244,14 @@
                         <viewControllerLayoutGuide type="bottom" id="HfM-2k-2i8"/>
                     </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="lv4-dC-RRl">
-                        <rect key="frame" x="0.0" y="0.0" width="393" height="852"/>
+                        <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" showsHorizontalScrollIndicator="NO" indicatorStyle="white" translatesAutoresizingMaskIntoConstraints="NO" id="zyB-d4-tJr">
-                                <rect key="frame" x="0.0" y="59" width="393" height="653"/>
+                                <rect key="frame" x="0.0" y="0.0" width="600" height="494"/>
                                 <subviews>
                                     <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Location" textAlignment="center" lineBreakMode="middleTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" adjustsFontForContentSizeCategory="YES" translatesAutoresizingMaskIntoConstraints="NO" id="1dJ-8V-tOj" userLabel="Heading">
-                                        <rect key="frame" x="32" y="15.999999999999996" width="329" height="33.666666666666657"/>
+                                        <rect key="frame" x="32" y="15.999999999999996" width="536" height="33.666666666666657"/>
                                         <accessibility key="accessibilityConfiguration">
                                             <accessibilityTraits key="traits" staticText="YES" header="YES"/>
                                         </accessibility>
@@ -264,13 +263,13 @@
                                         </userDefinedRuntimeAttributes>
                                     </label>
                                     <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="permissions-location" translatesAutoresizingMaskIntoConstraints="NO" id="mol-S8-f1K">
-                                        <rect key="frame" x="0.0" y="66.666666666666671" width="393" height="180.33333333333331"/>
+                                        <rect key="frame" x="0.0" y="66.666666666666686" width="600" height="275"/>
                                         <constraints>
                                             <constraint firstAttribute="width" secondItem="mol-S8-f1K" secondAttribute="height" multiplier="375:172" id="5tW-MW-lgr"/>
                                         </constraints>
                                     </imageView>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Soundscape is a location-based app. We use your location to find and call out things around you." textAlignment="center" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="frC-1Z-Paz" userLabel="Description">
-                                        <rect key="frame" x="32" y="295" width="329" height="64.333333333333314"/>
+                                        <rect key="frame" x="32" y="389.66666666666669" width="536" height="42.333333333333314"/>
                                         <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
                                         <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
                                         <nil key="highlightedColor"/>
@@ -279,7 +278,7 @@
                                         </userDefinedRuntimeAttributes>
                                     </label>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="This permission is required." textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="xTI-8V-z97" userLabel="Required">
-                                        <rect key="frame" x="32" y="391.33333333333331" width="329" height="14.333333333333314"/>
+                                        <rect key="frame" x="32" y="464" width="536" height="14.333333333333314"/>
                                         <fontDescription key="fontDescription" style="UICTFontTextStyleCaption1"/>
                                         <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="calibratedRGB"/>
                                         <nil key="highlightedColor"/>
@@ -305,7 +304,7 @@
                                 </constraints>
                             </scrollView>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="pGU-6E-1Jv" customClass="RoundedSolidButton" customModule="Soundscape" customModuleProvider="target">
-                                <rect key="frame" x="32" y="728" width="329" height="45"/>
+                                <rect key="frame" x="32" y="510" width="536" height="45"/>
                                 <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
                                 <constraints>
                                     <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="45" id="DXB-zS-9W3"/>
@@ -325,7 +324,7 @@
                                 </connections>
                             </button>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Enable Location" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" minimumScaleFactor="0.40000000000000002" adjustsFontForContentSizeCategory="YES" translatesAutoresizingMaskIntoConstraints="NO" id="vN2-rR-aTP">
-                                <rect key="frame" x="32" y="728" width="329" height="45"/>
+                                <rect key="frame" x="32" y="510" width="536" height="45"/>
                                 <accessibility key="accessibilityConfiguration">
                                     <bool key="isElement" value="NO"/>
                                 </accessibility>
@@ -378,14 +377,14 @@
                         <viewControllerLayoutGuide type="bottom" id="YPT-jG-2jI"/>
                     </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="Sq0-qP-7YV">
-                        <rect key="frame" x="0.0" y="0.0" width="393" height="852"/>
+                        <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" showsHorizontalScrollIndicator="NO" indicatorStyle="white" translatesAutoresizingMaskIntoConstraints="NO" id="khh-OM-Ghv">
-                                <rect key="frame" x="0.0" y="59" width="393" height="653"/>
+                                <rect key="frame" x="0.0" y="0.0" width="600" height="494"/>
                                 <subviews>
                                     <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Device Motion" textAlignment="center" lineBreakMode="middleTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" adjustsFontForContentSizeCategory="YES" translatesAutoresizingMaskIntoConstraints="NO" id="3dD-YQ-5WX" userLabel="Heading">
-                                        <rect key="frame" x="32" y="15.999999999999996" width="329" height="33.666666666666657"/>
+                                        <rect key="frame" x="32" y="15.999999999999996" width="536" height="33.666666666666657"/>
                                         <accessibility key="accessibilityConfiguration">
                                             <accessibilityTraits key="traits" staticText="YES" header="YES"/>
                                         </accessibility>
@@ -397,13 +396,13 @@
                                         </userDefinedRuntimeAttributes>
                                     </label>
                                     <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="permissions-device" translatesAutoresizingMaskIntoConstraints="NO" id="HY3-8h-0SH">
-                                        <rect key="frame" x="0.0" y="66.666666666666671" width="393" height="180.33333333333331"/>
+                                        <rect key="frame" x="0.0" y="66.666666666666686" width="600" height="275"/>
                                         <constraints>
                                             <constraint firstAttribute="width" secondItem="HY3-8h-0SH" secondAttribute="height" multiplier="375:172" id="Ir6-2q-E2x"/>
                                         </constraints>
                                     </imageView>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="This allows Soundscape to improve your experience based on whether you are walking, in a vehicle, or standing still." textAlignment="center" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="yO5-9y-xDk" userLabel="Description">
-                                        <rect key="frame" x="32" y="295" width="329" height="64.333333333333314"/>
+                                        <rect key="frame" x="32" y="389.66666666666669" width="536" height="42.333333333333314"/>
                                         <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
                                         <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
                                         <nil key="highlightedColor"/>
@@ -412,7 +411,7 @@
                                         </userDefinedRuntimeAttributes>
                                     </label>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="This permission is required." textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="XkJ-is-KCs" userLabel="Required">
-                                        <rect key="frame" x="32" y="391.33333333333331" width="329" height="14.333333333333314"/>
+                                        <rect key="frame" x="32" y="464" width="536" height="14.333333333333314"/>
                                         <fontDescription key="fontDescription" style="UICTFontTextStyleCaption1"/>
                                         <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="calibratedRGB"/>
                                         <nil key="highlightedColor"/>
@@ -438,7 +437,7 @@
                                 </constraints>
                             </scrollView>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="2i8-rP-UDC" customClass="RoundedSolidButton" customModule="Soundscape" customModuleProvider="target">
-                                <rect key="frame" x="32" y="728" width="329" height="45"/>
+                                <rect key="frame" x="32" y="510" width="536" height="45"/>
                                 <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
                                 <constraints>
                                     <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="45" id="YeZ-lJ-QCE"/>
@@ -458,7 +457,7 @@
                                 </connections>
                             </button>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Enable Motion &amp; Fitness Activity" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" minimumScaleFactor="0.40000000000000002" adjustsFontForContentSizeCategory="YES" translatesAutoresizingMaskIntoConstraints="NO" id="1gT-GG-B8b">
-                                <rect key="frame" x="32" y="728" width="329" height="45"/>
+                                <rect key="frame" x="32" y="510" width="536" height="45"/>
                                 <accessibility key="accessibilityConfiguration">
                                     <bool key="isElement" value="NO"/>
                                 </accessibility>
@@ -503,17 +502,6 @@
             <point key="canvasLocation" x="-634" y="-260"/>
         </scene>
     </scenes>
-    <designables>
-        <designable name="2i8-rP-UDC">
-            <size key="intrinsicContentSize" width="30" height="30"/>
-        </designable>
-        <designable name="JPX-Dl-x02">
-            <size key="intrinsicContentSize" width="30" height="30"/>
-        </designable>
-        <designable name="pGU-6E-1Jv">
-            <size key="intrinsicContentSize" width="30" height="30"/>
-        </designable>
-    </designables>
     <resources>
         <image name="ic_check_box_outline_blank_white" width="24" height="24"/>
         <image name="permissions-device" width="375" height="172"/>
diff --git a/apps/ios/GuideDogs/Code/Visual UI/Views/Map.storyboard b/apps/ios/GuideDogs/Code/Visual UI/Views/Map.storyboard
index ef469150..a3f120a4 100644
--- a/apps/ios/GuideDogs/Code/Visual UI/Views/Map.storyboard	
+++ b/apps/ios/GuideDogs/Code/Visual UI/Views/Map.storyboard	
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="22505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="JuR-oN-4JB">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="20037" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="JuR-oN-4JB">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22504"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="20020"/>
         <capability name="Image references" minToolsVersion="12.0"/>
         <capability name="Named colors" minToolsVersion="9.0"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
@@ -16,7 +16,7 @@
                 <navigationController storyboardIdentifier="EditableMapNavigation" id="fir-Ic-aC6" customClass="NavigationController" customModule="Soundscape" customModuleProvider="target" sceneMemberID="viewController">
                     <navigationItem key="navigationItem" id="NV3-Mx-FjS"/>
                     <navigationBar key="navigationBar" contentMode="scaleToFill" id="ikX-41-gQg">
-                        <rect key="frame" x="0.0" y="48" width="414" height="44"/>
+                        <rect key="frame" x="0.0" y="44" width="414" height="44"/>
                         <autoresizingMask key="autoresizingMask"/>
                     </navigationBar>
                     <connections>
@@ -36,17 +36,17 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <mapView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" mapType="standard" showsUserLocation="YES" translatesAutoresizingMaskIntoConstraints="NO" id="NKI-Jr-lpB">
-                                <rect key="frame" x="0.0" y="92" width="414" height="804"/>
+                                <rect key="frame" x="0.0" y="88" width="414" height="808"/>
                                 <gestureRecognizers/>
                                 <connections>
                                     <outlet property="delegate" destination="JuR-oN-4JB" id="RmJ-B9-M4H"/>
                                 </connections>
                             </mapView>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="nQw-lA-uTI">
-                                <rect key="frame" x="0.0" y="92" width="414" height="804"/>
+                                <rect key="frame" x="0.0" y="88" width="414" height="808"/>
                             </view>
                             <stackView opaque="NO" contentMode="scaleToFill" spacing="12" translatesAutoresizingMaskIntoConstraints="NO" id="MD7-hn-nil">
-                                <rect key="frame" x="302" y="104" width="100" height="44"/>
+                                <rect key="frame" x="302" y="100" width="100" height="44"/>
                                 <subviews>
                                     <button opaque="NO" alpha="0.90000000000000002" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" adjustsImageSizeForAccessibilityContentSizeCategory="YES" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Nfn-r4-9JV" customClass="RoundedButton" customModule="Soundscape" customModuleProvider="target">
                                         <rect key="frame" x="0.0" y="0.0" width="44" height="44"/>
@@ -152,10 +152,10 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <view opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="5PN-4Q-cEu">
-                                <rect key="frame" x="0.0" y="92" width="414" height="36.5"/>
+                                <rect key="frame" x="0.0" y="88" width="414" height="33"/>
                                 <subviews>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Edit to select a new location" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="anF-r1-gR9">
-                                        <rect key="frame" x="8" y="8" width="398" height="20.5"/>
+                                        <rect key="frame" x="8" y="8" width="398" height="17"/>
                                         <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
                                         <color key="textColor" name="Background Base"/>
                                         <nil key="highlightedColor"/>
@@ -170,14 +170,14 @@
                                 </constraints>
                             </view>
                             <mapView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" mapType="standard" showsUserLocation="YES" translatesAutoresizingMaskIntoConstraints="NO" id="bHw-mF-UdJ">
-                                <rect key="frame" x="0.0" y="128.5" width="414" height="767.5"/>
+                                <rect key="frame" x="0.0" y="121" width="414" height="775"/>
                                 <gestureRecognizers/>
                                 <connections>
                                     <outlet property="delegate" destination="h69-qw-bYg" id="eAc-3h-IGt"/>
                                 </connections>
                             </mapView>
                             <imageView hidden="YES" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="baseline_place_red_36pt" translatesAutoresizingMaskIntoConstraints="NO" id="oOA-g9-RIZ">
-                                <rect key="frame" x="189" y="476.5" width="36" height="36"/>
+                                <rect key="frame" x="189" y="472.5" width="36" height="36"/>
                                 <color key="tintColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                             </imageView>
                         </subviews>
@@ -229,7 +229,7 @@
                 <navigationController storyboardIdentifier="ExpandableMapNavigation" id="8bX-rz-fCK" customClass="NavigationController" customModule="Soundscape" customModuleProvider="target" sceneMemberID="viewController">
                     <navigationItem key="navigationItem" id="61c-Hp-utA"/>
                     <navigationBar key="navigationBar" contentMode="scaleToFill" id="oAe-4G-nee">
-                        <rect key="frame" x="0.0" y="48" width="414" height="44"/>
+                        <rect key="frame" x="0.0" y="44" width="414" height="44"/>
                         <autoresizingMask key="autoresizingMask"/>
                     </navigationBar>
                     <connections>
@@ -249,7 +249,7 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <mapView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" mapType="standard" showsUserLocation="YES" translatesAutoresizingMaskIntoConstraints="NO" id="l85-Yk-Gt6">
-                                <rect key="frame" x="0.0" y="48" width="414" height="848"/>
+                                <rect key="frame" x="0.0" y="44" width="414" height="852"/>
                                 <gestureRecognizers/>
                                 <connections>
                                     <outlet property="delegate" destination="EH6-sn-Wrf" id="zPA-KW-PKh"/>
@@ -278,14 +278,14 @@
     </scenes>
     <designables>
         <designable name="Nfn-r4-9JV">
-            <size key="intrinsicContentSize" width="27.5" height="24"/>
+            <size key="intrinsicContentSize" width="22.5" height="22"/>
         </designable>
         <designable name="loU-bV-Vdb">
-            <size key="intrinsicContentSize" width="26.5" height="25.5"/>
+            <size key="intrinsicContentSize" width="22.5" height="22.5"/>
         </designable>
     </designables>
     <resources>
-        <image name="arrow.triangle.branch" catalog="system" width="128" height="110"/>
+        <image name="arrow.triangle.branch" catalog="system" width="128" height="108"/>
         <image name="arrow.up.left.and.arrow.down.right" catalog="system" width="128" height="115"/>
         <image name="baseline_place_red_36pt" width="36" height="36"/>
         <namedColor name="Background Base">
diff --git a/apps/ios/GuideDogs/Code/Visual UI/Views/main.storyboard b/apps/ios/GuideDogs/Code/Visual UI/Views/main.storyboard
index e3daeb81..13578811 100644
--- a/apps/ios/GuideDogs/Code/Visual UI/Views/main.storyboard	
+++ b/apps/ios/GuideDogs/Code/Visual UI/Views/main.storyboard	
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="7et-YF-5hx">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="21701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="7et-YF-5hx">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22684"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21678"/>
         <capability name="Named colors" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -395,23 +395,6 @@
                                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="NK6-TR-1BY">
                                                 <rect key="frame" x="8" y="4" width="87.5" height="39"/>
                                                 <subviews>
-                                                    <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="750" verticalCompressionResistancePriority="250" image="my_location_32px" adjustsImageSizeForAccessibilityContentSizeCategory="YES" translatesAutoresizingMaskIntoConstraints="NO" id="p25-O6-Ar8">
-                                                        <rect key="frame" x="28" y="0.0" width="32" height="1"/>
-                                                    </imageView>
-                                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalCompressionResistancePriority="1000" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Avc-F7-TC9">
-                                                        <rect key="frame" x="0.0" y="5" width="87.5" height="34"/>
-                                                        <accessibility key="accessibilityConfiguration">
-                                                            <bool key="isElement" value="NO"/>
-                                                        </accessibility>
-                                                        <string key="text">My
-Location</string>
-                                                        <fontDescription key="fontDescription" style="UICTFontTextStyleFootnote"/>
-                                                        <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
-                                                        <nil key="highlightedColor"/>
-                                                        <userDefinedRuntimeAttributes>
-                                                            <userDefinedRuntimeAttribute type="string" keyPath="localization" value="ui.action_button.my_location"/>
-                                                        </userDefinedRuntimeAttributes>
-                                                    </label>
                                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="gjV-vm-fas" customClass="NVActivityIndicatorView" customModule="NVActivityIndicatorView">
                                                         <rect key="frame" x="30" y="-13.5" width="28" height="28"/>
                                                         <color key="backgroundColor" red="1" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
@@ -429,6 +412,23 @@ Location</string>
                                                             </userDefinedRuntimeAttribute>
                                                         </userDefinedRuntimeAttributes>
                                                     </view>
+                                                    <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="750" verticalCompressionResistancePriority="250" image="my_location_32px" adjustsImageSizeForAccessibilityContentSizeCategory="YES" translatesAutoresizingMaskIntoConstraints="NO" id="p25-O6-Ar8">
+                                                        <rect key="frame" x="28" y="0.0" width="32" height="1"/>
+                                                    </imageView>
+                                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalCompressionResistancePriority="1000" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Avc-F7-TC9">
+                                                        <rect key="frame" x="0.0" y="5" width="87.5" height="34"/>
+                                                        <accessibility key="accessibilityConfiguration">
+                                                            <bool key="isElement" value="NO"/>
+                                                        </accessibility>
+                                                        <string key="text">My
+Location</string>
+                                                        <fontDescription key="fontDescription" style="UICTFontTextStyleFootnote"/>
+                                                        <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                                        <nil key="highlightedColor"/>
+                                                        <userDefinedRuntimeAttributes>
+                                                            <userDefinedRuntimeAttribute type="string" keyPath="localization" value="ui.action_button.my_location"/>
+                                                        </userDefinedRuntimeAttributes>
+                                                    </label>
                                                 </subviews>
                                                 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                                 <constraints>
diff --git a/docs/Soundscape Lab Notebook.md b/docs/Soundscape Lab Notebook.md
deleted file mode 100644
index c0a4ba28..00000000
--- a/docs/Soundscape Lab Notebook.md	
+++ /dev/null
@@ -1,71 +0,0 @@
-## Start of documentation - 3/19/24
-
-(This document is written with the primary intention of describing the progress I’ve made so far to someone at RCOS who may take over this job in the future.)
-
-My primary objective is to repeat the last callout that occurred when a user shakes their device. This involves two things:
-
-1. Being able to trigger an event when the device is shaken
-
-2. Repeating the last callout
-
-Part 1 was pretty easy to implement. The program already has the relevant information to do something when the device is shaken. This most importantly involves the motionEnded function, which is overridden (which is pretty standard from tutorials I’ve seen). On XCode, it’s really easy to look for a particular keyword. On the left menu, which is commonly used for files, there is a tab that contains a search bar where you can search for any keyword. Putting in motionEnded quickly led me to the appropriate section to put the code. I then put code to detect a motion shake and made a message get logged to the console whenever the device was shaken. Part 1 is completed - an event is triggered when the device is shaken.
-
-Part 2 has been much trickier to implement and, as of writing this, is currently not implemented. Implementing this part has required me to establish a thorough understanding of how sounds are processed in soundscape. While there are functions in Swift that can call tts audio, like .speak, Soundscape uses a far more complex approach to sounds, though it’s this that allows it to broadcast more complex sounds, like 3D sounds. This 3D sound is significant - especially to someone who is blind. For example, when using headphones, using the app in Amos Eaton when Lally Hall is on the right will play the sound primarily on the right headphone. Moving the phone in real-time (for example, flipping the phone so Lally Hall is now on the left) primarily plays the sound on the left headphone. 
-
-The callout system also takes advantage of a queue, which ensures that only one sound is played at a time. All the text is put into a CalloutGroup, an object that is then passed to an AudioEngine at the last moment for rendering. The CalloutGroup has the potential to change while sounds are rendering, so by rendering the sound right before playing it, the most up-to-date information is presented to the user. Although many locations are presented, there appears to be a cap on how many locations are called out based on count and distance (count seems to be around 5, distance.. around a mile?) I don’t know exactly where these numbers are stored.
-
-The code also seems to utilize ‘generators’ as a part of the sound playback process, of which there are automatic and manual generators. Automatic generators generally queue up instead of interrupting and are updated based on things like user location (I’d guess that the sound moving to the other headphone based on how I adjusted my phone earlier was also a product of an automatic generator). Manual generators represent user actions and tend to interrupt automatic generators. These generators are utilized in classes that contain CalloutGroup objects.
-
-My interpretation of the above request is to repeat the last callout even if current callouts are being called. For example, if callout1 was “Lally Hall around 100 feet”, callout2 was “Sage Lab around 200 feet”, and callout2 was speaking, shaking the device would interrupt callout2 and instead play callout1 (which played just before callout2) before playing callout2 from the beginning. Shaking while callout1 was playing would just restart callout1. If callout2 was the last callout, shaking should play callout2. Now note that callout1 is (I assume) based on an automatic generator. But it needs to interrupt callout2 before playing. In the AutomaticGenerator, there is canInterrupt variable, so before playing callout1, that should be set to true. This should allow callout1 to properly interrupt callout2.
-
-How would I implement this? To start, CalloutGroup objects are generally located in classes that utilize generators, so by convention, we should store callouts there. We could create a new variable that will store the information of the last CalloutGroup played and get updated whenever a callout is finished playing. We then need to tell the audio generator to stop playing the current callout (if any) and play the last callout upon shaking the device.
-
-While I haven’t been able to really implement something so far in this part, I do have a few ideas on things that might work. We could create a new variable that will store the information of the last CalloutGroup played. We then need to tell the audio generator that when the device is shaken, the callout stored in that variable should be played. The part that I’m struggling with is where to place that code and how to write that code. 
-
-Swift coding, despite being fairly high-level, is unlike traditional languages like C++, Java, or Python in its syntax and the things you can do with it, so stuff doesn’t stick out as easily. There are also lots of custom-defined objects, which, most likely because of Swift and their complexity, doesn’t make it very clear to me what each line of code does.
-
-However, one thing that has helped is communicating with people in Soundscape Slack. Here, RCOS students can communicate with other active developers. If Wes Turner is still at RCOS, ask him to add you, and he should be able to honor that request. The expert on the sound side of Soundscape is Daniel Steinbrook, so if you work on this issue, send him a DM if you have any problems. I’ve been exchanging messages with him, and he’s given me great advice on how the sound system works, much more information than me just poking around the code. If there’s one thing you should do after reading this, it should be to join the Soundscape Slack.
-
-
-## Update 3/26/24
-
-Since last week, I have gotten a better understanding of how some of the program code works. Last Friday (3/22), I expanded on my attempt to store the callouts in a variable.
-
-My attempts on Friday were pretty fruitless, perhaps trying to write a line of code here and there, but ultimately to no verdict. Today, I got a slightly different approach. I remembered that Daniel had told me to look at the storyboards and see how the code was implemented for the four buttons on the bottom of the main menu. I made some decent traction here. I watched a YouTube video ([https://www.youtube.com/watch?v=oZGAicT2zbg](https://www.youtube.com/watch?v=oZGAicT2zbg)) to get an idea of how storyboards interacted with code. I eventually discovered the @IBAction keyword, which linked up buttons with actual code. Right-clicking on the buttons revealed the relevant function that they linked up to. From there, I used cmd + f to search the entire project (as explained above) and quickly found the file in which they were located. One line started with AppContext.process(ExplorationModeToggled(... and I right-clicked on ExplorationModeToggled, which took me to the top of the ExplorationGenerator.swift file. This taught me that the buttons were pretty closely related to the ExplorationGenerator and that this is where I should probably be focused. 
-
-As I looked through the ExplorationGenerator class, I started to find more evidence of these buttons. Right after the declaration, I found a Mode enumeration with cases of locate, aroundMe, aheadOfMe, and nearbyMarkers. As I searched through the file, I found answers to a question I had been wondering about earlier. A variable titled maxAheadOfMeCallouts is initialized to 5, confirming my suspicion that up to 5 callouts are listed. While I haven’t looked into markers yet, there is a maxNearbyMarkerCallouts that is initialized to 4, so that seems to answer that question.
-
-But after that, I quickly got confused again. Line 157 (as of writing this) says var callouts: [CalloutProtocol]. This made me quite confused because lots of documentation I was reading about queued audio (https://github.com/soundscape-community/soundscape/blob/main/docs/ios-client/overview.md#discrete-queued-audio) discussed Callout_Group_. From my understanding, protocols are a level above classes. They create a framework that is inherited by a class or an object (CalloutGroup, for example, is an object). CalloutProtocol is mentioned in CalloutGroup’s class declaration, but I don’t know if it’s necessarily inherited by it. Looking through the code doesn’t explicitly mention anything about the explicit _text_ that is rendered. But ultimately, I’m most confused about how CalloutGroup and CalloutProtocol are related and when to use which. I’ve sent Daniel Steinbrook a message concerning some of my issues, and I await his response.
-
-
-## Update 4/12/24
-
-I’ve made some more progress in understanding the code and have even started making some slight contributions. The biggest thing I discovered was where the sounds get passed to the Audio Engine. This is done in CalloutStateMachine.swift - the particular line is
-
-    strongSelf.audioEngine.play(sounds) { (success) in
-        calloutGroup.delegate?.calloutFinished(callout, completed: success)
-
-I don’t entirely understand the whole line, but it calls .play on the audioEngine, which is a big sign. It also calls sounds, which is an array of particular sound objects that are grouped into a callout.
-
-Sounds appear to be short phrases - things like “Nearest road” and “Star One Credit Union” (a weird example, yes, but the simulator oddly kept calling this out). These are all strung together to form a callout. The compilation of such objects is done in POICallout using the sounds function. A sounds array is created, which is an array of sounds. Individual sounds are then appended and, when every sound is appended, is passed back to the caller of sounds (which might be CalloutStateMachine). I have tried appending sounds, like..
-
-sounds.append(TTSSound("Hello world."))
-
-Appending this sound causes “Hello world” to be added to the callout, which I’m able to hear. This isn’t the first time I’ve tried running this line - I tried this in the past, but I put it in a spot where the sound wouldn’t be added to an array that would get properly returned, meaning the sound never gets played.
-
-Back to the code I’ve been trying to write - I’ve tried to obtain the previous sound but have struggled to do so. The big issue is where to declare this “previous sound” variable. Declaring it in the same function as where the sound is won’t work. I’ve attempted to expand the play sound code so it utilizes the previous sound variable. Declaring this variable after the play sound code results in scope issues. Declaring it before resets the previousSound variable, therefore causing the sound to not be preserved. This means it needs to be declared outside of this function. I tried declaring it in the class declaration, where several other variables are declared, but this resulted in problems.
-
-I sent a message to Daniel explaining the previous sound variable I was trying to create and how to declare variables in CalloutStateMachine. He sent me a message back saying that the variable I’m describing already exists. I looked at the variable and immediately got confused as its type is [POI] rather than Sounds. So, instead of having an array of sounds, there seems to be an array of POIs. A POI object contains several useful things, like the name of an object, a localized name, an address, a street, longitude, latitude, and even functions stating the closest location and its distance (I don’t entirely know the purpose of the functions). Part of the reasoning may be that the callout might need to be updated (i.e., if we’re 100 feet from a location and we move 50 feet away, the callout should now say that we’re 150 feet away). I’ve asked Daniel on how to utilize this POI object within the context of the CalloutStateMachine (which utilizes sounds), and I await his response.
-
-
-## Update 4/22/24
-
-Surprisingly, I was able to mostly solve my problem in the end. The secret to my problem was that many of the resources I needed already existed. Daniel helped guide me to code in the HomeViewController+RemoteControl.swift file, which virtually did what I needed. There was a handleRepeat() function in the context of repeating the last callout when playing from the lock screen. By pressing the previous track button on the lock screen, the audio machine would stop playing callouts and restart the callout that was previously playing. I wondered if I could adapt a similar code to utilize in restarting the callout when motion was detected. I initially tried calling the handleRepeat() function from LaunchHelper.swift (which has code to do something upon motion being detected), though I kept getting errors when doing this. What worked better was copy-pasting the handleRepeat() function into the code segment that runs when motion is detected. After tweaking a few things, shaking the device does indeed restart the callout. However, the callouts aren’t restarted, meaning that they just get discarded upon finishing the repeated callout. Depending on how we look at things, the issue is either mostly resolved or completely resolved. On one hand, this wasn’t how I originally interpreted the problem. I always thought of it as the callouts should keep playing, even after being restarted. But on the other hand, maybe this isn’t a necessary thing. Maybe it’s good that the user can keep hearing the same callout if needed, perhaps over and over again if needed. Having multiple callouts and having to cycle through them might be complicating the problem. Regardless of the approach to this problem, I do wonder if the current callout should be restarted or if it should play the _previous_ callout. I believe this is something that is up to interpretation, and I don’t know the best answer to this. It may take real-life experimentation to accurately determine the answer to this question.
-
-To another person joining this project: I think this issue is mostly resolved, and I’ll work on communicating with others about how this issue should go forth and if it’s ready to be merged with main or not. To get started,
-
-
-
-* Find an issue on GitHub that someone put out (or you can create your own)
-* Work on that issue. If things get hard, know that there’s lots of documentation available about Soundscape.
-* Join the Slack team, where you’ll find other people who are actively working on Soundscape. If you’re in RCOS, reach out to Prof. Turner. (I, unfortunately, don’t know how to join if you’re outside of RCOS, but you can join the discord: [https://discord.gg/vu4uG28qFY](https://discord.gg/vu4uG28qFY), and maybe there you can get invited to the slack). On Slack, you can message others about your issue if you’re stuck. I personally recommend talking to Daniel Steinbrook - he seems very knowledgeable about the inner workings of Soundscape, and I bet he’ll know how to approach your problem.