Refactored Swift samples to implement Swift concurrency for Ad loading

PiperOrigin-RevId: 610522817
googleads · Feb 26, 2024 · c4d10a7 · c4d10a7
1 parent e07ed14
commit c4d10a7
Show file tree

Hide file tree

Showing 11 changed files with 134 additions and 122 deletions.
diff --git a/Swift/admanager/AdManagerAppOpenExample/AdManagerAppOpenExample/AppOpenAdManager.swift b/Swift/admanager/AdManagerAppOpenExample/AdManagerAppOpenExample/AppOpenAdManager.swift
@@ -59,29 +59,26 @@ class AppOpenAdManager: NSObject {
     appOpenAdManagerDelegate?.appOpenAdManagerAdDidComplete(self)
   }
 
-  func loadAd() {
+  func loadAd() async {
     // Do not load ad if there is an unused ad or one is already loading.
     if isLoadingAd || isAdAvailable() {
       return
     }
     isLoadingAd = true
+
     print("Start loading app open ad.")
-    GADAppOpenAd.load(
-      withAdUnitID: "/6499/example/app-open",
-      request: GADRequest()
-    ) { ad, error in
-      self.isLoadingAd = false
-      if let error = error {
-        self.appOpenAd = nil
-        self.loadTime = nil
-        print("App open ad failed to load with error: \(error.localizedDescription)")
-        return
-      }
 
-      self.appOpenAd = ad
-      self.appOpenAd?.fullScreenContentDelegate = self
-      self.loadTime = Date()
-      print("App open ad loaded successfully.")
+    do {
+      appOpenAd = try await GADAppOpenAd.load(
+        withAdUnitID: "/6499/example/app-open", request: GAMRequest())
+      appOpenAd?.fullScreenContentDelegate = self
+      loadTime = Date()
+      isLoadingAd = false
+    } catch {
+      appOpenAd = nil
+      loadTime = nil
+      print("App open ad failed to load with error: \(error.localizedDescription)")
+      isLoadingAd = false
     }
   }
 
@@ -98,7 +95,9 @@ class AppOpenAdManager: NSObject {
       print("App open ad is not ready yet.")
       appOpenAdManagerAdDidComplete()
       if GoogleMobileAdsConsentManager.shared.canRequestAds {
-        loadAd()
+        Task {
+          await loadAd()
+        }
       }
       return
     }
@@ -120,7 +119,9 @@ extension AppOpenAdManager: GADFullScreenContentDelegate {
     isShowingAd = false
     print("App open ad was dismissed.")
     appOpenAdManagerAdDidComplete()
-    loadAd()
+    Task {
+      await loadAd()
+    }
   }
 
   func ad(
@@ -131,6 +132,8 @@ extension AppOpenAdManager: GADFullScreenContentDelegate {
     isShowingAd = false
     print("App open ad failed to present with error: \(error.localizedDescription)")
     appOpenAdManagerAdDidComplete()
-    loadAd()
+    Task {
+      await loadAd()
+    }
   }
 }
diff --git a/Swift/admanager/AdManagerAppOpenExample/AdManagerAppOpenExample/SplashViewController.swift b/Swift/admanager/AdManagerAppOpenExample/AdManagerAppOpenExample/SplashViewController.swift
@@ -81,7 +81,9 @@ class SplashViewController: UIViewController, AppOpenAdManagerDelegate {
       GADMobileAds.sharedInstance().start()
 
       // Load an ad.
-      AppOpenAdManager.shared.loadAd()
+      Task {
+        await AppOpenAdManager.shared.loadAd()
+      }
     }
   }
 

diff --git a/.../admanager/AdManagerInterstitialExample/AdManagerInterstitialExample/ViewController.swift b/.../admanager/AdManagerInterstitialExample/AdManagerInterstitialExample/ViewController.swift
@@ -149,7 +149,9 @@ class ViewController: UIViewController, GADFullScreenContentDelegate {
       // Initialize the Google Mobile Ads SDK.
       GADMobileAds.sharedInstance().start()
       // Request an ad.
-      self.loadInterstitial()
+      Task {
+        await self.loadInterstitial()
+      }
     }
   }
 
