react-native-applovin-max 6.3.1 → 6.4.1

package/android/build.gradle

@@ -35,8 +35,8 @@ android {
   defaultConfig {
     minSdkVersion 16
     targetSdkVersion getExtOrIntegerDefault('targetSdkVersion')
-    versionCode 6030100
-    versionName "6.3.1"
+    versionCode 6040100
+    versionName "6.4.1"
   }
 
   flavorDimensions("default")
@@ -140,5 +140,5 @@ dependencies {
   // noinspection GradleDynamicVersion
   api 'com.facebook.react:react-native:+'
 
-  implementation 'com.applovin:applovin-sdk:12.3.1'
+  implementation 'com.applovin:applovin-sdk:12.4.2'
 }

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

@@ -36,10 +36,7 @@ import com.applovin.mediation.ads.MaxAdView;
 import com.applovin.mediation.ads.MaxAppOpenAd;
 import com.applovin.mediation.ads.MaxInterstitialAd;
 import com.applovin.mediation.ads.MaxRewardedAd;
-import com.applovin.sdk.AppLovinAdContentRating;
 import com.applovin.sdk.AppLovinCmpError;
-import com.applovin.sdk.AppLovinCmpService;
-import com.applovin.sdk.AppLovinGender;
 import com.applovin.sdk.AppLovinMediationProvider;
 import com.applovin.sdk.AppLovinPrivacySettings;
 import com.applovin.sdk.AppLovinSdk;
@@ -47,6 +44,8 @@ import com.applovin.sdk.AppLovinSdkConfiguration;
 import com.applovin.sdk.AppLovinSdkConfiguration.ConsentFlowUserGeography;
 import com.applovin.sdk.AppLovinSdkSettings;
 import com.applovin.sdk.AppLovinSdkUtils;
+import com.applovin.sdk.AppLovinTargetingData.AdContentRating;
+import com.applovin.sdk.AppLovinTargetingData.Gender;
 import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.LifecycleEventListener;
 import com.facebook.react.bridge.Promise;
@@ -2459,7 +2458,7 @@ public class AppLovinMAXModule
 
         if ( promise == null )
         {
-            e(  message );
+            e( message );
             return;
         }
 
@@ -2531,38 +2530,38 @@ public class AppLovinMAXModule
         return new Point( AppLovinSdkUtils.dpToPx( context, (int) xDp ), AppLovinSdkUtils.dpToPx( context, (int) yDp ) );
     }
 
-    private static AppLovinGender getAppLovinGender(@Nullable final String gender)
+    private static Gender getAppLovinGender(@Nullable final String gender)
     {
         if ( gender != null )
         {
             if ( "F".equalsIgnoreCase( gender ) )
             {
-                return AppLovinGender.FEMALE;
+                return Gender.FEMALE;
             }
             else if ( "M".equalsIgnoreCase( gender ) )
             {
-                return AppLovinGender.MALE;
+                return Gender.MALE;
             }
             else if ( "O".equalsIgnoreCase( gender ) )
             {
-                return AppLovinGender.OTHER;
+                return Gender.OTHER;
             }
         }
 
-        return AppLovinGender.UNKNOWN;
+        return Gender.UNKNOWN;
     }
 
-    private static String getRawAppLovinGender(final AppLovinGender gender)
+    private static String getRawAppLovinGender(final Gender gender)
     {
-        if ( gender == AppLovinGender.FEMALE )
+        if ( gender == Gender.FEMALE )
         {
             return "F";
         }
-        else if ( gender == AppLovinGender.MALE )
+        else if ( gender == Gender.MALE )
         {
             return "M";
         }
-        else if ( gender == AppLovinGender.OTHER )
+        else if ( gender == Gender.OTHER )
         {
             return "O";
         }
@@ -2570,22 +2569,22 @@ public class AppLovinMAXModule
         return "U";
     }
 
