cordova-plugin-admob-nextgen 2.0.3 → 2.1.4-beta

package/README.md

@@ -21,7 +21,8 @@ It moves away from legacy implementations to modern `SurfaceControl`, optimized
 > (NEW) ⚡️ Next-Gen special capacitor: [capacitor-admob-nextgen](https://github.com/swaplab-engine/capacitor-admob-nextgen)
 ---
 
-## 🚀 Why Next-Gen?
+<details>
+<summary>Click to view: 🚀 Why Next-Gen?</summary>
 
 Google has introduced a fundamental shift in how ads are rendered on Android. 
 
@@ -97,9 +98,10 @@ This plugin prioritizes the safety of your AdMob account and the stability of yo
 
 * **Background Thread Loading**: All ad requests are dispatched on background threads, ensuring your app's UI never freezes.
 
-
 ---
 
+</details>
+
 
 ## Cordova/Capacitor/Framework7 AdMob Next-Gen: 
 
@@ -115,9 +117,9 @@ This plugin is regularly updated to support the latest standards.
 
 | Component | Platform | Version | Release Notes |
 | :--- | :--- | :--- | :--- |
-| **GMA Next-Gen SDK** | Android | **1.4.0** | [View Notes](https://developers.google.com/admob/android/next-gen/rel-notes) |
+| **GMA Next-Gen SDK** | Android | **1.5.0** | [View Notes](https://developers.google.com/admob/android/next-gen/rel-notes) |
 | **UMP SDK** | Android | **4.0.0** | [View Notes](https://developers.google.com/admob/android/privacy/release-notes) |
-| **Mobile Ads SDK** | iOS | **13.10.0** | [View Notes](https://developers.google.com/admob/ios/rel-notes) |
+| **Mobile Ads SDK** | iOS | **13.11.0** | [View Notes](https://developers.google.com/admob/ios/rel-notes) |
 | **UMP SDK** | iOS | **3.1.0** | [View Notes](https://developers.google.com/ad-manager/mobile-ads-sdk/ios/privacy/download) |
 
 ### 🎉 View all plugin release notes
@@ -143,6 +145,9 @@ Add this to your `config.xml` to restore the plugin automatically.
 
 ---
 
+### 📱 iOS 27 & iPhone Duo Support 
+- 👉 [**Releases notes**](https://github.com/swaplab-engine/cordova-plugin-admob-nextgen/releases/tag/2.1.4-beta)
+
 ## (Optional)
 
 ### Supporting Mediation: **[⚡ admob-mediation-suite ](https://github.com/swaplab-engine/admob-mediation-suite)** (Optional)
@@ -638,30 +643,8 @@ document.addEventListener('on.rewarded.loaded', (e) => {
 
 ---
 
-
 ## ⚖️ Revenue Policy
 
-**No Ad-Sharing. No Hidden Fees.**
-
-Unlike many other free plugins, this project is clean:
 * **0% Revenue Share:** This plugin do not inject our own Ad Unit IDs into your traffic.
 * **100% Control:** Every impression and click goes directly to your AdMob account.
-* **Transparent Source:** The code is open source. You can verify that no third-party SDKs or hidden backdoors exist.
-
----
-
-## ❤️ Support the Project
-
-This plugin is developed and maintained in my free time. 
-If it saved you hours of work, consider supporting the development!
-
-<a href="https://www.buymeacoffee.com/emi.indo" target="_blank">
-  <img src="https://cdn.buymeacoffee.com/buttons/v2/default-yellow.png" alt="Buy Me A Coffee" style="height: 60px !important;width: 217px !important;" >
-</a>
-
-Your support helps me keep the dependencies updated and the cleaner script running smoothly.
-
-
-<p align="center">
-  Built with ❤️ by <b>Swaplab Engine</b> (formerly EMI-INDO).
-</p>
+* **Transparent Source:** The code is open source.

package/capacitor-hook-admob-ids.js

@@ -158,7 +158,7 @@ function run() {
             admob = {
                 APP_ID_ANDROID: appIdAndroid ? appIdAndroid[1] : "ca-app-pub-3940256099942544~3347511713",
                 APP_ID_IOS: appIdIos ? appIdIos[1] : "ca-app-pub-3940256099942544~1458002511",
-                NEXT_GEN_SDK_VERSION: sdk ? sdk[1] : "1.4.0",
+                NEXT_GEN_SDK_VERSION: sdk ? sdk[1] : "1.5.0",
                 UMP_VERSION: ump ? ump[1] : "4.0.0"
             };
         }
@@ -167,7 +167,7 @@ function run() {
         injectExclusionRules();
         if (admob?.NEXT_GEN_SDK_VERSION || admob?.UMP_VERSION) {
             updateGradleDependencies(
-                admob.NEXT_GEN_SDK_VERSION || "1.4.0",
+                admob.NEXT_GEN_SDK_VERSION || "1.5.0",
                 admob.UMP_VERSION || "4.0.0"
             );
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cordova-plugin-admob-nextgen",
-  "version": "2.0.3",
+  "version": "2.1.4-beta",
   "description": "Google Mobile Ads Next Gen SDK for Cordova. High performance and modular architecture. ",
   "cordova": {
     "id": "cordova-plugin-admob-nextgen",

package/plugin.xml

@@ -54,7 +54,7 @@
         
     </platform>
 
-    <preference name="NEXT_GEN_SDK_VERSION" default="1.4.0" />
+    <preference name="NEXT_GEN_SDK_VERSION" default="1.5.0" />
     <preference name="UMP_VERSION" default="4.0.0" />
     <!-- Sample AdMob app ID: ca-app-pub-3940256099942544~3347511713 -->
     <preference name="APP_ID_ANDROID" default="ca-app-pub-3940256099942544~3347511713" />
@@ -139,7 +139,7 @@
             </config>
             <pods use-frameworks="true">
                 <pod name="GoogleUserMessagingPlatform" spec="~> 3.1.0" />
-                <pod name="Google-Mobile-Ads-SDK" spec="~> 13.10.0" />
+                <pod name="Google-Mobile-Ads-SDK" spec="~> 13.11.0" />
             </pods>
         </podspec>
 

package/src/android/ConsentExecutor.java

@@ -148,7 +148,7 @@ public class ConsentExecutor {
             String purposeConsents = prefs.getString("IABTCF_PurposeConsents", "");
             String purposeLegitimateInterests = prefs.getString("IABTCF_PurposeLegitimateInterests", ""); 
             String vendorConsents = prefs.getString("IABTCF_VendorConsents", "");
-            int gdprApplies = prefs.getInt("IABTCF_gdprApplies", 0);
+            int gdprApplies = prefs.getInt("IABTCF_gdprApplies", -1);
 
             tcData.put("purposeConsents", purposeConsents);
             tcData.put("purposeLegitimateInterests", purposeLegitimateInterests);
@@ -162,7 +162,15 @@ public class ConsentExecutor {
             boolean isAdMobNonPersonalizedAdsAllowed = false;
             String adMobConsentStatus = "Unknown";
 
-            if (gdprApplies == 0) {
+            if (gdprApplies == -1) {
+
+                statusMessage = "TCF data missing. Consent not yet gathered.";
+                adMobConsentStatus = "UNKNOWN";
+
+                isPersonalizedAllowed = false;
+                isAdMobPersonalizedAdsAllowed = false;
+                isAdMobNonPersonalizedAdsAllowed = false;
+            } else if (gdprApplies == 0) {
 
                 isPersonalizedAllowed = true;
                 statusMessage = "Not GDPR region. Personalized Ads allowed by default.";

package/src/ios/AdMobNextGen.m

@@ -54,14 +54,16 @@
             }
         }
 
-        if (options[@"tagForChildDirectedTreatment"]) {
-            BOOL isChildDirected = [options[@"tagForChildDirectedTreatment"] boolValue];
-            requestConfig.tagForChildDirectedTreatment = @(isChildDirected);
-        }
-
-        if (options[@"tagForUnderAgeOfConsent"]) {
-            BOOL isUnderAge = [options[@"tagForUnderAgeOfConsent"] boolValue];
-            requestConfig.tagForUnderAgeOfConsent = @(isUnderAge);
+        NSNumber *childDirected = options[@"tagForChildDirectedTreatment"];
+        NSNumber *underAge = options[@"tagForUnderAgeOfConsent"];
+
+        if (childDirected != nil && [childDirected boolValue]) {
+            requestConfig.ageRestrictedTreatment = GADAgeRestrictedTreatmentChild;
+        } else if (underAge != nil && [underAge boolValue]) {
+            requestConfig.ageRestrictedTreatment = GADAgeRestrictedTreatmentTeen;
+        } else if ((childDirected != nil && ![childDirected boolValue]) || 
+                   (underAge != nil && ![underAge boolValue])) {
+            requestConfig.ageRestrictedTreatment = GADAgeRestrictedTreatmentUnspecified;
         }
     }
 

package/src/ios/BannerExecutor.m

@@ -1,12 +1,28 @@
 #import "BannerExecutor.h"
 #import "AdMobNextGen.h"
 
+@interface BoundsObserverView : UIView
+@property (nonatomic, copy) void (^onBoundsChanged)(CGRect bounds);
+@end
+
+@implementation BoundsObserverView
+- (void)layoutSubviews {
+    [super layoutSubviews];
+    if (self.onBoundsChanged) {
+        self.onBoundsChanged(self.bounds);
+    }
+}
+@end
+
 @interface BannerExecutor ()
 
 @property(nonatomic, weak) AdMobNextGen *plugin;
 @property(nonatomic, strong) GADBannerView *bannerView;
 @property(nonatomic, strong) GADBannerView *pendingBannerView;
 
+@property(nonatomic, strong) BoundsObserverView *boundsObserverView;
+@property(nonatomic, assign) CGFloat lastObservedWidth;
+
 @property(nonatomic, strong) NSString *lastAdUnitId;
 @property(nonatomic, strong) NSString *lastSizeStr;
 @property(nonatomic, strong) NSString *currentPosition;
@@ -48,17 +64,15 @@
         self.lastLoadTime = 0;
         self.minLoadInterval = 5.0;
 
-        [[NSNotificationCenter defaultCenter]
-            addObserver:self
-               selector:@selector(layoutViews)
-                   name:UIDeviceOrientationDidChangeNotification
-                 object:nil];
     }
     return self;
 }
 
 - (void)dealloc {
-    [[NSNotificationCenter defaultCenter] removeObserver:self];
+    dispatch_async(dispatch_get_main_queue(), ^{
+            [self.boundsObserverView removeFromSuperview];
+            self.boundsObserverView = nil;
+        });
 }
 
 #pragma mark - Smart Window Helper
@@ -90,6 +104,49 @@
     return window;
 }
 
+- (void)startObservingBounds {
+    if (self.boundsObserverView != nil) return;
+
+    UIViewController *rootVC = self.plugin.viewController;
+    if (!rootVC) return;
+
+    self.lastObservedWidth = rootVC.view.bounds.size.width;
+
+    BoundsObserverView *observerView = [[BoundsObserverView alloc] init];
+    observerView.userInteractionEnabled = NO;
+    observerView.backgroundColor = [UIColor clearColor];
+    observerView.translatesAutoresizingMaskIntoConstraints = NO;
+
+    [rootVC.view addSubview:observerView];
+    [rootVC.view sendSubviewToBack:observerView];
+
+    [NSLayoutConstraint activateConstraints:@[
+        [observerView.leadingAnchor constraintEqualToAnchor:rootVC.view.leadingAnchor],
+        [observerView.trailingAnchor constraintEqualToAnchor:rootVC.view.trailingAnchor],
+        [observerView.topAnchor constraintEqualToAnchor:rootVC.view.topAnchor],
+        [observerView.bottomAnchor constraintEqualToAnchor:rootVC.view.bottomAnchor]
+    ]];
+
+    __weak typeof(self) weakSelf = self;
+    observerView.onBoundsChanged = ^(CGRect bounds) {
+        dispatch_async(dispatch_get_main_queue(), ^{
+            [weakSelf layoutViews];
+
+            CGFloat currentWidth = bounds.size.width;
+            if (fabs(weakSelf.lastObservedWidth - currentWidth) > 1.0) {
+                weakSelf.lastObservedWidth = currentWidth;
+
+                if (weakSelf.lastAdUnitId.length > 0) {
+                    NSString *jsonStr = @"{\"orientation\":\"RESIZE\"}";
+                    [weakSelf.plugin fireEvent:@"document" event:@"on.banner.orientation.changed" withData:jsonStr];
+                }
+            }
+        });
+    };
+
+    self.boundsObserverView = observerView;
+}
+
 #pragma mark - Main Methods
 
 - (void)createBanner:(NSDictionary *)options
@@ -120,6 +177,9 @@
     }
 
     dispatch_async(dispatch_get_main_queue(), ^{
+
+      [self startObservingBounds];
+
       NSTimeInterval currentTime = [[NSDate date] timeIntervalSince1970];
 
       if (self.isLoading) {
@@ -247,79 +307,85 @@
     if ([sizeStr isEqualToString:@"LEADERBOARD"])
         return GADAdSizeLeaderboard;
 
-    UIViewController *rootViewController = self.plugin.viewController;
-    CGRect frame = rootViewController.view.frame;
-    if (@available(iOS 11.0, *)) {
-        frame = UIEdgeInsetsInsetRect(rootViewController.view.frame,
-                                      rootViewController.view.safeAreaInsets);
-    }
-    return GADCurrentOrientationAnchoredAdaptiveBannerAdSizeWithWidth(
-        frame.size.width);
+        UIWindow *window = [self getKeyWindow];
+        CGFloat screenW = window ? window.bounds.size.width : UIScreen.mainScreen.bounds.size.width;
+
+        if (window) {
+            screenW -= (window.safeAreaInsets.left + window.safeAreaInsets.right);
+        }
+
+        if ([sizeStr isEqualToString:@"LARGE_ANCHORED_ADAPTIVE"]) {
+            return GADLargeAnchoredAdaptiveBannerAdSizeWithWidth(screenW);
+        }
+
+    #pragma clang diagnostic push
+    #pragma clang diagnostic ignored "-Wdeprecated-declarations"
+        return GADCurrentOrientationAnchoredAdaptiveBannerAdSizeWithWidth(screenW);
+    #pragma clang diagnostic pop
 }
 
 - (void)layoutViews {
     dispatch_async(dispatch_get_main_queue(), ^{
-      UIViewController *rootVC = self.plugin.viewController;
-      UIView *webView = self.plugin.webView;
-      if (!rootVC || !webView)
-          return;
+        UIViewController *rootVC = self.plugin.viewController;
+        UIView *webView = self.plugin.webView;
+        if (!rootVC || !webView) return;
 
-      UIWindow *window = [self getKeyWindow];
-      UIEdgeInsets safeArea =
-          (window) ? window.safeAreaInsets : UIEdgeInsetsZero;
+        UIWindow *window = [self getKeyWindow];
+        if (!window) return;
 
-      CGFloat screenH = UIScreen.mainScreen.bounds.size.height;
-      CGFloat screenW = UIScreen.mainScreen.bounds.size.width;
+        UIEdgeInsets safeArea = window.safeAreaInsets;
 
-      if (safeArea.bottom == 0 && screenH >= 812.0)
-          safeArea.bottom = 34.0;
-      if (safeArea.top == 0 && screenH >= 812.0)
-          safeArea.top = 44.0;
+        CGFloat screenH = window.bounds.size.height;
+        CGFloat screenW = window.bounds.size.width;
 
-      CGRect fullScreenRect = CGRectMake(0, 0, screenW, screenH);
+        if (safeArea.bottom == 0 && screenH >= 812.0) safeArea.bottom = 34.0;
+        if (safeArea.top == 0 && screenH >= 812.0) safeArea.top = 44.0;
 
-      if (self.isBannerVisible && self.bannerView &&
-          self.activeBannerHeight > 0) {
+        CGRect fullScreenRect = CGRectMake(0, 0, screenW, screenH);
 
-          CGSize adSize = self.bannerView.intrinsicContentSize;
-          CGFloat bH =
-              adSize.height > 0 ? adSize.height : self.activeBannerHeight;
-          CGFloat bW = adSize.width > 0 ? adSize.width
-                                        : self.bannerView.bounds.size.width;
-          CGFloat bX = (screenW - bW) / 2.0;
-          CGFloat bY = 0;
+        if (self.isBannerVisible && self.bannerView && self.activeBannerHeight > 0) {
+            CGSize adSize = self.bannerView.intrinsicContentSize;
+            CGFloat bH = adSize.height > 0 ? adSize.height : self.activeBannerHeight;
+            CGFloat bW = adSize.width > 0 ? adSize.width : self.bannerView.bounds.size.width;
+            CGFloat bX = (screenW - bW) / 2.0;
+            CGFloat bY = 0;
 
-          if ([self.currentPosition isEqualToString:@"top"]) {
-              bY = safeArea.top;
-          } else {
-              bY = screenH - safeArea.bottom - bH;
-          }
+            if ([self.currentPosition isEqualToString:@"top"]) {
+                bY = safeArea.top;
+                self.bannerView.frame = CGRectMake(bX, bY, bW, bH);
+                self.bannerView.hidden = NO;
 
-          self.bannerView.frame = CGRectMake(bX, bY, bW, bH);
-          self.bannerView.hidden = NO;
-
-          if (!self.isOverlapping) {
-              CGRect newWebFrame = fullScreenRect;
-              if ([self.currentPosition isEqualToString:@"top"]) {
-                  newWebFrame.origin.y = bY + bH;
-                  newWebFrame.size.height = screenH - newWebFrame.origin.y;
-              } else {
-                  newWebFrame.origin.y = 0;
-                  newWebFrame.size.height = bY;
-              }
-              webView.frame = newWebFrame;
-          } else {
-              webView.frame = fullScreenRect;
-          }
-      } else {
-          if (self.bannerView)
-              self.bannerView.hidden = YES;
-          webView.frame = fullScreenRect;
-      }
+                if (!self.isOverlapping) {
+                    CGRect newWebFrame = fullScreenRect;
 
-      if (self.bannerView && self.isBannerVisible) {
-          [webView.superview bringSubviewToFront:self.bannerView];
-      }
+                    newWebFrame.origin.y = bY + bH;
+                    newWebFrame.size.height = screenH - (bY + bH);
+                    webView.frame = newWebFrame;
+                } else {
+                    webView.frame = fullScreenRect;
+                }
+            } else {
+                bY = screenH - safeArea.bottom - bH;
+                self.bannerView.frame = CGRectMake(bX, bY, bW, bH);
+                self.bannerView.hidden = NO;
+
+                if (!self.isOverlapping) {
+                    CGRect newWebFrame = fullScreenRect;
+                    newWebFrame.origin.y = 0;
+                    newWebFrame.size.height = bY;
+                    webView.frame = newWebFrame;
+                } else {
+                    webView.frame = fullScreenRect;
+                }
+            }
+        } else {
+            if (self.bannerView) self.bannerView.hidden = YES;
+            webView.frame = fullScreenRect;
+        }
+
+        if (self.bannerView && self.isBannerVisible) {
+            [webView.superview bringSubviewToFront:self.bannerView];
+        }
     });
 }
 

package/src/ios/ConsentExecutor.m

@@ -113,7 +113,9 @@
             NSString *purposeLegitimateInterests = [prefs stringForKey:@"IABTCF_PurposeLegitimateInterests"] ?: @""; 
             NSString *vendorConsents = [prefs stringForKey:@"IABTCF_VendorConsents"] ?: @"";
             NSString *additionalConsent = [prefs stringForKey:@"IABTCF_AddtlConsent"] ?: @"";
-            NSInteger gdprApplies = [prefs integerForKey:@"IABTCF_gdprApplies"];
+
+            id gdprAppliesObj = [prefs objectForKey:@"IABTCF_gdprApplies"];
+            NSInteger gdprApplies = gdprAppliesObj ? [gdprAppliesObj integerValue] : -1;
 
             tcData[@"purposeConsents"] = purposeConsents;
             tcData[@"purposeLegitimateInterests"] = purposeLegitimateInterests; 
@@ -128,7 +130,15 @@
             BOOL isAdMobNonPersonalizedAdsAllowed = NO;
             NSString *adMobConsentStatus = @"Unknown";
 
-            if (gdprApplies == 0) {
+            if (gdprAppliesObj == nil) {
+
+                statusMessage = @"TCF data missing. Consent not yet gathered.";
+                adMobConsentStatus = @"UNKNOWN";
+
+                isPersonalizedAllowed = NO;
+                isAdMobPersonalizedAdsAllowed = NO;
+                isAdMobNonPersonalizedAdsAllowed = NO;
+            } else if (gdprApplies == 0) {
                 isPersonalizedAllowed = YES;
                 statusMessage = @"Not GDPR region. Personalized Ads allowed by default.";
 

package/src/ios/GlobalSettingsExecutor.m

@@ -66,14 +66,17 @@
     GADRequestConfiguration *requestConfiguration = GADMobileAds.sharedInstance.requestConfiguration;
 
     NSNumber *coppaTag = [self parseBooleanFromDict:config key:@"tagForChildDirectedTreatment"];
-    if (coppaTag != nil) {
-        requestConfiguration.tagForChildDirectedTreatment = coppaTag;
+    NSNumber *tfuaTag = [self parseBooleanFromDict:config key:@"tagForUnderAgeOfConsent"];
 
-    }
+    if (coppaTag != nil && [coppaTag boolValue]) {
+        requestConfiguration.ageRestrictedTreatment = GADAgeRestrictedTreatmentChild;
 
-    NSNumber *tfuaTag = [self parseBooleanFromDict:config key:@"tagForUnderAgeOfConsent"];
-    if (tfuaTag != nil) {
-        requestConfiguration.tagForUnderAgeOfConsent = tfuaTag;
+    } else if (tfuaTag != nil && [tfuaTag boolValue]) {
+        requestConfiguration.ageRestrictedTreatment = GADAgeRestrictedTreatmentTeen;
+
+    } else if ((coppaTag != nil && ![coppaTag boolValue]) || 
+               (tfuaTag != nil && ![tfuaTag boolValue])) {
+        requestConfiguration.ageRestrictedTreatment = GADAgeRestrictedTreatmentUnspecified;
 
     }