expo-camera 11.2.2 → 12.0.1

package/ios/EXCamera/EXCamera.m

@@ -5,8 +5,8 @@
 #import <EXCamera/EXCameraUtils.h>
 #import <EXCamera/EXCameraManager.h>
 #import <EXCamera/EXCameraCameraPermissionRequester.h>
-#import <UMCore/UMAppLifecycleService.h>
-#import <UMCore/UMUtilities.h>
+#import <ExpoModulesCore/EXAppLifecycleService.h>
+#import <ExpoModulesCore/EXUtilities.h>
 #import <ExpoModulesCore/EXFaceDetectorManagerInterface.h>
 #import <ExpoModulesCore/EXFaceDetectorManagerProviderInterface.h>
 #import <ExpoModulesCore/EXFileSystemInterface.h>
@@ -15,28 +15,28 @@
 @interface EXCamera ()
 
 @property (nonatomic, weak) id<EXFileSystemInterface> fileSystem;
-@property (nonatomic, weak) UMModuleRegistry *moduleRegistry;
+@property (nonatomic, weak) EXModuleRegistry *moduleRegistry;
 @property (nonatomic, strong) id<EXFaceDetectorManagerInterface> faceDetectorManager;
 @property (nonatomic, strong) id<EXBarCodeScannerInterface> barCodeScanner;
 @property (nonatomic, weak) id<EXPermissionsInterface> permissionsManager;
-@property (nonatomic, weak) id<UMAppLifecycleService> lifecycleManager;
+@property (nonatomic, weak) id<EXAppLifecycleService> lifecycleManager;
 
 @property (nonatomic, assign, getter=isSessionPaused) BOOL paused;
 @property (nonatomic, assign) BOOL isValidVideoOptions;
 
 @property (nonatomic, strong) NSDictionary *photoCaptureOptions;
-@property (nonatomic, strong) UMPromiseResolveBlock photoCapturedResolve;
-@property (nonatomic, strong) UMPromiseRejectBlock photoCapturedReject;
+@property (nonatomic, strong) EXPromiseResolveBlock photoCapturedResolve;
+@property (nonatomic, strong) EXPromiseRejectBlock photoCapturedReject;
 
-@property (nonatomic, strong) UMPromiseResolveBlock videoRecordedResolve;
-@property (nonatomic, strong) UMPromiseRejectBlock videoRecordedReject;
+@property (nonatomic, strong) EXPromiseResolveBlock videoRecordedResolve;
+@property (nonatomic, strong) EXPromiseRejectBlock videoRecordedReject;
 
-@property (nonatomic, copy) UMDirectEventBlock onCameraReady;
-@property (nonatomic, copy) UMDirectEventBlock onMountError;
-@property (nonatomic, copy) UMDirectEventBlock onPictureSaved;
+@property (nonatomic, copy) EXDirectEventBlock onCameraReady;
+@property (nonatomic, copy) EXDirectEventBlock onMountError;
+@property (nonatomic, copy) EXDirectEventBlock onPictureSaved;
 
-@property (nonatomic, copy) UMDirectEventBlock onBarCodeScanned;
-@property (nonatomic, copy) UMDirectEventBlock onFacesDetected;
+@property (nonatomic, copy) EXDirectEventBlock onBarCodeScanned;
+@property (nonatomic, copy) EXDirectEventBlock onFacesDetected;
 
 @end
 
@@ -44,7 +44,7 @@
 
 static NSDictionary *defaultFaceDetectorOptions = nil;
 
