cordova-plugin-admob-nextgen 1.0.2 → 1.0.3

package/README.md

@@ -78,9 +78,6 @@ Add this to your `config.xml` to restore the plugin automatically.
     <plugin name="cordova-plugin-admob-nextgen" spec="latest">
         <variable name="APP_ID_ANDROID" value="ca-app-pub-xxxxxxxxxxxxxxxx~yyyyyyyyyy" />
         <variable name="APP_ID_IOS" value="ca-app-pub-xxxxxxxxxxxxxxxx~yyyyyyyyyy" />
-        
-        <variable name="NEXT_GEN_SDK_VERSION" value="0.25.0-beta01" />
-        <variable name="UMP_VERSION" value="4.0.0" />
     </plugin>
 
 
@@ -89,9 +86,10 @@ Add this to your `config.xml` to restore the plugin automatically.
 
 **[⚡ AdMob Next Gen - Starter Templates 🚀 ](https://github.com/swaplab-engine/cordova-plugin-admob-nextgen-template)**.
 
-
 ---
 
+**[⚡ FULL Cordova - simple example 🚀 ](https://github.com/swaplab-engine/cordova-plugin-admob-nextgen/tree/main/simple-example/www/js)**.
+
 ## 2. Configuration & Initialization (CRITICAL)
 
 **IMPORTANT:** Configure Global Settings and handle Privacy Consent (UMP) **BEFORE** initializing the SDK.
@@ -240,7 +238,7 @@ Supports **Adaptive**, **Standard**, and **Collapsible** banners.
 
 ---
 
-## 4. Native Ads (Advanced Overlay)
+## 4. Native Ads (Advanced Overlay) - Android Only
 
 High-performance native templates.
 
@@ -283,7 +281,7 @@ High-performance native templates.
 
 ---
 
-## 5. Ad Preloading (Banner)
+## 5. Ad Preloading (Banner) - Android Only
 
 Use the background engine to pool ads for 0ms latency.
 

package/package.json

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

package/plugin.xml

@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?>
 <plugin id="cordova-plugin-admob-nextgen" 
-        version="1.0.2" 
+        version="1.0.3" 
         xmlns="http://apache.org/cordova/ns/plugins/1.0" 
         xmlns:android="http://schemas.android.com/apk/res/android">
 
@@ -139,6 +139,8 @@
         <source-file src="src/ios/AdMobNextGen.m" />
         <header-file src="src/ios/ConsentExecutor.h" />
         <source-file src="src/ios/ConsentExecutor.m" />
+        <header-file src="src/ios/GlobalSettingsExecutor.h" />
+        <source-file src="src/ios/GlobalSettingsExecutor.m" />
         <header-file src="src/ios/AppOpenAdExecutor.h" />
         <source-file src="src/ios/AppOpenAdExecutor.m" />
         <header-file src="src/ios/BannerExecutor.h" />

package/src/ios/AdMobNextGen.h

@@ -12,6 +12,10 @@
 - (void)requestTrackingAuthorization:(CDVInvokedUrlCommand*)command;
 - (void)getTrackingAuthorizationStatus:(CDVInvokedUrlCommand*)command;
 
+- (void)setAppVolume:(CDVInvokedUrlCommand*)command;
+- (void)setAppMuted:(CDVInvokedUrlCommand*)command;
+- (void)setRequestConfiguration:(CDVInvokedUrlCommand*)command;
+
 - (void)createBanner:(CDVInvokedUrlCommand*)command;
 - (void)showBanner:(CDVInvokedUrlCommand*)command;
 - (void)hideBanner:(CDVInvokedUrlCommand*)command;

package/src/ios/AdMobNextGen.m

@@ -1,5 +1,6 @@
 #import "AdMobNextGen.h"
 #import "ConsentExecutor.h"
+#import "GlobalSettingsExecutor.h"
 #import "BannerExecutor.h"
 #import "InterstitialExecutor.h"
 #import "RewardedExecutor.h"
@@ -8,6 +9,7 @@
 
 @interface AdMobNextGen()
 @property (nonatomic, strong) ConsentExecutor *consentExecutor;
+@property (nonatomic, strong) GlobalSettingsExecutor *globalSettingsExecutor;
 @property (nonatomic, strong) BannerExecutor *bannerExecutor;
 @property (nonatomic, strong) InterstitialExecutor *interstitialExecutor; 
 @property (nonatomic, strong) RewardedExecutor *rewardedExecutor;
@@ -19,6 +21,7 @@
 - (void)pluginInitialize {
     [super pluginInitialize];
     self.consentExecutor = [[ConsentExecutor alloc] initWithPlugin:self];
+    self.globalSettingsExecutor = [[GlobalSettingsExecutor alloc] initWithPlugin:self];
     self.bannerExecutor = [[BannerExecutor alloc] initWithPlugin:self];
     self.interstitialExecutor = [[InterstitialExecutor alloc] initWithPlugin:self]; 
     self.rewardedExecutor = [[RewardedExecutor alloc] initWithPlugin:self];
@@ -53,6 +56,10 @@
     [self.consentExecutor getTCData:command];
 }
 
+- (void)canRequestAds:(CDVInvokedUrlCommand *)command {
+    [self.consentExecutor canRequestAds:command];
+}
+
 - (void)requestTrackingAuthorization:(CDVInvokedUrlCommand *)command {
     [self.consentExecutor requestTrackingAuthorization:command];
 }
@@ -61,17 +68,18 @@
     [self.consentExecutor getTrackingAuthorizationStatus:command];
 }
 
-#pragma mark - AppOpenAd Routing
+#pragma mark - Global Settings Routing
 
-- (void)loadAppOpenAd:(CDVInvokedUrlCommand*)command {
-    NSDictionary *options = [command.arguments objectAtIndex:0];
-    if (options != nil) {
-        [[AppOpenAdExecutor sharedInstance] loadAppOpenAd:options command:command];
-    }
+- (void)setAppVolume:(CDVInvokedUrlCommand*)command {
+    [self.globalSettingsExecutor setAppVolume:command];
 }
 
-- (void)showAppOpenAd:(CDVInvokedUrlCommand*)command {
-    [[AppOpenAdExecutor sharedInstance] showAppOpenAd:command];
+- (void)setAppMuted:(CDVInvokedUrlCommand*)command {
+    [self.globalSettingsExecutor setAppMuted:command];
+}
+
+- (void)setRequestConfiguration:(CDVInvokedUrlCommand*)command {
+    [self.globalSettingsExecutor setRequestConfiguration:command];
 }
 
 #pragma mark - Banner Routing
@@ -114,8 +122,6 @@
     [self.interstitialExecutor showInterstitial:command];
 }
 
-#pragma mark - Rewarded Routing
-
 - (void)createRewarded:(CDVInvokedUrlCommand*)command {
     NSDictionary *options = [command.arguments objectAtIndex:0];
     if (options != nil) {
@@ -127,7 +133,16 @@
     [self.rewardedExecutor showRewarded:command];
 }
 
-#pragma mark - Rewarded Interstitial Routing
+- (void)loadAppOpenAd:(CDVInvokedUrlCommand*)command {
+    NSDictionary *options = [command.arguments objectAtIndex:0];
+    if (options != nil) {
+        [[AppOpenAdExecutor sharedInstance] loadAppOpenAd:options command:command];
+    }
+}
+
+- (void)showAppOpenAd:(CDVInvokedUrlCommand*)command {
+    [[AppOpenAdExecutor sharedInstance] showAppOpenAd:command];
+}
 
 - (void)createRewardedInterstitial:(CDVInvokedUrlCommand*)command {
     NSDictionary *options = [command.arguments objectAtIndex:0];

package/src/ios/BannerExecutor.m

@@ -195,9 +195,35 @@
 
             CGFloat safeTop = 0;
             if (@available(iOS 11.0, *)) {
-                UIWindow *window = UIApplication.sharedApplication.keyWindow;
-                if (!window) window = superView.window;
-                safeTop = window.safeAreaInsets.top;
+
+                UIWindow *window = webView.window;
+
+                if (!window) {
+                    if (@available(iOS 13.0, *)) {
+                        for (UIWindowScene *windowScene in [UIApplication sharedApplication].connectedScenes) {
+                            if (windowScene.activationState == UISceneActivationStateForegroundActive) {
+                                for (UIWindow *w in windowScene.windows) {
+                                    if (w.isKeyWindow) {
+                                        window = w;
+                                        break;
+                                    }
+                                }
+                            }
+                            if (window) break;
+                        }
+                    }
+                }
+
+                if (!window) {
+                    #pragma clang diagnostic push
+                    #pragma clang diagnostic ignored "-Wdeprecated-declarations"
+                    window = UIApplication.sharedApplication.keyWindow;
+                    #pragma clang diagnostic pop
+                }
+
+                if (window) {
+                    safeTop = window.safeAreaInsets.top;
+                }
             }
 
             CGRect bannerFrame = CGRectMake(0, 0, superBounds.size.width, self.activeBannerHeight);

package/src/ios/GlobalSettingsExecutor.h

@@ -0,0 +1,15 @@
+#import <Foundation/Foundation.h>
+#import <Cordova/CDV.h>
+#import <GoogleMobileAds/GoogleMobileAds.h>
+
+@class AdMobNextGen;
+
+@interface GlobalSettingsExecutor : NSObject
+
+- (instancetype)initWithPlugin:(AdMobNextGen *)plugin;
+
+- (void)setAppVolume:(CDVInvokedUrlCommand *)command;
+- (void)setAppMuted:(CDVInvokedUrlCommand *)command;
+- (void)setRequestConfiguration:(CDVInvokedUrlCommand *)command;
+
+@end

package/src/ios/GlobalSettingsExecutor.m

@@ -0,0 +1,136 @@
+#import "GlobalSettingsExecutor.h"
+#import "AdMobNextGen.h"
+
+@interface GlobalSettingsExecutor()
+@property (nonatomic, weak) AdMobNextGen *plugin;
+@end
+
+@implementation GlobalSettingsExecutor
+
+- (instancetype)initWithPlugin:(AdMobNextGen *)plugin {
+    self = [super init];
+    if (self) {
+        self.plugin = plugin;
+    }
+    return self;
+}
+
+- (void)setAppVolume:(CDVInvokedUrlCommand *)command {
+    if (command.arguments.count > 0) {
+        NSNumber *volumeNum = [command.arguments objectAtIndex:0];
+        if ([volumeNum isKindOfClass:[NSNumber class]]) {
+            float volume = [volumeNum floatValue];
+            GADMobileAds.sharedInstance.applicationVolume = volume;
+
+            CDVPluginResult* pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK];
+            [self.plugin.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
+            return;
+        }
+    }
+
+    CDVPluginResult* pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsString:@"Invalid volume value"];
+    [self.plugin.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
+}
+
+- (void)setAppMuted:(CDVInvokedUrlCommand *)command {
+    if (command.arguments.count > 0) {
+        NSNumber *mutedNum = [command.arguments objectAtIndex:0];
+        if ([mutedNum isKindOfClass:[NSNumber class]]) {
+            BOOL muted = [mutedNum boolValue];
+            GADMobileAds.sharedInstance.applicationMuted = muted;
+
+            CDVPluginResult* pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK];
+            [self.plugin.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
+            return;
+        }
+    }
+
+    CDVPluginResult* pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsString:@"Invalid mute value"];
+    [self.plugin.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
+}
+
+- (void)setRequestConfiguration:(CDVInvokedUrlCommand *)command {
+    if (command.arguments.count == 0) {
+        CDVPluginResult* pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsString:@"Configuration object required"];
+        [self.plugin.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
+        return;
+    }
+
+    NSDictionary *config = [command.arguments objectAtIndex:0];
+    if (![config isKindOfClass:[NSDictionary class]]) {
+        CDVPluginResult* pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsString:@"Invalid configuration format"];
+        [self.plugin.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
+        return;
+    }
+
+    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 (tfuaTag != nil) {
+        requestConfiguration.tagForUnderAgeOfConsent = tfuaTag;
+
+    }
+
+    if (config[@"maxAdContentRating"] != nil) {
+        NSString *rating = config[@"maxAdContentRating"];
+        if ([rating isEqualToString:@"G"]) {
+            requestConfiguration.maxAdContentRating = GADMaxAdContentRatingGeneral;
+        } else if ([rating isEqualToString:@"PG"]) {
+            requestConfiguration.maxAdContentRating = GADMaxAdContentRatingParentalGuidance;
+        } else if ([rating isEqualToString:@"T"]) {
+            requestConfiguration.maxAdContentRating = GADMaxAdContentRatingTeen;
+        } else if ([rating isEqualToString:@"MA"]) {
+            requestConfiguration.maxAdContentRating = GADMaxAdContentRatingMatureAudience;
+        }
+
+    }
+
+    if (config[@"testDeviceIds"] != nil && [config[@"testDeviceIds"] isKindOfClass:[NSArray class]]) {
+        NSArray *ids = config[@"testDeviceIds"];
+        NSMutableArray<NSString *> *testDevices = [NSMutableArray array];
+        for (id deviceId in ids) {
+            if ([deviceId isKindOfClass:[NSString class]]) {
+                [testDevices addObject:deviceId];
+            }
+        }
+        requestConfiguration.testDeviceIdentifiers = testDevices;
+
+    }
+
+    CDVPluginResult* pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsString:@"Configuration Updated"];
+    [self.plugin.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
+}
+
+#pragma mark - Helper Parsers
+
+- (NSNumber *)parseBooleanFromDict:(NSDictionary *)dict key:(NSString *)key {
+    id value = dict[key];
+
+    if (value == nil || [value isKindOfClass:[NSNull class]]) {
+        return nil; 
+    }
+
+    if ([value isKindOfClass:[NSNumber class]]) {
+        return [value boolValue] ? @YES : @NO;
+    }
+
+    if ([value isKindOfClass:[NSString class]]) {
+        NSString *strVal = (NSString *)value;
+        if ([[strVal lowercaseString] isEqualToString:@"true"]) {
+            return @YES;
+        }
+        if ([[strVal lowercaseString] isEqualToString:@"false"]) {
+            return @NO;
+        }
+    }
+
+    return nil;
+}
+
+@end