Merge milestone_0.4.0 into master for release 0.4.0

Example/SwiftWebVCExample/ViewController.swift

@@ -34,12 +34,12 @@ class ViewController: UIViewController {
     }
 
     @IBAction func presentModalWithLightBlackTheme() {
-        let webVC = SwiftModalWebVC(urlString: "https://www.google.com", theme: .lightBlack)
+        let webVC = SwiftModalWebVC(urlString: "https://www.google.com", theme: .lightBlack, dismissButtonStyle: .cross)
         self.present(webVC, animated: true, completion: nil)
     }
 
     @IBAction func presentModalWithDarkTheme() {
-        let webVC = SwiftModalWebVC(urlString: "https://www.google.com", theme: .dark)
+        let webVC = SwiftModalWebVC(urlString: "https://www.google.com", theme: .dark, dismissButtonStyle: .arrow)
         self.present(webVC, animated: true, completion: nil)
     }
 

README.md

@@ -117,3 +117,5 @@ Starting in iOS 6 Apple uses `UIActivity` to let you show additional sharing met
 SwiftWebVC is a Swift implementation of [Sam Vermette's SVWebViewController](https://github.com/samvermette/SVWebViewController/). Code transcription, updates and changes were carried out by Myles Ringle. The original SVWebViewController was brought to you by [Sam Vermette](http://samvermette.com) and [contributors to the project](https://github.com/samvermette/SVWebViewController/contributors).
 
 If you have feature suggestions or bug reports, feel free to help out by sending pull requests or by [creating new issues](https://github.com/meismyles/SwiftWebVC/issues/new). If you're using SwiftWebVC in your project, attribution is always appreciated.
+
+Thanks to [Icons8](https://icons8.com/) for the images.

SwiftWebVC/Resources/Media.xcassets/SwiftWebVCActivityChrome.imageset/Contents.json

@@ -2,6 +2,7 @@
   "images" : [
     {
       "idiom" : "universal",
+      "filename" : "SwiftWebVCActivityChrome.png",
       "scale" : "1x"
     },
     {
@@ -11,6 +12,7 @@
     },
     {
       "idiom" : "universal",
+      "filename" : "[email protected]",
       "scale" : "3x"
     }
   ],

SwiftWebVC/Resources/Media.xcassets/SwiftWebVCActivitySafari.imageset/Contents.json

@@ -2,6 +2,7 @@
   "images" : [
     {
       "idiom" : "universal",
+      "filename" : "SwiftWebVCActivitySafari.png",
       "scale" : "1x"
     },
     {
@@ -11,6 +12,7 @@
     },
     {
       "idiom" : "universal",
+      "filename" : "[email protected]",
       "scale" : "3x"
     }
   ],

SwiftWebVC/Resources/Media.xcassets/SwiftWebVCBack.imageset/Contents.json

@@ -12,6 +12,7 @@
     },
     {
       "idiom" : "universal",
+      "filename" : "[email protected]",
       "scale" : "3x"
     }
   ],

SwiftWebVC/Resources/Media.xcassets/SwiftWebVCDismiss.imageset/Contents.json

@@ -12,6 +12,7 @@
     },
     {
       "idiom" : "universal",
+      "filename" : "[email protected]",
       "scale" : "3x"
     }
   ],

SwiftWebVC/Resources/Media.xcassets/SwiftWebVCActivityChrome-iPad.imageset/Contents.json → SwiftWebVC/Resources/Media.xcassets/SwiftWebVCDismissAlt.imageset/Contents.json

@@ -2,16 +2,17 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "SwiftWebVCActivityChrome-iPad.png",
+      "filename" : "SwiftWebVCDismissAlt.png",
       "scale" : "1x"
     },
     {
       "idiom" : "universal",
-      "filename" : "SwiftWebVCActivityChrome-iPad@2x.png",
+      "filename" : "SwiftWebVCDismissAlt@2x.png",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
+      "filename" : "[email protected]",
       "scale" : "3x"
     }
   ],

SwiftWebVC/Resources/Media.xcassets/SwiftWebVCNext.imageset/Contents.json

@@ -12,6 +12,7 @@
     },
     {
       "idiom" : "universal",
+      "filename" : "[email protected]",
       "scale" : "3x"
     }
   ],

SwiftWebVC/SwiftModalWebVC.swift

