diff --git a/CHANGELOG.md b/CHANGELOG.md index f9a04a722..5a190e2f2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,9 +12,14 @@ The changes documented here do not include those from the original repository. - (android) Use PhotoPicker to select media from gallery (https://outsystemsrd.atlassian.net/browse/RMET-3812). ### Fixes +- (android, ios) Improve error handling for height x width invalid values (https://outsystemsrd.atlassian.net/browse/RMET-3894). - (android) Add image resolution and quality when creating its thumbnail (https://outsystemsrd.atlassian.net/browse/RMET-3810). - (android) Fixes an issue in the permission request in the `callEditUriImage` function, where in some cases the permission kept being requested. (https://outsystemsrd.atlassian.net/browse/RMET-3875). - (android) Removes `READ_MEDIA_IMAGE` and `READ_MEDIA_VIDEO` permissions from the AndroidManifest.xml file of the resulting app, since these are never requested by the plugin, so there's no point in having them in the manifest file. (https://outsystemsrd.atlassian.net/browse/RMET-3875). +- (android) Fixes edge-to-Edge for loading screen. +- (android) Fix to give persistable permissions for returned URIs (https://outsystemsrd.atlassian.net/browse/RMET-3812). +- (android) Fix exception being thrown on Android 10 when selecting media from gallery (https://outsystemsrd.atlassian.net/browse/RMET-3812). +- (android) Always show loading screen while processing selected media (https://outsystemsrd.atlassian.net/browse/RMET-3812). ## 4.2.0-OS51 diff --git a/src/android/CameraLauncher.kt b/src/android/CameraLauncher.kt index 0b5902ef5..583411247 100644 --- a/src/android/CameraLauncher.kt +++ b/src/android/CameraLauncher.kt @@ -79,8 +79,6 @@ class CameraLauncher : CordovaPlugin() { = false private var correctOrientation // Should the pictures orientation be corrected = false - private var orientationCorrected // Has the picture's orientation been corrected - = false private var allowEdit // Should we allow the user to crop the image. = false private var saveVideoToGallery @@ -159,20 +157,11 @@ class CameraLauncher : CordovaPlugin() { when(action) { "takePicture" -> { - srcType = CAMERA - destType = FILE_URI - saveToPhotoAlbum = false - targetHeight = 0 - targetWidth = 0 - encodingType = JPEG - mediaType = PICTURE - mQuality = 50 - val parameters = args.getJSONObject(0) //Take the values from the arguments if they're not already defined (this is tricky) mQuality = parameters.getInt(QUALITY) - targetWidth = parameters.getInt(WIDTH) - targetHeight = parameters.getInt(HEIGHT) + targetWidth = parameters.optInt(WIDTH, -1) + targetHeight = parameters.optInt(HEIGHT, -1) encodingType = parameters.getInt(ENCODING_TYPE) allowEdit = parameters.getBoolean(ALLOW_EDIT) correctOrientation = parameters.getBoolean(CORRECT_ORIENTATION) @@ -180,16 +169,8 @@ class CameraLauncher : CordovaPlugin() { destType = parameters.getInt(DEST_TYPE) srcType = parameters.getInt(SOURCE_TYPE) mediaType = parameters.getInt(MEDIA_TYPE) - includeMetadata = false - latestVersion = false - - if (parameters.has(INCLUDE_METADATA)) { - includeMetadata = parameters.getBoolean(INCLUDE_METADATA) - } - - if (parameters.has(LATEST_VERSION)) { - latestVersion = parameters.getBoolean(LATEST_VERSION) - } + includeMetadata = parameters.optBoolean(INCLUDE_METADATA, false) + latestVersion = parameters.optBoolean(LATEST_VERSION, false) // If the user specifies a 0 or smaller width/height // make it -1 so later comparisons succeed diff --git a/src/ios/OSCAMRTakePictureParameters.swift b/src/ios/OSCAMRTakePictureParameters.swift index 08d814da7..bb2c51eb3 100644 --- a/src/ios/OSCAMRTakePictureParameters.swift +++ b/src/ios/OSCAMRTakePictureParameters.swift @@ -2,34 +2,50 @@ import OSCameraLib struct OSCAMRTakePictureParameters: Decodable { let quality: Int - let targetWidth: Int - let targetHeight: Int + let targetWidth: Int? + let targetHeight: Int? let encodingType: Int let sourceType: Int let allowEdit: Bool let correctOrientation: Bool let saveToPhotoAlbum: Bool let cameraDirection: Int - let includeMetadata: Bool? - let latestVersion: Bool? + let includeMetadata: Bool + let latestVersion: Bool +} + +private enum OSCAMRTakePictureParametersError: Error { + case invalid(field: String) } extension OSCAMRPictureOptions { - convenience init(from parameters: OSCAMRTakePictureParameters) { - let targetSize = OSCAMRSize(width: parameters.targetWidth, height: parameters.targetHeight) - let encodingType = OSCAMREncodingType(rawValue: parameters.encodingType) ?? .jpeg - let direction = OSCAMRDirection(rawValue: parameters.cameraDirection) ?? .back + convenience init(from parameters: OSCAMRTakePictureParameters) throws { + func throwError(field: String) -> OSCAMRTakePictureParametersError { + OSCAMRTakePictureParametersError.invalid(field: field) + } + + if parameters.quality < 0 || parameters.quality > 100 { throw throwError(field: "quality") } + guard let encodingType = OSCAMREncodingType(rawValue: parameters.encodingType) else { throw throwError(field: "encodingType") } + guard let cameraDirection = OSCAMRDirection(rawValue: parameters.cameraDirection) else { throw throwError(field: "cameraDirection") } - self.init( - quality: parameters.quality, - size: targetSize, + var targetSize: OSCAMRSize? + if let targetWidth = parameters.targetWidth, let targetHeight = parameters.targetHeight { + guard targetWidth > 0 else { throw throwError(field: "targetWidth") } + guard targetHeight > 0 else { throw throwError(field: "targetHeight") } + + targetSize = try OSCAMRSize(width: targetWidth, height: targetHeight) + } + + try self.init( + quality: parameters.quality, + size: targetSize, correctOrientation: parameters.correctOrientation, encodingType: encodingType, saveToPhotoAlbum: parameters.saveToPhotoAlbum, - direction: direction, + direction: cameraDirection, allowEdit: parameters.allowEdit, - returnMetadata: parameters.includeMetadata ?? false, - latestVersion: parameters.latestVersion ?? false + returnMetadata: parameters.includeMetadata, + latestVersion: parameters.latestVersion ) } -} \ No newline at end of file +} diff --git a/src/ios/OSCamera.swift b/src/ios/OSCamera.swift index dcc0ae545..393b33efe 100644 --- a/src/ios/OSCamera.swift +++ b/src/ios/OSCamera.swift @@ -24,16 +24,16 @@ class OSCamera: CDVPlugin { guard let parametersDictionary = command.argument(at: 0) as? [String: Any], let parametersData = try? JSONSerialization.data(withJSONObject: parametersDictionary), let parameters = try? JSONDecoder().decode(OSCAMRTakePictureParameters.self, from: parametersData) - else { return self.callback(error: .takePictureIssue) } + else { return self.callback(error: .takePictureArguments) } // This 🔨 is required in order not to break Android's implementation if parameters.sourceType == 0 { - self.chooseSinglePicture(allowEdit: parameters.allowEdit) - return + return self.chooseSinglePicture(allowEdit: parameters.allowEdit) } - let options = OSCAMRPictureOptions(from: parameters) - + guard let options = try? OSCAMRPictureOptions(from: parameters) + else { return self.callback(error: .takePictureArguments) } + self.commandDelegate.run { [weak self] in guard let self = self else { return } self.plugin?.captureMedia(with: options) diff --git a/src/ios/frameworks/OSCameraLib.xcframework/Info.plist b/src/ios/frameworks/OSCameraLib.xcframework/Info.plist index 8d7e77e1b..2c273f6c8 100644 --- a/src/ios/frameworks/OSCameraLib.xcframework/Info.plist +++ b/src/ios/frameworks/OSCameraLib.xcframework/Info.plist @@ -8,32 +8,32 @@ BinaryPath OSCameraLib.framework/OSCameraLib LibraryIdentifier - ios-arm64 + ios-arm64_x86_64-simulator LibraryPath OSCameraLib.framework SupportedArchitectures arm64 + x86_64 SupportedPlatform ios + SupportedPlatformVariant + simulator BinaryPath OSCameraLib.framework/OSCameraLib LibraryIdentifier - ios-arm64_x86_64-simulator + ios-arm64 LibraryPath OSCameraLib.framework SupportedArchitectures arm64 - x86_64 SupportedPlatform ios - SupportedPlatformVariant - simulator CFBundlePackageType diff --git a/src/ios/frameworks/OSCameraLib.xcframework/_CodeSignature/CodeDirectory b/src/ios/frameworks/OSCameraLib.xcframework/_CodeSignature/CodeDirectory index e0ab9b94b..9aaef70a5 100644 Binary files a/src/ios/frameworks/OSCameraLib.xcframework/_CodeSignature/CodeDirectory and b/src/ios/frameworks/OSCameraLib.xcframework/_CodeSignature/CodeDirectory differ diff --git a/src/ios/frameworks/OSCameraLib.xcframework/_CodeSignature/CodeRequirements-1 b/src/ios/frameworks/OSCameraLib.xcframework/_CodeSignature/CodeRequirements-1 index f3fad3162..69c786d89 100644 Binary files a/src/ios/frameworks/OSCameraLib.xcframework/_CodeSignature/CodeRequirements-1 and b/src/ios/frameworks/OSCameraLib.xcframework/_CodeSignature/CodeRequirements-1 differ diff --git a/src/ios/frameworks/OSCameraLib.xcframework/_CodeSignature/CodeResources b/src/ios/frameworks/OSCameraLib.xcframework/_CodeSignature/CodeResources index f9b05140d..89fa18070 100644 --- a/src/ios/frameworks/OSCameraLib.xcframework/_CodeSignature/CodeResources +++ b/src/ios/frameworks/OSCameraLib.xcframework/_CodeSignature/CodeResources @@ -14,23 +14,23 @@ ios-arm64/OSCameraLib.framework/Info.plist - 8G8AxsvI/eELzSfTyh8Qgwe/5HE= + csDNOqHhEeuwj3E37H9cMUxXebw= ios-arm64/OSCameraLib.framework/Modules/OSCameraLib.swiftmodule/arm64-apple-ios.abi.json - T3gAOzuH9Na5ql26XgT9Gnldza8= + iGC0gKY4LFjlfu4UnkNzf02oq6o= ios-arm64/OSCameraLib.framework/Modules/OSCameraLib.swiftmodule/arm64-apple-ios.private.swiftinterface - DtKSb0u6XXSnDWTzYdY/fBNMLlc= + z3N/oAY/Kfy0r1AnAUGxLDxk9ao= ios-arm64/OSCameraLib.framework/Modules/OSCameraLib.swiftmodule/arm64-apple-ios.swiftdoc - yskLVdifB3k68eSxLBsY65iKjv0= + MF2Obmus/yBYses1WIzMeFPWvyE= ios-arm64/OSCameraLib.framework/Modules/OSCameraLib.swiftmodule/arm64-apple-ios.swiftinterface - DtKSb0u6XXSnDWTzYdY/fBNMLlc= + z3N/oAY/Kfy0r1AnAUGxLDxk9ao= ios-arm64/OSCameraLib.framework/Modules/module.modulemap @@ -38,7 +38,7 @@ ios-arm64/OSCameraLib.framework/OSCameraLib - O+NRISH/0RGMjpVws8KQ9cfoIkU= + 3vRc8TKNoZA0lDxu/+kRruYPgIE= ios-arm64/OSCameraLib.framework/PrivacyInfo.xcprivacy @@ -54,39 +54,39 @@ ios-arm64_x86_64-simulator/OSCameraLib.framework/Info.plist - ly81tqef7qhY+dj26F2s3gctoBI= + 4sYiboZHb9EG3GGU30t2/QJsLlE= ios-arm64_x86_64-simulator/OSCameraLib.framework/Modules/OSCameraLib.swiftmodule/arm64-apple-ios-simulator.abi.json - wBcLoBc0Zfd3zxshZaOJ8JAqKiA= + LV2g0CyYeRgvQBd/l4WmLnt94L4= ios-arm64_x86_64-simulator/OSCameraLib.framework/Modules/OSCameraLib.swiftmodule/arm64-apple-ios-simulator.private.swiftinterface - ljHEkL2rVAiFQnJnZk5IHQKTJeQ= + aQJbhdsrmU466EB8gHpGtJ6nxJA= ios-arm64_x86_64-simulator/OSCameraLib.framework/Modules/OSCameraLib.swiftmodule/arm64-apple-ios-simulator.swiftdoc - Urv1/KgxMD3HOYvv6mzOYqEcLZ4= + ljQtRVmMRd4o+CjpMtRc34/3Cfk= ios-arm64_x86_64-simulator/OSCameraLib.framework/Modules/OSCameraLib.swiftmodule/arm64-apple-ios-simulator.swiftinterface - ljHEkL2rVAiFQnJnZk5IHQKTJeQ= + aQJbhdsrmU466EB8gHpGtJ6nxJA= ios-arm64_x86_64-simulator/OSCameraLib.framework/Modules/OSCameraLib.swiftmodule/x86_64-apple-ios-simulator.abi.json - wBcLoBc0Zfd3zxshZaOJ8JAqKiA= + LV2g0CyYeRgvQBd/l4WmLnt94L4= ios-arm64_x86_64-simulator/OSCameraLib.framework/Modules/OSCameraLib.swiftmodule/x86_64-apple-ios-simulator.private.swiftinterface - smp6GNPiT8juaJXz49yvCCk93rY= + tCKiUCRGpXYsw3S+39Laq2e0TAU= ios-arm64_x86_64-simulator/OSCameraLib.framework/Modules/OSCameraLib.swiftmodule/x86_64-apple-ios-simulator.swiftdoc - pXd0RG9YW6t8nDwuA3NjLHMYnAA= + OMcxlzLvA2+ZzF1keegy+mSotAo= ios-arm64_x86_64-simulator/OSCameraLib.framework/Modules/OSCameraLib.swiftmodule/x86_64-apple-ios-simulator.swiftinterface - smp6GNPiT8juaJXz49yvCCk93rY= + tCKiUCRGpXYsw3S+39Laq2e0TAU= ios-arm64_x86_64-simulator/OSCameraLib.framework/Modules/module.modulemap @@ -94,7 +94,7 @@ ios-arm64_x86_64-simulator/OSCameraLib.framework/OSCameraLib - 8ihecnj036LKzIjUOtgKBE8BpbE= + IdS3hc+nmkVD2QgHikRXYPs17+c= ios-arm64_x86_64-simulator/OSCameraLib.framework/PrivacyInfo.xcprivacy @@ -102,7 +102,7 @@ ios-arm64_x86_64-simulator/OSCameraLib.framework/_CodeSignature/CodeResources - BOEpluZn38hbmaD4m2b63tzusck= + lVpf7yPeit1WWCvrTiNh4fC6XEA= files2 @@ -133,55 +133,55 @@ hash - 8G8AxsvI/eELzSfTyh8Qgwe/5HE= + csDNOqHhEeuwj3E37H9cMUxXebw= hash2 - 6PyOzCCNM5ThZg7L9VwLFtvifFMhcGIrzCCnbPq+VkQ= + Z929+S5ew0kIVdQAWt1Q0NgKFRFwEvOg1n8p4j6/yOA= ios-arm64/OSCameraLib.framework/Modules/OSCameraLib.swiftmodule/arm64-apple-ios.abi.json hash - T3gAOzuH9Na5ql26XgT9Gnldza8= + iGC0gKY4LFjlfu4UnkNzf02oq6o= hash2 - xrlR2TEsEQq+ZkFZ4p60RLWdPzpX8HWSXUr7v+8b8T0= + 7t+wtEVTujcZpe/wriB4cTXqdcdMcL8n0WOuTDdLV6E= ios-arm64/OSCameraLib.framework/Modules/OSCameraLib.swiftmodule/arm64-apple-ios.private.swiftinterface hash - DtKSb0u6XXSnDWTzYdY/fBNMLlc= + z3N/oAY/Kfy0r1AnAUGxLDxk9ao= hash2 - ZaXWBDr+aDHifngrP3iVpTgakXPVnU7BqUqH3GUu4JE= + R38fPZxt7dw+FSJFpv3MQlepsGu+KJi5O9GsxDtqfwI= ios-arm64/OSCameraLib.framework/Modules/OSCameraLib.swiftmodule/arm64-apple-ios.swiftdoc hash - yskLVdifB3k68eSxLBsY65iKjv0= + MF2Obmus/yBYses1WIzMeFPWvyE= hash2 - ezCk0gOliRHtfxIzsD+yURKsIdDqqOUfb8M/CUCPhB8= + 0M1lH/0vB+wQwjwyYCVgnpZvhiWV8omFx+rs9ahWOYk= ios-arm64/OSCameraLib.framework/Modules/OSCameraLib.swiftmodule/arm64-apple-ios.swiftinterface hash - DtKSb0u6XXSnDWTzYdY/fBNMLlc= + z3N/oAY/Kfy0r1AnAUGxLDxk9ao= hash2 - ZaXWBDr+aDHifngrP3iVpTgakXPVnU7BqUqH3GUu4JE= + R38fPZxt7dw+FSJFpv3MQlepsGu+KJi5O9GsxDtqfwI= ios-arm64/OSCameraLib.framework/Modules/module.modulemap @@ -199,11 +199,11 @@ hash - O+NRISH/0RGMjpVws8KQ9cfoIkU= + 3vRc8TKNoZA0lDxu/+kRruYPgIE= hash2 - miud4oMXD2Fwl2kmfYxDmNH62+fI9JshmFChkGF1DXU= + 5ffF4SfEcKZrBy4DUjaTwMj8JMEVLbMRUspCotMmjl0= ios-arm64/OSCameraLib.framework/PrivacyInfo.xcprivacy @@ -243,99 +243,99 @@ hash - ly81tqef7qhY+dj26F2s3gctoBI= + 4sYiboZHb9EG3GGU30t2/QJsLlE= hash2 - d9l3y1kWC+HAzsR1k1VGVeo7RRpKBPZ/PH3P94fuBDA= + dNEMKUyb0bA3Y+W1xSr9/PtDzbWM022swMfb1HBYrLg= ios-arm64_x86_64-simulator/OSCameraLib.framework/Modules/OSCameraLib.swiftmodule/arm64-apple-ios-simulator.abi.json hash - wBcLoBc0Zfd3zxshZaOJ8JAqKiA= + LV2g0CyYeRgvQBd/l4WmLnt94L4= hash2 - 7zYW/7RswAGamB0YWs72LHZyhxIaRzvp53TajbPn2nA= + 0nbLrmGVc5M2CJG43B9TA1kyMXh+ihPLkkfaXrHDZiU= ios-arm64_x86_64-simulator/OSCameraLib.framework/Modules/OSCameraLib.swiftmodule/arm64-apple-ios-simulator.private.swiftinterface hash - ljHEkL2rVAiFQnJnZk5IHQKTJeQ= + aQJbhdsrmU466EB8gHpGtJ6nxJA= hash2 - hW+mIYszm8M+eL+ATQXHMU782nkKl8kbZvf2Djd+sb8= + ooBkdkOL3Xx9VHxMe/IXjCAT2SZvPaTwf9gJMr3yptk= ios-arm64_x86_64-simulator/OSCameraLib.framework/Modules/OSCameraLib.swiftmodule/arm64-apple-ios-simulator.swiftdoc hash - Urv1/KgxMD3HOYvv6mzOYqEcLZ4= + ljQtRVmMRd4o+CjpMtRc34/3Cfk= hash2 - OH9Fi3jSV/jxbQew8knhx1JBlq1O/v8jIUYon4QX5O0= + HgDmfT96Qlk61y+YF2rDV7sryvqXVi+e670VaN1QhL4= ios-arm64_x86_64-simulator/OSCameraLib.framework/Modules/OSCameraLib.swiftmodule/arm64-apple-ios-simulator.swiftinterface hash - ljHEkL2rVAiFQnJnZk5IHQKTJeQ= + aQJbhdsrmU466EB8gHpGtJ6nxJA= hash2 - hW+mIYszm8M+eL+ATQXHMU782nkKl8kbZvf2Djd+sb8= + ooBkdkOL3Xx9VHxMe/IXjCAT2SZvPaTwf9gJMr3yptk= ios-arm64_x86_64-simulator/OSCameraLib.framework/Modules/OSCameraLib.swiftmodule/x86_64-apple-ios-simulator.abi.json hash - wBcLoBc0Zfd3zxshZaOJ8JAqKiA= + LV2g0CyYeRgvQBd/l4WmLnt94L4= hash2 - 7zYW/7RswAGamB0YWs72LHZyhxIaRzvp53TajbPn2nA= + 0nbLrmGVc5M2CJG43B9TA1kyMXh+ihPLkkfaXrHDZiU= ios-arm64_x86_64-simulator/OSCameraLib.framework/Modules/OSCameraLib.swiftmodule/x86_64-apple-ios-simulator.private.swiftinterface hash - smp6GNPiT8juaJXz49yvCCk93rY= + tCKiUCRGpXYsw3S+39Laq2e0TAU= hash2 - laX/IUN8yBiSc5I4V8f6mxv4UqQPj84GxCVRwKEqLbs= + 7EVtccBUvg1lPfVEXziKq6P9eRaTEsQZnW0gdICn7Ds= ios-arm64_x86_64-simulator/OSCameraLib.framework/Modules/OSCameraLib.swiftmodule/x86_64-apple-ios-simulator.swiftdoc hash - pXd0RG9YW6t8nDwuA3NjLHMYnAA= + OMcxlzLvA2+ZzF1keegy+mSotAo= hash2 - ZbYBjYhxU78Y11qulHA1UxaUtg1wW5TWosFS9q+78Vc= + E5oKM2zdwIUX9387XKvjrEci7a1J+brzdL3LpFfYnJE= ios-arm64_x86_64-simulator/OSCameraLib.framework/Modules/OSCameraLib.swiftmodule/x86_64-apple-ios-simulator.swiftinterface hash - smp6GNPiT8juaJXz49yvCCk93rY= + tCKiUCRGpXYsw3S+39Laq2e0TAU= hash2 - laX/IUN8yBiSc5I4V8f6mxv4UqQPj84GxCVRwKEqLbs= + 7EVtccBUvg1lPfVEXziKq6P9eRaTEsQZnW0gdICn7Ds= ios-arm64_x86_64-simulator/OSCameraLib.framework/Modules/module.modulemap @@ -353,11 +353,11 @@ hash - 8ihecnj036LKzIjUOtgKBE8BpbE= + IdS3hc+nmkVD2QgHikRXYPs17+c= hash2 - VSRizhm4u1vnpUAAAjewbPCP0c2rrHi4H8sVdA/NKEU= + /khc4Kg1o4dT9UmxwnQJQ+NbXW+tGkGveVhmAlx1X0E= ios-arm64_x86_64-simulator/OSCameraLib.framework/PrivacyInfo.xcprivacy @@ -375,11 +375,11 @@ hash - BOEpluZn38hbmaD4m2b63tzusck= + lVpf7yPeit1WWCvrTiNh4fC6XEA= hash2 - ETd4OFatElTLPWazOhnKBjG4a8FGEfqqXzMrGXlmmPc= + FgvHNZRl8QOLWC6LBT/+sTNSW9DA2UkagTagOm6ByAE= diff --git a/src/ios/frameworks/OSCameraLib.xcframework/_CodeSignature/CodeSignature b/src/ios/frameworks/OSCameraLib.xcframework/_CodeSignature/CodeSignature index 17369ffdf..31090fc1d 100644 Binary files a/src/ios/frameworks/OSCameraLib.xcframework/_CodeSignature/CodeSignature and b/src/ios/frameworks/OSCameraLib.xcframework/_CodeSignature/CodeSignature differ diff --git a/src/ios/frameworks/OSCameraLib.xcframework/ios-arm64/OSCameraLib.framework/Info.plist b/src/ios/frameworks/OSCameraLib.xcframework/ios-arm64/OSCameraLib.framework/Info.plist index 22e99714d..5aa195e27 100644 Binary files a/src/ios/frameworks/OSCameraLib.xcframework/ios-arm64/OSCameraLib.framework/Info.plist and b/src/ios/frameworks/OSCameraLib.xcframework/ios-arm64/OSCameraLib.framework/Info.plist differ diff --git a/src/ios/frameworks/OSCameraLib.xcframework/ios-arm64/OSCameraLib.framework/Modules/OSCameraLib.swiftmodule/arm64-apple-ios.abi.json b/src/ios/frameworks/OSCameraLib.xcframework/ios-arm64/OSCameraLib.framework/Modules/OSCameraLib.swiftmodule/arm64-apple-ios.abi.json index aed2664da..bf0767518 100644 --- a/src/ios/frameworks/OSCameraLib.xcframework/ios-arm64/OSCameraLib.framework/Modules/OSCameraLib.swiftmodule/arm64-apple-ios.abi.json +++ b/src/ios/frameworks/OSCameraLib.xcframework/ios-arm64/OSCameraLib.framework/Modules/OSCameraLib.swiftmodule/arm64-apple-ios.abi.json @@ -1259,12 +1259,13 @@ } ], "declKind": "Constructor", - "usr": "s:11OSCameraLib20OSCAMRPictureOptionsC7quality4size18correctOrientation12encodingType16saveToPhotoAlbum9direction9allowEdit14returnMetadata13latestVersionACSi_AA10OSCAMRSizeVSgSbAA014OSCAMREncodingJ0OSbAA15OSCAMRDirectionOS3btcfc", - "mangledName": "$s11OSCameraLib20OSCAMRPictureOptionsC7quality4size18correctOrientation12encodingType16saveToPhotoAlbum9direction9allowEdit14returnMetadata13latestVersionACSi_AA10OSCAMRSizeVSgSbAA014OSCAMREncodingJ0OSbAA15OSCAMRDirectionOS3btcfc", + "usr": "s:11OSCameraLib20OSCAMRPictureOptionsC7quality4size18correctOrientation12encodingType16saveToPhotoAlbum9direction9allowEdit14returnMetadata13latestVersionACSi_AA10OSCAMRSizeVSgSbAA014OSCAMREncodingJ0OSbAA15OSCAMRDirectionOS3btKcfc", + "mangledName": "$s11OSCameraLib20OSCAMRPictureOptionsC7quality4size18correctOrientation12encodingType16saveToPhotoAlbum9direction9allowEdit14returnMetadata13latestVersionACSi_AA10OSCAMRSizeVSgSbAA014OSCAMREncodingJ0OSbAA15OSCAMRDirectionOS3btKcfc", "moduleName": "OSCameraLib", "declAttributes": [ "AccessControl" ], + "throwing": true, "init_kind": "Designated" } ], @@ -1559,13 +1560,14 @@ } ], "declKind": "Constructor", - "usr": "s:11OSCameraLib10OSCAMRSizeV5width6heightACSi_Sitcfc", - "mangledName": "$s11OSCameraLib10OSCAMRSizeV5width6heightACSi_Sitcfc", + "usr": "s:11OSCameraLib10OSCAMRSizeV5width6heightACSi_SitKcfc", + "mangledName": "$s11OSCameraLib10OSCAMRSizeV5width6heightACSi_SitKcfc", "moduleName": "OSCameraLib", "declAttributes": [ "AccessControl", "RawDocComment" ], + "throwing": true, "init_kind": "Designated" } ], @@ -3284,21 +3286,7 @@ { "filePath": "\/Users\/rcj\/Documents\/Projects\/OSCameraLib-iOS\/OSCameraLib\/Extensions\/UIImage+MediaOptions.swift", "kind": "IntegerLiteral", - "offset": 1456, - "length": 1, - "value": "0" - }, - { - "filePath": "\/Users\/rcj\/Documents\/Projects\/OSCameraLib-iOS\/OSCameraLib\/Extensions\/UIImage+MediaOptions.swift", - "kind": "IntegerLiteral", - "offset": 1478, - "length": 1, - "value": "0" - }, - { - "filePath": "\/Users\/rcj\/Documents\/Projects\/OSCameraLib-iOS\/OSCameraLib\/Extensions\/UIImage+MediaOptions.swift", - "kind": "IntegerLiteral", - "offset": 3051, + "offset": 3106, "length": 3, "value": "100" }, @@ -3655,42 +3643,42 @@ { "filePath": "\/Users\/rcj\/Documents\/Projects\/OSCameraLib-iOS\/OSCameraLib\/Interfaces\/Extensions\/CGSize+Transformations.swift", "kind": "StringLiteral", - "offset": 566, + "offset": 601, "length": 40, "value": "\"\"" }, { "filePath": "\/Users\/rcj\/Documents\/Projects\/OSCameraLib-iOS\/OSCameraLib\/Interfaces\/Extensions\/CGSize+Transformations.swift", "kind": "StringLiteral", - "offset": 585, + "offset": 620, "length": 1, "value": "\"x\"" }, { "filePath": "\/Users\/rcj\/Documents\/Projects\/OSCameraLib-iOS\/OSCameraLib\/Interfaces\/Extensions\/CGSize+Transformations.swift", "kind": "StringLiteral", - "offset": 605, + "offset": 640, "length": 1, "value": "\"\"" }, { "filePath": "\/Users\/rcj\/Documents\/Projects\/OSCameraLib-iOS\/OSCameraLib\/Interfaces\/Extensions\/CGSize+Transformations.swift", "kind": "StringLiteral", - "offset": 643, + "offset": 678, "length": 40, "value": "\"\"" }, { "filePath": "\/Users\/rcj\/Documents\/Projects\/OSCameraLib-iOS\/OSCameraLib\/Interfaces\/Extensions\/CGSize+Transformations.swift", "kind": "StringLiteral", - "offset": 663, + "offset": 698, "length": 1, "value": "\"x\"" }, { "filePath": "\/Users\/rcj\/Documents\/Projects\/OSCameraLib-iOS\/OSCameraLib\/Interfaces\/Extensions\/CGSize+Transformations.swift", "kind": "StringLiteral", - "offset": 682, + "offset": 717, "length": 1, "value": "\"\"" }, @@ -4642,108 +4630,150 @@ { "filePath": "\/Users\/rcj\/Documents\/Projects\/OSCameraLib-iOS\/OSCameraLib\/Models\/OSCAMRPictureOptions.swift", "kind": "IntegerLiteral", - "offset": 1008, + "offset": 1141, + "length": 1, + "value": "0" + }, + { + "filePath": "\/Users\/rcj\/Documents\/Projects\/OSCameraLib-iOS\/OSCameraLib\/Models\/OSCAMRPictureOptions.swift", + "kind": "IntegerLiteral", + "offset": 1156, "length": 3, "value": "100" }, + { + "filePath": "\/Users\/rcj\/Documents\/Projects\/OSCameraLib-iOS\/OSCameraLib\/Models\/OSCAMRPictureOptions.swift", + "kind": "StringLiteral", + "offset": 1186, + "length": 9, + "value": "\"quality\"" + }, { "filePath": "\/Users\/rcj\/Documents\/Projects\/OSCameraLib-iOS\/OSCameraLib\/Models\/OSCAMRPictureOptions.swift", "kind": "IntegerLiteral", - "offset": 1025, + "offset": 1289, "length": 1, "value": "0" }, { "filePath": "\/Users\/rcj\/Documents\/Projects\/OSCameraLib-iOS\/OSCameraLib\/Models\/OSCAMRPictureOptions.swift", "kind": "IntegerLiteral", - "offset": 1039, + "offset": 1301, "length": 1, "value": "0" }, { "filePath": "\/Users\/rcj\/Documents\/Projects\/OSCameraLib-iOS\/OSCameraLib\/Models\/OSCAMRPictureOptions.swift", - "kind": "IntegerLiteral", - "offset": 1044, - "length": 3, - "value": "100" + "kind": "StringLiteral", + "offset": 1334, + "length": 6, + "value": "\"size\"" }, { "filePath": "\/Users\/rcj\/Documents\/Projects\/OSCameraLib-iOS\/OSCameraLib\/Models\/OSCAMRPictureOptions.swift", "kind": "StringLiteral", - "offset": 96, + "offset": 179, "length": 20, "value": "\"OSCameraLib.OSCAMRPictureOptions\"" }, { "filePath": "\/Users\/rcj\/Documents\/Projects\/OSCameraLib-iOS\/OSCameraLib\/Models\/OSCAMRPictureOptions.swift", "kind": "IntegerLiteral", - "offset": 1499, + "offset": 1837, "length": 1, "value": "1" }, { "filePath": "\/Users\/rcj\/Documents\/Projects\/OSCameraLib-iOS\/OSCameraLib\/Models\/OSCAMRPictureOptions.swift", "kind": "IntegerLiteral", - "offset": 1533, + "offset": 1871, "length": 4, "value": "1080" }, { "filePath": "\/Users\/rcj\/Documents\/Projects\/OSCameraLib-iOS\/OSCameraLib\/Models\/OSCAMRPictureOptions.swift", "kind": "IntegerLiteral", - "offset": 1777, + "offset": 2121, "length": 1, "value": "0" }, { "filePath": "\/Users\/rcj\/Documents\/Projects\/OSCameraLib-iOS\/OSCameraLib\/Models\/OSCAMRPictureOptions.swift", "kind": "IntegerLiteral", - "offset": 1788, + "offset": 2132, "length": 3, "value": "1" }, { "filePath": "\/Users\/rcj\/Documents\/Projects\/OSCameraLib-iOS\/OSCameraLib\/Models\/OSCAMRPictureOptions.swift", "kind": "StringLiteral", - "offset": 1883, + "offset": 2227, "length": 6, "value": "\"jpeg\"" }, { "filePath": "\/Users\/rcj\/Documents\/Projects\/OSCameraLib-iOS\/OSCameraLib\/Models\/OSCAMRPictureOptions.swift", "kind": "StringLiteral", - "offset": 1916, + "offset": 2260, "length": 5, "value": "\"png\"" }, { "filePath": "\/Users\/rcj\/Documents\/Projects\/OSCameraLib-iOS\/OSCameraLib\/Models\/OSCAMRPictureOptions.swift", "kind": "IntegerLiteral", - "offset": 1777, + "offset": 2121, "length": 1, "value": "0" }, { "filePath": "\/Users\/rcj\/Documents\/Projects\/OSCameraLib-iOS\/OSCameraLib\/Models\/OSCAMRPictureOptions.swift", "kind": "IntegerLiteral", - "offset": 1788, + "offset": 2132, "length": 3, "value": "1" }, { "filePath": "\/Users\/rcj\/Documents\/Projects\/OSCameraLib-iOS\/OSCameraLib\/Models\/OSCAMRPictureOptions.swift", "kind": "IntegerLiteral", - "offset": 1777, + "offset": 2121, "length": 1, "value": "0" }, { "filePath": "\/Users\/rcj\/Documents\/Projects\/OSCameraLib-iOS\/OSCameraLib\/Models\/OSCAMRPictureOptions.swift", "kind": "IntegerLiteral", - "offset": 1788, + "offset": 2132, "length": 3, "value": "1" }, + { + "filePath": "\/Users\/rcj\/Documents\/Projects\/OSCameraLib-iOS\/OSCameraLib\/Models\/OSCAMRPictureOptions.swift", + "kind": "IntegerLiteral", + "offset": 2832, + "length": 1, + "value": "0" + }, + { + "filePath": "\/Users\/rcj\/Documents\/Projects\/OSCameraLib-iOS\/OSCameraLib\/Models\/OSCAMRPictureOptions.swift", + "kind": "StringLiteral", + "offset": 2865, + "length": 7, + "value": "\"width\"" + }, + { + "filePath": "\/Users\/rcj\/Documents\/Projects\/OSCameraLib-iOS\/OSCameraLib\/Models\/OSCAMRPictureOptions.swift", + "kind": "IntegerLiteral", + "offset": 2899, + "length": 1, + "value": "0" + }, + { + "filePath": "\/Users\/rcj\/Documents\/Projects\/OSCameraLib-iOS\/OSCameraLib\/Models\/OSCAMRPictureOptions.swift", + "kind": "StringLiteral", + "offset": 2932, + "length": 8, + "value": "\"height\"" + }, { "filePath": "\/Users\/rcj\/Documents\/Projects\/OSCameraLib-iOS\/OSCameraLib\/Interfaces\/OSCAMREditorBehaviour.swift", "kind": "BooleanLiteral", diff --git a/src/ios/frameworks/OSCameraLib.xcframework/ios-arm64/OSCameraLib.framework/Modules/OSCameraLib.swiftmodule/arm64-apple-ios.private.swiftinterface b/src/ios/frameworks/OSCameraLib.xcframework/ios-arm64/OSCameraLib.framework/Modules/OSCameraLib.swiftmodule/arm64-apple-ios.private.swiftinterface index dd36f2cce..5c4d6941e 100644 --- a/src/ios/frameworks/OSCameraLib.xcframework/ios-arm64/OSCameraLib.framework/Modules/OSCameraLib.swiftmodule/arm64-apple-ios.private.swiftinterface +++ b/src/ios/frameworks/OSCameraLib.xcframework/ios-arm64/OSCameraLib.framework/Modules/OSCameraLib.swiftmodule/arm64-apple-ios.private.swiftinterface @@ -66,7 +66,7 @@ public protocol OSCAMRCallbackDelegate : AnyObject { @objc deinit } @_hasMissingDesignatedInitializers public class OSCAMRPictureOptions : OSCameraLib.OSCAMRMediaOptions { - public init(quality: Swift.Int, size: OSCameraLib.OSCAMRSize? = nil, correctOrientation: Swift.Bool, encodingType: OSCameraLib.OSCAMREncodingType, saveToPhotoAlbum: Swift.Bool, direction: OSCameraLib.OSCAMRDirection, allowEdit: Swift.Bool, returnMetadata: Swift.Bool, latestVersion: Swift.Bool) + public init(quality: Swift.Int, size: OSCameraLib.OSCAMRSize? = nil, correctOrientation: Swift.Bool, encodingType: OSCameraLib.OSCAMREncodingType, saveToPhotoAlbum: Swift.Bool, direction: OSCameraLib.OSCAMRDirection, allowEdit: Swift.Bool, returnMetadata: Swift.Bool, latestVersion: Swift.Bool) throws @objc deinit } public enum OSCAMREncodingType : Swift.Int, Swift.CustomStringConvertible { @@ -82,7 +82,7 @@ public enum OSCAMREncodingType : Swift.Int, Swift.CustomStringConvertible { } } public struct OSCAMRSize { - public init(width: Swift.Int, height: Swift.Int) + public init(width: Swift.Int, height: Swift.Int) throws } public enum OSCAMRError : Swift.Int, Foundation.CustomNSError, Foundation.LocalizedError { case cameraAccess diff --git a/src/ios/frameworks/OSCameraLib.xcframework/ios-arm64/OSCameraLib.framework/Modules/OSCameraLib.swiftmodule/arm64-apple-ios.swiftdoc b/src/ios/frameworks/OSCameraLib.xcframework/ios-arm64/OSCameraLib.framework/Modules/OSCameraLib.swiftmodule/arm64-apple-ios.swiftdoc index b8a73d623..0de209131 100644 Binary files a/src/ios/frameworks/OSCameraLib.xcframework/ios-arm64/OSCameraLib.framework/Modules/OSCameraLib.swiftmodule/arm64-apple-ios.swiftdoc and b/src/ios/frameworks/OSCameraLib.xcframework/ios-arm64/OSCameraLib.framework/Modules/OSCameraLib.swiftmodule/arm64-apple-ios.swiftdoc differ diff --git a/src/ios/frameworks/OSCameraLib.xcframework/ios-arm64/OSCameraLib.framework/Modules/OSCameraLib.swiftmodule/arm64-apple-ios.swiftinterface b/src/ios/frameworks/OSCameraLib.xcframework/ios-arm64/OSCameraLib.framework/Modules/OSCameraLib.swiftmodule/arm64-apple-ios.swiftinterface index dd36f2cce..5c4d6941e 100644 --- a/src/ios/frameworks/OSCameraLib.xcframework/ios-arm64/OSCameraLib.framework/Modules/OSCameraLib.swiftmodule/arm64-apple-ios.swiftinterface +++ b/src/ios/frameworks/OSCameraLib.xcframework/ios-arm64/OSCameraLib.framework/Modules/OSCameraLib.swiftmodule/arm64-apple-ios.swiftinterface @@ -66,7 +66,7 @@ public protocol OSCAMRCallbackDelegate : AnyObject { @objc deinit } @_hasMissingDesignatedInitializers public class OSCAMRPictureOptions : OSCameraLib.OSCAMRMediaOptions { - public init(quality: Swift.Int, size: OSCameraLib.OSCAMRSize? = nil, correctOrientation: Swift.Bool, encodingType: OSCameraLib.OSCAMREncodingType, saveToPhotoAlbum: Swift.Bool, direction: OSCameraLib.OSCAMRDirection, allowEdit: Swift.Bool, returnMetadata: Swift.Bool, latestVersion: Swift.Bool) + public init(quality: Swift.Int, size: OSCameraLib.OSCAMRSize? = nil, correctOrientation: Swift.Bool, encodingType: OSCameraLib.OSCAMREncodingType, saveToPhotoAlbum: Swift.Bool, direction: OSCameraLib.OSCAMRDirection, allowEdit: Swift.Bool, returnMetadata: Swift.Bool, latestVersion: Swift.Bool) throws @objc deinit } public enum OSCAMREncodingType : Swift.Int, Swift.CustomStringConvertible { @@ -82,7 +82,7 @@ public enum OSCAMREncodingType : Swift.Int, Swift.CustomStringConvertible { } } public struct OSCAMRSize { - public init(width: Swift.Int, height: Swift.Int) + public init(width: Swift.Int, height: Swift.Int) throws } public enum OSCAMRError : Swift.Int, Foundation.CustomNSError, Foundation.LocalizedError { case cameraAccess diff --git a/src/ios/frameworks/OSCameraLib.xcframework/ios-arm64/OSCameraLib.framework/OSCameraLib b/src/ios/frameworks/OSCameraLib.xcframework/ios-arm64/OSCameraLib.framework/OSCameraLib index 79cb6000f..767fa5092 100755 Binary files a/src/ios/frameworks/OSCameraLib.xcframework/ios-arm64/OSCameraLib.framework/OSCameraLib and b/src/ios/frameworks/OSCameraLib.xcframework/ios-arm64/OSCameraLib.framework/OSCameraLib differ diff --git a/src/ios/frameworks/OSCameraLib.xcframework/ios-arm64_x86_64-simulator/OSCameraLib.framework/Info.plist b/src/ios/frameworks/OSCameraLib.xcframework/ios-arm64_x86_64-simulator/OSCameraLib.framework/Info.plist index 5560e83f0..99debd715 100644 Binary files a/src/ios/frameworks/OSCameraLib.xcframework/ios-arm64_x86_64-simulator/OSCameraLib.framework/Info.plist and b/src/ios/frameworks/OSCameraLib.xcframework/ios-arm64_x86_64-simulator/OSCameraLib.framework/Info.plist differ diff --git a/src/ios/frameworks/OSCameraLib.xcframework/ios-arm64_x86_64-simulator/OSCameraLib.framework/Modules/OSCameraLib.swiftmodule/arm64-apple-ios-simulator.abi.json b/src/ios/frameworks/OSCameraLib.xcframework/ios-arm64_x86_64-simulator/OSCameraLib.framework/Modules/OSCameraLib.swiftmodule/arm64-apple-ios-simulator.abi.json index 2dd46e545..574b3c6ce 100644 --- a/src/ios/frameworks/OSCameraLib.xcframework/ios-arm64_x86_64-simulator/OSCameraLib.framework/Modules/OSCameraLib.swiftmodule/arm64-apple-ios-simulator.abi.json +++ b/src/ios/frameworks/OSCameraLib.xcframework/ios-arm64_x86_64-simulator/OSCameraLib.framework/Modules/OSCameraLib.swiftmodule/arm64-apple-ios-simulator.abi.json @@ -1259,12 +1259,13 @@ } ], "declKind": "Constructor", - "usr": "s:11OSCameraLib20OSCAMRPictureOptionsC7quality4size18correctOrientation12encodingType16saveToPhotoAlbum9direction9allowEdit14returnMetadata13latestVersionACSi_AA10OSCAMRSizeVSgSbAA014OSCAMREncodingJ0OSbAA15OSCAMRDirectionOS3btcfc", - "mangledName": "$s11OSCameraLib20OSCAMRPictureOptionsC7quality4size18correctOrientation12encodingType16saveToPhotoAlbum9direction9allowEdit14returnMetadata13latestVersionACSi_AA10OSCAMRSizeVSgSbAA014OSCAMREncodingJ0OSbAA15OSCAMRDirectionOS3btcfc", + "usr": "s:11OSCameraLib20OSCAMRPictureOptionsC7quality4size18correctOrientation12encodingType16saveToPhotoAlbum9direction9allowEdit14returnMetadata13latestVersionACSi_AA10OSCAMRSizeVSgSbAA014OSCAMREncodingJ0OSbAA15OSCAMRDirectionOS3btKcfc", + "mangledName": "$s11OSCameraLib20OSCAMRPictureOptionsC7quality4size18correctOrientation12encodingType16saveToPhotoAlbum9direction9allowEdit14returnMetadata13latestVersionACSi_AA10OSCAMRSizeVSgSbAA014OSCAMREncodingJ0OSbAA15OSCAMRDirectionOS3btKcfc", "moduleName": "OSCameraLib", "declAttributes": [ "AccessControl" ], + "throwing": true, "init_kind": "Designated" } ], @@ -1559,13 +1560,14 @@ } ], "declKind": "Constructor", - "usr": "s:11OSCameraLib10OSCAMRSizeV5width6heightACSi_Sitcfc", - "mangledName": "$s11OSCameraLib10OSCAMRSizeV5width6heightACSi_Sitcfc", + "usr": "s:11OSCameraLib10OSCAMRSizeV5width6heightACSi_SitKcfc", + "mangledName": "$s11OSCameraLib10OSCAMRSizeV5width6heightACSi_SitKcfc", "moduleName": "OSCameraLib", "declAttributes": [ "AccessControl", "RawDocComment" ], + "throwing": true, "init_kind": "Designated" } ], @@ -3284,21 +3286,7 @@ { "filePath": "\/Users\/rcj\/Documents\/Projects\/OSCameraLib-iOS\/OSCameraLib\/Extensions\/UIImage+MediaOptions.swift", "kind": "IntegerLiteral", - "offset": 1456, - "length": 1, - "value": "0" - }, - { - "filePath": "\/Users\/rcj\/Documents\/Projects\/OSCameraLib-iOS\/OSCameraLib\/Extensions\/UIImage+MediaOptions.swift", - "kind": "IntegerLiteral", - "offset": 1478, - "length": 1, - "value": "0" - }, - { - "filePath": "\/Users\/rcj\/Documents\/Projects\/OSCameraLib-iOS\/OSCameraLib\/Extensions\/UIImage+MediaOptions.swift", - "kind": "IntegerLiteral", - "offset": 3051, + "offset": 3106, "length": 3, "value": "100" }, @@ -3655,42 +3643,42 @@ { "filePath": "\/Users\/rcj\/Documents\/Projects\/OSCameraLib-iOS\/OSCameraLib\/Interfaces\/Extensions\/CGSize+Transformations.swift", "kind": "StringLiteral", - "offset": 566, + "offset": 601, "length": 40, "value": "\"\"" }, { "filePath": "\/Users\/rcj\/Documents\/Projects\/OSCameraLib-iOS\/OSCameraLib\/Interfaces\/Extensions\/CGSize+Transformations.swift", "kind": "StringLiteral", - "offset": 585, + "offset": 620, "length": 1, "value": "\"x\"" }, { "filePath": "\/Users\/rcj\/Documents\/Projects\/OSCameraLib-iOS\/OSCameraLib\/Interfaces\/Extensions\/CGSize+Transformations.swift", "kind": "StringLiteral", - "offset": 605, + "offset": 640, "length": 1, "value": "\"\"" }, { "filePath": "\/Users\/rcj\/Documents\/Projects\/OSCameraLib-iOS\/OSCameraLib\/Interfaces\/Extensions\/CGSize+Transformations.swift", "kind": "StringLiteral", - "offset": 643, + "offset": 678, "length": 40, "value": "\"\"" }, { "filePath": "\/Users\/rcj\/Documents\/Projects\/OSCameraLib-iOS\/OSCameraLib\/Interfaces\/Extensions\/CGSize+Transformations.swift", "kind": "StringLiteral", - "offset": 663, + "offset": 698, "length": 1, "value": "\"x\"" }, { "filePath": "\/Users\/rcj\/Documents\/Projects\/OSCameraLib-iOS\/OSCameraLib\/Interfaces\/Extensions\/CGSize+Transformations.swift", "kind": "StringLiteral", - "offset": 682, + "offset": 717, "length": 1, "value": "\"\"" }, @@ -4642,108 +4630,150 @@ { "filePath": "\/Users\/rcj\/Documents\/Projects\/OSCameraLib-iOS\/OSCameraLib\/Models\/OSCAMRPictureOptions.swift", "kind": "IntegerLiteral", - "offset": 1008, + "offset": 1141, + "length": 1, + "value": "0" + }, + { + "filePath": "\/Users\/rcj\/Documents\/Projects\/OSCameraLib-iOS\/OSCameraLib\/Models\/OSCAMRPictureOptions.swift", + "kind": "IntegerLiteral", + "offset": 1156, "length": 3, "value": "100" }, + { + "filePath": "\/Users\/rcj\/Documents\/Projects\/OSCameraLib-iOS\/OSCameraLib\/Models\/OSCAMRPictureOptions.swift", + "kind": "StringLiteral", + "offset": 1186, + "length": 9, + "value": "\"quality\"" + }, { "filePath": "\/Users\/rcj\/Documents\/Projects\/OSCameraLib-iOS\/OSCameraLib\/Models\/OSCAMRPictureOptions.swift", "kind": "IntegerLiteral", - "offset": 1025, + "offset": 1289, "length": 1, "value": "0" }, { "filePath": "\/Users\/rcj\/Documents\/Projects\/OSCameraLib-iOS\/OSCameraLib\/Models\/OSCAMRPictureOptions.swift", "kind": "IntegerLiteral", - "offset": 1039, + "offset": 1301, "length": 1, "value": "0" }, { "filePath": "\/Users\/rcj\/Documents\/Projects\/OSCameraLib-iOS\/OSCameraLib\/Models\/OSCAMRPictureOptions.swift", - "kind": "IntegerLiteral", - "offset": 1044, - "length": 3, - "value": "100" + "kind": "StringLiteral", + "offset": 1334, + "length": 6, + "value": "\"size\"" }, { "filePath": "\/Users\/rcj\/Documents\/Projects\/OSCameraLib-iOS\/OSCameraLib\/Models\/OSCAMRPictureOptions.swift", "kind": "StringLiteral", - "offset": 96, + "offset": 179, "length": 20, "value": "\"OSCameraLib.OSCAMRPictureOptions\"" }, { "filePath": "\/Users\/rcj\/Documents\/Projects\/OSCameraLib-iOS\/OSCameraLib\/Models\/OSCAMRPictureOptions.swift", "kind": "IntegerLiteral", - "offset": 1499, + "offset": 1837, "length": 1, "value": "1" }, { "filePath": "\/Users\/rcj\/Documents\/Projects\/OSCameraLib-iOS\/OSCameraLib\/Models\/OSCAMRPictureOptions.swift", "kind": "IntegerLiteral", - "offset": 1533, + "offset": 1871, "length": 4, "value": "1080" }, { "filePath": "\/Users\/rcj\/Documents\/Projects\/OSCameraLib-iOS\/OSCameraLib\/Models\/OSCAMRPictureOptions.swift", "kind": "IntegerLiteral", - "offset": 1777, + "offset": 2121, "length": 1, "value": "0" }, { "filePath": "\/Users\/rcj\/Documents\/Projects\/OSCameraLib-iOS\/OSCameraLib\/Models\/OSCAMRPictureOptions.swift", "kind": "IntegerLiteral", - "offset": 1788, + "offset": 2132, "length": 3, "value": "1" }, { "filePath": "\/Users\/rcj\/Documents\/Projects\/OSCameraLib-iOS\/OSCameraLib\/Models\/OSCAMRPictureOptions.swift", "kind": "StringLiteral", - "offset": 1883, + "offset": 2227, "length": 6, "value": "\"jpeg\"" }, { "filePath": "\/Users\/rcj\/Documents\/Projects\/OSCameraLib-iOS\/OSCameraLib\/Models\/OSCAMRPictureOptions.swift", "kind": "StringLiteral", - "offset": 1916, + "offset": 2260, "length": 5, "value": "\"png\"" }, { "filePath": "\/Users\/rcj\/Documents\/Projects\/OSCameraLib-iOS\/OSCameraLib\/Models\/OSCAMRPictureOptions.swift", "kind": "IntegerLiteral", - "offset": 1777, + "offset": 2121, "length": 1, "value": "0" }, { "filePath": "\/Users\/rcj\/Documents\/Projects\/OSCameraLib-iOS\/OSCameraLib\/Models\/OSCAMRPictureOptions.swift", "kind": "IntegerLiteral", - "offset": 1788, + "offset": 2132, "length": 3, "value": "1" }, { "filePath": "\/Users\/rcj\/Documents\/Projects\/OSCameraLib-iOS\/OSCameraLib\/Models\/OSCAMRPictureOptions.swift", "kind": "IntegerLiteral", - "offset": 1777, + "offset": 2121, "length": 1, "value": "0" }, { "filePath": "\/Users\/rcj\/Documents\/Projects\/OSCameraLib-iOS\/OSCameraLib\/Models\/OSCAMRPictureOptions.swift", "kind": "IntegerLiteral", - "offset": 1788, + "offset": 2132, "length": 3, "value": "1" }, + { + "filePath": "\/Users\/rcj\/Documents\/Projects\/OSCameraLib-iOS\/OSCameraLib\/Models\/OSCAMRPictureOptions.swift", + "kind": "IntegerLiteral", + "offset": 2832, + "length": 1, + "value": "0" + }, + { + "filePath": "\/Users\/rcj\/Documents\/Projects\/OSCameraLib-iOS\/OSCameraLib\/Models\/OSCAMRPictureOptions.swift", + "kind": "StringLiteral", + "offset": 2865, + "length": 7, + "value": "\"width\"" + }, + { + "filePath": "\/Users\/rcj\/Documents\/Projects\/OSCameraLib-iOS\/OSCameraLib\/Models\/OSCAMRPictureOptions.swift", + "kind": "IntegerLiteral", + "offset": 2899, + "length": 1, + "value": "0" + }, + { + "filePath": "\/Users\/rcj\/Documents\/Projects\/OSCameraLib-iOS\/OSCameraLib\/Models\/OSCAMRPictureOptions.swift", + "kind": "StringLiteral", + "offset": 2932, + "length": 8, + "value": "\"height\"" + }, { "filePath": "\/Users\/rcj\/Documents\/Projects\/OSCameraLib-iOS\/OSCameraLib\/Interfaces\/OSCAMREditorBehaviour.swift", "kind": "BooleanLiteral", diff --git a/src/ios/frameworks/OSCameraLib.xcframework/ios-arm64_x86_64-simulator/OSCameraLib.framework/Modules/OSCameraLib.swiftmodule/arm64-apple-ios-simulator.private.swiftinterface b/src/ios/frameworks/OSCameraLib.xcframework/ios-arm64_x86_64-simulator/OSCameraLib.framework/Modules/OSCameraLib.swiftmodule/arm64-apple-ios-simulator.private.swiftinterface index ecab0a022..4325e9fa9 100644 --- a/src/ios/frameworks/OSCameraLib.xcframework/ios-arm64_x86_64-simulator/OSCameraLib.framework/Modules/OSCameraLib.swiftmodule/arm64-apple-ios-simulator.private.swiftinterface +++ b/src/ios/frameworks/OSCameraLib.xcframework/ios-arm64_x86_64-simulator/OSCameraLib.framework/Modules/OSCameraLib.swiftmodule/arm64-apple-ios-simulator.private.swiftinterface @@ -66,7 +66,7 @@ public protocol OSCAMRCallbackDelegate : AnyObject { @objc deinit } @_hasMissingDesignatedInitializers public class OSCAMRPictureOptions : OSCameraLib.OSCAMRMediaOptions { - public init(quality: Swift.Int, size: OSCameraLib.OSCAMRSize? = nil, correctOrientation: Swift.Bool, encodingType: OSCameraLib.OSCAMREncodingType, saveToPhotoAlbum: Swift.Bool, direction: OSCameraLib.OSCAMRDirection, allowEdit: Swift.Bool, returnMetadata: Swift.Bool, latestVersion: Swift.Bool) + public init(quality: Swift.Int, size: OSCameraLib.OSCAMRSize? = nil, correctOrientation: Swift.Bool, encodingType: OSCameraLib.OSCAMREncodingType, saveToPhotoAlbum: Swift.Bool, direction: OSCameraLib.OSCAMRDirection, allowEdit: Swift.Bool, returnMetadata: Swift.Bool, latestVersion: Swift.Bool) throws @objc deinit } public enum OSCAMREncodingType : Swift.Int, Swift.CustomStringConvertible { @@ -82,7 +82,7 @@ public enum OSCAMREncodingType : Swift.Int, Swift.CustomStringConvertible { } } public struct OSCAMRSize { - public init(width: Swift.Int, height: Swift.Int) + public init(width: Swift.Int, height: Swift.Int) throws } public enum OSCAMRError : Swift.Int, Foundation.CustomNSError, Foundation.LocalizedError { case cameraAccess diff --git a/src/ios/frameworks/OSCameraLib.xcframework/ios-arm64_x86_64-simulator/OSCameraLib.framework/Modules/OSCameraLib.swiftmodule/arm64-apple-ios-simulator.swiftdoc b/src/ios/frameworks/OSCameraLib.xcframework/ios-arm64_x86_64-simulator/OSCameraLib.framework/Modules/OSCameraLib.swiftmodule/arm64-apple-ios-simulator.swiftdoc index 213ec4496..7bf1054ac 100644 Binary files a/src/ios/frameworks/OSCameraLib.xcframework/ios-arm64_x86_64-simulator/OSCameraLib.framework/Modules/OSCameraLib.swiftmodule/arm64-apple-ios-simulator.swiftdoc and b/src/ios/frameworks/OSCameraLib.xcframework/ios-arm64_x86_64-simulator/OSCameraLib.framework/Modules/OSCameraLib.swiftmodule/arm64-apple-ios-simulator.swiftdoc differ diff --git a/src/ios/frameworks/OSCameraLib.xcframework/ios-arm64_x86_64-simulator/OSCameraLib.framework/Modules/OSCameraLib.swiftmodule/arm64-apple-ios-simulator.swiftinterface b/src/ios/frameworks/OSCameraLib.xcframework/ios-arm64_x86_64-simulator/OSCameraLib.framework/Modules/OSCameraLib.swiftmodule/arm64-apple-ios-simulator.swiftinterface index ecab0a022..4325e9fa9 100644 --- a/src/ios/frameworks/OSCameraLib.xcframework/ios-arm64_x86_64-simulator/OSCameraLib.framework/Modules/OSCameraLib.swiftmodule/arm64-apple-ios-simulator.swiftinterface +++ b/src/ios/frameworks/OSCameraLib.xcframework/ios-arm64_x86_64-simulator/OSCameraLib.framework/Modules/OSCameraLib.swiftmodule/arm64-apple-ios-simulator.swiftinterface @@ -66,7 +66,7 @@ public protocol OSCAMRCallbackDelegate : AnyObject { @objc deinit } @_hasMissingDesignatedInitializers public class OSCAMRPictureOptions : OSCameraLib.OSCAMRMediaOptions { - public init(quality: Swift.Int, size: OSCameraLib.OSCAMRSize? = nil, correctOrientation: Swift.Bool, encodingType: OSCameraLib.OSCAMREncodingType, saveToPhotoAlbum: Swift.Bool, direction: OSCameraLib.OSCAMRDirection, allowEdit: Swift.Bool, returnMetadata: Swift.Bool, latestVersion: Swift.Bool) + public init(quality: Swift.Int, size: OSCameraLib.OSCAMRSize? = nil, correctOrientation: Swift.Bool, encodingType: OSCameraLib.OSCAMREncodingType, saveToPhotoAlbum: Swift.Bool, direction: OSCameraLib.OSCAMRDirection, allowEdit: Swift.Bool, returnMetadata: Swift.Bool, latestVersion: Swift.Bool) throws @objc deinit } public enum OSCAMREncodingType : Swift.Int, Swift.CustomStringConvertible { @@ -82,7 +82,7 @@ public enum OSCAMREncodingType : Swift.Int, Swift.CustomStringConvertible { } } public struct OSCAMRSize { - public init(width: Swift.Int, height: Swift.Int) + public init(width: Swift.Int, height: Swift.Int) throws } public enum OSCAMRError : Swift.Int, Foundation.CustomNSError, Foundation.LocalizedError { case cameraAccess diff --git a/src/ios/frameworks/OSCameraLib.xcframework/ios-arm64_x86_64-simulator/OSCameraLib.framework/Modules/OSCameraLib.swiftmodule/x86_64-apple-ios-simulator.abi.json b/src/ios/frameworks/OSCameraLib.xcframework/ios-arm64_x86_64-simulator/OSCameraLib.framework/Modules/OSCameraLib.swiftmodule/x86_64-apple-ios-simulator.abi.json index 2dd46e545..574b3c6ce 100644 --- a/src/ios/frameworks/OSCameraLib.xcframework/ios-arm64_x86_64-simulator/OSCameraLib.framework/Modules/OSCameraLib.swiftmodule/x86_64-apple-ios-simulator.abi.json +++ b/src/ios/frameworks/OSCameraLib.xcframework/ios-arm64_x86_64-simulator/OSCameraLib.framework/Modules/OSCameraLib.swiftmodule/x86_64-apple-ios-simulator.abi.json @@ -1259,12 +1259,13 @@ } ], "declKind": "Constructor", - "usr": "s:11OSCameraLib20OSCAMRPictureOptionsC7quality4size18correctOrientation12encodingType16saveToPhotoAlbum9direction9allowEdit14returnMetadata13latestVersionACSi_AA10OSCAMRSizeVSgSbAA014OSCAMREncodingJ0OSbAA15OSCAMRDirectionOS3btcfc", - "mangledName": "$s11OSCameraLib20OSCAMRPictureOptionsC7quality4size18correctOrientation12encodingType16saveToPhotoAlbum9direction9allowEdit14returnMetadata13latestVersionACSi_AA10OSCAMRSizeVSgSbAA014OSCAMREncodingJ0OSbAA15OSCAMRDirectionOS3btcfc", + "usr": "s:11OSCameraLib20OSCAMRPictureOptionsC7quality4size18correctOrientation12encodingType16saveToPhotoAlbum9direction9allowEdit14returnMetadata13latestVersionACSi_AA10OSCAMRSizeVSgSbAA014OSCAMREncodingJ0OSbAA15OSCAMRDirectionOS3btKcfc", + "mangledName": "$s11OSCameraLib20OSCAMRPictureOptionsC7quality4size18correctOrientation12encodingType16saveToPhotoAlbum9direction9allowEdit14returnMetadata13latestVersionACSi_AA10OSCAMRSizeVSgSbAA014OSCAMREncodingJ0OSbAA15OSCAMRDirectionOS3btKcfc", "moduleName": "OSCameraLib", "declAttributes": [ "AccessControl" ], + "throwing": true, "init_kind": "Designated" } ], @@ -1559,13 +1560,14 @@ } ], "declKind": "Constructor", - "usr": "s:11OSCameraLib10OSCAMRSizeV5width6heightACSi_Sitcfc", - "mangledName": "$s11OSCameraLib10OSCAMRSizeV5width6heightACSi_Sitcfc", + "usr": "s:11OSCameraLib10OSCAMRSizeV5width6heightACSi_SitKcfc", + "mangledName": "$s11OSCameraLib10OSCAMRSizeV5width6heightACSi_SitKcfc", "moduleName": "OSCameraLib", "declAttributes": [ "AccessControl", "RawDocComment" ], + "throwing": true, "init_kind": "Designated" } ], @@ -3284,21 +3286,7 @@ { "filePath": "\/Users\/rcj\/Documents\/Projects\/OSCameraLib-iOS\/OSCameraLib\/Extensions\/UIImage+MediaOptions.swift", "kind": "IntegerLiteral", - "offset": 1456, - "length": 1, - "value": "0" - }, - { - "filePath": "\/Users\/rcj\/Documents\/Projects\/OSCameraLib-iOS\/OSCameraLib\/Extensions\/UIImage+MediaOptions.swift", - "kind": "IntegerLiteral", - "offset": 1478, - "length": 1, - "value": "0" - }, - { - "filePath": "\/Users\/rcj\/Documents\/Projects\/OSCameraLib-iOS\/OSCameraLib\/Extensions\/UIImage+MediaOptions.swift", - "kind": "IntegerLiteral", - "offset": 3051, + "offset": 3106, "length": 3, "value": "100" }, @@ -3655,42 +3643,42 @@ { "filePath": "\/Users\/rcj\/Documents\/Projects\/OSCameraLib-iOS\/OSCameraLib\/Interfaces\/Extensions\/CGSize+Transformations.swift", "kind": "StringLiteral", - "offset": 566, + "offset": 601, "length": 40, "value": "\"\"" }, { "filePath": "\/Users\/rcj\/Documents\/Projects\/OSCameraLib-iOS\/OSCameraLib\/Interfaces\/Extensions\/CGSize+Transformations.swift", "kind": "StringLiteral", - "offset": 585, + "offset": 620, "length": 1, "value": "\"x\"" }, { "filePath": "\/Users\/rcj\/Documents\/Projects\/OSCameraLib-iOS\/OSCameraLib\/Interfaces\/Extensions\/CGSize+Transformations.swift", "kind": "StringLiteral", - "offset": 605, + "offset": 640, "length": 1, "value": "\"\"" }, { "filePath": "\/Users\/rcj\/Documents\/Projects\/OSCameraLib-iOS\/OSCameraLib\/Interfaces\/Extensions\/CGSize+Transformations.swift", "kind": "StringLiteral", - "offset": 643, + "offset": 678, "length": 40, "value": "\"\"" }, { "filePath": "\/Users\/rcj\/Documents\/Projects\/OSCameraLib-iOS\/OSCameraLib\/Interfaces\/Extensions\/CGSize+Transformations.swift", "kind": "StringLiteral", - "offset": 663, + "offset": 698, "length": 1, "value": "\"x\"" }, { "filePath": "\/Users\/rcj\/Documents\/Projects\/OSCameraLib-iOS\/OSCameraLib\/Interfaces\/Extensions\/CGSize+Transformations.swift", "kind": "StringLiteral", - "offset": 682, + "offset": 717, "length": 1, "value": "\"\"" }, @@ -4642,108 +4630,150 @@ { "filePath": "\/Users\/rcj\/Documents\/Projects\/OSCameraLib-iOS\/OSCameraLib\/Models\/OSCAMRPictureOptions.swift", "kind": "IntegerLiteral", - "offset": 1008, + "offset": 1141, + "length": 1, + "value": "0" + }, + { + "filePath": "\/Users\/rcj\/Documents\/Projects\/OSCameraLib-iOS\/OSCameraLib\/Models\/OSCAMRPictureOptions.swift", + "kind": "IntegerLiteral", + "offset": 1156, "length": 3, "value": "100" }, + { + "filePath": "\/Users\/rcj\/Documents\/Projects\/OSCameraLib-iOS\/OSCameraLib\/Models\/OSCAMRPictureOptions.swift", + "kind": "StringLiteral", + "offset": 1186, + "length": 9, + "value": "\"quality\"" + }, { "filePath": "\/Users\/rcj\/Documents\/Projects\/OSCameraLib-iOS\/OSCameraLib\/Models\/OSCAMRPictureOptions.swift", "kind": "IntegerLiteral", - "offset": 1025, + "offset": 1289, "length": 1, "value": "0" }, { "filePath": "\/Users\/rcj\/Documents\/Projects\/OSCameraLib-iOS\/OSCameraLib\/Models\/OSCAMRPictureOptions.swift", "kind": "IntegerLiteral", - "offset": 1039, + "offset": 1301, "length": 1, "value": "0" }, { "filePath": "\/Users\/rcj\/Documents\/Projects\/OSCameraLib-iOS\/OSCameraLib\/Models\/OSCAMRPictureOptions.swift", - "kind": "IntegerLiteral", - "offset": 1044, - "length": 3, - "value": "100" + "kind": "StringLiteral", + "offset": 1334, + "length": 6, + "value": "\"size\"" }, { "filePath": "\/Users\/rcj\/Documents\/Projects\/OSCameraLib-iOS\/OSCameraLib\/Models\/OSCAMRPictureOptions.swift", "kind": "StringLiteral", - "offset": 96, + "offset": 179, "length": 20, "value": "\"OSCameraLib.OSCAMRPictureOptions\"" }, { "filePath": "\/Users\/rcj\/Documents\/Projects\/OSCameraLib-iOS\/OSCameraLib\/Models\/OSCAMRPictureOptions.swift", "kind": "IntegerLiteral", - "offset": 1499, + "offset": 1837, "length": 1, "value": "1" }, { "filePath": "\/Users\/rcj\/Documents\/Projects\/OSCameraLib-iOS\/OSCameraLib\/Models\/OSCAMRPictureOptions.swift", "kind": "IntegerLiteral", - "offset": 1533, + "offset": 1871, "length": 4, "value": "1080" }, { "filePath": "\/Users\/rcj\/Documents\/Projects\/OSCameraLib-iOS\/OSCameraLib\/Models\/OSCAMRPictureOptions.swift", "kind": "IntegerLiteral", - "offset": 1777, + "offset": 2121, "length": 1, "value": "0" }, { "filePath": "\/Users\/rcj\/Documents\/Projects\/OSCameraLib-iOS\/OSCameraLib\/Models\/OSCAMRPictureOptions.swift", "kind": "IntegerLiteral", - "offset": 1788, + "offset": 2132, "length": 3, "value": "1" }, { "filePath": "\/Users\/rcj\/Documents\/Projects\/OSCameraLib-iOS\/OSCameraLib\/Models\/OSCAMRPictureOptions.swift", "kind": "StringLiteral", - "offset": 1883, + "offset": 2227, "length": 6, "value": "\"jpeg\"" }, { "filePath": "\/Users\/rcj\/Documents\/Projects\/OSCameraLib-iOS\/OSCameraLib\/Models\/OSCAMRPictureOptions.swift", "kind": "StringLiteral", - "offset": 1916, + "offset": 2260, "length": 5, "value": "\"png\"" }, { "filePath": "\/Users\/rcj\/Documents\/Projects\/OSCameraLib-iOS\/OSCameraLib\/Models\/OSCAMRPictureOptions.swift", "kind": "IntegerLiteral", - "offset": 1777, + "offset": 2121, "length": 1, "value": "0" }, { "filePath": "\/Users\/rcj\/Documents\/Projects\/OSCameraLib-iOS\/OSCameraLib\/Models\/OSCAMRPictureOptions.swift", "kind": "IntegerLiteral", - "offset": 1788, + "offset": 2132, "length": 3, "value": "1" }, { "filePath": "\/Users\/rcj\/Documents\/Projects\/OSCameraLib-iOS\/OSCameraLib\/Models\/OSCAMRPictureOptions.swift", "kind": "IntegerLiteral", - "offset": 1777, + "offset": 2121, "length": 1, "value": "0" }, { "filePath": "\/Users\/rcj\/Documents\/Projects\/OSCameraLib-iOS\/OSCameraLib\/Models\/OSCAMRPictureOptions.swift", "kind": "IntegerLiteral", - "offset": 1788, + "offset": 2132, "length": 3, "value": "1" }, + { + "filePath": "\/Users\/rcj\/Documents\/Projects\/OSCameraLib-iOS\/OSCameraLib\/Models\/OSCAMRPictureOptions.swift", + "kind": "IntegerLiteral", + "offset": 2832, + "length": 1, + "value": "0" + }, + { + "filePath": "\/Users\/rcj\/Documents\/Projects\/OSCameraLib-iOS\/OSCameraLib\/Models\/OSCAMRPictureOptions.swift", + "kind": "StringLiteral", + "offset": 2865, + "length": 7, + "value": "\"width\"" + }, + { + "filePath": "\/Users\/rcj\/Documents\/Projects\/OSCameraLib-iOS\/OSCameraLib\/Models\/OSCAMRPictureOptions.swift", + "kind": "IntegerLiteral", + "offset": 2899, + "length": 1, + "value": "0" + }, + { + "filePath": "\/Users\/rcj\/Documents\/Projects\/OSCameraLib-iOS\/OSCameraLib\/Models\/OSCAMRPictureOptions.swift", + "kind": "StringLiteral", + "offset": 2932, + "length": 8, + "value": "\"height\"" + }, { "filePath": "\/Users\/rcj\/Documents\/Projects\/OSCameraLib-iOS\/OSCameraLib\/Interfaces\/OSCAMREditorBehaviour.swift", "kind": "BooleanLiteral", diff --git a/src/ios/frameworks/OSCameraLib.xcframework/ios-arm64_x86_64-simulator/OSCameraLib.framework/Modules/OSCameraLib.swiftmodule/x86_64-apple-ios-simulator.private.swiftinterface b/src/ios/frameworks/OSCameraLib.xcframework/ios-arm64_x86_64-simulator/OSCameraLib.framework/Modules/OSCameraLib.swiftmodule/x86_64-apple-ios-simulator.private.swiftinterface index f44116ee3..3eeda9eec 100644 --- a/src/ios/frameworks/OSCameraLib.xcframework/ios-arm64_x86_64-simulator/OSCameraLib.framework/Modules/OSCameraLib.swiftmodule/x86_64-apple-ios-simulator.private.swiftinterface +++ b/src/ios/frameworks/OSCameraLib.xcframework/ios-arm64_x86_64-simulator/OSCameraLib.framework/Modules/OSCameraLib.swiftmodule/x86_64-apple-ios-simulator.private.swiftinterface @@ -66,7 +66,7 @@ public protocol OSCAMRCallbackDelegate : AnyObject { @objc deinit } @_hasMissingDesignatedInitializers public class OSCAMRPictureOptions : OSCameraLib.OSCAMRMediaOptions { - public init(quality: Swift.Int, size: OSCameraLib.OSCAMRSize? = nil, correctOrientation: Swift.Bool, encodingType: OSCameraLib.OSCAMREncodingType, saveToPhotoAlbum: Swift.Bool, direction: OSCameraLib.OSCAMRDirection, allowEdit: Swift.Bool, returnMetadata: Swift.Bool, latestVersion: Swift.Bool) + public init(quality: Swift.Int, size: OSCameraLib.OSCAMRSize? = nil, correctOrientation: Swift.Bool, encodingType: OSCameraLib.OSCAMREncodingType, saveToPhotoAlbum: Swift.Bool, direction: OSCameraLib.OSCAMRDirection, allowEdit: Swift.Bool, returnMetadata: Swift.Bool, latestVersion: Swift.Bool) throws @objc deinit } public enum OSCAMREncodingType : Swift.Int, Swift.CustomStringConvertible { @@ -82,7 +82,7 @@ public enum OSCAMREncodingType : Swift.Int, Swift.CustomStringConvertible { } } public struct OSCAMRSize { - public init(width: Swift.Int, height: Swift.Int) + public init(width: Swift.Int, height: Swift.Int) throws } public enum OSCAMRError : Swift.Int, Foundation.CustomNSError, Foundation.LocalizedError { case cameraAccess diff --git a/src/ios/frameworks/OSCameraLib.xcframework/ios-arm64_x86_64-simulator/OSCameraLib.framework/Modules/OSCameraLib.swiftmodule/x86_64-apple-ios-simulator.swiftdoc b/src/ios/frameworks/OSCameraLib.xcframework/ios-arm64_x86_64-simulator/OSCameraLib.framework/Modules/OSCameraLib.swiftmodule/x86_64-apple-ios-simulator.swiftdoc index 7085b3f46..e6bdf246f 100644 Binary files a/src/ios/frameworks/OSCameraLib.xcframework/ios-arm64_x86_64-simulator/OSCameraLib.framework/Modules/OSCameraLib.swiftmodule/x86_64-apple-ios-simulator.swiftdoc and b/src/ios/frameworks/OSCameraLib.xcframework/ios-arm64_x86_64-simulator/OSCameraLib.framework/Modules/OSCameraLib.swiftmodule/x86_64-apple-ios-simulator.swiftdoc differ diff --git a/src/ios/frameworks/OSCameraLib.xcframework/ios-arm64_x86_64-simulator/OSCameraLib.framework/Modules/OSCameraLib.swiftmodule/x86_64-apple-ios-simulator.swiftinterface b/src/ios/frameworks/OSCameraLib.xcframework/ios-arm64_x86_64-simulator/OSCameraLib.framework/Modules/OSCameraLib.swiftmodule/x86_64-apple-ios-simulator.swiftinterface index f44116ee3..3eeda9eec 100644 --- a/src/ios/frameworks/OSCameraLib.xcframework/ios-arm64_x86_64-simulator/OSCameraLib.framework/Modules/OSCameraLib.swiftmodule/x86_64-apple-ios-simulator.swiftinterface +++ b/src/ios/frameworks/OSCameraLib.xcframework/ios-arm64_x86_64-simulator/OSCameraLib.framework/Modules/OSCameraLib.swiftmodule/x86_64-apple-ios-simulator.swiftinterface @@ -66,7 +66,7 @@ public protocol OSCAMRCallbackDelegate : AnyObject { @objc deinit } @_hasMissingDesignatedInitializers public class OSCAMRPictureOptions : OSCameraLib.OSCAMRMediaOptions { - public init(quality: Swift.Int, size: OSCameraLib.OSCAMRSize? = nil, correctOrientation: Swift.Bool, encodingType: OSCameraLib.OSCAMREncodingType, saveToPhotoAlbum: Swift.Bool, direction: OSCameraLib.OSCAMRDirection, allowEdit: Swift.Bool, returnMetadata: Swift.Bool, latestVersion: Swift.Bool) + public init(quality: Swift.Int, size: OSCameraLib.OSCAMRSize? = nil, correctOrientation: Swift.Bool, encodingType: OSCameraLib.OSCAMREncodingType, saveToPhotoAlbum: Swift.Bool, direction: OSCameraLib.OSCAMRDirection, allowEdit: Swift.Bool, returnMetadata: Swift.Bool, latestVersion: Swift.Bool) throws @objc deinit } public enum OSCAMREncodingType : Swift.Int, Swift.CustomStringConvertible { @@ -82,7 +82,7 @@ public enum OSCAMREncodingType : Swift.Int, Swift.CustomStringConvertible { } } public struct OSCAMRSize { - public init(width: Swift.Int, height: Swift.Int) + public init(width: Swift.Int, height: Swift.Int) throws } public enum OSCAMRError : Swift.Int, Foundation.CustomNSError, Foundation.LocalizedError { case cameraAccess diff --git a/src/ios/frameworks/OSCameraLib.xcframework/ios-arm64_x86_64-simulator/OSCameraLib.framework/OSCameraLib b/src/ios/frameworks/OSCameraLib.xcframework/ios-arm64_x86_64-simulator/OSCameraLib.framework/OSCameraLib index 2b1ba4c14..e465c18f0 100755 Binary files a/src/ios/frameworks/OSCameraLib.xcframework/ios-arm64_x86_64-simulator/OSCameraLib.framework/OSCameraLib and b/src/ios/frameworks/OSCameraLib.xcframework/ios-arm64_x86_64-simulator/OSCameraLib.framework/OSCameraLib differ diff --git a/src/ios/frameworks/OSCameraLib.xcframework/ios-arm64_x86_64-simulator/OSCameraLib.framework/_CodeSignature/CodeResources b/src/ios/frameworks/OSCameraLib.xcframework/ios-arm64_x86_64-simulator/OSCameraLib.framework/_CodeSignature/CodeResources index 1720a5166..99ea7ce76 100644 --- a/src/ios/frameworks/OSCameraLib.xcframework/ios-arm64_x86_64-simulator/OSCameraLib.framework/_CodeSignature/CodeResources +++ b/src/ios/frameworks/OSCameraLib.xcframework/ios-arm64_x86_64-simulator/OSCameraLib.framework/_CodeSignature/CodeResources @@ -14,47 +14,47 @@ Info.plist - ly81tqef7qhY+dj26F2s3gctoBI= + 4sYiboZHb9EG3GGU30t2/QJsLlE= Modules/OSCameraLib.swiftmodule/arm64-apple-ios-simulator.abi.json - wBcLoBc0Zfd3zxshZaOJ8JAqKiA= + LV2g0CyYeRgvQBd/l4WmLnt94L4= Modules/OSCameraLib.swiftmodule/arm64-apple-ios-simulator.private.swiftinterface - ljHEkL2rVAiFQnJnZk5IHQKTJeQ= + aQJbhdsrmU466EB8gHpGtJ6nxJA= Modules/OSCameraLib.swiftmodule/arm64-apple-ios-simulator.swiftdoc - Urv1/KgxMD3HOYvv6mzOYqEcLZ4= + ljQtRVmMRd4o+CjpMtRc34/3Cfk= Modules/OSCameraLib.swiftmodule/arm64-apple-ios-simulator.swiftinterface - ljHEkL2rVAiFQnJnZk5IHQKTJeQ= + aQJbhdsrmU466EB8gHpGtJ6nxJA= Modules/OSCameraLib.swiftmodule/arm64-apple-ios-simulator.swiftmodule - eF2o20PaK84ZiQ2Ss1jcJjxYWOo= + ctLV+0lXETqRJThO8nmIgVHcEPk= Modules/OSCameraLib.swiftmodule/x86_64-apple-ios-simulator.abi.json - wBcLoBc0Zfd3zxshZaOJ8JAqKiA= + LV2g0CyYeRgvQBd/l4WmLnt94L4= Modules/OSCameraLib.swiftmodule/x86_64-apple-ios-simulator.private.swiftinterface - smp6GNPiT8juaJXz49yvCCk93rY= + tCKiUCRGpXYsw3S+39Laq2e0TAU= Modules/OSCameraLib.swiftmodule/x86_64-apple-ios-simulator.swiftdoc - pXd0RG9YW6t8nDwuA3NjLHMYnAA= + OMcxlzLvA2+ZzF1keegy+mSotAo= Modules/OSCameraLib.swiftmodule/x86_64-apple-ios-simulator.swiftinterface - smp6GNPiT8juaJXz49yvCCk93rY= + tCKiUCRGpXYsw3S+39Laq2e0TAU= Modules/OSCameraLib.swiftmodule/x86_64-apple-ios-simulator.swiftmodule - 8ZcFwIgJHsncQBosWtkM04j1Dm4= + BLdjhX6VztOvh21T7UnYdG92IPE= Modules/module.modulemap @@ -85,70 +85,70 @@ hash2 - 7zYW/7RswAGamB0YWs72LHZyhxIaRzvp53TajbPn2nA= + 0nbLrmGVc5M2CJG43B9TA1kyMXh+ihPLkkfaXrHDZiU= Modules/OSCameraLib.swiftmodule/arm64-apple-ios-simulator.private.swiftinterface hash2 - hW+mIYszm8M+eL+ATQXHMU782nkKl8kbZvf2Djd+sb8= + ooBkdkOL3Xx9VHxMe/IXjCAT2SZvPaTwf9gJMr3yptk= Modules/OSCameraLib.swiftmodule/arm64-apple-ios-simulator.swiftdoc hash2 - OH9Fi3jSV/jxbQew8knhx1JBlq1O/v8jIUYon4QX5O0= + HgDmfT96Qlk61y+YF2rDV7sryvqXVi+e670VaN1QhL4= Modules/OSCameraLib.swiftmodule/arm64-apple-ios-simulator.swiftinterface hash2 - hW+mIYszm8M+eL+ATQXHMU782nkKl8kbZvf2Djd+sb8= + ooBkdkOL3Xx9VHxMe/IXjCAT2SZvPaTwf9gJMr3yptk= Modules/OSCameraLib.swiftmodule/arm64-apple-ios-simulator.swiftmodule hash2 - BcCKP8SAvoj1suvHXU80/41nTvGHbdWqNSNa3MBE0U0= + FCKgxBPK0UMI/LzF1u4BAtQKVBwTiFR4UgatnVywJxY= Modules/OSCameraLib.swiftmodule/x86_64-apple-ios-simulator.abi.json hash2 - 7zYW/7RswAGamB0YWs72LHZyhxIaRzvp53TajbPn2nA= + 0nbLrmGVc5M2CJG43B9TA1kyMXh+ihPLkkfaXrHDZiU= Modules/OSCameraLib.swiftmodule/x86_64-apple-ios-simulator.private.swiftinterface hash2 - laX/IUN8yBiSc5I4V8f6mxv4UqQPj84GxCVRwKEqLbs= + 7EVtccBUvg1lPfVEXziKq6P9eRaTEsQZnW0gdICn7Ds= Modules/OSCameraLib.swiftmodule/x86_64-apple-ios-simulator.swiftdoc hash2 - ZbYBjYhxU78Y11qulHA1UxaUtg1wW5TWosFS9q+78Vc= + E5oKM2zdwIUX9387XKvjrEci7a1J+brzdL3LpFfYnJE= Modules/OSCameraLib.swiftmodule/x86_64-apple-ios-simulator.swiftinterface hash2 - laX/IUN8yBiSc5I4V8f6mxv4UqQPj84GxCVRwKEqLbs= + 7EVtccBUvg1lPfVEXziKq6P9eRaTEsQZnW0gdICn7Ds= Modules/OSCameraLib.swiftmodule/x86_64-apple-ios-simulator.swiftmodule hash2 - T0K6owuOe9YIRwDoAYna/MOX1hDFjELTSHwKd1fdiU8= + h9kTSPJuYNWBuGu6tk2yrySEBGNIoZVinZlugQgd00c= Modules/module.modulemap diff --git a/www/Camera.js b/www/Camera.js index 4445ba3e9..f350bcd59 100644 --- a/www/Camera.js +++ b/www/Camera.js @@ -248,11 +248,11 @@ cameraExport.takePicture = function (successCallback, errorCallback, options) { options = options || {}; let getValue = argscheck.getValue; - let quality = getValue(options.quality, 50); + let quality = getValue(options.quality, 60); let sourceType = getValue(options.sourceType, Camera.PictureSourceType.CAMERA); let destinationType = getValue(options.destinationType, Camera.DestinationType.FILE_URI); - let targetWidth = getValue(options.targetWidth, -1); - let targetHeight = getValue(options.targetHeight, -1); + let targetWidth = options.targetWidth; + let targetHeight = options.targetHeight; let encodingType = getValue(options.encodingType, Camera.EncodingType.JPEG); let mediaType = getValue(options.mediaType, Camera.MediaType.PICTURE); let allowEdit = !!options.allowEdit;