emi-indo-cordova-plugin-admob 2.0.2 → 2.0.3

package/example/www/index.html

@@ -17,6 +17,10 @@
 
 <p> <button onclick="loadAppOpen();">Auto Show App Open Ad</button></p>
 
+<p> <button onclick="loadBanner();">load a show Banner Ad</button></p>
+<p> <button onclick="showBanner();">show Banner Ad</button></p>
+<p> <button onclick="hideBanner();">hide Banner Ad</button></p>
+<p> <button onclick="removeBanner();">remove Banner Ad</button></p>
 
 <p> <button onclick="loadInterstitial();">Load Interstitial Ad</button></p>
 <p> <button onclick="showInterstitial();">Show Interstitial Ad</button></p>

package/example/www/js/bannerAd.js

@@ -10,16 +10,16 @@ function loadBanner() {
 
     if (typeof cordova !== 'undefined') {
 
-        if (!isPlatformIOS){
-
+      
         cordova.plugins.emiAdmobPlugin.styleBannerAd({
-            isOverlapping: true,
-            overlappingHeight: 0, // default 0 (Automatic)
-            padding: 0, // default 0
-            margins: 0 // default 0 (Automatic)
+            isOverlapping: true, // default false IOS | Android
+            isStatusBarShow: true, // default true Only Android
+            paddingWebView: 1.0, // Only IOS > padding banner Container and webView Container
+            overlappingHeight: 0, // default 0 (Automatic) Only Android
+            padding: 0, // default 0 Only Android
+            margins: 0 // default 0 (Automatic) Only Android
         });
         
-    }
     
 
         cordova.plugins.emiAdmobPlugin.loadBannerAd({
@@ -37,6 +37,30 @@ function loadBanner() {
 
 
 
+function showBanner() {
+
+    if (typeof cordova !== 'undefined') {
+        cordova.plugins.emiAdmobPlugin.showBannerAd();
+    }
+
+}
+
+function hideBanner() {
+
+    if (typeof cordova !== 'undefined') {
+        cordova.plugins.emiAdmobPlugin.hideBannerAd();
+    }
+
+}
+
+
+function removeBanner() {
+
+    if (typeof cordova !== 'undefined') {
+        cordova.plugins.emiAdmobPlugin.removeBannerAd();
+    }
+
+}
 
 
 /* ///////<<<<  bannerAd position  >>>>>>\\\\\\\

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "emi-indo-cordova-plugin-admob",
-  "version": "2.0.2",
+  "version": "2.0.3",
   "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.2">
+  id="emi-indo-cordova-plugin-admob" version="2.0.3">
 
   <name>emiAdmobPlugin</name>
   <description>Cordova/Quasar/Capacitor Plugin Admob Android IOS</description>
@@ -51,8 +51,6 @@
         android:value="$APP_ID_ANDROID" />
       <meta-data android:name="com.google.android.gms.ads.DELAY_APP_MEASUREMENT_INIT"
         android:value="true" />
-      <meta-data android:name="com.google.android.gms.ads.flag.OPTIMIZE_INITIALIZATION"
-        android:value="false" />
       <meta-data android:name="com.google.android.gms.ads.flag.OPTIMIZE_AD_LOADING"
         android:value="true" />
       <meta-data
@@ -99,7 +97,7 @@
 
     <config-file parent="/*" target="config.xml">
     <!--minimum deployment-target: 12.2  -->
-		<preference name="deployment-target" value="12.3" />
+		<preference name="deployment-target" value="13.0" />
 		<preference name="SwiftVersion" value="5.10" />
 	</config-file>
 

package/src/android/emiAdmobPlugin.kt

@@ -93,6 +93,7 @@ class emiAdmobPlugin : CordovaPlugin() {
 
     private var isOverlapping: Boolean = false
     private var overlappingHeight: Int = 0
+    private var isStatusBarShow: Boolean = true
 
     var adType = ""
 
@@ -1158,6 +1159,7 @@ class emiAdmobPlugin : CordovaPlugin() {
                     val navBarHeight = maxOf(0, screenHeight - usableHeight)
 
                     val isOverlapping = options.optBoolean("isOverlapping", false)
+                    val setStatusBarShow = options.optBoolean("isStatusBarShow", true)
                     val overlappingHeight = options.optInt("overlappingHeight", navBarHeight)
                     val paddingPx = options.optInt("padding", 0)
                     val marginsPx = options.optInt("margins", navBarHeight)
@@ -1166,6 +1168,7 @@ class emiAdmobPlugin : CordovaPlugin() {
                     try {
                         // Make sure to only set variables if they have the correct values
                         this.isOverlapping = isOverlapping
+                        this.isStatusBarShow = setStatusBarShow
                         this.overlappingHeight = if (overlappingHeight > 0) overlappingHeight else navBarHeight
                         this.paddingInPx = paddingPx
                         this.marginsInPx = if (marginsPx > 0) marginsPx else navBarHeight
@@ -1607,27 +1610,30 @@ class emiAdmobPlugin : CordovaPlugin() {
 
 
 
-    private fun bannerOverlapping() {
-        if (bannerView != null && mActivity != null && cWebView != null) {
-            mActivity?.runOnUiThread {
-                try {
-
-                    val displayMetrics = DisplayMetrics()
-                    mActivity?.windowManager?.defaultDisplay?.getMetrics(displayMetrics)
-                    val screenHeightInPx = displayMetrics.heightPixels
-
-                    val webViewHeight = screenHeightInPx - (adSize.height + overlappingHeight)
-                    val layoutParams = cWebView?.view?.layoutParams
-                    layoutParams?.height = webViewHeight
-                    cWebView?.view?.layoutParams = layoutParams
-
-                    // Log.d("BannerAdjustment", "Adjusted WebView height: $webViewHeight")
-                } catch (e: Exception) {
-                    Log.e("AdmobPlugin", "Error adjusting WebView for banner: ${e.message}")
+   private fun bannerOverlapping() {
+    if (bannerView != null && mActivity != null && cWebView != null) {
+        mActivity?.runOnUiThread {
+            try {
+                val displayMetrics = DisplayMetrics()
+                mActivity!!.windowManager.defaultDisplay.getMetrics(displayMetrics)
+                val screenHeightInPx = displayMetrics.heightPixels
+                
+                val webViewHeight = if (isStatusBarShow) {
+                    screenHeightInPx - (adSize.height + overlappingHeight)
+                } else {
+                    screenHeightInPx + (adSize.height + overlappingHeight)
                 }
+                val layoutParams = cWebView!!.view.layoutParams
+                layoutParams.height = webViewHeight
+                cWebView!!.view.layoutParams = layoutParams
+
+                // Log.d("BannerAdjustment", "Adjusted WebView height: $webViewHeight")
+            } catch (e: Exception) {
+                Log.e("AdmobPlugin", "Error adjusting WebView for banner: ${e.message}")
             }
         }
     }
+}
 
 
 

package/src/ios/emiAdmobPlugin.h

@@ -17,6 +17,8 @@
 @property (nonatomic, assign) BOOL isUsingAdManagerRequest;
 @property (nonatomic, assign) CGFloat viewWidth;
 @property (nonatomic, strong) UIView *bannerViewLayout;
+@property (nonatomic, strong) UIView *bannerContainer;
+@property (nonatomic, strong) UIView *webViewContainer;
 
 - (void)initialize:(CDVInvokedUrlCommand *)command;
 - (void)requestIDFA:(CDVInvokedUrlCommand *)command;
@@ -26,6 +28,7 @@
 - (void)getIabTfc:(CDVInvokedUrlCommand *)command;
 - (void)loadAppOpenAd:(CDVInvokedUrlCommand *)command;
 - (void)showAppOpenAd:(CDVInvokedUrlCommand *)command;
+- (void)styleBannerAd:(CDVInvokedUrlCommand *)command;
 - (void)loadBannerAd:(CDVInvokedUrlCommand *)command;
 - (void)showBannerAd:(CDVInvokedUrlCommand *)command;
 - (void)hideBannerAd:(CDVInvokedUrlCommand *)command;
@@ -38,3 +41,4 @@
 - (void)showRewardedAd:(CDVInvokedUrlCommand *)command;
 - (void) fireEvent:(NSString *)obj event:(NSString *)eventName withData:(NSString *)jsonStr;
 @end
+

package/src/ios/emiAdmobPlugin.m

@@ -4,6 +4,7 @@
 #import <Cordova/CDVPlugin.h>
 #import <Foundation/Foundation.h>
 #import <UserMessagingPlatform/UserMessagingPlatform.h>
+#import <Cordova/CDVViewController.h>
 @implementation emiAdmobPlugin
 @synthesize appOpenAd;
 @synthesize bannerView;
@@ -18,6 +19,7 @@ int attStatus = 0;
 int Consent_Status = 0;
 int adFormat = 0;
 int adWidth = 320; // Default
+
 BOOL auto_Show = NO;
 // NSString *Npa = @"1"; // Deprecated
 NSString *setPosition = @"bottom-center"; // Default
@@ -26,6 +28,11 @@ 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;
 BOOL UnderAgeOfConsent = NO;
 BOOL isPrivacyOptions = NO;
@@ -33,6 +40,7 @@ BOOL isDebugGeography = NO;
 BOOL isResponseInfo = NO;
 BOOL isUsingAdManagerRequest = YES;
 
+
 - (BOOL)canRequestAds {
   return UMPConsentInformation.sharedInstance.canRequestAds;
 }
@@ -259,7 +267,7 @@ BOOL isUsingAdManagerRequest = YES;
                 } else {
                     [UMPConsentForm presentPrivacyOptionsFormFromViewController:self.viewController completionHandler:^(NSError *_Nullable formError) {
                         if (formError) {
-                            // NSLog(@"Error when displaying the form: %@", formError);
+                             NSLog(@"Error when displaying the form: %@", formError);
                         }
                     }];
                 }
@@ -324,8 +332,7 @@ BOOL isUsingAdManagerRequest = YES;
 
 - (BOOL)isPrivacyOptionsRequired {
   UMPPrivacyOptionsRequirementStatus status = UMPConsentInformation.sharedInstance.privacyOptionsRequirementStatus;
-  // NSLog(@"[isPrivacyOptionsRequired] Privacy option status: %ld",
-  // (long)status);
+
   return status == UMPPrivacyOptionsRequirementStatusRequired;
 }
 
@@ -347,9 +354,6 @@ BOOL isUsingAdManagerRequest = YES;
       Consent_Status = UMPConsentStatusObtained;
     }
 
-  /*  NSLog(@"The Consent "
-          @"Status %i",
-          Consent_Status); */
     CDVPluginResult *pluginResult =
         [CDVPluginResult resultWithStatus:CDVCommandStatus_OK
                              messageAsInt:Consent_Status];
@@ -448,7 +452,7 @@ BOOL isUsingAdManagerRequest = YES;
         requestConfiguration.maxAdContentRating =
             GADMaxAdContentRatingMatureAudience;
       } else {
-        // NSLog(@"Unknown content rating: %@", contentRating);
+         NSLog(@"Unknown content rating: %@", contentRating);
       }
     }
 
@@ -538,9 +542,7 @@ BOOL isUsingAdManagerRequest = YES;
         [self.bannerViewLayout bringSubviewToFront:self.bannerView];
 
       } @catch (NSException *exception) {
-        // NSLog(@"Error adjusting banner size: %@", exception.reason);
-        // PUBLIC_CALLBACKS.error([NSString stringWithFormat:@"Error adjusting
-        // banner size: %@", exception.reason]);
+       //  banner size: %@", exception.reason]);
       }
     });
   }