@@ -13,30 +13,34 @@ public class SwiftModalWebVC: UINavigationController {
     public enum SwiftModalWebVCTheme {
         case lightBlue, lightBlack, dark
     }
+    public enum SwiftModalWebVCDismissButtonStyle {
+        case arrow, cross
+    }
 
     weak var webViewDelegate: UIWebViewDelegate? = nil
 
     public convenience init(urlString: String) {
         self.init(pageURL: URL(string: urlString)!)
     }
 
-    public convenience init(urlString: String, theme: SwiftModalWebVCTheme) {
-        self.init(pageURL: URL(string: urlString)!, theme: theme)
+    public convenience init(urlString: String, theme: SwiftModalWebVCTheme, dismissButtonStyle: SwiftModalWebVCDismissButtonStyle) {
+        self.init(pageURL: URL(string: urlString)!, theme: theme, dismissButtonStyle: dismissButtonStyle)
     }
 
     public convenience init(pageURL: URL) {
         self.init(request: URLRequest(url: pageURL))
     }
 
-    public convenience init(pageURL: URL, theme: SwiftModalWebVCTheme) {
-        self.init(request: URLRequest(url: pageURL), theme: theme)
+    public convenience init(pageURL: URL, theme: SwiftModalWebVCTheme, dismissButtonStyle: SwiftModalWebVCDismissButtonStyle) {
+        self.init(request: URLRequest(url: pageURL), theme: theme, dismissButtonStyle: dismissButtonStyle)
     }
 
-    public init(request: URLRequest, theme: SwiftModalWebVCTheme = .lightBlue) {
+    public init(request: URLRequest, theme: SwiftModalWebVCTheme = .lightBlue, dismissButtonStyle: SwiftModalWebVCDismissButtonStyle = .arrow) {
         let webViewController = SwiftWebVC(aRequest: request)
         webViewController.storedStatusColor = UINavigationBar.appearance().barStyle
-
-        let doneButton = UIBarButtonItem(image: SwiftWebVC.bundledImage(named: "SwiftWebVCDismiss"),
+
+        let dismissButtonImageName = (dismissButtonStyle == .arrow) ? "SwiftWebVCDismiss" : "SwiftWebVCDismissAlt"
+        let doneButton = UIBarButtonItem(image: SwiftWebVC.bundledImage(named: dismissButtonImageName),
                                          style: UIBarButtonItemStyle.plain,
                                          target: webViewController,
                                          action: #selector(SwiftWebVC.doneButtonTapped))

SwiftWebVC/SwiftWebVC.swift

@@ -306,5 +306,59 @@ extension SwiftWebVC: WKNavigationDelegate {
         updateToolbarItems()
     }
 
+    public func webView(_ webView: WKWebView, decidePolicyFor navigationAction: WKNavigationAction, decisionHandler: @escaping (WKNavigationActionPolicy) -> Void) {
+
+
+        let url = navigationAction.request.url
+
+        let hostAddress = navigationAction.request.url?.host
+
+        if (navigationAction.targetFrame == nil) {
+            if UIApplication.shared.canOpenURL(url!) {
+                UIApplication.shared.openURL(url!)
+            }
+        }
+        decisionHandler(.allow)
+
+        // To connnect app store
+        if hostAddress == "itunes.apple.com" {
+            if UIApplication.shared.canOpenURL(navigationAction.request.url!) {
+                UIApplication.shared.openURL(navigationAction.request.url!)
+                decisionHandler(.cancel)
+                return
+            }
+        }
+
+        let url_elements = url!.absoluteString.components(separatedBy: ":")
+
+        switch url_elements[0] {
+        case "tel":
+            openCustomApp(urlScheme: "telprompt://", additional_info: url_elements[1])
+            decisionHandler(.cancel)
+
+        case "sms":
+            openCustomApp(urlScheme: "sms://", additional_info: url_elements[1])
+            decisionHandler(.cancel)
+
+        case "mailto":
+            openCustomApp(urlScheme: "mailto://", additional_info: url_elements[1])
+            decisionHandler(.cancel)
+
+        default:
+            print("Default")
+        }
+
+        decisionHandler(.allow)
+
+    }
 
+    func openCustomApp(urlScheme: String, additional_info:String){
+
+        if let requestUrl: URL = URL(string:"\(urlScheme)"+"\(additional_info)") {
+            let application:UIApplication = UIApplication.shared
+            if application.canOpenURL(requestUrl) {
+                application.openURL(requestUrl)
+            }
+        }
+    }
 }

SwiftWebVC/SwiftWebVCActivity.swift

@@ -22,12 +22,7 @@ class SwiftWebVCActivity: UIActivity {
 
     override var activityImage : UIImage {
         if let type = activityType?.rawValue {
-            if (UIDevice.current.userInterfaceIdiom == UIUserInterfaceIdiom.pad) {
-                return SwiftWebVC.bundledImage(named: "\(type)-iPad")!
-            }
-            else {
-                return SwiftWebVC.bundledImage(named: "\(type)")!
-            }
+            return SwiftWebVC.bundledImage(named: "\(type)")!
         }
         else{
             assert(false, "Unknow type")