From 49f29a9e50ed7351a557d8dd8081d5f0874d39e4 Mon Sep 17 00:00:00 2001 From: Max Hunt Date: Fri, 31 May 2019 19:10:22 +0100 Subject: [PATCH] checkpoint --- Guibe.xcodeproj/project.pbxproj | 8 +-- Guibe/Base.lproj/Main.storyboard | 52 +++++++++------- Guibe/MainViewController.swift | 5 +- ...eViewCell.swift => NewTableViewCell.swift} | 17 ++++-- Guibe/TableViewController.swift | 59 ++++++++++--------- 5 files changed, 79 insertions(+), 62 deletions(-) rename Guibe/{TableViewCell.swift => NewTableViewCell.swift} (74%) diff --git a/Guibe.xcodeproj/project.pbxproj b/Guibe.xcodeproj/project.pbxproj index e67710f..6e7282a 100644 --- a/Guibe.xcodeproj/project.pbxproj +++ b/Guibe.xcodeproj/project.pbxproj @@ -8,7 +8,6 @@ /* Begin PBXBuildFile section */ 505AFEF8229FE1BD004FF0F1 /* settingsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 505AFEF7229FE1BD004FF0F1 /* settingsViewController.swift */; }; - 505AFEFC22A154EB004FF0F1 /* TableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 505AFEFB22A154EB004FF0F1 /* TableViewCell.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,11 +21,11 @@ 50A7AE02229D7B1100D58743 /* MapKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 50A7AE01229D7B1100D58743 /* MapKit.framework */; }; 50A9B4E1229E115B00070F61 /* Video.mov in Resources */ = {isa = PBXBuildFile; fileRef = 50A9B4E0229E115B00070F61 /* Video.mov */; }; 50C69B1122A16A7100EA99C1 /* TableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50C69B1022A16A7100EA99C1 /* TableViewController.swift */; }; + 50C69B1322A19D8800EA99C1 /* NewTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50C69B1222A19D8800EA99C1 /* NewTableViewCell.swift */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ 505AFEF7229FE1BD004FF0F1 /* settingsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = settingsViewController.swift; sourceTree = ""; }; - 505AFEFB22A154EB004FF0F1 /* TableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TableViewCell.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 = ""; }; @@ -43,6 +42,7 @@ 50A7AE05229D7B1E00D58743 /* Guibe.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Guibe.entitlements; sourceTree = ""; }; 50A9B4E0229E115B00070F61 /* Video.mov */ = {isa = PBXFileReference; lastKnownFileType = video.quicktime; path = Video.mov; sourceTree = ""; }; 50C69B1022A16A7100EA99C1 /* TableViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TableViewController.swift; sourceTree = ""; }; + 50C69B1222A19D8800EA99C1 /* NewTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NewTableViewCell.swift; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -83,9 +83,9 @@ 50A7ADD6229D6A4200D58743 /* ViewController.swift */, 50A7ADE6229D6C7100D58743 /* Assets.xcassets */, 50A7ADD8229D6A4200D58743 /* Main.storyboard */, - 505AFEFB22A154EB004FF0F1 /* TableViewCell.swift */, 50A7ADFE229D768900D58743 /* MainViewController.swift */, 50C69B1022A16A7100EA99C1 /* TableViewController.swift */, + 50C69B1222A19D8800EA99C1 /* NewTableViewCell.swift */, 505AFEF7229FE1BD004FF0F1 /* settingsViewController.swift */, 50A7ADFC229D766800D58743 /* 7_ReadyViewController.swift */, 50A7ADF4229D75A900D58743 /* 3_StartViewController.swift */, @@ -195,9 +195,9 @@ 50A7ADF9229D75C100D58743 /* 5_HandChoiceViewController.swift in Sources */, 50A7ADD7229D6A4200D58743 /* ViewController.swift in Sources */, 50C69B1122A16A7100EA99C1 /* TableViewController.swift in Sources */, - 505AFEFC22A154EB004FF0F1 /* TableViewCell.swift in Sources */, 50A7ADF5229D75A900D58743 /* 3_StartViewController.swift in Sources */, 50A7ADD5229D6A4200D58743 /* AppDelegate.swift in Sources */, + 50C69B1322A19D8800EA99C1 /* NewTableViewCell.swift in Sources */, 50A7ADFF229D768900D58743 /* MainViewController.swift in Sources */, 50A7ADFB229D75E900D58743 /* 6_SideChoiceViewController.swift in Sources */, 505AFEF8229FE1BD004FF0F1 /* settingsViewController.swift in Sources */, diff --git a/Guibe/Base.lproj/Main.storyboard b/Guibe/Base.lproj/Main.storyboard index d6a1ff5..a9dba9f 100644 --- a/Guibe/Base.lproj/Main.storyboard +++ b/Guibe/Base.lproj/Main.storyboard @@ -314,7 +314,6 @@ - @@ -329,53 +328,64 @@ - - + + - - + + - - + + - - + + - - + + + + + - + diff --git a/Guibe/MainViewController.swift b/Guibe/MainViewController.swift index dd0f086..9f1befe 100644 --- a/Guibe/MainViewController.swift +++ b/Guibe/MainViewController.swift @@ -252,7 +252,6 @@ extension MainViewController: CLLocationManagerDelegate { extension MainViewController: UISearchBarDelegate { func searchBarSearchButtonClicked(_ searchBar: UISearchBar) { - print("Here2") searchBar.endEditing(true) //HIDES LE KEYBOARD let localSearchRequest = MKLocalSearch.Request() @@ -266,8 +265,8 @@ extension MainViewController: UISearchBarDelegate { resultsViewController.searchResults = response.mapItems resultsViewController.modalTransitionStyle = .coverVertical self.present(resultsViewController, animated: true, completion: nil) - guard let firstMapItem = response.mapItems.first else { return } - self.getDirections(to: firstMapItem) +// guard let firstMapItem = response.mapItems.first else { return } +// self.getDirections(to: firstMapItem) } } diff --git a/Guibe/TableViewCell.swift b/Guibe/NewTableViewCell.swift similarity index 74% rename from Guibe/TableViewCell.swift rename to Guibe/NewTableViewCell.swift index 35f6440..9c4959d 100644 --- a/Guibe/TableViewCell.swift +++ b/Guibe/NewTableViewCell.swift @@ -1,5 +1,5 @@ // -// TableViewCell.swift +// NewTableViewCell.swift // Guibe // // Created by Max Hunt on 31/05/2019. @@ -8,22 +8,25 @@ import UIKit + protocol tableViewProtocol { func onClickCell(index: Int) } -class TableViewCell: UITableViewCell { - @IBOutlet weak var cellLbl: UILabel! - - var cellDelegate: tableViewProtocol? - var index: IndexPath? +class NewTableViewCell: UITableViewCell { + + @IBOutlet weak var primaryLbl: UILabel! + @IBOutlet weak var secondaryLbl: UILabel! @IBAction func goPressed(_ sender: Any) { cellDelegate?.onClickCell(index: (index?.row)!) } + var cellDelegate: tableViewProtocol? + var index: IndexPath? + override func awakeFromNib() { super.awakeFromNib() // Initialization code @@ -31,6 +34,8 @@ class TableViewCell: UITableViewCell { override func setSelected(_ selected: Bool, animated: Bool) { super.setSelected(selected, animated: animated) + + // Configure the view for the selected state } } diff --git a/Guibe/TableViewController.swift b/Guibe/TableViewController.swift index f2cd10d..c62dbda 100644 --- a/Guibe/TableViewController.swift +++ b/Guibe/TableViewController.swift @@ -11,52 +11,55 @@ import MapKit class TableViewController: UIViewController { - let appDelegate = UIApplication.shared.delegate as! AppDelegate - var searchResults: [MKMapItem]? + @IBOutlet weak var tableView: UITableView! + + override func viewDidLoad() { super.viewDidLoad() // let testData = appDelegate.navigationResults - - // 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. - } - */ - -} +// func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int { +// return searchResults?.count ?? 0 +// } +// +// func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell { +// let cell = tableView.dequeueReusableCell(withIdentifier: "cell", for: indexPath) +// let row = indexPath.row +// +// if let item = searchResults?[row] { +// print(item) +// cell.textLabel?.text = item.name +// } +// +// return cell +// } +} // END OF CLASS extension TableViewController: UITableViewDataSource, UITableViewDelegate { func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int { - return self.searchResults?.count ?? 0 + return searchResults?.count ?? 0 } func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell { - let cell = tableView.dequeueReusableCell(withIdentifier: "cell", for: indexPath) as? TableViewCell - let row = indexPath.row + let cell = tableView.dequeueReusableCell(withIdentifier: "cell", for: indexPath) as! NewTableViewCell - if let item = searchResults?[row] { - cell?.cellLbl.text = item.name -// cell.phoneLabel.text = item.phoneNumber + let row = indexPath.row + if let result = searchResults?[row] { + cell.primaryLbl.text = result.name + cell.secondaryLbl.text = result.phoneNumber + cell.cellDelegate = self + cell.index = indexPath } -// cell?.cellLbl.text = self.searchResults[indexPath.row] -// cell?.cellDelegate = self -// cell?.index = indexPath - return cell! + + return cell } } extension TableViewController: tableViewProtocol { func onClickCell(index: Int) { - debugPrint("Pressed on cell number \(index)") + print("Going to navigate to option \(index)") } }