Merge branch 'main' of github.com:flutter/packages into ima_ios_ad

packages/interactive_media_ads/ios/interactive_media_ads/Sources/interactive_media_ads/InteractiveMediaAdsLibrary.g.swift

@@ -1,7 +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.
-// Autogenerated from Pigeon (v22.6.4), do not edit directly.
+// Autogenerated from Pigeon (v22.7.2), do not edit directly.
 // See also: https://pub.dev/packages/pigeon
 
 import Foundation
@@ -1121,7 +1121,25 @@ class InteractiveMediaAdsLibraryPigeonCodec: FlutterStandardMessageCodec, @unche
 }
 
 protocol PigeonApiDelegateIMAAdDisplayContainer {
-  func pigeonDefaultConstructor(pigeonApi: PigeonApiIMAAdDisplayContainer, adContainer: UIView, adContainerViewController: UIViewController?) throws -> IMAAdDisplayContainer
+  /// Initializes IMAAdDisplayContainer for rendering the ad and displaying the
+  /// sad UI.
+  func pigeonDefaultConstructor(pigeonApi: PigeonApiIMAAdDisplayContainer, adContainer: UIView, companionSlots: [IMACompanionAdSlot]?, adContainerViewController: UIViewController?) throws -> IMAAdDisplayContainer
+  /// View containing the video display and ad related UI.
+  ///
+  /// This view must be present in the view hierarchy in order to make ad or
+  /// stream requests.
+  func adContainer(pigeonApi: PigeonApiIMAAdDisplayContainer, pigeonInstance: IMAAdDisplayContainer) throws -> UIView
+  /// List of companion ad slots.
+  func companionSlots(pigeonApi: PigeonApiIMAAdDisplayContainer, pigeonInstance: IMAAdDisplayContainer) throws -> [IMACompanionAdSlot]?
+  /// View controller containing the ad container.
+  func setAdContainerViewController(pigeonApi: PigeonApiIMAAdDisplayContainer, pigeonInstance: IMAAdDisplayContainer, controller: UIViewController?) throws
+  /// View controller containing the ad container.
+  func getAdContainerViewController(pigeonApi: PigeonApiIMAAdDisplayContainer, pigeonInstance: IMAAdDisplayContainer) throws -> UIViewController?
+  /// Registers a view that overlays or obstructs this container as “friendly”
+  /// for viewability measurement purposes.
+  func registerFriendlyObstruction(pigeonApi: PigeonApiIMAAdDisplayContainer, pigeonInstance: IMAAdDisplayContainer, friendlyObstruction: IMAFriendlyObstruction) throws
+  /// Unregisters all previously registered friendly obstructions.
+  func unregisterAllFriendlyObstructions(pigeonApi: PigeonApiIMAAdDisplayContainer, pigeonInstance: IMAAdDisplayContainer) throws
 }
 
 protocol PigeonApiProtocolIMAAdDisplayContainer {
@@ -1155,7 +1173,7 @@ final class PigeonApiIMAAdDisplayContainer: PigeonApiProtocolIMAAdDisplayContain
         let adContainerViewControllerArg: UIViewController? = nilOrValue(args[3])
         do {
           api.pigeonRegistrar.instanceManager.addDartCreatedInstance(
-try api.pigeonDelegate.pigeonDefaultConstructor(pigeonApi: api, adContainer: adContainerArg, adContainerViewController: adContainerViewControllerArg),
+try api.pigeonDelegate.pigeonDefaultConstructor(pigeonApi: api, adContainer: adContainerArg, companionSlots: companionSlotsArg, adContainerViewController: adContainerViewControllerArg),
 withIdentifier: pigeonIdentifierArg)
           reply(wrapResult(nil))
         } catch {
@@ -1165,18 +1183,14 @@ withIdentifier: pigeonIdentifierArg)
     } else {
       pigeonDefaultConstructorChannel.setMessageHandler(nil)
     }
