From c9a1f827d9d9d11eaf6853e2c83154cdb8d6c5cf Mon Sep 17 00:00:00 2001 From: VladiMihaylenko Date: Wed, 22 Jun 2016 16:08:57 +0300 Subject: [ios] Removed try button from booking what's new. --- .../MapViewControls/MWMMapViewControlsManager.h | 4 ---- .../MapViewControls/MWMMapViewControlsManager.mm | 9 --------- .../Welcome/MWMWhatsNewBookingBicycleRoutingController.mm | 15 ++------------- .../Welcome/PageController/MWMPageController.h | 2 -- .../Welcome/PageController/MWMPageController.mm | 5 ----- 5 files changed, 2 insertions(+), 33 deletions(-) (limited to 'iphone/Maps/Classes/CustomViews') diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.h b/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.h index e00eb59b85..26bb9adb7f 100644 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.h +++ b/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.h @@ -21,10 +21,6 @@ - (instancetype)init __attribute__((unavailable("init is not available"))); - (instancetype)initWithParentController:(MapViewController *)controller; -#pragma mark - Search - -- (void)mapSearchText:(NSString *)text forInputLocale:(NSString *)locale; - #pragma mark - Layout - (void)refreshLayout; diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.mm b/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.mm index 098b7b3b53..b5c292b37b 100644 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.mm +++ b/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.mm @@ -195,15 +195,6 @@ extern NSString * const kAlohalyticsTapEventKey; [self.ownerController.apiBar back]; } -#pragma mark - Search - -- (void)mapSearchText:(NSString *)text forInputLocale:(NSString *)locale -{ - self.searchManager.state = MWMSearchManagerStateDefault; - [self.searchManager searchText:text forInputLocale:locale]; - self.searchManager.state = MWMSearchManagerStateMapSearch; -} - #pragma mark - MWMSearchManagerProtocol - (MWMAlertViewController *)alertController diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/Welcome/MWMWhatsNewBookingBicycleRoutingController.mm b/iphone/Maps/Classes/CustomViews/MapViewControls/Welcome/MWMWhatsNewBookingBicycleRoutingController.mm index e9ac71ddaa..60acbf1099 100644 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/Welcome/MWMWhatsNewBookingBicycleRoutingController.mm +++ b/iphone/Maps/Classes/CustomViews/MapViewControls/Welcome/MWMWhatsNewBookingBicycleRoutingController.mm @@ -17,8 +17,6 @@ @property (weak, nonatomic) IBOutlet NSLayoutConstraint * titleTopOffset; @property (weak, nonatomic) IBOutlet NSLayoutConstraint * titleImageOffset; -- (void)tryBooking; - @end namespace @@ -28,11 +26,7 @@ NSArray * pagesConfigBlocks = @[ controller.image.image = [UIImage imageNamed:@"img_booking"]; controller.alertTitle.text = L(@"whatsnew_booking_header"); controller.alertText.text = L(@"whatsnew_booking_message"); - controller.nextPageButton.hidden = NO; - [controller.nextPageButton setTitle:L(@"button_try") forState:UIControlStateNormal]; - [controller.nextPageButton addTarget:controller - action:@selector(tryBooking) - forControlEvents:UIControlEventTouchUpInside]; + controller.nextPageButton.hidden = YES; } copy], [^(MWMWhatsNewBookingBicycleRoutingController * controller) { controller.image.image = [UIImage imageNamed:@"img_bikecycle_navigation"]; @@ -41,6 +35,7 @@ NSArray * pagesConfigBlocks = @[ controller.nextPageButton.hidden = YES; } copy] ]; + } // namespace @implementation MWMWhatsNewBookingBicycleRoutingController @@ -55,12 +50,6 @@ NSArray * pagesConfigBlocks = @[ return pagesConfigBlocks; } -- (void)tryBooking -{ - [self.pageController mapSearchText:[L(@"hotel") stringByAppendingString:@" "] forInputLocale:nil]; - [self close]; -} - - (IBAction)close { [self.pageController close]; diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/Welcome/PageController/MWMPageController.h b/iphone/Maps/Classes/CustomViews/MapViewControls/Welcome/PageController/MWMPageController.h index 442e47515d..4e4e04a739 100644 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/Welcome/PageController/MWMPageController.h +++ b/iphone/Maps/Classes/CustomViews/MapViewControls/Welcome/PageController/MWMPageController.h @@ -5,7 +5,6 @@ @protocol MWMPageControllerProtocol - (void)closePageController:(MWMPageController *)pageController; -- (void)mapSearchText:(NSString *)text forInputLocale:(NSString *)locale; @end @@ -16,6 +15,5 @@ NS_CLASS_AVAILABLE_IOS(8_0) @interface MWMPageController : UIPageViewController - (void)close; - (void)nextPage; - (void)show; -- (void)mapSearchText:(NSString *)text forInputLocale:(NSString *)locale; @end diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/Welcome/PageController/MWMPageController.mm b/iphone/Maps/Classes/CustomViews/MapViewControls/Welcome/PageController/MWMPageController.mm index 88e365a791..495c07a008 100644 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/Welcome/PageController/MWMPageController.mm +++ b/iphone/Maps/Classes/CustomViews/MapViewControls/Welcome/PageController/MWMPageController.mm @@ -65,11 +65,6 @@ [self didMoveToParentViewController:self.parent]; } -- (void)mapSearchText:(NSString *)text forInputLocale:(NSString *)locale -{ - [self.parent mapSearchText:text forInputLocale:locale]; -} - #pragma mark - Private methods - (void)configure -- cgit v1.2.3