Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mapsme/omim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/iphone
diff options
context:
space:
mode:
authorVladiMihaylenko <vxmihaylenko@gmail.com>2016-06-22 16:08:57 +0300
committerVladiMihaylenko <vxmihaylenko@gmail.com>2016-06-22 16:11:11 +0300
commitc9a1f827d9d9d11eaf6853e2c83154cdb8d6c5cf (patch)
tree74189d4d153ecd6f4a35dfa7096c48062f60a73b /iphone
parent031276d70e0eb4ef937d4cfe6998cf4c4300099a (diff)
[ios] Removed try button from booking what's new.
Diffstat (limited to 'iphone')
-rw-r--r--iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.h4
-rw-r--r--iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.mm9
-rw-r--r--iphone/Maps/Classes/CustomViews/MapViewControls/Welcome/MWMWhatsNewBookingBicycleRoutingController.mm15
-rw-r--r--iphone/Maps/Classes/CustomViews/MapViewControls/Welcome/PageController/MWMPageController.h2
-rw-r--r--iphone/Maps/Classes/CustomViews/MapViewControls/Welcome/PageController/MWMPageController.mm5
-rw-r--r--iphone/Maps/Classes/MapViewController.mm5
6 files changed, 2 insertions, 38 deletions
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<TMWMWelcomeConfigBlock> * 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<TMWMWelcomeConfigBlock> * pagesConfigBlocks = @[
controller.nextPageButton.hidden = YES;
} copy]
];
+
} // namespace
@implementation MWMWhatsNewBookingBicycleRoutingController
@@ -55,12 +50,6 @@ NSArray<TMWMWelcomeConfigBlock> * 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 <NSObject>
- (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
diff --git a/iphone/Maps/Classes/MapViewController.mm b/iphone/Maps/Classes/MapViewController.mm
index 47f2761c29..fa76e96d62 100644
--- a/iphone/Maps/Classes/MapViewController.mm
+++ b/iphone/Maps/Classes/MapViewController.mm
@@ -435,11 +435,6 @@ BOOL gIsFirstMyPositionMode = YES;
self.pageViewController = nil;
}
-- (void)mapSearchText:(NSString *)text forInputLocale:(NSString *)locale
-{
- [self.controlsManager mapSearchText:text forInputLocale:locale];
-}
-
- (void)showViralAlertIfNeeded
{
NSUserDefaults * ud = [NSUserDefaults standardUserDefaults];