diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.h b/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.h index b1212d66b1..261c6c279a 100644 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.h +++ b/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.h @@ -27,10 +27,11 @@ - (instancetype)init __attribute__((unavailable("init is not available"))); - (instancetype)initWithParentController:(MapViewController *)controller; -- (void)setTopBound:(CGFloat)bound; #pragma mark - Layout +@property (nonatomic) CGFloat topBound; + - (void)willRotateToInterfaceOrientation:(UIInterfaceOrientation)orientation; #pragma mark - MWMPlacePageViewManager diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.mm b/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.mm index dd574203f6..f8d7c54415 100644 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.mm +++ b/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.mm @@ -51,12 +51,6 @@ return self; } -- (void)setTopBound:(CGFloat)bound -{ - [self.zoomButtons setTopBound:bound]; - [self.placePageManager setTopBound:bound]; -} - #pragma mark - Layout - (void)willRotateToInterfaceOrientation:(UIInterfaceOrientation)orientation @@ -115,6 +109,13 @@ // GetFramework().BuildRoute(self.routeDestination, 0 /* timeoutSec */); } +- (void)navigationDashBoardDidUpdate +{ + CGFloat const topBound = self.topBound + self.navigationManager.height; + [self.zoomButtons setTopBound:topBound]; + [self.placePageManager setTopBound:topBound]; +} + #pragma mark - Properties @synthesize menuState = _menuState; @@ -160,4 +161,10 @@ return self.placePageManager.isDirectionViewShown; } +- (void)setTopBound:(CGFloat)topBound +{ + _topBound = topBound; + self.navigationManager.topBound = topBound; +} + @end diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager.h b/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager.h index 2fb013f46f..8dabc48434 100644 --- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager.h +++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager.h @@ -23,11 +23,16 @@ typedef NS_ENUM(NSUInteger, MWMNavigationDashboardState) - (void)buildRouteWithType:(enum MWMNavigationRouteType)type; +- (void)navigationDashBoardDidUpdate; + @end @interface MWMNavigationDashboardManager : NSObject @property (nonatomic) MWMNavigationDashboardState state; +@property (nonatomic) CGFloat topBound; +@property (nonatomic, readonly) CGFloat height; + - (instancetype)init __attribute__((unavailable("init is not available"))); - (instancetype)initWithParentView:(UIView *)view delegate:(id)delegate; diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager.mm b/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager.mm index 1397d2c3dd..cd3daa0e5f 100644 --- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager.mm +++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager.mm @@ -75,7 +75,7 @@ - (IBAction)routePreviewChange:(UIButton *)sender { - self.routePreview.showGoButton = [sender isEqual:self.routePreview.pedestrian]; + [self showGoButton:[sender isEqual:self.routePreview.pedestrian]]; // enum MWMNavigationRouteType const type = [sender isEqual:self.routePreview.pedestrian] ? MWMNavigationRouteTypePedestrian : MWMNavigationRouteTypeVehicle; // [self.delegate buildRouteWithType:type]; } @@ -113,6 +113,12 @@ [self.navigationDashboard addToView:self.ownerView]; } +- (void)showGoButton:(BOOL)show +{ + self.routePreviewPortrait.showGoButton = self.routePreviewLandscape.showGoButton = show; + [self.delegate navigationDashBoardDidUpdate]; +} + #pragma mark - Properties - (void)setState:(MWMNavigationDashboardState)state @@ -134,6 +140,29 @@ break; } _state = state; + [self.delegate navigationDashBoardDidUpdate]; +} + +- (void)setTopBound:(CGFloat)topBound +{ + _topBound = self.routePreviewLandscape.topBound = self.routePreviewPortrait.topBound = self.navigationDashboardLandscape.topBound = self.navigationDashboardPortrait.topBound = topBound; + [self.delegate navigationDashBoardDidUpdate]; +} + +- (CGFloat)height +{ + switch (self.state) + { + case MWMNavigationDashboardStateHidden: + return 0.0; + break; + case MWMNavigationDashboardStatePlanning: + return self.routePreview.visibleHeight; + break; + case MWMNavigationDashboardStateNavigation: + return self.navigationDashboard.height; + break; + } } @end diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/Dashboard/MWMLandscapeNavigationDashboard.xib b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/Dashboard/MWMLandscapeNavigationDashboard.xib index 86a23cba5f..358d51708a 100644 --- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/Dashboard/MWMLandscapeNavigationDashboard.xib +++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/Dashboard/MWMLandscapeNavigationDashboard.xib @@ -1,5 +1,5 @@ - + @@ -7,136 +7,158 @@ - + - - + + - - - + + - + - + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - + + + + + - - + + - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + - - - - - + + + + + + diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/Dashboard/MWMNavigationDashboard.h b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/Dashboard/MWMNavigationDashboard.h index 8c38199be8..36cbe27364 100644 --- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/Dashboard/MWMNavigationDashboard.h +++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/Dashboard/MWMNavigationDashboard.h @@ -15,5 +15,6 @@ @property (weak, nonatomic) IBOutlet UILabel * distanceToNextActionUnits; @property (weak, nonatomic) IBOutlet UILabel * distanceLeft; @property (weak, nonatomic) IBOutlet UILabel * eta; +@property (weak, nonatomic) IBOutlet UILabel * arrivalsTimeLabel; @end diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/Dashboard/MWMPortraitNavigationDashboard.xib b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/Dashboard/MWMPortraitNavigationDashboard.xib index 6ebf8d19b5..51082ee4e6 100644 --- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/Dashboard/MWMPortraitNavigationDashboard.xib +++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/Dashboard/MWMPortraitNavigationDashboard.xib @@ -1,5 +1,5 @@ - + @@ -7,103 +7,100 @@ - + - - + + - - - + + - + - + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - + + + + + - - + + - - - - - - - - - - + + + + + + + + + - - - - - - + + + + + + - - - - - + + + + + diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/MWMNavigationView.h b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/MWMNavigationView.h index c14009d42b..8c9dac9c4c 100644 --- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/MWMNavigationView.h +++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/MWMNavigationView.h @@ -10,7 +10,8 @@ @interface MWMNavigationView : SolidTouchView -@property (nonatomic) CGFloat topOffset; +@property (nonatomic) CGFloat topBound; +@property (nonatomic, readonly) CGFloat visibleHeight; @property (nonatomic, readonly) BOOL isVisible; - (void)addToView:(UIView *)superview; diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/MWMNavigationView.m b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/MWMNavigationView.m index 641f954b28..8679df9b21 100644 --- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/MWMNavigationView.m +++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/MWMNavigationView.m @@ -13,6 +13,9 @@ @property (nonatomic) BOOL isVisible; @property (nonatomic) CGFloat defaultHeight; +@property (nonatomic) UIView * statusbarBackground; +@property (weak, nonatomic) IBOutlet UIView * contentView; + @end @implementation MWMNavigationView @@ -20,12 +23,15 @@ - (void)awakeFromNib { [super awakeFromNib]; + self.statusbarBackground = [[UIView alloc] initWithFrame:CGRectZero]; + self.statusbarBackground.backgroundColor = self.contentView.backgroundColor; self.defaultHeight = self.height; + self.topBound = 0.0; } - (void)addToView:(UIView *)superview { - [superview addSubview:self]; + [superview insertSubview:self atIndex:0]; self.frame = self.defaultFrame; self.isVisible = YES; } @@ -38,27 +44,44 @@ - (void)layoutSubviews { [UIView animateWithDuration:0.2 animations:^ - { - self.frame = self.defaultFrame; - } - completion:^(BOOL finished) - { - if (!self.isVisible) - [self removeFromSuperview]; - }]; + { + self.frame = self.defaultFrame; + [self layoutStatusbar]; + } + completion:^(BOOL finished) + { + if (!self.isVisible) + [self removeFromSuperview]; + }]; [super layoutSubviews]; } +- (void)layoutStatusbar +{ + CGRect const statusBarFrame = UIApplication.sharedApplication.statusBarFrame; + if (self.topBound <= statusBarFrame.size.height) + { + if (![self.statusbarBackground.superview isEqual:self]) + [self addSubview:self.statusbarBackground]; + self.statusbarBackground.frame = statusBarFrame; + self.statusbarBackground.maxY = 0.0; + } + else + { + [self.statusbarBackground removeFromSuperview]; + } +} + #pragma mark - Properties - (CGRect)defaultFrame { - return CGRectMake(0.0, self.topOffset - (self.isVisible ? 0.0 : self.defaultHeight), self.superview.width, self.defaultHeight); + return CGRectMake(0.0, self.topBound - (self.isVisible ? 0.0 : self.defaultHeight), self.superview.width, self.defaultHeight); } -- (void)setTopOffset:(CGFloat)topOffset +- (void)setTopBound:(CGFloat)topBound { - _topOffset = topOffset; + _topBound = MAX(topBound, UIApplication.sharedApplication.statusBarFrame.size.height); [self layoutSubviews]; } @@ -68,4 +91,12 @@ [self layoutSubviews]; } +- (CGFloat)visibleHeight +{ + CGFloat height = self.contentView.height; + if ([self.statusbarBackground.superview isEqual:self]) + height += self.statusbarBackground.height; + return height; +} + @end diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMLandscapeRoutePreview.xib b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMLandscapeRoutePreview.xib index 667eec8f80..27293feb41 100644 --- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMLandscapeRoutePreview.xib +++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMLandscapeRoutePreview.xib @@ -12,11 +12,11 @@ - + - + - + + + + + + + + + + + + + + + + + + + + + + + - + @@ -95,14 +161,17 @@ - + - - - - + + + + + + - + + @@ -118,17 +187,28 @@ + + + + + + + + + + + diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMPortraitRoutePreview.xib b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMPortraitRoutePreview.xib index 827165f343..14669eb9a4 100644 --- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMPortraitRoutePreview.xib +++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMPortraitRoutePreview.xib @@ -7,19 +7,19 @@ - + - - + + - - - + + - - - - + + - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + + + + + + + + + + - - - - - - + + + + + + - - - - - + + + + + + + + + + + + + + diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMRoutePreview.h b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMRoutePreview.h index 06c1c80cf9..9b0657313a 100644 --- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMRoutePreview.h +++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMRoutePreview.h @@ -15,5 +15,8 @@ @property (weak, nonatomic) IBOutlet UILabel * status; @property (weak, nonatomic) IBOutlet UIButton * pedestrian; @property (weak, nonatomic) IBOutlet UIButton * vehicle; +@property (weak, nonatomic) IBOutlet UILabel * timeLabel; +@property (weak, nonatomic) IBOutlet UILabel * distanceLabel; +@property (weak, nonatomic) IBOutlet UILabel * arrivalsLabel; @end diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMRoutePreview.m b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMRoutePreview.m index d6e98a9f6d..ce85e379d7 100644 --- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMRoutePreview.m +++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMRoutePreview.m @@ -13,6 +13,10 @@ @property (nonatomic) CGFloat goButtonHiddenOffset; @property (weak, nonatomic) IBOutlet NSLayoutConstraint * goButtonVerticalOffset; +@property (weak, nonatomic) IBOutlet UIView * statusBox; +@property (weak, nonatomic) IBOutlet UIView * completeBox; + +@property (weak, nonatomic) IBOutlet NSLayoutConstraint * goButtonHeight; @end @@ -22,6 +26,7 @@ { [super awakeFromNib]; self.goButtonHiddenOffset = self.goButtonVerticalOffset.constant; + self.completeBox.hidden = YES; } - (IBAction)routeTypePressed:(UIButton *)sender @@ -37,7 +42,17 @@ _showGoButton = showGoButton; [self layoutIfNeeded]; self.goButtonVerticalOffset.constant = showGoButton ? 0.0 : self.goButtonHiddenOffset; + self.statusBox.hidden = YES; + self.completeBox.hidden = NO; [UIView animateWithDuration:0.2 animations:^{ [self layoutIfNeeded]; }]; } +- (CGFloat)visibleHeight +{ + CGFloat height = super.visibleHeight; + if (self.showGoButton) + height += self.goButtonHeight.constant; + return height; +} + @end diff --git a/iphone/Maps/Classes/MapViewController.mm b/iphone/Maps/Classes/MapViewController.mm index 506c5b8a06..6a8df5cb96 100644 --- a/iphone/Maps/Classes/MapViewController.mm +++ b/iphone/Maps/Classes/MapViewController.mm @@ -48,8 +48,7 @@ typedef NS_ENUM(NSUInteger, UserTouchesAction) typedef NS_OPTIONS(NSUInteger, MapInfoView) { - MapInfoViewRoute = 1 << 0, - MapInfoViewSearch = 1 << 1 + MapInfoViewSearch = 1 << 0 }; @interface NSValueWrapper : NSObject @@ -572,7 +571,7 @@ typedef NS_OPTIONS(NSUInteger, MapInfoView) { [super viewDidLoad]; self.view.clipsToBounds = YES; - [self.view addSubview:self.routeViewWrapper]; +// [self.view addSubview:self.routeViewWrapper]; self.controlsManager = [[MWMMapViewControlsManager alloc] initWithParentController:self]; [self.view addSubview:self.searchView]; __weak MapViewController * weakSelf = self; @@ -938,10 +937,6 @@ typedef NS_OPTIONS(NSUInteger, MapInfoView) - (void)routeViewWillEnterState:(RouteViewState)state { - if (state == RouteViewStateHidden) - [self clearMapInfoViewFlag:MapInfoViewRoute]; - else - [self setMapInfoViewFlag:MapInfoViewRoute]; } - (void)routeViewDidEnterState:(RouteViewState)state @@ -1146,11 +1141,6 @@ NSInteger compareAddress(id l, id r, void * context) - (void)updateInfoViews { CGFloat topBound = 0.0; - if ([self testMapInfoViewFlag:MapInfoViewRoute]) - { - CGRect const routeRect = self.routeViewWrapper.frame; - topBound = MAX(topBound, routeRect.origin.y + routeRect.size.height); - } if ([self testMapInfoViewFlag:MapInfoViewSearch]) { CGRect const searchRect = self.searchView.infoRect; diff --git a/iphone/Maps/Maps.xcodeproj/project.pbxproj b/iphone/Maps/Maps.xcodeproj/project.pbxproj index d727a1dc19..7f9a61eac3 100644 --- a/iphone/Maps/Maps.xcodeproj/project.pbxproj +++ b/iphone/Maps/Maps.xcodeproj/project.pbxproj @@ -203,9 +203,6 @@ F63732961AE9431E00A03764 /* MWMBasePlacePageView.mm in Sources */ = {isa = PBXBuildFile; fileRef = F63732951AE9431E00A03764 /* MWMBasePlacePageView.mm */; }; F63774E71B59375E00BCF54D /* MWMRoutingDisclaimerAlert.xib in Resources */ = {isa = PBXBuildFile; fileRef = F63774E61B59375E00BCF54D /* MWMRoutingDisclaimerAlert.xib */; }; F63774EA1B59376F00BCF54D /* MWMRoutingDisclaimerAlert.mm in Sources */ = {isa = PBXBuildFile; fileRef = F63774E91B59376F00BCF54D /* MWMRoutingDisclaimerAlert.mm */; }; - F63774E41B57F55300BCF54D /* MWMNavigationDashboard.xib in Resources */ = {isa = PBXBuildFile; fileRef = F63774E31B57F55300BCF54D /* MWMNavigationDashboard.xib */; }; - F63774ED1B5CEF9E00BCF54D /* MWMNavigationDashboard.mm in Sources */ = {isa = PBXBuildFile; fileRef = F63774EC1B5CEF9E00BCF54D /* MWMNavigationDashboard.mm */; }; - F63774F01B5CF25D00BCF54D /* MWMNavigationDashboardManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = F63774EF1B5CF25D00BCF54D /* MWMNavigationDashboardManager.mm */; }; F64F19991AB81A00006EAF7E /* MWMAlertViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = F64F19821AB81A00006EAF7E /* MWMAlertViewController.mm */; }; F64F199A1AB81A00006EAF7E /* MWMAlertViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = F64F19831AB81A00006EAF7E /* MWMAlertViewController.xib */; }; F64F199B1AB81A00006EAF7E /* MWMAlert.mm in Sources */ = {isa = PBXBuildFile; fileRef = F64F19861AB81A00006EAF7E /* MWMAlert.mm */; }; @@ -628,11 +625,6 @@ F63774E61B59375E00BCF54D /* MWMRoutingDisclaimerAlert.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMRoutingDisclaimerAlert.xib; sourceTree = ""; }; F63774E81B59376F00BCF54D /* MWMRoutingDisclaimerAlert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMRoutingDisclaimerAlert.h; sourceTree = ""; }; F63774E91B59376F00BCF54D /* MWMRoutingDisclaimerAlert.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMRoutingDisclaimerAlert.mm; sourceTree = ""; }; - F63774E31B57F55300BCF54D /* MWMNavigationDashboard.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMNavigationDashboard.xib; sourceTree = ""; }; - F63774EB1B5CEF9E00BCF54D /* MWMNavigationDashboard.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMNavigationDashboard.h; sourceTree = ""; }; - F63774EC1B5CEF9E00BCF54D /* MWMNavigationDashboard.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMNavigationDashboard.mm; sourceTree = ""; }; - F63774EE1B5CF25D00BCF54D /* MWMNavigationDashboardManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMNavigationDashboardManager.h; sourceTree = ""; }; - F63774EF1B5CF25D00BCF54D /* MWMNavigationDashboardManager.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMNavigationDashboardManager.mm; sourceTree = ""; }; F64F19811AB81A00006EAF7E /* MWMAlertViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMAlertViewController.h; sourceTree = ""; }; F64F19821AB81A00006EAF7E /* MWMAlertViewController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMAlertViewController.mm; sourceTree = ""; }; F64F19831AB81A00006EAF7E /* MWMAlertViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMAlertViewController.xib; sourceTree = ""; }; @@ -1479,18 +1471,6 @@ path = RoutingDisclaimerAlert; sourceTree = ""; }; - F63774E21B57F54300BCF54D /* NavigationDashboard */ = { - isa = PBXGroup; - children = ( - F63774E31B57F55300BCF54D /* MWMNavigationDashboard.xib */, - F63774EB1B5CEF9E00BCF54D /* MWMNavigationDashboard.h */, - F63774EC1B5CEF9E00BCF54D /* MWMNavigationDashboard.mm */, - F63774EE1B5CF25D00BCF54D /* MWMNavigationDashboardManager.h */, - F63774EF1B5CF25D00BCF54D /* MWMNavigationDashboardManager.mm */, - ); - path = NavigationDashboard; - sourceTree = ""; - }; F64F195F1AB8125C006EAF7E /* CustomAlert */ = { isa = PBXGroup; children = ( @@ -2305,7 +2285,7 @@ 1D3623260D0F684500981E51 /* MapsAppDelegate.mm in Sources */, F67BBB571AC54A7800D162C7 /* MWMFeedbackAlert.mm in Sources */, 34D783D71B5F9D7800E0C0EE /* MWMRoutePreview.m in Sources */, - 349A35831B53E967009677EE /* MWMDownloadMapRequest.m in Sources */, + 349A35831B53E967009677EE /* MWMDownloadMapRequest.mm in Sources */, A32B6D4C1A14980500E54A65 /* iosOGLContext.mm in Sources */, B0E1FCDF1A2343BC00A8E08B /* NextTurnPhoneView.m in Sources */, 46F26CD810F623BA00ECCA39 /* EAGLView.mm in Sources */,