Skip to content

Commit a158324

Browse files
msbitmsbit
committed
Allow serving Native ads in AdLoaderAd
Allow the `AdLoaderAd` instance to serve `Native` ads, which are instances of: * `NativeAd` under Android, and * `GADNativeAd` under iOS
1 parent 9801cad commit a158324

18 files changed

Lines changed: 629 additions & 23 deletions

‎packages/google_mobile_ads/android/src/main/java/io/flutter/plugins/googlemobileads/AdMessageCodec.java‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ class AdMessageCodec extends StandardMessageCodec {
5757
private static final byte VALUE_AD_MANAGER_AD_VIEW_OPTIONS = (byte) 149;
5858
private static final byte VALUE_BANNER_PARAMETERS = (byte) 150;
5959
private static final byte VALUE_CUSTOM_PARAMETERS = (byte) 151;
60+
private static final byte VALUE_NATIVE_PARAMETERS = (byte) 152;
6061

6162
@NonNull Context context;
6263
@NonNull final FlutterAdSize.AdSizeFactory adSizeFactory;
@@ -219,6 +220,12 @@ protected void writeValue(ByteArrayOutputStream stream, Object value) {
219220
FlutterCustomParameters customParameters = (FlutterCustomParameters) value;
220221
writeValue(stream, customParameters.formatIds);
221222
writeValue(stream, customParameters.viewOptions);
223+
} else if (value instanceof FlutterNativeParameters) {
224+
stream.write(VALUE_NATIVE_PARAMETERS);
225+
FlutterNativeParameters nativeParameters = (FlutterNativeParameters) value;
226+
writeValue(stream, nativeParameters.factoryId);
227+
writeValue(stream, nativeParameters.nativeAdOptions);
228+
writeValue(stream, nativeParameters.viewOptions);
222229
} else {
223230
super.writeValue(stream, value);
224231
}
@@ -363,6 +370,11 @@ protected Object readValueOfType(byte type, ByteBuffer buffer) {
363370
return new FlutterCustomParameters(
364371
(List<String>) readValueOfType(buffer.get(), buffer),
365372
(Map<String, Object>) readValueOfType(buffer.get(), buffer));
373+
case VALUE_NATIVE_PARAMETERS:
374+
return new FlutterNativeParameters(
375+
(String) readValueOfType(buffer.get(), buffer),
376+
(FlutterNativeAdOptions) readValueOfType(buffer.get(), buffer),
377+
(Map<String, Object>) readValueOfType(buffer.get(), buffer));
366378
default:
367379
return super.readValueOfType(type, buffer);
368380
}

‎packages/google_mobile_ads/android/src/main/java/io/flutter/plugins/googlemobileads/FlutterAdLoader.java‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,8 @@ public void loadAdLoaderAd(
147147
@NonNull AdListener adListener,
148148
@NonNull AdRequest request,
149149
@Nullable FlutterAdLoaderAd.BannerParameters bannerParameters,
150-
@Nullable FlutterAdLoaderAd.CustomParameters customParameters) {
150+
@Nullable FlutterAdLoaderAd.CustomParameters customParameters,
151+
@Nullable FlutterAdLoaderAd.NativeParameters nativeParameters) {
151152
AdLoader.Builder builder = new AdLoader.Builder(context, adUnitId);
152153
if (bannerParameters != null) {
153154
builder = builder.forAdManagerAdView(bannerParameters.listener, bannerParameters.adSizes);
@@ -160,6 +161,12 @@ public void loadAdLoaderAd(
160161
builder = builder.forCustomFormatAd(formatId, customParameters.listener, null);
161162
}
162163
}
164+
if (nativeParameters != null) {
165+
builder = builder.forNativeAd(nativeParameters.listener);
166+
if (nativeParameters.nativeAdOptions != null) {
167+
builder = builder.withNativeAdOptions(nativeParameters.nativeAdOptions);
168+
}
169+
}
163170
builder.withAdListener(adListener).build().loadAd(request);
164171
}
165172

@@ -169,7 +176,8 @@ public void loadAdManagerAdLoaderAd(
169176
@NonNull AdListener adListener,
170177
@NonNull AdManagerAdRequest adManagerAdRequest,
171178
@Nullable FlutterAdLoaderAd.BannerParameters bannerParameters,
172-
@Nullable FlutterAdLoaderAd.CustomParameters customParameters) {
179+
@Nullable FlutterAdLoaderAd.CustomParameters customParameters,
180+
@Nullable FlutterAdLoaderAd.NativeParameters nativeParameters) {
173181
AdLoader.Builder builder = new AdLoader.Builder(context, adUnitId);
174182
if (bannerParameters != null) {
175183
builder = builder.forAdManagerAdView(bannerParameters.listener, bannerParameters.adSizes);
@@ -182,6 +190,12 @@ public void loadAdManagerAdLoaderAd(
182190
builder = builder.forCustomFormatAd(formatId, customParameters.listener, null);
183191
}
184192
}
193+
if (nativeParameters != null) {
194+
builder = builder.forNativeAd(nativeParameters.listener);
195+
if (nativeParameters.nativeAdOptions != null) {
196+
builder = builder.withNativeAdOptions(nativeParameters.nativeAdOptions);
197+
}
198+
}
185199
builder.withAdListener(adListener).build().loadAd(adManagerAdRequest);
186200
}
187201
}

