From 00a6b486714a13978603146c013c90cc5d4d86b1 Mon Sep 17 00:00:00 2001 From: James Lin Date: Wed, 25 Jul 2018 20:05:18 -0700 Subject: [PATCH 1/3] Add an explicit `-[FlutterViewController init]` implementation `-[FlutterViewController init]` currently works because it inherits the `-[UIViewController init]` convenience initializer that invokes the `-[UIViewController initWithNibName:bundle:]` designated initializer that `FlutterViewController` overrides. However, this doesn't seem to be explicitly documented, so it's a bit confusing (or at least non-obvious), and it seems potentially brittle. Add an explicit implementation of `-[FlutterViewController init]` instead. --- .../darwin/ios/framework/Source/FlutterViewController.mm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/shell/platform/darwin/ios/framework/Source/FlutterViewController.mm b/shell/platform/darwin/ios/framework/Source/FlutterViewController.mm index 2839ece8c09c8..b998acc96add1 100644 --- a/shell/platform/darwin/ios/framework/Source/FlutterViewController.mm +++ b/shell/platform/darwin/ios/framework/Source/FlutterViewController.mm @@ -84,6 +84,10 @@ - (instancetype)initWithCoder:(NSCoder*)aDecoder { return [self initWithProject:nil nibName:nil bundle:nil]; } +- (instancetype) init { + return [self initWithProject:nil nibName:nil bundle: nil]; +} + #pragma mark - Common view controller initialization tasks - (void)performCommonViewControllerInitialization { From 33231a235b35844bc0d246dcaa2ade1561b5f973 Mon Sep 17 00:00:00 2001 From: James Lin Date: Wed, 1 Aug 2018 17:22:39 -0700 Subject: [PATCH 2/3] Fix formatting --- .../darwin/ios/framework/Source/FlutterViewController.mm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shell/platform/darwin/ios/framework/Source/FlutterViewController.mm b/shell/platform/darwin/ios/framework/Source/FlutterViewController.mm index b998acc96add1..4fced62153ec5 100644 --- a/shell/platform/darwin/ios/framework/Source/FlutterViewController.mm +++ b/shell/platform/darwin/ios/framework/Source/FlutterViewController.mm @@ -84,7 +84,7 @@ - (instancetype)initWithCoder:(NSCoder*)aDecoder { return [self initWithProject:nil nibName:nil bundle:nil]; } -- (instancetype) init { +- (instancetype)init { return [self initWithProject:nil nibName:nil bundle: nil]; } From 2ee88e8fdea7d382584e6e03da5893a2bb44fcd3 Mon Sep 17 00:00:00 2001 From: James Lin Date: Wed, 1 Aug 2018 17:26:44 -0700 Subject: [PATCH 3/3] Fix more formatting --- .../darwin/ios/framework/Source/FlutterViewController.mm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shell/platform/darwin/ios/framework/Source/FlutterViewController.mm b/shell/platform/darwin/ios/framework/Source/FlutterViewController.mm index 4fced62153ec5..16ded625da821 100644 --- a/shell/platform/darwin/ios/framework/Source/FlutterViewController.mm +++ b/shell/platform/darwin/ios/framework/Source/FlutterViewController.mm @@ -85,7 +85,7 @@ - (instancetype)initWithCoder:(NSCoder*)aDecoder { } - (instancetype)init { - return [self initWithProject:nil nibName:nil bundle: nil]; + return [self initWithProject:nil nibName:nil bundle:nil]; } #pragma mark - Common view controller initialization tasks