From 806975edeb863e8161157e0c80e68bd6944afef3 Mon Sep 17 00:00:00 2001 From: Benoit Martins Date: Thu, 20 Jul 2023 10:29:26 +0200 Subject: [PATCH] Revert "Fix secureBadge with safeArea" This reverts commit 32f264d8e4c60c3980925e47cb05223c68df6a4b. --- Classes/ContactsListTableView.m | 2 +- Classes/Swift/Util/BackActionsNavigationView.swift | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Classes/ContactsListTableView.m b/Classes/ContactsListTableView.m index 2e612f5d4..f67e61c0a 100644 --- a/Classes/ContactsListTableView.m +++ b/Classes/ContactsListTableView.m @@ -69,12 +69,12 @@ -(void)viewWillDisappear:(BOOL)animated{ [super viewWillDisappear:animated]; - [[NSNotificationCenter defaultCenter] removeObserver:self name:@"LinphoneFriendPresenceUpdate" object:nil]; [AvatarBridge removeAllObserver]; } -(void)viewDidDisappear:(BOOL)animated{ [super viewDidDisappear:animated]; + [[NSNotificationCenter defaultCenter] removeObserver:self name:@"LinphoneFriendPresenceUpdate" object:nil]; } -(void) receivePresenceNotification:(NSNotification*)notification diff --git a/Classes/Swift/Util/BackActionsNavigationView.swift b/Classes/Swift/Util/BackActionsNavigationView.swift index 8680439c2..e17f7d4b7 100644 --- a/Classes/Swift/Util/BackActionsNavigationView.swift +++ b/Classes/Swift/Util/BackActionsNavigationView.swift @@ -169,6 +169,7 @@ class BackActionsNavigationView: UIViewController { stackView.alignment = .center; stackView.spacing = 1; + //stackView.translatesAutoresizingMaskIntoConstraints = false view.addSubview(stackView) stackView.alignParentTop().done() @@ -270,6 +271,8 @@ class BackActionsNavigationView: UIViewController { constraintLandscapeFloatingButton = floatingButton.rightAnchor.constraint(equalTo: self.view.rightAnchor, constant: -56) if UIDevice.current.orientation.isLandscape { constraintLandscapeFloatingButton!.isActive = true + } else { + constraintFloatingButton!.isActive = true } constraintFloatingButton!.isActive = true floatingButton.topAnchor.constraint(equalTo: self.view.layoutMarginsGuide.topAnchor, constant: top_bar_height).isActive = true @@ -348,7 +351,7 @@ class BackActionsNavigationView: UIViewController { if UIDevice.current.orientation.isLandscape { constraintLandscapeFloatingButton!.isActive = true constraintFloatingButton!.isActive = false - } else if UIDevice.current.orientation.isPortrait { + } else { constraintLandscapeFloatingButton!.isActive = false constraintFloatingButton!.isActive = true }