@capgo/capacitor-admob 8.1.20 → 8.2.0

package/ios/Sources/AdmobPlusPlugin/AdmobPlusPlugin.swift

@@ -5,18 +5,27 @@ import AppTrackingTransparency
 
 @objc(AdmobPlusPlugin)
 public class AdmobPlusPlugin: CAPPlugin, CAPBridgedPlugin {
-    private let pluginVersion: String = "8.1.20"
+    private let pluginVersion: String = "8.2.0"
     public let identifier = "AdmobPlusPlugin"
     public let jsName = "AdMobPlus"
     public let pluginMethods: [CAPPluginMethod] = [
         CAPPluginMethod(name: "start", returnType: CAPPluginReturnPromise),
         CAPPluginMethod(name: "configure", returnType: CAPPluginReturnPromise),
         CAPPluginMethod(name: "configRequest", returnType: CAPPluginReturnPromise),
+        CAPPluginMethod(name: "requestConsentInfo", returnType: CAPPluginReturnPromise),
+        CAPPluginMethod(name: "showConsentForm", returnType: CAPPluginReturnPromise),
+        CAPPluginMethod(name: "showPrivacyOptionsForm", returnType: CAPPluginReturnPromise),
         CAPPluginMethod(name: "adCreate", returnType: CAPPluginReturnPromise),
         CAPPluginMethod(name: "adIsLoaded", returnType: CAPPluginReturnPromise),
         CAPPluginMethod(name: "adLoad", returnType: CAPPluginReturnPromise),
         CAPPluginMethod(name: "adShow", returnType: CAPPluginReturnPromise),
         CAPPluginMethod(name: "adHide", returnType: CAPPluginReturnPromise),
+        CAPPluginMethod(name: "feedAdCreate", returnType: CAPPluginReturnPromise),
+        CAPPluginMethod(name: "feedAdDestroy", returnType: CAPPluginReturnPromise),
+        CAPPluginMethod(name: "feedAdLoad", returnType: CAPPluginReturnPromise),
+        CAPPluginMethod(name: "feedAdIsLoaded", returnType: CAPPluginReturnPromise),
+        CAPPluginMethod(name: "feedAdUpdateBounds", returnType: CAPPluginReturnPromise),
+        CAPPluginMethod(name: "feedAdSetAutoRefresh", returnType: CAPPluginReturnPromise),
         CAPPluginMethod(name: "trackingAuthorizationStatus", returnType: CAPPluginReturnPromise),
         CAPPluginMethod(name: "requestTrackingAuthorization", returnType: CAPPluginReturnPromise),
         CAPPluginMethod(name: "getPluginVersion", returnType: CAPPluginReturnPromise)
@@ -24,6 +33,11 @@ public class AdmobPlusPlugin: CAPPlugin, CAPBridgedPlugin {
 
     private var nextAdId = 1
     private let adManager = AdManager.shared
+    private lazy var consentExecutor: ConsentExecutor = {
+        let executor = ConsentExecutor()
+        executor.plugin = self
+        return executor
+    }()
 
     @objc func start(_ call: CAPPluginCall) {
         DispatchQueue.main.async {
@@ -48,6 +62,33 @@ public class AdmobPlusPlugin: CAPPlugin, CAPBridgedPlugin {
         call.resolve()
     }
 
+    @objc func requestConsentInfo(_ call: CAPPluginCall) {
+        let debugGeography = call.getInt("debugGeography") ?? 0
+        let testDeviceIdentifiers = call.getArray("testDeviceIdentifiers", String.self) ?? []
+        let tagForUnderAgeOfConsent = call.getBool("tagForUnderAgeOfConsent") ?? false
+
+        DispatchQueue.main.async {
+            self.consentExecutor.requestConsentInfo(
+                call,
+                debugGeography: debugGeography,
+                testDeviceIdentifiers: testDeviceIdentifiers,
+                tagForUnderAgeOfConsent: tagForUnderAgeOfConsent
+            )
+        }
+    }
+
+    @objc func showConsentForm(_ call: CAPPluginCall) {
+        DispatchQueue.main.async {
+            self.consentExecutor.showConsentForm(call)
+        }
+    }
+
+    @objc func showPrivacyOptionsForm(_ call: CAPPluginCall) {
+        DispatchQueue.main.async {
+            self.consentExecutor.showPrivacyOptionsForm(call)
+        }
+    }
+
     @objc func configRequest(_ call: CAPPluginCall) {
         let requestConfiguration = MobileAds.shared.requestConfiguration
 
@@ -193,6 +234,95 @@ public class AdmobPlusPlugin: CAPPlugin, CAPBridgedPlugin {
         }
     }
 
+    @objc func feedAdCreate(_ call: CAPPluginCall) {
+        guard let adUnitId = call.getString("adUnitId") else {
+            call.reject("adUnitId is required")
+            return
+        }
+        guard let format = call.getString("format") else {
+            call.reject("format is required")
+            return
+        }
+        let positionKey = call.getString("positionKey")
+        let autoRefreshMs = call.getInt("autoRefreshMs")
+        var nativeStyle: [String: String] = [:]
+        if let styleObj = call.getObject("nativeStyle") {
+            for (key, value) in styleObj {
+                if let str = value as? String {
+                    nativeStyle[key] = str
+                }
+            }
+        }
+        DispatchQueue.main.async {
+            let id = FeedAdManager.shared.create(
+                format: format,
+                adUnitId: adUnitId,
+                positionKey: positionKey,
+                autoRefreshMs: autoRefreshMs,
+                nativeStyle: nativeStyle,
+                plugin: self
+            )
+            call.resolve(["id": id])
+        }
+    }
+
+    @objc func feedAdDestroy(_ call: CAPPluginCall) {
+        guard let id = call.getInt("id") else {
+            call.reject("id is required")
+            return
+        }
+        DispatchQueue.main.async {
+            FeedAdManager.shared.destroy(id: id)
+            call.resolve()
+        }
+    }
+
+    @objc func feedAdLoad(_ call: CAPPluginCall) {
+        guard let id = call.getInt("id") else {
+            call.reject("id is required")
+            return
+        }
+        FeedAdManager.shared.load(id: id) { error in
+            if let error = error {
+                call.reject("Failed to load feed ad: \(error.localizedDescription)")
+            } else {
+                call.resolve()
+            }
+        }
+    }
+
+    @objc func feedAdIsLoaded(_ call: CAPPluginCall) {
+        guard let id = call.getInt("id") else {
+            call.reject("id is required")
+            return
+        }
+        call.resolve(["value": FeedAdManager.shared.isLoaded(id: id)])
+    }
+
+    @objc func feedAdUpdateBounds(_ call: CAPPluginCall) {
+        guard let id = call.getInt("id") else {
+            call.reject("id is required")
+            return
+        }
+        let x = call.getDouble("x") ?? 0
+        let y = call.getDouble("y") ?? 0
+        let width = call.getDouble("width") ?? 0
+        let height = call.getDouble("height") ?? 0
+        let visible = call.getBool("visible") ?? false
+        FeedAdManager.shared.updateBounds(id: id, x: x, y: y, width: width, height: height, visible: visible)
+        call.resolve()
+    }
+
+    @objc func feedAdSetAutoRefresh(_ call: CAPPluginCall) {
+        guard let id = call.getInt("id") else {
+            call.reject("id is required")
+            return
+        }
+        let autoRefreshMs = call.getInt("autoRefreshMs")
+        FeedAdManager.shared.setAutoRefresh(id: id, autoRefreshMs: autoRefreshMs)
+        call.resolve()
+    }
+
     @objc func adHide(_ call: CAPPluginCall) {
         guard let adId = call.getInt("id") else {
             call.reject("id is required")

package/ios/Sources/AdmobPlusPlugin/BannerAd.swift

@@ -115,29 +115,26 @@ class BannerAd: NSObject, Ad {
 
 extension BannerAd: BannerViewDelegate {
     func bannerViewDidReceiveAd(_ bannerView: BannerView) {
-        plugin?.notifyListeners(Events.bannerLoad, data: ["id": id])
+        plugin?.notifyAdListeners(Events.bannerLoad, adId: id)
     }
 
     func bannerView(_ bannerView: BannerView, didFailToReceiveAdWithError error: Error) {
-        plugin?.notifyListeners(Events.bannerLoadFail, data: [
-            "id": id,
-            "error": error.localizedDescription
-        ])
+        plugin?.notifyAdFailureListeners(Events.bannerLoadFail, adId: id, error: error)
     }
 
     func bannerViewDidRecordImpression(_ bannerView: BannerView) {
-        plugin?.notifyListeners(Events.bannerImpression, data: ["id": id])
+        plugin?.notifyAdListeners(Events.bannerImpression, adId: id)
     }
 
     func bannerViewWillPresentScreen(_ bannerView: BannerView) {
-        plugin?.notifyListeners(Events.bannerOpen, data: ["id": id])
+        plugin?.notifyAdListeners(Events.bannerOpen, adId: id)
     }
 
     func bannerViewWillDismissScreen(_ bannerView: BannerView) {
-        plugin?.notifyListeners(Events.bannerClose, data: ["id": id])
+        plugin?.notifyAdListeners(Events.bannerClose, adId: id)
     }
 
     func bannerViewDidRecordClick(_ bannerView: BannerView) {
-        plugin?.notifyListeners(Events.bannerClick, data: ["id": id])
+        plugin?.notifyAdListeners(Events.bannerClick, adId: id)
     }
 }

package/ios/Sources/AdmobPlusPlugin/ConsentExecutor.swift

@@ -0,0 +1,100 @@
+import Foundation
+import Capacitor
+import GoogleMobileAds
+import UserMessagingPlatform
+
+class ConsentExecutor: NSObject {
+    weak var plugin: AdmobPlusPlugin?
+
+    func requestConsentInfo(_ call: CAPPluginCall, debugGeography: Int, testDeviceIdentifiers: [String], tagForUnderAgeOfConsent: Bool) {
+        let parameters = RequestParameters()
+        let debugSettings = DebugSettings()
+
+        debugSettings.geography = DebugGeography(rawValue: debugGeography) ?? DebugGeography.disabled
+        debugSettings.testDeviceIdentifiers = testDeviceIdentifiers
+
+        parameters.debugSettings = debugSettings
+        parameters.isTaggedForUnderAgeOfConsent = tagForUnderAgeOfConsent
+
+        ConsentInformation.shared.requestConsentInfoUpdate(with: parameters) { error in
+            if let error = error {
+                call.reject(error.localizedDescription)
+            } else {
+                call.resolve(self.buildConsentInfo(includeFormAvailability: true))
+            }
+        }
+    }
+
+    @MainActor
+    func showPrivacyOptionsForm(_ call: CAPPluginCall) {
+        guard let rootViewController = plugin?.bridge?.viewController else {
+            call.reject("No ViewController")
+            return
+        }
+
+        Task {
+            do {
+                try await ConsentForm.presentPrivacyOptionsForm(from: rootViewController)
+                call.resolve()
+            } catch {
+                call.reject("Failed to show privacy options form: \(error.localizedDescription)")
+            }
+        }
+    }
+
+    func showConsentForm(_ call: CAPPluginCall) {
+        guard let rootViewController = plugin?.bridge?.viewController else {
+            call.reject("No ViewController")
+            return
+        }
+
+        Task { @MainActor in
+            do {
+                try await ConsentForm.loadAndPresentIfRequired(from: rootViewController)
+                call.resolve(self.buildConsentInfo(includeFormAvailability: false))
+            } catch {
+                call.reject("Error when show consent form: \(error.localizedDescription)")
+            }
+        }
+    }
+
+    private func buildConsentInfo(includeFormAvailability: Bool) -> [String: Any] {
+        var result: [String: Any] = [
+            "status": getConsentStatusString(ConsentInformation.shared.consentStatus),
+            "canRequestAds": ConsentInformation.shared.canRequestAds,
+            "privacyOptionsRequirementStatus": getPrivacyOptionsRequirementStatus(
+                ConsentInformation.shared.privacyOptionsRequirementStatus
+            ),
+        ]
+
+        if includeFormAvailability {
+            result["isConsentFormAvailable"] = ConsentInformation.shared.formStatus == FormStatus.available
+        }
+
+        return result
+    }
+
+    private func getConsentStatusString(_ consentStatus: ConsentStatus) -> String {
+        switch consentStatus {
+        case ConsentStatus.required:
+            return "REQUIRED"
+        case ConsentStatus.notRequired:
+            return "NOT_REQUIRED"
+        case ConsentStatus.obtained:
+            return "OBTAINED"
+        default:
+            return "UNKNOWN"
+        }
+    }
+
+    private func getPrivacyOptionsRequirementStatus(_ requirementStatus: PrivacyOptionsRequirementStatus) -> String {
+        switch requirementStatus {
+        case PrivacyOptionsRequirementStatus.required:
+            return "REQUIRED"
+        case PrivacyOptionsRequirementStatus.notRequired:
+            return "NOT_REQUIRED"
+        default:
+            return "UNKNOWN"
+        }
+    }
+}