-    private static AppLovinAdContentRating getAppLovinAdContentRating(final int maximumAdContentRating)
+    private static AdContentRating getAppLovinAdContentRating(final int maximumAdContentRating)
     {
         if ( maximumAdContentRating == 1 )
         {
-            return AppLovinAdContentRating.ALL_AUDIENCES;
+            return AdContentRating.ALL_AUDIENCES;
         }
         else if ( maximumAdContentRating == 2 )
         {
-            return AppLovinAdContentRating.EVERYONE_OVER_TWELVE;
+            return AdContentRating.EVERYONE_OVER_TWELVE;
         }
         else if ( maximumAdContentRating == 3 )
         {
-            return AppLovinAdContentRating.MATURE_AUDIENCES;
+            return AdContentRating.MATURE_AUDIENCES;
         }
 
-        return AppLovinAdContentRating.NONE;
+        return AdContentRating.NONE;
     }
 
     private static ConsentFlowUserGeography getAppLovinConsentFlowUserGeography(final String userGeography)
@@ -2629,6 +2628,11 @@ public class AppLovinMAXModule
         adInfo.putMap( "waterfall", createAdWaterfallInfo( ad.getWaterfall() ) );
         adInfo.putString( "dspName", AppLovinSdkUtils.isValidString( ad.getDspName() ) ? ad.getDspName() : "" );
 
+        WritableMap sizeObject = Arguments.createMap();
+        sizeObject.putInt( "width", ad.getSize().getWidth() );
+        sizeObject.putInt( "height", ad.getSize().getHeight() );
+        adInfo.putMap( "size", sizeObject );
+
         return adInfo;
     }
 

package/ios/AppLovinMAX.m

@@ -2193,7 +2193,10 @@ RCT_EXPORT_METHOD(setAppOpenAdLocalExtraParameter:(NSString *)adUnitIdentifier :
              @"placement" : ad.placement ?: @"",
              @"revenue" : @(ad.revenue),
              @"waterfall": [self createAdWaterfallInfo: ad.waterfall],
-             @"dspName" : ad.DSPName ?: @""};
+             @"dspName" : ad.DSPName ?: @"",
+             @"size" : @{@"width" : @(ad.size.width),
+                         @"height" : @(ad.size.height)}
+            };
 }
 
 - (NSDictionary<NSString *, id> *)adLoadFailedInfoForAd:(NSString *)adUnitIdentifier withError:(MAError *)error

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', '12.3.1'
+  pod 'AppLovinSDK', '12.4.1'
 
 end

package/ios/Podfile.lock

@@ -1,5 +1,5 @@
 PODS:
-  - AppLovinSDK (12.3.1)
+  - AppLovinSDK (12.4.1)
   - boost-for-react-native (1.63.0)
   - DoubleConversion (1.1.6)
   - FBLazyVector (0.63.5)
@@ -249,7 +249,7 @@ PODS:
   - Yoga (1.14.0)
 
 DEPENDENCIES:
-  - AppLovinSDK (= 12.3.1)
+  - AppLovinSDK (= 12.4.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: d99a5a32b00e844932f4583f863780e1af835722
+  AppLovinSDK: c57ad0d34625c971d2db127f8ef60570b28ff51a
   boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c
   DoubleConversion: cde416483dac037923206447da6e1454df403714
   FBLazyVector: 352a8ca9bbc8e2f097d680747a8c97ecef12d469
@@ -368,6 +368,6 @@ SPEC CHECKSUMS:
   ReactCommon: b9ff54b6dd22ba4a776eda22d7f83ec27544ca35
   Yoga: 0276e9f20976c8568e107cfc1163a8629051adc0
 
-PODFILE CHECKSUM: 9ca7e6154d8697161b5d7f65806d35634fe4a6f5
+PODFILE CHECKSUM: 743d3a03166e4ff89e660e87d59561305c1e0a2e
 
 COCOAPODS: 1.15.2

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "react-native-applovin-max",
   "author": "AppLovin Corporation",
-  "version": "6.3.1",
+  "version": "6.4.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_6_3_1" }
+  s.source       = { :git => "https://github.com/AppLovin/AppLovin-MAX-React-Native.git", :tag => "release_6_4_1" }
   
   s.source_files  = "ios/AppLovinMAX*.{h,m}"
 
   s.dependency "React"
