react-native-applovin-max 3.3.0 → 3.3.1

package/ios/AppLovinMAXAdView.m

@@ -0,0 +1,190 @@
+#import <AppLovinSDK/AppLovinSDK.h>
+#import "AppLovinMAX.h"
+#import "AppLovinMAXAdView.h"
+
+@interface AppLovinMAXAdView()
+
+@property (nonatomic, strong, nullable) MAAdView *adView; // nil when unmounted
+
+// The following properties are updated from RN layer via the view manager
+@property (nonatomic, copy) NSString *adUnitId;
+@property (nonatomic, weak) MAAdFormat *adFormat;
+@property (nonatomic, copy, nullable) NSString *placement;
+@property (nonatomic, copy, nullable) NSString *customData;
+@property (nonatomic, assign, readonly, getter=isAdaptiveBannerEnabled) BOOL adaptiveBannerEnabled;
+@property (nonatomic, assign, readonly, getter=isAutoRefresh) BOOL autoRefresh;
+
+@end
+
+@implementation AppLovinMAXAdView
+
+- (void)setAdUnitId:(NSString *)adUnitId
+{
+    // Ad Unit ID must be set prior to creating MAAdView
+    if ( self.adView )
+    {
+        [[AppLovinMAX shared] log: @"Attempting to set Ad Unit ID %@ after MAAdView is created", adUnitId];
+        return;
+    }
+    
+    _adUnitId = adUnitId;
+    
+    [self attachAdViewIfNeeded];
+}  
+
+- (void)setAdFormat:(NSString *)adFormat
+{
+    // Ad format must be set prior to creating MAAdView
+    if ( self.adView )
+    {
+        [[AppLovinMAX shared] log: @"Attempting to set ad format %@ after MAAdView is created", adFormat];
+        return;
+    }
+    
+    if ( [@"banner" isEqualToString: adFormat] )
+    {
+        _adFormat = DEVICE_SPECIFIC_ADVIEW_AD_FORMAT;
+    }
+    else if ( [@"mrec" isEqualToString: adFormat] )
+    {
+        _adFormat = MAAdFormat.mrec;
+    }
+    else
+    {
+        [[AppLovinMAX shared] log: @"Attempting to set an invalid ad format of \"%@\" for %@", adFormat, self.adUnitId];
+        return;
+    }
+    
+    [self attachAdViewIfNeeded];
+}  
+
+- (void)setPlacement:(NSString *)placement
+{
+    _placement = placement;
+    
+    if ( self.adView )
+    {
+        self.adView.placement = placement;
+    }
+}
+
+- (void)setCustomData:(NSString *)customData
+{
+    _customData = customData;
+    
+    if ( self.adView )
+    {
+        self.adView.customData = customData;
+    }
+}
+
+- (void)setAdaptiveBannerEnabled:(BOOL)adaptiveBannerEnabled
+{
+    _adaptiveBannerEnabled = adaptiveBannerEnabled;
+    
+    if ( self.adView )
+    {
+        [self.adView setExtraParameterForKey: @"adaptive_banner" value: adaptiveBannerEnabled ? @"true" : @"false"];
+    }
+}
+
+- (void)setAutoRefresh:(BOOL)autoRefresh
+{
+    _autoRefresh = autoRefresh;
+    
+    if ( self.adView )
+    {
+        if ( autoRefresh )
+        {
+            [self.adView startAutoRefresh];
+        }
+        else
+        {
+            [self.adView stopAutoRefresh];
+        }
+    }
+}
+
+- (void)attachAdViewIfNeeded
+{
+    // Re-assign in case of race condition
+    NSString *adUnitId = self.adUnitId;
+    MAAdFormat *adFormat = self.adFormat;
+    
+    // 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 ( ![adUnitId al_isValidString] )
+        {
+            [[AppLovinMAX shared] log: @"Attempting to attach MAAdView without Ad Unit ID"];
+            return;
+        }
+        
+        if ( !adFormat )
+        {
+            [[AppLovinMAX shared] log: @"Attempting to attach MAAdView without ad format"];
+            return;
+        }
+        
+        if ( self.adView )
+        {
+            [[AppLovinMAX shared] log: @"Attempting to re-attach with existing MAAdView: %@", self.adView];
+            return;
+        }
+        
+        [[AppLovinMAX shared] log: @"Attaching MAAdView for %@", adUnitId];
+        
+        self.adView = [[MAAdView alloc] initWithAdUnitIdentifier: adUnitId
+                                                        adFormat: adFormat
+                                                             sdk: [AppLovinMAX shared].sdk];
+        self.adView.frame = (CGRect) { CGPointZero, self.frame.size };
+        self.adView.delegate = [AppLovinMAX shared]; // Go through core class for callback forwarding to React Native layer
+        self.adView.revenueDelegate = [AppLovinMAX shared];
+        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"];
+        
+        if ( [self isAutoRefresh] )
+        {
+            [self.adView startAutoRefresh];
+        }
+        else
+        {
+            [self.adView stopAutoRefresh];
+        }
+        
+        [self.adView loadAd];
+        
+        [self addSubview: self.adView];
+        
+        [NSLayoutConstraint activateConstraints: @[[self.adView.widthAnchor constraintEqualToAnchor: self.widthAnchor],
+                                                   [self.adView.heightAnchor constraintEqualToAnchor: self.heightAnchor],
+                                                   [self.adView.centerXAnchor constraintEqualToAnchor: self.centerXAnchor],
+                                                   [self.adView.centerYAnchor constraintEqualToAnchor: self.centerYAnchor]]];
+    });
+}
+
+- (void)didMoveToWindow
+{
+    [super didMoveToWindow];
+    
+    // This view is unmounted
+    if ( !self.window )
+    {
+        if ( self.adView )
+        {
+            [[AppLovinMAX shared] log: @"Unmounting MAAdView: %@", self.adView];
+            
+            self.adView.delegate = nil;
+            self.adView.revenueDelegate = nil;
+            
+            [self.adView removeFromSuperview];
+            
+            self.adView = nil;
+        }
+    }
+}
+
+@end

