review

format

Author: Chris Yang

shell/platform/darwin/common/framework/Source/FlutterNSBundleUtils.mm

@@ -8,6 +8,20 @@
 
 FLUTTER_ASSERT_ARC
 
+static GetFlutterAssetPathFromBundle(NSBundle* bundle) {
+  NSString* flutterAssetsPath = FLTAssetPath(bundle);
+  // Use the raw path solution so that asset path can be returned from unloaded bundles.
+  // See https://github.com/flutter/engine/pull/46073
+  NSString* assetsPath = [bundle pathForResource:flutterAssetsPath ofType:nil];
+  if (assetsPath.length == 0) {
+    // In app extension, using full relative path (kDefaultAssetPath)
+    // returns nil when the app bundle is not loaded. Try to use
+    // the sub folder name, which can successfully return a valid path.
+    assetsPath = [bundle pathForResource:@"flutter_assets" ofType:nil];
+  }
+  return assetsPath;
+}
+
 const NSString* kDefaultAssetPath = @"Frameworks/App.framework/flutter_assets";
 
 NSBundle* FLTFrameworkBundleInternal(NSString* flutterFrameworkBundleID, NSURL* searchURL) {
@@ -29,7 +43,7 @@
 }
 
 NSBundle* FLTGetApplicationBundle() {
-  NSBundle* mainBundle = [NSBundle mainBundle];
+  NSBundle* mainBundle = NSBundle.mainBundle;
   // App extension bundle is in <AppName>.app/PlugIns/Extension.appex.
   if ([mainBundle.bundleURL.pathExtension isEqualToString:@"appex"]) {
     // Up two levels.
@@ -48,7 +62,7 @@
     flutterFrameworkBundle = [NSBundle bundleWithIdentifier:flutterFrameworkBundleID];
   }
   if (flutterFrameworkBundle == nil) {
-    flutterFrameworkBundle = [NSBundle mainBundle];
+    flutterFrameworkBundle = NSBundle.mainBundle;
   }
   return flutterFrameworkBundle;
 }
@@ -58,26 +72,9 @@
 }
 
 NSString* FLTAssetsPathFromBundle(NSBundle* bundle) {
-  NSString* flutterAssetsPath = FLTAssetPath(bundle);
-  // Use the raw path solution so that asset path can be returned from unloaded bundles.
-  // See https://github.com/flutter/engine/pull/46073
-  NSString* assetsPath = [bundle pathForResource:flutterAssetsPath ofType:nil];
-  if (assetsPath.length == 0) {
-    // In app extension, using full relative path(kDefaultAssetPath)
-    // returns nil when the app bundle is not loaded. We try to use
-    // the sub folder name, which can successfully return a valid path.
-    assetsPath = [bundle pathForResource:@"flutter_assets" ofType:nil];
+  NSString* flutterAssetsPath = GetFlutterAssetPathFromBundle(bundle);
+  if (flutterAssetsPath.length == 0) {
+    flutterAssetsPath = GetFlutterAssetPathFromBundle(NSBundle.mainBundle);
   }
-
-  if (assetsPath.length == 0) {
-    assetsPath = [[NSBundle mainBundle] pathForResource:flutterAssetsPath ofType:nil];
-  }
-
-  if (assetsPath.length == 0) {
-    // In app extension, using full relative path(kDefaultAssetPath)
-    // returns nil when the app bundle is not loaded. We try to use
-    // the sub folder name, which can successfully return a valid path.
-    assetsPath = [[NSBundle mainBundle] pathForResource:@"flutter_assets" ofType:nil];
-  }
-  return assetsPath;
+  return flutterAssetsPath;
 }

testing/scenario_app/ios/FlutterAppExtensionTestHost/FlutterAppExtensionTestHost/AppDelegate.h

@@ -1,4 +1,4 @@
-// Copyright 2018 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Flutter Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 

testing/scenario_app/ios/FlutterAppExtensionTestHost/FlutterAppExtensionTestHost/AppDelegate.m

@@ -1,6 +1,7 @@
-// Copyright 2018 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Flutter Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
+
 #import "AppDelegate.h"
 
 @interface AppDelegate ()

testing/scenario_app/ios/FlutterAppExtensionTestHost/FlutterAppExtensionTestHost/SceneDelegate.h

@@ -1,4 +1,4 @@
-// Copyright 2018 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Flutter Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 

testing/scenario_app/ios/FlutterAppExtensionTestHost/FlutterAppExtensionTestHost/SceneDelegate.m

@@ -1,4 +1,4 @@
-// Copyright 2018 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Flutter Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 

testing/scenario_app/ios/FlutterAppExtensionTestHost/FlutterAppExtensionTestHost/ViewController.h

@@ -1,4 +1,4 @@
-// Copyright 2018 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Flutter Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 

testing/scenario_app/ios/FlutterAppExtensionTestHost/FlutterAppExtensionTestHost/ViewController.m

@@ -1,4 +1,4 @@
-// Copyright 2018 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Flutter Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 

testing/scenario_app/ios/FlutterAppExtensionTestHost/FlutterAppExtensionTestHost/main.m

@@ -1,4 +1,4 @@
-// Copyright 2018 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Flutter Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 

testing/scenario_app/ios/Scenarios/ScenariosShare/ShareViewController.h

@@ -1,4 +1,4 @@
-// Copyright 2018 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Flutter Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 

testing/scenario_app/ios/Scenarios/ScenariosShare/ShareViewController.m

@@ -1,4 +1,4 @@
-// Copyright 2018 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Flutter Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 

testing/scenario_app/ios/Scenarios/ScenariosUITests/AppExtensionTests.m

@@ -27,9 +27,9 @@ - (void)testAppExtensionLaunching {
   }
   [button tap];
   BOOL launchedExtensionInFlutter = NO;
-  // Custom share extenton button (like the one we made in this test) does not have a unique
+  // Custom share extension button (like the one in this test) does not have a unique
   // identity. They are all identified as `XCElementSnapshotPrivilegedValuePlaceholder`.
-  // We loop through all the `XCElementSnapshotPrivilegedValuePlaceholder` and find the Flutter one.
+  // Loop through all the `XCElementSnapshotPrivilegedValuePlaceholder` and find the Flutter one.
   for (int i = 0; i < self.hostApplication.collectionViews.cells.count; i++) {
     XCUIElement* shareSheetCell =
         [self.hostApplication.collectionViews.cells elementBoundByIndex:i];