Ran Convert > To Modern Objective C Syntax

Examples/UIExplorer/UIExplorerIntegrationTests/IntegrationTests.m

@@ -29,7 +29,7 @@ - (void)setUp
   RCTAssert(NO, @"Tests should be run on 32-bit device simulators (e.g. iPhone 5)");
 #endif
 
-  NSOperatingSystemVersion version = [[NSProcessInfo processInfo] operatingSystemVersion];
+  NSOperatingSystemVersion version = [NSProcessInfo processInfo].operatingSystemVersion;
   RCTAssert(version.majorVersion == 8 || version.minorVersion >= 3, @"Tests should be run on iOS 8.3+, found %zd.%zd.%zd", version.majorVersion, version.minorVersion, version.patchVersion);
   _runner = RCTInitRunnerForApp(@"Examples/UIExplorer/UIExplorerIntegrationTests/js/IntegrationTestsApp", nil);
 }

Examples/UIExplorer/UIExplorerIntegrationTests/RCTUIManagerScenarioTests.m

@@ -50,7 +50,7 @@ - (void)setUp
   // Register 20 views to use in the tests
   for (NSInteger i = 1; i <= 20; i++) {
     UIView *registeredView = [UIView new];
-    [registeredView setReactTag:@(i)];
+    registeredView.reactTag = @(i);
     _uiManager.viewRegistry[i] = registeredView;
   }
 }
@@ -92,7 +92,7 @@ - (void)testManagingChildrenToRemoveViews
 
   NSArray *removeAtIndices = @[@0, @4, @8, @12, @16];
   for (NSNumber *index in removeAtIndices) {
-    NSNumber *reactTag = @([index integerValue] + 2);
+    NSNumber *reactTag = @(index.integerValue + 2);
     [removedViews addObject:_uiManager.viewRegistry[reactTag]];
   }
   for (NSInteger i = 2; i < 20; i++) {

Examples/UIExplorer/UIExplorerIntegrationTests/UIExplorerSnapshotTests.m

@@ -36,7 +36,7 @@ - (void)setUp
   RCTAssert(NO, @"Tests should be run on 32-bit device simulators (e.g. iPhone 5)");
 #endif
 
-  NSOperatingSystemVersion version = [[NSProcessInfo processInfo] operatingSystemVersion];
+  NSOperatingSystemVersion version = [NSProcessInfo processInfo].operatingSystemVersion;
   RCTAssert(version.majorVersion == 8 || version.minorVersion >= 3, @"Snapshot tests should be run on iOS 8.3+, found %zd.%zd.%zd", version.majorVersion, version.minorVersion, version.patchVersion);
   _runner = RCTInitRunnerForApp(@"Examples/UIExplorer/UIExplorerApp.ios", nil);
   _runner.recordMode = NO;

Examples/UIExplorer/UIExplorerUnitTests/RCTUIManagerTests.m

@@ -49,7 +49,7 @@ - (void)setUp
   // Register 20 views to use in the tests
   for (NSInteger i = 1; i <= 20; i++) {
     UIView *registeredView = [UIView new];
-    [registeredView setReactTag:@(i)];
+    registeredView.reactTag = @(i);
     _uiManager.viewRegistry[i] = registeredView;
   }
 }
