add .subscribe function to AdManager

ammarahm-ed · ammarahm-ed · commit e27695800fa9 · 2023-07-05T08:44:19.000+05:00
diff --git a/android/src/main/java/com/ammarahmed/rnadmob/nativeads/RNAdMobUnifiedAdQueueWrapper.java b/android/src/main/java/com/ammarahmed/rnadmob/nativeads/RNAdMobUnifiedAdQueueWrapper.java
@@ -79,7 +79,7 @@ public void onAdFailedToLoad(LoadAdError adError) {
                     error.putInt("code", adError.getCode());
                     error.putString("domain", adError.getDomain());
                     event.putMap("error", error);
-                    EventEmitter.sendEvent((ReactContext) mContext, CacheManager.EVENT_AD_PRELOAD_ERROR, event);
+                    EventEmitter.sendEvent((ReactContext) mContext, CacheManager.EVENT_AD_PRELOAD_ERROR + ":" + name, event);
                     notifyOnAdsLoadFailed(adError);
                     return;
                 }
@@ -91,7 +91,7 @@ public void onAdFailedToLoad(LoadAdError adError) {
                     error.putInt("code", AdRequest.ERROR_CODE_INTERNAL_ERROR);
                     error.putString("domain", "");
                     event.putMap("error", error);
-                    EventEmitter.sendEvent((ReactContext) mContext, CacheManager.EVENT_AD_PRELOAD_ERROR, event);
+                    EventEmitter.sendEvent((ReactContext) mContext, CacheManager.EVENT_AD_PRELOAD_ERROR + ":" + name, event);
                     notifyOnAdsLoadFailed(adError);
                     return;
                 }
