fix(admob): use content-view

feat: customMuteThisAdAvailable
feat: muteThisAdWithReason

Author: triniwiz

packages/firebase-admob/nativead/common.ts

@@ -1,9 +1,9 @@
-import { ContainerView, CoreTypes, CSSType, Property, View } from '@nativescript/core';
+import { ContainerView, ContentView, CoreTypes, CSSType, Property, View } from '@nativescript/core';
 import { AdEventType } from '../common';
 import { IMediaContent, INativeAd } from '.';
 
 @CSSType('NativeAdView')
-export abstract class NativeAdViewBase extends ContainerView {
+export abstract class NativeAdViewBase extends ContentView {
 	abstract adChoicesView: View;
 
 	abstract advertiserView: View;

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

@@ -19,21 +19,7 @@ export class NativeAdView extends NativeAdViewBase implements AddChildFromBuilde
 	}
 
 	_addChildFromBuilder(name: string, value: any): void {
-		if (value instanceof View && !value.parent && !this._child) {
-			this._addView(value);
-			this._child = value;
-		}
-	}
-
-	public eachChildView(callback: (child: View) => boolean): void {
-		callback(this._child);
-	}
-
-	onLoaded() {
-		super.onLoaded();
-		if (this._child && (<any>this._native).indexOfChild(this._child.nativeView) === -1) {
-			(<any>this._native).addView(this._child.nativeView);
-		}
+		this.content = value;
 	}
 
 	_adChoicesView: View;
@@ -296,6 +282,10 @@ export class NativeAd implements INativeAd {
 		return MediaContent.fromNative(this.native?.getMediaContent?.());
 	}
 
+	get customMuteThisAdAvailable() {
+		return this.native?.isCustomMuteThisAdEnabled?.();
+	}
+
 	isCustomClickGestureEnabled(): boolean {
 		return this.native?.isCustomClickGestureEnabled?.();
 	}
@@ -363,6 +353,13 @@ export class NativeAd implements INativeAd {
 		}
 		return result;
 	}
+
+	muteThisAdWithReason(reason: MuteThisAdReason) {
+		if (reason?.native) {
+			this.native?.muteThisAd?.(reason.native);
+		}
+	}
+
 	get images() {
 		const result = [];
 		const images = this.native?.getImages?.();

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

@@ -155,7 +155,10 @@ export declare class NativeAd implements INativeAd {
 
 	readonly mediaContent: MediaContent;
 
+	readonly customMuteThisAdAvailable: boolean;
+
 	isCustomClickGestureEnabled(): boolean;
+
 	enableCustomClickGesture(): void;
 
 	readonly advertiser: string;
@@ -172,6 +175,8 @@ export declare class NativeAd implements INativeAd {
 
 	readonly muteThisAdReasons: MuteThisAdReason[];
 
+	muteThisAdWithReason(reason: MuteThisAdReason);
+
 	readonly images: NativeAdImage[];
 }
 

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

@@ -19,46 +19,14 @@ export class NativeAdView extends NativeAdViewBase implements AddChildFromBuilde
 	}
 
 	_addChildFromBuilder(name: string, value: any): void {
-		if (value instanceof View) {
-			this._child = value;
-		}
+		this.content = value;
 	}
 
-	public eachChildView(callback: (child: View) => boolean): void {
-		if (this._child) {
-			callback(this._child);
-		}
-	}
-
-	public onMeasure(widthMeasureSpec: number, heightMeasureSpec: number): void {
-		const result = View.measureChild(this, this._child, widthMeasureSpec, heightMeasureSpec);
-
-		const width = Utils.layout.getMeasureSpecSize(widthMeasureSpec);
-		const widthMode = Utils.layout.getMeasureSpecMode(widthMeasureSpec);
-
-		const height = Utils.layout.getMeasureSpecSize(heightMeasureSpec);
-		const heightMode = Utils.layout.getMeasureSpecMode(heightMeasureSpec);
-
-		const measureWidth = Math.max(result.measuredWidth, this.effectiveMinWidth);
-		const measureHeight = Math.max(result.measuredHeight, this.effectiveMinHeight);
-
-		const widthAndState = View.resolveSizeAndState(measureWidth, width, widthMode, 0);
-		const heightAndState = View.resolveSizeAndState(measureHeight, height, heightMode, 0);
-
-		this.setMeasuredDimension(widthAndState, heightAndState);
-	}
-
-	public onLayout(left: number, top: number, right: number, bottom: number): void {
-		View.layoutChild(this, this._child, 0, 0, right - left, bottom - top);
-	}
-
-	onLoaded() {
-		super.onLoaded();
-		if (this._child) {
-			this._addView(this._child);
-			this._native.addSubview(this._child.nativeView);
-		}
-	}
+	// public eachChildView(callback: (child: View) => boolean): void {
+	// 	if (this._child) {
+	// 		callback(this._child);
+	// 	}
+	// }
 
 	_adChoicesView: View;
 	get adChoicesView(): View {
@@ -376,6 +344,9 @@ export class NativeAd implements INativeAd {
 		return MediaContent.fromNative(this.native?.mediaContent);
 	}
 
+	get customMuteThisAdAvailable() {
+		return this.native.customMuteThisAdAvailable;
+	}
 	isCustomClickGestureEnabled(): boolean {
 		return this.native?.customClickGestureEnabled;
 	}
@@ -433,6 +404,12 @@ export class NativeAd implements INativeAd {
 		return result;
 	}
 
+	muteThisAdWithReason(reason: MuteThisAdReason) {
+		if (reason?.native) {
+			this.native?.muteThisAdWithReason?.(reason.native);
+		}
+	}
+
 	get images() {
 		const result = [];
 		const images = this.native?.images;