implement TFAAdDelegate.adBrowserWillOpen

elneruda · elneruda · commit 973dc742fe01 · 2020-09-29T11:50:12.000+02:00
diff --git a/TeadsDemoApp.xcodeproj/project.pbxproj b/TeadsDemoApp.xcodeproj/project.pbxproj
@@ -395,6 +395,7 @@
 				TargetAttributes = {
 					B5555A311F7CDF80007406D4 = {
 						CreatedOnToolsVersion = 9.0;
+						LastSwiftMigration = 1170;
 						ProvisioningStyle = Automatic;
 					};
 				};
@@ -684,7 +685,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = Teads.TeadsDemoApp;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
@@ -708,7 +709,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = Teads.TeadsDemoApp;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Release;
diff --git a/TeadsDemoApp/Controllers/EmbededWebView/CollectionView/WebViewEmbededCollectionViewController.swift b/TeadsDemoApp/Controllers/EmbededWebView/CollectionView/WebViewEmbededCollectionViewController.swift
@@ -37,7 +37,7 @@ class WebViewEmbededCollectionViewController: UICollectionViewController, WKNavi
         self.webView.loadHTMLString(contentString, baseURL: nil)
         
         self.adView = TFAInReadAdView(withPid: UserDefaults.standard.integer(forKey: "PID"))
-        self.webSync = SyncWebViewTFInReadAdView(webView: self.webView!, selector: "#my-placement-id", adView: self.adView!)
+        self.webSync = SyncWebViewTFInReadAdView(webView: self.webView!, selector: "#my-placement-id", adView: self.adView!, viewController: self)
         
         self.collectionView!.register(TeadsAdEmbededCollectionViewCell.self, forCellWithReuseIdentifier: self.reuseTeadsIdentifier)
     }
diff --git a/TeadsDemoApp/Controllers/EmbededWebView/TableView/WebViewEmbededTableViewController.swift b/TeadsDemoApp/Controllers/EmbededWebView/TableView/WebViewEmbededTableViewController.swift
@@ -47,7 +47,7 @@ class WebViewEmbededTableViewController: UITableViewController, WKNavigationDele
         self.webView?.loadHTMLString(contentString, baseURL: nil)
         
         self.adView = TFAInReadAdView(withPid: UserDefaults.standard.integer(forKey: "PID"))
-        self.webSync = SyncWebViewTFInReadAdView(webView: self.webView!, selector: "#my-placement-id", adView: self.adView!)
+        self.webSync = SyncWebViewTFInReadAdView(webView: self.webView!, selector: "#my-placement-id", adView: self.adView!, viewController: self)
                
         self.startObservingContentSize()
     }
diff --git a/TeadsDemoApp/Controllers/EmbededWebView/WebViewEmbededInScrollViewController.swift b/TeadsDemoApp/Controllers/EmbededWebView/WebViewEmbededInScrollViewController.swift
@@ -35,7 +35,7 @@ class WebViewEmbededInScrollViewController: UIViewController, WKNavigationDelega
         self.webView?.loadHTMLString(contentString, baseURL: nil)
         
         self.adView = TFAInReadAdView(withPid: UserDefaults.standard.integer(forKey: "PID"))
-        self.webSync = SyncWebViewTFInReadAdView(webView: self.webView!, selector: "#my-placement-id", adView: self.adView!)
+        self.webSync = SyncWebViewTFInReadAdView(webView: self.webView!, selector: "#my-placement-id", adView: self.adView!, viewController: self)
         
         self.startObservingContentSize()
     }
diff --git a/TeadsDemoApp/Controllers/collectionViewController/CollectionViewController.swift b/TeadsDemoApp/Controllers/collectionViewController/CollectionViewController.swift
@@ -134,4 +134,8 @@ class CollectionViewController: UICollectionViewController, UICollectionViewDele
     
     public func adError(_ ad: TFAAdView, errorMessage: String) {
     }
