Skip to content

Commit b7362ab

Browse files
authored
Uiscene migrate add2app hosts (flutter#191847)
part of flutter#188336
1 parent 8d1fa85 commit b7362ab

10 files changed

Lines changed: 131 additions & 44 deletions

File tree

‎dev/integration_tests/ios_add2app_life_cycle/ios_add2app.xcodeproj/project.pbxproj‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
24E221DE21A28B23008ADF09 /* MainViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 24E221D421A28B23008ADF09 /* MainViewController.m */; };
1515
24E221E021A28B23008ADF09 /* Launch Screen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 24E221D721A28B23008ADF09 /* Launch Screen.storyboard */; };
1616
24E221E221A28B36008ADF09 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 24E221E121A28B36008ADF09 /* Assets.xcassets */; };
17+
24E221E721A28B40008ADF09 /* SceneDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 24E221E621A28B40008ADF09 /* SceneDelegate.m */; };
1718
DB9A200AFEB7AAE22B4E12E4 /* libPods-ios_add2app.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7A318514E0307AE0FF0EFC76 /* libPods-ios_add2app.a */; };
1819
F73B66B8262F6FE1002080A0 /* IntegrationTests.m in Sources */ = {isa = PBXBuildFile; fileRef = F73B66B7262F6FE1002080A0 /* IntegrationTests.m */; };
1920
/* End PBXBuildFile section */
@@ -41,6 +42,8 @@
4142
24E221D421A28B23008ADF09 /* MainViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MainViewController.m; sourceTree = "<group>"; };
4243
24E221D721A28B23008ADF09 /* Launch Screen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = "Launch Screen.storyboard"; sourceTree = "<group>"; };
4344
24E221E121A28B36008ADF09 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
45+
24E221E521A28B40008ADF09 /* SceneDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SceneDelegate.h; sourceTree = "<group>"; };
46+
24E221E621A28B40008ADF09 /* SceneDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SceneDelegate.m; sourceTree = "<group>"; };
4447
7A318514E0307AE0FF0EFC76 /* libPods-ios_add2app.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-ios_add2app.a"; sourceTree = BUILT_PRODUCTS_DIR; };
4548
86B9DCFF5941A3BAC28862C3 /* libPods-ios_add2appTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-ios_add2appTests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
4649
A18D4CDABD6795975FD6B49F /* Pods-ios_add2app.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ios_add2app.release.xcconfig"; path = "Pods/Target Support Files/Pods-ios_add2app/Pods-ios_add2app.release.xcconfig"; sourceTree = "<group>"; };
@@ -102,6 +105,8 @@
102105
24E221D421A28B23008ADF09 /* MainViewController.m */,
103106
24E221B821A28A0B008ADF09 /* AppDelegate.h */,
104107
24E221B921A28A0B008ADF09 /* AppDelegate.m */,
108+
24E221E521A28B40008ADF09 /* SceneDelegate.h */,
109+
24E221E621A28B40008ADF09 /* SceneDelegate.m */,
105110
24E221C621A28A0C008ADF09 /* Info.plist */,
106111
24E221C721A28A0C008ADF09 /* main.m */,
107112
);
@@ -150,6 +155,7 @@
150155
24E221B221A28A0B008ADF09 /* Frameworks */,
151156
24E221B321A28A0B008ADF09 /* Resources */,
152157
7FADF19EC61F97E525982780 /* [CP] Embed Pods Frameworks */,
158+
E60026AD66E6FA84412ED3FF /* [CP-User] Embed Flutter Build ios_add2app_life_cycle_flutter Script */,
153159
);
154160
buildRules = (
155161
);
@@ -168,7 +174,6 @@
168174
F73B66A9262F6F87002080A0 /* Sources */,
169175
F73B66AA262F6F87002080A0 /* Frameworks */,
170176
F73B66AB262F6F87002080A0 /* Resources */,
171-
B7873FC60D5B7AA97A1DE937 /* [CP] Embed Pods Frameworks */,
172177
);
173178
buildRules = (
174179
);
@@ -287,22 +292,15 @@
287292
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-ios_add2app/Pods-ios_add2app-frameworks.sh\"\n";
288293
showEnvVarsInLog = 0;
289294
};
290-
B7873FC60D5B7AA97A1DE937 /* [CP] Embed Pods Frameworks */ = {
295+
E60026AD66E6FA84412ED3FF /* [CP-User] Embed Flutter Build ios_add2app_life_cycle_flutter Script */ = {
291296
isa = PBXShellScriptBuildPhase;
292297
buildActionMask = 2147483647;
293298
files = (
294299
);
295-
inputFileListPaths = (
296-
"${PODS_ROOT}/Target Support Files/Pods-ios_add2appTests/Pods-ios_add2appTests-frameworks-${CONFIGURATION}-input-files.xcfilelist",
297-
);
298-
name = "[CP] Embed Pods Frameworks";
299-
outputFileListPaths = (
300-
"${PODS_ROOT}/Target Support Files/Pods-ios_add2appTests/Pods-ios_add2appTests-frameworks-${CONFIGURATION}-output-files.xcfilelist",
301-
);
300+
name = "[CP-User] Embed Flutter Build ios_add2app_life_cycle_flutter Script";
302301
runOnlyForDeploymentPostprocessing = 0;
303302
shellPath = /bin/sh;
304-
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-ios_add2appTests/Pods-ios_add2appTests-frameworks.sh\"\n";
305-
showEnvVarsInLog = 0;
303+
shellScript = "set -e\nset -u\nsource \"${SRCROOT}/flutterapp/.ios/Flutter/flutter_export_environment.sh\"\nexport VERBOSE_SCRIPT_LOGGING=1 && \"$FLUTTER_ROOT\"/packages/flutter_tools/bin/xcode_backend.sh embed_and_thin";
306304
};
307305
F841B20A4BA845744CC6A838 /* [CP] Check Pods Manifest.lock */ = {
308306
isa = PBXShellScriptBuildPhase;
@@ -337,6 +335,7 @@
337335
24E221DE21A28B23008ADF09 /* MainViewController.m in Sources */,
338336
24E221DD21A28B23008ADF09 /* FullScreenViewController.m in Sources */,
339337
24E221BA21A28A0B008ADF09 /* AppDelegate.m in Sources */,
338+
24E221E721A28B40008ADF09 /* SceneDelegate.m in Sources */,
340339
);
341340
runOnlyForDeploymentPostprocessing = 0;
342341
};

