react-native-applovin-max 2.3.1 → 2.4.2

package/android/build.gradle

@@ -41,8 +41,8 @@ android {
   defaultConfig {
     minSdkVersion 16
     targetSdkVersion getExtOrIntegerDefault('targetSdkVersion')
-    versionCode 2030100
-    versionName "2.3.1"
+    versionCode 2040200
+    versionName "2.4.2"
   }
 
   flavorDimensions("default")

package/android/gradlew.bat

@@ -1,84 +1,84 @@
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto init
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega

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

@@ -2,16 +2,15 @@ package com.applovin.reactnative;
 
 import android.app.Activity;
 import android.content.Context;
-import android.graphics.Point;
 import android.text.TextUtils;
-import android.view.ViewGroup;
-import android.view.ViewParent;
 
 import com.applovin.mediation.MaxAdFormat;
 import com.applovin.mediation.ads.MaxAdView;
 import com.facebook.react.uimanager.ThemedReactContext;
 import com.facebook.react.views.view.ReactViewGroup;
 
+import androidx.annotation.Nullable;
+
 /**
  * Created by Thomas So on September 27 2020
  */
@@ -69,9 +68,15 @@ class AppLovinMAXAdView
         }
     }
 
-    public void maybeAttachAdView(final String adUnitId, final MaxAdFormat adFormat)
+    @Nullable
+    protected MaxAdView getAdView()
+    {
+        return adView;
+    }
+
+    public void maybeAttachAdView(final String placement, final String adaptiveBannerEnabledStr, final String adUnitId, final MaxAdFormat adFormat)
     {
-        Activity currentActivity = reactContext.getCurrentActivity();
+        final Activity currentActivity = reactContext.getCurrentActivity();
         if ( currentActivity == null )
         {
             AppLovinMAXModule.e( "Unable to attach AdView - no current Activity found" );
@@ -87,19 +92,24 @@ class AppLovinMAXAdView
                 // If ad unit id and format has been set - create and attach AdView
                 if ( !TextUtils.isEmpty( adUnitId ) && adFormat != null )
                 {
-                    adView = AppLovinMAXModule.getInstance().retrieveAdView( adUnitId, adFormat, "", new Point( 0, 0 ) );
-                    adView.loadAd();
+                    adView = new MaxAdView( adUnitId, adFormat, AppLovinMAXModule.getInstance().getSdk(), currentActivity );
+                    adView.setListener( AppLovinMAXModule.getInstance() );
 
-                    currentWidthPx = getWidth();
-                    currentHeightPx = getHeight();
+                    if ( placement != null )
+                    {
+                        adView.setPlacement( placement );
+                    }
 
-                    // Handle fast refresh cases of re-adding adView
-                    ViewParent parent = adView.getParent();
-                    if ( parent instanceof ViewGroup )
+                    if ( adaptiveBannerEnabledStr != null )
                     {
-                        ( (ViewGroup) parent ).removeView( adView );
+                        adView.setExtraParameter( "adaptive_banner", adaptiveBannerEnabledStr );
                     }
 
+                    adView.loadAd();
+
+                    currentWidthPx = getWidth();
+                    currentHeightPx = getHeight();
+
                     addView( adView );
                 }
             }

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

@@ -1,6 +1,7 @@
 package com.applovin.reactnative;
 
 import com.applovin.mediation.MaxAdFormat;
+import com.applovin.mediation.ads.MaxAdView;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.uimanager.SimpleViewManager;
@@ -28,6 +29,10 @@ class AppLovinMAXAdViewManager
     private final Map<AppLovinMAXAdView, String>      adUnitIdRegistry = new HashMap<>();
     private final Map<AppLovinMAXAdView, MaxAdFormat> adFormatRegistry = new HashMap<>();
 
+    // Storage for placement and extra parameters if set before the MAAdView is created
+    private final Map<AppLovinMAXAdView, String> placementRegistry             = new HashMap<>();
+    private final Map<AppLovinMAXAdView, String> adaptiveBannerEnabledRegistry = new HashMap<>();
+
     public AppLovinMAXAdViewManager(final ReactApplicationContext reactApplicationContext)
     {
         this.reactApplicationContext = reactApplicationContext;
@@ -49,13 +54,26 @@ class AppLovinMAXAdViewManager
     @Override
     public void receiveCommand(@NonNull AppLovinMAXAdView view, String commandId, @Nullable ReadableArray args)
     {
-        if ( "setAdUnitId".equals( commandId ) && args != null )
+        if ( args == null ) return;
+
+        String arg = args.getString( 0 );
+        if ( arg == null ) return;
+
+        if ( "setPlacement".equals( commandId ) )
+        {
+            setPlacement( view, arg );
+        }
+        else if ( "setAdaptiveBannerEnabled".equals( commandId ) )
         {
-            setAdUnitId( view, args.getString( 0 ) );
+            setAdaptiveBannerEnabled( view, arg );
         }
-        else if ( "setAdFormat".equals( commandId ) && args != null )
+        else if ( "setAdUnitId".equals( commandId ) )
         {
-            setAdFormat( view, args.getString( 0 ) );
+            setAdUnitId( view, arg );
+        }
+        else if ( "setAdFormat".equals( commandId ) )
+        {
+            setAdFormat( view, arg );
         }
         else
         {
@@ -63,11 +81,44 @@ class AppLovinMAXAdViewManager
         }
     }
 
+    public void setPlacement(final AppLovinMAXAdView view, final String placement)
+    {
+        // Post to main thread to avoid race condition with actual creation of MaxAdView in maybeAttachAdView()
+        view.post( () -> {
+
+            MaxAdView adView = view.getAdView();
+            if ( adView != null )
+            {
+                adView.setPlacement( placement );
+            }
+            else
+            {
+                placementRegistry.put( view, placement );
+            }
+        } );
+    }
+
+    public void setAdaptiveBannerEnabled(final AppLovinMAXAdView view, final String enabledStr)
+    {
+        // Post to main thread to avoid race condition with actual creation of MaxAdView in maybeAttachAdView()
+        view.post( () -> {
+
+            MaxAdView adView = view.getAdView();
+            if ( adView != null )
+            {
+                adView.setExtraParameter( "adaptive_banner", enabledStr );
+            }
+            else
+            {
+                adaptiveBannerEnabledRegistry.put( view, enabledStr );
+            }
+        } );
+    }
+
     public void setAdUnitId(final AppLovinMAXAdView view, final String adUnitId)
     {
         adUnitIdRegistry.put( view, adUnitId );
-
-        view.maybeAttachAdView( adUnitIdRegistry.get( view ), adFormatRegistry.get( view ) );
+        maybeAttachAdView( view );
     }
 
     public void setAdFormat(final AppLovinMAXAdView view, final String adFormatStr)
@@ -81,7 +132,18 @@ class AppLovinMAXAdViewManager
             adFormatRegistry.put( view, MaxAdFormat.MREC );
         }
 
-        view.maybeAttachAdView( adUnitIdRegistry.get( view ), adFormatRegistry.get( view ) );
+        maybeAttachAdView( view );
+    }
+
+    private void maybeAttachAdView(final AppLovinMAXAdView view)
+    {
+        String placement = placementRegistry.remove( view );
+        String adaptiveBannerEnabledStr = adaptiveBannerEnabledRegistry.remove( view );
+
+        view.maybeAttachAdView( placement,
+                                adaptiveBannerEnabledStr,
+                                adUnitIdRegistry.get( view ),
+                                adFormatRegistry.get( view ) );
     }
 
     @Override

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

