diff --git a/Classes/PhoneViewController.m b/Classes/PhoneViewController.m index 15979f5e4..b36327475 100644 --- a/Classes/PhoneViewController.m +++ b/Classes/PhoneViewController.m @@ -147,7 +147,9 @@ // Release any retained subviews of the main view. // e.g. self.myOutlet = nil; } +- (void) viewWillAppear:(BOOL)animated { +} - (BOOL)textFieldShouldReturn:(UITextField *)theTextField { if (theTextField == address) { @@ -160,6 +162,7 @@ -(void) displayDialerFromUI:(UIViewController*) viewCtrl forUser:(NSString*) username withDisplayName:(NSString*) displayName { + //cancel local notification, just in case if ([[UIDevice currentDevice] respondsToSelector:@selector(isMultitaskingSupported)] && [UIApplication sharedApplication].applicationState == UIApplicationStateBackground ) { @@ -179,8 +182,8 @@ linphone_core_set_native_video_window_id([LinphoneManager getLc],0); linphone_core_set_native_preview_window_id([LinphoneManager getLc],0); } - - [self dismissModalViewControllerAnimated:TRUE];//just in case + [[UIApplication sharedApplication] setStatusBarHidden:NO animated:NO]; + [self dismissModalViewControllerAnimated:FALSE];//just in case } [address setHidden:false]; @@ -246,6 +249,7 @@ } -(void) displayVideoCallFromUI:(UIViewController*) viewCtrl forUser:(NSString*) username withDisplayName:(NSString*) displayName { + [[UIApplication sharedApplication] setStatusBarHidden:YES animated:NO]; [self presentModalViewController:self.videoViewController animated:true]; } //status reporting diff --git a/Classes/VideoViewController.m b/Classes/VideoViewController.m index 6efc48580..e0adcd168 100644 --- a/Classes/VideoViewController.m +++ b/Classes/VideoViewController.m @@ -65,6 +65,9 @@ // Release any retained subviews of the main view. // e.g. self.myOutlet = nil; +} +-(void) viewWillDisappear:(BOOL)animated { + } -(void) viewWillAppear:(BOOL)animated { [super viewWillAppear:animated]; diff --git a/Classes/VideoViewController.xib b/Classes/VideoViewController.xib index 61ac5ddd6..299cc07b7 100644 --- a/Classes/VideoViewController.xib +++ b/Classes/VideoViewController.xib @@ -2,7 +2,7 @@ 1056 - 10K540 + 10K549 1305 1038.36 461.00 @@ -46,7 +46,7 @@ 274 - {320, 400} + {320, 420} @@ -57,7 +57,7 @@ 292 - {{0, 398}, {106, 62}} + {{1, 418}, {108, 62}} @@ -90,7 +90,7 @@ 292 - {{107, 398}, {106, 63}} + {{106, 418}, {106, 63}} @@ -114,7 +114,7 @@ 292 - {{213, 398}, {106, 62}} + {{211, 418}, {108, 62}} @@ -150,7 +150,7 @@ IBCocoaTouchFramework - {{0, 20}, {320, 460}} + {320, 480} @@ -158,7 +158,6 @@ 3 MC42NjY2NjY2NjY3AA - IBCocoaTouchFramework @@ -227,6 +226,7 @@ + View -1