‎dev/integration_tests/ios_add2app_life_cycle/ios_add2app/AppDelegate.m‎

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
// found in the LICENSE file.
44

55
#import "AppDelegate.h"
6-
#import "MainViewController.h"
76

87
@implementation GREYHostApplicationDistantObject (AppDelegate)
98

@@ -15,29 +14,18 @@ - (NSNotificationCenter *)notificationCenter {
1514

1615
@interface AppDelegate ()
1716

18-
@property(nonatomic, strong, readwrite) FlutterEngine* engine;
17+
@property(nonatomic, strong, readwrite) FlutterEngine *engine;
1918

2019
@end
2120

2221
@implementation AppDelegate
2322

2423
- (BOOL)application:(UIApplication *)application
2524
didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
26-
self.window = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
27-
28-
MainViewController *mainViewController = [[MainViewController alloc] init];
29-
UINavigationController *navigationController = [[UINavigationController alloc]
30-
initWithRootViewController:mainViewController];
31-
32-
navigationController.navigationBar.translucent = NO;
33-
3425
self.engine = [[FlutterEngine alloc] initWithName:@"test" project:nil];
3526
[self.engine runWithEntrypoint:nil];
3627

37-
self.window.rootViewController = navigationController;
38-
[self.window makeKeyAndVisible];
39-
40-
return YES;
28+
return [super application:application didFinishLaunchingWithOptions:launchOptions];
4129
}
4230

4331
@end

