react-native-applovin-max 4.1.7 → 5.0.1

package/ios/AppLovinMAXAdView.m

@@ -9,7 +9,7 @@
 #import "AppLovinMAX.h"
 #import "AppLovinMAXAdView.h"
 
-@interface AppLovinMAXAdView()<MAAdViewAdDelegate>
+@interface AppLovinMAXAdView()<MAAdViewAdDelegate, MAAdRevenueDelegate>
 
 @property (nonatomic, strong, nullable) MAAdView *adView; // nil when unmounted
 
@@ -20,6 +20,16 @@
 @property (nonatomic, copy, nullable) NSString *customData;
 @property (nonatomic, assign, readonly, getter=isAdaptiveBannerEnabled) BOOL adaptiveBannerEnabled;
 @property (nonatomic, assign, readonly, getter=isAutoRefresh) BOOL autoRefresh;
+@property (nonatomic, copy, nullable) NSDictionary *extraParameters;
+@property (nonatomic, copy, nullable) NSDictionary *localExtraParameters;
+
+@property (nonatomic, copy) RCTDirectEventBlock onAdLoadedEvent;
+@property (nonatomic, copy) RCTDirectEventBlock onAdLoadFailedEvent;
+@property (nonatomic, copy) RCTDirectEventBlock onAdDisplayFailedEvent;
+@property (nonatomic, copy) RCTDirectEventBlock onAdClickedEvent;
+@property (nonatomic, copy) RCTDirectEventBlock onAdExpandedEvent;
+@property (nonatomic, copy) RCTDirectEventBlock onAdCollapsedEvent;
+@property (nonatomic, copy) RCTDirectEventBlock onAdRevenuePaidEvent;
 
 @end
 
@@ -48,11 +58,11 @@
         return;
     }
     
-    if ( [@"banner" isEqualToString: adFormat] )
+    if ( [MAAdFormat.banner.label isEqualToString: adFormat] )
     {
         _adFormat = DEVICE_SPECIFIC_ADVIEW_AD_FORMAT;
     }
-    else if ( [@"mrec" isEqualToString: adFormat] )
+    else if ( [MAAdFormat.mrec.label isEqualToString: adFormat] )
     {
         _adFormat = MAAdFormat.mrec;
     }
