react-native-applovin-max 8.2.0 → 9.0.0

package/android/build.gradle

@@ -53,8 +53,19 @@ android {
     minSdkVersion getExtOrIntegerDefault("minSdkVersion")
     targetSdkVersion getExtOrIntegerDefault("targetSdkVersion")
 
-    buildConfigField("int", "VERSION_CODE", "8020000")
-    buildConfigField("String", "VERSION_NAME", "\"8.2.0\"")
+    buildConfigField("int", "VERSION_CODE", "9000000")
+    buildConfigField("String", "VERSION_NAME", "\"9.0.0\"")
+    buildConfigField("boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString())
+  }
+
+  sourceSets {
+    main {
+      if (isNewArchitectureEnabled()) {
+        java.srcDirs += ['src/newarch']
+      } else {
+        java.srcDirs += ['src/oldarch']
+      }
+    }
   }
 
   buildTypes {

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

@@ -7,7 +7,7 @@ import com.applovin.mediation.MaxAdFormat;
 import com.applovin.mediation.ads.MaxAdView;
 import com.facebook.react.bridge.Promise;
 import com.facebook.react.bridge.ReactContext;
-import com.facebook.react.bridge.ReadableMap;
+import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.views.view.ReactViewGroup;
 
 import java.util.HashMap;
@@ -52,7 +52,7 @@ public class AppLovinMAXAdView
     {
         for ( Map.Entry<Integer, AppLovinMAXAdViewUiComponent> entry : preloadedUiComponentInstances.entrySet() )
         {
-            if ( entry.getValue().getAdUnitId().equals ( adUnitId ) )
+            if ( entry.getValue().getAdUnitId().equals( adUnitId ) )
             {
                 return entry.getValue().getAdView();
             }
@@ -131,7 +131,7 @@ public class AppLovinMAXAdView
         // Ad Unit ID must be set prior to creating MaxAdView
         if ( uiComponent != null )
         {
-            AppLovinMAXModule.e( "Attempting to set Ad Unit ID " + value + " after the native UI component is created" );
+            AppLovinMAXModuleImpl.e( "Attempting to set Ad Unit ID " + value + " after the native UI component is created" );
             return;
         }
 
@@ -143,21 +143,21 @@ public class AppLovinMAXAdView
         // Ad format must be set prior to creating MaxAdView
         if ( uiComponent != null )
         {
-            AppLovinMAXModule.e( "Attempting to set ad format " + value + " after the native UI component is created" );
+            AppLovinMAXModuleImpl.e( "Attempting to set ad format " + value + " after the native UI component is created" );
             return;
         }
 
-        if ( MaxAdFormat.BANNER.getLabel().equals( value ) )
+        if ( "BANNER".equalsIgnoreCase( value ) )
         {
-            adFormat = AppLovinMAXModule.getDeviceSpecificBannerAdViewAdFormat( reactContext );
+            adFormat = AppLovinMAXModuleImpl.getDeviceSpecificBannerAdViewAdFormat( reactContext );
         }
-        else if ( MaxAdFormat.MREC.getLabel().equals( value ) )
+        else if ( "MREC".equalsIgnoreCase( value ) )
         {
             adFormat = MaxAdFormat.MREC;
         }
         else
         {
-            AppLovinMAXModule.e( "Attempting to set an invalid ad format of \"" + value + "\" for " + adUnitId );
+            AppLovinMAXModuleImpl.e( "Attempting to set an invalid ad format of \"" + value + "\" for " + adUnitId );
         }
     }
 
@@ -211,19 +211,26 @@ public class AppLovinMAXAdView
         loadOnMount = enabled;
     }
 
-    public void setExtraParameters(@Nullable final ReadableMap readableMap)
+    public void setExtraParameters(@Nullable final ReadableArray extraParameters)
     {
-        if ( readableMap != null )
-        {
-            extraParameters = readableMap.toHashMap();
-        }
+        this.extraParameters = AppLovinMAXUtils.convertReadbleArrayToHashMap( extraParameters );
     }
 
-    public void setLocalExtraParameters(@Nullable final ReadableMap readableMap)
+    public void setLocalExtraParameters(@Nullable final ReadableArray localExtraParameters)
     {
-        if ( readableMap != null )
+        Map<String, Object> localExtraParametersMap = AppLovinMAXUtils.convertReadbleArrayToHashMap( localExtraParameters );
+
+        if ( localExtraParametersMap == null ) return;
+
+        // Accumulate the result since this function may be called multiple times
+        // to handle different value types, including string, number, boolean, and null.
+        if ( this.localExtraParameters != null )
+        {
+            this.localExtraParameters.putAll( localExtraParametersMap );
+        }
+        else
         {
-            localExtraParameters = readableMap.toHashMap();
+            this.localExtraParameters = localExtraParametersMap;
         }
     }
 
@@ -275,27 +282,27 @@ public class AppLovinMAXAdView
 
         reactContext.runOnUiQueueThread( () -> {
 
-            if ( AppLovinMAXModule.getInstance().getSdk() == null )
+            if ( AppLovinMAXModuleImpl.getInstance().getSdk() == null )
             {
-                AppLovinMAXModule.logUninitializedAccessError( "AppLovinMAXAdView.maybeAttachAdView" );
+                AppLovinMAXModuleImpl.logUninitializedAccessError( "AppLovinMAXAdView.maybeAttachAdView" );
                 return;
             }
 
             if ( TextUtils.isEmpty( adUnitId ) )
             {
-                AppLovinMAXModule.e( "Attempting to attach a native UI component without Ad Unit ID" );
+                AppLovinMAXModuleImpl.e( "Attempting to attach a native UI component without Ad Unit ID" );
                 return;
             }
 
             if ( adFormat == null )
             {
-                AppLovinMAXModule.e( "Attempting to attach a native UI component without ad format" );
+                AppLovinMAXModuleImpl.e( "Attempting to attach a native UI component without ad format" );
                 return;
             }
 
             if ( uiComponent != null )
             {
-                AppLovinMAXModule.e( "Attempting to re-attach with existing AdView (" + uiComponent.hashCode() + ") for Ad Unit ID " + adUnitId );
+                AppLovinMAXModuleImpl.e( "Attempting to re-attach with existing AdView (" + uiComponent.hashCode() + ") for Ad Unit ID " + adUnitId );
                 return;
             }
 
@@ -305,7 +312,7 @@ public class AppLovinMAXAdView
                 // Attach the preloaded uiComponent if possible, otherwise create a new one for the same adUnitId
                 if ( !( uiComponent.hasContainerView() || uiComponent.isAdViewAttached() ) )
                 {
-                    AppLovinMAXModule.d( "Mounting the preloaded AdView (" + adViewId + ") for Ad Unit ID " + adUnitId );
+                    AppLovinMAXModuleImpl.d( "Mounting the preloaded AdView (" + adViewId + ") for Ad Unit ID " + adUnitId );
 
                     uiComponent.setAdaptiveBannerEnabled( adaptiveBannerEnabled );
                     uiComponent.setAutoRefreshEnabled( autoRefreshEnabled );
@@ -318,7 +325,7 @@ public class AppLovinMAXAdView
             adViewId = uiComponent.hashCode();
             uiComponentInstances.put( adViewId, uiComponent );
 
-            AppLovinMAXModule.d( "Mounting a new AdView (" + adViewId + ") for Ad Unit ID " + adUnitId );
+            AppLovinMAXModuleImpl.d( "Mounting a new AdView (" + adViewId + ") for Ad Unit ID " + adUnitId );
 
             uiComponent.setPlacement( placement );
             uiComponent.setCustomData( customData );
@@ -340,7 +347,7 @@ public class AppLovinMAXAdView
     {
         if ( uiComponent == null )
         {
-            AppLovinMAXModule.e( "Attempting to load uninitialized native UI component for " + adUnitId );
+            AppLovinMAXModuleImpl.e( "Attempting to load uninitialized native UI component for " + adUnitId );
             return;
         }
 
@@ -357,13 +364,13 @@ public class AppLovinMAXAdView
 
             if ( uiComponent == preloadedUiComponent )
             {
-                AppLovinMAXModule.d( "Unmounting the preloaded AdView (" + adViewId + ") for Ad Unit ID " + adUnitId );
+                AppLovinMAXModuleImpl.d( "Unmounting the preloaded AdView (" + adViewId + ") for Ad Unit ID " + adUnitId );
 
                 uiComponent.setAutoRefreshEnabled( false );
             }
             else
             {
-                AppLovinMAXModule.d( "Unmounting the AdView (" + adViewId + ") to destroy for Ad Unit ID " + adUnitId );
+                AppLovinMAXModuleImpl.d( "Unmounting the AdView (" + adViewId + ") to destroy for Ad Unit ID " + adUnitId );
 
                 uiComponentInstances.remove( adViewId );
                 uiComponent.destroy();

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

@@ -0,0 +1,110 @@
+package com.applovin.reactnative;
+
+import com.facebook.react.bridge.ReadableArray;
+import com.facebook.react.common.MapBuilder;
+import com.facebook.react.uimanager.ThemedReactContext;
+
+import java.util.Map;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+/**
+ * Created by Thomas So on September 26 2020
+ */
+class AppLovinMAXAdViewManagerImpl
+{
+    public static final String NAME = "AppLovinMAXAdView";
+
+    public static Map<String, Object> getExportedCustomDirectEventTypeConstants()
+    {
+        return MapBuilder.<String, Object>builder()
+                .put( AppLovinMAXAdEvents.ON_AD_LOADED_EVENT, MapBuilder.of( "registrationName", AppLovinMAXAdEvents.ON_AD_LOADED_EVENT ) )
+                .put( AppLovinMAXAdEvents.ON_AD_LOAD_FAILED_EVENT, MapBuilder.of( "registrationName", AppLovinMAXAdEvents.ON_AD_LOAD_FAILED_EVENT ) )
+                .put( AppLovinMAXAdEvents.ON_AD_DISPLAY_FAILED_EVENT, MapBuilder.of( "registrationName", AppLovinMAXAdEvents.ON_AD_DISPLAY_FAILED_EVENT ) )
+                .put( AppLovinMAXAdEvents.ON_AD_CLICKED_EVENT, MapBuilder.of( "registrationName", AppLovinMAXAdEvents.ON_AD_CLICKED_EVENT ) )
+                .put( AppLovinMAXAdEvents.ON_AD_EXPANDED_EVENT, MapBuilder.of( "registrationName", AppLovinMAXAdEvents.ON_AD_EXPANDED_EVENT ) )
+                .put( AppLovinMAXAdEvents.ON_AD_COLLAPSED_EVENT, MapBuilder.of( "registrationName", AppLovinMAXAdEvents.ON_AD_COLLAPSED_EVENT ) )
+                .put( AppLovinMAXAdEvents.ON_AD_REVENUE_PAID_EVENT, MapBuilder.of( "registrationName", AppLovinMAXAdEvents.ON_AD_REVENUE_PAID_EVENT ) )
+                .build();
+    }
+
+    public static void receiveCommand(final AppLovinMAXAdView view, final String commandId, @Nullable final ReadableArray args)
+    {
+        if ( commandId.equals( "loadAd" ) )
+        {
+            loadAd( view );
+        }
+    }
+
+    @NonNull
+    public static AppLovinMAXAdView createViewInstance(@NonNull final ThemedReactContext reactContext)
+    {
+        return new AppLovinMAXAdView( reactContext );
+    }
+
+    public static void setAdUnitId(final AppLovinMAXAdView view, final String adUnitId)
+    {
+        view.setAdUnitId( adUnitId );
+    }
+
+    public static void setAdFormat(final AppLovinMAXAdView view, final String adFormatStr)
+    {
+        view.setAdFormat( adFormatStr );
+    }
+
+    public static void setAdViewId(final AppLovinMAXAdView view, final int adViewId)
+    {
+        view.setAdViewId( adViewId );
+    }
+
+    public static void setPlacement(final AppLovinMAXAdView view, @Nullable final String placement)
+    {
+        view.setPlacement( placement );
+    }
+
+    public static void setCustomData(final AppLovinMAXAdView view, @Nullable final String customData)
+    {
+        view.setCustomData( customData );
+    }
+
+    public static void setAdaptiveBannerEnabled(final AppLovinMAXAdView view, final boolean enabled)
+    {
+        view.setAdaptiveBannerEnabled( enabled );
+    }
+
+    public static void setAutoRefresh(final AppLovinMAXAdView view, final boolean enabled)
+    {
+        view.setAutoRefreshEnabled( enabled );
+    }
+
+    public static void setLoadOnMount(final AppLovinMAXAdView view, final boolean enabled)
+    {
+        view.setLoadOnMount( enabled );
+    }
+
+    public static void setExtraParameters(final AppLovinMAXAdView view, @Nullable final ReadableArray value)
+    {
+        view.setExtraParameters( value );
+    }
+
+    public static void setLocalExtraParameters(final AppLovinMAXAdView view, @Nullable final ReadableArray value)
+    {
+        view.setLocalExtraParameters( value );
+    }
+
+    public static void onAfterUpdateTransaction(final AppLovinMAXAdView view)
+    {
+        view.onSetProps();
+    }
+
+    public static void onDropViewInstance(AppLovinMAXAdView view)
+    {
+        view.destroy();
+    }
+
+    public static void loadAd(AppLovinMAXAdView view)
+    {
+        view.loadAd();
+    }
+}

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

@@ -11,7 +11,7 @@ import com.applovin.mediation.MaxError;
 import com.applovin.mediation.ads.MaxAdView;
 import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.bridge.WritableMap;
-import com.facebook.react.uimanager.events.RCTEventEmitter;
+import com.facebook.react.uimanager.UIManagerHelper;
 
 import java.util.Map;
 
@@ -22,6 +22,7 @@ class AppLovinMAXAdViewUiComponent
     implements MaxAdListener, MaxAdViewAdListener, MaxAdRevenueListener
 {
     private final ReactContext reactContext;
+    private final int          surfaceId;
     private final MaxAdView    adView;
 
     @Nullable
@@ -30,8 +31,9 @@ class AppLovinMAXAdViewUiComponent
     public AppLovinMAXAdViewUiComponent(final String adUnitId, final MaxAdFormat adFormat, final ReactContext context)
     {
         reactContext = context;
+        surfaceId = UIManagerHelper.getSurfaceId( context );
 
-        adView = new MaxAdView( adUnitId, adFormat, AppLovinMAXModule.getInstance().getSdk(), context );
+        adView = new MaxAdView( adUnitId, adFormat, AppLovinMAXModuleImpl.getInstance().getSdk(), context );
         adView.setListener( this );
         adView.setRevenueListener( this );
         adView.setExtraParameter( "adaptive_banner", "true" );
@@ -117,7 +119,7 @@ class AppLovinMAXAdViewUiComponent
     {
         if ( isAdViewAttached() )
         {
-            AppLovinMAXModule.e( "Cannot attach AdView because it already has an existing parent: " + adView );
+            AppLovinMAXModuleImpl.e( "Cannot attach AdView because it already has an existing parent: " + adView );
             return;
         }
 
@@ -164,13 +166,13 @@ class AppLovinMAXAdViewUiComponent
     @Override
     public void onAdLoaded(@NonNull final MaxAd ad)
     {
-        WritableMap adInfo = AppLovinMAXModule.getInstance().getAdInfo( ad );
+        WritableMap adInfo = AppLovinMAXModuleImpl.getInstance().getAdInfo( ad );
         adInfo.putInt( "adViewId", hashCode() );
 
         if ( AppLovinMAXAdView.hasPreloadedAdView( hashCode() ) )
         {
             // Copy the `adInfo` since sending the same map through the RN bridge more than once will result in `com.facebook.react.bridge.ObjectAlreadyConsumedException: Map already consumed`
-            AppLovinMAXModule.getInstance().sendReactNativeEvent( AppLovinMAXAdEvents.ON_NATIVE_UI_COMPONENT_ADVIEW_AD_LOADED_EVENT, adInfo.copy() );
+            AppLovinMAXModuleImpl.getInstance().sendReactNativeEvent( AppLovinMAXAdEvents.ON_NATIVE_UI_COMPONENT_ADVIEW_AD_LOADED_EVENT, adInfo.copy() );
         }
 
         if ( containerView != null )
@@ -182,13 +184,13 @@ class AppLovinMAXAdViewUiComponent
     @Override
     public void onAdLoadFailed(@NonNull final String adUnitId, @NonNull final MaxError error)
     {
-        WritableMap adLoadFailedInfo = AppLovinMAXModule.getInstance().getAdLoadFailedInfo( adUnitId, error );
+        WritableMap adLoadFailedInfo = AppLovinMAXModuleImpl.getInstance().getAdLoadFailedInfo( adUnitId, error );
         adLoadFailedInfo.putInt( "adViewId", hashCode() );
 
         if ( AppLovinMAXAdView.hasPreloadedAdView( hashCode() ) )
         {
             // Copy the `adLoadFailedInfo` since sending the same map through the RN bridge more than once will result in `com.facebook.react.bridge.ObjectAlreadyConsumedException: Map already consumed`
-            AppLovinMAXModule.getInstance().sendReactNativeEvent( AppLovinMAXAdEvents.ON_NATIVE_UI_COMPONENT_ADVIEW_AD_LOAD_FAILED_EVENT, adLoadFailedInfo.copy() );
+            AppLovinMAXModuleImpl.getInstance().sendReactNativeEvent( AppLovinMAXAdEvents.ON_NATIVE_UI_COMPONENT_ADVIEW_AD_LOAD_FAILED_EVENT, adLoadFailedInfo.copy() );
         }
 
         if ( containerView != null )
@@ -202,7 +204,7 @@ class AppLovinMAXAdViewUiComponent
     {
         if ( containerView != null )
         {
-            WritableMap adDisplayFailedInfo = AppLovinMAXModule.getInstance().getAdDisplayFailedInfo( ad, error );
+            WritableMap adDisplayFailedInfo = AppLovinMAXModuleImpl.getInstance().getAdDisplayFailedInfo( ad, error );
             adDisplayFailedInfo.putInt( "adViewId", hashCode() );
 
             sendReactNativeCallbackEvent( AppLovinMAXAdEvents.ON_AD_DISPLAY_FAILED_EVENT, adDisplayFailedInfo );
@@ -214,7 +216,7 @@ class AppLovinMAXAdViewUiComponent
     {
         if ( containerView != null )
         {
-            WritableMap adInfo = AppLovinMAXModule.getInstance().getAdInfo( ad );
+            WritableMap adInfo = AppLovinMAXModuleImpl.getInstance().getAdInfo( ad );
             adInfo.putInt( "adViewId", hashCode() );
 
             sendReactNativeCallbackEvent( AppLovinMAXAdEvents.ON_AD_CLICKED_EVENT, adInfo );
@@ -226,7 +228,7 @@ class AppLovinMAXAdViewUiComponent
     {
         if ( containerView != null )
         {
-            WritableMap adInfo = AppLovinMAXModule.getInstance().getAdInfo( ad );
+            WritableMap adInfo = AppLovinMAXModuleImpl.getInstance().getAdInfo( ad );
             adInfo.putInt( "adViewId", hashCode() );
 
             sendReactNativeCallbackEvent( AppLovinMAXAdEvents.ON_AD_EXPANDED_EVENT, adInfo );
@@ -238,7 +240,7 @@ class AppLovinMAXAdViewUiComponent
     {
         if ( containerView != null )
         {
-            WritableMap adInfo = AppLovinMAXModule.getInstance().getAdInfo( ad );
+            WritableMap adInfo = AppLovinMAXModuleImpl.getInstance().getAdInfo( ad );
             adInfo.putInt( "adViewId", hashCode() );
 
             sendReactNativeCallbackEvent( AppLovinMAXAdEvents.ON_AD_COLLAPSED_EVENT, adInfo );
@@ -250,7 +252,7 @@ class AppLovinMAXAdViewUiComponent
     {
         if ( containerView != null )
         {
-            WritableMap adInfo = AppLovinMAXModule.getInstance().getAdInfo( ad );
+            WritableMap adInfo = AppLovinMAXModuleImpl.getInstance().getAdInfo( ad );
             adInfo.putInt( "adViewId", hashCode() );
 
             sendReactNativeCallbackEvent( AppLovinMAXAdEvents.ON_AD_REVENUE_PAID_EVENT, adInfo );
@@ -271,7 +273,7 @@ class AppLovinMAXAdViewUiComponent
     {
         if ( containerView != null )
         {
-            reactContext.getJSModule( RCTEventEmitter.class ).receiveEvent( containerView.getId(), name, params );
+            AppLovinMAXModuleImpl.getInstance().sendReactNativeViewEvent( surfaceId, containerView.getId(), name, params );
         }
     }
 }