@capacitor-community/admob 5.3.1 → 6.1.0

package/android/build.gradle

@@ -4,18 +4,18 @@ ext {
     androidxCoordinatorLayoutVersion = project.hasProperty('androidxCoordinatorLayoutVersion') ? rootProject.ext.androidxCoordinatorLayoutVersion : '1.2.0'
     androidxJunitVersion = project.hasProperty('androidxJunitVersion') ? rootProject.ext.androidxJunitVersion : '1.1.5'
     androidxEspressoCoreVersion = project.hasProperty('androidxEspressoCoreVersion') ? rootProject.ext.androidxEspressoCoreVersion : '3.5.1'
-    playServicesAdsVersion = project.hasProperty('playServicesAdsVersion') ? rootProject.ext.playServicesAdsVersion : '22.4.0'
-    androidxCoreKTXVersion = project.hasProperty('androidxCoreKTXVersion') ? rootProject.ext.androidxCoreKTXVersion : '1.10.0'
+    playServicesAdsVersion = project.hasProperty('playServicesAdsVersion') ? rootProject.ext.playServicesAdsVersion : '23.0.0'
+    androidxCoreKTXVersion = project.hasProperty('androidxCoreKTXVersion') ? rootProject.ext.androidxCoreKTXVersion : '1.13.0'
 }
 
 buildscript {
-    ext.kotlin_version = project.hasProperty("kotlin_version") ? rootProject.ext.kotlin_version : '1.8.20'
+    ext.kotlin_version = project.hasProperty("kotlin_version") ? rootProject.ext.kotlin_version : '1.9.10'
     repositories {
         google()
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.0.0'
+        classpath 'com.android.tools.build:gradle:8.2.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
@@ -25,10 +25,10 @@ apply plugin: 'kotlin-android'
 
 android {
     namespace "com.getcapacitor.community.admob.admob"
-    compileSdkVersion project.hasProperty('compileSdkVersion') ? rootProject.ext.compileSdkVersion : 33
+    compileSdk project.hasProperty('compileSdkVersion') ? rootProject.ext.compileSdkVersion : 34
     defaultConfig {
         minSdkVersion project.hasProperty('minSdkVersion') ? rootProject.ext.minSdkVersion : 22
-        targetSdkVersion project.hasProperty('targetSdkVersion') ? rootProject.ext.targetSdkVersion : 33
+        targetSdkVersion project.hasProperty('targetSdkVersion') ? rootProject.ext.targetSdkVersion : 34
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

package/android/src/main/java/com/getcapacitor/community/admob/AdMob.java

@@ -14,6 +14,7 @@ import com.getcapacitor.community.admob.helpers.AuthorizationStatusEnum;
 import com.getcapacitor.community.admob.interstitial.AdInterstitialExecutor;
 import com.getcapacitor.community.admob.interstitial.InterstitialAdCallbackAndListeners;
 import com.getcapacitor.community.admob.rewarded.AdRewardExecutor;
+import com.getcapacitor.community.admob.rewardedinterstitial.AdRewardInterstitialExecutor;
 import com.google.android.gms.ads.MobileAds;
 import com.google.android.gms.ads.RequestConfiguration;
 import com.google.android.gms.ads.initialization.InitializationStatus;
@@ -39,6 +40,12 @@ public class AdMob extends Plugin {
         this::notifyListeners,
         getLogTag()
     );
+    private final AdRewardInterstitialExecutor adRewardInterstitialExecutor = new AdRewardInterstitialExecutor(
+        this::getContext,
+        this::getActivity,
+        this::notifyListeners,
+        getLogTag()
+    );
     private final AdInterstitialExecutor adInterstitialExecutor = new AdInterstitialExecutor(
         this::getContext,
         this::getActivity,
@@ -169,6 +176,16 @@ public class AdMob extends Plugin {
         adRewardExecutor.showRewardVideoAd(call, this::notifyListeners);
     }
 
+    @PluginMethod
+    public void prepareRewardInterstitialAd(final PluginCall call) {
+        adRewardInterstitialExecutor.prepareRewardInterstitialAd(call, this::notifyListeners);
+    }
+
+    @PluginMethod
+    public void showRewardInterstitialAd(final PluginCall call) {
+        adRewardInterstitialExecutor.showRewardInterstitialAd(call, this::notifyListeners);
+    }
+
     /**
      * @see <a href="https://developers.google.com/admob/android/test-ads#enable_test_devices">Test Devices</a>
      * @see <a href="https://developers.google.com/admob/android/targeting">Target Settings</a>

package/android/src/main/java/com/getcapacitor/community/admob/models/AdOptions.java

@@ -27,6 +27,7 @@ public abstract class AdOptions {
     public static final String BANNER_TESTER_ID = "ca-app-pub-3940256099942544/6300978111";
     public static final String INTERSTITIAL_TESTER_ID = "ca-app-pub-3940256099942544/1033173712";
     public static final String REWARD_VIDEO_TESTER_ID = "ca-app-pub-3940256099942544/5224354917";
+    public static final String REWARD_INTERSTITIAL_TESTER_ID = "ca-app-pub-3940256099942544/5354046379";
 
     /**
      * The position of the ad, it can be TOP_CENTER,
@@ -138,6 +139,15 @@ public abstract class AdOptions {
             };
         }
 
+        public AdOptions createRewardInterstitialOptions(PluginCall call) {
+            return new AdOptions(call) {
+                @Override
+                public String getTestingId() {
+                    return AdOptions.REWARD_INTERSTITIAL_TESTER_ID;
+                }
+            };
+        }
+
         public AdOptions createGenericOptions(PluginCall call, final String testingID) {
             return new AdOptions(call) {
                 @Override

package/android/src/main/java/com/getcapacitor/community/admob/rewardedinterstitial/AdRewardInterstitialExecutor.java

@@ -0,0 +1,84 @@
+package com.getcapacitor.community.admob.rewardedinterstitial;
+
+import android.app.Activity;
+import android.content.Context;
+import androidx.core.util.Supplier;
+import com.getcapacitor.JSObject;
+import com.getcapacitor.PluginCall;
+import com.getcapacitor.PluginMethod;
+import com.getcapacitor.community.admob.helpers.AdViewIdHelper;
+import com.getcapacitor.community.admob.helpers.RequestHelper;
+import com.getcapacitor.community.admob.models.AdMobPluginError;
+import com.getcapacitor.community.admob.models.AdOptions;
+import com.getcapacitor.community.admob.models.Executor;
+import com.google.android.gms.ads.AdRequest;
+import com.google.android.gms.ads.rewardedinterstitial.RewardedInterstitialAd;
+import com.google.android.gms.common.util.BiConsumer;
+
+public class AdRewardInterstitialExecutor extends Executor {
+
+    public static RewardedInterstitialAd mRewardedInterstitialAd;
+
+    public AdRewardInterstitialExecutor(
+        Supplier<Context> contextSupplier,
+        Supplier<Activity> activitySupplier,
+        BiConsumer<String, JSObject> notifyListenersFunction,
+        String pluginLogTag
+    ) {
+        super(contextSupplier, activitySupplier, notifyListenersFunction, pluginLogTag, "AdRewardExecutor");
+    }
+
+    @PluginMethod
+    public void prepareRewardInterstitialAd(final PluginCall call, BiConsumer<String, JSObject> notifyListenersFunction) {
+        final AdOptions adOptions = AdOptions.getFactory().createRewardInterstitialOptions(call);
+
+        activitySupplier
+            .get()
+            .runOnUiThread(
+                () -> {
+                    try {
+                        final AdRequest adRequest = RequestHelper.createRequest(adOptions);
+                        final String id = AdViewIdHelper.getFinalAdId(adOptions, adRequest, logTag, contextSupplier.get());
+                        RewardedInterstitialAd.load(
+                            contextSupplier.get(),
+                            id,
+                            adRequest,
+                            RewardedInterstitialAdCallbackAndListeners.INSTANCE.getRewardedAdLoadCallback(
+                                call,
+                                notifyListenersFunction,
+                                adOptions
+                            )
+                        );
+                    } catch (Exception ex) {
+                        call.reject(ex.getLocalizedMessage(), ex);
+                    }
+                }
+            );
+    }
+
+    @PluginMethod
+    public void showRewardInterstitialAd(final PluginCall call, BiConsumer<String, JSObject> notifyListenersFunction) {
+        if (mRewardedInterstitialAd == null) {
+            String errorMessage = "No Reward Video Ad can be show. It was not prepared or maybe it failed to be prepared.";
+            call.reject(errorMessage);
+            AdMobPluginError errorObject = new AdMobPluginError(-1, errorMessage);
+            notifyListenersFunction.accept(RewardInterstitialAdPluginEvents.FailedToLoad, errorObject);
+            return;
+        }
+
+        try {
+            activitySupplier
+                .get()
+                .runOnUiThread(
+                    () -> {
+                        mRewardedInterstitialAd.show(
+                            activitySupplier.get(),
+                            RewardedInterstitialAdCallbackAndListeners.INSTANCE.getOnUserEarnedRewardListener(call, notifyListenersFunction)
+                        );
+                    }
+                );
+        } catch (Exception ex) {
+            call.reject(ex.getLocalizedMessage(), ex);
+        }
+    }
+}

package/android/src/main/java/com/getcapacitor/community/admob/rewardedinterstitial/RewardInterstitialAdPluginEvents.kt

@@ -0,0 +1,12 @@
+package com.getcapacitor.community.admob.rewardedinterstitial
+
+import com.getcapacitor.community.admob.models.LoadPluginEventNames
+
+object RewardInterstitialAdPluginEvents: LoadPluginEventNames {
+    const val Loaded = "onRewardedInterstitialAdLoaded"
+    const val FailedToLoad = "onRewardedInterstitialAdFailedToLoad"
+    const val Rewarded = "onRewardedInterstitialAdReward"
+    override val Showed = "onRewardedInterstitialAdShowed"
+    override val FailedToShow = "onRewardedInterstitialAdFailedToShow"
+    override val Dismissed = "onRewardedInterstitialAdDismissed"
+}

package/android/src/main/java/com/getcapacitor/community/admob/rewardedinterstitial/RewardedInterstitialAdCallbackAndListeners.kt

@@ -0,0 +1,50 @@
+package com.getcapacitor.community.admob.rewardedinterstitial
+
+import com.getcapacitor.JSObject
+import com.getcapacitor.PluginCall
+import com.getcapacitor.community.admob.helpers.FullscreenPluginCallback
+import com.getcapacitor.community.admob.models.AdMobPluginError
+import com.getcapacitor.community.admob.models.AdOptions
+import com.google.android.gms.ads.LoadAdError
+import com.google.android.gms.ads.OnUserEarnedRewardListener
+import com.google.android.gms.ads.rewarded.RewardItem
+import com.google.android.gms.ads.rewardedinterstitial.RewardedInterstitialAd
+import com.google.android.gms.ads.rewardedinterstitial.RewardedInterstitialAdLoadCallback
+import com.google.android.gms.common.util.BiConsumer
+
+object RewardedInterstitialAdCallbackAndListeners {
+
+    fun getOnUserEarnedRewardListener(call: PluginCall, notifyListenersFunction: BiConsumer<String, JSObject>): OnUserEarnedRewardListener {
+        return OnUserEarnedRewardListener { item: RewardItem ->
+            val response = JSObject()
+            response.put("type", item.type)
+                    .put("amount", item.amount)
+            notifyListenersFunction.accept(RewardInterstitialAdPluginEvents.Rewarded, response)
+            call.resolve(response)
+        }
+    }
+
+    fun getRewardedAdLoadCallback(call: PluginCall, notifyListenersFunction: BiConsumer<String, JSObject>, adOptions: AdOptions): RewardedInterstitialAdLoadCallback {
+        return object : RewardedInterstitialAdLoadCallback() {
+            override fun onAdLoaded(ad: RewardedInterstitialAd) {
+                AdRewardInterstitialExecutor.mRewardedInterstitialAd = ad
+                AdRewardInterstitialExecutor.mRewardedInterstitialAd.fullScreenContentCallback = FullscreenPluginCallback(
+                        RewardInterstitialAdPluginEvents, notifyListenersFunction)
+
+                val adInfo = JSObject()
+                adInfo.put("adUnitId", ad.adUnitId)
+                call.resolve(adInfo)
+
+                notifyListenersFunction.accept(RewardInterstitialAdPluginEvents.Loaded, adInfo)
+            }
+
+            override fun onAdFailedToLoad(adError: LoadAdError) {
+                val adMobError = AdMobPluginError(adError)
+
+                notifyListenersFunction.accept(RewardInterstitialAdPluginEvents.FailedToLoad, adMobError)
+                call.reject(adError.message)
+            }
+        }
+    }
+
+}

package/android/src/main/java/com/getcapacitor/community/admob/rewardedinterstitial/models/SsvInfo.kt

@@ -0,0 +1,20 @@
+package com.getcapacitor.community.admob.rewardedinterstitial.models
+
+import com.getcapacitor.PluginCall
+
+class SsvInfo(
+    val customData: String? = null,
+    val userId: String? = null) {
+
+    constructor(pluginCall: PluginCall?) : this(
+        pluginCall?.getObject("ssv")?.getString("customData"),
+        pluginCall?.getObject("ssv")?.getString("userId")
+    )
+
+    constructor() : this(null, null)
+
+    val hasInfo
+        get(): Boolean {
+            return customData != null || userId != null
+        }
+}