+    
+    func adBrowserWillOpen(_ ad: TFAAdView) -> UIViewController? {
+        return self
+    }
 }
diff --git a/TeadsDemoApp/Controllers/inRead Top/InReadTopViewController.swift b/TeadsDemoApp/Controllers/inRead Top/InReadTopViewController.swift
@@ -55,5 +55,9 @@ class InReadTopViewController: UIViewController, TFAAdDelegate {
     func didUpdateRatio(_ ad: TFAAdView, ratio: CGFloat) {
         resizeTeadsAd(adRatio: ratio)
     }
+    
+    public func adBrowserWillOpen(_ ad: TFAAdView) -> UIViewController? {
+        return self
+    }
 
 }
diff --git a/TeadsDemoApp/Controllers/mopubController/MoPubController.swift b/TeadsDemoApp/Controllers/mopubController/MoPubController.swift
@@ -25,6 +25,7 @@ class MoPubController: UIViewController {
         
         let config = MPMoPubConfiguration(adUnitIdForAppInitialization: MOPUB_AD_UNIT_ID)
         bannerView = MPAdView(adUnitId: MOPUB_AD_UNIT_ID)
+        bannerView.delegate = self
         config.loggingLevel = .debug
         
         if MoPub.sharedInstance().isSdkInitialized {
@@ -91,6 +92,12 @@ class MoPubController: UIViewController {
     }
 }
 
+extension MoPubController: MPAdViewDelegate {
+    func viewControllerForPresentingModalView() -> UIViewController! {
+        return self
+    }
+}
+
 extension MoPubController: TFAMediatedAdViewDelegate {
     
     func didUpdateRatio(_ adView: UIView, ratio: CGFloat) {
diff --git a/TeadsDemoApp/Controllers/scrollViewController/ScrollViewController.swift b/TeadsDemoApp/Controllers/scrollViewController/ScrollViewController.swift
@@ -74,4 +74,8 @@ class ScrollViewController: UIViewController, TFAAdDelegate {
         adRatio = ratio
         resizeTeadsAd(adRatio: ratio)
     }
+    
+    public func adBrowserWillOpen(_ ad: TFAAdView) -> UIViewController? {
+        return self
+    }
 }
diff --git a/TeadsDemoApp/Controllers/tableViewController/TableViewController.swift b/TeadsDemoApp/Controllers/tableViewController/TableViewController.swift
@@ -130,4 +130,8 @@ class TableViewController: UITableViewController, TFAAdDelegate {
         //be careful if you want to load another ad in the same page don't remove the observer
         NotificationCenter.default.removeObserver(self)
     }
+    
+    public func adBrowserWillOpen(_ ad: TFAAdView) -> UIViewController? {
+        return self
+    }
 }
diff --git a/TeadsDemoApp/Controllers/webViewController/WebViewViewController.swift b/TeadsDemoApp/Controllers/webViewController/WebViewViewController.swift
@@ -31,7 +31,7 @@ class WebViewViewController: UIViewController, WKNavigationDelegate {
         self.webView?.loadHTMLString(contentString, baseURL: nil)
         
         self.adView = TFAInReadAdView(withPid: UserDefaults.standard.integer(forKey: "PID"))
-        self.webSync = SyncWebViewTFInReadAdView(webView: self.webView!, selector: "#my-placement-id", adView: self.adView!)
+        self.webSync = SyncWebViewTFInReadAdView(webView: self.webView!, selector: "#my-placement-id", adView: self.adView!, viewController: self)
     }
     
     // MARK: -
diff --git a/TeadsDemoApp/Controllers/webViewController/webViewHelper/SyncWebViewTFInReadAdView.swift b/TeadsDemoApp/Controllers/webViewController/webViewHelper/SyncWebViewTFInReadAdView.swift
@@ -20,14 +20,16 @@ public class SyncWebViewTFInReadAdView: NSObject, WebViewHelperDelegate, TFAAdDe
     var adViewConstraints = [NSLayoutConstraint]()
     var adViewHeightConstraint: NSLayoutConstraint?
     var adRatio: CGFloat = 16/9.0
+    weak var viewController: UIViewController?
     
-    public init(webView: WKWebView, selector: String, adView: TFAInReadAdView, adSettings: TeadsAdSettings? = nil) {
+    public init(webView: WKWebView, selector: String, adView: TFAInReadAdView, viewController: UIViewController, adSettings: TeadsAdSettings? = nil) {
         self.webViewHelper = WebViewHelper(webView: webView, selector: selector)
         self.adView = adView
         super.init()
         self.adView?.delegate = self
         self.webViewHelper.delegate = self
         self.webView = webView
+        self.viewController = viewController
         self.teadsAdSettings = adSettings
         //We use the observer to know when the rotation happen to resize the ad
         NotificationCenter.default.addObserver(self, selector: #selector(self.rotationDetected), name: UIDevice.orientationDidChangeNotification, object: nil)
@@ -138,4 +140,8 @@ public class SyncWebViewTFInReadAdView: NSObject, WebViewHelperDelegate, TFAAdDe
         //update the slot in case there was a rotation or a layout change to be sure that the ad has the right layout
         self.webViewHelper.updateSlot(adRatio: self.adRatio)
     }
+    
+    public func adBrowserWillOpen(_ ad: TFAAdView) -> UIViewController? {
+        return viewController
+    }
 }
diff --git a/TeadsDemoApp/Controllers/webViewController/webViewHelper/WebViewHelper.swift b/TeadsDemoApp/Controllers/webViewController/webViewHelper/WebViewHelper.swift
@@ -203,11 +203,11 @@ public class WebViewHelper: NSObject, WKScriptMessageHandler {
     func onSlotUpdated(position: String?) {
         if let positionString = position,
             let data = positionString.data(using: .utf8),
-            let positionDict = try? JSONSerialization.jsonObject(with: data, options: []) as? [String: Any] {
-            guard let top = positionDict?["top"] as? Int,
-                let bottom = positionDict?["bottom"] as? Int,
-                let right = positionDict?["right"] as? Int,
-                let left = positionDict?["left"] as? Int else {
+            let positionDict = (try? JSONSerialization.jsonObject(with: data)) as? [String: Any] {
+            guard let top = positionDict["top"] as? Int,
+                let bottom = positionDict["bottom"] as? Int,
+                let right = positionDict["right"] as? Int,
+                let left = positionDict["left"] as? Int else {
                     return
             }
             self.noSlotTimer?.invalidate()

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ class WebViewEmbededCollectionViewController: UICollectionViewController, WKNavi`
`37`	`37`	`self.webView.loadHTMLString(contentString, baseURL: nil)`
`38`	`38`
`39`	`39`	`self.adView = TFAInReadAdView(withPid: UserDefaults.standard.integer(forKey: "PID"))`
`40`		`- self.webSync = SyncWebViewTFInReadAdView(webView: self.webView!, selector: "#my-placement-id", adView: self.adView!)`
	`40`	`+ self.webSync = SyncWebViewTFInReadAdView(webView: self.webView!, selector: "#my-placement-id", adView: self.adView!, viewController: self)`
`41`	`41`
`42`	`42`	`self.collectionView!.register(TeadsAdEmbededCollectionViewCell.self, forCellWithReuseIdentifier: self.reuseTeadsIdentifier)`
`43`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ class WebViewEmbededTableViewController: UITableViewController, WKNavigationDele`
`47`	`47`	`self.webView?.loadHTMLString(contentString, baseURL: nil)`
`48`	`48`
`49`	`49`	`self.adView = TFAInReadAdView(withPid: UserDefaults.standard.integer(forKey: "PID"))`
`50`		`- self.webSync = SyncWebViewTFInReadAdView(webView: self.webView!, selector: "#my-placement-id", adView: self.adView!)`
	`50`	`+ self.webSync = SyncWebViewTFInReadAdView(webView: self.webView!, selector: "#my-placement-id", adView: self.adView!, viewController: self)`
`51`	`51`
`52`	`52`	`self.startObservingContentSize()`
`53`	`53`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ class WebViewEmbededInScrollViewController: UIViewController, WKNavigationDelega`
`35`	`35`	`self.webView?.loadHTMLString(contentString, baseURL: nil)`
`36`	`36`
`37`	`37`	`self.adView = TFAInReadAdView(withPid: UserDefaults.standard.integer(forKey: "PID"))`
`38`		`- self.webSync = SyncWebViewTFInReadAdView(webView: self.webView!, selector: "#my-placement-id", adView: self.adView!)`
	`38`	`+ self.webSync = SyncWebViewTFInReadAdView(webView: self.webView!, selector: "#my-placement-id", adView: self.adView!, viewController: self)`
`39`	`39`
`40`	`40`	`self.startObservingContentSize()`
`41`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -134,4 +134,8 @@ class CollectionViewController: UICollectionViewController, UICollectionViewDele`
`134`	`134`
`135`	`135`	`public func adError(_ ad: TFAAdView, errorMessage: String) {`
`136`	`136`	`}`
	`137`	`+`
	`138`	`+ func adBrowserWillOpen(_ ad: TFAAdView) -> UIViewController? {`
	`139`	`+ return self`
	`140`	`+ }`
`137`	`141`	`}`
Original file line number	Diff line number	Diff line change
`@@ -55,5 +55,9 @@ class InReadTopViewController: UIViewController, TFAAdDelegate {`
`55`	`55`	`func didUpdateRatio(_ ad: TFAAdView, ratio: CGFloat) {`
`56`	`56`	`resizeTeadsAd(adRatio: ratio)`
`57`	`57`	`}`
	`58`	`+`
	`59`	`+ public func adBrowserWillOpen(_ ad: TFAAdView) -> UIViewController? {`
	`60`	`+ return self`
	`61`	`+ }`
`58`	`62`
`59`	`63`	`}`
Original file line number	Diff line number	Diff line change
`@@ -74,4 +74,8 @@ class ScrollViewController: UIViewController, TFAAdDelegate {`
`74`	`74`	`adRatio = ratio`
`75`	`75`	`resizeTeadsAd(adRatio: ratio)`
`76`	`76`	`}`
	`77`	`+`
	`78`	`+ public func adBrowserWillOpen(_ ad: TFAAdView) -> UIViewController? {`
	`79`	`+ return self`
	`80`	`+ }`
`77`	`81`	`}`
Original file line number	Diff line number	Diff line change
`@@ -130,4 +130,8 @@ class TableViewController: UITableViewController, TFAAdDelegate {`
`130`	`130`	`//be careful if you want to load another ad in the same page don't remove the observer`
`131`	`131`	`NotificationCenter.default.removeObserver(self)`
`132`	`132`	`}`
	`133`	`+`
	`134`	`+ public func adBrowserWillOpen(_ ad: TFAAdView) -> UIViewController? {`
	`135`	`+ return self`
	`136`	`+ }`
`133`	`137`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ class WebViewViewController: UIViewController, WKNavigationDelegate {`
`31`	`31`	`self.webView?.loadHTMLString(contentString, baseURL: nil)`
`32`	`32`
`33`	`33`	`self.adView = TFAInReadAdView(withPid: UserDefaults.standard.integer(forKey: "PID"))`
`34`		`- self.webSync = SyncWebViewTFInReadAdView(webView: self.webView!, selector: "#my-placement-id", adView: self.adView!)`
	`34`	`+ self.webSync = SyncWebViewTFInReadAdView(webView: self.webView!, selector: "#my-placement-id", adView: self.adView!, viewController: self)`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`// MARK: -`