react-native-google-mobile-ads 6.2.4 → 7.0.0

package/ios/RNGoogleMobileAds/RNGoogleMobileAdsInterstitialModule.m

@@ -1,4 +1,3 @@
-//
 /**
  * Copyright (c) 2016-present Invertase Limited & Contributors
  *
@@ -16,121 +15,28 @@
  *
  */
 
-#import <React/RCTUtils.h>
+#import <React/RCTBridgeModule.h>
 
-#import "RNGoogleMobileAdsCommon.h"
-#import "RNGoogleMobileAdsFullScreenContentDelegate.h"
-#import "RNGoogleMobileAdsInterstitialModule.h"
-#import "common/RNSharedUtils.h"
-
-static __strong NSMutableDictionary *interstitialMap;
-static __strong NSMutableDictionary *interstitialDelegateMap;
-
-@implementation RNGoogleMobileAdsInterstitialModule
-#pragma mark -
-#pragma mark Module Setup
-
-RCT_EXPORT_MODULE();
+@interface RCT_EXTERN_MODULE (RNGoogleMobileAdsInterstitialModule, NSObject)
 
 - (dispatch_queue_t)methodQueue {
   return dispatch_get_main_queue();
 }
 
-- (id)init {
-  self = [super init];
-  static dispatch_once_t onceToken;
-  dispatch_once(&onceToken, ^{
-    interstitialMap = [[NSMutableDictionary alloc] init];
-    interstitialDelegateMap = [[NSMutableDictionary alloc] init];
-  });
-  return self;
-}
-
 + (BOOL)requiresMainQueueSetup {
   return YES;
 }
 
-- (void)dealloc {
-  [self invalidate];
-}
-
-- (void)invalidate {
-  for (NSNumber *id in [interstitialMap allKeys]) {
-    [interstitialMap removeObjectForKey:id];
-    [interstitialDelegateMap removeObjectForKey:id];
-  }
-}
-
-#pragma mark -
-#pragma mark Google Mobile Ads Methods
-
-RCT_EXPORT_METHOD(interstitialLoad
-                  : (nonnull NSNumber *)requestId
-                  : (NSString *)adUnitId
-                  : (NSDictionary *)adRequestOptions) {
-  GAMRequest *request = [RNGoogleMobileAdsCommon buildAdRequest:adRequestOptions];
-
-  void (^completionhandler)(GADInterstitialAd *, NSError *) = ^(GADInterstitialAd *ad,
-                                                                NSError *error) {
-    if (error) {
-      NSDictionary *codeAndMessage = [RNGoogleMobileAdsCommon getCodeAndMessageFromAdError:error];
-      [RNGoogleMobileAdsCommon sendAdEvent:GOOGLE_MOBILE_ADS_EVENT_INTERSTITIAL
-                                 requestId:requestId
-                                      type:GOOGLE_MOBILE_ADS_EVENT_ERROR
-                                  adUnitId:adUnitId
-                                     error:codeAndMessage
-                                      data:nil];
-      return;
-    }
-    GADInterstitialAd *interstitial = ad;
-    RNGoogleMobileAdsFullScreenContentDelegate *fullScreenContentDelegate =
-        [[RNGoogleMobileAdsFullScreenContentDelegate alloc] init];
-    fullScreenContentDelegate.sendAdEvent = GOOGLE_MOBILE_ADS_EVENT_INTERSTITIAL;
-    fullScreenContentDelegate.requestId = requestId;
-    fullScreenContentDelegate.adUnitId = ad.adUnitID;
-    interstitial.fullScreenContentDelegate = fullScreenContentDelegate;
-    if ([interstitial class] == [GAMInterstitialAd class]) {
-      ((GAMInterstitialAd *)interstitial).appEventDelegate = fullScreenContentDelegate;
-    }
-    interstitialMap[requestId] = interstitial;
-    interstitialDelegateMap[requestId] = fullScreenContentDelegate;
-    [RNGoogleMobileAdsCommon sendAdEvent:GOOGLE_MOBILE_ADS_EVENT_INTERSTITIAL
-                               requestId:requestId
-                                    type:GOOGLE_MOBILE_ADS_EVENT_LOADED
-                                adUnitId:ad.adUnitID
-                                   error:nil
-                                    data:nil];
-  };
-
-  if ([RNGoogleMobileAdsCommon isAdManagerUnit:adUnitId]) {
-    [GAMInterstitialAd loadWithAdManagerAdUnitID:adUnitId
-                                         request:request
-                               completionHandler:completionhandler];
-  } else {
-    [GADInterstitialAd loadWithAdUnitID:adUnitId
-                                request:request
-                      completionHandler:completionhandler];
-  }
-}
-
-RCT_EXPORT_METHOD(interstitialShow
-                  : (nonnull NSNumber *)requestId
-                  : (NSString *)adUnitId
-                  : (NSDictionary *)showOptions
-                  : (RCTPromiseResolveBlock)resolve
-                  : (RCTPromiseRejectBlock)reject) {
-  GADInterstitialAd *interstitial = interstitialMap[requestId];
-  if (interstitial) {
-    [interstitial presentFromRootViewController:RNGoogleMobileAdsCommon.currentViewController];
-    resolve([NSNull null]);
-  } else {
-    [RNSharedUtils
-        rejectPromiseWithUserInfo:reject
-                         userInfo:[@{
-                           @"code" : @"not-ready",
-                           @"message" : @"Interstitial ad attempted to show but was not ready.",
-                         } mutableCopy]];
-  }
-}
+RCT_EXTERN_METHOD(interstitialLoad
+                  : (nonnull NSNumber *)requestId forAdUnitId
+                  : (nonnull NSString *)adUnitId withAdRequestOptions
+                  : (nonnull NSDictionary *)adRequestOptions)
+
+RCT_EXTERN_METHOD(interstitialShow
+                  : (nonnull NSNumber *)requestId forAdUnitId
+                  : (nonnull NSString *)adUnitId withShowOptions
+                  : (NSDictionary *)showOptions withResolve
+                  : (RCTPromiseResolveBlock)resolve withReject
+                  : (RCTPromiseRejectBlock)reject)
 
 @end

