diff --git a/Guibe/3_StartViewController.swift b/Guibe/3_StartViewController.swift index e805f0a..631127f 100644 --- a/Guibe/3_StartViewController.swift +++ b/Guibe/3_StartViewController.swift @@ -24,6 +24,10 @@ class S3artViewController: UIViewController, CLLocationManagerDelegate { self.getStartedBtn.isHidden = true self.playAgainBtn.isHidden = false self.nextBtn.isHidden = false + self.nextBtn.layer.shadowColor = UIColor.black.cgColor + self.nextBtn.layer.shadowOffset = CGSize(width: 2, height: 5) + self.nextBtn.layer.shadowRadius = 5 + self.nextBtn.layer.shadowOpacity = 0.2 } playVideo() diff --git a/Guibe/Assets.xcassets/blank.imageset/Contents.json b/Guibe/Assets.xcassets/blank.imageset/Contents.json new file mode 100644 index 0000000..6f1cb9e --- /dev/null +++ b/Guibe/Assets.xcassets/blank.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "blank.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "blank-1.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "blank-2.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Guibe/Assets.xcassets/blank.imageset/blank-1.png b/Guibe/Assets.xcassets/blank.imageset/blank-1.png new file mode 100644 index 0000000..4caf36f Binary files /dev/null and b/Guibe/Assets.xcassets/blank.imageset/blank-1.png differ diff --git a/Guibe/Assets.xcassets/blank.imageset/blank-2.png b/Guibe/Assets.xcassets/blank.imageset/blank-2.png new file mode 100644 index 0000000..4caf36f Binary files /dev/null and b/Guibe/Assets.xcassets/blank.imageset/blank-2.png differ diff --git a/Guibe/Assets.xcassets/blank.imageset/blank.png b/Guibe/Assets.xcassets/blank.imageset/blank.png new file mode 100644 index 0000000..4caf36f Binary files /dev/null and b/Guibe/Assets.xcassets/blank.imageset/blank.png differ diff --git a/Guibe/Assets.xcassets/menuBtnImg.imageset/Contents.json b/Guibe/Assets.xcassets/menuBtnImg.imageset/Contents.json new file mode 100644 index 0000000..653e101 --- /dev/null +++ b/Guibe/Assets.xcassets/menuBtnImg.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "manuBtnImg.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "manuBtnImg-1.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "manuBtnImg-2.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Guibe/Assets.xcassets/menuBtnImg.imageset/manuBtnImg-1.png b/Guibe/Assets.xcassets/menuBtnImg.imageset/manuBtnImg-1.png new file mode 100644 index 0000000..6ab8518 Binary files /dev/null and b/Guibe/Assets.xcassets/menuBtnImg.imageset/manuBtnImg-1.png differ diff --git a/Guibe/Assets.xcassets/menuBtnImg.imageset/manuBtnImg-2.png b/Guibe/Assets.xcassets/menuBtnImg.imageset/manuBtnImg-2.png new file mode 100644 index 0000000..6ab8518 Binary files /dev/null and b/Guibe/Assets.xcassets/menuBtnImg.imageset/manuBtnImg-2.png differ diff --git a/Guibe/Assets.xcassets/menuBtnImg.imageset/manuBtnImg.png b/Guibe/Assets.xcassets/menuBtnImg.imageset/manuBtnImg.png new file mode 100644 index 0000000..6ab8518 Binary files /dev/null and b/Guibe/Assets.xcassets/menuBtnImg.imageset/manuBtnImg.png differ diff --git a/Guibe/Assets.xcassets/nextBtn.imageset/Contents.json b/Guibe/Assets.xcassets/nextBtn.imageset/Contents.json new file mode 100644 index 0000000..2e01a7c --- /dev/null +++ b/Guibe/Assets.xcassets/nextBtn.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "nextBtn.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "nextBtn-1.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "nextBtn-2.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Guibe/Assets.xcassets/nextBtn.imageset/nextBtn-1.png b/Guibe/Assets.xcassets/nextBtn.imageset/nextBtn-1.png new file mode 100644 index 0000000..163e1a3 Binary files /dev/null and b/Guibe/Assets.xcassets/nextBtn.imageset/nextBtn-1.png differ diff --git a/Guibe/Assets.xcassets/nextBtn.imageset/nextBtn-2.png b/Guibe/Assets.xcassets/nextBtn.imageset/nextBtn-2.png new file mode 100644 index 0000000..163e1a3 Binary files /dev/null and b/Guibe/Assets.xcassets/nextBtn.imageset/nextBtn-2.png differ diff --git a/Guibe/Assets.xcassets/nextBtn.imageset/nextBtn.png b/Guibe/Assets.xcassets/nextBtn.imageset/nextBtn.png new file mode 100644 index 0000000..163e1a3 Binary files /dev/null and b/Guibe/Assets.xcassets/nextBtn.imageset/nextBtn.png differ diff --git a/Guibe/Assets.xcassets/playAgainBtn.imageset/Contents.json b/Guibe/Assets.xcassets/playAgainBtn.imageset/Contents.json new file mode 100644 index 0000000..19c7094 --- /dev/null +++ b/Guibe/Assets.xcassets/playAgainBtn.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "playAgainBtn.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "playAgainBtn-1.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "playAgainBtn-2.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Guibe/Assets.xcassets/playAgainBtn.imageset/playAgainBtn-1.png b/Guibe/Assets.xcassets/playAgainBtn.imageset/playAgainBtn-1.png new file mode 100644 index 0000000..3c8a73b Binary files /dev/null and b/Guibe/Assets.xcassets/playAgainBtn.imageset/playAgainBtn-1.png differ diff --git a/Guibe/Assets.xcassets/playAgainBtn.imageset/playAgainBtn-2.png b/Guibe/Assets.xcassets/playAgainBtn.imageset/playAgainBtn-2.png new file mode 100644 index 0000000..3c8a73b Binary files /dev/null and b/Guibe/Assets.xcassets/playAgainBtn.imageset/playAgainBtn-2.png differ diff --git a/Guibe/Assets.xcassets/playAgainBtn.imageset/playAgainBtn.png b/Guibe/Assets.xcassets/playAgainBtn.imageset/playAgainBtn.png new file mode 100644 index 0000000..3c8a73b Binary files /dev/null and b/Guibe/Assets.xcassets/playAgainBtn.imageset/playAgainBtn.png differ diff --git a/Guibe/Assets.xcassets/searchBar.imageset/Contents.json b/Guibe/Assets.xcassets/searchBar.imageset/Contents.json new file mode 100644 index 0000000..93fcdd3 --- /dev/null +++ b/Guibe/Assets.xcassets/searchBar.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "searchBar.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "searchBar-1.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "searchBar-2.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Guibe/Assets.xcassets/searchBar.imageset/searchBar-1.png b/Guibe/Assets.xcassets/searchBar.imageset/searchBar-1.png new file mode 100644 index 0000000..2c42068 Binary files /dev/null and b/Guibe/Assets.xcassets/searchBar.imageset/searchBar-1.png differ diff --git a/Guibe/Assets.xcassets/searchBar.imageset/searchBar-2.png b/Guibe/Assets.xcassets/searchBar.imageset/searchBar-2.png new file mode 100644 index 0000000..2c42068 Binary files /dev/null and b/Guibe/Assets.xcassets/searchBar.imageset/searchBar-2.png differ diff --git a/Guibe/Assets.xcassets/searchBar.imageset/searchBar.png b/Guibe/Assets.xcassets/searchBar.imageset/searchBar.png new file mode 100644 index 0000000..2c42068 Binary files /dev/null and b/Guibe/Assets.xcassets/searchBar.imageset/searchBar.png differ diff --git a/Guibe/Assets.xcassets/speechBtn.imageset/Contents.json b/Guibe/Assets.xcassets/speechBtn.imageset/Contents.json new file mode 100644 index 0000000..cf24c88 --- /dev/null +++ b/Guibe/Assets.xcassets/speechBtn.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "speechBtn.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "speechBtn-1.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "speechBtn-2.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Guibe/Assets.xcassets/speechBtn.imageset/speechBtn-1.png b/Guibe/Assets.xcassets/speechBtn.imageset/speechBtn-1.png new file mode 100644 index 0000000..0d023ee Binary files /dev/null and b/Guibe/Assets.xcassets/speechBtn.imageset/speechBtn-1.png differ diff --git a/Guibe/Assets.xcassets/speechBtn.imageset/speechBtn-2.png b/Guibe/Assets.xcassets/speechBtn.imageset/speechBtn-2.png new file mode 100644 index 0000000..0d023ee Binary files /dev/null and b/Guibe/Assets.xcassets/speechBtn.imageset/speechBtn-2.png differ diff --git a/Guibe/Assets.xcassets/speechBtn.imageset/speechBtn.png b/Guibe/Assets.xcassets/speechBtn.imageset/speechBtn.png new file mode 100644 index 0000000..0d023ee Binary files /dev/null and b/Guibe/Assets.xcassets/speechBtn.imageset/speechBtn.png differ diff --git a/Guibe/Base.lproj/Main.storyboard b/Guibe/Base.lproj/Main.storyboard index aa3070d..9dbeb8f 100644 --- a/Guibe/Base.lproj/Main.storyboard +++ b/Guibe/Base.lproj/Main.storyboard @@ -52,17 +52,17 @@ + + + + + + + + + + + + + + + + + + - + + + + + + + diff --git a/Guibe/MainViewController.swift b/Guibe/MainViewController.swift index e951093..2d80282 100644 --- a/Guibe/MainViewController.swift +++ b/Guibe/MainViewController.swift @@ -9,22 +9,31 @@ import UIKit class MainViewController: UIViewController { + +// OUTLETS--------------OUTLETS + @IBOutlet weak var menuView: UIView! + @IBOutlet weak var menuBtn: UIButton! +// ---------------------------- + @IBOutlet weak var searchView: UIView! + @IBOutlet weak var searchBar: UISearchBar! + @IBOutlet weak var micBtn: UIButton! +// OUTLETS--------------OUTLETS +// ACTIONS--------------ACTIONS + @IBAction func menuBtnPressed(_ sender: Any) { + + } + @IBAction func micBtnPressed(_ sender: Any) { + + } + // ACTIONS--------------ACTIONS + override func viewDidLoad() { super.viewDidLoad() - // Do any additional setup after loading the view. - } + + } //END VIEW DID LOAD + - /* - // 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. - } - */ - -} +} //END OF CLASS