-    let setAdContainerViewControllerChannel = FlutterBasicMessageChannel(
-      name:
-        "dev.flutter.pigeon.interactive_media_ads.IMAAdDisplayContainer.setAdContainerViewController",
-      binaryMessenger: binaryMessenger, codec: codec)
+    let setAdContainerViewControllerChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.interactive_media_ads.IMAAdDisplayContainer.setAdContainerViewController", binaryMessenger: binaryMessenger, codec: codec)
     if let api = api {
       setAdContainerViewControllerChannel.setMessageHandler { message, reply in
         let args = message as! [Any?]
         let pigeonInstanceArg = args[0] as! IMAAdDisplayContainer
         let controllerArg: UIViewController? = nilOrValue(args[1])
         do {
-          try api.pigeonDelegate.setAdContainerViewController(
-            pigeonApi: api, pigeonInstance: pigeonInstanceArg, controller: controllerArg)
+          try api.pigeonDelegate.setAdContainerViewController(pigeonApi: api, pigeonInstance: pigeonInstanceArg, controller: controllerArg)
           reply(wrapResult(nil))
         } catch {
           reply(wrapError(error))
@@ -1185,17 +1199,13 @@ withIdentifier: pigeonIdentifierArg)
     } else {
       setAdContainerViewControllerChannel.setMessageHandler(nil)
     }
-    let getAdContainerViewControllerChannel = FlutterBasicMessageChannel(
-      name:
-        "dev.flutter.pigeon.interactive_media_ads.IMAAdDisplayContainer.getAdContainerViewController",
-      binaryMessenger: binaryMessenger, codec: codec)
+    let getAdContainerViewControllerChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.interactive_media_ads.IMAAdDisplayContainer.getAdContainerViewController", binaryMessenger: binaryMessenger, codec: codec)
     if let api = api {
       getAdContainerViewControllerChannel.setMessageHandler { message, reply in
         let args = message as! [Any?]
         let pigeonInstanceArg = args[0] as! IMAAdDisplayContainer
         do {
-          let result = try api.pigeonDelegate.getAdContainerViewController(
-            pigeonApi: api, pigeonInstance: pigeonInstanceArg)
+          let result = try api.pigeonDelegate.getAdContainerViewController(pigeonApi: api, pigeonInstance: pigeonInstanceArg)
           reply(wrapResult(result))
         } catch {
           reply(wrapError(error))
@@ -1204,19 +1214,14 @@ withIdentifier: pigeonIdentifierArg)
     } else {
       getAdContainerViewControllerChannel.setMessageHandler(nil)
     }
-    let registerFriendlyObstructionChannel = FlutterBasicMessageChannel(
-      name:
-        "dev.flutter.pigeon.interactive_media_ads.IMAAdDisplayContainer.registerFriendlyObstruction",
-      binaryMessenger: binaryMessenger, codec: codec)
+    let registerFriendlyObstructionChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.interactive_media_ads.IMAAdDisplayContainer.registerFriendlyObstruction", binaryMessenger: binaryMessenger, codec: codec)
     if let api = api {
       registerFriendlyObstructionChannel.setMessageHandler { message, reply in
         let args = message as! [Any?]
         let pigeonInstanceArg = args[0] as! IMAAdDisplayContainer
         let friendlyObstructionArg = args[1] as! IMAFriendlyObstruction
         do {
-          try api.pigeonDelegate.registerFriendlyObstruction(
-            pigeonApi: api, pigeonInstance: pigeonInstanceArg,
-            friendlyObstruction: friendlyObstructionArg)
+          try api.pigeonDelegate.registerFriendlyObstruction(pigeonApi: api, pigeonInstance: pigeonInstanceArg, friendlyObstruction: friendlyObstructionArg)
           reply(wrapResult(nil))
         } catch {
           reply(wrapError(error))
@@ -1225,17 +1230,13 @@ withIdentifier: pigeonIdentifierArg)
     } else {
       registerFriendlyObstructionChannel.setMessageHandler(nil)
     }
-    let unregisterAllFriendlyObstructionsChannel = FlutterBasicMessageChannel(
-      name:
-        "dev.flutter.pigeon.interactive_media_ads.IMAAdDisplayContainer.unregisterAllFriendlyObstructions",
-      binaryMessenger: binaryMessenger, codec: codec)
+    let unregisterAllFriendlyObstructionsChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.interactive_media_ads.IMAAdDisplayContainer.unregisterAllFriendlyObstructions", binaryMessenger: binaryMessenger, codec: codec)
     if let api = api {
       unregisterAllFriendlyObstructionsChannel.setMessageHandler { message, reply in
         let args = message as! [Any?]
         let pigeonInstanceArg = args[0] as! IMAAdDisplayContainer
         do {
-          try api.pigeonDelegate.unregisterAllFriendlyObstructions(
-            pigeonApi: api, pigeonInstance: pigeonInstanceArg)
+          try api.pigeonDelegate.unregisterAllFriendlyObstructions(pigeonApi: api, pigeonInstance: pigeonInstanceArg)
           reply(wrapResult(nil))
         } catch {
           reply(wrapError(error))
@@ -1261,11 +1262,13 @@ withIdentifier: pigeonIdentifierArg)
       return
     }
     let pigeonIdentifierArg = pigeonRegistrar.instanceManager.addHostCreatedInstance(pigeonInstance as AnyObject)
+    let adContainerArg = try! pigeonDelegate.adContainer(pigeonApi: self, pigeonInstance: pigeonInstance)
+    let companionSlotsArg = try! pigeonDelegate.companionSlots(pigeonApi: self, pigeonInstance: pigeonInstance)
     let binaryMessenger = pigeonRegistrar.binaryMessenger
     let codec = pigeonRegistrar.codec
     let channelName: String = "dev.flutter.pigeon.interactive_media_ads.IMAAdDisplayContainer.pigeon_newInstance"
     let channel = FlutterBasicMessageChannel(name: channelName, binaryMessenger: binaryMessenger, codec: codec)
-    channel.sendMessage([pigeonIdentifierArg] as [Any?]) { response in
+    channel.sendMessage([pigeonIdentifierArg, adContainerArg, companionSlotsArg] as [Any?]) { response in
       guard let listResponse = response as? [Any?] else {
         completion(.failure(createConnectionError(withChannelName: channelName)))
         return

packages/interactive_media_ads/lib/src/ios/interactive_media_ads.g.dart

@@ -1,7 +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.
-// Autogenerated from Pigeon (v22.6.4), do not edit directly.
+// Autogenerated from Pigeon (v22.7.2), do not edit directly.
 // See also: https://pub.dev/packages/pigeon
 // ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unused_import, unnecessary_parenthesis, prefer_null_aware_operators, omit_local_variable_types, unused_shown_name, unnecessary_import, no_leading_underscores_for_local_identifiers
 

packages/interactive_media_ads/pubspec.yaml

@@ -31,7 +31,7 @@ dev_dependencies:
   flutter_test:
     sdk: flutter
   mockito: ^5.4.4
-  pigeon: ^22.6.4
+  pigeon: ^22.7.2
 
 topics:
   - ads