diff --git a/add_to_app/books/flutter_module_books/pubspec.yaml b/add_to_app/books/flutter_module_books/pubspec.yaml index 01d44f08a..840b54499 100644 --- a/add_to_app/books/flutter_module_books/pubspec.yaml +++ b/add_to_app/books/flutter_module_books/pubspec.yaml @@ -15,7 +15,7 @@ dependencies: dev_dependencies: analysis_defaults: path: ../../../analysis_defaults - pigeon: ">=11.0.0 <27.0.0" + pigeon: ">=11.0.0 <30.0.0" flutter_test: sdk: flutter diff --git a/add_to_app/books/ios_books/Podfile b/add_to_app/books/ios_books/Podfile index b8246b032..d5eebc3a2 100644 --- a/add_to_app/books/ios_books/Podfile +++ b/add_to_app/books/ios_books/Podfile @@ -1,5 +1,4 @@ -# Uncomment the next line to define a global platform for your project -# platform :ios, '9.0' +platform :ios, '15.0' flutter_application_path = '../flutter_module_books/' load File.join(flutter_application_path, '.ios', 'Flutter', 'podhelper.rb') diff --git a/add_to_app/fullscreen/ios_fullscreen/IOSFullScreen/AppDelegate.swift b/add_to_app/fullscreen/ios_fullscreen/IOSFullScreen/AppDelegate.swift index a4ef063b3..66cb1d3be 100644 --- a/add_to_app/fullscreen/ios_fullscreen/IOSFullScreen/AppDelegate.swift +++ b/add_to_app/fullscreen/ios_fullscreen/IOSFullScreen/AppDelegate.swift @@ -2,20 +2,34 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import UIKit import Flutter +import UIKit -@UIApplicationMain +@main class AppDelegate: UIResponder, UIApplicationDelegate { - var window: UIWindow? + var flutterEngine: FlutterEngine? - var flutterEngine : FlutterEngine? + func application( + _ application: UIApplication, + didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]? + ) -> Bool { + // Instantiate Flutter engine + self.flutterEngine = FlutterEngine(name: "io.flutter", project: nil) + self.flutterEngine?.run(withEntrypoint: nil) - func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool { - // Instantiate Flutter engine - self.flutterEngine = FlutterEngine(name: "io.flutter", project: nil) - self.flutterEngine?.run(withEntrypoint: nil) + return true + } - return true - } + func application( + _ application: UIApplication, + configurationForConnecting connectingSceneSession: UISceneSession, + options: UIScene.ConnectionOptions + ) -> UISceneConfiguration { + let configuration = UISceneConfiguration( + name: "Default Configuration", + sessionRole: connectingSceneSession.role + ) + configuration.delegateClass = FlutterSceneDelegate.self + return configuration + } } diff --git a/add_to_app/fullscreen/ios_fullscreen/IOSFullScreen/Info-Debug.plist b/add_to_app/fullscreen/ios_fullscreen/IOSFullScreen/Info-Debug.plist index 72b874acd..c09fef963 100644 --- a/add_to_app/fullscreen/ios_fullscreen/IOSFullScreen/Info-Debug.plist +++ b/add_to_app/fullscreen/ios_fullscreen/IOSFullScreen/Info-Debug.plist @@ -20,6 +20,27 @@ 1 LSRequiresIPhoneOS + UIApplicationSceneManifest + + UIApplicationSupportsMultipleScenes + + UISceneConfigurations + + UIWindowSceneSessionRoleApplication + + + UISceneClassName + UIWindowScene + UISceneConfigurationName + Default Configuration + UISceneDelegateClassName + FlutterSceneDelegate + UISceneStoryboardFile + Main + + + + UILaunchStoryboardName LaunchScreen UIMainStoryboardFile diff --git a/add_to_app/fullscreen/ios_fullscreen/IOSFullScreen/Info-Release.plist b/add_to_app/fullscreen/ios_fullscreen/IOSFullScreen/Info-Release.plist index 16be3b681..cf27efee8 100644 --- a/add_to_app/fullscreen/ios_fullscreen/IOSFullScreen/Info-Release.plist +++ b/add_to_app/fullscreen/ios_fullscreen/IOSFullScreen/Info-Release.plist @@ -20,6 +20,27 @@ 1 LSRequiresIPhoneOS + UIApplicationSceneManifest + + UIApplicationSupportsMultipleScenes + + UISceneConfigurations + + UIWindowSceneSessionRoleApplication + + + UISceneClassName + UIWindowScene + UISceneConfigurationName + Default Configuration + UISceneDelegateClassName + FlutterSceneDelegate + UISceneStoryboardFile + Main + + + + UILaunchStoryboardName LaunchScreen UIMainStoryboardFile diff --git a/add_to_app/fullscreen/ios_fullscreen/Podfile b/add_to_app/fullscreen/ios_fullscreen/Podfile index 1daf6b963..db8e79871 100644 --- a/add_to_app/fullscreen/ios_fullscreen/Podfile +++ b/add_to_app/fullscreen/ios_fullscreen/Podfile @@ -1,5 +1,4 @@ -# Uncomment the next line to define a global platform for your project -# platform :ios, '9.0' +platform :ios, '15.0' flutter_application_path = '../flutter_module_fullscreen' load File.join(flutter_application_path, '.ios', 'Flutter', 'podhelper.rb') diff --git a/add_to_app/ios_content_resizing/ios_content_resizing/Podfile b/add_to_app/ios_content_resizing/ios_content_resizing/Podfile index a17a10562..c09db125d 100644 --- a/add_to_app/ios_content_resizing/ios_content_resizing/Podfile +++ b/add_to_app/ios_content_resizing/ios_content_resizing/Podfile @@ -1,5 +1,4 @@ -# Uncomment the next line to define a global platform for your project -# platform :ios, '15.0' +platform :ios, '15.0' flutter_application_path = '../flutter_module' load File.join(flutter_application_path, '.ios', 'Flutter', 'podhelper.rb') diff --git a/add_to_app/ios_content_resizing/ios_content_resizing/ios_content_resizing/SceneDelegate.swift b/add_to_app/ios_content_resizing/ios_content_resizing/ios_content_resizing/SceneDelegate.swift index a968d2935..17b7789af 100644 --- a/add_to_app/ios_content_resizing/ios_content_resizing/ios_content_resizing/SceneDelegate.swift +++ b/add_to_app/ios_content_resizing/ios_content_resizing/ios_content_resizing/SceneDelegate.swift @@ -5,48 +5,8 @@ // Created by Louise Hsu on 12/3/25. // +import Flutter import UIKit -class SceneDelegate: UIResponder, UIWindowSceneDelegate { - - var window: UIWindow? - - - func scene(_ scene: UIScene, willConnectTo session: UISceneSession, options connectionOptions: UIScene.ConnectionOptions) { - // Use this method to optionally configure and attach the UIWindow `window` to the provided UIWindowScene `scene`. - // If using a storyboard, the `window` property will automatically be initialized and attached to the scene. - // This delegate does not imply the connecting scene or session are new (see `application:configurationForConnectingSceneSession` instead). - guard let _ = (scene as? UIWindowScene) else { return } - } - - func sceneDidDisconnect(_ scene: UIScene) { - // Called as the scene is being released by the system. - // This occurs shortly after the scene enters the background, or when its session is discarded. - // Release any resources associated with this scene that can be re-created the next time the scene connects. - // The scene may re-connect later, as its session was not necessarily discarded (see `application:didDiscardSceneSessions` instead). - } - - func sceneDidBecomeActive(_ scene: UIScene) { - // Called when the scene has moved from an inactive state to an active state. - // Use this method to restart any tasks that were paused (or not yet started) when the scene was inactive. - } - - func sceneWillResignActive(_ scene: UIScene) { - // Called when the scene will move from an active state to an inactive state. - // This may occur due to temporary interruptions (ex. an incoming phone call). - } - - func sceneWillEnterForeground(_ scene: UIScene) { - // Called as the scene transitions from the background to the foreground. - // Use this method to undo the changes made on entering the background. - } - - func sceneDidEnterBackground(_ scene: UIScene) { - // Called as the scene transitions from the foreground to the background. - // Use this method to save data, release shared resources, and store enough scene-specific state information - // to restore the scene back to its current state. - } - - +class SceneDelegate: FlutterSceneDelegate { } - diff --git a/add_to_app/multiple_flutters/multiple_flutters_ios/MultipleFluttersIos/SceneDelegate.swift b/add_to_app/multiple_flutters/multiple_flutters_ios/MultipleFluttersIos/SceneDelegate.swift index ae755e8c3..1c692f59e 100644 --- a/add_to_app/multiple_flutters/multiple_flutters_ios/MultipleFluttersIos/SceneDelegate.swift +++ b/add_to_app/multiple_flutters/multiple_flutters_ios/MultipleFluttersIos/SceneDelegate.swift @@ -2,31 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +import Flutter import UIKit /// The UIWindowSceneDelegate for the app. -class SceneDelegate: UIResponder, UIWindowSceneDelegate { - var window: UIWindow? - - func scene( - _ scene: UIScene, willConnectTo session: UISceneSession, - options connectionOptions: UIScene.ConnectionOptions - ) { - guard let _ = (scene as? UIWindowScene) else { return } - } - - func sceneDidDisconnect(_ scene: UIScene) { - } - - func sceneDidBecomeActive(_ scene: UIScene) { - } - - func sceneWillResignActive(_ scene: UIScene) { - } - - func sceneWillEnterForeground(_ scene: UIScene) { - } - - func sceneDidEnterBackground(_ scene: UIScene) { - } +class SceneDelegate: FlutterSceneDelegate { } diff --git a/add_to_app/multiple_flutters/multiple_flutters_ios/MultipleFluttersIos/SingleFlutterViewController.swift b/add_to_app/multiple_flutters/multiple_flutters_ios/MultipleFluttersIos/SingleFlutterViewController.swift index 892c87c7a..a26db6f9a 100644 --- a/add_to_app/multiple_flutters/multiple_flutters_ios/MultipleFluttersIos/SingleFlutterViewController.swift +++ b/add_to_app/multiple_flutters/multiple_flutters_ios/MultipleFluttersIos/SingleFlutterViewController.swift @@ -39,7 +39,7 @@ class SingleFlutterViewController: FlutterViewController, DataModelObserver { override func viewDidLoad() { super.viewDidLoad() channel = FlutterMethodChannel( - name: "multiple-flutters", binaryMessenger: self.engine!.binaryMessenger) + name: "multiple-flutters", binaryMessenger: self.engine.binaryMessenger) channel!.invokeMethod("setCount", arguments: DataModel.shared.count) let navController = self.navigationController! channel!.setMethodCallHandler { (call: FlutterMethodCall, result: @escaping FlutterResult) in diff --git a/add_to_app/multiple_flutters/multiple_flutters_ios/Podfile b/add_to_app/multiple_flutters/multiple_flutters_ios/Podfile index 64e1388e6..bc486e734 100644 --- a/add_to_app/multiple_flutters/multiple_flutters_ios/Podfile +++ b/add_to_app/multiple_flutters/multiple_flutters_ios/Podfile @@ -1,3 +1,5 @@ +platform :ios, '15.0' + # Copyright 2021 The Flutter team. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/add_to_app/plugin/ios_using_plugin/IOSUsingPlugin/AppDelegate.swift b/add_to_app/plugin/ios_using_plugin/IOSUsingPlugin/AppDelegate.swift index bb5ca8776..061862e88 100644 --- a/add_to_app/plugin/ios_using_plugin/IOSUsingPlugin/AppDelegate.swift +++ b/add_to_app/plugin/ios_using_plugin/IOSUsingPlugin/AppDelegate.swift @@ -2,22 +2,36 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import UIKit import Flutter import FlutterPluginRegistrant +import UIKit -@UIApplicationMain +@main class AppDelegate: UIResponder, UIApplicationDelegate { - var window: UIWindow? - - var flutterEngine : FlutterEngine? - - func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool { - // Instantiate Flutter engine - self.flutterEngine = FlutterEngine(name: "io.flutter", project: nil) - self.flutterEngine?.run(withEntrypoint: nil) - GeneratedPluginRegistrant.register(with: self.flutterEngine!) + var flutterEngine: FlutterEngine? + + func application( + _ application: UIApplication, + didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]? + ) -> Bool { + // Instantiate Flutter engine + self.flutterEngine = FlutterEngine(name: "io.flutter", project: nil) + self.flutterEngine?.run(withEntrypoint: nil) + GeneratedPluginRegistrant.register(with: self.flutterEngine!) + + return true + } - return true - } + func application( + _ application: UIApplication, + configurationForConnecting connectingSceneSession: UISceneSession, + options: UIScene.ConnectionOptions + ) -> UISceneConfiguration { + let configuration = UISceneConfiguration( + name: "Default Configuration", + sessionRole: connectingSceneSession.role + ) + configuration.delegateClass = FlutterSceneDelegate.self + return configuration + } } diff --git a/add_to_app/plugin/ios_using_plugin/IOSUsingPlugin/Info-Debug.plist b/add_to_app/plugin/ios_using_plugin/IOSUsingPlugin/Info-Debug.plist index 72b874acd..c09fef963 100644 --- a/add_to_app/plugin/ios_using_plugin/IOSUsingPlugin/Info-Debug.plist +++ b/add_to_app/plugin/ios_using_plugin/IOSUsingPlugin/Info-Debug.plist @@ -20,6 +20,27 @@ 1 LSRequiresIPhoneOS + UIApplicationSceneManifest + + UIApplicationSupportsMultipleScenes + + UISceneConfigurations + + UIWindowSceneSessionRoleApplication + + + UISceneClassName + UIWindowScene + UISceneConfigurationName + Default Configuration + UISceneDelegateClassName + FlutterSceneDelegate + UISceneStoryboardFile + Main + + + + UILaunchStoryboardName LaunchScreen UIMainStoryboardFile diff --git a/add_to_app/plugin/ios_using_plugin/IOSUsingPlugin/Info-Release.plist b/add_to_app/plugin/ios_using_plugin/IOSUsingPlugin/Info-Release.plist index 16be3b681..cf27efee8 100644 --- a/add_to_app/plugin/ios_using_plugin/IOSUsingPlugin/Info-Release.plist +++ b/add_to_app/plugin/ios_using_plugin/IOSUsingPlugin/Info-Release.plist @@ -20,6 +20,27 @@ 1 LSRequiresIPhoneOS + UIApplicationSceneManifest + + UIApplicationSupportsMultipleScenes + + UISceneConfigurations + + UIWindowSceneSessionRoleApplication + + + UISceneClassName + UIWindowScene + UISceneConfigurationName + Default Configuration + UISceneDelegateClassName + FlutterSceneDelegate + UISceneStoryboardFile + Main + + + + UILaunchStoryboardName LaunchScreen UIMainStoryboardFile diff --git a/add_to_app/plugin/ios_using_plugin/Podfile b/add_to_app/plugin/ios_using_plugin/Podfile index 726737d1b..faf763aae 100644 --- a/add_to_app/plugin/ios_using_plugin/Podfile +++ b/add_to_app/plugin/ios_using_plugin/Podfile @@ -1,5 +1,4 @@ -# Uncomment the next line to define a global platform for your project -# platform :ios, '9.0' +platform :ios, '15.0' flutter_application_path = '../flutter_module_using_plugin' load File.join(flutter_application_path, '.ios', 'Flutter', 'podhelper.rb') diff --git a/add_to_app/prebuilt_module/ios_using_prebuilt_module/IOSUsingPrebuiltModule/AppDelegate.swift b/add_to_app/prebuilt_module/ios_using_prebuilt_module/IOSUsingPrebuiltModule/AppDelegate.swift index a4ef063b3..66cb1d3be 100644 --- a/add_to_app/prebuilt_module/ios_using_prebuilt_module/IOSUsingPrebuiltModule/AppDelegate.swift +++ b/add_to_app/prebuilt_module/ios_using_prebuilt_module/IOSUsingPrebuiltModule/AppDelegate.swift @@ -2,20 +2,34 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import UIKit import Flutter +import UIKit -@UIApplicationMain +@main class AppDelegate: UIResponder, UIApplicationDelegate { - var window: UIWindow? + var flutterEngine: FlutterEngine? - var flutterEngine : FlutterEngine? + func application( + _ application: UIApplication, + didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]? + ) -> Bool { + // Instantiate Flutter engine + self.flutterEngine = FlutterEngine(name: "io.flutter", project: nil) + self.flutterEngine?.run(withEntrypoint: nil) - func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool { - // Instantiate Flutter engine - self.flutterEngine = FlutterEngine(name: "io.flutter", project: nil) - self.flutterEngine?.run(withEntrypoint: nil) + return true + } - return true - } + func application( + _ application: UIApplication, + configurationForConnecting connectingSceneSession: UISceneSession, + options: UIScene.ConnectionOptions + ) -> UISceneConfiguration { + let configuration = UISceneConfiguration( + name: "Default Configuration", + sessionRole: connectingSceneSession.role + ) + configuration.delegateClass = FlutterSceneDelegate.self + return configuration + } } diff --git a/add_to_app/prebuilt_module/ios_using_prebuilt_module/IOSUsingPrebuiltModule/Info-Debug.plist b/add_to_app/prebuilt_module/ios_using_prebuilt_module/IOSUsingPrebuiltModule/Info-Debug.plist index 72b874acd..c09fef963 100644 --- a/add_to_app/prebuilt_module/ios_using_prebuilt_module/IOSUsingPrebuiltModule/Info-Debug.plist +++ b/add_to_app/prebuilt_module/ios_using_prebuilt_module/IOSUsingPrebuiltModule/Info-Debug.plist @@ -20,6 +20,27 @@ 1 LSRequiresIPhoneOS + UIApplicationSceneManifest + + UIApplicationSupportsMultipleScenes + + UISceneConfigurations + + UIWindowSceneSessionRoleApplication + + + UISceneClassName + UIWindowScene + UISceneConfigurationName + Default Configuration + UISceneDelegateClassName + FlutterSceneDelegate + UISceneStoryboardFile + Main + + + + UILaunchStoryboardName LaunchScreen UIMainStoryboardFile diff --git a/add_to_app/prebuilt_module/ios_using_prebuilt_module/IOSUsingPrebuiltModule/Info-Release.plist b/add_to_app/prebuilt_module/ios_using_prebuilt_module/IOSUsingPrebuiltModule/Info-Release.plist index 16be3b681..cf27efee8 100644 --- a/add_to_app/prebuilt_module/ios_using_prebuilt_module/IOSUsingPrebuiltModule/Info-Release.plist +++ b/add_to_app/prebuilt_module/ios_using_prebuilt_module/IOSUsingPrebuiltModule/Info-Release.plist @@ -20,6 +20,27 @@ 1 LSRequiresIPhoneOS + UIApplicationSceneManifest + + UIApplicationSupportsMultipleScenes + + UISceneConfigurations + + UIWindowSceneSessionRoleApplication + + + UISceneClassName + UIWindowScene + UISceneConfigurationName + Default Configuration + UISceneDelegateClassName + FlutterSceneDelegate + UISceneStoryboardFile + Main + + + + UILaunchStoryboardName LaunchScreen UIMainStoryboardFile diff --git a/animations/ios/Runner/AppDelegate.swift b/animations/ios/Runner/AppDelegate.swift index 70693e4a8..c30b367ec 100644 --- a/animations/ios/Runner/AppDelegate.swift +++ b/animations/ios/Runner/AppDelegate.swift @@ -1,13 +1,16 @@ -import UIKit import Flutter +import UIKit -@UIApplicationMain -@objc class AppDelegate: FlutterAppDelegate { +@main +@objc class AppDelegate: FlutterAppDelegate, FlutterImplicitEngineDelegate { override func application( _ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]? ) -> Bool { - GeneratedPluginRegistrant.register(with: self) return super.application(application, didFinishLaunchingWithOptions: launchOptions) } + + func didInitializeImplicitFlutterEngine(_ engineBridge: FlutterImplicitEngineBridge) { + GeneratedPluginRegistrant.register(with: engineBridge.pluginRegistry) + } } diff --git a/animations/ios/Runner/Info.plist b/animations/ios/Runner/Info.plist index a6d2ff85d..0724330bc 100644 --- a/animations/ios/Runner/Info.plist +++ b/animations/ios/Runner/Info.plist @@ -24,6 +24,27 @@ $(FLUTTER_BUILD_NUMBER) LSRequiresIPhoneOS + UIApplicationSceneManifest + + UIApplicationSupportsMultipleScenes + + UISceneConfigurations + + UIWindowSceneSessionRoleApplication + + + UISceneClassName + UIWindowScene + UISceneConfigurationName + flutter + UISceneDelegateClassName + FlutterSceneDelegate + UISceneStoryboardFile + Main + + + + UILaunchStoryboardName LaunchScreen UIMainStoryboardFile diff --git a/asset_transformation/ios/Runner/AppDelegate.swift b/asset_transformation/ios/Runner/AppDelegate.swift index 626664468..c30b367ec 100644 --- a/asset_transformation/ios/Runner/AppDelegate.swift +++ b/asset_transformation/ios/Runner/AppDelegate.swift @@ -2,12 +2,15 @@ import Flutter import UIKit @main -@objc class AppDelegate: FlutterAppDelegate { +@objc class AppDelegate: FlutterAppDelegate, FlutterImplicitEngineDelegate { override func application( _ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]? ) -> Bool { - GeneratedPluginRegistrant.register(with: self) return super.application(application, didFinishLaunchingWithOptions: launchOptions) } + + func didInitializeImplicitFlutterEngine(_ engineBridge: FlutterImplicitEngineBridge) { + GeneratedPluginRegistrant.register(with: engineBridge.pluginRegistry) + } } diff --git a/asset_transformation/ios/Runner/Info.plist b/asset_transformation/ios/Runner/Info.plist index 10bfdec30..d59367c3a 100644 --- a/asset_transformation/ios/Runner/Info.plist +++ b/asset_transformation/ios/Runner/Info.plist @@ -24,6 +24,27 @@ $(FLUTTER_BUILD_NUMBER) LSRequiresIPhoneOS + UIApplicationSceneManifest + + UIApplicationSupportsMultipleScenes + + UISceneConfigurations + + UIWindowSceneSessionRoleApplication + + + UISceneClassName + UIWindowScene + UISceneConfigurationName + flutter + UISceneDelegateClassName + FlutterSceneDelegate + UISceneStoryboardFile + Main + + + + UILaunchStoryboardName LaunchScreen UIMainStoryboardFile diff --git a/compass_app/app/ios/Runner/AppDelegate.swift b/compass_app/app/ios/Runner/AppDelegate.swift index 9074fee92..c30b367ec 100644 --- a/compass_app/app/ios/Runner/AppDelegate.swift +++ b/compass_app/app/ios/Runner/AppDelegate.swift @@ -1,13 +1,16 @@ import Flutter import UIKit -@UIApplicationMain -@objc class AppDelegate: FlutterAppDelegate { +@main +@objc class AppDelegate: FlutterAppDelegate, FlutterImplicitEngineDelegate { override func application( _ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]? ) -> Bool { - GeneratedPluginRegistrant.register(with: self) return super.application(application, didFinishLaunchingWithOptions: launchOptions) } + + func didInitializeImplicitFlutterEngine(_ engineBridge: FlutterImplicitEngineBridge) { + GeneratedPluginRegistrant.register(with: engineBridge.pluginRegistry) + } } diff --git a/compass_app/app/ios/Runner/Info.plist b/compass_app/app/ios/Runner/Info.plist index e8a8df16d..ed33ebafc 100644 --- a/compass_app/app/ios/Runner/Info.plist +++ b/compass_app/app/ios/Runner/Info.plist @@ -24,6 +24,27 @@ $(FLUTTER_BUILD_NUMBER) LSRequiresIPhoneOS + UIApplicationSceneManifest + + UIApplicationSupportsMultipleScenes + + UISceneConfigurations + + UIWindowSceneSessionRoleApplication + + + UISceneClassName + UIWindowScene + UISceneConfigurationName + flutter + UISceneDelegateClassName + FlutterSceneDelegate + UISceneStoryboardFile + Main + + + + UILaunchStoryboardName LaunchScreen UIMainStoryboardFile diff --git a/compass_app/app/pubspec.yaml b/compass_app/app/pubspec.yaml index cbdd3ff05..379f7af12 100644 --- a/compass_app/app/pubspec.yaml +++ b/compass_app/app/pubspec.yaml @@ -35,7 +35,7 @@ dev_dependencies: integration_test: sdk: flutter build_runner: ^2.4.14 - freezed: ^3.0.0 + freezed: '>=3.0.0 <5.0.0' json_serializable: ^6.9.0 flutter: diff --git a/compass_app/server/pubspec.yaml b/compass_app/server/pubspec.yaml index f26d031a3..ac42aea6a 100644 --- a/compass_app/server/pubspec.yaml +++ b/compass_app/server/pubspec.yaml @@ -20,5 +20,5 @@ dev_dependencies: path: ../../analysis_defaults test: ^1.24.0 build_runner: ^2.4.11 - freezed: ^3.0.0 + freezed: '>=3.0.0 <5.0.0' json_serializable: ^6.8.0 diff --git a/cupertino_gallery/ios/Runner/AppDelegate.swift b/cupertino_gallery/ios/Runner/AppDelegate.swift index 626664468..c30b367ec 100644 --- a/cupertino_gallery/ios/Runner/AppDelegate.swift +++ b/cupertino_gallery/ios/Runner/AppDelegate.swift @@ -2,12 +2,15 @@ import Flutter import UIKit @main -@objc class AppDelegate: FlutterAppDelegate { +@objc class AppDelegate: FlutterAppDelegate, FlutterImplicitEngineDelegate { override func application( _ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]? ) -> Bool { - GeneratedPluginRegistrant.register(with: self) return super.application(application, didFinishLaunchingWithOptions: launchOptions) } + + func didInitializeImplicitFlutterEngine(_ engineBridge: FlutterImplicitEngineBridge) { + GeneratedPluginRegistrant.register(with: engineBridge.pluginRegistry) + } } diff --git a/cupertino_gallery/ios/Runner/Info.plist b/cupertino_gallery/ios/Runner/Info.plist index a8ead9290..6eaf62432 100644 --- a/cupertino_gallery/ios/Runner/Info.plist +++ b/cupertino_gallery/ios/Runner/Info.plist @@ -24,6 +24,27 @@ $(FLUTTER_BUILD_NUMBER) LSRequiresIPhoneOS + UIApplicationSceneManifest + + UIApplicationSupportsMultipleScenes + + UISceneConfigurations + + UIWindowSceneSessionRoleApplication + + + UISceneClassName + UIWindowScene + UISceneConfigurationName + flutter + UISceneDelegateClassName + FlutterSceneDelegate + UISceneStoryboardFile + Main + + + + UILaunchStoryboardName LaunchScreen UIMainStoryboardFile diff --git a/date_planner/ios/Runner/AppDelegate.swift b/date_planner/ios/Runner/AppDelegate.swift index 626664468..c30b367ec 100644 --- a/date_planner/ios/Runner/AppDelegate.swift +++ b/date_planner/ios/Runner/AppDelegate.swift @@ -2,12 +2,15 @@ import Flutter import UIKit @main -@objc class AppDelegate: FlutterAppDelegate { +@objc class AppDelegate: FlutterAppDelegate, FlutterImplicitEngineDelegate { override func application( _ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]? ) -> Bool { - GeneratedPluginRegistrant.register(with: self) return super.application(application, didFinishLaunchingWithOptions: launchOptions) } + + func didInitializeImplicitFlutterEngine(_ engineBridge: FlutterImplicitEngineBridge) { + GeneratedPluginRegistrant.register(with: engineBridge.pluginRegistry) + } } diff --git a/date_planner/ios/Runner/Info.plist b/date_planner/ios/Runner/Info.plist index c836cd5dd..cb423ae71 100644 --- a/date_planner/ios/Runner/Info.plist +++ b/date_planner/ios/Runner/Info.plist @@ -24,6 +24,27 @@ $(FLUTTER_BUILD_NUMBER) LSRequiresIPhoneOS + UIApplicationSceneManifest + + UIApplicationSupportsMultipleScenes + + UISceneConfigurations + + UIWindowSceneSessionRoleApplication + + + UISceneClassName + UIWindowScene + UISceneConfigurationName + flutter + UISceneDelegateClassName + FlutterSceneDelegate + UISceneStoryboardFile + Main + + + + UILaunchStoryboardName LaunchScreen UIMainStoryboardFile diff --git a/desktop_photo_search/fluent_ui/pubspec.yaml b/desktop_photo_search/fluent_ui/pubspec.yaml index 4ec96add0..5ef775413 100644 --- a/desktop_photo_search/fluent_ui/pubspec.yaml +++ b/desktop_photo_search/fluent_ui/pubspec.yaml @@ -31,7 +31,7 @@ dev_dependencies: analysis_defaults: path: ../../analysis_defaults async: ^2.11.0 - build: ^3.0.0 + build: '>=3.0.0 <5.0.0' build_runner: ^2.4.6 built_value_generator: ^8.6.1 flutter_test: diff --git a/desktop_photo_search/material/pubspec.yaml b/desktop_photo_search/material/pubspec.yaml index 29ef3b1f4..f202a3cfc 100644 --- a/desktop_photo_search/material/pubspec.yaml +++ b/desktop_photo_search/material/pubspec.yaml @@ -30,7 +30,7 @@ dev_dependencies: analysis_defaults: path: ../../analysis_defaults async: ^2.11.0 - build: ^3.0.0 + build: '>=3.0.0 <5.0.0' build_runner: ^2.4.6 built_value_generator: ^8.6.1 flutter_test: diff --git a/dynamic_theme/ios/Runner/AppDelegate.swift b/dynamic_theme/ios/Runner/AppDelegate.swift index 70693e4a8..c30b367ec 100644 --- a/dynamic_theme/ios/Runner/AppDelegate.swift +++ b/dynamic_theme/ios/Runner/AppDelegate.swift @@ -1,13 +1,16 @@ -import UIKit import Flutter +import UIKit -@UIApplicationMain -@objc class AppDelegate: FlutterAppDelegate { +@main +@objc class AppDelegate: FlutterAppDelegate, FlutterImplicitEngineDelegate { override func application( _ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]? ) -> Bool { - GeneratedPluginRegistrant.register(with: self) return super.application(application, didFinishLaunchingWithOptions: launchOptions) } + + func didInitializeImplicitFlutterEngine(_ engineBridge: FlutterImplicitEngineBridge) { + GeneratedPluginRegistrant.register(with: engineBridge.pluginRegistry) + } } diff --git a/dynamic_theme/ios/Runner/Info.plist b/dynamic_theme/ios/Runner/Info.plist index 5c12ce8d0..5cd7d05ea 100644 --- a/dynamic_theme/ios/Runner/Info.plist +++ b/dynamic_theme/ios/Runner/Info.plist @@ -24,6 +24,27 @@ $(FLUTTER_BUILD_NUMBER) LSRequiresIPhoneOS + UIApplicationSceneManifest + + UIApplicationSupportsMultipleScenes + + UISceneConfigurations + + UIWindowSceneSessionRoleApplication + + + UISceneClassName + UIWindowScene + UISceneConfigurationName + flutter + UISceneDelegateClassName + FlutterSceneDelegate + UISceneStoryboardFile + Main + + + + UILaunchStoryboardName LaunchScreen UIMainStoryboardFile diff --git a/form_app/ios/Runner/AppDelegate.swift b/form_app/ios/Runner/AppDelegate.swift index 70693e4a8..c30b367ec 100644 --- a/form_app/ios/Runner/AppDelegate.swift +++ b/form_app/ios/Runner/AppDelegate.swift @@ -1,13 +1,16 @@ -import UIKit import Flutter +import UIKit -@UIApplicationMain -@objc class AppDelegate: FlutterAppDelegate { +@main +@objc class AppDelegate: FlutterAppDelegate, FlutterImplicitEngineDelegate { override func application( _ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]? ) -> Bool { - GeneratedPluginRegistrant.register(with: self) return super.application(application, didFinishLaunchingWithOptions: launchOptions) } + + func didInitializeImplicitFlutterEngine(_ engineBridge: FlutterImplicitEngineBridge) { + GeneratedPluginRegistrant.register(with: engineBridge.pluginRegistry) + } } diff --git a/form_app/ios/Runner/Info.plist b/form_app/ios/Runner/Info.plist index e374d3bf7..44f08d9c2 100644 --- a/form_app/ios/Runner/Info.plist +++ b/form_app/ios/Runner/Info.plist @@ -24,6 +24,27 @@ $(FLUTTER_BUILD_NUMBER) LSRequiresIPhoneOS + UIApplicationSceneManifest + + UIApplicationSupportsMultipleScenes + + UISceneConfigurations + + UIWindowSceneSessionRoleApplication + + + UISceneClassName + UIWindowScene + UISceneConfigurationName + flutter + UISceneDelegateClassName + FlutterSceneDelegate + UISceneStoryboardFile + Main + + + + UILaunchStoryboardName LaunchScreen UIMainStoryboardFile diff --git a/google_maps/ios/Runner/AppDelegate.swift b/google_maps/ios/Runner/AppDelegate.swift index 6861f5a96..31ef6679d 100644 --- a/google_maps/ios/Runner/AppDelegate.swift +++ b/google_maps/ios/Runner/AppDelegate.swift @@ -1,18 +1,20 @@ -import UIKit import Flutter import GoogleMaps +import UIKit -@UIApplicationMain -@objc class AppDelegate: FlutterAppDelegate { +@main +@objc class AppDelegate: FlutterAppDelegate, FlutterImplicitEngineDelegate { override func application( _ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]? ) -> Bool { - GeneratedPluginRegistrant.register(with: self) - // TODO: Add your Google Maps API key GMSServices.provideAPIKey("YOUR-API-KEY") return super.application(application, didFinishLaunchingWithOptions: launchOptions) } + + func didInitializeImplicitFlutterEngine(_ engineBridge: FlutterImplicitEngineBridge) { + GeneratedPluginRegistrant.register(with: engineBridge.pluginRegistry) + } } diff --git a/google_maps/ios/Runner/Info.plist b/google_maps/ios/Runner/Info.plist index 3d7ffa12c..38aa622b3 100644 --- a/google_maps/ios/Runner/Info.plist +++ b/google_maps/ios/Runner/Info.plist @@ -24,6 +24,27 @@ $(FLUTTER_BUILD_NUMBER) LSRequiresIPhoneOS + UIApplicationSceneManifest + + UIApplicationSupportsMultipleScenes + + UISceneConfigurations + + UIWindowSceneSessionRoleApplication + + + UISceneClassName + UIWindowScene + UISceneConfigurationName + flutter + UISceneDelegateClassName + FlutterSceneDelegate + UISceneStoryboardFile + Main + + + + UILaunchStoryboardName LaunchScreen UIMainStoryboardFile diff --git a/ios_app_clip/ios/AppClip/Info.plist b/ios_app_clip/ios/AppClip/Info.plist index 9d1cf2299..6c9cf1857 100644 --- a/ios_app_clip/ios/AppClip/Info.plist +++ b/ios_app_clip/ios/AppClip/Info.plist @@ -22,6 +22,27 @@ $(FLUTTER_BUILD_NUMBER) LSRequiresIPhoneOS + UIApplicationSceneManifest + + UIApplicationSupportsMultipleScenes + + UISceneConfigurations + + UIWindowSceneSessionRoleApplication + + + UISceneClassName + UIWindowScene + UISceneConfigurationName + flutter + UISceneDelegateClassName + FlutterSceneDelegate + UISceneStoryboardFile + Main + + + + NSAppClip NSAppClipRequestEphemeralUserNotification diff --git a/ios_app_clip/ios/Runner/AppDelegate.swift b/ios_app_clip/ios/Runner/AppDelegate.swift index b63630348..c30b367ec 100644 --- a/ios_app_clip/ios/Runner/AppDelegate.swift +++ b/ios_app_clip/ios/Runner/AppDelegate.swift @@ -1,13 +1,16 @@ -import UIKit import Flutter +import UIKit @main -@objc class AppDelegate: FlutterAppDelegate { +@objc class AppDelegate: FlutterAppDelegate, FlutterImplicitEngineDelegate { override func application( _ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]? ) -> Bool { - GeneratedPluginRegistrant.register(with: self) return super.application(application, didFinishLaunchingWithOptions: launchOptions) } + + func didInitializeImplicitFlutterEngine(_ engineBridge: FlutterImplicitEngineBridge) { + GeneratedPluginRegistrant.register(with: engineBridge.pluginRegistry) + } } diff --git a/ios_app_clip/ios/Runner/Info.plist b/ios_app_clip/ios/Runner/Info.plist index 6ba20555e..5b591c710 100644 --- a/ios_app_clip/ios/Runner/Info.plist +++ b/ios_app_clip/ios/Runner/Info.plist @@ -24,6 +24,27 @@ $(FLUTTER_BUILD_NUMBER) LSRequiresIPhoneOS + UIApplicationSceneManifest + + UIApplicationSupportsMultipleScenes + + UISceneConfigurations + + UIWindowSceneSessionRoleApplication + + + UISceneClassName + UIWindowScene + UISceneConfigurationName + flutter + UISceneDelegateClassName + FlutterSceneDelegate + UISceneStoryboardFile + Main + + + + UIApplicationSupportsIndirectInputEvents UILaunchStoryboardName diff --git a/material_3_demo/ios/Runner/AppDelegate.swift b/material_3_demo/ios/Runner/AppDelegate.swift index 70693e4a8..c30b367ec 100644 --- a/material_3_demo/ios/Runner/AppDelegate.swift +++ b/material_3_demo/ios/Runner/AppDelegate.swift @@ -1,13 +1,16 @@ -import UIKit import Flutter +import UIKit -@UIApplicationMain -@objc class AppDelegate: FlutterAppDelegate { +@main +@objc class AppDelegate: FlutterAppDelegate, FlutterImplicitEngineDelegate { override func application( _ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]? ) -> Bool { - GeneratedPluginRegistrant.register(with: self) return super.application(application, didFinishLaunchingWithOptions: launchOptions) } + + func didInitializeImplicitFlutterEngine(_ engineBridge: FlutterImplicitEngineBridge) { + GeneratedPluginRegistrant.register(with: engineBridge.pluginRegistry) + } } diff --git a/material_3_demo/ios/Runner/Info.plist b/material_3_demo/ios/Runner/Info.plist index 45576eaa6..e10675a9f 100644 --- a/material_3_demo/ios/Runner/Info.plist +++ b/material_3_demo/ios/Runner/Info.plist @@ -24,6 +24,27 @@ $(FLUTTER_BUILD_NUMBER) LSRequiresIPhoneOS + UIApplicationSceneManifest + + UIApplicationSupportsMultipleScenes + + UISceneConfigurations + + UIWindowSceneSessionRoleApplication + + + UISceneClassName + UIWindowScene + UISceneConfigurationName + flutter + UISceneDelegateClassName + FlutterSceneDelegate + UISceneStoryboardFile + Main + + + + UILaunchStoryboardName LaunchScreen UIMainStoryboardFile diff --git a/navigation_and_routing/ios/Runner/AppDelegate.swift b/navigation_and_routing/ios/Runner/AppDelegate.swift index 70693e4a8..c30b367ec 100644 --- a/navigation_and_routing/ios/Runner/AppDelegate.swift +++ b/navigation_and_routing/ios/Runner/AppDelegate.swift @@ -1,13 +1,16 @@ -import UIKit import Flutter +import UIKit -@UIApplicationMain -@objc class AppDelegate: FlutterAppDelegate { +@main +@objc class AppDelegate: FlutterAppDelegate, FlutterImplicitEngineDelegate { override func application( _ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]? ) -> Bool { - GeneratedPluginRegistrant.register(with: self) return super.application(application, didFinishLaunchingWithOptions: launchOptions) } + + func didInitializeImplicitFlutterEngine(_ engineBridge: FlutterImplicitEngineBridge) { + GeneratedPluginRegistrant.register(with: engineBridge.pluginRegistry) + } } diff --git a/navigation_and_routing/ios/Runner/Info.plist b/navigation_and_routing/ios/Runner/Info.plist index 9a04f33d2..8fa2a4c56 100644 --- a/navigation_and_routing/ios/Runner/Info.plist +++ b/navigation_and_routing/ios/Runner/Info.plist @@ -24,6 +24,27 @@ $(FLUTTER_BUILD_NUMBER) LSRequiresIPhoneOS + UIApplicationSceneManifest + + UIApplicationSupportsMultipleScenes + + UISceneConfigurations + + UIWindowSceneSessionRoleApplication + + + UISceneClassName + UIWindowScene + UISceneConfigurationName + flutter + UISceneDelegateClassName + FlutterSceneDelegate + UISceneStoryboardFile + Main + + + + UILaunchStoryboardName LaunchScreen UIMainStoryboardFile diff --git a/pedometer/example/ios/Runner/AppDelegate.swift b/pedometer/example/ios/Runner/AppDelegate.swift index 70693e4a8..c30b367ec 100644 --- a/pedometer/example/ios/Runner/AppDelegate.swift +++ b/pedometer/example/ios/Runner/AppDelegate.swift @@ -1,13 +1,16 @@ -import UIKit import Flutter +import UIKit -@UIApplicationMain -@objc class AppDelegate: FlutterAppDelegate { +@main +@objc class AppDelegate: FlutterAppDelegate, FlutterImplicitEngineDelegate { override func application( _ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]? ) -> Bool { - GeneratedPluginRegistrant.register(with: self) return super.application(application, didFinishLaunchingWithOptions: launchOptions) } + + func didInitializeImplicitFlutterEngine(_ engineBridge: FlutterImplicitEngineBridge) { + GeneratedPluginRegistrant.register(with: engineBridge.pluginRegistry) + } } diff --git a/pedometer/example/ios/Runner/Info.plist b/pedometer/example/ios/Runner/Info.plist index 15dfe789c..94524e532 100644 --- a/pedometer/example/ios/Runner/Info.plist +++ b/pedometer/example/ios/Runner/Info.plist @@ -26,6 +26,27 @@ $(FLUTTER_BUILD_NUMBER) LSRequiresIPhoneOS + UIApplicationSceneManifest + + UIApplicationSupportsMultipleScenes + + UISceneConfigurations + + UIWindowSceneSessionRoleApplication + + + UISceneClassName + UIWindowScene + UISceneConfigurationName + flutter + UISceneDelegateClassName + FlutterSceneDelegate + UISceneStoryboardFile + Main + + + + NSMotionUsageDescription Live stream pedometer UIApplicationSupportsIndirectInputEvents diff --git a/platform_channels/ios/Runner/AppDelegate.swift b/platform_channels/ios/Runner/AppDelegate.swift index 131fd18b7..f40bb6430 100644 --- a/platform_channels/ios/Runner/AppDelegate.swift +++ b/platform_channels/ios/Runner/AppDelegate.swift @@ -2,88 +2,111 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import UIKit import Flutter +import UIKit + +@main +@objc class AppDelegate: FlutterAppDelegate, FlutterImplicitEngineDelegate { + override func application( + _ application: UIApplication, + didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]? + ) -> Bool { + return super.application(application, didFinishLaunchingWithOptions: launchOptions) + } + + func didInitializeImplicitFlutterEngine(_ engineBridge: FlutterImplicitEngineBridge) { + GeneratedPluginRegistrant.register(with: engineBridge.pluginRegistry) + + let messenger = engineBridge.applicationRegistrar.messenger() -@UIApplicationMain -@objc class AppDelegate: FlutterAppDelegate { - override func application( - _ application: UIApplication, - didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]? - ) -> Bool { - let flutterViewController = window.rootViewController as! FlutterViewController - FlutterMethodChannel(name: "methodChannelDemo", binaryMessenger: flutterViewController.binaryMessenger).setMethodCallHandler({ - (call: FlutterMethodCall, result: FlutterResult) -> Void in - - guard let count = (call.arguments as? NSDictionary)?["count"] as? Int else { - result(FlutterError(code: "INVALID_ARGUMENT", message: "Value of count cannot be null", details: nil)) - return - } - - switch call.method { - case "increment": - result(count + 1) - case "decrement": - result(count - 1) - default: - result(FlutterMethodNotImplemented) - } - }) - - FlutterBasicMessageChannel(name: "platformImageDemo", binaryMessenger: flutterViewController.binaryMessenger, codec: FlutterStandardMessageCodec.sharedInstance()).setMessageHandler{ - (message: Any?, reply: FlutterReply) -> Void in - - if(message as! String == "getImage") { - guard let image = UIImage(named: "eat_new_orleans.jpg") else { - reply(nil) - return - } - - reply(FlutterStandardTypedData(bytes: image.jpegData(compressionQuality: 1)!)) - } + FlutterMethodChannel(name: "methodChannelDemo", binaryMessenger: messenger) + .setMethodCallHandler({ (call: FlutterMethodCall, result: FlutterResult) -> Void in + guard let count = (call.arguments as? NSDictionary)?["count"] as? Int else { + result( + FlutterError( + code: "INVALID_ARGUMENT", + message: "Value of count cannot be null", + details: nil + ) + ) + return } - - FlutterEventChannel(name: "eventChannelDemo", binaryMessenger: flutterViewController.binaryMessenger).setStreamHandler(AccelerometerStreamHandler()) - - var petList : [[String:String]] = [] - - // A FlutterBasicMessageChannel for sending petList to Dart. - let stringCodecChannel = FlutterBasicMessageChannel(name: "stringCodecDemo", binaryMessenger: flutterViewController.binaryMessenger, codec: FlutterStringCodec.sharedInstance()) - - // Registers a MessageHandler for FlutterBasicMessageChannel to receive pet details. - FlutterBasicMessageChannel(name: "jsonMessageCodecDemo", binaryMessenger: flutterViewController.binaryMessenger, codec: FlutterJSONMessageCodec.sharedInstance()) - .setMessageHandler{(message: Any?, reply: FlutterReply) -> Void in - petList.insert(message! as! [String: String], at: 0) - stringCodecChannel.sendMessage(self.convertPetListToJson(petList: petList)) - } - - // Registers a MessageHandler for FlutterBasicMessageHandler to receive indices of detail records to remove from the petList. - FlutterBasicMessageChannel(name: "binaryCodecDemo", binaryMessenger: flutterViewController.binaryMessenger, codec: FlutterBinaryCodec.sharedInstance()).setMessageHandler{ - (message: Any?, reply: FlutterReply) -> Void in - - guard let index = Int.init(String.init(data: message! as! Data, encoding: String.Encoding.utf8)!) else { - reply(nil) - return - } - - if (index >= 0 && index < petList.count) { - petList.remove(at: index) - reply("Removed Successfully".data(using: .utf8)!) - stringCodecChannel.sendMessage(self.convertPetListToJson(petList: petList)) - } else { - reply(nil) - } + + switch call.method { + case "increment": + result(count + 1) + case "decrement": + result(count - 1) + default: + result(FlutterMethodNotImplemented) } - - GeneratedPluginRegistrant.register(with: self) - return super.application(application, didFinishLaunchingWithOptions: launchOptions) - } - - // Function to convert petList to json string. - func convertPetListToJson(petList: [[String: String]]) -> String? { - guard let data = try? JSONSerialization.data(withJSONObject: ["petList": petList], options: .prettyPrinted) else { - return nil + }) + + FlutterBasicMessageChannel( + name: "platformImageDemo", + binaryMessenger: messenger, + codec: FlutterStandardMessageCodec.sharedInstance() + ).setMessageHandler { (message: Any?, reply: FlutterReply) -> Void in + if message as! String == "getImage" { + guard let image = UIImage(named: "eat_new_orleans.jpg") else { + reply(nil) + return } - return String(data: data, encoding: String.Encoding.utf8) + + reply(FlutterStandardTypedData(bytes: image.jpegData(compressionQuality: 1)!)) + } + } + + FlutterEventChannel( + name: "eventChannelDemo", + binaryMessenger: messenger + ).setStreamHandler(AccelerometerStreamHandler()) + + var petList: [[String: String]] = [] + + // A FlutterBasicMessageChannel for sending petList to Dart. + let stringCodecChannel = FlutterBasicMessageChannel( + name: "stringCodecDemo", + binaryMessenger: messenger, + codec: FlutterStringCodec.sharedInstance() + ) + + // Registers a MessageHandler for FlutterBasicMessageChannel to receive pet details. + FlutterBasicMessageChannel( + name: "jsonMessageCodecDemo", + binaryMessenger: messenger, + codec: FlutterJSONMessageCodec.sharedInstance() + ).setMessageHandler { (message: Any?, reply: FlutterReply) -> Void in + petList.insert(message! as! [String: String], at: 0) + stringCodecChannel.sendMessage(self.convertPetListToJson(petList: petList)) + } + + // Registers a MessageHandler for FlutterBasicMessageHandler to receive indices of detail records to remove from the petList. + FlutterBasicMessageChannel( + name: "binaryCodecDemo", + binaryMessenger: messenger, + codec: FlutterBinaryCodec.sharedInstance() + ).setMessageHandler { (message: Any?, reply: FlutterReply) -> Void in + guard let index = Int(String(data: message! as! Data, encoding: String.Encoding.utf8)!) else { + reply(nil) + return + } + + if index >= 0 && index < petList.count { + petList.remove(at: index) + reply("Removed Successfully".data(using: .utf8)!) + stringCodecChannel.sendMessage(self.convertPetListToJson(petList: petList)) + } else { + reply(nil) + } + } + } + + // Function to convert petList to json string. + func convertPetListToJson(petList: [[String: String]]) -> String? { + guard let data = try? JSONSerialization.data(withJSONObject: ["petList": petList], options: .prettyPrinted) else { + return nil } + return String(data: data, encoding: String.Encoding.utf8) + } } diff --git a/platform_channels/ios/Runner/Info.plist b/platform_channels/ios/Runner/Info.plist index 2557472fd..fd3fb7f48 100644 --- a/platform_channels/ios/Runner/Info.plist +++ b/platform_channels/ios/Runner/Info.plist @@ -24,6 +24,27 @@ $(FLUTTER_BUILD_NUMBER) LSRequiresIPhoneOS + UIApplicationSceneManifest + + UIApplicationSupportsMultipleScenes + + UISceneConfigurations + + UIWindowSceneSessionRoleApplication + + + UISceneClassName + UIWindowScene + UISceneConfigurationName + flutter + UISceneDelegateClassName + FlutterSceneDelegate + UISceneStoryboardFile + Main + + + + UILaunchStoryboardName LaunchScreen UIMainStoryboardFile diff --git a/platform_design/ios/Runner/AppDelegate.swift b/platform_design/ios/Runner/AppDelegate.swift index 70693e4a8..c30b367ec 100644 --- a/platform_design/ios/Runner/AppDelegate.swift +++ b/platform_design/ios/Runner/AppDelegate.swift @@ -1,13 +1,16 @@ -import UIKit import Flutter +import UIKit -@UIApplicationMain -@objc class AppDelegate: FlutterAppDelegate { +@main +@objc class AppDelegate: FlutterAppDelegate, FlutterImplicitEngineDelegate { override func application( _ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]? ) -> Bool { - GeneratedPluginRegistrant.register(with: self) return super.application(application, didFinishLaunchingWithOptions: launchOptions) } + + func didInitializeImplicitFlutterEngine(_ engineBridge: FlutterImplicitEngineBridge) { + GeneratedPluginRegistrant.register(with: engineBridge.pluginRegistry) + } } diff --git a/platform_design/ios/Runner/Info.plist b/platform_design/ios/Runner/Info.plist index e92f26f77..d3f9fd384 100644 --- a/platform_design/ios/Runner/Info.plist +++ b/platform_design/ios/Runner/Info.plist @@ -24,6 +24,27 @@ $(FLUTTER_BUILD_NUMBER) LSRequiresIPhoneOS + UIApplicationSceneManifest + + UIApplicationSupportsMultipleScenes + + UISceneConfigurations + + UIWindowSceneSessionRoleApplication + + + UISceneClassName + UIWindowScene + UISceneConfigurationName + flutter + UISceneDelegateClassName + FlutterSceneDelegate + UISceneStoryboardFile + Main + + + + UILaunchStoryboardName LaunchScreen UIMainStoryboardFile diff --git a/platform_view_swift/ios/Runner/AppDelegate.swift b/platform_view_swift/ios/Runner/AppDelegate.swift index 630e34447..f3028e4b3 100644 --- a/platform_view_swift/ios/Runner/AppDelegate.swift +++ b/platform_view_swift/ios/Runner/AppDelegate.swift @@ -2,42 +2,56 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -import UIKit import Flutter +import UIKit -@UIApplicationMain -@objc class AppDelegate: FlutterAppDelegate, PlatformViewControllerDelegate { +@main +@objc class AppDelegate: FlutterAppDelegate, FlutterImplicitEngineDelegate, PlatformViewControllerDelegate { var flutterResult: FlutterResult? override func application( _ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]? ) -> Bool { - GeneratedPluginRegistrant.register(with: self) - let controller: FlutterViewController = window?.rootViewController as! FlutterViewController - let channel = FlutterMethodChannel.init(name: "dev.flutter.sample/platform_view_swift", binaryMessenger: controller.binaryMessenger) - - channel.setMethodCallHandler({ - (call: FlutterMethodCall, result: @escaping FlutterResult) -> Void in - if ("switchView" == call.method) { - self.flutterResult = result - - let platformViewController = PlatformViewController(nibName: "PlatformViewController", bundle: nil) - platformViewController.counter = call.arguments as! Int - platformViewController.delegate = self - - let navigationController = UINavigationController(rootViewController: platformViewController) - navigationController.navigationBar.topItem?.title = "Platform View" - controller.present(navigationController, animated: true, completion: nil) - } else { - result(FlutterMethodNotImplemented) - } - }); - return super.application(application, didFinishLaunchingWithOptions: launchOptions) } - - func didUpdateCounter(counter: Int) { - flutterResult?(counter) - } + + func didInitializeImplicitFlutterEngine(_ engineBridge: FlutterImplicitEngineBridge) { + GeneratedPluginRegistrant.register(with: engineBridge.pluginRegistry) + + let registrar = engineBridge.pluginRegistry.registrar(forPlugin: "PlatformViewSwift") + let channel = FlutterMethodChannel( + name: "dev.flutter.sample/platform_view_swift", + binaryMessenger: engineBridge.applicationRegistrar.messenger() + ) + + channel.setMethodCallHandler({ + [weak self] (call: FlutterMethodCall, result: @escaping FlutterResult) -> Void in + guard let self = self else { return } + if "switchView" == call.method { + self.flutterResult = result + + let platformViewController = PlatformViewController(nibName: "PlatformViewController", bundle: nil) + platformViewController.counter = call.arguments as! Int + platformViewController.delegate = self + + let navigationController = UINavigationController(rootViewController: platformViewController) + navigationController.navigationBar.topItem?.title = "Platform View" + + let presenter = registrar?.viewController ?? UIApplication.shared.connectedScenes + .compactMap { $0 as? UIWindowScene } + .flatMap { $0.windows } + .first { $0.isKeyWindow }? + .rootViewController + + presenter?.present(navigationController, animated: true, completion: nil) + } else { + result(FlutterMethodNotImplemented) + } + }) + } + + func didUpdateCounter(counter: Int) { + flutterResult?(counter) + } } diff --git a/platform_view_swift/ios/Runner/Info.plist b/platform_view_swift/ios/Runner/Info.plist index 83cff7fe1..e15b917b9 100644 --- a/platform_view_swift/ios/Runner/Info.plist +++ b/platform_view_swift/ios/Runner/Info.plist @@ -22,6 +22,27 @@ $(FLUTTER_BUILD_NUMBER) LSRequiresIPhoneOS + UIApplicationSceneManifest + + UIApplicationSupportsMultipleScenes + + UISceneConfigurations + + UIWindowSceneSessionRoleApplication + + + UISceneClassName + UIWindowScene + UISceneConfigurationName + flutter + UISceneDelegateClassName + FlutterSceneDelegate + UISceneStoryboardFile + Main + + + + UILaunchStoryboardName LaunchScreen UIMainStoryboardFile @@ -41,5 +62,9 @@ UIViewControllerBasedStatusBarAppearance + CADisableMinimumFrameDurationOnPhone + + UIApplicationSupportsIndirectInputEvents + diff --git a/simple_shader/ios/Runner/AppDelegate.swift b/simple_shader/ios/Runner/AppDelegate.swift index 70693e4a8..c30b367ec 100644 --- a/simple_shader/ios/Runner/AppDelegate.swift +++ b/simple_shader/ios/Runner/AppDelegate.swift @@ -1,13 +1,16 @@ -import UIKit import Flutter +import UIKit -@UIApplicationMain -@objc class AppDelegate: FlutterAppDelegate { +@main +@objc class AppDelegate: FlutterAppDelegate, FlutterImplicitEngineDelegate { override func application( _ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]? ) -> Bool { - GeneratedPluginRegistrant.register(with: self) return super.application(application, didFinishLaunchingWithOptions: launchOptions) } + + func didInitializeImplicitFlutterEngine(_ engineBridge: FlutterImplicitEngineBridge) { + GeneratedPluginRegistrant.register(with: engineBridge.pluginRegistry) + } } diff --git a/simple_shader/ios/Runner/Info.plist b/simple_shader/ios/Runner/Info.plist index 29cfd74e1..5df9796f8 100644 --- a/simple_shader/ios/Runner/Info.plist +++ b/simple_shader/ios/Runner/Info.plist @@ -24,6 +24,27 @@ $(FLUTTER_BUILD_NUMBER) LSRequiresIPhoneOS + UIApplicationSceneManifest + + UIApplicationSupportsMultipleScenes + + UISceneConfigurations + + UIWindowSceneSessionRoleApplication + + + UISceneClassName + UIWindowScene + UISceneConfigurationName + flutter + UISceneDelegateClassName + FlutterSceneDelegate + UISceneStoryboardFile + Main + + + + UILaunchStoryboardName LaunchScreen UIMainStoryboardFile