From c4dac9944021016143124b1f36c83599f0f554f2 Mon Sep 17 00:00:00 2001 From: Hans Muller Date: Tue, 2 Jan 2018 17:30:09 -0800 Subject: [PATCH 1/9] Change requestAgent to flutter-alph --- packages/firebase_admob/lib/firebase_admob.dart | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/packages/firebase_admob/lib/firebase_admob.dart b/packages/firebase_admob/lib/firebase_admob.dart index 9e66a8718841..0a25186db674 100644 --- a/packages/firebase_admob/lib/firebase_admob.dart +++ b/packages/firebase_admob/lib/firebase_admob.dart @@ -46,7 +46,6 @@ class MobileAdTargetingInfo { this.designedForFamilies, this.childDirected, this.testDevices, - this.requestAgent, }); final List keywords; @@ -56,10 +55,11 @@ class MobileAdTargetingInfo { final bool designedForFamilies; final bool childDirected; final List testDevices; - final String requestAgent; Map toJson() { - final Map json = {}; + final Map json = { + 'requestAgent': 'flutter-alpha', + }; if (keywords != null && keywords.isNotEmpty) { assert(keywords.every((String s) => s != null && s.isNotEmpty)); @@ -76,8 +76,6 @@ class MobileAdTargetingInfo { assert(testDevices.every((String s) => s != null && s.isNotEmpty)); json['testDevices'] = testDevices; } - if (requestAgent != null && requestAgent.isNotEmpty) - json['requestAgent'] = requestAgent; return json; } From 4ad69b6b2254de11904a924d8249261442cdbd54 Mon Sep 17 00:00:00 2001 From: Hans Muller Date: Wed, 3 Jan 2018 10:27:56 -0800 Subject: [PATCH 2/9] banner and interstitial ads have default targeting info --- packages/firebase_admob/lib/firebase_admob.dart | 14 ++++++++++---- .../firebase_admob/test/firebase_admob_test.dart | 2 ++ 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/packages/firebase_admob/lib/firebase_admob.dart b/packages/firebase_admob/lib/firebase_admob.dart index 0a25186db674..60cdfd62c0c5 100644 --- a/packages/firebase_admob/lib/firebase_admob.dart +++ b/packages/firebase_admob/lib/firebase_admob.dart @@ -156,8 +156,11 @@ class BannerAd extends MobileAd { @required String unitId, MobileAdTargetingInfo targetingInfo, MobileAdListener listener, - }) - : super(unitId: unitId, targetingInfo: targetingInfo, listener: listener); + }) : super( + unitId: unitId, + targetingInfo: targetingInfo ?? const MobileAdTargetingInfo(), + listener: listener + ); @override Future load() => _doLoad("loadBannerAd"); @@ -172,8 +175,11 @@ class InterstitialAd extends MobileAd { String unitId, MobileAdTargetingInfo targetingInfo, MobileAdListener listener, - }) - : super(unitId: unitId, targetingInfo: targetingInfo, listener: listener); + }) : super( + unitId: unitId, + targetingInfo: targetingInfo ?? const MobileAdTargetInfo(), + listener: listener + ); @override Future load() => _doLoad("loadInterstitialAd"); diff --git a/packages/firebase_admob/test/firebase_admob_test.dart b/packages/firebase_admob/test/firebase_admob_test.dart index 3fe23fec504d..8d7571780a51 100644 --- a/packages/firebase_admob/test/firebase_admob_test.dart +++ b/packages/firebase_admob/test/firebase_admob_test.dart @@ -58,6 +58,7 @@ void main() { ); final int id = banner.id; + expect(banner.targetingInfo?.requestAgent, 'flutter-alpha'); expect(await banner.load(), true); expect(await banner.show(), true); expect(await banner.dispose(), true); @@ -85,6 +86,7 @@ void main() { ); final int id = interstitial.id; + expect(interstitial.targetingInfo?.requestAgent, 'flutter-alpha'); expect(await interstitial.load(), true); expect(await interstitial.show(), true); expect(await interstitial.dispose(), true); From 8cbafd99b1dd20bef8a32e436dde189b16a48036 Mon Sep 17 00:00:00 2001 From: Hans Muller Date: Wed, 3 Jan 2018 10:42:48 -0800 Subject: [PATCH 3/9] Moved default targeting info to the MobileAd base class --- .../firebase_admob/lib/firebase_admob.dart | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/packages/firebase_admob/lib/firebase_admob.dart b/packages/firebase_admob/lib/firebase_admob.dart index 60cdfd62c0c5..50ae024fec76 100644 --- a/packages/firebase_admob/lib/firebase_admob.dart +++ b/packages/firebase_admob/lib/firebase_admob.dart @@ -90,14 +90,16 @@ abstract class MobileAd { static final Map _allAds = {}; /// Default constructor, used by subclasses. - MobileAd({@required this.unitId, this.targetingInfo, this.listener}) { + MobileAd({@required this.unitId, MobileAdTargetingInfo targetingInfo, this.listener}) { assert(unitId != null && unitId.isNotEmpty); assert(_allAds[id] == null); + _targetingInfo = targetingInfo ?? const MobileAdTargetingInfo(); _allAds[id] = this; } /// Optional targeting info per the native AdMob API. - final MobileAdTargetingInfo targetingInfo; + MobileAdTargetingInfo get targetingInfo => _targetingInfo; + final MobileAdTargetingInfo _targetingInfo; /// Identifies the source of ads for your application. /// @@ -156,11 +158,7 @@ class BannerAd extends MobileAd { @required String unitId, MobileAdTargetingInfo targetingInfo, MobileAdListener listener, - }) : super( - unitId: unitId, - targetingInfo: targetingInfo ?? const MobileAdTargetingInfo(), - listener: listener - ); + }) : super(unitId: unitId, targetingInfo: targetingInfo, listener: listener); @override Future load() => _doLoad("loadBannerAd"); @@ -175,11 +173,7 @@ class InterstitialAd extends MobileAd { String unitId, MobileAdTargetingInfo targetingInfo, MobileAdListener listener, - }) : super( - unitId: unitId, - targetingInfo: targetingInfo ?? const MobileAdTargetInfo(), - listener: listener - ); + }) : super(unitId: unitId, targetingInfo: targetingInfo, listener: listener); @override Future load() => _doLoad("loadInterstitialAd"); From 62d069f696fcb5a525282fcf76681e3a307cdd88 Mon Sep 17 00:00:00 2001 From: Hans Muller Date: Wed, 3 Jan 2018 11:27:20 -0800 Subject: [PATCH 4/9] updated requestAgent defaulting --- packages/firebase_admob/lib/firebase_admob.dart | 5 +++-- packages/firebase_admob/test/firebase_admob_test.dart | 5 ++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/firebase_admob/lib/firebase_admob.dart b/packages/firebase_admob/lib/firebase_admob.dart index 50ae024fec76..03840e7334a8 100644 --- a/packages/firebase_admob/lib/firebase_admob.dart +++ b/packages/firebase_admob/lib/firebase_admob.dart @@ -90,10 +90,11 @@ abstract class MobileAd { static final Map _allAds = {}; /// Default constructor, used by subclasses. - MobileAd({@required this.unitId, MobileAdTargetingInfo targetingInfo, this.listener}) { + MobileAd({@required this.unitId, MobileAdTargetingInfo targetingInfo, this.listener}) + : _targetingInfo = targetingInfo ?? const MobileAdTargetingInfo(); + { assert(unitId != null && unitId.isNotEmpty); assert(_allAds[id] == null); - _targetingInfo = targetingInfo ?? const MobileAdTargetingInfo(); _allAds[id] = this; } diff --git a/packages/firebase_admob/test/firebase_admob_test.dart b/packages/firebase_admob/test/firebase_admob_test.dart index 8d7571780a51..c9c3cdbad0dc 100644 --- a/packages/firebase_admob/test/firebase_admob_test.dart +++ b/packages/firebase_admob/test/firebase_admob_test.dart @@ -58,7 +58,6 @@ void main() { ); final int id = banner.id; - expect(banner.targetingInfo?.requestAgent, 'flutter-alpha'); expect(await banner.load(), true); expect(await banner.show(), true); expect(await banner.dispose(), true); @@ -67,7 +66,7 @@ void main() { isMethodCall('loadBannerAd', arguments: { 'id': id, 'unitId': bannerAdUnitId, - 'targetingInfo': null, + 'targetingInfo': {'requestAgent:', 'flutter-alpha'}, }), isMethodCall('showAd', arguments: { 'id': id, @@ -95,7 +94,7 @@ void main() { isMethodCall('loadInterstitialAd', arguments: { 'id': id, 'unitId': interstitialAdUnitId, - 'targetingInfo': null, + 'targetingInfo': {'requestAgent:', 'flutter-alpha'}, }), isMethodCall('showAd', arguments: { 'id': id, From aeb16176914ea6c8e99af150f1068a6d722dab2c Mon Sep 17 00:00:00 2001 From: Hans Muller Date: Wed, 3 Jan 2018 12:12:18 -0800 Subject: [PATCH 5/9] fixed a typo --- packages/firebase_admob/lib/firebase_admob.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/firebase_admob/lib/firebase_admob.dart b/packages/firebase_admob/lib/firebase_admob.dart index 03840e7334a8..43898e4c448c 100644 --- a/packages/firebase_admob/lib/firebase_admob.dart +++ b/packages/firebase_admob/lib/firebase_admob.dart @@ -91,7 +91,7 @@ abstract class MobileAd { /// Default constructor, used by subclasses. MobileAd({@required this.unitId, MobileAdTargetingInfo targetingInfo, this.listener}) - : _targetingInfo = targetingInfo ?? const MobileAdTargetingInfo(); + : _targetingInfo = targetingInfo ?? const MobileAdTargetingInfo() { assert(unitId != null && unitId.isNotEmpty); assert(_allAds[id] == null); From 805d0cfe19bdb7ec7a6fca2a2d0527aeba2a0c7f Mon Sep 17 00:00:00 2001 From: Hans Muller Date: Wed, 3 Jan 2018 12:27:36 -0800 Subject: [PATCH 6/9] fixed another typos --- packages/firebase_admob/test/firebase_admob_test.dart | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/firebase_admob/test/firebase_admob_test.dart b/packages/firebase_admob/test/firebase_admob_test.dart index c9c3cdbad0dc..d679d44648bc 100644 --- a/packages/firebase_admob/test/firebase_admob_test.dart +++ b/packages/firebase_admob/test/firebase_admob_test.dart @@ -66,7 +66,7 @@ void main() { isMethodCall('loadBannerAd', arguments: { 'id': id, 'unitId': bannerAdUnitId, - 'targetingInfo': {'requestAgent:', 'flutter-alpha'}, + 'targetingInfo': {'requestAgent':, 'flutter-alpha'}, }), isMethodCall('showAd', arguments: { 'id': id, @@ -94,7 +94,7 @@ void main() { isMethodCall('loadInterstitialAd', arguments: { 'id': id, 'unitId': interstitialAdUnitId, - 'targetingInfo': {'requestAgent:', 'flutter-alpha'}, + 'targetingInfo': {'requestAgent':, 'flutter-alpha'}, }), isMethodCall('showAd', arguments: { 'id': id, From 486a24ffb364c12decabaa45e68da22d27de5560 Mon Sep 17 00:00:00 2001 From: Hans Muller Date: Wed, 3 Jan 2018 12:40:15 -0800 Subject: [PATCH 7/9] yet another typo --- packages/firebase_admob/test/firebase_admob_test.dart | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/firebase_admob/test/firebase_admob_test.dart b/packages/firebase_admob/test/firebase_admob_test.dart index d679d44648bc..5b221bf5c2f4 100644 --- a/packages/firebase_admob/test/firebase_admob_test.dart +++ b/packages/firebase_admob/test/firebase_admob_test.dart @@ -66,7 +66,7 @@ void main() { isMethodCall('loadBannerAd', arguments: { 'id': id, 'unitId': bannerAdUnitId, - 'targetingInfo': {'requestAgent':, 'flutter-alpha'}, + 'targetingInfo': {'requestAgent': 'flutter-alpha'}, }), isMethodCall('showAd', arguments: { 'id': id, @@ -94,7 +94,7 @@ void main() { isMethodCall('loadInterstitialAd', arguments: { 'id': id, 'unitId': interstitialAdUnitId, - 'targetingInfo': {'requestAgent':, 'flutter-alpha'}, + 'targetingInfo': {'requestAgent': 'flutter-alpha'}, }), isMethodCall('showAd', arguments: { 'id': id, From 57f4f7800f9f3ae502c62dae62496f5598759d80 Mon Sep 17 00:00:00 2001 From: Hans Muller Date: Wed, 3 Jan 2018 13:04:08 -0800 Subject: [PATCH 8/9] yet another typo.. --- packages/firebase_admob/test/firebase_admob_test.dart | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/firebase_admob/test/firebase_admob_test.dart b/packages/firebase_admob/test/firebase_admob_test.dart index 5b221bf5c2f4..6777ffd3fdad 100644 --- a/packages/firebase_admob/test/firebase_admob_test.dart +++ b/packages/firebase_admob/test/firebase_admob_test.dart @@ -85,7 +85,6 @@ void main() { ); final int id = interstitial.id; - expect(interstitial.targetingInfo?.requestAgent, 'flutter-alpha'); expect(await interstitial.load(), true); expect(await interstitial.show(), true); expect(await interstitial.dispose(), true); From 47ef4680453e6f50f409ac1ddf3c03e12935cd13 Mon Sep 17 00:00:00 2001 From: Hans Muller Date: Wed, 3 Jan 2018 14:53:05 -0800 Subject: [PATCH 9/9] dartfmt --- packages/firebase_admob/lib/firebase_admob.dart | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/packages/firebase_admob/lib/firebase_admob.dart b/packages/firebase_admob/lib/firebase_admob.dart index 43898e4c448c..610c0dba6008 100644 --- a/packages/firebase_admob/lib/firebase_admob.dart +++ b/packages/firebase_admob/lib/firebase_admob.dart @@ -90,9 +90,11 @@ abstract class MobileAd { static final Map _allAds = {}; /// Default constructor, used by subclasses. - MobileAd({@required this.unitId, MobileAdTargetingInfo targetingInfo, this.listener}) - : _targetingInfo = targetingInfo ?? const MobileAdTargetingInfo() - { + MobileAd( + {@required this.unitId, + MobileAdTargetingInfo targetingInfo, + this.listener}) + : _targetingInfo = targetingInfo ?? const MobileAdTargetingInfo() { assert(unitId != null && unitId.isNotEmpty); assert(_allAds[id] == null); _allAds[id] = this; @@ -159,7 +161,8 @@ class BannerAd extends MobileAd { @required String unitId, MobileAdTargetingInfo targetingInfo, MobileAdListener listener, - }) : super(unitId: unitId, targetingInfo: targetingInfo, listener: listener); + }) + : super(unitId: unitId, targetingInfo: targetingInfo, listener: listener); @override Future load() => _doLoad("loadBannerAd"); @@ -174,7 +177,8 @@ class InterstitialAd extends MobileAd { String unitId, MobileAdTargetingInfo targetingInfo, MobileAdListener listener, - }) : super(unitId: unitId, targetingInfo: targetingInfo, listener: listener); + }) + : super(unitId: unitId, targetingInfo: targetingInfo, listener: listener); @override Future load() => _doLoad("loadInterstitialAd");