-- (id)initWithModuleRegistry:(UMModuleRegistry *)moduleRegistry
+- (id)initWithModuleRegistry:(EXModuleRegistry *)moduleRegistry
 {
   if ((self = [super init])) {
     _moduleRegistry = moduleRegistry;
@@ -52,7 +52,7 @@ static NSDictionary *defaultFaceDetectorOptions = nil;
     _sessionQueue = dispatch_queue_create("cameraQueue", DISPATCH_QUEUE_SERIAL);
     _faceDetectorManager = [self createFaceDetectorManager];
     _barCodeScanner = [self createBarCodeScanner];
-    _lifecycleManager = [moduleRegistry getModuleImplementingProtocol:@protocol(UMAppLifecycleService)];
+    _lifecycleManager = [moduleRegistry getModuleImplementingProtocol:@protocol(EXAppLifecycleService)];
     _fileSystem = [moduleRegistry getModuleImplementingProtocol:@protocol(EXFileSystemInterface)];
     _permissionsManager = [moduleRegistry getModuleImplementingProtocol:@protocol(EXPermissionsInterface)];
 #if !(TARGET_IPHONE_SIMULATOR)
@@ -133,9 +133,9 @@ static NSDictionary *defaultFaceDetectorOptions = nil;
 
 - (void)updateType
 {
-  UM_WEAKIFY(self);
+  EX_WEAKIFY(self);
   dispatch_async(_sessionQueue, ^{
-    UM_ENSURE_STRONGIFY(self);
+    EX_ENSURE_STRONGIFY(self);
     [self initializeCaptureSessionInput];
     if (!self.session.isRunning) {
       [self startSession];
@@ -155,7 +155,7 @@ static NSDictionary *defaultFaceDetectorOptions = nil;
 
     if (![device lockForConfiguration:&error]) {
       if (error) {
-        UMLogInfo(@"%s: %@", __func__, error);
+        EXLogInfo(@"%s: %@", __func__, error);
       }
       return;
     }
@@ -166,7 +166,7 @@ static NSDictionary *defaultFaceDetectorOptions = nil;
         [device unlockForConfiguration];
       } else {
         if (error) {
-          UMLogInfo(@"%s: %@", __func__, error);
+          EXLogInfo(@"%s: %@", __func__, error);
         }
       }
     }
@@ -177,7 +177,7 @@ static NSDictionary *defaultFaceDetectorOptions = nil;
 
     if (![device lockForConfiguration:&error]) {
       if (error) {
-        UMLogInfo(@"%s: %@", __func__, error);
+        EXLogInfo(@"%s: %@", __func__, error);
       }
       return;
     }
@@ -191,7 +191,7 @@ static NSDictionary *defaultFaceDetectorOptions = nil;
         [device unlockForConfiguration];
       } else {
         if (error) {
-          UMLogInfo(@"%s: %@", __func__, error);
+          EXLogInfo(@"%s: %@", __func__, error);
         }
       }
     }
@@ -207,7 +207,7 @@ static NSDictionary *defaultFaceDetectorOptions = nil;
 
   if (![device lockForConfiguration:&error]) {
     if (error) {
-      UMLogInfo(@"%s: %@", __func__, error);
+      EXLogInfo(@"%s: %@", __func__, error);
     }
     return;
   }
@@ -217,7 +217,7 @@ static NSDictionary *defaultFaceDetectorOptions = nil;
       [device setFocusMode:_autoFocus];
     } else {
       if (error) {
-        UMLogInfo(@"%s: %@", __func__, error);
+        EXLogInfo(@"%s: %@", __func__, error);
       }
     }
   }
@@ -237,20 +237,20 @@ static NSDictionary *defaultFaceDetectorOptions = nil;
   if ([device isLockingFocusWithCustomLensPositionSupported]) {
     if (![device lockForConfiguration:&error]) {
       if (error) {
-        UMLogInfo(@"%s: %@", __func__, error);
+        EXLogInfo(@"%s: %@", __func__, error);
       }
       return;
     }
 
-    UM_WEAKIFY(device);
+    EX_WEAKIFY(device);
     [device setFocusModeLockedWithLensPosition:_focusDepth completionHandler:^(CMTime syncTime) {
-      UM_ENSURE_STRONGIFY(device);
+      EX_ENSURE_STRONGIFY(device);
       [device unlockForConfiguration];
     }];
     return;
   }
 
-  UMLogInfo(@"%s: Setting focusDepth isn't supported for this camera device", __func__);
+  EXLogInfo(@"%s: Setting focusDepth isn't supported for this camera device", __func__);
   return;
 }
 
