diff --git a/Guibe.xcodeproj/project.pbxproj b/Guibe.xcodeproj/project.pbxproj index 5ab66c8..b4b1b4e 100644 --- a/Guibe.xcodeproj/project.pbxproj +++ b/Guibe.xcodeproj/project.pbxproj @@ -7,6 +7,7 @@ objects = { /* 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 */; }; 50A7ADD7229D6A4200D58743 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50A7ADD6229D6A4200D58743 /* ViewController.swift */; }; 50A7ADDA229D6A4200D58743 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 50A7ADD8229D6A4200D58743 /* Main.storyboard */; }; @@ -22,6 +23,7 @@ /* End PBXBuildFile section */ /* Begin PBXFileReference section */ + 505AFEF7229FE1BD004FF0F1 /* settingsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = settingsViewController.swift; sourceTree = ""; }; 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 = ""; }; 50A7ADD6229D6A4200D58743 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = ""; }; @@ -78,6 +80,7 @@ 50A7ADE6229D6C7100D58743 /* Assets.xcassets */, 50A7ADD8229D6A4200D58743 /* Main.storyboard */, 50A7ADFE229D768900D58743 /* MainViewController.swift */, + 505AFEF7229FE1BD004FF0F1 /* settingsViewController.swift */, 50A7ADFC229D766800D58743 /* 7_ReadyViewController.swift */, 50A7ADF4229D75A900D58743 /* 3_StartViewController.swift */, 50A7ADF8229D75C100D58743 /* 5_HandChoiceViewController.swift */, @@ -189,6 +192,7 @@ 50A7ADD5229D6A4200D58743 /* AppDelegate.swift in Sources */, 50A7ADFF229D768900D58743 /* MainViewController.swift in Sources */, 50A7ADFB229D75E900D58743 /* 6_SideChoiceViewController.swift in Sources */, + 505AFEF8229FE1BD004FF0F1 /* settingsViewController.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/Guibe/Assets.xcassets/appLogo.imageset/Contents.json b/Guibe/Assets.xcassets/appLogo.imageset/Contents.json new file mode 100644 index 0000000..4c383e7 --- /dev/null +++ b/Guibe/Assets.xcassets/appLogo.imageset/Contents.json @@ -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" + } +} \ No newline at end of file diff --git a/Guibe/Assets.xcassets/appLogo.imageset/appLogo.png b/Guibe/Assets.xcassets/appLogo.imageset/appLogo.png new file mode 100644 index 0000000..c3d8dd6 Binary files /dev/null and b/Guibe/Assets.xcassets/appLogo.imageset/appLogo.png differ diff --git a/Guibe/Assets.xcassets/circle.imageset/Contents.json b/Guibe/Assets.xcassets/circle.imageset/Contents.json new file mode 100644 index 0000000..2a46977 --- /dev/null +++ b/Guibe/Assets.xcassets/circle.imageset/Contents.json @@ -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" + } +} \ No newline at end of file diff --git a/Guibe/Assets.xcassets/circle.imageset/circle-1.png b/Guibe/Assets.xcassets/circle.imageset/circle-1.png new file mode 100644 index 0000000..acb0820 Binary files /dev/null and b/Guibe/Assets.xcassets/circle.imageset/circle-1.png differ diff --git a/Guibe/Assets.xcassets/circle.imageset/circle-2.png b/Guibe/Assets.xcassets/circle.imageset/circle-2.png new file mode 100644 index 0000000..acb0820 Binary files /dev/null and b/Guibe/Assets.xcassets/circle.imageset/circle-2.png differ diff --git a/Guibe/Assets.xcassets/circle.imageset/circle.png b/Guibe/Assets.xcassets/circle.imageset/circle.png new file mode 100644 index 0000000..acb0820 Binary files /dev/null and b/Guibe/Assets.xcassets/circle.imageset/circle.png differ diff --git a/Guibe/Assets.xcassets/guibeWord.imageset/Contents.json b/Guibe/Assets.xcassets/guibeWord.imageset/Contents.json new file mode 100644 index 0000000..793aa3a --- /dev/null +++ b/Guibe/Assets.xcassets/guibeWord.imageset/Contents.json @@ -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" + } +} \ No newline at end of file diff --git a/Guibe/Assets.xcassets/guibeWord.imageset/guibeWord-1.png b/Guibe/Assets.xcassets/guibeWord.imageset/guibeWord-1.png new file mode 100644 index 0000000..b40e74e Binary files /dev/null and b/Guibe/Assets.xcassets/guibeWord.imageset/guibeWord-1.png differ diff --git a/Guibe/Assets.xcassets/guibeWord.imageset/guibeWord-2.png b/Guibe/Assets.xcassets/guibeWord.imageset/guibeWord-2.png new file mode 100644 index 0000000..b40e74e Binary files /dev/null and b/Guibe/Assets.xcassets/guibeWord.imageset/guibeWord-2.png differ diff --git a/Guibe/Assets.xcassets/guibeWord.imageset/guibeWord.png b/Guibe/Assets.xcassets/guibeWord.imageset/guibeWord.png new file mode 100644 index 0000000..b40e74e Binary files /dev/null and b/Guibe/Assets.xcassets/guibeWord.imageset/guibeWord.png differ diff --git a/Guibe/Assets.xcassets/serparator.imageset/Contents.json b/Guibe/Assets.xcassets/serparator.imageset/Contents.json new file mode 100644 index 0000000..6beb307 --- /dev/null +++ b/Guibe/Assets.xcassets/serparator.imageset/Contents.json @@ -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" + } +} \ No newline at end of file diff --git a/Guibe/Assets.xcassets/serparator.imageset/serparator-1.png b/Guibe/Assets.xcassets/serparator.imageset/serparator-1.png new file mode 100644 index 0000000..0f15538 Binary files /dev/null and b/Guibe/Assets.xcassets/serparator.imageset/serparator-1.png differ diff --git a/Guibe/Assets.xcassets/serparator.imageset/serparator-2.png b/Guibe/Assets.xcassets/serparator.imageset/serparator-2.png new file mode 100644 index 0000000..0f15538 Binary files /dev/null and b/Guibe/Assets.xcassets/serparator.imageset/serparator-2.png differ diff --git a/Guibe/Assets.xcassets/serparator.imageset/serparator.png b/Guibe/Assets.xcassets/serparator.imageset/serparator.png new file mode 100644 index 0000000..0f15538 Binary files /dev/null and b/Guibe/Assets.xcassets/serparator.imageset/serparator.png differ diff --git a/Guibe/Assets.xcassets/settingsScreen.imageset/Contents.json b/Guibe/Assets.xcassets/settingsScreen.imageset/Contents.json new file mode 100644 index 0000000..d3d4a78 --- /dev/null +++ b/Guibe/Assets.xcassets/settingsScreen.imageset/Contents.json @@ -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" + } +} \ No newline at end of file diff --git a/Guibe/Assets.xcassets/settingsScreen.imageset/settingsScreen-1.png b/Guibe/Assets.xcassets/settingsScreen.imageset/settingsScreen-1.png new file mode 100644 index 0000000..4cc0e27 Binary files /dev/null and b/Guibe/Assets.xcassets/settingsScreen.imageset/settingsScreen-1.png differ diff --git a/Guibe/Assets.xcassets/settingsScreen.imageset/settingsScreen-2.png b/Guibe/Assets.xcassets/settingsScreen.imageset/settingsScreen-2.png new file mode 100644 index 0000000..4cc0e27 Binary files /dev/null and b/Guibe/Assets.xcassets/settingsScreen.imageset/settingsScreen-2.png differ diff --git a/Guibe/Assets.xcassets/settingsScreen.imageset/settingsScreen.png b/Guibe/Assets.xcassets/settingsScreen.imageset/settingsScreen.png new file mode 100644 index 0000000..4cc0e27 Binary files /dev/null and b/Guibe/Assets.xcassets/settingsScreen.imageset/settingsScreen.png differ diff --git a/Guibe/Base.lproj/Main.storyboard b/Guibe/Base.lproj/Main.storyboard index 76f3797..f187b6b 100644 --- a/Guibe/Base.lproj/Main.storyboard +++ b/Guibe/Base.lproj/Main.storyboard @@ -244,14 +244,72 @@ + + + + + + + + + + + + + + + + + + + + + + + + + @@ -260,12 +318,107 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -276,6 +429,8 @@ + + diff --git a/Guibe/MainViewController.swift b/Guibe/MainViewController.swift index 6fcfb03..b544b4d 100644 --- a/Guibe/MainViewController.swift +++ b/Guibe/MainViewController.swift @@ -14,6 +14,10 @@ import AVFoundation class MainViewController: UIViewController, AVAudioPlayerDelegate { +// DELETE + let defaults = UserDefaults.standard +// DELETE + let locationManager = CLLocationManager() var currentCoordinate: CLLocationCoordinate2D! @@ -30,9 +34,11 @@ class MainViewController: UIViewController, AVAudioPlayerDelegate { // OUTLETS--------------OUTLETS + @IBOutlet weak var menuWindowView: UIView! @IBOutlet weak var menuView: UIView! @IBOutlet weak var menuBtn: UIButton! -// --------------------- + @IBOutlet weak var dismissBtn: UIButton! + // --------------------- @IBOutlet weak var searchBarBg: UIButton! @IBOutlet weak var searchView: UIView! @IBOutlet weak var searchBar: UISearchBar! @@ -44,9 +50,17 @@ class MainViewController: UIViewController, AVAudioPlayerDelegate { // ACTIONS--------------ACTIONS @IBAction func menuBtnPressed(_ sender: Any) { - + UIView.animate(withDuration: 0.2, animations: {self.menuWindowView.alpha = 1.0}) + 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 @@ -60,6 +74,12 @@ class MainViewController: UIViewController, AVAudioPlayerDelegate { searchBarBg.layer.shadowRadius = 10 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 diff --git a/Guibe/settingsViewController.swift b/Guibe/settingsViewController.swift new file mode 100644 index 0000000..45004af --- /dev/null +++ b/Guibe/settingsViewController.swift @@ -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. + } + */ + +}