‎dev/integration_tests/ios_add2app_life_cycle/ios_add2app/Info.plist‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,5 +39,22 @@
3939
<string>UIInterfaceOrientationLandscapeLeft</string>
4040
<string>UIInterfaceOrientationLandscapeRight</string>
4141
</array>
42+
<key>UIApplicationSceneManifest</key>
43+
<dict>
44+
<key>UIApplicationSupportsMultipleScenes</key>
45+
<false/>
46+
<key>UISceneConfigurations</key>
47+
<dict>
48+
<key>UIWindowSceneSessionRoleApplication</key>
49+
<array>
50+
<dict>
51+
<key>UISceneConfigurationName</key>
52+
<string>Default Configuration</string>
53+
<key>UISceneDelegateClassName</key>
54+
<string>SceneDelegate</string>
55+
</dict>
56+
</array>
57+
</dict>
58+
</dict>
4259
</dict>
4360
</plist>
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
// Copyright 2014 The Flutter Authors. All rights reserved.
2+
// Use of this source code is governed by a BSD-style license that can be
3+
// found in the LICENSE file.
4+
5+
#import <UIKit/UIKit.h>
6+
7+
@interface SceneDelegate : UIResponder <UIWindowSceneDelegate>
8+
9+
@property (strong, nonatomic) UIWindow *window;
10+
11+
@end
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
// Copyright 2014 The Flutter Authors. All rights reserved.
2+
// Use of this source code is governed by a BSD-style license that can be
3+
// found in the LICENSE file.
4+
5+
#import "SceneDelegate.h"
6+
#import "MainViewController.h"
7+
8+
@implementation SceneDelegate
9+
10+
- (void)scene:(UIScene *)scene
11+
willConnectToSession:(UISceneSession *)session
12+
options:(UISceneConnectionOptions *)connectionOptions {
13+
UIWindowScene *windowScene = (UIWindowScene *)scene;
14+
self.window = [[UIWindow alloc] initWithWindowScene:windowScene];
15+
16+
MainViewController *mainViewController = [[MainViewController alloc] init];
17+
UINavigationController *navigationController =
18+
[[UINavigationController alloc] initWithRootViewController:mainViewController];
19+
20+
navigationController.navigationBar.translucent = NO;
21+
22+
self.window.rootViewController = navigationController;
23+
[self.window makeKeyAndVisible];
24+
}
25+
26+
@end

‎dev/integration_tests/ios_host_app/Host.xcodeproj/project.pbxproj‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
/* Begin PBXBuildFile section */
1010
4AF9D63425F74F0694CAB07D /* libPods-Host.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E20960BD8B505D605FE82853 /* libPods-Host.a */; };
1111
74F97866215AB9E8005A0F04 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 74F97865215AB9E8005A0F04 /* AppDelegate.m */; };
12+
74F97878215AB9EA005A0F04 /* SceneDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 74F97877215AB9EA005A0F04 /* SceneDelegate.m */; };
1213
74F9786E215AB9E9005A0F04 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 74F9786D215AB9E9005A0F04 /* Assets.xcassets */; };
1314
74F97871215AB9E9005A0F04 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 74F9786F215AB9E9005A0F04 /* LaunchScreen.storyboard */; };
1415
74F97874215AB9E9005A0F04 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 74F97873215AB9E9005A0F04 /* main.m */; };
@@ -39,6 +40,8 @@
3940
74F97861215AB9E8005A0F04 /* Host.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Host.app; sourceTree = BUILT_PRODUCTS_DIR; };
4041
74F97864215AB9E8005A0F04 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
4142
74F97865215AB9E8005A0F04 /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
43+
74F97876215AB9EA005A0F04 /* SceneDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SceneDelegate.h; sourceTree = "<group>"; };
44+
74F97877215AB9EA005A0F04 /* SceneDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SceneDelegate.m; sourceTree = "<group>"; };
4245
74F9786D215AB9E9005A0F04 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
4346
74F97870215AB9E9005A0F04 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
4447
74F97872215AB9E9005A0F04 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
@@ -120,6 +123,8 @@
120123
F7C2661124AC18D00085742D /* HybridViewController.m */,
121124
74F97864215AB9E8005A0F04 /* AppDelegate.h */,
122125
74F97865215AB9E8005A0F04 /* AppDelegate.m */,
126+
74F97876215AB9EA005A0F04 /* SceneDelegate.h */,
127+
74F97877215AB9EA005A0F04 /* SceneDelegate.m */,
123128
74F9786D215AB9E9005A0F04 /* Assets.xcassets */,
124129
74F9786F215AB9E9005A0F04 /* LaunchScreen.storyboard */,
125130
74F97872215AB9E9005A0F04 /* Info.plist */,
@@ -396,6 +401,7 @@
396401
F7C2661624AC18D00085742D /* HybridViewController.m in Sources */,
397402
F7C2661B24AC18DD0085742D /* NativeViewController.m in Sources */,
398403
74F97866215AB9E8005A0F04 /* AppDelegate.m in Sources */,
404+
74F97878215AB9EA005A0F04 /* SceneDelegate.m in Sources */,
399405
);
400406
runOnlyForDeploymentPostprocessing = 0;
401407
};