package/ios/RNGoogleMobileAds/RNGoogleMobileAdsInterstitialModule.swift

@@ -0,0 +1,119 @@
+/**
+ * Copyright (c) 2016-present Invertase Limited & Contributors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this library except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+import Foundation
+import GoogleMobileAds
+
+@objc(RNGoogleMobileAdsInterstitialModule)
+class RNGoogleMobileAdsInterstitialModule: NSObject {
+  let ad = RNGoogleMobileAdsInterstitialAd()
+  let gamAd = RNGoogleMobileAdsGAMInterstitialAd()
+  
+  deinit {
+    invalidate()
+  }
+  
+  @objc
+  func invalidate() {
+    ad.invalidate()
+    gamAd.invalidate()
+  }
+  
+  @objc(interstitialLoad:forAdUnitId:withAdRequestOptions:)
+  func interstitialLoad(
+    requestId: NSNumber,
+    adUnitId: String,
+    adRequestOptions: Dictionary<String, Any>
+  ) {
+    if (RNGoogleMobileAdsCommon.isAdManagerUnit(adUnitId)) {
+      gamAd.load(
+        requestId: requestId.intValue,
+        adUnitId: adUnitId,
+        adRequestOptions: adRequestOptions
+      )
+    } else {
+      ad.load(
+        requestId: requestId.intValue,
+        adUnitId: adUnitId,
+        adRequestOptions: adRequestOptions
+      )
+    }
+  }
+  
+  @objc(interstitialShow:forAdUnitId:withShowOptions:withResolve:withReject:)
+  func interstitialShow(
+    requestId: NSNumber,
+    adUnitId: String,
+    showOptions: Dictionary<String, Any>,
+    resolve: RCTPromiseResolveBlock?,
+    reject: RCTPromiseRejectBlock?
+  ) {
+    if (RNGoogleMobileAdsCommon.isAdManagerUnit(adUnitId)) {
+      gamAd.show(
+        requestId: requestId.intValue,
+        adUnitId: adUnitId,
+        showOptions: showOptions,
+        resolve: resolve,
+        reject: reject
+      )
+    } else {
+      ad.show(
+        requestId: requestId.intValue,
+        adUnitId: adUnitId,
+        showOptions: showOptions,
+        resolve: resolve,
+        reject: reject
+      )
+    }
+  }
+  
+  class RNGoogleMobileAdsInterstitialAd: RNGoogleMobileAdsFullScreenAd<GADInterstitialAd> {
+    override func getAdEventName() -> String {
+      return GOOGLE_MOBILE_ADS_EVENT_INTERSTITIAL
+    }
+    
+    override func loadAd(
+      adUnitId: String,
+      adRequest: GAMRequest,
+      completionHandler: @escaping (GADInterstitialAd?, Error?) -> ()
+    ) {
+      GADInterstitialAd.load(
+        withAdUnitID: adUnitId,
+        request: adRequest,
+        completionHandler: completionHandler
+      )
+    }
+  }
+  
+  class RNGoogleMobileAdsGAMInterstitialAd: RNGoogleMobileAdsFullScreenAd<GAMInterstitialAd> {
+    override func getAdEventName() -> String {
+      return GOOGLE_MOBILE_ADS_EVENT_INTERSTITIAL
+    }
+    
+    override func loadAd(
+      adUnitId: String,
+      adRequest: GAMRequest,
+      completionHandler: @escaping (GAMInterstitialAd?, Error?) -> ()
+    ) {
+      GAMInterstitialAd.load(
+        withAdManagerAdUnitID: adUnitId,
+        request: adRequest,
+        completionHandler: completionHandler
+      )
+    }
+  }
+}

package/ios/RNGoogleMobileAds/RNGoogleMobileAdsModule.m

@@ -115,8 +115,9 @@ RCT_EXPORT_METHOD(openAdInspector
                                                         stringWithFormat:@"CODE_%d", error.code],
                                                     @"message" : error.description,
                                                   } mutableCopy]];
+                           } else {
+                             resolve(nil);
                            }
-                           resolve(nil);
                          }];
 }
 

package/ios/RNGoogleMobileAds/RNGoogleMobileAdsRewardedInterstitialModule.m

@@ -1,4 +1,3 @@
-//
 /**
  * Copyright (c) 2016-present Invertase Limited & Contributors
  *
@@ -16,158 +15,28 @@
  *
  */
 
