[ios] move out UI from the MWMNavigationDashboardManager to RoutePreviewView

The MWMNavigationDashboardManager's old impl contains both the business logic and UI.
Now this responsibilities are separated: the MWMNavigationDashboardManager controls the previewing logic and NavigationDashboardView - UI

Signed-off-by: Kiryl Kaveryn <kirylkaveryn@gmail.com>

iphone/Maps/Bridging-Header.h

@@ -79,3 +79,4 @@
 #import "MWMSearchSuggestionCell.h"
 #import "MWMSearch.h"
 #import "SearchResult.h"
+#import "RoutePreview.h"

iphone/Maps/Categories/CALayer+SetCorner.swift

@@ -1,12 +1,18 @@
 extension CALayer {
-  func setCorner(radius: CGFloat,
+  func setCornerRadius(_ cornerRadius: CornerRadius,
-                 corners: CACornerMask? = nil) {
+                       maskedCorners: CACornerMask? = nil) {
-    cornerRadius = radius
+    self.cornerRadius = cornerRadius.value
-    if let corners {
+    if let maskedCorners {
-      maskedCorners = corners
+      self.maskedCorners = maskedCorners
     }
     if #available(iOS 13.0, *) {
       cornerCurve = .continuous
     }
   }
 }
+
+extension CACornerMask {
+  static var all: CACornerMask {
+    return [.layerMinXMinYCorner, .layerMaxXMinYCorner, .layerMinXMaxYCorner, .layerMaxXMaxYCorner]
+  }
+}

iphone/Maps/Categories/UIView+Snapshot.swift

@@ -13,7 +13,7 @@ extension UIView {
       snapshot.layer.contents = contents
       snapshot.layer.bounds = layer.bounds
     }
-    snapshot.layer.setCorner(radius: layer.cornerRadius)
+    snapshot.layer.setCornerRadius(.custom(layer.cornerRadius))
     snapshot.layer.masksToBounds = layer.masksToBounds
     snapshot.contentMode = contentMode
     snapshot.transform = transform

iphone/Maps/Classes/Components/Modal/AlertPresentationController.swift

@@ -8,7 +8,7 @@ final class AlertPresentationController: DimmedModalPresentationController {
 
   override func presentationTransitionWillBegin() {
     super.presentationTransitionWillBegin()
-    presentedViewController.view.layer.setCorner(radius: 12)
+    presentedViewController.view.layer.setCornerRadius(.modalSheet)
     presentedViewController.view.clipsToBounds = true
     guard let containerView = containerView, let presentedView = presentedView else { return }
     containerView.addSubview(presentedView)

iphone/Maps/Classes/Components/Modal/IPadModalPresentationController.swift

@@ -17,7 +17,7 @@ override var frameOfPresentedViewInContainerView: CGRect {
 
   override func presentationTransitionWillBegin() {
     super.presentationTransitionWillBegin()
-    presentedViewController.view.layer.setCorner(radius: 8)
+    presentedViewController.view.layer.setCornerRadius(.buttonDefault)
     presentedViewController.view.clipsToBounds = true
     guard let containerView = containerView, let presentedView = presentedView else { return }
     containerView.addSubview(presentedView)

iphone/Maps/Classes/Components/Modal/PromoBookingPresentationController.swift

@@ -16,7 +16,7 @@ final class PromoBookingPresentationController: DimmedModalPresentationControlle
   
   override func presentationTransitionWillBegin() {
     super.presentationTransitionWillBegin()
-    presentedViewController.view.layer.setCorner(radius: 8)
+    presentedViewController.view.layer.setCornerRadius(.buttonDefault)
     presentedViewController.view.clipsToBounds = true
     guard let containerView = containerView, let presentedView = presentedView else { return } 
     containerView.addSubview(presentedView)

iphone/Maps/Classes/CustomAlert/Toast/Toast.swift

@@ -22,7 +22,7 @@ final class Toast: NSObject {
   }
   
   private init(_ text: String) {
-    blurView.layer.setCorner(radius: 8)
+    blurView.layer.setCornerRadius(.buttonDefault)
     blurView.clipsToBounds = true
     blurView.alpha = 0
 

iphone/Maps/Classes/CustomViews/MapViewControls/SideButtons/MWMSideButtons.h

@@ -14,6 +14,5 @@
 - (void)processMyPositionStateModeEvent:(MWMMyPositionMode)mode;
 
 + (void)updateAvailableArea:(CGRect)frame;
-+ (CGRect)getAvailableArea;
 
 @end

iphone/Maps/Classes/CustomViews/MapViewControls/SideButtons/MWMSideButtons.mm

@@ -58,8 +58,6 @@ NSString * const kUDDidShowLongTapToShowSideButtonsToast = @"kUDDidShowLongTapTo
 
 + (void)updateAvailableArea:(CGRect)frame { [[self buttons].sideView updateAvailableArea:frame]; }
 
-+ (CGRect)getAvailableArea { return [self buttons].sideView.getAvailableArea; }
-
 - (void)zoomIn
 {
   GetFramework().Scale(Framework::SCALE_MAG, true);

iphone/Maps/Classes/CustomViews/MapViewControls/SideButtons/MWMSideButtonsView.h

@@ -8,6 +8,5 @@
 - (void)setHidden:(BOOL)hidden animated:(BOOL)animated;
 
 - (void)updateAvailableArea:(CGRect)frame;
-- (CGRect)getAvailableArea;
 
 @end

iphone/Maps/Classes/CustomViews/MapViewControls/SideButtons/MWMSideButtonsView.mm

@@ -144,10 +144,6 @@ CGFloat const kButtonsBottomOffset = 6;
   [self setNeedsLayout];
 }
 
-- (CGRect)getAvailableArea {
-  return self.availableArea;
-}
-
 - (CGFloat)availableHeight {
   return self.availableArea.size.height - kButtonsTopOffset - kButtonsBottomOffset;
 }

iphone/Maps/Classes/CustomViews/MapViewControls/TrafficButton/MWMTrafficButtonViewController.mm

@@ -195,6 +195,8 @@ NSArray<UIImage *> *imagesWithName(NSString *name) {
   if (CGRectEqualToRect(controller.availableArea, frame))
     return;
   controller.availableArea = frame;
+  BOOL isHidden = frame.origin.y + frame.size.height < controller.view.origin.y + controller.view.height + kTopOffset;
+  [MapViewController.sharedController.controlsManager setTrafficButtonHidden:isHidden];
   [controller refreshLayout];
 }
 

iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager.h

@@ -7,6 +7,8 @@ typedef NS_ENUM(NSUInteger, MWMNavigationDashboardState) {
   MWMNavigationDashboardStateNavigation
 };
 
+@class NavigationDashboardView;
+
 @interface MWMNavigationDashboardManager : NSObject
 
 + (nonnull MWMNavigationDashboardManager *)sharedManager;

iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager.mm

@@ -1,40 +1,24 @@
 #import "MWMNavigationDashboardManager.h"
-#import "MWMMapViewControlsManager.h"
-#import "MWMNavigationInfoView.h"
 #import "MWMRoutePreview.h"
 #import "MWMSearch.h"
 #import "MapViewController.h"
-
+#import "NavigationDashboardView.h"
-#import "SwiftBridge.h"
-
-namespace {
-NSString *const kRoutePreviewIPhoneXibName = @"MWMiPhoneRoutePreview";
-NSString *const kNavigationInfoViewXibName = @"MWMNavigationInfoView";
-NSString *const kNavigationControlViewXibName = @"NavigationControlView";
-}  // namespace
 
 @interface MWMMapViewControlsManager ()
 
-@property(nonatomic) MWMNavigationDashboardManager *navigationManager;
+@property(nonatomic) MWMNavigationDashboardManager * navigationManager;
 
 @end
 
 @interface MWMNavigationDashboardManager () <SearchOnMapManagerObserver, MWMRoutePreviewDelegate>
 
-@property(copy, nonatomic) NSDictionary *etaAttributes;
+@property(copy, nonatomic) NSDictionary * etaAttributes;
-@property(copy, nonatomic) NSDictionary *etaSecondaryAttributes;
+@property(copy, nonatomic) NSDictionary * etaSecondaryAttributes;
-@property(copy, nonatomic) NSString *errorMessage;
+@property(copy, nonatomic) NSString * errorMessage;
-@property(nonatomic) IBOutlet MWMBaseRoutePreviewStatus *baseRoutePreviewStatus;
+@property(copy, nonatomic) MWMNavigationDashboardEntity * entity;
-@property(nonatomic) IBOutlet MWMNavigationControlView *navigationControlView;
+
-@property(nonatomic) IBOutlet MWMNavigationInfoView *navigationInfoView;
+@property(nonatomic, readonly) NavigationDashboardView * _Nonnull navigationDashboardView;
-@property(nonatomic) IBOutlet MWMRoutePreview *routePreview;
+@property(weak, nonatomic) UIView * ownerView;
-@property(nonatomic) IBOutlet MWMTransportRoutePreviewStatus *transportRoutePreviewStatus;
-@property(nonatomic) IBOutletCollection(MWMRouteStartButton) NSArray *goButtons;
-@property(nonatomic) MWMNavigationDashboardEntity *entity;
-@property(nonatomic) MWMRouteManagerTransitioningManager *routeManagerTransitioningManager;
-@property(weak, nonatomic) IBOutlet UIButton *showRouteManagerButton;
-@property(weak, nonatomic) IBOutlet UIView *goButtonsContainer;
-@property(weak, nonatomic) UIView *ownerView;
 
 @end
 
@@ -48,6 +32,8 @@ NSString *const kNavigationControlViewXibName = @"NavigationControlView";
   self = [super init];
   if (self) {
     _ownerView = view;
+    _navigationDashboardView = [[NavigationDashboardView alloc] initWithOwnerView:view];
+    _navigationDashboardView.delegate = self;
   }
   return self;
 }
@@ -56,215 +42,51 @@ NSString *const kNavigationControlViewXibName = @"NavigationControlView";
   return [[MapViewController sharedController] searchManager];
 }
 
-- (void)loadPreviewWithStatusBoxes {
-  [NSBundle.mainBundle loadNibNamed:kRoutePreviewIPhoneXibName owner:self options:nil];
-  auto ownerView = self.ownerView;
-  _baseRoutePreviewStatus.ownerView = ownerView;
-  _transportRoutePreviewStatus.ownerView = ownerView;
-}
-
-#pragma mark - MWMRoutePreview
-
 - (void)setRouteBuilderProgress:(CGFloat)progress {
-  [self.routePreview router:[MWMRouter type] setProgress:progress / 100.];
+  [self.navigationDashboardView setRouteBuilderProgress:[MWMRouter type] progress:progress / 100.];
 }
 
-#pragma mark - MWMNavigationGo
+#pragma mark - On route updates
-
-- (IBAction)routingStartTouchUpInside {
-  [MWMRouter startRouting];
-}
-- (void)updateGoButtonTitle {
-  NSString *title = L(@"p2p_start");
-
-  for (MWMRouteStartButton *button in self.goButtons)
-    [button setTitle:title forState:UIControlStateNormal];
-}
 
 - (void)onNavigationInfoUpdated {
   auto entity = self.entity;
   if (!entity.isValid)
     return;
-  [_navigationInfoView onNavigationInfoUpdated:entity];
+  [self.navigationDashboardView onNavigationInfoUpdated:entity];
-  bool const isPublicTransport = [MWMRouter type] == MWMRouterTypePublicTransport;
-  bool const isRuler = [MWMRouter type] == MWMRouterTypeRuler;
-  if (isPublicTransport || isRuler)
-    [_transportRoutePreviewStatus onNavigationInfoUpdated:entity prependDistance:isRuler];
-  else
-    [_baseRoutePreviewStatus onNavigationInfoUpdated:entity];
-  [_navigationControlView onNavigationInfoUpdated:entity];
 }
 
-#pragma mark - On route updates
-
 - (void)onRoutePrepare {
   self.state = MWMNavigationDashboardStatePrepare;
-  self.routePreview.drivingOptionsState = MWMDrivingOptionsStateNone;
+  [self.navigationDashboardView setDrivingOptionState:MWMDrivingOptionsStateNone];
 }
 
 - (void)onRoutePlanning {
   self.state = MWMNavigationDashboardStatePlanning;
-  self.routePreview.drivingOptionsState = MWMDrivingOptionsStateNone;
+  [self.navigationDashboardView setDrivingOptionState:MWMDrivingOptionsStateNone];
 }
 
 - (void)onRouteError:(NSString *)error {
   self.errorMessage = error;
   self.state = MWMNavigationDashboardStateError;
-  self.routePreview.drivingOptionsState =
+  [self.navigationDashboardView setDrivingOptionState:[MWMRouter hasActiveDrivingOptions] ? MWMDrivingOptionsStateChange : MWMDrivingOptionsStateNone];
-    [MWMRouter hasActiveDrivingOptions] ? MWMDrivingOptionsStateChange : MWMDrivingOptionsStateNone;
 }
 
 - (void)onRouteReady:(BOOL)hasWarnings {
   if (self.state != MWMNavigationDashboardStateNavigation)
     self.state = MWMNavigationDashboardStateReady;
   if ([MWMRouter hasActiveDrivingOptions]) {
-    self.routePreview.drivingOptionsState = MWMDrivingOptionsStateChange;
+    [self.navigationDashboardView setDrivingOptionState:MWMDrivingOptionsStateChange];
   } else {
-    self.routePreview.drivingOptionsState = hasWarnings ? MWMDrivingOptionsStateDefine : MWMDrivingOptionsStateNone;
+    [self.navigationDashboardView setDrivingOptionState:hasWarnings ? MWMDrivingOptionsStateDefine : MWMDrivingOptionsStateNone];
   }
 }
 
 - (void)onRoutePointsUpdated {
   if (self.state == MWMNavigationDashboardStateHidden)
     self.state = MWMNavigationDashboardStatePrepare;
-  [self.navigationInfoView updateToastView];
+  [self.navigationDashboardView onRoutePointsUpdated];
 }
 
-#pragma mark - State changes
-
-- (void)stateHidden {
-  self.routePreview = nil;
-  self.navigationInfoView.state = MWMNavigationInfoViewStateHidden;
-  self.navigationInfoView = nil;
-  _navigationControlView.isVisible = NO;
-  _navigationControlView = nil;
-  [self.baseRoutePreviewStatus hide];
-  [_transportRoutePreviewStatus hide];
-  _transportRoutePreviewStatus = nil;
-}
-
-- (void)statePrepare {
-  self.navigationInfoView.state = MWMNavigationInfoViewStatePrepare;
-  auto routePreview = self.routePreview;
-  [routePreview addToView:self.ownerView];
-  [routePreview statePrepare];
-  [routePreview selectRouter:[MWMRouter type]];
-  [self updateGoButtonTitle];
-  [self.baseRoutePreviewStatus hide];
-  [_transportRoutePreviewStatus hide];
-  for (MWMRouteStartButton *button in self.goButtons)
-    [button statePrepare];
-}
-
-- (void)statePlanning {
-  [self statePrepare];
-  [self.routePreview router:[MWMRouter type] setState:MWMCircularProgressStateSpinner];
-  [self setRouteBuilderProgress:0.];
-}
-
-- (void)stateError {
-  if (_state == MWMNavigationDashboardStateReady)
-    return;
-
-  NSAssert(_state == MWMNavigationDashboardStatePlanning, @"Invalid state change (error)");
-  auto routePreview = self.routePreview;
-  [routePreview router:[MWMRouter type] setState:MWMCircularProgressStateFailed];
-  [self updateGoButtonTitle];
-  [self.baseRoutePreviewStatus showErrorWithMessage:self.errorMessage];
-  for (MWMRouteStartButton *button in self.goButtons)
-    [button stateError];
-}
-
-- (void)stateReady {
-  // TODO: Here assert sometimes fires with _state = MWMNavigationDashboardStateReady, if app was stopped while navigating and then restarted.
-  // Also in ruler mode when new point is added by single tap on the map state MWMNavigationDashboardStatePlanning is skipped and we get _state = MWMNavigationDashboardStateReady.
-  NSAssert(_state == MWMNavigationDashboardStatePlanning || _state == MWMNavigationDashboardStateReady, @"Invalid state change (ready)");
-  [self setRouteBuilderProgress:100.];
-  [self updateGoButtonTitle];
-  bool const isTransport = ([MWMRouter type] == MWMRouterTypePublicTransport);
-  bool const isRuler = ([MWMRouter type] == MWMRouterTypeRuler);
-  if (isTransport || isRuler)
-    [self.transportRoutePreviewStatus showReady];
-  else
-    [self.baseRoutePreviewStatus showReady];
-  self.goButtonsContainer.hidden = isTransport || isRuler;
-  for (MWMRouteStartButton *button in self.goButtons)
-  {
-    if (isRuler)
-      [button stateHidden];
-    else
-      [button stateReady];
-  }
-}
-
-- (void)onRouteStart {
-  self.state = MWMNavigationDashboardStateNavigation;
-}
-- (void)onRouteStop {
-  self.state = MWMNavigationDashboardStateHidden;
-}
-- (void)stateNavigation {
-  self.routePreview = nil;
-  self.navigationInfoView.state = MWMNavigationInfoViewStateNavigation;
-  self.navigationControlView.isVisible = YES;
-  [self.baseRoutePreviewStatus hide];
-  [_transportRoutePreviewStatus hide];
-  _transportRoutePreviewStatus = nil;
-  [self onNavigationInfoUpdated];
-}
-
-#pragma mark - MWMRoutePreviewStatus
-
-- (IBAction)showRouteManager {
-  auto routeManagerViewModel = [[MWMRouteManagerViewModel alloc] init];
-  auto routeManager = [[MWMRouteManagerViewController alloc] initWithViewModel:routeManagerViewModel];
-  routeManager.modalPresentationStyle = UIModalPresentationCustom;
-
-  self.routeManagerTransitioningManager = [[MWMRouteManagerTransitioningManager alloc] init];
-  routeManager.transitioningDelegate = self.routeManagerTransitioningManager;
-
-  [[MapViewController sharedController] presentViewController:routeManager animated:YES completion:nil];
-}
-
-#pragma mark - MWMNavigationControlView
-
-- (IBAction)ttsButtonAction {
-  BOOL const isEnabled = [MWMTextToSpeech tts].active;
-  [MWMTextToSpeech tts].active = !isEnabled;
-}
-
-- (IBAction)settingsButtonAction {
-  [[MapViewController sharedController] openSettings];
-}
-
-- (IBAction)stopRoutingButtonAction {
-  [MWMSearch clear];
-  [MWMRouter stopRouting];
-  [self.searchManager close];
-}
-
-#pragma mark - SearchOnMapManagerObserver
-
-- (void)searchManagerWithDidChangeState:(SearchOnMapState)state {
-  switch (state) {
-    case SearchOnMapStateClosed:
-      [self.navigationInfoView setSearchState:NavigationSearchState::MinimizedNormal animated:YES];
-      break;
-    case SearchOnMapStateHidden:
-    case SearchOnMapStateSearching:
-      [self setMapSearch];
-  }
-}
-
-#pragma mark - Available area
-
-+ (void)updateNavigationInfoAvailableArea:(CGRect)frame {
-  [[self sharedManager] updateNavigationInfoAvailableArea:frame];
-}
-
-- (void)updateNavigationInfoAvailableArea:(CGRect)frame {
-  _navigationInfoView.availableArea = frame;
-}
 #pragma mark - Properties
 
 - (void)setState:(MWMNavigationDashboardState)state {
@@ -299,64 +121,91 @@ NSString *const kNavigationControlViewXibName = @"NavigationControlView";
     BottomTabBarViewController.controller.isHidden = state != MWMNavigationDashboardStateHidden;
 }
 
-@synthesize routePreview = _routePreview;
-- (MWMRoutePreview *)routePreview {
-  if (!_routePreview)
-    [self loadPreviewWithStatusBoxes];
-  return _routePreview;
-}
-
-- (void)setRoutePreview:(MWMRoutePreview *)routePreview {
-  if (routePreview == _routePreview)
-    return;
-  [_routePreview remove];
-  _routePreview = routePreview;
-  _routePreview.delegate = self;
-}
-
-- (MWMBaseRoutePreviewStatus *)baseRoutePreviewStatus {
-  if (!_baseRoutePreviewStatus)
-    [self loadPreviewWithStatusBoxes];
-  return _baseRoutePreviewStatus;
-}
-
-- (MWMTransportRoutePreviewStatus *)transportRoutePreviewStatus {
-  if (!_transportRoutePreviewStatus)
-    [self loadPreviewWithStatusBoxes];
-  return _transportRoutePreviewStatus;
-}
-
-- (MWMNavigationInfoView *)navigationInfoView {
-  if (!_navigationInfoView) {
-    [NSBundle.mainBundle loadNibNamed:kNavigationInfoViewXibName owner:self options:nil];
-    _navigationInfoView.state = MWMNavigationInfoViewStateHidden;
-    _navigationInfoView.ownerView = self.ownerView;
-  }
-  return _navigationInfoView;
-}
-
-- (MWMNavigationControlView *)navigationControlView {
-  if (!_navigationControlView) {
-    [NSBundle.mainBundle loadNibNamed:kNavigationControlViewXibName owner:self options:nil];
-    _navigationControlView.ownerView = self.ownerView;
-  }
-  return _navigationControlView;
-}
-
 - (MWMNavigationDashboardEntity *)entity {
   if (!_entity)
     _entity = [[MWMNavigationDashboardEntity alloc] init];
   return _entity;
 }
 
-- (void)setMapSearch {
+#pragma mark - State changes
-  [_navigationInfoView setMapSearch];
+
+- (void)stateHidden {
+  [self.navigationDashboardView setHidden];
+}
+
+- (void)statePrepare {
+  [self.navigationDashboardView statePrepare];
+}
+
+- (void)statePlanning {
+  [self statePrepare];
+  [self.navigationDashboardView statePlanning];
+  [self setRouteBuilderProgress:0.];
+}
+
+- (void)stateError {
+  if (_state == MWMNavigationDashboardStateReady)
+    return;
+  NSAssert(_state == MWMNavigationDashboardStatePlanning, @"Invalid state change (error)");
+  [self.navigationDashboardView stateError:self.errorMessage];
+}
+
+- (void)stateReady {
+  // TODO: Here assert sometimes fires with _state = MWMNavigationDashboardStateReady, if app was stopped while navigating and then restarted.
+  // Also in ruler mode when new point is added by single tap on the map state MWMNavigationDashboardStatePlanning is skipped and we get _state = MWMNavigationDashboardStateReady.
+  NSAssert(_state == MWMNavigationDashboardStatePlanning || _state == MWMNavigationDashboardStateReady, @"Invalid state change (ready)");
+  [self setRouteBuilderProgress:100.];
+  [self.navigationDashboardView stateReady];
+}
+
+- (void)onRouteStart {
+  self.state = MWMNavigationDashboardStateNavigation;
+}
+- (void)onRouteStop {
+  self.state = MWMNavigationDashboardStateHidden;
+}
+
+- (void)stateNavigation {
+  [self.navigationDashboardView stateNavigation];
+  [self onNavigationInfoUpdated];
 }
 
 #pragma mark - MWMRoutePreviewDelegate
 
+- (void)routingStartButtonDidTap {
+  [MWMRouter startRouting];
+}
+
 - (void)routePreviewDidPressDrivingOptions:(MWMRoutePreview *)routePreview {
   [[MapViewController sharedController] openDrivingOptions];
 }
 
+- (void)ttsButtonDidTap {
+  BOOL const isEnabled = [MWMTextToSpeech tts].active;
+  [MWMTextToSpeech tts].active = !isEnabled;
+}
+
+- (void)settingsButtonDidTap {
+  [[MapViewController sharedController] openSettings];
+}
+
+- (void)stopRoutingButtonDidTap {
+  [MWMSearch clear];
+  [MWMRouter stopRouting];
+  [self.searchManager close];
+}
+
+#pragma mark - SearchOnMapManagerObserver
+
+- (void)searchManagerWithDidChangeState:(SearchOnMapState)state {
+  [self.navigationDashboardView searchManagerWithDidChangeState:state];
+}
+
+#pragma mark - Available area
+
++ (void)updateNavigationInfoAvailableArea:(CGRect)frame {
+  [[self sharedManager].navigationDashboardView updateNavigationInfoAvailableArea:frame];
+}
+
+
 @end

iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMRoutePreview.h

@@ -1,31 +1,8 @@
-#import "MWMCircularProgressState.h"
+#import "RoutePreviewView.h"
-#import "MWMRouterType.h"
 
-typedef NS_ENUM(NSInteger, MWMDrivingOptionsState) {
+@interface MWMRoutePreview : UIView <RoutePreviewView>
-  MWMDrivingOptionsStateNone,
-  MWMDrivingOptionsStateDefine,
-  MWMDrivingOptionsStateChange
-};
-
-@class MWMRoutePreview;
-
-@protocol MWMRoutePreviewDelegate
-
-- (void)routePreviewDidPressDrivingOptions:(MWMRoutePreview *)routePreview;
-
-@end
-
-@interface MWMRoutePreview : UIView
 
 @property(nonatomic) MWMDrivingOptionsState drivingOptionsState;
 @property(weak, nonatomic) id<MWMRoutePreviewDelegate> delegate;
 
-- (void)addToView:(UIView *)superview;
-- (void)remove;
-
-- (void)statePrepare;
-- (void)selectRouter:(MWMRouterType)routerType;
-- (void)router:(MWMRouterType)routerType setState:(MWMCircularProgressState)state;
-- (void)router:(MWMRouterType)routerType setProgress:(CGFloat)progress;
-
 @end

iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/NavigationDashboardView.h

@@ -0,0 +1,33 @@
+#import "RoutePreviewView.h"
+#import "SwiftBridge.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@class MWMNavigationDashboardEntity;
+
+@interface NavigationDashboardView : NSObject
+
+@property(weak, nonatomic) id<MWMRoutePreviewDelegate> delegate;
+
+- (instancetype)initWithOwnerView:(UIView *)ownerView;
+
+- (void)loadPreview;
+- (void)onNavigationInfoUpdated:(MWMNavigationDashboardEntity *)entity;
+- (void)setDrivingOptionState:(MWMDrivingOptionsState)state;
+- (void)searchManagerWithDidChangeState:(SearchOnMapState)state;
+- (void)updateNavigationInfoAvailableArea:(CGRect)frame;
+- (void)setRouteBuilderProgress:(MWMRouterType)router progress:(CGFloat)progress;
+
+- (void)setHidden;
+- (void)statePrepare;
+- (void)statePlanning;
+- (void)stateError:(NSString *_Nonnull)errorMessage;
+- (void)stateReady;
+- (void)onRouteStart;
+- (void)onRouteStop;
+- (void)onRoutePointsUpdated;
+- (void)stateNavigation;
+
+@end
+
+NS_ASSUME_NONNULL_END

iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/NavigationDashboardView.mm

@@ -0,0 +1,245 @@
+#import "NavigationDashboardView.h"
+#import "MWMNavigationDashboardManager.h"
+#import "MWMMapViewControlsManager.h"
+#import "MWMNavigationInfoView.h"
+#import "MWMRoutePreview.h"
+#import "MWMSearch.h"
+#import "MapViewController.h"
+
+#import "SwiftBridge.h"
+
+NSString *kRoutePreviewIPhoneXibName = @"MWMiPhoneRoutePreview";
+NSString *kNavigationInfoViewXibName = @"MWMNavigationInfoView";
+NSString *kNavigationControlViewXibName = @"NavigationControlView";
+
+@interface NavigationDashboardView()
+
+@property(nonatomic) IBOutlet MWMBaseRoutePreviewStatus *baseRoutePreviewStatus;
+@property(nonatomic) IBOutlet MWMNavigationControlView *navigationControlView;
+@property(nonatomic) IBOutlet MWMNavigationInfoView *navigationInfoView;
+@property(nonatomic) IBOutlet MWMRoutePreview *routePreview;
+@property(nonatomic) IBOutlet MWMTransportRoutePreviewStatus *transportRoutePreviewStatus;
+@property(nonatomic) IBOutletCollection(MWMRouteStartButton) NSArray *goButtons;
+@property(nonatomic) MWMRouteManagerTransitioningManager *routeManagerTransitioningManager;
+@property(weak, nonatomic) IBOutlet UIButton *showRouteManagerButton;
+@property(weak, nonatomic) IBOutlet UIView *goButtonsContainer;
+@property(weak, nonatomic) UIView *ownerView;
+
+@end
+
+@implementation NavigationDashboardView
+
+- (instancetype)initWithOwnerView:(UIView *)ownerView {
+  self = [super init];
+  if (self) {
+    self.ownerView = ownerView;
+    [self loadPreview];
+  }
+  return self;
+}
+
+- (void)loadPreview {
+  [NSBundle.mainBundle loadNibNamed:kRoutePreviewIPhoneXibName owner:self options:nil];
+  auto const ownerView = self.ownerView;
+  self.baseRoutePreviewStatus.ownerView = ownerView;
+  self.transportRoutePreviewStatus.ownerView = ownerView;
+}
+
+- (void)setRouteBuilderProgress:(MWMRouterType)router progress:(CGFloat)progress  {
+  [self.routePreview router:router setProgress:progress];
+}
+
+- (void)onNavigationInfoUpdated:(MWMNavigationDashboardEntity *)entity {
+  [_navigationInfoView onNavigationInfoUpdated:entity];
+  bool const isPublicTransport = ([MWMRouter type] == MWMRouterTypePublicTransport);
+  bool const isRuler = ([MWMRouter type] == MWMRouterTypeRuler);
+  if (isPublicTransport || isRuler)
+    [_transportRoutePreviewStatus onNavigationInfoUpdated:entity prependDistance:isRuler];
+  else
+    [_baseRoutePreviewStatus onNavigationInfoUpdated:entity];
+  [_navigationControlView onNavigationInfoUpdated:entity];
+}
+
+- (void)setDrivingOptionState:(MWMDrivingOptionsState)state {
+  self.routePreview.drivingOptionsState = state;
+}
+
+- (void)onRoutePointsUpdated {
+  [self.navigationInfoView updateToastView];
+}
+
+- (void)updateGoButtonTitle {
+  NSString *title = L(@"p2p_start");
+
+  for (MWMRouteStartButton *button in self.goButtons)
+    [button setTitle:title forState:UIControlStateNormal];
+}
+
+#pragma mark - State changes
+
+- (void)setHidden {
+  self.routePreview = nil;
+  self.navigationInfoView.state = MWMNavigationInfoViewStateHidden;
+  self.navigationInfoView = nil;
+  _navigationControlView.isVisible = NO;
+  _navigationControlView = nil;
+  [self.baseRoutePreviewStatus hide];
+  [_transportRoutePreviewStatus hide];
+  _transportRoutePreviewStatus = nil;
+}
+
+- (void)statePrepare {
+  self.navigationInfoView.state = MWMNavigationInfoViewStatePrepare;
+  [self.routePreview addToView:self.ownerView];
+  [self.routePreview statePrepare];
+  [self.routePreview selectRouter:[MWMRouter type]];
+  [self updateGoButtonTitle];
+  [self.baseRoutePreviewStatus hide];
+  [_transportRoutePreviewStatus hide];
+  for (MWMRouteStartButton *button in self.goButtons)
+    [button statePrepare];
+}
+
+- (void)statePlanning {
+//  [self statePrepare];
+  [self.routePreview router:[MWMRouter type] setState:MWMCircularProgressStateSpinner];
+}
+
+- (void)stateError:(NSString *_Nonnull)errorMessage {
+  [self.routePreview router:[MWMRouter type] setState:MWMCircularProgressStateFailed];
+  [self updateGoButtonTitle];
+  [self.baseRoutePreviewStatus showErrorWithMessage:errorMessage];
+  for (MWMRouteStartButton *button in self.goButtons)
+    [button stateError];
+}
+
+- (void)stateReady {
+  [self updateGoButtonTitle];
+  bool const isTransport = ([MWMRouter type] == MWMRouterTypePublicTransport);
+  bool const isRuler = ([MWMRouter type] == MWMRouterTypeRuler);
+  if (isTransport || isRuler)
+    [self.transportRoutePreviewStatus showReady];
+  else
+    [self.baseRoutePreviewStatus showReady];
+  self.goButtonsContainer.hidden = isTransport || isRuler;
+  for (MWMRouteStartButton *button in self.goButtons)
+  {
+    if (isRuler)
+      [button stateHidden];
+    else
+      [button stateReady];
+  }
+}
+
+- (void)onRouteStart {
+}
+
+- (void)onRouteStop {
+}
+
+- (void)stateNavigation {
+  self.routePreview = nil;
+  self.navigationInfoView.state = MWMNavigationInfoViewStateNavigation;
+  self.navigationControlView.isVisible = YES;
+  [self.baseRoutePreviewStatus hide];
+  [_transportRoutePreviewStatus hide];
+  _transportRoutePreviewStatus = nil;
+}
+
+#pragma mark - MWMRoutePreviewStatus
+
+- (IBAction)showRouteManager {
+  MWMRouteManagerViewModel * routeManagerViewModel = [[MWMRouteManagerViewModel alloc] init];
+  MWMRouteManagerViewController * routeManager = [[MWMRouteManagerViewController alloc] initWithViewModel:routeManagerViewModel];
+  routeManager.modalPresentationStyle = UIModalPresentationCustom;
+
+  self.routeManagerTransitioningManager = [[MWMRouteManagerTransitioningManager alloc] init];
+  routeManager.transitioningDelegate = self.routeManagerTransitioningManager;
+
+  [[MapViewController sharedController] presentViewController:routeManager animated:YES completion:nil];
+}
+
+#pragma mark - Properties
+
+@synthesize routePreview = _routePreview;
+- (MWMRoutePreview *)routePreview {
+  if (!_routePreview)
+    [self loadPreview];
+  return _routePreview;
+}
+
+- (void)setRoutePreview:(MWMRoutePreview *)routePreview {
+  if (routePreview == _routePreview)
+    return;
+  [_routePreview remove];
+  _routePreview = routePreview;
+  _routePreview.delegate = self.delegate;
+}
+
+- (MWMBaseRoutePreviewStatus *)baseRoutePreviewStatus {
+  if (!_baseRoutePreviewStatus)
+    [self loadPreview];
+  return _baseRoutePreviewStatus;
+}
+
+- (MWMTransportRoutePreviewStatus *)transportRoutePreviewStatus {
+  if (!_transportRoutePreviewStatus)
+    [self loadPreview];
+  return _transportRoutePreviewStatus;
+}
+
+- (MWMNavigationInfoView *)navigationInfoView {
+  if (!_navigationInfoView) {
+    [NSBundle.mainBundle loadNibNamed:kNavigationInfoViewXibName owner:self options:nil];
+    _navigationInfoView.state = MWMNavigationInfoViewStateHidden;
+    _navigationInfoView.ownerView = self.ownerView;
+  }
+  return _navigationInfoView;
+}
+
+- (MWMNavigationControlView *)navigationControlView {
+  if (!_navigationControlView) {
+    [NSBundle.mainBundle loadNibNamed:kNavigationControlViewXibName owner:self options:nil];
+    _navigationControlView.ownerView = self.ownerView;
+  }
+  return _navigationControlView;
+}
+
+#pragma mark - Button tap Actions
+
+- (IBAction)ttsButtonAction {
+  [self.delegate ttsButtonDidTap];
+}
+
+- (IBAction)settingsButtonAction {
+  [self.delegate settingsButtonDidTap];
+}
+
+- (IBAction)stopRoutingButtonAction {
+  [self.delegate stopRoutingButtonDidTap];
+}
+
+- (IBAction)routingStartTouchUpInside {
+  [self.delegate routingStartButtonDidTap];
+}
+
+#pragma mark - SearchOnMapManagerObserver
+
+- (void)searchManagerWithDidChangeState:(SearchOnMapState)state {
+  switch (state) {
+    case SearchOnMapStateClosed:
+      [self.navigationInfoView setSearchState:NavigationSearchState::MinimizedNormal animated:YES];
+      break;
+    case SearchOnMapStateHidden:
+    case SearchOnMapStateSearching:
+      [self.navigationInfoView setMapSearch];
+  }
+}
+
+#pragma mark - Available area
+
+- (void)updateNavigationInfoAvailableArea:(CGRect)frame {
+  _navigationInfoView.availableArea = frame;
+}
+
+@end

iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RoutePreviewStatus/TransportTransitSteps/TransportRuler.swift

@@ -1,6 +1,5 @@
 final class TransportRuler: TransportTransitCell {
   enum Config {
-    static let backgroundCornerRadius: CGFloat = 4
     static var backgroundColor: UIColor { return UIColor.blackOpaque() }
     static var imageColor: UIColor { return UIColor.blackSecondaryText() }
     static var labelTextColor: UIColor { return .black }
@@ -10,7 +9,7 @@ final class TransportRuler: TransportTransitCell {
 
   @IBOutlet private weak var background: UIView! {
     didSet {
-      background.layer.setCorner(radius: Config.backgroundCornerRadius)
+      background.layer.setCornerRadius(.buttonSmall)
       background.backgroundColor = Config.backgroundColor
     }
   }

iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RoutePreviewStatus/TransportTransitSteps/TransportTransitPedestrian.swift

@@ -1,20 +1,19 @@
 final class TransportTransitPedestrian: TransportTransitCell {
   enum Config {
-    static let backgroundCornerRadius: CGFloat = 4
     static var backgroundColor: UIColor { return UIColor.blackOpaque() }
     static var imageColor: UIColor { return UIColor.blackSecondaryText() }
   }
 
   @IBOutlet private weak var background: UIView! {
     didSet {
-      background.layer.setCorner(radius: Config.backgroundCornerRadius)
+      background.layer.setCornerRadius(.buttonSmall)
       background.backgroundColor = Config.backgroundColor
     }
   }
 
   @IBOutlet private weak var image: UIImageView! {
     didSet {
-      image.image = #imageLiteral(resourceName: "ic_walk")
+      image.image = UIImage(resource: .icWalk)
       image.tintColor = Config.imageColor
       image.contentMode = .scaleAspectFit
     }

iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RoutePreviewStatus/TransportTransitSteps/TransportTransitTrain.swift

@@ -1,6 +1,5 @@
 final class TransportTransitTrain: TransportTransitCell {
   enum Config {
-    static let backgroundCornerRadius: CGFloat = 4
     static var labelTextColor: UIColor { return .white }
     static let labelTextFont = UIFont.bold12()
     static let labelTrailing: CGFloat = 4
@@ -8,7 +7,7 @@ final class TransportTransitTrain: TransportTransitCell {
 
   @IBOutlet private weak var background: UIView! {
     didSet {
-      background.layer.setCorner(radius: Config.backgroundCornerRadius)
+      background.layer.setCornerRadius(.buttonSmall)
     }
   }
 

iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RoutePreviewView.h

@@ -0,0 +1,39 @@
+#import "MWMCircularProgressState.h"
+#import "MWMRouterType.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+typedef NS_ENUM(NSInteger, MWMDrivingOptionsState) {
+  MWMDrivingOptionsStateNone,
+  MWMDrivingOptionsStateDefine,
+  MWMDrivingOptionsStateChange
+};
+
+@protocol MWMRoutePreviewDelegate;
+
+@protocol RoutePreviewView <NSObject>
+
+@property(nonatomic) MWMDrivingOptionsState drivingOptionsState;
+@property(weak, nonatomic) id<MWMRoutePreviewDelegate> delegate;
+
+- (void)addToView:(UIView *)superview;
+- (void)remove;
+
+- (void)statePrepare;
+- (void)selectRouter:(MWMRouterType)routerType;
+- (void)router:(MWMRouterType)routerType setState:(MWMCircularProgressState)state;
+- (void)router:(MWMRouterType)routerType setProgress:(CGFloat)progress;
+
+@end
+
+@protocol MWMRoutePreviewDelegate <NSObject>
+
+- (void)routePreviewDidPressDrivingOptions:(id<RoutePreviewView>)routePreview;
+- (void)ttsButtonDidTap;
+- (void)settingsButtonDidTap;
+- (void)stopRoutingButtonDidTap;
+- (void)routingStartButtonDidTap;
+
+@end
+
+NS_ASSUME_NONNULL_END

iphone/Maps/Classes/MapViewController.h

@@ -7,6 +7,11 @@
 @class MWMMapDownloadDialog;
 @class BookmarksCoordinator;
 @class SearchOnMapManager;
+@class SideButtonsArea;
+@class WidgetsArea;
+@class TrafficButtonArea;
+@class PlacePageArea;
+
 @protocol MWMLocationModeListener;
 
 @interface MapViewController : MWMViewController
@@ -52,5 +57,11 @@
 @property(nonatomic) MWMMyPositionMode currentPositionMode;
 @property(strong, nonatomic) IBOutlet EAGLView * _Nonnull mapView;
 @property(strong, nonatomic) IBOutlet UIView * _Nonnull controlsView;
+@property(nonatomic) UIView * _Nonnull searchContainer;
+
+@property (weak, nonatomic) IBOutlet SideButtonsArea * sideButtonsArea;
+@property (weak, nonatomic) IBOutlet WidgetsArea * widgetsArea;
+@property (weak, nonatomic) IBOutlet TrafficButtonArea * trafficButtonArea;
+@property (weak, nonatomic) IBOutlet PlacePageArea * placePageArea;
 
 @end

iphone/Maps/Classes/MapViewController.mm

@@ -148,34 +148,48 @@ 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;
+  NSLayoutConstraint * topConstraint = [self.placePageContainer.topAnchor constraintEqualToAnchor:self.view.safeAreaLayoutGuide.topAnchor];
-  if (IPAD) {
+
-    self.placePageLeadingConstraint.priority = UILayoutPriorityDefaultLow;
+  NSLayoutConstraint * bottomConstraint;
-    [self.placePageContainer.bottomAnchor constraintLessThanOrEqualToAnchor:self.view.bottomAnchor].active = YES;
+  if (IPAD)
-  }
+    bottomConstraint = [self.placePageContainer.bottomAnchor constraintLessThanOrEqualToAnchor:self.view.bottomAnchor];
-  else {
+  else
-    [self.placePageContainer.bottomAnchor constraintEqualToAnchor:self.view.bottomAnchor].active = YES;
+    bottomConstraint = [self.placePageContainer.bottomAnchor constraintEqualToAnchor:self.view.bottomAnchor];
-  }
+
+  [NSLayoutConstraint activateConstraints:@[
+    self.placePageLeadingConstraint,
+    topConstraint,
+    bottomConstraint,
+  ]];
 
   [self updatePlacePageContainerConstraints];
 }
 
+- (void)setupSearchContainer {
+  if (self.searchContainer != nil)
+    return;
+  self.searchContainer = [[TouchTransparentView alloc] initWithFrame:self.view.bounds];
+  [self.view addSubview:self.searchContainer];
+  [self.view bringSubviewToFront:self.searchContainer];
+  self.searchContainer.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
+}
+
 - (void)updatePlacePageContainerConstraints {
   const BOOL isLimitedWidth = IPAD || self.traitCollection.verticalSizeClass == UIUserInterfaceSizeClassCompact;
-  [self.placePageWidthConstraint setConstant:kPlacePageCompactWidth];
 
-  if (IPAD && self.searchViewContainer != nil) {
+  if (IPAD && self.searchViewAvailableArea != nil) {
-    NSLayoutConstraint * leadingToSearchConstraint = [self.placePageContainer.leadingAnchor constraintEqualToAnchor:self.searchViewContainer.trailingAnchor constant:kPlacePageLeadingOffset];
+    NSLayoutConstraint * leadingToSearchConstraint = [self.placePageContainer.leadingAnchor constraintEqualToAnchor:self.searchViewAvailableArea.trailingAnchor constant:kPlacePageLeadingOffset];
     leadingToSearchConstraint.priority = UILayoutPriorityDefaultHigh;
     leadingToSearchConstraint.active = isLimitedWidth;
   }
@@ -259,9 +273,6 @@ NSString *const kSettingsSegue = @"Map2Settings";
     return;
   }
 
-  if (self.searchManager.isSearching && type == df::TouchEvent::TOUCH_MOVE)
-    [self.searchManager setMapIsDragging];
-
   NSArray *allTouches = [[event allTouches] allObjects];
   if ([allTouches count] < 1)
     return;
@@ -273,6 +284,10 @@ NSString *const kSettingsSegue = @"Map2Settings";
   UITouch *touch = [allTouches objectAtIndex:0];
   CGPoint const pt = [touch locationInView:v];
 
+  // Check if the tap is inside searchView)
+  if (self.searchManager.isSearching && type == df::TouchEvent::TOUCH_MOVE && !CGRectContainsPoint(self.searchViewAvailableArea.frame, pt))
+    [self.searchManager setMapIsDragging];
+
   e.SetTouchType(type);
 
   df::Touch t0;
@@ -372,6 +387,7 @@ NSString *const kSettingsSegue = @"Map2Settings";
 - (void)viewDidLoad {
   [super viewDidLoad];
   [self setupPlacePageContainer];
+  [self setupSearchContainer];
 
   if (@available(iOS 14.0, *))
     [self setupTrackPadGestureRecognizers];
@@ -726,12 +742,12 @@ NSString *const kSettingsSegue = @"Map2Settings";
 
 - (SearchOnMapManager *)searchManager {
   if (!_searchManager)
-    _searchManager = [[SearchOnMapManager alloc] initWithNavigationController:self.navigationController];
+    _searchManager = [[SearchOnMapManager alloc] init];
   return _searchManager;
 }
 
-- (UIView * _Nullable)searchViewContainer {
+- (UIView * _Nullable)searchViewAvailableArea {
-  return self.searchManager.viewController.view;
+  return self.searchManager.viewController.availableAreaView;
 }
 
 - (BOOL)hasNavigationBar {

iphone/Maps/Core/Search/MWMSearch.mm

@@ -61,7 +61,7 @@ using Observers = NSHashTable<Observer>;
 - (void)searchEverywhere {
   self.lastSearchTimestamp += 1;
   NSUInteger const timestamp = self.lastSearchTimestamp;
-  
+
   search::EverywhereSearchParams params{
     m_query, m_locale, {} /* default timeout */, m_isCategory,
     // m_onResults
@@ -156,6 +156,7 @@ using Observers = NSHashTable<Observer>;
 
 + (void)showResultAtIndex:(NSUInteger)index {
   auto const & result = [MWMSearch manager]->m_everywhereResults[index];
+  GetFramework().StopLocationFollow();
   GetFramework().SelectSearchResult(result, true);
 }
 
@@ -168,8 +169,13 @@ using Observers = NSHashTable<Observer>;
 
 + (void)showEverywhereSearchResultsOnMap {
   MWMSearch * manager = [MWMSearch manager];
-  if (![MWMRouter isRoutingActive])
+  if (![MWMRouter isRoutingActive]) {
-    GetFramework().ShowSearchResults(manager->m_everywhereResults);
+    auto const & results = manager->m_everywhereResults;
+    if (results.GetCount() == 1)
+      [self showResultAtIndex:0];
+    else
+      GetFramework().ShowSearchResults(manager->m_everywhereResults);
+  }
 }
 
 + (void)showViewportSearchResultsOnMap {

iphone/Maps/Core/Theme/Core/Style.swift

@@ -4,6 +4,7 @@ class Style: ExpressibleByDictionaryLiteral {
     case borderColor
     case borderWidth
     case cornerRadius
+    case maskedCorners
     case shadowColor
     case shadowOpacity
     case shadowOffset
@@ -115,11 +116,16 @@ extension Style {
     set { params[.borderWidth] = newValue }
   }
 
-  var cornerRadius: CGFloat? {
+  var cornerRadius: CornerRadius? {
-    get { return self[.cornerRadius] as? CGFloat }
+    get { return self[.cornerRadius] as? CornerRadius }
     set { params[.cornerRadius] = newValue }
   }
 
+  var maskedCorners: CACornerMask? {
+    get { return self[.maskedCorners] as? CACornerMask }
+    set { params[.maskedCorners] = newValue }
+  }
+
   var shadowColor: UIColor? {
     get { return self[.shadowColor] as? UIColor }
     set { params[.shadowColor] = newValue }

iphone/Maps/Core/Theme/CornerRadius.swift

@@ -0,0 +1,21 @@
+enum CornerRadius {
+  case modalSheet
+  case buttonDefault
+  case buttonDefaultSmall
+  case buttonSmall
+  case grabber
+  case custom(CGFloat)
+}
+
+extension CornerRadius {
+  var value: CGFloat {
+    switch self {
+    case .modalSheet: return 12
+    case .buttonDefault: return 8
+    case .buttonDefaultSmall: return 6
+    case .buttonSmall: return 4
+    case .grabber: return 2.5
+    case .custom(let value): return value
+    }
+  }
+}

iphone/Maps/Core/Theme/GlobalStyleSheet.swift

@@ -59,6 +59,9 @@ enum GlobalStyleSheet: String, CaseIterable {
   case white = "MWMWhite"
   case datePickerView = "DatePickerView"
   case valueStepperView = "ValueStepperView"
+  case grabber
+  case modalSheetBackground
+  case modalSheetContent
 }
 
 extension GlobalStyleSheet: IStyleSheet {
@@ -176,7 +179,7 @@ extension GlobalStyleSheet: IStyleSheet {
         s.backgroundColor = colors.tabBarButtonBackground
         s.tintColor = colors.blackSecondaryText
         s.coloring = MWMButtonColoring.black
-        s.cornerRadius = 8
+        s.cornerRadius = .buttonDefault
         s.shadowColor = UIColor(0,0,0,alpha20)
         s.shadowOpacity = 1
         s.shadowOffset = CGSize(width: 0, height: 1)
@@ -184,7 +187,7 @@ extension GlobalStyleSheet: IStyleSheet {
       }
     case .trackRecordingWidgetButton:
       return .addFrom(Self.bottomTabBarButton) { s in
-        s.cornerRadius = 23
+        s.cornerRadius = .custom(23)
       }
     case .blackOpaqueBackground:
       return .add { s in
@@ -232,7 +235,7 @@ extension GlobalStyleSheet: IStyleSheet {
       }
     case .dialogView:
       return .add { s in
-        s.cornerRadius = 8
+        s.cornerRadius = .buttonDefault
         s.shadowRadius = 2
         s.shadowColor = UIColor(0,0,0,alpha26)
         s.shadowOpacity = 1
@@ -242,7 +245,7 @@ extension GlobalStyleSheet: IStyleSheet {
       }
     case .alertView:
       return .add { s in
-        s.cornerRadius = 12
+        s.cornerRadius = .modalSheet
         s.shadowRadius = 6
         s.shadowColor = UIColor(0,0,0,alpha20)
         s.shadowOpacity = 1
@@ -273,7 +276,7 @@ extension GlobalStyleSheet: IStyleSheet {
     case .flatNormalButton:
       return .add { s in
         s.font = fonts.medium14
-        s.cornerRadius = 8
+        s.cornerRadius = .buttonDefault
         s.clip = true
         s.fontColor = colors.whitePrimaryText
         s.backgroundColor = colors.linkBlue
@@ -288,7 +291,7 @@ extension GlobalStyleSheet: IStyleSheet {
     case .flatNormalTransButton:
       return .add { s in
         s.font = fonts.medium14
-        s.cornerRadius = 8
+        s.cornerRadius = .buttonDefault
         s.clip = true
         s.fontColor = colors.linkBlue
         s.backgroundColor = colors.clear
@@ -330,7 +333,7 @@ extension GlobalStyleSheet: IStyleSheet {
     case .flatRedButton:
       return .add { s in
         s.font = fonts.medium14
-        s.cornerRadius = 8
+        s.cornerRadius = .buttonDefault
         s.fontColor = colors.whitePrimaryText
         s.backgroundColor = colors.buttonRed
         s.fontColorHighlighted = colors.buttonRedHighlighted
@@ -346,7 +349,7 @@ extension GlobalStyleSheet: IStyleSheet {
       return .add { s in
         s.font = fonts.regular14
         s.fontColor = colors.linkBlue
-        s.cornerRadius = 8
+        s.cornerRadius = .buttonDefault
         s.borderColor = colors.linkBlue
         s.borderWidth = 1
         s.fontColorHighlighted = colors.linkBlueHighlighted
@@ -358,7 +361,7 @@ extension GlobalStyleSheet: IStyleSheet {
         s.fontColor = colors.linkBlue
         s.fontColorHighlighted = colors.white
         s.borderColor = colors.linkBlue
-        s.cornerRadius = 8
+        s.cornerRadius = .buttonDefault
         s.borderWidth = 1
         s.backgroundColor = colors.clear
         s.backgroundColorHighlighted = colors.linkBlue
@@ -429,6 +432,26 @@ extension GlobalStyleSheet: IStyleSheet {
         s.fontColor = colors.blackPrimaryText
         s.coloring = MWMButtonColoring.blue
       }
+    case .grabber:
+      return .addFrom(Self.background) { s in
+        s.cornerRadius = .grabber
+      }
+    case .modalSheetBackground:
+      return .add { s in
+        s.backgroundColor = colors.white
+        s.shadowColor = UIColor.black
+        s.shadowOffset = CGSize(width: 0, height: 1)
+        s.shadowOpacity = 0.3
+        s.shadowRadius = 6
+        s.cornerRadius = .modalSheet
+        s.clip = false
+        s.maskedCorners = isIPad ? [] : [.layerMinXMinYCorner, .layerMaxXMinYCorner]
+      }
+    case .modalSheetContent:
+      return .addFrom(Self.modalSheetBackground) { s in
+        s.backgroundColor = colors.clear
+        s.clip = true
+      }
     }
   }
 }

iphone/Maps/Core/Theme/MapStyleSheet.swift

@@ -28,7 +28,7 @@ extension MapStyleSheet: IStyleSheet {
         s.backgroundColor = colors.clear
         s.borderColor = colors.clear
         s.borderWidth = 0
-        s.cornerRadius = 6
+        s.cornerRadius = .buttonDefaultSmall
       }
     case .mapMenuButtonEnabled:
       return .add { s in
@@ -37,7 +37,7 @@ extension MapStyleSheet: IStyleSheet {
         s.backgroundColor = colors.linkBlue
         s.borderColor = colors.linkBlue
         s.borderWidth = 2
-        s.cornerRadius = 6
+        s.cornerRadius = .buttonDefaultSmall
       }
     case .mapStreetNameBackgroundView:
       return .add { s in
@@ -90,7 +90,7 @@ extension MapStyleSheet: IStyleSheet {
     case .mapFirstTurnView:
       return .add { s in
         s.backgroundColor = colors.linkBlue
-        s.cornerRadius = 4
+        s.cornerRadius = .buttonSmall
         s.shadowRadius = 2
         s.shadowColor = colors.blackHintText
         s.shadowOpacity = 1
@@ -104,7 +104,7 @@ extension MapStyleSheet: IStyleSheet {
       return .add { s in
         s.shadowOffset = CGSize(width: 0, height: 3)
         s.shadowRadius = 6
-        s.cornerRadius = 4
+        s.cornerRadius = .buttonSmall
         s.shadowOpacity = 1
         s.backgroundColor = colors.white
       }

iphone/Maps/Core/Theme/PlacePageStyleSheet.swift

@@ -30,7 +30,7 @@ extension PlacePageStyleSheet: IStyleSheet {
     case .ppTitlePopularView:
       return .add { s in
         s.backgroundColor = colors.linkBlueHighlighted
-        s.cornerRadius = 10
+        s.cornerRadius = .custom(10)
       }
     case .ppActionBarTitle:
       return .add { s in
@@ -45,7 +45,7 @@ extension PlacePageStyleSheet: IStyleSheet {
     case .ppElevationProfileDescriptionCell:
       return .add { s in
         s.backgroundColor = colors.blackOpaque
-        s.cornerRadius = 6
+        s.cornerRadius = .buttonDefault
       }
     case .ppElevationProfileExtendedDifficulty:
       return .add { s in
@@ -110,7 +110,7 @@ extension PlacePageStyleSheet: IStyleSheet {
     case .ppHeaderView:
       return .add { s in
         s.backgroundColor = colors.white
-        s.cornerRadius = 10
+        s.cornerRadius = .modalSheet
         s.clip = true
       }
     case .ppNavigationShadowView:
@@ -123,19 +123,15 @@ extension PlacePageStyleSheet: IStyleSheet {
         s.clip = false
       }
     case .ppBackgroundView:
-      return .add { s in
+      return .addFrom(GlobalStyleSheet.modalSheetBackground) { s in
         s.backgroundColor = colors.pressBackground
-        s.cornerRadius = 10
+        s.maskedCorners = isIPad ? CACornerMask.all : [.layerMinXMinYCorner, .layerMaxXMinYCorner]
-        s.shadowColor = UIColor.black
-        s.shadowOffset = CGSize(width: 0, height: 1)
-        s.shadowOpacity = 0.6
-        s.shadowRadius = 2
         s.clip = false
       }
     case .ppView:
       return .add { s in
         s.backgroundColor = colors.clear
-        s.cornerRadius = 10
+        s.cornerRadius = .modalSheet
         s.clip = true
       }
     case .ppHeaderCircleIcon:

iphone/Maps/Core/Theme/Renderers/UISearchBarRenderer.swift

@@ -31,7 +31,7 @@ class UISearchBarRenderer: UIViewRenderer {
       } else {
         control.setSearchFieldBackgroundImage(UIImage(), for: .normal)
       }
-      searchTextField.layer.setCorner(radius: 8)
+      searchTextField.layer.setCornerRadius(.buttonDefault)
       searchTextField.layer.masksToBounds = true
       // Placeholder color
       if let placeholder = searchTextField.placeholder {

iphone/Maps/Core/Theme/Renderers/UITextFieldRenderer.swift

@@ -20,7 +20,7 @@ extension UITextField {
 class UITextFieldRenderer {
   class func render(_ control: UITextField, style: Style) {
     if let cornerRadius = style.cornerRadius {
-      control.layer.setCorner(radius: cornerRadius)
+      control.layer.setCornerRadius(cornerRadius)
       control.clipsToBounds = true
     }
     control.borderStyle = .none

iphone/Maps/Core/Theme/Renderers/UIViewRenderer.swift

@@ -46,7 +46,10 @@ class UIViewRenderer {
       control.layer.borderWidth = borderWidth
     }
     if let cornerRadius = style.cornerRadius {
-      control.layer.cornerRadius = cornerRadius
+      control.layer.cornerRadius = cornerRadius.value
+    }
+    if let maskedCorners = style.maskedCorners {
+      control.layer.maskedCorners = maskedCorners
     }
     if let clip = style.clip {
       control.clipsToBounds = clip

iphone/Maps/Core/Theme/SearchStyleSheet.swift

@@ -1,107 +1,27 @@
 enum SearchStyleSheet: String, CaseIterable {
-  case searchHeader
+  case searchCancelButton
-  case searchInstallButton = "SearchInstallButton"
-  case searchBanner = "SearchBanner"
-  case searchClosedBackground = "SearchClosedBackground"
   case searchPopularView = "SearchPopularView"
   case searchSideAvailableMarker = "SearchSideAvaliableMarker"
-  case searchBarView = "SearchBarView"
-  case searchActionBarView = "SearchActionBarView"
-  case searchActionBarButton = "SearchActionBarButton"
-  case searchSearchTextField = "SearchSearchTextField"
-  case searchSearchTextFieldIcon = "SearchSearchTextFieldIcon"
-  case searchDatePickerField = "SearchDatePickerField"
-  case searchCellAvailable = "SearchCellAvaliable"
 }
 
 extension SearchStyleSheet: IStyleSheet {
   func styleResolverFor(colors: IColors, fonts: IFonts) -> Theme.StyleResolver {
     switch self {
-    case .searchHeader:
-      return .add { s in
-        s.backgroundColor = colors.primary
-        iPhoneSpecific {
-          s.shadowColor = UIColor.black
-          s.shadowOffset = CGSize(width: 0, height: 1)
-          s.shadowOpacity = 0.5
-          s.shadowRadius = 3
-          s.cornerRadius = 10
-        }
-      }
-    case .searchInstallButton:
-      return .add { s in
-        s.cornerRadius = 10
-        s.clip = true
-        s.font = fonts.medium12
-        s.fontColor = colors.blackSecondaryText
-        s.backgroundColor = colors.searchPromoBackground
-      }
-    case .searchBanner:
-      return .add { s in
-        s.backgroundColor = colors.searchPromoBackground
-      }
-    case .searchClosedBackground:
-      return .add { s in
-        s.cornerRadius = 4
-        s.backgroundColor = colors.blackHintText
-      }
     case .searchPopularView:
       return .add { s in
-        s.cornerRadius = 10
+        s.cornerRadius = .custom(10)
         s.backgroundColor = colors.linkBlueHighlighted
       }
     case .searchSideAvailableMarker:
       return .add { s in
         s.backgroundColor = colors.ratingGreen
       }
-    case .searchBarView:
+    case .searchCancelButton:
       return .add { s in
-        s.backgroundColor = colors.primary
-        s.shadowRadius = 2
-        s.shadowColor = UIColor(0, 0, 0, alpha26)
-        s.shadowOpacity = 1
-        s.shadowOffset = CGSize.zero
-      }
-    case .searchActionBarView:
-      return .add { s in
-        s.backgroundColor = colors.linkBlue
-        s.cornerRadius = 20
-        s.shadowRadius = 1
-        s.shadowColor = UIColor(0, 0, 0, 0.24)
-        s.shadowOffset = CGSize(width: 0, height: 2)
-        s.shadowOpacity = 1
-      }
-    case .searchActionBarButton:
-      return .add { s in
-        s.backgroundColor = colors.clear
         s.fontColor = colors.whitePrimaryText
-        s.font = fonts.semibold14
+        s.fontColorHighlighted = colors.whitePrimaryTextHighlighted
-        s.coloring = .whiteText
+        s.font = fonts.regular17
-      }
+        s.backgroundColor = .clear
-    case .searchSearchTextField:
-      return .add { s in
-        s.fontColor = colors.blackPrimaryText
-        s.backgroundColor = colors.white
-        s.tintColor = colors.blackSecondaryText
-        s.cornerRadius = 8.0
-        s.barTintColor = colors.primary
-      }
-    case .searchSearchTextFieldIcon:
-      return .add { s in
-        s.tintColor = colors.blackSecondaryText
-        s.coloring = MWMButtonColoring.black
-        s.color = colors.blackSecondaryText
-      }
-    case .searchDatePickerField:
-      return .add { s in
-        s.backgroundColor = colors.white
-        s.cornerRadius = 4
-        s.borderColor = colors.solidDividers
-        s.borderWidth = 1
-      }
-    case .searchCellAvailable:
-      return .addFrom(GlobalStyleSheet.tableCell) { s in
-        s.backgroundColor = colors.transparentGreen
       }
     }
   }

iphone/Maps/Maps.xcodeproj/project.pbxproj

@@ -491,20 +491,17 @@
 		ED4DC7782CAEDECC0029B338 /* ProductButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED4DC7732CAEDECC0029B338 /* ProductButton.swift */; };
 		ED4DC7792CAEDECC0029B338 /* ProductsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED4DC7742CAEDECC0029B338 /* ProductsViewController.swift */; };
 		ED5BAF4B2D688F5B0088D7B1 /* SearchOnMapHeaderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED5BAF4A2D688F5A0088D7B1 /* SearchOnMapHeaderView.swift */; };
+		ED5E02142D8B17B600A5CC7B /* ModalPresentationStepsController.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED5E02132D8B17B600A5CC7B /* ModalPresentationStepsController.swift */; };
+		ED5E02522D92E33300A5CC7B /* NavigationDashboardView.mm in Sources */ = {isa = PBXBuildFile; fileRef = ED5E02512D92E33300A5CC7B /* NavigationDashboardView.mm */; };
 		ED63CEB92BDF8F9D006155C4 /* SettingsTableViewiCloudSwitchCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED63CEB62BDF8F9C006155C4 /* SettingsTableViewiCloudSwitchCell.swift */; };
 		ED70D55C2D5396F300738C1E /* SearchResult.mm in Sources */ = {isa = PBXBuildFile; fileRef = ED70D55A2D5396F300738C1E /* SearchResult.mm */; };
 		ED70D5892D539A2500738C1E /* SearchOnMapViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED70D5872D539A2500738C1E /* SearchOnMapViewController.swift */; };
 		ED70D58A2D539A2500738C1E /* SearchOnMapModels.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED70D5852D539A2500738C1E /* SearchOnMapModels.swift */; };
-		ED70D58B2D539A2500738C1E /* SearchOnMapModalTransitionManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED70D57E2D539A2500738C1E /* SearchOnMapModalTransitionManager.swift */; };
 		ED70D58C2D539A2500738C1E /* SearchOnMapPresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED70D5862D539A2500738C1E /* SearchOnMapPresenter.swift */; };
-		ED70D58D2D539A2500738C1E /* ModalScreenPresentationStep.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED70D57C2D539A2500738C1E /* ModalScreenPresentationStep.swift */; };
+		ED70D58D2D539A2500738C1E /* ModalPresentationStep.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED70D57C2D539A2500738C1E /* ModalPresentationStep.swift */; };
-		ED70D58E2D539A2500738C1E /* SideMenuPresentationAnimator.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED70D5802D539A2500738C1E /* SideMenuPresentationAnimator.swift */; };
 		ED70D58F2D539A2500738C1E /* SearchOnMapInteractor.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED70D5832D539A2500738C1E /* SearchOnMapInteractor.swift */; };
-		ED70D5902D539A2500738C1E /* SearchOnMapModalPresentationController.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED70D57D2D539A2500738C1E /* SearchOnMapModalPresentationController.swift */; };
-		ED70D5912D539A2500738C1E /* MapPassthroughView.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED70D57B2D539A2500738C1E /* MapPassthroughView.swift */; };
 		ED70D5922D539A2500738C1E /* PlaceholderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED70D5822D539A2500738C1E /* PlaceholderView.swift */; };
 		ED70D5932D539A2500738C1E /* SearchOnMapManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED70D5842D539A2500738C1E /* SearchOnMapManager.swift */; };
-		ED70D5942D539A2500738C1E /* SideMenuDismissalAnimator.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED70D57F2D539A2500738C1E /* SideMenuDismissalAnimator.swift */; };
 		ED77556E2C2C490B0051E656 /* UIAlertController+openInAppActionSheet.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED77556D2C2C490B0051E656 /* UIAlertController+openInAppActionSheet.swift */; };
 		ED79A5AB2BD7AA9C00952D1F /* LoadingOverlayViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED79A5AA2BD7AA9C00952D1F /* LoadingOverlayViewController.swift */; };
 		ED79A5AD2BD7BA0F00952D1F /* UIApplication+LoadingOverlay.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED79A5AC2BD7BA0F00952D1F /* UIApplication+LoadingOverlay.swift */; };
@@ -526,6 +523,9 @@
 		ED9857082C4ED02D00694F6C /* MailComposer.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED9857072C4ED02D00694F6C /* MailComposer.swift */; };
 		ED9966802B94FBC20083CE55 /* ColorPicker.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED99667D2B94FBC20083CE55 /* ColorPicker.swift */; };
 		EDA1EAA42CC7ECAD00DBDCAA /* ElevationProfileFormatter.swift in Sources */ = {isa = PBXBuildFile; fileRef = EDA1EAA32CC7ECAD00DBDCAA /* ElevationProfileFormatter.swift */; };
+		EDB71D8C2D8474A0004A6A7F /* CornerRadius.swift in Sources */ = {isa = PBXBuildFile; fileRef = EDB71D8B2D8474A0004A6A7F /* CornerRadius.swift */; };
+		EDB71E002D8B0338004A6A7F /* ModalPresentationAnimator.swift in Sources */ = {isa = PBXBuildFile; fileRef = EDB71DFF2D8B0338004A6A7F /* ModalPresentationAnimator.swift */; };
+		EDB71E042D8B0943004A6A7F /* SearchOnMapAreaView.swift in Sources */ = {isa = PBXBuildFile; fileRef = EDB71E032D8B0943004A6A7F /* SearchOnMapAreaView.swift */; };
 		EDBD68072B625724005DD151 /* LocationServicesDisabledAlert.xib in Resources */ = {isa = PBXBuildFile; fileRef = EDBD68062B625724005DD151 /* LocationServicesDisabledAlert.xib */; };
 		EDBD680B2B62572E005DD151 /* LocationServicesDisabledAlert.swift in Sources */ = {isa = PBXBuildFile; fileRef = EDBD680A2B62572E005DD151 /* LocationServicesDisabledAlert.swift */; };
 		EDC3573B2B7B5029001AE9CA /* CALayer+SetCorner.swift in Sources */ = {isa = PBXBuildFile; fileRef = EDC3573A2B7B5029001AE9CA /* CALayer+SetCorner.swift */; };
@@ -1390,6 +1390,10 @@
 		A630D205207CAA3A00976DEA /* zh-Hant */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = "zh-Hant"; path = "zh-Hant.lproj/Localizable.stringsdict"; sourceTree = "<group>"; };
 		A630D206207CAA5800976DEA /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = "zh-Hans"; path = "zh-Hans.lproj/Localizable.stringsdict"; sourceTree = "<group>"; };
 		AA1C7E3D269A2DD600BAADF2 /* EditTrackViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EditTrackViewController.swift; sourceTree = "<group>"; };
+		AC4209FF2D79BCEC00A64AA9 /* af */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = af; path = af.lproj/InfoPlist.strings; sourceTree = "<group>"; };
+		AC420A002D79BCED00A64AA9 /* af */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = af; path = af.lproj/Localizable.strings; sourceTree = "<group>"; };
+		AC420A012D79BCED00A64AA9 /* af */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = af; path = af.lproj/Localizable.stringsdict; sourceTree = "<group>"; };
+		AC420A022D79BCEE00A64AA9 /* af */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = af; path = af.lproj/LocalizableTypes.strings; sourceTree = "<group>"; };
 		AC420A082D79BDDA00A64AA9 /* lt */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = lt; path = lt.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		AC420A092D79BDDA00A64AA9 /* lt */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = lt; path = lt.lproj/Localizable.strings; sourceTree = "<group>"; };
 		AC420A0A2D79BDDB00A64AA9 /* lt */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = lt; path = lt.lproj/Localizable.stringsdict; sourceTree = "<group>"; };
@@ -1398,10 +1402,6 @@
 		AC420A142D79C2EC00A64AA9 /* mt */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = mt; path = mt.lproj/Localizable.strings; sourceTree = "<group>"; };
 		AC420A152D79C2EC00A64AA9 /* mt */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = mt; path = mt.lproj/Localizable.stringsdict; sourceTree = "<group>"; };
 		AC420A162D79C2ED00A64AA9 /* mt */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = mt; path = mt.lproj/LocalizableTypes.strings; sourceTree = "<group>"; };
-		AC4209FF2D79BCEC00A64AA9 /* af */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = af; path = af.lproj/InfoPlist.strings; sourceTree = "<group>"; };
-		AC420A002D79BCED00A64AA9 /* af */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = af; path = af.lproj/Localizable.strings; sourceTree = "<group>"; };
-		AC420A012D79BCED00A64AA9 /* af */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = af; path = af.lproj/Localizable.stringsdict; sourceTree = "<group>"; };
-		AC420A022D79BCEE00A64AA9 /* af */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = af; path = af.lproj/LocalizableTypes.strings; sourceTree = "<group>"; };
 		AC79C8912A65AB9500594C24 /* UIColor+hexString.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIColor+hexString.swift"; sourceTree = "<group>"; };
 		B33D21AE20DAF9F000BAD749 /* Toast.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Toast.swift; sourceTree = "<group>"; };
 		B3E3B4FC20D463B700DA8C13 /* BMCCategoriesHeader.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = BMCCategoriesHeader.xib; sourceTree = "<group>"; };
@@ -1467,17 +1467,16 @@
 		ED4DC7742CAEDECC0029B338 /* ProductsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProductsViewController.swift; sourceTree = "<group>"; };
 		ED4DC7752CAEDECC0029B338 /* ProductsViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProductsViewModel.swift; sourceTree = "<group>"; };
 		ED5BAF4A2D688F5A0088D7B1 /* SearchOnMapHeaderView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchOnMapHeaderView.swift; sourceTree = "<group>"; };
+		ED5E02132D8B17B600A5CC7B /* ModalPresentationStepsController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ModalPresentationStepsController.swift; sourceTree = "<group>"; };
+		ED5E024F2D92AC9300A5CC7B /* RoutePreviewView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RoutePreviewView.h; sourceTree = "<group>"; };
+		ED5E02502D92E33300A5CC7B /* NavigationDashboardView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NavigationDashboardView.h; sourceTree = "<group>"; };
+		ED5E02512D92E33300A5CC7B /* NavigationDashboardView.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = NavigationDashboardView.mm; sourceTree = "<group>"; };
 		ED63CEB62BDF8F9C006155C4 /* SettingsTableViewiCloudSwitchCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SettingsTableViewiCloudSwitchCell.swift; sourceTree = "<group>"; };
 		ED70D5582D5396F300738C1E /* SearchItemType.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SearchItemType.h; sourceTree = "<group>"; };
 		ED70D5592D5396F300738C1E /* SearchResult.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SearchResult.h; sourceTree = "<group>"; };
 		ED70D55A2D5396F300738C1E /* SearchResult.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = SearchResult.mm; sourceTree = "<group>"; };
 		ED70D55B2D5396F300738C1E /* SearchResult+Core.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "SearchResult+Core.h"; sourceTree = "<group>"; };
-		ED70D57B2D539A2500738C1E /* MapPassthroughView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MapPassthroughView.swift; sourceTree = "<group>"; };
+		ED70D57C2D539A2500738C1E /* ModalPresentationStep.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ModalPresentationStep.swift; sourceTree = "<group>"; };
-		ED70D57C2D539A2500738C1E /* ModalScreenPresentationStep.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ModalScreenPresentationStep.swift; sourceTree = "<group>"; };
-		ED70D57D2D539A2500738C1E /* SearchOnMapModalPresentationController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchOnMapModalPresentationController.swift; sourceTree = "<group>"; };
-		ED70D57E2D539A2500738C1E /* SearchOnMapModalTransitionManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchOnMapModalTransitionManager.swift; sourceTree = "<group>"; };
-		ED70D57F2D539A2500738C1E /* SideMenuDismissalAnimator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SideMenuDismissalAnimator.swift; sourceTree = "<group>"; };
-		ED70D5802D539A2500738C1E /* SideMenuPresentationAnimator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SideMenuPresentationAnimator.swift; sourceTree = "<group>"; };
 		ED70D5822D539A2500738C1E /* PlaceholderView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PlaceholderView.swift; sourceTree = "<group>"; };
 		ED70D5832D539A2500738C1E /* SearchOnMapInteractor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchOnMapInteractor.swift; sourceTree = "<group>"; };
 		ED70D5842D539A2500738C1E /* SearchOnMapManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchOnMapManager.swift; sourceTree = "<group>"; };
@@ -1548,6 +1547,9 @@
 		ED9857072C4ED02D00694F6C /* MailComposer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MailComposer.swift; sourceTree = "<group>"; };
 		ED99667D2B94FBC20083CE55 /* ColorPicker.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ColorPicker.swift; sourceTree = "<group>"; };
 		EDA1EAA32CC7ECAD00DBDCAA /* ElevationProfileFormatter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ElevationProfileFormatter.swift; sourceTree = "<group>"; };
+		EDB71D8B2D8474A0004A6A7F /* CornerRadius.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CornerRadius.swift; sourceTree = "<group>"; };
+		EDB71DFF2D8B0338004A6A7F /* ModalPresentationAnimator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ModalPresentationAnimator.swift; sourceTree = "<group>"; };
+		EDB71E032D8B0943004A6A7F /* SearchOnMapAreaView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchOnMapAreaView.swift; sourceTree = "<group>"; };
 		EDBD68062B625724005DD151 /* LocationServicesDisabledAlert.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = LocationServicesDisabledAlert.xib; sourceTree = "<group>"; };
 		EDBD680A2B62572E005DD151 /* LocationServicesDisabledAlert.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocationServicesDisabledAlert.swift; sourceTree = "<group>"; };
 		EDC3573A2B7B5029001AE9CA /* CALayer+SetCorner.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "CALayer+SetCorner.swift"; sourceTree = "<group>"; };
@@ -2552,9 +2554,12 @@
 				34AB65FE1FC5AA320078E451 /* MWMiPhoneRoutePreview.xib */,
 				34AB65FF1FC5AA320078E451 /* MWMRoutePreview.h */,
 				34AB65FD1FC5AA320078E451 /* MWMRoutePreview.mm */,
+				ED5E024F2D92AC9300A5CC7B /* RoutePreviewView.h */,
 				34AB65D71FC5AA320078E451 /* RouteManager */,
 				34AB65EC1FC5AA320078E451 /* RoutePreviewStatus */,
 				34AB65D51FC5AA320078E451 /* RouteStartButton.swift */,
+				ED5E02502D92E33300A5CC7B /* NavigationDashboardView.h */,
+				ED5E02512D92E33300A5CC7B /* NavigationDashboardView.mm */,
 			);
 			path = RoutePreview;
 			sourceTree = "<group>";
@@ -3008,6 +3013,7 @@
 				993DF0CE23F6BDB000AC231A /* MainTheme.swift */,
 				ED914AB72D351DF000973C45 /* StyleApplicable.swift */,
 				EDCA7CDE2D317DF9003366CE /* StyleSheet.swift */,
+				EDB71D8B2D8474A0004A6A7F /* CornerRadius.swift */,
 				993DF10123F6BDB100AC231A /* GlobalStyleSheet.swift */,
 				99A906F223FA95AB0005872B /* PlacePageStyleSheet.swift */,
 				99F8B4C523B644A6009FF0B4 /* MapStyleSheet.swift */,
@@ -3291,12 +3297,9 @@
 		ED70D5812D539A2500738C1E /* Presentation */ = {
 			isa = PBXGroup;
 			children = (
-				ED70D57B2D539A2500738C1E /* MapPassthroughView.swift */,
+				ED5E02132D8B17B600A5CC7B /* ModalPresentationStepsController.swift */,
-				ED70D57C2D539A2500738C1E /* ModalScreenPresentationStep.swift */,
+				EDB71DFF2D8B0338004A6A7F /* ModalPresentationAnimator.swift */,
-				ED70D57D2D539A2500738C1E /* SearchOnMapModalPresentationController.swift */,
+				ED70D57C2D539A2500738C1E /* ModalPresentationStep.swift */,
-				ED70D57E2D539A2500738C1E /* SearchOnMapModalTransitionManager.swift */,
-				ED70D57F2D539A2500738C1E /* SideMenuDismissalAnimator.swift */,
-				ED70D5802D539A2500738C1E /* SideMenuPresentationAnimator.swift */,
 			);
 			path = Presentation;
 			sourceTree = "<group>";
@@ -3312,6 +3315,7 @@
 				ED70D5862D539A2500738C1E /* SearchOnMapPresenter.swift */,
 				ED70D5872D539A2500738C1E /* SearchOnMapViewController.swift */,
 				ED5BAF4A2D688F5A0088D7B1 /* SearchOnMapHeaderView.swift */,
+				EDB71E032D8B0943004A6A7F /* SearchOnMapAreaView.swift */,
 			);
 			path = SearchOnMap;
 			sourceTree = "<group>";
@@ -4585,6 +4589,7 @@
 				F653CE191C71F62700A453F1 /* MWMAddPlaceNavigationBar.mm in Sources */,
 				340475621E081A4600C92850 /* MWMNetworkPolicy+UI.m in Sources */,
 				F6E2FEE51E097BA00083EBEC /* MWMSearchNoResults.m in Sources */,
+				ED5E02142D8B17B600A5CC7B /* ModalPresentationStepsController.swift in Sources */,
 				F6E2FF631E097BA00083EBEC /* MWMTTSLanguageViewController.mm in Sources */,
 				4715273524907F8200E91BBA /* BookmarkColorViewController.swift in Sources */,
 				47E3C7292111E614008B3B27 /* FadeInAnimatedTransitioning.swift in Sources */,
@@ -4634,6 +4639,7 @@
 				993DF12223F6BDB100AC231A /* UINavigationItemRenderer.swift in Sources */,
 				993DF12B23F6BDB100AC231A /* StyleManager.swift in Sources */,
 				ED43B8BD2C12063500D07BAA /* DocumentPicker.swift in Sources */,
+				ED5E02522D92E33300A5CC7B /* NavigationDashboardView.mm in Sources */,
 				470E1674252AD7F2002D201A /* BookmarksListInfoViewController.swift in Sources */,
 				47B9065521C7FA400079C85E /* NSString+MD5.m in Sources */,
 				ED5BAF4B2D688F5B0088D7B1 /* SearchOnMapHeaderView.swift in Sources */,
@@ -4664,6 +4670,7 @@
 				99AAEA74244DA5ED0039D110 /* BottomMenuPresentationController.swift in Sources */,
 				99514BB823E82B450085D3A7 /* ElevationProfilePresenter.swift in Sources */,
 				34C9BD031C6DB693000DC38D /* MWMTableViewController.m in Sources */,
+				EDB71E002D8B0338004A6A7F /* ModalPresentationAnimator.swift in Sources */,
 				F6E2FD8C1E097BA00083EBEC /* MWMNoMapsView.m in Sources */,
 				34D3B0361E389D05004100F9 /* MWMEditorSelectTableViewCell.m in Sources */,
 				990128562449A82500C72B10 /* BottomTabBarView.swift in Sources */,
@@ -4729,6 +4736,7 @@
 				34D3AFEA1E378AF1004100F9 /* UINib+Init.swift in Sources */,
 				34AB663E1FC5AA330078E451 /* RouteManagerTransitioning.swift in Sources */,
 				993DF0CB23F6BD0600AC231A /* ElevationDetailsRouter.swift in Sources */,
+				EDB71D8C2D8474A0004A6A7F /* CornerRadius.swift in Sources */,
 				47CA68FC250F99E500671019 /* BookmarksListCellStrategy.swift in Sources */,
 				34AB662F1FC5AA330078E451 /* RouteManagerPresentationController.swift in Sources */,
 				993F5508237C622700545511 /* DeepLinkRouteStrategyAdapter.mm in Sources */,
@@ -4817,16 +4825,11 @@
 				3404755C1E081A4600C92850 /* MWMLocationManager.mm in Sources */,
 				ED70D5892D539A2500738C1E /* SearchOnMapViewController.swift in Sources */,
 				ED70D58A2D539A2500738C1E /* SearchOnMapModels.swift in Sources */,
-				ED70D58B2D539A2500738C1E /* SearchOnMapModalTransitionManager.swift in Sources */,
 				ED70D58C2D539A2500738C1E /* SearchOnMapPresenter.swift in Sources */,
-				ED70D58D2D539A2500738C1E /* ModalScreenPresentationStep.swift in Sources */,
+				ED70D58D2D539A2500738C1E /* ModalPresentationStep.swift in Sources */,
-				ED70D58E2D539A2500738C1E /* SideMenuPresentationAnimator.swift in Sources */,
 				ED70D58F2D539A2500738C1E /* SearchOnMapInteractor.swift in Sources */,
-				ED70D5902D539A2500738C1E /* SearchOnMapModalPresentationController.swift in Sources */,
-				ED70D5912D539A2500738C1E /* MapPassthroughView.swift in Sources */,
 				ED70D5922D539A2500738C1E /* PlaceholderView.swift in Sources */,
 				ED70D5932D539A2500738C1E /* SearchOnMapManager.swift in Sources */,
-				ED70D5942D539A2500738C1E /* SideMenuDismissalAnimator.swift in Sources */,
 				3454D7BC1E07F045004AF2AD /* CLLocation+Mercator.mm in Sources */,
 				47E3C7272111E5A8008B3B27 /* AlertPresentationController.swift in Sources */,
 				CDCA27812243F59800167D87 /* CarPlayRouter.swift in Sources */,
@@ -4846,6 +4849,7 @@
 				34AB66381FC5AA330078E451 /* RouteManagerCell.swift in Sources */,
 				ED1263AB2B6F99F900AD99F3 /* UIView+AddSeparator.swift in Sources */,
 				CD4A1F132305872700F2A6B6 /* PromoBookingPresentationController.swift in Sources */,
+				EDB71E042D8B0943004A6A7F /* SearchOnMapAreaView.swift in Sources */,
 				3472B5D3200F501500DC6CD5 /* BackgroundFetchTaskFrameworkType.swift in Sources */,
 				47E460AD240D737D00385B45 /* OpeinigHoursLocalization.swift in Sources */,
 				99F9A0E52462CA0E00AE21E0 /* DownloadAllView.swift in Sources */,

iphone/Maps/Tests/UI/SearchOnMapTests/SearchOnMapTests.swift

@@ -12,8 +12,7 @@ final class SearchOnMapTests: XCTestCase {
   override func setUp() {
     super.setUp()
     searchManager = SearchManagerMock.self
-    presenter = SearchOnMapPresenter(transitionManager: SearchOnMapModalTransitionManager(),
+    presenter = SearchOnMapPresenter(isRouting: false,
-                                     isRouting: false,
                                      didChangeState: { [weak self] in self?.currentState = $0 })
     interactor = SearchOnMapInteractor(presenter: presenter, searchManager: searchManager)
     view = SearchOnMapViewMock()
@@ -131,8 +130,13 @@ final class SearchOnMapTests: XCTestCase {
     searchManager.results = results
 
     interactor.handle(.didSelectResult(results[0], withSearchText: searchText))
-    XCTAssertEqual(currentState, .hidden)
+    if isIPad {
-    XCTAssertEqual(view.viewModel.presentationStep, .hidden)
+      XCTAssertEqual(currentState, .searching)
+      XCTAssertEqual(view.viewModel.presentationStep, .fullScreen)
+    } else {
+      XCTAssertEqual(currentState, .hidden)
+      XCTAssertEqual(view.viewModel.presentationStep, .hidden)
+    }
   }
 
   func test_GivenSearchIsActive_WhenSelectPlaceOnMap_ThenHideSearch() {
@@ -159,8 +163,13 @@ final class SearchOnMapTests: XCTestCase {
     searchManager.results = results
 
     interactor.handle(.didSelectResult(results[0], withSearchText: searchText))
-    XCTAssertEqual(currentState, .hidden)
+    if isIPad {
-    XCTAssertEqual(view.viewModel.presentationStep, .hidden)
+      XCTAssertEqual(currentState, .searching)
+      XCTAssertEqual(view.viewModel.presentationStep, .fullScreen)
+    } else {
+      XCTAssertEqual(currentState, .hidden)
+      XCTAssertEqual(view.viewModel.presentationStep, .hidden)
+    }
 
     interactor.handle(.didDeselectPlaceOnMap)
     XCTAssertEqual(currentState, .searching)
@@ -222,6 +231,10 @@ private class SearchOnMapViewMock: SearchOnMapView {
   func render(_ viewModel: SearchOnMap.ViewModel) {
     self.viewModel = viewModel
   }
+  func close() {
+  }
+  func show() {
+  }
 }
 
 private class SearchManagerMock: SearchManager {

iphone/Maps/UI/AvailableArea/AvailableArea.swift

@@ -101,7 +101,10 @@ class AvailableArea: UIView {
   }
 
   func addConstraints(otherView: UIView, directions: MWMAvailableAreaAffectDirections) {
-    precondition(!directions.isEmpty)
+    guard !directions.isEmpty else {
+      LOG(.warning, "Attempt to add empty affecting directions from \(otherView) to \(self)")
+      return
+    }
     let add = { (sa: NSLayoutConstraint.Attribute, oa: NSLayoutConstraint.Attribute, rel: NSLayoutConstraint.Relation) in
       let c = NSLayoutConstraint(item: self, attribute: sa, relatedBy: rel, toItem: otherView, attribute: oa, multiplier: 1, constant: 0)
       c.priority = UILayoutPriority.defaultHigh

iphone/Maps/UI/BottomMenu/Menu/BottomMenuViewController.swift

@@ -25,7 +25,7 @@ class BottomMenuViewController: MWMViewController {
   override func viewDidLoad() {
     super.viewDidLoad()
     
-    tableView.layer.setCorner(radius: 8, corners: [.layerMinXMinYCorner, .layerMaxXMinYCorner])
+    tableView.layer.setCornerRadius(.buttonDefault, maskedCorners: [.layerMinXMinYCorner, .layerMaxXMinYCorner])
     tableView.sectionFooterHeight = 0
     
     tableView.dataSource = presenter

iphone/Maps/UI/PlacePage/Components/Products/ProductButton.swift

@@ -22,7 +22,7 @@ final class ProductButton: UIButton {
     titleLabel?.allowsDefaultTighteningForTruncation = true
     titleLabel?.adjustsFontSizeToFitWidth = true
     titleLabel?.minimumScaleFactor = 0.5
-    layer.setCorner(radius: 5.0)
+    layer.setCornerRadius(.buttonDefaultSmall)
     layer.masksToBounds = true
     addTarget(self, action: #selector(buttonDidTap), for: .touchUpInside)
   }

iphone/Maps/UI/PlacePage/PlacePageViewController.swift

@@ -153,7 +153,6 @@ final class PlacePageScrollView: UIScrollView {
 
   private func setupView() {
     let bgView = UIView()
-    bgView.setStyle(.ppBackgroundView)
     stackView.insertSubview(bgView, at: 0)
     bgView.alignToSuperview()
 
@@ -163,7 +162,7 @@ final class PlacePageScrollView: UIScrollView {
     stackView.backgroundColor = .clear
 
     let cornersToMask: CACornerMask = alternativeSizeClass(iPhone: [], iPad: [.layerMinXMaxYCorner, .layerMaxXMaxYCorner])
-    actionBarContainerView.layer.setCorner(radius: 16, corners: cornersToMask)
+    actionBarContainerView.layer.setCornerRadius(.modalSheet, maskedCorners: cornersToMask)
     actionBarContainerView.layer.masksToBounds = true
 
     // See https://github.com/organicmaps/organicmaps/issues/6917 for the details.

iphone/Maps/UI/PlacePage/Views/DifficultyView.swift

@@ -43,7 +43,7 @@ class DifficultyView: UIView {
     for _ in 0..<difficultyLevelCount {
       let view = UIView()
       stackView.addArrangedSubview(view)
-      view.layer.setCorner(radius: bulletSize.height / 2)
+      view.layer.setCornerRadius(.custom(bulletSize.height / 2))
       views.append(view)
     }
   }

iphone/Maps/UI/Search/SearchOnMap/PlaceholderView.swift

@@ -115,8 +115,8 @@ final class PlaceholderView: UIView {
 
 // MARK: - ModallyPresentedViewController
 extension PlaceholderView: ModallyPresentedViewController {
-  func translationYDidUpdate(_ translationY: CGFloat) {
+  func presentationFrameDidChange(_ frame: CGRect) {
-    self.containerModalYTranslation = translationY
+    self.containerModalYTranslation = frame.origin.y
     reloadConstraints()
   }
 }

iphone/Maps/UI/Search/SearchOnMap/Presentation/MapPassthroughView.swift

@@ -1,30 +0,0 @@
-/// A transparent view that allows touch events to pass through to the MapViewController's view.
-///
-/// This view is used to enable interaction with the underlying map while still maintaining a
-/// transparent overlay. It does not block touch events but forwards them to the specified `passingView`.
-
-final class MapPassthroughView: UIView {
-  private weak var passingView: UIView?
-
-  init(passingView: UIView) {
-    self.passingView = passingView
-    super.init(frame: passingView.bounds)
-    self.autoresizingMask = [.flexibleWidth, .flexibleHeight]
-    self.alpha = 0
-  }
-
-  @available(*, unavailable)
-  required init?(coder: NSCoder) {
-    fatalError("init(coder:) has not been implemented")
-  }
-
-  override func hitTest(_ point: CGPoint, with event: UIEvent?) -> UIView? {
-    guard let passingView else { return nil }
-    let pointInPassthroughView = passingView.convert(point, from: self)
-    super.hitTest(point, with: event)
-    if passingView.bounds.contains(pointInPassthroughView) {
-      return MapViewController.shared()?.view.hitTest(point, with: event)
-    }
-    return nil
-  }
-}

iphone/Maps/UI/Search/SearchOnMap/Presentation/ModalPresentationAnimator.swift

@@ -0,0 +1,38 @@
+enum PresentationStepChangeAnimation {
+  case none
+  case slide
+  case slideAndBounce
+}
+
+final class ModalPresentationAnimator {
+
+  private enum Constants {
+    static let animationDuration: TimeInterval = kDefaultAnimationDuration
+    static let springDamping: CGFloat = 0.85
+    static let springVelocity: CGFloat = 0.2
+  }
+
+  static func animate(with stepAnimation: PresentationStepChangeAnimation = .slide,
+                      animations: @escaping (() -> Void),
+                      completion: ((Bool) -> Void)?) {
+    switch stepAnimation {
+    case .none:
+      animations()
+      completion?(true)
+    case .slide:
+      UIView.animate(withDuration: Constants.animationDuration,
+                     delay: 0,
+                     options: .curveEaseOut,
+                     animations: animations,
+                     completion: completion)
+    case .slideAndBounce:
+      UIView.animate(withDuration: Constants.animationDuration,
+                     delay: 0,
+                     usingSpringWithDamping: Constants.springDamping,
+                     initialSpringVelocity: Constants.springVelocity,
+                     options: .curveLinear,
+                     animations: animations,
+                     completion: completion)
+    }
+  }
+}

iphone/Maps/UI/Search/SearchOnMap/Presentation/ModalPresentationStep.swift

@@ -1,11 +1,11 @@
-enum ModalScreenPresentationStep {
+enum ModalPresentationStep: Int, CaseIterable {
   case fullScreen
   case halfScreen
   case compact
   case hidden
 }
 
-extension ModalScreenPresentationStep {
+extension ModalPresentationStep {
   private enum Constants {
     static let iPadWidth: CGFloat = 350
     static let compactHeightOffset: CGFloat = 120
@@ -14,7 +14,7 @@ extension ModalScreenPresentationStep {
     static let landscapeTopInset: CGFloat = 10
   }
 
-  var upper: ModalScreenPresentationStep {
+  var upper: ModalPresentationStep {
     switch self {
     case .fullScreen:
       return .fullScreen
@@ -27,7 +27,7 @@ extension ModalScreenPresentationStep {
     }
   }
 
-  var lower: ModalScreenPresentationStep {
+  var lower: ModalPresentationStep {
     switch self {
     case .fullScreen:
       return .halfScreen
@@ -40,18 +40,22 @@ extension ModalScreenPresentationStep {
     }
   }
 
-  var first: ModalScreenPresentationStep {
+  var first: ModalPresentationStep {
     .fullScreen
   }
 
-  var last: ModalScreenPresentationStep {
+  var last: ModalPresentationStep {
     .compact
   }
 
-  func frame(for viewController: UIViewController, in containerView: UIView) -> CGRect {
+  func frame(for presentedView: UIView, in containerViewController: UIViewController) -> CGRect {
     let isIPad = UIDevice.current.userInterfaceIdiom == .pad
-    let containerSize = containerView.bounds.size
+    var containerSize = containerViewController.view.bounds.size
-    let safeAreaInsets = containerView.safeAreaInsets
+    if containerSize == .zero {
+      containerSize = UIScreen.main.bounds.size
+    }
+    let safeAreaInsets = containerViewController.view.safeAreaInsets
+    let traitCollection = containerViewController.traitCollection
     var frame = CGRect(origin: .zero, size: containerSize)
 
     if isIPad {
@@ -65,7 +69,7 @@ extension ModalScreenPresentationStep {
       return frame
     }
 
-    let isPortraitOrientation = viewController.traitCollection.verticalSizeClass == .regular
+    let isPortraitOrientation = traitCollection.verticalSizeClass == .regular
     if isPortraitOrientation {
       switch self {
       case .fullScreen:

iphone/Maps/UI/Search/SearchOnMap/Presentation/ModalPresentationStepsController.swift

@@ -0,0 +1,118 @@
+final class ModalPresentationStepsController {
+
+  enum StepUpdate {
+    case didClose
+    case didUpdateFrame(CGRect)
+    case didUpdateStep(ModalPresentationStep)
+  }
+
+  fileprivate enum Constants {
+    static let slowSwipeVelocity: CGFloat = 500
+    static let fastSwipeDownVelocity: CGFloat = 4000
+    static let fastSwipeUpVelocity: CGFloat = 3000
+    static let translationThreshold: CGFloat = 50
+  }
+
+  private weak var presentedView: UIView?
+  private weak var containerViewController: UIViewController?
+
+  private var initialTranslationY: CGFloat = .zero
+
+  private(set) var currentStep: ModalPresentationStep = .fullScreen
+  private(set) var maxAvailableFrame: CGRect = .zero
+
+  var currentFrame: CGRect { frame(for: currentStep) }
+  var hiddenFrame: CGRect { frame(for: .hidden) }
+
+  var didUpdateHandler: ((StepUpdate) -> Void)?
+
+  func set(presentedView: UIView, containerViewController: UIViewController) {
+    self.presentedView = presentedView
+    self.containerViewController = containerViewController
+  }
+
+  func setInitialState() {
+    setStep(.hidden, animation: .none)
+  }
+
+  func close(completion: (() -> Void)? = nil) {
+    setStep(.hidden, animation: .slide, completion: completion)
+  }
+
+  func updateMaxAvailableFrame() {
+    maxAvailableFrame = frame(for: .fullScreen)
+  }
+
+  func handlePan(_ gesture: UIPanGestureRecognizer) {
+    guard let presentedView else { return }
+    let translation = gesture.translation(in: presentedView)
+    let velocity = gesture.velocity(in: presentedView)
+    var currentFrame = presentedView.frame
+
+    switch gesture.state {
+    case .began:
+      initialTranslationY = presentedView.frame.origin.y
+    case .changed:
+      let newY = max(max(initialTranslationY + translation.y, 0), maxAvailableFrame.origin.y)
+      currentFrame.origin.y = newY
+      presentedView.frame = currentFrame
+      didUpdateHandler?(.didUpdateFrame(currentFrame))
+    case .ended:
+      let nextStep: ModalPresentationStep
+      if velocity.y > Constants.fastSwipeDownVelocity {
+        didUpdateHandler?(.didClose)
+        return
+      } else if velocity.y < -Constants.fastSwipeUpVelocity {
+        nextStep = .fullScreen
+      } else if velocity.y > Constants.slowSwipeVelocity || translation.y > Constants.translationThreshold {
+        if currentStep == .compact {
+          didUpdateHandler?(.didClose)
+          return
+        }
+        nextStep = currentStep.lower
+      } else if velocity.y < -Constants.slowSwipeVelocity || translation.y < -Constants.translationThreshold {
+        nextStep = currentStep.upper
+      } else {
+        nextStep = currentStep
+      }
+
+      let animation: PresentationStepChangeAnimation = abs(velocity.y) > Constants.slowSwipeVelocity ? .slideAndBounce : .slide
+      setStep(nextStep, animation: animation, notifyAboutStepUpdate: true)
+    default:
+      break
+    }
+  }
+
+  func setStep(_ step: ModalPresentationStep,
+               completion: (() -> Void)? = nil) {
+    guard currentStep != step else { return }
+    setStep(step, animation: .slide, notifyAboutStepUpdate: false, completion: completion)
+  }
+
+  private func setStep(_ step: ModalPresentationStep,
+                       animation: PresentationStepChangeAnimation,
+                       notifyAboutStepUpdate: Bool = true,
+                       completion: (() -> Void)? = nil) {
+    guard let presentedView else { return }
+    currentStep = step
+    updateMaxAvailableFrame()
+
+    let frame = frame(for: step)
+    didUpdateHandler?(.didUpdateFrame(frame))
+
+    ModalPresentationAnimator.animate(with: animation) {
+      presentedView.frame = frame
+    } completion: { [weak self] _ in
+      guard let self else { return }
+      if notifyAboutStepUpdate {
+        self.didUpdateHandler?(.didUpdateStep(step))
+      }
+      completion?()
+    }
+  }
+
+  private func frame(for step: ModalPresentationStep) -> CGRect {
+    guard let presentedView, let containerViewController else { return .zero }
+    return step.frame(for: presentedView, in: containerViewController)
+  }
+}

iphone/Maps/UI/Search/SearchOnMap/Presentation/SearchOnMapModalPresentationController.swift

@@ -1,226 +0,0 @@
-protocol ModallyPresentedViewController {
-  func translationYDidUpdate(_ translationY: CGFloat)
-}
-
-protocol SearchOnMapModalPresentationView: AnyObject {
-  func setPresentationStep(_ step: ModalScreenPresentationStep)
-  func close()
-}
-
-final class SearchOnMapModalPresentationController: UIPresentationController {
-
-  private enum StepChangeAnimation {
-    case slide
-    case slideAndBounce
-  }
-
-  private enum Constants {
-    static let animationDuration: TimeInterval = kDefaultAnimationDuration
-    static let springDamping: CGFloat = 0.85
-    static let springVelocity: CGFloat = 0.2
-    static let iPhoneCornerRadius: CGFloat = 10
-    static let slowSwipeVelocity: CGFloat = 500
-    static let fastSwipeDownVelocity: CGFloat = 4000
-    static let fastSwipeUpVelocity: CGFloat = 3000
-    static let translationThreshold: CGFloat = 50
-    static let panGestureThreshold: CGFloat = 5
-  }
-
-  private var initialTranslationY: CGFloat = 0
-  private weak var interactor: SearchOnMapInteractor? {
-    (presentedViewController as? SearchOnMapViewController)?.interactor
-  }
-  // TODO: replace with set of steps passed from the outside
-  private var presentationStep: ModalScreenPresentationStep = .fullScreen
-  private var internalScrollViewContentOffset: CGFloat = 0
-  private var maxAvailableFrameOfPresentedView: CGRect = .zero
-
-  // MARK: - Init
-  override init(presentedViewController: UIViewController, presenting presentingViewController: UIViewController?) {
-    super.init(presentedViewController: presentedViewController, presenting: presentingViewController)
-
-    iPhoneSpecific {
-      let panGestureRecognizer = UIPanGestureRecognizer(target: self, action: #selector(handlePan(_:)))
-      panGestureRecognizer.delegate = self
-      presentedViewController.view.addGestureRecognizer(panGestureRecognizer)
-      if let presentedViewController = presentedViewController as? SearchOnMapView {
-        presentedViewController.scrollViewDelegate = self
-      }
-    }
-  }
-
-  // MARK: - Lifecycle
-  override func containerViewWillLayoutSubviews() {
-    super.containerViewWillLayoutSubviews()
-    presentedView?.frame = frameOfPresentedViewInContainerView
-  }
-
-  override func presentationTransitionWillBegin() {
-    guard let containerView else { return }
-    containerView.backgroundColor = .clear
-    let passThroughView = MapPassthroughView(passingView: containerView)
-    containerView.addSubview(passThroughView)
-  }
-
-  override func presentationTransitionDidEnd(_ completed: Bool) {
-    translationYDidUpdate(presentedView?.frame.origin.y ?? 0)
-  }
-
-  override func dismissalTransitionDidEnd(_ completed: Bool) {
-    super.dismissalTransitionDidEnd(completed)
-    if completed {
-      presentedView?.removeFromSuperview()
-    }
-  }
-
-  override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) {
-    super.traitCollectionDidChange(previousTraitCollection)
-    updateMaxAvailableFrameOfPresentedView()
-  }
-
-  // MARK: - Layout
-  override var frameOfPresentedViewInContainerView: CGRect {
-    guard let containerView else { return .zero }
-    let frame = presentationStep.frame(for: presentedViewController, in: containerView)
-    updateMaxAvailableFrameOfPresentedView()
-    return frame
-  }
-
-  private func updateMaxAvailableFrameOfPresentedView() {
-    guard let containerView else { return }
-    maxAvailableFrameOfPresentedView = ModalScreenPresentationStep.fullScreen.frame(for: presentedViewController, in: containerView)
-  }
-
-  private func updateSideButtonsAvailableArea(_ newY: CGFloat) {
-    iPhoneSpecific {
-      guard presentedViewController.traitCollection.verticalSizeClass != .compact else { return }
-      var sideButtonsAvailableArea = MWMSideButtons.getAvailableArea()
-      sideButtonsAvailableArea.size.height = newY - sideButtonsAvailableArea.origin.y
-      MWMSideButtons.updateAvailableArea(sideButtonsAvailableArea)
-    }
-  }
-
-  // MARK: - Pan gesture handling
-  @objc private func handlePan(_ gesture: UIPanGestureRecognizer) {
-    guard let presentedView, maxAvailableFrameOfPresentedView != .zero else { return }
-    interactor?.handle(.didStartDraggingSearch)
-
-    let translation = gesture.translation(in: presentedView)
-    let velocity = gesture.velocity(in: presentedView)
-
-    switch gesture.state {
-    case .began:
-      initialTranslationY = presentedView.frame.origin.y
-    case .changed:
-      let newY = max(max(initialTranslationY + translation.y, 0), maxAvailableFrameOfPresentedView.origin.y)
-      presentedView.frame.origin.y = newY
-      updateSideButtonsAvailableArea(newY)
-      translationYDidUpdate(newY)
-    case .ended:
-      let nextStep: ModalScreenPresentationStep
-      if velocity.y > Constants.fastSwipeDownVelocity {
-        interactor?.handle(.closeSearch)
-        return
-      } else if velocity.y < -Constants.fastSwipeUpVelocity {
-        nextStep = .fullScreen // fast swipe up
-      } else if velocity.y > Constants.slowSwipeVelocity || translation.y > Constants.translationThreshold {
-        if presentationStep == .compact {
-          interactor?.handle(.closeSearch)
-          return
-        }
-        nextStep = presentationStep.lower // regular swipe down
-      } else if velocity.y < -Constants.slowSwipeVelocity || translation.y < -Constants.translationThreshold {
-        nextStep = presentationStep.upper // regular swipe up
-      } else {
-        // TODO: swipe to closest step on the big translation
-        nextStep = presentationStep
-      }
-      let animation: StepChangeAnimation = abs(velocity.y) > Constants.slowSwipeVelocity ? .slideAndBounce : .slide
-      animateTo(nextStep, animation: animation)
-    default:
-      break
-    }
-  }
-
-  private func animateTo(_ presentationStep: ModalScreenPresentationStep, animation: StepChangeAnimation = .slide) {
-    guard let presentedView, let containerView else { return }
-    self.presentationStep = presentationStep
-    interactor?.handle(.didUpdatePresentationStep(presentationStep))
-
-    let updatedFrame = presentationStep.frame(for: presentedViewController, in: containerView)
-    let targetYTranslation = updatedFrame.origin.y
-
-    switch animation {
-    case .slide:
-      UIView.animate(withDuration: Constants.animationDuration,
-                     delay: 0,
-                     options: .curveEaseOut,
-                     animations: { [weak self] in
-        presentedView.frame = updatedFrame
-        self?.translationYDidUpdate(targetYTranslation)
-        self?.updateSideButtonsAvailableArea(targetYTranslation)
-      })
-    case .slideAndBounce:
-      UIView.animate(withDuration: Constants.animationDuration,
-                     delay: 0,
-                     usingSpringWithDamping: Constants.springDamping,
-                     initialSpringVelocity: Constants.springVelocity,
-                     options: .curveLinear,
-                     animations: { [weak self] in
-        presentedView.frame = updatedFrame
-        self?.translationYDidUpdate(targetYTranslation)
-        self?.updateSideButtonsAvailableArea(targetYTranslation)
-      })
-    }
-  }
-}
-
-// MARK: - SearchOnMapModalPresentationView
-extension SearchOnMapModalPresentationController: SearchOnMapModalPresentationView {
-  func setPresentationStep(_ step: ModalScreenPresentationStep) {
-    guard presentationStep != step else { return }
-    animateTo(step)
-  }
-
-  func close() {
-    guard let containerView else { return }
-    updateSideButtonsAvailableArea(containerView.frame.height)
-    presentedViewController.dismiss(animated: true)
-  }
-}
-
-// MARK: - ModallyPresentedViewController
-extension SearchOnMapModalPresentationController: ModallyPresentedViewController {
-  func translationYDidUpdate(_ translationY: CGFloat) {
-    iPhoneSpecific {
-      (presentedViewController as? SearchOnMapViewController)?.translationYDidUpdate(translationY)
-    }
-  }
-}
-
-// MARK: - UIGestureRecognizerDelegate
-extension SearchOnMapModalPresentationController: UIGestureRecognizerDelegate {
-  func gestureRecognizerShouldBegin(_ gestureRecognizer: UIGestureRecognizer) -> Bool {
-    true
-  }
-
-  func gestureRecognizer(_ gestureRecognizer: UIGestureRecognizer, shouldRecognizeSimultaneouslyWith otherGestureRecognizer: UIGestureRecognizer) -> Bool {
-    // threshold is used to soften transition from the internal scroll zero content offset
-    internalScrollViewContentOffset < Constants.panGestureThreshold
-  }
-}
-
-// MARK: - SearchOnMapScrollViewDelegate
-extension SearchOnMapModalPresentationController: SearchOnMapScrollViewDelegate {
-  func scrollViewDidScroll(_ scrollView: UIScrollView) {
-    guard let presentedView else { return }
-    let hasReachedTheTop = Int(presentedView.frame.origin.y) > Int(maxAvailableFrameOfPresentedView.origin.y)
-    let hasZeroContentOffset = internalScrollViewContentOffset == 0
-    if hasReachedTheTop && hasZeroContentOffset {
-      // prevent the internal scroll view scrolling
-      scrollView.contentOffset.y = internalScrollViewContentOffset
-      return
-    }
-    internalScrollViewContentOffset = scrollView.contentOffset.y
-  }
-}

iphone/Maps/UI/Search/SearchOnMap/Presentation/SearchOnMapModalTransitionManager.swift

@@ -1,21 +0,0 @@
-@objc
-final class SearchOnMapModalTransitionManager: NSObject, UIViewControllerTransitioningDelegate {
-
-  weak var presentationController: SearchOnMapModalPresentationView?
-
-  func animationController(forPresented presented: UIViewController, presenting: UIViewController, source: UIViewController) -> (any UIViewControllerAnimatedTransitioning)? {
-    isIPad ? SideMenuPresentationAnimator() : nil
-  }
-
-  func animationController(forDismissed dismissed: UIViewController) -> (any UIViewControllerAnimatedTransitioning)? {
-    isIPad ? SideMenuDismissalAnimator() : nil
-  }
-
-  func presentationController(forPresented presented: UIViewController,
-                              presenting: UIViewController?,
-                              source: UIViewController) -> UIPresentationController? {
-    let presentationController = SearchOnMapModalPresentationController(presentedViewController: presented, presenting: presenting)
-    self.presentationController = presentationController
-    return presentationController
-  }
-}

iphone/Maps/UI/Search/SearchOnMap/Presentation/SideMenuDismissalAnimator.swift

@@ -1,22 +0,0 @@
-final class SideMenuDismissalAnimator: NSObject, UIViewControllerAnimatedTransitioning {
-  func transitionDuration(using transitionContext: UIViewControllerContextTransitioning?) -> TimeInterval {
-    return kDefaultAnimationDuration / 2
-  }
-
-  func animateTransition(using transitionContext: UIViewControllerContextTransitioning) {
-    guard let fromVC = transitionContext.viewController(forKey: .from) else { return }
-    let initialFrame = transitionContext.initialFrame(for: fromVC)
-    let targetFrame = initialFrame.offsetBy(dx: -initialFrame.width, dy: 0)
-
-    UIView.animate(withDuration: transitionDuration(using: transitionContext),
-                   delay: .zero,
-                   options: .curveEaseIn,
-                   animations: {
-      fromVC.view.frame = targetFrame
-    },
-                   completion: {
-      fromVC.view.removeFromSuperview()
-      transitionContext.completeTransition($0)
-    })
-  }
-}

iphone/Maps/UI/Search/SearchOnMap/Presentation/SideMenuPresentationAnimator.swift

@@ -1,25 +0,0 @@
-final class SideMenuPresentationAnimator: NSObject, UIViewControllerAnimatedTransitioning {
-  func transitionDuration(using transitionContext: UIViewControllerContextTransitioning?) -> TimeInterval {
-    return kDefaultAnimationDuration / 2
-  }
-
-  func animateTransition(using transitionContext: UIViewControllerContextTransitioning) {
-    guard let toVC = transitionContext.viewController(forKey: .to) else { return }
-    let containerView = transitionContext.containerView
-    let finalFrame = transitionContext.finalFrame(for: toVC)
-    let originFrame = finalFrame.offsetBy(dx: -finalFrame.width, dy: 0)
-    containerView.addSubview(toVC.view)
-    toVC.view.frame = originFrame
-    toVC.view.autoresizingMask = [.flexibleWidth, .flexibleHeight]
-
-    UIView.animate(withDuration: transitionDuration(using: transitionContext),
-                   delay: .zero,
-                   options: .curveEaseOut,
-                   animations: {
-      toVC.view.frame = finalFrame
-    },
-                   completion: {
-      transitionContext.completeTransition($0)
-    })
-  }
-}

iphone/Maps/UI/Search/SearchOnMap/SearchOnMapAreaView.swift

@@ -0,0 +1,9 @@
+final class SearchOnMapAreaView: UIView {
+  override var sideButtonsAreaAffectDirections: MWMAvailableAreaAffectDirections {
+    alternative(iPhone: .bottom, iPad: [])
+  }
+
+  override var trafficButtonAreaAffectDirections: MWMAvailableAreaAffectDirections {
+    alternative(iPhone: .bottom, iPad: [])
+  }
+}

iphone/Maps/UI/Search/SearchOnMap/SearchOnMapHeaderView.swift

@@ -1,5 +1,6 @@
 protocol SearchOnMapHeaderViewDelegate: UISearchBarDelegate {
   func cancelButtonDidTap()
+  func grabberDidTap()
 }
 
 final class SearchOnMapHeaderView: UIView {
@@ -10,15 +11,19 @@ final class SearchOnMapHeaderView: UIView {
   }
 
   private enum Constants {
+    static let searchBarHeight: CGFloat = 36
+    static let searchBarInsets: UIEdgeInsets = UIEdgeInsets(top: 8, left: 10, bottom: 10, right: 0)
     static let grabberHeight: CGFloat = 5
     static let grabberWidth: CGFloat = 36
     static let grabberTopMargin: CGFloat = 5
-    static let cancelButtonInsets: UIEdgeInsets = UIEdgeInsets(top: 0, left: 6, bottom: 0, right: 8)
+    static let cancelButtonInsets: UIEdgeInsets = UIEdgeInsets(top: 0, left: 6, bottom: 0, right: 16)
   }
 
   private let grabberView = UIView()
+  private let grabberTapHandlerView = UIView()
   private let searchBar = UISearchBar()
   private let cancelButton = UIButton()
+  private let cancelContainer = UIView()
 
   override init(frame: CGRect) {
     super.init(frame: frame)
@@ -32,22 +37,29 @@ final class SearchOnMapHeaderView: UIView {
   }
 
   private func setupView() {
-    setStyle(.searchHeader)
+    setStyle(.primaryBackground)
-    layer.maskedCorners = [.layerMinXMinYCorner, .layerMaxXMinYCorner]
 
     setupGrabberView()
+    setupGrabberTapHandlerView()
     setupSearchBar()
     setupCancelButton()
   }
 
   private func setupGrabberView() {
-    grabberView.setStyle(.background)
+    grabberView.setStyle(.grabber)
-    grabberView.layer.setCorner(radius: Constants.grabberHeight / 2)
     iPadSpecific { [weak self] in
       self?.grabberView.isHidden = true
     }
   }
 
+  private func setupGrabberTapHandlerView() {
+    grabberTapHandlerView.backgroundColor = .clear
+    iPhoneSpecific {
+      let tapGesture = UITapGestureRecognizer(target: self, action: #selector(grabberDidTap))
+      grabberTapHandlerView.addGestureRecognizer(tapGesture)
+    }
+  }
+
   private func setupSearchBar() {
     searchBar.placeholder = L("search")
     searchBar.showsCancelButton = false
@@ -59,19 +71,24 @@ final class SearchOnMapHeaderView: UIView {
   }
 
   private func setupCancelButton() {
-    cancelButton.tintColor = .whitePrimaryText()
+    cancelContainer.setStyle(.primaryBackground)
-    cancelButton.setStyle(.clearBackground)
+    cancelButton.setStyle(.searchCancelButton)
     cancelButton.setTitle(L("cancel"), for: .normal)
-    cancelButton.addTarget(self, action: #selector(cancelButtonTapped), for: .touchUpInside)
+    cancelButton.addTarget(self, action: #selector(cancelButtonDidTap), for: .touchUpInside)
   }
 
   private func layoutView() {
     addSubview(grabberView)
+    addSubview(grabberTapHandlerView)
     addSubview(searchBar)
-    addSubview(cancelButton)
+    addSubview(cancelContainer)
+    cancelContainer.addSubview(cancelButton)
 
     grabberView.translatesAutoresizingMaskIntoConstraints = false
+    grabberTapHandlerView.translatesAutoresizingMaskIntoConstraints = false
+    grabberTapHandlerView.setContentHuggingPriority(.defaultLow, for: .vertical)
     searchBar.translatesAutoresizingMaskIntoConstraints = false
+    cancelContainer.translatesAutoresizingMaskIntoConstraints = false
     cancelButton.translatesAutoresizingMaskIntoConstraints = false
 
     NSLayoutConstraint.activate([
@@ -80,18 +97,33 @@ final class SearchOnMapHeaderView: UIView {
       grabberView.widthAnchor.constraint(equalToConstant: Constants.grabberWidth),
       grabberView.heightAnchor.constraint(equalToConstant: Constants.grabberHeight),
 
-      searchBar.topAnchor.constraint(equalTo: grabberView.bottomAnchor),
+      grabberTapHandlerView.topAnchor.constraint(equalTo: grabberView.bottomAnchor),
-      searchBar.leadingAnchor.constraint(equalTo: leadingAnchor),
+      grabberTapHandlerView.leadingAnchor.constraint(equalTo: leadingAnchor),
-      searchBar.trailingAnchor.constraint(equalTo: cancelButton.leadingAnchor, constant: -Constants.cancelButtonInsets.left),
+      grabberTapHandlerView.trailingAnchor.constraint(equalTo: trailingAnchor),
+      grabberTapHandlerView.bottomAnchor.constraint(equalTo: searchBar.topAnchor),
 
-      cancelButton.centerYAnchor.constraint(equalTo: searchBar.centerYAnchor),
+      searchBar.topAnchor.constraint(equalTo: grabberView.bottomAnchor, constant: Constants.searchBarInsets.top),
-      cancelButton.trailingAnchor.constraint(equalTo: trailingAnchor, constant: -Constants.cancelButtonInsets.right),
+      searchBar.leadingAnchor.constraint(equalTo: leadingAnchor, constant: Constants.searchBarInsets.left),
+      searchBar.trailingAnchor.constraint(equalTo: cancelContainer.leadingAnchor),
+      searchBar.bottomAnchor.constraint(equalTo: bottomAnchor, constant: -Constants.searchBarInsets.bottom),
+      searchBar.heightAnchor.constraint(equalToConstant: Constants.searchBarHeight),
 
-      bottomAnchor.constraint(equalTo: searchBar.bottomAnchor)
+      cancelContainer.trailingAnchor.constraint(equalTo: trailingAnchor),
+      cancelContainer.topAnchor.constraint(equalTo: searchBar.topAnchor),
+      cancelContainer.bottomAnchor.constraint(equalTo: searchBar.bottomAnchor),
+
+      cancelButton.topAnchor.constraint(equalTo: cancelContainer.topAnchor),
+      cancelButton.leadingAnchor.constraint(equalTo: cancelContainer.leadingAnchor, constant: Constants.cancelButtonInsets.left),
+      cancelButton.trailingAnchor.constraint(equalTo: cancelContainer.trailingAnchor, constant: -Constants.cancelButtonInsets.right),
+      cancelButton.bottomAnchor.constraint(equalTo: cancelContainer.bottomAnchor),
     ])
   }
 
-  @objc private func cancelButtonTapped() {
+  @objc private func grabberDidTap() {
+    delegate?.grabberDidTap()
+  }
+
+  @objc private func cancelButtonDidTap() {
     delegate?.cancelButtonDidTap()
   }
 

iphone/Maps/UI/Search/SearchOnMap/SearchOnMapInteractor.swift

@@ -70,12 +70,12 @@ final class SearchOnMapInteractor: NSObject {
     searchManager.saveQuery(searchText.text,
                             forInputLocale: searchText.locale)
     showResultsOnMap = true
+    searchManager.showEverywhereSearchResultsOnMap()
     return .showOnTheMap
   }
 
   private func processTypedText(_ searchText: SearchOnMap.SearchText) -> SearchOnMap.Response {
     isUpdatesDisabled = false
-    showResultsOnMap = true
     searchManager.searchQuery(searchText.text,
                               forInputLocale: searchText.locale,
                               withCategory: false)

iphone/Maps/UI/Search/SearchOnMap/SearchOnMapManager.swift

@@ -19,16 +19,14 @@ protocol SearchOnMapManagerObserver: AnyObject {
 
 @objcMembers
 final class SearchOnMapManager: NSObject {
-  private let navigationController: UINavigationController
+  private var interactor: SearchOnMapInteractor? { viewController?.interactor }
-  private weak var interactor: SearchOnMapInteractor?
   private let observers = ListenerContainer<SearchOnMapManagerObserver>()
 
-  // MARK: - Public properties
+  weak var viewController: SearchOnMapViewController?
-  weak var viewController: UIViewController?
   var isSearching: Bool { viewController != nil }
 
-  init(navigationController: UINavigationController = MapViewController.shared()!.navigationController!) {
+  override init() {
-    self.navigationController = navigationController
+    super.init()
   }
 
   // MARK: - Public methods
@@ -38,10 +36,9 @@ final class SearchOnMapManager: NSObject {
       return
     }
     FrameworkHelper.deactivateMapSelection()
-    let viewController = buildViewController(isRouting: isRouting)
+    let viewController = SearchOnMapViewControllerBuilder.build(isRouting: isRouting,
+                                                                didChangeState: notifyObservers)
     self.viewController = viewController
-    self.interactor = viewController.interactor
-    navigationController.present(viewController, animated: true)
   }
 
   func hide() {
@@ -77,20 +74,20 @@ final class SearchOnMapManager: NSObject {
     observers.removeListener(observer)
   }
 
-  // MARK: - Private methods
+  private func notifyObservers(_ state: SearchOnMapState) {
-  private func buildViewController(isRouting: Bool) -> SearchOnMapViewController {
+    observers.forEach { observer in observer.searchManager(didChangeState: state) }
-    let transitioningManager = SearchOnMapModalTransitionManager()
+  }
-    let presenter = SearchOnMapPresenter(transitionManager: transitioningManager,
+}
-                                         isRouting: isRouting,
+
-                                         didChangeState: { [weak self] state in
+private struct SearchOnMapViewControllerBuilder {
-      guard let self else { return }
+  static func build(isRouting: Bool, didChangeState: @escaping ((SearchOnMapState) -> Void)) -> SearchOnMapViewController {
-      self.observers.forEach { observer in observer.searchManager(didChangeState: state) }
+    let viewController = SearchOnMapViewController()
-    })
+    let presenter = SearchOnMapPresenter(isRouting: isRouting,
+                                         didChangeState: didChangeState)
     let interactor = SearchOnMapInteractor(presenter: presenter)
-    let viewController = SearchOnMapViewController(interactor: interactor)
     presenter.view = viewController
-    viewController.modalPresentationStyle = .custom
+    viewController.interactor = interactor
-    viewController.transitioningDelegate = transitioningManager
+    viewController.show()
     return viewController
   }
 }

iphone/Maps/UI/Search/SearchOnMap/SearchOnMapModels.swift

@@ -1,6 +1,6 @@
 enum SearchOnMap {
   struct ViewModel: Equatable {
-    enum ContentState: Equatable {
+    enum Content: Equatable {
       case historyAndCategory
       case results(SearchResults)
       case noResults
@@ -10,8 +10,8 @@ enum SearchOnMap {
     var isTyping: Bool
     var skipSuggestions: Bool
     var searchingText: String?
-    var contentState: ContentState
+    var contentState: Content
-    var presentationStep: ModalScreenPresentationStep
+    var presentationStep: ModalPresentationStep
   }
 
   struct SearchResults: Equatable {
@@ -54,7 +54,7 @@ enum SearchOnMap {
     case clearButtonDidTap
     case didSelectPlaceOnMap
     case didDeselectPlaceOnMap
-    case didUpdatePresentationStep(ModalScreenPresentationStep)
+    case didUpdatePresentationStep(ModalPresentationStep)
   }
 
   enum Response: Equatable {
@@ -67,7 +67,7 @@ enum SearchOnMap {
     case clearSearch
     case setSearchScreenHidden(Bool)
     case setSearchScreenCompact
-    case updatePresentationStep(ModalScreenPresentationStep)
+    case updatePresentationStep(ModalPresentationStep)
     case close
     case none
   }

iphone/Maps/UI/Search/SearchOnMap/SearchOnMapPresenter.swift

@@ -3,7 +3,6 @@ final class SearchOnMapPresenter {
   typealias ViewModel = SearchOnMap.ViewModel
 
   weak var view: SearchOnMapView?
-  weak var presentationView: SearchOnMapModalPresentationView? { transitionManager.presentationController }
 
   private var searchState: SearchOnMapState = .searching {
     didSet {
@@ -12,13 +11,11 @@ final class SearchOnMapPresenter {
     }
   }
 
-  private let transitionManager: SearchOnMapModalTransitionManager
   private var viewModel: ViewModel = .initial
   private var isRouting: Bool
   private var didChangeState: ((SearchOnMapState) -> Void)?
 
-  init(transitionManager: SearchOnMapModalTransitionManager, isRouting: Bool, didChangeState: ((SearchOnMapState) -> Void)?) {
+  init(isRouting: Bool, didChangeState: ((SearchOnMapState) -> Void)?) {
-    self.transitionManager = transitionManager
     self.isRouting = isRouting
     self.didChangeState = didChangeState
     didChangeState?(searchState)
@@ -28,8 +25,8 @@ final class SearchOnMapPresenter {
     guard response != .none else { return }
 
     if response == .close {
+      view?.close()
       searchState = .closed
-      presentationView?.close()
       return
     }
 
@@ -43,7 +40,6 @@ final class SearchOnMapPresenter {
       viewModel = newViewModel
       view?.render(newViewModel)
       searchState = newViewModel.presentationStep.searchState
-      presentationView?.setPresentationStep(newViewModel.presentationStep)
     }
   }
 
@@ -97,6 +93,9 @@ final class SearchOnMapPresenter {
       viewModel.isTyping = false
       viewModel.presentationStep = .compact
     case .updatePresentationStep(let step):
+      if step == .hidden {
+        viewModel.isTyping = false
+      }
       viewModel.presentationStep = step
     case .close, .none:
       break
@@ -105,7 +104,7 @@ final class SearchOnMapPresenter {
   }
 }
 
-private extension ModalScreenPresentationStep {
+private extension ModalPresentationStep {
   var searchState: SearchOnMapState {
     switch self {
     case .fullScreen, .halfScreen, .compact:

iphone/Maps/UI/Search/SearchOnMap/SearchOnMapViewController.swift

@@ -1,52 +1,73 @@
 protocol SearchOnMapView: AnyObject {
-  var scrollViewDelegate: SearchOnMapScrollViewDelegate? { get set }
-
   func render(_ viewModel: SearchOnMap.ViewModel)
+  func show()
+  func close()
 }
 
 @objc
 protocol SearchOnMapScrollViewDelegate: AnyObject {
   func scrollViewDidScroll(_ scrollView: UIScrollView)
+  func scrollViewWillEndDragging(_ scrollView: UIScrollView, withVelocity velocity: CGPoint, targetContentOffset: UnsafeMutablePointer<CGPoint>)
+}
+
+@objc
+protocol ModallyPresentedViewController: AnyObject {
+  @objc func presentationFrameDidChange(_ frame: CGRect)
 }
 
 final class SearchOnMapViewController: UIViewController {
   typealias ViewModel = SearchOnMap.ViewModel
-  typealias ContentState = SearchOnMap.ViewModel.ContentState
+  typealias Content = SearchOnMap.ViewModel.Content
   typealias SearchText = SearchOnMap.SearchText
 
   fileprivate enum Constants {
-    static let categoriesHeight: CGFloat = 100
-    static let filtersHeight: CGFloat = 50
-    static let keyboardAnimationDuration: CGFloat = 0.3
-    static let cancelButtonInsets: UIEdgeInsets = UIEdgeInsets(top: 0, left: 6, bottom: 0, right: 8)
     static let estimatedRowHeight: CGFloat = 80
+    static let panGestureThreshold: CGFloat = 5
+    static let dimAlpha: CGFloat = 0.3
+    static let dimViewThreshold: CGFloat = 50
   }
 
-  let interactor: SearchOnMapInteractor
+  var interactor: SearchOnMapInteractor?
-  weak var scrollViewDelegate: SearchOnMapScrollViewDelegate?
 
-  private var searchResults = SearchOnMap.SearchResults([])
+  @objc let availableAreaView = SearchOnMapAreaView()
-
+  private let contentView = UIView()
-  // MARK: - UI Elements
   private let headerView = SearchOnMapHeaderView()
-  private let containerView = UIView()
+  private let searchResultsView = UIView()
   private let resultsTableView = UITableView()
   private let historyAndCategoryTabViewController = SearchTabViewController()
-  // TODO: implement filters
-  private let filtersCollectionView: UICollectionView = {
-    let layout = UICollectionViewFlowLayout()
-    layout.scrollDirection = .horizontal
-    return UICollectionView(frame: .zero, collectionViewLayout: layout)
-  }()
   private var searchingActivityView = PlaceholderView(hasActivityIndicator: true)
-  private var containerModalYTranslation: CGFloat = 0
   private var searchNoResultsView = PlaceholderView(title: L("search_not_found"),
                                                     subtitle: L("search_not_found_query"))
+  private var dimView: UIView?
+
+  private var internalScrollViewContentOffset: CGFloat = .zero
+  private let presentationStepsController = ModalPresentationStepsController()
+  private var searchResults = SearchOnMap.SearchResults([])
 
   // MARK: - Init
-  init(interactor: SearchOnMapInteractor) {
+  init() {
-    self.interactor = interactor
     super.init(nibName: nil, bundle: nil)
+    configureModalPresentation()
+  }
+
+  private func configureModalPresentation() {
+    guard let mapViewController = MapViewController.shared() else {
+      fatalError("MapViewController is not available")
+    }
+    presentationStepsController.set(presentedView: availableAreaView, containerViewController: self)
+    presentationStepsController.didUpdateHandler = presentationUpdateHandler
+
+    mapViewController.searchContainer.addSubview(view)
+    mapViewController.addChild(self)
+    view.frame = mapViewController.searchContainer.bounds
+    view.autoresizingMask = [.flexibleWidth, .flexibleHeight]
+    didMove(toParent: mapViewController)
+
+    let affectedAreaViews = [
+      mapViewController.sideButtonsArea,
+      mapViewController.trafficButtonArea,
+    ]
+    affectedAreaViews.forEach { $0?.addAffectingView(availableAreaView) }
   }
 
   @available(*, unavailable)
@@ -54,16 +75,16 @@ final class SearchOnMapViewController: UIViewController {
     fatalError("init(coder:) has not been implemented")
   }
 
-  deinit {
+  // MARK: - Lifecycle
-    NotificationCenter.default.removeObserver(self)
+  override func loadView() {
+    view = TouchTransparentView()
   }
 
-  // MARK: - Lifecycle
   override func viewDidLoad() {
     super.viewDidLoad()
     setupViews()
     layoutViews()
-    interactor.handle(.openSearch)
+    presentationStepsController.setInitialState()
   }
 
   override func viewWillDisappear(_ animated: Bool) {
@@ -71,30 +92,58 @@ final class SearchOnMapViewController: UIViewController {
     headerView.setIsSearching(false)
   }
 
-  // MARK: - Private methods
+  override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) {
-  private func setupViews() {
+    super.traitCollectionDidChange(previousTraitCollection)
-    view.setStyle(.clearBackground)
+    updateFrameOfPresentedViewInContainerView()
-    setupTapGestureRecognizer()
+    updateDimView(for: availableAreaView.frame)
-    setupHeaderView()
-    setupContainerView()
-    setupResultsTableView()
-    setupHistoryAndCategoryTabView()
-    setupResultsTableView()
-    setupFiltersCollectionView()
   }
 
-  private func setupTapGestureRecognizer() {
+  override func viewWillTransition(to size: CGSize, with coordinator: any UIViewControllerTransitionCoordinator) {
+    super.viewWillTransition(to: size, with: coordinator)
+    if #available(iOS 14.0, *), ProcessInfo.processInfo.isiOSAppOnMac {
+      updateFrameOfPresentedViewInContainerView()
+    }
+  }
+
+  // MARK: - Private methods
+  private func setupViews() {
+    availableAreaView.setStyleAndApply(.modalSheetBackground)
+    contentView.setStyleAndApply(.modalSheetContent)
+
+    setupGestureRecognizers()
+    setupDimView()
+    setupHeaderView()
+    setupSearchResultsView()
+    setupResultsTableView()
+    setupHistoryAndCategoryTabView()
+  }
+
+  private func setupDimView() {
+    iPhoneSpecific {
+      dimView = UIView()
+      dimView?.backgroundColor = .black
+      dimView?.frame = view.bounds
+    }
+  }
+
+  private func setupGestureRecognizers() {
     let tapGesture = UITapGestureRecognizer(target: self, action: #selector(handleTapOutside))
     tapGesture.cancelsTouchesInView = false
-    view.addGestureRecognizer(tapGesture)
+    contentView.addGestureRecognizer(tapGesture)
+
+    iPhoneSpecific {
+      let panGestureRecognizer = UIPanGestureRecognizer(target: self, action: #selector(handlePan(_:)))
+      panGestureRecognizer.delegate = self
+      contentView.addGestureRecognizer(panGestureRecognizer)
+    }
   }
 
   private func setupHeaderView() {
     headerView.delegate = self
   }
 
-  private func setupContainerView() {
+  private func setupSearchResultsView() {
-    containerView.setStyle(.background)
+    searchResultsView.setStyle(.background)
   }
 
   private func setupResultsTableView() {
@@ -112,91 +161,141 @@ final class SearchOnMapViewController: UIViewController {
     historyAndCategoryTabViewController.delegate = self
   }
 
-  // TODO: (KK) Implement filters collection viewe
-  private func setupFiltersCollectionView() {
-    filtersCollectionView.register(UICollectionViewCell.self, forCellWithReuseIdentifier: "FilterCell")
-    filtersCollectionView.dataSource = self
-  }
-
   private func layoutViews() {
-    view.addSubview(headerView)
+    if let dimView {
-    view.addSubview(containerView)
+      view.addSubview(dimView)
+      dimView.autoresizingMask = [.flexibleWidth, .flexibleHeight]
+    }
+    view.addSubview(availableAreaView)
+    availableAreaView.addSubview(contentView)
+    contentView.addSubview(headerView)
+    contentView.addSubview(searchResultsView)
+
+    contentView.translatesAutoresizingMaskIntoConstraints = false
     headerView.translatesAutoresizingMaskIntoConstraints = false
-    containerView.translatesAutoresizingMaskIntoConstraints = false
+    searchResultsView.translatesAutoresizingMaskIntoConstraints = false
 
     NSLayoutConstraint.activate([
-      headerView.topAnchor.constraint(equalTo: view.topAnchor),
+      contentView.topAnchor.constraint(equalTo: availableAreaView.topAnchor),
-      headerView.leadingAnchor.constraint(equalTo: view.leadingAnchor),
+      contentView.leadingAnchor.constraint(equalTo: availableAreaView.leadingAnchor),
-      headerView.trailingAnchor.constraint(equalTo: view.trailingAnchor),
+      contentView.trailingAnchor.constraint(equalTo: availableAreaView.trailingAnchor),
+      contentView.bottomAnchor.constraint(equalTo: availableAreaView.bottomAnchor),
 
-      containerView.topAnchor.constraint(equalTo: headerView.bottomAnchor),
+      headerView.topAnchor.constraint(equalTo: contentView.topAnchor),
-      containerView.leadingAnchor.constraint(equalTo: view.leadingAnchor),
+      headerView.leadingAnchor.constraint(equalTo: contentView.leadingAnchor),
-      containerView.trailingAnchor.constraint(equalTo: view.trailingAnchor),
+      headerView.trailingAnchor.constraint(equalTo: contentView.trailingAnchor),
-      containerView.bottomAnchor.constraint(equalTo: view.bottomAnchor),
+
+      searchResultsView.topAnchor.constraint(equalTo: headerView.bottomAnchor),
+      searchResultsView.leadingAnchor.constraint(equalTo: contentView.leadingAnchor),
+      searchResultsView.trailingAnchor.constraint(equalTo: contentView.trailingAnchor),
+      searchResultsView.bottomAnchor.constraint(equalTo: contentView.bottomAnchor),
     ])
 
     layoutResultsView()
     layoutHistoryAndCategoryTabView()
     layoutSearchNoResultsView()
     layoutSearchingView()
+    updateFrameOfPresentedViewInContainerView()
   }
 
   private func layoutResultsView() {
-    containerView.addSubview(resultsTableView)
+    searchResultsView.addSubview(resultsTableView)
     resultsTableView.translatesAutoresizingMaskIntoConstraints = false
 
     NSLayoutConstraint.activate([
-      resultsTableView.topAnchor.constraint(equalTo: containerView.topAnchor),
+      resultsTableView.topAnchor.constraint(equalTo: searchResultsView.topAnchor),
-      resultsTableView.leadingAnchor.constraint(equalTo: containerView.leadingAnchor),
+      resultsTableView.leadingAnchor.constraint(equalTo: searchResultsView.leadingAnchor),
-      resultsTableView.trailingAnchor.constraint(equalTo: containerView.trailingAnchor),
+      resultsTableView.trailingAnchor.constraint(equalTo: searchResultsView.trailingAnchor),
-      resultsTableView.bottomAnchor.constraint(equalTo: containerView.bottomAnchor)
+      resultsTableView.bottomAnchor.constraint(equalTo: searchResultsView.bottomAnchor)
     ])
   }
 
   private func layoutHistoryAndCategoryTabView() {
-    containerView.addSubview(historyAndCategoryTabViewController.view)
+    searchResultsView.addSubview(historyAndCategoryTabViewController.view)
     historyAndCategoryTabViewController.view.translatesAutoresizingMaskIntoConstraints = false
 
     NSLayoutConstraint.activate([
-      historyAndCategoryTabViewController.view.topAnchor.constraint(equalTo: containerView.topAnchor),
+      historyAndCategoryTabViewController.view.topAnchor.constraint(equalTo: searchResultsView.topAnchor),
-      historyAndCategoryTabViewController.view.leadingAnchor.constraint(equalTo: containerView.leadingAnchor),
+      historyAndCategoryTabViewController.view.leadingAnchor.constraint(equalTo: searchResultsView.leadingAnchor),
-      historyAndCategoryTabViewController.view.trailingAnchor.constraint(equalTo: containerView.trailingAnchor),
+      historyAndCategoryTabViewController.view.trailingAnchor.constraint(equalTo: searchResultsView.trailingAnchor),
-      historyAndCategoryTabViewController.view.bottomAnchor.constraint(equalTo: containerView.bottomAnchor)
+      historyAndCategoryTabViewController.view.bottomAnchor.constraint(equalTo: searchResultsView.bottomAnchor)
     ])
   }
 
   private func layoutSearchNoResultsView() {
     searchNoResultsView.translatesAutoresizingMaskIntoConstraints = false
-    containerView.addSubview(searchNoResultsView)
+    searchResultsView.addSubview(searchNoResultsView)
     NSLayoutConstraint.activate([
-      searchNoResultsView.topAnchor.constraint(equalTo: containerView.topAnchor),
+      searchNoResultsView.topAnchor.constraint(equalTo: searchResultsView.topAnchor),
-      searchNoResultsView.leadingAnchor.constraint(equalTo: containerView.leadingAnchor),
+      searchNoResultsView.leadingAnchor.constraint(equalTo: searchResultsView.leadingAnchor),
-      searchNoResultsView.trailingAnchor.constraint(equalTo: containerView.trailingAnchor),
+      searchNoResultsView.trailingAnchor.constraint(equalTo: searchResultsView.trailingAnchor),
-      searchNoResultsView.bottomAnchor.constraint(equalTo: containerView.bottomAnchor)
+      searchNoResultsView.bottomAnchor.constraint(equalTo: searchResultsView.bottomAnchor)
     ])
   }
 
   private func layoutSearchingView() {
-    containerView.insertSubview(searchingActivityView, at: 0)
+    searchResultsView.insertSubview(searchingActivityView, at: 0)
     searchingActivityView.translatesAutoresizingMaskIntoConstraints = false
     NSLayoutConstraint.activate([
-      searchingActivityView.leadingAnchor.constraint(equalTo: containerView.leadingAnchor),
+      searchingActivityView.leadingAnchor.constraint(equalTo: searchResultsView.leadingAnchor),
-      searchingActivityView.trailingAnchor.constraint(equalTo: containerView.trailingAnchor),
+      searchingActivityView.trailingAnchor.constraint(equalTo: searchResultsView.trailingAnchor),
-      searchingActivityView.topAnchor.constraint(equalTo: containerView.topAnchor),
+      searchingActivityView.topAnchor.constraint(equalTo: searchResultsView.topAnchor),
-      searchingActivityView.bottomAnchor.constraint(equalTo: containerView.bottomAnchor)
+      searchingActivityView.bottomAnchor.constraint(equalTo: searchResultsView.bottomAnchor)
     ])
   }
 
-  // MARK: - Handle Button Actions
+  // MARK: - Handle Presentation Steps
-  @objc private func handleTapOutside(_ gesture: UITapGestureRecognizer) {
+  private func updateFrameOfPresentedViewInContainerView() {
+    presentationStepsController.updateMaxAvailableFrame()
+    availableAreaView.frame = presentationStepsController.currentFrame
+    view.layoutIfNeeded()
+  }
+
+  @objc
+  private func handleTapOutside(_ gesture: UITapGestureRecognizer) {
     let location = gesture.location(in: view)
     if resultsTableView.frame.contains(location) && searchResults.isEmpty {
       headerView.setIsSearching(false)
     }
   }
 
-  // MARK: - Handle State Updates
+  @objc
-  private func setContent(_ content: ContentState) {
+  private func handlePan(_ gesture: UIPanGestureRecognizer) {
+    interactor?.handle(.didStartDraggingSearch)
+    presentationStepsController.handlePan(gesture)
+  }
+
+  private var presentationUpdateHandler: (ModalPresentationStepsController.StepUpdate) -> Void {
+    { [weak self] update in
+      guard let self else { return }
+      switch update {
+      case .didClose:
+        self.interactor?.handle(.closeSearch)
+      case .didUpdateFrame(let frame):
+        self.presentationFrameDidChange(frame)
+        self.updateDimView(for: frame)
+      case .didUpdateStep(let step):
+        self.interactor?.handle(.didUpdatePresentationStep(step))
+      }
+    }
+  }
+
+  private func updateDimView(for frame: CGRect) {
+    guard let dimView else { return }
+    let currentTop = frame.origin.y
+    let maxTop = presentationStepsController.maxAvailableFrame.origin.y
+    let alpha = (1 - (currentTop - maxTop) / Constants.dimViewThreshold) * Constants.dimAlpha
+    let isCloseToTop = currentTop - maxTop < Constants.dimViewThreshold
+    let isPortrait = UIApplication.shared.statusBarOrientation.isPortrait
+    let shouldDim = isCloseToTop && isPortrait
+    UIView.animate(withDuration: kDefaultAnimationDuration / 2) {
+      dimView.alpha = shouldDim ? alpha : 0
+      dimView.isHidden = !shouldDim
+    }
+  }
+
+  // MARK: - Handle Content Updates
+  private func setContent(_ content: Content) {
     switch content {
     case .historyAndCategory:
       historyAndCategoryTabViewController.reloadSearchHistory()
@@ -214,7 +313,7 @@ final class SearchOnMapViewController: UIViewController {
     showView(viewToShow(for: content))
   }
 
-  private func viewToShow(for content: ContentState) -> UIView {
+  private func viewToShow(for content: Content) -> UIView {
     switch content {
     case .historyAndCategory:
       return historyAndCategoryTabViewController.view
@@ -232,24 +331,26 @@ final class SearchOnMapViewController: UIViewController {
                                  historyAndCategoryTabViewController.view,
                                  searchNoResultsView,
                                  searchingActivityView].filter { $0 != view }
-    UIView.transition(with: containerView,
+    UIView.animate(withDuration: kDefaultAnimationDuration / 2,
-                      duration: kDefaultAnimationDuration / 2,
+                   delay: 0,
-                      options: [.transitionCrossDissolve, .curveEaseInOut], animations: {
+                   options: .curveEaseInOut,
-      viewsToHide.forEach { viewToHide in
+                   animations: {
-        view.isHidden = false
+      viewsToHide.forEach { $0.alpha = 0 }
-        view.alpha = 1
+      view.alpha = 1
-        viewToHide.isHidden = true
+    }) { _ in
-        viewToHide.alpha = 0
+      viewsToHide.forEach { $0.isHidden = true }
-      }
+      view.isHidden = false
-    })
+    }
   }
 
   private func setIsSearching(_ isSearching: Bool) {
     headerView.setIsSearching(isSearching)
   }
 
-  private func replaceSearchText(with text: String) {
+  private func setSearchText(_ text: String?) {
-    headerView.setSearchText(text)
+    if let text {
+      headerView.setSearchText(text)
+    }
   }
 }
 
@@ -258,20 +359,33 @@ extension SearchOnMapViewController: SearchOnMapView {
   func render(_ viewModel: ViewModel) {
     setContent(viewModel.contentState)
     setIsSearching(viewModel.isTyping)
-    if let searchingText = viewModel.searchingText {
+    setSearchText(viewModel.searchingText)
-      replaceSearchText(with: searchingText)
+    presentationStepsController.setStep(viewModel.presentationStep)
+  }
+
+  func show() {
+    interactor?.handle(.openSearch)
+  }
+
+  func close() {
+    headerView.setIsSearching(false)
+    updateDimView(for: presentationStepsController.hiddenFrame)
+    willMove(toParent: nil)
+    presentationStepsController.close { [weak self] in
+      self?.view.removeFromSuperview()
+      self?.removeFromParent()
     }
   }
 }
 
 // MARK: - ModallyPresentedViewController
 extension SearchOnMapViewController: ModallyPresentedViewController {
-  func translationYDidUpdate(_ translationY: CGFloat) {
+  func presentationFrameDidChange(_ frame: CGRect) {
-    self.containerModalYTranslation = translationY
+    let translationY = frame.origin.y
     resultsTableView.contentInset.bottom = translationY
-    historyAndCategoryTabViewController.translationYDidUpdate(translationY)
+    historyAndCategoryTabViewController.presentationFrameDidChange(frame)
-    searchNoResultsView.translationYDidUpdate(translationY)
+    searchNoResultsView.presentationFrameDidChange(frame)
-    searchingActivityView.translationYDidUpdate(translationY)
+    searchingActivityView.presentationFrameDidChange(frame)
   }
 }
 
@@ -303,60 +417,82 @@ extension SearchOnMapViewController: UITableViewDataSource {
 extension SearchOnMapViewController: UITableViewDelegate {
   func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
     let result = searchResults[indexPath.row]
-    interactor.handle(.didSelectResult(result, withSearchText: headerView.searchText))
+    interactor?.handle(.didSelectResult(result, withSearchText: headerView.searchText))
     tableView.deselectRow(at: indexPath, animated: true)
   }
 
   func scrollViewWillBeginDragging(_ scrollView: UIScrollView) {
-    interactor.handle(.didStartDraggingSearch)
+    interactor?.handle(.didStartDraggingSearch)
-  }
-
-  func scrollViewDidScroll(_ scrollView: UIScrollView) {
-    scrollViewDelegate?.scrollViewDidScroll(scrollView)
-  }
-}
-
-// MARK: - UICollectionViewDataSource
-extension SearchOnMapViewController: UICollectionViewDataSource {
-  func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
-    // TODO: remove search from here
-    Int(Search.resultsCount())
-  }
-
-  func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
-    let cell = collectionView.dequeueReusableCell(withReuseIdentifier: "FilterCell", for: indexPath)
-    return cell
   }
 }
 
 // MARK: - SearchOnMapHeaderViewDelegate
 extension SearchOnMapViewController: SearchOnMapHeaderViewDelegate {
   func searchBarTextDidBeginEditing(_ searchBar: UISearchBar) {
-    interactor.handle(.didStartTyping)
+    interactor?.handle(.didStartTyping)
   }
 
   func searchBar(_ searchBar: UISearchBar, textDidChange searchText: String) {
     guard !searchText.isEmpty else {
-      interactor.handle(.clearButtonDidTap)
+      interactor?.handle(.clearButtonDidTap)
       return
     }
-    interactor.handle(.didType(SearchText(searchText, locale: searchBar.textInputMode?.primaryLanguage)))
+    interactor?.handle(.didType(SearchText(searchText, locale: searchBar.textInputMode?.primaryLanguage)))
   }
 
   func searchBarSearchButtonClicked(_ searchBar: UISearchBar) {
     guard let searchText = searchBar.text, !searchText.isEmpty else { return }
-    interactor.handle(.searchButtonDidTap(SearchText(searchText, locale: searchBar.textInputMode?.primaryLanguage)))
+    interactor?.handle(.searchButtonDidTap(SearchText(searchText, locale: searchBar.textInputMode?.primaryLanguage)))
   }
 
   func cancelButtonDidTap() {
-    interactor.handle(.closeSearch)
+    interactor?.handle(.closeSearch)
+  }
+
+  func grabberDidTap() {
+    interactor?.handle(.didUpdatePresentationStep(.fullScreen))
   }
 }
 
 // MARK: - SearchTabViewControllerDelegate
 extension SearchOnMapViewController: SearchTabViewControllerDelegate {
   func searchTabController(_ viewController: SearchTabViewController, didSearch text: String, withCategory: Bool) {
-    interactor.handle(.didSelectText(SearchText(text, locale: nil), isCategory: withCategory))
+    interactor?.handle(.didSelectText(SearchText(text, locale: nil), isCategory: withCategory))
   }
 }
 
+// MARK: - UIGestureRecognizerDelegate
+extension SearchOnMapViewController: UIGestureRecognizerDelegate {
+  func gestureRecognizerShouldBegin(_ gestureRecognizer: UIGestureRecognizer) -> Bool {
+    true
+  }
+
+  func gestureRecognizer(_ gestureRecognizer: UIGestureRecognizer, shouldRecognizeSimultaneouslyWith otherGestureRecognizer: UIGestureRecognizer) -> Bool {
+    if gestureRecognizer is UIPanGestureRecognizer && otherGestureRecognizer is UIPanGestureRecognizer {
+      // threshold is used to soften transition from the internal scroll zero content offset
+      return internalScrollViewContentOffset < Constants.panGestureThreshold
+    }
+    return false
+  }
+}
+
+// MARK: - SearchOnMapScrollViewDelegate
+extension SearchOnMapViewController: SearchOnMapScrollViewDelegate {
+  func scrollViewDidScroll(_ scrollView: UIScrollView) {
+    let hasReachedTheTop = Int(availableAreaView.frame.origin.y) > Int(presentationStepsController.maxAvailableFrame.origin.y)
+    let hasZeroContentOffset = internalScrollViewContentOffset == 0
+    if hasReachedTheTop && hasZeroContentOffset {
+      // prevent the internal scroll view scrolling
+      scrollView.contentOffset.y = internalScrollViewContentOffset
+      return
+    }
+    internalScrollViewContentOffset = scrollView.contentOffset.y
+  }
+
+  func scrollViewWillEndDragging(_ scrollView: UIScrollView, withVelocity velocity: CGPoint, targetContentOffset: UnsafeMutablePointer<CGPoint>) {
+    // lock internal scroll view when the user fast scrolls screen to the top
+    if internalScrollViewContentOffset == 0 {
+      targetContentOffset.pointee = .zero
+    }
+  }
+}

iphone/Maps/UI/Search/Tabs/CategoriesTab/SearchCategoriesViewController.swift

@@ -45,6 +45,10 @@ final class SearchCategoriesViewController: MWMTableViewController {
     delegate?.scrollViewDidScroll(scrollView)
   }
 
+  override func scrollViewWillEndDragging(_ scrollView: UIScrollView, withVelocity velocity: CGPoint, targetContentOffset: UnsafeMutablePointer<CGPoint>) {
+    delegate?.scrollViewWillEndDragging(scrollView, withVelocity: velocity, targetContentOffset: targetContentOffset)
+  }
+
   func category(at indexPath: IndexPath) -> String {
     let index = indexPath.row
     return categories[index]
@@ -52,8 +56,8 @@ final class SearchCategoriesViewController: MWMTableViewController {
 }
 
 extension SearchCategoriesViewController: ModallyPresentedViewController {
-  func translationYDidUpdate(_ translationY: CGFloat) {
+  func presentationFrameDidChange(_ frame: CGRect) {
     guard isViewLoaded else { return }
-    tableView.contentInset.bottom = translationY + view.safeAreaInsets.bottom
+    tableView.contentInset.bottom = frame.origin.y + view.safeAreaInsets.bottom
   }
 }

iphone/Maps/UI/Search/Tabs/HistoryTab/SearchHistoryViewController.swift

@@ -122,9 +122,9 @@ extension SearchHistoryViewController: UITableViewDelegate {
 }
 
 extension SearchHistoryViewController: ModallyPresentedViewController {
-  func translationYDidUpdate(_ translationY: CGFloat) {
+  func presentationFrameDidChange(_ frame: CGRect) {
     guard isViewLoaded else { return }
-    tableView.contentInset.bottom = translationY
+    tableView.contentInset.bottom = frame.origin.y
-    emptyHistoryView.translationYDidUpdate(translationY)
+    emptyHistoryView.presentationFrameDidChange(frame)
   }
 }

iphone/Maps/UI/Search/Tabs/SearchTabViewController.swift

@@ -54,8 +54,8 @@ final class SearchTabViewController: TabViewController {
 }
 
 extension SearchTabViewController: ModallyPresentedViewController {
-  func translationYDidUpdate(_ translationY: CGFloat) {
+  func presentationFrameDidChange(_ frame: CGRect) {
-    viewControllers.forEach { ($0 as? ModallyPresentedViewController)?.translationYDidUpdate(translationY) }
+    viewControllers.forEach { ($0 as? ModallyPresentedViewController)?.presentationFrameDidChange(frame) }
   }
 }
 
@@ -63,6 +63,10 @@ extension SearchTabViewController: SearchOnMapScrollViewDelegate {
   func scrollViewDidScroll(_ scrollView: UIScrollView) {
     delegate?.scrollViewDidScroll(scrollView)
   }
+
+  func scrollViewWillEndDragging(_ scrollView: UIScrollView, withVelocity velocity: CGPoint, targetContentOffset: UnsafeMutablePointer<CGPoint>) {
+    delegate?.scrollViewWillEndDragging(scrollView, withVelocity: velocity, targetContentOffset: targetContentOffset)
+  }
 }
 
 extension SearchTabViewController: SearchCategoriesViewControllerDelegate {

iphone/Maps/UI/Storyboard/Main.storyboard

@@ -194,11 +194,15 @@
                         <outlet property="carplayPlaceholderView" destination="ixC-IZ-Pvs" id="3rZ-Kn-VBS"/>
                         <outlet property="controlsView" destination="rL1-9E-4b7" id="sfV-7X-WlR"/>
                         <outlet property="mapView" destination="aPn-pa-nCx" id="tCi-LW-1ll"/>
+                        <outlet property="placePageArea" destination="awj-9E-eBS" id="nDP-as-zc2"/>
                         <outlet property="placePageAreaKeyboard" destination="PFs-sL-oVA" id="O3P-ia-ZlX"/>
+                        <outlet property="sideButtonsArea" destination="xJx-UU-IdV" id="Qug-gg-Za8"/>
                         <outlet property="sideButtonsAreaBottom" destination="VfU-Zk-8IU" id="MvP-Ki-4wP"/>
                         <outlet property="sideButtonsAreaKeyboard" destination="SDX-4J-Jz5" id="kv9-zX-hbD"/>
+                        <outlet property="trafficButtonArea" destination="QKu-4A-UgP" id="uJI-rT-zGt"/>
                         <outlet property="visibleAreaBottom" destination="OE7-Qb-J0v" id="isp-aT-LtA"/>
                         <outlet property="visibleAreaKeyboard" destination="YUs-MJ-9w8" id="UJP-KT-2uK"/>
+                        <outlet property="widgetsArea" destination="NI8-tV-i2B" id="xU3-51-vHe"/>
                         <segue destination="Lfa-Zp-orR" kind="custom" identifier="Map2EditorSegue" customClass="MWMSegue" id="OEF-kR-jKi"/>
                         <segue destination="QlF-CJ-cEG" kind="custom" identifier="MapToCategorySelectorSegue" customClass="MWMSegue" id="4Cc-99-mlN"/>
                         <segue destination="5Wc-fy-NOW" kind="custom" identifier="Map2OsmLogin" customClass="MWMSegue" id="7YC-t5-0WN"/>