Add 'keywords' support to AdMob banners #666

Author: EddyVerbruggen

demo/app/main-view-model.ts

@@ -411,7 +411,8 @@ export class HelloWorldModel extends Observable {
       iosTestDeviceIds: [
         "45d77bf513dfabc2949ba053da83c0c7b7e87715", // Eddy's iPhone 6s
         "fee4cf319a242eab4701543e4c16db89c722731f"  // Eddy's iPad Pro
-      ]
+      ],
+      keywords: ["keyword1", "keyword2"] // add keywords for ad targeting
     }).then(
         () => {
           alert({

docs/ADMOB.md

@@ -42,7 +42,8 @@ Go [manage your AdMob app](https://apps.admob.com/#account/appmgmt:) and grab th
     iosTestDeviceIds: [ //Android automatically adds the connected device as test device with testing:true, iOS does not
         "45d77bf513dfabc2949ba053da83c0c7b7e87715", // Eddy's iPhone 6s
         "fee4cf319a242eab4701543e4c16db89c722731f"  // Eddy's iPad Pro
-    ]
+    ],
+    keywords: ["keyword1", "keyword2"] // add keywords for ad targeting
   }).then(
       function () {
         console.log("AdMob banner showing");
@@ -108,4 +109,4 @@ There's currently no functional difference between the AdMob features in the Fir
 [nativescript-admob](https://github.com/EddyVerbruggen/nativescript-admob).
 
 The main advantage of using the version in the Firebase plugin is to avoid a gradle build conflict
-in the Android build you may encounter when including both plugins in your app.
+in the Android build you may encounter when including both plugins in your app.

src/firebase.android.ts

@@ -768,6 +768,13 @@ firebase.admob._buildAdRequest = settings => {
       builder.addTestDevice(deviceId);
     }
   }
+
+  if (settings.keywords !== undefined && settings.keywords.length > 0) {
+    for (let i = 0; i < settings.keywords.length; i++) {
+      builder.addKeyword(settings.keywords[i]);
+    }
+  }
+
   const bundle = new android.os.Bundle();
   bundle.putInt("nativescript", 1);
   const adextras = new com.google.android.gms.ads.mediation.admob.AdMobExtras(bundle);
@@ -1987,15 +1994,11 @@ firebase.downloadFile = arg => {
       const storageReference = storageRef.child(arg.remoteFullPath);
 
       const onSuccessListener = new com.google.android.gms.tasks.OnSuccessListener({
-        onSuccess: downloadTaskSnapshot => {
-          resolve();
-        }
+        onSuccess: downloadTaskSnapshot => resolve()
       });
 
       const onFailureListener = new com.google.android.gms.tasks.OnFailureListener({
-        onFailure: exception => {
-          reject("Download failed. " + exception);
-        }
+        onFailure: exception => reject("Download failed. " + exception)
       });
 
       let localFilePath;

src/firebase.d.ts

@@ -633,6 +633,11 @@ export namespace admob {
        */
       bottom?: number;
     };
+
+    /**
+     * Specify keywords for ad targeting
+     */
+    keywords?: string[];
   }
 
   export interface ShowInterstitialOptions {
@@ -710,7 +715,7 @@ export namespace analytics {
   function logEvent(options: LogEventOptions): Promise<any>;
 
   function setUserId(options: SetUserIdOptions): Promise<any>;
-  
+
   function setUserProperty(options: SetUserPropertyOptions): Promise<any>;
 
   function setScreenName(options: SetScreenNameOptions): Promise<any>;

src/firebase.ios.ts

@@ -851,12 +851,16 @@ firebase.admob.showBanner = arg => {
         adRequest.testDevices = testDevices;
       }
 
+      if (settings.keywords !== undefined) {
+        adRequest.keywords = settings.keywords;
+      }
+
       firebase.admob.adView.rootViewController = utils.ios.getter(UIApplication, UIApplication.sharedApplication).keyWindow.rootViewController;
       // var statusbarFrame = utils.ios.getter(UIApplication, UIApplication.sharedApplication).statusBarFrame;
 
       firebase.admob.adView.loadRequest(adRequest);
 
-      // TODO consider listening to delegate features like 'ad loaded'
+      // TODO consider listening to delegate features like 'ad loaded' (Android resolves when the banner is actually showing)
       // adView.delegate = self;
 
       view.addSubview(firebase.admob.adView);
@@ -1967,6 +1971,7 @@ firebase.downloadFile = arg => {
     try {
 
       const onCompletion = (url, error) => {
+        console.log(">>> download complete, error: " + error);
         if (error) {
           reject(error.localizedDescription);
         } else {