change calls to proxy

packages/interactive_media_ads/android/src/test/kotlin/dev/flutter/packages/interactive_media_ads/AdsLoaderProxyApiTest.kt

@@ -8,7 +8,6 @@ import com.google.ads.interactivemedia.v3.api.AdErrorEvent
 import com.google.ads.interactivemedia.v3.api.AdsLoader
 import com.google.ads.interactivemedia.v3.api.AdsRequest
 import kotlin.test.Test
-import org.mockito.Mockito
 import org.mockito.kotlin.mock
 import org.mockito.kotlin.verify
 

packages/interactive_media_ads/lib/src/android/android_ad_display_container.dart

@@ -11,21 +11,31 @@ import 'android_view_widget.dart';
 import 'interactive_media_ads.g.dart' as ima;
 import 'interactive_media_ads_proxy.dart';
 
+/// Android implementation of [PlatformAdDisplayContainerCreationParams].
 final class AndroidAdDisplayContainerCreationParams
     extends PlatformAdDisplayContainerCreationParams {
-  AndroidAdDisplayContainerCreationParams._(
-    PlatformAdDisplayContainerCreationParams params, {
-    this.proxy = const InteractiveMediaAdsProxy(),
-  }) : super(onContainerAdded: params.onContainerAdded);
-
+  /// Constructs a [AndroidAdDisplayContainerCreationParams].
+  const AndroidAdDisplayContainerCreationParams({
+    super.key,
+    required super.onContainerAdded,
+    InteractiveMediaAdsProxy? proxy,
+  })  : _proxy = proxy ?? const InteractiveMediaAdsProxy(),
+        super();
+
+  /// Creates a [AndroidAdDisplayContainerCreationParams] from an instance of
+  /// [PlatformAdDisplayContainerCreationParams].
   factory AndroidAdDisplayContainerCreationParams.fromPlatformAdDisplayContainerCreationParams(
     PlatformAdDisplayContainerCreationParams params, {
-    InteractiveMediaAdsProxy proxy = const InteractiveMediaAdsProxy(),
+    @visibleForTesting InteractiveMediaAdsProxy? proxy,
   }) {
-    return AndroidAdDisplayContainerCreationParams._(params, proxy: proxy);
+    return AndroidAdDisplayContainerCreationParams(
+      key: params.key,
+      onContainerAdded: params.onContainerAdded,
+      proxy: proxy,
+    );
   }
 
-  final InteractiveMediaAdsProxy proxy;
+  final InteractiveMediaAdsProxy _proxy;
 }
 
 /// Android implementation of [PlatformAdDisplayContainer].
