react-native-applovin-max 6.5.0 → 7.0.1

package/android/src/main/java/com/applovin/reactnative/AppLovinMAXNativeAdView.java

@@ -29,11 +29,12 @@ import java.util.List;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicBoolean;
 
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 public class AppLovinMAXNativeAdView
-        extends ReactViewGroup
-        implements MaxAdRevenueListener, View.OnLayoutChangeListener, ViewGroup.OnHierarchyChangeListener
+    extends ReactViewGroup
+    implements MaxAdRevenueListener, View.OnLayoutChangeListener, ViewGroup.OnHierarchyChangeListener
 {
     private static final int TITLE_LABEL_TAG          = 1;
     private static final int MEDIA_VIEW_CONTAINER_TAG = 2;
@@ -172,10 +173,10 @@ public class AppLovinMAXNativeAdView
     /// Ad Loader Listener
 
     private class NativeAdListener
-            extends MaxNativeAdListener
+        extends MaxNativeAdListener
     {
         @Override
-        public void onNativeAdLoaded(@Nullable final MaxNativeAdView nativeAdView, final MaxAd ad)
+        public void onNativeAdLoaded(@Nullable final MaxNativeAdView nativeAdView, @NonNull final MaxAd ad)
         {
             AppLovinMAXModule.d( "Native ad loaded: " + ad );
 
@@ -203,7 +204,7 @@ public class AppLovinMAXNativeAdView
         }
 
         @Override
-        public void onNativeAdLoadFailed(final String adUnitId, final MaxError error)
+        public void onNativeAdLoadFailed(@NonNull final String adUnitId, @NonNull final MaxError error)
         {
             isLoading.set( false );
 
@@ -214,7 +215,7 @@ public class AppLovinMAXNativeAdView
         }
 
         @Override
-        public void onNativeAdClicked(final MaxAd ad)
+        public void onNativeAdClicked(@NonNull final MaxAd ad)
         {
             WritableMap adInfo = AppLovinMAXModule.getInstance().getAdInfo( ad );
             reactContext.getJSModule( RCTEventEmitter.class ).receiveEvent( getId(), "onAdClickedEvent", adInfo );
@@ -224,7 +225,7 @@ public class AppLovinMAXNativeAdView
     /// Ad Revenue Listener
 
     @Override
-    public void onAdRevenuePaid(final MaxAd ad)
+    public void onAdRevenuePaid(@NonNull final MaxAd ad)
     {
         WritableMap adRevenueInfo = AppLovinMAXModule.getInstance().getAdRevenueInfo( ad );
         reactContext.getJSModule( RCTEventEmitter.class ).receiveEvent( getId(), "onAdRevenuePaidEvent", adRevenueInfo );
@@ -406,9 +407,9 @@ public class AppLovinMAXNativeAdView
     }
 
     static class RenderNativeAdTask
-            implements Runnable
+        implements Runnable
     {
-        private AppLovinMAXNativeAdView nativeAdView;
+        private final AppLovinMAXNativeAdView nativeAdView;
 
         RenderNativeAdTask(AppLovinMAXNativeAdView nativeAdView) { this.nativeAdView = nativeAdView; }
 
@@ -443,7 +444,7 @@ public class AppLovinMAXNativeAdView
         {
             // Renders the ad only after the last asset view is set
             renderNativeAdHandler.removeCallbacksAndMessages( null );
-            renderNativeAdHandler.postDelayed( renderNativeAdTask, 1 );
+            renderNativeAdHandler.postDelayed( renderNativeAdTask, 50 );
         }
     }
 
@@ -493,7 +494,7 @@ public class AppLovinMAXNativeAdView
 
         if ( ad.getStarRating() != null )
         {
-            nativeAdInfo.putDouble( "starRating", ad.getStarRating().doubleValue() );
+            nativeAdInfo.putDouble( "starRating", ad.getStarRating() );
         }
 
         // The aspect ratio can be 0.0f when it is not provided by the network.
@@ -520,7 +521,7 @@ public class AppLovinMAXNativeAdView
 
         if ( ad.getStarRating() != null )
         {
-            jsNativeAd.putDouble( "starRating", ad.getStarRating().doubleValue() );
+            jsNativeAd.putDouble( "starRating", ad.getStarRating() );
         }
 
         MaxNativeAdImage icon = ad.getIcon();

package/android/src/main/java/com/applovin/reactnative/AppLovinMAXNativeAdViewManager.java

@@ -1,6 +1,5 @@
 package com.applovin.reactnative;
 
-import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.common.MapBuilder;
@@ -14,13 +13,13 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 public class AppLovinMAXNativeAdViewManager
-        extends ViewGroupManager<AppLovinMAXNativeAdView>
+    extends ViewGroupManager<AppLovinMAXNativeAdView>
 {
     public static final String REACT_CLASS = "AppLovinMAXNativeAdView";
 
     public final int COMMAND_LOAD_AD = 1;
 
-    public AppLovinMAXNativeAdViewManager(final ReactApplicationContext callerContext) { }
+    public AppLovinMAXNativeAdViewManager() { }
 
     @NonNull
     @Override
@@ -44,11 +43,11 @@ public class AppLovinMAXNativeAdViewManager
     {
         // mapping Android events to JavaScript events
         return MapBuilder.<String, Object>builder()
-                .put( "onAdLoadedEvent", MapBuilder.of( "registrationName", "onAdLoadedEvent" ) )
-                .put( "onAdLoadFailedEvent", MapBuilder.of( "registrationName", "onAdLoadFailedEvent" ) )
-                .put( "onAdClickedEvent", MapBuilder.of( "registrationName", "onAdClickedEvent" ) )
-                .put( "onAdRevenuePaidEvent", MapBuilder.of( "registrationName", "onAdRevenuePaidEvent" ) )
-                .build();
+            .put( "onAdLoadedEvent", MapBuilder.of( "registrationName", "onAdLoadedEvent" ) )
+            .put( "onAdLoadFailedEvent", MapBuilder.of( "registrationName", "onAdLoadFailedEvent" ) )
+            .put( "onAdClickedEvent", MapBuilder.of( "registrationName", "onAdClickedEvent" ) )
+            .put( "onAdRevenuePaidEvent", MapBuilder.of( "registrationName", "onAdRevenuePaidEvent" ) )
+            .build();
     }
 
     /// Call from JavaScript
@@ -58,7 +57,7 @@ public class AppLovinMAXNativeAdViewManager
     public Map<String, Integer> getCommandsMap()
     {
         return MapBuilder.of(
-                "loadAd", COMMAND_LOAD_AD
+            "loadAd", COMMAND_LOAD_AD
         );
     }
 
@@ -66,11 +65,9 @@ public class AppLovinMAXNativeAdViewManager
     @Override
     public void receiveCommand(@NonNull final AppLovinMAXNativeAdView root, final int commandId, @Nullable final ReadableArray args)
     {
-        switch ( commandId )
+        if ( commandId == COMMAND_LOAD_AD )
         {
-            case COMMAND_LOAD_AD:
-                root.loadAd();
-                break;
+            root.loadAd();
         }
     }
 
@@ -149,7 +146,7 @@ public class AppLovinMAXNativeAdViewManager
     }
 
     @Override
-    public void onAfterUpdateTransaction(final AppLovinMAXNativeAdView view)
+    public void onAfterUpdateTransaction(@NonNull final AppLovinMAXNativeAdView view)
     {
         super.onAfterUpdateTransaction( view );
 

package/android/src/main/java/com/applovin/reactnative/AppLovinMAXPackage.java

@@ -14,7 +14,7 @@ import androidx.annotation.NonNull;
  * Created by Thomas So on July 11 2020
  */
 public class AppLovinMAXPackage
-        implements ReactPackage
+    implements ReactPackage
 {
     @Override
     public @NonNull List<NativeModule> createNativeModules(@NonNull final ReactApplicationContext reactContext)
@@ -28,8 +28,8 @@ public class AppLovinMAXPackage
     public @NonNull List<ViewManager> createViewManagers(@NonNull final ReactApplicationContext reactContext)
     {
         List<ViewManager> viewManagers = new ArrayList<>( 2 );
-        viewManagers.add( new AppLovinMAXAdViewManager( reactContext ) );
-        viewManagers.add( new AppLovinMAXNativeAdViewManager( reactContext ) );
+        viewManagers.add( new AppLovinMAXAdViewManager() );
+        viewManagers.add( new AppLovinMAXNativeAdViewManager() );
         return viewManagers;
     }
 }

package/ios/AppLovinMAX.h

@@ -49,7 +49,7 @@ NS_ASSUME_NONNULL_BEGIN
 /**
  * Returns a dictionay value of adLoadFailedInfo for the specified error.
  */
-- (NSDictionary<NSString *, id> *)adLoadFailedInfoForAd:(NSString *)adUnitIdentifier withError:(MAError *)error;
+- (NSDictionary<NSString *, id> *)adLoadFailedInfoForAd:(NSString *)adUnitIdentifier withError:(nullable MAError *)error;
 
 /**
  * Returns a dictionay value of adDisplayFailedInfo for the specified ad and error.

package/ios/AppLovinMAX.m

@@ -136,6 +136,9 @@ static NSString *const ON_APPOPEN_AD_FAILED_TO_DISPLAY_EVENT = @"OnAppOpenAdFail
 static NSString *const ON_APPOPEN_AD_HIDDEN_EVENT = @"OnAppOpenAdHiddenEvent";
 static NSString *const ON_APPOPEN_AD_REVENUE_PAID = @"OnAppOpenAdRevenuePaid";
 
+static NSString *const ON_NATIVE_UI_COMPONENT_ADVIEW_AD_LOADED_EVENT = @"OnNativeUIComponentAdviewAdLoadedEvent";
+static NSString *const ON_NATIVE_UI_COMPONENT_ADVIEW_AD_LOAD_FAILED_EVENT = @"OnNativeUIComponentAdviewAdLoadFailedEvent";
+
 static NSString *const TOP_CENTER = @"top_center";
 static NSString *const TOP_LEFT = @"top_left";
 static NSString *const TOP_RIGHT = @"top_right";
@@ -577,7 +580,7 @@ RCT_EXPORT_METHOD(showCmpForExistingUser:(RCTPromiseResolveBlock)resolve :(RCTPr
         [self logUninitializedAccessError: @"showCmpForExistingUser" withPromiseReject: reject];
         return;
     }
-
+    
     [self.sdk.cmpService showCMPForExistingUserWithCompletion:^(ALCMPError * _Nullable error) {
         
         if ( !error )
@@ -585,7 +588,7 @@ RCT_EXPORT_METHOD(showCmpForExistingUser:(RCTPromiseResolveBlock)resolve :(RCTPr
             resolve(nil);
             return;
         }
-
+        
         resolve(@{@"code" : @(error.code),
                   @"message" : error.message ?: @"",
                   @"cmpCode" : @(error.cmpCode),
@@ -600,7 +603,7 @@ RCT_EXPORT_METHOD(hasSupportedCmp:(RCTPromiseResolveBlock)resolve :(RCTPromiseRe
         [self logUninitializedAccessError: @"hasSupportedCmp" withPromiseReject: reject];
         return;
     }
-
+    
     resolve(@([self.sdk.cmpService hasSupportedCMP]));
 }
 
@@ -1266,6 +1269,34 @@ RCT_EXPORT_METHOD(setAppOpenAdLocalExtraParameter:(NSString *)adUnitIdentifier :
     [appOpenAd setLocalExtraParameterForKey: key value: value];
 }
 
+#pragma mark - AdView Preloading
+
+RCT_EXPORT_METHOD(preloadNativeUIComponentAdView:(NSString *)adUnitIdentifier :(NSString *)adFormatStr :(NSString *)placement :(NSString *)customData :(NSDictionary<NSString *, id> *)extraParameterDict :(NSDictionary<NSString *, id> *)localExtraParameterDict :(RCTPromiseResolveBlock)resolve :(RCTPromiseRejectBlock)reject)
+{
+    MAAdFormat *adFormat;
+    
+    if ( [MAAdFormat.banner.label isEqualToString: adFormatStr] )
+    {
+        adFormat = DEVICE_SPECIFIC_ADVIEW_AD_FORMAT;
+    }
+    else if ( [MAAdFormat.mrec.label isEqualToString: adFormatStr] )
+    {
+        adFormat = MAAdFormat.mrec;
+    }
+    else
+    {
+        [self logInvalidAdFormat: adFormat withPromiseReject: reject];
+        return;
+    }
+    
+    [AppLovinMAXAdView preloadNativeUIComponentAdView:adUnitIdentifier adFormat:adFormat placement:placement customData:customData extraParameters:extraParameterDict localExtraParameters:localExtraParameterDict withPromiseResolver:resolve withPromiseRejecter:reject];
+}
+
+RCT_EXPORT_METHOD(destroyNativeUIComponentAdView:(NSString *)adUnitIdentifier :(RCTPromiseResolveBlock)resolve :(RCTPromiseRejectBlock)reject)
+{
+    [AppLovinMAXAdView destroyNativeUIComponentAdView:adUnitIdentifier withPromiseResolver:resolve withPromiseRejecter:reject];
+}
+
 #pragma mark - Ad Callbacks
 
 - (void)didLoadAd:(MAAd *)ad
@@ -2040,7 +2071,20 @@ RCT_EXPORT_METHOD(setAppOpenAdLocalExtraParameter:(NSString *)adUnitIdentifier :
 
 - (void)logInvalidAdFormat:(MAAdFormat *)adFormat
 {
-    [self log: @"invalid ad format: %@, from %@", adFormat, [NSThread callStackSymbols]];
+    [self logInvalidAdFormat: adFormat withPromiseReject: nil];
+}
+
+- (void)logInvalidAdFormat:(MAAdFormat *)adFormat withPromiseReject:(nullable RCTPromiseRejectBlock)reject
+{
+    NSString *message = [NSString stringWithFormat:@"invalid ad format: %@, from %@", adFormat, [NSThread callStackSymbols]];
+    
+    if ( !reject )
+    {
+        NSLog(@"[%@] [%@] %@", SDK_TAG, TAG, message);
+        return;
+    }
+    
+    reject(TAG, message, nil);
 }
 
 - (void)logUninitializedAccessError:(NSString *)callingMethod
@@ -2051,13 +2095,13 @@ RCT_EXPORT_METHOD(setAppOpenAdLocalExtraParameter:(NSString *)adUnitIdentifier :
 - (void)logUninitializedAccessError:(NSString *)callingMethod withPromiseReject:(nullable RCTPromiseRejectBlock)reject
 {
     NSString *message = [NSString stringWithFormat:@"ERROR: Failed to execute %@() - please ensure the AppLovin MAX React Native module has been initialized by calling 'AppLovinMAX.initialize(...);'!", callingMethod];
-
+    
     if ( !reject )
     {
         NSLog(@"[%@] [%@] %@", SDK_TAG, TAG, message);
         return;
     }
-
+    
     reject(TAG, message, nil);
 }
 
@@ -2196,10 +2240,10 @@ RCT_EXPORT_METHOD(setAppOpenAdLocalExtraParameter:(NSString *)adUnitIdentifier :
              @"dspName" : ad.DSPName ?: @"",
              @"size" : @{@"width" : @(ad.size.width),
                          @"height" : @(ad.size.height)}
-            };
+    };
 }
 
-- (NSDictionary<NSString *, id> *)adLoadFailedInfoForAd:(NSString *)adUnitIdentifier withError:(MAError *)error
+- (NSDictionary<NSString *, id> *)adLoadFailedInfoForAd:(NSString *)adUnitIdentifier withError:(nullable MAError *)error
 {
     return ( error ) ?
     @{@"adUnitId": adUnitIdentifier,
@@ -2343,7 +2387,7 @@ RCT_EXPORT_METHOD(setAppOpenAdLocalExtraParameter:(NSString *)adUnitIdentifier :
             [self log: @"Failed to set Amazon result - unable to find interstitial"];
             return;
         }
-
+        
         [interstitial setLocalExtraParameterForKey: key value: result];
     }
     else if ( adFormat == MAAdFormat.rewarded )
@@ -2354,13 +2398,13 @@ RCT_EXPORT_METHOD(setAppOpenAdLocalExtraParameter:(NSString *)adUnitIdentifier :
             [self log: @"Failed to set Amazon result - unable to find rewarded ad"];
             return;
         }
-
+        
         [rewardedAd setLocalExtraParameterForKey: key value: result];
     }
     else  // MAAdFormat.banner or MAAdFormat.mrec
     {
         MAAdView *adView = [AppLovinMAXAdView sharedWithAdUnitIdentifier: adUnitIdentifier];
-
+        
         if ( !adView )
         {
             adView = [self retrieveAdViewForAdUnitIdentifier: adUnitIdentifier adFormat: adFormat];
@@ -2430,7 +2474,10 @@ RCT_EXPORT_METHOD(setAppOpenAdLocalExtraParameter:(NSString *)adUnitIdentifier :
              ON_APPOPEN_AD_DISPLAYED_EVENT,
              ON_APPOPEN_AD_FAILED_TO_DISPLAY_EVENT,
              ON_APPOPEN_AD_HIDDEN_EVENT,
-             ON_APPOPEN_AD_REVENUE_PAID];
+             ON_APPOPEN_AD_REVENUE_PAID,
+
+             ON_NATIVE_UI_COMPONENT_ADVIEW_AD_LOADED_EVENT,
+             ON_NATIVE_UI_COMPONENT_ADVIEW_AD_LOAD_FAILED_EVENT];
 }
 
 - (NSDictionary *)constantsToExport
@@ -2474,6 +2521,9 @@ RCT_EXPORT_METHOD(setAppOpenAdLocalExtraParameter:(NSString *)adUnitIdentifier :
              @"ON_APPOPEN_AD_HIDDEN_EVENT" : ON_APPOPEN_AD_HIDDEN_EVENT,
              @"ON_APPOPEN_AD_REVENUE_PAID" : ON_APPOPEN_AD_REVENUE_PAID,
              
+             @"ON_NATIVE_UI_COMPONENT_ADVIEW_AD_LOADED_EVENT" : ON_NATIVE_UI_COMPONENT_ADVIEW_AD_LOADED_EVENT,
+             @"ON_NATIVE_UI_COMPONENT_ADVIEW_AD_LOAD_FAILED_EVENT" : ON_NATIVE_UI_COMPONENT_ADVIEW_AD_LOAD_FAILED_EVENT,
+
              @"TOP_CENTER_POSITION" : TOP_CENTER,
              @"TOP_LEFT_POSITION" : TOP_LEFT,
              @"TOP_RIGHT_POSITION" : TOP_RIGHT,

package/ios/AppLovinMAXAdView.h

@@ -13,8 +13,20 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface AppLovinMAXAdView : UIView
 
+@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;
+
 + (MAAdView *)sharedWithAdUnitIdentifier:(NSString *)adUnitIdentifier;
 
++ (void)preloadNativeUIComponentAdView:(NSString *)adUnitIdentifier adFormat:(MAAdFormat *)adFormat placement:(NSString *)placement  customData:(NSString *)customData extraParameters:(NSDictionary<NSString *, NSString *> *)extraParameters localExtraParameters:(NSDictionary<NSString *, NSString *> *)localExtraParameters withPromiseResolver:(RCTPromiseResolveBlock)resolve withPromiseRejecter:(RCTPromiseRejectBlock)reject;
+
++ (void)destroyNativeUIComponentAdView:(NSString *)adUnitIdentifier withPromiseResolver:(RCTPromiseResolveBlock)resolve withPromiseRejecter:(RCTPromiseRejectBlock)reject;
+
 - (void)loadAd;
 
 @end