From ce4d238f79dc5861bcee50ea3e3a7884e61fa38a Mon Sep 17 00:00:00 2001 From: REIS Benjamin Date: Fri, 14 Oct 2016 17:04:58 +0200 Subject: [PATCH] Fix view problems on IPAD --- Classes/ContactDetailsView.m | 30 ++++++++++++++++++++++++++++++ Classes/HistoryDetailsView.m | 12 ++++++++++++ 2 files changed, 42 insertions(+) diff --git a/Classes/ContactDetailsView.m b/Classes/ContactDetailsView.m index 71ecc55b2..160eeeabb 100644 --- a/Classes/ContactDetailsView.m +++ b/Classes/ContactDetailsView.m @@ -162,6 +162,25 @@ _editButton.hidden = ([ContactSelection getSelectionMode] != ContactSelectionModeEdit && [ContactSelection getSelectionMode] != ContactSelectionModeNone); [_tableController.tableView addObserver:self forKeyPath:@"contentSize" options:0 context:NULL]; + + [[NSNotificationCenter defaultCenter] addObserver: self + selector: @selector(deviceOrientationDidChange:) + name: UIDeviceOrientationDidChangeNotification + object: nil]; + if (IPAD && self.contact == NULL) { + _editButton.hidden = TRUE; + _deleteButton.hidden = TRUE; + } +} + +- (void)deviceOrientationDidChange:(NSNotification*)notif { + if (IPAD) { + if (self.contact == NULL || (self.contact.firstName == NULL && self.contact.lastName == NULL)) { + _editButton.hidden = TRUE; + _deleteButton.hidden = TRUE; + _avatarImage.hidden = TRUE; + } + } } - (void)viewWillDisappear:(BOOL)animated { @@ -198,6 +217,15 @@ static UICompositeViewDescription *compositeDescription = nil; - (void)setEditing:(BOOL)editing animated:(BOOL)animated { [super setEditing:editing animated:animated]; + if (editing) { + _editButton.hidden = FALSE; + _deleteButton.hidden = FALSE; + _avatarImage.hidden = FALSE; + } else { + _editButton.hidden = TRUE; + _deleteButton.hidden = TRUE; + _avatarImage.hidden = TRUE; + } if (animated) { [UIView beginAnimations:nil context:nil]; @@ -256,6 +284,8 @@ static UICompositeViewDescription *compositeDescription = nil; _emptyLabel.hidden = NO; if (!IPAD) { [PhoneMainView.instance popCurrentView]; + } else { + self.contact = NULL; } } } diff --git a/Classes/HistoryDetailsView.m b/Classes/HistoryDetailsView.m index e0d946807..73e2381b1 100644 --- a/Classes/HistoryDetailsView.m +++ b/Classes/HistoryDetailsView.m @@ -60,6 +60,7 @@ static UICompositeViewDescription *compositeDescription = nil; if (IPAD) { _backButton.hidden = YES; _backButton.alpha = 0; + } UITapGestureRecognizer *headerTapGesture = @@ -81,6 +82,11 @@ static UICompositeViewDescription *compositeDescription = nil; selector:@selector(coreUpdateEvent:) name:kLinphoneCoreUpdate object:nil]; + + [[NSNotificationCenter defaultCenter] addObserver: self + selector: @selector(deviceOrientationDidChange:) + name: UIDeviceOrientationDidChangeNotification + object: nil]; } - (void)viewWillDisappear:(BOOL)animated { @@ -94,6 +100,12 @@ static UICompositeViewDescription *compositeDescription = nil; [self update]; } +- (void) deviceOrientationDidChange:(NSNotification*) notif { + if (IPAD) { + [self update]; + } +} + #pragma mark - - (void)update {