‎packages/google_mobile_ads/android/src/main/java/io/flutter/plugins/googlemobileads/FlutterAdLoaderAd.java‎

Lines changed: 60 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,18 +24,24 @@
2424
import com.google.android.gms.ads.admanager.AdManagerAdView;
2525
import com.google.android.gms.ads.formats.AdManagerAdViewOptions;
2626
import com.google.android.gms.ads.formats.OnAdManagerAdViewLoadedListener;
27+
import com.google.android.gms.ads.nativead.NativeAd;
28+
import com.google.android.gms.ads.nativead.NativeAd.OnNativeAdLoadedListener;
29+
import com.google.android.gms.ads.nativead.NativeAdOptions;
2730
import com.google.android.gms.ads.nativead.NativeCustomFormatAd;
2831
import com.google.android.gms.ads.nativead.NativeCustomFormatAd.OnCustomFormatAdLoadedListener;
2932
import io.flutter.plugin.platform.PlatformView;
3033
import io.flutter.plugins.googlemobileads.GoogleMobileAdsPlugin.CustomAdFactory;
34+
import io.flutter.plugins.googlemobileads.GoogleMobileAdsPlugin.NativeAdFactory;
3135
import java.util.Map;
3236

3337
/**
3438
* A central wrapper for {@link AdManagerAdView}, {@link NativeCustomFormatAd} and {@link NativeAd}
3539
* instances served for a single {@link AdRequest} or {@link AdManagerAdRequest}
3640
*/
3741
class FlutterAdLoaderAd extends FlutterAd
38-
implements OnAdManagerAdViewLoadedListener, OnCustomFormatAdLoadedListener {
42+
implements OnAdManagerAdViewLoadedListener,
43+
OnCustomFormatAdLoadedListener,
44+
OnNativeAdLoadedListener {
3945
private static final String TAG = "FlutterAdLoaderAd";
4046

4147
@NonNull private final AdInstanceManager manager;
@@ -46,6 +52,7 @@ class FlutterAdLoaderAd extends FlutterAd
4652
@Nullable private View view;
4753
@Nullable protected BannerParameters bannerParameters;
4854
@Nullable protected CustomParameters customParameters;
55+
@Nullable protected NativeParameters nativeParameters;
4956

5057
static class Builder {
5158
@Nullable private AdInstanceManager manager;
@@ -57,6 +64,8 @@ static class Builder {
5764
@Nullable private FlutterBannerParameters bannerParameters;
5865
@Nullable private FlutterCustomParameters customParameters;
5966
@Nullable private Map<String, CustomAdFactory> customFactories;
67+
@Nullable private FlutterNativeParameters nativeParameters;
68+
@Nullable private Map<String, NativeAdFactory> nativeFactories;
6069

6170
public Builder setId(int id) {
6271
this.id = id;
@@ -104,6 +113,17 @@ public Builder withAvailableCustomFactories(
104113
return this;
105114
}
106115

116+
public Builder setNative(@Nullable FlutterNativeParameters nativeParameters) {
117+
this.nativeParameters = nativeParameters;
118+
return this;
119+
}
120+
121+
public Builder withAvailableNativeFactories(
122+
@NonNull Map<String, NativeAdFactory> nativeFactories) {
123+
this.nativeFactories = nativeFactories;
124+
return this;
125+
}
126+
107127
FlutterAdLoaderAd build() {
108128
if (manager == null) {
109129
throw new IllegalStateException("manager must be provided");
@@ -137,6 +157,12 @@ FlutterAdLoaderAd build() {
137157
new FlutterCustomFormatAdLoadedListener(adLoaderAd), customFactories);
138158
}
139159

160+
if (nativeParameters != null) {
161+
adLoaderAd.nativeParameters =
162+
nativeParameters.asNativeParameters(
163+
new FlutterNativeAdLoadedListener(adLoaderAd), nativeFactories);
164+
}
165+
140166
return adLoaderAd;
141167
}
142168
}
@@ -171,6 +197,24 @@ static class CustomParameters {
171197
}
172198
}
173199

200+
static class NativeParameters {
201+
@NonNull final OnNativeAdLoadedListener listener;
202+
@NonNull final NativeAdFactory factory;
203+
@Nullable final NativeAdOptions nativeAdOptions;
204+
@Nullable final Map<String, Object> viewOptions;
205+
206+
NativeParameters(
207+
@NonNull OnNativeAdLoadedListener listener,
208+
@NonNull NativeAdFactory factory,
209+
@Nullable NativeAdOptions nativeAdOptions,
210+
@Nullable Map<String, Object> viewOptions) {
211+
this.listener = listener;
212+
this.factory = factory;
213+
this.nativeAdOptions = nativeAdOptions;
214+
this.viewOptions = viewOptions;
215+
}
216+
}
217+
174218
protected FlutterAdLoaderAd(
175219
int adId,
176220
@NonNull AdInstanceManager manager,
@@ -204,7 +248,12 @@ void load() {
204248
// As of 20.0.0 of GMA, mockito is unable to mock AdLoader.
205249
if (request != null) {
206250
adLoader.loadAdLoaderAd(
207-
adUnitId, adListener, request.asAdRequest(adUnitId), bannerParameters, customParameters);
251+
adUnitId,
252+
adListener,
253+
request.asAdRequest(adUnitId),
254+
bannerParameters,
255+
customParameters,
256+
nativeParameters);
208257
return;
209258
}
210259

@@ -214,7 +263,8 @@ void load() {
214263
adListener,
215264
adManagerRequest.asAdManagerAdRequest(adUnitId),
216265
bannerParameters,
217-
customParameters);
266+
customParameters,
267+
nativeParameters);
218268
return;
219269
}
220270

@@ -245,6 +295,13 @@ public void onCustomFormatAdLoaded(@NonNull NativeCustomFormatAd ad) {
245295
manager.onAdLoaded(adId, null);
246296
}
247297

298+
@Override
299+
public void onNativeAdLoaded(@NonNull NativeAd ad) {
300+
view = nativeParameters.factory.createNativeAd(ad, nativeParameters.viewOptions);
301+
ad.setOnPaidEventListener(new FlutterPaidEventListener(manager, this));
302+
manager.onAdLoaded(adId, ad.getResponseInfo());
303+
}
304+
248305
@Override
249306
void dispose() {
250307
if (view == null) {

‎packages/google_mobile_ads/android/src/main/java/io/flutter/plugins/googlemobileads/FlutterCustomParameters.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ class FlutterCustomParameters {
2020

2121
FlutterAdLoaderAd.CustomParameters asCustomParameters(
2222
@NonNull OnCustomFormatAdLoadedListener listener,
23-
@NonNull Map<String, CustomAdFactory> availableFactories) {
23+
@NonNull Map<String, CustomAdFactory> registeredFactories) {
2424
Map<String, CustomAdFactory> factories = new HashMap<>();
2525
for (String formatId : formatIds) {
26-
factories.put(formatId, availableFactories.get(formatId));
26+
factories.put(formatId, registeredFactories.get(formatId));
2727
}
2828
return new FlutterAdLoaderAd.CustomParameters(listener, factories, viewOptions);
2929
}

‎packages/google_mobile_ads/android/src/main/java/io/flutter/plugins/googlemobileads/FlutterNativeParameters.java‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
// Copyright 2022 Google LLC
2+
//
3+
// Licensed under the Apache License, Version 2.0 (the "License");
4+
// you may not use this file except in compliance with the License.
5+
// You may obtain a copy of the License at
6+
//
7+
// https://www.apache.org/licenses/LICENSE-2.0
8+
//
9+
// Unless required by applicable law or agreed to in writing, software
10+
// distributed under the License is distributed on an "AS IS" BASIS,
11+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
// See the License for the specific language governing permissions and
13+
// limitations under the License.
14+
15+
package io.flutter.plugins.googlemobileads;
16+
17+
import androidx.annotation.NonNull;
18+
import androidx.annotation.Nullable;
19+
import com.google.android.gms.ads.nativead.NativeAd.OnNativeAdLoadedListener;
20+
import com.google.android.gms.ads.nativead.NativeAdOptions;
21+
import io.flutter.plugins.googlemobileads.GoogleMobileAdsPlugin.NativeAdFactory;
22+
import java.util.Map;
23+
24+
class FlutterNativeParameters {
25+
@NonNull final String factoryId;
26+
@Nullable final FlutterNativeAdOptions nativeAdOptions;
27+
@Nullable final Map<String, Object> viewOptions;
28+
29+
FlutterNativeParameters(
30+
@NonNull String factoryId,
31+
@Nullable FlutterNativeAdOptions nativeAdOptions,
32+
@Nullable Map<String, Object> viewOptions) {
33+
this.factoryId = factoryId;
34+
this.nativeAdOptions = nativeAdOptions;
35+
this.viewOptions = viewOptions;
36+
}
37+
38+
FlutterAdLoaderAd.NativeParameters asNativeParameters(
39+
@NonNull OnNativeAdLoadedListener listener,
40+
@NonNull Map<String, NativeAdFactory> registeredFactories) {
41+
NativeAdOptions nativeAdOptions = null;
42+
if (this.nativeAdOptions != null) {
43+
nativeAdOptions = this.nativeAdOptions.asNativeAdOptions();
44+
}
45+
return new FlutterAdLoaderAd.NativeParameters(
46+
listener, registeredFactories.get(factoryId), nativeAdOptions, viewOptions);
47+
}
48+
}

‎packages/google_mobile_ads/android/src/main/java/io/flutter/plugins/googlemobileads/GoogleMobileAdsPlugin.java‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -484,6 +484,17 @@ public void onAdInspectorClosed(@Nullable AdInspectorError adInspectorError) {
484484
}
485485
}
486486

487+
final FlutterNativeParameters nativeParameters =
488+
call.<FlutterNativeParameters>argument("native");
489+
if (nativeParameters != null) {
490+
if (nativeAdFactories.get(nativeParameters.factoryId) == null) {
491+
final String message =
492+
String.format("Can't find NativeAdFactory with id: %s", nativeParameters.factoryId);
493+
result.error("AdLoaderAdError", message, null);
494+
return;
495+
}
496+
}
497+
487498
final FlutterAdLoaderAd adLoaderAd =
488499
new FlutterAdLoaderAd.Builder()
489500
.setManager(instanceManager)
@@ -495,6 +506,8 @@ public void onAdInspectorClosed(@Nullable AdInspectorError adInspectorError) {
495506
.setBanner(call.<FlutterBannerParameters>argument("banner"))
496507
.setCustom(customParameters)
497508
.withAvailableCustomFactories(customAdFactories)
509+
.setNative(nativeParameters)
510+
.withAvailableNativeFactories(nativeAdFactories)
498511
.build();
499512
instanceManager.trackAd(adLoaderAd, call.<Integer>argument("adId"));
500513
adLoaderAd.load();

‎packages/google_mobile_ads/android/src/test/java/io/flutter/plugins/googlemobileads/AdMessageCodecTest.java‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -471,4 +471,27 @@ public void encodeCustomParameters() {
471471
assertEquals(result.viewOptions.size(), 1);
472472
assertEquals(result.viewOptions.get("key"), "value");
473473
}
474+
475+
@Test
476+
public void encodeNativeParameters() {
477+
final ByteBuffer data =
478+
codec.encodeMessage(
479+
new FlutterNativeParameters(
480+
"factory-id",
481+
new FlutterNativeAdOptions(1, 1, null, true, true, true),
482+
Collections.singletonMap("key", "value")));
483+
484+
final FlutterNativeParameters result =
485+
(FlutterNativeParameters) codec.decodeMessage((ByteBuffer) data.position(0));
486+
487+
assertEquals(result.factoryId, "factory-id");
488+
assertEquals(result.nativeAdOptions.adChoicesPlacement, Integer.valueOf(1));
489+
assertEquals(result.nativeAdOptions.mediaAspectRatio, Integer.valueOf(1));
490+
assertNull(result.nativeAdOptions.videoOptions);
491+
assertTrue(result.nativeAdOptions.requestCustomMuteThisAd);
492+
assertTrue(result.nativeAdOptions.shouldRequestMultipleImages);
493+
assertTrue(result.nativeAdOptions.shouldReturnUrlsForImageAssets);
494+
assertEquals(result.viewOptions.size(), 1);
495+
assertEquals(result.viewOptions.get("key"), "value");
496+
}
474497
}

0 commit comments

Comments
 (0)