railbird/react-native-vision-camera
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: Fix Xcode 15 build error (var instead of let) (#2048)

Browse Source 
* fix: Fix Xcode 15 build error (`var` instead of `let`)

* chore: Restructure code a bit for that logic

* Update CameraDevicesManager.swift
This commit is contained in:
Marc Rousavy 2023-10-19 17:43:20 +02:00 committed by GitHub
parent 00718ea0ee
commit 5d9d153e54
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
package/ios/CameraDevicesManager.swift
View File

@ -38,19 +38,11 @@ class CameraDevicesManager: RCTEventEmitter {
override func constantsToExport() -> [AnyHashable: Any]! {
let devices = getDevicesJson()
let preferredDevice = devices.first
#if swift(>=5.9)
if #available(iOS 17.0, *) {
if let userPreferred = AVCaptureDevice.userPreferredCamera {
preferredDevice = userPreferred.toDictionary()
}
}
#endif
let preferredDevice = getPreferredDevice()
return [
"availableCameraDevices": devices,
"userPreferredCameraDevice": preferredDevice as Any,
"userPreferredCameraDevice": preferredDevice?.toDictionary() as Any,
]
}
@ -60,6 +52,19 @@ class CameraDevicesManager: RCTEventEmitter {
}
}
private func getPreferredDevice() -> AVCaptureDevice? {
#if swift(>=5.9)
if #available(iOS 17.0, *) {
if let userPreferred = AVCaptureDevice.userPreferredCamera {
// Return the device that was explicitly marked as a preferred camera by the user
return userPreferred
}
}
#endif
// Just return the first device
return discoverySession.devices.first
}
private static func getAllDeviceTypes() -> [AVCaptureDevice.DeviceType] {
var deviceTypes: [AVCaptureDevice.DeviceType] = []
deviceTypes.append(.builtInDualCamera)