@@ -631,37 +633,12 @@ BOOL isUsingAdManagerRequest = YES;
 
 
 
-- (GADAdSize)__AdSizeFromString:(NSString *)size {
-
-  if (self.viewWidth == 0) {
-    self.viewWidth = [UIScreen mainScreen].bounds.size.width;
-  }
-
-  if ([size isEqualToString:@"responsive_adaptive"]) {
-    return GADCurrentOrientationAnchoredAdaptiveBannerAdSizeWithWidth(
-        self.viewWidth);
-  } else if ([size isEqualToString:@"in_line_adaptive"]) {
-    return GADCurrentOrientationInlineAdaptiveBannerAdSizeWithWidth(
-        self.viewWidth);
-  } else if ([size isEqualToString:@"banner"]) {
-    return GADAdSizeBanner;
-  } else if ([size isEqualToString:@"large_banner"]) {
-    return GADAdSizeLargeBanner;
-  } else if ([size isEqualToString:@"full_banner"]) {
-    return GADAdSizeFullBanner;
-  } else if ([size isEqualToString:@"leaderboard"]) {
-    return GADAdSizeLeaderboard;
-  } else {
-    return GADAdSizeBanner;
-  }
-}
-
 - (void)showBannerAd:(CDVInvokedUrlCommand *)command {
   CDVPluginResult *pluginResult;
   NSString *callbackId = command.callbackId;
   if (self.bannerView) {
     self.bannerView.hidden = NO;
-    [self addBannerViewToView:command];
+      [self addBannerViewToView:command];
     pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK];
   } else {
       [self fireEvent:@"" event:@"on.banner.failed.show" withData:nil];
@@ -730,13 +707,162 @@ BOOL isUsingAdManagerRequest = YES;
                                     constant:0]
     ]];
   }
