diff --git a/Guibe.xcodeproj/project.pbxproj b/Guibe.xcodeproj/project.pbxproj index 9b8984b..b6fa0ee 100644 --- a/Guibe.xcodeproj/project.pbxproj +++ b/Guibe.xcodeproj/project.pbxproj @@ -10,8 +10,16 @@ 50A7ADD5229D6A4200D58743 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50A7ADD4229D6A4200D58743 /* AppDelegate.swift */; }; 50A7ADD7229D6A4200D58743 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50A7ADD6229D6A4200D58743 /* ViewController.swift */; }; 50A7ADDA229D6A4200D58743 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 50A7ADD8229D6A4200D58743 /* Main.storyboard */; }; - 50A7ADDC229D6A4200D58743 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 50A7ADDB229D6A4200D58743 /* Assets.xcassets */; }; 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 */; }; + 50A7ADFF229D768900D58743 /* MainViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50A7ADFE229D768900D58743 /* MainViewController.swift */; }; + 50A7AE02229D7B1100D58743 /* MapKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 50A7AE01229D7B1100D58743 /* MapKit.framework */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ @@ -19,9 +27,18 @@ 50A7ADD4229D6A4200D58743 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 50A7ADD6229D6A4200D58743 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = ""; }; 50A7ADD9229D6A4200D58743 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; - 50A7ADDB229D6A4200D58743 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 50A7ADDE229D6A4200D58743 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; 50A7ADE0229D6A4200D58743 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 50A7ADE6229D6C7100D58743 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; + 50A7ADF2229D759F00D58743 /* 2_WelcomeViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = 2_WelcomeViewController.swift; sourceTree = ""; }; + 50A7ADF4229D75A900D58743 /* 3_StartViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = 3_StartViewController.swift; sourceTree = ""; }; + 50A7ADF6229D75B600D58743 /* 4_VideoViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = 4_VideoViewController.swift; sourceTree = ""; }; + 50A7ADF8229D75C100D58743 /* 5_HandChoiceViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = 5_HandChoiceViewController.swift; sourceTree = ""; }; + 50A7ADFA229D75E900D58743 /* 6_SideChoiceViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = 6_SideChoiceViewController.swift; sourceTree = ""; }; + 50A7ADFC229D766800D58743 /* 7_ReadyViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = 7_ReadyViewController.swift; sourceTree = ""; }; + 50A7ADFE229D768900D58743 /* MainViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainViewController.swift; sourceTree = ""; }; + 50A7AE01229D7B1100D58743 /* MapKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MapKit.framework; path = System/Library/Frameworks/MapKit.framework; sourceTree = SDKROOT; }; + 50A7AE05229D7B1E00D58743 /* Guibe.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Guibe.entitlements; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -29,6 +46,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 50A7AE02229D7B1100D58743 /* MapKit.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -40,6 +58,7 @@ children = ( 50A7ADD3229D6A4200D58743 /* Guibe */, 50A7ADD2229D6A4200D58743 /* Products */, + 50A7AE00229D7B1100D58743 /* Frameworks */, ); sourceTree = ""; }; @@ -54,16 +73,32 @@ 50A7ADD3229D6A4200D58743 /* Guibe */ = { isa = PBXGroup; children = ( + 50A7AE05229D7B1E00D58743 /* Guibe.entitlements */, 50A7ADD4229D6A4200D58743 /* AppDelegate.swift */, 50A7ADD6229D6A4200D58743 /* ViewController.swift */, + 50A7ADE6229D6C7100D58743 /* Assets.xcassets */, 50A7ADD8229D6A4200D58743 /* Main.storyboard */, - 50A7ADDB229D6A4200D58743 /* Assets.xcassets */, + 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 */, 50A7ADE0229D6A4200D58743 /* Info.plist */, ); path = Guibe; sourceTree = ""; }; + 50A7AE00229D7B1100D58743 /* Frameworks */ = { + isa = PBXGroup; + children = ( + 50A7AE01229D7B1100D58743 /* MapKit.framework */, + ); + name = Frameworks; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -96,6 +131,20 @@ TargetAttributes = { 50A7ADD0229D6A4200D58743 = { CreatedOnToolsVersion = 10.2.1; + SystemCapabilities = { + com.apple.BackgroundModes = { + enabled = 1; + }; + com.apple.DataProtection = { + enabled = 0; + }; + com.apple.Maps.iOS = { + enabled = 1; + }; + com.apple.WAC = { + enabled = 0; + }; + }; }; }; }; @@ -123,7 +172,7 @@ buildActionMask = 2147483647; files = ( 50A7ADDF229D6A4200D58743 /* LaunchScreen.storyboard in Resources */, - 50A7ADDC229D6A4200D58743 /* Assets.xcassets in Resources */, + 50A7ADE7229D6C7100D58743 /* Assets.xcassets in Resources */, 50A7ADDA229D6A4200D58743 /* Main.storyboard in Resources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -135,8 +184,15 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( + 50A7ADFD229D766800D58743 /* 7_ReadyViewController.swift in Sources */, + 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; }; @@ -283,13 +339,13 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_STYLE = Automatic; - DEVELOPMENT_TEAM = 36JR976L6Y; + DEVELOPMENT_TEAM = T87U8Q4BB3; INFOPLIST_FILE = Guibe/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", ); - PRODUCT_BUNDLE_IDENTIFIER = icl.8.Guibe; + PRODUCT_BUNDLE_IDENTIFIER = icl.8.Guibes; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; @@ -301,13 +357,13 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_STYLE = Automatic; - DEVELOPMENT_TEAM = 36JR976L6Y; + DEVELOPMENT_TEAM = T87U8Q4BB3; INFOPLIST_FILE = Guibe/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", ); - PRODUCT_BUNDLE_IDENTIFIER = icl.8.Guibe; + PRODUCT_BUNDLE_IDENTIFIER = icl.8.Guibes; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; diff --git a/Guibe/2_WelcomeViewController.swift b/Guibe/2_WelcomeViewController.swift new file mode 100644 index 0000000..ba4b3b7 --- /dev/null +++ b/Guibe/2_WelcomeViewController.swift @@ -0,0 +1,60 @@ +// +// 2_WelcomeViewController.swift +// Guibe +// +// Created by Max Hunt on 28/05/2019. +// Copyright © 2019 8. All rights reserved. +// + +import UIKit +import CoreLocation + +class W2lcomeViewController: UIViewController, CLLocationManagerDelegate { + + let locationManager = CLLocationManager() + + override func viewDidLoad() { + super.viewDidLoad() + sleep(1) + self.locationManager.requestAlwaysAuthorization() + + let xstatus = CLLocationManager.authorizationStatus() + if xstatus == CLAuthorizationStatus.authorizedAlways || xstatus == 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) + } + } + + + + + + // 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 + + // 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. + } + */ + +} diff --git a/Guibe/3_StartViewController.swift b/Guibe/3_StartViewController.swift new file mode 100644 index 0000000..5ef3d69 --- /dev/null +++ b/Guibe/3_StartViewController.swift @@ -0,0 +1,30 @@ +// +// 3_StartViewController.swift +// Guibe +// +// Created by Max Hunt on 28/05/2019. +// Copyright © 2019 8. All rights reserved. +// + +import UIKit + +class S3artViewController: UIViewController { + + 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. + } + */ + +} diff --git a/Guibe/4_VideoViewController.swift b/Guibe/4_VideoViewController.swift new file mode 100644 index 0000000..a733201 --- /dev/null +++ b/Guibe/4_VideoViewController.swift @@ -0,0 +1,30 @@ +// +// 4_VideoViewController.swift +// Guibe +// +// Created by Max Hunt on 28/05/2019. +// Copyright © 2019 8. All rights reserved. +// + +import UIKit + +class V4deoViewController: UIViewController { + + 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. + } + */ + +} diff --git a/Guibe/5_HandChoiceViewController.swift b/Guibe/5_HandChoiceViewController.swift new file mode 100644 index 0000000..5322ec2 --- /dev/null +++ b/Guibe/5_HandChoiceViewController.swift @@ -0,0 +1,30 @@ +// +// 5_HandChoiceViewController.swift +// Guibe +// +// Created by Max Hunt on 28/05/2019. +// Copyright © 2019 8. All rights reserved. +// + +import UIKit + +class H5ndChoiceViewController: UIViewController { + + 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. + } + */ + +} diff --git a/Guibe/6_SideChoiceViewController.swift b/Guibe/6_SideChoiceViewController.swift new file mode 100644 index 0000000..78c745f --- /dev/null +++ b/Guibe/6_SideChoiceViewController.swift @@ -0,0 +1,30 @@ +// +// 6_SideChoiceViewController.swift +// Guibe +// +// Created by Max Hunt on 28/05/2019. +// Copyright © 2019 8. All rights reserved. +// + +import UIKit + +class S6deChoiceViewController: UIViewController { + + 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. + } + */ + +} diff --git a/Guibe/7_ReadyViewController.swift b/Guibe/7_ReadyViewController.swift new file mode 100644 index 0000000..e9973d7 --- /dev/null +++ b/Guibe/7_ReadyViewController.swift @@ -0,0 +1,30 @@ +// +// 7_ReadyViewController.swift +// Guibe +// +// Created by Max Hunt on 28/05/2019. +// Copyright © 2019 8. All rights reserved. +// + +import UIKit + +class R7adyViewController: UIViewController { + + 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. + } + */ + +} diff --git a/Guibe/Assets.xcassets/LoadScreen.imageset/Contents.json b/Guibe/Assets.xcassets/LoadScreen.imageset/Contents.json new file mode 100644 index 0000000..5fce928 --- /dev/null +++ b/Guibe/Assets.xcassets/LoadScreen.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "Screenshot 2019-05-28 at 14.09.29.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "Screenshot 2019-05-28 at 14.09.29-1.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "Screenshot 2019-05-28 at 14.09.29-2.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Guibe/Assets.xcassets/LoadScreen.imageset/Screenshot 2019-05-28 at 14.09.29-1.png b/Guibe/Assets.xcassets/LoadScreen.imageset/Screenshot 2019-05-28 at 14.09.29-1.png new file mode 100644 index 0000000..e676e96 Binary files /dev/null and b/Guibe/Assets.xcassets/LoadScreen.imageset/Screenshot 2019-05-28 at 14.09.29-1.png differ diff --git a/Guibe/Assets.xcassets/LoadScreen.imageset/Screenshot 2019-05-28 at 14.09.29-2.png b/Guibe/Assets.xcassets/LoadScreen.imageset/Screenshot 2019-05-28 at 14.09.29-2.png new file mode 100644 index 0000000..e676e96 Binary files /dev/null and b/Guibe/Assets.xcassets/LoadScreen.imageset/Screenshot 2019-05-28 at 14.09.29-2.png differ diff --git a/Guibe/Assets.xcassets/LoadScreen.imageset/Screenshot 2019-05-28 at 14.09.29.png b/Guibe/Assets.xcassets/LoadScreen.imageset/Screenshot 2019-05-28 at 14.09.29.png new file mode 100644 index 0000000..e676e96 Binary files /dev/null and b/Guibe/Assets.xcassets/LoadScreen.imageset/Screenshot 2019-05-28 at 14.09.29.png differ diff --git a/Guibe/Assets.xcassets/s1l.imageset/Contents.json b/Guibe/Assets.xcassets/s1l.imageset/Contents.json new file mode 100644 index 0000000..31629bb --- /dev/null +++ b/Guibe/Assets.xcassets/s1l.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "s1l.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "s1l-1.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "s1l-2.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Guibe/Assets.xcassets/s1l.imageset/s1l-1.png b/Guibe/Assets.xcassets/s1l.imageset/s1l-1.png new file mode 100644 index 0000000..eec9f25 Binary files /dev/null and b/Guibe/Assets.xcassets/s1l.imageset/s1l-1.png differ diff --git a/Guibe/Assets.xcassets/s1l.imageset/s1l-2.png b/Guibe/Assets.xcassets/s1l.imageset/s1l-2.png new file mode 100644 index 0000000..eec9f25 Binary files /dev/null and b/Guibe/Assets.xcassets/s1l.imageset/s1l-2.png differ diff --git a/Guibe/Assets.xcassets/s1l.imageset/s1l.png b/Guibe/Assets.xcassets/s1l.imageset/s1l.png new file mode 100644 index 0000000..eec9f25 Binary files /dev/null and b/Guibe/Assets.xcassets/s1l.imageset/s1l.png differ diff --git a/Guibe/Assets.xcassets/s1r.imageset/Contents.json b/Guibe/Assets.xcassets/s1r.imageset/Contents.json new file mode 100644 index 0000000..a6b02f9 --- /dev/null +++ b/Guibe/Assets.xcassets/s1r.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "s1r.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "s1r-1.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "s1r-2.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Guibe/Assets.xcassets/s1r.imageset/s1r-1.png b/Guibe/Assets.xcassets/s1r.imageset/s1r-1.png new file mode 100644 index 0000000..b0283c2 Binary files /dev/null and b/Guibe/Assets.xcassets/s1r.imageset/s1r-1.png differ diff --git a/Guibe/Assets.xcassets/s1r.imageset/s1r-2.png b/Guibe/Assets.xcassets/s1r.imageset/s1r-2.png new file mode 100644 index 0000000..b0283c2 Binary files /dev/null and b/Guibe/Assets.xcassets/s1r.imageset/s1r-2.png differ diff --git a/Guibe/Assets.xcassets/s1r.imageset/s1r.png b/Guibe/Assets.xcassets/s1r.imageset/s1r.png new file mode 100644 index 0000000..b0283c2 Binary files /dev/null and b/Guibe/Assets.xcassets/s1r.imageset/s1r.png differ diff --git a/Guibe/Assets.xcassets/s2b.imageset/Contents.json b/Guibe/Assets.xcassets/s2b.imageset/Contents.json new file mode 100644 index 0000000..d9a9609 --- /dev/null +++ b/Guibe/Assets.xcassets/s2b.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "s2b.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "s2b-1.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "s2b-2.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Guibe/Assets.xcassets/s2b.imageset/s2b-1.png b/Guibe/Assets.xcassets/s2b.imageset/s2b-1.png new file mode 100644 index 0000000..4066e52 Binary files /dev/null and b/Guibe/Assets.xcassets/s2b.imageset/s2b-1.png differ diff --git a/Guibe/Assets.xcassets/s2b.imageset/s2b-2.png b/Guibe/Assets.xcassets/s2b.imageset/s2b-2.png new file mode 100644 index 0000000..4066e52 Binary files /dev/null and b/Guibe/Assets.xcassets/s2b.imageset/s2b-2.png differ diff --git a/Guibe/Assets.xcassets/s2b.imageset/s2b.png b/Guibe/Assets.xcassets/s2b.imageset/s2b.png new file mode 100644 index 0000000..4066e52 Binary files /dev/null and b/Guibe/Assets.xcassets/s2b.imageset/s2b.png differ diff --git a/Guibe/Assets.xcassets/s2t.imageset/Contents.json b/Guibe/Assets.xcassets/s2t.imageset/Contents.json new file mode 100644 index 0000000..4379d15 --- /dev/null +++ b/Guibe/Assets.xcassets/s2t.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "s2t.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "s2t-1.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "s2t-2.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Guibe/Assets.xcassets/s2t.imageset/s2t-1.png b/Guibe/Assets.xcassets/s2t.imageset/s2t-1.png new file mode 100644 index 0000000..7336906 Binary files /dev/null and b/Guibe/Assets.xcassets/s2t.imageset/s2t-1.png differ diff --git a/Guibe/Assets.xcassets/s2t.imageset/s2t-2.png b/Guibe/Assets.xcassets/s2t.imageset/s2t-2.png new file mode 100644 index 0000000..7336906 Binary files /dev/null and b/Guibe/Assets.xcassets/s2t.imageset/s2t-2.png differ diff --git a/Guibe/Assets.xcassets/s2t.imageset/s2t.png b/Guibe/Assets.xcassets/s2t.imageset/s2t.png new file mode 100644 index 0000000..7336906 Binary files /dev/null and b/Guibe/Assets.xcassets/s2t.imageset/s2t.png differ diff --git a/Guibe/Assets.xcassets/select1Screen.imageset/Contents.json b/Guibe/Assets.xcassets/select1Screen.imageset/Contents.json new file mode 100644 index 0000000..043cb80 --- /dev/null +++ b/Guibe/Assets.xcassets/select1Screen.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "select1Screen.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "select1Screen-1.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "select1Screen-2.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Guibe/Assets.xcassets/select1Screen.imageset/select1Screen-1.png b/Guibe/Assets.xcassets/select1Screen.imageset/select1Screen-1.png new file mode 100644 index 0000000..bc9596b Binary files /dev/null and b/Guibe/Assets.xcassets/select1Screen.imageset/select1Screen-1.png differ diff --git a/Guibe/Assets.xcassets/select1Screen.imageset/select1Screen-2.png b/Guibe/Assets.xcassets/select1Screen.imageset/select1Screen-2.png new file mode 100644 index 0000000..bc9596b Binary files /dev/null and b/Guibe/Assets.xcassets/select1Screen.imageset/select1Screen-2.png differ diff --git a/Guibe/Assets.xcassets/select1Screen.imageset/select1Screen.png b/Guibe/Assets.xcassets/select1Screen.imageset/select1Screen.png new file mode 100644 index 0000000..bc9596b Binary files /dev/null and b/Guibe/Assets.xcassets/select1Screen.imageset/select1Screen.png differ diff --git a/Guibe/Assets.xcassets/select2Screen.imageset/Contents.json b/Guibe/Assets.xcassets/select2Screen.imageset/Contents.json new file mode 100644 index 0000000..2409778 --- /dev/null +++ b/Guibe/Assets.xcassets/select2Screen.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "select2Screen.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "select2Screen-1.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "select2Screen-2.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Guibe/Assets.xcassets/select2Screen.imageset/select2Screen-1.png b/Guibe/Assets.xcassets/select2Screen.imageset/select2Screen-1.png new file mode 100644 index 0000000..2efb639 Binary files /dev/null and b/Guibe/Assets.xcassets/select2Screen.imageset/select2Screen-1.png differ diff --git a/Guibe/Assets.xcassets/select2Screen.imageset/select2Screen-2.png b/Guibe/Assets.xcassets/select2Screen.imageset/select2Screen-2.png new file mode 100644 index 0000000..2efb639 Binary files /dev/null and b/Guibe/Assets.xcassets/select2Screen.imageset/select2Screen-2.png differ diff --git a/Guibe/Assets.xcassets/select2Screen.imageset/select2Screen.png b/Guibe/Assets.xcassets/select2Screen.imageset/select2Screen.png new file mode 100644 index 0000000..2efb639 Binary files /dev/null and b/Guibe/Assets.xcassets/select2Screen.imageset/select2Screen.png differ diff --git a/Guibe/Assets.xcassets/startBtn.imageset/Contents.json b/Guibe/Assets.xcassets/startBtn.imageset/Contents.json new file mode 100644 index 0000000..2de8476 --- /dev/null +++ b/Guibe/Assets.xcassets/startBtn.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "startBtn.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "startBtn-1.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "startBtn-2.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Guibe/Assets.xcassets/startBtn.imageset/startBtn-1.png b/Guibe/Assets.xcassets/startBtn.imageset/startBtn-1.png new file mode 100644 index 0000000..5caace2 Binary files /dev/null and b/Guibe/Assets.xcassets/startBtn.imageset/startBtn-1.png differ diff --git a/Guibe/Assets.xcassets/startBtn.imageset/startBtn-2.png b/Guibe/Assets.xcassets/startBtn.imageset/startBtn-2.png new file mode 100644 index 0000000..5caace2 Binary files /dev/null and b/Guibe/Assets.xcassets/startBtn.imageset/startBtn-2.png differ diff --git a/Guibe/Assets.xcassets/startBtn.imageset/startBtn.png b/Guibe/Assets.xcassets/startBtn.imageset/startBtn.png new file mode 100644 index 0000000..5caace2 Binary files /dev/null and b/Guibe/Assets.xcassets/startBtn.imageset/startBtn.png differ diff --git a/Guibe/Assets.xcassets/startScreen.imageset/Contents.json b/Guibe/Assets.xcassets/startScreen.imageset/Contents.json new file mode 100644 index 0000000..1b7a36c --- /dev/null +++ b/Guibe/Assets.xcassets/startScreen.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "startScreen.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "startScreen-1.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "startScreen-2.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Guibe/Assets.xcassets/startScreen.imageset/startScreen-1.png b/Guibe/Assets.xcassets/startScreen.imageset/startScreen-1.png new file mode 100644 index 0000000..0e2108a Binary files /dev/null and b/Guibe/Assets.xcassets/startScreen.imageset/startScreen-1.png differ diff --git a/Guibe/Assets.xcassets/startScreen.imageset/startScreen-2.png b/Guibe/Assets.xcassets/startScreen.imageset/startScreen-2.png new file mode 100644 index 0000000..0e2108a Binary files /dev/null and b/Guibe/Assets.xcassets/startScreen.imageset/startScreen-2.png differ diff --git a/Guibe/Assets.xcassets/startScreen.imageset/startScreen.png b/Guibe/Assets.xcassets/startScreen.imageset/startScreen.png new file mode 100644 index 0000000..0e2108a Binary files /dev/null and b/Guibe/Assets.xcassets/startScreen.imageset/startScreen.png differ diff --git a/Guibe/Assets.xcassets/welcome2Screen.imageset/Contents.json b/Guibe/Assets.xcassets/welcome2Screen.imageset/Contents.json new file mode 100644 index 0000000..b181109 --- /dev/null +++ b/Guibe/Assets.xcassets/welcome2Screen.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "welcome2Screen.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "welcome2Screen-1.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "welcome2Screen-2.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Guibe/Assets.xcassets/welcome2Screen.imageset/welcome2Screen-1.png b/Guibe/Assets.xcassets/welcome2Screen.imageset/welcome2Screen-1.png new file mode 100644 index 0000000..8a1f246 Binary files /dev/null and b/Guibe/Assets.xcassets/welcome2Screen.imageset/welcome2Screen-1.png differ diff --git a/Guibe/Assets.xcassets/welcome2Screen.imageset/welcome2Screen-2.png b/Guibe/Assets.xcassets/welcome2Screen.imageset/welcome2Screen-2.png new file mode 100644 index 0000000..8a1f246 Binary files /dev/null and b/Guibe/Assets.xcassets/welcome2Screen.imageset/welcome2Screen-2.png differ diff --git a/Guibe/Assets.xcassets/welcome2Screen.imageset/welcome2Screen.png b/Guibe/Assets.xcassets/welcome2Screen.imageset/welcome2Screen.png new file mode 100644 index 0000000..8a1f246 Binary files /dev/null and b/Guibe/Assets.xcassets/welcome2Screen.imageset/welcome2Screen.png differ diff --git a/Guibe/Assets.xcassets/welcomeScreen.imageset/Contents.json b/Guibe/Assets.xcassets/welcomeScreen.imageset/Contents.json new file mode 100644 index 0000000..b85abfb --- /dev/null +++ b/Guibe/Assets.xcassets/welcomeScreen.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "Screenshot 2019-05-28 at 14.12.36.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "Screenshot 2019-05-28 at 14.12.36-1.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "Screenshot 2019-05-28 at 14.12.36-2.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Guibe/Assets.xcassets/welcomeScreen.imageset/Screenshot 2019-05-28 at 14.12.36-1.png b/Guibe/Assets.xcassets/welcomeScreen.imageset/Screenshot 2019-05-28 at 14.12.36-1.png new file mode 100644 index 0000000..425d192 Binary files /dev/null and b/Guibe/Assets.xcassets/welcomeScreen.imageset/Screenshot 2019-05-28 at 14.12.36-1.png differ diff --git a/Guibe/Assets.xcassets/welcomeScreen.imageset/Screenshot 2019-05-28 at 14.12.36-2.png b/Guibe/Assets.xcassets/welcomeScreen.imageset/Screenshot 2019-05-28 at 14.12.36-2.png new file mode 100644 index 0000000..425d192 Binary files /dev/null and b/Guibe/Assets.xcassets/welcomeScreen.imageset/Screenshot 2019-05-28 at 14.12.36-2.png differ diff --git a/Guibe/Assets.xcassets/welcomeScreen.imageset/Screenshot 2019-05-28 at 14.12.36.png b/Guibe/Assets.xcassets/welcomeScreen.imageset/Screenshot 2019-05-28 at 14.12.36.png new file mode 100644 index 0000000..425d192 Binary files /dev/null and b/Guibe/Assets.xcassets/welcomeScreen.imageset/Screenshot 2019-05-28 at 14.12.36.png differ diff --git a/Guibe/Base.lproj/Main.storyboard b/Guibe/Base.lproj/Main.storyboard index f1bcf38..86fcc3f 100644 --- a/Guibe/Base.lproj/Main.storyboard +++ b/Guibe/Base.lproj/Main.storyboard @@ -1,7 +1,11 @@ - + + + + - + + @@ -9,16 +13,215 @@ - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Guibe/Guibe.entitlements b/Guibe/Guibe.entitlements new file mode 100644 index 0000000..0c67376 --- /dev/null +++ b/Guibe/Guibe.entitlements @@ -0,0 +1,5 @@ + + + + + diff --git a/Guibe/Info.plist b/Guibe/Info.plist index 16be3b6..5389bde 100644 --- a/Guibe/Info.plist +++ b/Guibe/Info.plist @@ -4,6 +4,17 @@ CFBundleDevelopmentRegion $(DEVELOPMENT_LANGUAGE) + CFBundleDocumentTypes + + + CFBundleTypeName + MKDirectionsRequest + LSItemContentTypes + + com.apple.maps.directionsrequest + + + CFBundleExecutable $(EXECUTABLE_NAME) CFBundleIdentifier @@ -20,6 +31,19 @@ 1 LSRequiresIPhoneOS + MKDirectionsApplicationSupportedModes + + MKDirectionsModePedestrian + + NSLocationAlwaysAndWhenInUseUsageDescription + The app needs your location to allow step by step navigation + NSLocationWhenInUseUsageDescription + Please allow this feature to navigate + UIBackgroundModes + + location + remote-notification + UILaunchStoryboardName LaunchScreen UIMainStoryboardFile diff --git a/Guibe/MainViewController.swift b/Guibe/MainViewController.swift new file mode 100644 index 0000000..e951093 --- /dev/null +++ b/Guibe/MainViewController.swift @@ -0,0 +1,30 @@ +// +// MainViewController.swift +// Guibe +// +// Created by Max Hunt on 28/05/2019. +// Copyright © 2019 8. All rights reserved. +// + +import UIKit + +class MainViewController: UIViewController { + + 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. + } + */ + +} diff --git a/Guibe/ViewController.swift b/Guibe/ViewController.swift index b26a297..880052f 100644 --- a/Guibe/ViewController.swift +++ b/Guibe/ViewController.swift @@ -9,12 +9,32 @@ import UIKit class ViewController: UIViewController { + + let defaults = UserDefaults.standard override func viewDidLoad() { super.viewDidLoad() + + let setupDone = defaults.integer(forKey: "setupDone") + + + if setupDone != 2 { + DispatchQueue.main.asyncAfter(deadline: .now() + 2) { + let nextViewController = self.storyboard?.instantiateViewController(withIdentifier: "screen2") as! W2lcomeViewController + nextViewController.modalTransitionStyle = .crossDissolve + self.present(nextViewController, animated: true, completion: nil) + } + } + + if setupDone == 2 { + DispatchQueue.main.asyncAfter(deadline: .now() + 2) { + let nextViewController = self.storyboard?.instantiateViewController(withIdentifier: "mainView") as! MainViewController + nextViewController.modalTransitionStyle = .crossDissolve + self.present(nextViewController, animated: true, completion: nil) + } + } + + // Do any additional setup after loading the view. } - - } -