@@ -108,31 +108,36 @@ public void run() {
             @Override
             public void onAdImpression() {
                 super.onAdImpression();
-                EventEmitter.sendEvent((ReactContext) mContext, CacheManager.EVENT_AD_IMPRESSION, null);
+                EventEmitter.sendEvent((ReactContext) mContext, CacheManager.EVENT_AD_IMPRESSION + ":" + name, null);
+
             }
 
             @Override
             public void onAdClosed() {
                 super.onAdClosed();
-                EventEmitter.sendEvent((ReactContext) mContext, CacheManager.EVENT_AD_CLOSED, null);
+                EventEmitter.sendEvent((ReactContext) mContext, CacheManager.EVENT_AD_CLOSED + ":" + name, null);
+
             }
 
             @Override
             public void onAdOpened() {
                 super.onAdOpened();
-                EventEmitter.sendEvent((ReactContext) mContext, CacheManager.EVENT_AD_OPEN, null);
+                EventEmitter.sendEvent((ReactContext) mContext, CacheManager.EVENT_AD_OPEN + ":" + name, null);
+
             }
 
             @Override
             public void onAdClicked() {
                 super.onAdClicked();
-                EventEmitter.sendEvent((ReactContext) mContext, CacheManager.EVENT_AD_CLICKED, null);
+                Log.d("RNADMOB", CacheManager.EVENT_AD_CLICKED + ":" + name);
+                EventEmitter.sendEvent((ReactContext) mContext, CacheManager.EVENT_AD_CLICKED + ":" + name, null);
 
             }
 
             @Override
             public void onAdLoaded() {
                 super.onAdLoaded();
+
                 retryCount = 0;
                 if (mediation) {
                     loadingAdRequestCount--;
diff --git a/android/src/main/java/com/ammarahmed/rnadmob/nativeads/RNAdmobNativeView.java b/android/src/main/java/com/ammarahmed/rnadmob/nativeads/RNAdmobNativeView.java
@@ -4,6 +4,7 @@
 import android.os.Handler;
 import android.view.LayoutInflater;
 import android.view.View;
+import android.view.ViewGroup;
 import android.widget.LinearLayout;
 
 import androidx.annotation.NonNull;
@@ -304,6 +305,7 @@ private void getAdFromRepository() {
                 if (adListener != null)
                     adListener.onAdFailedToLoad(new LoadAdError(3, "The requested repo is not registered", "", null, null));
             } else {
+                CacheManager.instance.attachAdListener(adRepo, adListener);
                 if (CacheManager.instance.numberOfAds(adRepo) != 0) {
                     unifiedNativeAdContainer = CacheManager.instance.getNativeAd(adRepo);
 
@@ -319,10 +321,7 @@ private void getAdFromRepository() {
                     }
                 } else {
                     if (!CacheManager.instance.isLoading(adRepo)) {
-                        CacheManager.instance.attachAdListener(adRepo, adListener);
                         CacheManager.instance.requestAds(adRepo);
-                    } else {
-                        CacheManager.instance.attachAdListener(adRepo, adListener);
                     }
                 }
             }
diff --git a/android/src/main/java/com/ammarahmed/rnadmob/nativeads/RNAdmobNativeViewManager.java b/android/src/main/java/com/ammarahmed/rnadmob/nativeads/RNAdmobNativeViewManager.java
@@ -266,7 +266,9 @@ public void onDropViewInstance(@NonNull RNAdmobNativeView nativeAdWrapper) {
             }
         }
         if (nativeAdWrapper.nativeAdView != null){
+            nativeAdWrapper.nativeAdView.removeAllViews();
             nativeAdWrapper.nativeAdView.destroy();
+            nativeAdWrapper.removeAllViews();
         }
     }
 
diff --git a/android/src/main/java/com/ammarahmed/rnadmob/nativeads/Utils.java b/android/src/main/java/com/ammarahmed/rnadmob/nativeads/Utils.java
@@ -20,11 +20,13 @@ public static void setTargetingOptions(ReadableMap options, AdManagerAdRequest.B
         if (options == null) return;
         if (options.hasKey("targets")) {
             ReadableArray targets = options.getArray("targets");
+
             for (int i = 0; i < targets.size(); i++) {
                 ReadableMap target = targets.getMap(i);
                 String key = target.getString("key");
                 if (target.getType("value") == ReadableType.Array) {
                     List list = Arguments.toList(target.getArray("value"));
+
                     adRequest.addCustomTargeting(key, list);
                 } else {
                     adRequest.addCustomTargeting(key, target.getString("value"));
diff --git a/ios/RNAdMobManager/CacheManager.h b/ios/RNAdMobManager/CacheManager.h
@@ -15,8 +15,13 @@
 @interface CacheManager:NSObject
 
 + (CacheManager*)sharedInstance;
-+ (NSString*)  EVENT_AD_PRELOAD_LOADED;
-+ (NSString*)  EVENT_AD_PRELOAD_ERROR;
++ (NSString *)EVENT_AD_PRELOAD_LOADED:(NSString *)name;
++ (NSString *)EVENT_AD_PRELOAD_ERROR:(NSString *)name;
++ (NSString *)EVENT_AD_CLOSED:(NSString *)name;
++ (NSString *)EVENT_AD_OPEN:(NSString *)name;
++ (NSString *)EVENT_AD_CLICKED:(NSString *)name;
++ (NSString *)EVENT_AD_IMPRESSION:(NSString *)name;
+
 
 -(BOOL) isLoading:(NSString*) id;
 -(NSInteger)  numberOfAds:(NSString*) id;
diff --git a/ios/RNAdMobManager/CacheManager.m b/ios/RNAdMobManager/CacheManager.m
@@ -15,8 +15,12 @@ @implementation CacheManager{
     NSMutableDictionary *repositoriesMap;
 }
 
-+ (NSString *)EVENT_AD_PRELOAD_LOADED { return @"onAdPreloadLoaded"; }
-+ (NSString *)EVENT_AD_PRELOAD_ERROR { return @"onAdPreloadError"; }
++ (NSString *)EVENT_AD_PRELOAD_LOADED:(NSString *)name { return [@"onAdPreloadLoaded" stringByAppendingString:[@":" stringByAppendingString:name]]; }
++ (NSString *)EVENT_AD_PRELOAD_ERROR:(NSString *)name { return [@"onAdPreloadError" stringByAppendingString:[@":" stringByAppendingString:name]]; }
++ (NSString *)EVENT_AD_CLOSED:(NSString *)name { return [@"onAdPreloadClosed" stringByAppendingString:[@":" stringByAppendingString:name]]; }
++ (NSString *)EVENT_AD_OPEN:(NSString *)name { return [@"onAdPreloadOpen" stringByAppendingString:[@":" stringByAppendingString:name]]; }
++ (NSString *)EVENT_AD_CLICKED:(NSString *)name { return [@"onAdPreloadClicked" stringByAppendingString:[@":" stringByAppendingString:name]]; }
++ (NSString *)EVENT_AD_IMPRESSION:(NSString *)name { return [@"onAdPreloadImpression" stringByAppendingString:[@":" stringByAppendingString:name]]; }
 
 static CacheManager *_sharedInstance = nil;
 
diff --git a/ios/RNAdMobManager/RNAdMobUnifiedAdQueueWrapper.m b/ios/RNAdMobManager/RNAdMobUnifiedAdQueueWrapper.m
@@ -194,13 +194,29 @@ - (void)adLoader:(nonnull GADAdLoader *)adLoader didReceiveNativeAd:(nonnull GAD
     for (id<AdListener> listener in [attachedAdListeners copy]){
         [listener didAdLoaded:nativeAd];
     }
+    [EventEmitter.sharedInstance sendEvent:[CacheManager EVENT_AD_PRELOAD_LOADED:_name] dict:nil];
 
     if (loadingAdRequestCount == 0){
         [self fillAds];//fill up repository if need
     }
     // The adLoader has finished loading ads, and a new request can be sent.
 }
 
+- (void)nativeAdDidRecordClick:(GADNativeAd *)nativeAd {
+    [EventEmitter.sharedInstance sendEvent:[CacheManager EVENT_AD_CLICKED:_name] dict:nil];
+}
+
+- (void)nativeAdDidRecordImpression:(GADNativeAd *)nativeAd {
+    [EventEmitter.sharedInstance sendEvent:[CacheManager EVENT_AD_IMPRESSION:_name] dict:nil];
+}
+
+- (void)nativeAdWillPresentScreen:(GADNativeAd *)nativeAd {
+    [EventEmitter.sharedInstance sendEvent:[CacheManager EVENT_AD_OPEN:_name] dict:nil];
+}
+
+- (void)nativeAdDidDismissScreen:(GADNativeAd *)nativeAd {
+    [EventEmitter.sharedInstance sendEvent:[CacheManager EVENT_AD_CLOSED:_name] dict:nil];
+}
 
 - (void)adLoader:(nonnull GADAdLoader *)adLoader didFailToReceiveAdWithError:(nonnull NSError *)error {
       if(_isMediationEnabled){
@@ -230,7 +246,8 @@ - (void)adLoader:(nonnull GADAdLoader *)adLoader didFailToReceiveAdWithError:(no
                 @"error":errorDic,
             };
 
-            [EventEmitter.sharedInstance sendEvent:CacheManager.EVENT_AD_PRELOAD_ERROR dict:event];
+            [EventEmitter.sharedInstance sendEvent:[CacheManager EVENT_AD_PRELOAD_ERROR:_name] dict:event];
+        
             for (id<AdListener> listener in [attachedAdListeners copy]){
                [listener didFailToReceiveAdWithError:error];
              }
@@ -246,7 +263,7 @@ - (void)adLoader:(nonnull GADAdLoader *)adLoader didFailToReceiveAdWithError:(no
             NSDictionary *event = @{
                 @"error":errorDic,
             };
-        [EventEmitter.sharedInstance sendEvent:CacheManager.EVENT_AD_PRELOAD_ERROR dict:event];
+        [EventEmitter.sharedInstance sendEvent:[CacheManager EVENT_AD_PRELOAD_ERROR:_name] dict:event];
         for (id<AdListener> listener in [attachedAdListeners copy]){
            [listener didFailToReceiveAdWithError:error];
          }
diff --git a/ios/RNAdMobManager/RNGADNativeView.m b/ios/RNAdMobManager/RNGADNativeView.m
@@ -106,7 +106,12 @@ - (void)setTargetingOptions:(NSDictionary *)targetingOptions {
     NSArray *allKeys = [targetingOptions allKeys];
 
     if ([allKeys containsObject:@"targets"]) {
-        [adRequest setCustomTargeting:(NSDictionary *) [targetingOptions objectForKey:@"targets"]];
+        NSArray *array = [targetingOptions objectForKey:@"targets"];
+        NSMutableDictionary *dic = [[NSMutableDictionary alloc] init];
+        for (NSDictionary *object in array) {
+            [dic setValue:[object valueForKey:@"key"] forKey:[object valueForKey:@"value"]];
+        }
+        [adRequest setCustomTargeting:dic];
     }
 
     if ([allKeys containsObject:@"categoryExclusions"]) {
diff --git a/ios/RNAdMobManager/UnifiedNativeAdLoadedListener.m b/ios/RNAdMobManager/UnifiedNativeAdLoadedListener.m
@@ -41,7 +41,7 @@ - (void)adLoader:(nonnull GADAdLoader *)adLoader didReceiveNativeAd:(nonnull GAD
 
     NSMutableDictionary*  args = [[NSMutableDictionary alloc] init];
     [args setObject:[NSNumber numberWithInteger:_nativeAds.count] forKey:_repo];
-    [EventEmitter.sharedInstance sendEvent:CacheManager.EVENT_AD_PRELOAD_LOADED dict:args];
+    [EventEmitter.sharedInstance sendEvent:[CacheManager EVENT_AD_PRELOAD_LOADED:_repo] dict:args];
 }
 
 - (void)adLoader:(nonnull GADAdLoader *)adLoader didFailToReceiveAdWithError:(nonnull NSError *)error {
diff --git a/src/AdManager.js b/src/AdManager.js
@@ -1,5 +1,5 @@
-import {NativeModules} from 'react-native';
-import { AdOptions } from './utils';
+import { DeviceEventEmitter, NativeModules } from "react-native";
+import { AdOptions } from "./utils";
 
 const RNAdmobNativeAdsManager = NativeModules.RNAdmobNativeAdsManager;
 
@@ -12,8 +12,10 @@ async function isTestDevice() {
 }
 
 function registerRepository(config) {
-  config.mediaAspectRatio = AdOptions.mediaAspectRatio[config.mediaAspectRatio || "unknown"];
-  config.adChoicesPlacement = AdOptions.adChoicesPlacement[config.adChoicesPlacement || "topRight"];
+  config.mediaAspectRatio =
+    AdOptions.mediaAspectRatio[config.mediaAspectRatio || "unknown"];
+  config.adChoicesPlacement =
+    AdOptions.adChoicesPlacement[config.adChoicesPlacement || "topRight"];
   return RNAdmobNativeAdsManager.registerRepository(config);
 }
 
@@ -29,11 +31,16 @@ async function resetCache() {
   return RNAdmobNativeAdsManager.resetCache();
 }
 
+function subscribe(repo, eventName, listener) {
+  return DeviceEventEmitter.addListener(`${eventName}:${repo}`, listener);
+}
+
 export default {
   setRequestConfiguration,
   isTestDevice,
   registerRepository,
   hasAd,
   unRegisterRepository,
   resetCache,
-}
+  subscribe,
+};

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`	`import android.os.Handler;`
`5`	`5`	`import android.view.LayoutInflater;`
`6`	`6`	`import android.view.View;`
	`7`	`+import android.view.ViewGroup;`
`7`	`8`	`import android.widget.LinearLayout;`
`8`	`9`
`9`	`10`	`import androidx.annotation.NonNull;`
`@@ -304,6 +305,7 @@ private void getAdFromRepository() {`
`304`	`305`	`if (adListener != null)`
`305`	`306`	`adListener.onAdFailedToLoad(new LoadAdError(3, "The requested repo is not registered", "", null, null));`
`306`	`307`	`} else {`
	`308`	`+ CacheManager.instance.attachAdListener(adRepo, adListener);`
`307`	`309`	`if (CacheManager.instance.numberOfAds(adRepo) != 0) {`
`308`	`310`	`unifiedNativeAdContainer = CacheManager.instance.getNativeAd(adRepo);`
`309`	`311`
`@@ -319,10 +321,7 @@ private void getAdFromRepository() {`
`319`	`321`	`}`
`320`	`322`	`} else {`
`321`	`323`	`if (!CacheManager.instance.isLoading(adRepo)) {`
`322`		`- CacheManager.instance.attachAdListener(adRepo, adListener);`
`323`	`324`	`CacheManager.instance.requestAds(adRepo);`
`324`		`- } else {`
`325`		`- CacheManager.instance.attachAdListener(adRepo, adListener);`
`326`	`325`	`}`
`327`	`326`	`}`
`328`	`327`	`}`
Original file line number	Diff line number	Diff line change
`@@ -266,7 +266,9 @@ public void onDropViewInstance(@NonNull RNAdmobNativeView nativeAdWrapper) {`
`266`	`266`	`}`
`267`	`267`	`}`
`268`	`268`	`if (nativeAdWrapper.nativeAdView != null){`
	`269`	`+ nativeAdWrapper.nativeAdView.removeAllViews();`
`269`	`270`	`nativeAdWrapper.nativeAdView.destroy();`
	`271`	`+ nativeAdWrapper.removeAllViews();`
`270`	`272`	`}`
`271`	`273`	`}`
`272`	`274`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ - (void)adLoader:(nonnull GADAdLoader *)adLoader didReceiveNativeAd:(nonnull GAD`
`41`	`41`
`42`	`42`	`NSMutableDictionary* args = [[NSMutableDictionary alloc] init];`
`43`	`43`	`[args setObject:[NSNumber numberWithInteger:_nativeAds.count] forKey:_repo];`
`44`		`- [EventEmitter.sharedInstance sendEvent:CacheManager.EVENT_AD_PRELOAD_LOADED dict:args];`
	`44`	`+ [EventEmitter.sharedInstance sendEvent:[CacheManager EVENT_AD_PRELOAD_LOADED:_repo] dict:args];`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`- (void)adLoader:(nonnull GADAdLoader )adLoader didFailToReceiveAdWithError:(nonnull NSError )error {`