diff options
author | VladiMihaylenko <vxmihaylenko@gmail.com> | 2016-10-06 14:19:33 +0300 |
---|---|---|
committer | VladiMihaylenko <vxmihaylenko@gmail.com> | 2016-10-18 18:21:41 +0300 |
commit | 1ab061d3ac12f63d95c023da57148dbf45dc2c2a (patch) | |
tree | 78b18c50cd8b4db99225b81e139ff967ddc86d9f /iphone/Maps/Classes/CustomViews/MapViewControls | |
parent | 54798069b30de479fd804e44a1a036ea3db1c753 (diff) |
[ios] Review fixes
Diffstat (limited to 'iphone/Maps/Classes/CustomViews/MapViewControls')
2 files changed, 7 insertions, 28 deletions
diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.mm b/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.mm index 06f83de0a5..d018df6039 100644 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.mm +++ b/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.mm @@ -69,6 +69,7 @@ extern NSString * const kAlohalyticsTapEventKey; self.ownerController = controller; self.hidden = NO; self.sideButtonsHidden = NO; + self.isDirectionViewHidden = YES; self.menuState = MWMBottomMenuStateInactive; self.menuRestoreState = MWMBottomMenuStateInactive; return self; @@ -293,24 +294,7 @@ extern NSString * const kAlohalyticsTapEventKey; { if (IPAD) return; - if (isIOS7) - { - CGSize const ownerViewSize = self.ownerController.view.size; - if (ownerViewSize.width > ownerViewSize.height) - { - CGFloat const leftBound = frame.origin.x + frame.size.width; - self.menuController.leftBound = leftBound; - [MWMNavigationDashboardManager manager].leftBound = leftBound; - } - else - { - [self.sideButtons setBottomBound:frame.origin.y]; - } - } - else - { - [self.sideButtons setBottomBound:frame.origin.y]; - } + [self.sideButtons setBottomBound:frame.origin.y]; } - (void)addPlacePageViews:(NSArray *)views @@ -467,13 +451,12 @@ extern NSString * const kAlohalyticsTapEventKey; return _menuController; } -- (id)placePageManager +- (id<MWMPlacePageProtocol>)placePageManager { - auto const PlacePageClass = isIOS7 || IPAD ? [MWMPlacePageViewManager class] : [MWMPlacePageManager class]; + auto const PlacePageClass = IPAD ? [MWMPlacePageViewManager class] : [MWMPlacePageManager class]; if (!_placePageManager) - _placePageManager = - [[PlacePageClass alloc] initWithViewController:self.ownerController]; + _placePageManager = [[PlacePageClass alloc] init]; return _placePageManager; } @@ -564,9 +547,5 @@ extern NSString * const kAlohalyticsTapEventKey; #pragma mark - MWMFeatureHolder -- (id<MWMFeatureHolder>)featureHolder -{ - return self.placePageManager; -} - +- (id<MWMFeatureHolder>)featureHolder { return self.placePageManager; } @end diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/Search/TabbedView/BookmarksTab/MWMSearchBookmarksCell.mm b/iphone/Maps/Classes/CustomViews/MapViewControls/Search/TabbedView/BookmarksTab/MWMSearchBookmarksCell.mm index 3d2ac72aa7..54cf32d377 100644 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/Search/TabbedView/BookmarksTab/MWMSearchBookmarksCell.mm +++ b/iphone/Maps/Classes/CustomViews/MapViewControls/Search/TabbedView/BookmarksTab/MWMSearchBookmarksCell.mm @@ -57,7 +57,7 @@ - (IBAction)openBookmarks { - BookmarksVC * bvc = [[BookmarksVC alloc] initWithCategory:static_cast<int>(self.index)]; + BookmarksVC * bvc = [[BookmarksVC alloc] initWithCategory:self.index]; UINavigationController * rootVC = (UINavigationController *)UIApplication.sharedApplication.delegate.window.rootViewController; [rootVC pushViewController:bvc animated:YES]; } |