incremental updates

Guibe/Assets.xcassets/loadScreen-1.imageset/Contents.json

@@ -2,17 +2,17 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "Screenshot 2019-05-28 at 14.12.36.png",
+      "filename" : "startScreen.png",
       "scale" : "1x"
     },
     {
       "idiom" : "universal",
-      "filename" : "Screenshot 2019-05-28 at 14.12.36-1.png",
+      "filename" : "startScreen-1.png",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "filename" : "Screenshot 2019-05-28 at 14.12.36-2.png",
+      "filename" : "startScreen-2.png",
       "scale" : "3x"
     }
   ],

Guibe/Assets.xcassets/todelete.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "todelete.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "todelete-1.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "todelete-2.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

Guibe/Base.lproj/Main.storyboard

@@ -172,7 +172,7 @@
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                             </imageView>
                             <activityIndicatorView opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" fixedFrame="YES" animating="YES" style="whiteLarge" translatesAutoresizingMaskIntoConstraints="NO" id="akh-Bh-HOu">
-                                <rect key="frame" x="189" y="477" width="37" height="37"/>
+                                <rect key="frame" x="189" y="508" width="37" height="37"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                             </activityIndicatorView>
                         </subviews>
@@ -210,22 +210,12 @@
                                         </state>
                                     </button>
                                     <searchBar contentMode="redraw" fixedFrame="YES" placeholder="Search" backgroundImage="blank" translatesAutoresizingMaskIntoConstraints="NO" id="dRT-vj-1ew">
-                                        <rect key="frame" x="8" y="15" width="326" height="44"/>
+                                        <rect key="frame" x="8" y="15" width="358" height="44"/>
                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
                                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                         <color key="barTintColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                         <textInputTraits key="textInputTraits" autocapitalizationType="words" autocorrectionType="yes" spellCheckingType="no" keyboardAppearance="alert" returnKeyType="go" enablesReturnKeyAutomatically="YES" smartInsertDeleteType="yes" textContentType="location"/>
                                     </searchBar>
-                                    <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="G7y-oE-2AD">
-                                        <rect key="frame" x="334" y="20" width="32" height="34"/>
-                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                        <state key="normal" backgroundImage="speechBtn">
-                                            <color key="titleShadowColor" red="1" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
-                                        </state>
-                                        <connections>
-                                            <action selector="micBtnPressed:" destination="Ovf-sw-BKp" eventType="touchUpInside" id="5yU-FZ-eI9"/>
-                                        </connections>
-                                    </button>
                                 </subviews>
                                 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                             </view>
@@ -262,7 +252,16 @@
                                     <action selector="dismissBtnPressed:" destination="Ovf-sw-BKp" eventType="touchUpInside" id="BNO-Ka-gpn"/>
                                 </connections>
                             </button>
-                            <view alpha="0.0" contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="J48-J9-3Mc">
+                            <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="hPs-7x-Bl0">
+                                <rect key="frame" x="328" y="798" width="66" height="64"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="52"/>
+                                <state key="normal" backgroundImage="todelete"/>
+                                <connections>
+                                    <action selector="headingBtnPressed:" destination="Ovf-sw-BKp" eventType="touchUpInside" id="ZlX-6a-RgF"/>
+                                </connections>
+                            </button>
+                            <view contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="J48-J9-3Mc">
                                 <rect key="frame" x="-34" y="-24" width="347" height="399"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <subviews>
@@ -321,24 +320,6 @@
                                 </subviews>
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                             </view>
-                            <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="9F2-yk-wzW">
-                                <rect key="frame" x="364" y="853" width="30" height="31"/>
-                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                <fontDescription key="fontDescription" type="system" pointSize="52"/>
-                                <state key="normal" title="^"/>
-                                <connections>
-                                    <action selector="followBtnPressed:" destination="Ovf-sw-BKp" eventType="touchUpInside" id="pLx-Zt-hHP"/>
-                                </connections>
-                            </button>
-                            <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="hPs-7x-Bl0">
-                                <rect key="frame" x="20" y="809" width="39" height="75"/>
-                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                <fontDescription key="fontDescription" type="system" pointSize="52"/>
-                                <state key="normal" title="^|"/>
-                                <connections>
-                                    <action selector="headingBtnPressed:" destination="Ovf-sw-BKp" eventType="touchUpInside" id="ZlX-6a-RgF"/>
-                                </connections>
-                            </button>
                             <view alpha="0.0" contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="wbi-cI-xnq" userLabel="etaView">
                                 <rect key="frame" x="0.0" y="658" width="414" height="238"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