@@ -103,6 +103,11 @@ public class AppLovinMAXModule
         return instance;
     }
 
+    public AppLovinSdk getSdk()
+    {
+        return sdk;
+    }
+
     public AppLovinMAXModule(final ReactApplicationContext reactContext)
     {
         super( reactContext );
@@ -1203,7 +1208,7 @@ public class AppLovinMAXModule
         return retrieveAdView( adUnitId, adFormat, null, DEFAULT_AD_VIEW_OFFSET );
     }
 
-    public MaxAdView retrieveAdView(String adUnitId, MaxAdFormat adFormat, String adViewPosition, Point adViewOffsetPixels)
+    private MaxAdView retrieveAdView(String adUnitId, MaxAdFormat adFormat, String adViewPosition, Point adViewOffsetPixels)
     {
         MaxAdView result = mAdViews.get( adUnitId );
         if ( result == null && adViewPosition != null && adViewOffsetPixels != null )
@@ -1233,13 +1238,10 @@ public class AppLovinMAXModule
             return;
         }
 
-        final RelativeLayout relativeLayout = (RelativeLayout) adView.getParent();
-        if ( relativeLayout == null )
-        {
-            e( adFormat.getLabel() + "'s parent does not exist" );
-            return;
-        }
+        final ViewParent parent = adView.getParent();
+        if ( !( parent instanceof RelativeLayout ) ) return;
 
