expo-camera 11.2.2 → 12.0.1

package/ios/EXCamera/EXCameraManager.m

@@ -5,7 +5,7 @@
 #import <EXCamera/EXCameraCameraPermissionRequester.h>
 #import <EXCamera/EXCameraMicrophonePermissionRequester.h>
 
-#import <UMCore/UMUIManager.h>
+#import <ExpoModulesCore/EXUIManager.h>
 #import <ExpoModulesCore/EXFileSystemInterface.h>
 #import <ExpoModulesCore/EXPermissionsInterface.h>
 #import <ExpoModulesCore/EXPermissionsMethodsDelegate.h>
@@ -13,25 +13,25 @@
 @interface EXCameraManager ()
 
 @property (nonatomic, weak) id<EXFileSystemInterface> fileSystem;
-@property (nonatomic, weak) id<UMUIManager> uiManager;
-@property (nonatomic, weak) UMModuleRegistry *moduleRegistry;
+@property (nonatomic, weak) id<EXUIManager> uiManager;
+@property (nonatomic, weak) EXModuleRegistry *moduleRegistry;
 @property (nonatomic, weak) id<EXPermissionsInterface> permissionsManager;
 @end
 
 @implementation EXCameraManager
 
-UM_EXPORT_MODULE(ExponentCameraManager);
+EX_EXPORT_MODULE(ExponentCameraManager);
 
 - (NSString *)viewName
 {
   return @"ExponentCamera";
 }
 
-- (void)setModuleRegistry:(UMModuleRegistry *)moduleRegistry
+- (void)setModuleRegistry:(EXModuleRegistry *)moduleRegistry
 {
   _moduleRegistry = moduleRegistry;
   _fileSystem = [moduleRegistry getModuleImplementingProtocol:@protocol(EXFileSystemInterface)];
-  _uiManager = [moduleRegistry getModuleImplementingProtocol:@protocol(UMUIManager)];
+  _uiManager = [moduleRegistry getModuleImplementingProtocol:@protocol(EXUIManager)];
   _permissionsManager = [moduleRegistry getModuleImplementingProtocol:@protocol(EXPermissionsInterface)];
   [EXPermissionsMethodsDelegate registerRequesters:@[[EXCameraPermissionRequester new]] withPermissionsManager:_permissionsManager];
   [EXPermissionsMethodsDelegate registerRequesters:@[[EXCameraCameraPermissionRequester new]] withPermissionsManager:_permissionsManager];
@@ -114,7 +114,7 @@ UM_EXPORT_MODULE(ExponentCameraManager);
            };
 }
 
-UM_VIEW_PROPERTY(type, NSNumber *, EXCamera)
+EX_VIEW_PROPERTY(type, NSNumber *, EXCamera)
 {
   long longValue = [value longValue];
   if (view.presetCamera != longValue) {
@@ -123,7 +123,7 @@ UM_VIEW_PROPERTY(type, NSNumber *, EXCamera)
   }
 }
 
-UM_VIEW_PROPERTY(flashMode, NSNumber *, EXCamera)
+EX_VIEW_PROPERTY(flashMode, NSNumber *, EXCamera)
 {
   long longValue = [value longValue];
   if (longValue != view.flashMode) {
@@ -132,17 +132,17 @@ UM_VIEW_PROPERTY(flashMode, NSNumber *, EXCamera)
   }
 }
 
-UM_VIEW_PROPERTY(faceDetectorSettings, NSDictionary *, EXCamera)
+EX_VIEW_PROPERTY(faceDetectorSettings, NSDictionary *, EXCamera)
 {
   [view updateFaceDetectorSettings:value];
 }
 
-UM_VIEW_PROPERTY(barCodeScannerSettings, NSDictionary *, EXCamera)
+EX_VIEW_PROPERTY(barCodeScannerSettings, NSDictionary *, EXCamera)
 {
   [view setBarCodeScannerSettings:value];
 }
 
-UM_VIEW_PROPERTY(autoFocus, NSNumber *, EXCamera)
+EX_VIEW_PROPERTY(autoFocus, NSNumber *, EXCamera)
 {
   long longValue = [value longValue];
   if (longValue != view.autoFocus) {
@@ -151,7 +151,7 @@ UM_VIEW_PROPERTY(autoFocus, NSNumber *, EXCamera)
   }
 }
 