-#import <React/RCTUtils.h>
+#import <React/RCTBridgeModule.h>
 
-#import "RNGoogleMobileAdsCommon.h"
-#import "RNGoogleMobileAdsFullScreenContentDelegate.h"
-#import "RNGoogleMobileAdsRewardedInterstitialModule.h"
-#import "common/RNSharedUtils.h"
-
-static __strong NSMutableDictionary *rewardedInterstitialMap;
-static __strong NSMutableDictionary *rewardedInterstitialDelegateMap;
-
-@implementation RNGoogleMobileAdsRewardedInterstitialModule
-#pragma mark -
-#pragma mark Module Setup
-
-RCT_EXPORT_MODULE();
+@interface RCT_EXTERN_MODULE (RNGoogleMobileAdsRewardedInterstitialModule, NSObject)
 
 - (dispatch_queue_t)methodQueue {
   return dispatch_get_main_queue();
 }
 
-- (id)init {
-  self = [super init];
-  static dispatch_once_t onceToken;
-  dispatch_once(&onceToken, ^{
-    rewardedInterstitialMap = [[NSMutableDictionary alloc] init];
-    rewardedInterstitialDelegateMap = [[NSMutableDictionary alloc] init];
-  });
-  return self;
-}
-
 + (BOOL)requiresMainQueueSetup {
   return YES;
 }
 