@@ -168,17 +170,13 @@ class ViewController: UIViewController, GADFullScreenContentDelegate {
       repeats: true)
   }
 
-  fileprivate func loadInterstitial() {
-    GAMInterstitialAd.load(
-      withAdManagerAdUnitID: "/6499/example/interstitial",
-      request: GAMRequest()
-    ) { (ad, error) in
-      if let error = error {
-        print("Failed to load interstitial ad with error: \(error.localizedDescription)")
-        return
-      }
-      self.interstitial = ad
-      self.interstitial?.fullScreenContentDelegate = self
+  fileprivate func loadInterstitial() async {
+    do {
+      interstitial = try await GAMInterstitialAd.load(
+        withAdManagerAdUnitID: "/6499/example/interstitial", request: GAMRequest())
+      interstitial?.fullScreenContentDelegate = self
+    } catch {
+      print("Failed to load interstitial ad with error: \(error.localizedDescription)")
     }
   }
 
@@ -251,7 +249,9 @@ class ViewController: UIViewController, GADFullScreenContentDelegate {
     startNewGame()
 
     if GoogleMobileAdsConsentManager.shared.canRequestAds {
-      loadInterstitial()
+      Task {
+        await loadInterstitial()
+      }
     }
   }
 

diff --git a/...RewardedInterstitialExample/AdManagerRewardedInterstitialExample/GameViewController.swift b/...RewardedInterstitialExample/AdManagerRewardedInterstitialExample/GameViewController.swift
@@ -110,7 +110,9 @@ class GameViewController: UIViewController, GADFullScreenContentDelegate {
       // Initialize the Google Mobile Ads SDK.
       GADMobileAds.sharedInstance().start()
       // Request an ad.
-      self.loadRewardedInterstitialAd()
+      Task {
+        await self.loadRewardedInterstitialAd()
+      }
     }
   }
 
@@ -129,18 +131,14 @@ class GameViewController: UIViewController, GADFullScreenContentDelegate {
       repeats: true)
   }
 
