react-native-applovin-max 2.1.3 → 2.3.2

package/android/build.gradle

@@ -41,8 +41,8 @@ android {
   defaultConfig {
     minSdkVersion 16
     targetSdkVersion getExtOrIntegerDefault('targetSdkVersion')
-    versionCode 2010300
-    versionName "2.1.3"
+    versionCode 2030200
+    versionName "2.3.2"
   }
 
   flavorDimensions("default")
@@ -151,10 +151,5 @@ dependencies {
 
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 
-  if (findProject(':Android-SDK') != null) {
-    implementation "com.google.android.gms:play-services-ads-identifier:${versions.playServicesIdentifier}"
-    implementation project(':Android-SDK')
-  } else {
-    implementation 'com.applovin:applovin-sdk:+'
-  }
+  implementation 'com.applovin:applovin-sdk:+'
 }

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/AppLovinMAXAdViewManager.java

@@ -2,12 +2,16 @@ package com.applovin.reactnative;
 
 import com.applovin.mediation.MaxAdFormat;
 import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.uimanager.SimpleViewManager;
 import com.facebook.react.uimanager.ThemedReactContext;
-import com.facebook.react.uimanager.annotations.ReactProp;
 
 import org.jetbrains.annotations.NotNull;
 
+import java.util.HashMap;
+import java.util.Map;
+
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 /**
@@ -17,14 +21,12 @@ class AppLovinMAXAdViewManager
         extends SimpleViewManager<AppLovinMAXAdView>
 {
     // Parent fields
-    private ReactApplicationContext reactApplicationContext;
-
-    // View fields
-    private AppLovinMAXAdView adView;
+    private final ReactApplicationContext reactApplicationContext;
 
-    // Fields that need to be set before creating MaxAdView
-    private String      adUnitId;
-    private MaxAdFormat adFormat;
+    // Maps from the view to the corresponding ad unit id and ad format.
+    // Both must be set before the MaxAdView is created.
+    private final Map<AppLovinMAXAdView, String>      adUnitIdRegistry = new HashMap<>();
+    private final Map<AppLovinMAXAdView, MaxAdFormat> adFormatRegistry = new HashMap<>();
 
     public AppLovinMAXAdViewManager(final ReactApplicationContext reactApplicationContext)
     {
@@ -41,29 +43,53 @@ class AppLovinMAXAdViewManager
     protected @NotNull AppLovinMAXAdView createViewInstance(@NotNull final ThemedReactContext reactContext)
     {
         // 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
-        adView = new AppLovinMAXAdView( reactContext );
-        return adView;
+        return new AppLovinMAXAdView( reactContext );
+    }
+
+    @Override
+    public void receiveCommand(@NonNull AppLovinMAXAdView view, String commandId, @Nullable ReadableArray args)
+    {
+        if ( "setAdUnitId".equals( commandId ) && args != null )
+        {
+            setAdUnitId( view, args.getString( 0 ) );
+        }
+        else if ( "setAdFormat".equals( commandId ) && args != null )
+        {
+            setAdFormat( view, args.getString( 0 ) );
+        }
+        else
+        {
+            AppLovinMAXModule.e( "Unable to parse command: " + commandId + " for AdView: + " + view + " with args: " + args );
+        }
     }
 
-    @ReactProp(name = "adUnitId")
-    public void setAdUnitId(final AppLovinMAXAdView view, @Nullable final String adUnitId)
+    public void setAdUnitId(final AppLovinMAXAdView view, final String adUnitId)
     {
-        this.adUnitId = adUnitId;
-        adView.maybeAttachAdView( adUnitId, adFormat );
+        adUnitIdRegistry.put( view, adUnitId );
+
+        view.maybeAttachAdView( adUnitIdRegistry.get( view ), adFormatRegistry.get( view ) );
     }
 
-    @ReactProp(name = "adFormat")
-    public void setAdFormat(final AppLovinMAXAdView view, @Nullable final String adFormatStr)
+    public void setAdFormat(final AppLovinMAXAdView view, final String adFormatStr)
     {
         if ( "banner".equals( adFormatStr ) )
         {
-            adFormat = AppLovinMAXModule.getDeviceSpecificBannerAdViewAdFormat( reactApplicationContext );
+            adFormatRegistry.put( view, AppLovinMAXModule.getDeviceSpecificBannerAdViewAdFormat( reactApplicationContext ) );
         }
         else if ( "mrec".equals( adFormatStr ) )
         {
-            adFormat = MaxAdFormat.MREC;
+            adFormatRegistry.put( view, MaxAdFormat.MREC );
         }
 
-        adView.maybeAttachAdView( adUnitId, adFormat );
+        view.maybeAttachAdView( adUnitIdRegistry.get( view ), adFormatRegistry.get( view ) );
+    }
+
+    @Override
+    public void onDropViewInstance(@NotNull AppLovinMAXAdView view)
+    {
+        // NOTE: Android destroys the native MaxAdView and calls this method while iOS caches it when you remove it from screen
+        adUnitIdRegistry.remove( view );
+
+        super.onDropViewInstance( view );
     }
 }

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

@@ -46,8 +46,10 @@ import com.facebook.react.bridge.WritableMap;
 
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
 import androidx.annotation.Nullable;
@@ -87,13 +89,14 @@ public class AppLovinMAXModule
     private final Map<String, MaxRewardedAd>     mRewardedAds   = new HashMap<>( 2 );
 
     // Banner Fields
-    private final Map<String, MaxAdView>   mAdViews                    = new HashMap<>( 2 );
-    private final Map<String, MaxAdFormat> mAdViewAdFormats            = new HashMap<>( 2 );
-    private final Map<String, String>      mAdViewPositions            = new HashMap<>( 2 );
-    private final Map<String, Point>       mAdViewOffsets              = new HashMap<>( 2 );
-    private final Map<String, Integer>     mAdViewWidths               = new HashMap<>( 2 );
-    private final Map<String, MaxAdFormat> mVerticalAdViewFormats      = new HashMap<>( 2 );
-    private final List<String>             mAdUnitIdsToShowAfterCreate = new ArrayList<>( 2 );
+    private final Map<String, MaxAdView>   mAdViews                         = new HashMap<>( 2 );
+    private final Map<String, MaxAdFormat> mAdViewAdFormats                 = new HashMap<>( 2 );
+    private final Map<String, String>      mAdViewPositions                 = new HashMap<>( 2 );
+    private final Map<String, Point>       mAdViewOffsets                   = new HashMap<>( 2 );
+    private final Map<String, Integer>     mAdViewWidths                    = new HashMap<>( 2 );
+    private final Map<String, MaxAdFormat> mVerticalAdViewFormats           = new HashMap<>( 2 );
+    private final List<String>             mAdUnitIdsToShowAfterCreate      = new ArrayList<>( 2 );
+    private final Set<String>              mDisabledAdaptiveBannerAdUnitIds = new HashSet<>( 2 );
 
     public static AppLovinMAXModule getInstance()
     {
@@ -478,7 +481,7 @@ public class AppLovinMAXModule
     @ReactMethod()
     public void setBannerExtraParameter(final String adUnitId, final String key, final String value)
     {
-        setAdViewExtraParameters( adUnitId, getDeviceSpecificBannerAdViewAdFormat(), value, key );
+        setAdViewExtraParameters( adUnitId, getDeviceSpecificBannerAdViewAdFormat(), key, value );
     }
 
     @ReactMethod()
@@ -499,6 +502,12 @@ public class AppLovinMAXModule
         destroyAdView( adUnitId, getDeviceSpecificBannerAdViewAdFormat() );
     }
 
+    @ReactMethod(isBlockingSynchronousMethod = true)
+    public float getAdaptiveBannerHeightForWidth(final float width)
+    {
+        return getDeviceSpecificBannerAdViewAdFormat().getAdaptiveSize( (int) width, getCurrentActivity() ).getHeight();
+    }
+
     // MRECS
 
     @ReactMethod()
@@ -909,7 +918,7 @@ public class AppLovinMAXModule
             {
                 d( "Setting placement \"" + placement + "\" for " + adFormat.getLabel() + " with ad unit id \"" + adUnitId + "\"" );
 
-                final MaxAdView adView = retrieveAdView( adUnitId, adFormat );
+                final MaxAdView adView = retrieveAdView( adUnitId, adFormat, "", DEFAULT_AD_VIEW_OFFSET );
                 if ( adView == null )
                 {
                     e( adFormat.getLabel() + " does not exist" );
@@ -1070,7 +1079,7 @@ public class AppLovinMAXModule
         } );
     }
 
-    private void setAdViewExtraParameters(final String adUnitId, final MaxAdFormat adFormat, final String value, final String key)
+    private void setAdViewExtraParameters(final String adUnitId, final MaxAdFormat adFormat, final String key, final String value)
     {
         getReactApplicationContext().runOnUiQueueThread( new Runnable()
         {
@@ -1107,6 +1116,20 @@ public class AppLovinMAXModule
                     mAdViewAdFormats.put( adUnitId, forcedAdFormat );
                     positionAdView( adUnitId, forcedAdFormat );
                 }
+                else if ( "adaptive_banner".equalsIgnoreCase( key ) )
+                {
+                    boolean useAdaptiveBannerAdSize = Boolean.parseBoolean( value );
+                    if ( useAdaptiveBannerAdSize )
+                    {
+                        mDisabledAdaptiveBannerAdUnitIds.remove( adUnitId );
+                    }
+                    else
+                    {
+                        mDisabledAdaptiveBannerAdUnitIds.add( adUnitId );
+                    }
+
+                    positionAdView( adUnitId, adFormat );
+                }
             }
         } );
     }
@@ -1210,14 +1233,18 @@ public class AppLovinMAXModule
             return;
         }
 
-        final String adViewPosition = mAdViewPositions.get( adUnitId );
-        final Point adViewOffset = mAdViewOffsets.get( adUnitId );
-        final boolean isWidthDpOverridden = mAdViewWidths.containsKey( adUnitId );
+        final ViewParent parent = adView.getParent();
+        if ( !( parent instanceof RelativeLayout ) ) return;
 
-        final RelativeLayout relativeLayout = (RelativeLayout) adView.getParent();
+        final RelativeLayout relativeLayout = (RelativeLayout) parent;
         final Rect windowRect = new Rect();
         relativeLayout.getWindowVisibleDisplayFrame( windowRect );
 
+        final String adViewPosition = mAdViewPositions.get( adUnitId );
+        final Point adViewOffset = mAdViewOffsets.get( adUnitId );
+        final boolean isAdaptiveBannerDisabled = mDisabledAdaptiveBannerAdUnitIds.contains( adUnitId );
+        final boolean isWidthDpOverridden = mAdViewWidths.containsKey( adUnitId );
+
         //
         // Determine ad width
         //
@@ -1240,7 +1267,19 @@ public class AppLovinMAXModule
             adViewWidthDp = adFormat.getSize().getWidth();
         }
 
-        final int adViewHeightDp = adFormat.getSize().getHeight();
+        //
+        // Determine ad height
+        //
+        final int adViewHeightDp;
+
+        if ( ( adFormat == MaxAdFormat.BANNER || adFormat == MaxAdFormat.LEADER ) && !isAdaptiveBannerDisabled )
+        {
+            adViewHeightDp = adFormat.getAdaptiveSize( adViewWidthDp, getCurrentActivity() ).getHeight();
+        }
+        else
+        {
+            adViewHeightDp = adFormat.getSize().getHeight();
+        }
 
         final int widthPx = AppLovinSdkUtils.dpToPx( getCurrentActivity(), adViewWidthDp );
         final int heightPx = AppLovinSdkUtils.dpToPx( getCurrentActivity(), adViewHeightDp );

package/ios/AppLovinMAX.h

@@ -26,11 +26,6 @@ NS_ASSUME_NONNULL_BEGIN
  */
 @property (nonatomic, strong, readonly, class) AppLovinMAX *shared;
 
-/**
- * Utility method for getting the width and height for a given ad format.
- */
-+ (CGSize)adViewSizeForAdFormat:(MAAdFormat *)adFormat;
-
 /**
  * Dedicated method for retrieving a MAAdView.
  */

package/ios/AppLovinMAX.m

@@ -55,6 +55,7 @@
 @property (nonatomic, strong) NSMutableDictionary<NSString *, NSNumber *> *adViewWidths;
 @property (nonatomic, strong) NSMutableDictionary<NSString *, NSArray<NSLayoutConstraint *> *> *adViewConstraints;
 @property (nonatomic, strong) NSMutableArray<NSString *> *adUnitIdentifiersToShowAfterCreate;
+@property (nonatomic, strong) NSMutableSet<NSString *> *disabledAdaptiveBannerAdUnitIdentifiers;
 @property (nonatomic, strong) UIView *safeAreaBackground;
 @property (nonatomic, strong, nullable) UIColor *publisherBannerBackgroundColor;
 
@@ -105,6 +106,7 @@ RCT_EXPORT_MODULE()
         self.adViewWidths = [NSMutableDictionary dictionaryWithCapacity: 2];
         self.adViewConstraints = [NSMutableDictionary dictionaryWithCapacity: 2];
         self.adUnitIdentifiersToShowAfterCreate = [NSMutableArray arrayWithCapacity: 2];
+        self.disabledAdaptiveBannerAdUnitIdentifiers = [NSMutableSet setWithCapacity: 2];
         
         self.safeAreaBackground = [[UIView alloc] init];
         self.safeAreaBackground.hidden = YES;
@@ -357,7 +359,7 @@ RCT_EXPORT_METHOD(setBannerBackgroundColor:(NSString *)adUnitIdentifier :(NSStri
     [self setAdViewBackgroundColorForAdUnitIdentifier: adUnitIdentifier adFormat: DEVICE_SPECIFIC_ADVIEW_AD_FORMAT hexColorCode: hexColorCode];
 }
 
-RCT_EXPORT_METHOD(setBannerPlacement:(nullable NSString *)placement :(NSString *)adUnitIdentifier)
+RCT_EXPORT_METHOD(setBannerPlacement:(NSString *)adUnitIdentifier :(nullable NSString *)placement)
 {
     [self setAdViewPlacement: placement forAdUnitIdentifier: adUnitIdentifier adFormat: DEVICE_SPECIFIC_ADVIEW_AD_FORMAT];
 }
@@ -397,6 +399,11 @@ RCT_EXPORT_METHOD(destroyBanner:(NSString *)adUnitIdentifier)
     [self destroyAdViewWithAdUnitIdentifier: adUnitIdentifier adFormat: DEVICE_SPECIFIC_ADVIEW_AD_FORMAT];
 }
 
+RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(getAdaptiveBannerHeightForWidth:(CGFloat)width)
+{
+    return @([DEVICE_SPECIFIC_ADVIEW_AD_FORMAT adaptiveSizeForWidth: width].height);
+}
+
 #pragma mark - MRECs
 
 RCT_EXPORT_METHOD(createMRec:(NSString *)adUnitIdentifier :(NSString *)mrecPosition)
@@ -404,7 +411,7 @@ RCT_EXPORT_METHOD(createMRec:(NSString *)adUnitIdentifier :(NSString *)mrecPosit
     [self createAdViewWithAdUnitIdentifier: adUnitIdentifier adFormat: MAAdFormat.mrec atPosition: mrecPosition withOffset: CGPointZero];
 }
 
-RCT_EXPORT_METHOD(setMRecPlacement:(nullable NSString *)placement :(NSString *)adUnitIdentifier)
+RCT_EXPORT_METHOD(setMRecPlacement:(NSString *)adUnitIdentifier :(nullable NSString *)placement)
 {
     [self setAdViewPlacement: placement forAdUnitIdentifier: adUnitIdentifier adFormat: MAAdFormat.mrec];
 }
@@ -756,7 +763,7 @@ RCT_EXPORT_METHOD(setRewardedAdExtraParameter:(NSString *)adUnitIdentifier :(NSS
         
         [self log: @"Setting placement \"%@\" for \"%@\" with ad unit identifier \"%@\"", placement, adFormat, adUnitIdentifier];
         
-        MAAdView *adView = [self retrieveAdViewForAdUnitIdentifier: adUnitIdentifier adFormat: adFormat];
+        MAAdView *adView = [self retrieveAdViewForAdUnitIdentifier: adUnitIdentifier adFormat: adFormat atPosition: @"" withOffset: CGPointZero];
         adView.placement = placement;
     });
 }
