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

package/.gitattributes

@@ -0,0 +1,2 @@
+# Auto detect text files and perform LF normalization
+* text=auto

package/.github/FUNDING.yml

@@ -0,0 +1,13 @@
+# These are supported funding model platforms
+
+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: 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
+otechie: # Replace with a single Otechie username
+lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
+custom: ['paypal.me/emiindo']

package/.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,127 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+<!--
+IMPORTANT: PLEASE READ
+
+WARNING: Failure to follow the issue template guidelines below will result in the issue being immediately closed.
+-->
+
+<!-- Fill out the relevant sections below and delete irrelevant sections. -->
+
+# Bug report
+
+<!-- COMPLETE THIS CHECKLIST -->
+
+
+- [ ] I confirm this is a suspected bug or issue that will affect other users
+<!-- i.e. this is not a request for support in using/integrating the plugin into your specific project -->
+
+- [ ] I have reproduced the issue using the [example project](https://github.com/EMI-INDO/emi-indo-cordova-plugin-admob/blob/main/example/index.html) or provided the necessary information to reproduce the issue.
+<!-- necessary information e.g. exact steps, FCM notification message content, test case project repo -->
+
+- [ ] I have read [the documentation](https://github.com/EMI-INDO/emi-indo-cordova-plugin-admob/blob/main/README.md) thoroughly and it does not help solve my issue.
+<!-- e.g. if you're having a build issue ensure you've read through the build environment notes -->
+
+- [ ] I have checked that no similar issues (open or closed) already exist.
+<!-- Duplicates or near-duplicates will be closed immediately. -->
+
+
+
+**Current behavior:**
+
+<!-- Describe how the bug manifests. -->
+
+<!-- Explain how you're sure there is an issue with this plugin rather than your own code:
+ - If this plugin has an example project, have you been able to reproduce the issue within it?
+ - Have you created a clean test Cordova project containing only this plugin to eliminate the potential for interference with other plugins/code?
+ -->
+
+**Expected behavior:**
+<!-- Describe what the behavior should be without the bug. -->
+
+**Steps to reproduce:**
+<!-- If you are able to illustrate the bug with an example, please provide steps to reproduce. -->
+
+**Screenshots**
+<!-- If applicable, add screenshots to help explain your problem. -->
+
+**Environment information**
+<!-- Please supply full details of your development environment including: -->
+- Plugin version 
+	- `Plugin version: xxxx`
+
+- Cordova CLI version 
+	- `cordova -v`
+- Cordova platform version
+	- `cordova platform ls`
+- Plugins & versions installed in project (including this plugin)
+    - `cordova plugin ls`
+- Dev machine OS and version, e.g.
+    - OSX
+        - `sw_vers`
+    - Windows 10
+        - `winver`
+        
+_Runtime issue_
+- Device details
+    - _e.g. iPhone X, Samsung Galaxy S8, iPhone X Simulator, Pixel XL Emulator_
+- OS details
+    - _e.g. iOS 12.2, Android 9.0_	
+	
+_Android build issue:_	
+- Node JS version
+    - `node -v`
+- Gradle version
+	- `ls platforms/android/.gradle`
+- Target Android SDK version
+	- `android:targetSdkVersion` in `AndroidManifest.xml`
+- Android SDK details
+	- `sdkmanager --list | sed -e '/Available Packages/q'`
+	
+_iOS build issue:_
+- Node JS version
+    - `node -v`
+- XCode version
+
+
+**Related code:**
+```
+insert any relevant code here such as plugin API calls / input parameters
+```
+
+**Console output**
+<details>
+<summary>console output</summary>
+
+```
+
+// Paste any relevant JS/native console output here
+
+```
+
+</details><br/><br/>
+
+**Other information:**
+
+<!-- List any other information that is relevant to your issue. Stack traces, related issues, suggestions on how to fix, Stack Overflow links, forum links, etc. -->
+
+
+
+
+
+<!--
+A POLITE REMINDER
+
+- This is free, open-source software. 
+- Although the author makes every effort to maintain it, no guarantees are made as to the quality or reliability, and reported issues will be addressed if and when the author has time. 
+- Help/support will not be given by the author, so forums (e.g. Ionic) or Stack Overflow should be used. Any issues requesting help/support will be closed immediately.
+- If you have urgent need of a bug fix/feature, the author can be engaged for PAID contract work to do so: please contact dave@workingedge.co.uk
+- Rude or abusive comments/issues will not be tolerated, nor will opening multiple issues if those previously closed are deemed unsuitable. Any of the above will result in you being BANNED from ALL of my Github repositories.
+-->

package/README.md

@@ -1,4 +1,4 @@
-### emi-indo-cordova-plugin-admob@2.2.9
+### emi-indo-cordova-plugin-admob@2.3.9
 
 
 ## Features/method
@@ -159,7 +159,7 @@ config.xml
 ### 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)
+### Mobile Ads SDK (IOS: 12.5.0) [Release Notes:](https://developers.google.com/admob/ios/rel-notes)
 
 ### User Messaging Platform (UMP IOS: 3.0.0) [Release Notes:](https://developers.google.com/ad-manager/mobile-ads-sdk/ios/privacy/download)
 ### IAB Europe Transparency & Consent Framework (CMP: 2.2.0)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "emi-indo-cordova-plugin-admob",
-  "version": "2.2.9",
+  "version": "2.3.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.2.9">
+  id="emi-indo-cordova-plugin-admob" version="2.3.9">
 
   <name>emiAdmobPlugin</name>
   <description>Cordova/Quasar/Capacitor Plugin Admob Android IOS</description>
@@ -298,9 +298,9 @@
         <source url="https://cdn.cocoapods.org/" />
       </config>
       <pods use-frameworks="true">
-		<!--minimum macOS 14.4 > Xcode 16.0 -->
+		 <!--minimum macOS 14.4 > Xcode 16.0 -->
 		 <pod name="GoogleUserMessagingPlatform" spec="~> 3.0.0" />
-     <pod name="Google-Mobile-Ads-SDK" spec="~> 12.2.0" />
+     <pod name="Google-Mobile-Ads-SDK" spec="~> 12.5.0" />
 		
       </pods>
     </podspec>

package/src/android/emiAdmobPlugin.kt

@@ -262,7 +262,7 @@ class emiAdmobPlugin : CordovaPlugin() {
                                 if (consentInformation!!.canRequestAds()) {
                                     initializeMobileAdsSdk()
                                 }
-                                cWebView!!.loadUrl("javascript:cordova.fireDocumentEvent('on.consent.info.update.failed', { message: '" + formError.message + "' });")
+                                cWebView!!.loadUrl("javascript:cordova.fireDocumentEvent('on.consent.info.update.failed', ${formError.message});") 
                             })
                     }
                     if (consentInformation?.canRequestAds()!!) {

package/src/ios/emiAdmobPlugin.h

@@ -18,10 +18,10 @@
 @property (nonatomic, assign) CGFloat viewWidth;
 @property(nonatomic, assign) BOOL isOverlapping;
 @property(nonatomic, assign) BOOL isCollapsible;
+@property(nonatomic, assign) BOOL isBannerOpen;
 @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;

package/src/ios/emiAdmobPlugin.m

@@ -504,7 +504,9 @@ NSString *setKeyword = @"";
 }
 
 