@@ -426,7 +407,6 @@
                         <outlet property="menuBtn" destination="m8G-AJ-moq" id="QXG-rH-6Lm"/>
                         <outlet property="menuView" destination="VZj-Lm-Ems" id="IBs-mV-GJW"/>
                         <outlet property="menuWindowView" destination="J48-J9-3Mc" id="gnS-K2-H8d"/>
-                        <outlet property="micBtn" destination="G7y-oE-2AD" id="W6R-nB-sax"/>
                         <outlet property="persEtaLbl" destination="O4h-DM-Zqh" id="UYm-pC-87I"/>
                         <outlet property="persEtaView" destination="BdX-f2-6nO" id="4xT-MK-1za"/>
                         <outlet property="searchBar" destination="dRT-vj-1ew" id="nAa-5O-h0R"/>
@@ -475,7 +455,7 @@
                                                     <nil key="textColor"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Phone number" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bBb-Ag-DTw">
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Address" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" adjustsLetterSpacingToFitWidth="YES" translatesAutoresizingMaskIntoConstraints="NO" id="bBb-Ag-DTw">
                                                     <rect key="frame" x="20" y="58" width="374" height="21"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
@@ -495,10 +475,21 @@
                                     <outlet property="delegate" destination="jBr-V0-GbL" id="JWz-Zv-Onp"/>
                                 </connections>
                             </tableView>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Destinations" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="26H-72-eUL">
+                            <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="mbK-My-hrd">
-                                <rect key="frame" x="20" y="44" width="235" height="48"/>
+                                <rect key="frame" x="20" y="53" width="374" height="42"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                <fontDescription key="fontDescription" type="boldSystem" pointSize="40"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="25"/>
+                                <state key="normal" title="&lt; Back">
+                                    <color key="titleColor" white="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                </state>
+                                <connections>
+                                    <action selector="backBtnPressed:" destination="jBr-V0-GbL" eventType="touchUpInside" id="ygE-xp-WAh"/>
+                                </connections>
+                            </button>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Destinations" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="26H-72-eUL">
+                                <rect key="frame" x="119" y="56" width="177" height="36"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <fontDescription key="fontDescription" type="boldSystem" pointSize="30"/>
                                 <nil key="textColor"/>
                                 <nil key="highlightedColor"/>
                             </label>
@@ -663,8 +654,19 @@
                                     </segue>
                                 </connections>
                             </button>
+                            <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="iKA-Ec-DYO">
+                                <rect key="frame" x="29" y="338" width="299" height="51"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="32"/>
+                                <state key="normal" title="More coming soon!!!!!">
+                                    <color key="titleColor" cocoaTouchSystemColor="scrollViewTexturedBackgroundColor"/>
+                                </state>
+                                <connections>
+                                    <action selector="easterEggPressed:" destination="Obs-kC-EBO" eventType="touchUpInside" id="4fy-fz-fIa"/>
+                                </connections>
+                            </button>
                             <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="fov-Ic-2dL">
-                                <rect key="frame" x="29" y="264" width="268" height="51"/>
+                                <rect key="frame" x="29" y="244" width="268" height="51"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="32"/>
                                 <state key="normal" title="Written Instructions">
@@ -677,15 +679,13 @@
                                     </segue>
                                 </connections>
                             </button>
-                            <view contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="DkN-yW-Xgu">
-                                <rect key="frame" x="0.0" y="236" width="342" height="2"/>
-                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                <color key="backgroundColor" red="0.94275027513504028" green="0.44108907970833666" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
-                            </view>
                         </subviews>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                         <viewLayoutGuide key="safeArea" id="qYW-KB-ok9"/>
                     </view>