@@ -769,7 +776,7 @@ RCT_EXPORT_METHOD(setRewardedAdExtraParameter:(NSString *)adUnitIdentifier :(NSS
         CGFloat minWidth = adFormat.size.width;
         if ( width < minWidth )
         {
-            [self log: @"The provided with: %f is smaller than the minimum required width: %f for ad format: %@. Please set the width higher than the minimum required.", width, minWidth, adFormat];   
+            [self log: @"The provided with: %f is smaller than the minimum required width: %f for ad format: %@. Please set the width higher than the minimum required.", width, minWidth, adFormat];
         }
 
         self.adViewWidths[adUnitIdentifier] = @(width);
@@ -813,6 +820,20 @@ RCT_EXPORT_METHOD(setRewardedAdExtraParameter:(NSString *)adUnitIdentifier :(NSS
             self.adViewAdFormats[adUnitIdentifier] = adFormat;
             [self positionAdViewForAdUnitIdentifier: adUnitIdentifier adFormat: adFormat];
         }
+        else if ( [@"adaptive_banner" isEqualToString: key] )
+        {
+            BOOL shouldUseAdaptiveBanner = [NSNumber al_numberWithString: value].boolValue;
+            if ( shouldUseAdaptiveBanner )
+            {
+                [self.disabledAdaptiveBannerAdUnitIdentifiers removeObject: adUnitIdentifier];
+            }
+            else
+            {
+                [self.disabledAdaptiveBannerAdUnitIdentifiers addObject: adUnitIdentifier];
+            }
+            
+            [self positionAdViewForAdUnitIdentifier: adUnitIdentifier adFormat: adFormat];
+        }
     });
 }
 