@@ -121,6 +131,12 @@
     // Run after 0.25 sec delay to allow all properties to set
     dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t) (0.25 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
         
+        if ( ![AppLovinMAX shared].sdk )
+        {
+            [[AppLovinMAX shared] logUninitializedAccessError: @"AppLovinMAXAdview.attachAdViewIfNeeded"];
+            return;
+        }
+
         if ( ![adUnitId al_isValidString] )
         {
             [[AppLovinMAX shared] log: @"Attempting to attach MAAdView without Ad Unit ID"];
@@ -146,13 +162,23 @@
                                                              sdk: [AppLovinMAX shared].sdk];
         self.adView.frame = (CGRect) { CGPointZero, self.frame.size };
         self.adView.delegate = self;
-        self.adView.revenueDelegate = [AppLovinMAX shared];
+        self.adView.revenueDelegate = self;
         self.adView.placement = self.placement;
         self.adView.customData = self.customData;
         [self.adView setExtraParameterForKey: @"adaptive_banner" value: [self isAdaptiveBannerEnabled] ? @"true" : @"false"];
         // Set this extra parameter to work around a SDK bug that ignores calls to stopAutoRefresh()
         [self.adView setExtraParameterForKey: @"allow_pause_auto_refresh_immediately" value: @"true"];
         
+        for ( NSString *key in self.extraParameters )
+        {
+            [self.adView setExtraParameterForKey: key value: self.extraParameters[key]];
+        }
+        
+        for ( NSString *key in self.localExtraParameters )
+        {
+            [self.adView setLocalExtraParameterForKey: key value: self.localExtraParameters[key]];
+        }
+        
         if ( [self isAutoRefresh] )
         {
             [self.adView startAutoRefresh];
@@ -198,36 +224,41 @@
 
 - (void)didLoadAd:(MAAd *)ad
 {
-    [[AppLovinMAX shared] didLoadAd: ad];
+    self.onAdLoadedEvent([[AppLovinMAX shared] adInfoForAd: ad]);
 }
 
 - (void)didFailToLoadAdForAdUnitIdentifier:(NSString *)adUnitIdentifier withError:(MAError *)error
 {
-    NSString *name = ( MAAdFormat.mrec == self.adFormat ) ? @"OnMRecAdLoadFailedEvent" : @"OnBannerAdLoadFailedEvent";
-    
-    [[AppLovinMAX shared] sendReactNativeEventForAdLoadFailed: name forAdUnitIdentifier: adUnitIdentifier withError: error];
+    self.onAdLoadFailedEvent([[AppLovinMAX shared] adLoadFailedInfoForAd: adUnitIdentifier withError: error]);
 }
 
 - (void)didFailToDisplayAd:(MAAd *)ad withError:(MAError *)error
 {
-    [[AppLovinMAX shared] didFailToDisplayAd: ad withError: error];
+    self.onAdDisplayFailedEvent([[AppLovinMAX shared] adDisplayFailedInfoForAd: ad withError: error]);
 }
 
 - (void)didClickAd:(MAAd *)ad
 {
-    [[AppLovinMAX shared] didClickAd: ad];
+    self.onAdClickedEvent([[AppLovinMAX shared] adInfoForAd: ad]);
 }
 
 #pragma mark - MAAdViewAdDelegate Protocol
 
 - (void)didExpandAd:(MAAd *)ad
 {
-    [[AppLovinMAX shared] didExpandAd: ad];
+    self.onAdExpandedEvent([[AppLovinMAX shared] adInfoForAd: ad]);
 }
 
 - (void)didCollapseAd:(MAAd *)ad
 {
-    [[AppLovinMAX shared] didCollapseAd: ad];
+    self.onAdCollapsedEvent([[AppLovinMAX shared] adInfoForAd: ad]);
+}
+
+#pragma mark - MAAdRevenueDelegate Protocol
+
+- (void)didPayRevenueForAd:(MAAd *)ad
+{
+    self.onAdRevenuePaidEvent([[AppLovinMAX shared] adRevenueInfoForAd: ad]);
 }
 
 #pragma mark - Deprecated Callbacks

package/ios/AppLovinMAXAdViewManager.m

@@ -19,6 +19,16 @@ RCT_EXPORT_VIEW_PROPERTY(placement, NSString)
 RCT_EXPORT_VIEW_PROPERTY(customData, NSString)
 RCT_EXPORT_VIEW_PROPERTY(adaptiveBannerEnabled, BOOL)
 RCT_EXPORT_VIEW_PROPERTY(autoRefresh, BOOL)
+RCT_EXPORT_VIEW_PROPERTY(extraParameters, NSDictionary)
+RCT_EXPORT_VIEW_PROPERTY(localExtraParameters, NSDictionary)
+
+RCT_EXPORT_VIEW_PROPERTY(onAdLoadedEvent, RCTDirectEventBlock)
+RCT_EXPORT_VIEW_PROPERTY(onAdLoadFailedEvent, RCTDirectEventBlock)
+RCT_EXPORT_VIEW_PROPERTY(onAdDisplayFailedEvent, RCTDirectEventBlock)
+RCT_EXPORT_VIEW_PROPERTY(onAdClickedEvent, RCTDirectEventBlock)
+RCT_EXPORT_VIEW_PROPERTY(onAdExpandedEvent, RCTDirectEventBlock)
+RCT_EXPORT_VIEW_PROPERTY(onAdCollapsedEvent, RCTDirectEventBlock)
+RCT_EXPORT_VIEW_PROPERTY(onAdRevenuePaidEvent, RCTDirectEventBlock)
 
 + (BOOL)requiresMainQueueSetup
 {

package/ios/AppLovinMAXNativeAdView.m

@@ -18,7 +18,7 @@
 - (void)handleNativeAdViewRenderedForAd:(MAAd *)ad;
 @end
 
-@interface AppLovinMAXNativeAdView()<MANativeAdDelegate>
+@interface AppLovinMAXNativeAdView()<MANativeAdDelegate, MAAdRevenueDelegate>
 
 @property (nonatomic, weak) RCTBridge *bridge;
 @property (nonatomic, strong, nullable) MANativeAdLoader *adLoader;
@@ -30,9 +30,13 @@
 @property (nonatomic, copy, nullable) NSString *placement;
 @property (nonatomic, copy, nullable) NSString *customData;
 @property (nonatomic, copy, nullable) NSDictionary *extraParameters;
+@property (nonatomic, copy, nullable) NSDictionary *localExtraParameters;
 
 // Callback to `AppLovinNativeAdView.js`
-@property (nonatomic, copy) RCTDirectEventBlock onAdLoaded;
+@property (nonatomic, copy) RCTDirectEventBlock onAdLoadedEvent;
+@property (nonatomic, copy) RCTDirectEventBlock onAdLoadFailedEvent;
+@property (nonatomic, copy) RCTDirectEventBlock onAdClickedEvent;
+@property (nonatomic, copy) RCTDirectEventBlock onAdRevenuePaidEvent;
 
 // TODO: Allow publisher to select which views are clickable and which isn't via prop
 @property (nonatomic, strong) NSMutableArray<UIView *> *clickableViews;
@@ -62,7 +66,7 @@
     {
         _adLoader = [[MANativeAdLoader alloc] initWithAdUnitIdentifier: self.adUnitId sdk: [AppLovinMAX shared].sdk];
         _adLoader.nativeAdDelegate = self;
-        _adLoader.revenueDelegate = [AppLovinMAX shared];
+        _adLoader.revenueDelegate = self;
     }
     
     return _adLoader;
@@ -93,6 +97,12 @@
 // Called when Ad Unit ID is set, and via RN layer
 - (void)loadAd
 {
+    if ( ![AppLovinMAX shared].sdk )
+    {
+        [[AppLovinMAX shared] logUninitializedAccessError: @"AppLovinMAXNativeAdview.loadAd"];
+        return;
+    }
+
     if ( [self.isLoading compareAndSet: NO update: YES] )
     {
         [[AppLovinMAX shared] log: @"Loading a native ad for Ad Unit ID: %@...", self.adUnitId];
@@ -105,6 +115,11 @@
             [self.adLoader setExtraParameterForKey: key value: self.extraParameters[key]];
         }
         
+        for ( NSString *key in self.localExtraParameters )
+        {
+            [self.adLoader setLocalExtraParameterForKey: key value: self.localExtraParameters[key]];
+        }
+        
         [self.adLoader loadAd];
     }
     else
@@ -171,21 +186,27 @@
     [self.clickableViews addObject: view];
 }
 
-- (void)setMediaView:(NSNumber *)tag
+- (void)setIconView:(NSNumber *)tag
 {
-    if ( !self.nativeAd.nativeAd.mediaView ) return;
-    
     UIView *view = [self.bridge.uiManager viewForReactTag: tag];
-    if ( !view )
+    if ( ![view isKindOfClass: [RCTImageView class]] )
     {
-        [[AppLovinMAX shared] log: @"Cannot find a media view with tag \"%@\" for %@", tag, self.adUnitId];
+        [[AppLovinMAX shared] log: @"Cannot find an icon image view with tag \"%@\" for %@", tag, self.adUnitId];
         return;
     }
-
+    
     [self.clickableViews addObject: view];
-  
-    [view addSubview: self.nativeAd.nativeAd.mediaView];
-    [self.nativeAd.nativeAd.mediaView al_pinToSuperview];
+    
+    MANativeAdImage *icon = self.nativeAd.nativeAd.icon;
+    if ( icon )
+    {
+        // Check if "URL" was missing and therefore need to set the image data
+        if ( !icon.URL && icon.image )
+        {
+            RCTImageView *iconImageView = (RCTImageView *) view;
+            iconImageView.defaultImage = icon.image;
+        }
+    }
 }
 
 - (void)setOptionsView:(NSNumber *)tag
@@ -203,27 +224,21 @@
     [self.nativeAd.nativeAd.optionsView al_pinToSuperview];
 }
 
-- (void)setIconView:(NSNumber *)tag
+- (void)setMediaView:(NSNumber *)tag
 {
+    if ( !self.nativeAd.nativeAd.mediaView ) return;
+    
     UIView *view = [self.bridge.uiManager viewForReactTag: tag];
-    if ( ![view isKindOfClass: [RCTImageView class]] )
+    if ( !view )
     {
-        [[AppLovinMAX shared] log: @"Cannot find an icon image view with tag \"%@\" for %@", tag, self.adUnitId];
+        [[AppLovinMAX shared] log: @"Cannot find a media view with tag \"%@\" for %@", tag, self.adUnitId];
         return;
     }
-    
+
     [self.clickableViews addObject: view];
-    
-    MANativeAdImage *icon = self.nativeAd.nativeAd.icon;
-    if ( icon )
-    {
-        // Check if "URL" was missing and therefore need to set the image data
-        if ( !icon.URL && icon.image )
-        {
-            RCTImageView *iconImageView = (RCTImageView *) view;
-            iconImageView.defaultImage = icon.image;
-        }
-    }
+  
+    [view addSubview: self.nativeAd.nativeAd.mediaView];
+    [self.nativeAd.nativeAd.mediaView al_pinToSuperview];
 }
 
 #pragma mark - Ad Loader Delegate
@@ -238,7 +253,7 @@
         [self.isLoading set: NO];
         
         [[AppLovinMAX shared] log: @"Native ad is of template type, failing ad load..."];
-        [[AppLovinMAX shared] sendReactNativeEventForAdLoadFailed: @"OnNativeAdLoadFailedEvent" forAdUnitIdentifier: self.adUnitId withError: nil];
+        self.onAdLoadFailedEvent([[AppLovinMAX shared] adLoadFailedInfoForAd: self.adUnitId withError: nil]);
         
         return;
     }