@@ -42,7 +52,7 @@ final class AndroidAdDisplayContainer extends PlatformAdDisplayContainer {
   static const int _progressPollingMs = 250;
 
   late final ima.FrameLayout _frameLayout =
-      _androidParams.proxy.newFrameLayout();
+      _androidParams._proxy.newFrameLayout();
   final Set<ima.VideoAdPlayerCallback> _videoAdPlayerCallbacks =
       <ima.VideoAdPlayerCallback>{};
   late final ima.VideoView _videoView;
@@ -64,7 +74,8 @@ final class AndroidAdDisplayContainer extends PlatformAdDisplayContainer {
     return AndroidViewWidget(
       view: _frameLayout,
       onPlatformViewCreated: () async {
-        _adDisplayContainer = await ima.ImaSdkFactory.createAdDisplayContainer(
+        _adDisplayContainer =
+            await _androidParams._proxy.createAdDisplayContainerImaSdkFactory(
           _frameLayout,
           _videoAdPlayer,
         );
@@ -83,7 +94,8 @@ final class AndroidAdDisplayContainer extends PlatformAdDisplayContainer {
     _adProgressTimer = Timer.periodic(
       const Duration(milliseconds: _progressPollingMs),
       (Timer timer) async {
-        final ima.VideoProgressUpdate currentProgress = ima.VideoProgressUpdate(
+        final ima.VideoProgressUpdate currentProgress =
+            _androidParams._proxy.newVideoProgressUpdate(
           currentTimeMs: await _videoView.getCurrentPosition(),
           durationMs: _adDuration!,
         );
@@ -112,7 +124,7 @@ final class AndroidAdDisplayContainer extends PlatformAdDisplayContainer {
   static ima.VideoView _setUpVideoView(
     WeakReference<AndroidAdDisplayContainer> weakThis,
   ) {
-    return weakThis.target!._androidParams.proxy.newVideoView(
+    return weakThis.target!._androidParams._proxy.newVideoView(
       onCompletion: (_, ima.MediaPlayer player) {
         final AndroidAdDisplayContainer? container = weakThis.target;
         if (container != null) {
@@ -187,6 +199,35 @@ final class AndroidAdDisplayContainer extends PlatformAdDisplayContainer {
   }
 }
 
+/// Android implementation of [PlatformAdsLoaderCreationParams].
+final class AndroidAdsLoaderCreationParams
+    extends PlatformAdsLoaderCreationParams {
+  /// Constructs a [AndroidAdsLoaderCreationParams].
+  const AndroidAdsLoaderCreationParams({
+    required super.container,
+    required super.onAdsLoaded,
+    required super.onAdsLoadError,
+    InteractiveMediaAdsProxy? proxy,
+  })  : _proxy = proxy ?? const InteractiveMediaAdsProxy(),
+        super();
+
+  /// Creates a [AndroidAdsLoaderCreationParams] from an instance of
+  /// [PlatformAdsLoaderCreationParams].
+  factory AndroidAdsLoaderCreationParams.fromPlatformAdsLoaderCreationParams(
+    PlatformAdsLoaderCreationParams params, {
+    @visibleForTesting InteractiveMediaAdsProxy? proxy,
+  }) {
+    return AndroidAdsLoaderCreationParams(
+      container: params.container,
+      onAdsLoaded: params.onAdsLoaded,
+      onAdsLoadError: params.onAdsLoadError,
+      proxy: proxy,
+    );
+  }
+
+  final InteractiveMediaAdsProxy _proxy;
+}
+
 /// Android implementation of [PlatformAdsLoader].
 final class AndroidAdsLoader extends PlatformAdsLoader {
   /// Constructs an [AndroidAdsLoader].
@@ -196,9 +237,14 @@ final class AndroidAdsLoader extends PlatformAdsLoader {
     _adsLoaderFuture = _createAdsLoader();
   }
 
-  final ima.ImaSdkFactory _sdkFactory = ima.ImaSdkFactory.instance;
+  late final ima.ImaSdkFactory _sdkFactory =
+      _androidParams._proxy.instanceImaSdkFactory();
   late Future<ima.AdsLoader> _adsLoaderFuture;
 
+  AndroidAdsLoaderCreationParams get _androidParams =>
+      AndroidAdsLoaderCreationParams.fromPlatformAdsLoaderCreationParams(
+          params);
+
   @override
   Future<void> contentComplete() async {
     final Set<ima.VideoAdPlayerCallback> callbacks =
@@ -224,11 +270,12 @@ final class AndroidAdsLoader extends PlatformAdsLoader {
     final ima.ImaSdkSettings settings =
         await _sdkFactory.createImaSdkSettings();
 
-    final ima.AdsLoader adsLoader =
-        await ima.ImaSdkFactory.instance.createAdsLoader(
-      settings,
-      (params.container as AndroidAdDisplayContainer)._adDisplayContainer,
-    );
+    final ima.AdsLoader adsLoader = await _androidParams._proxy
+        .instanceImaSdkFactory()
+        .createAdsLoader(
+          settings,
+          (params.container as AndroidAdDisplayContainer)._adDisplayContainer,
+        );
 
     _addListeners(WeakReference<AndroidAdsLoader>(this), adsLoader);
 
@@ -239,14 +286,16 @@ final class AndroidAdsLoader extends PlatformAdsLoader {
     WeakReference<AndroidAdsLoader> weakThis,
     ima.AdsLoader adsLoader,
   ) {
-    adsLoader.addAdsLoadedListener(ima.AdsLoadedListener(
+    final InteractiveMediaAdsProxy proxy =
+        weakThis.target!._androidParams._proxy;
+    adsLoader.addAdsLoadedListener(proxy.newAdsLoadedListener(
       onAdsManagerLoaded: (_, ima.AdsManagerLoadedEvent event) {
         weakThis.target?.params.onAdsLoaded(
           PlatformOnAdsLoadedData(manager: AndroidAdsManager._(event.manager)),
         );
       },
     ));
-    adsLoader.addAdErrorListener(ima.AdErrorListener(
+    adsLoader.addAdErrorListener(proxy.newAdErrorListener(
       onAdError: (_, ima.AdErrorEvent event) {
         weakThis.target?.params.onAdsLoadError(
           AdsLoadErrorData(
@@ -264,9 +313,14 @@ final class AndroidAdsLoader extends PlatformAdsLoader {
 
 /// Android implementation of [PlatformAdsManager].
 class AndroidAdsManager extends PlatformAdsManager {
-  AndroidAdsManager._(ima.AdsManager manager) : _manager = manager;
+  AndroidAdsManager._(
+    ima.AdsManager manager, {
+    InteractiveMediaAdsProxy? proxy,
+  })  : _manager = manager,
+        _proxy = proxy ?? const InteractiveMediaAdsProxy();
 
   final ima.AdsManager _manager;
+  final InteractiveMediaAdsProxy _proxy;
 
   PlatformAdsManagerDelegate? _managerDelegate;
 
@@ -294,8 +348,9 @@ class AndroidAdsManager extends PlatformAdsManager {
   }
 
   static void _addListeners(WeakReference<AndroidAdsManager> weakThis) {
+    final InteractiveMediaAdsProxy proxy = weakThis.target!._proxy;
     weakThis.target?._manager.addAdEventListener(
-      ima.AdEventListener(
+      proxy.newAdEventListener(
         onAdEvent: (_, ima.AdEvent event) {
           late final AdEventType eventType;
 
@@ -341,7 +396,7 @@ class AndroidAdsManager extends PlatformAdsManager {
       ),
     );
     weakThis.target?._manager.addAdErrorListener(
-      ima.AdErrorListener(
+      proxy.newAdErrorListener(
         onAdError: (_, ima.AdErrorEvent event) {
           weakThis.target?._managerDelegate?.params.onAdErrorEvent?.call(
             AdErrorEvent(

packages/interactive_media_ads/lib/src/android/interactive_media_ads_proxy.dart

@@ -1,3 +1,7 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
 import 'interactive_media_ads.g.dart';
 
 /// Handles constructing objects and calling static methods for the Android
@@ -10,19 +14,114 @@ import 'interactive_media_ads.g.dart';
 /// By default each function calls the default constructor of the class it
 /// intends to return.
 class InteractiveMediaAdsProxy {
-  /// Constructs a [InteractiveMediaAdsProxy].
+  /// Constructs an [InteractiveMediaAdsProxy].
   const InteractiveMediaAdsProxy({
+    this.newVideoProgressUpdate = VideoProgressUpdate.new,
     this.newFrameLayout = FrameLayout.new,
     this.newVideoView = VideoView.new,
+    this.newVideoAdPlayer = VideoAdPlayer.new,
+    this.newAdsLoadedListener = AdsLoadedListener.new,
+    this.newAdErrorListener = AdErrorListener.new,
+    this.newAdEventListener = AdEventListener.new,
+    this.createAdDisplayContainerImaSdkFactory =
+        ImaSdkFactory.createAdDisplayContainer,
+    this.instanceImaSdkFactory = _instanceImaSdkFactory,
+    this.videoTimeNotReadyVideoProgressUpdate =
+        _videoTimeNotReadyVideoProgressUpdate,
   });
 
-  /// Creates a new [FrameLayout].
+  /// Constructs [VideoProgressUpdate].
+  final VideoProgressUpdate Function({
+    required int currentTimeMs,
+    required int durationMs,
+  }) newVideoProgressUpdate;
+
+  /// Constructs [FrameLayout].
   final FrameLayout Function() newFrameLayout;
 
-  /// Creates a new [VideoView].
+  /// Constructs [VideoView].
   final VideoView Function({
-    void Function(VideoView, MediaPlayer)? onPrepared,
-    void Function(VideoView, MediaPlayer)? onCompletion,
-    required void Function(VideoView, MediaPlayer, int, int) onError,
+    required void Function(
+      VideoView,
+      MediaPlayer,
+      int,
+      int,
+    ) onError,
+    void Function(
+      VideoView,
+      MediaPlayer,
+    )? onPrepared,
+    void Function(
+      VideoView,
+      MediaPlayer,
+    )? onCompletion,
   }) newVideoView;
+
+  /// Constructs [VideoAdPlayer].
+  final VideoAdPlayer Function({
+    required void Function(
+      VideoAdPlayer,
+      VideoAdPlayerCallback,
+    ) addCallback,
+    required void Function(
+      VideoAdPlayer,
+      AdMediaInfo,
+      AdPodInfo,
+    ) loadAd,
+    required void Function(
+      VideoAdPlayer,
+      AdMediaInfo,
+    ) pauseAd,
+    required void Function(
+      VideoAdPlayer,
+      AdMediaInfo,
+    ) playAd,
+    required void Function(VideoAdPlayer) release,
+    required void Function(
+      VideoAdPlayer,
+      VideoAdPlayerCallback,
+    ) removeCallback,
+    required void Function(
+      VideoAdPlayer,
+      AdMediaInfo,
+    ) stopAd,
+  }) newVideoAdPlayer;
+
+  /// Constructs [AdsLoadedListener].
+  final AdsLoadedListener Function(
+      {required void Function(
+        AdsLoadedListener,
+        AdsManagerLoadedEvent,
+      ) onAdsManagerLoaded}) newAdsLoadedListener;
+
+  /// Constructs [AdErrorListener].
+  final AdErrorListener Function(
+      {required void Function(
+        AdErrorListener,
+        AdErrorEvent,
+      ) onAdError}) newAdErrorListener;
+
+  /// Constructs [AdEventListener].
+  final AdEventListener Function(
+      {required void Function(
+        AdEventListener,
+        AdEvent,
+      ) onAdEvent}) newAdEventListener;
+
+  /// Calls to [ImaSdkFactory.createAdDisplayContainer].
+  final Future<AdDisplayContainer> Function(
+    ViewGroup,
+    VideoAdPlayer,
+  ) createAdDisplayContainerImaSdkFactory;
+
+  /// Calls to [ImaSdkFactory.instance].
+  final ImaSdkFactory Function() instanceImaSdkFactory;
+
+  /// Calls to [VideoProgressUpdate.videoTimeNotReady].
+  final VideoProgressUpdate Function() videoTimeNotReadyVideoProgressUpdate;
+
+  static ImaSdkFactory _instanceImaSdkFactory() => ImaSdkFactory.instance;
+
+  static VideoProgressUpdate _videoTimeNotReadyVideoProgressUpdate() =>
+      VideoProgressUpdate.videoTimeNotReady;
 }

packages/interactive_media_ads/pubspec.yaml

@@ -30,7 +30,7 @@ dev_dependencies:
   pigeon:
     git:
       url: [email protected]:bparrishMines/packages.git
-      ref: pigeon_kotlin_split
+      ref: pigeon_helper
       path: packages/pigeon
 
 topics: