diff --git a/packages/pigeon/example/README.md b/packages/pigeon/example/README.md index 489a4aed60b0..9dba8e33d35f 100644 --- a/packages/pigeon/example/README.md +++ b/packages/pigeon/example/README.md @@ -439,8 +439,7 @@ Register the handler with the generated method. ```swift let eventListener = EventListener() -StreamEventsStreamHandler.register( - with: controller.binaryMessenger, streamHandler: eventListener) +StreamEventsStreamHandler.register(with: binaryMessenger, streamHandler: eventListener) ``` ### Kotlin diff --git a/packages/pigeon/example/app/ios/Runner/AppDelegate.swift b/packages/pigeon/example/app/ios/Runner/AppDelegate.swift index 9ffa2456849a..8e0401597fd2 100644 --- a/packages/pigeon/example/app/ios/Runner/AppDelegate.swift +++ b/packages/pigeon/example/app/ios/Runner/AppDelegate.swift @@ -94,31 +94,16 @@ func sendEvents(_ eventListener: EventListener) { } @main -@objc class AppDelegate: FlutterAppDelegate { - override func application( - _ application: UIApplication, - didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]? - ) -> Bool { - GeneratedPluginRegistrant.register(with: self) - return super.application(application, didFinishLaunchingWithOptions: launchOptions) - } -} - -// TODO(stuartmorgan): Once 3.33+ reaches stable, remove this subclass and move the setup to -// AppDelegate.register(...). This approach is only used because this example needs to support -// both stable and master, and 3.32 doesn't have FlutterPluginRegistrant, while 3.33+ can't use -// the older application(didFinishLaunchingWithOptions) approach. -@objc class ExampleViewController: FlutterViewController { - override func awakeFromNib() { - super.awakeFromNib() +@objc class AppDelegate: FlutterAppDelegate, FlutterImplicitEngineDelegate { + func didInitializeImplicitFlutterEngine(_ engineBridge: FlutterImplicitEngineBridge) { + GeneratedPluginRegistrant.register(with: engineBridge.pluginRegistry) let api = PigeonApiImplementation() + let binaryMessenger = engineBridge.applicationRegistrar.messenger() ExampleHostApiSetup.setUp(binaryMessenger: binaryMessenger, api: api) - let controller = self // #docregion swift-init-event let eventListener = EventListener() - StreamEventsStreamHandler.register( - with: controller.binaryMessenger, streamHandler: eventListener) + StreamEventsStreamHandler.register(with: binaryMessenger, streamHandler: eventListener) // #enddocregion swift-init-event sendEvents(eventListener) } diff --git a/packages/pigeon/example/app/ios/Runner/Base.lproj/Main.storyboard b/packages/pigeon/example/app/ios/Runner/Base.lproj/Main.storyboard index 5c266a12dd93..97fed9a4b200 100644 --- a/packages/pigeon/example/app/ios/Runner/Base.lproj/Main.storyboard +++ b/packages/pigeon/example/app/ios/Runner/Base.lproj/Main.storyboard @@ -7,10 +7,10 @@ - + - +