@@ -253,9 +268,6 @@
     // After notifying the RN layer - have slight delay to let views bind to this layer in `clickableViews` before registering
     dispatchOnMainQueueAfter(0.5, ^{
         
-        // Notify publisher
-        [[AppLovinMAX shared] didLoadAd: ad];
-        
         [self.adLoader registerClickableViews: self.clickableViews withContainer: self forAd: ad];
         [self.adLoader handleNativeAdViewRenderedForAd: ad];
       
@@ -265,8 +277,32 @@
 
 - (void)sendAdLoadedReactNativeEventForAd:(MANativeAd *)ad
 {
-    NSMutableDictionary<NSString *, id> *jsNativeAd = [NSMutableDictionary dictionaryWithCapacity: 6];
+    // 1. AdInfo for publisher to be notified via `onAdLoaded`
     
+    NSMutableDictionary<NSString *, id> *nativeAdInfo = [NSMutableDictionary dictionaryWithCapacity: 2];
+    if ( !isnan(ad.mediaContentAspectRatio) )
+    {
+        // The aspect ratio can be 0.0f when it is not provided by the network.
+        if ( fabs(ad.mediaContentAspectRatio) < FLT_EPSILON )
+        {
+            nativeAdInfo[@"mediaContentAspectRatio"] = @(1.0);
+        }
+        else
+        {
+            nativeAdInfo[@"mediaContentAspectRatio"] = @(ad.mediaContentAspectRatio);
+        }
+    }
+    else
+    {
+        nativeAdInfo[@"mediaContentAspectRatio"] = @(1.0);
+    }
+
+    NSMutableDictionary *adInfo = [[AppLovinMAX shared] adInfoForAd: self.nativeAd].mutableCopy;
+    adInfo[@"nativeAd"] = nativeAdInfo;
+    
+    // 2. NativeAd for `AppLovinNativeAdView.js` to render the views
+    
+    NSMutableDictionary<NSString *, id> *jsNativeAd = [NSMutableDictionary dictionaryWithCapacity: 5];
     if ( ad.title )
     {
         jsNativeAd[@"title"] = ad.title;
@@ -294,13 +330,15 @@
             jsNativeAd[@"image"] = @(YES);
         }
     }
-    if ( !isnan(ad.mediaContentAspectRatio) )
-    {
-        jsNativeAd[@"mediaContentAspectRatio"] = @(ad.mediaContentAspectRatio);
-    }
-     
-    // Send to `AppLovinNativeAdView.js` to render the views
-    self.onAdLoaded(jsNativeAd);
+    jsNativeAd[@"isOptionsViewAvailable"] = ad.optionsView ? @(YES) : @(NO);
+    jsNativeAd[@"isMediaViewAvailable"] = ad.mediaView ? @(YES) : @(NO);
+    
+    NSMutableDictionary<NSString *, id> *arg = [NSMutableDictionary dictionaryWithCapacity: 2];
+    arg[@"adInfo"] = adInfo;
+    arg[@"nativeAd"] = jsNativeAd;
+    
+    // Send to `AppLovinNativeAdView.js`
+    self.onAdLoadedEvent(arg);
 }
 
 - (void)didFailToLoadNativeAdForAdUnitIdentifier:(NSString *)adUnitIdentifier withError:(MAError *)error
@@ -310,12 +348,19 @@
     [[AppLovinMAX shared] log: @"Failed to load native ad for Ad Unit ID %@ with error: %@", self.adUnitId, error];
     
     // Notify publisher
-    [[AppLovinMAX shared] sendReactNativeEventForAdLoadFailed: @"OnNativeAdLoadFailedEvent" forAdUnitIdentifier: self.adUnitId withError: error];
+    self.onAdLoadFailedEvent([[AppLovinMAX shared] adLoadFailedInfoForAd: adUnitIdentifier withError: error]);
 }
 
 - (void)didClickNativeAd:(MAAd *)ad
 {
-    [[AppLovinMAX shared] didClickAd: ad];
+    self.onAdClickedEvent([[AppLovinMAX shared] adInfoForAd: ad]);
+}
+
+#pragma mark - Ad Revenue Delegate
+
+- (void)didPayRevenueForAd:(MAAd *)ad
+{
+    self.onAdRevenuePaidEvent([[AppLovinMAX shared] adRevenueInfoForAd: ad]);
 }
 
 - (void)destroyCurrentAdIfNeeded