@@ -958,6 +979,7 @@ RCT_EXPORT_METHOD(setRewardedAdExtraParameter:(NSString *)adUnitIdentifier :(NSS
 {
     MAAdView *adView = [self retrieveAdViewForAdUnitIdentifier: adUnitIdentifier adFormat: adFormat];
     NSString *adViewPosition = self.adViewPositions[adUnitIdentifier];
+    BOOL isAdaptiveBannerDisabled = [self.disabledAdaptiveBannerAdUnitIdentifiers containsObject: adUnitIdentifier];
     BOOL isWidthPtsOverridden = self.adViewWidths[adUnitIdentifier] != nil;
     
     NSValue *adViewPositionValue = self.adViewOffsets[adUnitIdentifier];
@@ -1016,7 +1038,20 @@ RCT_EXPORT_METHOD(setRewardedAdExtraParameter:(NSString *)adUnitIdentifier :(NSS
         adViewWidth = adFormat.size.width;
     }
 
-    CGFloat adViewHeight = adFormat.size.height;
+    //
+    // Determine ad height
+    //
+    CGFloat adViewHeight;
+    
+    if ( (adFormat == MAAdFormat.banner || adFormat == MAAdFormat.leader) && !isAdaptiveBannerDisabled )
+    {
+        adViewHeight = [adFormat adaptiveSizeForWidth: adViewWidth].height;
+    }
+    else
+    {
+        adViewHeight = adFormat.size.height;
+    }
+    
     CGSize adViewSize = CGSizeMake(adViewWidth, adViewHeight);
     
     // All positions have constant height
@@ -1035,6 +1070,21 @@ RCT_EXPORT_METHOD(setRewardedAdExtraParameter:(NSString *)adUnitIdentifier :(NSS
     // If top of bottom center, stretch width of screen
     if ( [adViewPosition isEqual: @"top_center"] || [adViewPosition isEqual: @"bottom_center"] )
     {
+        // Non AdMob banners will still be of 50/90 points tall. Set the auto sizing mask such that the inner ad view is pinned to the bottom or top according to the ad view position.
+        if ( !isAdaptiveBannerDisabled )
+        {
+            adView.autoresizingMask = UIViewAutoresizingFlexibleWidth;
+            
+            if ( [@"top_center" isEqual: adViewPosition] )
+            {
+                adView.autoresizingMask |= UIViewAutoresizingFlexibleBottomMargin;
+            }
+            else // bottom_center
+            {
+                adView.autoresizingMask |= UIViewAutoresizingFlexibleTopMargin;
+            }
+        }
+        
         // If publisher actually provided a banner background color, span the banner across the realm
         if ( self.publisherBannerBackgroundColor && adFormat != MAAdFormat.mrec )
         {
@@ -1115,27 +1165,6 @@ RCT_EXPORT_METHOD(setRewardedAdExtraParameter:(NSString *)adUnitIdentifier :(NSS
     [NSLayoutConstraint activateConstraints: constraints];
 }
 
-+ (CGSize)adViewSizeForAdFormat:(MAAdFormat *)adFormat
-{
-    if ( MAAdFormat.leader == adFormat )
-    {
-        return CGSizeMake(728.0f, 90.0f);
-    }
-    else if ( MAAdFormat.banner == adFormat )
-    {
-        return CGSizeMake(320.0f, 50.0f);
-    }
-    else if ( MAAdFormat.mrec == adFormat )
-    {
-        return CGSizeMake(300.0f, 250.0f);
-    }
-    else
-    {
-        [NSException raise: NSInvalidArgumentException format: @"Invalid ad format"];
-        return CGSizeZero;
-    }
-}
-
 - (NSDictionary<NSString *, id> *)adInfoForAd:(MAAd *)ad
 {
     return @{@"adUnitId" : ad.adUnitIdentifier,