status-im
/
react-native-firebase
mirror of
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

[admob][android] Support re-rendering Banner/NativeExpress with new size/unitId/request/videoOptions

This commit is contained in:
Elliot Hesp 2017-06-05 10:03:05 +01:00
parent a6705dfb3d
commit c61bddeb43
2 changed files with 92 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

100
android/src/main/java/io/invertase/firebase/admob/RNFirebaseAdMobBanner.java
View File

@ -1,7 +1,6 @@
package io.invertase.firebase.admob;
import android.support.annotation.Nullable;
import android.view.View;
import com.facebook.react.bridge.Arguments;
import com.facebook.react.bridge.ReadableMap;
@ -17,13 +16,10 @@ import com.google.android.gms.ads.AdListener;
import com.google.android.gms.ads.AdRequest;
import com.google.android.gms.ads.AdSize;
import com.google.android.gms.ads.AdView;
import com.google.android.gms.ads.NativeExpressAdView;
import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
public class RNFirebaseAdMobBanner extends SimpleViewManager<ReactViewGroup> implements View.OnLayoutChangeListener {
public class RNFirebaseAdMobBanner extends SimpleViewManager<ReactViewGroup> {
public static final String REACT_CLASS = "RNFirebaseAdMobBanner";
public static final String BANNER_EVENT = "bannerEvent";
@ -52,8 +48,13 @@ public class RNFirebaseAdMobBanner extends SimpleViewManager<ReactViewGroup> imp
private ThemedReactContext context;
private ReactViewGroup viewGroup;
private RCTEventEmitter emitter;
private AdRequest.Builder request = null;
private String size;
private Boolean requested = false;
// Internal prop values
private AdRequest.Builder request;
private AdSize size;
private String unitId;
@Override
public String getName() {
@ -62,6 +63,7 @@ public class RNFirebaseAdMobBanner extends SimpleViewManager<ReactViewGroup> imp
/**
* Create & return view instance
*
* @param themedReactContext
* @return
*/
@ -82,8 +84,22 @@ public class RNFirebaseAdMobBanner extends SimpleViewManager<ReactViewGroup> imp
return (AdView) viewGroup.getChildAt(0);
}
/**
* Remove the inner AdView and set a new one
*/
private void resetAdView() {
AdView oldAdView = getAdView();
AdView newAdView = new AdView(context);
viewGroup.removeViewAt(0);
if (oldAdView != null) oldAdView.destroy();
viewGroup.addView(newAdView);
setAdListener();
}
/**
* Declare custom events
*
* @return
*/
@Override
@ -93,75 +109,51 @@ public class RNFirebaseAdMobBanner extends SimpleViewManager<ReactViewGroup> imp
return builder.build();
}
/**
* If the React View changes, reset the Ad size
* @param view
* @param left
* @param top
* @param right
* @param bottom
* @param oldLeft
* @param oldTop
* @param oldRight
* @param oldBottom
*/
@Override
public void onLayoutChange(View view, final int left, int top, int right, int bottom, int oldLeft, int oldTop, int oldRight, int oldBottom) {
// If the view has changed at all, recalculate what banner we need
if (left != oldLeft || right != oldRight || top != oldTop || bottom != oldBottom) {
setSize(viewGroup, null);
}
}
/**
* Handle unitId prop
*
* @param view
* @param value
*/
@ReactProp(name = "unitId")
public void setUnitId(final ReactViewGroup view, final String value) {
AdView adViewView = getAdView();
adViewView.setAdUnitId(value);
public void setUnitId(ReactViewGroup view, String value) {
unitId = value;
requestAd();
}
/**
* Handle request prop
*
* @param view
* @param adRequest
* @param value
*/
@ReactProp(name = "request")
public void setRequest(final ReactViewGroup view, final ReadableMap adRequest) {
request = RNFirebaseAdMobUtils.buildRequest(adRequest);
public void setRequest(ReactViewGroup view, ReadableMap value) {
request = RNFirebaseAdMobUtils.buildRequest(value);
requestAd();
}
/**
* Handle size prop
*
* @param view
* @param value
*/
@ReactProp(name = "size")
public void setSize(final ReactViewGroup view, final @Nullable String value) {
if (value != null) {
size = value;
}
AdSize adSize = RNFirebaseAdMobUtils.stringToAdSize(size);
AdView adViewView = (AdView) view.getChildAt(0);
adViewView.setAdSize(adSize);
public void setSize(ReactViewGroup view, String value) {
size = RNFirebaseAdMobUtils.stringToAdSize(value);
// Send the width & height back to the JS
int width;
int height;
WritableMap payload = Arguments.createMap();
if (adSize == AdSize.SMART_BANNER) {
width = (int) PixelUtil.toDIPFromPixel(adSize.getWidthInPixels(context));
height = (int) PixelUtil.toDIPFromPixel(adSize.getHeightInPixels(context));
if (size == AdSize.SMART_BANNER) {
width = (int) PixelUtil.toDIPFromPixel(size.getWidthInPixels(context));
height = (int) PixelUtil.toDIPFromPixel(size.getHeightInPixels(context));
} else {
width = adSize.getWidth();
height = adSize.getHeight();
width = size.getWidth();
height = size.getHeight();
}
payload.putDouble("width", width);
@ -175,13 +167,22 @@ public class RNFirebaseAdMobBanner extends SimpleViewManager<ReactViewGroup> imp
* Loads a new ad into a viewGroup
*/
void requestAd() {
AdView adView = getAdView();
if (adView.getAdSize() == null || adView.getAdUnitId() == null || request == null) {
// If the props have not yet been set
if (size == null || unitId == null || request == null) {
return;
}
// If the banner has already been requested, reset it
if (requested) {
resetAdView();
}
AdView adView = getAdView();
adView.setAdUnitId(unitId);
adView.setAdSize(size);
AdRequest adRequest = request.build();
requested = true;
adView.loadAd(adRequest);
}
@ -240,6 +241,7 @@ public class RNFirebaseAdMobBanner extends SimpleViewManager<ReactViewGroup> imp
/**
* Sends an event back to the JS component to handle
*
* @param type
* @param payload
*/

89
android/src/main/java/io/invertase/firebase/admob/RNFirebaseAdMobNativeExpress.java
View File

@ -1,7 +1,6 @@
package io.invertase.firebase.admob;
import android.support.annotation.Nullable;
import android.view.View;
import com.facebook.react.bridge.Arguments;
import com.facebook.react.bridge.ReadableMap;
@ -16,16 +15,13 @@ import com.facebook.react.views.view.ReactViewGroup;
import com.google.android.gms.ads.AdListener;
import com.google.android.gms.ads.AdRequest;
import com.google.android.gms.ads.AdSize;
import com.google.android.gms.ads.AdView;
import com.google.android.gms.ads.NativeExpressAdView;
import com.google.android.gms.ads.VideoController;
import com.google.android.gms.ads.VideoOptions;
import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
public class RNFirebaseAdMobNativeExpress extends SimpleViewManager<ReactViewGroup> implements View.OnLayoutChangeListener {
public class RNFirebaseAdMobNativeExpress extends SimpleViewManager<ReactViewGroup> {
public static final String REACT_CLASS = "RNFirebaseAdMobNativeExpress";
public static final String BANNER_EVENT = "bannerEvent";
@ -55,9 +51,13 @@ public class RNFirebaseAdMobNativeExpress extends SimpleViewManager<ReactViewGro
private ThemedReactContext context;
private ReactViewGroup viewGroup;
private RCTEventEmitter emitter;
private Boolean requested = false;
// Internal prop values
private AdRequest.Builder request;
private VideoOptions.Builder videoOptions;
private String size;
private AdSize size;
private String unitId;
@Override
public String getName() {
@ -86,6 +86,19 @@ public class RNFirebaseAdMobNativeExpress extends SimpleViewManager<ReactViewGro
return (NativeExpressAdView) viewGroup.getChildAt(0);
}
/**
* Remove the inner AdView and set a new one
*/
private void resetAdView() {
NativeExpressAdView oldAdView = getAdView();
NativeExpressAdView newAdView = new NativeExpressAdView(context);
viewGroup.removeViewAt(0);
if (oldAdView != null) oldAdView.destroy();
viewGroup.addView(newAdView);
setAdListener();
}
/**
* Declare custom events
* @return
@ -97,35 +110,14 @@ public class RNFirebaseAdMobNativeExpress extends SimpleViewManager<ReactViewGro
return builder.build();
}
/**
* If the React View changes, reset the Ad size
* @param view
* @param left
* @param top
* @param right
* @param bottom
* @param oldLeft
* @param oldTop
* @param oldRight
* @param oldBottom
*/
@Override
public void onLayoutChange(View view, final int left, int top, int right, int bottom, int oldLeft, int oldTop, int oldRight, int oldBottom) {
// If the view has changed at all, recalculate what banner we need
if (left != oldLeft || right != oldRight || top != oldTop || bottom != oldBottom) {
setSize(viewGroup, null);
}
}
/**
* Handle unitId prop
* @param view
* @param value
*/
@ReactProp(name = "unitId")
public void setUnitId(final ReactViewGroup view, final String value) {
NativeExpressAdView adViewView = getAdView();
adViewView.setAdUnitId(value);
public void setUnitId(ReactViewGroup view, String value) {
unitId = value;
requestAd();
}
@ -135,7 +127,7 @@ public class RNFirebaseAdMobNativeExpress extends SimpleViewManager<ReactViewGro
* @param map
*/
@ReactProp(name = "request")
public void setRequest(final ReactViewGroup view, final ReadableMap map) {
public void setRequest(ReactViewGroup view, ReadableMap map) {
request = RNFirebaseAdMobUtils.buildRequest(map);
requestAd();
}
@ -146,7 +138,7 @@ public class RNFirebaseAdMobNativeExpress extends SimpleViewManager<ReactViewGro
* @param map
*/
@ReactProp(name = "video")
public void setVideoOptions(final ReactViewGroup view, final ReadableMap map) {
public void setVideoOptions(ReactViewGroup view, ReadableMap map) {
videoOptions = RNFirebaseAdMobUtils.buildVideoOptions(map);
requestAd();
}
@ -157,26 +149,20 @@ public class RNFirebaseAdMobNativeExpress extends SimpleViewManager<ReactViewGro
* @param value
*/
@ReactProp(name = "size")
public void setSize(final ReactViewGroup view, final @Nullable String value) {
if (value != null) {
size = value;
}
AdSize adSize = RNFirebaseAdMobUtils.stringToAdSize(size);
NativeExpressAdView adViewView = getAdView();
adViewView.setAdSize(adSize);
public void setSize(ReactViewGroup view, String value) {
size = RNFirebaseAdMobUtils.stringToAdSize(value);
// Send the width & height back to the JS
int width;
int height;
WritableMap payload = Arguments.createMap();
if (adSize == AdSize.SMART_BANNER) {
width = (int) PixelUtil.toDIPFromPixel(adSize.getWidthInPixels(context));
height = (int) PixelUtil.toDIPFromPixel(adSize.getHeightInPixels(context));
if (size == AdSize.SMART_BANNER) {
width = (int) PixelUtil.toDIPFromPixel(size.getWidthInPixels(context));
height = (int) PixelUtil.toDIPFromPixel(size.getHeightInPixels(context));
} else {
width = adSize.getWidth();
height = adSize.getHeight();
width = size.getWidth();
height = size.getHeight();
}
payload.putDouble("width", width);
@ -190,14 +176,21 @@ public class RNFirebaseAdMobNativeExpress extends SimpleViewManager<ReactViewGro
* Loads a new ad into a viewGroup
*/
void requestAd() {
NativeExpressAdView adView = getAdView();
if (adView.getAdSize() == null || adView.getAdUnitId() == null || request == null || videoOptions == null) {
if (size == null || unitId == null || request == null || videoOptions == null) {
return;
}
AdRequest adRequest = request.build();
if (requested) {
resetAdView();
}
NativeExpressAdView adView = getAdView();
adView.setAdUnitId(unitId);
adView.setAdSize(size);
adView.setVideoOptions(videoOptions.build());
AdRequest adRequest = request.build();
requested = true;
adView.loadAd(adRequest);
}