+    [self bannerOverlapping];
 }
+
+
+
+
+
+- (void)bannerOverlapping {
+    if (!self.bannerView || !self.webView) {
+        NSLog(@"[AdPlugin] Error: Missing bannerView or webView. Adjustment skipped.");
+        return;
+    }
+    
+    if (isSetOverlapping){
+        
+        dispatch_async(dispatch_get_main_queue(), ^{
+            @try {
+
+                CGFloat screenWidth = UIScreen.mainScreen.bounds.size.width;
+                CGFloat screenHeight = UIScreen.mainScreen.bounds.size.height;
+                
+                CGFloat navigationBarHeight = 0.0;
+                if (@available(iOS 11.0, *)) {
+                    navigationBarHeight = self.viewController.view.safeAreaInsets.bottom;
+                }
+                
+                if (!self.bannerContainer) {
+                    self.bannerContainer = [[UIView alloc] initWithFrame:CGRectZero];
+                   // self.bannerContainer.backgroundColor = [UIColor redColor]; // Debug
+                    [self.viewController.view addSubview:self.bannerContainer];
+                }
+                
+                if (!self.webViewContainer) {
+                    self.webViewContainer = [[UIView alloc] initWithFrame:CGRectZero];
+                    // self.webViewContainer.backgroundColor = [UIColor blueColor]; // Debug
+                    [self.viewController.view addSubview:self.webViewContainer];
+                }
+                
+                CGRect bannerContainerFrame = CGRectZero;
+                if ([setPosition isEqualToString:@"top-center"]) {
+                    bannerContainerFrame = CGRectMake(0, 0, screenWidth, bannerHeightFinal);
+                } else if ([setPosition isEqualToString:@"bottom-center"]) {
+                    bannerContainerFrame = CGRectMake(0, screenHeight - paddingWebView - bannerHeightFinal - navigationBarHeight, screenWidth, bannerHeightFinal);
+                }
+                self.bannerContainer.frame = bannerContainerFrame;
+                
+                self.bannerView.frame = self.bannerContainer.bounds;
+                [self.bannerContainer addSubview:self.bannerView];
+                
+                CGRect webViewContainerFrame = CGRectZero;
+                if ([setPosition isEqualToString:@"top-center"]) {
+                    webViewContainerFrame = CGRectMake(0, bannerHeightFinal, screenWidth, screenHeight - bannerHeightFinal);
+                } else if ([setPosition isEqualToString:@"bottom-center"]) {
+                    
+                    webViewContainerFrame = CGRectMake(0, 0, screenWidth, screenHeight - bannerHeightFinal - paddingWebView - navigationBarHeight);
+                    
+                }
+                self.webViewContainer.frame = webViewContainerFrame;
+                
+                self.webView.frame = self.webViewContainer.bounds;
+                [self.webViewContainer addSubview:self.webView];
+                
+                [self.bannerContainer setNeedsLayout];
+                [self.bannerContainer layoutIfNeeded];
+                [self.webViewContainer setNeedsLayout];
+                [self.webViewContainer layoutIfNeeded];
+                
+                
+                NSLog(@"[AdPlugin] Banner and WebView are now in separate containers with proper sizing.");
+            } @catch (NSException *exception) {
+                NSLog(@"[AdPlugin] Error adjusting layout for banner and WebView: %@", exception.reason);
+            }
+            
+        });
+    }
+}
+
+
+
+
+
+- (void)styleBannerAd:(CDVInvokedUrlCommand *)command {
+
+    NSDictionary *options = [command.arguments objectAtIndex:0];
+    BOOL isOverlapping = [[options valueForKey:@"isOverlapping"] boolValue];
+    CGFloat paddingContainer = [[options valueForKey:@"paddingWebView"] floatValue];
+
+    isSetOverlapping = isOverlapping;
+    paddingWebView = paddingContainer;
+
+}
+
+
+- (GADAdSize)__AdSizeFromString:(NSString *)size {
+
+  if (self.viewWidth == 0) {
+    self.viewWidth = [UIScreen mainScreen].bounds.size.width;
+  }
+
+  if ([size isEqualToString:@"responsive_adaptive"]) {
+    return GADCurrentOrientationAnchoredAdaptiveBannerAdSizeWithWidth(
+        self.viewWidth);
+  } else if ([size isEqualToString:@"in_line_adaptive"]) {
+    return GADCurrentOrientationInlineAdaptiveBannerAdSizeWithWidth(
+        self.viewWidth);
+  } else if ([size isEqualToString:@"banner"]) {
+    return GADAdSizeBanner;
+  } else if ([size isEqualToString:@"large_banner"]) {
+    return GADAdSizeLargeBanner;
+  } else if ([size isEqualToString:@"full_banner"]) {
+    return GADAdSizeFullBanner;
+  } else if ([size isEqualToString:@"leaderboard"]) {
+    return GADAdSizeLeaderboard;
+  } else {
+    return GADAdSizeBanner;
+  }
+}
+
+
+
+
+
+
+- (void)resetWebViewHeight {
+    if (!self.webView) {
+        NSLog(@"[AdPlugin] Error: WebView is missing. Reset skipped.");
+        return;
+    }
+
+    dispatch_async(dispatch_get_main_queue(), ^{
+        @try {
+
+            CGFloat screenHeightInPx = UIScreen.mainScreen.bounds.size.height;
+
+            CGRect webViewFrame = self.webView.frame;
+            webViewFrame.size.height = screenHeightInPx;
+            self.webView.frame = webViewFrame;
+
+            [self.webView setNeedsLayout];
+            [self.webView layoutIfNeeded];
+
+        } @catch (NSException *exception) {
+            NSLog(@"[AdPlugin] Error resetting WebView height: %@", exception.reason);
+        }
+    });
+}
+
+
+
 - (void)hideBannerAd:(CDVInvokedUrlCommand *)command {
   CDVPluginResult *pluginResult;
   NSString *callbackId = command.callbackId;
   if (self.bannerView) {
     dispatch_async(dispatch_get_main_queue(), ^{
       self.bannerView.hidden = YES;
+      [self resetWebViewHeight];
       [self fireEvent:@"" event:@"on.banner.hide" withData:nil];
     });
     pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK];
@@ -753,6 +879,7 @@ BOOL isUsingAdManagerRequest = YES;
       self.bannerView.hidden = YES;
       [self.bannerView removeFromSuperview];
       self.bannerView = nil;
+      [self resetWebViewHeight];
       [self fireEvent:@"" event:@"on.banner.remove" withData:nil];
     });
     pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK];
@@ -1436,6 +1563,15 @@ BOOL isUsingAdManagerRequest = YES;
   return hexString;
 }
 
+
+
+
+
+
+
+
+
+
  #pragma mark GADBannerViewDelegate implementation
 
 - (void)bannerViewDidReceiveAd:(GADBannerView *)bannerView {
@@ -1452,9 +1588,9 @@ BOOL isUsingAdManagerRequest = YES;
     
     // 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];
@@ -1465,7 +1601,7 @@ BOOL isUsingAdManagerRequest = YES;
     
     if (auto_Show && self.bannerView) {
         [self addBannerViewToView:command];
-        self.bannerView.hidden = NO;
+        [self showBannerAd:command];
     } else {
         [self fireEvent:@"" event:@"on.banner.failed.show" withData:nil];
     }