+        final RelativeLayout relativeLayout = (RelativeLayout) parent;
         final Rect windowRect = new Rect();
         relativeLayout.getWindowVisibleDisplayFrame( windowRect );
 

package/ios/AppLovinMAX.h

@@ -19,7 +19,7 @@ NS_ASSUME_NONNULL_BEGIN
 /**
  * The primary bridge between JS <-> native code for the AppLovin MAX React Native module.
  */
-@interface AppLovinMAX : RCTEventEmitter<RCTBridgeModule>
+@interface AppLovinMAX : RCTEventEmitter<RCTBridgeModule, MAAdDelegate, MARewardedAdDelegate, MAAdViewAdDelegate>
 
 /**
  * Shared instance of this bridge module.
@@ -27,13 +27,9 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, strong, readonly, class) AppLovinMAX *shared;
 
 /**
- * Dedicated method for retrieving a MAAdView.
+ * The instance of the AppLovin SDK the module is using.
  */
-- (MAAdView *)retrieveAdViewForAdUnitIdentifier:(NSString *)adUnitIdentifier
-                                       adFormat:(MAAdFormat *)adFormat
-                                     atPosition:(NSString *)adViewPosition
-                                     withOffset:(CGPoint)offset
-                                         attach:(BOOL)attach;
+@property (nonatomic, weak, readonly) ALSdk *sdk;
 
 @end
 

package/ios/AppLovinMAX.m

@@ -27,7 +27,7 @@
 @property (nonatomic, assign, readonly, getter=al_isValidString) BOOL al_validString;
 @end
 
-@interface AppLovinMAX()<MAAdDelegate, MAAdViewAdDelegate, MARewardedAdDelegate>
+@interface AppLovinMAX()
 
 // Parent Fields
 @property (nonatomic,  weak) ALSdk *sdk;