+
 - (void)orientationDidChange:(NSNotification *)notification {
+    /*
   [self fireEvent:@"" event:@"on.screen.rotated" withData:nil];
   if (isAutoResize) {
     dispatch_async(dispatch_get_main_queue(), ^{
@@ -565,6 +567,7 @@ NSString *setKeyword = @"";
       }
     });
   }
+ */
 }
 
 
@@ -604,8 +607,10 @@ NSString *setKeyword = @"";
     
   [self setAdRequest];
 
-  if (adFormat == 5) {
+    if (adFormat == 5 && !self.isBannerOpen) {
     dispatch_async(dispatch_get_main_queue(), ^{
+    
+        
       UIView *parentView = self.viewController.view;
       CGRect frame = self.bannerView.frame;
 
@@ -669,7 +674,17 @@ NSString *setKeyword = @"";
 
 - (void)showBannerAd:(CDVInvokedUrlCommand *)command {
     @try {
-        if (self.bannerView) {
+        
+        if (self.bannerView && self.isBannerOpen) {
+            
+            if (!self.isOverlapping){
+                self.bannerView.hidden = NO;
+                [self setBodyHeight:command];
+            } else {
+                self.bannerView.hidden = NO;
+            }
+            
+        } else if (self.bannerView && !self.isAutoShowBanner) {
             
             if (!self.isOverlapping){
                 self.bannerView.hidden = NO;
@@ -681,6 +696,7 @@ NSString *setKeyword = @"";
         } else {
             [self fireEvent:@"" event:@"on.banner.failed.show" withData:nil];
         }
+      
     }
     @catch (NSException *exception) {
         NSLog(@"[AdPlugin] Error in showBannerAd: %@", exception.reason);
@@ -704,105 +720,109 @@ NSString *setKeyword = @"";
 
 
 - (void)setBodyHeight:(CDVInvokedUrlCommand*)command {
-    dispatch_async(dispatch_get_main_queue(), ^{
-        @try {
-
-            UIWindow *keyWindow = [UIApplication sharedApplication].delegate.window;
-            UIViewController* rootViewController = keyWindow.rootViewController;
-
-            if (!rootViewController) {
-                CDVPluginResult* errorResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsString:@"Root ViewController not found"];
-                [self.commandDelegate sendPluginResult:errorResult callbackId:command.callbackId];
-                return;
-            }
+    if(!self.isBannerOpen){
+        dispatch_async(dispatch_get_main_queue(), ^{
             
-           
-            [rootViewController.view setNeedsLayout];
-            [rootViewController.view layoutIfNeeded];
-
-            UIEdgeInsets safeAreaInsets = rootViewController.view.safeAreaInsets;
-
-            if (safeAreaInsets.bottom == 0) {
-                safeAreaInsets = keyWindow.safeAreaInsets;
-            }
-
-            CGFloat screenHeight = UIScreen.mainScreen.bounds.size.height;
-            CGFloat screenWidth = UIScreen.mainScreen.bounds.size.width;
-            CGFloat bannerHeight = bannerHeightFinal;
-            CGFloat newHeight = screenHeight - bannerHeight;
-           
-
-            if (newHeight <= 0) {
-           
-                CDVPluginResult* errorResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsString:@"Invalid new height"];
-                [self.commandDelegate sendPluginResult:errorResult callbackId:command.callbackId];
-                return;
-            }
-
-            UIView *webView = [self findWebViewInView:rootViewController.view];
-            if (webView) {
-                CGRect webViewFrame = webView.frame;
-                webViewFrame.size.height = newHeight;
-                webView.frame = webViewFrame;
-            } else {
-                NSLog(@"[CordovaBodyHeight] WebView not found");
-            }
-
-            if ([setPosition isEqualToString:@"top-center"]) {
-                            CGRect currentBannerFrame = self.bannerView.frame;
-                            CGFloat expectedYPosition = safeAreaInsets.top;
-
-                            if (fabs(currentBannerFrame.origin.y - expectedYPosition) > 0.1) {
-                                CGRect bannerFrame = CGRectMake(0, expectedYPosition, screenWidth, bannerHeight);
-                                self.bannerView.frame = bannerFrame;
-                                CGRect contentFrame = rootViewController.view.frame;
-                                contentFrame.origin.y = bannerHeight + safeAreaInsets.top;
-                                contentFrame.size.height = screenHeight - (bannerHeight + safeAreaInsets.top);
-                                rootViewController.view.frame = contentFrame;
-             }
-            } else if ([setPosition isEqualToString:@"bottom-center"]) {
-
-                CGRect bannerFrame = CGRectMake(
-                    0,
-                    screenHeight - bannerHeight - safeAreaInsets.bottom + paddingWebView,
-                    screenWidth,
-                    bannerHeight
-                );
-                self.bannerView.frame = bannerFrame;
-
-                CGRect contentFrame = rootViewController.view.frame;
-                contentFrame.origin.y = 0;
-                contentFrame.size.height = screenHeight - (bannerHeight + safeAreaInsets.bottom);
-                rootViewController.view.frame = contentFrame;
-
-            } else {
-                CGRect bannerFrame = CGRectMake(
-                0,
-                screenHeight - bannerHeight - safeAreaInsets.bottom + paddingWebView,
-                screenWidth,
-                bannerHeight
-            );
-            self.bannerView.frame = bannerFrame;
-
-            CGRect contentFrame = rootViewController.view.frame;
-            contentFrame.origin.y = 0;
-            contentFrame.size.height = screenHeight - (bannerHeight + safeAreaInsets.bottom);
-            rootViewController.view.frame = contentFrame;
-
-            }
+            @try {
+                
+                UIWindow *keyWindow = [UIApplication sharedApplication].delegate.window;
+                UIViewController* rootViewController = keyWindow.rootViewController;
+                
+                if (!rootViewController) {
+                    CDVPluginResult* errorResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsString:@"Root ViewController not found"];
+                    [self.commandDelegate sendPluginResult:errorResult callbackId:command.callbackId];
+                    return;
+                }
+                
+                
+                [rootViewController.view setNeedsLayout];
+                [rootViewController.view layoutIfNeeded];
+                
+                UIEdgeInsets safeAreaInsets = rootViewController.view.safeAreaInsets;
+                
+                if (safeAreaInsets.bottom == 0) {
+                    safeAreaInsets = keyWindow.safeAreaInsets;
+                }
+                
+                CGFloat screenHeight = UIScreen.mainScreen.bounds.size.height;
+                CGFloat screenWidth = UIScreen.mainScreen.bounds.size.width;
+                CGFloat bannerHeight = bannerHeightFinal;
+                CGFloat newHeight = screenHeight - bannerHeight;
+                
+                
+                if (newHeight <= 0) {
+                    
+                    CDVPluginResult* errorResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsString:@"Invalid new height"];
+                    [self.commandDelegate sendPluginResult:errorResult callbackId:command.callbackId];
+                    return;
+                }
+                
+                UIView *webView = [self findWebViewInView:rootViewController.view];
+                if (webView) {
+                    CGRect webViewFrame = webView.frame;
+                    webViewFrame.size.height = newHeight;
+                    webView.frame = webViewFrame;
+                } else {
+                    NSLog(@"[CordovaBodyHeight] WebView not found");
+                }
+                
+                if ([setPosition isEqualToString:@"top-center"]) {
+                    CGRect currentBannerFrame = self.bannerView.frame;
+                    CGFloat expectedYPosition = safeAreaInsets.top;
+                    
+                    if (fabs(currentBannerFrame.origin.y - expectedYPosition) > 0.1) {
+                        CGRect bannerFrame = CGRectMake(0, expectedYPosition, screenWidth, bannerHeight);
+                        self.bannerView.frame = bannerFrame;
+                        CGRect contentFrame = rootViewController.view.frame;
+                        contentFrame.origin.y = bannerHeight + safeAreaInsets.top;
+                        contentFrame.size.height = screenHeight - (bannerHeight + safeAreaInsets.top);
+                        rootViewController.view.frame = contentFrame;
+                    }
+                } else if ([setPosition isEqualToString:@"bottom-center"]) {
+                    
+                    CGRect bannerFrame = CGRectMake(
+                                                    0,
+                                                    screenHeight - bannerHeight - safeAreaInsets.bottom + paddingWebView,
+                                                    screenWidth,
+                                                    bannerHeight
+                                                    );
+                    self.bannerView.frame = bannerFrame;
+                    
+                    CGRect contentFrame = rootViewController.view.frame;
+                    contentFrame.origin.y = 0;
+                    contentFrame.size.height = screenHeight - (bannerHeight + safeAreaInsets.bottom);
+                    rootViewController.view.frame = contentFrame;
+                    
+                } else {
+                    CGRect bannerFrame = CGRectMake(
+                                                    0,
+                                                    screenHeight - bannerHeight - safeAreaInsets.bottom + paddingWebView,
+                                                    screenWidth,
+                                                    bannerHeight
+                                                    );
+                    self.bannerView.frame = bannerFrame;
+                    
+                    CGRect contentFrame = rootViewController.view.frame;
+                    contentFrame.origin.y = 0;
+                    contentFrame.size.height = screenHeight - (bannerHeight + safeAreaInsets.bottom);
+                    rootViewController.view.frame = contentFrame;
+                    
+                }
                 
                 [self.bannerView setNeedsLayout];
                 [self.bannerView layoutIfNeeded];
                 [rootViewController.view setNeedsLayout];
                 [rootViewController.view layoutIfNeeded];
-
-            CDVPluginResult* result = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsDouble:newHeight];
-            [self.commandDelegate sendPluginResult:result callbackId:command.callbackId];
-        }
-        @catch (NSException* exception) {
-            NSLog(@"[CordovaBodyHeight] Exception: %@", exception.reason);
-        }
-    });
+                
+                CDVPluginResult* result = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsDouble:newHeight];
+                [self.commandDelegate sendPluginResult:result callbackId:command.callbackId];
+            }
+            @catch (NSException* exception) {
+                NSLog(@"[CordovaBodyHeight] Exception: %@", exception.reason);
+            }
+            
+        });
+    }
 }
 
 
@@ -951,7 +971,7 @@ NSString *setKeyword = @"";
 - (void)hideBannerAd:(CDVInvokedUrlCommand *)command {
   CDVPluginResult *pluginResult;
   NSString *callbackId = command.callbackId;
-  if (self.bannerView) {
+  if (self.bannerView && self.isBannerOpen) {
     dispatch_async(dispatch_get_main_queue(), ^{
       self.bannerView.hidden = YES;
       [self resetWebViewHeight];
@@ -973,6 +993,7 @@ NSString *setKeyword = @"";
     dispatch_async(dispatch_get_main_queue(), ^{
       self.bannerView.hidden = YES;
       [self.bannerView removeFromSuperview];
+      self.isBannerOpen = NO;
       self.bannerView = nil;
      [self resetWebViewHeight];
      [self fireEvent:@"" event:@"on.banner.remove" withData:nil];
@@ -1688,16 +1709,19 @@ NSString *setKeyword = @"";
     NSString *bannerLoadJsonString = [[NSString alloc] initWithData:bannerLoadJsonData encoding:NSUTF8StringEncoding];
     
     [self fireEvent:@"" event:@"on.banner.load" withData:bannerLoadJsonString];
+   
     
-    if (self.isAutoShowBanner && self.bannerView) {
-        if (!self.isOverlapping){
-            self.bannerView.hidden = NO;
-            [self setBodyHeight:command];
-        } else {
-            self.bannerView.hidden = NO;
-        }
+    
+    if (self.isAutoShowBanner && self.bannerView && !self.isBannerOpen) {
+            if (!self.isOverlapping){
+                self.bannerView.hidden = NO;
+                [self setBodyHeight:command];
+            } else {
+                self.bannerView.hidden = NO;
+            }
     }
     
+    
     __weak __typeof(self) weakSelf = self;
     self.bannerView.paidEventHandler = ^(GADAdValue *_Nonnull value) {
         __strong __typeof(weakSelf) strongSelf = weakSelf;
@@ -1771,18 +1795,23 @@ NSString *setKeyword = @"";
     if (jsonData) {
         NSString *jsonString = [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];
         [self fireEvent:@"" event:@"on.banner.failed.load" withData:jsonString];
+        self.isBannerOpen = NO;
     } else {
         // Fallback in case of JSON serialization failure
+        self.isBannerOpen = NO;
         [self fireEvent:@"" event:@"on.banner.failed.load" withData:error.localizedDescription];
     }
 }
 
 - (void)bannerViewDidRecordImpression:(GADBannerView *)bannerView {
     [self fireEvent:@"" event:@"on.banner.impression" withData:nil];
+    self.isBannerOpen = YES;
 }
 
 - (void)bannerViewWillPresentScreen:(GADBannerView *)bannerView {
     [self fireEvent:@"" event:@"on.banner.open" withData:nil];
+    self.isBannerOpen = YES;
+   
 }
 
 - (void)bannerViewWillDismissScreen:(GADBannerView *)bannerView {