package/ios/AppLovinMAXAdViewManager.m

@@ -7,297 +7,27 @@
 //
 
 #import "AppLovinMAXAdViewManager.h"
-#import <AppLovinSDK/AppLovinSDK.h>
-#import "AppLovinMAX.h"
-#import <React/RCTUIManager.h>
-
-// Internal
-@interface NSString (ALUtils)
-@property (assign, readonly, getter=al_isValidString) BOOL al_validString;
-@end
-
-@interface AppLovinMAXAdViewManager()
-
-// Dictionaries from id of the React view to the corresponding ad unit id and ad format.
-// Both must be set before the MAAdView is created.
-@property (nonatomic, strong) NSMutableDictionary<NSNumber *, NSString *> *adUnitIdRegistry;
-@property (nonatomic, strong) NSMutableDictionary<NSNumber *, MAAdFormat *> *adFormatRegistry;
-
-// Storage for placement and extra parameters if set before the MAAdView is created
-@property (nonatomic, strong) NSMutableDictionary<NSNumber *, NSString *> *placementRegistry;
-@property (nonatomic, strong) NSMutableDictionary<NSNumber *, NSString *> *customDataRegistry;
-@property (nonatomic, strong) NSMutableDictionary<NSNumber *, NSString *> *adaptiveBannerEnabledRegistry;
-@property (nonatomic, strong) NSMutableDictionary<NSNumber *, NSNumber *> *autoRefreshEnabledRegistry;
-
-@end
+#import "AppLovinMAXAdview.h"
 
 @implementation AppLovinMAXAdViewManager
+
 RCT_EXPORT_MODULE(AppLovinMAXAdView)
 
-// Overridding `init` requires main queue
+RCT_EXPORT_VIEW_PROPERTY(adUnitId, NSString)
+RCT_EXPORT_VIEW_PROPERTY(adFormat, NSString)
+RCT_EXPORT_VIEW_PROPERTY(placement, NSString)
+RCT_EXPORT_VIEW_PROPERTY(customData, NSString)
+RCT_EXPORT_VIEW_PROPERTY(adaptiveBannerEnabled, BOOL)
+RCT_EXPORT_VIEW_PROPERTY(autoRefresh, BOOL)
+
 + (BOOL)requiresMainQueueSetup
 {
     return YES;
 }
 
