From e1130bfb86881f5a2575a2b52bc2fdfef6e8a993 Mon Sep 17 00:00:00 2001 From: Kiryl Kaveryn Date: Wed, 12 Mar 2025 15:27:36 +0400 Subject: [PATCH] [ios] fix layout crash on the ios 12 on ipad The exception was rised by the NSLayoutConstrait when the priority is changed (on ipad) after constraint activation. The all of the constraints set up shood be done before activation. Signed-off-by: Kiryl Kaveryn --- iphone/Maps/Classes/MapViewController.mm | 29 ++++++++++++++---------- 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/iphone/Maps/Classes/MapViewController.mm b/iphone/Maps/Classes/MapViewController.mm index 63f28319ae..72fdb5c4cf 100644 --- a/iphone/Maps/Classes/MapViewController.mm +++ b/iphone/Maps/Classes/MapViewController.mm @@ -148,24 +148,30 @@ NSString *const kSettingsSegue = @"Map2Settings"; - (void)setupPlacePageContainer { self.placePageContainer = [[TouchTransparentView alloc] initWithFrame:self.view.bounds]; + self.placePageContainer.translatesAutoresizingMaskIntoConstraints = NO; [self.view addSubview:self.placePageContainer]; [self.view bringSubviewToFront:self.placePageContainer]; - self.placePageContainer.translatesAutoresizingMaskIntoConstraints = NO; self.placePageLeadingConstraint = [self.placePageContainer.leadingAnchor constraintEqualToAnchor:self.view.safeAreaLayoutGuide.leadingAnchor constant:kPlacePageLeadingOffset]; - self.placePageLeadingConstraint.active = YES; + if (IPAD) + self.placePageLeadingConstraint.priority = UILayoutPriorityDefaultLow; - self.placePageWidthConstraint = [self.placePageContainer.widthAnchor constraintEqualToConstant:0]; + self.placePageWidthConstraint = [self.placePageContainer.widthAnchor constraintEqualToConstant:kPlacePageCompactWidth]; self.placePageTrailingConstraint = [self.placePageContainer.trailingAnchor constraintEqualToAnchor:self.view.safeAreaLayoutGuide.trailingAnchor]; - [self.placePageContainer.topAnchor constraintEqualToAnchor:self.view.safeAreaLayoutGuide.topAnchor].active = YES; - if (IPAD) { - self.placePageLeadingConstraint.priority = UILayoutPriorityDefaultLow; - [self.placePageContainer.bottomAnchor constraintLessThanOrEqualToAnchor:self.view.bottomAnchor].active = YES; - } - else { - [self.placePageContainer.bottomAnchor constraintEqualToAnchor:self.view.bottomAnchor].active = YES; - } + NSLayoutConstraint * topConstraint = [self.placePageContainer.topAnchor constraintEqualToAnchor:self.view.safeAreaLayoutGuide.topAnchor]; + + NSLayoutConstraint * bottomConstraint; + if (IPAD) + bottomConstraint = [self.placePageContainer.bottomAnchor constraintLessThanOrEqualToAnchor:self.view.bottomAnchor]; + else + bottomConstraint = [self.placePageContainer.bottomAnchor constraintEqualToAnchor:self.view.bottomAnchor]; + + [NSLayoutConstraint activateConstraints:@[ + self.placePageLeadingConstraint, + topConstraint, + bottomConstraint, + ]]; [self updatePlacePageContainerConstraints]; } @@ -178,7 +184,6 @@ NSString *const kSettingsSegue = @"Map2Settings"; - (void)updatePlacePageContainerConstraints { const BOOL isLimitedWidth = IPAD || self.traitCollection.verticalSizeClass == UIUserInterfaceSizeClassCompact; - [self.placePageWidthConstraint setConstant:kPlacePageCompactWidth]; if (IPAD && self.searchView != nil) { NSLayoutConstraint * leadingToSearchConstraint = [self.placePageContainer.leadingAnchor constraintEqualToAnchor:self.searchView.trailingAnchor constant:kPlacePageLeadingOffset];