feat(cordova-android): add banner size option

admob-plus · Dec 1, 2018 · 14f3367 · 14f3367
1 parent 8865ddb
commit 14f3367
Show file tree

Hide file tree

Showing 10 changed files with 124 additions and 9 deletions.
diff --git a/packages/cordova/plugin.xml b/packages/cordova/plugin.xml
@@ -34,6 +34,7 @@
         <source-file src="src/android/Action.java" target-dir="src/admob/plugin" />
         <source-file src="src/android/Actions.java" target-dir="src/admob/plugin" />
         <source-file src="src/android/AdMob.java" target-dir="src/admob/plugin" />
+        <source-file src="src/android/AdSizeType.java" target-dir="src/admob/plugin" />
         <source-file src="src/android/Events.java" target-dir="src/admob/plugin" />
         <source-file src="src/android/ads/AdBase.java" target-dir="src/admob/plugin/ads" />
         <source-file src="src/android/ads/BannerAd.java" target-dir="src/admob/plugin/ads" />

diff --git a/packages/cordova/scripts/gen.ts b/packages/cordova/scripts/gen.ts
@@ -51,6 +51,15 @@ const Events: { [index: string]: string } = {
 }
 /* tslint:enable:object-literal-sort-keys */
 
+const AdSizeTypes = [
+  'BANNER',
+  'LARGE_BANNER',
+  'MEDIUM_RECTANGLE',
+  'FULL_BANNER',
+  'LEADERBOARD',
+  'SMART_BANNER',
+]
+
 function buildActionsJava(): string {
   const linesActions = Object.keys(Actions)
     .map(k => `    static final String ${k.toUpperCase()} = "${Actions[k]}";`)
@@ -83,6 +92,27 @@ ${linesEvents}
 `
 }
 
+function buildAdSizeTypeJava(): string {
+  return `// ${warnMessage}
+package admob.plugin;
+
+import com.google.android.gms.ads.AdSize;
+
+public enum AdSizeType {
+    ${AdSizeTypes.map(s => `${s}`).join(', ')};
+
+    public static AdSize getAdSize(Object adSize) {
+${AdSizeTypes.map(
+    s => `      if (AdSizeType.${s}.equals(adSize)) {
+          return AdSize.${s};
+      }`,
+  ).join('\n')}
+      return null;
+    }
+}
+`
+}
+
 function buildConstantsSwift(): string {
   const linesEvents = Object.keys(Events)
     .map(k => `    static let ${_.camelCase(k)} = "${Events[k]}"`)
@@ -107,6 +137,8 @@ function buildConstantsTs(): string {
     .sort()
     .join('\n')
 
+  const adSizeType = AdSizeTypes.map(s => `  ${s},`).join('\n')
+
   return `// ${warnMessage}
 export const enum NativeActions {
   Service = 'AdMob',
@@ -116,6 +148,10 @@ ${linesActions}
 export const enum Events {
 ${linesEvents}
 }
+
+export enum AdSizeType {
+${adSizeType}
+}
 `
 }
 
@@ -150,6 +186,7 @@ async function updateConfigXML() {
 
 async function main() {
   const l = [
+    { filepath: 'src/android/AdSizeType.java', f: buildAdSizeTypeJava },
     { filepath: 'src/android/Actions.java', f: buildActionsJava },
     { filepath: 'src/android/Events.java', f: buildEventsJava },
     { filepath: 'src/ios/AMSConstants.swift', f: buildConstantsSwift },

diff --git a/packages/cordova/src/android/Action.java b/packages/cordova/src/android/Action.java
@@ -4,6 +4,7 @@
 
 import com.google.ads.mediation.admob.AdMobAdapter;
 import com.google.android.gms.ads.AdRequest;
+import com.google.android.gms.ads.AdSize;
 
 import org.json.JSONArray;
 import org.json.JSONObject;
@@ -21,10 +22,24 @@ public int optId() {
         return opts.optInt("id");
     }
 
+
     public AdBase getAd() {
         return AdBase.getAd(optId());
     }
 
+    public AdSize getAdSize() {
+        final String name = "size";
+        if (!this.opts.has(name)) {
+            return AdSize.SMART_BANNER;
+        }
+        AdSize adSize = AdSizeType.getAdSize(this.opts.opt(name));
+        if (adSize != null) {
+            return adSize;
+        }
+        JSONObject adSizeObj = this.opts.optJSONObject(name);
+        return new AdSize(adSizeObj.optInt("width"), adSizeObj.optInt("height"));
+    }
+
     public String getAdUnitID() {
         return this.opts.optString("adUnitID");
     }

diff --git a/packages/cordova/src/android/AdSizeType.java b/packages/cordova/src/android/AdSizeType.java
@@ -0,0 +1,30 @@
+// THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+package admob.plugin;
+
+import com.google.android.gms.ads.AdSize;
+
+public enum AdSizeType {
+    BANNER, LARGE_BANNER, MEDIUM_RECTANGLE, FULL_BANNER, LEADERBOARD, SMART_BANNER;
+
+    public static AdSize getAdSize(Object adSize) {
+      if (AdSizeType.BANNER.equals(adSize)) {
+          return AdSize.BANNER;
+      }
+      if (AdSizeType.LARGE_BANNER.equals(adSize)) {
+          return AdSize.LARGE_BANNER;
+      }
+      if (AdSizeType.MEDIUM_RECTANGLE.equals(adSize)) {
+          return AdSize.MEDIUM_RECTANGLE;
+      }
+      if (AdSizeType.FULL_BANNER.equals(adSize)) {
+          return AdSize.FULL_BANNER;
+      }
+      if (AdSizeType.LEADERBOARD.equals(adSize)) {
+          return AdSize.LEADERBOARD;
+      }
+      if (AdSizeType.SMART_BANNER.equals(adSize)) {
+          return AdSize.SMART_BANNER;
+      }
+      return null;
+    }
+}
diff --git a/packages/cordova/src/android/ads/BannerAd.java b/packages/cordova/src/android/ads/BannerAd.java
@@ -20,9 +20,11 @@
 public class BannerAd extends AdBase {
     private AdView adView;
     private ViewGroup parentView;
+    private AdSize adSize;
 
-    BannerAd(int id, String adUnitID) {
+    BannerAd(int id, String adUnitID, AdSize adSize) {
         super(id, adUnitID);
+        this.adSize = adSize;
     }
 
     public static boolean executeShowAction(Action action, CallbackContext callbackContext) {
@@ -31,7 +33,7 @@ public static boolean executeShowAction(Action action, CallbackContext callbackC
             public void run() {
                 BannerAd bannerAd = (BannerAd) action.getAd();
                 if (bannerAd == null) {
-                    bannerAd = new BannerAd(action.optId(), action.getAdUnitID());
+                    bannerAd = new BannerAd(action.optId(), action.getAdUnitID(), action.getAdSize());
                 }
                 bannerAd.show(action.buildAdRequest());
 
@@ -64,7 +66,7 @@ public void show(AdRequest adRequest) {
         if (adView == null) {
             adView = new AdView(plugin.cordova.getActivity());
             adView.setAdUnitId(adUnitID);
-            adView.setAdSize(AdSize.SMART_BANNER);
+            adView.setAdSize(adSize);
             adView.setAdListener(new AdListener() {
                 @Override
                 public void onAdLoaded() {

diff --git a/packages/cordova/ts/banner.ts b/packages/cordova/ts/banner.ts
@@ -1,4 +1,4 @@
-import { IAdRequest } from '@admob-plus/core'
+import { AdSizeType, IBannerRequest } from '@admob-plus/core'
 
 import { AdBase, execAsync, NativeActions, TestIds } from './base'
 
@@ -8,9 +8,10 @@ export default class Banner extends AdBase {
   protected testIdForAndroid = TestIds.banner_android
   protected testIdForIOS = TestIds.banner_ios
 
-  public show(opts: IAdRequest = {}) {
+  public show(opts: IBannerRequest) {
     return execAsync(NativeActions.banner_show, [
       {
+        size: AdSizeType.SMART_BANNER,
         ...opts,
         adUnitID: this.resolveAdUnitID(opts.id),
         id: AD_ID,

diff --git a/packages/core/constants.ts b/packages/core/constants.ts
@@ -34,3 +34,12 @@ export const enum Events {
   reward_video_reward = 'admob.reward_video.reward',
   reward_video_start = 'admob.reward_video.start',
 }
+
+export enum AdSizeType {
+  BANNER,
+  LARGE_BANNER,
+  MEDIUM_RECTANGLE,
+  FULL_BANNER,
+  LEADERBOARD,
+  SMART_BANNER,
+}
diff --git a/packages/core/index.ts b/packages/core/index.ts
@@ -13,3 +13,23 @@ export interface IAdRequest {
   childDirectedTreatment?: boolean
   underAgeOfConsent?: boolean
 }
+
+export enum AdSizeType {
+  BANNER,
+  LARGE_BANNER,
+  MEDIUM_RECTANGLE,
+  FULL_BANNER,
+  LEADERBOARD,
+  SMART_BANNER,
+}
+
+type AdSize =
+  | AdSizeType
+  | {
+      width: number;
+      height: number;
+    }
+
+export interface IBannerRequest extends IAdRequest {
+  size?: AdSize
+}
diff --git a/packages/ionic-ngx/index.ts b/packages/ionic-ngx/index.ts
@@ -2,7 +2,7 @@ import { Injectable } from '@angular/core'
 import { cordova, IonicNativePlugin } from '@ionic-native/core'
 import { fromEvent, Observable } from 'rxjs'
 
-import { IAdRequest } from '@admob-plus/core'
+import { IAdRequest, IBannerRequest } from '@admob-plus/core'
 
 export class Banner extends IonicNativePlugin {
   public static plugin = 'cordova-admob-plus'
@@ -13,7 +13,7 @@ export class Banner extends IonicNativePlugin {
     return cordova(this, 'hide', { otherPromise: true }, arguments)
   }
 
-  public show(opts: IAdRequest): Promise<any> {
+  public show(opts: IBannerRequest): Promise<any> {
     return cordova(this, 'show', { otherPromise: true }, arguments)
   }
 }

diff --git a/packages/ionic/index.ts b/packages/ionic/index.ts
@@ -3,7 +3,7 @@ import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core'
 import { Observable } from 'rxjs/Observable'
 import { fromEvent } from 'rxjs/observable/fromEvent'
 
-import { IAdRequest } from '@admob-plus/core'
+import { IAdRequest, IBannerRequest } from '@admob-plus/core'
 
 @Plugin({
   plugin: 'cordova-admob-plus',
@@ -17,7 +17,7 @@ export class Banner {
   }
 
   @Cordova({ otherPromise: true })
-  public show(opts: IAdRequest): Promise<any> {
+  public show(opts: IBannerRequest): Promise<any> {
     return Promise.resolve()
   }
 }