fix: Fixed MasamuneControllerBase where adapter was not specified.

mathrunet · Aug 1, 2023 · 04493af · 04493af
1 parent 2383db8
commit 04493af
Show file tree

Hide file tree

Showing 31 changed files with 627 additions and 618 deletions.
diff --git a/packages/masamune_ads_google/lib/src/others/google_ad_interstitial.dart b/packages/masamune_ads_google/lib/src/others/google_ad_interstitial.dart
@@ -11,7 +11,8 @@ part of masamune_ads_google.others;
 /// [adUnitId]を指定してインタースティシャル広告を表示します。
 ///
 /// [loading]が終了した後、[show]で広告を表示します。
-class GoogleAdInterstitial extends ChangeNotifier {
+class GoogleAdInterstitial
+    extends MasamuneControllerBase<void, GoogleAdsMasamuneAdapter> {
   /// This class displays interstitial advertisements.
   ///
   /// Display interstitial ads by specifying [adUnitId].
@@ -24,11 +25,16 @@ class GoogleAdInterstitial extends ChangeNotifier {
   ///
   /// [loading]が終了した後、[show]で広告を表示します。
   GoogleAdInterstitial(
-    this.adUnitId,
-  ) {
+    this.adUnitId, {
+    super.adapter,
+  }) {
     _initialize();
   }
 
+  @override
+  GoogleAdsMasamuneAdapter get primaryAdapter =>
+      GoogleAdsMasamuneAdapter.primary;
+
   /// Ad unit ID.
   ///
   /// 広告ユニットID。

diff --git a/packages/masamune_ads_google/lib/src/others/google_ad_rewarded.dart b/packages/masamune_ads_google/lib/src/others/google_ad_rewarded.dart
@@ -11,7 +11,8 @@ part of masamune_ads_google.others;
 /// [adUnitId]を指定してインタースティシャル広告を表示します。
 ///
 /// [loading]が終了した後、[show]で広告を表示します。
-class GoogleAdRewarded extends ChangeNotifier {
+class GoogleAdRewarded
+    extends MasamuneControllerBase<void, GoogleAdsMasamuneAdapter> {
   /// This class displays video ads with rewards.
   ///
   /// Display interstitial ads by specifying [adUnitId].
@@ -24,11 +25,16 @@ class GoogleAdRewarded extends ChangeNotifier {
   ///
   /// [loading]が終了した後、[show]で広告を表示します。
   GoogleAdRewarded(
-    this.adUnitId,
-  ) {
+    this.adUnitId, {
+    super.adapter,
+  }) {
     _initialize();
   }
 
+  @override
+  GoogleAdsMasamuneAdapter get primaryAdapter =>
+      GoogleAdsMasamuneAdapter.primary;
+
   /// Ad unit ID.
   ///
   /// 広告ユニットID。

diff --git a/packages/masamune_ads_google/lib/src/others/others.dart b/packages/masamune_ads_google/lib/src/others/others.dart
@@ -9,6 +9,8 @@ import 'package:flutter/material.dart';
 
 // Package imports:
 import 'package:google_mobile_ads/google_mobile_ads.dart';
+import 'package:masamune/masamune.dart';
+import 'package:masamune_ads_google/masamune_ads_google.dart';
 
 part 'google_ads_core.dart';
 part 'google_ad_native.dart';

diff --git a/packages/masamune_ads_google/lib/src/web/google_ad_interstitial.dart b/packages/masamune_ads_google/lib/src/web/google_ad_interstitial.dart
@@ -71,7 +71,8 @@ class GoogleAdInterstitial extends ChangeNotifier {
 /// [adUnitId]を指定してインタースティシャル広告を表示します。
 ///
 /// [loading]が終了した後、[show]で広告を表示します。
-class GoogleAdRewardedInterstitial extends ChangeNotifier {
+class GoogleAdRewardedInterstitial
+    extends MasamuneControllerBase<void, GoogleAdsMasamuneAdapter> {
   /// This class displays a rewarded interstitial ad.
   ///
   /// Display interstitial ads by specifying [adUnitId].
@@ -84,8 +85,13 @@ class GoogleAdRewardedInterstitial extends ChangeNotifier {
   ///
   /// [loading]が終了した後、[show]で広告を表示します。
   GoogleAdRewardedInterstitial(
-    this.adUnitId,
-  );
+    this.adUnitId, {
+    super.adapter,
+  });
+
+  @override
+  GoogleAdsMasamuneAdapter get primaryAdapter =>
+      GoogleAdsMasamuneAdapter.primary;
 
   /// Ad unit ID.
   ///

diff --git a/packages/masamune_ads_google/lib/src/web/google_ad_rewarded.dart b/packages/masamune_ads_google/lib/src/web/google_ad_rewarded.dart
@@ -11,7 +11,8 @@ part of masamune_ads_google.web;
 /// [adUnitId]を指定してインタースティシャル広告を表示します。
 ///
 /// [loading]が終了した後、[show]で広告を表示します。
-class GoogleAdRewarded extends ChangeNotifier {
+class GoogleAdRewarded
+    extends MasamuneControllerBase<void, GoogleAdsMasamuneAdapter> {
   /// This class displays video ads with rewards.
   ///
   /// Display interstitial ads by specifying [adUnitId].
@@ -24,8 +25,13 @@ class GoogleAdRewarded extends ChangeNotifier {
   ///
   /// [loading]が終了した後、[show]で広告を表示します。
   GoogleAdRewarded(
-    this.adUnitId,
-  );
+    this.adUnitId, {
+    super.adapter,
+  });
+
+  @override
+  GoogleAdsMasamuneAdapter get primaryAdapter =>
+      GoogleAdsMasamuneAdapter.primary;
 
   /// Ad unit ID.
   ///

diff --git a/packages/masamune_ads_google/lib/src/web/web.dart b/packages/masamune_ads_google/lib/src/web/web.dart
@@ -9,6 +9,7 @@ import 'package:flutter/widgets.dart';
 
 // Package imports:
 import 'package:masamune/masamune.dart';
+import 'package:masamune_ads_google/masamune_ads_google.dart';
 
 part 'google_ads_core.dart';
 part 'google_ad_native.dart';