max/guide
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

DoneTheSetup

Browse Source
This commit is contained in:
Max Hunt 2019-05-29 15:57:09 +01:00
parent 2197f3d80c
commit 9b6af93650
6 changed files with 125 additions and 118 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Guibe.xcodeproj/project.pbxproj
View File

@ -12,9 +12,7 @@
50A7ADDA229D6A4200D58743 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 50A7ADD8229D6A4200D58743 /* Main.storyboard */; };
50A7ADDF229D6A4200D58743 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 50A7ADDD229D6A4200D58743 /* LaunchScreen.storyboard */; };
50A7ADE7229D6C7100D58743 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 50A7ADE6229D6C7100D58743 /* Assets.xcassets */; };
50A7ADF3229D759F00D58743 /* 2_WelcomeViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50A7ADF2229D759F00D58743 /* 2_WelcomeViewController.swift */; };
50A7ADF5229D75A900D58743 /* 3_StartViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50A7ADF4229D75A900D58743 /* 3_StartViewController.swift */; };
50A7ADF7229D75B600D58743 /* 4_VideoViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50A7ADF6229D75B600D58743 /* 4_VideoViewController.swift */; };
50A7ADF9229D75C100D58743 /* 5_HandChoiceViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50A7ADF8229D75C100D58743 /* 5_HandChoiceViewController.swift */; };
50A7ADFB229D75E900D58743 /* 6_SideChoiceViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50A7ADFA229D75E900D58743 /* 6_SideChoiceViewController.swift */; };
50A7ADFD229D766800D58743 /* 7_ReadyViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50A7ADFC229D766800D58743 /* 7_ReadyViewController.swift */; };
@ -31,9 +29,7 @@
50A7ADDE229D6A4200D58743 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
50A7ADE0229D6A4200D58743 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
50A7ADE6229D6C7100D58743 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
50A7ADF2229D759F00D58743 /* 2_WelcomeViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = 2_WelcomeViewController.swift; sourceTree = "<group>"; };
50A7ADF4229D75A900D58743 /* 3_StartViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = 3_StartViewController.swift; sourceTree = "<group>"; };
50A7ADF6229D75B600D58743 /* 4_VideoViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = 4_VideoViewController.swift; sourceTree = "<group>"; };
50A7ADF8229D75C100D58743 /* 5_HandChoiceViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = 5_HandChoiceViewController.swift; sourceTree = "<group>"; };
50A7ADFA229D75E900D58743 /* 6_SideChoiceViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = 6_SideChoiceViewController.swift; sourceTree = "<group>"; };
50A7ADFC229D766800D58743 /* 7_ReadyViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = 7_ReadyViewController.swift; sourceTree = "<group>"; };
@ -83,9 +79,7 @@
50A7ADD8229D6A4200D58743 /* Main.storyboard */,
50A7ADFE229D768900D58743 /* MainViewController.swift */,
50A7ADFC229D766800D58743 /* 7_ReadyViewController.swift */,
50A7ADF2229D759F00D58743 /* 2_WelcomeViewController.swift */,
50A7ADF4229D75A900D58743 /* 3_StartViewController.swift */,
50A7ADF6229D75B600D58743 /* 4_VideoViewController.swift */,
50A7ADF8229D75C100D58743 /* 5_HandChoiceViewController.swift */,
50A7ADFA229D75E900D58743 /* 6_SideChoiceViewController.swift */,
50A7ADDD229D6A4200D58743 /* LaunchScreen.storyboard */,
@ -192,10 +186,8 @@
50A7ADF9229D75C100D58743 /* 5_HandChoiceViewController.swift in Sources */,
50A7ADD7229D6A4200D58743 /* ViewController.swift in Sources */,
50A7ADF5229D75A900D58743 /* 3_StartViewController.swift in Sources */,
50A7ADF3229D759F00D58743 /* 2_WelcomeViewController.swift in Sources */,
50A7ADD5229D6A4200D58743 /* AppDelegate.swift in Sources */,
50A7ADFF229D768900D58743 /* MainViewController.swift in Sources */,
50A7ADF7229D75B600D58743 /* 4_VideoViewController.swift in Sources */,
50A7ADFB229D75E900D58743 /* 6_SideChoiceViewController.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;

13
Guibe/2_WelcomeViewController.swift
View File

@ -33,19 +33,6 @@ class W2lcomeViewController: UIViewController, CLLocationManagerDelegate {
// Do any additional setup after loading the view.
}
func locationManager(_ manager: CLLocationManager, didChangeAuthorization status: CLAuthorizationStatus) {
if status == CLAuthorizationStatus.authorizedAlways || status == CLAuthorizationStatus.authorizedWhenInUse{
DispatchQueue.main.asyncAfter(deadline: .now() + 1) {
let nextViewController = self.storyboard?.instantiateViewController(withIdentifier: "screen3") as! S3artViewController
nextViewController.modalTransitionStyle = .crossDissolve
self.present(nextViewController, animated: true, completion: nil)
}
}
if status == CLAuthorizationStatus.denied{
//bad
}
}
/*
// MARK: - Navigation

57
Guibe/3_StartViewController.swift
View File

@ -7,21 +7,61 @@
//
import UIKit
import CoreLocation
import AVKit
class S3artViewController: UIViewController {
class S3artViewController: UIViewController, CLLocationManagerDelegate {
@IBOutlet var getStartedBtn: UIButton!
@IBOutlet var playAgainBtn: UIButton!
@IBOutlet var nextBtn: UIButton!
let locationManager = CLLocationManager()
@IBAction func startBtnPressed(_ sender: Any) {
let nextViewController = self.storyboard?.instantiateViewController(withIdentifier: "screen4") as! V4deoViewController
DispatchQueue.main.asyncAfter(deadline: .now() + 1){
self.getStartedBtn.isHidden = true
self.playAgainBtn.isHidden = false
self.nextBtn.isHidden = false
}
playVideo()
}
@IBAction func playAgainBtnPressed(_ sender: Any) {
playVideo()
}
@IBAction func nextBtnPressed(_ sender: Any) {
let nextViewController = self.storyboard?.instantiateViewController(withIdentifier: "screen5") as! H5ndChoiceViewController
nextViewController.modalTransitionStyle = .crossDissolve
self.present(nextViewController, animated: true, completion: nil)
}
override func viewDidLoad() {
super.viewDidLoad()
// self.locationManager.delegate = self
self.locationManager.requestAlwaysAuthorization()
// Do any additional setup after loading the view.
}
private func playVideo() {
guard let path = Bundle.main.path(forResource: "Video", ofType:"mov") else {
debugPrint("Video.mov not found")
return }
let player = AVPlayer(url: URL(fileURLWithPath: path))
let playerController = AVPlayerViewController()
playerController.player = player
// playerController.modalPresentationStyle = .popover
present(playerController, animated: true) {
player.play()
}
}
/*
// MARK: - Navigation
@ -33,3 +73,14 @@ class S3artViewController: UIViewController {
*/
}
/*
class W2lcomeViewController: UIViewController, CLLocationManagerDelegate {
let locationManager = CLLocationManager()
override func viewDidLoad() {
super.viewDidLoad()
// sleep(1)
self.locationManager.requestAlwaysAuthorization()
*/

