github/cordova-plugin-camera
3
0
Fork 0
mirror of https://github.com/apache/cordova-plugin-camera.git synced 2026-05-18 00:00:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

ios! rename CDVCameraPicker to CDVUIImagePickerController (#948)

Browse Source 
- 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.
This commit is contained in:
Manuel Beck
2026-01-30 18:41:01 +01:00
committed by GitHub
parent b75cff893e
commit 77e85f2f08
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ios/CDVCamera.h
+2 -2
View File
@@ -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;
src/ios/CDVCamera.m
+5 -5
View File
@@ -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;
tests/ios/CDVCameraTest/CDVCameraLibTests/CameraTest.m
+4 -4
View File
@@ -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);