Skip to content

Commit 10e2206

Browse files
authored
Uiscene migrate custom channels views (flutter#191817)
Part of flutter#188336
1 parent 477ca01 commit 10e2206

9 files changed

Lines changed: 118 additions & 33 deletions

File tree

‎dev/benchmarks/platform_channels_benchmarks/ios/Runner/AppDelegate.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
NS_ASSUME_NONNULL_BEGIN
99

10-
@interface AppDelegate : FlutterAppDelegate
10+
@interface AppDelegate : FlutterAppDelegate <FlutterImplicitEngineDelegate>
1111

1212
@end
1313

‎dev/benchmarks/platform_channels_benchmarks/ios/Runner/AppDelegate.m‎

Lines changed: 32 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,28 +9,46 @@
99
@implementation AppDelegate
1010

1111
- (BOOL)application:(UIApplication *)application
12-
didFinishLaunchingWithOptions:(NSDictionary<UIApplicationLaunchOptionsKey, id> *)launchOptions {
13-
[GeneratedPluginRegistrant registerWithRegistry:self];
14-
NSObject<FlutterPluginRegistrar>* registrar = [self registrarForPlugin:@"Echo"];
15-
FlutterBasicMessageChannel* reset = [[FlutterBasicMessageChannel alloc] initWithName:@"dev.flutter.echo.reset" binaryMessenger:registrar.messenger codec:FlutterStandardMessageCodec.sharedInstance];
16-
[reset setMessageHandler:^(id _Nullable message, FlutterReply _Nonnull callback) {
12+
didFinishLaunchingWithOptions:(NSDictionary<UIApplicationLaunchOptionsKey, id> *)launchOptions {
13+
// Override point for customization after application launch.
14+
return [super application:application didFinishLaunchingWithOptions:launchOptions];
15+
}
16+
17+
- (void)didInitializeImplicitFlutterEngine:(NSObject<FlutterImplicitEngineBridge> *)engineBridge {
18+
[GeneratedPluginRegistrant registerWithRegistry:engineBridge.pluginRegistry];
19+
20+
NSObject<FlutterPluginRegistrar> *registrar =
21+
[engineBridge.pluginRegistry registrarForPlugin:@"Echo"];
22+
FlutterBasicMessageChannel *reset =
23+
[[FlutterBasicMessageChannel alloc] initWithName:@"dev.flutter.echo.reset"
24+
binaryMessenger:registrar.messenger
25+
codec:FlutterStandardMessageCodec.sharedInstance];
26+
[reset setMessageHandler:^(id _Nullable message, FlutterReply _Nonnull callback) {
1727
// noop
1828
}];
19-
FlutterBasicMessageChannel* basicStandard = [[FlutterBasicMessageChannel alloc] initWithName:@"dev.flutter.echo.basic.standard" binaryMessenger:registrar.messenger codec:FlutterStandardMessageCodec.sharedInstance];
20-
[basicStandard setMessageHandler:^(id _Nullable message, FlutterReply _Nonnull callback) {
29+
FlutterBasicMessageChannel *basicStandard = [[FlutterBasicMessageChannel alloc]
30+
initWithName:@"dev.flutter.echo.basic.standard"
31+
binaryMessenger:registrar.messenger
32+
codec:FlutterStandardMessageCodec.sharedInstance];
33+
[basicStandard setMessageHandler:^(id _Nullable message, FlutterReply _Nonnull callback) {
2134
callback(message);
2235
}];
23-
FlutterBasicMessageChannel* basicBinary = [[FlutterBasicMessageChannel alloc] initWithName:@"dev.flutter.echo.basic.binary" binaryMessenger:registrar.messenger codec:FlutterBinaryCodec.sharedInstance];
24-
[basicBinary setMessageHandler:^(id _Nullable message, FlutterReply _Nonnull callback) {
36+
FlutterBasicMessageChannel *basicBinary =
37+
[[FlutterBasicMessageChannel alloc] initWithName:@"dev.flutter.echo.basic.binary"
38+
binaryMessenger:registrar.messenger
39+
codec:FlutterBinaryCodec.sharedInstance];
40+
[basicBinary setMessageHandler:^(id _Nullable message, FlutterReply _Nonnull callback) {
2541
callback(message);
2642
}];
27-
NSObject<FlutterTaskQueue>* taskQueue = [registrar.messenger makeBackgroundTaskQueue];
28-
FlutterBasicMessageChannel* background =
29-
[[FlutterBasicMessageChannel alloc] initWithName:@"dev.flutter.echo.background.standard" binaryMessenger:registrar.messenger codec:FlutterStandardMessageCodec.sharedInstance taskQueue:taskQueue];
30-
[background setMessageHandler:^(id _Nullable message, FlutterReply _Nonnull callback) {
43+
NSObject<FlutterTaskQueue> *taskQueue = [registrar.messenger makeBackgroundTaskQueue];
44+
FlutterBasicMessageChannel *background = [[FlutterBasicMessageChannel alloc]
45+
initWithName:@"dev.flutter.echo.background.standard"
46+
binaryMessenger:registrar.messenger
47+
codec:FlutterStandardMessageCodec.sharedInstance
48+
taskQueue:taskQueue];
49+
[background setMessageHandler:^(id _Nullable message, FlutterReply _Nonnull callback) {
3150
callback(message);
3251
}];
33-
return YES;
3452
}
3553

3654
@end

‎dev/benchmarks/platform_channels_benchmarks/ios/Runner/Info.plist‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,5 +45,26 @@
4545
<string>UIInterfaceOrientationLandscapeLeft</string>
4646
<string>UIInterfaceOrientationLandscapeRight</string>
4747
</array>
48+
<key>UIApplicationSceneManifest</key>
49+
<dict>
50+
<key>UIApplicationSupportsMultipleScenes</key>
51+
<false/>
52+
<key>UISceneConfigurations</key>
53+
<dict>
54+
<key>UIWindowSceneSessionRoleApplication</key>
55+
<array>
56+
<dict>
57+
<key>UISceneClassName</key>
58+
<string>UIWindowScene</string>
59+
<key>UISceneDelegateClassName</key>
60+
<string>FlutterSceneDelegate</string>
61+
<key>UISceneConfigurationName</key>
62+
<string>flutter</string>
63+
<key>UISceneStoryboardFile</key>
64+
<string>Main</string>
65+
</dict>
66+
</array>
67+
</dict>
68+
</dict>
4869
</dict>
4970
</plist>

‎dev/benchmarks/platform_views_layout/ios/Runner/AppDelegate.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@
55
#import <Flutter/Flutter.h>
66
#import <UIKit/UIKit.h>
77

8-
@interface AppDelegate : FlutterAppDelegate
8+
@interface AppDelegate : FlutterAppDelegate <FlutterImplicitEngineDelegate>
99

1010
@end

‎dev/benchmarks/platform_views_layout/ios/Runner/AppDelegate.m‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,20 @@ @implementation AppDelegate
1010

1111
- (BOOL)application:(UIApplication *)application
1212
didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
13-
[GeneratedPluginRegistrant registerWithRegistry:self];
13+
// Override point for customization after application launch.
14+
return [super application:application didFinishLaunchingWithOptions:launchOptions];
15+
}
16+
17+
- (void)didInitializeImplicitFlutterEngine:(NSObject<FlutterImplicitEngineBridge> *)engineBridge {
18+
[GeneratedPluginRegistrant registerWithRegistry:engineBridge.pluginRegistry];
1419

15-
NSObject<FlutterPluginRegistrar>* registrar =
16-
[self registrarForPlugin:@"benchmarks/platform_views_layout/DummyPlatformViewPlugin"];
20+
NSObject<FlutterPluginRegistrar> *registrar =
21+
[engineBridge.pluginRegistry registrarForPlugin:@"benchmarks/platform_views_layout/DummyPlatformViewPlugin"];
1722

18-
DummyPlatformViewFactory* dummyPlatformViewFactory = [[DummyPlatformViewFactory alloc] init];
23+
DummyPlatformViewFactory *dummyPlatformViewFactory = [[DummyPlatformViewFactory alloc] init];
1924
[registrar registerViewFactory:dummyPlatformViewFactory
20-
withId:@"benchmarks/platform_views_layout/DummyPlatformView"
25+
withId:@"benchmarks/platform_views_layout/DummyPlatformView"
2126
gestureRecognizersBlockingPolicy:FlutterPlatformViewGestureRecognizersBlockingPolicyEager];
22-
23-
// Override point for customization after application launch.
24-
return [super application:application didFinishLaunchingWithOptions:launchOptions];
2527
}
2628

2729
@end

‎dev/benchmarks/platform_views_layout/ios/Runner/Info.plist‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,5 +49,26 @@
4949
<true/>
5050
<key>io.flutter.metal_preview</key>
5151
<true/>
52+
<key>UIApplicationSceneManifest</key>
53+
<dict>
54+
<key>UIApplicationSupportsMultipleScenes</key>
55+
<false/>
56+
<key>UISceneConfigurations</key>
57+
<dict>
58+
<key>UIWindowSceneSessionRoleApplication</key>
59+
<array>
60+
<dict>
61+
<key>UISceneClassName</key>
62+
<string>UIWindowScene</string>
63+
<key>UISceneDelegateClassName</key>
64+
<string>FlutterSceneDelegate</string>
65+
<key>UISceneConfigurationName</key>
66+
<string>flutter</string>
67+
<key>UISceneStoryboardFile</key>
68+
<string>Main</string>
69+
</dict>
70+
</array>
71+
</dict>
72+
</dict>
5273
</dict>
5374
</plist>

‎dev/benchmarks/platform_views_layout_hybrid_composition/ios/Runner/AppDelegate.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@
55
#import <Flutter/Flutter.h>
66
#import <UIKit/UIKit.h>
77

8-
@interface AppDelegate : FlutterAppDelegate
8+
@interface AppDelegate : FlutterAppDelegate <FlutterImplicitEngineDelegate>
99

1010
@end

‎dev/benchmarks/platform_views_layout_hybrid_composition/ios/Runner/AppDelegate.m‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,20 @@ @implementation AppDelegate
1010

1111
- (BOOL)application:(UIApplication *)application
1212
didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
13-
[GeneratedPluginRegistrant registerWithRegistry:self];
13+
// Override point for customization after application launch.
14+
return [super application:application didFinishLaunchingWithOptions:launchOptions];
15+
}
16+
17+
- (void)didInitializeImplicitFlutterEngine:(NSObject<FlutterImplicitEngineBridge> *)engineBridge {
18+
[GeneratedPluginRegistrant registerWithRegistry:engineBridge.pluginRegistry];
1419

15-
NSObject<FlutterPluginRegistrar>* registrar =
16-
[self registrarForPlugin:@"benchmarks/platform_views_layout_hybrid_composition/DummyPlatformViewPlugin"];
20+
NSObject<FlutterPluginRegistrar> *registrar =
21+
[engineBridge.pluginRegistry registrarForPlugin:@"benchmarks/platform_views_layout_hybrid_composition/DummyPlatformViewPlugin"];
1722

18-
DummyPlatformViewFactory* dummyPlatformViewFactory = [[DummyPlatformViewFactory alloc] init];
23+
DummyPlatformViewFactory *dummyPlatformViewFactory = [[DummyPlatformViewFactory alloc] init];
1924
[registrar registerViewFactory:dummyPlatformViewFactory
20-
withId:@"benchmarks/platform_views_layout_hybrid_composition/DummyPlatformView"
25+
withId:@"benchmarks/platform_views_layout_hybrid_composition/DummyPlatformView"
2126
gestureRecognizersBlockingPolicy:FlutterPlatformViewGestureRecognizersBlockingPolicyEager];
22-
23-
// Override point for customization after application launch.
24-
return [super application:application didFinishLaunchingWithOptions:launchOptions];
2527
}
2628

2729
@end

‎dev/benchmarks/platform_views_layout_hybrid_composition/ios/Runner/Info.plist‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,5 +47,26 @@
4747
<true/>
4848
<key>UIApplicationSupportsIndirectInputEvents</key>
4949
<true/>
50+
<key>UIApplicationSceneManifest</key>
51+
<dict>
52+
<key>UIApplicationSupportsMultipleScenes</key>
53+
<false/>
54+
<key>UISceneConfigurations</key>
55+
<dict>
56+
<key>UIWindowSceneSessionRoleApplication</key>
57+
<array>
58+
<dict>
59+
<key>UISceneClassName</key>
60+
<string>UIWindowScene</string>
61+
<key>UISceneDelegateClassName</key>
62+
<string>FlutterSceneDelegate</string>
63+
<key>UISceneConfigurationName</key>
64+
<string>flutter</string>
65+
<key>UISceneStoryboardFile</key>
66+
<string>Main</string>
67+
</dict>
68+
</array>
69+
</dict>
70+
</dict>
5071
</dict>
5172
</plist>

0 commit comments

Comments
 (0)