react-native-applovin-max 4.1.6 → 5.0.0

package/android/build.gradle

@@ -1,7 +1,4 @@
 buildscript {
-  // Buildscript is evaluated before everything else so we can't use getExtOrDefault
-  def kotlin_version = rootProject.ext.has('kotlinVersion') ? rootProject.ext.get('kotlinVersion') : project.properties['AppLovinMAX_kotlinVersion']
-
   ext.versions = [
           'minSdk'                : 16,
           'compileSdk'            : 29,
@@ -17,15 +14,12 @@ buildscript {
 
   dependencies {
     classpath 'com.android.tools.build:gradle:3.5.4'
-    // noinspection DifferentKotlinGradleVersion
-    classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
     classpath "io.codearte.gradle.nexus:gradle-nexus-staging-plugin:0.21.0"
   }
 }
 
 apply plugin: 'com.android.library'
-apply plugin: 'kotlin-android'
 
 def getExtOrDefault(name) {
   return rootProject.ext.has(name) ? rootProject.ext.get(name) : project.properties['AppLovinMAX_' + name]
@@ -41,8 +35,8 @@ android {
   defaultConfig {
     minSdkVersion 16
     targetSdkVersion getExtOrIntegerDefault('targetSdkVersion')
-    versionCode 4010600
-    versionName "4.1.6"
+    versionCode 5000000
+    versionName "5.0.0"
   }
 
   flavorDimensions("default")
@@ -142,13 +136,9 @@ repositories {
   }
 }
 
-def kotlin_version = getExtOrDefault('kotlinVersion')
-
 dependencies {
   // noinspection GradleDynamicVersion
   api 'com.facebook.react:react-native:+'
 
-  implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-
   implementation 'com.applovin:applovin-sdk:11.8.0'
 }

package/android/gradle.properties

@@ -1,4 +1,3 @@
-AppLovinMAX_kotlinVersion=1.3.50
 AppLovinMAX_compileSdkVersion=28
 AppLovinMAX_buildToolsVersion=28.0.3
 AppLovinMAX_targetSdkVersion=28

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

@@ -7,12 +7,18 @@ import android.text.TextUtils;
 import com.applovin.mediation.MaxAd;
 import com.applovin.mediation.MaxAdFormat;
 import com.applovin.mediation.MaxAdListener;
+import com.applovin.mediation.MaxAdRevenueListener;
 import com.applovin.mediation.MaxAdViewAdListener;
 import com.applovin.mediation.MaxError;
 import com.applovin.mediation.ads.MaxAdView;
+import com.facebook.react.bridge.ReadableMap;
+import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.uimanager.ThemedReactContext;
+import com.facebook.react.uimanager.events.RCTEventEmitter;
 import com.facebook.react.views.view.ReactViewGroup;
 
+import java.util.Map;
+
 import androidx.annotation.Nullable;
 
 /**
@@ -20,23 +26,30 @@ import androidx.annotation.Nullable;
  */
 class AppLovinMAXAdView
         extends ReactViewGroup
-        implements MaxAdListener, MaxAdViewAdListener
+        implements MaxAdListener, MaxAdViewAdListener, MaxAdRevenueListener
 {
     private final ThemedReactContext reactContext;
 
-    private @Nullable MaxAdView adView;
-
-    private           String      adUnitId;
-    private           MaxAdFormat adFormat;
-    private @Nullable String      placement;
-    private @Nullable String      customData;
-    private           boolean     adaptiveBannerEnabled;
-    private           boolean     autoRefresh;
+    @Nullable
+    private MaxAdView adView;
+
+    private String              adUnitId;
+    private MaxAdFormat         adFormat;
+    @Nullable
+    private String              placement;
+    @Nullable
+    private String              customData;
+    private boolean             adaptiveBannerEnabled;
+    private boolean             autoRefresh;
+    @Nullable
+    private Map<String, Object> extraParameters;
+    @Nullable
+    private Map<String, Object> localExtraParameters;
 
     public AppLovinMAXAdView(final Context context)
     {
         super( context );
-        this.reactContext = (ThemedReactContext) context;
+        reactContext = (ThemedReactContext) context;
     }
 
     public void setAdUnitId(final String value)
@@ -62,11 +75,11 @@ class AppLovinMAXAdView
             return;
         }
 
-        if ( "banner".equals( value ) )
+        if ( MaxAdFormat.BANNER.getLabel().equals( value ) )
         {
             adFormat = AppLovinMAXModule.getDeviceSpecificBannerAdViewAdFormat( reactContext );
         }
-        else if ( "mrec".equals( value ) )
+        else if ( MaxAdFormat.MREC.getLabel().equals( value ) )
         {
             adFormat = MaxAdFormat.MREC;
         }
@@ -126,6 +139,22 @@ class AppLovinMAXAdView
         }
     }
 
+    public void setExtraParameters(@Nullable final ReadableMap readableMap)
+    {
+        if ( readableMap != null )
+        {
+            extraParameters = readableMap.toHashMap();
+        }
+    }
+
+    public void setLocalExtraParameters(@Nullable final ReadableMap readableMap)
+    {
+        if ( readableMap != null )
+        {
+            localExtraParameters = readableMap.toHashMap();
+        }
+    }
+
     @Override
     public void requestLayout()
     {
@@ -184,6 +213,12 @@ class AppLovinMAXAdView
         // Run after 0.25 sec delay to allow all properties to set
         postDelayed( () -> {
 
+            if ( AppLovinMAXModule.getInstance().getSdk() == null )
+            {
+                AppLovinMAXModule.logUninitializedAccessError( "AppLovinMAXAdView.maybeAttachAdView" );
+                return;
+            }
+
             if ( TextUtils.isEmpty( adUnitId ) )
             {
                 AppLovinMAXModule.e( "Attempting to attach MaxAdView without Ad Unit ID" );
@@ -206,13 +241,29 @@ class AppLovinMAXAdView
 
             adView = new MaxAdView( adUnitId, adFormat, AppLovinMAXModule.getInstance().getSdk(), currentActivity );
             adView.setListener( this );
-            adView.setRevenueListener( AppLovinMAXModule.getInstance() );
+            adView.setRevenueListener( this );
             adView.setPlacement( placement );
             adView.setCustomData( customData );
             adView.setExtraParameter( "adaptive_banner", Boolean.toString( adaptiveBannerEnabled ) );
             // Set this extra parameter to work around a SDK bug that ignores calls to stopAutoRefresh()
             adView.setExtraParameter( "allow_pause_auto_refresh_immediately", "true" );
 
+            if ( extraParameters != null )
+            {
+                for ( Map.Entry<String, Object> entry : extraParameters.entrySet() )
+                {
+                    adView.setExtraParameter( entry.getKey(), (String) entry.getValue() );
+                }
+            }
+
+            if ( localExtraParameters != null )
+            {
+                for ( Map.Entry<String, Object> entry : localExtraParameters.entrySet() )
+                {
+                    adView.setLocalExtraParameter( entry.getKey(), (String) entry.getValue() );
+                }
+            }
+
             if ( autoRefresh )
             {
                 adView.startAutoRefresh();
@@ -247,46 +298,57 @@ class AppLovinMAXAdView
     @Override
     public void onAdLoaded(final MaxAd ad)
     {
-        AppLovinMAXModule.getInstance().onAdLoaded( ad );
+        WritableMap adInfo = AppLovinMAXModule.getInstance().getAdInfo( ad );
+        reactContext.getJSModule( RCTEventEmitter.class ).receiveEvent( getId(), "onAdLoadedEvent", adInfo );
     }
 
     @Override
     public void onAdLoadFailed(final String adUnitId, final MaxError error)
     {
-        String name = ( adFormat == MaxAdFormat.MREC ) ? "OnMRecAdLoadFailedEvent" : "OnBannerAdLoadFailedEvent";
-        
-        AppLovinMAXModule.getInstance().sendReactNativeEventForAdLoadFailed( name, adUnitId, error );
+        WritableMap adLoadFailedInfo = AppLovinMAXModule.getInstance().getAdLoadFailedInfo( adUnitId, error );
+        reactContext.getJSModule( RCTEventEmitter.class ).receiveEvent( getId(), "onAdLoadFailedEvent", adLoadFailedInfo );
     }
 
     @Override
     public void onAdDisplayFailed(final MaxAd ad, final MaxError error)
     {
-        AppLovinMAXModule.getInstance().onAdDisplayFailed( ad, error );
+        WritableMap adDisplayFailedInfo = AppLovinMAXModule.getInstance().getAdDisplayFailedInfo( ad, error );
+        reactContext.getJSModule( RCTEventEmitter.class ).receiveEvent( getId(), "onAdDisplayFailedEvent", adDisplayFailedInfo );
     }
 
     @Override
     public void onAdClicked(final MaxAd ad)
     {
-        AppLovinMAXModule.getInstance().onAdClicked( ad );
+        WritableMap adInfo = AppLovinMAXModule.getInstance().getAdInfo( ad );
+        reactContext.getJSModule( RCTEventEmitter.class ).receiveEvent( getId(), "onAdClickedEvent", adInfo );
     }
 
     @Override
     public void onAdExpanded(final MaxAd ad)
     {
-        AppLovinMAXModule.getInstance().onAdExpanded( ad );
+        WritableMap adInfo = AppLovinMAXModule.getInstance().getAdInfo( ad );
+        reactContext.getJSModule( RCTEventEmitter.class ).receiveEvent( getId(), "onAdExpandedEvent", adInfo );
     }
 
     @Override
     public void onAdCollapsed(final MaxAd ad)
     {
-        AppLovinMAXModule.getInstance().onAdCollapsed( ad );
+        WritableMap adInfo = AppLovinMAXModule.getInstance().getAdInfo( ad );
+        reactContext.getJSModule( RCTEventEmitter.class ).receiveEvent( getId(), "onAdCollapsedEvent", adInfo );
+    }
+
+    @Override
+    public void onAdRevenuePaid(final MaxAd ad)
+    {
+        WritableMap adRevenueInfo = AppLovinMAXModule.getInstance().getAdRevenueInfo( ad );
+        reactContext.getJSModule( RCTEventEmitter.class ).receiveEvent( getId(), "onAdRevenuePaidEvent", adRevenueInfo );
     }
 
     /// Deprecated Callbacks
 
     @Override
-    public void onAdDisplayed(final MaxAd ad) {}
+    public void onAdDisplayed(final MaxAd ad) { }
 
     @Override
-    public void onAdHidden(final MaxAd ad) {}
+    public void onAdHidden(final MaxAd ad) { }
 }

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

@@ -1,11 +1,13 @@
 package com.applovin.reactnative;
 
 import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.ReadableMap;
+import com.facebook.react.common.MapBuilder;
 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.Map;
 
 import androidx.annotation.Nullable;
 
@@ -17,21 +19,47 @@ class AppLovinMAXAdViewManager
 {
     public AppLovinMAXAdViewManager(final ReactApplicationContext reactApplicationContext) { }
 
-    @NotNull
     @Override
     public String getName()
     {
         return "AppLovinMAXAdView";
     }
 
-    @NotNull
+    @Nullable
     @Override
-    protected AppLovinMAXAdView createViewInstance(@NotNull final ThemedReactContext reactContext)
+    public Map<String, Object> getExportedCustomDirectEventTypeConstants()
+    {
+        // mapping Android events to JavaScript events
+        return MapBuilder.<String, Object>builder()
+                .put( "onAdLoadedEvent", MapBuilder.of( "registrationName", "onAdLoadedEvent" ) )
+                .put( "onAdLoadFailedEvent", MapBuilder.of( "registrationName", "onAdLoadFailedEvent" ) )
+                .put( "onAdDisplayFailedEvent", MapBuilder.of( "registrationName", "onAdDisplayFailedEvent" ) )
+                .put( "onAdClickedEvent", MapBuilder.of( "registrationName", "onAdClickedEvent" ) )
+                .put( "onAdExpandedEvent", MapBuilder.of( "registrationName", "onAdExpandedEvent" ) )
+                .put( "onAdCollapsedEvent", MapBuilder.of( "registrationName", "onAdCollapsedEvent" ) )
+                .put( "onAdRevenuePaidEvent", MapBuilder.of( "registrationName", "onAdRevenuePaidEvent" ) )
+                .build();
+    }
+
+    @Override
+    protected AppLovinMAXAdView createViewInstance(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
         return new AppLovinMAXAdView( reactContext );
     }
 
+    @ReactProp(name = "adUnitId")
+    public void setAdUnitId(final AppLovinMAXAdView view, final String adUnitId)
+    {
+        view.setAdUnitId( adUnitId );
+    }
+
+    @ReactProp(name = "adFormat")
+    public void setAdFormat(final AppLovinMAXAdView view, final String adFormatStr)
+    {
+        view.setAdFormat( adFormatStr );
+    }
+
     @ReactProp(name = "placement")
     public void setPlacement(final AppLovinMAXAdView view, @Nullable final String placement)
     {
@@ -56,20 +84,20 @@ class AppLovinMAXAdViewManager
         view.setAutoRefresh( enabled );
     }
 
-    @ReactProp(name = "adUnitId")
-    public void setAdUnitId(final AppLovinMAXAdView view, final String adUnitId)
+    @ReactProp(name = "extraParameters")
+    public void setExtraParameters(final AppLovinMAXAdView view, @Nullable final ReadableMap value)
     {
-        view.setAdUnitId( adUnitId );
+        view.setExtraParameters( value );
     }
 
-    @ReactProp(name = "adFormat")
-    public void setAdFormat(final AppLovinMAXAdView view, final String adFormatStr)
+    @ReactProp(name = "localExtraParameters")
+    public void setLocalExtraParameters(final AppLovinMAXAdView view, @Nullable final ReadableMap value)
     {
-        view.setAdFormat( adFormatStr );
+        view.setLocalExtraParameters( value );
     }
 
     @Override
-    public void onDropViewInstance(@NotNull AppLovinMAXAdView view)
+    public void onDropViewInstance(AppLovinMAXAdView view)
     {
         view.destroy();