-UM_VIEW_PROPERTY(focusDepth, NSNumber *, EXCamera)
+EX_VIEW_PROPERTY(focusDepth, NSNumber *, EXCamera)
 {
   float floatValue = [value floatValue];
   if (fabsf(view.focusDepth - floatValue) > FLT_EPSILON) {
@@ -160,7 +160,7 @@ UM_VIEW_PROPERTY(focusDepth, NSNumber *, EXCamera)
   }
 }
 
-UM_VIEW_PROPERTY(zoom, NSNumber *, EXCamera)
+EX_VIEW_PROPERTY(zoom, NSNumber *, EXCamera)
 {
   double doubleValue = [value doubleValue];
   if (fabs(view.zoom - doubleValue) > DBL_EPSILON) {
@@ -169,7 +169,7 @@ UM_VIEW_PROPERTY(zoom, NSNumber *, EXCamera)
   }
 }
 
-UM_VIEW_PROPERTY(whiteBalance, NSNumber *, EXCamera)
+EX_VIEW_PROPERTY(whiteBalance, NSNumber *, EXCamera)
 {
   long longValue = [value longValue];
   if (longValue != view.whiteBalance) {
@@ -178,12 +178,12 @@ UM_VIEW_PROPERTY(whiteBalance, NSNumber *, EXCamera)
   }
 }
 
-UM_VIEW_PROPERTY(pictureSize, NSString *, EXCamera) {
+EX_VIEW_PROPERTY(pictureSize, NSString *, EXCamera) {
   [view setPictureSize:[[self class] pictureSizes][value]];
   [view updatePictureSize];
 }
 
-UM_VIEW_PROPERTY(faceDetectorEnabled, NSNumber *, EXCamera)
+EX_VIEW_PROPERTY(faceDetectorEnabled, NSNumber *, EXCamera)
 {
   bool boolValue = [value boolValue];
   if ([view isDetectingFaces] != boolValue) {
@@ -191,7 +191,7 @@ UM_VIEW_PROPERTY(faceDetectorEnabled, NSNumber *, EXCamera)
   }
 }
 
-UM_VIEW_PROPERTY(barCodeScannerEnabled, NSNumber *, EXCamera)
+EX_VIEW_PROPERTY(barCodeScannerEnabled, NSNumber *, EXCamera)
 {
   bool boolValue = [value boolValue];
   if ([view isScanningBarCodes] != boolValue) {
@@ -199,11 +199,11 @@ UM_VIEW_PROPERTY(barCodeScannerEnabled, NSNumber *, EXCamera)
   }
 }
 
-UM_EXPORT_METHOD_AS(takePicture,
+EX_EXPORT_METHOD_AS(takePicture,
                     takePictureWithOptions:(NSDictionary *)options
                     reactTag:(nonnull NSNumber *)reactTag
-                    resolver:(UMPromiseResolveBlock)resolve
-                    rejecter:(UMPromiseRejectBlock)reject)
+                    resolver:(EXPromiseResolveBlock)resolve
+                    rejecter:(EXPromiseRejectBlock)reject)
 {
 #if TARGET_IPHONE_SIMULATOR
   __weak EXCameraManager *weakSelf = self;
@@ -251,11 +251,11 @@ UM_EXPORT_METHOD_AS(takePicture,
 
 }
 
-UM_EXPORT_METHOD_AS(record,
+EX_EXPORT_METHOD_AS(record,
                     recordWithOptions:(NSDictionary *)options
                     reactTag:(nonnull NSNumber *)reactTag
-                    resolver:(UMPromiseResolveBlock)resolve
-                    rejecter:(UMPromiseRejectBlock)reject)
+                    resolver:(EXPromiseResolveBlock)resolve
+                    rejecter:(EXPromiseRejectBlock)reject)
 {
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wunreachable-code"
@@ -274,25 +274,25 @@ UM_EXPORT_METHOD_AS(record,
 #pragma clang diagnostic pop
 }
 
-UM_EXPORT_METHOD_AS(stopRecording,
+EX_EXPORT_METHOD_AS(stopRecording,
                     stopRecordingOfReactTag:(nonnull NSNumber *)reactTag
-                    resolver:(UMPromiseResolveBlock)resolve
-                    rejecter:(UMPromiseRejectBlock)reject)
+                    resolver:(EXPromiseResolveBlock)resolve
+                    rejecter:(EXPromiseRejectBlock)reject)
 {
   [_uiManager executeUIBlock:^(id view) {
     if (view != nil) {
       [view stopRecording];
       resolve(nil);
     } else {
-      UMLogError(@"Invalid view returned from registry, expected EXCamera, got: %@", view);
+      EXLogError(@"Invalid view returned from registry, expected EXCamera, got: %@", view);
     }
   } forView:reactTag ofClass:[EXCamera class]];
 }
 
-UM_EXPORT_METHOD_AS(resumePreview,
+EX_EXPORT_METHOD_AS(resumePreview,
                     resumePreview:(nonnull NSNumber *)tag
-                         resolver:(UMPromiseResolveBlock)resolve
-                         rejecter:(UMPromiseRejectBlock)reject)
+                         resolver:(EXPromiseResolveBlock)resolve
+                         rejecter:(EXPromiseRejectBlock)reject)
 {
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wunreachable-code"
@@ -305,16 +305,16 @@ UM_EXPORT_METHOD_AS(resumePreview,
       [view resumePreview];
       resolve(nil);
     } else {
-      UMLogError(@"Invalid view returned from registry, expected EXCamera, got: %@", view);
+      EXLogError(@"Invalid view returned from registry, expected EXCamera, got: %@", view);
     }
   } forView:tag ofClass:[EXCamera class]];
 #pragma clang diagnostic pop
 }
 
-UM_EXPORT_METHOD_AS(pausePreview,
+EX_EXPORT_METHOD_AS(pausePreview,
                     pausePreview:(nonnull NSNumber *)tag
-                        resolver:(UMPromiseResolveBlock)resolve
-                         rejecter:(UMPromiseRejectBlock)reject)
+                        resolver:(EXPromiseResolveBlock)resolve
+                         rejecter:(EXPromiseRejectBlock)reject)
 {
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wunreachable-code"
@@ -327,24 +327,24 @@ UM_EXPORT_METHOD_AS(pausePreview,
       [view pausePreview];
       resolve(nil);
     } else {
-      UMLogError(@"Invalid view returned from registry, expected EXCamera, got: %@", view);
+      EXLogError(@"Invalid view returned from registry, expected EXCamera, got: %@", view);
     }
   } forView:tag ofClass:[EXCamera class]];
 #pragma clang diagnostic pop
 }
 
