Merge branch 'fix-force-touch'

Author: NatashaTheRobot

trySwift/OrganizersTableViewController.swift

@@ -12,13 +12,18 @@ import TrySwiftData
 class OrganizersTableViewController: UITableViewController {
 
     fileprivate let organizers = Conference.current.organizers
+    fileprivate var forceTouchedOrganizer: Organizer?
 
     override func viewDidLoad() {
         super.viewDidLoad()
         edgesForExtendedLayout = []
 
         title = "Organizers".localized()
         configureTableView()
+        
+        if traitCollection.forceTouchCapability == .available {
+            registerForPreviewing(with: self, sourceView: tableView)
+        }
     }
 }
 
@@ -48,6 +53,22 @@ extension OrganizersTableViewController {
     }
 }
 
+extension OrganizersTableViewController: UIViewControllerPreviewingDelegate {
+    
+    func previewingContext(_ previewingContext: UIViewControllerPreviewing, viewControllerForLocation location: CGPoint) -> UIViewController? {
+        guard let indexPath = tableView.indexPathForRow(at: location) else { return nil }
+        //This will show the cell clearly and blur the rest of the screen for our peek.
+        previewingContext.sourceRect = tableView.rectForRow(at: indexPath)
+        let organizer = organizers[indexPath.row]
+        forceTouchedOrganizer = organizer
+        return OrganizerDetailTableViewController(organizer: organizer)
+    }
+    
+    func previewingContext(_ previewingContext: UIViewControllerPreviewing, commit viewControllerToCommit: UIViewController) {
+        self.navigationController?.pushViewController(viewControllerToCommit, animated: true)
+    }
+}
+
 fileprivate extension OrganizersTableViewController {
 
     func configureTableView() {

trySwift/SpeakersViewController.swift

@@ -14,6 +14,7 @@ class SpeakersViewController: UITableViewController {
     fileprivate let speakers = Speaker.all
     fileprivate let speakerDetailSegue = "speakerDetailSegue"
     fileprivate var didShowDetail = false
+    fileprivate var forceTouchedSpeaker: Speaker?
 
     override func awakeFromNib() {
         super.awakeFromNib()
@@ -88,11 +89,13 @@ extension SpeakersViewController: UIViewControllerPreviewingDelegate {
         guard let indexPath = tableView.indexPathForRow(at: location) else { return nil }
         //This will show the cell clearly and blur the rest of the screen for our peek.
         previewingContext.sourceRect = tableView.rectForRow(at: indexPath)
-        return speakerDetailViewController(for: speakers[indexPath.row])
+        let speaker = speakers[indexPath.row]
+        forceTouchedSpeaker = speaker
+        return speakerDetailViewController(for: speaker)
     }
 
     func previewingContext(_ previewingContext: UIViewControllerPreviewing, commit viewControllerToCommit: UIViewController) {
-        performSegue(withIdentifier: speakerDetailSegue, sender: nil)
+        performSegue(withIdentifier: speakerDetailSegue, sender: forceTouchedSpeaker)
     }
 }