react-native-google-mobile-ads 9.1.1 → 9.1.2

package/android/src/main/java/io/invertase/googlemobileads/ReactNativeGoogleMobileAdsBannerAdViewManager.java

@@ -38,6 +38,7 @@ import com.google.android.gms.ads.BaseAdView;
 import com.google.android.gms.ads.LoadAdError;
 import com.google.android.gms.ads.admanager.AdManagerAdView;
 import com.google.android.gms.ads.admanager.AppEventListener;
+import io.invertase.googlemobileads.common.ReactNativeAdView;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -45,7 +46,7 @@ import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
 public class ReactNativeGoogleMobileAdsBannerAdViewManager
-    extends SimpleViewManager<ReactViewGroup> {
+    extends SimpleViewManager<ReactNativeAdView> {
   private static final String REACT_CLASS = "RNGoogleMobileAdsBannerView";
   private final String EVENT_AD_LOADED = "onAdLoaded";
   private final String EVENT_AD_FAILED_TO_LOAD = "onAdFailedToLoad";
@@ -55,13 +56,6 @@ public class ReactNativeGoogleMobileAdsBannerAdViewManager
   private final String EVENT_APP_EVENT = "onAppEvent";
   private final int COMMAND_ID_RECORD_MANUAL_IMPRESSION = 1;
 
-  private AdRequest request;
-  private List<AdSize> sizes;
-  private String unitId;
-  private Boolean manualImpressionsEnabled;
-  private boolean propsChanged;
-  private boolean isFluid;
-
   @Nonnull
   @Override
   public String getName() {
@@ -70,8 +64,8 @@ public class ReactNativeGoogleMobileAdsBannerAdViewManager
 
   @Nonnull
   @Override
-  public ReactViewGroup createViewInstance(@Nonnull ThemedReactContext themedReactContext) {
-    return new ReactViewGroup(themedReactContext);
+  public ReactNativeAdView createViewInstance(@Nonnull ThemedReactContext themedReactContext) {
+    return new ReactNativeAdView(themedReactContext);
   }
 
   @Override
@@ -89,7 +83,7 @@ public class ReactNativeGoogleMobileAdsBannerAdViewManager
 
   @Override
   public void receiveCommand(
-      @NonNull ReactViewGroup reactViewGroup, String commandId, @Nullable ReadableArray args) {
+      @NonNull ReactNativeAdView reactViewGroup, String commandId, @Nullable ReadableArray args) {
     super.receiveCommand(reactViewGroup, commandId, args);
     int commandIdInt = Integer.parseInt(commandId);
 
@@ -102,19 +96,19 @@ public class ReactNativeGoogleMobileAdsBannerAdViewManager
   }
 
   @ReactProp(name = "unitId")
-  public void setUnitId(ReactViewGroup reactViewGroup, String value) {
-    unitId = value;
-    propsChanged = true;
+  public void setUnitId(ReactNativeAdView reactViewGroup, String value) {
+    reactViewGroup.setUnitId(value);
+    reactViewGroup.setPropsChanged(true);
   }
 
   @ReactProp(name = "request")
-  public void setRequest(ReactViewGroup reactViewGroup, ReadableMap value) {
-    request = ReactNativeGoogleMobileAdsCommon.buildAdRequest(value);
-    propsChanged = true;
+  public void setRequest(ReactNativeAdView reactViewGroup, ReadableMap value) {
+    reactViewGroup.setRequest(ReactNativeGoogleMobileAdsCommon.buildAdRequest(value));
+    reactViewGroup.setPropsChanged(true);
   }
 
   @ReactProp(name = "sizes")
-  public void setSizes(ReactViewGroup reactViewGroup, ReadableArray value) {
+  public void setSizes(ReactNativeAdView reactViewGroup, ReadableArray value) {
     List<AdSize> sizeList = new ArrayList<>();
     for (Object size : value.toArrayList()) {
       if (size instanceof String) {
@@ -131,33 +125,37 @@ public class ReactNativeGoogleMobileAdsBannerAdViewManager
       sendEvent(reactViewGroup, EVENT_SIZE_CHANGE, payload);
     }
 
-    sizes = sizeList;
-    propsChanged = true;
+    reactViewGroup.setSizes(sizeList);
+    reactViewGroup.setPropsChanged(true);
   }
 
   @ReactProp(name = "manualImpressionsEnabled")
-  public void setManualImpressionsEnabled(ReactViewGroup reactViewGroup, boolean value) {
-    this.manualImpressionsEnabled = value;
-    propsChanged = true;
+  public void setManualImpressionsEnabled(ReactNativeAdView reactViewGroup, boolean value) {
+    reactViewGroup.setManualImpressionsEnabled(value);
+    reactViewGroup.setPropsChanged(true);
   }
 
   @Override
-  public void onAfterUpdateTransaction(@NonNull ReactViewGroup reactViewGroup) {
+  public void onAfterUpdateTransaction(@NonNull ReactNativeAdView reactViewGroup) {
     super.onAfterUpdateTransaction(reactViewGroup);
-    if (propsChanged) {
+    if (reactViewGroup.getPropsChanged()) {
       requestAd(reactViewGroup);
     }
-    propsChanged = false;
+    reactViewGroup.setPropsChanged(false);
   }
 
-  private BaseAdView initAdView(ReactViewGroup reactViewGroup) {
+  private BaseAdView initAdView(ReactNativeAdView reactViewGroup) {
     BaseAdView oldAdView = getAdView(reactViewGroup);
     if (oldAdView != null) {
+      oldAdView.setAdListener(null);
+      if (oldAdView instanceof AdManagerAdView) {
+        ((AdManagerAdView) oldAdView).setAppEventListener(null);
+      }
       oldAdView.destroy();
       reactViewGroup.removeView(oldAdView);
     }
     BaseAdView adView;
-    if (ReactNativeGoogleMobileAdsCommon.isAdManagerUnit(unitId)) {
+    if (ReactNativeGoogleMobileAdsCommon.isAdManagerUnit(reactViewGroup.getUnitId())) {
       adView = new AdManagerAdView(reactViewGroup.getContext());
     } else {
       adView = new AdView(reactViewGroup.getContext());
@@ -169,7 +167,7 @@ public class ReactNativeGoogleMobileAdsBannerAdViewManager
           public void onAdLoaded() {
             AdSize adSize = adView.getAdSize();
             int left, top, width, height;
-            if (isFluid) {
+            if (reactViewGroup.getIsFluid()) {
               // TODO size=FLUID is still not working
               left = 0;
               top = 0;
@@ -230,7 +228,12 @@ public class ReactNativeGoogleMobileAdsBannerAdViewManager
     return (BaseAdView) reactViewGroup.getChildAt(0);
   }
 
-  private void requestAd(ReactViewGroup reactViewGroup) {
+  private void requestAd(ReactNativeAdView reactViewGroup) {
+    String unitId = reactViewGroup.getUnitId();
+    List<AdSize> sizes = reactViewGroup.getSizes();
+    AdRequest request = reactViewGroup.getRequest();
+    Boolean manualImpressionsEnabled = reactViewGroup.getManualImpressionsEnabled();
+
     if (sizes == null || unitId == null || request == null || manualImpressionsEnabled == null) {
       return;
     }
@@ -238,10 +241,10 @@ public class ReactNativeGoogleMobileAdsBannerAdViewManager
     BaseAdView adView = initAdView(reactViewGroup);
     adView.setAdUnitId(unitId);
 
-    isFluid = false;
+    reactViewGroup.setIsFluid(false);
     if (adView instanceof AdManagerAdView) {
       if (sizes.contains(AdSize.FLUID)) {
-        isFluid = true;
+        reactViewGroup.setIsFluid(true);
         ((AdManagerAdView) adView).setAdSizes(AdSize.FLUID);
       } else {
         ((AdManagerAdView) adView).setAdSizes(sizes.toArray(new AdSize[0]));
@@ -256,7 +259,7 @@ public class ReactNativeGoogleMobileAdsBannerAdViewManager
     adView.loadAd(request);
   }
 
-  private void sendEvent(ReactViewGroup reactViewGroup, String type, WritableMap payload) {
+  private void sendEvent(ReactNativeAdView reactViewGroup, String type, WritableMap payload) {
     WritableMap event = Arguments.createMap();
     event.putString("type", type);
 

package/android/src/main/java/io/invertase/googlemobileads/common/ReactNativeAdView.java

@@ -0,0 +1,68 @@
+package io.invertase.googlemobileads.common;
+
+import android.content.Context;
+import com.facebook.react.views.view.ReactViewGroup;
+import com.google.android.gms.ads.AdRequest;
+import com.google.android.gms.ads.AdSize;
+import java.util.List;
+
+public class ReactNativeAdView extends ReactViewGroup {
+  private AdRequest request;
+  private List<AdSize> sizes;
+  private String unitId;
+  private boolean manualImpressionsEnabled;
+  private boolean propsChanged;
+  private boolean isFluid;
+
+  public ReactNativeAdView(final Context context) {
+    super(context);
+  }
+
+  public void setRequest(AdRequest request) {
+    this.request = request;
+  }
+
+  public AdRequest getRequest() {
+    return this.request;
+  }
+
+  public void setSizes(List<AdSize> sizes) {
+    this.sizes = sizes;
+  }
+
+  public List<AdSize> getSizes() {
+    return this.sizes;
+  }
+
+  public void setUnitId(String unitId) {
+    this.unitId = unitId;
+  }
+
+  public String getUnitId() {
+    return this.unitId;
+  }
+
+  public void setManualImpressionsEnabled(boolean manualImpressionsEnabled) {
+    this.manualImpressionsEnabled = manualImpressionsEnabled;
+  }
+
+  public boolean getManualImpressionsEnabled() {
+    return this.manualImpressionsEnabled;
+  }
+
+  public void setPropsChanged(boolean propsChanged) {
+    this.propsChanged = propsChanged;
+  }
+
+  public boolean getPropsChanged() {
+    return this.propsChanged;
+  }
+
+  public void setIsFluid(boolean isFluid) {
+    this.isFluid = isFluid;
+  }
+
+  public boolean getIsFluid() {
+    return this.isFluid;
+  }
+}

package/docs/displaying-ads-hook.mdx

@@ -86,6 +86,7 @@ Return values of the hook are:
 | :------------- | :--------------------------------- | :----------------------------------------------------------------------------------------------------------------- |
 | isLoaded       | boolean                            | Whether the ad is loaded and ready to to be shown to the user. Automatically set to false when the ad was shown.   |
 | isOpened       | boolean                            | Whether the ad is opened. The value is remained `true` even after the ad is closed unless **new ad is requested**. |
+| isClicked      | boolean                            | Whether the ad is clicked.                                                                                         |
 | isClosed       | boolean                            | Whether your ad is dismissed.                                                                                      |
 | isShowing      | boolean                            | Whether your ad is showing. The value is equal with `isOpened && !isClosed`.                                       |
 | error          | Error \| undefined                 | `Error` object throwed during ad load.                                                                             |

package/lib/commonjs/version.js

@@ -5,6 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.version = void 0;
 // Generated by genversion.
-const version = '9.1.1';
+const version = '9.1.2';
 exports.version = version;
 //# sourceMappingURL=version.js.map

package/lib/module/version.js

@@ -1,3 +1,3 @@
 // Generated by genversion.
-export const version = '9.1.1';
+export const version = '9.1.2';
 //# sourceMappingURL=version.js.map

package/lib/typescript/index.d.ts

@@ -1,4 +1,4 @@
-export declare const SDK_VERSION = "9.1.1";
+export declare const SDK_VERSION = "9.1.2";
 export { default, MobileAds } from './MobileAds';
 export { AdsConsentDebugGeography } from './AdsConsentDebugGeography';
 export { AdsConsentPurposes } from './AdsConsentPurposes';

package/lib/typescript/version.d.ts

@@ -1,2 +1,2 @@
-export declare const version = "9.1.1";
+export declare const version = "9.1.2";
 //# sourceMappingURL=version.d.ts.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-google-mobile-ads",
-  "version": "9.1.1",
+  "version": "9.1.2",
   "author": "Invertase <oss@invertase.io> (http://invertase.io)",
   "description": "React Native Google Mobile Ads is an easy way to monetize mobile apps with targeted, in-app advertising.",
   "main": "lib/commonjs/index.js",

package/src/version.ts

@@ -1,2 +1,2 @@
 // Generated by genversion.
-export const version = '9.1.1';
+export const version = '9.1.2';