@@ -802,7 +802,7 @@ RCT_EXPORT_METHOD(setRewardedAdExtraParameter:(NSString *)adUnitIdentifier :(NSS
         MAAdView *adView = [self retrieveAdViewForAdUnitIdentifier: adUnitIdentifier adFormat: adFormat];
         [adView setExtraParameterForKey: key value: value];
         
-        if (  [@"force_banner" isEqualToString: key] && MAAdFormat.mrec != adFormat )
+        if ( [@"force_banner" isEqualToString: key] && MAAdFormat.mrec != adFormat )
         {
             // Handle local changes as needed
             MAAdFormat *adFormat;
@@ -942,11 +942,6 @@ RCT_EXPORT_METHOD(setRewardedAdExtraParameter:(NSString *)adUnitIdentifier :(NSS
 }
 
 - (MAAdView *)retrieveAdViewForAdUnitIdentifier:(NSString *)adUnitIdentifier adFormat:(MAAdFormat *)adFormat atPosition:(NSString *)adViewPosition withOffset:(CGPoint)offset
-{
-    return [self retrieveAdViewForAdUnitIdentifier: adUnitIdentifier adFormat: adFormat atPosition: adViewPosition withOffset: offset attach: YES];
-}
-
-- (MAAdView *)retrieveAdViewForAdUnitIdentifier:(NSString *)adUnitIdentifier adFormat:(MAAdFormat *)adFormat atPosition:(NSString *)adViewPosition withOffset:(CGPoint)offset attach:(BOOL)attach
 {
     MAAdView *result = self.adViews[adUnitIdentifier];
     if ( !result && adViewPosition )
@@ -957,14 +952,9 @@ RCT_EXPORT_METHOD(setRewardedAdExtraParameter:(NSString *)adUnitIdentifier :(NSS
         result.translatesAutoresizingMaskIntoConstraints = NO;
         
         self.adViews[adUnitIdentifier] = result;
-        
-        // If this is programmatic (non native RN)
-        if ( attach )
-        {
-            self.adViewPositions[adUnitIdentifier] = adViewPosition;
-            self.adViewOffsets[adUnitIdentifier] = [NSValue valueWithCGPoint: offset];
-            [ROOT_VIEW_CONTROLLER.view addSubview: result];
-        }
+        self.adViewPositions[adUnitIdentifier] = adViewPosition;
+        self.adViewOffsets[adUnitIdentifier] = [NSValue valueWithCGPoint: offset];
+        [ROOT_VIEW_CONTROLLER.view addSubview: result];
     }
     
     return result;

package/ios/AppLovinMAXAdViewManager.m

@@ -23,6 +23,10 @@
 @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 *> *adaptiveBannerEnabledRegistry;
+
 @end
 
 @implementation AppLovinMAXAdViewManager
@@ -41,6 +45,8 @@ RCT_EXPORT_MODULE(AppLovinMAXAdView)
     {
         self.adUnitIdRegistry = [NSMutableDictionary dictionary];
         self.adFormatRegistry = [NSMutableDictionary dictionary];
+        self.placementRegistry = [NSMutableDictionary dictionary];
+        self.adaptiveBannerEnabledRegistry = [NSMutableDictionary dictionary];
     }
     return self;
 }
@@ -52,7 +58,7 @@ RCT_EXPORT_MODULE(AppLovinMAXAdView)
 }
 
 // NOTE: `nonnull` must be annotated here for this RN export to work at runtime
-RCT_EXPORT_METHOD(setAdUnitId:(nonnull NSNumber *)viewTag toAdUnitId:(NSString *)adUnitId)
+RCT_EXPORT_METHOD(setPlacement:(nonnull NSNumber *)viewTag toPlacement:(NSString *)placement)
 {
     [self.bridge.uiManager addUIBlock:^(RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
         
@@ -63,17 +69,68 @@ RCT_EXPORT_METHOD(setAdUnitId:(nonnull NSNumber *)viewTag toAdUnitId:(NSString *
             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(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(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 attachAdViewIfNeededForAdUnitIdentifier: self.adUnitIdRegistry[viewTag]
-                                             adFormat: self.adFormatRegistry[viewTag]
-                                        containerView: view];
+        [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 *)adFormatString)
+RCT_EXPORT_METHOD(setAdFormat:(nonnull NSNumber *)viewTag toAdFormat:(NSString *)adFormatStr)
 {
     [self.bridge.uiManager addUIBlock:^(RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
         
@@ -85,22 +142,23 @@ RCT_EXPORT_METHOD(setAdFormat:(nonnull NSNumber *)viewTag toAdFormat:(NSString *
             return;
         }
         
-        if ( [@"banner" isEqualToString: adFormatString] )
+        if ( [@"banner" isEqualToString: adFormatStr] )
         {
             self.adFormatRegistry[viewTag] = DEVICE_SPECIFIC_ADVIEW_AD_FORMAT;
         }
-        else if ( [@"mrec" isEqualToString: adFormatString] )
+        else if ( [@"mrec" isEqualToString: adFormatStr] )
         {
             self.adFormatRegistry[viewTag] = MAAdFormat.mrec;
         }
-
-        [self attachAdViewIfNeededForAdUnitIdentifier: self.adUnitIdRegistry[viewTag]
-                                             adFormat: self.adFormatRegistry[viewTag]
-                                        containerView: view];
+        
+        [self attachAdViewIfNeededForViewTag: viewTag
+                            adUnitIdentifier: self.adUnitIdRegistry[viewTag]
+                                    adFormat: self.adFormatRegistry[viewTag]
+                               containerView: view];
     }];
 }
 
-- (void)attachAdViewIfNeededForAdUnitIdentifier:(NSString *)adUnitIdentifier adFormat:(MAAdFormat *)adFormat containerView:(UIView *)containerView
+- (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(), ^{
@@ -108,7 +166,8 @@ RCT_EXPORT_METHOD(setAdFormat:(nonnull NSNumber *)viewTag toAdFormat:(NSString *
         // If ad unit id and format has been set - create and attach AdView
         if ( [adUnitIdentifier al_isValidString] && adFormat )
         {
-            MAAdView *adView = [self getMAAdViewFromContainerView: containerView];
+            MAAdView *adView = [self adViewFromContainerView: containerView];
+            
             // Check if there's a previously-attached AdView
             if ( adView )
             {
@@ -118,11 +177,24 @@ RCT_EXPORT_METHOD(setAdFormat:(nonnull NSNumber *)viewTag toAdFormat:(NSString *
                 adView = nil;
             }
             
-            adView = [AppLovinMAX.shared retrieveAdViewForAdUnitIdentifier: adUnitIdentifier
-                                                                  adFormat: adFormat
-                                                                atPosition: @""
-                                                                withOffset: CGPointZero
-                                                                    attach: NO];
+            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
+            
+            NSString *placement = self.placementRegistry[viewTag];
+            if ( placement )
+            {
+                [self.placementRegistry removeObjectForKey: viewTag];
+                adView.placement = placement;
+            }
+            
+            NSString *adaptiveBannerEnabledStr = self.adaptiveBannerEnabledRegistry[viewTag];
+            if ( [adaptiveBannerEnabledStr al_isValidString] )
+            {
+                [self.adaptiveBannerEnabledRegistry removeObjectForKey: viewTag];
+                [adView setExtraParameterForKey: @"adaptive_banner" value: adaptiveBannerEnabledStr];
+            }
+            
             [adView loadAd];
             
             [containerView addSubview: adView];
@@ -138,7 +210,7 @@ RCT_EXPORT_METHOD(setAdFormat:(nonnull NSNumber *)viewTag toAdFormat:(NSString *
 
 // MARK: - Helper Functions
 
-- (nullable MAAdView *)getMAAdViewFromContainerView:(UIView *)view
+- (nullable MAAdView *)adViewFromContainerView:(UIView *)view
 {
     return view.subviews.count > 0 ? ((MAAdView *) view.subviews.lastObject) : nil;
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "react-native-applovin-max",
   "author": "AppLovin Corporation",
-  "version": "2.3.1",
+  "version": "2.4.2",
   "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,7 +11,7 @@ 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_2_3_1" }
+  s.source       = { :git => "https://github.com/AppLovin/AppLovin-MAX-React-Native.git", :tag => "release_2_4_2" }
   
   s.source_files  = "ios/AppLovinMAX*.{h,m}"
 

package/src/.idea/modules.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/src.iml" filepath="$PROJECT_DIR$/.idea/src.iml" />
+    </modules>
+  </component>
+</project>

package/src/.idea/src.iml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="WEB_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

package/src/.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
+  </component>
+</project>

package/src/AppLovinMAXAdView.js

@@ -87,11 +87,11 @@ class AdView extends React.Component {
     // If the ad unit id or ad format are unset, we can't set the placement.
     if (adUnitId == null || adFormat == null) return;
 
-    if (adFormat === AppLovinMAX.AdFormat.BANNER) {
-      AppLovinMAX.setBannerPlacement(adUnitId, placement);
-    } else if (adFormat === AppLovinMAX.AdFormat.MREC) {
-      AppLovinMAX.setMRecPlacement(adUnitId, placement);
-    }
+    UIManager.dispatchViewManagerCommand(
+        findNodeHandle(this),
+        Platform.OS === 'android' ? "setPlacement" : UIManager.getViewManagerConfig("AppLovinMAXAdView").Commands.setPlacement,
+        [placement]
+    );
   }
 
   setAdaptiveBannerEnabled(enabled) {
@@ -103,7 +103,11 @@ class AdView extends React.Component {
 
     if (adFormat === AppLovinMAX.AdFormat.BANNER) {
       if (enabled === true || enabled === false) {
-        AppLovinMAX.setBannerExtraParameter(adUnitId, "adaptive_banner", enabled ? "true" : "false");
+        UIManager.dispatchViewManagerCommand(
+            findNodeHandle(this),
+            Platform.OS === 'android' ? "setAdaptiveBannerEnabled" : UIManager.getViewManagerConfig("AppLovinMAXAdView").Commands.setAdaptiveBannerEnabled,
+            [enabled ? "true" : "false"]
+        );
       }
     }
   }

package/src/index.js

@@ -3,7 +3,7 @@ import AdView from "./AppLovinMAXAdView";
 
 const { AppLovinMAX } = NativeModules;
 
-const VERSION = "2.3.1";
+const VERSION = "2.4.2";
 
 /**
  * This enum represents whether or not the consent dialog should be shown for this user.
@@ -76,14 +76,6 @@ export default {
   initialize(sdkKey, callback) {
     AppLovinMAX.initialize(VERSION, sdkKey, callback); // Inject VERSION into native code
   },
-  // Support for showing ad without placement
-  showInterstitial(adUnitId) {
-    AppLovinMAX.showInterstitial(adUnitId, "");
-  },
-  // Support for showing ad without placement
-  showRewardedAd(adUnitId) {
-    AppLovinMAX.showRewardedAd(adUnitId, "");
-  },
 
   /*----------------------*/
   /** AUTO-DECLARED APIs **/

package/CHANGELOG.md

@@ -1,66 +0,0 @@
-## Versions
-
-## 2.3.1
-    * Fix NPE in `positionAdView()`.
-## 2.3.0
-    * Enable adaptive banners by default.
-    * Add support for native ad placements. Docs can be found [here](https://dash.applovin.com/documentation/mediation/react-native/getting-started/advanced-settings#banners-/-mrecs-(native-ui-component-method)).
-    * Fix thread warning with native component AdViews.
-## 2.2.0
-    * Allow for multiple native `AppLovinMAX.AdView`s at once on a screen (e.g. a banner and a mrec).
-## 2.1.3
-    * Add support for latest SDKs v10.3.1 with new callbacks.
-## 2.1.2
-    * Fix banners and MRECs native UI components not clicking if not styled by parent dom.
-## 2.1.1
-    * Fix iOS projects not building.
-## 2.1.0
-    * Add API for passing in `errorInfo` for ad load failure callbacks with parameters "code", "message", and "adLoadFailureInfo".
-    * Add API for passing in `errorInfo` for ad display failure callbacks with parameters "code" and "message".
-    * Add API for creating and updating banner X and Y offsets. For example, to offset banner 50px from a bottom center position: `AppLovinMAX.createBannerWithOffsets(adUnitId, AppLovinMAX.AdViewPosition.BOTTOM_CENTER, 0, 50);`.
-## 2.0.6
-    * Add support for latest SDKs v10.3.0 with new callbacks.
-## 2.0.5
-    * Fallback to SDK key in Android Manifest and Info.plist if not passed programmatically.
-    * Add support for setting banner width.
-## 2.0.4
-    * Pass `"countryCode"` in initialization callback.
-## 2.0.3
-    * Fix ad callbacks not returning.
-## 2.0.2
-    * Remove `getAdInfo(adUnitId)` API in lieu of ad callbacks.
-    * Return more data in ad callbacks in addition to `ad.adUnitId` (e.g. `adInfo.creativeId`, `adInfo.networkName`, `adInfo.placement`, `adInfo.revenue`).
-## 2.0.1
-    * Ensure exported iOS methods are invoked on the main queue.
-## 2.0.0
-    * Initial support for MAX consent flow. Please see our documentation for instructions on enabling it.
-    * Add `AppLovinMAX.setCreativeDebuggerEnabled()` API to enable the creative debugger button.
-    * Revert from using the hardcoded SDK value of 10.1.1 to using +.
-    * Fix MRec ad expanded event not working on Android.
-## 1.1.10
-    * Hardcode Android SDK version to 10.1.1.
-## 1.1.9
-    * Fix React Native version not being passed through to native SDKs.
-## 1.1.8
-    * Remove need to define Android product flavors in `build.gradle`.
-## 1.1.7
-    * Fix Android native UI banners rendering issues when mounting / unmounting.
-    * Add support for setting test device(s) using the advertising identifier (GAID / IDFA) printed in the initialization logs.
-## 1.1.6
-    * Attempt fix for `loadInterstitial()` or `loadRewardedAd()` due to current Activity being null.
-## 1.1.5
-    * Fix `removeEventListener()` not working by explicitly calling `remove()`.
-## 1.1.4
-    * Fix Android banners not working for fast refreshes.
-    * FIx iOS module's podspec pointing to invalid tag.
-## 1.1.3
-    * Ensure values such as user id is set before initializing SDK.
-    * Add workaround for `getCurrentActivity()` returning `null`.
-## 1.1.2
-    * Fix `ConsentDialogState.UNKNOWN` being returned for `getConsentDialogState()` on iOS.
-## 1.1.1
-    * Fix `AppLovinMAX.removeEventListener()` crash.
-## 1.1.0
-    * Add support for native banner / MREC UI components via `<AppLovinMAX.AdView adUnitId={...} adFormat={...} />`.
-## 1.0.0
-    * Initial release with support for interstitials, rewarded ads, banners, and MRECs.

package/android/.gitignore

@@ -1,23 +0,0 @@
-
-*.iml
-
-*.apk
-
-*.hprof
-
-
-/local.properties
-.idea
-.gradle
-
-.DS_Store
-
-/build
-/captures
-/target
-/release
-
-.externalNativeBuild
-.DS_Store
-
-sdk_keys.local

package/ios/.gitignore

@@ -1 +0,0 @@
-/Pods

package/ios/AppLovinMAX.xcworkspace/xcuserdata/thomasso.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Bucket
-   uuid = "3CE74096-E37E-4931-B9DE-06D2340266D0"
-   type = "0"
-   version = "2.0">
-   <Breakpoints>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "4F7E6675-4074-44B2-A62C-1962AA9296C7"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "AppLovinMAXAdViewManager.m"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "90"
-            endingLineNumber = "90"
-            landmarkName = "-attachAdViewIfNeededForAdUnitIdentifier:adFormat:"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-   </Breakpoints>
-</Bucket>