‎dev/integration_tests/ios_host_app/Host/AppDelegate.m‎

Lines changed: 5 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
// found in the LICENSE file.
44

55
#import "AppDelegate.h"
6-
#import "MainViewController.h"
76

87
@interface AppDelegate ()
98

@@ -12,8 +11,6 @@ @interface AppDelegate ()
1211
static NSString *_kReloadChannelName = @"reload";
1312

1413
@implementation AppDelegate {
15-
MainViewController *_mainViewController;
16-
UINavigationController *_navigationController;
1714
FlutterEngine *_engine;
1815
FlutterBasicMessageChannel *_reloadMessageChannel;
1916
}
@@ -28,26 +25,15 @@ - (FlutterBasicMessageChannel *)reloadMessageChannel {
2825

2926
- (BOOL)application:(UIApplication *)application
3027
didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
31-
self.window = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
32-
33-
_mainViewController = [[MainViewController alloc] init];
34-
_navigationController = [[UINavigationController alloc]
35-
initWithRootViewController:_mainViewController];
36-
37-
_navigationController.navigationBar.translucent = NO;
38-
3928
_engine = [[FlutterEngine alloc] initWithName:@"test" project:nil];
4029
[_engine runWithEntrypoint:nil];
4130

42-
_reloadMessageChannel = [[FlutterBasicMessageChannel alloc]
43-
initWithName:_kReloadChannelName
44-
binaryMessenger:_engine.binaryMessenger
45-
codec:[FlutterStringCodec sharedInstance]];
46-
47-
self.window.rootViewController = _navigationController;
48-
[self.window makeKeyAndVisible];
31+
_reloadMessageChannel =
32+
[[FlutterBasicMessageChannel alloc] initWithName:_kReloadChannelName
33+
binaryMessenger:_engine.binaryMessenger
34+
codec:[FlutterStringCodec sharedInstance]];
4935

50-
return YES;
36+
return [super application:application didFinishLaunchingWithOptions:launchOptions];
5137
}
5238

5339
@end

‎dev/integration_tests/ios_host_app/Host/Info.plist‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,5 +39,22 @@
3939
<string>UIInterfaceOrientationLandscapeLeft</string>
4040
<string>UIInterfaceOrientationLandscapeRight</string>
4141
</array>
42+
<key>UIApplicationSceneManifest</key>
43+
<dict>
44+
<key>UIApplicationSupportsMultipleScenes</key>
45+
<false/>
46+
<key>UISceneConfigurations</key>
47+
<dict>
48+
<key>UIWindowSceneSessionRoleApplication</key>
49+
<array>
50+
<dict>
51+
<key>UISceneConfigurationName</key>
52+
<string>Default Configuration</string>
53+
<key>UISceneDelegateClassName</key>
54+
<string>SceneDelegate</string>
55+
</dict>
56+
</array>
57+
</dict>
58+
</dict>
4259
</dict>
4360
</plist>
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
// Copyright 2014 The Flutter Authors. All rights reserved.
2+
// Use of this source code is governed by a BSD-style license that can be
3+
// found in the LICENSE file.
4+
5+
#import <UIKit/UIKit.h>
6+
7+
@interface SceneDelegate : UIResponder <UIWindowSceneDelegate>
8+
9+
@property (strong, nonatomic) UIWindow *window;
10+
11+
@end
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
// Copyright 2014 The Flutter Authors. All rights reserved.
2+
// Use of this source code is governed by a BSD-style license that can be
3+
// found in the LICENSE file.
4+
5+
#import "SceneDelegate.h"
6+
#import "MainViewController.h"
7+
8+
@implementation SceneDelegate
9+
10+
- (void)scene:(UIScene *)scene
11+
willConnectToSession:(UISceneSession *)session
12+
options:(UISceneConnectionOptions *)connectionOptions {
13+
UIWindowScene *windowScene = (UIWindowScene *)scene;
14+
self.window = [[UIWindow alloc] initWithWindowScene:windowScene];
15+
16+
MainViewController *mainViewController = [[MainViewController alloc] init];
17+
UINavigationController *navigationController =
18+
[[UINavigationController alloc] initWithRootViewController:mainViewController];
19+
20+
navigationController.navigationBar.translucent = NO;
21+
22+
self.window.rootViewController = navigationController;
23+
[self.window makeKeyAndVisible];
24+
}
25+
26+
@end

0 commit comments

Comments
 (0)