You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by sh...@apache.org on 2013/10/25 00:36:12 UTC
ios commit: CB-5199 - Media Capture - UI issues under iOS 7
(uncrustify style fix-ups as well)
Updated Branches:
refs/heads/2.9.x 3c2e8110a -> 7e6ad2e6b
CB-5199 - Media Capture - UI issues under iOS 7 (uncrustify style fix-ups as well)
Project: http://git-wip-us.apache.org/repos/asf/cordova-ios/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-ios/commit/7e6ad2e6
Tree: http://git-wip-us.apache.org/repos/asf/cordova-ios/tree/7e6ad2e6
Diff: http://git-wip-us.apache.org/repos/asf/cordova-ios/diff/7e6ad2e6
Branch: refs/heads/2.9.x
Commit: 7e6ad2e6beb7511398139529cc74f5ebd7169430
Parents: 3c2e811
Author: Shazron Abdullah <sh...@apache.org>
Authored: Thu Oct 24 15:36:05 2013 -0700
Committer: Shazron Abdullah <sh...@apache.org>
Committed: Thu Oct 24 15:36:05 2013 -0700
----------------------------------------------------------------------
CordovaLib/Classes/CDVCapture.m | 44 ++++++++++++++++++++++++++++--------
1 file changed, 34 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/7e6ad2e6/CordovaLib/Classes/CDVCapture.m
----------------------------------------------------------------------
diff --git a/CordovaLib/Classes/CDVCapture.m b/CordovaLib/Classes/CDVCapture.m
index ffffc2c..efbebde 100644
--- a/CordovaLib/Classes/CDVCapture.m
+++ b/CordovaLib/Classes/CDVCapture.m
@@ -45,6 +45,27 @@
return UIAccessibilityTraitNone;
}
+- (BOOL)prefersStatusBarHidden
+{
+ return YES;
+}
+
+- (UIViewController*)childViewControllerForStatusBarHidden
+{
+ return nil;
+}
+
+- (void)viewWillAppear:(BOOL)animated
+{
+ SEL sel = NSSelectorFromString(@"setNeedsStatusBarAppearanceUpdate");
+
+ if ([self respondsToSelector:sel]) {
+ [self performSelector:sel withObject:nil afterDelay:0];
+ }
+
+ [super viewWillAppear:animated];
+}
+
@end
@implementation CDVCapture
@@ -242,11 +263,11 @@
// iOS 3.0
pickerController.mediaTypes = [NSArray arrayWithObjects:mediaType, nil];
- if ([mediaType isEqualToString:(NSString*)kUTTypeMovie]){
+ if ([mediaType isEqualToString:(NSString*)kUTTypeMovie]) {
if (duration) {
pickerController.videoMaximumDuration = [duration doubleValue];
}
- //NSLog(@"pickerController.videoMaximumDuration = %f", pickerController.videoMaximumDuration);
+ // NSLog(@"pickerController.videoMaximumDuration = %f", pickerController.videoMaximumDuration);
}
// iOS 4.0
@@ -580,6 +601,10 @@
- (void)loadView
{
+ if ([self respondsToSelector:@selector(edgesForExtendedLayout)]) {
+ self.edgesForExtendedLayout = UIRectEdgeNone;
+ }
+
// create view and display
CGRect viewRect = [[UIScreen mainScreen] applicationFrame];
UIView* tmp = [[UIView alloc] initWithFrame:viewRect];
@@ -622,10 +647,10 @@
[self.timerLabel setBackgroundColor:[UIColor clearColor]];
[self.timerLabel setTextColor:[UIColor whiteColor]];
#ifdef __IPHONE_6_0
- [self.timerLabel setTextAlignment:NSTextAlignmentCenter];
+ [self.timerLabel setTextAlignment:NSTextAlignmentCenter];
#else
- // for iOS SDK < 6.0
- [self.timerLabel setTextAlignment:UITextAlignmentCenter];
+ // for iOS SDK < 6.0
+ [self.timerLabel setTextAlignment:UITextAlignmentCenter];
#endif
[self.timerLabel setText:@"0:00"];
[self.timerLabel setAccessibilityHint:NSLocalizedString(@"recorded time in minutes and seconds", nil)];
@@ -730,7 +755,7 @@
self.recordButton.accessibilityTraits &= ~[self accessibilityTraits];
[self.recordingView setHidden:NO];
__block NSError* error = nil;
-
+
void (^startRecording)(void) = ^{
[self.avSession setCategory:AVAudioSessionCategoryRecord error:&error];
[self.avSession setActive:YES error:&error];
@@ -751,13 +776,12 @@
}
UIAccessibilityPostNotification(UIAccessibilityLayoutChangedNotification, nil);
};
-
+
SEL rrpSel = NSSelectorFromString(@"requestRecordPermission:");
- if ([self.avSession respondsToSelector:rrpSel])
- {
+ if ([self.avSession respondsToSelector:rrpSel]) {
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Warc-performSelector-leaks"
- [self.avSession performSelector:rrpSel withObject:^(BOOL granted){
+ [self.avSession performSelector:rrpSel withObject:^(BOOL granted) {
if (granted) {
startRecording();
} else {