POPOVERS WORK!!!!!
@ -7,6 +7,7 @@
|
|||||||
objects = {
|
objects = {
|
||||||
|
|
||||||
/* Begin PBXBuildFile section */
|
/* Begin PBXBuildFile section */
|
||||||
|
505AFEF8229FE1BD004FF0F1 /* settingsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 505AFEF7229FE1BD004FF0F1 /* settingsViewController.swift */; };
|
||||||
50A7ADD5229D6A4200D58743 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50A7ADD4229D6A4200D58743 /* AppDelegate.swift */; };
|
50A7ADD5229D6A4200D58743 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50A7ADD4229D6A4200D58743 /* AppDelegate.swift */; };
|
||||||
50A7ADD7229D6A4200D58743 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50A7ADD6229D6A4200D58743 /* ViewController.swift */; };
|
50A7ADD7229D6A4200D58743 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50A7ADD6229D6A4200D58743 /* ViewController.swift */; };
|
||||||
50A7ADDA229D6A4200D58743 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 50A7ADD8229D6A4200D58743 /* Main.storyboard */; };
|
50A7ADDA229D6A4200D58743 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 50A7ADD8229D6A4200D58743 /* Main.storyboard */; };
|
||||||
@ -22,6 +23,7 @@
|
|||||||
/* End PBXBuildFile section */
|
/* End PBXBuildFile section */
|
||||||
|
|
||||||
/* Begin PBXFileReference section */
|
/* Begin PBXFileReference section */
|
||||||
|
505AFEF7229FE1BD004FF0F1 /* settingsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = settingsViewController.swift; sourceTree = "<group>"; };
|
||||||
50A7ADD1229D6A4200D58743 /* Guibe.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Guibe.app; sourceTree = BUILT_PRODUCTS_DIR; };
|
50A7ADD1229D6A4200D58743 /* Guibe.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Guibe.app; sourceTree = BUILT_PRODUCTS_DIR; };
|
||||||
50A7ADD4229D6A4200D58743 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
|
50A7ADD4229D6A4200D58743 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
|
||||||
50A7ADD6229D6A4200D58743 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
|
50A7ADD6229D6A4200D58743 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
|
||||||
@ -78,6 +80,7 @@
|
|||||||
50A7ADE6229D6C7100D58743 /* Assets.xcassets */,
|
50A7ADE6229D6C7100D58743 /* Assets.xcassets */,
|
||||||
50A7ADD8229D6A4200D58743 /* Main.storyboard */,
|
50A7ADD8229D6A4200D58743 /* Main.storyboard */,
|
||||||
50A7ADFE229D768900D58743 /* MainViewController.swift */,
|
50A7ADFE229D768900D58743 /* MainViewController.swift */,
|
||||||
|
505AFEF7229FE1BD004FF0F1 /* settingsViewController.swift */,
|
||||||
50A7ADFC229D766800D58743 /* 7_ReadyViewController.swift */,
|
50A7ADFC229D766800D58743 /* 7_ReadyViewController.swift */,
|
||||||
50A7ADF4229D75A900D58743 /* 3_StartViewController.swift */,
|
50A7ADF4229D75A900D58743 /* 3_StartViewController.swift */,
|
||||||
50A7ADF8229D75C100D58743 /* 5_HandChoiceViewController.swift */,
|
50A7ADF8229D75C100D58743 /* 5_HandChoiceViewController.swift */,
|
||||||
@ -189,6 +192,7 @@
|
|||||||
50A7ADD5229D6A4200D58743 /* AppDelegate.swift in Sources */,
|
50A7ADD5229D6A4200D58743 /* AppDelegate.swift in Sources */,
|
||||||
50A7ADFF229D768900D58743 /* MainViewController.swift in Sources */,
|
50A7ADFF229D768900D58743 /* MainViewController.swift in Sources */,
|
||||||
50A7ADFB229D75E900D58743 /* 6_SideChoiceViewController.swift in Sources */,
|
50A7ADFB229D75E900D58743 /* 6_SideChoiceViewController.swift in Sources */,
|
||||||
|
505AFEF8229FE1BD004FF0F1 /* settingsViewController.swift in Sources */,
|
||||||
);
|
);
|
||||||
runOnlyForDeploymentPostprocessing = 0;
|
runOnlyForDeploymentPostprocessing = 0;
|
||||||
};
|
};
|
||||||
|
|||||||
21
Guibe/Assets.xcassets/appLogo.imageset/Contents.json
vendored
Normal file
@ -0,0 +1,21 @@
|
|||||||
|
{
|
||||||
|
"images" : [
|
||||||
|
{
|
||||||
|
"idiom" : "universal",
|
||||||
|
"filename" : "appLogo.png",
|
||||||
|
"scale" : "1x"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"idiom" : "universal",
|
||||||
|
"scale" : "2x"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"idiom" : "universal",
|
||||||
|
"scale" : "3x"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"info" : {
|
||||||
|
"version" : 1,
|
||||||
|
"author" : "xcode"
|
||||||
|
}
|
||||||
|
}
|
||||||
BIN
Guibe/Assets.xcassets/appLogo.imageset/appLogo.png
vendored
Normal file
|
After Width: | Height: | Size: 27 KiB |
23
Guibe/Assets.xcassets/circle.imageset/Contents.json
vendored
Normal file
@ -0,0 +1,23 @@
|
|||||||
|
{
|
||||||
|
"images" : [
|
||||||
|
{
|
||||||
|
"idiom" : "universal",
|
||||||
|
"filename" : "circle.png",
|
||||||
|
"scale" : "1x"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"idiom" : "universal",
|
||||||
|
"filename" : "circle-1.png",
|
||||||
|
"scale" : "2x"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"idiom" : "universal",
|
||||||
|
"filename" : "circle-2.png",
|
||||||
|
"scale" : "3x"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"info" : {
|
||||||
|
"version" : 1,
|
||||||
|
"author" : "xcode"
|
||||||
|
}
|
||||||
|
}
|
||||||
BIN
Guibe/Assets.xcassets/circle.imageset/circle-1.png
vendored
Normal file
|
After Width: | Height: | Size: 72 KiB |
BIN
Guibe/Assets.xcassets/circle.imageset/circle-2.png
vendored
Normal file
|
After Width: | Height: | Size: 72 KiB |
BIN
Guibe/Assets.xcassets/circle.imageset/circle.png
vendored
Normal file
|
After Width: | Height: | Size: 72 KiB |
23
Guibe/Assets.xcassets/guibeWord.imageset/Contents.json
vendored
Normal file
@ -0,0 +1,23 @@
|
|||||||
|
{
|
||||||
|
"images" : [
|
||||||
|
{
|
||||||
|
"idiom" : "universal",
|
||||||
|
"filename" : "guibeWord.png",
|
||||||
|
"scale" : "1x"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"idiom" : "universal",
|
||||||
|
"filename" : "guibeWord-1.png",
|
||||||
|
"scale" : "2x"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"idiom" : "universal",
|
||||||
|
"filename" : "guibeWord-2.png",
|
||||||
|
"scale" : "3x"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"info" : {
|
||||||
|
"version" : 1,
|
||||||
|
"author" : "xcode"
|
||||||
|
}
|
||||||
|
}
|
||||||
BIN
Guibe/Assets.xcassets/guibeWord.imageset/guibeWord-1.png
vendored
Normal file
|
After Width: | Height: | Size: 25 KiB |
BIN
Guibe/Assets.xcassets/guibeWord.imageset/guibeWord-2.png
vendored
Normal file
|
After Width: | Height: | Size: 25 KiB |
BIN
Guibe/Assets.xcassets/guibeWord.imageset/guibeWord.png
vendored
Normal file
|
After Width: | Height: | Size: 25 KiB |
23
Guibe/Assets.xcassets/serparator.imageset/Contents.json
vendored
Normal file
@ -0,0 +1,23 @@
|
|||||||
|
{
|
||||||
|
"images" : [
|
||||||
|
{
|
||||||
|
"idiom" : "universal",
|
||||||
|
"filename" : "serparator.png",
|
||||||
|
"scale" : "1x"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"idiom" : "universal",
|
||||||
|
"filename" : "serparator-1.png",
|
||||||
|
"scale" : "2x"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"idiom" : "universal",
|
||||||
|
"filename" : "serparator-2.png",
|
||||||
|
"scale" : "3x"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"info" : {
|
||||||
|
"version" : 1,
|
||||||
|
"author" : "xcode"
|
||||||
|
}
|
||||||
|
}
|
||||||
BIN
Guibe/Assets.xcassets/serparator.imageset/serparator-1.png
vendored
Normal file
|
After Width: | Height: | Size: 5.4 KiB |
BIN
Guibe/Assets.xcassets/serparator.imageset/serparator-2.png
vendored
Normal file
|
After Width: | Height: | Size: 5.4 KiB |
BIN
Guibe/Assets.xcassets/serparator.imageset/serparator.png
vendored
Normal file
|
After Width: | Height: | Size: 5.4 KiB |
23
Guibe/Assets.xcassets/settingsScreen.imageset/Contents.json
vendored
Normal file
@ -0,0 +1,23 @@
|
|||||||
|
{
|
||||||
|
"images" : [
|
||||||
|
{
|
||||||
|
"idiom" : "universal",
|
||||||
|
"filename" : "settingsScreen.png",
|
||||||
|
"scale" : "1x"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"idiom" : "universal",
|
||||||
|
"filename" : "settingsScreen-1.png",
|
||||||
|
"scale" : "2x"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"idiom" : "universal",
|
||||||
|
"filename" : "settingsScreen-2.png",
|
||||||
|
"scale" : "3x"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"info" : {
|
||||||
|
"version" : 1,
|
||||||
|
"author" : "xcode"
|
||||||
|
}
|
||||||
|
}
|
||||||
BIN
Guibe/Assets.xcassets/settingsScreen.imageset/settingsScreen-1.png
vendored
Normal file
|
After Width: | Height: | Size: 56 KiB |
BIN
Guibe/Assets.xcassets/settingsScreen.imageset/settingsScreen-2.png
vendored
Normal file
|
After Width: | Height: | Size: 56 KiB |
BIN
Guibe/Assets.xcassets/settingsScreen.imageset/settingsScreen.png
vendored
Normal file
|
After Width: | Height: | Size: 56 KiB |
@ -244,14 +244,72 @@
|
|||||||
</subviews>
|
</subviews>
|
||||||
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
|
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
|
||||||
</view>
|
</view>
|
||||||
|
<button hidden="YES" opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="efK-Gw-gxB">
|
||||||
|
<rect key="frame" x="0.0" y="44" width="414" height="852"/>
|
||||||
|
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
|
||||||
|
<connections>
|
||||||
|
<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">
|
||||||
|
<rect key="frame" x="-34" y="-24" width="347" height="399"/>
|
||||||
|
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
|
||||||
|
<subviews>
|
||||||
|
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" image="appLogo" translatesAutoresizingMaskIntoConstraints="NO" id="fds-28-e5l">
|
||||||
|
<rect key="frame" x="53" y="79" width="58" height="58"/>
|
||||||
|
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
|
||||||
|
</imageView>
|
||||||
|
<button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="hHS-Ml-slu">
|
||||||
|
<rect key="frame" x="53" y="163" width="277" height="56"/>
|
||||||
|
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
|
||||||
|
<fontDescription key="fontDescription" name="Helvetica" family="Helvetica" pointSize="25"/>
|
||||||
|
<state key="normal" title=" Settings">
|
||||||
|
<color key="titleColor" white="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
|
||||||
|
</state>
|
||||||
|
<connections>
|
||||||
|
<action selector="settingsBtnPressed:" destination="Ovf-sw-BKp" eventType="touchUpInside" id="JJd-Hf-lGh"/>
|
||||||
|
<segue destination="C7R-cA-IIg" kind="popoverPresentation" popoverAnchorView="hHS-Ml-slu" id="OaP-VF-l5T">
|
||||||
|
<popoverArrowDirection key="popoverArrowDirection" up="YES" down="YES" left="YES" right="YES"/>
|
||||||
|
</segue>
|
||||||
|
</connections>
|
||||||
|
</button>
|
||||||
|
<button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="sG4-j5-Aqw">
|
||||||
|
<rect key="frame" x="53" y="243" width="277" height="56"/>
|
||||||
|
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
|
||||||
|
<fontDescription key="fontDescription" name="Helvetica" family="Helvetica" pointSize="25"/>
|
||||||
|
<state key="normal" title=" Instructions">
|
||||||
|
<color key="titleColor" white="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
|
||||||
|
</state>
|
||||||
|
</button>
|
||||||
|
<button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="xjP-IE-WTI">
|
||||||
|
<rect key="frame" x="53" y="326" width="277" height="56"/>
|
||||||
|
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
|
||||||
|
<fontDescription key="fontDescription" name="Helvetica" family="Helvetica" pointSize="25"/>
|
||||||
|
<state key="normal" title=" Product Specifications">
|
||||||
|
<color key="titleColor" white="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
|
||||||
|
</state>
|
||||||
|
</button>
|
||||||
|
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" image="guibeWord" translatesAutoresizingMaskIntoConstraints="NO" id="90Y-ch-grn">
|
||||||
|
<rect key="frame" x="119" y="90" width="114" height="47"/>
|
||||||
|
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
|
||||||
|
</imageView>
|
||||||
|
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" image="serparator" translatesAutoresizingMaskIntoConstraints="NO" id="2yI-Jf-HZl">
|
||||||
|
<rect key="frame" x="53" y="142" width="277" height="10"/>
|
||||||
|
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
|
||||||
|
</imageView>
|
||||||
|
</subviews>
|
||||||
|
<color key="backgroundColor" white="1" alpha="1" 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>
|
<connections>
|
||||||
|
<outlet property="dismissBtn" destination="efK-Gw-gxB" id="upX-k6-K16"/>
|
||||||
<outlet property="mapView" destination="Bex-Mk-DDO" id="2Ww-7N-bZc"/>
|
<outlet property="mapView" destination="Bex-Mk-DDO" id="2Ww-7N-bZc"/>
|
||||||
<outlet property="menuBtn" destination="m8G-AJ-moq" id="QXG-rH-6Lm"/>
|
<outlet property="menuBtn" destination="m8G-AJ-moq" id="QXG-rH-6Lm"/>
|
||||||
<outlet property="menuView" destination="VZj-Lm-Ems" id="IBs-mV-GJW"/>
|
<outlet property="menuView" destination="VZj-Lm-Ems" id="IBs-mV-GJW"/>
|
||||||
|
<outlet property="menuWindowView" destination="J48-J9-3Mc" id="gnS-K2-H8d"/>
|
||||||
<outlet property="micBtn" destination="G7y-oE-2AD" id="W6R-nB-sax"/>
|
<outlet property="micBtn" destination="G7y-oE-2AD" id="W6R-nB-sax"/>
|
||||||
<outlet property="searchBar" destination="dRT-vj-1ew" id="nAa-5O-h0R"/>
|
<outlet property="searchBar" destination="dRT-vj-1ew" id="nAa-5O-h0R"/>
|
||||||
<outlet property="searchBarBg" destination="3Xt-Rr-hs1" id="6bL-cK-ScI"/>
|
<outlet property="searchBarBg" destination="3Xt-Rr-hs1" id="6bL-cK-ScI"/>
|
||||||
@ -260,12 +318,107 @@
|
|||||||
</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="882.60869565217399" y="758.70535714285711"/>
|
<point key="canvasLocation" x="882.60869565217399" y="776.78571428571422"/>
|
||||||
|
</scene>
|
||||||
|
<!--Settings View Controller-->
|
||||||
|
<scene sceneID="B3S-T4-83q">
|
||||||
|
<objects>
|
||||||
|
<viewController storyboardIdentifier="settingsScn" useStoryboardIdentifierAsRestorationIdentifier="YES" id="C7R-cA-IIg" customClass="settingsViewController" customModule="Guibe" customModuleProvider="target" sceneMemberID="viewController">
|
||||||
|
<view key="view" contentMode="scaleToFill" id="LsY-LB-als">
|
||||||
|
<rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
|
||||||
|
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
|
||||||
|
<subviews>
|
||||||
|
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" image="serparator" translatesAutoresizingMaskIntoConstraints="NO" id="5OC-U4-KxU">
|
||||||
|
<rect key="frame" x="20" y="91" width="374" height="10"/>
|
||||||
|
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
|
||||||
|
</imageView>
|
||||||
|
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" image="settingsScreen" translatesAutoresizingMaskIntoConstraints="NO" id="mY9-zh-MBf">
|
||||||
|
<rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
|
||||||
|
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
|
||||||
|
</imageView>
|
||||||
|
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" image="serparator" translatesAutoresizingMaskIntoConstraints="NO" id="bsB-YW-ZT9">
|
||||||
|
<rect key="frame" x="20" y="91" width="374" height="10"/>
|
||||||
|
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
|
||||||
|
</imageView>
|
||||||
|
<button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="omH-ol-EuT">
|
||||||
|
<rect key="frame" x="20" y="44" width="84" height="44"/>
|
||||||
|
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
|
||||||
|
<fontDescription key="fontDescription" type="system" pointSize="26"/>
|
||||||
|
<state key="normal" title="< Back">
|
||||||
|
<color key="titleColor" white="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
|
||||||
|
</state>
|
||||||
|
<connections>
|
||||||
|
<action selector="backBtnPressed:" destination="C7R-cA-IIg" eventType="touchUpInside" id="vz8-xF-uSj"/>
|
||||||
|
</connections>
|
||||||
|
</button>
|
||||||
|
<button opaque="NO" contentMode="scaleAspectFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="yUo-9A-eP3">
|
||||||
|
<rect key="frame" x="27" y="278" width="173" height="178"/>
|
||||||
|
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
|
||||||
|
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
|
||||||
|
<state key="normal" backgroundImage="s1l"/>
|
||||||
|
<connections>
|
||||||
|
<action selector="lftHandPressed:" destination="1fA-dZ-9ei" eventType="touchUpInside" id="iWC-za-Mhl"/>
|
||||||
|
</connections>
|
||||||
|
</button>
|
||||||
|
<button opaque="NO" contentMode="scaleAspectFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="wdb-kA-JMS">
|
||||||
|
<rect key="frame" x="219" y="278" width="179" height="178"/>
|
||||||
|
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
|
||||||
|
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
|
||||||
|
<state key="normal" backgroundImage="s1r"/>
|
||||||
|
<connections>
|
||||||
|
<action selector="ritHandPressed:" destination="1fA-dZ-9ei" eventType="touchUpInside" id="Pri-mu-NZc"/>
|
||||||
|
</connections>
|
||||||
|
</button>
|
||||||
|
<button opaque="NO" contentMode="scaleAspectFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="THO-p7-oiF">
|
||||||
|
<rect key="frame" x="20" y="689" width="182" height="180"/>
|
||||||
|
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
|
||||||
|
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
|
||||||
|
<state key="normal" backgroundImage="s2t"/>
|
||||||
|
<connections>
|
||||||
|
<action selector="topBigPressed:" destination="Y31-kj-JwL" eventType="touchUpInside" id="hcV-CC-Ktt"/>
|
||||||
|
</connections>
|
||||||
|
</button>
|
||||||
|
<button opaque="NO" contentMode="scaleAspectFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Nvb-Td-arP">
|
||||||
|
<rect key="frame" x="215" y="689" width="183" height="180"/>
|
||||||
|
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
|
||||||
|
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
|
||||||
|
<state key="normal" backgroundImage="s2b"/>
|
||||||
|
<connections>
|
||||||
|
<action selector="bottomBigPressed:" destination="Y31-kj-JwL" eventType="touchUpInside" id="N70-Ou-Cc5"/>
|
||||||
|
</connections>
|
||||||
|
</button>
|
||||||
|
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" image="circle" translatesAutoresizingMaskIntoConstraints="NO" id="fn6-xO-kaN">
|
||||||
|
<rect key="frame" x="210" y="689" width="193" height="180"/>
|
||||||
|
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
|
||||||
|
</imageView>
|
||||||
|
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" image="circle" translatesAutoresizingMaskIntoConstraints="NO" id="0ZX-JT-JpQ">
|
||||||
|
<rect key="frame" x="15" y="689" width="193" height="180"/>
|
||||||
|
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
|
||||||
|
</imageView>
|
||||||
|
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" image="circle" translatesAutoresizingMaskIntoConstraints="NO" id="WDv-sY-oOi">
|
||||||
|
<rect key="frame" x="14" y="273" width="193" height="180"/>
|
||||||
|
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
|
||||||
|
</imageView>
|
||||||
|
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" image="circle" translatesAutoresizingMaskIntoConstraints="NO" id="ZDz-GQ-0Cc">
|
||||||
|
<rect key="frame" x="211" y="273" width="193" height="180"/>
|
||||||
|
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
|
||||||
|
</imageView>
|
||||||
|
</subviews>
|
||||||
|
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
|
||||||
|
<viewLayoutGuide key="safeArea" id="iMX-Fb-tJF"/>
|
||||||
|
</view>
|
||||||
|
</viewController>
|
||||||
|
<placeholder placeholderIdentifier="IBFirstResponder" id="C73-06-ntv" userLabel="First Responder" sceneMemberID="firstResponder"/>
|
||||||
|
</objects>
|
||||||
|
<point key="canvasLocation" x="1792.753623188406" y="776.78571428571422"/>
|
||||||
</scene>
|
</scene>
|
||||||
</scenes>
|
</scenes>
|
||||||
<resources>
|
<resources>
|
||||||
<image name="LoadScreen" width="294.66665649414062" height="638"/>
|
<image name="LoadScreen" width="294.66665649414062" height="638"/>
|
||||||
|
<image name="appLogo" width="1024" height="1024"/>
|
||||||
<image name="blank" width="314.66665649414062" height="76"/>
|
<image name="blank" width="314.66665649414062" height="76"/>
|
||||||
|
<image name="circle" width="575.33331298828125" height="568.33331298828125"/>
|
||||||
|
<image name="guibeWord" width="250.66667175292969" height="100"/>
|
||||||
<image name="menuBtnImg" width="341.33334350585938" height="341.33334350585938"/>
|
<image name="menuBtnImg" width="341.33334350585938" height="341.33334350585938"/>
|
||||||
<image name="nextBtn" width="495.33334350585938" height="181.33332824707031"/>
|
<image name="nextBtn" width="495.33334350585938" height="181.33332824707031"/>
|
||||||
<image name="playAgainBtn" width="596.66668701171875" height="229.33332824707031"/>
|
<image name="playAgainBtn" width="596.66668701171875" height="229.33332824707031"/>
|
||||||
@ -276,6 +429,8 @@
|
|||||||
<image name="searchBar" width="572.33331298828125" height="95.333335876464844"/>
|
<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="serparator" width="737.33331298828125" height="14"/>
|
||||||
|
<image name="settingsScreen" width="280" height="608"/>
|
||||||
<image name="speechBtn" width="331.33334350585938" height="369"/>
|
<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"/>
|
||||||
|
|||||||
@ -14,6 +14,10 @@ import AVFoundation
|
|||||||
|
|
||||||
class MainViewController: UIViewController, AVAudioPlayerDelegate {
|
class MainViewController: UIViewController, AVAudioPlayerDelegate {
|
||||||
|
|
||||||
|
// DELETE
|
||||||
|
let defaults = UserDefaults.standard
|
||||||
|
// DELETE
|
||||||
|
|
||||||
let locationManager = CLLocationManager()
|
let locationManager = CLLocationManager()
|
||||||
var currentCoordinate: CLLocationCoordinate2D!
|
var currentCoordinate: CLLocationCoordinate2D!
|
||||||
|
|
||||||
@ -30,9 +34,11 @@ class MainViewController: UIViewController, AVAudioPlayerDelegate {
|
|||||||
|
|
||||||
|
|
||||||
// OUTLETS--------------OUTLETS
|
// OUTLETS--------------OUTLETS
|
||||||
|
@IBOutlet weak var menuWindowView: UIView!
|
||||||
@IBOutlet weak var menuView: UIView!
|
@IBOutlet weak var menuView: UIView!
|
||||||
@IBOutlet weak var menuBtn: UIButton!
|
@IBOutlet weak var menuBtn: UIButton!
|
||||||
// ---------------------
|
@IBOutlet weak var dismissBtn: UIButton!
|
||||||
|
// ---------------------
|
||||||
@IBOutlet weak var searchBarBg: UIButton!
|
@IBOutlet weak var searchBarBg: UIButton!
|
||||||
@IBOutlet weak var searchView: UIView!
|
@IBOutlet weak var searchView: UIView!
|
||||||
@IBOutlet weak var searchBar: UISearchBar!
|
@IBOutlet weak var searchBar: UISearchBar!
|
||||||
@ -44,9 +50,17 @@ class MainViewController: UIViewController, AVAudioPlayerDelegate {
|
|||||||
|
|
||||||
// ACTIONS--------------ACTIONS
|
// ACTIONS--------------ACTIONS
|
||||||
@IBAction func menuBtnPressed(_ sender: Any) {
|
@IBAction func menuBtnPressed(_ sender: Any) {
|
||||||
|
UIView.animate(withDuration: 0.2, animations: {self.menuWindowView.alpha = 1.0})
|
||||||
|
dismissBtn.isHidden = false
|
||||||
}
|
}
|
||||||
@IBAction func micBtnPressed(_ sender: Any) {
|
@IBAction func micBtnPressed(_ sender: Any) {
|
||||||
|
defaults.set(0, forKey: "setupDone")
|
||||||
|
}
|
||||||
|
@IBAction func dismissBtnPressed(_ sender: Any) {
|
||||||
|
UIView.animate(withDuration: 0.2, animations: {self.menuWindowView.alpha = 0.0})
|
||||||
|
dismissBtn.isHidden = true
|
||||||
|
}
|
||||||
|
@IBAction func settingsBtnPressed(_ sender: Any) {
|
||||||
|
|
||||||
}
|
}
|
||||||
// ACTIONS--------------ACTIONS
|
// ACTIONS--------------ACTIONS
|
||||||
@ -60,6 +74,12 @@ class MainViewController: UIViewController, AVAudioPlayerDelegate {
|
|||||||
searchBarBg.layer.shadowRadius = 10
|
searchBarBg.layer.shadowRadius = 10
|
||||||
searchBarBg.layer.shadowOpacity = 0.2
|
searchBarBg.layer.shadowOpacity = 0.2
|
||||||
|
|
||||||
|
menuWindowView.layer.shadowColor = UIColor.black.cgColor
|
||||||
|
menuWindowView.layer.cornerRadius = 13
|
||||||
|
menuWindowView.layer.shadowOffset = CGSize(width: 5, height: 7)
|
||||||
|
menuWindowView.layer.shadowRadius = 10
|
||||||
|
menuWindowView.layer.shadowOpacity = 0.2
|
||||||
|
|
||||||
mapView.delegate = self
|
mapView.delegate = self
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
33
Guibe/settingsViewController.swift
Normal file
@ -0,0 +1,33 @@
|
|||||||
|
//
|
||||||
|
// settingsViewController.swift
|
||||||
|
// Guibe
|
||||||
|
//
|
||||||
|
// Created by Max Hunt on 30/05/2019.
|
||||||
|
// Copyright © 2019 8. All rights reserved.
|
||||||
|
//
|
||||||
|
|
||||||
|
import UIKit
|
||||||
|
|
||||||
|
class settingsViewController: UIViewController {
|
||||||
|
|
||||||
|
@IBAction func backBtnPressed(_ sender: Any) {
|
||||||
|
self.dismiss(animated: true, completion: nil)
|
||||||
|
}
|
||||||
|
override func viewDidLoad() {
|
||||||
|
super.viewDidLoad()
|
||||||
|
|
||||||
|
// Do any additional setup after loading the view.
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/*
|
||||||
|
// MARK: - Navigation
|
||||||
|
|
||||||
|
// In a storyboard-based application, you will often want to do a little preparation before navigation
|
||||||
|
override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
|
||||||
|
// Get the new view controller using segue.destination.
|
||||||
|
// Pass the selected object to the new view controller.
|
||||||
|
}
|
||||||
|
*/
|
||||||
|
|
||||||
|
}
|
||||||