-  s.dependency "AppLovinSDK", "12.3.1"
+  s.dependency "AppLovinSDK", "12.4.1"
 end

package/src/AdView.tsx

@@ -1,7 +1,14 @@
 import * as React from 'react';
-import { useEffect, useState, useRef, useCallback, useImperativeHandle, forwardRef } from 'react';
-import { NativeModules, requireNativeComponent, StyleSheet, UIManager, findNodeHandle } from 'react-native';
-import type { ViewProps, ViewStyle, StyleProp, NativeMethods } from 'react-native';
+import { useEffect, useState, useRef, useCallback, useImperativeHandle, useReducer, forwardRef } from 'react';
+import {
+    NativeModules,
+    requireNativeComponent,
+    StyleSheet,
+    UIManager,
+    findNodeHandle,
+    useWindowDimensions,
+} from 'react-native';
+import type { ViewProps, ViewStyle, StyleProp, NativeMethods, DimensionValue } from 'react-native';
 import type { AdDisplayFailedInfo, AdInfo, AdLoadFailedInfo, AdRevenueInfo } from './types/AdInfo';
 import type { AdNativeEvent } from './types/AdEvent';
 import type { AdViewProps, AdViewHandler } from './types/AdViewProps';
@@ -67,77 +74,45 @@ const AdViewComponent = requireNativeComponent<AdViewProps & ViewProps & AdViewN
 
 type AdViewType = React.Component<AdViewProps> & NativeMethods;
 
+type SizeKey = 'width' | 'height';
+type SizeRecord = Partial<Record<SizeKey, DimensionValue>>;
+
 const ADVIEW_SIZE = {
     banner: { width: 320, height: 50 },
     leader: { width: 728, height: 90 },
     mrec: { width: 300, height: 250 },
 };
 
+// Returns 'auto' for unspecified width / height
 const getOutlineViewSize = (style: StyleProp<ViewStyle>) => {
     const viewStyle = StyleSheet.flatten(style || {});
-    return [viewStyle?.width, viewStyle?.height];
+    return [viewStyle?.width ?? 'auto', viewStyle?.height ?? 'auto'];
 };
 
