emi-indo-cordova-plugin-admob 1.5.5 → 1.5.7

package/README.md

@@ -12,7 +12,8 @@
 ### IAB Europe Transparency & Consent Framework (CPM: 2.2.0)
 
 
-## New example https://github.com/EMI-INDO/emi-indo-cordova-plugin-admob/tree/main/example/www
+## New example 
+- https://github.com/EMI-INDO/emi-indo-cordova-plugin-admob/tree/main/example/www
 
 
 ## Minimum Cordova Engines
@@ -142,7 +143,8 @@ cordova plugin rm emi-indo-cordova-plugin-admob
 
 ## Import the Mobile Ads SDK IOS
 ### Then from the command line run:
-- cd platforms/ios
+- cd platforms/ios 
+- Then run cordova prepare
 ### Then from the command line run:
 - pod install --repo-update
 
@@ -284,103 +286,6 @@ document.addEventListener('on.TCString.expired', () => {
 
 
 
-## Global Variable adunitId
-
-```
-<script>
-Ad format	Demo ad unit ID
-// https://developers.google.com/admob/android/test-ads
-// https://developers.google.com/admob/ios/test-ads
-
-var App_Open_ID;
-var Banner_ID;
-var Interstitial_ID;
-var Rewarded_ID;
-var Rewarded_Interstitial_ID;
-
-/* https://support.google.com/admob/answer/9493252?hl=en
-Best practice when using ad original ID unit, 
-the app must be uploaded to the play store or app store, 
-and you must upload it from there, 
-otherwise you may be subject to ad serving restrictions, 
-if it happens often, it is possible that your admob account will be permanently disabled.
-*/
-
-if (window.cordova.platformId === 'ios') {
-   
-    App_Open_ID = 'ca-app-pub-3940256099942544/5575463023';
-    Banner_ID = 'ca-app-pub-3940256099942544/2934735716';
-    Interstitial_ID = 'ca-app-pub-3940256099942544/4411468910';
-    Rewarded_ID = 'ca-app-pub-3940256099942544/1712485313';
-    Rewarded_Interstitial_ID = 'ca-app-pub-3940256099942544/6978759866';
-    
-} else {
-    // Assume Android
-    App_Open_ID = 'ca-app-pub-3940256099942544/9257395921';
-    Banner_ID = 'ca-app-pub-3940256099942544/6300978111';
-    Interstitial_ID = 'ca-app-pub-3940256099942544/1033173712';
-    Rewarded_ID = 'ca-app-pub-3940256099942544/5224354917';
-    Rewarded_Interstitial_ID = 'ca-app-pub-3940256099942544/5354046379';
-}
-
-
-  cordova.plugins.emiAdmobPlugin.initialize({
-  isUsingAdManagerRequest: true, // true = AdManagerAdRequest.Builder | false = AdRequest.Builder (Default true)
-  isResponseInfo: true, // Default false
-  isConsentDebug: true, // Default false
- });
-
-
- document.addEventListener('on.sdkInitialization', (data) => {
-// JSON.stringify(data)
-   const sdkVersion = data.version;
-// const adAdapter = data.adapters;
-// const conStatus = data.consentStatus;
-// const gdprApplie = data.gdprApplies;
-// const purposeConsent = data.purposeConsents;
-// const vendorConsents = data.vendorConsents;
-// const conTCString = data.consentTCString;
-// const additionalConsent = data.additionalConsent;
-console.log("On Sdk Initialization version: " + sdkVersion);
-
-
-cordova.plugins.emiAdmobPlugin.loadInterstitialAd({
-adUnitId: "ca-app-pub-3940256099942544/1033173712", 
-autoShow: true
-});
-
-});
-
-
-document.addEventListener('on.interstitial.loaded', () => {
-
-   console.log("on interstitial Ad loaded");
-
-});
-
-// all events that contain the keyword dismissed there is a block to load the ad after it is closed by the user.
-// 'on.interstitial.dismissed' | 'on.rewardedInt.dismissed' | 'on.rewarded.dismissed'
-document.addEventListener('on.interstitial.dismissed', () => {
-
-   console.log("on interstitial Ad dismissed");
-   console.log("you can load ads automatically after the ads are closed by users");
-   // loadInterstitialAd();
-
-});
-
-function loadInterstitialAd(){
-
-cordova.plugins.emiAdmobPlugin.loadInterstitialAd({
-adUnitId: "ca-app-pub-3940256099942544/1033173712", 
-autoShow: false
-});
-
-}
-
-
- </script>
-```
-
 
 ## AppOpenAd ADS
  
@@ -428,7 +333,7 @@ document.addEventListener('on.appOpenAd.loaded', () => {
 </pre>
 </details>
 
-- [FULL AppOpenAd basic:](https://github.com/EMI-INDO/emi-indo-cordova-plugin-admob/blob/main/Example/www/js/appOpenAd.js) 
+- [FULL AppOpenAd basic:](https://github.com/EMI-INDO/emi-indo-cordova-plugin-admob/blob/main/example/www/js/appOpenAd.js) 
 
 
 
@@ -531,7 +436,7 @@ console.log("Collapsible Status: " + event.collapsible);
 </pre>
 </details>
 
- [FULL Banner basic:](https://github.com/EMI-INDO/emi-indo-cordova-plugin-admob/blob/main/Example/www/js/bannerAd.js) 
+ [FULL Banner basic:](https://github.com/EMI-INDO/emi-indo-cordova-plugin-admob/blob/main/example/www/js/bannerAd.js) 
 
 
 ## Interstitial ADS
@@ -594,7 +499,7 @@ document.addEventListener('on.interstitial.dismissed', () => {
 </details>
 
 
-[FULL Interstitial basic: ](https://github.com/EMI-INDO/emi-indo-cordova-plugin-admob/blob/main/Example/www/js/interstitialAd.js) 
+[FULL Interstitial basic: ](https://github.com/EMI-INDO/emi-indo-cordova-plugin-admob/blob/main/example/www/js/interstitialAd.js) 
 
 
 
@@ -723,7 +628,7 @@ document.addEventListener('on.rewarded.dismissed', () => {
 </pre>
 </details>
 
-[FULL Rewarded basic: ](https://github.com/EMI-INDO/emi-indo-cordova-plugin-admob/blob/main/Example/www/js/rewardedAd.js) 
+[FULL Rewarded basic: ](https://github.com/EMI-INDO/emi-indo-cordova-plugin-admob/blob/main/example/www/js/rewardedAd.js) 
 
 
 
@@ -1005,7 +910,7 @@ on.orientation.landscape
 
 
 
-# Admob Mediation
+# Admob Mediation (supports both platforms)
 
 <details>
 <summary>Mediation #9</summary>
@@ -1017,7 +922,7 @@ on.orientation.landscape
 
 ## get Mediation Adapter Name
 
-responseInfo = true // (debugging)
+isResponseInfo: true, // debug Default false // (debugging)
 
 <img src="https://user-images.githubusercontent.com/78555833/230655800-0dbc3f12-72fb-4cf3-b4e6-801704fade28.png" width="250">
 
@@ -1101,24 +1006,25 @@ cordova plugin add emi-indo-cordova-plugin-mediation-ironsource
 
 - Cordova CLI Update Adapter version with Variables
 ```sh
-cordova plugin add emi-indo-cordova-plugin-mediation-meta --variable META_ADAPTER_VERSION="xxxxx"
+cordova plugin add emi-indo-cordova-plugin-mediation-meta --save --variable META_ADAPTER_VERSION="xxxxx" --variable IOS_META_ADAPTER_VERSION="xxxxx"
 ```
 - Update Adapter version with config.xml
 ```sh
 <preference name="META_ADAPTER_VERSION" value="xxxxx" />
+<preference name="IOS_META_ADAPTER_VERSION" value="xxxxx" />
 ```
 
 ### Variables Name
 
-- --variable META_ADAPTER_VERSION="xxxxx"
-- --variable UNITY_ADAPTER_VERSION="xxxxx"
-- --variable APPLOVIN_ADAPTER_VERSION="xxxxx"
-- --variable ADCOLONY_ADAPTER_VERSION="xxxxx"
-- --variable CHARTBOOST_ADAPTER_VERSION="xxxxx"
-- --variable IRONSOURCE_ADAPTER_VERSION="xxxxx"
+- --variable META_ADAPTER_VERSION="xxxxx" --variable IOS_META_ADAPTER_VERSION="xxxxx"
+- --variable UNITY_ADAPTER_VERSION="xxxxx" --variable IOS_UNITY_ADAPTER_VERSION="xxxxx"
+- --variable APPLOVIN_ADAPTER_VERSION="xxxxx" --variable IOS_APPLOVIN_ADAPTER_VERSION="xxxxx"
+- --variable ADCOLONY_ADAPTER_VERSION="xxxxx" --variable IOS_ADCOLONY_ADAPTER_VERSION="xxxxx"
+- --variable CHARTBOOST_ADAPTER_VERSION="xxxxx" --variable IOS_CHARTBOOST_ADAPTER_VERSION="xxxxx"
+- --variable IRONSOURCE_ADAPTER_VERSION="xxxxx" --variable IOS_IRONSOURCE_ADAPTER_VERSION="xxxxx"
 
 ### preference name
-
+## (ANDROID)
 - META_ADAPTER_VERSION
 - UNITY_ADAPTER_VERSION
 - APPLOVIN_ADAPTER_VERSION
@@ -1126,6 +1032,14 @@ cordova plugin add emi-indo-cordova-plugin-mediation-meta --variable META_ADAPTE
 - CHARTBOOST_ADAPTER_VERSION
 - IRONSOURCE_ADAPTER_VERSION
 
+## (IOS)
+- IOS_META_ADAPTER_VERSION
+- IOS_UNITY_ADAPTER_VERSION
+- IOS_APPLOVIN_ADAPTER_VERSION
+- IOS_ADCOLONY_ADAPTER_VERSION
+- IOS_CHARTBOOST_ADAPTER_VERSION
+- IOS_IRONSOURCE_ADAPTER_VERSION
+
 - ================================
 </details>
 

package/example/www/index.html

@@ -1,14 +1,15 @@
 <html>
 <head>
     <script type="text/javascript" src="cordova.js"></script>
+    <script src="js/deviceready.js" defer></script>
     <script src="js/appOpenAd.js" defer></script>
     <script src="js/bannerAd.js" defer></script>
     <script src="js/interstitialAd.js" defer></script>
     <script src="js/rewardedAd.js" defer></script>
-    <script src="js/deviceready.js" defer></script>
 </head>
 <body>
 
+    
 <label for="event">Debug Event All response :</label>
 <textarea id="log" name="log" rows="5" cols="40"></textarea>
 

package/example/www/js/appOpenAd.js

@@ -62,7 +62,6 @@ on.appOpenAd.responseInfo
 */
 
 
-
 document.addEventListener('on.appOpenAd.loaded', () => {
     isAppOpenAdLoad = true;
     console.log("on.appOpenAd.loaded");

package/example/www/js/bannerAd.js

@@ -1,4 +1,4 @@
-// cordova.plugins.emiAdmobPlugin.styleBannerAd({ padding: 50, margins: 50 });  // (Optional only android)
+// ccordova.plugins.emiAdmobPlugin.styleBannerAd({isOverlapping: true, overlappingHeight: 5, padding: 0, margins: 0 });  // ( only android)
 //cordova.plugins.emiAdmobPlugin.loadBannerAd({config});
 //cordova.plugins.emiAdmobPlugin.showBannerAd(); // default
 //cordova.plugins.emiAdmobPlugin.hideBannerAd(); // default
@@ -10,6 +10,13 @@ function loadBanner() {
 
     if (typeof cordova !== 'undefined') {
 
+        cordova.plugins.emiAdmobPlugin.styleBannerAd({
+            isOverlapping: true, 
+            overlappingHeight: 5, 
+            padding: 0, 
+            margins: 0 
+        });
+
         cordova.plugins.emiAdmobPlugin.loadBannerAd({
             adUnitId: Banner_ID, //Banner_ID,
             position: "bottom-center",
@@ -27,7 +34,6 @@ function loadBanner() {
 
 
 
-
 /* ///////<<<<  bannerAd position  >>>>>>\\\\\\\
 
 (ANDROID)

package/example/www/js/deviceready.js

@@ -21,6 +21,7 @@ if it happens often, it is possible that your admob account will be permanently
 */
 
 
+
 if (window.cordova.platformId === 'ios') {
 
     App_Open_ID = 'ca-app-pub-3940256099942544/5575463023';

package/example/www/js/interstitialAd.js

@@ -41,7 +41,6 @@ on.interstitialAd.responseInfo
 */
 
 
-
 // EVENT For example
 
 document.addEventListener('on.interstitial.loaded', () => {

package/example/www/js/rewardedAd.js

@@ -20,6 +20,7 @@ function showRewarded() {
 
 }
 
+
 /*
 on.rewarded.loaded
 on.rewarded.failed.load

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "emi-indo-cordova-plugin-admob",
-  "version": "1.5.5",
+  "version": "1.5.7",
   "description": "Cordova Plugin Admob Android IOS",
   "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.5.5">
+  id="emi-indo-cordova-plugin-admob" version="1.5.7">
 
   <name>emiAdmobPlugin</name>
   <description>Cordova Plugin Admob Android IOS</description>

package/src/android/emiAdmobPlugin.kt

@@ -86,12 +86,17 @@ class emiAdmobPlugin : CordovaPlugin() {
 
     private var consentInformation: ConsentInformation? = null
 
+    private var isOverlapping: Boolean = false
+    private var overlappingHeight: Int = 0
+
     var isBannerLoad: Boolean = false
     var isBannerShow: Boolean = false
 
     var isBannerShows: Boolean = true
     private var bannerAutoShow = false
     private var isAutoResize: Boolean = false
+
+
     var appOpenAutoShow: Boolean = false
     var intAutoShow: Boolean = false
     var rewardedAutoShow: Boolean = false
@@ -1077,13 +1082,15 @@ class emiAdmobPlugin : CordovaPlugin() {
             val options = args.getJSONObject(0)
             if(mActivity != null) {
                 mActivity!!.runOnUiThread {
+                    val isOverlapping = options.optBoolean("isOverlapping")
+                    val overlappingHeight = options.optInt("overlappingHeight")
                     val paddingPx = options.optInt("padding")
                     val marginsPx = options.optInt("margins")
-                    // final boolean autoResize = options.optBoolean("autoResize");
                     try {
+                        this.isOverlapping = isOverlapping
+                        this.overlappingHeight = overlappingHeight
                         this.paddingInPx = paddingPx
                         this.marginsInPx = marginsPx
-                        // this.isAutoResize = autoResize;
                     } catch (e: Exception) {
                         callbackContext.error(e.toString())
                     }
@@ -1192,7 +1199,7 @@ class emiAdmobPlugin : CordovaPlugin() {
                 bannerView!!.adUnitId = adUnitId
                 bannerView!!.adListener = bannerAdListener
                 bannerView!!.loadAd(buildAdRequest())
-                adjustWebViewForBanner(position)
+                // adjustWebViewForBanner(position)
             } else {
                 Log.d(TAG, "Banner view layout already exists.")
             }
@@ -1369,6 +1376,11 @@ class emiAdmobPlugin : CordovaPlugin() {
             if (bannerAutoShow) {
                 isBannerAutoShow()
             }
+
+            if (isOverlapping) {
+                bannerOverlapping()
+            }
+
             cWebView!!.loadUrl("javascript:cordova.fireDocumentEvent('on.banner.load');")
 
             val eventData = String.format(
@@ -1412,6 +1424,32 @@ 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}")
+                }
+            }
+        }
+    }
+
+
     private val bannerPaidAdListener = OnPaidEventListener { adValue ->
         val valueMicros = adValue.valueMicros
         val currencyCode = adValue.currencyCode

package/src/ios/emiAdmobPlugin.m

@@ -17,10 +17,10 @@ int idfaStatus = 0;
 // int fromStatus = 0; // Deprecated
 int Consent_Status = 0;
 int adFormat = 0;
-int adWidth = 320; // Default
+int adWidth = 320; // Deprecated
 BOOL auto_Show = NO;
 // NSString *Npa = @"1"; // Deprecated
-NSString *Position = @"bottom"; // Default
+NSString *Position = @"bottom-center"; // Default
 NSString *bannerSaveAdUnitId = @""; // autoResize dependency = true
 
 BOOL enableCollapsible = NO;
@@ -1163,8 +1163,8 @@ BOOL isUsingAdManagerRequest = YES;
                             
                             // Prepare reward data as JSON
                             NSDictionary *rewardData = @{
-                                @"currency": reward.type,
-                                @"amount": [reward.amount stringValue]
+                                @"rewardType": reward.type,
+                                @"rewardAmount": [reward.amount stringValue]
                             };
                             NSData *rewardJsonData = [NSJSONSerialization dataWithJSONObject:rewardData options:0 error:nil];
                             NSString *rewardJsonString = [[NSString alloc] initWithData:rewardJsonData encoding:NSUTF8StringEncoding];
@@ -1241,8 +1241,8 @@ BOOL isUsingAdManagerRequest = YES;
             
             // Prepare reward data as JSON
             NSDictionary *rewardData = @{
-                @"currency": reward.type,
-                @"amount": [reward.amount stringValue]
+                @"rewardType": reward.type,
+                @"rewardAmount": [reward.amount stringValue]
             };
             NSData *rewardJsonData = [NSJSONSerialization dataWithJSONObject:rewardData options:0 error:nil];
             NSString *rewardJsonString = [[NSString alloc] initWithData:rewardJsonData encoding:NSUTF8StringEncoding];
@@ -1329,8 +1329,8 @@ BOOL isUsingAdManagerRequest = YES;
                             GADAdReward *reward = self.rewardedAd.adReward;
 
                             NSDictionary *rewardData = @{
-                                @"currency": reward.type,
-                                @"amount": [reward.amount stringValue]
+                                @"rewardType": reward.type,
+                                @"rewardAmount": [reward.amount stringValue]
                             };
                             NSData *rewardJsonData = [NSJSONSerialization dataWithJSONObject:rewardData options:0 error:nil];
                             NSString *rewardJsonString = [[NSString alloc] initWithData:rewardJsonData encoding:NSUTF8StringEncoding];
@@ -1402,8 +1402,8 @@ BOOL isUsingAdManagerRequest = YES;
                 GADAdReward *reward = self.rewardedAd.adReward;
                 
                 NSDictionary *rewardData = @{
-                    @"currency": reward.type,
-                    @"amount": [reward.amount stringValue]
+                    @"rewardType": reward.type,
+                    @"rewardAmount": [reward.amount stringValue]
                 };
                 NSError *jsonError;
                 NSData *jsonData = [NSJSONSerialization dataWithJSONObject:rewardData options:0 error:&jsonError];