[firebase_admob] Use instance variables when loading ads (firebase#2382)

Author: bparrishMines

packages/firebase_admob/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.9.3+2
+
+* Fixed bug related to simultaneous ad loading behavior on iOS.
+
 ## 0.9.3+1
 
 * Modified README to reflect supporting Native Ads.

packages/firebase_admob/ios/Classes/FLTMobileAd.m

@@ -9,21 +9,20 @@
 static NSMutableDictionary *allAds = nil;
 static NSDictionary *statusToString = nil;
 
-@implementation FLTMobileAd
-NSNumber *_mobileAdId;
-FlutterMethodChannel *_channel;
-FLTMobileAdStatus _status;
-double _anchorOffset;
-double _horizontalCenterOffset;
-int _anchorType;
+@implementation FLTMobileAd {
+  NSNumber *_mobileAdId;
+ @protected
+  FlutterMethodChannel *_channel;
+  FLTMobileAdStatus _status;
+  double _anchorOffset;
+  double _horizontalCenterOffset;
+  int _anchorType;
+}
 
 + (void)initialize {
   if (allAds == nil) {
     allAds = [[NSMutableDictionary alloc] init];
   }
-  _anchorType = 0;
-  _anchorOffset = 0;
-  _horizontalCenterOffset = 0;
 
   if (statusToString == nil) {
     statusToString = @{
@@ -169,9 +168,10 @@ - (NSString *)description {
 }
 @end
 
-@implementation FLTBannerAd
-GADBannerView *_banner;
-GADAdSize _adSize;
+@implementation FLTBannerAd {
+  GADBannerView *_banner;
+  GADAdSize _adSize;
+}
 
 + (instancetype)withId:(NSNumber *)mobileAdId
                 adSize:(GADAdSize)adSize
@@ -238,8 +238,9 @@ - (void)adViewDidReceiveAd:(GADBannerView *)adView {
 }
 @end
 
-@implementation FLTInterstitialAd
-GADInterstitial *_interstitial;
+@implementation FLTInterstitialAd {
+  GADInterstitial *_interstitial;
+}
 
 + (instancetype)withId:(NSNumber *)mobileAdId channel:(FlutterMethodChannel *)channel {
   FLTMobileAd *ad = [FLTMobileAd getAdForId:mobileAdId];

packages/firebase_admob/ios/Classes/FLTRequestFactory.m

@@ -7,9 +7,9 @@
 #import "GoogleMobileAds/GADExtras.h"
 #import "GoogleMobileAds/GoogleMobileAds.h"
 
-@implementation FLTRequestFactory
-
-NSDictionary *_targetingInfo;
+@implementation FLTRequestFactory {
+  NSDictionary *_targetingInfo;
+}
 
 - (instancetype)initWithTargetingInfo:(NSDictionary *)targetingInfo {
   self = [super init];

packages/firebase_admob/ios/Classes/FLTRewardedVideoAdWrapper.h

@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 #import <Flutter/Flutter.h>
-#import "GoogleMobileAds/GoogleMobileAds.h"
+#import <GoogleMobileAds/GoogleMobileAds.h>
 
 typedef enum : NSUInteger {
   FLTRewardedVideoAdStatusCreated,

packages/firebase_admob/ios/Classes/FLTRewardedVideoAdWrapper.m

@@ -11,10 +11,10 @@
 @interface FLTRewardedVideoAdWrapper () <GADRewardBasedVideoAdDelegate>
 @end
 
-@implementation FLTRewardedVideoAdWrapper
-
-FlutterMethodChannel *_rewardedChannel;
-FLTRewardedVideoAdStatus _rewardedStatus;
+@implementation FLTRewardedVideoAdWrapper {
+  FlutterMethodChannel *_rewardedChannel;
+  FLTRewardedVideoAdStatus _rewardedStatus;
+}
 
 + (void)initialize {
   if (rewardedStatusToString == nil) {
@@ -79,10 +79,8 @@ - (NSString *)description {
 
 - (void)rewardBasedVideoAd:(nonnull GADRewardBasedVideoAd *)rewardBasedVideoAd
     didRewardUserWithReward:(nonnull GADAdReward *)reward {
-  NSDictionary *arguments = @{
-    @"rewardAmount" : [NSNumber numberWithInt:[reward.amount intValue]],
-    @"rewardType" : reward.type
-  };
+  NSDictionary *arguments =
+      @{@"rewardAmount" : @(reward.amount.intValue), @"rewardType" : reward.type};
   [_rewardedChannel invokeMethod:@"onRewarded" arguments:arguments];
 }
 

packages/firebase_admob/pubspec.yaml

@@ -2,7 +2,7 @@ name: firebase_admob
 description: Flutter plugin for Firebase AdMob, supporting
   banner, interstitial (full-screen), and rewarded video ads
 homepage: https://github.com/FirebaseExtended/flutterfire/tree/master/packages/firebase_admob
-version: 0.9.3+1
+version: 0.9.3+2
 
 flutter:
   plugin:

packages/firebase_admob/test/firebase_admob_e2e.dart

@@ -1,3 +1,6 @@
+import 'dart:async';
+import 'dart:io';
+
 import 'package:flutter_test/flutter_test.dart';
 import 'package:e2e/e2e.dart';
 
@@ -35,4 +38,34 @@ void main() {
     await Future<void>.delayed(Duration(seconds: 10));
     expect(adLoaded, isTrue);
   });
+
+  // TODO(bparrishMines): Unskip on Android once tests work on Firebase TestLab.
+  // See https://github.com/FirebaseExtended/flutterfire/issues/2384
+  // ignore: missing_return
+  testWidgets('Load two Ads Simultaneously', (WidgetTester tester) {
+    final Completer<void> adCompleter1 = Completer<void>();
+    final Completer<void> adCompleter2 = Completer<void>();
+
+    final BannerAd bannerAd1 = BannerAd(
+      adUnitId: NativeAd.testAdUnitId,
+      size: AdSize.banner,
+      listener: (MobileAdEvent event) {
+        if (event == MobileAdEvent.loaded) adCompleter1.complete();
+      },
+    );
+
+    final BannerAd bannerAd2 = BannerAd(
+      adUnitId: NativeAd.testAdUnitId,
+      size: AdSize.banner,
+      listener: (MobileAdEvent event) {
+        if (event == MobileAdEvent.loaded) adCompleter1.complete();
+      },
+    );
+
+    bannerAd1.load();
+    bannerAd2.load();
+
+    expect(adCompleter1.future, completes);
+    expect(adCompleter2.future, completes);
+  }, skip: Platform.isAndroid);
 }