emi-indo-cordova-plugin-admob 1.6.6 → 1.6.8

package/.github/FUNDING.yml

@@ -3,8 +3,8 @@
 github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
 patreon: # Replace with a single Patreon username
 open_collective: # Replace with a single Open Collective username
-ko_fi: # Replace with a single Ko-fi username
-tidelift: # npm/emi-indo-cordova-plugin-admob
+ko_fi: emiindo
+tidelift:  # npm/emi-indo-cordova-plugin-admob
 community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
 liberapay: # Replace with a single Liberapay username
 issuehunt: # Replace with a single IssueHunt username

package/README.md

@@ -8,7 +8,7 @@
  - AdSense New [example ](https://github.com/EMI-INDO/emi-indo-cordova-plugin-admob/blob/main/example/www/js/adSense.js)
 
 
-### Mobile Ads SDK (Android: 23.5.0) [Release Notes:](https://developers.google.com/admob/android/rel-notes)
+### Mobile Ads SDK (Android: 23.6.0) [Release Notes:](https://developers.google.com/admob/android/rel-notes)
 ### User Messaging Platform (UMP Android: 3.1.0) [Release Notes:](https://developers.google.com/admob/android/privacy/release-notes)
 
 ### Mobile Ads SDK (IOS: 11.12.0) [Release Notes:](https://developers.google.com/admob/ios/rel-notes)
@@ -102,7 +102,7 @@ https://developers.google.com/admob/ios/quick-start
 
 ## 💰Sponsor this project
   [![PayPal](https://img.shields.io/badge/PayPal-00457C?style=for-the-badge&logo=paypal&logoColor=white)](https://paypal.me/emiindo)  
-  
+  [![ko-fi](https://ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/F1F16NI8H)
 ##  [Check all release notes:](https://github.com/EMI-INDO/emi-indo-cordova-plugin-admob/releases/)
 
 

package/example/www/js/bannerAd.js

@@ -114,7 +114,8 @@ on.banner.hide
 
 // EVENT For example
 
-document.addEventListener('on.banner.load', () => {
+document.addEventListener('on.banner.load', (arg) => {
+    let bannerAdHeight=arg.height;
     console.log("on banner load");
 });
 

package/example/www/js/deviceready.js

@@ -80,8 +80,17 @@ document.addEventListener("deviceready", function () {
         
         cordova.plugins.emiAdmobPlugin.requestIDFA(); // requestTrackingAuthorization
         
-    }
-    
+    } 
+
+
+   // deactivate Google's consent
+    /*
+     cordova.plugins.emiAdmobPlugin.metaData({
+
+            useCustomConsentManager: false // Default false only android
+
+    });
+    */
 
     // AdMob Sdk initialize
     
@@ -121,4 +130,4 @@ document.addEventListener("deviceready", function () {
 
 
 
-}, false);
+}, false);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "emi-indo-cordova-plugin-admob",
-  "version": "1.6.6",
+  "version": "1.6.8",
   "description": "Cordova Plugin Admob Android IOS Support Capacitor",
   "cordova": {
     "id": "emi-indo-cordova-plugin-admob",

package/plugin.xml

@@ -1,6 +1,6 @@
 <plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
   xmlns:android="http://schemas.android.com/apk/res/android"
-  id="emi-indo-cordova-plugin-admob" version="1.6.6">
+  id="emi-indo-cordova-plugin-admob" version="1.6.8">
 
   <name>emiAdmobPlugin</name>
   <description>Cordova Plugin Admob Android IOS</description>
@@ -40,7 +40,10 @@
       <uses-permission android:name="android.permission.INTERNET" />
       <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     </config-file>
-
+    
+    <config-file parent="./application" target="AndroidManifest.xml">
+            <property android:name="android.adservices.AD_SERVICES_CONFIG" android:resource="@xml/gma_ad_services_config" tools:replace="android:resource" />
+    </config-file>
 
     <config-file target="AndroidManifest.xml" parent="/manifest/application">
       <activity
@@ -64,7 +67,7 @@
     <!-- Sample AdMob app ID: ca-app-pub-3940256099942544~3347511713 -->
 
     <preference name="APP_ID_ANDROID" default="ca-app-pub-3940256099942544~3347511713" />
-    <preference name="PLAY_SERVICES_VERSION" default="23.5.0" />
+    <preference name="PLAY_SERVICES_VERSION" default="23.6.0" />
 
     <framework src="com.google.android.gms:play-services-ads:$PLAY_SERVICES_VERSION" />
 
@@ -306,4 +309,4 @@
     </podspec>
 
   </platform>
-</plugin>
+</plugin>

package/src/android/emiAdmobPlugin.kt

@@ -138,6 +138,8 @@ class emiAdmobPlugin : CordovaPlugin() {
 
     private var isUsingAdManagerRequest = false
 
+    private var isCustomConsentManager = false
+
 
     override fun initialize(cordova: CordovaInterface, webView: CordovaWebView) {
         super.initialize(cordova, webView)
@@ -234,6 +236,14 @@ class emiAdmobPlugin : CordovaPlugin() {
                     setUsingAdManagerRequest(setAdRequest)
                     this.isResponseInfo = responseInfo
                     this.setDebugGeography = setDebugGeography
+
+                    // If the user uses a custom CMP
+                    if (this.isCustomConsentManager) {
+                        cWebView!!.loadUrl("javascript:cordova.fireDocumentEvent('on.custom.consent.manager.used');")
+                        initializeMobileAdsSdk()
+                        return@runOnUiThread
+                    }
+
                     val params: ConsentRequestParameters
                     if (this.setDebugGeography) {
                         val debugSettings = mActivity?.let {
@@ -1202,19 +1212,11 @@ class emiAdmobPlugin : CordovaPlugin() {
                 }
             }
             return true
-        } else if (action == "collapsibleBannerAd") {
+        } else if (action == "metaData") {
             val options = args.getJSONObject(0)
+            val useCustomConsentManager = options.optBoolean("useCustomConsentManager")
             if (mActivity != null) {
-                mActivity!!.runOnUiThread {
-                    val enableCollapsible = options.optBoolean("enabledBannerCollapsible")
-                    val collapsible = options.optString("collapsiblePosition")
-                    try {
-                        this.isCollapsible = enableCollapsible
-                        this.collapsiblePos = collapsible
-                    } catch (e: Exception) {
-                        callbackContext.error(e.toString())
-                    }
-                }
+                this.isCustomConsentManager = useCustomConsentManager
             }
             return true
         } else if (action == "hideBannerAd") {
@@ -1296,7 +1298,7 @@ class emiAdmobPlugin : CordovaPlugin() {
                 callbackContext.error("View is not a WebView.")
             }
         } catch (e: Exception) {
-                callbackContext.error("Error registering WebView: ${e.message}")
+            callbackContext.error("Error registering WebView: ${e.message}")
         }
 
     }
@@ -1304,14 +1306,14 @@ class emiAdmobPlugin : CordovaPlugin() {
 
     private fun loadUrl(url: String, callbackContext: CallbackContext) {
         try {
-                val webView = cWebView?.view
+            val webView = cWebView?.view
 
-                if (webView is WebView) {
-                    webView.loadUrl(url)
-                    callbackContext.success("URL loaded successfully: $url")
-                } else {
-                    callbackContext.error("WebView is not available.")
-                }
+            if (webView is WebView) {
+                webView.loadUrl(url)
+                callbackContext.success("URL loaded successfully: $url")
+            } else {
+                callbackContext.error("WebView is not available.")
+            }
 
         } catch (e: Exception) {
             callbackContext.error("Error loading URL: ${e.message}")
@@ -1484,7 +1486,7 @@ class emiAdmobPlugin : CordovaPlugin() {
                 put("responseInfoAdapterResponses", adapterResponses)
             }
 
-          cWebView!!.loadUrl("javascript:cordova.fireDocumentEvent('on.banner.failed.load', ${errorData});")
+            cWebView!!.loadUrl("javascript:cordova.fireDocumentEvent('on.banner.failed.load', ${errorData});")
 
             bannerOverlappingToZero()
 
@@ -1521,7 +1523,11 @@ class emiAdmobPlugin : CordovaPlugin() {
                 bannerOverlapping()
             }
 
-            cWebView!!.loadUrl("javascript:cordova.fireDocumentEvent('on.banner.load');")
+            val bannerHeight= adSize.height;
+
+            val bannerLoadEventData = String.format(Locale.US, "{\"height\": %d}", bannerHeight)
+
+            cWebView!!.loadUrl("javascript:cordova.fireDocumentEvent('on.banner.load', $bannerLoadEventData);")
 
             val eventData = String.format(
                 "{\"collapsible\": \"%s\"}",
@@ -1599,30 +1605,30 @@ class emiAdmobPlugin : CordovaPlugin() {
 
 
 
-        // fix https://github.com/EMI-INDO/emi-indo-cordova-plugin-admob/issues/26
-        private fun bannerOverlapping() {
-            if (bannerView != null && mActivity != null && cWebView != null) {
-                mActivity!!.runOnUiThread {
-                    try {
-                        val bannerHeightInPx = bannerView!!.height
-                        val displayMetrics = DisplayMetrics()
-                        mActivity!!.windowManager.defaultDisplay.getMetrics(displayMetrics)
-                        val screenHeightInPx = displayMetrics.heightPixels
-
-                        // Adjust the WebView height to account for the banner ad
-                        val webViewHeight = screenHeightInPx - (adSize.height + overlappingHeight)
-                        val layoutParams = cWebView!!.view.layoutParams
-                        layoutParams.height = webViewHeight
-                        cWebView!!.view.layoutParams = layoutParams
-
-                        // Log for debugging
-                        Log.d("BannerAdjustment", "Adjusted WebView height: $webViewHeight")
-                    } catch (e: Exception) {
-                        Log.e("AdmobPlugin", "Error adjusting WebView for banner: ${e.message}")
-                    }
+    // fix https://github.com/EMI-INDO/emi-indo-cordova-plugin-admob/issues/26
+    private fun bannerOverlapping() {
+        if (bannerView != null && mActivity != null && cWebView != null) {
+            mActivity!!.runOnUiThread {
+                try {
+                    val bannerHeightInPx = bannerView!!.height
+                    val displayMetrics = DisplayMetrics()
+                    mActivity!!.windowManager.defaultDisplay.getMetrics(displayMetrics)
+                    val screenHeightInPx = displayMetrics.heightPixels
+
+                    // Adjust the WebView height to account for the banner ad
+                    val webViewHeight = screenHeightInPx - (adSize.height + overlappingHeight)
+                    val layoutParams = cWebView!!.view.layoutParams
+                    layoutParams.height = webViewHeight
+                    cWebView!!.view.layoutParams = layoutParams
+
+                    // Log for debugging
+                    Log.d("BannerAdjustment", "Adjusted WebView height: $webViewHeight")
+                } catch (e: Exception) {
+                    Log.e("AdmobPlugin", "Error adjusting WebView for banner: ${e.message}")
                 }
             }
         }
+    }
 
 
 
@@ -1785,7 +1791,7 @@ class emiAdmobPlugin : CordovaPlugin() {
                     try {
                         (brandSafetyUrls as ArrayList<String>).add(brandSafetyArr.getString(i))
                     } catch (e: JSONException) {
-                        // e.printStackTrace();
+                        e.printStackTrace();
                     }
                 }
             }
@@ -1794,7 +1800,7 @@ class emiAdmobPlugin : CordovaPlugin() {
             this.ppIdVl = ppId
             this.cURLVl = ctURL
         } catch (e: JSONException) {
-            //  e.printStackTrace();
+            e.printStackTrace();
         }
     }
 
@@ -1808,7 +1814,7 @@ class emiAdmobPlugin : CordovaPlugin() {
                 }
             }
         } catch (e: JSONException) {
-            // e.printStackTrace();
+            e.printStackTrace();
         }
     }
 
@@ -1835,7 +1841,7 @@ class emiAdmobPlugin : CordovaPlugin() {
                 }
             }
             val sdkVersion = MobileAds.getVersion().toString()
-            val mStatus = consentInformation!!.consentStatus.toString()
+            val mStatus = consentInformation?.consentStatus.toString()
 
             val adapterInfo = StringBuilder()
             for (adapterClass in statusMap.keys) {
@@ -2272,8 +2278,4 @@ class emiAdmobPlugin : CordovaPlugin() {
         private const val LAST_ACCESS_SUFFIX = "_last_access"
         private const val EXPIRATION_TIME = 360L * 24 * 60 * 60 * 1000
     }
-}
-
-
-
-
+}

package/src/ios/emiAdmobPlugin.m

@@ -1446,8 +1446,19 @@ BOOL isUsingAdManagerRequest = YES;
         NSString *jsonString = [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];
         [self fireEvent:@"" event:@"on.is.collapsible" withData:jsonString];
     }
+    
+    // Get the banner height
+    CGFloat bannerHeight = bannerView.bounds.size.height;
+
 
-    [self fireEvent:@"" event:@"on.banner.load" withData:nil];
+    
+    // Prepare height data for banner load event
+    NSDictionary *bannerLoadData = @{@"height" : @(bannerHeight)};
+    NSData *bannerLoadJsonData = [NSJSONSerialization dataWithJSONObject:bannerLoadData options:0 error:&error];
+    NSString *bannerLoadJsonString = [[NSString alloc] initWithData:bannerLoadJsonData encoding:NSUTF8StringEncoding];
+    
+    // Fire the banner load event with the height data
+    [self fireEvent:@"" event:@"on.banner.load" withData:bannerLoadJsonString];
     
     if (auto_Show && self.bannerView) {
         [self addBannerViewToView:command];

package/www/emiAdmobPlugin.js

@@ -73,6 +73,9 @@ exports.forceDisplayPrivacyForm = function (success, error) {
         exec(success, error, 'emiAdmobPlugin', 'forceDisplayPrivacyForm', []); // only IOS
 };
 
+exports.metaData = function (options, success, error) {
+    exec(success, error, 'emiAdmobPlugin', 'metaData', [options]);
+};
     
 // ( only Android )
 // only isUsingAdManagerRequest: true