From 88bb90de0d81001394076010539fbab391934703 Mon Sep 17 00:00:00 2001 From: dawood-ilyas-pakwheels Date: Wed, 4 Sep 2019 19:27:24 +0500 Subject: [PATCH] Migrated to swift 4.2 --- SwiftWebVC/SwiftModalWebVC.swift | 2 +- SwiftWebVC/SwiftWebVC.swift | 14 +++++++------- SwiftWebVC/SwiftWebVCActivity.swift | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/SwiftWebVC/SwiftModalWebVC.swift b/SwiftWebVC/SwiftModalWebVC.swift index 22ff7ef..eb9d765 100755 --- a/SwiftWebVC/SwiftModalWebVC.swift +++ b/SwiftWebVC/SwiftModalWebVC.swift @@ -46,7 +46,7 @@ public class SwiftModalWebVC: UINavigationController { let dismissButtonImageName = (dismissButtonStyle == .arrow) ? "SwiftWebVCDismiss" : "SwiftWebVCDismissAlt" let doneButton = UIBarButtonItem(image: SwiftWebVC.bundledImage(named: dismissButtonImageName), - style: UIBarButtonItemStyle.plain, + style: UIBarButtonItem.Style.plain, target: webViewController, action: #selector(SwiftWebVC.doneButtonTapped)) diff --git a/SwiftWebVC/SwiftWebVC.swift b/SwiftWebVC/SwiftWebVC.swift index 584e273..2d98e65 100755 --- a/SwiftWebVC/SwiftWebVC.swift +++ b/SwiftWebVC/SwiftWebVC.swift @@ -23,7 +23,7 @@ public class SwiftWebVC: UIViewController { lazy var backBarButtonItem: UIBarButtonItem = { var tempBackBarButtonItem = UIBarButtonItem(image: SwiftWebVC.bundledImage(named: "SwiftWebVCBack"), - style: UIBarButtonItemStyle.plain, + style: UIBarButtonItem.Style.plain, target: self, action: #selector(SwiftWebVC.goBackTapped(_:))) tempBackBarButtonItem.width = 18.0 @@ -33,7 +33,7 @@ public class SwiftWebVC: UIViewController { lazy var forwardBarButtonItem: UIBarButtonItem = { var tempForwardBarButtonItem = UIBarButtonItem(image: SwiftWebVC.bundledImage(named: "SwiftWebVCNext"), - style: UIBarButtonItemStyle.plain, + style: UIBarButtonItem.Style.plain, target: self, action: #selector(SwiftWebVC.goForwardTapped(_:))) tempForwardBarButtonItem.width = 18.0 @@ -42,7 +42,7 @@ public class SwiftWebVC: UIViewController { }() lazy var refreshBarButtonItem: UIBarButtonItem = { - var tempRefreshBarButtonItem = UIBarButtonItem(barButtonSystemItem: UIBarButtonSystemItem.refresh, + var tempRefreshBarButtonItem = UIBarButtonItem(barButtonSystemItem: UIBarButtonItem.SystemItem.refresh, target: self, action: #selector(SwiftWebVC.reloadTapped(_:))) tempRefreshBarButtonItem.tintColor = self.buttonColor @@ -50,7 +50,7 @@ public class SwiftWebVC: UIViewController { }() lazy var stopBarButtonItem: UIBarButtonItem = { - var tempStopBarButtonItem = UIBarButtonItem(barButtonSystemItem: UIBarButtonSystemItem.stop, + var tempStopBarButtonItem = UIBarButtonItem(barButtonSystemItem: UIBarButtonItem.SystemItem.stop, target: self, action: #selector(SwiftWebVC.stopTapped(_:))) tempStopBarButtonItem.tintColor = self.buttonColor @@ -58,7 +58,7 @@ public class SwiftWebVC: UIViewController { }() lazy var actionBarButtonItem: UIBarButtonItem = { - var tempActionBarButtonItem = UIBarButtonItem(barButtonSystemItem: UIBarButtonSystemItem.action, + var tempActionBarButtonItem = UIBarButtonItem(barButtonSystemItem: UIBarButtonItem.SystemItem.action, target: self, action: #selector(SwiftWebVC.actionButtonTapped(_:))) tempActionBarButtonItem.tintColor = self.buttonColor @@ -173,8 +173,8 @@ public class SwiftWebVC: UIViewController { let refreshStopBarButtonItem: UIBarButtonItem = webView.isLoading ? stopBarButtonItem : refreshBarButtonItem - let fixedSpace: UIBarButtonItem = UIBarButtonItem(barButtonSystemItem: UIBarButtonSystemItem.fixedSpace, target: nil, action: nil) - let flexibleSpace: UIBarButtonItem = UIBarButtonItem(barButtonSystemItem: UIBarButtonSystemItem.flexibleSpace, target: nil, action: nil) + let fixedSpace: UIBarButtonItem = UIBarButtonItem(barButtonSystemItem: UIBarButtonItem.SystemItem.fixedSpace, target: nil, action: nil) + let flexibleSpace: UIBarButtonItem = UIBarButtonItem(barButtonSystemItem: UIBarButtonItem.SystemItem.flexibleSpace, target: nil, action: nil) if (UIDevice.current.userInterfaceIdiom == UIUserInterfaceIdiom.pad) { diff --git a/SwiftWebVC/SwiftWebVCActivity.swift b/SwiftWebVC/SwiftWebVCActivity.swift index a73bd11..cb095da 100755 --- a/SwiftWebVC/SwiftWebVCActivity.swift +++ b/SwiftWebVC/SwiftWebVCActivity.swift @@ -14,10 +14,10 @@ class SwiftWebVCActivity: UIActivity { var URLToOpen: URL? var schemePrefix: String? - override var activityType : UIActivityType? { + override var activityType : UIActivity.ActivityType? { let typeArray = "\(type(of: self))".components(separatedBy: ".") let _type: String = typeArray[typeArray.count-1] - return UIActivityType(rawValue: _type) + return UIActivity.ActivityType(rawValue: _type) } override var activityImage : UIImage {