Migrate View to Swift 3

jakubvano · jakubvano · commit aab294a5e684 · 2016-11-18T17:15:25.000+01:00
diff --git a/ExampleView/ImageDetailViewController.swift b/ExampleView/ImageDetailViewController.swift
@@ -18,25 +18,25 @@ public final class ImageDetailViewController: UIViewController {
         
         if let viewModel = viewModel {
             viewModel.image.producer
-                .on(next: { self.imageView.image = $0 })
+                .on(value: { self.imageView.image = $0 })
                 .start()
             viewModel.tagText.producer
-                .on(next: { self.tagLabel.text = $0 })
+                .on(value: { self.tagLabel.text = $0 })
                 .start()
             viewModel.usernameText.producer
-                .on(next: { self.usernameLabel.text = $0 })
+                .on(value: { self.usernameLabel.text = $0 })
                 .start()
             viewModel.pageImageSizeText.producer
-                .on(next: { self.imageSizeLabel.text = $0 })
+                .on(value: { self.imageSizeLabel.text = $0 })
                 .start()
             viewModel.viewCountText.producer
-                .on(next: { self.viewCountLabel.text = $0 })
+                .on(value: { self.viewCountLabel.text = $0 })
                 .start()
             viewModel.downloadCountText.producer
-                .on(next: { self.downloadCountLabel.text = $0 })
+                .on(value: { self.downloadCountLabel.text = $0 })
                 .start()
             viewModel.likeCountText.producer
-                .on(next: { self.likeCountLabel.text = $0 })
+                .on(value: { self.likeCountLabel.text = $0 })
                 .start()
         }
     }