package/ios/AppLovinMAXNativeAdViewManager.m

@@ -18,9 +18,7 @@ RCT_EXPORT_VIEW_PROPERTY(adUnitId, NSString)
 RCT_EXPORT_VIEW_PROPERTY(placement, NSString)
 RCT_EXPORT_VIEW_PROPERTY(customData, NSString)
 RCT_EXPORT_VIEW_PROPERTY(extraParameters, NSDictionary)
-
-// Callback
-RCT_EXPORT_VIEW_PROPERTY(onAdLoaded, RCTDirectEventBlock)
+RCT_EXPORT_VIEW_PROPERTY(localExtraParameters, NSDictionary)
 
 // Asset views
 RCT_EXPORT_VIEW_PROPERTY(titleView, NSNumber)
@@ -31,6 +29,12 @@ RCT_EXPORT_VIEW_PROPERTY(iconView, NSNumber)
 RCT_EXPORT_VIEW_PROPERTY(optionsView, NSNumber)
 RCT_EXPORT_VIEW_PROPERTY(mediaView, NSNumber)
 
+// Callback
+RCT_EXPORT_VIEW_PROPERTY(onAdLoadedEvent, RCTDirectEventBlock)
+RCT_EXPORT_VIEW_PROPERTY(onAdLoadFailedEvent, RCTDirectEventBlock)
+RCT_EXPORT_VIEW_PROPERTY(onAdClickedEvent, RCTDirectEventBlock)
+RCT_EXPORT_VIEW_PROPERTY(onAdRevenuePaidEvent, RCTDirectEventBlock)
+
 + (BOOL)requiresMainQueueSetup
 {
     return YES;

package/ios/Podfile

@@ -35,6 +35,6 @@ target 'AppLovinMAX' do
   pod 'glog', :podspec => '../node_modules/react-native/third-party-podspecs/glog.podspec'
   pod 'Folly', :podspec => '../node_modules/react-native/third-party-podspecs/Folly.podspec'
 
-  pod 'AppLovinSDK', '11.8.0'
+  pod 'AppLovinSDK', '11.8.2'
 
 end

package/ios/Podfile.lock

@@ -1,5 +1,5 @@
 PODS:
-  - AppLovinSDK (11.8.0)
+  - AppLovinSDK (11.8.2)
   - boost-for-react-native (1.63.0)
   - DoubleConversion (1.1.6)
   - FBLazyVector (0.63.5)
@@ -249,7 +249,7 @@ PODS:
   - Yoga (1.14.0)
 
 DEPENDENCIES:
-  - AppLovinSDK (= 11.8.0)
+  - AppLovinSDK (= 11.8.2)
   - DoubleConversion (from `../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec`)
   - FBLazyVector (from `../node_modules/react-native/Libraries/FBLazyVector`)
   - FBReactNativeSpec (from `../node_modules/react-native/Libraries/FBReactNativeSpec`)
@@ -339,7 +339,7 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native/ReactCommon/yoga"
 
 SPEC CHECKSUMS:
-  AppLovinSDK: 80818d048a0d46701b878927a1e1a064d32b747d
+  AppLovinSDK: cfcf1972d25febb4c0f23837763e3809f0fba159
   boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c
   DoubleConversion: cde416483dac037923206447da6e1454df403714
   FBLazyVector: 352a8ca9bbc8e2f097d680747a8c97ecef12d469
@@ -368,6 +368,6 @@ SPEC CHECKSUMS:
   ReactCommon: b9ff54b6dd22ba4a776eda22d7f83ec27544ca35
   Yoga: 0276e9f20976c8568e107cfc1163a8629051adc0
 
-PODFILE CHECKSUM: 6e9aa2145f566a91f3e26d928707679adc7b3cf8
+PODFILE CHECKSUM: 8638b3ebfa25029aca293faa9d5f2513a076845c
 
 COCOAPODS: 1.11.3

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "react-native-applovin-max",
   "author": "AppLovin Corporation",
-  "version": "4.1.7",
+  "version": "5.0.1",
   "description": "AppLovin MAX React Native Plugin for Android and iOS",
   "homepage": "https://github.com/AppLovin/AppLovin-MAX-React-Native",
   "license": "MIT",

package/react-native-applovin-max.podspec

@@ -11,10 +11,10 @@ Pod::Spec.new do |s|
   s.authors      = package["author"]
 
   s.platforms    = { :ios => "10.0" }
-  s.source       = { :git => "https://github.com/AppLovin/AppLovin-MAX-React-Native.git", :tag => "release_4_1_7" }
+  s.source       = { :git => "https://github.com/AppLovin/AppLovin-MAX-React-Native.git", :tag => "release_5_0_1" }
   
   s.source_files  = "ios/AppLovinMAX*.{h,m}"
 
   s.dependency "React"
-  s.dependency "AppLovinSDK", "11.8.0"
+  s.dependency "AppLovinSDK", "11.8.2"
 end