Updated Branches: refs/heads/master 7e0a32892 -> 735b2843f
[CB-2053] Update UIImagePickerController label to reflect video media type in CDVCamera Project: http://git-wip-us.apache.org/repos/asf/cordova-ios/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-ios/commit/735b2843 Tree: http://git-wip-us.apache.org/repos/asf/cordova-ios/tree/735b2843 Diff: http://git-wip-us.apache.org/repos/asf/cordova-ios/diff/735b2843 Branch: refs/heads/master Commit: 735b2843f3e2e71a70e2fb92b937c057cb164549 Parents: 7e0a328 Author: Cory Thompson <[email protected]> Authored: Fri Dec 21 11:19:51 2012 +1100 Committer: James Jong <[email protected]> Committed: Wed Apr 24 13:39:43 2013 -0400 ---------------------------------------------------------------------- CordovaLib/Classes/CDVCamera.h | 1 + CordovaLib/Classes/CDVCamera.m | 11 +++++++++++ 2 files changed, 12 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/735b2843/CordovaLib/Classes/CDVCamera.h ---------------------------------------------------------------------- diff --git a/CordovaLib/Classes/CDVCamera.h b/CordovaLib/Classes/CDVCamera.h index 65eac77..2ff4567 100644 --- a/CordovaLib/Classes/CDVCamera.h +++ b/CordovaLib/Classes/CDVCamera.h @@ -85,6 +85,7 @@ typedef NSUInteger CDVMediaType; - (void)imagePickerController:(UIImagePickerController*)picker didFinishPickingMediaWithInfo:(NSDictionary*)info; - (void)imagePickerController:(UIImagePickerController*)picker didFinishPickingImage:(UIImage*)image editingInfo:(NSDictionary*)editingInfo; - (void)imagePickerControllerDidCancel:(UIImagePickerController*)picker; +- (void)navigationController:(UINavigationController *)navigationController willShowViewController:(UIViewController *)viewController animated:(BOOL)animated; - (UIImage*)imageByScalingAndCroppingForSize:(UIImage*)anImage toSize:(CGSize)targetSize; - (UIImage*)imageByScalingNotCroppingForSize:(UIImage*)anImage toSize:(CGSize)frameSize; - (UIImage*)imageCorrectedForCaptureOrientation:(UIImage*)anImage; http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/735b2843/CordovaLib/Classes/CDVCamera.m ---------------------------------------------------------------------- diff --git a/CordovaLib/Classes/CDVCamera.m b/CordovaLib/Classes/CDVCamera.m index 823fde9..fcf0a73 100644 --- a/CordovaLib/Classes/CDVCamera.m +++ b/CordovaLib/Classes/CDVCamera.m @@ -187,6 +187,17 @@ static NSSet* org_apache_cordova_validArrowDirections; animated:YES]; } +- (void)navigationController:(UINavigationController *)navigationController willShowViewController:(UIViewController *)viewController animated:(BOOL)animated +{ + if([navigationController isKindOfClass:[UIImagePickerController class]]){ + UIImagePickerController * cameraPicker = (UIImagePickerController*)navigationController; + + if(![cameraPicker.mediaTypes containsObject:(NSString*) kUTTypeImage]){ + [viewController.navigationItem setTitle:@"Videos"]; + } + } +} + - (void)cleanup:(CDVInvokedUrlCommand*)command { // empty the tmp directory