-UM_EXPORT_METHOD_AS(getAvailablePictureSizes,
+EX_EXPORT_METHOD_AS(getAvailablePictureSizes,
                      getAvailablePictureSizesWithRatio:(NSString *)ratio
                                                    tag:(nonnull NSNumber *)tag
-                                              resolver:(UMPromiseResolveBlock)resolve
-                                              rejecter:(UMPromiseRejectBlock)reject)
+                                              resolver:(EXPromiseResolveBlock)resolve
+                                              rejecter:(EXPromiseRejectBlock)reject)
 {
   resolve([[[self class] pictureSizes] allKeys]);
 }
 
-UM_EXPORT_METHOD_AS(getAvailableVideoCodecsAsync,
-                    resolver:(UMPromiseResolveBlock)resolve
-                    rejecter:(UMPromiseRejectBlock)reject)
+EX_EXPORT_METHOD_AS(getAvailableVideoCodecsAsync,
+                    resolver:(EXPromiseResolveBlock)resolve
+                    rejecter:(EXPromiseRejectBlock)reject)
 {
   AVCaptureSession *session = [AVCaptureSession new];   
   [session beginConfiguration];
@@ -367,9 +367,9 @@ UM_EXPORT_METHOD_AS(getAvailableVideoCodecsAsync,
   resolve([movieFileOutput availableVideoCodecTypes]);
 }
 
-UM_EXPORT_METHOD_AS(getPermissionsAsync,
-                    getPermissionsAsync:(UMPromiseResolveBlock)resolve
-                    rejecter:(UMPromiseRejectBlock)reject)
+EX_EXPORT_METHOD_AS(getPermissionsAsync,
+                    getPermissionsAsync:(EXPromiseResolveBlock)resolve
+                    rejecter:(EXPromiseRejectBlock)reject)
 {
   [EXPermissionsMethodsDelegate getPermissionWithPermissionsManager:_permissionsManager
                                                       withRequester:[EXCameraPermissionRequester class]
@@ -377,9 +377,9 @@ UM_EXPORT_METHOD_AS(getPermissionsAsync,
                                                              reject:reject];
 }
 
-UM_EXPORT_METHOD_AS(requestPermissionsAsync,
-                    requestPermissionsAsync:(UMPromiseResolveBlock)resolve
-                    rejecter:(UMPromiseRejectBlock)reject)
+EX_EXPORT_METHOD_AS(requestPermissionsAsync,
+                    requestPermissionsAsync:(EXPromiseResolveBlock)resolve
+                    rejecter:(EXPromiseRejectBlock)reject)
 {
   [EXPermissionsMethodsDelegate askForPermissionWithPermissionsManager:_permissionsManager
                                                          withRequester:[EXCameraPermissionRequester class]
@@ -388,9 +388,9 @@ UM_EXPORT_METHOD_AS(requestPermissionsAsync,
 }
 
 
-UM_EXPORT_METHOD_AS(getCameraPermissionsAsync,
-                    getCameraPermissionsAsync:(UMPromiseResolveBlock)resolve
-                    rejecter:(UMPromiseRejectBlock)reject)
+EX_EXPORT_METHOD_AS(getCameraPermissionsAsync,
+                    getCameraPermissionsAsync:(EXPromiseResolveBlock)resolve
+                    rejecter:(EXPromiseRejectBlock)reject)
 {
   [EXPermissionsMethodsDelegate getPermissionWithPermissionsManager:_permissionsManager
                                                       withRequester:[EXCameraCameraPermissionRequester class]
@@ -399,9 +399,9 @@ UM_EXPORT_METHOD_AS(getCameraPermissionsAsync,
 }
 
 
-UM_EXPORT_METHOD_AS(requestCameraPermissionsAsync,
-                    requestCameraPermissionsAsync:(UMPromiseResolveBlock)resolve
-                    rejecter:(UMPromiseRejectBlock)reject)
+EX_EXPORT_METHOD_AS(requestCameraPermissionsAsync,
+                    requestCameraPermissionsAsync:(EXPromiseResolveBlock)resolve
+                    rejecter:(EXPromiseRejectBlock)reject)
 {
   [EXPermissionsMethodsDelegate askForPermissionWithPermissionsManager:_permissionsManager
                                                          withRequester:[EXCameraCameraPermissionRequester class]
@@ -411,9 +411,9 @@ UM_EXPORT_METHOD_AS(requestCameraPermissionsAsync,
 
 
 
-UM_EXPORT_METHOD_AS(getMicrophonePermissionsAsync,
-                    getMicrophonePermissionsAsync:(UMPromiseResolveBlock)resolve
-                    rejecter:(UMPromiseRejectBlock)reject)
+EX_EXPORT_METHOD_AS(getMicrophonePermissionsAsync,
+                    getMicrophonePermissionsAsync:(EXPromiseResolveBlock)resolve
+                    rejecter:(EXPromiseRejectBlock)reject)
 {
   [EXPermissionsMethodsDelegate getPermissionWithPermissionsManager:_permissionsManager
                                                       withRequester:[EXCameraMicrophonePermissionRequester class]
@@ -422,9 +422,9 @@ UM_EXPORT_METHOD_AS(getMicrophonePermissionsAsync,
 }
 
 
-UM_EXPORT_METHOD_AS(requestMicrophonePermissionsAsync,
-                    requestMicrophonePermissionsAsync:(UMPromiseResolveBlock)resolve
-                    rejecter:(UMPromiseRejectBlock)reject)
+EX_EXPORT_METHOD_AS(requestMicrophonePermissionsAsync,
+                    requestMicrophonePermissionsAsync:(EXPromiseResolveBlock)resolve
+                    rejecter:(EXPromiseRejectBlock)reject)
 {
   [EXPermissionsMethodsDelegate askForPermissionWithPermissionsManager:_permissionsManager
                                                          withRequester:[EXCameraMicrophonePermissionRequester class]

package/ios/EXCamera/EXCameraMicrophonePermissionRequester.m

@@ -1,7 +1,7 @@
 // Copyright 2016-present 650 Industries. All rights reserved.
 
 #import <EXCamera/EXCameraMicrophonePermissionRequester.h>
-#import <UMCore/UMDefines.h>
+#import <ExpoModulesCore/EXDefines.h>
 #import <ExpoModulesCore/EXPermissionsInterface.h>
 
 #import <AVFoundation/AVFoundation.h>
@@ -20,7 +20,7 @@
   NSString *microphoneUsageDescription = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"NSMicrophoneUsageDescription"];
     
   if (!microphoneUsageDescription) {
-    UMFatal(UMErrorWithMessage(@"This app is missing NSMicrophoneUsageDescription, so audio services will fail. Add this entry to your bundle's Info.plist."));
+    EXFatal(EXErrorWithMessage(@"This app is missing NSMicrophoneUsageDescription, so audio services will fail. Add this entry to your bundle's Info.plist."));
     systemStatus = AVAuthorizationStatusDenied;
   } else {
     systemStatus = [AVCaptureDevice authorizationStatusForMediaType:AVMediaTypeAudio];
@@ -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:AVMediaTypeAudio completionHandler:^(BOOL granted) {
-    UM_STRONGIFY(self)
+    EX_STRONGIFY(self)
     resolve([self getPermissions]);
   }];
 }

package/ios/EXCamera/EXCameraPermissionRequester.m

@@ -1,7 +1,7 @@
 // Copyright 2016-present 650 Industries. All rights reserved.
 
 #import <EXCamera/EXCameraPermissionRequester.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"];
   NSString *microphoneUsageDescription = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"NSMicrophoneUsageDescription"];
   if (!(cameraUsageDescription && microphoneUsageDescription)) {
-    UMFatal(UMErrorWithMessage(@"This app is missing either NSCameraUsageDescription or NSMicrophoneUsageDescription, so audio/video services will fail. Add one of these entries to your bundle's Info.plist."));
+    EXFatal(EXErrorWithMessage(@"This app is missing either NSCameraUsageDescription or NSMicrophoneUsageDescription, so audio/video services will fail. Add one of these entries 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.podspec

@@ -10,10 +10,10 @@ Pod::Spec.new do |s|
   s.license        = package['license']
   s.author         = package['author']
   s.homepage       = package['homepage']
-  s.platform       = :ios, '11.0'
+  s.platform       = :ios, '12.0'
   s.source         = { :git => "https://github.com/expo/expo.git" }
+  s.static_framework = true
 
-  s.dependency 'UMCore'
   s.dependency 'ExpoModulesCore'
 
   if !$ExpoUseSources&.include?(package['name']) && ENV['EXPO_USE_SOURCE'].to_i == 0 && File.exist?("#{s.name}.xcframework") && Gem::Version.new(Pod::VERSION) >= Gem::Version.new('1.10.0')

package/ios/EXCamera.xcframework/Info.plist

@@ -6,30 +6,30 @@
 	<array>
 		<dict>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64</string>
+			<string>ios-arm64_x86_64-simulator</string>
 			<key>LibraryPath</key>
 			<string>EXCamera.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
+				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
 		</dict>
 		<dict>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_x86_64-simulator</string>
+			<string>ios-arm64</string>
 			<key>LibraryPath</key>
 			<string>EXCamera.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
-				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
-			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
 		</dict>
 	</array>
 	<key>CFBundlePackageType</key>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-camera",
-  "version": "11.2.2",
+  "version": "12.0.1",
   "description": "A React component that renders a preview for the device's either front or back camera. Camera's parameters like zoom, auto focus, white balance and flash mode are adjustable. With expo-camera, one can also take photos and record videos that are saved to the app's cache. Morever, the component is also capable of detecting faces and bar codes appearing on the preview.",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -29,18 +29,18 @@
   },
   "author": "650 Industries, Inc.",
   "license": "MIT",
-  "homepage": "https://docs.expo.io/versions/latest/sdk/camera/",
+  "homepage": "https://docs.expo.dev/versions/latest/sdk/camera/",
   "jest": {
     "preset": "expo-module-scripts"
   },
   "dependencies": {
-    "@expo/config-plugins": "^3.0.0",
-    "@koale/useworker": "^3.2.1",
-    "expo-modules-core": "~0.2.0",
+    "@expo/config-plugins": "^3.1.0",
+    "@koale/useworker": "^4.0.2",
+    "expo-modules-core": "~0.4.2",
     "invariant": "2.2.4"
   },
   "devDependencies": {
     "expo-module-scripts": "^2.0.0"
   },
-  "gitHead": "4fba2d1457de04cde97e21ce98acb1c3eab65e82"
+  "gitHead": "2718b696f4a6919905b0f47ebb24ff65b42d8ff9"
 }

package/plugin/build/withCamera.js

@@ -9,8 +9,8 @@ const MICROPHONE_USAGE = 'Allow $(PRODUCT_NAME) to access your microphone';
 // It's ok to have multiple allprojects.repositories, so we create a new one since it's cheaper than tokenizing
 // the existing block to find the correct place to insert our camera maven.
 const gradleMaven = 'allprojects { repositories { maven { url "$rootDir/../node_modules/expo-camera/android/maven" } } }';
-const withAndroidCameraGradle = config => {
-    return config_plugins_1.withProjectBuildGradle(config, config => {
+const withAndroidCameraGradle = (config) => {
+    return config_plugins_1.withProjectBuildGradle(config, (config) => {
         if (config.modResults.language === 'groovy') {
             config.modResults.contents = setGradleMaven(config.modResults.contents);
         }

package/plugin/src/withCamera.ts

@@ -17,8 +17,8 @@ const MICROPHONE_USAGE = 'Allow $(PRODUCT_NAME) to access your microphone';
 const gradleMaven =
   'allprojects { repositories { maven { url "$rootDir/../node_modules/expo-camera/android/maven" } } }';
 
-const withAndroidCameraGradle: ConfigPlugin = config => {
-  return withProjectBuildGradle(config, config => {
+const withAndroidCameraGradle: ConfigPlugin = (config) => {
+  return withProjectBuildGradle(config, (config) => {
     if (config.modResults.language === 'groovy') {
       config.modResults.contents = setGradleMaven(config.modResults.contents);
     } else {

package/src/Camera.tsx

@@ -1,4 +1,4 @@
-import { Platform, UnavailabilityError } from '@unimodules/core';
+import { createPermissionHook, Platform, UnavailabilityError } from 'expo-modules-core';
 import * as React from 'react';
 import { findNodeHandle } from 'react-native';
 
@@ -117,11 +117,23 @@ export default class Camera extends React.Component<CameraProps> {
     whiteBalance: CameraManager.WhiteBalance.auto,
   };
 
+  /**
+   * @deprecated Use `getCameraPermissionsAync` or `getMicrophonePermissionsAsync` instead.
+   */
   static async getPermissionsAsync(): Promise<PermissionResponse> {
+    console.warn(
+      `"getPermissionsAsync()" is now deprecated. Please use "getCameraPermissionsAsync()" or "getMicrophonePermissionsAsync()" instead.`
+    );
     return CameraManager.getPermissionsAsync();
   }
 
+  /**
+   * @deprecated Use `requestCameraPermissionsAsync` or `requestMicrophonePermissionsAsync` instead.
+   */
   static async requestPermissionsAsync(): Promise<PermissionResponse> {
+    console.warn(
+      `"requestPermissionsAsync()" is now deprecated. Please use "requestCameraPermissionsAsync()" or "requestMicrophonePermissionsAsync()" instead.`
+    );
     return CameraManager.requestPermissionsAsync();
   }
 
@@ -133,6 +145,21 @@ export default class Camera extends React.Component<CameraProps> {
     return CameraManager.requestCameraPermissionsAsync();
   }
 
+  // @needsAudit
+  /**
+   * Check or request permissions to access the camera.
+   * This uses both `requestCameraPermissionsAsync` and `getCameraPermissionsAsync` to interact with the permissions.
+   *
+   * @example
+   * ```ts
+   * const [status, requestPermission] = Camera.useCameraPermissions();
+   * ```
+   */
+  static useCameraPermissions = createPermissionHook({
+    getMethod: Camera.getCameraPermissionsAsync,
+    requestMethod: Camera.requestCameraPermissionsAsync,
+  });
+
   static async getMicrophonePermissionsAsync(): Promise<PermissionResponse> {
     return CameraManager.getMicrophonePermissionsAsync();
   }
@@ -141,6 +168,21 @@ export default class Camera extends React.Component<CameraProps> {
     return CameraManager.requestMicrophonePermissionsAsync();
   }
 
+  // @needsAudit
+  /**
+   * Check or request permissions to access the microphone.
+   * This uses both `requestMicrophonePermissionsAsync` and `getMicrophonePermissionsAsync` to interact with the permissions.
+   *
+   * @example
+   * ```ts
+   * const [status, requestPermission] = Camera.useMicrophonePermissions();
+   * ```
+   */
+  static useMicrophonePermissions = createPermissionHook({
+    getMethod: Camera.getMicrophonePermissionsAsync,
+    requestMethod: Camera.requestMicrophonePermissionsAsync,
+  });
+
   _cameraHandle?: number | null;
   _cameraRef?: React.Component | null;
   _lastEvents: { [eventName: string]: string } = {};
@@ -214,23 +256,25 @@ export default class Camera extends React.Component<CameraProps> {
     }
   };
 
-  _onObjectDetected = (callback?: Function) => ({ nativeEvent }: { nativeEvent: any }) => {
-    const { type } = nativeEvent;
-    if (
-      this._lastEvents[type] &&
-      this._lastEventsTimes[type] &&
-      JSON.stringify(nativeEvent) === this._lastEvents[type] &&
-      new Date().getTime() - this._lastEventsTimes[type].getTime() < EventThrottleMs
-    ) {
-      return;
-    }
+  _onObjectDetected =
+    (callback?: Function) =>
+    ({ nativeEvent }: { nativeEvent: any }) => {
+      const { type } = nativeEvent;
+      if (
+        this._lastEvents[type] &&
+        this._lastEventsTimes[type] &&
+        JSON.stringify(nativeEvent) === this._lastEvents[type] &&
+        new Date().getTime() - this._lastEventsTimes[type].getTime() < EventThrottleMs
+      ) {
+        return;
+      }
 
-    if (callback) {
-      callback(nativeEvent);
-      this._lastEventsTimes[type] = new Date();
-      this._lastEvents[type] = JSON.stringify(nativeEvent);
-    }
-  };
+      if (callback) {
+        callback(nativeEvent);
+        this._lastEventsTimes[type] = new Date();
+        this._lastEvents[type] = JSON.stringify(nativeEvent);
+      }
+    };
 
   _setReference = (ref?: React.Component) => {
     if (ref) {

package/src/Camera.types.ts

@@ -1,4 +1,9 @@
-import { PermissionResponse, PermissionStatus, PermissionExpiration } from 'expo-modules-core';
+import {
+  PermissionResponse,
+  PermissionStatus,
+  PermissionExpiration,
+  PermissionHookOptions,
+} from 'expo-modules-core';
 import { ViewProps } from 'react-native';
 
 export enum CameraType {
@@ -301,4 +306,4 @@ export type BarCodeSettings = {
   interval?: number;
 };
 
-export { PermissionResponse, PermissionStatus, PermissionExpiration };
+export { PermissionResponse, PermissionStatus, PermissionExpiration, PermissionHookOptions };

package/src/ExponentCamera.ts

@@ -1,10 +1,9 @@
-import { requireNativeViewManager } from '@unimodules/core';
+import { requireNativeViewManager } from 'expo-modules-core';
 import * as React from 'react';
 
 import { CameraNativeProps } from './Camera.types';
 
-const ExponentCamera: React.ComponentType<CameraNativeProps> = requireNativeViewManager(
-  'ExponentCamera'
-);
+const ExponentCamera: React.ComponentType<CameraNativeProps> =
+  requireNativeViewManager('ExponentCamera');
 
 export default ExponentCamera;

package/src/ExponentCamera.web.tsx

@@ -1,4 +1,4 @@
-import { CodedError } from '@unimodules/core';
+import { CodedError } from 'expo-modules-core';
 import * as React from 'react';
 import { StyleProp, StyleSheet, View, ViewStyle } from 'react-native';
 import createElement from 'react-native-web/dist/exports/createElement';

package/src/ExponentCameraManager.ts

@@ -1,4 +1,4 @@
-import { NativeModulesProxy } from '@unimodules/core';
+import { NativeModulesProxy } from 'expo-modules-core';
 
 const CameraManager: Record<string, any> =
   NativeModulesProxy.ExponentCameraManager || NativeModulesProxy.ExponentCameraModule;