@@ -260,7 +260,7 @@ static NSDictionary *defaultFaceDetectorOptions = nil;
 
   if (![device lockForConfiguration:&error]) {
     if (error) {
-      UMLogInfo(@"%s: %@", __func__, error);
+      EXLogInfo(@"%s: %@", __func__, error);
     }
     return;
   }
@@ -277,7 +277,7 @@ static NSDictionary *defaultFaceDetectorOptions = nil;
 
   if (![device lockForConfiguration:&error]) {
     if (error) {
-      UMLogInfo(@"%s: %@", __func__, error);
+      EXLogInfo(@"%s: %@", __func__, error);
     }
     return;
   }
@@ -292,14 +292,14 @@ static NSDictionary *defaultFaceDetectorOptions = nil;
     };
     AVCaptureWhiteBalanceGains rgbGains = [device deviceWhiteBalanceGainsForTemperatureAndTintValues:temperatureAndTint];
     if ([device lockForConfiguration:&error]) {
-      UM_WEAKIFY(device);
+      EX_WEAKIFY(device);
       [device setWhiteBalanceModeLockedWithDeviceWhiteBalanceGains:rgbGains completionHandler:^(CMTime syncTime) {
-        UM_ENSURE_STRONGIFY(device);
+        EX_ENSURE_STRONGIFY(device);
         [device unlockForConfiguration];
       }];
     } else {
       if (error) {
-        UMLogInfo(@"%s: %@", __func__, error);
+        EXLogInfo(@"%s: %@", __func__, error);
       }
     }
   }
@@ -317,7 +317,7 @@ static NSDictionary *defaultFaceDetectorOptions = nil;
   if (_barCodeScanner) {
     [_barCodeScanner setIsEnabled:barCodeScanning];
   } else if (barCodeScanning) {
-    UMLogError(@"BarCodeScanner module not found. Make sure `expo-barcode-scanner` is installed and linked correctly.");
+    EXLogError(@"BarCodeScanner module not found. Make sure `expo-barcode-scanner` is installed and linked correctly.");
   }
 }
 
@@ -333,7 +333,7 @@ static NSDictionary *defaultFaceDetectorOptions = nil;
   if (_faceDetectorManager) {
     [_faceDetectorManager setIsEnabled:faceDetecting];
   } else if (faceDetecting) {
-    UMLogError(@"FaceDetector module not found. Make sure `expo-face-detector` is installed and linked correctly.");
+    EXLogError(@"FaceDetector module not found. Make sure `expo-face-detector` is installed and linked correctly.");
   }
 }
 
@@ -344,7 +344,7 @@ static NSDictionary *defaultFaceDetectorOptions = nil;
   }
 }
 