@@ -49,14 +49,14 @@ public final class ImageDetailViewController: UIViewController {
     @IBOutlet weak var downloadCountLabel: UILabel!
     @IBOutlet weak var likeCountLabel: UILabel!
     
-    @IBAction func openImagePage(sender: UIBarButtonItem) {
+    @IBAction func openImagePage(_ sender: UIBarButtonItem) {
         let actionText = LocalizedString("ImageDetailViewController_ActionSheetViewInSafari", comment: "Action sheet button text.")
         let cancelText = LocalizedString("ImageDetailViewController_ActionSheetCancel", comment: "Action sheet button text.")
-        let alertController = UIAlertController(title: nil, message: nil, preferredStyle: .ActionSheet)
-        alertController.addAction(UIAlertAction(title: actionText, style: .Default) { _ in
+        let alertController = UIAlertController(title: nil, message: nil, preferredStyle: .actionSheet)
+        alertController.addAction(UIAlertAction(title: actionText, style: .default) { _ in
             self.viewModel?.openImagePage()
         })
-        alertController.addAction(UIAlertAction(title: cancelText, style: .Cancel, handler: nil))
-        self.presentViewController(alertController, animated: true, completion: nil)
+        alertController.addAction(UIAlertAction(title: cancelText, style: .cancel, handler: nil))
+        self.present(alertController, animated: true, completion: nil)
     }
 }
diff --git a/ExampleView/ImageSearchTableViewCell.swift b/ExampleView/ImageSearchTableViewCell.swift
@@ -17,8 +17,8 @@ internal final class ImageSearchTableViewCell: UITableViewCell {
             
             if let viewModel = viewModel {
                 viewModel.getPreviewImage()
-                    .takeUntil(self.racutil_prepareForReuseProducer)
-                    .on(next: { self.previewImageView.image = $0 })
+                    .take(until: self.reactive.prepareForReuse)
+                    .on(value: { self.previewImageView.image = $0 })
                     .start()
             }
             else {
diff --git a/ExampleView/ImageSearchTableViewController.swift b/ExampleView/ImageSearchTableViewController.swift
@@ -9,18 +9,18 @@
 import ExampleViewModel
 
 public final class ImageSearchTableViewController: UITableViewController {
-    private var autoSearchStarted = false
+    fileprivate var autoSearchStarted = false
     @IBOutlet var footerView: UIView!
     @IBOutlet weak var searchingIndicator: UIActivityIndicatorView!
     
     public var viewModel: ImageSearchTableViewModeling? {
         didSet {
             if let viewModel = viewModel {
                 viewModel.cellModels.producer
-                    .on(next: { _ in self.tableView.reloadData() })
+                    .on(value: { _ in self.tableView.reloadData() })
                     .start()
                 viewModel.searching.producer
-                    .on(next: { searching in
+                    .on(value: { searching in
                         if searching {
                             // Display the activity indicator at the center of the screen if the table is empty.
                             self.footerView.frame.size.height = viewModel.cellModels.value.isEmpty
@@ -36,7 +36,7 @@ public final class ImageSearchTableViewController: UITableViewController {
                     })
                     .start()
                 viewModel.errorMessage.producer
-                    .on(next: { errorMessage in
+                    .on(value: { errorMessage in
                         if let errorMessage = errorMessage {
                             self.displayErrorMessage(errorMessage)
                         }
@@ -46,7 +46,7 @@ public final class ImageSearchTableViewController: UITableViewController {
         }
     }
     
-    public override func viewWillAppear(animated: Bool) {
+    public override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
         
         if !autoSearchStarted {
@@ -55,21 +55,21 @@ public final class ImageSearchTableViewController: UITableViewController {
         }
     }
     
-    private func displayErrorMessage(errorMessage: String) {
+    fileprivate func displayErrorMessage(_ errorMessage: String) {
         let title = LocalizedString("ImageSearchTableViewController_ErrorAlertTitle", comment: "Error alert title.")
         let dismissButtonText = LocalizedString("ImageSearchTableViewController_DismissButtonTitle", comment: "Dismiss button title on an alert.")
         let message = errorMessage
-        let alert = UIAlertController(title: title, message: message, preferredStyle: .Alert)
-        alert.addAction(UIAlertAction(title: dismissButtonText, style: .Default) { _ in
-            alert.dismissViewControllerAnimated(true, completion: nil)
+        let alert = UIAlertController(title: title, message: message, preferredStyle: .alert)
+        alert.addAction(UIAlertAction(title: dismissButtonText, style: .default) { _ in
+            alert.dismiss(animated: true, completion: nil)
             })
-        self.presentViewController(alert, animated: true, completion: nil)
+        self.present(alert, animated: true, completion: nil)
     }
 }
 
 // MARK: UITableViewDataSource
 extension ImageSearchTableViewController {
-    public override func tableView(tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+    public override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
         if let viewModel = viewModel {
             return viewModel.cellModels.value.count
         }
@@ -79,12 +79,12 @@ extension ImageSearchTableViewController {
         // return viewModel?.cellModels.value.count ?? 0
     }
     
-    public override func tableView(tableView: UITableView, cellForRowAtIndexPath indexPath: NSIndexPath) -> UITableViewCell {
-        let cell = tableView.dequeueReusableCellWithIdentifier("ImageSearchTableViewCell", forIndexPath: indexPath) as! ImageSearchTableViewCell
+    public override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+        let cell = tableView.dequeueReusableCell(withIdentifier: "ImageSearchTableViewCell", for: indexPath) as! ImageSearchTableViewCell
         cell.viewModel = viewModel.map { $0.cellModels.value[indexPath.row] }
         
         if let viewModel = viewModel
-            where indexPath.row >= viewModel.cellModels.value.count - 1 && viewModel.loadNextPage.enabled.value {
+            , indexPath.row >= viewModel.cellModels.value.count - 1 && viewModel.loadNextPage.isEnabled.value {
                 viewModel.loadNextPage.apply(()).start()
         }
 
@@ -94,8 +94,8 @@ extension ImageSearchTableViewController {
 
 // MARK: - UITableViewDelegate
 extension ImageSearchTableViewController {
-    public override func tableView(tableView: UITableView, didSelectRowAtIndexPath indexPath: NSIndexPath) {
+    public override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
         viewModel?.selectCellAtIndex(indexPath.row)
-        performSegueWithIdentifier("ImageDetailViewControllerSegue", sender: self)
+        performSegue(withIdentifier: "ImageDetailViewControllerSegue", sender: self)
     }
 }
diff --git a/ExampleView/LocalizedString.swift b/ExampleView/LocalizedString.swift
@@ -6,9 +6,9 @@
 //  Copyright © 2015 Swinject Contributors. All rights reserved.
 //
 
-internal func LocalizedString(key: String, comment: String?) -> String {
+internal func LocalizedString(_ key: String, comment: String?) -> String {
     struct Static {
-        static let bundle = NSBundle(identifier: "com.github.Swinject.SwinjectMVVMExample.ExampleView")!
+        static let bundle = Bundle(identifier: "com.github.Swinject.SwinjectMVVMExample.ExampleView")!
     }
     return NSLocalizedString(key, bundle: Static.bundle, comment: comment ?? "")
 }
diff --git a/ExampleView/RACUtil.swift b/ExampleView/RACUtil.swift
diff --git a/ExampleViewModel/ImageSearchTableViewCellModel.swift b/ExampleViewModel/ImageSearchTableViewCellModel.swift
@@ -7,6 +7,7 @@
 //
 
 import ReactiveSwift
+import ReactiveCocoa
 import Result
 import ExampleModel
 
diff --git a/SwinjectMVVMExample.xcodeproj/project.pbxproj b/SwinjectMVVMExample.xcodeproj/project.pbxproj

Original file line number	Diff line number	Diff line change
`@@ -6,9 +6,9 @@`
`6`	`6`	`// Copyright © 2015 Swinject Contributors. All rights reserved.`
`7`	`7`	`//`
`8`	`8`
`9`		`-internal func LocalizedString(key: String, comment: String?) -> String {`
	`9`	`+internal func LocalizedString(_ key: String, comment: String?) -> String {`
`10`	`10`	`struct Static {`
`11`		`- static let bundle = NSBundle(identifier: "com.github.Swinject.SwinjectMVVMExample.ExampleView")!`
	`11`	`+ static let bundle = Bundle(identifier: "com.github.Swinject.SwinjectMVVMExample.ExampleView")!`
`12`	`12`	`}`
`13`	`13`	`return NSLocalizedString(key, bundle: Static.bundle, comment: comment ?? "")`
`14`	`14`	`}`