-- (instancetype)init
-{
-    self = [super init];
-    if ( self )
-    {
-        self.adUnitIdRegistry = [NSMutableDictionary dictionary];
-        self.adFormatRegistry = [NSMutableDictionary dictionary];
-        self.placementRegistry = [NSMutableDictionary dictionary];
-        self.customDataRegistry = [NSMutableDictionary dictionary];
-        self.adaptiveBannerEnabledRegistry = [NSMutableDictionary dictionary];
-        self.autoRefreshEnabledRegistry = [NSMutableDictionary dictionary];
-    }
-    return self;
-}
-
 - (UIView *)view
 {
-    // NOTE: Do not set frame or backgroundColor as RN will overwrite the values set by your custom class in order to match your JavaScript component's layout props - hence wrapper
-    return [[UIView alloc] init];
-}
-
-// NOTE: `nonnull` must be annotated here for this RN export to work at runtime
-RCT_EXPORT_METHOD(setPlacement:(nonnull NSNumber *)viewTag toPlacement:(NSString *)placement)
-{
-    [self.bridge.uiManager addUIBlock:^(RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
-        
-        // NOTE: iOS caches the native view via `viewTag` when you remove it from screen (unlike Android)
-        UIView *view = viewRegistry[viewTag];
-        if ( !view )
-        {
-            RCTLogError(@"Cannot find UIView with tag %@", viewTag);
-            return;
-        }
-        
-        MAAdView *adView = [self adViewFromContainerView: view];
-        if ( adView )
-        {
-            adView.placement = placement;
-        }
-        else
-        {
-            self.placementRegistry[viewTag] = placement;
-        }
-    }];
-}
-
-// NOTE: `nonnull` must be annotated here for this RN export to work at runtime
-RCT_EXPORT_METHOD(setCustomData:(nonnull NSNumber *)viewTag toCustomData:(NSString *)customData)
-{
-    [self.bridge.uiManager addUIBlock:^(RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
-
-        // NOTE: iOS caches the native view via `viewTag` when you remove it from screen (unlike Android)
-        UIView *view = viewRegistry[viewTag];
-        if ( !view )
-        {
-            RCTLogError(@"Cannot find UIView with tag %@", viewTag);
-            return;
-        }
-
-        MAAdView *adView = [self adViewFromContainerView: view];
-        if ( adView )
-        {
-            adView.customData = customData;
-        }
-        else
-        {
-            self.customDataRegistry[viewTag] = customData;
-        }
-    }];
-}
-
-// NOTE: `nonnull` must be annotated here for this RN export to work at runtime
-RCT_EXPORT_METHOD(setAdaptiveBannerEnabled:(nonnull NSNumber *)viewTag toEnabled:(NSString *)enabledStr)
-{
-    [self.bridge.uiManager addUIBlock:^(RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
-        
-        // NOTE: iOS caches the native view via `viewTag` when you remove it from screen (unlike Android)
-        UIView *view = viewRegistry[viewTag];
-        if ( !view )
-        {
-            RCTLogError(@"Cannot find UIView with tag %@", viewTag);
-            return;
-        }
-        
-        MAAdView *adView = [self adViewFromContainerView: view];
-        if ( adView )
-        {
-            [adView setExtraParameterForKey: @"adaptive_banner" value: enabledStr];
-        }
-        else
-        {
-            self.adaptiveBannerEnabledRegistry[viewTag] = enabledStr;
-        }
-    }];
-}
-
-// NOTE: `nonnull` must be annotated here for this RN export to work at runtime
-RCT_EXPORT_METHOD(setAutoRefresh:(nonnull NSNumber *)viewTag toEnabled:(BOOL)enabled)
-{
-    [self.bridge.uiManager addUIBlock:^(RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
-        
-        // NOTE: iOS caches the native view via `viewTag` when you remove it from screen (unlike Android)
-        UIView *view = viewRegistry[viewTag];
-        if ( !view )
-        {
-            RCTLogError(@"Cannot find UIView with tag %@", viewTag);
-            return;
-        }
-        
-        MAAdView *adView = [self adViewFromContainerView: view];
-        if ( adView )
-        {
-            if ( enabled )
-            {
-                [adView startAutoRefresh];
-            }
-            else
-            {
-                [adView stopAutoRefresh];
-            }
-        }
-        else
-        {
-            self.autoRefreshEnabledRegistry[viewTag] = @(enabled);
-        }
-    }];
-}
-
-// NOTE: `nonnull` must be annotated here for this RN export to work at runtime
-RCT_EXPORT_METHOD(setAdUnitId:(nonnull NSNumber *)viewTag toAdUnitId:(NSString *)adUnitId)
-{
-    [self.bridge.uiManager addUIBlock:^(RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
-        
-        // NOTE: iOS caches the native view via `viewTag` when you remove it from screen (unlike Android)
-        UIView *view = viewRegistry[viewTag];
-        if ( !view )
-        {
-            RCTLogError(@"Cannot find UIView with tag %@", viewTag);
-            return;
-        }
-        
-        self.adUnitIdRegistry[viewTag] = adUnitId;
-        
-        [self attachAdViewIfNeededForViewTag: viewTag
-                            adUnitIdentifier: self.adUnitIdRegistry[viewTag]
-                                    adFormat: self.adFormatRegistry[viewTag]
-                               containerView: view];
-    }];
-}
-
-// NOTE: `nonnull` must be annotated here for this RN export to work at runtime
-RCT_EXPORT_METHOD(setAdFormat:(nonnull NSNumber *)viewTag toAdFormat:(NSString *)adFormatStr)
-{
-    [self.bridge.uiManager addUIBlock:^(RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
-        
-        // NOTE: iOS caches the native view via `viewTag` when you remove it from screen (unlike Android)
-        UIView *view = viewRegistry[viewTag];
-        if ( !view )
-        {
-            RCTLogError(@"Cannot find UIView with tag %@", viewTag);
-            return;
-        }
-        
-        if ( [@"banner" isEqualToString: adFormatStr] )
-        {
-            self.adFormatRegistry[viewTag] = DEVICE_SPECIFIC_ADVIEW_AD_FORMAT;
-        }
-        else if ( [@"mrec" isEqualToString: adFormatStr] )
-        {
-            self.adFormatRegistry[viewTag] = MAAdFormat.mrec;
-        }
-        
-        [self attachAdViewIfNeededForViewTag: viewTag
-                            adUnitIdentifier: self.adUnitIdRegistry[viewTag]
-                                    adFormat: self.adFormatRegistry[viewTag]
-                               containerView: view];
-    }];
-}
-
-- (void)attachAdViewIfNeededForViewTag:(NSNumber *)viewTag adUnitIdentifier:(NSString *)adUnitIdentifier adFormat:(MAAdFormat *)adFormat containerView:(UIView *)containerView
-{
-    // Run after delay to ensure SDK is attached to main module first
-    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t) (1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-        
-        // If ad unit id and format has been set - create and attach AdView
-        if ( [adUnitIdentifier al_isValidString] && adFormat )
-        {
-            MAAdView *adView = [self adViewFromContainerView: containerView];
-            
-            // Check if there's a previously-attached AdView
-            if ( adView )
-            {
-                [adView removeFromSuperview];
-                [adView stopAutoRefresh];
-                
-                adView = nil;
-            }
-            
-            adView = [[MAAdView alloc] initWithAdUnitIdentifier: adUnitIdentifier adFormat: adFormat sdk: AppLovinMAX.shared.sdk];
-            adView.frame = (CGRect) { CGPointZero, adFormat.size };
-            adView.delegate = AppLovinMAX.shared; // Go through core class for callback forwarding to React Native layer
-            adView.revenueDelegate = AppLovinMAX.shared;
-            
-            NSString *placement = self.placementRegistry[viewTag];
-            if ( placement )
-            {
-                [self.placementRegistry removeObjectForKey: viewTag];
-                adView.placement = placement;
-            }
-            
-            NSString *customData = self.customDataRegistry[viewTag];
-            if ( customData )
-            {
-                [self.customDataRegistry removeObjectForKey: viewTag];
-                adView.customData = customData;
-            }
-
-            NSString *adaptiveBannerEnabledStr = self.adaptiveBannerEnabledRegistry[viewTag];
-            if ( [adaptiveBannerEnabledStr al_isValidString] )
-            {
-                [self.adaptiveBannerEnabledRegistry removeObjectForKey: viewTag];
-                [adView setExtraParameterForKey: @"adaptive_banner" value: adaptiveBannerEnabledStr];
-            }
-            
-            // Set this extra parameter to work around a SDK bug that ignores calls to stopAutoRefresh()
-            [adView setExtraParameterForKey: @"allow_pause_auto_refresh_immediately" value: @"true"];
-
-            NSNumber *autoRefreshEnabled = self.autoRefreshEnabledRegistry[viewTag];
-            if ( autoRefreshEnabled )
-            {
-                if ( [autoRefreshEnabled boolValue] )
-                {
-                    [adView startAutoRefresh];
-                }
-                else
-                {
-                    [adView stopAutoRefresh];
-                }
-            }
-
-            [adView loadAd];
-            
-            [containerView addSubview: adView];
-            
-            CGSize adViewSize = [adFormat adaptiveSizeForWidth: CGRectGetWidth(containerView.frame)];
-            [NSLayoutConstraint activateConstraints: @[[adView.widthAnchor constraintEqualToConstant: adViewSize.width],
-                                                       [adView.heightAnchor constraintEqualToConstant: adViewSize.height],
-                                                       [adView.centerXAnchor constraintEqualToAnchor: containerView.centerXAnchor],
-                                                       [adView.centerYAnchor constraintEqualToAnchor: containerView.centerYAnchor]]];
-        }
-    });
-}
-
-// MARK: - Helper Functions
-
-- (nullable MAAdView *)adViewFromContainerView:(UIView *)view
-{
-    return view.subviews.count > 0 ? ((MAAdView *) view.subviews.lastObject) : nil;
+    return [[AppLovinMAXAdView alloc] init];
 }
 
 @end

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.4.3'
+  pod 'AppLovinSDK', '11.5.1'
 
 end

