diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/MWMNavigationInfoView.mm b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/MWMNavigationInfoView.mm index 0176d0a579..3267231bc1 100644 --- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/MWMNavigationInfoView.mm +++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/MWMNavigationInfoView.mm @@ -56,6 +56,7 @@ BOOL defaultOrientation(CGSize const &size) { @interface MWMNavigationInfoView () @property(weak, nonatomic) IBOutlet UIView *streetNameView; +@property(weak, nonatomic) IBOutlet NSLayoutConstraint *streetNameTopOffsetConstraint; @property(weak, nonatomic) IBOutlet NSLayoutConstraint *streetNameViewHideOffset; @property(weak, nonatomic) IBOutlet UILabel *streetNameLabel; @property(weak, nonatomic) IBOutlet UIView *turnsView; @@ -336,6 +337,12 @@ BOOL defaultOrientation(CGSize const &size) { self.widthConstraint.active = YES; self.heightConstraint = [self.heightAnchor constraintEqualToConstant:ov.frame.size.height]; self.heightConstraint.active = YES; + self.streetNameTopOffsetConstraint.constant = self.additionalStreetNameTopOffset; +} + +// Additional spacing for devices with a small top safe area (such as SE or when the device is in landscape mode). +- (CGFloat)additionalStreetNameTopOffset { + return MapsAppDelegate.theApp.window.safeAreaInsets.top <= 20 ? 10 : 0;; } - (void)refreshLayout { @@ -358,6 +365,7 @@ BOOL defaultOrientation(CGSize const &size) { (defaultOrientation(availableArea.size) ? kSearchButtonsViewHeightPortrait : kSearchButtonsViewHeightLandscape) / 2; + self.streetNameTopOffsetConstraint.constant = self.additionalStreetNameTopOffset; }]; }); } diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/MWMNavigationInfoView.xib b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/MWMNavigationInfoView.xib index 4d6e35d141..ded600ce1e 100644 --- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/MWMNavigationInfoView.xib +++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/MWMNavigationInfoView.xib @@ -125,12 +125,12 @@ - + - +