-- (void)takePicture:(NSDictionary *)options resolve:(UMPromiseResolveBlock)resolve reject:(UMPromiseRejectBlock)reject
+- (void)takePicture:(NSDictionary *)options resolve:(EXPromiseResolveBlock)resolve reject:(EXPromiseRejectBlock)reject
 {
   if (_photoCapturedResolve) {
     reject(@"E_ANOTHER_CAPTURE", @"Another photo capture is already being processed. Await the first call.", nil);
@@ -390,8 +390,8 @@ previewPhotoSampleBuffer:(CMSampleBufferRef)previewPhotoSampleBuffer
                 error:(NSError *)error
 {
   NSDictionary *options = _photoCaptureOptions;
-  UMPromiseRejectBlock reject = _photoCapturedReject;
-  UMPromiseResolveBlock resolve = _photoCapturedResolve;
+  EXPromiseRejectBlock reject = _photoCapturedReject;
+  EXPromiseResolveBlock resolve = _photoCapturedResolve;
   _photoCapturedResolve = nil;
   _photoCapturedReject = nil;
   _photoCaptureOptions = nil;
@@ -414,11 +414,11 @@ previewPhotoSampleBuffer:(CMSampleBufferRef)previewPhotoSampleBuffer
   CFRelease(sourceCGIImageRef);
 }
 
-- (void)captureOutput:(AVCapturePhotoOutput *)output didFinishProcessingPhoto:(AVCapturePhoto *)photo error:(NSError *)error API_AVAILABLE(ios(11.0))
+- (void)captureOutput:(AVCapturePhotoOutput *)output didFinishProcessingPhoto:(AVCapturePhoto *)photo error:(NSError *)error 
 {
   NSDictionary *options = _photoCaptureOptions;
-  UMPromiseRejectBlock reject = _photoCapturedReject;
-  UMPromiseResolveBlock resolve = _photoCapturedResolve;
+  EXPromiseRejectBlock reject = _photoCapturedReject;
+  EXPromiseResolveBlock resolve = _photoCapturedResolve;
   _photoCapturedResolve = nil;
   _photoCapturedReject = nil;
   _photoCaptureOptions = nil;
@@ -437,7 +437,7 @@ previewPhotoSampleBuffer:(CMSampleBufferRef)previewPhotoSampleBuffer
   [self handleCapturedImageData:imageData metadata:photo.metadata options:options resolver:resolve reject:reject];
 }
 
-- (void)handleCapturedImageData:(NSData *)imageData metadata:(NSDictionary *)metadata options:(NSDictionary *)options resolver:(UMPromiseResolveBlock)resolve reject:(UMPromiseRejectBlock)reject
+- (void)handleCapturedImageData:(NSData *)imageData metadata:(NSDictionary *)metadata options:(NSDictionary *)options resolver:(EXPromiseResolveBlock)resolve reject:(EXPromiseRejectBlock)reject
 {
   UIImage *takenImage = [UIImage imageWithData:imageData];
   BOOL useFastMode = [options[@"fastMode"] boolValue];
@@ -498,7 +498,7 @@ previewPhotoSampleBuffer:(CMSampleBufferRef)previewPhotoSampleBuffer
   }
 }
 
-- (void)record:(NSDictionary *)options resolve:(UMPromiseResolveBlock)resolve reject:(UMPromiseRejectBlock)reject
+- (void)record:(NSDictionary *)options resolve:(EXPromiseResolveBlock)resolve reject:(EXPromiseRejectBlock)reject
 {
   if (_movieFileOutput == nil) {
     // At the time of writing AVCaptureMovieFileOutput and AVCaptureVideoDataOutput (> GMVDataOutput)
@@ -517,7 +517,7 @@ previewPhotoSampleBuffer:(CMSampleBufferRef)previewPhotoSampleBuffer
     AVCaptureConnection *connection = [_movieFileOutput connectionWithMediaType:AVMediaTypeVideo];
     // TODO: Add support for videoStabilizationMode (right now it is not only read, never written to)
     if (connection.isVideoStabilizationSupported == NO) {
-      UMLogWarn(@"%s: Video Stabilization is not supported on this device.", __func__);
+      EXLogWarn(@"%s: Video Stabilization is not supported on this device.", __func__);
     } else {
       [connection setPreferredVideoStabilizationMode:self.videoStabilizationMode];
     }
@@ -543,9 +543,9 @@ previewPhotoSampleBuffer:(CMSampleBufferRef)previewPhotoSampleBuffer
       [connection setVideoMirrored:shouldBeMirrored];
     }
 
-    UM_WEAKIFY(self);
+    EX_WEAKIFY(self);
     dispatch_async(self.sessionQueue, ^{
-      UM_STRONGIFY(self);
+      EX_STRONGIFY(self);
       // it is possible that the session has been invalidated at this point
       // for example, the video codec option is invalid and so this call has already rejected
       if (!self.isValidVideoOptions) {
@@ -572,11 +572,11 @@ previewPhotoSampleBuffer:(CMSampleBufferRef)previewPhotoSampleBuffer
 
 // Video options are set in an async block to prevent the possible race condition outlined here:
 // https://github.com/react-native-camera/react-native-camera/pull/2694
-- (void)setVideoOptions:(NSDictionary *)options forConnection:(AVCaptureConnection *)connection onReject:(UMPromiseRejectBlock)reject
+- (void)setVideoOptions:(NSDictionary *)options forConnection:(AVCaptureConnection *)connection onReject:(EXPromiseRejectBlock)reject
 {
-  UM_WEAKIFY(self);
+  EX_WEAKIFY(self);
   dispatch_async(_sessionQueue, ^{
-    UM_STRONGIFY(self);
+    EX_STRONGIFY(self);
     // Reset validation flag
     self.isValidVideoOptions = YES;
 
@@ -652,9 +652,9 @@ previewPhotoSampleBuffer:(CMSampleBufferRef)previewPhotoSampleBuffer
     [self onMountingError:@{@"message": @"Camera permissions not granted - component could not be rendered."}];
     return;
   }
-  UM_WEAKIFY(self);
+  EX_WEAKIFY(self);
   dispatch_async(_sessionQueue, ^{
-    UM_ENSURE_STRONGIFY(self);
+    EX_ENSURE_STRONGIFY(self);
 
     if (self.presetCamera == AVCaptureDevicePositionUnspecified) {
       return;
@@ -670,9 +670,9 @@ previewPhotoSampleBuffer:(CMSampleBufferRef)previewPhotoSampleBuffer
 
     [self setRuntimeErrorHandlingObserver:
      [[NSNotificationCenter defaultCenter] addObserverForName:AVCaptureSessionRuntimeErrorNotification object:self.session queue:nil usingBlock:^(NSNotification *note) {
-      UM_ENSURE_STRONGIFY(self);
+      EX_ENSURE_STRONGIFY(self);
       dispatch_async(self.sessionQueue, ^{
-        UM_ENSURE_STRONGIFY(self)
+        EX_ENSURE_STRONGIFY(self)
         // Manually restarting the session since it must
         // have been stopped due to an error.
         [self.session startRunning];
@@ -684,7 +684,7 @@ previewPhotoSampleBuffer:(CMSampleBufferRef)previewPhotoSampleBuffer
     // when BarCodeScanner is enabled since the beginning of camera component lifecycle,
     // some race condition occurs in reconfiguration and barcodes aren't scanned at all
     dispatch_after(dispatch_time(DISPATCH_TIME_NOW, 50 * NSEC_PER_USEC), self.sessionQueue, ^{
-      UM_ENSURE_STRONGIFY(self);
+      EX_ENSURE_STRONGIFY(self);
       [self maybeStartFaceDetection:self.presetCamera!=1];
       if (self.barCodeScanner) {
         [self.barCodeScanner maybeStartBarCodeScanning];
@@ -703,9 +703,9 @@ previewPhotoSampleBuffer:(CMSampleBufferRef)previewPhotoSampleBuffer
 #if TARGET_IPHONE_SIMULATOR
   return;
 #endif
-  UM_WEAKIFY(self);
+  EX_WEAKIFY(self);
   dispatch_async(_sessionQueue, ^{
-    UM_ENSURE_STRONGIFY(self);
+    EX_ENSURE_STRONGIFY(self);
 
     if (self.faceDetectorManager) {
       [self.faceDetectorManager stopFaceDetection];
@@ -733,14 +733,14 @@ previewPhotoSampleBuffer:(CMSampleBufferRef)previewPhotoSampleBuffer
   }
 
   __block UIInterfaceOrientation interfaceOrientation;
-  [UMUtilities performSynchronouslyOnMainThread:^{
+  [EXUtilities performSynchronouslyOnMainThread:^{
     interfaceOrientation = [[UIApplication sharedApplication] statusBarOrientation];
   }];
   AVCaptureVideoOrientation orientation = [EXCameraUtils videoOrientationForInterfaceOrientation:interfaceOrientation];
 
-  UM_WEAKIFY(self);
+  EX_WEAKIFY(self);
   dispatch_async(_sessionQueue, ^{
-    UM_ENSURE_STRONGIFY(self);
+    EX_ENSURE_STRONGIFY(self);
 
     [self.session beginConfiguration];
 
@@ -779,9 +779,9 @@ previewPhotoSampleBuffer:(CMSampleBufferRef)previewPhotoSampleBuffer
 // - torchMode: https://stackoverflow.com/a/53666293/4337317
 - (void)ensureSessionConfiguration
 {
-  UM_WEAKIFY(self);
+  EX_WEAKIFY(self);
   dispatch_async(_sessionQueue, ^{
-    UM_ENSURE_STRONGIFY(self);
+    EX_ENSURE_STRONGIFY(self);
     [self updateFlashMode];
   });
 }
@@ -792,9 +792,9 @@ previewPhotoSampleBuffer:(CMSampleBufferRef)previewPhotoSampleBuffer
 {
 #if !(TARGET_IPHONE_SIMULATOR)
   if (preset) {
-    UM_WEAKIFY(self);
+    EX_WEAKIFY(self);
     dispatch_async(_sessionQueue, ^{
-      UM_ENSURE_STRONGIFY(self);
+      EX_ENSURE_STRONGIFY(self);
       [self.session beginConfiguration];
       if ([self.session canSetSessionPreset:preset]) {
         self.session.sessionPreset = preset;
@@ -807,9 +807,9 @@ previewPhotoSampleBuffer:(CMSampleBufferRef)previewPhotoSampleBuffer
 
 - (void)updateSessionAudioIsMuted:(BOOL)isMuted
 {
-  UM_WEAKIFY(self);
+  EX_WEAKIFY(self);
   dispatch_async(_sessionQueue, ^{
-    UM_ENSURE_STRONGIFY(self);
+    EX_ENSURE_STRONGIFY(self);
     [self.session beginConfiguration];
 
     for (AVCaptureDeviceInput* input in [self.session inputs]) {
@@ -829,7 +829,7 @@ previewPhotoSampleBuffer:(CMSampleBufferRef)previewPhotoSampleBuffer
       AVCaptureDeviceInput *audioDeviceInput = [AVCaptureDeviceInput deviceInputWithDevice:audioCaptureDevice error:&error];
 
       if (error || audioDeviceInput == nil) {
-        UMLogInfo(@"%s: %@", __func__, error);
+        EXLogInfo(@"%s: %@", __func__, error);
         return;
       }
 
@@ -846,9 +846,9 @@ previewPhotoSampleBuffer:(CMSampleBufferRef)previewPhotoSampleBuffer
 {
   if (![_session isRunning] && [self isSessionPaused]) {
     _paused = NO;
-    UM_WEAKIFY(self);
+    EX_WEAKIFY(self);
     dispatch_async(_sessionQueue, ^{
-      UM_ENSURE_STRONGIFY(self);
+      EX_ENSURE_STRONGIFY(self);
       [self.session startRunning];
       [self ensureSessionConfiguration];
     });
@@ -859,9 +859,9 @@ previewPhotoSampleBuffer:(CMSampleBufferRef)previewPhotoSampleBuffer
 {
   if ([_session isRunning] && ![self isSessionPaused]) {
     _paused = YES;
-    UM_WEAKIFY(self);
+    EX_WEAKIFY(self);
     dispatch_async(_sessionQueue, ^{
-      UM_ENSURE_STRONGIFY(self);
+      EX_ENSURE_STRONGIFY(self);
       [self.session stopRunning];
     });
   }
@@ -875,10 +875,10 @@ previewPhotoSampleBuffer:(CMSampleBufferRef)previewPhotoSampleBuffer
 
 - (void)changePreviewOrientation:(UIInterfaceOrientation)orientation
 {
-  UM_WEAKIFY(self);
+  EX_WEAKIFY(self);
   AVCaptureVideoOrientation videoOrientation = [EXCameraUtils videoOrientationForInterfaceOrientation:orientation];
-  [UMUtilities performSynchronouslyOnMainThread:^{
-    UM_ENSURE_STRONGIFY(self);
+  [EXUtilities performSynchronouslyOnMainThread:^{
+    EX_ENSURE_STRONGIFY(self);
     if (self.previewLayer.connection.isVideoOrientationSupported) {
       [self.previewLayer.connection setVideoOrientation:videoOrientation];
     }
@@ -942,9 +942,9 @@ previewPhotoSampleBuffer:(CMSampleBufferRef)previewPhotoSampleBuffer
   if (faceDetectorProvider) {
     id<EXFaceDetectorManagerInterface> faceDetector = [faceDetectorProvider createFaceDetectorManager];
     if (faceDetector) {
-      UM_WEAKIFY(self);
+      EX_WEAKIFY(self);
       [faceDetector setOnFacesDetected:^(NSArray<NSDictionary *> *faces) {
-        UM_ENSURE_STRONGIFY(self);
+        EX_ENSURE_STRONGIFY(self);
         if (self.onFacesDetected) {
           self.onFacesDetected(@{
                                  @"type": @"face",
@@ -967,11 +967,11 @@ previewPhotoSampleBuffer:(CMSampleBufferRef)previewPhotoSampleBuffer
   if (barCodeScannerProvider) {
     id<EXBarCodeScannerInterface> barCodeScanner = [barCodeScannerProvider createBarCodeScanner];
     if (barCodeScanner) {
-      UM_WEAKIFY(self);
+      EX_WEAKIFY(self);
       [barCodeScanner setSession:_session];
       [barCodeScanner setSessionQueue:_sessionQueue];
       [barCodeScanner setOnBarCodeScanned:^(NSDictionary *body) {
-        UM_ENSURE_STRONGIFY(self);
+        EX_ENSURE_STRONGIFY(self);
         [self onBarCodeScanned:body];
       }];
     }

package/ios/EXCamera/EXCameraCameraPermissionRequester.m

@@ -1,7 +1,7 @@
 // Copyright 2016-present 650 Industries. All rights reserved.
 
 #import <EXCamera/EXCameraCameraPermissionRequester.h>
-#import <UMCore/UMDefines.h>
+#import <ExpoModulesCore/EXDefines.h>
 #import <ExpoModulesCore/EXPermissionsInterface.h>
 
 #import <AVFoundation/AVFoundation.h>
@@ -20,7 +20,7 @@
   NSString *cameraUsageDescription = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"NSCameraUsageDescription"];
   
   if (!cameraUsageDescription) {
-    UMFatal(UMErrorWithMessage(@"This app is missing NSCameraUsageDescription, so video services will fail. Add this entry to your bundle's Info.plist."));
+    EXFatal(EXErrorWithMessage(@"This app is missing NSCameraUsageDescription, so video services will fail. Add this entry to your bundle's Info.plist."));
     systemStatus = AVAuthorizationStatusDenied;
   } else {
     systemStatus = [AVCaptureDevice authorizationStatusForMediaType:AVMediaTypeVideo];
@@ -42,11 +42,11 @@
   };
 }
 
-- (void)requestPermissionsWithResolver:(UMPromiseResolveBlock)resolve rejecter:(UMPromiseRejectBlock)reject
+- (void)requestPermissionsWithResolver:(EXPromiseResolveBlock)resolve rejecter:(EXPromiseRejectBlock)reject
 {
-  UM_WEAKIFY(self)
+  EX_WEAKIFY(self)
   [AVCaptureDevice requestAccessForMediaType:AVMediaTypeVideo completionHandler:^(BOOL granted) {
-    UM_STRONGIFY(self)
+    EX_STRONGIFY(self)
     resolve([self getPermissions]);
   }];
 }

package/ios/EXCamera/EXCameraManager.h

@@ -1,9 +1,9 @@
 #import <AVFoundation/AVFoundation.h>
-#import <UMCore/UMViewManager.h>
-#import <UMCore/UMExportedModule.h>
-#import <UMCore/UMModuleRegistryConsumer.h>
+#import <ExpoModulesCore/EXViewManager.h>
+#import <ExpoModulesCore/EXExportedModule.h>
+#import <ExpoModulesCore/EXModuleRegistryConsumer.h>
 #import <EXCamera/EXCamera.h>
 
-@interface EXCameraManager : UMViewManager <UMModuleRegistryConsumer>
+@interface EXCameraManager : EXViewManager <EXModuleRegistryConsumer>
 
 @end