-  private func loadRewardedInterstitialAd() {
-    let request = GAMRequest()
-    GADRewardedInterstitialAd.load(
-      withAdUnitID: "/21775744923/example/rewarded_interstitial", request: request
-    ) { (ad, error) in
-      if let error = error {
-        print("Failed to load rewarded interstitial ad with error: \(error.localizedDescription)")
-        self.playAgainButton.isHidden = false
-        return
-      }
-      self.rewardedInterstitialAd = ad
-      self.rewardedInterstitialAd?.fullScreenContentDelegate = self
+  private func loadRewardedInterstitialAd() async {
+    do {
+      rewardedInterstitialAd = try await GADRewardedInterstitialAd.load(
+        withAdUnitID: "/21775744923/example/rewarded_interstitial", request: GAMRequest())
+      rewardedInterstitialAd?.fullScreenContentDelegate = self
+    } catch {
+      print("Failed to load rewarded interstitial ad with error: \(error.localizedDescription)")
+      playAgainButton.isHidden = false
     }
   }
 
@@ -260,7 +258,9 @@ class GameViewController: UIViewController, GADFullScreenContentDelegate {
   @IBAction func playAgain(_ sender: AnyObject) {
     startNewGame()
     if GoogleMobileAdsConsentManager.shared.canRequestAds {
-      loadRewardedInterstitialAd()
+      Task {
+        await loadRewardedInterstitialAd()
+      }
     }
   }
 

diff --git a/...er/AdManagerRewardedVideoExample/AdManagerRewardedVideoExample/Base.lproj/Main.storyboard b/...er/AdManagerRewardedVideoExample/AdManagerRewardedVideoExample/Base.lproj/Main.storyboard
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="22113.1" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" colorMatched="YES" initialViewController="pGH-Ev-CeE">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="22505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" colorMatched="YES" initialViewController="pGH-Ev-CeE">
     <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment version="2048" identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22089"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22504"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
@@ -101,6 +101,7 @@
                         <outlet property="coinCountLabel" destination="QZR-go-ZKi" id="phD-yy-NM6"/>
                         <outlet property="gameText" destination="wpQ-a9-WRd" id="jgH-bl-10i"/>
                         <outlet property="playAgainButton" destination="NoO-Ga-hur" id="NmL-nh-1EK"/>
+                        <outlet property="privacySettingsButton" destination="xfn-We-cUj" id="xiD-lz-y0b"/>
                         <outlet property="watchVideoButton" destination="uTO-QG-Mlb" id="mbV-qa-rVp"/>
                     </connections>
                 </viewController>

diff --git a/...dmanager/AdManagerRewardedVideoExample/AdManagerRewardedVideoExample/ViewController.swift b/...dmanager/AdManagerRewardedVideoExample/AdManagerRewardedVideoExample/ViewController.swift
@@ -120,21 +120,20 @@ class ViewController: UIViewController, GADFullScreenContentDelegate {
       // Initialize the Google Mobile Ads SDK.
       GADMobileAds.sharedInstance().start()
       // Request an ad.
-      self.loadRewardedAd()
+      Task {
+        await self.loadRewardedAd()
+      }
+
     }
   }
 
-  func loadRewardedAd() {
-    GADRewardedAd.load(
-      withAdUnitID: "/6499/example/rewarded-video", request: GAMRequest()
-    ) { (ad, error) in
-      if let error = error {
-        print("Rewarded ad failed to load with error: \(error.localizedDescription)")
-        return
-      }
-      print("Loading Succeeded")
-      self.rewardedAd = ad
-      self.rewardedAd?.fullScreenContentDelegate = self
+  func loadRewardedAd() async {
+    do {
+      rewardedAd = try await GADRewardedAd.load(
+        withAdUnitID: "/6499/example/rewarded-video", request: GAMRequest())
+      rewardedAd?.fullScreenContentDelegate = self
+    } catch {
+      print("Rewarded ad failed to load with error: \(error.localizedDescription)")
     }
   }
 
@@ -257,7 +256,9 @@ class ViewController: UIViewController, GADFullScreenContentDelegate {
   @IBAction func playAgain(_ sender: AnyObject) {
     startNewGame()
     if GoogleMobileAdsConsentManager.shared.canRequestAds {
-      loadRewardedAd()
+      Task {
+        await loadRewardedAd()
+      }
     }
   }
 

diff --git a/Swift/admob/AppOpenExample/AppOpenExample/AppOpenAdManager.swift b/Swift/admob/AppOpenExample/AppOpenExample/AppOpenAdManager.swift
@@ -59,29 +59,26 @@ class AppOpenAdManager: NSObject {
     appOpenAdManagerDelegate?.appOpenAdManagerAdDidComplete(self)
   }
 
-  func loadAd() {
+  func loadAd() async {
     // Do not load ad if there is an unused ad or one is already loading.
     if isLoadingAd || isAdAvailable() {
       return
     }
     isLoadingAd = true
+
     print("Start loading app open ad.")
-    GADAppOpenAd.load(
-      withAdUnitID: "ca-app-pub-3940256099942544/5575463023",
-      request: GADRequest()
-    ) { ad, error in
-      self.isLoadingAd = false
-      if let error = error {
-        self.appOpenAd = nil
-        self.loadTime = nil
-        print("App open ad failed to load with error: \(error.localizedDescription)")
-        return
-      }
 
-      self.appOpenAd = ad
-      self.appOpenAd?.fullScreenContentDelegate = self
-      self.loadTime = Date()
-      print("App open ad loaded successfully.")
+    do {
+      appOpenAd = try await GADAppOpenAd.load(
+        withAdUnitID: "ca-app-pub-3940256099942544/5575463023", request: GADRequest())
+      appOpenAd?.fullScreenContentDelegate = self
+      loadTime = Date()
+      isLoadingAd = false
+    } catch {
+      appOpenAd = nil
+      loadTime = nil
+      print("App open ad failed to load with error: \(error.localizedDescription)")
+      isLoadingAd = false
     }
   }
 
@@ -98,7 +95,9 @@ class AppOpenAdManager: NSObject {
       print("App open ad is not ready yet.")
       appOpenAdManagerAdDidComplete()
       if GoogleMobileAdsConsentManager.shared.canRequestAds {
-        loadAd()
+        Task {
+          await loadAd()
+        }
       }
       return
     }
@@ -120,7 +119,9 @@ extension AppOpenAdManager: GADFullScreenContentDelegate {
     isShowingAd = false
     print("App open ad was dismissed.")
     appOpenAdManagerAdDidComplete()
-    loadAd()
+    Task {
+      await loadAd()
+    }
   }
 
   func ad(
@@ -131,6 +132,8 @@ extension AppOpenAdManager: GADFullScreenContentDelegate {
     isShowingAd = false
     print("App open ad failed to present with error: \(error.localizedDescription)")
     appOpenAdManagerAdDidComplete()
-    loadAd()
+    Task {
+      await loadAd()
+    }
   }
 }
diff --git a/Swift/admob/AppOpenExample/AppOpenExample/SplashViewController.swift b/Swift/admob/AppOpenExample/AppOpenExample/SplashViewController.swift
@@ -81,7 +81,9 @@ class SplashViewController: UIViewController, AppOpenAdManagerDelegate {
       GADMobileAds.sharedInstance().start()
 
       // Load an ad.
-      AppOpenAdManager.shared.loadAd()
+      Task {
+        await AppOpenAdManager.shared.loadAd()
+      }
     }
   }
 

diff --git a/Swift/admob/InterstitialExample/InterstitialExample/ViewController.swift b/Swift/admob/InterstitialExample/InterstitialExample/ViewController.swift
@@ -150,7 +150,9 @@ class ViewController: UIViewController, GADFullScreenContentDelegate {
       // Initialize the Google Mobile Ads SDK.
       GADMobileAds.sharedInstance().start()
       // Request an ad.
-      self.loadInterstitial()
+      Task {
+        await self.loadInterstitial()
+      }
     }
   }
 
@@ -169,17 +171,13 @@ class ViewController: UIViewController, GADFullScreenContentDelegate {
       repeats: true)
   }
 
-  fileprivate func loadInterstitial() {
-    let request = GADRequest()
-    GADInterstitialAd.load(
-      withAdUnitID: "ca-app-pub-3940256099942544/4411468910", request: request
-    ) { (ad, error) in
-      if let error = error {
-        print("Failed to load interstitial ad with error: \(error.localizedDescription)")
-        return
-      }
-      self.interstitial = ad
-      self.interstitial?.fullScreenContentDelegate = self
+  fileprivate func loadInterstitial() async {
+    do {
+      interstitial = try await GADInterstitialAd.load(
+        withAdUnitID: "ca-app-pub-3940256099942544/4411468910", request: GADRequest())
+      interstitial?.fullScreenContentDelegate = self
+    } catch {
+      print("Failed to load interstitial ad with error: \(error.localizedDescription)")
     }
   }
 
@@ -252,7 +250,9 @@ class ViewController: UIViewController, GADFullScreenContentDelegate {
     startNewGame()
 
     if GoogleMobileAdsConsentManager.shared.canRequestAds {
-      loadInterstitial()
+      Task {
+        await loadInterstitial()
+      }
     }
   }