some changes
This commit is contained in:
Max Hunt
parent
5b39f8bcb6
commit
17e84bf157
@ -351,62 +351,80 @@
|
||||
<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"/>
|
||||
<button opaque="NO" contentMode="scaleAspectFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="yUo-9A-eP3" userLabel="leftBtn">
|
||||
<rect key="frame" x="27" y="278" width="175" 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="leftBtnPressed:" destination="C7R-cA-IIg" eventType="touchUpInside" id="8S8-ne-cal"/>
|
||||
<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"/>
|
||||
<button opaque="NO" contentMode="scaleAspectFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="wdb-kA-JMS" userLabel="rightBtn">
|
||||
<rect key="frame" x="215" y="278" width="183" 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="rightBtnPressed:" destination="C7R-cA-IIg" eventType="touchUpInside" id="fKN-wJ-853"/>
|
||||
<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">
|
||||
<button opaque="NO" contentMode="scaleAspectFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="THO-p7-oiF" userLabel="bTopBtn">
|
||||
<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="bTopBtnPressed:" destination="C7R-cA-IIg" eventType="touchUpInside" id="Sp8-Ef-FWw"/>
|
||||
<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">
|
||||
<button opaque="NO" contentMode="scaleAspectFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Nvb-Td-arP" userLabel="sTopBtn">
|
||||
<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"/>
|
||||
<action selector="sTopBtnPressed:" destination="C7R-cA-IIg" eventType="touchUpInside" id="sAq-Pz-QbB"/>
|
||||
</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">
|
||||
<imageView clipsSubviews="YES" userInteractionEnabled="NO" alpha="0.0" 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">
|
||||
<imageView clipsSubviews="YES" userInteractionEnabled="NO" alpha="0.0" 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>
|
||||
<imageView clipsSubviews="YES" userInteractionEnabled="NO" alpha="0.0" 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" alpha="0.0" 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>
|
||||
<button opaque="NO" alpha="0.20000000000000001" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="WPC-q8-Us8">
|
||||
<rect key="frame" x="305" y="51" width="89" height="30"/>
|
||||
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
|
||||
<state key="normal" title="Reset Config"/>
|
||||
<connections>
|
||||
<action selector="resetCfgPressed:" destination="C7R-cA-IIg" eventType="touchUpInside" id="yTQ-3x-JnU"/>
|
||||
</connections>
|
||||
</button>
|
||||
</subviews>
|
||||
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
|
||||
<viewLayoutGuide key="safeArea" id="iMX-Fb-tJF"/>
|
||||
</view>
|
||||
<connections>
|
||||
<outlet property="CSTop" destination="fn6-xO-kaN" id="lVs-zO-Wtb"/>
|
||||
<outlet property="cBTop" destination="0ZX-JT-JpQ" id="Tyb-6u-Zls"/>
|
||||
<outlet property="cLeft" destination="WDv-sY-oOi" id="zwL-Wg-cRa"/>
|
||||
<outlet property="cRight" destination="ZDz-GQ-0Cc" id="ULK-qC-VTO"/>
|
||||
</connections>
|
||||
</viewController>
|
||||
<placeholder placeholderIdentifier="IBFirstResponder" id="C73-06-ntv" userLabel="First Responder" sceneMemberID="firstResponder"/>
|
||||
</objects>
|
||||
|
||||
@ -54,14 +54,10 @@ class MainViewController: UIViewController, AVAudioPlayerDelegate {
|
||||
dismissBtn.isHidden = false
|
||||
}
|
||||
@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
|
||||
|
||||
@ -89,7 +85,7 @@ class MainViewController: UIViewController, AVAudioPlayerDelegate {
|
||||
locationManager.startUpdatingLocation()
|
||||
|
||||
|
||||
} //END VIEW DID LOAD
|
||||
} //END OF VIEW DID LOAD
|
||||
|
||||
func getDirections(to destination: MKMapItem) {
|
||||
let sourcePlacemark = MKPlacemark(coordinate: currentCoordinate)
|
||||
|
||||
@ -26,7 +26,7 @@ class ViewController: UIViewController {
|
||||
}
|
||||
|
||||
if setupDone == 2 {
|
||||
DispatchQueue.main.asyncAfter(deadline: .now() + 2) {
|
||||
DispatchQueue.main.asyncAfter(deadline: .now() + 1) {
|
||||
let nextViewController = self.storyboard?.instantiateViewController(withIdentifier: "mainScreen") as! MainViewController
|
||||
nextViewController.modalTransitionStyle = .crossDissolve
|
||||
self.present(nextViewController, animated: true, completion: nil)
|
||||
|
||||
@ -9,13 +9,77 @@
|
||||
import UIKit
|
||||
|
||||
class settingsViewController: UIViewController {
|
||||
let defaults = UserDefaults.standard
|
||||
|
||||
// OUTLETS--------------OUTLETS
|
||||
@IBOutlet weak var cLeft: UIImageView!
|
||||
@IBOutlet weak var cRight: UIImageView!
|
||||
@IBOutlet weak var cBTop: UIImageView!
|
||||
@IBOutlet weak var CSTop: UIImageView!
|
||||
// OUTLETS--------------OUTLETS
|
||||
|
||||
|
||||
// ACTIONS--------------ACTIONS
|
||||
@IBAction func backBtnPressed(_ sender: Any) {
|
||||
self.dismiss(animated: true, completion: nil)
|
||||
}
|
||||
@IBAction func leftBtnPressed(_ sender: Any) {
|
||||
if defaults.integer(forKey: "handSide") == 2{
|
||||
defaults.set(1, forKey: "handSide")
|
||||
UIView.animate(withDuration: 0.4, animations: {self.cLeft.alpha = 1.0})
|
||||
UIView.animate(withDuration: 0.4, animations: {self.cRight.alpha = 0.0})
|
||||
}
|
||||
}
|
||||
@IBAction func rightBtnPressed(_ sender: Any) {
|
||||
if defaults.integer(forKey: "handSide") == 1{
|
||||
defaults.set(2, forKey: "handSide")
|
||||
UIView.animate(withDuration: 0.4, animations: {self.cLeft.alpha = 0.0})
|
||||
UIView.animate(withDuration: 0.4, animations: {self.cRight.alpha = 1.0})
|
||||
}
|
||||
}
|
||||
@IBAction func bTopBtnPressed(_ sender: Any) {
|
||||
if defaults.integer(forKey: "bigSide") == 2{
|
||||
defaults.set(1, forKey: "bigSide")
|
||||
UIView.animate(withDuration: 0.4, animations: {self.cBTop.alpha = 1.0})
|
||||
UIView.animate(withDuration: 0.4, animations: {self.CSTop.alpha = 0.0})
|
||||
}
|
||||
}
|
||||
@IBAction func sTopBtnPressed(_ sender: Any) {
|
||||
if defaults.integer(forKey: "bigSide") == 1{
|
||||
defaults.set(2, forKey: "bigSide")
|
||||
UIView.animate(withDuration: 0.4, animations: {self.cBTop.alpha = 0.0})
|
||||
UIView.animate(withDuration: 0.4, animations: {self.CSTop.alpha = 1.0})
|
||||
}
|
||||
}
|
||||
@IBAction func resetCfgPressed(_ sender: Any) {
|
||||
defaults.set(0, forKey: "setupDone")
|
||||
}
|
||||
|
||||
// ACTIONS--------------ACTIONS
|
||||
override func viewDidLoad() {
|
||||
super.viewDidLoad()
|
||||
|
||||
|
||||
switch defaults.integer(forKey: "handSide") {
|
||||
case 1:
|
||||
cLeft.alpha = 1.0
|
||||
cRight.alpha = 0.0
|
||||
case 2:
|
||||
cLeft.alpha = 0.0
|
||||
cRight.alpha = 1.0
|
||||
default:
|
||||
print("ERROR, THIS CANNOT HAPPEN!!!!!")
|
||||
}
|
||||
|
||||
switch defaults.integer(forKey: "bigSide") {
|
||||
case 1:
|
||||
cBTop.alpha = 1.0
|
||||
CSTop.alpha = 0.0
|
||||
case 2:
|
||||
cBTop.alpha = 0.0
|
||||
CSTop.alpha = 1.0
|
||||
default:
|
||||
print("ERROR, THIS CANNOT HAPPEN!!!!!")
|
||||
}
|
||||
// Do any additional setup after loading the view.
|
||||
}
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user