@capacitor-community/admob 5.1.0 → 5.2.0

package/CapacitorCommunityAdmob.podspec

@@ -15,5 +15,5 @@ Pod::Spec.new do |s|
   s.swift_version = '5.1'
   s.static_framework = true
   s.dependency 'Capacitor'
-  s.dependency 'Google-Mobile-Ads-SDK', '10.1.0'
+  s.dependency 'Google-Mobile-Ads-SDK', '10.12.0'
 end

package/README.md

@@ -177,6 +177,13 @@ If you testing on real device, you have to set `debugGeography` and add your dev
 
 **Note**: When testing, if you choose not consent (Manage -> Confirm Choices). The ads may not load/show. Even on testing enviroment. This is normal. It will work on Production so don't worry.
 
+**Note**: The order in which they are combined with other methods is as follows.
+
+1. AdMob.initialize
+2. AdMob.requestConsentInfo
+3. AdMob.showConsentForm (If consent form required )
+3/ AdMob.showBanner
+
 ### Show Banner
 
 ```ts

package/android/build.gradle

@@ -4,7 +4,7 @@ ext {
     androidxCoordinatorLayoutVersion = project.hasProperty('androidxCoordinatorLayoutVersion') ? rootProject.ext.androidxCoordinatorLayoutVersion : '1.2.0'
     androidxJunitVersion = project.hasProperty('androidxJunitVersion') ? rootProject.ext.androidxJunitVersion : '1.1.5'
     androidxEspressoCoreVersion = project.hasProperty('androidxEspressoCoreVersion') ? rootProject.ext.androidxEspressoCoreVersion : '3.5.1'
-    playServicesAdsVersion = project.hasProperty('playServicesAdsVersion') ? rootProject.ext.playServicesAdsVersion : '22.0.0'
+    playServicesAdsVersion = project.hasProperty('playServicesAdsVersion') ? rootProject.ext.playServicesAdsVersion : '22.4.0'
     androidxCoreKTXVersion = project.hasProperty('androidxCoreKTXVersion') ? rootProject.ext.androidxCoreKTXVersion : '1.10.0'
 }
 

package/ios/Plugin/Consent/ConsentExecutor.swift

@@ -3,60 +3,60 @@ import Capacitor
 import GoogleMobileAds
 import UserMessagingPlatform
 
-
 class ConsentExecutor: NSObject {
     public weak var plugin: AdMob?
 
-    func requestConsentInfo(_ call: CAPPluginCall, _ debugGeography: Int, _ testDeviceIdentifiers: Array<String>, _ tagForUnderAgeOfConsent: Bool) {
+    func requestConsentInfo(_ call: CAPPluginCall, _ debugGeography: Int, _ testDeviceIdentifiers: [String], _ tagForUnderAgeOfConsent: Bool) {
         let parameters = UMPRequestParameters()
         let debugSettings = UMPDebugSettings()
-        
+
         debugSettings.geography = UMPDebugGeography(rawValue: debugGeography) ?? UMPDebugGeography.disabled
         debugSettings.testDeviceIdentifiers = testDeviceIdentifiers
-        
+
         parameters.debugSettings = debugSettings
         parameters.tagForUnderAgeOfConsent = tagForUnderAgeOfConsent
 
         // Request an update to the consent information.
         UMPConsentInformation.sharedInstance.requestConsentInfoUpdate(
-           with: parameters,
-           completionHandler: { error in
-             if error != nil {
-                 call.reject("Request consent info failed")
-             } else {
-                 call.resolve([
-                    "status": self.getConsentStatusString(UMPConsentInformation.sharedInstance.consentStatus),
-                    "isConsentFormAvailable": UMPConsentInformation.sharedInstance.formStatus == UMPFormStatus.available
-                 ])
-             }
-        })
+            with: parameters,
+            completionHandler: { error in
+                if error != nil {
+                    call.reject("Request consent info failed")
+                } else {
+                    call.resolve([
+                        "status": self.getConsentStatusString(UMPConsentInformation.sharedInstance.consentStatus),
+                        "isConsentFormAvailable": UMPConsentInformation.sharedInstance.formStatus == UMPFormStatus.available
+                    ])
+                }
+            })
     }
 
     func showConsentForm(_ call: CAPPluginCall) {
         if let rootViewController = plugin?.getRootVC() {
             let formStatus = UMPConsentInformation.sharedInstance.formStatus
-            
+
             if formStatus == UMPFormStatus.available {
                 UMPConsentForm.load(completionHandler: {form, loadError in
                     if loadError != nil {
                         call.reject(loadError?.localizedDescription ?? "Load consent form error")
-                    } else {
-                        if UMPConsentInformation.sharedInstance.consentStatus == UMPConsentStatus.required {
-                            form?.present(from: rootViewController, completionHandler: { dismissError in
-                                if (dismissError != nil) {
-                                    call.resolve([
-                                        "status": self.getConsentStatusString(UMPConsentInformation.sharedInstance.consentStatus),
-                                    ])
-                                } else {
-                                    call.reject(dismissError?.localizedDescription ?? "Consent dismiss error")
+                        return
+                    }
+
+                    if UMPConsentInformation.sharedInstance.consentStatus == UMPConsentStatus.required {
+                        form?.present(from: rootViewController, completionHandler: { dismissError in
+                            if dismissError != nil {
+                                call.reject(dismissError?.localizedDescription ?? "Consent dismiss error")
+                                return
+                            }
 
-                                }
-                            })
-                        } else {
                             call.resolve([
-                                "status": self.getConsentStatusString(UMPConsentInformation.sharedInstance.consentStatus),
+                                "status": self.getConsentStatusString(UMPConsentInformation.sharedInstance.consentStatus)
                             ])
-                        }
+                        })
+                    } else {
+                        call.resolve([
+                            "status": self.getConsentStatusString(UMPConsentInformation.sharedInstance.consentStatus)
+                        ])
                     }
                 })
             } else {
@@ -71,17 +71,17 @@ class ConsentExecutor: NSObject {
         UMPConsentInformation.sharedInstance.reset()
         call.resolve()
     }
-    
+
     func getConsentStatusString(_ consentStatus: UMPConsentStatus) -> String {
-        switch (consentStatus) {
+        switch consentStatus {
         case UMPConsentStatus.required:
-            return "REQUIRED";
+            return "REQUIRED"
         case UMPConsentStatus.notRequired:
-            return "NOT_REQUIRED";
+            return "NOT_REQUIRED"
         case UMPConsentStatus.obtained:
-            return "OBTAINED";
+            return "OBTAINED"
         default:
-            return "UNKNOWN";
+            return "UNKNOWN"
         }
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capacitor-community/admob",
-  "version": "5.1.0",
+  "version": "5.2.0",
   "description": "A native plugin for AdMob",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",