70
Guibe/4_VideoViewController.swift
View File

@ -11,40 +11,58 @@ import AVKit
import AVFoundation
class V4deoViewController: UIViewController {
@IBOutlet var videoBtn: UIButton!
@IBOutlet var nextBtn: UIButton!
// @IBOutlet var videoBtn: UIButton!
// @IBOutlet var nextBtn: UIButton!
@IBOutlet weak var videoPreviewLayer: UIView!
var player: AVPlayer!
var avpController = AVPlayerViewController()
override func viewDidLoad() {
super.viewDidLoad()
// Do any additional setup after loading the view.
}
@IBAction func nextBtnPressed(_ sender: Any) {
let nextViewController = self.storyboard?.instantiateViewController(withIdentifier: "screen5") as! H5ndChoiceViewController
nextViewController.modalTransitionStyle = .crossDissolve
self.present(nextViewController, animated: true, completion: nil)
}
@IBAction func videoBtnPress(_ sender: Any) {
DispatchQueue.main.asyncAfter(deadline: .now() + 1) {
self.videoBtn.isHidden = true
self.nextBtn.isHidden = false}
playVideo()
}
private func playVideo() {
guard let path = Bundle.main.path(forResource: "Video", ofType:"mov") else {
debugPrint("Video.mov not found")
return
}
let player = AVPlayer(url: URL(fileURLWithPath: path))
let playerController = AVPlayerViewController()
playerController.player = player
// playerController.modalPresentationStyle = .popover
present(playerController, animated: true) {
player.play()
}
self.player = AVPlayer(url: URL(fileURLWithPath: path))
self.avpController = AVPlayerViewController()
self.avpController.player = self.player
avpController.view.frame = videoPreviewLayer.frame
self.addChild(avpController)
self.view.addSubview(avpController.view)
// Do any additional setup after loading the view.
}
// @IBAction func nextBtnPressed(_ sender: Any) {
// let nextViewController = self.storyboard?.instantiateViewController(withIdentifier: "screen5") as! H5ndChoiceViewController
// nextViewController.modalTransitionStyle = .crossDissolve
// self.present(nextViewController, animated: true, completion: nil)
// }
// @IBAction func videoBtnPress(_ sender: Any) {
// DispatchQueue.main.asyncAfter(deadline: .now() + 1) {
// self.videoBtn.isHidden = true
// self.nextBtn.isHidden = false}
// playVideo()
// }
// private func playVideo() {
// guard let path = Bundle.main.path(forResource: "Video", ofType:"mov") else {
// debugPrint("Video.mov not found")
// return
// }
// let player = AVPlayer(url: URL(fileURLWithPath: path))
// let playerController = AVPlayerViewController()
// playerController.player = player
//// playerController.modalPresentationStyle = .popover
// present(playerController, animated: true) {
// player.play()
// }
// }
/*
// MARK: - Navigation

91
Guibe/Base.lproj/Main.storyboard
View File

@ -31,27 +31,6 @@
</objects>
<point key="canvasLocation" x="47.826086956521742" y="20.758928571428569"/>
</scene>
<!--2lcome View Controller-->
<scene sceneID="u4u-33-guT">
<objects>
<viewController storyboardIdentifier="screen2" useStoryboardIdentifierAsRestorationIdentifier="YES" id="9pW-8V-82V" customClass="W2lcomeViewController" customModule="Guibe" customModuleProvider="target" sceneMemberID="viewController">
<view key="view" contentMode="scaleToFill" id="5pm-jt-Og3">
<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="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" image="welcomeScreen" translatesAutoresizingMaskIntoConstraints="NO" id="J35-r3-k1v">
<rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
</imageView>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<viewLayoutGuide key="safeArea" id="UBI-r1-yTn"/>
</view>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="tOf-RV-4kP" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="882.60869565217399" y="20.758928571428569"/>
</scene>
<!--3art View Controller-->
<scene sceneID="xah-oV-ojV">
<objects>
@ -72,54 +51,35 @@
<action selector="startBtnPressed:" destination="S0e-nc-j2W" eventType="touchUpInside" id="1vm-La-3FE"/>
</connections>
</button>
<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"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<state key="normal" title="Play Again"/>
<connections>
<action selector="playAgainBtnPressed:" destination="S0e-nc-j2W" eventType="touchUpInside" id="yJD-kg-4cS"/>
</connections>
</button>
<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"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<state key="normal" title="Next"/>
<connections>
<action selector="nextBtnPressed:" destination="S0e-nc-j2W" eventType="touchUpInside" id="zKg-TD-FXH"/>
</connections>
</button>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<viewLayoutGuide key="safeArea" id="ERx-Xn-jx1"/>
</view>
<connections>
<outlet property="getStartedBtn" destination="Vc2-EO-nFa" id="rOb-lC-p71"/>
<outlet property="nextBtn" destination="jTR-vZ-p6S" id="dwf-TB-WKq"/>
<outlet property="playAgainBtn" destination="iVK-bB-pZc" id="mxr-VC-6wE"/>
</connections>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="OjR-hE-Zab" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="1715.9420289855075" y="20.758928571428569"/>
</scene>
<!--4deo View Controller-->
<scene sceneID="o8F-Mx-xWY">
<objects>
<viewController storyboardIdentifier="screen4" useStoryboardIdentifierAsRestorationIdentifier="YES" id="8xf-T6-H67" customClass="V4deoViewController" customModule="Guibe" customModuleProvider="target" sceneMemberID="viewController">
<view key="view" contentMode="scaleToFill" id="iTM-B5-mLe">
<rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="C2A-QW-MS5">
<rect key="frame" x="68" y="384" width="282" height="132"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="100"/>
<state key="normal" title="VIDEO"/>
<connections>
<action selector="videoBtnPress:" destination="8xf-T6-H67" eventType="touchUpInside" id="79U-fi-MQK"/>
</connections>
</button>
<button hidden="YES" opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="OKY-Ox-Fry">
<rect key="frame" x="84" y="382" width="247" height="132"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="100"/>
<state key="normal" title="NEXT"/>
<connections>
<action selector="nextBtnPressed:" destination="8xf-T6-H67" eventType="touchUpInside" id="jiS-c4-YM2"/>
<action selector="videoBtnPress:" destination="8xf-T6-H67" eventType="touchUpInside" id="KUt-Gq-XsB"/>
</connections>
</button>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<viewLayoutGuide key="safeArea" id="MT9-Vx-1hz"/>
</view>
<connections>
<outlet property="nextBtn" destination="OKY-Ox-Fry" id="1eC-SF-kyz"/>
<outlet property="videoBtn" destination="C2A-QW-MS5" id="EGo-Cn-Jbc"/>
</connections>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="Dhl-P2-3k6" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="2590" y="21"/>
<point key="canvasLocation" x="883" y="21"/>
</scene>
<!--5nd Choice View Controller-->
<scene sceneID="8Ym-Ub-aPL">
@ -158,7 +118,7 @@
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="F9v-Vk-vwE" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="3505.7971014492755" y="20.758928571428569"/>
<point key="canvasLocation" x="1806" y="21"/>
</scene>
<!--6de Choice View Controller-->
<scene sceneID="QLR-Oe-vCm">
@ -197,7 +157,7 @@
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="dgq-NS-Hqn" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="4447.826086956522" y="20.758928571428569"/>
<point key="canvasLocation" x="2748" y="21"/>
</scene>
<!--7ady View Controller-->
<scene sceneID="alI-ln-agi">
@ -225,7 +185,7 @@
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="sFx-6a-7bc" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="5362" y="21"/>
<point key="canvasLocation" x="3664" y="21"/>
</scene>
<!--Main View Controller-->
<scene sceneID="55K-vG-ne9">
@ -260,6 +220,5 @@
<image name="startBtn" width="173.33332824707031" height="47.666667938232422"/>
<image name="startScreen" width="306" height="661.33331298828125"/>
<image name="welcome2Screen" width="293.33334350585938" height="636"/>
<image name="welcomeScreen" width="282" height="610"/>
</resources>
</document>

4
Guibe/ViewController.swift
View File

@ -19,7 +19,7 @@ class ViewController: UIViewController {
if setupDone != 2 {
DispatchQueue.main.asyncAfter(deadline: .now() + 2) {
let nextViewController = self.storyboard?.instantiateViewController(withIdentifier: "screen2") as! W2lcomeViewController
let nextViewController = self.storyboard?.instantiateViewController(withIdentifier: "screen3") as! S3artViewController
nextViewController.modalTransitionStyle = .crossDissolve
self.present(nextViewController, animated: true, completion: nil)
}
@ -27,7 +27,7 @@ class ViewController: UIViewController {
if setupDone == 2 {
DispatchQueue.main.asyncAfter(deadline: .now() + 2) {
let nextViewController = self.storyboard?.instantiateViewController(withIdentifier: "mainView") as! MainViewController
let nextViewController = self.storyboard?.instantiateViewController(withIdentifier: "mainScreen") as! MainViewController
nextViewController.modalTransitionStyle = .crossDissolve
self.present(nextViewController, animated: true, completion: nil)
}