emi-indo-cordova-plugin-admob 2.0.9 → 2.2.9

package/README.md

@@ -1,4 +1,4 @@
-### emi-indo-cordova-plugin-admob@2.0.9
+### emi-indo-cordova-plugin-admob@2.2.9
 
 
 ## Features/method
@@ -156,7 +156,7 @@ config.xml
 ### Check all release notes: https://github.com/EMI-INDO/emi-indo-cordova-plugin-admob/releases/
 
 
-### Mobile Ads SDK (Android: 24.1.0) [Release Notes:](https://developers.google.com/admob/android/rel-notes)
+### Mobile Ads SDK (Android: 24.2.0) [Release Notes:](https://developers.google.com/admob/android/rel-notes)
 ### User Messaging Platform (UMP Android: 3.2.0) [Release Notes:](https://developers.google.com/admob/android/privacy/release-notes)
 
 ### Mobile Ads SDK (IOS: 12.2.0) [Release Notes:](https://developers.google.com/admob/ios/rel-notes)

package/example/package.json

@@ -14,7 +14,7 @@
   "author": "Apache Cordova Team",
   "license": "Apache-2.0",
   "devDependencies": {
-    "emi-indo-cordova-plugin-admob": "^2.0.8"
+    "emi-indo-cordova-plugin-admob": "^2.2.9"
   },
   "cordova": {
     "plugins": {

package/example/www/js/bannerAd.js

@@ -8,17 +8,7 @@
 
 function loadBanner() {
 
-        // Optional Only IOS
-        if (isPlatformIOS){
-            cordova.plugins.emiAdmobPlugin.styleBannerAd({
-                isOverlapping: true, // default false 
-                paddingWebView: 1.0 
-            });
-            
-        }
-
-        
-        
+        // default: Android | IOS
         cordova.plugins.emiAdmobPlugin.loadBannerAd({
             adUnitId: Banner_ID, //Banner_ID,
             position: "bottom-center", //  bottom-center | top-center
@@ -30,6 +20,25 @@ function loadBanner() {
         });
 
 
+
+
+
+        // NOTE: Do not use loadBannerAd and loadBannerCapacitor together.
+
+        /*
+        // Only Android
+        cordova.plugins.emiAdmobPlugin.loadBannerCapacitor({
+            adUnitId: Banner_ID, //Banner_ID,
+            position: "bottom-center", //  bottom-center | top-center
+            size: "banner",
+            collapsible: "", // position: top | bottom (disable, empty string)
+            autoShow: true, // default false
+            isOverlapping: false // The height of the body is reduced by the height of the banner.
+         // isOverlapping: true // The body height is not reduced, the banner overlaps on top of the body
+        });
+        */
+
+
 }
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "emi-indo-cordova-plugin-admob",
-  "version": "2.0.9",
+  "version": "2.2.9",
   "description": "Cordova/Quasar/Capacitor 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="2.0.9">
+  id="emi-indo-cordova-plugin-admob" version="2.2.9">
 
   <name>emiAdmobPlugin</name>
   <description>Cordova/Quasar/Capacitor Plugin Admob Android IOS</description>
@@ -59,7 +59,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="24.1.0" />
+    <preference name="PLAY_SERVICES_VERSION" default="24.2.0" />
 
     <framework src="com.google.android.gms:play-services-ads:$PLAY_SERVICES_VERSION" />
 
@@ -76,8 +76,6 @@
             <activity android:resizeableActivity="$MULTI_WINDOW" />
     </edit-config>
 
-
-
     <config-file parent="/*" target="AndroidManifest.xml" />
     <source-file src="src/android/emiAdmobPlugin.kt" target-dir="app/src/main/kotlin/emi/indo/cordova/plugin/admob" />
 

package/src/android/emiAdmobPlugin.kt

@@ -152,7 +152,8 @@ class emiAdmobPlugin : CordovaPlugin() {
 
 
     private var isFullScreen: Boolean = false
-   // private var bannerOverlapping: Boolean = false
+    private var loadBannerCapacitor: Boolean = false
+    private var loadBannerCordova: Boolean = false
 
     override fun pluginInitialize() {
         super.pluginInitialize()
@@ -1030,7 +1031,7 @@ class emiAdmobPlugin : CordovaPlugin() {
                     val collapsible = options.optString("collapsible")
                     val size = options.optString("size")
                     val autoShow = options.optBoolean("autoShow")
-                    val isOverlapping = options.optBoolean("isOverlapping", false)
+                    val isOverlapping = options.optBoolean("isOverlapping")
                     val paddingPx = options.optInt("padding")
                     this.bannerAdUnitId = adUnitId
                     this.isPosition = position
@@ -1039,6 +1040,34 @@ class emiAdmobPlugin : CordovaPlugin() {
                     this.collapsiblePos = collapsible
                     this.isOverlapping = isOverlapping
                     this.paddingInPx = paddingPx
+                    this.loadBannerCordova = true
+
+                    try {
+                        loadBannerAd(adUnitId, position, size)
+                    } catch (e: Exception) {
+                        callbackContext.error("loadBannerAd Error: " + e.message)
+                    }
+                }
+            }
+            return true
+
+        } else if (action == "loadBannerCapacitor") {
+            if (mActivity != null) {
+                val options = args.getJSONObject(0)
+                mActivity?.runOnUiThread {
+                    val adUnitId = options.optString("adUnitId")
+                    val position = options.optString("position")
+                    val collapsible = options.optString("collapsible")
+                    val size = options.optString("size")
+                    val autoShow = options.optBoolean("autoShow")
+                    val isOverlapping = options.optBoolean("isOverlapping")
+                    this.bannerAdUnitId = adUnitId
+                    this.isPosition = position
+                    this.isSize = size
+                    this.bannerAutoShow = autoShow
+                    this.collapsiblePos = collapsible
+                    this.isOverlapping = isOverlapping
+                    this.loadBannerCapacitor = true
 
                     try {
                         loadBannerAd(adUnitId, position, size)
@@ -1059,10 +1088,20 @@ class emiAdmobPlugin : CordovaPlugin() {
                             bannerView?.visibility = View.VISIBLE
                             bannerView?.resume()
 
-                            if (isPosition == "top-center") {
-                                setBannerAdTop()
-                            } else {
-                                setBannerAdBottom()
+                            if(loadBannerCordova) {
+                                if (isPosition == "top-center") {
+                                    setBannerAdTop()
+                                } else {
+                                    setBannerAdBottom()
+                                }
+                            }
+
+                            if (loadBannerCapacitor) {
+                                if (isPosition == "top-center") {
+                                    setBannerAdTopCapacitor()
+                                } else {
+                                    setBannerAdBottomCapacitor()
+                                }
                             }
 
                             bannerViewLayout?.requestFocus()
@@ -1418,19 +1457,15 @@ class emiAdmobPlugin : CordovaPlugin() {
 
             cWebView?.loadUrl("javascript:cordova.fireDocumentEvent('on.banner.failed.load', ${errorData});")
 
+
             if (bannerViewLayout != null && bannerView != null) {
-                /*
-                bannerViewLayout?.removeView(bannerView)
-                bannerView?.destroy()
-                bannerView = null
-                bannerViewLayout = null
-                */
                 isBannerLoad = false
-                //isBannerShow = false
                 isBannerPause = 2
                 lock = true
             }
 
+
+
         }
 
         override fun onAdImpression() {
@@ -1454,10 +1489,20 @@ class emiAdmobPlugin : CordovaPlugin() {
                 bannerViewHeight = heightInPx ?: 0
             }
 
-            if (isPosition == "top-center") {
-                setBannerAdTop()
-            } else {
-                setBannerAdBottom()
+            if(loadBannerCordova) {
+                if (isPosition == "top-center") {
+                    setBannerAdTop()
+                } else {
+                    setBannerAdBottom()
+                }
+            }
+
+            if (loadBannerCapacitor) {
+                if (isPosition == "top-center") {
+                    setBannerAdTopCapacitor()
+                } else {
+                    setBannerAdBottomCapacitor()
+                }
             }
 
             if (bannerAutoShow) {
@@ -1592,6 +1637,8 @@ class emiAdmobPlugin : CordovaPlugin() {
     }
 
 
+    
+
     private fun setBannerAdTop() {
         mActivity?.let { activity ->
             bannerView?.post {
@@ -1641,6 +1688,174 @@ class emiAdmobPlugin : CordovaPlugin() {
 
 
 
+
+
+
+    private fun setBannerAdBottomCapacitor() {
+        if (bannerView != null && mActivity != null && cWebView != null) {
+            mActivity?.runOnUiThread {
+                bannerView?.post {
+                    try {
+                        val measuredBannerHeight = if (bannerView!!.height > 0)
+                            bannerView!!.height //167
+
+                        //adSize.height
+                        else
+                            adSize.getHeightInPixels(mActivity!!)
+
+                        //61
+
+                        val screenHeightInPx = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {    //2186
+
+
+                            val windowMetrics = mActivity!!.windowManager.currentWindowMetrics  //WindowMetrics:{bounds=Rect(0, 0 - 1080, 2400), windowInsets=null, density=2.75}
+                            val insets = windowMetrics.windowInsets.getInsets(WindowInsets.Type.systemBars())   //Insets{left=0, top=84, right=0, bottom=130}
+                            val height = windowMetrics.bounds.height() - insets.top - insets.bottom  //2186    2400 - 84 - 130
+                            height
+                        } else {
+                            val displayMetrics = DisplayMetrics()
+                            @Suppress("DEPRECATION")
+                            mActivity!!.windowManager.defaultDisplay.getMetrics(displayMetrics)
+                            displayMetrics.heightPixels
+                        }
+
+                        val webViewHeight = screenHeightInPx// - measuredBannerHeight //2186 - 167
+
+                        if (!isFullScreen) {
+                            var navBarHeight = 0
+
+                            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+                                val windowMetrics = mActivity!!.windowManager.currentWindowMetrics
+                                val insets = windowMetrics.windowInsets.getInsets(WindowInsets.Type.navigationBars())
+                                navBarHeight = insets.bottom
+                            } else {
+                                val decorView = mActivity!!.window.decorView
+                                @Suppress("DEPRECATION")
+                                val isNavBarVisible = (decorView.systemUiVisibility and View.SYSTEM_UI_FLAG_HIDE_NAVIGATION) == 0
+                                if (isNavBarVisible) {
+                                    navBarHeight = getNavigationBarHeight(mActivity!!)
+                                }
+                            }
+
+                            if (navBarHeight > 0) {
+                                bannerViewLayout?.let { container ->
+                                    container.post {
+                                        val params = container.layoutParams
+                                        if (params is ViewGroup.MarginLayoutParams) {
+                                            params.bottomMargin = navBarHeight
+                                            container.layoutParams = params
+                                            container.requestLayout()
+                                        }
+                                    }
+                                }
+                            }
+                        }
+
+
+
+                        if (!isOverlapping) {
+                            val layoutParams = cWebView!!.view.layoutParams
+
+                            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+                                val windowMetrics = mActivity!!.windowManager.currentWindowMetrics
+                                val insets = windowMetrics.windowInsets.getInsets(WindowInsets.Type.systemBars())
+                                val usableHeight = windowMetrics.bounds.height()
+
+                                layoutParams.height = if (isFullScreen) {
+                                    // In fullscreen, do NOT subtract nav bar height
+                                    usableHeight - adSize.getHeightInPixels(mActivity!!)
+                                } else {
+                                    usableHeight - getNavigationBarHeight(mActivity!!) - adSize.getHeightInPixels(mActivity!!)
+                                }
+                            } else {
+
+                                layoutParams.height = if (isFullScreen) {
+                                    webViewHeight - adSize.getHeightInPixels(mActivity!!) + getNavigationBarHeight(mActivity!!)
+                                } else {
+                                    webViewHeight  - adSize.getHeightInPixels(mActivity!!)  //- getNavigationBarHeight(mActivity!!)
+                                }
+                            }
+
+                            cWebView!!.view.layoutParams = layoutParams
+                        }
+
+                        val bannerParams = bannerView?.layoutParams as? FrameLayout.LayoutParams
+                        bannerParams?.bottomMargin = 0
+                        bannerParams?.gravity = Gravity.BOTTOM or Gravity.CENTER_HORIZONTAL     //81
+                        bannerView?.layoutParams = bannerParams
+
+                        bannerViewLayout?.setPadding(0, 0, 0, 0)
+
+
+                    } catch (e: Exception) {
+                        PUBLIC_CALLBACKS?.error("Error bannerOverlapping: ${e.message}")
+                    }
+                }
+            }
+        }
+    }
+
+
+
+    private fun setBannerAdTopCapacitor() {
+        mActivity?.let { activity ->
+            bannerView?.post {
+                val bannerHeightPx = bannerViewHeight
+                val statusBarHeight = getStatusBarHeight(activity)
+
+                if (isPosition.equals("top-center", ignoreCase = true)) {
+                    val bannerLp = bannerView?.layoutParams as? FrameLayout.LayoutParams
+                    bannerLp?.let { lp ->
+                        if (isOverlapping) {
+                            if (isFullScreen) {
+                                lp.topMargin = 0
+                                bannerView?.layoutParams = lp
+                            } else {
+                                lp.topMargin = 0 // bannerHeightPx // + statusBarHeight
+                                bannerView?.layoutParams = lp
+                            }
+                        } else {
+                            if (isFullScreen) {
+                                lp.topMargin = 0
+                                bannerView?.layoutParams = lp
+                            } else {
+                                lp.topMargin = statusBarHeight
+                                bannerView?.layoutParams = lp
+                            }
+                        }
+
+                    }
+                }
+
+                cWebView?.let { webView ->
+                    val webLp = webView.view.layoutParams as FrameLayout.LayoutParams
+                    if (isPosition.equals("top-center", ignoreCase = true)) {
+
+                        if (isOverlapping) {
+                            if (isFullScreen) {
+                                webLp.topMargin = 0 //+ statusBarHeight
+                            } else {
+                                webLp.topMargin = 0 //bannerHeightPx // + statusBarHeight
+                            }
+                        } else {
+                            if (isFullScreen) {
+                                webLp.topMargin = bannerHeightPx
+                            } else {
+                                webLp.topMargin = bannerHeightPx
+                            }
+                        }
+                    }
+
+                    webView.view.layoutParams = webLp
+                    webView.view.requestLayout()
+                }
+            }}
+    }
+
+
+
+
+
     private val bannerPaidAdListener = OnPaidEventListener { adValue ->
             val valueMicros = adValue.valueMicros.takeIf { it > 0 } ?: 0L
             val currencyCode = adValue.currencyCode.ifBlank { "UNKNOWN" }

package/src/ios/emiAdmobPlugin.h

@@ -16,10 +16,18 @@
 @property(nonatomic, readonly) BOOL canRequestAds;
 @property (nonatomic, assign) BOOL isUsingAdManagerRequest;
 @property (nonatomic, assign) CGFloat viewWidth;
+@property(nonatomic, assign) BOOL isOverlapping;
+@property(nonatomic, assign) BOOL isCollapsible;
 @property (nonatomic, strong) UIView *bannerViewLayout;
 @property (nonatomic, strong) UIView *bannerContainer;
 @property (nonatomic, strong) UIView *webViewContainer;
 
+@property(nonatomic, assign) BOOL isAutoShowAppOpen;
+@property(nonatomic, assign) BOOL isAutoShowBanner;
+@property(nonatomic, assign) BOOL isAutoShowInterstitial;
+@property(nonatomic, assign) BOOL isAutoShowRewardedAds;
+@property(nonatomic, assign) BOOL isAutoShowRewardedInt;
+
 - (void)initialize:(CDVInvokedUrlCommand *)command;
 - (void)requestIDFA:(CDVInvokedUrlCommand *)command;
 - (void)showPrivacyOptionsForm:(CDVInvokedUrlCommand *)command;

package/src/ios/emiAdmobPlugin.m

@@ -7,6 +7,7 @@
 #import <Cordova/CDVViewController.h>
 
 @implementation emiAdmobPlugin
+
 @synthesize appOpenAd;
 @synthesize bannerView;
 @synthesize interstitial;
@@ -15,25 +16,20 @@
 @synthesize command;
 @synthesize responseInfo;
 @synthesize isPrivacyOptionsRequired;
+
 int attStatus = 0;
-// int fromStatus = 0; // Deprecated
+
 int Consent_Status = 0;
 int adFormat = 0;
 int adWidth = 320; // Default
 
-BOOL auto_Show = NO;
 // NSString *Npa = @"1"; // Deprecated
 NSString *setPosition = @"bottom-center"; // Default
 NSString *bannerSaveAdUnitId = @""; // autoResize dependency = true
 
-
-
-BOOL isCollapsible = NO;
 BOOL isAutoResize = NO;
 
-
 CGFloat paddingWebView = 0; // Default
-BOOL isSetOverlapping = NO; // Default
 CGFloat bannerHeightFinal = 50; // Default
 
 int isAdSkip = 0;
@@ -60,10 +56,10 @@ NSString *setKeyword = @"";
 - (void)setAdRequest {
     if (isUsingAdManagerRequest) {
         self.globalRequest = [GAMRequest request];
-        NSLog(@"Using AdManager request");
+       // NSLog(@"Using AdManager request");
     } else {
         self.globalRequest = [GADRequest request];
-        NSLog(@"Using AdMob request");
+      //  NSLog(@"Using AdMob request");
     }
     
     if (isEnabledKeyword && setKeyword.length > 0) {
@@ -71,7 +67,7 @@ NSString *setKeyword = @"";
             for (NSString *keyword in keywords) {
                 NSString *trimmedKeyword = [keyword stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]];
                 if (trimmedKeyword.length > 0) {
-                    NSLog(@"Adding keyword: %@", trimmedKeyword);
+                   // NSLog(@"Adding keyword: %@", trimmedKeyword);
                     [self.globalRequest setKeywords:[self.globalRequest.keywords arrayByAddingObject:trimmedKeyword]];
                 }
             }
@@ -81,17 +77,9 @@ NSString *setKeyword = @"";
 
 
 
+- (void)isResponseInfo:(BOOL)value { isResponseInfo = value; }
+- (void)isDebugGeography:(BOOL)value { isDebugGeography = value; }
 
-
-
-
-
-- (void)isResponseInfo:(BOOL)value {
-  isResponseInfo = value;
-}
-- (void)isDebugGeography:(BOOL)value {
-  isDebugGeography = value;
-}
 - (void)initialize:(CDVInvokedUrlCommand *)command {
 
   NSDictionary *options = [command.arguments objectAtIndex:0];
@@ -154,11 +142,11 @@ NSString *setKeyword = @"";
               [self.commandDelegate sendPluginResult:pluginResult callbackId:callbackId];
             }];
           }
-
   
           if (UMPConsentInformation.sharedInstance.canRequestAds) {
             [self startGoogleMobileAdsSDK];
           }
+            
         }];
       } else if (status == UMPConsentStatusNotRequired || status == UMPConsentStatusObtained) {
         if (UMPConsentInformation.sharedInstance.canRequestAds) {
@@ -183,8 +171,6 @@ NSString *setKeyword = @"";
     
     if (@available(iOS 14, *)) {
         dispatch_async(dispatch_get_main_queue(), ^{
-            // Added a 1-second pause before performing a tracking authorization request
-            dispatch_after(dispatch_time(DISPATCH_TIME_NOW, 1 * NSEC_PER_SEC), dispatch_get_main_queue(), ^{
                 
                 [ATTrackingManager requestTrackingAuthorizationWithCompletionHandler:^(ATTrackingManagerAuthorizationStatus status) {
                     if (status == ATTrackingManagerAuthorizationStatusDenied) {
@@ -200,7 +186,6 @@ NSString *setKeyword = @"";
                     pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsInt:attStatus];
                     [self.commandDelegate sendPluginResult:pluginResult callbackId:callbackId];
                 }];
-            });
         });
     } else {
         [self fireEvent:@"" event:@"on.getIDFA.error" withData:nil];
@@ -254,26 +239,15 @@ NSString *setKeyword = @"";
       result[@"TCString"] = TCString;
       result[@"additionalConsent"] = additionalConsent;
 
-      // NSLog(@"Result dictionary: %@", result);consentStatus
-
       NSError *error;
-      NSData *jsonData = [NSJSONSerialization dataWithJSONObject:result
-                                                         options:0
-                                                           error:&error];
+      NSData *jsonData = [NSJSONSerialization dataWithJSONObject:result options:0 error:&error];
 
       if (!jsonData) {
-        NSLog(@"Error converting result to JSON: %@",
-              error.localizedDescription);
+        NSLog(@"Error converting result to JSON: %@", error.localizedDescription);
       } else {
-        NSString *jsonString =
-            [[NSString alloc] initWithData:jsonData
-                                  encoding:NSUTF8StringEncoding];
-
-        // NSLog(@"JSON String: %@", jsonString);
-
+        NSString *jsonString = [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];
         [self fireEvent:@"" event:@"on.sdkInitialization" withData:jsonString];
       }
-
       [prefs synchronize];
     }];
   });
@@ -316,6 +290,8 @@ NSString *setKeyword = @"";
     });
 }
 
+
+
 - (void)showPrivacyOptionsForm:(CDVInvokedUrlCommand *)command {
     NSString *deviceId = [self __getAdMobDeviceId];
     UMPRequestParameters *parameters = [[UMPRequestParameters alloc] init];
@@ -370,10 +346,6 @@ NSString *setKeyword = @"";
 
 
 
-
-
-
-
 - (BOOL)isPrivacyOptionsRequired {
   UMPPrivacyOptionsRequirementStatus status = UMPConsentInformation.sharedInstance.privacyOptionsRequirementStatus;
 
@@ -399,10 +371,8 @@ NSString *setKeyword = @"";
     }
 
     CDVPluginResult *pluginResult =
-        [CDVPluginResult resultWithStatus:CDVCommandStatus_OK
-                             messageAsInt:Consent_Status];
-    [self.commandDelegate sendPluginResult:pluginResult
-                                callbackId:command.callbackId];
+        [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsInt:Consent_Status];
+    [self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
   }];
 }
 
@@ -462,8 +432,7 @@ NSString *setKeyword = @"";
         setPublisherFirstPartyIDEnabled:pubIdEnabled];
     pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK];
   } @catch (NSException *exception) {
-    pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR
-                                     messageAsString:exception.reason];
+    pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsString:exception.reason];
   }
   [self.commandDelegate sendPluginResult:pluginResult callbackId:callbackId];
 }
@@ -531,14 +500,11 @@ NSString *setKeyword = @"";
     result[@"IABTCF_PurposeConsents"] = PurposeConsents;
     result[@"IABTCF_TCString"] = TCString;
     
-    // NSLog(@"%@", [[NSUserDefaults standardUserDefaults] dictionaryRepresentation]);
-    
     [prefs synchronize];
 }
 
 
 - (void)orientationDidChange:(NSNotification *)notification {
-  // NSLog(@"Orientation changed");
   [self fireEvent:@"" event:@"on.screen.rotated" withData:nil];
   if (isAutoResize) {
     dispatch_async(dispatch_get_main_queue(), ^{
@@ -584,19 +550,16 @@ NSString *setKeyword = @"";
 
         [self.bannerViewLayout addSubview:self.bannerView];
         [self.bannerViewLayout bringSubviewToFront:self.bannerView];
-          
-          if (isSetOverlapping) {
-              
-              if (auto_Show && self.bannerView) {
-                  if (isSetOverlapping){
+       
+              if (self.isAutoShowBanner && self.bannerView) {
+                  if (!self.isOverlapping){
                       self.bannerView.hidden = NO;
                       [self setBodyHeight:self.command];
-                 }
+                  } else {
+                      self.bannerView.hidden = NO;
+                  }
               }
 
-              
-          }
-
       } @catch (NSException *exception) {
           NSLog(@"Exception: %@", exception.reason);
       }
@@ -615,12 +578,11 @@ NSString *setKeyword = @"";
   NSString *collapsible = [options valueForKey:@"collapsible"];
   BOOL autoResize = [[options valueForKey:@"autoResize"] boolValue];
   NSString *size = [options valueForKey:@"size"];
-  BOOL autoShow = [[options valueForKey:@"autoShow"] boolValue];
+  self.isAutoShowBanner = [[options valueForKey:@"autoShow"] boolValue];
+  self.isOverlapping = [[options valueForKey:@"isOverlapping"] boolValue];
 
   bannerSaveAdUnitId = adUnitId;
-
   setPosition = position;
-    
   adFormat = 5;
 
   if (adUnitId == nil || [adUnitId length] == 0) {
@@ -630,10 +592,10 @@ NSString *setKeyword = @"";
     return;
   }
 
-  if (collapsible != nil && [collapsible length] > 0) {
-    isCollapsible = YES;
+ if (collapsible != nil && [collapsible length] > 0) {
+    self.isCollapsible = YES;
   } else {
-    isCollapsible = NO;
+    self.isCollapsible = NO;
   }
 
   if (autoResize) {
@@ -653,19 +615,16 @@ NSString *setKeyword = @"";
       }
 
       self.viewWidth = frame.size.width;
-        
-      auto_Show = autoShow;
+      
       adWidth = self.viewWidth;
 
       GADAdSize siz = [self __AdSizeFromString:size];
       self.bannerView = [[GADBannerView alloc] initWithAdSize:siz];
 
-
     CGSize bannerSize = self.bannerView.bounds.size;
     CGFloat screenWidth = parentView.bounds.size.width;
     CGFloat screenHeight = parentView.bounds.size.height;
 
-    // Default to top-center
     CGFloat originX = (screenWidth - bannerSize.width) / 2;
     CGFloat originY = 0;
 
@@ -680,9 +639,9 @@ NSString *setKeyword = @"";
 
       GADExtras *extras = [[GADExtras alloc] init];
 
-      if (isCollapsible) {
+      if (self.isCollapsible) {
         extras.additionalParameters = @{@"collapsible" : collapsible};
-          
+   
         [self.globalRequest registerAdNetworkExtras:extras];
           
       }
@@ -700,7 +659,7 @@ NSString *setKeyword = @"";
 
     pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK];
   } else {
-    //  NSLog(@"Admob Option invalid for banner");
+
     pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR];
   }
 
@@ -711,11 +670,14 @@ NSString *setKeyword = @"";
 - (void)showBannerAd:(CDVInvokedUrlCommand *)command {
     @try {
         if (self.bannerView) {
-            self.bannerView.hidden = NO;
-            if (isSetOverlapping){
+            
+            if (!self.isOverlapping){
+                self.bannerView.hidden = NO;
                 [self setBodyHeight:command];
+            } else {
+                self.bannerView.hidden = NO;
             }
-   
+            
         } else {
             [self fireEvent:@"" event:@"on.banner.failed.show" withData:nil];
         }
@@ -828,7 +790,7 @@ NSString *setKeyword = @"";
             rootViewController.view.frame = contentFrame;
 
             }
-
+                
                 [self.bannerView setNeedsLayout];
                 [self.bannerView layoutIfNeeded];
                 [rootViewController.view setNeedsLayout];
@@ -860,10 +822,9 @@ NSString *setKeyword = @"";
 
 - (void)styleBannerAd:(CDVInvokedUrlCommand *)command {
     NSDictionary *options = [command.arguments objectAtIndex:0];
-    BOOL isOverlapping = [[options valueForKey:@"isOverlapping"] boolValue];
+    self.isOverlapping = [[options valueForKey:@"isOverlapping"] boolValue];
     CGFloat paddingContainer = [[options valueForKey:@"paddingWebView"] floatValue];
 
-    isSetOverlapping = isOverlapping;
     paddingWebView = paddingContainer;
 
     dispatch_async(dispatch_get_main_queue(), ^{
@@ -1022,15 +983,16 @@ NSString *setKeyword = @"";
   }
   [self.commandDelegate sendPluginResult:pluginResult callbackId:callbackId];
 }
+
+
 - (void)loadAppOpenAd:(CDVInvokedUrlCommand *)command {
     CDVPluginResult *pluginResult;
     NSString *callbackId = command.callbackId;
     
     NSDictionary *options = [command.arguments objectAtIndex:0];
     NSString *adUnitId = [options valueForKey:@"adUnitId"];
-    BOOL autoShow = [[options valueForKey:@"autoShow"] boolValue];
+    self.isAutoShowAppOpen = [[options valueForKey:@"autoShow"] boolValue];
     
-    auto_Show = autoShow;
     adFormat = 1;
     self.appOpenAd = nil;
     
@@ -1084,7 +1046,7 @@ NSString *setKeyword = @"";
                 };
                 
                 
-                if (auto_Show) {
+                if (self.isAutoShowAppOpen) {
                     NSError *presentError = nil;
                     if ([self.appOpenAd canPresentFromRootViewController:self.viewController error:&presentError]) {
                         [self.appOpenAd presentFromRootViewController:self.viewController];
@@ -1146,9 +1108,7 @@ NSString *setKeyword = @"";
 - (void)showAppOpenAd:(CDVInvokedUrlCommand *)command {
   CDVPluginResult *pluginResult;
   NSString *callbackId = command.callbackId;
-  if (self.appOpenAd &&
-      [self.appOpenAd canPresentFromRootViewController:self.viewController
-                                                 error:nil]) {
+  if (self.appOpenAd && [self.appOpenAd canPresentFromRootViewController:self.viewController error:nil]) {
     [self.appOpenAd presentFromRootViewController:self.viewController];
     adFormat = 1;
     pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK];
@@ -1158,15 +1118,16 @@ NSString *setKeyword = @"";
   }
   [self.commandDelegate sendPluginResult:pluginResult callbackId:callbackId];
 }
+
+
 - (void)loadInterstitialAd:(CDVInvokedUrlCommand *)command {
     CDVPluginResult *pluginResult;
     NSString *callbackId = command.callbackId;
     
     NSDictionary *options = [command.arguments objectAtIndex:0];
     NSString *adUnitId = [options valueForKey:@"adUnitId"];
-    BOOL autoShow = [[options valueForKey:@"autoShow"] boolValue];
+    self.isAutoShowInterstitial = [[options valueForKey:@"autoShow"] boolValue];
     
-    auto_Show = autoShow;
     adFormat = 2;
     [self setAdRequest];
     if (adFormat == 2) {
@@ -1213,7 +1174,7 @@ NSString *setKeyword = @"";
                 };
                 
                 
-                if (auto_Show) {
+                if (self.isAutoShowInterstitial) {
                     NSError *presentError = nil;
                     if ([self.interstitial canPresentFromRootViewController:self.viewController error:&presentError]) {
                         [self.interstitial presentFromRootViewController:self.viewController];
@@ -1300,9 +1261,8 @@ NSString *setKeyword = @"";
     
     NSDictionary *options = [command.arguments objectAtIndex:0];
     NSString *adUnitId = [options valueForKey:@"adUnitId"];
-    BOOL autoShow = [[options valueForKey:@"autoShow"] boolValue];
+    self.isAutoShowRewardedInt = [[options valueForKey:@"autoShow"] boolValue];
     
-    auto_Show = autoShow;
     adFormat = 4;
     [self setAdRequest];
     if (adFormat == 4) {
@@ -1348,7 +1308,7 @@ NSString *setKeyword = @"";
                 };
                 
                 
-                if (auto_Show) {
+                if (self.isAutoShowRewardedInt) {
                     NSError *presentError = nil;
                     if ([self.rewardedInterstitialAd canPresentFromRootViewController:self.viewController error:&presentError]) {
                         [self.rewardedInterstitialAd presentFromRootViewController:self.viewController userDidEarnRewardHandler:^{
@@ -1461,10 +1421,7 @@ NSString *setKeyword = @"";
     NSString *callbackId = command.callbackId;
     NSDictionary *options = [command.arguments objectAtIndex:0];
     NSString *adUnitId = [options valueForKey:@"adUnitId"];
-    BOOL autoShow = [[options valueForKey:@"autoShow"] boolValue];
-    //auto_Show = autoShow;
-    
-    __block BOOL shouldAutoShow = autoShow;
+    self.isAutoShowRewardedAds = [[options valueForKey:@"autoShow"] boolValue];
     
     adFormat = 3;
     [self setAdRequest];
@@ -1509,7 +1466,7 @@ NSString *setKeyword = @"";
                 
                 
 
-                if (shouldAutoShow) {
+                if (self.isAutoShowRewardedAds) {
                     NSError *presentError = nil;
                     if ([self.rewardedAd canPresentFromRootViewController:self.viewController error:&presentError]) {
                         [self.rewardedAd presentFromRootViewController:self.viewController userDidEarnRewardHandler:^{
@@ -1712,7 +1669,7 @@ NSString *setKeyword = @"";
  #pragma mark GADBannerViewDelegate implementation
 
 - (void)bannerViewDidReceiveAd:(GADBannerView *)bannerView {
-   // NSLog(@"The last loaded banner is %@collapsible.", (bannerView.isCollapsible ? @"" : @"not "));
+
     NSString *collapsibleStatus = bannerView.isCollapsible ? @"collapsible" : @"not collapsible";
     NSDictionary *eventData = @{@"collapsible" : collapsibleStatus};
     NSError *error;
@@ -1723,29 +1680,24 @@ NSString *setKeyword = @"";
         [self fireEvent:@"" event:@"on.is.collapsible" withData:jsonString];
     }
     
-    // Get the banner height
     CGFloat bannerHeight = bannerView.bounds.size.height;
     bannerHeightFinal = bannerHeight;
 
-
-    // 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) {
-        if (isSetOverlapping){
+    if (self.isAutoShowBanner && self.bannerView) {
+        if (!self.isOverlapping){
             self.bannerView.hidden = NO;
             [self setBodyHeight:command];
-       }
-    } else {
-        [self fireEvent:@"" event:@"on.banner.failed.show" withData:nil];
+        } else {
+            self.bannerView.hidden = NO;
+        }
     }
     
-    
     __weak __typeof(self) weakSelf = self;
     self.bannerView.paidEventHandler = ^(GADAdValue *_Nonnull value) {
         __strong __typeof(weakSelf) strongSelf = weakSelf;

package/www/emiAdmobPlugin.js

@@ -16,16 +16,19 @@ exports.showAppOpenAd = function (success, error) {
     exec(success, error, 'emiAdmobPlugin', 'showAppOpenAd', []);
 };
 exports.styleBannerAd = function (options, success, error) {
-    exec(success, error, 'emiAdmobPlugin', 'styleBannerAd', [options]); 
+    exec(success, error, 'emiAdmobPlugin', 'styleBannerAd', [options]);
 };
 exports.loadBannerAd = function (options, success, error) {
     exec(success, error, 'emiAdmobPlugin', 'loadBannerAd', [options]);
 };
+exports.loadBannerCapacitor = function (options, success, error) {
+    exec(success, error, 'emiAdmobPlugin', 'loadBannerCapacitor', [options]);
+};
 exports.showBannerAd = function (success, error) {
     exec(success, error, 'emiAdmobPlugin', 'showBannerAd', []);
 };
 exports.hideBannerAd = function (success, error) {
-        exec(success, error, 'emiAdmobPlugin', 'hideBannerAd', []);
+    exec(success, error, 'emiAdmobPlugin', 'hideBannerAd', []);
 };
 exports.removeBannerAd = function (success, error) {
     exec(success, error, 'emiAdmobPlugin', 'removeBannerAd', []);
@@ -70,13 +73,13 @@ exports.globalSettings = function (options, success, error) {
     exec(success, error, 'emiAdmobPlugin', 'globalSettings', [options]);
 };
 exports.forceDisplayPrivacyForm = function (success, error) {
-        exec(success, error, 'emiAdmobPlugin', 'forceDisplayPrivacyForm', []); // only IOS
+    exec(success, error, 'emiAdmobPlugin', 'forceDisplayPrivacyForm', []); 
 };
 
 exports.metaData = function (options, success, error) {
     exec(success, error, 'emiAdmobPlugin', 'metaData', [options]);
 };
-    
+
 // ( only Android )
 // only isUsingAdManagerRequest: true
 // AdManagerAdRequest.Builder