fit documentation to sample app (#158)

Author: elneruda

TeadsSampleApp/Cells/AdmobNativeAdTableViewCell.swift

@@ -9,7 +9,5 @@ import UIKit
 import GoogleMobileAds
 
 class AdmobNativeAdTableViewCell: UITableViewCell {
-
     @IBOutlet weak var nativeAdView: GADNativeAdView!
-    
 }

TeadsSampleApp/Controllers/InRead/Admob/ScrollView/InReadAdmobScrollViewController.swift

@@ -33,7 +33,6 @@ class InReadAdmobScrollViewController: TeadsViewController {
         bannerView.delegate = self
 
         // 3. Load a new ad (this will call AdMob and Teads afterward)
-        let request = GADRequest()
         let adSettings = TeadsAdapterSettings { (settings) in
             settings.enableDebug()
             settings.disableLocation()
@@ -46,10 +45,9 @@ class InReadAdmobScrollViewController: TeadsViewController {
             //settings.pageUrl("http://page.com/article1")
         }
 
-        let extras = try? adSettings.toDictionary()
-        let customEventExtras = GADCustomEventExtras()
-        customEventExtras.setExtras(extras, forLabel: "Teads")
-
+        let customEventExtras = GADMAdapterTeads.customEventExtra(with: adSettings)
+        
+        let request = GADRequest()
         request.register(customEventExtras)
 
         bannerView.load(request)

TeadsSampleApp/Controllers/InRead/Admob/TableView/InReadAdmobTableViewController.swift

@@ -9,6 +9,7 @@
 import UIKit
 import GoogleMobileAds
 import TeadsSDK
+import TeadsAdMobAdapter
 
 class InReadAdmobTableViewController: TeadsViewController {
 
@@ -39,7 +40,6 @@ class InReadAdmobTableViewController: TeadsViewController {
         admobAdView?.delegate = self
 
         // 3. Load a new ad (this will call AdMob and Teads afterward)
-        let request = GADRequest()
         let adSettings = TeadsAdapterSettings { (settings) in
             settings.enableDebug()
             settings.disableLocation()
@@ -54,10 +54,9 @@ class InReadAdmobTableViewController: TeadsViewController {
             //settings.pageUrl("http://page.com/article1")
         }
 
-        let extras = try? adSettings.toDictionary()
-        let customEventExtras = GADCustomEventExtras()
-        customEventExtras.setExtras(extras, forLabel: "Teads")
-
+        let customEventExtras = GADMAdapterTeads.customEventExtra(with: adSettings)
+        
+        let request = GADRequest()
         request.register(customEventExtras)
 
         admobAdView?.load(request)

TeadsSampleApp/Controllers/InRead/Admob/WebView/InReadAdmobWebViewController.swift

@@ -10,6 +10,7 @@ import UIKit
 import WebKit
 import GoogleMobileAds
 import TeadsSDK
+import TeadsAdMobAdapter
 
 class InReadAdmobWebViewController: TeadsViewController {
 
@@ -39,7 +40,6 @@ class InReadAdmobWebViewController: TeadsViewController {
         /// init helper
         webViewHelper = TeadsWebViewHelper(webView: webView, selector: "#teads-placement-slot", delegate: self)
 
-        let request = GADRequest()
         let adSettings = TeadsAdapterSettings { (settings) in
             settings.enableDebug()
             settings.disableLocation()
@@ -53,10 +53,9 @@ class InReadAdmobWebViewController: TeadsViewController {
             //settings.pageUrl("http://page.com/article1")
         }
 
-        let extras = try? adSettings.toDictionary()
-        let customEventExtras = GADCustomEventExtras()
-        customEventExtras.setExtras(extras, forLabel: "Teads")
-
+        let customEventExtras = GADMAdapterTeads.customEventExtra(with: adSettings)
+        
+        let request = GADRequest()
         request.register(customEventExtras)
 
         bannerView.load(request)

TeadsSampleApp/Controllers/InRead/Direct/CollectionView/InReadDirectCollectionViewController.swift

@@ -17,16 +17,17 @@ class InReadDirectCollectionViewController: TeadsViewController {
     let teadsAdCellIndentifier = "TeadsAdCell"
     let fakeArticleCell = "fakeArticleCell"
     let adItemNumber = 2
-    var adHeight: CGFloat?
-    var adRatio: TeadsAdRatio?
-    var teadsAdIsLoaded = false
-    var teadsAdView: TeadsInReadAdView?
-    var collectionViewAdCellWidth: CGFloat!
-    var fakeArticleCellHeight: CGFloat = 300
     var placement: TeadsInReadAdPlacement?
+    
+    private var elements = [TeadsInReadAd?]()
 
     override func viewDidLoad() {
         super.viewDidLoad()
+        
+        (0..<8).forEach { _ in
+            elements.append(nil)
+        }
+        
         let placementSettings = TeadsAdPlacementSettings { (settings) in
             settings.enableDebug()
         }
@@ -35,86 +36,64 @@ class InReadDirectCollectionViewController: TeadsViewController {
         placement?.requestAd(requestSettings: TeadsAdRequestSettings { settings in
             settings.pageUrl("https://www.teads.tv")
         })
-        
-        teadsAdView = TeadsInReadAdView()
-        
-        // We use an observer to know when a rotation happened, to resize the ad
-        // You can use whatever way you want to do so
-        NotificationCenter.default.addObserver(self, selector: #selector(rotationDetected), name: UIDevice.orientationDidChangeNotification, object: nil)
-                        
-    }
-    
-    override func viewDidLayoutSubviews() {
-        super.viewDidLayoutSubviews()
-        collectionViewAdCellWidth = collectionView.frame.width - 20
-    }
-    
-    deinit {
-        NotificationCenter.default.removeObserver(self)
     }
 
     @objc func rotationDetected() {
-        if let adRatio = self.adRatio {
-            resizeTeadsAd(adRatio: adRatio)
+        var indexPaths = [IndexPath]()
+        for index in 0..<elements.count {
+            indexPaths.append(IndexPath(row: index, section: 0))
         }
+        collectionView.reloadItems(at: indexPaths)
         collectionView.collectionViewLayout.invalidateLayout()
     }
 
-    func resizeTeadsAd(adRatio: TeadsAdRatio) {
-        adHeight = adRatio.calculateHeight(for: collectionViewAdCellWidth)
-        updateAdCellHeight()
-    }
-    
-    func closeSlot() {
-        adHeight = 0
-        updateAdCellHeight()
+    func closeSlot(ad: TeadsAd) {
+        elements.removeAll { $0 == ad }
+        collectionView.reloadData()
     }
 
-    func updateAdCellHeight() {
-        collectionView.reloadItems(at: [IndexPath(row: adItemNumber, section: 0)])
-        collectionView.collectionViewLayout.invalidateLayout()
+    func updateAdSize(ad: TeadsInReadAd) {
+        if let row = elements.firstIndex(of: ad) {
+            collectionView.reloadItems(at: [IndexPath(row: row, section: 0)])
+            collectionView.collectionViewLayout.invalidateLayout()
+        }
     }
 
 }
 
 extension InReadDirectCollectionViewController: UICollectionViewDelegate, UICollectionViewDataSource, UICollectionViewDelegateFlowLayout  {
     func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
-        return 4
+        return elements.count
     }
 
     func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
-        switch indexPath.item {
-        case 0:
-            let cell = collectionView.dequeueReusableCell(withReuseIdentifier: contentCell, for: indexPath)
-            cell.contentView.translatesAutoresizingMaskIntoConstraints = false
-            cell.contentView.widthAnchor.constraint(equalToConstant: collectionView.bounds.width).isActive = true
-            return cell
-        case adItemNumber:
-            //need to create a cell and just add a teadsAd to it, so we have only one teads ad
+        if indexPath.item == 0 {
+            return collectionView.dequeueReusableCell(withReuseIdentifier: contentCell, for: indexPath)
+        } else if let ad = elements[indexPath.row] {
             let cellAd = collectionView.dequeueReusableCell(withReuseIdentifier: teadsAdCellIndentifier, for: indexPath)
-            if let teadsAdView = teadsAdView {
-                cellAd.addSubview(teadsAdView)
-                teadsAdView.frame = CGRect(x: 0, y: 0, width: collectionViewAdCellWidth, height: adHeight ?? 250)
-            }
+            let teadsAdView = TeadsInReadAdView(bind: ad)
+            cellAd.contentView.addSubview(teadsAdView)
+            teadsAdView.setupConstraintsToFitSuperView(horizontalMargin: 10)
             return cellAd
-        default:
+        } else {
             let cell = collectionView.dequeueReusableCell(withReuseIdentifier: fakeArticleCell, for: indexPath)
             return cell
         }
     }
 
     func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, sizeForItemAt indexPath: IndexPath) -> CGSize {
-        switch indexPath.item {
-        case 0:
+        if indexPath.item == 0 {
             let cell = collectionView.cellForItem(at: indexPath)
             guard let bounds = cell?.bounds else {
                 return CGSize.zero
             }
             return CGSize(width: collectionView.bounds.width, height: bounds.height)
-        case adItemNumber:
-            return CGSize(width: collectionViewAdCellWidth, height: adHeight ?? 0)
-        default:
-            return CGSize(width: collectionView.bounds.width, height: fakeArticleCellHeight)
+        } else if let ad = elements[indexPath.row] {
+            let width = collectionView.frame.width - 20
+            let height = ad.adRatio.calculateHeight(for: width)
+            return .init(width: width, height: height)
+        } else {
+            return CGSize(width: collectionView.bounds.width, height: 300)
         }
     }
 }
@@ -134,36 +113,34 @@ extension InReadDirectCollectionViewController: TeadsAdDelegate {
     }
 
     func didCatchError(ad: TeadsAd, error: Error) {
-        closeSlot()
+        closeSlot(ad: ad)
     }
 
     func didCloseAd(ad: TeadsAd) {
-        closeSlot()
+        closeSlot(ad: ad)
     }
 
 }
 
 extension InReadDirectCollectionViewController: TeadsInReadAdPlacementDelegate {
 
     func didReceiveAd(ad: TeadsInReadAd, adRatio: TeadsAdRatio) {
-        teadsAdView?.bind(ad)
+        elements.insert(ad, at: adItemNumber)
+        let indexPaths = [IndexPath(row: adItemNumber, section: 0)]
+        collectionView.insertItems(at: indexPaths)
+        collectionView.collectionViewLayout.invalidateLayout()
         ad.delegate = self
-        let creativeRatio = adRatio
-        self.adRatio = creativeRatio
-        resizeTeadsAd(adRatio: creativeRatio)
     }
 
     func didFailToReceiveAd(reason: AdFailReason) {
-        closeSlot()
+        print("didFailToReceiveAd: \(reason.description)")
     }
 
     func didUpdateRatio(ad: TeadsInReadAd, adRatio: TeadsAdRatio) {
-        updateAdCellHeight()
-        self.adRatio = adRatio
+        updateAdSize(ad: ad)
     }
 
     func adOpportunityTrackerView(trackerView: TeadsAdOpportunityTrackerView) {
-        teadsAdView?.addSubview(trackerView)
+        //not relevant in tableView integration
     }
-    
 }