package/ios/Podfile.lock

@@ -1,5 +1,5 @@
 PODS:
-  - AppLovinSDK (11.4.3)
+  - AppLovinSDK (11.5.1)
   - boost-for-react-native (1.63.0)
   - DoubleConversion (1.1.6)
   - FBLazyVector (0.63.4)
@@ -249,7 +249,7 @@ PODS:
   - Yoga (1.14.0)
 
 DEPENDENCIES:
-  - AppLovinSDK (= 11.4.3)
+  - AppLovinSDK (= 11.5.1)
   - 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: 221dfbdff620be0ff227ed5b018b97b1f3d15713
+  AppLovinSDK: 40398f6ec127e01f53992b2acd663252647c0dbb
   boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c
   DoubleConversion: cde416483dac037923206447da6e1454df403714
   FBLazyVector: 3bb422f41b18121b71783a905c10e58606f7dc3e
@@ -368,6 +368,6 @@ SPEC CHECKSUMS:
   ReactCommon: 73d79c7039f473b76db6ff7c6b159c478acbbb3b
   Yoga: 4bd86afe9883422a7c4028c00e34790f560923d6
 
-PODFILE CHECKSUM: 26bc18f6057a79b7f583981eaa607d7b30a63d74
+PODFILE CHECKSUM: fde6ef203f431a104b9569e9ddb156746ae77c1f
 
-COCOAPODS: 1.11.2
+COCOAPODS: 1.11.3

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "react-native-applovin-max",
   "author": "AppLovin Corporation",
-  "version": "3.3.0",
+  "version": "3.3.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_3_3_0" }
+  s.source       = { :git => "https://github.com/AppLovin/AppLovin-MAX-React-Native.git", :tag => "release_3_3_1" }
   
   s.source_files  = "ios/AppLovinMAX*.{h,m}"
 
   s.dependency "React"
-  s.dependency "AppLovinSDK", "11.4.3"
+  s.dependency "AppLovinSDK", "11.5.1"
 end