-const sizeAdViewDimensions = (
-    adFormat: AdFormat,
-    adaptiveBannerEnabled?: boolean,
-    width?: number | string | null,
-    height?: number | string | null
-): Promise<Record<string, number>> => {
+const sizeBannerDimensions = (
+    sizeProps: SizeRecord,
+    adaptiveBannerEnabled: boolean,
+    screenWidth: number,
+    bannerFormatSize: SizeRecord
+): Promise<SizeRecord> => {
     const sizeForBannerFormat = async () => {
-        const isTablet = await AppLovinMAX.isTablet();
-
-        const minWidth = isTablet ? ADVIEW_SIZE.leader.width : ADVIEW_SIZE.banner.width;
+        const width = sizeProps.width === 'auto' ? screenWidth : sizeProps.width;
 
-        let minHeight;
-        if (adaptiveBannerEnabled) {
-            if (typeof width === 'number' && width > minWidth) {
-                minHeight = await AppLovinMAX.getAdaptiveBannerHeightForWidth(width);
+        let height;
+        if (sizeProps.height === 'auto') {
+            if (adaptiveBannerEnabled) {
+                height = await AppLovinMAX.getAdaptiveBannerHeightForWidth(screenWidth);
             } else {
-                minHeight = await AppLovinMAX.getAdaptiveBannerHeightForWidth(minWidth);
+                height = bannerFormatSize.height;
             }
         } else {
-            minHeight = isTablet ? ADVIEW_SIZE.leader.height : ADVIEW_SIZE.banner.height;
+            height = sizeProps.height;
         }
 
-        return Promise.resolve({
-            ...(width === 'auto'
-                ? {
-                      width: minWidth,
-                  }
-                : {
-                      minWidth: minWidth,
-                  }),
-            ...(height === 'auto'
-                ? {
-                      height: minHeight,
-                  }
-                : {
-                      minHeight: minHeight,
-                  }),
-        });
+        return Promise.resolve({ width: width, height: height });
     };
 
-    if (adFormat === AdFormat.BANNER) {
-        return sizeForBannerFormat();
-    } else {
-        return Promise.resolve({
-            ...(width === 'auto'
-                ? {
-                      width: ADVIEW_SIZE.mrec.width,
-                  }
-                : {
-                      minWidth: ADVIEW_SIZE.mrec.width,
-                  }),
-            ...(height === 'auto'
-                ? {
-                      height: ADVIEW_SIZE.mrec.height,
-                  }
-                : {
-                      minHeight: ADVIEW_SIZE.mrec.height,
-                  }),
-        });
-    }
+    return sizeForBannerFormat();
 };
 
 /**
@@ -186,14 +161,19 @@ export const AdView = forwardRef<AdViewHandler, AdViewProps & ViewProps>(functio
     },
     ref
 ) {
+    const { width: screenWidth } = useWindowDimensions();
+    const adFormatSize = useRef<SizeRecord>({});
+    const [, forceUpdate] = useReducer((x) => x + 1, 0);
     const adViewRef = useRef<AdViewType | null>(null);
     const [isInitialized, setIsInitialized] = useState<boolean>(false);
-    const [dimensions, setDimensions] = useState({});
+    const sizeProps = useRef<SizeRecord>({});
+    const dimensions = useRef<SizeRecord>({});
 
     const loadAd = () => {
         if (adViewRef.current) {
             UIManager.dispatchViewManagerCommand(
                 findNodeHandle(adViewRef.current),
+                // @ts-ignore: Issue in RN ts defs
                 UIManager.getViewManagerConfig('AppLovinMAXAdView').Commands.loadAd,
                 undefined
             );
@@ -209,23 +189,55 @@ export const AdView = forwardRef<AdViewHandler, AdViewProps & ViewProps>(functio
     }, []);
 
     useEffect(() => {
+        if (adFormat === AdFormat.BANNER) {
+            AppLovinMAX.isTablet().then((result: boolean) => {
+                if (result) {
+                    adFormatSize.current = { width: ADVIEW_SIZE.leader.width, height: ADVIEW_SIZE.leader.height };
+                } else {
+                    adFormatSize.current = { width: ADVIEW_SIZE.banner.width, height: ADVIEW_SIZE.banner.height };
+                }
+            });
+        } else {
+            adFormatSize.current = { width: ADVIEW_SIZE.mrec.width, height: ADVIEW_SIZE.mrec.height };
+        }
+
         AppLovinMAX.isInitialized().then((result: boolean) => {
             setIsInitialized(result);
             if (!result) {
                 console.warn('AdView is mounted before the initialization of the AppLovin MAX React Native module');
             }
         });
-    }, []);
+    }, []); // Run once when mounted
 
     useEffect(() => {
         if (!isInitialized) return;
+
         const [width, height] = getOutlineViewSize(style);
-        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-        // @ts-ignore: width and height should be of type DimensionValue in react-native 0.72.0 and above
-        sizeAdViewDimensions(adFormat, adaptiveBannerEnabled, width, height).then((value: Record<string, number>) => {
-            setDimensions(value);
-        });
-    }, [isInitialized]);
+
+        if (sizeProps.current.width === width && sizeProps.current.height === height) return;
+
+        sizeProps.current = { width: width, height: height };
+
+        if (adFormat === AdFormat.BANNER) {
+            sizeBannerDimensions(sizeProps.current, adaptiveBannerEnabled, screenWidth, adFormatSize.current).then(
+                (adaptedSize: SizeRecord) => {
+                    if (
+                        dimensions.current.width !== adaptedSize.width ||
+                        dimensions.current.height !== adaptedSize.height
+                    ) {
+                        dimensions.current = adaptedSize;
+                        forceUpdate();
+                    }
+                }
+            );
+        } else {
+            dimensions.current = {
+                width: width === 'auto' ? adFormatSize.current.width : width,
+                height: height === 'auto' ? adFormatSize.current.height : height,
+            };
+            forceUpdate();
+        }
+    }); // Run every render
 
     const onAdLoadedEvent = (event: AdNativeEvent<AdInfo>) => {
         if (onAdLoaded) onAdLoaded(event.nativeEvent);
@@ -259,7 +271,7 @@ export const AdView = forwardRef<AdViewHandler, AdViewProps & ViewProps>(functio
     if (!isInitialized) {
         return null;
     } else {
-        const isDimensionsSet = Object.keys(dimensions).length > 0;
+        const isDimensionsSet = Object.keys(dimensions.current).length > 0;
 
         // Not sized yet
         if (!isDimensionsSet) {
@@ -286,7 +298,7 @@ export const AdView = forwardRef<AdViewHandler, AdViewProps & ViewProps>(functio
             onAdExpandedEvent={onAdExpandedEvent}
             onAdCollapsedEvent={onAdCollapsedEvent}
             onAdRevenuePaidEvent={onAdRevenuePaidEvent}
-            style={Object.assign({}, style, dimensions)}
+            style={Object.assign({}, style, dimensions.current)}
             {...otherProps}
         />
     );

package/src/AppLovinMAX.ts

@@ -4,7 +4,7 @@ import type { Configuration } from './types/Configuration';
 
 const NativeAppLovinMAX = NativeModules.AppLovinMAX;
 
-const VERSION = '6.3.1';
+const VERSION = '6.4.1';
 
 /**
  * This enum represents the user's geography used to determine the type of consent flow shown to the

package/src/BannerAd.ts

@@ -18,6 +18,7 @@ const {
 
 const createAd = (adUnitId: string, position: AdViewPosition, xOffset?: number, yOffset?: number): void => {
     AppLovinMAX.createBannerWithOffsets(adUnitId, position, xOffset ?? 0, yOffset ?? 0);
+    AppLovinMAX.setBannerExtraParameter(adUnitId, 'adaptive_banner', 'true');
 };
 
 const destroyAd = (adUnitId: string): void => {

package/src/nativeAd/NativeAdView.tsx

@@ -116,6 +116,7 @@ const NativeAdViewImpl = forwardRef<NativeAdViewHandler, NativeAdViewProps & Vie
         if (nativeAdViewRef) {
             UIManager.dispatchViewManagerCommand(
                 findNodeHandle(nativeAdViewRef.current),
+                // @ts-ignore: Issue in RN ts defs
                 UIManager.getViewManagerConfig('AppLovinMAXNativeAdView').Commands.loadAd,
                 undefined
             );

package/src/nativeAd/NativeAdViewComponents.tsx

@@ -88,7 +88,7 @@ export const IconView = (props: Omit<ImageProps, 'source'>) => {
     const { nativeAd, nativeAdView } = useContext(NativeAdViewContext);
 
     useEffect(() => {
-        if (!nativeAd.image || !imageRef.current) return;
+        if (!(nativeAd.image || nativeAd.url) || !imageRef.current) return;
 
         nativeAdView?.setNativeProps({
             iconView: findNodeHandle(imageRef.current),
@@ -96,7 +96,7 @@ export const IconView = (props: Omit<ImageProps, 'source'>) => {
     }, [nativeAd]);
 
     return nativeAd.url ? (
-        <Image {...props} source={{ uri: nativeAd.url }} />
+        <Image {...props} ref={imageRef} source={{ uri: nativeAd.url }} />
     ) : nativeAd.image ? (
         <Image {...props} ref={imageRef} source={0} />
     ) : (

package/src/types/AdInfo.ts

@@ -48,6 +48,14 @@ export type AdInfo = {
      * The native ad info.
      */
     nativeAd?: AdNativeInfo | null;
+
+    /**
+     * The size of the AdView format ad, or size with (width: 0, height: 0) otherwise.
+     */
+    size: {
+        width: number;
+        height: number;
+    };
 };
 
 /**