From 03848c51990c1f34d0808d54783437a6db85a34b Mon Sep 17 00:00:00 2001 From: Ilya Grechuhin Date: Fri, 12 Feb 2016 13:56:03 +0300 Subject: [PATCH] [ios] Refactoring. --- iphone/Common/RichTextVC.h | 6 +- iphone/Common/WebViewController.h | 5 +- iphone/Maps/Bookmarks/AddSetVC.h | 5 +- iphone/Maps/Bookmarks/BookmarksRootVC.h | 5 +- iphone/Maps/Bookmarks/BookmarksVC.h | 5 +- iphone/Maps/Bookmarks/SelectSetVC.h | 6 +- .../Maps/Classes/Components/MWMController.h | 11 ++++ .../Components/MWMNavigationController.h | 4 ++ .../Components/MWMNavigationController.mm | 38 +++++++++++ .../Components/MWMTableViewController.h | 5 ++ .../Components/MWMTableViewController.mm} | 25 +++++++- .../Classes/Components/MWMViewController.h | 5 ++ .../Classes/Components/MWMViewController.mm | 62 ++++++++++++++++++ .../AlertController/MWMAlertViewController.h | 8 ++- .../AlertController/MWMAlertViewController.mm | 12 +++- .../Classes/CustomAlert/BaseAlert/MWMAlert.h | 2 + .../Classes/CustomAlert/BaseAlert/MWMAlert.mm | 12 +++- .../DefaultAlert/MWMDefaultAlert.h | 2 + .../DefaultAlert/MWMDefaultAlert.mm | 16 ++++- ...orizationForgottenPasswordViewController.h | 4 +- .../MWMAuthorizationLoginViewController.h | 4 +- .../MWMAuthorizationLoginViewController.mm | 2 +- .../MWMAuthorizationOSMLoginViewController.h | 4 +- .../MWMAuthorizationOSMLoginViewController.mm | 5 +- .../MWMAuthorizationSignupViewController.h | 4 +- ...MAuthorizationWebViewLoginViewController.h | 4 +- ...AuthorizationWebViewLoginViewController.mm | 8 +-- .../BottomMenu/MWMBottomMenuViewController.h | 5 +- .../MapViewControls/MWMWhatsNewController.h | 4 +- .../MWMSearchDownloadViewController.h | 4 +- .../MWMSearchTabbedViewController.h | 4 +- .../TableView/MWMSearchTableViewController.h | 6 +- .../Cuisine/MWMCuisineEditorViewController.h | 4 +- .../Classes/Editor/MWMEditorViewController.h | 4 +- .../MWMOpeningHoursEditorViewController.h | 4 +- .../Street/MWMStreetEditorViewController.h | 4 +- .../Classes/MWMBookmarkColorViewController.h | 4 +- .../MWMBookmarkDescriptionViewController.h | 5 +- iphone/Maps/Classes/MWMiPadPlacePage.mm | 4 +- iphone/Maps/Classes/MapViewController.h | 4 +- iphone/Maps/Classes/MapViewController.mm | 19 +++--- iphone/Maps/Classes/MapsAppDelegate.h | 3 +- iphone/Maps/Classes/MapsAppDelegate.mm | 9 +-- iphone/Maps/Classes/NavigationController.h | 6 -- iphone/Maps/Classes/NavigationController.mm | 32 ---------- iphone/Maps/CommunityVC.h | 6 +- iphone/Maps/DownloaderParentVC.h | 6 +- iphone/Maps/DownloaderParentVC.mm | 2 +- iphone/Maps/MWMNightModeController.h | 4 +- .../Maps/MWMRecentTrackSettingsController.h | 4 +- iphone/Maps/MWMTTSLanguageViewController.h | 4 +- iphone/Maps/MWMTTSSettingsViewController.h | 4 +- iphone/Maps/Maps.xcodeproj/project.pbxproj | 58 +++++++++-------- iphone/Maps/Mapsme.storyboard | 48 +++++++------- iphone/Maps/Settings/SettingsViewController.h | 6 +- iphone/Maps/SettingsAndMoreVC.h | 4 +- iphone/Maps/TableViewController.h | 7 -- iphone/Maps/ViewController.h | 6 -- iphone/Maps/ViewController.mm | 64 ------------------- .../geometry.xcodeproj/project.pbxproj | 8 +++ .../platform.xcodeproj/project.pbxproj | 16 +++++ xcode/search/search.xcodeproj/project.pbxproj | 20 +++--- 62 files changed, 372 insertions(+), 289 deletions(-) create mode 100644 iphone/Maps/Classes/Components/MWMController.h create mode 100644 iphone/Maps/Classes/Components/MWMNavigationController.h create mode 100644 iphone/Maps/Classes/Components/MWMNavigationController.mm create mode 100644 iphone/Maps/Classes/Components/MWMTableViewController.h rename iphone/Maps/{TableViewController.mm => Classes/Components/MWMTableViewController.mm} (72%) create mode 100644 iphone/Maps/Classes/Components/MWMViewController.h create mode 100644 iphone/Maps/Classes/Components/MWMViewController.mm delete mode 100644 iphone/Maps/Classes/NavigationController.h delete mode 100644 iphone/Maps/Classes/NavigationController.mm delete mode 100644 iphone/Maps/TableViewController.h delete mode 100644 iphone/Maps/ViewController.h delete mode 100644 iphone/Maps/ViewController.mm diff --git a/iphone/Common/RichTextVC.h b/iphone/Common/RichTextVC.h index 4ee5048dae..de2e7745d1 100644 --- a/iphone/Common/RichTextVC.h +++ b/iphone/Common/RichTextVC.h @@ -1,8 +1,6 @@ +#import "MWMViewController.h" -#import -#import "ViewController.h" - -@interface RichTextVC : ViewController +@interface RichTextVC : MWMViewController - (instancetype)initWithText:(NSString *)text; diff --git a/iphone/Common/WebViewController.h b/iphone/Common/WebViewController.h index f24f76f0fd..be58eafdb3 100644 --- a/iphone/Common/WebViewController.h +++ b/iphone/Common/WebViewController.h @@ -1,7 +1,6 @@ -#import -#import "ViewController.h" +#import "MWMViewController.h" -@interface WebViewController : ViewController +@interface WebViewController : MWMViewController @property (nonatomic) NSURL * m_url; @property (nonatomic) NSString * m_htmlText; diff --git a/iphone/Maps/Bookmarks/AddSetVC.h b/iphone/Maps/Bookmarks/AddSetVC.h index d28cd2ebcb..0cba9b7038 100644 --- a/iphone/Maps/Bookmarks/AddSetVC.h +++ b/iphone/Maps/Bookmarks/AddSetVC.h @@ -1,5 +1,4 @@ -#import -#import "TableViewController.h" +#import "MWMTableViewController.h" @class AddSetVC; @protocol AddSetVCDelegate @@ -8,7 +7,7 @@ @end -@interface AddSetVC : TableViewController +@interface AddSetVC : MWMTableViewController @property (weak, nonatomic) id delegate; diff --git a/iphone/Maps/Bookmarks/BookmarksRootVC.h b/iphone/Maps/Bookmarks/BookmarksRootVC.h index 5e78707923..c1daab8549 100644 --- a/iphone/Maps/Bookmarks/BookmarksRootVC.h +++ b/iphone/Maps/Bookmarks/BookmarksRootVC.h @@ -1,7 +1,6 @@ -#import -#import "TableViewController.h" +#import "MWMTableViewController.h" -@interface BookmarksRootVC : TableViewController +@interface BookmarksRootVC : MWMTableViewController { /// Description for the user: how to create/import bookmarks. /// We store it here to correctly calculate dynamic table footer height depending on the text formatting. diff --git a/iphone/Maps/Bookmarks/BookmarksVC.h b/iphone/Maps/Bookmarks/BookmarksVC.h index 5fba73bb9d..7082345c31 100644 --- a/iphone/Maps/Bookmarks/BookmarksVC.h +++ b/iphone/Maps/Bookmarks/BookmarksVC.h @@ -1,8 +1,7 @@ -#import -#import "TableViewController.h" #import "LocationManager.h" +#import "MWMTableViewController.h" -@interface BookmarksVC : TableViewController +@interface BookmarksVC : MWMTableViewController { LocationManager * m_locationManager; size_t m_categoryIndex; diff --git a/iphone/Maps/Bookmarks/SelectSetVC.h b/iphone/Maps/Bookmarks/SelectSetVC.h index 64946ec8d2..f3b0ee9954 100644 --- a/iphone/Maps/Bookmarks/SelectSetVC.h +++ b/iphone/Maps/Bookmarks/SelectSetVC.h @@ -1,10 +1,8 @@ - -#import -#import "TableViewController.h" +#import "MWMTableViewController.h" @class MWMPlacePageViewManager; -@interface SelectSetVC : TableViewController +@interface SelectSetVC : MWMTableViewController - (instancetype)initWithPlacePageManager:(MWMPlacePageViewManager *)manager; diff --git a/iphone/Maps/Classes/Components/MWMController.h b/iphone/Maps/Classes/Components/MWMController.h new file mode 100644 index 0000000000..aed06f2547 --- /dev/null +++ b/iphone/Maps/Classes/Components/MWMController.h @@ -0,0 +1,11 @@ +@class MWMAlertViewController; + +@protocol MWMController + +@property (nonatomic, readonly) BOOL hasNavigationBar; + +@property (nonatomic, readonly) MWMAlertViewController * alertController; + +- (void)mwm_refreshUI; + +@end diff --git a/iphone/Maps/Classes/Components/MWMNavigationController.h b/iphone/Maps/Classes/Components/MWMNavigationController.h new file mode 100644 index 0000000000..ebd0a9ccf0 --- /dev/null +++ b/iphone/Maps/Classes/Components/MWMNavigationController.h @@ -0,0 +1,4 @@ + +@interface MWMNavigationController : UINavigationController + +@end diff --git a/iphone/Maps/Classes/Components/MWMNavigationController.mm b/iphone/Maps/Classes/Components/MWMNavigationController.mm new file mode 100644 index 0000000000..9ff2461e8f --- /dev/null +++ b/iphone/Maps/Classes/Components/MWMNavigationController.mm @@ -0,0 +1,38 @@ +#import "MapsAppDelegate.h" +#import "MWMController.h" +#import "MWMNavigationController.h" +#import "UIViewController+Navigation.h" + +@interface MWMNavigationController () + +@end + +@implementation MWMNavigationController + +- (UIStatusBarStyle)preferredStatusBarStyle +{ + return UIStatusBarStyleLightContent; +} + +- (void)viewDidLoad +{ + [super viewDidLoad]; + self.delegate = self; +} + +- (void)navigationController:(UINavigationController *)navigationController willShowViewController:(UIViewController *)viewController animated:(BOOL)animated +{ + NSAssert([viewController conformsToProtocol:@protocol(MWMController)], @"Controller must inherit ViewController or TableViewController class"); + id vc = static_cast>(viewController); + [navigationController setNavigationBarHidden:!vc.hasNavigationBar animated:animated]; + + if ([navigationController.viewControllers count] > 1) + [viewController showBackButton]; +} + +- (BOOL)shouldAutorotate +{ + return YES; +} + +@end diff --git a/iphone/Maps/Classes/Components/MWMTableViewController.h b/iphone/Maps/Classes/Components/MWMTableViewController.h new file mode 100644 index 0000000000..286563e2a9 --- /dev/null +++ b/iphone/Maps/Classes/Components/MWMTableViewController.h @@ -0,0 +1,5 @@ +#import "MWMController.h" + +@interface MWMTableViewController : UITableViewController + +@end diff --git a/iphone/Maps/TableViewController.mm b/iphone/Maps/Classes/Components/MWMTableViewController.mm similarity index 72% rename from iphone/Maps/TableViewController.mm rename to iphone/Maps/Classes/Components/MWMTableViewController.mm index a801b8173e..162ac0e75c 100644 --- a/iphone/Maps/TableViewController.mm +++ b/iphone/Maps/Classes/Components/MWMTableViewController.mm @@ -1,12 +1,19 @@ #import "MapsAppDelegate.h" #import "MapViewController.h" +#import "MWMAlertViewController.h" #import "MWMTableViewCell.h" -#import "TableViewController.h" +#import "MWMTableViewController.h" #import "UIColor+MapsMeColor.h" #import "3party/Alohalytics/src/alohalytics_objc.h" -@implementation TableViewController +@interface MWMTableViewController () + +@property (nonatomic, readwrite) MWMAlertViewController * alertController; + +@end + +@implementation MWMTableViewController - (BOOL)prefersStatusBarHidden { @@ -46,4 +53,18 @@ [super viewWillDisappear:animated]; } +#pragma mark - Properties + +- (BOOL)hasNavigationBar +{ + return YES; +} + +- (MWMAlertViewController *)alertController +{ + if (!_alertController) + _alertController = [[MWMAlertViewController alloc] initWithViewController:self]; + return _alertController; +} + @end diff --git a/iphone/Maps/Classes/Components/MWMViewController.h b/iphone/Maps/Classes/Components/MWMViewController.h new file mode 100644 index 0000000000..493bf3e6a4 --- /dev/null +++ b/iphone/Maps/Classes/Components/MWMViewController.h @@ -0,0 +1,5 @@ +#import "MWMController.h" + +@interface MWMViewController : UIViewController + +@end diff --git a/iphone/Maps/Classes/Components/MWMViewController.mm b/iphone/Maps/Classes/Components/MWMViewController.mm new file mode 100644 index 0000000000..4d97acc4f0 --- /dev/null +++ b/iphone/Maps/Classes/Components/MWMViewController.mm @@ -0,0 +1,62 @@ +#import "Common.h" +#import "MapsAppDelegate.h" +#import "MapViewController.h" +#import "MWMAlertViewController.h" +#import "MWMViewController.h" + +#import "3party/Alohalytics/src/alohalytics_objc.h" + +@interface MWMViewController () + +@property (nonatomic, readwrite) MWMAlertViewController * alertController; + +@end + +@implementation MWMViewController + +- (BOOL)prefersStatusBarHidden +{ + return NO; +} + +- (void)mwm_refreshUI +{ + [self.navigationController.navigationBar mwm_refreshUI]; + [self.view mwm_refreshUI]; + if (![self isKindOfClass:[MapViewController class]]) + [[MapsAppDelegate theApp].mapViewController mwm_refreshUI]; +} + +- (void)viewDidLoad +{ + [super viewDidLoad]; + [self.navigationController.navigationBar setTranslucent:NO]; +} + +- (void)viewWillAppear:(BOOL)animated +{ + [Alohalytics logEvent:@"$viewWillAppear" withValue:NSStringFromClass([self class])]; + [super viewWillAppear:animated]; +} + +- (void)viewWillDisappear:(BOOL)animated +{ + [Alohalytics logEvent:@"$viewWillDisappear" withValue:NSStringFromClass([self class])]; + [super viewWillDisappear:animated]; +} + +#pragma mark - Properties + +- (BOOL)hasNavigationBar +{ + return YES; +} + +- (MWMAlertViewController *)alertController +{ + if (!_alertController) + _alertController = [[MWMAlertViewController alloc] initWithViewController:self]; + return _alertController; +} + +@end \ No newline at end of file diff --git a/iphone/Maps/Classes/CustomAlert/AlertController/MWMAlertViewController.h b/iphone/Maps/Classes/CustomAlert/AlertController/MWMAlertViewController.h index 667955edd9..51c7775286 100644 --- a/iphone/Maps/Classes/CustomAlert/AlertController/MWMAlertViewController.h +++ b/iphone/Maps/Classes/CustomAlert/AlertController/MWMAlertViewController.h @@ -1,10 +1,10 @@ #import "MWMAlert.h" -#import "ViewController.h" +#import "MWMViewController.h" #include "routing/router.hpp" #include "storage/storage.hpp" -@interface MWMAlertViewController : ViewController +@interface MWMAlertViewController : MWMViewController @property (weak, nonatomic, readonly) UIViewController * ownerViewController; @@ -23,8 +23,10 @@ - (void)presentLocationAlert; - (void)presentLocationServiceNotSupportedAlert; - (void)presentNoConnectionAlert; -- (void)presentnoWiFiAlertWithName:(nonnull NSString *)name downloadBlock:(nullable TMWMVoidBlock)block; +- (void)presentNoWiFiAlertWithName:(nonnull NSString *)name downloadBlock:(nullable TMWMVoidBlock)block; - (void)presentPedestrianToastAlert:(BOOL)isFirstLaunch; +- (void)presentInternalErrorAlert; +- (void)presentInvalidUserNameOrPasswordAlert; - (void)closeAlertWithCompletion:(nullable TMWMVoidBlock)completion; - (nonnull instancetype)init __attribute__((unavailable("call -initWithViewController: instead!"))); diff --git a/iphone/Maps/Classes/CustomAlert/AlertController/MWMAlertViewController.mm b/iphone/Maps/Classes/CustomAlert/AlertController/MWMAlertViewController.mm index 4b49479010..a6322c9711 100644 --- a/iphone/Maps/Classes/CustomAlert/AlertController/MWMAlertViewController.mm +++ b/iphone/Maps/Classes/CustomAlert/AlertController/MWMAlertViewController.mm @@ -86,7 +86,7 @@ static NSString * const kAlertControllerNibIdentifier = @"MWMAlertViewController [self displayAlert:MWMAlert.noConnectionAlert]; } -- (void)presentnoWiFiAlertWithName:(nonnull NSString *)name downloadBlock:(nullable TMWMVoidBlock)block +- (void)presentNoWiFiAlertWithName:(nonnull NSString *)name downloadBlock:(nullable TMWMVoidBlock)block { [self displayAlert:[MWMAlert noWiFiAlertWithName:name downloadBlock:block]]; } @@ -96,6 +96,16 @@ static NSString * const kAlertControllerNibIdentifier = @"MWMAlertViewController [self displayAlert:[MWMAlert pedestrianToastShareAlert:isFirstLaunch]]; } +- (void)presentInternalErrorAlert +{ + [self displayAlert:[MWMAlert internalErrorAlert]]; +} + +- (void)presentInvalidUserNameOrPasswordAlert +{ + [self displayAlert:[MWMAlert invalidUserNameOrPasswordAlert]]; +} + - (void)presentDownloaderAlertWithCountries:(vector const &)countries routes:(vector const &)routes code:(routing::IRouter::ResultCode)code diff --git a/iphone/Maps/Classes/CustomAlert/BaseAlert/MWMAlert.h b/iphone/Maps/Classes/CustomAlert/BaseAlert/MWMAlert.h index 933a832a8e..92dc4eba17 100644 --- a/iphone/Maps/Classes/CustomAlert/BaseAlert/MWMAlert.h +++ b/iphone/Maps/Classes/CustomAlert/BaseAlert/MWMAlert.h @@ -20,6 +20,8 @@ + (MWMAlert *)noConnectionAlert; + (MWMAlert *)locationServiceNotSupportedAlert; + (MWMAlert *)pedestrianToastShareAlert:(BOOL)isFirstLaunch; ++ (MWMAlert *)internalErrorAlert; ++ (MWMAlert *)invalidUserNameOrPasswordAlert; + (MWMAlert *)point2PointAlertWithOkBlock:(TMWMVoidBlock)block needToRebuild:(BOOL)needToRebuild; + (MWMAlert *)needMigrationAlertWithOkBlock:(TMWMVoidBlock)block; - (void)close; diff --git a/iphone/Maps/Classes/CustomAlert/BaseAlert/MWMAlert.mm b/iphone/Maps/Classes/CustomAlert/BaseAlert/MWMAlert.mm index 296a726402..dec8504384 100644 --- a/iphone/Maps/Classes/CustomAlert/BaseAlert/MWMAlert.mm +++ b/iphone/Maps/Classes/CustomAlert/BaseAlert/MWMAlert.mm @@ -88,7 +88,7 @@ case routing::IRouter::FileTooOld: return [MWMDefaultAlert routeFileNotExistAlert]; case routing::IRouter::InternalError: - return [MWMDefaultAlert internalErrorAlert]; + return [MWMDefaultAlert internalRoutingErrorAlert]; case routing::IRouter::Cancelled: case routing::IRouter::NoError: case routing::IRouter::NeedMoreMaps: @@ -101,6 +101,16 @@ return [MWMPedestrianShareAlert alert:isFirstLaunch]; } ++ (MWMAlert *)internalErrorAlert +{ + return [MWMDefaultAlert internalErrorAlert]; +} + ++ (MWMAlert *)invalidUserNameOrPasswordAlert +{ + return [MWMDefaultAlert invalidUserNameOrPasswordAlert]; +} + - (void)willRotateToInterfaceOrientation:(UIInterfaceOrientation)orientation { // Should override this method if you want custom relayout after rotation. diff --git a/iphone/Maps/Classes/CustomAlert/DefaultAlert/MWMDefaultAlert.h b/iphone/Maps/Classes/CustomAlert/DefaultAlert/MWMDefaultAlert.h index f2d380d43a..929c5422b3 100644 --- a/iphone/Maps/Classes/CustomAlert/DefaultAlert/MWMDefaultAlert.h +++ b/iphone/Maps/Classes/CustomAlert/DefaultAlert/MWMDefaultAlert.h @@ -6,7 +6,9 @@ + (instancetype)routeFileNotExistAlert; + (instancetype)endPointNotFoundAlert; + (instancetype)startPointNotFoundAlert; ++ (instancetype)internalRoutingErrorAlert; + (instancetype)internalErrorAlert; ++ (instancetype)invalidUserNameOrPasswordAlert; + (instancetype)noCurrentPositionAlert; + (instancetype)pointsInDifferentMWMAlert; + (instancetype)disabledLocationAlert; diff --git a/iphone/Maps/Classes/CustomAlert/DefaultAlert/MWMDefaultAlert.mm b/iphone/Maps/Classes/CustomAlert/DefaultAlert/MWMDefaultAlert.mm index 7d01e8c3cc..33acdee084 100644 --- a/iphone/Maps/Classes/CustomAlert/DefaultAlert/MWMDefaultAlert.mm +++ b/iphone/Maps/Classes/CustomAlert/DefaultAlert/MWMDefaultAlert.mm @@ -79,11 +79,23 @@ static NSString * const kDefaultAlertNibName = @"MWMDefaultAlert"; return [self defaultAlertWithTitle:@"dialog_routing_change_start" message:message rightButtonTitle:@"ok" leftButtonTitle:nil rightButtonAction:nil]; } ++ (instancetype)internalRoutingErrorAlert +{ + kStatisticsEvent = @"Internal Routing Error Alert"; + NSString * message = [NSString stringWithFormat:@"%@\n\n%@", L(@"dialog_routing_application_error"), L(@"dialog_routing_try_again")]; + return [self defaultAlertWithTitle:@"dialog_routing_system_error" message:message rightButtonTitle:@"ok" leftButtonTitle:nil rightButtonAction:nil]; +} + + (instancetype)internalErrorAlert { kStatisticsEvent = @"Internal Error Alert"; - NSString * message = [NSString stringWithFormat:@"%@\n\n%@", L(@"dialog_routing_application_error"), L(@"dialog_routing_try_again")]; - return [self defaultAlertWithTitle:@"dialog_routing_system_error" message:message rightButtonTitle:@"ok" leftButtonTitle:nil rightButtonAction:nil]; + return [self defaultAlertWithTitle:@"dialog_routing_system_error" message:nil rightButtonTitle:@"ok" leftButtonTitle:nil rightButtonAction:nil]; +} + ++ (instancetype)invalidUserNameOrPasswordAlert +{ + kStatisticsEvent = @"Invalid User Name or Password Alert"; + return [self defaultAlertWithTitle:@"invalid_username_or_password" message:nil rightButtonTitle:@"ok" leftButtonTitle:nil rightButtonAction:nil]; } + (instancetype)noCurrentPositionAlert diff --git a/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationForgottenPasswordViewController.h b/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationForgottenPasswordViewController.h index 16885bc3d7..3558360456 100644 --- a/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationForgottenPasswordViewController.h +++ b/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationForgottenPasswordViewController.h @@ -1,5 +1,5 @@ -#import "ViewController.h" +#import "MWMViewController.h" -@interface MWMAuthorizationForgottenPasswordViewController : ViewController +@interface MWMAuthorizationForgottenPasswordViewController : MWMViewController @end diff --git a/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationLoginViewController.h b/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationLoginViewController.h index aec78e0ea2..53a9243eb2 100644 --- a/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationLoginViewController.h +++ b/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationLoginViewController.h @@ -1,6 +1,6 @@ -#import "ViewController.h" +#import "MWMViewController.h" -@interface MWMAuthorizationLoginViewController : ViewController +@interface MWMAuthorizationLoginViewController : MWMViewController @property (nonatomic) BOOL isCalledFromSettings; diff --git a/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationLoginViewController.mm b/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationLoginViewController.mm index 7958a45e6f..28d5e1f90a 100644 --- a/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationLoginViewController.mm +++ b/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationLoginViewController.mm @@ -207,7 +207,7 @@ using namespace osm_auth_ios; if (Platform::IsConnected()) block(); else - [self showAlert:L(@"no_internet_connection_detected") withButtonTitle:L(@"ok")]; + [self.alertController presentNoConnectionAlert]; } - (IBAction)loginGoogle diff --git a/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationOSMLoginViewController.h b/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationOSMLoginViewController.h index e837d717ae..8cf14391be 100644 --- a/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationOSMLoginViewController.h +++ b/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationOSMLoginViewController.h @@ -1,5 +1,5 @@ -#import "ViewController.h" +#import "MWMViewController.h" -@interface MWMAuthorizationOSMLoginViewController : ViewController +@interface MWMAuthorizationOSMLoginViewController : MWMViewController @end diff --git a/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationOSMLoginViewController.mm b/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationOSMLoginViewController.mm index 8b239cc71a..8e264859f1 100644 --- a/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationOSMLoginViewController.mm +++ b/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationOSMLoginViewController.mm @@ -1,3 +1,4 @@ +#import "MWMAlertViewController.h" #import "MWMAuthorizationCommon.h" #import "MWMAuthorizationOSMLoginViewController.h" #import "MWMCircularProgress.h" @@ -149,14 +150,14 @@ using namespace osm; } else { - [self showAlert:L(@"invalid_username_or_password") withButtonTitle:L(@"ok")]; + [self.alertController presentInvalidUserNameOrPasswordAlert]; } }); }); } else { - [self showAlert:L(@"no_internet_connection_detected") withButtonTitle:L(@"ok")]; + [self.alertController presentNoConnectionAlert]; } } diff --git a/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationSignupViewController.h b/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationSignupViewController.h index 1031b6f121..22da35120d 100644 --- a/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationSignupViewController.h +++ b/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationSignupViewController.h @@ -1,5 +1,5 @@ -#import "ViewController.h" +#import "MWMViewController.h" -@interface MWMAuthorizationSignupViewController : ViewController +@interface MWMAuthorizationSignupViewController : MWMViewController @end diff --git a/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationWebViewLoginViewController.h b/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationWebViewLoginViewController.h index 708d717cb8..fb414e0877 100644 --- a/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationWebViewLoginViewController.h +++ b/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationWebViewLoginViewController.h @@ -1,4 +1,4 @@ -#import "ViewController.h" +#import "MWMViewController.h" typedef NS_ENUM(NSUInteger, MWMWebViewAuthorizationType) { @@ -6,7 +6,7 @@ typedef NS_ENUM(NSUInteger, MWMWebViewAuthorizationType) MWMWebViewAuthorizationTypeFacebook }; -@interface MWMAuthorizationWebViewLoginViewController : ViewController +@interface MWMAuthorizationWebViewLoginViewController : MWMViewController @property (nonatomic) MWMWebViewAuthorizationType authType; diff --git a/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationWebViewLoginViewController.mm b/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationWebViewLoginViewController.mm index 4f681ca964..2b89d68977 100644 --- a/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationWebViewLoginViewController.mm +++ b/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationWebViewLoginViewController.mm @@ -1,3 +1,4 @@ +#import "MWMAlertViewController.h" #import "MWMAuthorizationCommon.h" #import "MWMAuthorizationWebViewLoginViewController.h" #import "MWMCircularProgress.h" @@ -104,7 +105,7 @@ NSString * getVerifier(NSString * urlString) dispatch_async(dispatch_get_main_queue(), ^ { [self stopSpinner]; - [self showAlert:L(@"dialog_routing_system_error") withButtonTitle:L(@"ok")]; + [self.alertController presentInternalErrorAlert]; }); LOG(LWARNING, ("Can't loadAuthorizationPage", ex.what())); } @@ -154,7 +155,7 @@ NSString * getVerifier(NSString * urlString) else { [self loadAuthorizationPage]; - [self showAlert:L(@"invalid_username_or_password") withButtonTitle:L(@"ok")]; + [self.alertController presentInvalidUserNameOrPasswordAlert]; } }); }); @@ -194,8 +195,7 @@ NSString * getVerifier(NSString * urlString) - (void)webView:(UIWebView *)webView didFailLoadWithError:(NSError *)error { - // TODO Rename string - [self showAlert:L(@"dialog_routing_system_error") withButtonTitle:L(@"ok")]; + [self.alertController presentInternalErrorAlert]; } @end diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuViewController.h b/iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuViewController.h index f1b40d6a98..f428ba0610 100644 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuViewController.h +++ b/iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuViewController.h @@ -1,5 +1,5 @@ #import "MWMBottomMenuView.h" -#import "ViewController.h" +#import "MWMViewController.h" #include "platform/location.hpp" @@ -12,7 +12,7 @@ @end -@interface MWMBottomMenuViewController : ViewController +@interface MWMBottomMenuViewController : MWMViewController @property(nonatomic) MWMBottomMenuState state; @property(weak, nonatomic) IBOutlet MWMButton * p2pButton; @@ -27,7 +27,6 @@ - (void)setGo; - (void)refreshLayout; -- (void)mwm_refreshUI; - (void)onLocationStateModeChanged:(location::EMyPositionMode)state; diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/MWMWhatsNewController.h b/iphone/Maps/Classes/CustomViews/MapViewControls/MWMWhatsNewController.h index 73cdaec2aa..5e539b2748 100644 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/MWMWhatsNewController.h +++ b/iphone/Maps/Classes/CustomViews/MapViewControls/MWMWhatsNewController.h @@ -1,8 +1,8 @@ -#import "ViewController.h" +#import "MWMViewController.h" @class MWMPageController; -@interface MWMWhatsNewController : ViewController +@interface MWMWhatsNewController : MWMViewController @property (nonatomic) NSUInteger pageIndex; @property (weak, nonatomic) MWMPageController * pageController; diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/Search/DownloadView/MWMSearchDownloadViewController.h b/iphone/Maps/Classes/CustomViews/MapViewControls/Search/DownloadView/MWMSearchDownloadViewController.h index 7df0c6f993..074506e856 100644 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/Search/DownloadView/MWMSearchDownloadViewController.h +++ b/iphone/Maps/Classes/CustomViews/MapViewControls/Search/DownloadView/MWMSearchDownloadViewController.h @@ -1,4 +1,4 @@ -#import "ViewController.h" +#import "MWMViewController.h" @protocol MWMSearchDownloadProtocol @@ -6,7 +6,7 @@ @end -@interface MWMSearchDownloadViewController : ViewController +@interface MWMSearchDownloadViewController : MWMViewController - (nonnull instancetype)init __attribute__((unavailable("init is not available"))); - (nonnull instancetype)initWithDelegate:(nonnull id)delegate; diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/Search/TabbedView/MWMSearchTabbedViewController.h b/iphone/Maps/Classes/CustomViews/MapViewControls/Search/TabbedView/MWMSearchTabbedViewController.h index 7ab9cdf5f9..591ac67a19 100644 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/Search/TabbedView/MWMSearchTabbedViewController.h +++ b/iphone/Maps/Classes/CustomViews/MapViewControls/Search/TabbedView/MWMSearchTabbedViewController.h @@ -1,8 +1,8 @@ #import "MWMSearchTabbedViewProtocol.h" #import "MWMSearchTabButtonsView.h" -#import "ViewController.h" +#import "MWMViewController.h" -@interface MWMSearchTabbedViewController : ViewController +@interface MWMSearchTabbedViewController : MWMViewController @property (copy, nonatomic) NSArray * tabButtons; @property (weak, nonatomic) NSLayoutConstraint * scrollIndicatorOffset; diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/Search/TableView/MWMSearchTableViewController.h b/iphone/Maps/Classes/CustomViews/MapViewControls/Search/TableView/MWMSearchTableViewController.h index f32688129d..acab3cf193 100644 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/Search/TableView/MWMSearchTableViewController.h +++ b/iphone/Maps/Classes/CustomViews/MapViewControls/Search/TableView/MWMSearchTableViewController.h @@ -1,7 +1,7 @@ #import "MWMSearchManager.h" -#import "MWMSearchTextField.h" #import "MWMSearchTabbedViewProtocol.h" -#import "ViewController.h" +#import "MWMSearchTextField.h" +#import "MWMViewController.h" @protocol MWMSearchTableViewProtocol @@ -14,7 +14,7 @@ @end -@interface MWMSearchTableViewController : ViewController +@interface MWMSearchTableViewController : MWMViewController @property (nonatomic) BOOL searchOnMap; diff --git a/iphone/Maps/Classes/Editor/Cuisine/MWMCuisineEditorViewController.h b/iphone/Maps/Classes/Editor/Cuisine/MWMCuisineEditorViewController.h index d8fd5e22b9..c84e39dcfd 100644 --- a/iphone/Maps/Classes/Editor/Cuisine/MWMCuisineEditorViewController.h +++ b/iphone/Maps/Classes/Editor/Cuisine/MWMCuisineEditorViewController.h @@ -1,4 +1,4 @@ -#import "TableViewController.h" +#import "MWMTableViewController.h" @protocol MWMCuisineEditorProtocol @@ -6,7 +6,7 @@ @end -@interface MWMCuisineEditorViewController : TableViewController +@interface MWMCuisineEditorViewController : MWMTableViewController @property (weak, nonatomic) id delegate; diff --git a/iphone/Maps/Classes/Editor/MWMEditorViewController.h b/iphone/Maps/Classes/Editor/MWMEditorViewController.h index 1fdf358e6d..e12939425f 100644 --- a/iphone/Maps/Classes/Editor/MWMEditorViewController.h +++ b/iphone/Maps/Classes/Editor/MWMEditorViewController.h @@ -1,8 +1,8 @@ #import "MWMOpeningHoursEditorViewController.h" #import "MWMPlacePageEntity.h" -#import "TableViewController.h" +#import "MWMTableViewController.h" -@interface MWMEditorViewController : TableViewController +@interface MWMEditorViewController : MWMTableViewController @property (nonatomic) MWMPlacePageEntity * entity; diff --git a/iphone/Maps/Classes/Editor/OpeningHours/MWMOpeningHoursEditorViewController.h b/iphone/Maps/Classes/Editor/OpeningHours/MWMOpeningHoursEditorViewController.h index 7a8cca007a..bff585b83a 100644 --- a/iphone/Maps/Classes/Editor/OpeningHours/MWMOpeningHoursEditorViewController.h +++ b/iphone/Maps/Classes/Editor/OpeningHours/MWMOpeningHoursEditorViewController.h @@ -1,4 +1,4 @@ -#import "ViewController.h" +#import "MWMViewController.h" @protocol MWMOpeningHoursEditorProtocol @@ -6,7 +6,7 @@ @end -@interface MWMOpeningHoursEditorViewController : ViewController +@interface MWMOpeningHoursEditorViewController : MWMViewController @property (copy, nonatomic) NSString * openingHours; @property (weak, nonatomic) id delegate; diff --git a/iphone/Maps/Classes/Editor/Street/MWMStreetEditorViewController.h b/iphone/Maps/Classes/Editor/Street/MWMStreetEditorViewController.h index 5133957672..c6ea084c0e 100644 --- a/iphone/Maps/Classes/Editor/Street/MWMStreetEditorViewController.h +++ b/iphone/Maps/Classes/Editor/Street/MWMStreetEditorViewController.h @@ -1,4 +1,4 @@ -#import "TableViewController.h" +#import "MWMTableViewController.h" @protocol MWMStreetEditorProtocol @@ -9,7 +9,7 @@ @end -@interface MWMStreetEditorViewController : TableViewController +@interface MWMStreetEditorViewController : MWMTableViewController @property (weak, nonatomic) id delegate; diff --git a/iphone/Maps/Classes/MWMBookmarkColorViewController.h b/iphone/Maps/Classes/MWMBookmarkColorViewController.h index 6f73460d15..c51ece0415 100644 --- a/iphone/Maps/Classes/MWMBookmarkColorViewController.h +++ b/iphone/Maps/Classes/MWMBookmarkColorViewController.h @@ -1,8 +1,8 @@ -#import "TableViewController.h" +#import "MWMTableViewController.h" @class MWMPlacePageViewManager; -@interface MWMBookmarkColorViewController : TableViewController +@interface MWMBookmarkColorViewController : MWMTableViewController @property (weak, nonatomic) MWMPlacePageViewManager * placePageManager; @property (weak, nonatomic) UINavigationController * iPadOwnerNavigationController; diff --git a/iphone/Maps/Classes/MWMBookmarkDescriptionViewController.h b/iphone/Maps/Classes/MWMBookmarkDescriptionViewController.h index 9bc18af31b..5e88cfa667 100644 --- a/iphone/Maps/Classes/MWMBookmarkDescriptionViewController.h +++ b/iphone/Maps/Classes/MWMBookmarkDescriptionViewController.h @@ -1,9 +1,8 @@ -#import -#import "ViewController.h" +#import "MWMViewController.h" @class MWMPlacePageViewManager; -@interface MWMBookmarkDescriptionViewController : ViewController +@interface MWMBookmarkDescriptionViewController : MWMViewController - (instancetype)initWithPlacePageManager:(MWMPlacePageViewManager *)manager; diff --git a/iphone/Maps/Classes/MWMiPadPlacePage.mm b/iphone/Maps/Classes/MWMiPadPlacePage.mm index 7ab6d77254..e6f437cc9d 100644 --- a/iphone/Maps/Classes/MWMiPadPlacePage.mm +++ b/iphone/Maps/Classes/MWMiPadPlacePage.mm @@ -5,17 +5,17 @@ #import "MWMiPadPlacePage.h" #import "MWMPlacePageActionBar.h" #import "MWMPlacePageViewManager.h" +#import "MWMViewController.h" #import "SelectSetVC.h" #import "UIColor+MapsMeColor.h" #import "UIViewController+Navigation.h" -#import "ViewController.h" static CGFloat const kLeftOffset = 12.; static CGFloat const kTopOffset = 36.; static CGFloat const kBottomOffset = 60.; static CGFloat const kKeyboardOffset = 12.; -@interface MWMiPadPlacePageViewController : ViewController +@interface MWMiPadPlacePageViewController : MWMViewController @property (nonatomic) UIView * placePageView; @property (nonatomic) UIView * actionBarView; diff --git a/iphone/Maps/Classes/MapViewController.h b/iphone/Maps/Classes/MapViewController.h index 92c2cb72f0..5547040ae4 100644 --- a/iphone/Maps/Classes/MapViewController.h +++ b/iphone/Maps/Classes/MapViewController.h @@ -1,6 +1,6 @@ #import "LocationManager.h" #import "LocationPredictor.h" -#import "ViewController.h" +#import "MWMViewController.h" #import #include "geometry/point2d.hpp" @@ -12,7 +12,7 @@ namespace search { struct AddressInfo; } @class MWMMapViewControlsManager; @class MWMAPIBar; -@interface MapViewController : ViewController +@interface MapViewController : MWMViewController { CGPoint m_popoverPos; diff --git a/iphone/Maps/Classes/MapViewController.mm b/iphone/Maps/Classes/MapViewController.mm index 69bdf74479..1aea2bbd33 100644 --- a/iphone/Maps/Classes/MapViewController.mm +++ b/iphone/Maps/Classes/MapViewController.mm @@ -13,6 +13,7 @@ #import "MWMMapViewControlsManager.h" #import "MWMPageController.h" #import "MWMPlacePageEntity.h" +#import "MWMTableViewController.h" #import "MWMTextToSpeech.h" #import "RouteState.h" #import "Statistics.h" @@ -565,7 +566,7 @@ NSString * const kAuthorizationSegue = @"Map2AuthorizationSegue"; { if (connection == Platform::EConnectionType::CONNECTION_WWAN && sizeToDownload > 50 * MB) { - [self.alertController presentnoWiFiAlertWithName:name downloadBlock:^ + [self.alertController presentNoWiFiAlertWithName:name downloadBlock:^ { layout.DownloadMap(idx, static_cast(opt)); }]; @@ -713,7 +714,7 @@ NSString * const kAuthorizationSegue = @"Map2AuthorizationSegue"; - (void)openBookmarks { BOOL const oneCategory = (GetFramework().GetBmCategoriesCount() == 1); - TableViewController * vc = + MWMTableViewController * vc = oneCategory ? [[BookmarksVC alloc] initWithCategory:0] : [[BookmarksRootVC alloc] init]; [self.navigationController pushViewController:vc animated:YES]; } @@ -834,15 +835,6 @@ NSString * const kAuthorizationSegue = @"Map2AuthorizationSegue"; [self.alertController presentRoutingDisclaimerAlert]; } -#pragma mark - Getters - -- (MWMAlertViewController *)alertController -{ - if (!_alertController) - _alertController = [[MWMAlertViewController alloc] initWithViewController:self]; - return _alertController; -} - #pragma mark - Private methods - (void)destroyPopover @@ -927,4 +919,9 @@ NSString * const kAuthorizationSegue = @"Map2AuthorizationSegue"; return haveAppWall && haveBanners; } +- (BOOL)hasNavigationBar +{ + return NO; +} + @end diff --git a/iphone/Maps/Classes/MapsAppDelegate.h b/iphone/Maps/Classes/MapsAppDelegate.h index 58bdb8c8f8..f0198b4109 100644 --- a/iphone/Maps/Classes/MapsAppDelegate.h +++ b/iphone/Maps/Classes/MapsAppDelegate.h @@ -1,6 +1,7 @@ #import "DownloadIndicatorProtocol.h" #import "MapsObservers.h" -#import "NavigationController.h" +#import "MWMAlertViewController.h" +#import "MWMNavigationController.h" #include "indexer/map_style.hpp" diff --git a/iphone/Maps/Classes/MapsAppDelegate.mm b/iphone/Maps/Classes/MapsAppDelegate.mm index 03c95a0db3..4261c5d7e3 100644 --- a/iphone/Maps/Classes/MapsAppDelegate.mm +++ b/iphone/Maps/Classes/MapsAppDelegate.mm @@ -3,11 +3,12 @@ #import "EAGLView.h" #import "LocalNotificationManager.h" #import "LocationManager.h" +#import "MapsAppDelegate.h" +#import "MapViewController.h" #import "MWMAlertViewController.h" #import "MWMAuthorizationCommon.h" +#import "MWMController.h" #import "MWMTextToSpeech.h" -#import "MapViewController.h" -#import "MapsAppDelegate.h" #import "Preferences.h" #import "RouteState.h" #import "Statistics.h" @@ -303,7 +304,7 @@ using namespace osm_auth_ios; return; f.SetMapStyle(MapStyleClear); [UIColor setNightMode:NO]; - [static_cast(app.mapViewController.navigationController.topViewController) mwm_refreshUI]; + [static_cast>(app.mapViewController.navigationController.topViewController) mwm_refreshUI]; [app stopMapStyleChecker]; } @@ -318,7 +319,7 @@ using namespace osm_auth_ios; dispatch_async(dispatch_get_main_queue(), [&f, l, self, app] { auto const dayTime = GetDayTime(static_cast(NSDate.date.timeIntervalSince1970), l.coordinate.latitude, l.coordinate.longitude); - ViewController * vc = static_cast(app.mapViewController.navigationController.topViewController); + id vc = static_cast>(app.mapViewController.navigationController.topViewController); auto style = f.GetMapStyle(); switch (dayTime) { diff --git a/iphone/Maps/Classes/NavigationController.h b/iphone/Maps/Classes/NavigationController.h deleted file mode 100644 index 9cd27f150a..0000000000 --- a/iphone/Maps/Classes/NavigationController.h +++ /dev/null @@ -1,6 +0,0 @@ - -#import - -@interface NavigationController : UINavigationController - -@end diff --git a/iphone/Maps/Classes/NavigationController.mm b/iphone/Maps/Classes/NavigationController.mm deleted file mode 100644 index 515cbdf208..0000000000 --- a/iphone/Maps/Classes/NavigationController.mm +++ /dev/null @@ -1,32 +0,0 @@ - -#import "NavigationController.h" -#import "MapsAppDelegate.h" -#import "UIViewController+Navigation.h" -#import "MapViewController.h" - -@interface NavigationController () - -@end - -@implementation NavigationController - -- (UIStatusBarStyle)preferredStatusBarStyle -{ - return UIStatusBarStyleLightContent; -} - -- (void)viewDidLoad -{ - [super viewDidLoad]; - self.delegate = self; -} - -- (void)navigationController:(UINavigationController *)navigationController willShowViewController:(UIViewController *)viewController animated:(BOOL)animated -{ - [navigationController setNavigationBarHidden:[viewController isMemberOfClass:[MapViewController class]] animated:animated]; - - if ([navigationController.viewControllers count] > 1) - [viewController showBackButton]; -} - -@end diff --git a/iphone/Maps/CommunityVC.h b/iphone/Maps/CommunityVC.h index 29a7df1f9b..d52a00e57d 100644 --- a/iphone/Maps/CommunityVC.h +++ b/iphone/Maps/CommunityVC.h @@ -1,7 +1,5 @@ +#import "MWMTableViewController.h" -#import -#import "TableViewController.h" - -@interface CommunityVC : TableViewController +@interface CommunityVC : MWMTableViewController @end diff --git a/iphone/Maps/DownloaderParentVC.h b/iphone/Maps/DownloaderParentVC.h index b101bfa5cd..d62061c096 100644 --- a/iphone/Maps/DownloaderParentVC.h +++ b/iphone/Maps/DownloaderParentVC.h @@ -1,8 +1,6 @@ - -#import #import "MapsObservers.h" #import "MapCell.h" -#import "ViewController.h" +#import "MWMViewController.h" #include "storage/storage_defines.hpp" #include "platform/preferred_languages.hpp" @@ -17,7 +15,7 @@ typedef NS_ENUM(NSUInteger, DownloaderAction) using namespace storage; -@interface DownloaderParentVC : ViewController +@interface DownloaderParentVC : MWMViewController - (BOOL)canDownloadSelectedMap; - (UIActionSheet *)actionSheetToCancelDownloadingSelectedMap; diff --git a/iphone/Maps/DownloaderParentVC.mm b/iphone/Maps/DownloaderParentVC.mm index fe2960db1b..b228549598 100644 --- a/iphone/Maps/DownloaderParentVC.mm +++ b/iphone/Maps/DownloaderParentVC.mm @@ -66,7 +66,7 @@ if (connection != Platform::EConnectionType::CONNECTION_NONE) { if (connection == Platform::EConnectionType::CONNECTION_WWAN && size > 50 * MB) - [alert presentnoWiFiAlertWithName:name downloadBlock:^{[self download];}]; + [alert presentNoWiFiAlertWithName:name downloadBlock:^{[self download];}]; else return YES; } diff --git a/iphone/Maps/MWMNightModeController.h b/iphone/Maps/MWMNightModeController.h index 4844f9114c..27b77f6f56 100644 --- a/iphone/Maps/MWMNightModeController.h +++ b/iphone/Maps/MWMNightModeController.h @@ -1,5 +1,5 @@ -#import "TableViewController.h" +#import "MWMTableViewController.h" -@interface MWMNightModeController : TableViewController +@interface MWMNightModeController : MWMTableViewController @end diff --git a/iphone/Maps/MWMRecentTrackSettingsController.h b/iphone/Maps/MWMRecentTrackSettingsController.h index 8a08bca1a7..4266571020 100644 --- a/iphone/Maps/MWMRecentTrackSettingsController.h +++ b/iphone/Maps/MWMRecentTrackSettingsController.h @@ -1,5 +1,5 @@ -#import "TableViewController.h" +#import "MWMTableViewController.h" -@interface MWMRecentTrackSettingsController : TableViewController +@interface MWMRecentTrackSettingsController : MWMTableViewController @end diff --git a/iphone/Maps/MWMTTSLanguageViewController.h b/iphone/Maps/MWMTTSLanguageViewController.h index 1530c6f92a..a7b6a64ac2 100644 --- a/iphone/Maps/MWMTTSLanguageViewController.h +++ b/iphone/Maps/MWMTTSLanguageViewController.h @@ -1,5 +1,5 @@ -#import "TableViewController.h" +#import "MWMTableViewController.h" -@interface MWMTTSLanguageViewController : TableViewController +@interface MWMTTSLanguageViewController : MWMTableViewController @end diff --git a/iphone/Maps/MWMTTSSettingsViewController.h b/iphone/Maps/MWMTTSSettingsViewController.h index 29035fbe6d..410b630a22 100644 --- a/iphone/Maps/MWMTTSSettingsViewController.h +++ b/iphone/Maps/MWMTTSSettingsViewController.h @@ -1,6 +1,6 @@ -#import "TableViewController.h" +#import "MWMTableViewController.h" -@interface MWMTTSSettingsViewController : TableViewController +@interface MWMTTSSettingsViewController : MWMTableViewController - (void)setAdditionalTTSLanguage:(std::pair const &)l; diff --git a/iphone/Maps/Maps.xcodeproj/project.pbxproj b/iphone/Maps/Maps.xcodeproj/project.pbxproj index 94df410604..40483c3e99 100644 --- a/iphone/Maps/Maps.xcodeproj/project.pbxproj +++ b/iphone/Maps/Maps.xcodeproj/project.pbxproj @@ -137,6 +137,8 @@ 3491E7CE1C06F1F10042FE24 /* MWMPlacePageButtonCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3491E7CA1C06F1F10042FE24 /* MWMPlacePageButtonCell.xib */; }; 34921F6A1BFA0CDC00737D6E /* MyTargetSDKCorp.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 34921F691BFA0CDC00737D6E /* MyTargetSDKCorp.framework */; }; 34921F6B1BFA0CDC00737D6E /* MyTargetSDKCorp.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 34921F691BFA0CDC00737D6E /* MyTargetSDKCorp.framework */; }; + 3492CC121C6DF00E0057D8E8 /* ProgressView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 976D86EB19C8697700C920EF /* ProgressView.mm */; }; + 3492CC131C6DF00F0057D8E8 /* ProgressView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 976D86EB19C8697700C920EF /* ProgressView.mm */; }; 3497A93A1B5CF8A900F51E55 /* MWMNavigationDashboardManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3497A9371B5CF8A900F51E55 /* MWMNavigationDashboardManager.mm */; }; 349A357A1B53D4C9009677EE /* MWMCircularProgress.mm in Sources */ = {isa = PBXBuildFile; fileRef = 349A35761B53D4C9009677EE /* MWMCircularProgress.mm */; }; 349A357B1B53D4C9009677EE /* MWMCircularProgress.xib in Resources */ = {isa = PBXBuildFile; fileRef = 349A35771B53D4C9009677EE /* MWMCircularProgress.xib */; }; @@ -195,6 +197,12 @@ 34BF0CC61C31304A00D097EB /* MWMAuthorizationCommon.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34BF0CC51C31304A00D097EB /* MWMAuthorizationCommon.mm */; }; 34BF0CC71C31304A00D097EB /* MWMAuthorizationCommon.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34BF0CC51C31304A00D097EB /* MWMAuthorizationCommon.mm */; }; 34C659471BD12A77009DC20A /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 34C659451BD12A77009DC20A /* InfoPlist.strings */; }; + 34C9BD021C6DB693000DC38D /* MWMTableViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34C9BCFF1C6DB693000DC38D /* MWMTableViewController.mm */; }; + 34C9BD031C6DB693000DC38D /* MWMTableViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34C9BCFF1C6DB693000DC38D /* MWMTableViewController.mm */; }; + 34C9BD041C6DB693000DC38D /* MWMViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34C9BD011C6DB693000DC38D /* MWMViewController.mm */; }; + 34C9BD051C6DB693000DC38D /* MWMViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34C9BD011C6DB693000DC38D /* MWMViewController.mm */; }; + 34C9BD091C6DBCDA000DC38D /* MWMNavigationController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34C9BD081C6DBCDA000DC38D /* MWMNavigationController.mm */; }; + 34C9BD0A1C6DBCDA000DC38D /* MWMNavigationController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34C9BD081C6DBCDA000DC38D /* MWMNavigationController.mm */; }; 34CA57181C292F17004D9C89 /* MyTrackerSDKCorp.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F696CCBA1C2816FB00150DFD /* MyTrackerSDKCorp.framework */; }; 34CA57191C292F50004D9C89 /* MediaPlayer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 97C9864B186C5EAA00AF7E9E /* MediaPlayer.framework */; }; 34CC4C091B81F3B500E44C1F /* MWMSearchTabbedViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34CC4C071B81F3B500E44C1F /* MWMSearchTabbedViewController.mm */; }; @@ -376,7 +384,6 @@ 6741A9C41BF340DE002C974C /* MWMRouteHelperPanel.mm in Sources */ = {isa = PBXBuildFile; fileRef = F68E6BD11B8DB7AE0040566D /* MWMRouteHelperPanel.mm */; }; 6741A9C51BF340DE002C974C /* MWMZoomButtons.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34BC721D1B0DECAE0012A34B /* MWMZoomButtons.mm */; }; 6741A9C61BF340DE002C974C /* MWMSearchCommonCell.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34B82ADC1B84A4A000180497 /* MWMSearchCommonCell.mm */; }; - 6741A9C71BF340DE002C974C /* NavigationController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 978F9252183BD530000D6C7C /* NavigationController.mm */; }; 6741A9C81BF340DE002C974C /* MWMiPhoneLandscapePlacePage.mm in Sources */ = {isa = PBXBuildFile; fileRef = F66A8FA71B09F052001B9C97 /* MWMiPhoneLandscapePlacePage.mm */; }; 6741A9C91BF340DE002C974C /* ToastView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 974386DC19373EA400FD5659 /* ToastView.mm */; }; 6741A9CA1BF340DE002C974C /* MWMAnimator.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6C9343B1AE4F94A00DDC624 /* MWMAnimator.mm */; }; @@ -440,7 +447,6 @@ 6741AA051BF340DE002C974C /* MWMSearchDownloadViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 344825911B8DBADF00757B1B /* MWMSearchDownloadViewController.mm */; }; 6741AA061BF340DE002C974C /* MWMSearchHistoryRequestCell.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34B82AB81B837FFD00180497 /* MWMSearchHistoryRequestCell.mm */; }; 6741AA071BF340DE002C974C /* MWMBottomMenuLayout.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34BAB6E81BB2DA0C00DB941B /* MWMBottomMenuLayout.mm */; }; - 6741AA081BF340DE002C974C /* TableViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = B0FBFA2A1A515B4C0086819E /* TableViewController.mm */; }; 6741AA091BF340DE002C974C /* BookmarkCell.mm in Sources */ = {isa = PBXBuildFile; fileRef = F785EB3F16386FC4003A38A8 /* BookmarkCell.mm */; }; 6741AA0A1BF340DE002C974C /* MWMBottomMenuCollectionViewCell.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34BAB6EB1BB2DFCE00DB941B /* MWMBottomMenuCollectionViewCell.mm */; }; 6741AA0B1BF340DE002C974C /* MWMMapViewControlsManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34BC72111B0DECAE0012A34B /* MWMMapViewControlsManager.mm */; }; @@ -464,8 +470,6 @@ 6741AA1D1BF340DE002C974C /* MWMDownloadTransitMapAlert.mm in Sources */ = {isa = PBXBuildFile; fileRef = F64F19971AB81A00006EAF7E /* MWMDownloadTransitMapAlert.mm */; }; 6741AA1E1BF340DE002C974C /* LinkCell.mm in Sources */ = {isa = PBXBuildFile; fileRef = 97F61793183E7445009919E2 /* LinkCell.mm */; }; 6741AA1F1BF340DE002C974C /* MWMSearchBookmarksCell.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34B82ACE1B846B2C00180497 /* MWMSearchBookmarksCell.mm */; }; - 6741AA201BF340DE002C974C /* ProgressView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 976D86EB19C8697700C920EF /* ProgressView.mm */; }; - 6741AA211BF340DE002C974C /* ViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = B0FBFA261A515AFD0086819E /* ViewController.mm */; }; 6741AA221BF340DE002C974C /* MWMNavigationView.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6BD33831B6240F200F2CE18 /* MWMNavigationView.mm */; }; 6741AA231BF340DE002C974C /* UIFont+MapsMeFonts.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3472EC041B4D44BE0085CB79 /* UIFont+MapsMeFonts.mm */; }; 6741AA241BF340DE002C974C /* UIButton+RuntimeAttributes.mm in Sources */ = {isa = PBXBuildFile; fileRef = 342AD76E1B53D30C00E0B997 /* UIButton+RuntimeAttributes.mm */; }; @@ -549,7 +553,6 @@ 9747278418338F0C006B7CB7 /* UIViewController+Navigation.mm in Sources */ = {isa = PBXBuildFile; fileRef = 9747278318338F0C006B7CB7 /* UIViewController+Navigation.mm */; }; 974D041D1977DE430081D0A7 /* LocalNotificationManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = 974D041B1977DE430081D0A7 /* LocalNotificationManager.mm */; }; 97508423199522D300A7457D /* SettingsAndMoreVC.mm in Sources */ = {isa = PBXBuildFile; fileRef = 97508422199522D300A7457D /* SettingsAndMoreVC.mm */; }; - 976D86EC19C8697700C920EF /* ProgressView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 976D86EB19C8697700C920EF /* ProgressView.mm */; }; 976D86F119C877E600C920EF /* MapCell.mm in Sources */ = {isa = PBXBuildFile; fileRef = 976D86F019C877E600C920EF /* MapCell.mm */; }; 97719D451843B6DC00BDD815 /* MessageUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 97719D441843B6DC00BDD815 /* MessageUI.framework */; }; 97719D491843B6F700BDD815 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 97719D471843B6F200BDD815 /* Security.framework */; }; @@ -563,7 +566,6 @@ 978F9240183B660F000D6C7C /* SettingsViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 978F9239183B660F000D6C7C /* SettingsViewController.mm */; }; 978F9242183B660F000D6C7C /* SelectableCell.mm in Sources */ = {isa = PBXBuildFile; fileRef = 978F923A183B660F000D6C7C /* SelectableCell.mm */; }; 978F9244183B660F000D6C7C /* SwitchCell.mm in Sources */ = {isa = PBXBuildFile; fileRef = 978F923B183B660F000D6C7C /* SwitchCell.mm */; }; - 978F9253183BD530000D6C7C /* NavigationController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 978F9252183BD530000D6C7C /* NavigationController.mm */; }; 97A5967F19B9CD47007A963F /* copyright.html in Resources */ = {isa = PBXBuildFile; fileRef = 97A5967E19B9CD47007A963F /* copyright.html */; }; 97C98522186AE3CF00AF7E9E /* AppInfo.mm in Sources */ = {isa = PBXBuildFile; fileRef = 97C98520186AE3CF00AF7E9E /* AppInfo.mm */; }; 97D40C0A184D031900A1D572 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97D40C09184D031900A1D572 /* Images.xcassets */; }; @@ -597,8 +599,6 @@ B08AA8D61A25E58C00810B1C /* Social.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 97C9864D186C5ED300AF7E9E /* Social.framework */; settings = {ATTRIBUTES = (Required, ); }; }; B08AA8DA1A26299A00810B1C /* TimeUtils.mm in Sources */ = {isa = PBXBuildFile; fileRef = B08AA8D91A26299A00810B1C /* TimeUtils.mm */; }; B0DFE6311A1B78A200B6C35E /* LocalNotifications.plist in Resources */ = {isa = PBXBuildFile; fileRef = B0DFE62F1A1B78A200B6C35E /* LocalNotifications.plist */; }; - B0FBFA271A515AFD0086819E /* ViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = B0FBFA261A515AFD0086819E /* ViewController.mm */; }; - B0FBFA2B1A515B4C0086819E /* TableViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = B0FBFA2A1A515B4C0086819E /* TableViewController.mm */; }; CB252D6F16FF82C9001E41E9 /* Statistics.mm in Sources */ = {isa = PBXBuildFile; fileRef = CB252D6C16FF82C8001E41E9 /* Statistics.mm */; }; ED48BBB517C267F5003E7E92 /* ColorPickerView.mm in Sources */ = {isa = PBXBuildFile; fileRef = ED48BBB417C267F5003E7E92 /* ColorPickerView.mm */; }; ED48BBBA17C2B1E2003E7E92 /* CircleView.mm in Sources */ = {isa = PBXBuildFile; fileRef = ED48BBB917C2B1E2003E7E92 /* CircleView.mm */; }; @@ -1002,6 +1002,13 @@ 34C659491BD12A81009DC20A /* it */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = it; path = it.lproj/InfoPlist.strings; sourceTree = ""; }; 34C6594A1BD12A89009DC20A /* vi */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = vi; path = vi.lproj/InfoPlist.strings; sourceTree = ""; }; 34C6594B1BD12A89009DC20A /* cs */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = cs; path = cs.lproj/InfoPlist.strings; sourceTree = ""; }; + 34C9BCFE1C6DB693000DC38D /* MWMTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMTableViewController.h; sourceTree = ""; }; + 34C9BCFF1C6DB693000DC38D /* MWMTableViewController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMTableViewController.mm; sourceTree = ""; }; + 34C9BD001C6DB693000DC38D /* MWMViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMViewController.h; sourceTree = ""; }; + 34C9BD011C6DB693000DC38D /* MWMViewController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMViewController.mm; sourceTree = ""; }; + 34C9BD061C6DB6F3000DC38D /* MWMController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMController.h; sourceTree = ""; }; + 34C9BD071C6DBCDA000DC38D /* MWMNavigationController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMNavigationController.h; sourceTree = ""; }; + 34C9BD081C6DBCDA000DC38D /* MWMNavigationController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMNavigationController.mm; sourceTree = ""; }; 34CC4C061B81F3B500E44C1F /* MWMSearchTabbedViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMSearchTabbedViewController.h; sourceTree = ""; }; 34CC4C071B81F3B500E44C1F /* MWMSearchTabbedViewController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMSearchTabbedViewController.mm; sourceTree = ""; }; 34CC4C081B81F3B500E44C1F /* MWMSearchTabbedViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMSearchTabbedViewController.xib; sourceTree = ""; }; @@ -1139,8 +1146,6 @@ 978F923D183B660F000D6C7C /* SwitchCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SwitchCell.h; path = Settings/SwitchCell.h; sourceTree = ""; }; 978F923E183B660F000D6C7C /* SelectableCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SelectableCell.h; path = Settings/SelectableCell.h; sourceTree = ""; }; 978F923F183B660F000D6C7C /* SettingsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SettingsViewController.h; path = Settings/SettingsViewController.h; sourceTree = ""; }; - 978F9251183BD530000D6C7C /* NavigationController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NavigationController.h; sourceTree = ""; }; - 978F9252183BD530000D6C7C /* NavigationController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = NavigationController.mm; sourceTree = ""; }; 97A5967E19B9CD47007A963F /* copyright.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; name = copyright.html; path = ../../data/copyright.html; sourceTree = ""; }; 97C98520186AE3CF00AF7E9E /* AppInfo.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = AppInfo.mm; sourceTree = ""; }; 97C98521186AE3CF00AF7E9E /* AppInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppInfo.h; sourceTree = ""; }; @@ -1180,10 +1185,6 @@ B08AA8D81A26299A00810B1C /* TimeUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TimeUtils.h; path = Categories/TimeUtils.h; sourceTree = ""; }; B08AA8D91A26299A00810B1C /* TimeUtils.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = TimeUtils.mm; path = Categories/TimeUtils.mm; sourceTree = ""; }; B0DFE6301A1B78A200B6C35E /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = en; path = en.lproj/LocalNotifications.plist; sourceTree = ""; }; - B0FBFA251A515AFD0086819E /* ViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ViewController.h; path = ../ViewController.h; sourceTree = ""; }; - B0FBFA261A515AFD0086819E /* ViewController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = ViewController.mm; path = ../ViewController.mm; sourceTree = ""; }; - B0FBFA291A515B4C0086819E /* TableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TableViewController.h; path = ../TableViewController.h; sourceTree = ""; }; - B0FBFA2A1A515B4C0086819E /* TableViewController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = TableViewController.mm; path = ../TableViewController.mm; sourceTree = ""; }; CB252D6B16FF82C8001E41E9 /* Statistics.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Statistics.h; sourceTree = ""; }; CB252D6C16FF82C8001E41E9 /* Statistics.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = Statistics.mm; sourceTree = ""; }; ED48BBB317C267F5003E7E92 /* ColorPickerView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ColorPickerView.h; sourceTree = ""; }; @@ -1540,14 +1541,8 @@ 974D041C1977DE430081D0A7 /* LocalNotificationManager.h */, 974D041B1977DE430081D0A7 /* LocalNotificationManager.mm */, B0DFE62F1A1B78A200B6C35E /* LocalNotifications.plist */, - B0FBFA251A515AFD0086819E /* ViewController.h */, - B0FBFA261A515AFD0086819E /* ViewController.mm */, F626D52C1C3E6CAA00C17D15 /* MWMTableViewCell.h */, F626D52D1C3E6CAA00C17D15 /* MWMTableViewCell.mm */, - B0FBFA291A515B4C0086819E /* TableViewController.h */, - B0FBFA2A1A515B4C0086819E /* TableViewController.mm */, - 978F9251183BD530000D6C7C /* NavigationController.h */, - 978F9252183BD530000D6C7C /* NavigationController.mm */, 46F26CD610F623BA00ECCA39 /* EAGLView.h */, 46F26CD710F623BA00ECCA39 /* EAGLView.mm */, 1D3623240D0F684500981E51 /* MapsAppDelegate.h */, @@ -1802,6 +1797,13 @@ F6791B121C43DEA7007A8A6E /* MWMStartButton.mm */, F6FEA82B1C58E89B007223CC /* MWMButton.h */, F6FEA82C1C58E89B007223CC /* MWMButton.mm */, + 34C9BD061C6DB6F3000DC38D /* MWMController.h */, + 34C9BCFE1C6DB693000DC38D /* MWMTableViewController.h */, + 34C9BCFF1C6DB693000DC38D /* MWMTableViewController.mm */, + 34C9BD001C6DB693000DC38D /* MWMViewController.h */, + 34C9BD011C6DB693000DC38D /* MWMViewController.mm */, + 34C9BD071C6DBCDA000DC38D /* MWMNavigationController.h */, + 34C9BD081C6DBCDA000DC38D /* MWMNavigationController.mm */, ); path = Components; sourceTree = ""; @@ -3225,7 +3227,6 @@ 34BC72291B0DECAE0012A34B /* MWMZoomButtons.mm in Sources */, 340C20E31C3E565600111D22 /* MWMCuisineEditorViewController.mm in Sources */, 34B82ADE1B84A4A000180497 /* MWMSearchCommonCell.mm in Sources */, - 978F9253183BD530000D6C7C /* NavigationController.mm in Sources */, F66A8FA81B09F052001B9C97 /* MWMiPhoneLandscapePlacePage.mm in Sources */, 974386DD19373EA400FD5659 /* ToastView.mm in Sources */, F6C9343C1AE4F94A00DDC624 /* MWMAnimator.mm in Sources */, @@ -3236,6 +3237,7 @@ 34CFFE8B1B7DE6FD009D0C9F /* MWMSearchManager.mm in Sources */, 34ABA62C1C2D57D500FE1BEC /* MWMInputPasswordValidator.mm in Sources */, 34ABA6161C2D185C00FE1BEC /* MWMAuthorizationOSMLoginViewController.mm in Sources */, + 3492CC121C6DF00E0057D8E8 /* ProgressView.mm in Sources */, F6BBF2C61B4FFB72000CF8E2 /* MWMLocationAlert.mm in Sources */, F66A8FB01B09F268001B9C97 /* MWMPlacePage.mm in Sources */, F6ED13911B1EF96B0095C6DE /* MWMBookmarkDescriptionViewController.mm in Sources */, @@ -3243,7 +3245,9 @@ F64F19991AB81A00006EAF7E /* MWMAlertViewController.mm in Sources */, FAFCB63613366E78001A5C59 /* WebViewController.mm in Sources */, 34181EA11C0ECF210081B586 /* MWMOpeningHoursDeleteScheduleTableViewCell.mm in Sources */, + 34C9BD091C6DBCDA000DC38D /* MWMNavigationController.mm in Sources */, 340C21111C3FFE3100111D22 /* MWMCuisineEditorTableViewCell.mm in Sources */, + 34C9BD021C6DB693000DC38D /* MWMTableViewController.mm in Sources */, F63BA3711BCD5B520044C504 /* MWMTTSLanguageViewController.mm in Sources */, F64DA8021C524BDE00330E9E /* UISwitch+RuntimeAttributes.m in Sources */, F607C18E1C047FDC00B53A87 /* MWMSegue.mm in Sources */, @@ -3315,7 +3319,6 @@ 345FDD261C3BB3AF0070C459 /* MWMEditorViewController.mm in Sources */, 34B82ABA1B837FFD00180497 /* MWMSearchHistoryRequestCell.mm in Sources */, 34BAB6E91BB2DA0C00DB941B /* MWMBottomMenuLayout.mm in Sources */, - B0FBFA2B1A515B4C0086819E /* TableViewController.mm in Sources */, F785EB4016386FC4003A38A8 /* BookmarkCell.mm in Sources */, 34BAB6ED1BB2DFCE00DB941B /* MWMBottomMenuCollectionViewCell.mm in Sources */, 34CCFDE01C22A2EF00F28959 /* MWMPlacePageOpeningHoursCell.mm in Sources */, @@ -3334,6 +3337,7 @@ 34BC722A1B0DECAE0012A34B /* MWMZoomButtonsView.mm in Sources */, F6F533A31B3C248900C1940B /* UIColor+MapsMeColor.mm in Sources */, 346EDADB1B9F0E35004F8DB5 /* MWMMultilineLabel.mm in Sources */, + 34C9BD041C6DB693000DC38D /* MWMViewController.mm in Sources */, CB252D6F16FF82C9001E41E9 /* Statistics.mm in Sources */, F6D5822D1BFDB7C6009409E8 /* MWMPageController.mm in Sources */, 6BA0BCD11B74DDBA00CC9969 /* MWMCustomFacebookEvents.mm in Sources */, @@ -3349,8 +3353,6 @@ F64F19A31AB81A00006EAF7E /* MWMDownloadTransitMapAlert.mm in Sources */, 97F61794183E7445009919E2 /* LinkCell.mm in Sources */, 34B82AD01B846B2C00180497 /* MWMSearchBookmarksCell.mm in Sources */, - 976D86EC19C8697700C920EF /* ProgressView.mm in Sources */, - B0FBFA271A515AFD0086819E /* ViewController.mm in Sources */, F6BD33841B6240F200F2CE18 /* MWMNavigationView.mm in Sources */, 3472EC051B4D44BE0085CB79 /* UIFont+MapsMeFonts.mm in Sources */, 342AD76F1B53D30C00E0B997 /* UIButton+RuntimeAttributes.mm in Sources */, @@ -3418,7 +3420,6 @@ 6741A9C51BF340DE002C974C /* MWMZoomButtons.mm in Sources */, 6741A9C61BF340DE002C974C /* MWMSearchCommonCell.mm in Sources */, 34ABA6351C2D64D400FE1BEC /* MWMAuthorizationForgottenPasswordViewController.mm in Sources */, - 6741A9C71BF340DE002C974C /* NavigationController.mm in Sources */, 340C20E41C3E565600111D22 /* MWMCuisineEditorViewController.mm in Sources */, 6741A9C81BF340DE002C974C /* MWMiPhoneLandscapePlacePage.mm in Sources */, 6741A9C91BF340DE002C974C /* ToastView.mm in Sources */, @@ -3434,11 +3435,14 @@ 34ABA62D1C2D57D500FE1BEC /* MWMInputPasswordValidator.mm in Sources */, 34ABA6171C2D185C00FE1BEC /* MWMAuthorizationOSMLoginViewController.mm in Sources */, 6741A9D01BF340DE002C974C /* MWMPlacePage.mm in Sources */, + 3492CC131C6DF00F0057D8E8 /* ProgressView.mm in Sources */, 6741A9D21BF340DE002C974C /* MWMBookmarkDescriptionViewController.mm in Sources */, 6741A9D31BF340DE002C974C /* MWMDownloadMapRequestView.mm in Sources */, 3476B8CC1BFDCB6700874594 /* MWMTTSSettingsViewController.mm in Sources */, 6741A9D41BF340DE002C974C /* MWMAlertViewController.mm in Sources */, + 34C9BD0A1C6DBCDA000DC38D /* MWMNavigationController.mm in Sources */, 6741A9D51BF340DE002C974C /* WebViewController.mm in Sources */, + 34C9BD031C6DB693000DC38D /* MWMTableViewController.mm in Sources */, 6741A9D61BF340DE002C974C /* MWMPlacePageNavigationBar.mm in Sources */, 340C21121C3FFE3100111D22 /* MWMCuisineEditorTableViewCell.mm in Sources */, 6741A9D71BF340DE002C974C /* MWMRouteHelperPanelsDrawer.mm in Sources */, @@ -3509,7 +3513,6 @@ 3401CD681C3C03A80028C6F8 /* MWMEditorTextTableViewCell.mm in Sources */, 6741AA071BF340DE002C974C /* MWMBottomMenuLayout.mm in Sources */, 3401CD771C3CED1E0028C6F8 /* MWMEditorSelectTableViewCell.mm in Sources */, - 6741AA081BF340DE002C974C /* TableViewController.mm in Sources */, 34181E9E1C0ECF210081B586 /* MWMOpeningHoursDaysSelectorTableViewCell.mm in Sources */, 345FDD271C3BB3AF0070C459 /* MWMEditorViewController.mm in Sources */, 6741AA091BF340DE002C974C /* BookmarkCell.mm in Sources */, @@ -3531,6 +3534,7 @@ 6741AA141BF340DE002C974C /* MWMMultilineLabel.mm in Sources */, 34181EB01C0ECF210081B586 /* MWMOpeningHoursTimeSelectorTableViewCell.mm in Sources */, 6741AA151BF340DE002C974C /* Statistics.mm in Sources */, + 34C9BD051C6DB693000DC38D /* MWMViewController.mm in Sources */, 6741AA161BF340DE002C974C /* MWMCustomFacebookEvents.mm in Sources */, 6741AA171BF340DE002C974C /* SwitchCell.mm in Sources */, 6741AA181BF340DE002C974C /* UIView+RuntimeAttributes.mm in Sources */, @@ -3544,8 +3548,6 @@ 6741AA1D1BF340DE002C974C /* MWMDownloadTransitMapAlert.mm in Sources */, 6741AA1E1BF340DE002C974C /* LinkCell.mm in Sources */, 6741AA1F1BF340DE002C974C /* MWMSearchBookmarksCell.mm in Sources */, - 6741AA201BF340DE002C974C /* ProgressView.mm in Sources */, - 6741AA211BF340DE002C974C /* ViewController.mm in Sources */, 6741AA221BF340DE002C974C /* MWMNavigationView.mm in Sources */, 6741AA231BF340DE002C974C /* UIFont+MapsMeFonts.mm in Sources */, 674A7E301C0DB10B003D48E1 /* MWMMapWidgets.mm in Sources */, diff --git a/iphone/Maps/Mapsme.storyboard b/iphone/Maps/Mapsme.storyboard index 062fed3c01..55f2f25e34 100644 --- a/iphone/Maps/Mapsme.storyboard +++ b/iphone/Maps/Mapsme.storyboard @@ -1,5 +1,5 @@ - + @@ -41,7 +41,7 @@ - + @@ -66,10 +66,10 @@ - + - + - + - + - + - +