mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-01-17 11:08:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

chat: hide status bar when selecting image

Browse source
This commit is contained in:
Gautier Pelloux-Prayer 2016-04-25 10:38:56 +02:00
parent 93f0707d41
commit f1fc46a2ce
5 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Classes/ImagePickerView.m
View file

@ -91,6 +91,8 @@ static UICompositeViewDescription *compositeDescription = nil;
[[UIApplication sharedApplication] setStatusBarHidden:NO]; // Fix UIImagePickerController status bar hide
[[UIApplication sharedApplication]
setStatusBarStyle:UIStatusBarStyleDefault]; // Fix UIImagePickerController status bar style change
[PhoneMainView.instance hideStatusBar:YES];
}
- (void)viewWillDisappear:(BOOL)animated {
@ -98,6 +100,8 @@ static UICompositeViewDescription *compositeDescription = nil;
if (popoverController != nil) {
[popoverController dismissPopoverAnimated:NO];
}
[PhoneMainView.instance hideStatusBar:NO];
}
#pragma mark - Property Functions
@ -172,9 +176,6 @@ static UICompositeViewDescription *compositeDescription = nil;
inView:(UIView *)ipadView {
void (^block)(UIImagePickerControllerSourceType) = ^(UIImagePickerControllerSourceType type) {
ImagePickerView *view = VIEW(ImagePickerView);
if (!(IPAD && ipadView && ipadPopoverView)) {
[PhoneMainView.instance changeCurrentView:view.compositeViewDescription];
}
view.sourceType = type;
// Displays a control that allows the user to choose picture or
@ -198,6 +199,8 @@ static UICompositeViewDescription *compositeDescription = nil;
inView:ipadView
permittedArrowDirections:UIPopoverArrowDirectionAny
animated:FALSE];
} else {
[PhoneMainView.instance changeCurrentView:view.compositeViewDescription];
}
};

10
Classes/LinphoneUI/UICompositeView.m
View file

@ -570,14 +570,16 @@
// Compute frame for each elements
CGRect viewFrame = self.view.frame;
int origin = currentViewDescription.fullscreen ? 0 : IPHONE_STATUSBAR_HEIGHT;
// 1. status bar - fixed size on top
CGRect statusBarFrame = self.statusBarView.frame;
int origin = currentViewDescription.fullscreen ? 0 : IPHONE_STATUSBAR_HEIGHT;
if (self.statusBarViewController != nil && currentViewDescription.statusBarEnabled) {
statusBarFrame.origin.y = origin;
// move origin below status bar
origin += statusBarFrame.size.height;
} else {
statusBarFrame.origin.y = origin - statusBarFrame.size.height;
statusBarFrame.origin.y = -statusBarFrame.size.height;
}
// 2. side menu - fixed size, always starting below status bar (hack: except in fullscreen)
@ -597,7 +599,7 @@
if (UIInterfaceOrientationIsPortrait([self currentOrientation])) {
tabFrame.origin.y = viewFrame.size.height - tabFrame.size.height;
} else {
tabFrame.origin.y = statusBarFrame.origin.y + statusBarFrame.size.height;
tabFrame.origin.y = origin;
tabFrame.size.height = viewFrame.size.height - tabFrame.origin.y;
}
} else {
@ -607,7 +609,7 @@
// 4. main view and details view - space left width of 35%/65% each
CGRect mainFrame = viewFrame;
mainFrame.origin.y = statusBarFrame.origin.y + statusBarFrame.size.height;
mainFrame.origin.y = origin;
mainFrame.size.height -= mainFrame.origin.y;
if (!currentViewDescription.fullscreen) {
if (UIInterfaceOrientationIsPortrait([self currentOrientation])) {

2
submodules/bzrtp

@ -1 +1 @@
Subproject commit 916a3bc8773c4230de5813bbb844413864823b8b
Subproject commit 5a6196e3d0a5d5b2998522379c9fdc2788378570

2
submodules/cmake-builder

@ -1 +1 @@
Subproject commit 95b7669abde0bc7708f632a8506e19532c6fc261
Subproject commit d04ec58fa4c162634d32cce9ebcd3bdc3d07aa89

2
submodules/linphone

@ -1 +1 @@
Subproject commit 6f48b4151cce800cb300a2c4c8dd8b32e7275c1b
Subproject commit e3e363dbdce3c1f44bcd55f51863ebfc45205eff