@@ -91,7 +91,7 @@ - (void)testManagingChildrenToRemoveViews
 
   NSArray *removeAtIndices = @[@0, @4, @8, @12, @16];
   for (NSNumber *index in removeAtIndices) {
-    NSNumber *reactTag = @([index integerValue] + 2);
+    NSNumber *reactTag = @(index.integerValue + 2);
     [removedViews addObject:_uiManager.viewRegistry[reactTag]];
   }
   for (NSInteger i = 2; i < 20; i++) {

Libraries/ActionSheetIOS/RCTActionSheetManager.m

@@ -60,7 +60,7 @@ - (dispatch_queue_t)methodQueue
 
   _callbacks[RCTKeyForInstance(actionSheet)] = successCallback;
 
-  UIWindow *appWindow = [[[UIApplication sharedApplication] delegate] window];
+  UIWindow *appWindow = [UIApplication sharedApplication].delegate.window;
   if (appWindow == nil) {
     RCTLogError(@"Tried to display action sheet but there is no application window. options: %@", options);
     return;
@@ -81,12 +81,12 @@ - (dispatch_queue_t)methodQueue
   if (URL) {
     [items addObject:URL];
   }
-  if ([items count] == 0) {
+  if (items.count == 0) {
     failureCallback(@[@"No `url` or `message` to share"]);
     return;
   }
   UIActivityViewController *share = [[UIActivityViewController alloc] initWithActivityItems:items applicationActivities:nil];
-  UIViewController *ctrl = [[[[UIApplication sharedApplication] delegate] window] rootViewController];
+  UIViewController *ctrl = [UIApplication sharedApplication].delegate.window.rootViewController;
 
 #if __IPHONE_OS_VERSION_MIN_REQUIRED < __IPHONE_8_0
 
@@ -126,7 +126,7 @@ - (void)actionSheet:(UIActionSheet *)actionSheet clickedButtonAtIndex:(NSInteger
     RCTLogWarn(@"No callback registered for action sheet: %@", actionSheet.title);
   }
 
-  [[[[UIApplication sharedApplication] delegate] window] makeKeyWindow];
+  [[UIApplication sharedApplication].delegate.window makeKeyWindow];
 }
 
 #pragma mark Private

Libraries/Geolocation/RCTLocationObserver.m

@@ -252,7 +252,7 @@ - (void)timeout:(NSTimer *)timer
 - (void)locationManager:(CLLocationManager *)manager didUpdateLocations:(NSArray *)locations
 {
   // Create event
-  CLLocation *location = [locations lastObject];
+  CLLocation *location = locations.lastObject;
   _lastLocationEvent = @{
     @"coords": @{
       @"latitude": @(location.coordinate.latitude),

Libraries/Image/RCTCameraRollManager.m

@@ -34,20 +34,20 @@ @implementation RCTCameraRollManager
       errorCallback(loadError);
       return;
     }
-    [_bridge.assetsLibrary writeImageToSavedPhotosAlbum:[loadedImage CGImage] metadata:nil completionBlock:^(NSURL *assetURL, NSError *saveError) {
+    [_bridge.assetsLibrary writeImageToSavedPhotosAlbum:loadedImage.CGImage metadata:nil completionBlock:^(NSURL *assetURL, NSError *saveError) {
       if (saveError) {
         RCTLogWarn(@"Error saving cropped image: %@", saveError);
         errorCallback(saveError);
       } else {
-        successCallback(@[[assetURL absoluteString]]);
+        successCallback(@[assetURL.absoluteString]);
       }
     }];
   }];
 }
 
 - (void)callCallback:(RCTResponseSenderBlock)callback withAssets:(NSArray *)assets hasNextPage:(BOOL)hasNextPage
 {
-  if (![assets count]) {
+  if (!assets.count) {
     callback(@[@{
                  @"edges": assets,
                  @"page_info": @{
@@ -109,14 +109,14 @@ - (void)callCallback:(RCTResponseSenderBlock)callback withAssets:(NSArray *)asse
 
       [group enumerateAssetsWithOptions:NSEnumerationReverse usingBlock:^(ALAsset *result, NSUInteger index, BOOL *stopAssets) {
         if (result) {
-          NSString *uri = [(NSURL *)[result valueForProperty:ALAssetPropertyAssetURL] absoluteString];
+          NSString *uri = ((NSURL *)[result valueForProperty:ALAssetPropertyAssetURL]).absoluteString;
           if (afterCursor && !foundAfter) {
             if ([afterCursor isEqualToString:uri]) {
               foundAfter = YES;
             }
             return; // Skip until we get to the first one
           }
-          if (first == [assets count]) {
+          if (first == assets.count) {
             *stopAssets = YES;
             *stopGroups = YES;
             hasNextPage = YES;
@@ -138,7 +138,7 @@ - (void)callCallback:(RCTResponseSenderBlock)callback withAssets:(NSArray *)asse
                                       @"width": @(dimensions.width),
                                       @"isStored": @YES,
                                       },
-                                  @"timestamp": @([date timeIntervalSince1970]),
+                                  @"timestamp": @(date.timeIntervalSince1970),
                                   @"location": loc ?
                                   @{
                                     @"latitude": @(loc.coordinate.latitude),

Libraries/Image/RCTGIFImage.m

@@ -85,7 +85,7 @@
     return nil;
   }
 
-  if (![URL isFileURL]) {
+  if (!URL.fileURL) {
     RCTLogError(@"Loading remote image URLs synchronously is a really bad idea.");
     return nil;
   }

Libraries/Image/RCTImageLoader.m

@@ -170,7 +170,7 @@ - (RCTImageLoaderCancellationBlock)loadImageWithTag:(NSString *)imageTag
     // The 'ph://' prefix is used by FBMediaKit to differentiate between
     // assets-library. It is prepended to the local ID so that it is in the
     // form of an, NSURL which is what assets-library uses.
-    NSString *phAssetID = [imageTag substringFromIndex:[@"ph://" length]];
+    NSString *phAssetID = [imageTag substringFromIndex:@"ph://".length];
     PHFetchResult *results = [PHAsset fetchAssetsWithLocalIdentifiers:@[phAssetID] options:nil];
     if (results.count == 0) {
       NSString *errorText = [NSString stringWithFormat:@"Failed to fetch PHAsset with local identifier %@ with no error message.", phAssetID];
@@ -179,7 +179,7 @@ - (RCTImageLoaderCancellationBlock)loadImageWithTag:(NSString *)imageTag
       return ^{};
     }
 
-    PHAsset *asset = [results firstObject];
+    PHAsset *asset = results.firstObject;
 
     PHImageRequestOptions *imageOptions = [PHImageRequestOptions new];
 

Libraries/Image/RCTImagePickerManager.m

@@ -53,7 +53,7 @@ - (instancetype)init
                   successCallback:(RCTResponseSenderBlock)callback
                   cancelCallback:(RCTResponseSenderBlock)cancelCallback)
 {
-  UIWindow *keyWindow = [[UIApplication sharedApplication] keyWindow];
+  UIWindow *keyWindow = [UIApplication sharedApplication].keyWindow;
   UIViewController *rootViewController = keyWindow.rootViewController;
 
   UIImagePickerController *imagePicker = [UIImagePickerController new];
@@ -75,7 +75,7 @@ - (instancetype)init
                   successCallback:(RCTResponseSenderBlock)callback
                   cancelCallback:(RCTResponseSenderBlock)cancelCallback)
 {
-  UIWindow *keyWindow = [[UIApplication sharedApplication] keyWindow];
+  UIWindow *keyWindow = [UIApplication sharedApplication].keyWindow;
   UIViewController *rootViewController = keyWindow.rootViewController;
 
   UIImagePickerController *imagePicker = [UIImagePickerController new];
@@ -109,7 +109,7 @@ - (void)imagePickerController:(UIImagePickerController *)picker
   [_pickerCallbacks removeObjectAtIndex:index];
   [_pickerCancelCallbacks removeObjectAtIndex:index];
 
-  UIWindow *keyWindow = [[UIApplication sharedApplication] keyWindow];
+  UIWindow *keyWindow = [UIApplication sharedApplication].keyWindow;
   UIViewController *rootViewController = keyWindow.rootViewController;
   [rootViewController dismissViewControllerAnimated:YES completion:nil];
 
@@ -125,7 +125,7 @@ - (void)imagePickerControllerDidCancel:(UIImagePickerController *)picker
   [_pickerCallbacks removeObjectAtIndex:index];
   [_pickerCancelCallbacks removeObjectAtIndex:index];
 
-  UIWindow *keyWindow = [[UIApplication sharedApplication] keyWindow];
+  UIWindow *keyWindow = [UIApplication sharedApplication].keyWindow;
   UIViewController *rootViewController = keyWindow.rootViewController;
   [rootViewController dismissViewControllerAnimated:YES completion:nil];
 

Libraries/Image/RCTImageRequestHandler.m

@@ -22,13 +22,13 @@ @implementation RCTImageRequestHandler
 
 - (BOOL)canHandleRequest:(NSURLRequest *)request
 {
-  return [@[@"assets-library", @"ph"] containsObject:[request.URL.scheme lowercaseString]];
+  return [@[@"assets-library", @"ph"] containsObject:request.URL.scheme.lowercaseString];
 }
 
 - (id)sendRequest:(NSURLRequest *)request
      withDelegate:(id<RCTURLRequestDelegate>)delegate
 {
-  NSString *URLString = [request.URL absoluteString];
+  NSString *URLString = request.URL.absoluteString;
 
   __block RCTImageLoaderCancellationBlock requestToken = nil;
   requestToken = [_bridge.imageLoader loadImageWithTag:URLString callback:^(NSError *error, UIImage *image) {

Libraries/Image/RCTImageStoreManager.m

@@ -21,7 +21,7 @@ @implementation RCTImageStoreManager
 
 RCT_EXPORT_MODULE()
 
-- (id)init
+- (instancetype)init
 {
   if ((self = [super init])) {
 
@@ -34,7 +34,7 @@ - (id)init
 - (NSString *)storeImage:(UIImage *)image
 {
   RCTAssertMainThread();
-  NSString *tag = [NSString stringWithFormat:@"rct-image-store://%tu", [_store count]];
+  NSString *tag = [NSString stringWithFormat:@"rct-image-store://%tu", _store.count];
   _store[tag] = image;
   return tag;
 }
@@ -101,13 +101,13 @@ - (void)getImageForTag:(NSString *)imageTag withBlock:(void (^)(UIImage *image))
 
 - (BOOL)canHandleRequest:(NSURLRequest *)request
 {
-  return [@[@"rct-image-store"] containsObject:[request.URL.scheme lowercaseString]];
+  return [@[@"rct-image-store"] containsObject:request.URL.scheme.lowercaseString];
 }
 
 - (id)sendRequest:(NSURLRequest *)request
      withDelegate:(id<RCTURLRequestDelegate>)delegate
 {
-  NSString *imageTag = [request.URL absoluteString];
+  NSString *imageTag = request.URL.absoluteString;
   [self getImageForTag:imageTag withBlock:^(UIImage *image) {
     if (!image) {
       NSError *error = RCTErrorWithMessage([NSString stringWithFormat:@"Invalid imageTag: %@", imageTag]);

Libraries/Image/RCTImageView.m

@@ -42,7 +42,7 @@ - (instancetype)initWithBridge:(RCTBridge *)bridge
   return self;
 }
 
-RCT_NOT_IMPLEMENTED(-init)
+RCT_NOT_IMPLEMENTED(- (instancetype)init)
 
 - (void)updateImage
 {

Libraries/LinkingIOS/RCTLinkingManager.m

@@ -42,7 +42,7 @@ + (BOOL)application:(UIApplication *)application
   sourceApplication:(NSString *)sourceApplication
          annotation:(id)annotation
 {
-  NSDictionary *payload = @{@"url": [URL absoluteString]};
+  NSDictionary *payload = @{@"url": URL.absoluteString};
   [[NSNotificationCenter defaultCenter] postNotificationName:RCTOpenURLNotification
                                                       object:self
                                                     userInfo:payload];
@@ -52,7 +52,7 @@ + (BOOL)application:(UIApplication *)application
 - (void)handleOpenURLNotification:(NSNotification *)notification
 {
   [_bridge.eventDispatcher sendDeviceEventWithName:@"openURL"
-                                              body:[notification userInfo]];
+                                              body:notification.userInfo];
 }
 
 RCT_EXPORT_METHOD(openURL:(NSURL *)URL)
@@ -72,7 +72,7 @@ - (void)handleOpenURLNotification:(NSNotification *)notification
 - (NSDictionary *)constantsToExport
 {
   NSURL *initialURL = _bridge.launchOptions[UIApplicationLaunchOptionsURLKey];
-  return @{@"initialURL": RCTNullIfNil([initialURL absoluteString])};
+  return @{@"initialURL": RCTNullIfNil(initialURL.absoluteString)};
 }
 
 @end

Libraries/Network/RCTDownloadTask.m

@@ -51,7 +51,7 @@ - (void)invalidate
   _uploadProgressBlock = nil;
 }
 
-RCT_NOT_IMPLEMENTED(-init)
+RCT_NOT_IMPLEMENTED(- (instancetype)init)
 
 - (void)cancel
 {

Libraries/Network/RCTHTTPRequestHandler.m

@@ -47,7 +47,7 @@ - (BOOL)isValid
 
 - (BOOL)canHandleRequest:(NSURLRequest *)request
 {
-  return [@[@"http", @"https", @"file"] containsObject:[request.URL.scheme lowercaseString]];
+  return [@[@"http", @"https", @"file"] containsObject:request.URL.scheme.lowercaseString];
 }
 
 - (NSURLSessionDataTask *)sendRequest:(NSURLRequest *)request

Libraries/Network/RCTNetworking.m

@@ -88,7 +88,7 @@ - (RCTURLRequestCancellationBlock)handleResult:(NSDictionary *)result
   NSMutableDictionary *headers = [parts[0][@"headers"] mutableCopy];
   NSString *partContentType = result[@"contentType"];
   if (partContentType != nil) {
-    [headers setObject:partContentType forKey:@"content-type"];
+    headers[@"content-type"] = partContentType;
   }
   [headers enumerateKeysAndObjectsUsingBlock:^(NSString *parameterKey, NSString *parameterValue, BOOL *stop) {
     [multipartBody appendData:[[NSString stringWithFormat:@"%@: %@\r\n", parameterKey, parameterValue]
@@ -142,7 +142,7 @@ - (RCTURLRequestCancellationBlock)buildRequest:(NSDictionary *)query
 {
   NSURL *URL = [RCTConvert NSURL:query[@"url"]]; // this is marked as nullable in JS, but should not be null
   NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:URL];
-  request.HTTPMethod = [[RCTConvert NSString:RCTNilIfNull(query[@"method"])] uppercaseString] ?: @"GET";
+  request.HTTPMethod = [RCTConvert NSString:RCTNilIfNull(query[@"method"])].uppercaseString ?: @"GET";
   request.allHTTPHeaderFields = [RCTConvert NSDictionary:query[@"headers"]];
 
   NSDictionary *data = [RCTConvert NSDictionary:RCTNilIfNull(query[@"data"])];
@@ -161,7 +161,7 @@ - (RCTURLRequestCancellationBlock)buildRequest:(NSDictionary *)query
     // Gzip the request body
     if ([request.allHTTPHeaderFields[@"Content-Encoding"] isEqualToString:@"gzip"]) {
       request.HTTPBody = RCTGzipData(request.HTTPBody, -1 /* default */);
-      [request setValue:[@(request.HTTPBody.length) description] forHTTPHeaderField:@"Content-Length"];
+      [request setValue:(@(request.HTTPBody.length)).description forHTTPHeaderField:@"Content-Length"];
     }
 
     block(request);
@@ -195,7 +195,7 @@ - (RCTURLRequestCancellationBlock)buildRequest:(NSDictionary *)query
       return NSOrderedSame;
     }
   }];
-  id<RCTURLRequestHandler> handler = [handlers lastObject];
+  id<RCTURLRequestHandler> handler = handlers.lastObject;
   if (!handler) {
     RCTLogError(@"No suitable request handler found for %@", request.URL);
   }

Libraries/PushNotificationIOS/RCTPushNotificationManager.m

@@ -108,13 +108,13 @@ + (void)application:(__unused UIApplication *)application didReceiveRemoteNotifi
 - (void)handleRemoteNotificationReceived:(NSNotification *)notification
 {
   [_bridge.eventDispatcher sendDeviceEventWithName:@"remoteNotificationReceived"
-                                              body:[notification userInfo]];
+                                              body:notification.userInfo];
 }
 
 - (void)handleRemoteNotificationsRegistered:(NSNotification *)notification
 {
   [_bridge.eventDispatcher sendDeviceEventWithName:@"remoteNotificationsRegistered"
-                                              body:[notification userInfo]];
+                                              body:notification.userInfo];
 }
 
 /**
@@ -175,7 +175,7 @@ - (void)handleRemoteNotificationsRegistered:(NSNotification *)notification
 {
   NSUInteger types = 0;
   if ([UIApplication instancesRespondToSelector:@selector(currentUserNotificationSettings)]) {
-    types = [[[UIApplication sharedApplication] currentUserNotificationSettings] types];
+    types = [[UIApplication sharedApplication] currentUserNotificationSettings].types;
   } else {
 
 #if __IPHONE_OS_VERSION_MIN_REQUIRED < __IPHONE_8_0

Libraries/RCTTest/FBSnapshotTestCase/UIImage+Compare.m

@@ -65,7 +65,7 @@ - (BOOL)compareWithImage:(UIImage *)image
                                                     (CGBitmapInfo)kCGImageAlphaPremultipliedLast
                                                     );
 
-  CGFloat scaleFactor = [[UIScreen mainScreen] scale];
+  CGFloat scaleFactor = [UIScreen mainScreen].scale;
   CGContextScaleCTM(referenceImageContext, scaleFactor, scaleFactor);
   CGContextScaleCTM(imageContext, scaleFactor, scaleFactor);
 

Libraries/RCTTest/RCTTestModule.m

@@ -44,7 +44,7 @@ - (instancetype)init
   [_bridge.uiManager addUIBlock:^(RCTUIManager *uiManager, RCTSparseArray *viewRegistry) {
 
     NSString *testName = NSStringFromSelector(_testSelector);
-    _snapshotCounter[testName] = [@([_snapshotCounter[testName] integerValue] + 1) stringValue];
+    _snapshotCounter[testName] = (@([_snapshotCounter[testName] integerValue] + 1)).stringValue;
 
     NSError *error = nil;
     BOOL success = [_controller compareSnapshotOfView:_view