-- (void)dealloc {
-  [self invalidate];
-}
-
-- (void)invalidate {
-  for (NSNumber *id in [rewardedInterstitialMap allKeys]) {
-    [rewardedInterstitialMap removeObjectForKey:id];
-    [rewardedInterstitialDelegateMap removeObjectForKey:id];
-  }
-}
-
-#pragma mark -
-#pragma mark Google Mobile Ads Methods
-
-RCT_EXPORT_METHOD(rewardedInterstitialLoad
-                  : (nonnull NSNumber *)requestId
-                  : (NSString *)adUnitId
-                  : (NSDictionary *)adRequestOptions) {
-  [GADRewardedInterstitialAd
-       loadWithAdUnitID:adUnitId
-                request:[RNGoogleMobileAdsCommon buildAdRequest:adRequestOptions]
-      completionHandler:^(GADRewardedInterstitialAd *ad, NSError *error) {
-        if (error) {
-          NSDictionary *codeAndMessage =
-              [RNGoogleMobileAdsCommon getCodeAndMessageFromAdError:error];
-          [RNGoogleMobileAdsCommon sendAdEvent:GOOGLE_MOBILE_ADS_EVENT_REWARDED_INTERSTITIAL
-                                     requestId:requestId
-                                          type:GOOGLE_MOBILE_ADS_EVENT_ERROR
-                                      adUnitId:adUnitId
-                                         error:codeAndMessage
-                                          data:nil];
-          return;
-        }
-        GADRewardedInterstitialAd *rewardedInterstitialAd = ad;
-
-        NSDictionary *serverSideVerificationOptions =
-            [adRequestOptions objectForKey:@"serverSideVerificationOptions"];
-
-        if (serverSideVerificationOptions != nil) {
-          GADServerSideVerificationOptions *options =
-              [[GADServerSideVerificationOptions alloc] init];
-
-          NSString *userId = [serverSideVerificationOptions valueForKey:@"userId"];
-
-          if (userId != nil) {
-            options.userIdentifier = userId;
-          }
-
-          NSString *customData = [serverSideVerificationOptions valueForKey:@"customData"];
-
-          if (customData != nil) {
-            options.customRewardString = customData;
-          }
-
-          [rewardedInterstitialAd setServerSideVerificationOptions:options];
-        }
-
-        RNGoogleMobileAdsFullScreenContentDelegate *fullScreenContentDelegate =
-            [[RNGoogleMobileAdsFullScreenContentDelegate alloc] init];
-        fullScreenContentDelegate.sendAdEvent = GOOGLE_MOBILE_ADS_EVENT_REWARDED_INTERSTITIAL;
-        fullScreenContentDelegate.requestId = requestId;
-        fullScreenContentDelegate.adUnitId = ad.adUnitID;
-        rewardedInterstitialAd.fullScreenContentDelegate = fullScreenContentDelegate;
-        rewardedInterstitialMap[requestId] = rewardedInterstitialAd;
-        rewardedInterstitialDelegateMap[requestId] = fullScreenContentDelegate;
-        GADAdReward *reward = rewardedInterstitialAd.adReward;
-        NSMutableDictionary *data = [NSMutableDictionary dictionary];
-        if (reward.type != nil) {
-          [data setValue:reward.type forKey:@"type"];
-        }
-        if (reward.amount != nil) {
-          [data setValue:reward.amount forKey:@"amount"];
-        }
-        [RNGoogleMobileAdsCommon sendAdEvent:GOOGLE_MOBILE_ADS_EVENT_REWARDED_INTERSTITIAL
-                                   requestId:requestId
-                                        type:GOOGLE_MOBILE_ADS_EVENT_REWARDED_LOADED
-                                    adUnitId:ad.adUnitID
-                                       error:nil
-                                        data:data];
-      }];
-}
-
-RCT_EXPORT_METHOD(rewardedInterstitialShow
-                  : (nonnull NSNumber *)requestId
-                  : (NSString *)adUnitId
-                  : (NSDictionary *)showOptions
-                  : (RCTPromiseResolveBlock)resolve
-                  : (RCTPromiseRejectBlock)reject) {
-  GADRewardedInterstitialAd *rewardedInterstitialAd = rewardedInterstitialMap[requestId];
-
-  if (rewardedInterstitialAd) {
-    [rewardedInterstitialAd
-        presentFromRootViewController:RNGoogleMobileAdsCommon.currentViewController
-             userDidEarnRewardHandler:^{
-               GADAdReward *reward = rewardedInterstitialAd.adReward;
-               NSMutableDictionary *data = [NSMutableDictionary dictionary];
-               if (reward.type != nil) {
-                 [data setValue:reward.type forKey:@"type"];
-               }
-               if (reward.amount != nil) {
-                 [data setValue:reward.amount forKey:@"amount"];
-               }
-               [RNGoogleMobileAdsCommon sendAdEvent:GOOGLE_MOBILE_ADS_EVENT_REWARDED_INTERSTITIAL
-                                          requestId:requestId
-                                               type:GOOGLE_MOBILE_ADS_EVENT_REWARDED_EARNED_REWARD
-                                           adUnitId:rewardedInterstitialAd.adUnitID
-                                              error:nil
-                                               data:data];
-             }];
-  } else {
-    [RNSharedUtils
-        rejectPromiseWithUserInfo:reject
-                         userInfo:[@{
-                           @"code" : @"not-ready",
-                           @"message" :
-                               @"Rewarded Interstitial ad attempted to show but was not ready.",
-                         } mutableCopy]];
-  }
-}
+RCT_EXTERN_METHOD(rewardedInterstitialLoad
+                  : (nonnull NSNumber *)requestId forAdUnitId
+                  : (nonnull NSString *)adUnitId withAdRequestOptions
+                  : (nonnull NSDictionary *)adRequestOptions)
+
+RCT_EXTERN_METHOD(rewardedInterstitialShow
+                  : (nonnull NSNumber *)requestId forAdUnitId
+                  : (nonnull NSString *)adUnitId withShowOptions
+                  : (NSDictionary *)showOptions withResolve
+                  : (RCTPromiseResolveBlock)resolve withReject
+                  : (RCTPromiseRejectBlock)reject)
 
 @end

