Preparing for the push

This commit is contained in:
Max Hunt 2019-05-29 17:18:28 +01:00
parent 9b6af93650
commit 0f4edf7f3f
27 changed files with 232 additions and 28 deletions

View File

@ -24,6 +24,10 @@ class S3artViewController: UIViewController, CLLocationManagerDelegate {
self.getStartedBtn.isHidden = true self.getStartedBtn.isHidden = true
self.playAgainBtn.isHidden = false self.playAgainBtn.isHidden = false
self.nextBtn.isHidden = false self.nextBtn.isHidden = false
self.nextBtn.layer.shadowColor = UIColor.black.cgColor
self.nextBtn.layer.shadowOffset = CGSize(width: 2, height: 5)
self.nextBtn.layer.shadowRadius = 5
self.nextBtn.layer.shadowOpacity = 0.2
} }
playVideo() playVideo()

View File

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

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.8 KiB

View File

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

Binary file not shown.

After

Width:  |  Height:  |  Size: 32 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 32 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 32 KiB

View File

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

Binary file not shown.

After

Width:  |  Height:  |  Size: 26 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 26 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 26 KiB

View File

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

Binary file not shown.

After

Width:  |  Height:  |  Size: 57 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 57 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 57 KiB

View File

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

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.5 KiB

View File

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

Binary file not shown.

After

Width:  |  Height:  |  Size: 31 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 31 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 31 KiB

View File

