fix(admob): NativeAdImage

feat: NativeAdImage image returns ImageSource

Author: triniwiz

packages/firebase-admob/nativead/index.android.ts

@@ -562,18 +562,18 @@ export class MediaView extends MediaViewBase {
 }
 
 export class NativeAdImage implements INativeAdImage {
-	#native: com.google.android.gms.ads.formats.NativeAd.Image;
-	static fromNative(image: com.google.android.gms.ads.formats.NativeAd.Image) {
-		if (image instanceof com.google.android.gms.ads.formats.NativeAd.Image) {
+	#native: com.google.android.gms.ads.nativead.NativeAd.Image;
+	static fromNative(image: com.google.android.gms.ads.nativead.NativeAd.Image) {
+		if (image instanceof com.google.android.gms.ads.nativead.NativeAd.Image) {
 			const nativeAdImage = new NativeAdImage();
 			nativeAdImage.#native = image;
 			return nativeAdImage;
 		}
 		return null;
 	}
 
-	get image(): any {
-		return this.native?.getDrawable?.();
+	get image() {
+		return new ImageSource(org.nativescript.firebase.admob.FirebaseAdmob.getBitmap(this.native?.getDrawable?.() || null));
 	}
 
 	get url(): string {

packages/firebase-admob/nativead/index.d.ts

@@ -123,7 +123,7 @@ export declare class MediaView extends MediaViewBase {
 }
 
 export declare class NativeAdImage implements INativeAdImage {
-	readonly image: any;
+	readonly image: ImageSource;
 
 	readonly url: string;
 

packages/firebase-admob/nativead/index.ios.ts

@@ -610,8 +610,8 @@ export class NativeAdImage implements INativeAdImage {
 		return null;
 	}
 
-	get image(): any {
-		return this.native?.image;
+	get image() {
+		return new ImageSource(this.native?.image);
 	}
 
 	get url(): string {

packages/firebase-admob/platforms/android/admob-release.aar

@@ -2,11 +2,16 @@ package org.nativescript.firebase.admob
 
 import android.app.Activity
 import android.content.Context
+import android.graphics.Bitmap
+import android.graphics.BitmapFactory
+import android.graphics.drawable.BitmapDrawable
+import android.graphics.drawable.Drawable
 import android.location.Location
 import android.os.Bundle
 import android.os.Handler
 import android.os.Looper
 import android.util.Log
+import androidx.core.graphics.drawable.toBitmap
 import com.google.ads.mediation.admob.AdMobAdapter
 import com.google.android.gms.ads.*
 import com.google.android.gms.ads.admanager.AdManagerAdRequest
@@ -103,7 +108,7 @@ private const val AD_CLOSED_EVENT = "adClosed"
 private const val AD_FAILED_TO_LOAD_EVENT = "adFailedToLoad"
 private const val AD_LOADED_EVENT = "adLoaded"
 private const val AD_OPENED_EVENT = "adOpened"
-private  const val AD_IMPRESSION_EVENT = "adImpression"
+private const val AD_IMPRESSION_EVENT = "adImpression"
 private const val AD_FAILED_TO_SHOW_FULL_SCREEN_CONTENT = " adFailedToShowFullScreenContent"
 
 
@@ -665,6 +670,11 @@ class FirebaseAdmob {
 
   companion object {
 
+    @JvmStatic
+    fun getBitmap(drawable: Drawable?): Bitmap? {
+      return drawable?.toBitmap()
+    }
+
     @JvmStatic
     fun setRequestConfiguration(configuration: String) {
       try {

packages/firebase-admob/src-native/android/.idea/misc.xml

@@ -26,6 +26,7 @@ declare module org {
 					public static setRequestConfiguration(param0: string): void;
 					public static getExecutorsCount(): number;
 					public static setExecutorsCount(param0: number): void;
+					public static getBitmap(param0: globalAndroid.graphics.drawable.Drawable): globalAndroid.graphics.Bitmap;
 				}
 				export module FirebaseAdmob {
 					export class AdCallback {