package/ios/RNGoogleMobileAds/RNGoogleMobileAdsRewardedInterstitialModule.swift

@@ -0,0 +1,81 @@
+/**
+ * Copyright (c) 2016-present Invertase Limited & Contributors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this library except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+import Foundation
+import GoogleMobileAds
+
+@objc(RNGoogleMobileAdsRewardedInterstitialModule)
+class RNGoogleMobileAdsRewardedInterstitialModule: NSObject {
+  let ad = RNGoogleMobileAdsRewardedInterstitialAd()
+  
+  deinit {
+    invalidate()
+  }
+  
+  @objc
+  func invalidate() {
+    ad.invalidate()
+  }
+  
+  @objc(rewardedInterstitialLoad:forAdUnitId:withAdRequestOptions:)
+  func rewardedInterstitialLoad(
+    requestId: NSNumber,
+    adUnitId: String,
+    adRequestOptions: Dictionary<String, Any>
+  ) {
+    ad.load(
+      requestId: requestId.intValue,
+      adUnitId: adUnitId,
+      adRequestOptions: adRequestOptions
+    )
+  }
+  
+  @objc(rewardedInterstitialShow:forAdUnitId:withShowOptions:withResolve:withReject:)
+  func rewardedInterstitialShow(
+    requestId: NSNumber,
+    adUnitId: String,
+    showOptions: Dictionary<String, Any>,
+    resolve: RCTPromiseResolveBlock?,
+    reject: RCTPromiseRejectBlock?
+  ) {
+    ad.show(
+      requestId: requestId.intValue,
+      adUnitId: adUnitId,
+      showOptions: showOptions,
+      resolve: resolve,
+      reject: reject
+    )
+  }
+  
+  class RNGoogleMobileAdsRewardedInterstitialAd: RNGoogleMobileAdsFullScreenAd<GADRewardedInterstitialAd> {
+    override func getAdEventName() -> String {
+      return GOOGLE_MOBILE_ADS_EVENT_REWARDED_INTERSTITIAL
+    }
+    
+    override func loadAd(
+      adUnitId: String,
+      adRequest: GAMRequest,
+      completionHandler: @escaping (GADRewardedInterstitialAd?, Error?) -> ()
+    ) {
+      GADRewardedInterstitialAd.load(
+        withAdUnitID: adUnitId,
+        request: adRequest,
+        completionHandler: completionHandler
+      )
+    }
+  }
+}