@ -52,17 +52,17 @@
</connections> </connections>
</button> </button>
<button hidden="YES" opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="iVK-bB-pZc"> <button hidden="YES" opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="iVK-bB-pZc">
<rect key="frame" x="79" y="776" width="71" height="30"/> <rect key="frame" x="38" y="708" width="150" height="55"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<state key="normal" title="Play Again"/> <state key="normal" backgroundImage="playAgainBtn"/>
<connections> <connections>
<action selector="playAgainBtnPressed:" destination="S0e-nc-j2W" eventType="touchUpInside" id="yJD-kg-4cS"/> <action selector="playAgainBtnPressed:" destination="S0e-nc-j2W" eventType="touchUpInside" id="yJD-kg-4cS"/>
</connections> </connections>
</button> </button>
<button hidden="YES" opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="jTR-vZ-p6S"> <button hidden="YES" opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="jTR-vZ-p6S">
<rect key="frame" x="288" y="776" width="32" height="30"/> <rect key="frame" x="227" y="708" width="150" height="55"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<state key="normal" title="Next"/> <state key="normal" backgroundImage="nextBtn"/>
<connections> <connections>
<action selector="nextBtnPressed:" destination="S0e-nc-j2W" eventType="touchUpInside" id="zKg-TD-FXH"/> <action selector="nextBtnPressed:" destination="S0e-nc-j2W" eventType="touchUpInside" id="zKg-TD-FXH"/>
</connections> </connections>
@ -79,7 +79,7 @@
</viewController> </viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="OjR-hE-Zab" userLabel="First Responder" sceneMemberID="firstResponder"/> <placeholder placeholderIdentifier="IBFirstResponder" id="OjR-hE-Zab" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects> </objects>
<point key="canvasLocation" x="883" y="21"/> <point key="canvasLocation" x="882.60869565217399" y="20.758928571428569"/>
</scene> </scene>
<!--5nd Choice View Controller--> <!--5nd Choice View Controller-->
<scene sceneID="8Ym-Ub-aPL"> <scene sceneID="8Ym-Ub-aPL">
@ -118,7 +118,7 @@
</viewController> </viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="F9v-Vk-vwE" userLabel="First Responder" sceneMemberID="firstResponder"/> <placeholder placeholderIdentifier="IBFirstResponder" id="F9v-Vk-vwE" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects> </objects>
<point key="canvasLocation" x="1806" y="21"/> <point key="canvasLocation" x="1746" y="21"/>
</scene> </scene>
<!--6de Choice View Controller--> <!--6de Choice View Controller-->
<scene sceneID="QLR-Oe-vCm"> <scene sceneID="QLR-Oe-vCm">
@ -157,7 +157,7 @@
</viewController> </viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="dgq-NS-Hqn" userLabel="First Responder" sceneMemberID="firstResponder"/> <placeholder placeholderIdentifier="IBFirstResponder" id="dgq-NS-Hqn" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects> </objects>
<point key="canvasLocation" x="2748" y="21"/> <point key="canvasLocation" x="2688" y="21"/>
</scene> </scene>
<!--7ady View Controller--> <!--7ady View Controller-->
<scene sceneID="alI-ln-agi"> <scene sceneID="alI-ln-agi">
@ -171,13 +171,10 @@
<rect key="frame" x="0.0" y="0.0" width="414" height="896"/> <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
</imageView> </imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Welcome" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dKe-vx-zvq"> <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="88" y="512" width="238" height="72"/> <rect key="frame" x="189" y="477" width="37" height="37"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="60"/> </activityIndicatorView>
<color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<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="AzM-Y7-if5"/> <viewLayoutGuide key="safeArea" id="AzM-Y7-if5"/>
@ -185,7 +182,7 @@
</viewController> </viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="sFx-6a-7bc" userLabel="First Responder" sceneMemberID="firstResponder"/> <placeholder placeholderIdentifier="IBFirstResponder" id="sFx-6a-7bc" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects> </objects>
<point key="canvasLocation" x="3664" y="21"/> <point key="canvasLocation" x="3604" y="21"/>
</scene> </scene>
<!--Main View Controller--> <!--Main View Controller-->
<scene sceneID="55K-vG-ne9"> <scene sceneID="55K-vG-ne9">
@ -199,24 +196,80 @@
<rect key="frame" x="0.0" y="44" width="414" height="852"/> <rect key="frame" x="0.0" y="44" width="414" height="852"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
</mapView> </mapView>
<view contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="bKl-Ku-mh1" userLabel="searchView">
<rect key="frame" x="20" y="179" width="374" height="75"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<subviews>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" image="searchBar" translatesAutoresizingMaskIntoConstraints="NO" id="VD5-7k-Htb" userLabel="searchBarImg">
<rect key="frame" x="0.0" y="8" width="374" height="59"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
</imageView>
<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"/>
<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" 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>
<view contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="VZj-Lm-Ems" userLabel="menuView">
<rect key="frame" x="20" y="88" width="69" height="72"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<subviews>
<button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="m8G-AJ-moq">
<rect key="frame" x="0.0" y="0.0" width="69" height="72"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<state key="normal" backgroundImage="menuBtnImg"/>
<connections>
<action selector="menuBtnPressed:" destination="Ovf-sw-BKp" eventType="touchUpInside" id="S4Q-Tq-jOi"/>
</connections>
</button>
</subviews>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</view>
</subviews> </subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<viewLayoutGuide key="safeArea" id="Ut7-03-t0b"/> <viewLayoutGuide key="safeArea" id="Ut7-03-t0b"/>
</view> </view>
<connections>
<outlet property="menuBtn" destination="m8G-AJ-moq" id="QXG-rH-6Lm"/>
<outlet property="menuView" destination="VZj-Lm-Ems" id="IBs-mV-GJW"/>
<outlet property="micBtn" destination="G7y-oE-2AD" id="W6R-nB-sax"/>
<outlet property="searchBar" destination="dRT-vj-1ew" id="nAa-5O-h0R"/>
<outlet property="searchView" destination="bKl-Ku-mh1" id="d0n-Pl-NrK"/>
</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"/>
</objects> </objects>
<point key="canvasLocation" x="883" y="759"/> <point key="canvasLocation" x="882.60869565217399" y="758.70535714285711"/>
</scene> </scene>
</scenes> </scenes>
<resources> <resources>
<image name="LoadScreen" width="294.66665649414062" height="638"/> <image name="LoadScreen" width="294.66665649414062" height="638"/>
<image name="blank" width="314.66665649414062" height="76"/>
<image name="menuBtnImg" width="341.33334350585938" height="341.33334350585938"/>
<image name="nextBtn" width="495.33334350585938" height="181.33332824707031"/>
<image name="playAgainBtn" width="596.66668701171875" height="229.33332824707031"/>
<image name="s1l" width="167.33332824707031" height="199.33332824707031"/> <image name="s1l" width="167.33332824707031" height="199.33332824707031"/>
<image name="s1r" width="435.33334350585938" height="476.66665649414062"/> <image name="s1r" width="435.33334350585938" height="476.66665649414062"/>
<image name="s2b" width="514.33331298828125" height="507"/> <image name="s2b" width="514.33331298828125" height="507"/>
<image name="s2t" width="494.66665649414062" height="490"/> <image name="s2t" width="494.66665649414062" height="490"/>
<image name="searchBar" width="572.33331298828125" height="95.333335876464844"/>
<image name="select1Screen" width="279.33334350585938" height="606"/> <image name="select1Screen" width="279.33334350585938" height="606"/>
<image name="select2Screen" width="278.66665649414062" height="605.33331298828125"/> <image name="select2Screen" width="278.66665649414062" height="605.33331298828125"/>
<image name="speechBtn" width="331.33334350585938" height="369"/>
<image name="startBtn" width="173.33332824707031" height="47.666667938232422"/> <image name="startBtn" width="173.33332824707031" height="47.666667938232422"/>
<image name="startScreen" width="306" height="661.33331298828125"/> <image name="startScreen" width="306" height="661.33331298828125"/>
<image name="welcome2Screen" width="293.33334350585938" height="636"/> <image name="welcome2Screen" width="293.33334350585938" height="636"/>

View File

@ -10,21 +10,30 @@ import UIKit
class MainViewController: UIViewController { class MainViewController: UIViewController {
// OUTLETS--------------OUTLETS
@IBOutlet weak var menuView: UIView!
@IBOutlet weak var menuBtn: UIButton!
// ----------------------------
@IBOutlet weak var searchView: UIView!
@IBOutlet weak var searchBar: UISearchBar!
@IBOutlet weak var micBtn: UIButton!
// OUTLETS--------------OUTLETS
// ACTIONS--------------ACTIONS
@IBAction func menuBtnPressed(_ sender: Any) {
}
@IBAction func micBtnPressed(_ sender: Any) {
}
// ACTIONS--------------ACTIONS
override func viewDidLoad() { override func viewDidLoad() {
super.viewDidLoad() super.viewDidLoad()
// Do any additional setup after loading the view.
} } //END VIEW DID LOAD
/*
// MARK: - Navigation
// In a storyboard-based application, you will often want to do a little preparation before navigation } //END OF CLASS
override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
// Get the new view controller using segue.destination.
// Pass the selected object to the new view controller.
}
*/
}