refactor: rewarded ads v8

ios/RNGoogleAds/RNGoogleAdsFullScreenContentDelegate.h

@@ -25,11 +25,7 @@
 
 @interface RNGoogleAdsFullScreenContentDelegate : NSObject <GADFullScreenContentDelegate>
 
-+ (void)sendInterstitialEvent:(NSString *)type
-                    requestId:(NSNumber *)requestId
-                     adUnitId:(NSString *)adUnitId
-                        error:(nullable NSDictionary *)error;
-
+@property(nonatomic, copy) NSString *sendAdEvent;
 @property(nonatomic, copy) NSNumber *requestId;
 @property(nonatomic, copy) NSString *adUnitId;
 

ios/RNGoogleAds/RNGoogleAdsFullScreenContentDelegate.m

@@ -20,47 +20,38 @@
 @implementation RNGoogleAdsFullScreenContentDelegate
 
 #pragma mark -
-#pragma mark Helper Methods
+#pragma mark GADFullScreenContentDelegate Methods
 
-+ (void)sendInterstitialEvent:(NSString *)type
-                    requestId:(NSNumber *)requestId
-                     adUnitId:(NSString *)adUnitId
-                        error:(nullable NSDictionary *)error {
-  [RNGoogleAdsCommon sendAdEvent:GOOGLE_ADS_EVENT_INTERSTITIAL
-                       requestId:requestId
-                            type:type
-                        adUnitId:adUnitId
-                           error:error
+/// Tells the delegate that the ad presented full screen content.
+- (void)adDidPresentFullScreenContent:(nonnull id<GADFullScreenPresentingAd>)ad {
+  [RNGoogleAdsCommon sendAdEvent:_sendAdEvent
+                       requestId:_requestId
+                            type:GOOGLE_ADS_EVENT_OPENED
+                        adUnitId:_adUnitId
+                           error:nil
                             data:nil];
 }
 
-#pragma mark -
-#pragma mark GADFullScreenContentDelegate Methods
-
 /// Tells the delegate that the ad failed to present full screen content.
 - (void)ad:(nonnull id<GADFullScreenPresentingAd>)ad
 didFailToPresentFullScreenContentWithError:(nonnull NSError *)error {
   NSDictionary *codeAndMessage = [RNGoogleAdsCommon getCodeAndMessageFromAdError:error];
-  [RNGoogleAdsFullScreenContentDelegate sendInterstitialEvent:GOOGLE_ADS_EVENT_ERROR
-                                               requestId:_requestId
-                                                adUnitId:_adUnitId
-                                                   error:codeAndMessage];
-}
-
-/// Tells the delegate that the ad presented full screen content.
-- (void)adDidPresentFullScreenContent:(nonnull id<GADFullScreenPresentingAd>)ad {
-  [RNGoogleAdsFullScreenContentDelegate sendInterstitialEvent:GOOGLE_ADS_EVENT_OPENED
-                                               requestId:_requestId
-                                                adUnitId:_adUnitId
-                                                   error:nil];
+  [RNGoogleAdsCommon sendAdEvent:_sendAdEvent
+                       requestId:_requestId
+                            type:GOOGLE_ADS_EVENT_ERROR
+                        adUnitId:_adUnitId
+                           error:codeAndMessage
+                            data:nil];
 }
 
 /// Tells the delegate that the ad dismissed full screen content.
 - (void)adDidDismissFullScreenContent:(nonnull id<GADFullScreenPresentingAd>)ad {
-  [RNGoogleAdsFullScreenContentDelegate sendInterstitialEvent:GOOGLE_ADS_EVENT_CLOSED
-                                             requestId:_requestId
-                                              adUnitId:_adUnitId
-                                                 error:nil];
+  [RNGoogleAdsCommon sendAdEvent:_sendAdEvent
+                       requestId:_requestId
+                            type:GOOGLE_ADS_EVENT_CLOSED
+                        adUnitId:_adUnitId
+                           error:nil
+                            data:nil];
 }
 
 @end

ios/RNGoogleAds/RNGoogleAdsInterstitialModule.m

@@ -82,6 +82,7 @@ - (void)invalidate {
     }
     GADInterstitialAd *interstitial = ad;
     RNGoogleAdsFullScreenContentDelegate *fullScreenContentDelegate = [[RNGoogleAdsFullScreenContentDelegate alloc] init];
+    fullScreenContentDelegate.sendAdEvent = GOOGLE_ADS_EVENT_INTERSTITIAL;
     fullScreenContentDelegate.requestId = requestId;
     fullScreenContentDelegate.adUnitId = ad.adUnitID;
     interstitial.fullScreenContentDelegate = fullScreenContentDelegate;