This is an automated email from the ASF dual-hosted git repository.
manuelbeck pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cordova-plugin-camera.git
The following commit(s) were added to refs/heads/master by this push:
new 77e85f2 ios! rename `CDVCameraPicker` to `CDVUIImagePickerController`
(#948)
77e85f2 is described below
commit 77e85f2f083aa72cd9fbc1751c8787cf75821715
Author: Manuel Beck <[email protected]>
AuthorDate: Fri Jan 30 18:41:01 2026 +0100
ios! rename `CDVCameraPicker` to `CDVUIImagePickerController` (#948)
- Rename to `CDVUIImagePickerController ` since it inherits from
`UIImagePickerController` and is not only for taking pictures
- This is a breaking change because it renames an externally visible
interface.
---
src/ios/CDVCamera.h | 4 ++--
src/ios/CDVCamera.m | 10 +++++-----
tests/ios/CDVCameraTest/CDVCameraLibTests/CameraTest.m | 8 ++++----
3 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/ios/CDVCamera.h b/src/ios/CDVCamera.h
index 9892fc8..45075b5 100644
--- a/src/ios/CDVCamera.h
+++ b/src/ios/CDVCamera.h
@@ -85,7 +85,7 @@ typedef NSUInteger CDVMediaType;
@end
-@interface CDVCameraPicker : UIImagePickerController
+@interface CDVUIImagePickerController : UIImagePickerController
@property (strong) CDVPictureOptions* pictureOptions;
@@ -114,7 +114,7 @@ typedef NSUInteger CDVMediaType;
{}
#endif
-@property (strong) CDVCameraPicker* pickerController;
+@property (strong) CDVUIImagePickerController* pickerController;
@property (strong) NSMutableDictionary *metadata;
@property (strong, nonatomic) CLLocationManager *locationManager;
@property (strong) NSData* data;
diff --git a/src/ios/CDVCamera.m b/src/ios/CDVCamera.m
index 29daa7f..0e31669 100644
--- a/src/ios/CDVCamera.m
+++ b/src/ios/CDVCamera.m
@@ -275,7 +275,7 @@ static NSString* MIME_JPEG = @"image/jpeg";
// Use UIImagePickerController for camera or as image picker for iOS older
than 14
// UIImagePickerController must be created and presented on the main
thread.
dispatch_async(dispatch_get_main_queue(), ^{
- CDVCameraPicker* cameraPicker = [CDVCameraPicker
createFromPictureOptions:pictureOptions];
+ CDVUIImagePickerController* cameraPicker = [CDVUIImagePickerController
createFromPictureOptions:pictureOptions];
self.pickerController = cameraPicker;
cameraPicker.delegate = self;
@@ -940,7 +940,7 @@ static NSString* MIME_JPEG = @"image/jpeg";
- (void)imagePickerController:(UIImagePickerController*)picker
didFinishPickingMediaWithInfo:(NSDictionary*)info
{
- __weak CDVCameraPicker* cameraPicker = (CDVCameraPicker*)picker;
+ __weak CDVUIImagePickerController* cameraPicker =
(CDVUIImagePickerController*)picker;
__weak CDVCamera* weakSelf = self;
dispatch_block_t invoke = ^(void) {
@@ -982,7 +982,7 @@ static NSString* MIME_JPEG = @"image/jpeg";
- (void)imagePickerControllerDidCancel:(UIImagePickerController*)picker
{
- __weak CDVCameraPicker* cameraPicker = (CDVCameraPicker*)picker;
+ __weak CDVUIImagePickerController* cameraPicker =
(CDVUIImagePickerController*)picker;
__weak CDVCamera* weakSelf = self;
dispatch_block_t invoke = ^ (void) {
@@ -1181,7 +1181,7 @@ static NSString* MIME_JPEG = @"image/jpeg";
@end
-@implementation CDVCameraPicker
+@implementation CDVUIImagePickerController
- (BOOL)prefersStatusBarHidden
{
@@ -1205,7 +1205,7 @@ static NSString* MIME_JPEG = @"image/jpeg";
+ (instancetype)createFromPictureOptions:(CDVPictureOptions*)pictureOptions
{
- CDVCameraPicker* cameraPicker = [[CDVCameraPicker alloc] init];
+ CDVUIImagePickerController* cameraPicker = [[CDVUIImagePickerController
alloc] init];
cameraPicker.pictureOptions = pictureOptions;
cameraPicker.sourceType = pictureOptions.sourceType;
cameraPicker.allowsEditing = pictureOptions.allowsEditing;
diff --git a/tests/ios/CDVCameraTest/CDVCameraLibTests/CameraTest.m
b/tests/ios/CDVCameraTest/CDVCameraLibTests/CameraTest.m
index ac1b7ef..9b88c49 100644
--- a/tests/ios/CDVCameraTest/CDVCameraLibTests/CameraTest.m
+++ b/tests/ios/CDVCameraTest/CDVCameraLibTests/CameraTest.m
@@ -117,7 +117,7 @@
{
NSArray* args;
CDVPictureOptions* pictureOptions;
- CDVCameraPicker* picker;
+ CDVUIImagePickerController* picker;
// Source is Camera, uses always UIImagePickerController
args = @[
@@ -138,7 +138,7 @@
pictureOptions = [CDVPictureOptions
createFromTakePictureArguments:command];
if ([UIImagePickerController
isSourceTypeAvailable:pictureOptions.sourceType]) {
- picker = [CDVCameraPicker createFromPictureOptions:pictureOptions];
+ picker = [CDVUIImagePickerController
createFromPictureOptions:pictureOptions];
XCTAssertEqualObjects(picker.pictureOptions, pictureOptions);
@@ -168,7 +168,7 @@
pictureOptions = [CDVPictureOptions
createFromTakePictureArguments:command];
if ([UIImagePickerController
isSourceTypeAvailable:pictureOptions.sourceType]) {
- picker = [CDVCameraPicker createFromPictureOptions:pictureOptions];
+ picker = [CDVUIImagePickerController
createFromPictureOptions:pictureOptions];
XCTAssertEqualObjects(picker.pictureOptions, pictureOptions);
@@ -197,7 +197,7 @@
pictureOptions = [CDVPictureOptions
createFromTakePictureArguments:command];
if ([UIImagePickerController
isSourceTypeAvailable:pictureOptions.sourceType]) {
- picker = [CDVCameraPicker createFromPictureOptions:pictureOptions];
+ picker = [CDVUIImagePickerController
createFromPictureOptions:pictureOptions];
XCTAssertEqualObjects(picker.pictureOptions, pictureOptions);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