+                    <connections>
+                        <outlet property="separator" destination="qeH-zn-8dI" id="YcR-E8-ps7"/>
+                    </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="m3K-Fq-zFT" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
@@ -850,9 +850,9 @@
         <image name="select2Screen" width="278.66665649414062" height="605.33331298828125"/>
         <image name="serparator" width="737.33331298828125" height="14"/>
         <image name="settingsScreen" width="280" height="608"/>
-        <image name="speechBtn" width="331.33334350585938" height="369"/>
         <image name="startBtn" width="173.33332824707031" height="47.666667938232422"/>
-        <image name="startScreen" width="306" height="661.33331298828125"/>
+        <image name="startScreen" width="297.33334350585938" height="645.33331298828125"/>
-        <image name="welcome2Screen" width="293.33334350585938" height="636"/>
+        <image name="todelete" width="319" height="318"/>
+        <image name="welcome2Screen" width="282.66665649414062" height="616.66668701171875"/>
     </resources>
 </document>

Guibe/InstructionsViewController.swift

@@ -10,6 +10,7 @@ import UIKit
 import MapKit
 
 class InstructionsViewController: UIViewController {
+    @IBOutlet weak var separator: UIImageView!
     
     @IBAction func backBtnPressed(_ sender: Any) {
         self.dismiss(animated: true, completion: nil)
@@ -23,6 +24,18 @@ class InstructionsViewController: UIViewController {
 //        ivc.currentStep = mvc.stepCounter
     }
     
+    @IBAction func easterEggPressed(_ sender: Any) {
+        separator.isHidden = true
+        self.view.backgroundColor = .green
+        DispatchQueue.main.asyncAfter(deadline: .now() + 0.4) {self.view.backgroundColor = .red}
+        DispatchQueue.main.asyncAfter(deadline: .now() + 0.8) {self.view.backgroundColor = .blue}
+        DispatchQueue.main.asyncAfter(deadline: .now() + 1.2) {self.view.backgroundColor = .yellow}
+        DispatchQueue.main.asyncAfter(deadline: .now() + 1.6) {self.view.backgroundColor = .cyan}
+        DispatchQueue.main.asyncAfter(deadline: .now() + 2.0) {self.view.backgroundColor = .magenta}
+        DispatchQueue.main.asyncAfter(deadline: .now() + 2.4) {self.view.backgroundColor = .white;self.separator.isHidden = false}
+    }
+    
+    
     @IBAction func VABtnPressed(_ sender: Any) {
         
     }

Guibe/MainViewController.swift

@@ -50,7 +50,6 @@ class MainViewController: UIViewController, AVAudioPlayerDelegate, myProtocol {
     @IBOutlet weak var searchBarBg: UIButton!
     @IBOutlet weak var searchView: UIView!
     @IBOutlet weak var searchBar: UISearchBar!
-    @IBOutlet weak var micBtn: UIButton!
     @IBOutlet weak var keybDismissBtn: UIButton!
 //    ---------------------
     @IBOutlet weak var mapView: MKMapView!
@@ -280,6 +279,7 @@ extension MainViewController: CLLocationManagerDelegate {
                     //                    let currentStep = steps[stepCounter]
                     let message = "\(steps[stepCounter-1].instructions)"
                     let maneuverCommand = String(message.prefix(10))
+                    if player.volume != 1.0 {player.setVolume(1.0, fadeDuration: 1.0)}
                     switch (maneuverCommand) {
                     case "Turn right":
                         playRight()

Guibe/TableViewController.swift

@@ -22,6 +22,9 @@ class TableViewController: UIViewController {
     
     @IBOutlet weak var tableView: UITableView!
     
+    @IBAction func backBtnPressed(_ sender: Any) {
+        self.dismiss(animated: true, completion: nil)
+    }
     
     override func viewDidLoad() {
         super.viewDidLoad()
@@ -58,7 +61,7 @@ extension TableViewController: UITableViewDataSource, UITableViewDelegate {
         let row = indexPath.row
         if let result = searchResults?[row] {
             cell.primaryLbl.text = result.name
-            cell.secondaryLbl.text = result.phoneNumber
+            cell.secondaryLbl.text = result.placemark.title
             cell.cellDelegate = self
             cell.index = indexPath
         }