diff options
author | VladiMihaylenko <vxmihaylenko@gmail.com> | 2016-12-09 15:35:55 +0300 |
---|---|---|
committer | Илья Гречухин <i.grechuhin@gmail.com> | 2016-12-09 15:44:53 +0300 |
commit | e10dd2b4afd7b3271c730b5506c93d99fa14a4cb (patch) | |
tree | ed549a6a774d4916e3d435513eecaed668e4c5c0 /iphone/Maps | |
parent | 12e04098d153418bd3c95b076007ab3b0f5da78e (diff) |
[ios] Renamed methods.
Diffstat (limited to 'iphone/Maps')
-rw-r--r-- | iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.mm | 6 | ||||
-rw-r--r-- | iphone/Maps/Classes/MWMPlacePageManager.mm | 12 | ||||
-rw-r--r-- | iphone/Maps/Classes/MWMPlacePageProtocol.h | 5 |
3 files changed, 10 insertions, 13 deletions
diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.mm b/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.mm index fd59fad917..06181acb28 100644 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.mm +++ b/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.mm @@ -133,13 +133,13 @@ extern NSString * const kAlohalyticsTapEventKey; - (void)dismissPlacePage { self.trafficButtonHidden = NO; - [self.placePageManager hidePlacePage]; + [self.placePageManager close]; } - (void)showPlacePage:(place_page::Info const &)info { self.trafficButtonHidden = YES; - [self.placePageManager showPlacePage:info]; + [self.placePageManager show:info]; if (IPAD) { auto ownerView = self.ownerController.view; @@ -278,7 +278,7 @@ extern NSString * const kAlohalyticsTapEventKey; self.menuState = MWMBottomMenuStateHidden; MapViewController * ownerController = self.ownerController; static_cast<EAGLView *>(ownerController.view).widgetsManager.fullScreen = YES; - [self.placePageManager dismissPlacePage]; + [self.placePageManager close]; self.searchManager.state = MWMSearchManagerStateHidden; [MWMAddPlaceNavigationBar showInSuperview:ownerController.view diff --git a/iphone/Maps/Classes/MWMPlacePageManager.mm b/iphone/Maps/Classes/MWMPlacePageManager.mm index 2801ef6452..bc31299ad9 100644 --- a/iphone/Maps/Classes/MWMPlacePageManager.mm +++ b/iphone/Maps/Classes/MWMPlacePageManager.mm @@ -32,7 +32,7 @@ @implementation MWMPlacePageManager -- (void)showPlacePage:(place_page::Info const &)info +- (void)show:(place_page::Info const &)info { self.currentDownloaderStatus = storage::NodeStatus::Undefined; [MWMFrameworkListener addObserver:self]; @@ -55,7 +55,7 @@ [self processCountryEvent:self.data.countryId]; } -- (void)closePlacePage +- (void)close { [self.layout close]; [MWMLocationManager removeObserver:self]; @@ -157,32 +157,30 @@ } - (void)mwm_refreshUI { [self.layout mwm_refreshUI]; } -- (void)dismissPlacePage { [self closePlacePage]; } -- (void)hidePlacePage { [self closePlacePage]; } - (void)routeFrom { [Statistics logEvent:kStatEventName(kStatPlacePage, kStatBuildRoute) withParameters:@{kStatValue : kStatSource}]; + [self close]; [[MWMRouter router] buildFromPoint:self.target bestRouter:YES]; - [self closePlacePage]; } - (void)routeTo { [Statistics logEvent:kStatEventName(kStatPlacePage, kStatBuildRoute) withParameters:@{kStatValue : kStatDestination}]; + [self close]; [[MWMRouter router] buildToPoint:self.target bestRouter:YES]; - [self closePlacePage]; } - (void)taxiTo { [Statistics logEvent:kStatPlacePageTaxiClick withParameters:@{kStatProvider : kStatUber, kStatTags : self.data.statisticsTags}]; + [self close]; auto router = [MWMRouter router]; router.type = routing::RouterType::Taxi; [router buildToPoint:self.target bestRouter:NO]; - [self closePlacePage]; } - (MWMRoutePoint)target diff --git a/iphone/Maps/Classes/MWMPlacePageProtocol.h b/iphone/Maps/Classes/MWMPlacePageProtocol.h index 82dc518086..e754ac68cc 100644 --- a/iphone/Maps/Classes/MWMPlacePageProtocol.h +++ b/iphone/Maps/Classes/MWMPlacePageProtocol.h @@ -46,10 +46,9 @@ struct FeatureID; @property(nonatomic) CGFloat topBound; @property(nonatomic) CGFloat leftBound; -- (void)showPlacePage:(place_page::Info const &)info; +- (void)show:(place_page::Info const &)info; +- (void)close; - (void)mwm_refreshUI; -- (void)dismissPlacePage; -- (void)hidePlacePage; - (void)willRotateToInterfaceOrientation:(UIInterfaceOrientation)orientation; - (void)viewWillTransitionToSize:(CGSize)size withTransitionCoordinator:(id<UIViewControllerTransitionCoordinator>)coordinator; |