From d2a6f528c5e04bedf5af08cb14148e307dfb8b4f Mon Sep 17 00:00:00 2001 From: Ilya Grechuhin Date: Tue, 10 Jan 2017 15:42:45 +0300 Subject: [PATCH 01/14] [cleanup] [ios] Fixed erroneous view layout in XIB. --- .../Cells/MWMOpeningHoursAllDayTableViewCell.xib | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/iphone/Maps/UI/Editor/OpeningHours/Cells/MWMOpeningHoursAllDayTableViewCell.xib b/iphone/Maps/UI/Editor/OpeningHours/Cells/MWMOpeningHoursAllDayTableViewCell.xib index 69e748a2eb..6c53e5de8f 100644 --- a/iphone/Maps/UI/Editor/OpeningHours/Cells/MWMOpeningHoursAllDayTableViewCell.xib +++ b/iphone/Maps/UI/Editor/OpeningHours/Cells/MWMOpeningHoursAllDayTableViewCell.xib @@ -1,10 +1,14 @@ - - + + + + + - + + @@ -13,7 +17,7 @@ - + - - + + From 3b4f6e9bb2f3ece2af85aa9c39b288b3e8cd9ff6 Mon Sep 17 00:00:00 2001 From: Ilya Grechuhin Date: Tue, 10 Jan 2017 15:52:28 +0300 Subject: [PATCH 02/14] [cleanup] [ios] Fixed strong delegate references. --- iphone/Maps/Maps.xcodeproj/project.pbxproj | 22 +++++++++---------- .../PlacePageLayout/PlacePageView/MWMPPView.h | 2 +- .../MWMSearchFilterTransitioningDelegate.h | 3 --- .../MWMSearchFilterTransitioningManager.h | 3 +++ ...=> MWMSearchFilterTransitioningManager.mm} | 4 ++-- .../Maps/UI/Search/MWMSearchManager+Filter.mm | 10 ++++----- iphone/Maps/UI/Search/MWMSearchManager.mm | 4 ++-- 7 files changed, 24 insertions(+), 24 deletions(-) delete mode 100644 iphone/Maps/UI/Search/Filters/MWMSearchFilterTransitioningDelegate.h create mode 100644 iphone/Maps/UI/Search/Filters/MWMSearchFilterTransitioningManager.h rename iphone/Maps/UI/Search/Filters/{MWMSearchFilterTransitioningDelegate.mm => MWMSearchFilterTransitioningManager.mm} (92%) diff --git a/iphone/Maps/Maps.xcodeproj/project.pbxproj b/iphone/Maps/Maps.xcodeproj/project.pbxproj index 5b6bac4b5f..106a6e4f8b 100644 --- a/iphone/Maps/Maps.xcodeproj/project.pbxproj +++ b/iphone/Maps/Maps.xcodeproj/project.pbxproj @@ -1189,9 +1189,9 @@ F6E2FEC91E097BA00083EBEC /* MWMSearchFilterTransitioning.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FCEA1E097B9F0083EBEC /* MWMSearchFilterTransitioning.mm */; }; F6E2FECA1E097BA00083EBEC /* MWMSearchFilterTransitioning.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FCEA1E097B9F0083EBEC /* MWMSearchFilterTransitioning.mm */; }; F6E2FECB1E097BA00083EBEC /* MWMSearchFilterTransitioning.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FCEA1E097B9F0083EBEC /* MWMSearchFilterTransitioning.mm */; }; - F6E2FECC1E097BA00083EBEC /* MWMSearchFilterTransitioningDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FCEC1E097B9F0083EBEC /* MWMSearchFilterTransitioningDelegate.mm */; }; - F6E2FECD1E097BA00083EBEC /* MWMSearchFilterTransitioningDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FCEC1E097B9F0083EBEC /* MWMSearchFilterTransitioningDelegate.mm */; }; - F6E2FECE1E097BA00083EBEC /* MWMSearchFilterTransitioningDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FCEC1E097B9F0083EBEC /* MWMSearchFilterTransitioningDelegate.mm */; }; + F6E2FECC1E097BA00083EBEC /* MWMSearchFilterTransitioningManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FCEC1E097B9F0083EBEC /* MWMSearchFilterTransitioningManager.mm */; }; + F6E2FECD1E097BA00083EBEC /* MWMSearchFilterTransitioningManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FCEC1E097B9F0083EBEC /* MWMSearchFilterTransitioningManager.mm */; }; + F6E2FECE1E097BA00083EBEC /* MWMSearchFilterTransitioningManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FCEC1E097B9F0083EBEC /* MWMSearchFilterTransitioningManager.mm */; }; F6E2FECF1E097BA00083EBEC /* MWMSearchFilterViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FCEE1E097B9F0083EBEC /* MWMSearchFilterViewController.mm */; }; F6E2FED01E097BA00083EBEC /* MWMSearchFilterViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FCEE1E097B9F0083EBEC /* MWMSearchFilterViewController.mm */; }; F6E2FED11E097BA00083EBEC /* MWMSearchFilterViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FCEE1E097B9F0083EBEC /* MWMSearchFilterViewController.mm */; }; @@ -1772,7 +1772,7 @@ 845C89301C89837900940D7F /* AssetsLibrary.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AssetsLibrary.framework; path = System/Library/Frameworks/AssetsLibrary.framework; sourceTree = SDKROOT; }; 845C89331C8983F300940D7F /* libc++.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = "libc++.tbd"; path = "usr/lib/libc++.tbd"; sourceTree = SDKROOT; }; 845C89341C8983F300940D7F /* QuickLook.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuickLook.framework; path = System/Library/Frameworks/QuickLook.framework; sourceTree = SDKROOT; }; - 849CF7A31DE842290024A8A5 /* cmMAPS.ME.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = cmMAPS.ME.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 849CF7A31DE842290024A8A5 /* cmMAPS.ME.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; name = cmMAPS.ME.app; path = "cm dbg.app"; sourceTree = BUILT_PRODUCTS_DIR; }; 8D1107310486CEB800E47090 /* MAPSME.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = MAPSME.plist; plistStructureDefinitionIdentifier = "com.apple.xcode.plist.structure-definition.iphone.info-plist"; sourceTree = ""; }; 972CDCC51887F1B7006641CA /* CFNetwork.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CFNetwork.framework; path = System/Library/Frameworks/CFNetwork.framework; sourceTree = SDKROOT; }; 974D041B1977DE430081D0A7 /* LocalNotificationManager.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; lineEnding = 0; path = LocalNotificationManager.mm; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; @@ -2102,8 +2102,8 @@ F6E2FCE81E097B9F0083EBEC /* MWMSearchFilters.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = MWMSearchFilters.storyboard; sourceTree = ""; }; F6E2FCE91E097B9F0083EBEC /* MWMSearchFilterTransitioning.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMSearchFilterTransitioning.h; sourceTree = ""; }; F6E2FCEA1E097B9F0083EBEC /* MWMSearchFilterTransitioning.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMSearchFilterTransitioning.mm; sourceTree = ""; }; - F6E2FCEB1E097B9F0083EBEC /* MWMSearchFilterTransitioningDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMSearchFilterTransitioningDelegate.h; sourceTree = ""; }; - F6E2FCEC1E097B9F0083EBEC /* MWMSearchFilterTransitioningDelegate.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMSearchFilterTransitioningDelegate.mm; sourceTree = ""; }; + F6E2FCEB1E097B9F0083EBEC /* MWMSearchFilterTransitioningManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMSearchFilterTransitioningManager.h; sourceTree = ""; }; + F6E2FCEC1E097B9F0083EBEC /* MWMSearchFilterTransitioningManager.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMSearchFilterTransitioningManager.mm; sourceTree = ""; }; F6E2FCED1E097B9F0083EBEC /* MWMSearchFilterViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMSearchFilterViewController.h; sourceTree = ""; }; F6E2FCEE1E097B9F0083EBEC /* MWMSearchFilterViewController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMSearchFilterViewController.mm; sourceTree = ""; }; F6E2FCEF1E097B9F0083EBEC /* MWMSearchFilterViewController_Protected.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMSearchFilterViewController_Protected.h; sourceTree = ""; }; @@ -3777,8 +3777,8 @@ F6E2FCE81E097B9F0083EBEC /* MWMSearchFilters.storyboard */, F6E2FCE91E097B9F0083EBEC /* MWMSearchFilterTransitioning.h */, F6E2FCEA1E097B9F0083EBEC /* MWMSearchFilterTransitioning.mm */, - F6E2FCEB1E097B9F0083EBEC /* MWMSearchFilterTransitioningDelegate.h */, - F6E2FCEC1E097B9F0083EBEC /* MWMSearchFilterTransitioningDelegate.mm */, + F6E2FCEB1E097B9F0083EBEC /* MWMSearchFilterTransitioningManager.h */, + F6E2FCEC1E097B9F0083EBEC /* MWMSearchFilterTransitioningManager.mm */, F6E2FCED1E097B9F0083EBEC /* MWMSearchFilterViewController.h */, F6E2FCEE1E097B9F0083EBEC /* MWMSearchFilterViewController.mm */, F6E2FCEF1E097B9F0083EBEC /* MWMSearchFilterViewController_Protected.h */, @@ -4815,7 +4815,7 @@ F6E2FE541E097BA00083EBEC /* MWMPlacePageActionBar.mm in Sources */, 34C9BD091C6DBCDA000DC38D /* MWMNavigationController.mm in Sources */, 3406FA151C6E0C3300E9FAD2 /* MWMMapDownloadDialog.mm in Sources */, - F6E2FECC1E097BA00083EBEC /* MWMSearchFilterTransitioningDelegate.mm in Sources */, + F6E2FECC1E097BA00083EBEC /* MWMSearchFilterTransitioningManager.mm in Sources */, F6E2FDD91E097BA00083EBEC /* MWMEditorTextTableViewCell.mm in Sources */, F6E2FF111E097BA00083EBEC /* MWMSearchHistoryRequestCell.mm in Sources */, 34C9BD021C6DB693000DC38D /* MWMTableViewController.mm in Sources */, @@ -5070,7 +5070,7 @@ F6E2FE551E097BA00083EBEC /* MWMPlacePageActionBar.mm in Sources */, 34ABA6171C2D185C00FE1BEC /* MWMAuthorizationOSMLoginViewController.mm in Sources */, 6741A9D41BF340DE002C974C /* MWMAlertViewController.mm in Sources */, - F6E2FECD1E097BA00083EBEC /* MWMSearchFilterTransitioningDelegate.mm in Sources */, + F6E2FECD1E097BA00083EBEC /* MWMSearchFilterTransitioningManager.mm in Sources */, F6E2FDDA1E097BA00083EBEC /* MWMEditorTextTableViewCell.mm in Sources */, F6E2FF121E097BA00083EBEC /* MWMSearchHistoryRequestCell.mm in Sources */, F6FE3C391CC50FFD00A73196 /* MWMPlaceDoesntExistAlert.mm in Sources */, @@ -5325,7 +5325,7 @@ F6E2FE561E097BA00083EBEC /* MWMPlacePageActionBar.mm in Sources */, 849CF6CF1DE842290024A8A5 /* MWMAlertViewController.mm in Sources */, 340475781E081A4600C92850 /* MWMTrafficManager.mm in Sources */, - F6E2FECE1E097BA00083EBEC /* MWMSearchFilterTransitioningDelegate.mm in Sources */, + F6E2FECE1E097BA00083EBEC /* MWMSearchFilterTransitioningManager.mm in Sources */, F6E2FDDB1E097BA00083EBEC /* MWMEditorTextTableViewCell.mm in Sources */, F6E2FF131E097BA00083EBEC /* MWMSearchHistoryRequestCell.mm in Sources */, 849CF6D21DE842290024A8A5 /* MWMNavigationController.mm in Sources */, diff --git a/iphone/Maps/UI/PlacePage/PlacePageLayout/PlacePageView/MWMPPView.h b/iphone/Maps/UI/PlacePage/PlacePageLayout/PlacePageView/MWMPPView.h index e807b05c35..a45802767e 100644 --- a/iphone/Maps/UI/PlacePage/PlacePageLayout/PlacePageView/MWMPPView.h +++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/PlacePageView/MWMPPView.h @@ -23,6 +23,6 @@ @property(weak, nonatomic) IBOutlet UITableView * tableView; @property(nonatomic) CGFloat currentContentHeight; -@property(nonatomic) id delegate; +@property(weak, nonatomic) id delegate; @end diff --git a/iphone/Maps/UI/Search/Filters/MWMSearchFilterTransitioningDelegate.h b/iphone/Maps/UI/Search/Filters/MWMSearchFilterTransitioningDelegate.h deleted file mode 100644 index aabe260e4a..0000000000 --- a/iphone/Maps/UI/Search/Filters/MWMSearchFilterTransitioningDelegate.h +++ /dev/null @@ -1,3 +0,0 @@ -@interface MWMSearchFilterTransitioningDelegate : NSObject - -@end diff --git a/iphone/Maps/UI/Search/Filters/MWMSearchFilterTransitioningManager.h b/iphone/Maps/UI/Search/Filters/MWMSearchFilterTransitioningManager.h new file mode 100644 index 0000000000..ef532b8264 --- /dev/null +++ b/iphone/Maps/UI/Search/Filters/MWMSearchFilterTransitioningManager.h @@ -0,0 +1,3 @@ +@interface MWMSearchFilterTransitioningManager : NSObject + +@end diff --git a/iphone/Maps/UI/Search/Filters/MWMSearchFilterTransitioningDelegate.mm b/iphone/Maps/UI/Search/Filters/MWMSearchFilterTransitioningManager.mm similarity index 92% rename from iphone/Maps/UI/Search/Filters/MWMSearchFilterTransitioningDelegate.mm rename to iphone/Maps/UI/Search/Filters/MWMSearchFilterTransitioningManager.mm index 693b1de6a9..9939eb3041 100644 --- a/iphone/Maps/UI/Search/Filters/MWMSearchFilterTransitioningDelegate.mm +++ b/iphone/Maps/UI/Search/Filters/MWMSearchFilterTransitioningManager.mm @@ -1,8 +1,8 @@ -#import "MWMSearchFilterTransitioningDelegate.h" +#import "MWMSearchFilterTransitioningManager.h" #import "MWMSearchFilterPresentationController.h" #import "MWMSearchFilterTransitioning.h" -@implementation MWMSearchFilterTransitioningDelegate +@implementation MWMSearchFilterTransitioningManager - (UIPresentationController *) presentationControllerForPresentedViewController:(UIViewController *)presented diff --git a/iphone/Maps/UI/Search/MWMSearchManager+Filter.mm b/iphone/Maps/UI/Search/MWMSearchManager+Filter.mm index 8279272d08..d29c399637 100644 --- a/iphone/Maps/UI/Search/MWMSearchManager+Filter.mm +++ b/iphone/Maps/UI/Search/MWMSearchManager+Filter.mm @@ -1,5 +1,5 @@ #import "MWMSearch.h" -#import "MWMSearchFilterTransitioningDelegate.h" +#import "MWMSearchFilterTransitioningManager.h" #import "MWMSearchFilterViewController.h" #import "MWMSearchManager+Filter.h" #import "UIColor+MapsMeColor.h" @@ -10,7 +10,7 @@ @property(weak, nonatomic, readonly) UIViewController * ownerController; @property(weak, nonatomic) IBOutlet UIButton * actionBarViewFilterButton; -@property(nonatomic) MWMSearchFilterTransitioningDelegate * filterTransitioningDelegate; +@property(nonatomic) MWMSearchFilterTransitioningManager * filterTransitioningManager; @end @@ -35,9 +35,9 @@ else { navController.modalPresentationStyle = UIModalPresentationCustom; - self.filterTransitioningDelegate = [[MWMSearchFilterTransitioningDelegate alloc] init]; - ownerController.transitioningDelegate = self.filterTransitioningDelegate; - navController.transitioningDelegate = self.filterTransitioningDelegate; + self.filterTransitioningManager = [[MWMSearchFilterTransitioningManager alloc] init]; + ownerController.transitioningDelegate = self.filterTransitioningManager; + navController.transitioningDelegate = self.filterTransitioningManager; } [self configNavigationBar:navController.navigationBar]; diff --git a/iphone/Maps/UI/Search/MWMSearchManager.mm b/iphone/Maps/UI/Search/MWMSearchManager.mm index bc6ee9bfde..c8a4a86537 100644 --- a/iphone/Maps/UI/Search/MWMSearchManager.mm +++ b/iphone/Maps/UI/Search/MWMSearchManager.mm @@ -8,7 +8,7 @@ #import "MWMRouter.h" #import "MWMSearch.h" #import "MWMSearchChangeModeView.h" -#import "MWMSearchFilterTransitioningDelegate.h" +#import "MWMSearchFilterTransitioningManager.h" #import "MWMSearchManager+Filter.h" #import "MWMSearchManager+Layout.h" #import "MWMSearchTabButtonsView.h" @@ -73,7 +73,7 @@ typedef NS_ENUM(NSUInteger, MWMSearchManagerActionBarState) { @property(nonatomic) MWMSearchTableViewController * tableViewController; @property(nonatomic) MWMNoMapsViewController * noMapsController; -@property(nonatomic) MWMSearchFilterTransitioningDelegate * filterTransitioningDelegate; +@property(nonatomic) MWMSearchFilterTransitioningManager * filterTransitioningManager; @end From 940bcb59d0f44fc76f4ef553f2201aaf03284696 Mon Sep 17 00:00:00 2001 From: Ilya Grechuhin Date: Tue, 10 Jan 2017 15:59:35 +0300 Subject: [PATCH 03/14] [cleanup] [ios] Fixed conflicting category methods. --- .../MWMiPadPlacePageLayoutImpl.mm | 23 ------------------- .../PlacePageView/MWMPPView.mm | 16 +++++++++++++ 2 files changed, 16 insertions(+), 23 deletions(-) diff --git a/iphone/Maps/UI/PlacePage/PlacePageLayout/MWMiPadPlacePageLayoutImpl.mm b/iphone/Maps/UI/PlacePage/PlacePageLayout/MWMiPadPlacePageLayoutImpl.mm index 037feb0b1f..26d0f52fc0 100644 --- a/iphone/Maps/UI/PlacePage/PlacePageLayout/MWMiPadPlacePageLayoutImpl.mm +++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/MWMiPadPlacePageLayoutImpl.mm @@ -9,29 +9,6 @@ CGFloat const kTopOffset = 36; CGFloat const kBottomOffset = 60; } // namespace -@interface MWMPPView (ActionBarLayout) - -@end - -@implementation MWMPPView (ActionBarLayout) - -- (void)layoutSubviews -{ - [super layoutSubviews]; - if (!IPAD) - return; - - for (UIView * sv in self.subviews) - { - if (![sv isKindOfClass:[MWMPlacePageActionBar class]]) - continue; - sv.maxY = self.height; - break; - } -} - -@end - @interface MWMiPadPlacePageLayoutImpl () @property(nonatomic) CGFloat topBound; diff --git a/iphone/Maps/UI/PlacePage/PlacePageLayout/PlacePageView/MWMPPView.mm b/iphone/Maps/UI/PlacePage/PlacePageLayout/PlacePageView/MWMPPView.mm index a169df5882..e9e9c78eb6 100644 --- a/iphone/Maps/UI/PlacePage/PlacePageLayout/PlacePageView/MWMPPView.mm +++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/PlacePageView/MWMPPView.mm @@ -1,4 +1,5 @@ #import "MWMCommon.h" +#import "MWMPlacePageActionBar.h" #import "MWMPPView.h" #import "UIColor+MapsMeColor.h" @@ -81,4 +82,19 @@ CGFloat const kTableViewTopInset = -36; [self.tableView removeObserver:self forKeyPath:kTableViewContentSizeKeyPath context:kContext]; } +- (void)layoutSubviews +{ + [super layoutSubviews]; + if (!IPAD) + return; + + for (UIView * sv in self.subviews) + { + if (![sv isKindOfClass:[MWMPlacePageActionBar class]]) + continue; + sv.maxY = self.height; + break; + } +} + @end From 8d574916fe545768e98274359f51e3df920f65b8 Mon Sep 17 00:00:00 2001 From: Ilya Grechuhin Date: Tue, 10 Jan 2017 16:04:38 +0300 Subject: [PATCH 04/14] [cleanup] [ios] Fixed Undetached delegates. --- .../CustomViews/NavigationDashboard/Sound/MWMTextToSpeech.mm | 5 +++++ iphone/Maps/Core/Location/MWMLocationManager.mm | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Sound/MWMTextToSpeech.mm b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Sound/MWMTextToSpeech.mm index 21ceb45a0c..c230d231f0 100644 --- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Sound/MWMTextToSpeech.mm +++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Sound/MWMTextToSpeech.mm @@ -110,6 +110,11 @@ vector> availableLanguages() return self; } +- (void)dealloc +{ + self.speechSynthesizer.delegate = nil; +} + + (NSString *)ttsStatusNotificationKey { return @"TTFStatusWasChangedFromSettingsNotification"; } - (vector>)availableLanguages { return _availableLanguages; } - (void)setNotificationsLocale:(NSString *)locale diff --git a/iphone/Maps/Core/Location/MWMLocationManager.mm b/iphone/Maps/Core/Location/MWMLocationManager.mm index 86648cfd40..76fa81fd52 100644 --- a/iphone/Maps/Core/Location/MWMLocationManager.mm +++ b/iphone/Maps/Core/Location/MWMLocationManager.mm @@ -192,6 +192,11 @@ void setPermissionRequested() return self; } +- (void)dealloc +{ + self.locationManager.delegate = nil; +} + #pragma mark - Add/Remove Observers + (void)addObserver:(TObserver)observer From 08a1048498d6d5baeecdac749f0368a57a08fb76 Mon Sep 17 00:00:00 2001 From: Ilya Grechuhin Date: Tue, 10 Jan 2017 16:08:26 +0300 Subject: [PATCH 05/14] [cleanup] [ios] Fixed fixed-format NSDateFormatter not using invariant (POSIX) locale. --- iphone/Maps/Common/AppInfo.mm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/iphone/Maps/Common/AppInfo.mm b/iphone/Maps/Common/AppInfo.mm index 175a846f80..da226b0fcd 100644 --- a/iphone/Maps/Common/AppInfo.mm +++ b/iphone/Maps/Common/AppInfo.mm @@ -208,7 +208,7 @@ NSDictionary * const kDeviceNamesWithMetalDriver = @{ NSDateFormatter * dateFormatter = [[NSDateFormatter alloc] init]; [dateFormatter setDateFormat:@"LLL d yyyy HH:mm:ss"]; - [dateFormatter setLocale:[[NSLocale alloc] initWithLocaleIdentifier:@"en_US"]]; + [dateFormatter setLocale:[[NSLocale alloc] initWithLocaleIdentifier:@"en_US_POSIX"]]; _buildDate = [dateFormatter dateFromString:dateStr]; } return _buildDate; From dcf987c22892eae476150b4b75bb9af061ef7e42 Mon Sep 17 00:00:00 2001 From: Ilya Grechuhin Date: Tue, 10 Jan 2017 16:13:27 +0300 Subject: [PATCH 06/14] [cleanup] [ios] Fixed unidiomatic accessor naming. --- .../Cuisine/MWMCuisineEditorViewController.h | 2 +- .../Cuisine/MWMCuisineEditorViewController.mm | 2 +- .../Maps/UI/Editor/MWMEditorViewController.mm | 2 +- .../OpeningHours/MWMOpeningHoursModel.mm | 2 +- .../OpeningHours/MWMOpeningHoursSection.h | 2 +- .../OpeningHours/MWMOpeningHoursSection.mm | 26 +++++++++---------- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/iphone/Maps/UI/Editor/Cuisine/MWMCuisineEditorViewController.h b/iphone/Maps/UI/Editor/Cuisine/MWMCuisineEditorViewController.h index a718b879b0..171705fae4 100644 --- a/iphone/Maps/UI/Editor/Cuisine/MWMCuisineEditorViewController.h +++ b/iphone/Maps/UI/Editor/Cuisine/MWMCuisineEditorViewController.h @@ -5,7 +5,7 @@ @protocol MWMCuisineEditorProtocol -- (vector)getSelectedCuisines; +- (vector)selectedCuisines; - (void)setSelectedCuisines:(vector const &)cuisines; @end diff --git a/iphone/Maps/UI/Editor/Cuisine/MWMCuisineEditorViewController.mm b/iphone/Maps/UI/Editor/Cuisine/MWMCuisineEditorViewController.mm index 7f8f0a763d..5a1b4e75b2 100644 --- a/iphone/Maps/UI/Editor/Cuisine/MWMCuisineEditorViewController.mm +++ b/iphone/Maps/UI/Editor/Cuisine/MWMCuisineEditorViewController.mm @@ -153,7 +153,7 @@ vector SliceKeys(vector> const & v) using namespace osm; m_allCuisines = Cuisines::Instance().AllSupportedCuisines(); m_displayedKeys = SliceKeys(m_allCuisines); - m_selectedCuisines = [self.delegate getSelectedCuisines]; + m_selectedCuisines = [self.delegate selectedCuisines]; for (auto const & s : m_selectedCuisines) { string const translated = Cuisines::Instance().Translate(s); diff --git a/iphone/Maps/UI/Editor/MWMEditorViewController.mm b/iphone/Maps/UI/Editor/MWMEditorViewController.mm index 0b3d9a9010..2a5f9d41f3 100644 --- a/iphone/Maps/UI/Editor/MWMEditorViewController.mm +++ b/iphone/Maps/UI/Editor/MWMEditorViewController.mm @@ -1041,7 +1041,7 @@ void registerCellsForTableView(vector const & cells, UITab #pragma mark - MWMCuisineEditorProtocol -- (vector)getSelectedCuisines { return m_mapObject.GetCuisines(); } +- (vector)selectedCuisines { return m_mapObject.GetCuisines(); } - (void)setSelectedCuisines:(vector const &)cuisines { m_mapObject.SetCuisines(cuisines); } #pragma mark - MWMStreetEditorProtocol diff --git a/iphone/Maps/UI/Editor/OpeningHours/MWMOpeningHoursModel.mm b/iphone/Maps/UI/Editor/OpeningHours/MWMOpeningHoursModel.mm index 0e2ac1ce1c..8b719bfb74 100644 --- a/iphone/Maps/UI/Editor/OpeningHours/MWMOpeningHoursModel.mm +++ b/iphone/Maps/UI/Editor/OpeningHours/MWMOpeningHoursModel.mm @@ -89,7 +89,7 @@ using namespace osmoh; } } -- (ui::TTimeTableProxy)getTimeTableProxy:(NSUInteger)index +- (ui::TTimeTableProxy)timeTableProxy:(NSUInteger)index { NSAssert(index < self.count, @"Invalid section index"); return timeTableSet.Get(index); diff --git a/iphone/Maps/UI/Editor/OpeningHours/MWMOpeningHoursSection.h b/iphone/Maps/UI/Editor/OpeningHours/MWMOpeningHoursSection.h index 23c65729a9..68342e0731 100644 --- a/iphone/Maps/UI/Editor/OpeningHours/MWMOpeningHoursSection.h +++ b/iphone/Maps/UI/Editor/OpeningHours/MWMOpeningHoursSection.h @@ -10,7 +10,7 @@ - (void)updateActiveSection:(NSUInteger)index; -- (editor::ui::TTimeTableProxy)getTimeTableProxy:(NSUInteger)index; +- (editor::ui::TTimeTableProxy)timeTableProxy:(NSUInteger)index; - (void)deleteSchedule:(NSUInteger)index; @end diff --git a/iphone/Maps/UI/Editor/OpeningHours/MWMOpeningHoursSection.mm b/iphone/Maps/UI/Editor/OpeningHours/MWMOpeningHoursSection.mm index c7a363811a..8cedd6f643 100644 --- a/iphone/Maps/UI/Editor/OpeningHours/MWMOpeningHoursSection.mm +++ b/iphone/Maps/UI/Editor/OpeningHours/MWMOpeningHoursSection.mm @@ -114,7 +114,7 @@ using namespace osmoh; return cachedTime; BOOL const isClosed = [self cellKeyForRow:row] != MWMOpeningHoursEditorTimeSpanCell; - TTimeTableProxy tt = [self getTimeTableProxy]; + TTimeTableProxy tt = [self timeTableProxy]; NSUInteger const index = isClosed ? [self closedTimeIndex:row] : 0; Timespan span = isClosed ? tt.GetExcludeTime()[index] : tt.GetOpeningTime(); return dateComponentsFromTime(isStart ? span.GetStart() : span.GetEnd()); @@ -125,7 +125,7 @@ using namespace osmoh; if (!startTime && !endTime) return; - TTimeTableProxy tt = [self getTimeTableProxy]; + TTimeTableProxy tt = [self timeTableProxy]; NSUInteger const row = self.selectedRow.unsignedIntegerValue; NSUInteger const index = isClosed ? [self closedTimeIndex:row] : 0; Timespan span = isClosed ? tt.GetExcludeTime()[index] : tt.GetOpeningTime(); @@ -165,7 +165,7 @@ using namespace osmoh; - (NSUInteger)closedTimesCount { - return [self getTimeTableProxy].GetExcludeTime().size(); + return [self timeTableProxy].GetExcludeTime().size(); } - (NSUInteger)closedTimeIndex:(NSUInteger)row @@ -185,7 +185,7 @@ using namespace osmoh; NSUInteger const row = [self firstRowForKey:MWMOpeningHoursEditorAddClosedCell]; - TTimeTableProxy timeTable = [self getTimeTableProxy]; + TTimeTableProxy timeTable = [self timeTableProxy]; NSUInteger const closedTimesCountBeforeUpdate = [self closedTimesCount]; @@ -222,7 +222,7 @@ using namespace osmoh; UITableView * tableView = self.delegate.tableView; [tableView beginUpdates]; - TTimeTableProxy timeTable = [self getTimeTableProxy]; + TTimeTableProxy timeTable = [self timeTableProxy]; timeTable.RemoveExcludeTime([self closedTimeIndex:row]); timeTable.Commit(); @@ -237,7 +237,7 @@ using namespace osmoh; - (void)addSelectedDay:(Weekday)day { - TTimeTableProxy timeTable = [self getTimeTableProxy]; + TTimeTableProxy timeTable = [self timeTableProxy]; TOpeningDays openingDays(timeTable.GetOpeningDays()); openingDays.insert(day); timeTable.SetOpeningDays(openingDays); @@ -247,7 +247,7 @@ using namespace osmoh; - (void)removeSelectedDay:(Weekday)day { - TTimeTableProxy timeTable = [self getTimeTableProxy]; + TTimeTableProxy timeTable = [self timeTableProxy]; TOpeningDays openingDays(timeTable.GetOpeningDays()); openingDays.erase(day); timeTable.SetOpeningDays(openingDays); @@ -257,7 +257,7 @@ using namespace osmoh; - (BOOL)containsSelectedDay:(Weekday)day { - TTimeTableProxy timeTable = [self getTimeTableProxy]; + TTimeTableProxy timeTable = [self timeTableProxy]; TOpeningDays const & openingDays = timeTable.GetOpeningDays(); return openingDays.find(day) != openingDays.end(); } @@ -316,9 +316,9 @@ using namespace osmoh; #pragma mark - Model -- (TTimeTableProxy)getTimeTableProxy +- (TTimeTableProxy)timeTableProxy { - return [self.delegate getTimeTableProxy:self.index]; + return [self.delegate timeTableProxy:self.index]; } - (void)deleteSchedule @@ -444,7 +444,7 @@ using namespace osmoh; - (BOOL)allDay { - return [self getTimeTableProxy].IsTwentyFourHours(); + return [self timeTableProxy].IsTwentyFourHours(); } - (void)setAllDay:(BOOL)allDay @@ -456,7 +456,7 @@ using namespace osmoh; NSUInteger const deleteScheduleCellShift = self.index != 0 ? 1 : 0; NSUInteger const oldRowCount = [self numberOfRowsForAllDay:currentAllDay] - deleteScheduleCellShift; NSUInteger const newRowCount = [self numberOfRowsForAllDay:allDay] - deleteScheduleCellShift; - TTimeTableProxy timeTable = [self getTimeTableProxy]; + TTimeTableProxy timeTable = [self timeTableProxy]; timeTable.SetTwentyFourHours(allDay); timeTable.Commit(); [self refreshForNewRowCount:newRowCount oldRowCount:oldRowCount]; @@ -484,7 +484,7 @@ using namespace osmoh; - (BOOL)canAddClosedTime { - return [self getTimeTableProxy].CanAddExcludeTime(); + return [self timeTableProxy].CanAddExcludeTime(); } @end From 0f71cb83de7a81d841e55407ed9f1c8380cdac89 Mon Sep 17 00:00:00 2001 From: Ilya Grechuhin Date: Tue, 10 Jan 2017 16:16:06 +0300 Subject: [PATCH 07/14] [cleanup] [ios] Fixed uncommented localized string. --- iphone/Maps/Classes/ColorPickerView.mm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/iphone/Maps/Classes/ColorPickerView.mm b/iphone/Maps/Classes/ColorPickerView.mm index dc5c55b8ba..7edf8ec46b 100644 --- a/iphone/Maps/Classes/ColorPickerView.mm +++ b/iphone/Maps/Classes/ColorPickerView.mm @@ -44,7 +44,7 @@ static Tcolor const g_color [] = UILabel * header = [[UILabel alloc] initWithFrame:CGRectMake(0, 0, customWidth, HEADERHEIGHT)]; header.backgroundColor = [UIColor clearColor]; - header.text = NSLocalizedString(@"bookmark_color", nil); + header.text = L(@"bookmark_color"); header.font = [UIFont fontWithName:@"Helvetica" size:20]; header.textAlignment = NSTextAlignmentCenter; header.textColor = [UIColor colorWithRed:51/255.f green:204/255.f blue:255/255.f alpha:1]; From 05651dcc615f184fea2bf8654e412923edcc119d Mon Sep 17 00:00:00 2001 From: Ilya Grechuhin Date: Tue, 10 Jan 2017 16:20:25 +0300 Subject: [PATCH 08/14] [cleanup] [ios] Fixed non-copying property of immutable NSCopying type. --- iphone/Maps/Categories/UIButton+RuntimeAttributes.h | 2 +- iphone/Maps/Categories/UILabel+RuntimeAttributes.h | 2 +- iphone/Maps/Categories/UITextField+RuntimeAttributes.h | 2 +- iphone/Maps/Categories/UITextView+RuntimeAttributes.h | 2 +- iphone/Maps/Common/WebViewController.h | 2 +- iphone/Maps/UI/Search/TabButtons/MWMSearchTabButtonsView.h | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/iphone/Maps/Categories/UIButton+RuntimeAttributes.h b/iphone/Maps/Categories/UIButton+RuntimeAttributes.h index 53a7e65647..877ee46ca0 100644 --- a/iphone/Maps/Categories/UIButton+RuntimeAttributes.h +++ b/iphone/Maps/Categories/UIButton+RuntimeAttributes.h @@ -2,7 +2,7 @@ @interface UIButton (RuntimeAttributes) -@property(nonatomic) NSString * localizedText; +@property(copy, nonatomic) NSString * localizedText; - (void)setBackgroundColorName:(NSString *)colorName; - (NSString *)backgroundColorName; diff --git a/iphone/Maps/Categories/UILabel+RuntimeAttributes.h b/iphone/Maps/Categories/UILabel+RuntimeAttributes.h index fb652df6c1..72d9d8694a 100644 --- a/iphone/Maps/Categories/UILabel+RuntimeAttributes.h +++ b/iphone/Maps/Categories/UILabel+RuntimeAttributes.h @@ -1,3 +1,3 @@ @interface UILabel (RuntimeAttributes) -@property (nonatomic) NSString * localizedText; +@property (copy, nonatomic) NSString * localizedText; @end diff --git a/iphone/Maps/Categories/UITextField+RuntimeAttributes.h b/iphone/Maps/Categories/UITextField+RuntimeAttributes.h index 34f70caa9e..d062027d7d 100644 --- a/iphone/Maps/Categories/UITextField+RuntimeAttributes.h +++ b/iphone/Maps/Categories/UITextField+RuntimeAttributes.h @@ -2,7 +2,7 @@ @interface UITextField (RuntimeAttributes) -@property (nonatomic) NSString * localizedPlaceholder; +@property (copy, nonatomic) NSString * localizedPlaceholder; @property (nonatomic) MWMInputValidator * validator; @property (nonatomic, readonly) BOOL isValid; diff --git a/iphone/Maps/Categories/UITextView+RuntimeAttributes.h b/iphone/Maps/Categories/UITextView+RuntimeAttributes.h index 61068dd1f0..0479f1c60e 100644 --- a/iphone/Maps/Categories/UITextView+RuntimeAttributes.h +++ b/iphone/Maps/Categories/UITextView+RuntimeAttributes.h @@ -6,6 +6,6 @@ @interface MWMTextView (RuntimeAttributes) -@property (nonatomic) NSString * localizedPlaceholder; +@property (copy, nonatomic) NSString * localizedPlaceholder; @end diff --git a/iphone/Maps/Common/WebViewController.h b/iphone/Maps/Common/WebViewController.h index be58eafdb3..309d35f27c 100644 --- a/iphone/Maps/Common/WebViewController.h +++ b/iphone/Maps/Common/WebViewController.h @@ -3,7 +3,7 @@ @interface WebViewController : MWMViewController @property (nonatomic) NSURL * m_url; -@property (nonatomic) NSString * m_htmlText; +@property (copy, nonatomic) NSString * m_htmlText; // Set to YES if external browser should be launched @property (nonatomic) BOOL openInSafari; diff --git a/iphone/Maps/UI/Search/TabButtons/MWMSearchTabButtonsView.h b/iphone/Maps/UI/Search/TabButtons/MWMSearchTabButtonsView.h index 05545efcf7..83adb5f936 100644 --- a/iphone/Maps/UI/Search/TabButtons/MWMSearchTabButtonsView.h +++ b/iphone/Maps/UI/Search/TabButtons/MWMSearchTabButtonsView.h @@ -11,6 +11,6 @@ @property (nonatomic) BOOL selected; @property (nonatomic) UIImage * iconImage; -@property (nonatomic) NSString * localizedText; +@property (copy, nonatomic) NSString * localizedText; @end From dd54bb0adb518e41457831f269e7198a643bb201 Mon Sep 17 00:00:00 2001 From: Ilya Grechuhin Date: Tue, 10 Jan 2017 16:22:20 +0300 Subject: [PATCH 09/14] [cleanup] [ios] Fixed redundant inclusion directives. --- .../MapViewControls/BottomMenu/MWMBottomMenuViewController.mm | 1 - iphone/Maps/Core/Location/MWMLocationPredictor.h | 2 -- iphone/Maps/UI/Downloader/MWMMapDownloaderViewController.mm | 1 - iphone/Maps/UI/Downloader/NoMaps/MWMNoMapsView.h | 2 -- iphone/Maps/UI/Editor/MWMEditorAdditionalNamesHeader.h | 2 -- .../UI/Search/Filters/MWMSearchHotelsFilterViewController.mm | 1 - 6 files changed, 9 deletions(-) diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuViewController.mm b/iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuViewController.mm index 1e1d7c7e75..08f12515d9 100644 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuViewController.mm +++ b/iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuViewController.mm @@ -23,7 +23,6 @@ #import "UIColor+MapsMeColor.h" #import "UIFont+MapsMeFonts.h" #import "UIImageView+Coloring.h" -#import "UIKitCategories.h" #import "UIViewController+Navigation.h" #import "3party/Alohalytics/src/alohalytics_objc.h" diff --git a/iphone/Maps/Core/Location/MWMLocationPredictor.h b/iphone/Maps/Core/Location/MWMLocationPredictor.h index e8700dcc40..2bdda7adce 100644 --- a/iphone/Maps/Core/Location/MWMLocationPredictor.h +++ b/iphone/Maps/Core/Location/MWMLocationPredictor.h @@ -1,5 +1,3 @@ -#import "MWMTypes.h" - #include "platform/location.hpp" using TPredictionBlock = void (^)(location::GpsInfo const &); diff --git a/iphone/Maps/UI/Downloader/MWMMapDownloaderViewController.mm b/iphone/Maps/UI/Downloader/MWMMapDownloaderViewController.mm index eb9a1ddcf4..cc7239b46f 100644 --- a/iphone/Maps/UI/Downloader/MWMMapDownloaderViewController.mm +++ b/iphone/Maps/UI/Downloader/MWMMapDownloaderViewController.mm @@ -5,7 +5,6 @@ #import "MWMNoMapsViewController.h" #import "SwiftBridge.h" #import "UIColor+MapsMeColor.h" -#import "UIKitCategories.h" #include "Framework.h" diff --git a/iphone/Maps/UI/Downloader/NoMaps/MWMNoMapsView.h b/iphone/Maps/UI/Downloader/NoMaps/MWMNoMapsView.h index d16a44e2df..aa9a8c700c 100644 --- a/iphone/Maps/UI/Downloader/NoMaps/MWMNoMapsView.h +++ b/iphone/Maps/UI/Downloader/NoMaps/MWMNoMapsView.h @@ -1,5 +1,3 @@ -#import "UIKitCategories.h" - @interface MWMNoMapsView : SolidTouchView @end diff --git a/iphone/Maps/UI/Editor/MWMEditorAdditionalNamesHeader.h b/iphone/Maps/UI/Editor/MWMEditorAdditionalNamesHeader.h index 880635225f..eae44e7108 100644 --- a/iphone/Maps/UI/Editor/MWMEditorAdditionalNamesHeader.h +++ b/iphone/Maps/UI/Editor/MWMEditorAdditionalNamesHeader.h @@ -1,5 +1,3 @@ -#import "MWMTypes.h" - @interface MWMEditorAdditionalNamesHeader : UIView + (instancetype)header:(TMWMVoidBlock)toggleBlock; diff --git a/iphone/Maps/UI/Search/Filters/MWMSearchHotelsFilterViewController.mm b/iphone/Maps/UI/Search/Filters/MWMSearchHotelsFilterViewController.mm index 454eaaeee8..fdb2d047cd 100644 --- a/iphone/Maps/UI/Search/Filters/MWMSearchHotelsFilterViewController.mm +++ b/iphone/Maps/UI/Search/Filters/MWMSearchHotelsFilterViewController.mm @@ -2,7 +2,6 @@ #import "MWMSearchFilterViewController_Protected.h" #import "UIColor+MapsMeColor.h" #import "UIFont+MapsMeFonts.h" -#import "UIKitCategories.h" namespace { From 52507ed344d035d4f53d399dc4c78e8b797a6397 Mon Sep 17 00:00:00 2001 From: Ilya Grechuhin Date: Tue, 10 Jan 2017 16:41:16 +0300 Subject: [PATCH 10/14] [cleanup] [ios] Moved common inclusions into prefix header. --- iphone/Maps/Bookmarks/BookmarksRootVC.mm | 1 - iphone/Maps/Bookmarks/BookmarksVC.mm | 1 - iphone/Maps/Categories/CALayer+RuntimeAttributes.mm | 1 - iphone/Maps/Categories/UIButton+RuntimeAttributes.mm | 2 -- iphone/Maps/Categories/UIFont+MapsMeFonts.mm | 1 - iphone/Maps/Categories/UIImageView+Coloring.mm | 1 - iphone/Maps/Categories/UIKitCategories.mm | 1 - iphone/Maps/Categories/UILabel+RuntimeAttributes.mm | 2 -- iphone/Maps/Categories/UISwitch+RuntimeAttributes.m | 1 - iphone/Maps/Categories/UITextField+RuntimeAttributes.mm | 2 -- iphone/Maps/Categories/UITextView+RuntimeAttributes.mm | 2 -- iphone/Maps/Categories/UIView+RuntimeAttributes.mm | 1 - iphone/Maps/Classes/AddSetTableViewCell.mm | 1 - iphone/Maps/Classes/Components/MWMButton.mm | 1 - iphone/Maps/Classes/Components/MWMMailViewController.mm | 1 - iphone/Maps/Classes/Components/MWMNavigationController.mm | 1 - iphone/Maps/Classes/Components/MWMStartButton.mm | 1 - iphone/Maps/Classes/Components/MWMStopButton.mm | 1 - iphone/Maps/Classes/Components/MWMTableViewController.mm | 1 - .../DownloadTransitMapsAlert/MWMDownloadTransitMapAlert.mm | 1 - iphone/Maps/Classes/CustomAlert/RateAlert/MWMRateAlert.mm | 1 - .../RoutingDisclaimerAlert/MWMRoutingDisclaimerAlert.mm | 2 -- iphone/Maps/Classes/CustomAlert/Toast/MWMToast.mm | 1 - .../CustomViews/CircularProgress/MWMCircularProgressView.mm | 1 - iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationCommon.mm | 1 - .../CustomViews/Login/MWMAuthorizationLoginViewController.mm | 1 - .../CustomViews/Login/MWMAuthorizationOSMLoginViewController.mm | 1 - .../BottomMenu/MWMBottomMenuCollectionViewCell.mm | 2 -- .../CustomViews/MapViewControls/BottomMenu/MWMBottomMenuView.mm | 2 -- .../MapViewControls/BottomMenu/MWMBottomMenuViewController.mm | 2 -- .../CustomViews/MapViewControls/MWMMapViewControlsManager.mm | 1 - .../CustomViews/MapViewControls/SideButtons/MWMSideButtons.mm | 1 - .../TrafficButton/MWMTrafficButtonViewController.mm | 1 - .../MapViewControls/Welcome/PageController/MWMPageController.mm | 1 - .../NavigationDashboard/MWMNavigationDashboardEntity.mm | 2 -- .../CustomViews/NavigationDashboard/MWMNavigationInfoView.mm | 2 -- iphone/Maps/Classes/MWMTableViewCell.mm | 1 - iphone/Maps/Classes/MapViewController.mm | 2 -- iphone/Maps/Classes/MapsAppDelegate.mm | 2 -- iphone/Maps/Classes/Widgets/MWMMapDownloadDialog.mm | 1 - iphone/Maps/Maps_Prefix.pch | 2 ++ iphone/Maps/UI/Downloader/Cells/MWMMapDownloaderCellHeader.mm | 2 -- .../UI/Downloader/Cells/MWMMapDownloaderPlaceTableViewCell.mm | 1 - .../Downloader/Cells/MWMMapDownloaderSubplaceTableViewCell.mm | 1 - .../Maps/UI/Downloader/Cells/MWMMapDownloaderTableViewCell.mm | 1 - .../DataSources/MWMMapDownloaderExtendedDataSourceWithAds.mm | 2 -- iphone/Maps/UI/Downloader/MWMBaseMapDownloaderViewController.mm | 1 - iphone/Maps/UI/Downloader/MWMMapDownloaderViewController.mm | 1 - iphone/Maps/UI/EditBookmark/MWMBookmarkColorViewController.mm | 1 - iphone/Maps/UI/Editor/Cuisine/MWMCuisineEditorViewController.mm | 1 - iphone/Maps/UI/Editor/MWMEditorCategoryCell.mm | 1 - iphone/Maps/UI/Editor/MWMEditorSelectTableViewCell.mm | 1 - iphone/Maps/UI/Editor/MWMEditorSwitchTableViewCell.mm | 1 - iphone/Maps/UI/Editor/MWMEditorTextTableViewCell.mm | 1 - iphone/Maps/UI/Editor/MWMNoteCell.mm | 1 - iphone/Maps/UI/Editor/MWMObjectsCategorySelectorController.mm | 1 - .../OpeningHours/Cells/MWMOpeningHoursAllDayTableViewCell.mm | 1 - .../Cells/MWMOpeningHoursClosedSpanTableViewCell.mm | 2 -- .../Cells/MWMOpeningHoursDaysSelectorTableViewCell.mm | 1 - .../OpeningHours/Cells/MWMOpeningHoursTimeSpanTableViewCell.mm | 1 - .../Editor/OpeningHours/MWMOpeningHoursEditorViewController.mm | 1 - iphone/Maps/UI/Migration/MWMMigrationView.mm | 1 - iphone/Maps/UI/PlacePage/DirectionView/MWMDirectionView.mm | 1 - .../PlacePage/PlacePageLayout/ActionBar/MWMActionBarButton.mm | 1 - .../PlacePage/PlacePageLayout/Banner/MWMPPPreviewBannerCell.mm | 2 -- .../PlacePageLayout/Content/BookmarkCell/MWMBookmarkCell.mm | 2 -- .../Content/ButtonCell/MWMPlacePageButtonCell.mm | 1 - .../Content/OpeningHoursCell/MWMOpeningHoursLayoutHelper.mm | 2 -- .../Content/OpeningHoursCell/MWMPlacePageOpeningHoursDayView.mm | 2 -- .../PlacePageLayout/Content/RegularCell/MWMPlacePageInfoCell.mm | 2 -- iphone/Maps/UI/PlacePage/PlacePageLayout/MWMPlacePageLayout.mm | 1 - .../UI/PlacePage/PlacePageLayout/PlacePageView/MWMPPView.mm | 1 - .../PlacePageLayout/Preview/MWMPPPreviewLayoutHelper.mm | 1 - .../UI/Search/Filters/MWMSearchFilterPresentationController.mm | 1 - .../UI/Search/Filters/MWMSearchHotelsFilterViewController.mm | 2 -- iphone/Maps/UI/Search/MWMSearchChangeModeView.mm | 1 - iphone/Maps/UI/Search/MWMSearchManager+Filter.mm | 2 -- iphone/Maps/UI/Search/MWMSearchManager.mm | 2 -- iphone/Maps/UI/Search/MWMSearchTextField.mm | 1 - iphone/Maps/UI/Search/TabButtons/MWMSearchTabButtonsView.mm | 1 - .../UI/Search/TabbedView/BookmarksTab/MWMSearchBookmarksCell.mm | 2 -- .../UI/Search/TabbedView/CategoriesTab/MWMSearchCategoryCell.mm | 2 -- .../Search/TabbedView/HistoryTab/MWMSearchHistoryClearCell.mm | 1 - .../TabbedView/HistoryTab/MWMSearchHistoryMyPositionCell.mm | 1 - .../Search/TabbedView/HistoryTab/MWMSearchHistoryRequestCell.mm | 2 -- iphone/Maps/UI/Search/TableView/MWMSearchCell.mm | 1 - iphone/Maps/UI/Search/TableView/MWMSearchCommonCell.mm | 2 -- iphone/Maps/UI/Search/TableView/MWMSearchSuggestionCell.mm | 2 -- iphone/Maps/UI/Settings/MWMHelpController.mm | 1 - iphone/Maps/UI/Settings/MWMNightModeController.mm | 1 - iphone/Maps/UI/Settings/MWMTTSLanguageViewController.mm | 1 - iphone/Maps/UI/Settings/MWMTTSSettingsViewController.mm | 1 - 92 files changed, 2 insertions(+), 119 deletions(-) diff --git a/iphone/Maps/Bookmarks/BookmarksRootVC.mm b/iphone/Maps/Bookmarks/BookmarksRootVC.mm index 82d49d0d9d..498a46fcb6 100644 --- a/iphone/Maps/Bookmarks/BookmarksRootVC.mm +++ b/iphone/Maps/Bookmarks/BookmarksRootVC.mm @@ -2,7 +2,6 @@ #import "BookmarksVC.h" #import "MWMCommon.h" #import "Statistics.h" -#import "UIColor+MapsMeColor.h" #import "UIImageView+Coloring.h" #include "Framework.h" diff --git a/iphone/Maps/Bookmarks/BookmarksVC.mm b/iphone/Maps/Bookmarks/BookmarksVC.mm index e4ae898e17..72692c75ac 100644 --- a/iphone/Maps/Bookmarks/BookmarksVC.mm +++ b/iphone/Maps/Bookmarks/BookmarksVC.mm @@ -10,7 +10,6 @@ #import "MapViewController.h" #import "MapsAppDelegate.h" #import "Statistics.h" -#import "UIColor+MapsMeColor.h" #include "Framework.h" diff --git a/iphone/Maps/Categories/CALayer+RuntimeAttributes.mm b/iphone/Maps/Categories/CALayer+RuntimeAttributes.mm index f7fb0b7833..36dfb07dfd 100644 --- a/iphone/Maps/Categories/CALayer+RuntimeAttributes.mm +++ b/iphone/Maps/Categories/CALayer+RuntimeAttributes.mm @@ -1,5 +1,4 @@ #import "CALayer+RuntimeAttributes.h" -#import "UIColor+MapsMeColor.h" @implementation CALayer (RuntimeAttributes) diff --git a/iphone/Maps/Categories/UIButton+RuntimeAttributes.mm b/iphone/Maps/Categories/UIButton+RuntimeAttributes.mm index 2cc2480547..f83c4ffb57 100644 --- a/iphone/Maps/Categories/UIButton+RuntimeAttributes.mm +++ b/iphone/Maps/Categories/UIButton+RuntimeAttributes.mm @@ -1,7 +1,5 @@ #import #import "UIButton+RuntimeAttributes.h" -#import "UIColor+MapsMeColor.h" -#import "UIFont+MapsMeFonts.h" @implementation UIButton (RuntimeAttributes) diff --git a/iphone/Maps/Categories/UIFont+MapsMeFonts.mm b/iphone/Maps/Categories/UIFont+MapsMeFonts.mm index 8ca8f33808..6d8e5ae4e8 100644 --- a/iphone/Maps/Categories/UIFont+MapsMeFonts.mm +++ b/iphone/Maps/Categories/UIFont+MapsMeFonts.mm @@ -1,5 +1,4 @@ #import "MWMCommon.h" -#import "UIFont+MapsMeFonts.h" NSString * const kMediumFontName = @"HelveticaNeue-Medium"; NSString * const kLightFontName = @"HelveticaNeue-Light"; diff --git a/iphone/Maps/Categories/UIImageView+Coloring.mm b/iphone/Maps/Categories/UIImageView+Coloring.mm index d1df0896ac..2f98cad71a 100644 --- a/iphone/Maps/Categories/UIImageView+Coloring.mm +++ b/iphone/Maps/Categories/UIImageView+Coloring.mm @@ -1,5 +1,4 @@ #import "MWMCommon.h" -#import "UIColor+MapsMeColor.h" #import "UIImageView+Coloring.h" #import diff --git a/iphone/Maps/Categories/UIKitCategories.mm b/iphone/Maps/Categories/UIKitCategories.mm index 7d8f465541..cb973c67bf 100644 --- a/iphone/Maps/Categories/UIKitCategories.mm +++ b/iphone/Maps/Categories/UIKitCategories.mm @@ -1,7 +1,6 @@ #import "UIKitCategories.h" #import "MWMCommon.h" #import "UIButton+RuntimeAttributes.h" -#import "UIColor+MapsMeColor.h" #import "UIImageView+Coloring.h" #import diff --git a/iphone/Maps/Categories/UILabel+RuntimeAttributes.mm b/iphone/Maps/Categories/UILabel+RuntimeAttributes.mm index 4dc885cad3..8ac440368a 100644 --- a/iphone/Maps/Categories/UILabel+RuntimeAttributes.mm +++ b/iphone/Maps/Categories/UILabel+RuntimeAttributes.mm @@ -1,6 +1,4 @@ #import "UILabel+RuntimeAttributes.h" -#import "UIFont+MapsMeFonts.h" -#import "UIColor+MapsMeColor.h" // Runtime attributes for setting localized text in Xib. diff --git a/iphone/Maps/Categories/UISwitch+RuntimeAttributes.m b/iphone/Maps/Categories/UISwitch+RuntimeAttributes.m index b3e7fccd12..15f397975c 100644 --- a/iphone/Maps/Categories/UISwitch+RuntimeAttributes.m +++ b/iphone/Maps/Categories/UISwitch+RuntimeAttributes.m @@ -1,5 +1,4 @@ #import "UISwitch+RuntimeAttributes.h" -#import "UIColor+MapsMeColor.h" @implementation UISwitch (RuntimeAttributes) diff --git a/iphone/Maps/Categories/UITextField+RuntimeAttributes.mm b/iphone/Maps/Categories/UITextField+RuntimeAttributes.mm index b1994c242f..50d2d78ccb 100644 --- a/iphone/Maps/Categories/UITextField+RuntimeAttributes.mm +++ b/iphone/Maps/Categories/UITextField+RuntimeAttributes.mm @@ -1,6 +1,4 @@ #import "MWMInputValidatorFactory.h" -#import "UIColor+MapsMeColor.h" -#import "UIFont+MapsMeFonts.h" #import "UITextField+RuntimeAttributes.h" #import diff --git a/iphone/Maps/Categories/UITextView+RuntimeAttributes.mm b/iphone/Maps/Categories/UITextView+RuntimeAttributes.mm index 9dc3a33ca1..00a9ce7074 100644 --- a/iphone/Maps/Categories/UITextView+RuntimeAttributes.mm +++ b/iphone/Maps/Categories/UITextView+RuntimeAttributes.mm @@ -1,6 +1,4 @@ -#import "UIFont+MapsMeFonts.h" #import "UITextView+RuntimeAttributes.h" -#import "UIColor+MapsMeColor.h" @implementation UITextView (RuntimeAttributes) diff --git a/iphone/Maps/Categories/UIView+RuntimeAttributes.mm b/iphone/Maps/Categories/UIView+RuntimeAttributes.mm index f0b81bb195..da1e96a6dd 100644 --- a/iphone/Maps/Categories/UIView+RuntimeAttributes.mm +++ b/iphone/Maps/Categories/UIView+RuntimeAttributes.mm @@ -1,4 +1,3 @@ -#import "UIColor+MapsMeColor.h" #import "UIView+RuntimeAttributes.h" @implementation UIView (RuntimeAttributes) diff --git a/iphone/Maps/Classes/AddSetTableViewCell.mm b/iphone/Maps/Classes/AddSetTableViewCell.mm index cca0f15548..4f7ce28c58 100644 --- a/iphone/Maps/Classes/AddSetTableViewCell.mm +++ b/iphone/Maps/Classes/AddSetTableViewCell.mm @@ -1,5 +1,4 @@ #import "AddSetTableViewCell.h" -#import "UIColor+MapsMeColor.h" @interface AddSetTableViewCell () diff --git a/iphone/Maps/Classes/Components/MWMButton.mm b/iphone/Maps/Classes/Components/MWMButton.mm index c6474f3a0d..448b9e7ae3 100644 --- a/iphone/Maps/Classes/Components/MWMButton.mm +++ b/iphone/Maps/Classes/Components/MWMButton.mm @@ -1,6 +1,5 @@ #import "MWMCommon.h" #import "MWMButton.h" -#import "UIColor+MapsMeColor.h" namespace { diff --git a/iphone/Maps/Classes/Components/MWMMailViewController.mm b/iphone/Maps/Classes/Components/MWMMailViewController.mm index 32eba659b4..038436e11c 100644 --- a/iphone/Maps/Classes/Components/MWMMailViewController.mm +++ b/iphone/Maps/Classes/Components/MWMMailViewController.mm @@ -1,7 +1,6 @@ #import "MWMMailViewController.h" #import "MWMCommon.h" #import "MWMToast.h" -#import "UIColor+MapsMeColor.h" @implementation MWMMailViewController diff --git a/iphone/Maps/Classes/Components/MWMNavigationController.mm b/iphone/Maps/Classes/Components/MWMNavigationController.mm index a1d6d45cd3..b3a9bd2978 100644 --- a/iphone/Maps/Classes/Components/MWMNavigationController.mm +++ b/iphone/Maps/Classes/Components/MWMNavigationController.mm @@ -3,7 +3,6 @@ #import "MWMController.h" #import "MWMToast.h" #import "MapsAppDelegate.h" -#import "UIColor+MapsMeColor.h" #import "UIViewController+Navigation.h" #import diff --git a/iphone/Maps/Classes/Components/MWMStartButton.mm b/iphone/Maps/Classes/Components/MWMStartButton.mm index 07280d866a..1c921e44c9 100644 --- a/iphone/Maps/Classes/Components/MWMStartButton.mm +++ b/iphone/Maps/Classes/Components/MWMStartButton.mm @@ -1,5 +1,4 @@ #import "MWMStartButton.h" -#import "UIColor+MapsMeColor.h" @implementation MWMStartButton diff --git a/iphone/Maps/Classes/Components/MWMStopButton.mm b/iphone/Maps/Classes/Components/MWMStopButton.mm index 42ec97c949..5c0b1fb43d 100644 --- a/iphone/Maps/Classes/Components/MWMStopButton.mm +++ b/iphone/Maps/Classes/Components/MWMStopButton.mm @@ -1,5 +1,4 @@ #import "MWMStopButton.h" -#import "UIColor+MapsMeColor.h" @implementation MWMStopButton diff --git a/iphone/Maps/Classes/Components/MWMTableViewController.mm b/iphone/Maps/Classes/Components/MWMTableViewController.mm index eaa9541580..d6287b9b20 100644 --- a/iphone/Maps/Classes/Components/MWMTableViewController.mm +++ b/iphone/Maps/Classes/Components/MWMTableViewController.mm @@ -3,7 +3,6 @@ #import "MWMAlertViewController.h" #import "MWMTableViewCell.h" #import "MWMTableViewController.h" -#import "UIColor+MapsMeColor.h" #import "3party/Alohalytics/src/alohalytics_objc.h" diff --git a/iphone/Maps/Classes/CustomAlert/DownloadTransitMapsAlert/MWMDownloadTransitMapAlert.mm b/iphone/Maps/Classes/CustomAlert/DownloadTransitMapsAlert/MWMDownloadTransitMapAlert.mm index 09125322cd..e7b71196ef 100644 --- a/iphone/Maps/Classes/CustomAlert/DownloadTransitMapsAlert/MWMDownloadTransitMapAlert.mm +++ b/iphone/Maps/Classes/CustomAlert/DownloadTransitMapsAlert/MWMDownloadTransitMapAlert.mm @@ -7,7 +7,6 @@ #import "MWMFrameworkListener.h" #import "MWMStorage.h" #import "Statistics.h" -#import "UIColor+MapsMeColor.h" #import "UILabel+RuntimeAttributes.h" #include "Framework.h" diff --git a/iphone/Maps/Classes/CustomAlert/RateAlert/MWMRateAlert.mm b/iphone/Maps/Classes/CustomAlert/RateAlert/MWMRateAlert.mm index 7cfcb49a9c..2ebc23adf0 100644 --- a/iphone/Maps/Classes/CustomAlert/RateAlert/MWMRateAlert.mm +++ b/iphone/Maps/Classes/CustomAlert/RateAlert/MWMRateAlert.mm @@ -3,7 +3,6 @@ #import "MWMAlertViewController.h" #import "MWMMailViewController.h" #import "Statistics.h" -#import "UIColor+MapsMeColor.h" #import "3party/Alohalytics/src/alohalytics_objc.h" diff --git a/iphone/Maps/Classes/CustomAlert/RoutingDisclaimerAlert/MWMRoutingDisclaimerAlert.mm b/iphone/Maps/Classes/CustomAlert/RoutingDisclaimerAlert/MWMRoutingDisclaimerAlert.mm index 0aeb75b5b9..b80d047887 100644 --- a/iphone/Maps/Classes/CustomAlert/RoutingDisclaimerAlert/MWMRoutingDisclaimerAlert.mm +++ b/iphone/Maps/Classes/CustomAlert/RoutingDisclaimerAlert/MWMRoutingDisclaimerAlert.mm @@ -2,8 +2,6 @@ #import "MWMCommon.h" #import "MWMAlertViewController.h" #import "Statistics.h" -#import "UIColor+MapsMeColor.h" -#import "UIFont+MapsMeFonts.h" static CGFloat const kMinimumOffset = 20.; static NSString * const kStatisticsEvent = @"Routing Disclaimer Alert"; diff --git a/iphone/Maps/Classes/CustomAlert/Toast/MWMToast.mm b/iphone/Maps/Classes/CustomAlert/Toast/MWMToast.mm index e9233a61b8..686a169e81 100644 --- a/iphone/Maps/Classes/CustomAlert/Toast/MWMToast.mm +++ b/iphone/Maps/Classes/CustomAlert/Toast/MWMToast.mm @@ -1,6 +1,5 @@ #import "MWMToast.h" #import "MWMCommon.h" -#import "UIColor+MapsMeColor.h" namespace { diff --git a/iphone/Maps/Classes/CustomViews/CircularProgress/MWMCircularProgressView.mm b/iphone/Maps/Classes/CustomViews/CircularProgress/MWMCircularProgressView.mm index 1e3f7e0a97..b55a87548b 100644 --- a/iphone/Maps/Classes/CustomViews/CircularProgress/MWMCircularProgressView.mm +++ b/iphone/Maps/Classes/CustomViews/CircularProgress/MWMCircularProgressView.mm @@ -1,6 +1,5 @@ #import "MWMCircularProgressView.h" #import "MWMCommon.h" -#import "UIColor+MapsMeColor.h" #import "UIImageView+Coloring.h" #include "std/map.hpp" diff --git a/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationCommon.mm b/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationCommon.mm index 913c09d59c..0af27b1874 100644 --- a/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationCommon.mm +++ b/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationCommon.mm @@ -1,7 +1,6 @@ #import "MWMCommon.h" #import "MWMAuthorizationCommon.h" #import "UIButton+RuntimeAttributes.h" -#import "UIColor+MapsMeColor.h" #include "base/logging.hpp" #include "editor/server_api.hpp" diff --git a/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationLoginViewController.mm b/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationLoginViewController.mm index c31a6d3f1e..eb34aa41e2 100644 --- a/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationLoginViewController.mm +++ b/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationLoginViewController.mm @@ -5,7 +5,6 @@ #import "MWMAuthorizationLoginViewController.h" #import "MWMAuthorizationWebViewLoginViewController.h" #import "Statistics.h" -#import "UIColor+MapsMeColor.h" #include "Framework.h" diff --git a/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationOSMLoginViewController.mm b/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationOSMLoginViewController.mm index 175fffa0e4..ca286aaf58 100644 --- a/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationOSMLoginViewController.mm +++ b/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationOSMLoginViewController.mm @@ -4,7 +4,6 @@ #import "MWMCircularProgress.h" #import "MWMSettingsViewController.h" #import "Statistics.h" -#import "UIColor+MapsMeColor.h" #import "UITextField+RuntimeAttributes.h" #include "base/logging.hpp" diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuCollectionViewCell.mm b/iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuCollectionViewCell.mm index f26d61fbe1..cca5deb731 100644 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuCollectionViewCell.mm +++ b/iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuCollectionViewCell.mm @@ -1,7 +1,5 @@ #import "MWMCommon.h" #import "MWMBottomMenuCollectionViewCell.h" -#import "UIFont+MapsMeFonts.h" -#import "UIColor+MapsMeColor.h" #import "UIImageView+Coloring.h" @interface MWMBottomMenuCollectionViewCell () diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuView.mm b/iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuView.mm index d77cd6150c..2d8ec55cda 100644 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuView.mm +++ b/iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuView.mm @@ -7,8 +7,6 @@ #import "MWMSideButtons.h" #import "MapsAppDelegate.h" #import "UIButton+RuntimeAttributes.h" -#import "UIColor+MapsMeColor.h" -#import "UIFont+MapsMeFonts.h" #import "UIImageView+Coloring.h" #import "UIView+RuntimeAttributes.h" diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuViewController.mm b/iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuViewController.mm index 08f12515d9..e37752aef3 100644 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuViewController.mm +++ b/iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuViewController.mm @@ -20,8 +20,6 @@ #import "MapsAppDelegate.h" #import "Statistics.h" #import "SwiftBridge.h" -#import "UIColor+MapsMeColor.h" -#import "UIFont+MapsMeFonts.h" #import "UIImageView+Coloring.h" #import "UIViewController+Navigation.h" diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.mm b/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.mm index c3301418e7..cf769d4a83 100644 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.mm +++ b/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.mm @@ -21,7 +21,6 @@ #import "MapViewController.h" #import "MapsAppDelegate.h" #import "Statistics.h" -#import "UIColor+MapsMeColor.h" #import "3party/Alohalytics/src/alohalytics_objc.h" diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/SideButtons/MWMSideButtons.mm b/iphone/Maps/Classes/CustomViews/MapViewControls/SideButtons/MWMSideButtons.mm index c0eece810b..8608db559f 100644 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/SideButtons/MWMSideButtons.mm +++ b/iphone/Maps/Classes/CustomViews/MapViewControls/SideButtons/MWMSideButtons.mm @@ -5,7 +5,6 @@ #import "MWMSettings.h" #import "MWMSideButtonsView.h" #import "Statistics.h" -#import "UIColor+MapsMeColor.h" #import "3party/Alohalytics/src/alohalytics_objc.h" diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/TrafficButton/MWMTrafficButtonViewController.mm b/iphone/Maps/Classes/CustomViews/MapViewControls/TrafficButton/MWMTrafficButtonViewController.mm index 70fc06f2e6..d75783534b 100644 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/TrafficButton/MWMTrafficButtonViewController.mm +++ b/iphone/Maps/Classes/CustomViews/MapViewControls/TrafficButton/MWMTrafficButtonViewController.mm @@ -7,7 +7,6 @@ #import "MWMToast.h" #import "MWMTrafficManager.h" #import "MapViewController.h" -#import "UIColor+MapsMeColor.h" namespace { diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/Welcome/PageController/MWMPageController.mm b/iphone/Maps/Classes/CustomViews/MapViewControls/Welcome/PageController/MWMPageController.mm index 1691aa1fe5..9c2199a322 100644 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/Welcome/PageController/MWMPageController.mm +++ b/iphone/Maps/Classes/CustomViews/MapViewControls/Welcome/PageController/MWMPageController.mm @@ -1,7 +1,6 @@ #import "MWMPageController.h" #import "MWMPageControllerDataSource.h" #import "Statistics.h" -#import "UIColor+MapsMeColor.h" @interface MWMPageController () diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardEntity.mm b/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardEntity.mm index 4213c6330c..dc6b7e0aec 100644 --- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardEntity.mm +++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardEntity.mm @@ -4,8 +4,6 @@ #import "MWMSettings.h" #import "MapsAppDelegate.h" #import "SwiftBridge.h" -#import "UIColor+MapsMeColor.h" -#import "UIFont+MapsMeFonts.h" #include "Framework.h" #include "geometry/distance_on_sphere.hpp" diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationInfoView.mm b/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationInfoView.mm index 192dfe68f2..555c0418a2 100644 --- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationInfoView.mm +++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationInfoView.mm @@ -9,8 +9,6 @@ #import "MWMRouter.h" #import "MWMSearch.h" #import "MapViewController.h" -#import "UIColor+MapsMeColor.h" -#import "UIFont+MapsMeFonts.h" #import "UIImageView+Coloring.h" #include "geometry/angles.hpp" diff --git a/iphone/Maps/Classes/MWMTableViewCell.mm b/iphone/Maps/Classes/MWMTableViewCell.mm index 1b7dc15b25..60a27cb11e 100644 --- a/iphone/Maps/Classes/MWMTableViewCell.mm +++ b/iphone/Maps/Classes/MWMTableViewCell.mm @@ -1,5 +1,4 @@ #import "MWMTableViewCell.h" -#import "UIColor+MapsMeColor.h" @implementation MWMTableViewCell diff --git a/iphone/Maps/Classes/MapViewController.mm b/iphone/Maps/Classes/MapViewController.mm index 7a23786ef5..3dda1ec85d 100644 --- a/iphone/Maps/Classes/MapViewController.mm +++ b/iphone/Maps/Classes/MapViewController.mm @@ -28,8 +28,6 @@ #import "MWMWhatsNewTrafficController.h" #import "MapsAppDelegate.h" #import "Statistics.h" -#import "UIColor+MapsMeColor.h" -#import "UIFont+MapsMeFonts.h" #import "UIViewController+Navigation.h" #import "3party/Alohalytics/src/alohalytics_objc.h" diff --git a/iphone/Maps/Classes/MapsAppDelegate.mm b/iphone/Maps/Classes/MapsAppDelegate.mm index 945cd9e8b1..a4b90b30ca 100644 --- a/iphone/Maps/Classes/MapsAppDelegate.mm +++ b/iphone/Maps/Classes/MapsAppDelegate.mm @@ -23,8 +23,6 @@ #import "MWMTextToSpeech.h" #import "MapViewController.h" #import "Statistics.h" -#import "UIColor+MapsMeColor.h" -#import "UIFont+MapsMeFonts.h" #import "3party/Alohalytics/src/alohalytics_objc.h" diff --git a/iphone/Maps/Classes/Widgets/MWMMapDownloadDialog.mm b/iphone/Maps/Classes/Widgets/MWMMapDownloadDialog.mm index 6dc3273b20..02d414ab85 100644 --- a/iphone/Maps/Classes/Widgets/MWMMapDownloadDialog.mm +++ b/iphone/Maps/Classes/Widgets/MWMMapDownloadDialog.mm @@ -10,7 +10,6 @@ #import "MapViewController.h" #import "MapsAppDelegate.h" #import "Statistics.h" -#import "UIColor+MapsMeColor.h" #include "Framework.h" diff --git a/iphone/Maps/Maps_Prefix.pch b/iphone/Maps/Maps_Prefix.pch index 8816476a01..e316166892 100644 --- a/iphone/Maps/Maps_Prefix.pch +++ b/iphone/Maps/Maps_Prefix.pch @@ -10,5 +10,7 @@ #import "MWMMacros.h" #import "MWMTypes.h" + #import "UIColor+MapsMeColor.h" + #import "UIFont+MapsMeFonts.h" #import "UIKitCategories.h" #endif diff --git a/iphone/Maps/UI/Downloader/Cells/MWMMapDownloaderCellHeader.mm b/iphone/Maps/UI/Downloader/Cells/MWMMapDownloaderCellHeader.mm index 535210134f..21f867cd2a 100644 --- a/iphone/Maps/UI/Downloader/Cells/MWMMapDownloaderCellHeader.mm +++ b/iphone/Maps/UI/Downloader/Cells/MWMMapDownloaderCellHeader.mm @@ -1,6 +1,4 @@ #import "MWMMapDownloaderCellHeader.h" -#import "UIColor+MapsMeColor.h" -#import "UIFont+MapsMeFonts.h" @implementation MWMMapDownloaderCellHeader diff --git a/iphone/Maps/UI/Downloader/Cells/MWMMapDownloaderPlaceTableViewCell.mm b/iphone/Maps/UI/Downloader/Cells/MWMMapDownloaderPlaceTableViewCell.mm index a8fc03346a..b32455d49a 100644 --- a/iphone/Maps/UI/Downloader/Cells/MWMMapDownloaderPlaceTableViewCell.mm +++ b/iphone/Maps/UI/Downloader/Cells/MWMMapDownloaderPlaceTableViewCell.mm @@ -1,6 +1,5 @@ #import "MWMMapDownloaderPlaceTableViewCell.h" #import "MWMCommon.h" -#import "UIFont+MapsMeFonts.h" #include "Framework.h" diff --git a/iphone/Maps/UI/Downloader/Cells/MWMMapDownloaderSubplaceTableViewCell.mm b/iphone/Maps/UI/Downloader/Cells/MWMMapDownloaderSubplaceTableViewCell.mm index e21927f5b7..838d38806e 100644 --- a/iphone/Maps/UI/Downloader/Cells/MWMMapDownloaderSubplaceTableViewCell.mm +++ b/iphone/Maps/UI/Downloader/Cells/MWMMapDownloaderSubplaceTableViewCell.mm @@ -1,6 +1,5 @@ #import "MWMMapDownloaderSubplaceTableViewCell.h" #import "MWMCommon.h" -#import "UIFont+MapsMeFonts.h" @interface MWMMapDownloaderTableViewCell () diff --git a/iphone/Maps/UI/Downloader/Cells/MWMMapDownloaderTableViewCell.mm b/iphone/Maps/UI/Downloader/Cells/MWMMapDownloaderTableViewCell.mm index 2cff8b57a0..d8772760e6 100644 --- a/iphone/Maps/UI/Downloader/Cells/MWMMapDownloaderTableViewCell.mm +++ b/iphone/Maps/UI/Downloader/Cells/MWMMapDownloaderTableViewCell.mm @@ -3,7 +3,6 @@ #import "MWMCircularProgress.h" #import "MWMMapDownloaderLargeCountryTableViewCell.h" #import "NSString+Categories.h" -#import "UIFont+MapsMeFonts.h" #include "Framework.h" diff --git a/iphone/Maps/UI/Downloader/DataSources/MWMMapDownloaderExtendedDataSourceWithAds.mm b/iphone/Maps/UI/Downloader/DataSources/MWMMapDownloaderExtendedDataSourceWithAds.mm index d1da953458..078309e330 100644 --- a/iphone/Maps/UI/Downloader/DataSources/MWMMapDownloaderExtendedDataSourceWithAds.mm +++ b/iphone/Maps/UI/Downloader/DataSources/MWMMapDownloaderExtendedDataSourceWithAds.mm @@ -1,8 +1,6 @@ #import "MWMMapDownloaderExtendedDataSourceWithAds.h" #import "MWMMapDownloaderAdsTableViewCell.h" #import "MWMMyTarget.h" -#import "UIColor+MapsMeColor.h" -#import "UIFont+MapsMeFonts.h" #include "Framework.h" diff --git a/iphone/Maps/UI/Downloader/MWMBaseMapDownloaderViewController.mm b/iphone/Maps/UI/Downloader/MWMBaseMapDownloaderViewController.mm index bdf6264524..5f2782234b 100644 --- a/iphone/Maps/UI/Downloader/MWMBaseMapDownloaderViewController.mm +++ b/iphone/Maps/UI/Downloader/MWMBaseMapDownloaderViewController.mm @@ -18,7 +18,6 @@ #import "MWMToast.h" #import "MapsAppDelegate.h" #import "Statistics.h" -#import "UIColor+MapsMeColor.h" #import "UIViewController+Navigation.h" #include "Framework.h" diff --git a/iphone/Maps/UI/Downloader/MWMMapDownloaderViewController.mm b/iphone/Maps/UI/Downloader/MWMMapDownloaderViewController.mm index cc7239b46f..236eeaaf60 100644 --- a/iphone/Maps/UI/Downloader/MWMMapDownloaderViewController.mm +++ b/iphone/Maps/UI/Downloader/MWMMapDownloaderViewController.mm @@ -4,7 +4,6 @@ #import "MWMMapDownloaderSearchDataSource.h" #import "MWMNoMapsViewController.h" #import "SwiftBridge.h" -#import "UIColor+MapsMeColor.h" #include "Framework.h" diff --git a/iphone/Maps/UI/EditBookmark/MWMBookmarkColorViewController.mm b/iphone/Maps/UI/EditBookmark/MWMBookmarkColorViewController.mm index 64579f2559..cf9c072069 100644 --- a/iphone/Maps/UI/EditBookmark/MWMBookmarkColorViewController.mm +++ b/iphone/Maps/UI/EditBookmark/MWMBookmarkColorViewController.mm @@ -1,6 +1,5 @@ #import "MWMBookmarkColorViewController.h" #import "Statistics.h" -#import "UIColor+MapsMeColor.h" #import "UIViewController+Navigation.h" #include "std/array.hpp" diff --git a/iphone/Maps/UI/Editor/Cuisine/MWMCuisineEditorViewController.mm b/iphone/Maps/UI/Editor/Cuisine/MWMCuisineEditorViewController.mm index 5a1b4e75b2..b3a623b26a 100644 --- a/iphone/Maps/UI/Editor/Cuisine/MWMCuisineEditorViewController.mm +++ b/iphone/Maps/UI/Editor/Cuisine/MWMCuisineEditorViewController.mm @@ -3,7 +3,6 @@ #import "MWMKeyboard.h" #import "MWMTableViewCell.h" #import "MWMToast.h" -#import "UIColor+MapsMeColor.h" #include "indexer/cuisines.hpp" #include "indexer/search_string_utils.hpp" diff --git a/iphone/Maps/UI/Editor/MWMEditorCategoryCell.mm b/iphone/Maps/UI/Editor/MWMEditorCategoryCell.mm index 2a415aae73..c49364b640 100644 --- a/iphone/Maps/UI/Editor/MWMEditorCategoryCell.mm +++ b/iphone/Maps/UI/Editor/MWMEditorCategoryCell.mm @@ -1,6 +1,5 @@ #import "MWMEditorCategoryCell.h" #import "MWMEditorCommon.h" -#import "UIColor+MapsMeColor.h" #import "UIImageView+Coloring.h" namespace diff --git a/iphone/Maps/UI/Editor/MWMEditorSelectTableViewCell.mm b/iphone/Maps/UI/Editor/MWMEditorSelectTableViewCell.mm index cece4b6c04..c99ec521fa 100644 --- a/iphone/Maps/UI/Editor/MWMEditorSelectTableViewCell.mm +++ b/iphone/Maps/UI/Editor/MWMEditorSelectTableViewCell.mm @@ -1,6 +1,5 @@ #import "MWMEditorSelectTableViewCell.h" #import "MWMCommon.h" -#import "UIColor+MapsMeColor.h" #import "UIImageView+Coloring.h" @interface MWMEditorSelectTableViewCell () diff --git a/iphone/Maps/UI/Editor/MWMEditorSwitchTableViewCell.mm b/iphone/Maps/UI/Editor/MWMEditorSwitchTableViewCell.mm index f4eb5657ac..613c55f689 100644 --- a/iphone/Maps/UI/Editor/MWMEditorSwitchTableViewCell.mm +++ b/iphone/Maps/UI/Editor/MWMEditorSwitchTableViewCell.mm @@ -1,5 +1,4 @@ #import "MWMEditorSwitchTableViewCell.h" -#import "UIColor+MapsMeColor.h" #import "UIImageView+Coloring.h" @interface MWMEditorSwitchTableViewCell () diff --git a/iphone/Maps/UI/Editor/MWMEditorTextTableViewCell.mm b/iphone/Maps/UI/Editor/MWMEditorTextTableViewCell.mm index acbbbaca2e..b80efdefa6 100644 --- a/iphone/Maps/UI/Editor/MWMEditorTextTableViewCell.mm +++ b/iphone/Maps/UI/Editor/MWMEditorTextTableViewCell.mm @@ -1,6 +1,5 @@ #import "MWMEditorCommon.h" #import "MWMEditorTextTableViewCell.h" -#import "UIColor+MapsMeColor.h" #import "UIImageView+Coloring.h" #import "UITextField+RuntimeAttributes.h" diff --git a/iphone/Maps/UI/Editor/MWMNoteCell.mm b/iphone/Maps/UI/Editor/MWMNoteCell.mm index 42ce5332b0..8054435915 100644 --- a/iphone/Maps/UI/Editor/MWMNoteCell.mm +++ b/iphone/Maps/UI/Editor/MWMNoteCell.mm @@ -1,4 +1,3 @@ -#import "UIColor+MapsMeColor.h" #import "MWMTextView.h" #import "MWMNoteCell.h" diff --git a/iphone/Maps/UI/Editor/MWMObjectsCategorySelectorController.mm b/iphone/Maps/UI/Editor/MWMObjectsCategorySelectorController.mm index 4519060f45..f21c97f806 100644 --- a/iphone/Maps/UI/Editor/MWMObjectsCategorySelectorController.mm +++ b/iphone/Maps/UI/Editor/MWMObjectsCategorySelectorController.mm @@ -6,7 +6,6 @@ #import "MWMTableViewCell.h" #import "MWMToast.h" #import "Statistics.h" -#import "UIColor+MapsMeColor.h" #import "UIViewController+Navigation.h" #include "LocaleTranslator.h" diff --git a/iphone/Maps/UI/Editor/OpeningHours/Cells/MWMOpeningHoursAllDayTableViewCell.mm b/iphone/Maps/UI/Editor/OpeningHours/Cells/MWMOpeningHoursAllDayTableViewCell.mm index 27cfde33b8..cef32a1436 100644 --- a/iphone/Maps/UI/Editor/OpeningHours/Cells/MWMOpeningHoursAllDayTableViewCell.mm +++ b/iphone/Maps/UI/Editor/OpeningHours/Cells/MWMOpeningHoursAllDayTableViewCell.mm @@ -1,5 +1,4 @@ #import "MWMOpeningHoursAllDayTableViewCell.h" -#import "UIColor+MapsMeColor.h" @interface MWMOpeningHoursAllDayTableViewCell () diff --git a/iphone/Maps/UI/Editor/OpeningHours/Cells/MWMOpeningHoursClosedSpanTableViewCell.mm b/iphone/Maps/UI/Editor/OpeningHours/Cells/MWMOpeningHoursClosedSpanTableViewCell.mm index 238f33141d..cb1d875c33 100644 --- a/iphone/Maps/UI/Editor/OpeningHours/Cells/MWMOpeningHoursClosedSpanTableViewCell.mm +++ b/iphone/Maps/UI/Editor/OpeningHours/Cells/MWMOpeningHoursClosedSpanTableViewCell.mm @@ -1,6 +1,4 @@ #import "MWMOpeningHoursClosedSpanTableViewCell.h" -#import "UIColor+MapsMeColor.h" -#import "UIFont+MapsMeFonts.h" static NSString * const kLabelText = L(@"editor_hours_closed"); diff --git a/iphone/Maps/UI/Editor/OpeningHours/Cells/MWMOpeningHoursDaysSelectorTableViewCell.mm b/iphone/Maps/UI/Editor/OpeningHours/Cells/MWMOpeningHoursDaysSelectorTableViewCell.mm index e85e44776a..aec9042b96 100644 --- a/iphone/Maps/UI/Editor/OpeningHours/Cells/MWMOpeningHoursDaysSelectorTableViewCell.mm +++ b/iphone/Maps/UI/Editor/OpeningHours/Cells/MWMOpeningHoursDaysSelectorTableViewCell.mm @@ -1,5 +1,4 @@ #import "MWMOpeningHoursDaysSelectorTableViewCell.h" -#import "UIColor+MapsMeColor.h" #import "UIImageView+Coloring.h" #include "3party/opening_hours/opening_hours.hpp" diff --git a/iphone/Maps/UI/Editor/OpeningHours/Cells/MWMOpeningHoursTimeSpanTableViewCell.mm b/iphone/Maps/UI/Editor/OpeningHours/Cells/MWMOpeningHoursTimeSpanTableViewCell.mm index 70add3faee..76348d7fd6 100644 --- a/iphone/Maps/UI/Editor/OpeningHours/Cells/MWMOpeningHoursTimeSpanTableViewCell.mm +++ b/iphone/Maps/UI/Editor/OpeningHours/Cells/MWMOpeningHoursTimeSpanTableViewCell.mm @@ -1,5 +1,4 @@ #import "MWMOpeningHoursTimeSpanTableViewCell.h" -#import "UIColor+MapsMeColor.h" @interface MWMOpeningHoursTimeSpanTableViewCell () diff --git a/iphone/Maps/UI/Editor/OpeningHours/MWMOpeningHoursEditorViewController.mm b/iphone/Maps/UI/Editor/OpeningHours/MWMOpeningHoursEditorViewController.mm index 9b97692410..e5c0e3136f 100644 --- a/iphone/Maps/UI/Editor/OpeningHours/MWMOpeningHoursEditorViewController.mm +++ b/iphone/Maps/UI/Editor/OpeningHours/MWMOpeningHoursEditorViewController.mm @@ -3,7 +3,6 @@ #import "MWMOpeningHoursModel.h" #import "MWMOpeningHoursSection.h" #import "MWMTextView.h" -#import "UIColor+MapsMeColor.h" extern NSDictionary * const kMWMOpeningHoursEditorTableCells = @{ @(MWMOpeningHoursEditorDaysSelectorCell) : @"MWMOpeningHoursDaysSelectorTableViewCell", diff --git a/iphone/Maps/UI/Migration/MWMMigrationView.mm b/iphone/Maps/UI/Migration/MWMMigrationView.mm index cfabc4224e..b8d5db02b0 100644 --- a/iphone/Maps/UI/Migration/MWMMigrationView.mm +++ b/iphone/Maps/UI/Migration/MWMMigrationView.mm @@ -1,6 +1,5 @@ #import "MWMCommon.h" #import "MWMMigrationView.h" -#import "UIColor+MapsMeColor.h" @interface MWMMigrationView () diff --git a/iphone/Maps/UI/PlacePage/DirectionView/MWMDirectionView.mm b/iphone/Maps/UI/PlacePage/DirectionView/MWMDirectionView.mm index 73eb046cd7..4c519a160e 100644 --- a/iphone/Maps/UI/PlacePage/DirectionView/MWMDirectionView.mm +++ b/iphone/Maps/UI/PlacePage/DirectionView/MWMDirectionView.mm @@ -2,7 +2,6 @@ #import "MWMMapViewControlsManager.h" #import "MapViewController.h" #import "MapsAppDelegate.h" -#import "UIFont+MapsMeFonts.h" static NSString * const kDirectionViewNibName = @"MWMDirectionView"; static CGFloat const kDirectionArrowSide = IPAD ? 260. : 160.; diff --git a/iphone/Maps/UI/PlacePage/PlacePageLayout/ActionBar/MWMActionBarButton.mm b/iphone/Maps/UI/PlacePage/PlacePageLayout/ActionBar/MWMActionBarButton.mm index 867298653d..83b707ed1d 100644 --- a/iphone/Maps/UI/PlacePage/PlacePageLayout/ActionBar/MWMActionBarButton.mm +++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/ActionBar/MWMActionBarButton.mm @@ -2,7 +2,6 @@ #import "MWMCommon.h" #import "MWMButton.h" #import "MWMCircularProgress.h" -#import "UIColor+MapsMeColor.h" NSString * titleForButton(EButton type, BOOL isSelected) { diff --git a/iphone/Maps/UI/PlacePage/PlacePageLayout/Banner/MWMPPPreviewBannerCell.mm b/iphone/Maps/UI/PlacePage/PlacePageLayout/Banner/MWMPPPreviewBannerCell.mm index 299706ac7b..b725de1b92 100644 --- a/iphone/Maps/UI/PlacePage/PlacePageLayout/Banner/MWMPPPreviewBannerCell.mm +++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/Banner/MWMPPPreviewBannerCell.mm @@ -4,8 +4,6 @@ #import "MWMPlacePageData.h" #import "MWMPlacePageLayoutImpl.h" #import "Statistics.h" -#import "UIColor+MapsMeColor.h" -#import "UIFont+MapsMeFonts.h" namespace { diff --git a/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/BookmarkCell/MWMBookmarkCell.mm b/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/BookmarkCell/MWMBookmarkCell.mm index 787a349695..cb4ff80d54 100644 --- a/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/BookmarkCell/MWMBookmarkCell.mm +++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/BookmarkCell/MWMBookmarkCell.mm @@ -2,8 +2,6 @@ #import "MWMPlacePageCellUpdateProtocol.h" #import "MWMPlacePageProtocol.h" -#import "UIColor+MapsMeColor.h" -#import "UIFont+MapsMeFonts.h" namespace { diff --git a/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/ButtonCell/MWMPlacePageButtonCell.mm b/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/ButtonCell/MWMPlacePageButtonCell.mm index 065c40b8ee..e2c48b78d3 100644 --- a/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/ButtonCell/MWMPlacePageButtonCell.mm +++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/ButtonCell/MWMPlacePageButtonCell.mm @@ -1,7 +1,6 @@ #import "MWMPlacePageButtonCell.h" #import "MWMCommon.h" #import "MWMPlacePageProtocol.h" -#import "UIColor+MapsMeColor.h" @interface MWMPlacePageButtonCell () diff --git a/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/OpeningHoursCell/MWMOpeningHoursLayoutHelper.mm b/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/OpeningHoursCell/MWMOpeningHoursLayoutHelper.mm index da12f6446e..2969584576 100644 --- a/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/OpeningHoursCell/MWMOpeningHoursLayoutHelper.mm +++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/OpeningHoursCell/MWMOpeningHoursLayoutHelper.mm @@ -3,8 +3,6 @@ #import "MWMOpeningHours.h" #import "MWMPlacePageData.h" #import "MWMTableViewCell.h" -#import "UIColor+MapsMeColor.h" -#import "UIFont+MapsMeFonts.h" #include "std/array.hpp" diff --git a/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/OpeningHoursCell/MWMPlacePageOpeningHoursDayView.mm b/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/OpeningHoursCell/MWMPlacePageOpeningHoursDayView.mm index 84f3d2b138..0aeec73248 100644 --- a/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/OpeningHoursCell/MWMPlacePageOpeningHoursDayView.mm +++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/OpeningHoursCell/MWMPlacePageOpeningHoursDayView.mm @@ -1,6 +1,4 @@ #import "MWMPlacePageOpeningHoursDayView.h" -#import "UIColor+MapsMeColor.h" -#import "UIFont+MapsMeFonts.h" @interface MWMPlacePageOpeningHoursDayView () diff --git a/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/RegularCell/MWMPlacePageInfoCell.mm b/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/RegularCell/MWMPlacePageInfoCell.mm index 3b3ae3bd92..eae985b86a 100644 --- a/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/RegularCell/MWMPlacePageInfoCell.mm +++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/RegularCell/MWMPlacePageInfoCell.mm @@ -3,8 +3,6 @@ #import "MapViewController.h" #import "MapsAppDelegate.h" #import "Statistics.h" -#import "UIColor+MapsMeColor.h" -#import "UIFont+MapsMeFonts.h" #import "UIImageView+Coloring.h" #include "platform/measurement_utils.hpp" diff --git a/iphone/Maps/UI/PlacePage/PlacePageLayout/MWMPlacePageLayout.mm b/iphone/Maps/UI/PlacePage/PlacePageLayout/MWMPlacePageLayout.mm index 0241e8a1c0..e24ec01608 100644 --- a/iphone/Maps/UI/PlacePage/PlacePageLayout/MWMPlacePageLayout.mm +++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/MWMPlacePageLayout.mm @@ -11,7 +11,6 @@ #import "MWMPlacePageLayoutImpl.h" #import "MWMPlacePageTaxiCell.h" #import "MWMPPPreviewLayoutHelper.h" -#import "UIColor+MapsMeColor.h" #include "storage/storage.hpp" diff --git a/iphone/Maps/UI/PlacePage/PlacePageLayout/PlacePageView/MWMPPView.mm b/iphone/Maps/UI/PlacePage/PlacePageLayout/PlacePageView/MWMPPView.mm index e9e9c78eb6..db11a02f71 100644 --- a/iphone/Maps/UI/PlacePage/PlacePageLayout/PlacePageView/MWMPPView.mm +++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/PlacePageView/MWMPPView.mm @@ -1,7 +1,6 @@ #import "MWMCommon.h" #import "MWMPlacePageActionBar.h" #import "MWMPPView.h" -#import "UIColor+MapsMeColor.h" namespace { diff --git a/iphone/Maps/UI/PlacePage/PlacePageLayout/Preview/MWMPPPreviewLayoutHelper.mm b/iphone/Maps/UI/PlacePage/PlacePageLayout/Preview/MWMPPPreviewLayoutHelper.mm index 30cdd82b06..0496a6f3e1 100644 --- a/iphone/Maps/UI/PlacePage/PlacePageLayout/Preview/MWMPPPreviewLayoutHelper.mm +++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/Preview/MWMPPPreviewLayoutHelper.mm @@ -5,7 +5,6 @@ #import "MWMPPPreviewBannerCell.h" #import "MWMTableViewCell.h" #import "Statistics.h" -#import "UIColor+MapsmeColor.h" #include "std/array.hpp" diff --git a/iphone/Maps/UI/Search/Filters/MWMSearchFilterPresentationController.mm b/iphone/Maps/UI/Search/Filters/MWMSearchFilterPresentationController.mm index de42e29d4d..080b53ab54 100644 --- a/iphone/Maps/UI/Search/Filters/MWMSearchFilterPresentationController.mm +++ b/iphone/Maps/UI/Search/Filters/MWMSearchFilterPresentationController.mm @@ -1,6 +1,5 @@ #import "MWMSearchFilterPresentationController.h" #import "MWMSearch.h" -#import "UIColor+MapsMeColor.h" namespace { diff --git a/iphone/Maps/UI/Search/Filters/MWMSearchHotelsFilterViewController.mm b/iphone/Maps/UI/Search/Filters/MWMSearchHotelsFilterViewController.mm index fdb2d047cd..a4bb84e8cd 100644 --- a/iphone/Maps/UI/Search/Filters/MWMSearchHotelsFilterViewController.mm +++ b/iphone/Maps/UI/Search/Filters/MWMSearchHotelsFilterViewController.mm @@ -1,7 +1,5 @@ #import "MWMSearchHotelsFilterViewController.h" #import "MWMSearchFilterViewController_Protected.h" -#import "UIColor+MapsMeColor.h" -#import "UIFont+MapsMeFonts.h" namespace { diff --git a/iphone/Maps/UI/Search/MWMSearchChangeModeView.mm b/iphone/Maps/UI/Search/MWMSearchChangeModeView.mm index 19943dc6f2..5dcb771b54 100644 --- a/iphone/Maps/UI/Search/MWMSearchChangeModeView.mm +++ b/iphone/Maps/UI/Search/MWMSearchChangeModeView.mm @@ -2,7 +2,6 @@ #import "MWMButton.h" #import "MWMSearch.h" #import "UIButton+RuntimeAttributes.h" -#import "UIColor+MapsMeColor.h" extern NSString * const kSearchStateWillChangeNotification; extern NSString * const kSearchStateKey; diff --git a/iphone/Maps/UI/Search/MWMSearchManager+Filter.mm b/iphone/Maps/UI/Search/MWMSearchManager+Filter.mm index d29c399637..6ab38b95c2 100644 --- a/iphone/Maps/UI/Search/MWMSearchManager+Filter.mm +++ b/iphone/Maps/UI/Search/MWMSearchManager+Filter.mm @@ -2,8 +2,6 @@ #import "MWMSearchFilterTransitioningManager.h" #import "MWMSearchFilterViewController.h" #import "MWMSearchManager+Filter.h" -#import "UIColor+MapsMeColor.h" -#import "UIFont+MapsMeFonts.h" @interface MWMSearchManager () diff --git a/iphone/Maps/UI/Search/MWMSearchManager.mm b/iphone/Maps/UI/Search/MWMSearchManager.mm index c8a4a86537..685c7cbd11 100644 --- a/iphone/Maps/UI/Search/MWMSearchManager.mm +++ b/iphone/Maps/UI/Search/MWMSearchManager.mm @@ -17,8 +17,6 @@ #import "MapViewController.h" #import "MapsAppDelegate.h" #import "Statistics.h" -#import "UIColor+MapsMeColor.h" -#import "UIFont+MapsMeFonts.h" #import "3party/Alohalytics/src/alohalytics_objc.h" diff --git a/iphone/Maps/UI/Search/MWMSearchTextField.mm b/iphone/Maps/UI/Search/MWMSearchTextField.mm index 5af935d822..2cdee64173 100644 --- a/iphone/Maps/UI/Search/MWMSearchTextField.mm +++ b/iphone/Maps/UI/Search/MWMSearchTextField.mm @@ -1,6 +1,5 @@ #import "MWMSearchTextField.h" #import "MWMSearch.h" -#import "UIColor+MapsMeColor.h" #import "UIImageView+Coloring.h" namespace diff --git a/iphone/Maps/UI/Search/TabButtons/MWMSearchTabButtonsView.mm b/iphone/Maps/UI/Search/TabButtons/MWMSearchTabButtonsView.mm index 2c4e838f35..5df1ec4b9b 100644 --- a/iphone/Maps/UI/Search/TabButtons/MWMSearchTabButtonsView.mm +++ b/iphone/Maps/UI/Search/TabButtons/MWMSearchTabButtonsView.mm @@ -1,7 +1,6 @@ #import "MWMCommon.h" #import "MWMSearchManager.h" #import "MWMSearchTabButtonsView.h" -#import "UIColor+MapsMeColor.h" static CGFloat const kIconToLabelSpacing = 4.0; diff --git a/iphone/Maps/UI/Search/TabbedView/BookmarksTab/MWMSearchBookmarksCell.mm b/iphone/Maps/UI/Search/TabbedView/BookmarksTab/MWMSearchBookmarksCell.mm index da6f82443f..7adae67e82 100644 --- a/iphone/Maps/UI/Search/TabbedView/BookmarksTab/MWMSearchBookmarksCell.mm +++ b/iphone/Maps/UI/Search/TabbedView/BookmarksTab/MWMSearchBookmarksCell.mm @@ -1,8 +1,6 @@ #import "BookmarksVC.h" #import "MWMCommon.h" #import "MWMSearchBookmarksCell.h" -#import "UIColor+MapsMeColor.h" -#import "UIFont+MapsMeFonts.h" #include "Framework.h" diff --git a/iphone/Maps/UI/Search/TabbedView/CategoriesTab/MWMSearchCategoryCell.mm b/iphone/Maps/UI/Search/TabbedView/CategoriesTab/MWMSearchCategoryCell.mm index 503f56810f..b9eea2f492 100644 --- a/iphone/Maps/UI/Search/TabbedView/CategoriesTab/MWMSearchCategoryCell.mm +++ b/iphone/Maps/UI/Search/TabbedView/CategoriesTab/MWMSearchCategoryCell.mm @@ -1,7 +1,5 @@ #import "MWMSearchCategoryCell.h" #import "MWMCommon.h" -#import "UIColor+MapsMeColor.h" -#import "UIFont+MapsMeFonts.h" #import "UIImageView+Coloring.h" @interface MWMSearchCategoryCell () diff --git a/iphone/Maps/UI/Search/TabbedView/HistoryTab/MWMSearchHistoryClearCell.mm b/iphone/Maps/UI/Search/TabbedView/HistoryTab/MWMSearchHistoryClearCell.mm index 2a2358fda4..59a88216c6 100644 --- a/iphone/Maps/UI/Search/TabbedView/HistoryTab/MWMSearchHistoryClearCell.mm +++ b/iphone/Maps/UI/Search/TabbedView/HistoryTab/MWMSearchHistoryClearCell.mm @@ -1,5 +1,4 @@ #import "MWMSearchHistoryClearCell.h" -#import "UIColor+MapsMeColor.h" @interface MWMSearchHistoryClearCell () diff --git a/iphone/Maps/UI/Search/TabbedView/HistoryTab/MWMSearchHistoryMyPositionCell.mm b/iphone/Maps/UI/Search/TabbedView/HistoryTab/MWMSearchHistoryMyPositionCell.mm index 66b2f5df5b..7c5c1f1d96 100644 --- a/iphone/Maps/UI/Search/TabbedView/HistoryTab/MWMSearchHistoryMyPositionCell.mm +++ b/iphone/Maps/UI/Search/TabbedView/HistoryTab/MWMSearchHistoryMyPositionCell.mm @@ -1,5 +1,4 @@ #import "MWMSearchHistoryMyPositionCell.h" -#import "UIColor+MapsMeColor.h" @implementation MWMSearchHistoryMyPositionCell diff --git a/iphone/Maps/UI/Search/TabbedView/HistoryTab/MWMSearchHistoryRequestCell.mm b/iphone/Maps/UI/Search/TabbedView/HistoryTab/MWMSearchHistoryRequestCell.mm index 914b16547a..5679c79e4e 100644 --- a/iphone/Maps/UI/Search/TabbedView/HistoryTab/MWMSearchHistoryRequestCell.mm +++ b/iphone/Maps/UI/Search/TabbedView/HistoryTab/MWMSearchHistoryRequestCell.mm @@ -1,7 +1,5 @@ #import "MWMCommon.h" #import "MWMSearchHistoryRequestCell.h" -#import "UIColor+MapsMeColor.h" -#import "UIFont+MapsMeFonts.h" @interface MWMSearchHistoryRequestCell () diff --git a/iphone/Maps/UI/Search/TableView/MWMSearchCell.mm b/iphone/Maps/UI/Search/TableView/MWMSearchCell.mm index 0b4e52080d..d16c874daf 100644 --- a/iphone/Maps/UI/Search/TableView/MWMSearchCell.mm +++ b/iphone/Maps/UI/Search/TableView/MWMSearchCell.mm @@ -1,7 +1,6 @@ #import "MWMCommon.h" #import "MWMSearchCell.h" #import "Statistics.h" -#import "UIColor+MapsMeColor.h" #include "Framework.h" diff --git a/iphone/Maps/UI/Search/TableView/MWMSearchCommonCell.mm b/iphone/Maps/UI/Search/TableView/MWMSearchCommonCell.mm index efbd637334..c2066a15b3 100644 --- a/iphone/Maps/UI/Search/TableView/MWMSearchCommonCell.mm +++ b/iphone/Maps/UI/Search/TableView/MWMSearchCommonCell.mm @@ -2,8 +2,6 @@ #import "MWMLocationManager.h" #import "MWMSearchCommonCell.h" #import "MapsAppDelegate.h" -#import "UIColor+MapsMeColor.h" -#import "UIFont+MapsMeFonts.h" #include "Framework.h" diff --git a/iphone/Maps/UI/Search/TableView/MWMSearchSuggestionCell.mm b/iphone/Maps/UI/Search/TableView/MWMSearchSuggestionCell.mm index a13ce2f7c1..26851843af 100644 --- a/iphone/Maps/UI/Search/TableView/MWMSearchSuggestionCell.mm +++ b/iphone/Maps/UI/Search/TableView/MWMSearchSuggestionCell.mm @@ -1,6 +1,4 @@ #import "MWMSearchSuggestionCell.h" -#import "UIColor+MapsMeColor.h" -#import "UIFont+MapsMeFonts.h" @interface MWMSearchSuggestionCell () diff --git a/iphone/Maps/UI/Settings/MWMHelpController.mm b/iphone/Maps/UI/Settings/MWMHelpController.mm index dd848f6b67..395d2a4e45 100644 --- a/iphone/Maps/UI/Settings/MWMHelpController.mm +++ b/iphone/Maps/UI/Settings/MWMHelpController.mm @@ -3,7 +3,6 @@ #import "MWMCommon.h" #import "MWMMailViewController.h" #import "Statistics.h" -#import "UIColor+MapsMeColor.h" #import "WebViewController.h" #import "3party/Alohalytics/src/alohalytics_objc.h" diff --git a/iphone/Maps/UI/Settings/MWMNightModeController.mm b/iphone/Maps/UI/Settings/MWMNightModeController.mm index 96e209e88d..74d5efd459 100644 --- a/iphone/Maps/UI/Settings/MWMNightModeController.mm +++ b/iphone/Maps/UI/Settings/MWMNightModeController.mm @@ -3,7 +3,6 @@ #import "MapsAppDelegate.h" #import "Statistics.h" #import "SwiftBridge.h" -#import "UIColor+MapsMeColor.h" #include "Framework.h" diff --git a/iphone/Maps/UI/Settings/MWMTTSLanguageViewController.mm b/iphone/Maps/UI/Settings/MWMTTSLanguageViewController.mm index 34dff26271..aad7871960 100644 --- a/iphone/Maps/UI/Settings/MWMTTSLanguageViewController.mm +++ b/iphone/Maps/UI/Settings/MWMTTSLanguageViewController.mm @@ -2,7 +2,6 @@ #import "MWMTTSSettingsViewController.h" #import "MWMTextToSpeech.h" #import "SwiftBridge.h" -#import "UIColor+MapsMeColor.h" static NSString * const kUnwingSegueIdentifier = @"UnwindToTTSSettings"; diff --git a/iphone/Maps/UI/Settings/MWMTTSSettingsViewController.mm b/iphone/Maps/UI/Settings/MWMTTSSettingsViewController.mm index 36c040c4a1..5ac1c4db05 100644 --- a/iphone/Maps/UI/Settings/MWMTTSSettingsViewController.mm +++ b/iphone/Maps/UI/Settings/MWMTTSSettingsViewController.mm @@ -3,7 +3,6 @@ #import "MWMTextToSpeech.h" #import "Statistics.h" #import "SwiftBridge.h" -#import "UIColor+MapsMeColor.h" #import "WebViewController.h" #include "LocaleTranslator.h" From da2f4a01480a5e9fad679caa141d85010c046df4 Mon Sep 17 00:00:00 2001 From: Ilya Grechuhin Date: Tue, 10 Jan 2017 16:51:43 +0300 Subject: [PATCH 11/14] [cleanup] [ios] Fixed old, verbose Objective-C syntax. --- iphone/Maps/Bookmarks/BookmarksRootVC.mm | 4 ++-- iphone/Maps/Bookmarks/BookmarksVC.mm | 6 +++--- iphone/Maps/Classes/CustomAlert/MWMEditorViralAlert.mm | 5 +++-- iphone/Maps/Common/AppInfo.mm | 5 +---- 4 files changed, 9 insertions(+), 11 deletions(-) diff --git a/iphone/Maps/Bookmarks/BookmarksRootVC.mm b/iphone/Maps/Bookmarks/BookmarksRootVC.mm index 498a46fcb6..6e4375c813 100644 --- a/iphone/Maps/Bookmarks/BookmarksRootVC.mm +++ b/iphone/Maps/Bookmarks/BookmarksRootVC.mm @@ -52,7 +52,7 @@ label.textColor = [UIColor blackPrimaryText]; [m_hint addSubview:label]; } - UILabel * label = [m_hint.subviews objectAtIndex:0]; + UILabel * label = m_hint.subviews.firstObject; label.bounds = CGRectInset(rect, offset, offset); [label sizeToIntegralFit]; m_hint.bounds = CGRectMake(0, 0, rect.size.width, label.bounds.size.height + 2 * offset); @@ -238,7 +238,7 @@ [[NSNotificationCenter defaultCenter] postNotificationName:BOOKMARK_CATEGORY_DELETED_NOTIFICATION object:@(indexPath.row)]; Framework & f = GetFramework(); f.DeleteBmCategory(indexPath.row); - [self.tableView deleteRowsAtIndexPaths:[NSArray arrayWithObject:indexPath] withRowAnimation:UITableViewRowAnimationFade]; + [self.tableView deleteRowsAtIndexPaths:@[indexPath] withRowAnimation:UITableViewRowAnimationFade]; // Disable edit mode if no categories are left if (!f.GetBmCategoriesCount()) { diff --git a/iphone/Maps/Bookmarks/BookmarksVC.mm b/iphone/Maps/Bookmarks/BookmarksVC.mm index 72692c75ac..e3d306c990 100644 --- a/iphone/Maps/Bookmarks/BookmarksVC.mm +++ b/iphone/Maps/Bookmarks/BookmarksVC.mm @@ -139,7 +139,7 @@ extern NSString * const kBookmarksChangedNotification = @"BookmarksChangedNotifi string dist; if (measurement_utils::FormatDistance(tr->GetLengthMeters(), dist)) //Change Length before release!!! - cell.detailTextLabel.text = [NSString stringWithFormat:@"%@ %@", L(@"length"), [NSString stringWithUTF8String:dist.c_str()]]; + cell.detailTextLabel.text = [NSString stringWithFormat:@"%@ %@", L(@"length"), @(dist.c_str())]; else cell.detailTextLabel.text = nil; const dp::Color c = tr->GetColor(0); @@ -246,7 +246,7 @@ extern NSString * const kBookmarksChangedNotification = @"BookmarksChangedNotifi if (cat) { [Statistics logEvent:kStatEventName(kStatBookmarks, kStatExport)]; - NSMutableString * catName = [NSMutableString stringWithUTF8String:cat->GetName().c_str()]; + NSMutableString * catName = @(cat->GetName().c_str()); if (![catName length]) [catName setString:@"MapsMe"]; @@ -308,7 +308,7 @@ extern NSString * const kBookmarksChangedNotification = @"BookmarksChangedNotifi [self calculateSections]; //We can delete the row with animation, if number of sections stay the same. if (previousNumberOfSections == m_numberOfSections) - [self.tableView deleteRowsAtIndexPaths:[NSArray arrayWithObject:indexPath] withRowAnimation:UITableViewRowAnimationFade]; + [self.tableView deleteRowsAtIndexPaths:@[ indexPath ] withRowAnimation:UITableViewRowAnimationFade]; else [self.tableView reloadData]; if (cat->GetUserMarkCount() + cat->GetTracksCount() == 0) diff --git a/iphone/Maps/Classes/CustomAlert/MWMEditorViralAlert.mm b/iphone/Maps/Classes/CustomAlert/MWMEditorViralAlert.mm index b8afbe753b..4fde1473e6 100644 --- a/iphone/Maps/Classes/CustomAlert/MWMEditorViralAlert.mm +++ b/iphone/Maps/Classes/CustomAlert/MWMEditorViralAlert.mm @@ -36,8 +36,9 @@ namespace } alert.message.text = message; NSMutableDictionary * info = [@{kStatValue : alert.statMessage} mutableCopy]; - if (NSString * un = osm_auth_ios::OSMUserName()) - [info setObject:un forKey:kStatOSMUserName]; + NSString * un = osm_auth_ios::OSMUserName(); + if (un) + info[kStatOSMUserName] = un; [Statistics logEvent:kStatEditorSecondTimeShareShow withParameters:info]; return alert; diff --git a/iphone/Maps/Common/AppInfo.mm b/iphone/Maps/Common/AppInfo.mm index da226b0fcd..af0bc140ae 100644 --- a/iphone/Maps/Common/AppInfo.mm +++ b/iphone/Maps/Common/AppInfo.mm @@ -202,10 +202,7 @@ NSDictionary * const kDeviceNamesWithMetalDriver = @{ { if (!_buildDate) { - NSString * dateStr = - [NSString stringWithFormat:@"%@ %@", [NSString stringWithUTF8String:__DATE__], - [NSString stringWithUTF8String:__TIME__]]; - + NSString * dateStr = [NSString stringWithFormat:@"%@ %@", @(__DATE__), @(__TIME__)]; NSDateFormatter * dateFormatter = [[NSDateFormatter alloc] init]; [dateFormatter setDateFormat:@"LLL d yyyy HH:mm:ss"]; [dateFormatter setLocale:[[NSLocale alloc] initWithLocaleIdentifier:@"en_US_POSIX"]]; From 7fc41500e504b4fa154e7f157d8de54c4149c85d Mon Sep 17 00:00:00 2001 From: Ilya Grechuhin Date: Tue, 10 Jan 2017 17:00:02 +0300 Subject: [PATCH 12/14] [cleanup] [ios] Fixed Null coalescing operator usage. --- .../RoutingDisclaimerAlert/MWMRoutingDisclaimerAlert.mm | 2 +- .../MapViewControls/BottomMenu/MWMBottomMenuViewController.mm | 2 +- .../Downloader/DataSources/MWMMapDownloaderDefaultDataSource.mm | 2 +- iphone/Maps/UI/EditBookmark/MWMEditBookmarkController.mm | 2 +- iphone/Maps/UI/Migration/MWMMigrationView.mm | 2 +- .../Content/OpeningHoursCell/MWMOpeningHoursLayoutHelper.mm | 2 +- iphone/Maps/UI/Search/MWMSearchManager.mm | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/iphone/Maps/Classes/CustomAlert/RoutingDisclaimerAlert/MWMRoutingDisclaimerAlert.mm b/iphone/Maps/Classes/CustomAlert/RoutingDisclaimerAlert/MWMRoutingDisclaimerAlert.mm index b80d047887..33b498bbf6 100644 --- a/iphone/Maps/Classes/CustomAlert/RoutingDisclaimerAlert/MWMRoutingDisclaimerAlert.mm +++ b/iphone/Maps/Classes/CustomAlert/RoutingDisclaimerAlert/MWMRoutingDisclaimerAlert.mm @@ -57,7 +57,7 @@ static NSString * const kStatisticsEvent = @"Routing Disclaimer Alert"; - (void)willRotateToInterfaceOrientation:(UIInterfaceOrientation)orientation { - UIView * superview = self.superview ? self.superview : UIApplication.sharedApplication.keyWindow; + UIView * superview = self.superview ?: UIApplication.sharedApplication.keyWindow; CGFloat const height = UIInterfaceOrientationIsLandscape(orientation) ? MIN(superview.width, superview.height) : MAX(superview.width, superview.height); diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuViewController.mm b/iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuViewController.mm index e37752aef3..be1face039 100644 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuViewController.mm +++ b/iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuViewController.mm @@ -191,7 +191,7 @@ typedef NS_ENUM(NSUInteger, MWMBottomMenuViewCell) { attributes:routingLegendAttributes]]; self.distanceWithLegendLabel.attributedText = distance; - NSString * currentSpeed = info.speed ? info.speed : @"0"; + NSString * currentSpeed = info.speed ?: @"0"; self.speedLabel.text = currentSpeed; self.speedLegendLabel.text = info.speedUnits; NSMutableAttributedString * speed = diff --git a/iphone/Maps/UI/Downloader/DataSources/MWMMapDownloaderDefaultDataSource.mm b/iphone/Maps/UI/Downloader/DataSources/MWMMapDownloaderDefaultDataSource.mm index 38d26ece08..ba1400b691 100644 --- a/iphone/Maps/UI/Downloader/DataSources/MWMMapDownloaderDefaultDataSource.mm +++ b/iphone/Maps/UI/Downloader/DataSources/MWMMapDownloaderDefaultDataSource.mm @@ -91,7 +91,7 @@ using namespace mwm; [indexSet addObject:index]; NSMutableArray * letterIds = availableCountries[index]; - letterIds = letterIds ? letterIds : [@[] mutableCopy]; + letterIds = letterIds ?: [@[] mutableCopy]; [letterIds addObject:nsCountryId]; availableCountries[index] = letterIds; } diff --git a/iphone/Maps/UI/EditBookmark/MWMEditBookmarkController.mm b/iphone/Maps/UI/EditBookmark/MWMEditBookmarkController.mm index c98148a467..c322abd05b 100644 --- a/iphone/Maps/UI/EditBookmark/MWMEditBookmarkController.mm +++ b/iphone/Maps/UI/EditBookmark/MWMEditBookmarkController.mm @@ -53,7 +53,7 @@ enum RowInMetaInfo auto data = self.data; NSAssert(data, @"Data can't be nil!"); self.cachedDescription = data.bookmarkDescription; - self.cachedTitle = data.externalTitle ? data.externalTitle : data.title; + self.cachedTitle = data.externalTitle ?: data.title; self.cachedCategory = data.bookmarkCategory; self.cachedColor = data.bookmarkColor; m_cachedBac = data.bac; diff --git a/iphone/Maps/UI/Migration/MWMMigrationView.mm b/iphone/Maps/UI/Migration/MWMMigrationView.mm index b8d5db02b0..9e7f34ef8b 100644 --- a/iphone/Maps/UI/Migration/MWMMigrationView.mm +++ b/iphone/Maps/UI/Migration/MWMMigrationView.mm @@ -89,7 +89,7 @@ - (void)willRotateToInterfaceOrientation:(UIInterfaceOrientation)orientation { - UIView * superview = self.superview ? self.superview : UIApplication.sharedApplication.keyWindow; + UIView * superview = self.superview ?: UIApplication.sharedApplication.keyWindow; BOOL const isLandscape = UIInterfaceOrientationIsLandscape(orientation); CGFloat const minDim = MIN(superview.width, superview.height); CGFloat const maxDim = MAX(superview.width, superview.height); diff --git a/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/OpeningHoursCell/MWMOpeningHoursLayoutHelper.mm b/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/OpeningHoursCell/MWMOpeningHoursLayoutHelper.mm index 2969584576..e797b2325b 100644 --- a/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/OpeningHoursCell/MWMOpeningHoursLayoutHelper.mm +++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/OpeningHoursCell/MWMOpeningHoursLayoutHelper.mm @@ -191,7 +191,7 @@ NSAttributedString * richStringFromDay(osmoh::Day const & day, BOOL isClosedNow) { _MWMOHSubCell * cell = [tableView dequeueReusableCellWithIdentifier:[_MWMOHSubCell className]]; cell.days.text = day.m_workingDays; - cell.schedule.text = day.m_workingTimes ? day.m_workingTimes : L(@"closed"); + cell.schedule.text = day.m_workingTimes ?: L(@"closed"); cell.breaks.text = day.m_breaks; return cell; } diff --git a/iphone/Maps/UI/Search/MWMSearchManager.mm b/iphone/Maps/UI/Search/MWMSearchManager.mm index 685c7cbd11..197ee3f3e3 100644 --- a/iphone/Maps/UI/Search/MWMSearchManager.mm +++ b/iphone/Maps/UI/Search/MWMSearchManager.mm @@ -190,7 +190,7 @@ typedef NS_ENUM(NSUInteger, MWMSearchManagerActionBarState) { { [self beginSearch]; self.searchTextField.text = text; - NSString * inputLocale = locale ? locale : self.searchTextField.textInputMode.primaryLanguage; + NSString * inputLocale = locale ?: self.searchTextField.textInputMode.primaryLanguage; [MWMSearch searchQuery:text forInputLocale:inputLocale]; } From 49ad147b2ebcb335c55ac21e4dd28c44a4320861 Mon Sep 17 00:00:00 2001 From: Ilya Grechuhin Date: Tue, 10 Jan 2017 17:14:29 +0300 Subject: [PATCH 13/14] [cleanup] [ios] Fixed hardcoded self class references. --- iphone/Maps/Bookmarks/BookmarksVC.mm | 4 ++-- iphone/Maps/Classes/CircleView.mm | 2 +- iphone/Maps/Classes/ColorPickerView.mm | 2 +- iphone/Maps/Classes/Components/MWMDropDown.mm | 2 +- .../DefaultAlert/MWMDefaultAlert.mm | 2 +- .../Classes/CustomAlert/MWMEditorViralAlert.mm | 2 +- .../Classes/CustomAlert/MWMOsmAuthAlert.mm | 2 +- .../CustomAlert/MWMPlaceDoesntExistAlert.mm | 2 +- .../MWMMobileInternetAlert.mm | 2 +- .../MWMRoutingDisclaimerAlert.mm | 2 +- .../SearchAlert/MWMSearchNoResultsAlert.mm | 2 +- .../Maps/Classes/CustomAlert/Toast/MWMToast.mm | 6 +++--- .../CircularProgress/MWMCircularProgress.mm | 2 +- .../Sound/MWMTextToSpeech.mm | 16 ++++++++-------- iphone/Maps/Classes/MWMSegue.mm | 2 +- iphone/Maps/Common/Keyboard/MWMKeyboard.mm | 8 ++++---- iphone/Maps/Common/Statistics/Statistics.mm | 2 +- .../Maps/Core/Location/MWMLocationManager.mm | 16 ++++++++-------- iphone/Maps/Core/Routing/MWMRouter.mm | 18 +++++++++--------- .../Maps/Core/Routing/MWMRouterSavedState.mm | 8 ++++---- .../Editor/MWMEditorAdditionalNamesHeader.mm | 2 +- iphone/Maps/UI/Editor/MWMEditorNotesFooter.mm | 2 +- .../ActionBar/MWMActionBarButton.mm | 2 +- .../MWMSearchHotelsFilterViewController.mm | 2 +- iphone/Maps/UI/Search/MWMSearchNoResults.mm | 2 +- 25 files changed, 56 insertions(+), 56 deletions(-) diff --git a/iphone/Maps/Bookmarks/BookmarksVC.mm b/iphone/Maps/Bookmarks/BookmarksVC.mm index e3d306c990..5f288375e8 100644 --- a/iphone/Maps/Bookmarks/BookmarksVC.mm +++ b/iphone/Maps/Bookmarks/BookmarksVC.mm @@ -246,9 +246,9 @@ extern NSString * const kBookmarksChangedNotification = @"BookmarksChangedNotifi if (cat) { [Statistics logEvent:kStatEventName(kStatBookmarks, kStatExport)]; - NSMutableString * catName = @(cat->GetName().c_str()); + NSString * catName = @(cat->GetName().c_str()); if (![catName length]) - [catName setString:@"MapsMe"]; + catName = @"MapsMe"; NSString * filePath = @(cat->GetFileName().c_str()); NSMutableString * kmzFile = [NSMutableString stringWithString:filePath]; diff --git a/iphone/Maps/Classes/CircleView.mm b/iphone/Maps/Classes/CircleView.mm index 38cce89a5f..9742a831dd 100644 --- a/iphone/Maps/Classes/CircleView.mm +++ b/iphone/Maps/Classes/CircleView.mm @@ -33,7 +33,7 @@ { UIView * circleView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, diameter, diameter)]; circleView.backgroundColor = [UIColor clearColor]; - CircleView * circle = [[CircleView alloc] initWithFrame:CGRectMake(0.5, 0.5, diameter - 1, diameter - 1) andColor:color]; + CircleView * circle = [[self alloc] initWithFrame:CGRectMake(0.5, 0.5, diameter - 1, diameter - 1) andColor:color]; [circleView addSubview:circle]; return circleView; } diff --git a/iphone/Maps/Classes/ColorPickerView.mm b/iphone/Maps/Classes/ColorPickerView.mm index 7edf8ec46b..54adf1758c 100644 --- a/iphone/Maps/Classes/ColorPickerView.mm +++ b/iphone/Maps/Classes/ColorPickerView.mm @@ -59,7 +59,7 @@ static Tcolor const g_color [] = for (size_t i = 0; i < 8; ++i) { UIButton * button = [[UIButton alloc] initWithFrame:CGRectMake(BORDERMARGIN + (i % 4) * (buttonDiameter + BUTTONMARGIN), BORDERMARGIN + (i / 4) * (buttonDiameter + BUTTONMARGINHEIGHT) + HEADERHEIGHT + LINEHEIGHT, buttonDiameter, buttonDiameter)]; - UIColor * c = [ColorPickerView buttonColor:i]; + UIColor * c = [[self class] buttonColor:i]; if (i != selectedIndex) [button setBackgroundImage:[CircleView createCircleImageWith:buttonDiameter andColor:c] forState:UIControlStateNormal]; else diff --git a/iphone/Maps/Classes/Components/MWMDropDown.mm b/iphone/Maps/Classes/Components/MWMDropDown.mm index 2d56b1dd9f..4058d05c50 100644 --- a/iphone/Maps/Classes/Components/MWMDropDown.mm +++ b/iphone/Maps/Classes/Components/MWMDropDown.mm @@ -50,7 +50,7 @@ CGFloat const kTopOffset = 25.; self = [super init]; if (self) { - [[NSBundle mainBundle] loadNibNamed:[MWMDropDown className] owner:self options:nil]; + [[NSBundle mainBundle] loadNibNamed:[[self class] className] owner:self options:nil]; self.superview = view; } return self; diff --git a/iphone/Maps/Classes/CustomAlert/DefaultAlert/MWMDefaultAlert.mm b/iphone/Maps/Classes/CustomAlert/DefaultAlert/MWMDefaultAlert.mm index 56de398587..d193527456 100644 --- a/iphone/Maps/Classes/CustomAlert/DefaultAlert/MWMDefaultAlert.mm +++ b/iphone/Maps/Classes/CustomAlert/DefaultAlert/MWMDefaultAlert.mm @@ -219,7 +219,7 @@ static NSString * const kDefaultAlertNibName = @"MWMDefaultAlert"; TMWMVoidBlock action = ^{ GetFramework().SwitchMyPositionNextMode(); }; - return [MWMDefaultAlert defaultAlertWithTitle:L(@"dialog_routing_location_turn_on") + return [self defaultAlertWithTitle:L(@"dialog_routing_location_turn_on") message:L(@"dialog_routing_location_unknown_turn_on") rightButtonTitle:L(@"turn_on") leftButtonTitle:L(@"later") diff --git a/iphone/Maps/Classes/CustomAlert/MWMEditorViralAlert.mm b/iphone/Maps/Classes/CustomAlert/MWMEditorViralAlert.mm index 4fde1473e6..9ec7c3c1f2 100644 --- a/iphone/Maps/Classes/CustomAlert/MWMEditorViralAlert.mm +++ b/iphone/Maps/Classes/CustomAlert/MWMEditorViralAlert.mm @@ -26,7 +26,7 @@ namespace + (nonnull instancetype)alert { - MWMEditorViralAlert * alert = [[[NSBundle mainBundle] loadNibNamed:[MWMEditorViralAlert className] owner:nil options:nil] firstObject]; + MWMEditorViralAlert * alert = [[[NSBundle mainBundle] loadNibNamed:[self className] owner:nil options:nil] firstObject]; alert.indexOfMessage = rand() % kMessages.size(); NSString * message = kMessages[alert.indexOfMessage]; if (alert.indexOfMessage == 1) diff --git a/iphone/Maps/Classes/CustomAlert/MWMOsmAuthAlert.mm b/iphone/Maps/Classes/CustomAlert/MWMOsmAuthAlert.mm index 5c171de092..c325f0b83e 100644 --- a/iphone/Maps/Classes/CustomAlert/MWMOsmAuthAlert.mm +++ b/iphone/Maps/Classes/CustomAlert/MWMOsmAuthAlert.mm @@ -12,7 +12,7 @@ extern NSString * const kMap2GoogleLoginSegue; + (instancetype)alert { - MWMOsmAuthAlert * alert = [[[NSBundle mainBundle] loadNibNamed:[MWMOsmAuthAlert className] owner:nil options:nil] firstObject]; + MWMOsmAuthAlert * alert = [[[NSBundle mainBundle] loadNibNamed:[self className] owner:nil options:nil] firstObject]; return alert; } diff --git a/iphone/Maps/Classes/CustomAlert/MWMPlaceDoesntExistAlert.mm b/iphone/Maps/Classes/CustomAlert/MWMPlaceDoesntExistAlert.mm index 105e578d3e..4166fbe826 100644 --- a/iphone/Maps/Classes/CustomAlert/MWMPlaceDoesntExistAlert.mm +++ b/iphone/Maps/Classes/CustomAlert/MWMPlaceDoesntExistAlert.mm @@ -14,7 +14,7 @@ + (instancetype)alertWithBlock:(MWMStringBlock)block { MWMPlaceDoesntExistAlert * alert = - [[[NSBundle mainBundle] loadNibNamed:[MWMPlaceDoesntExistAlert className] + [[[NSBundle mainBundle] loadNibNamed:[self className] owner:nil options:nil] firstObject]; alert.block = block; diff --git a/iphone/Maps/Classes/CustomAlert/MobileInternetAlert/MWMMobileInternetAlert.mm b/iphone/Maps/Classes/CustomAlert/MobileInternetAlert/MWMMobileInternetAlert.mm index 32148ce71f..037870d00c 100644 --- a/iphone/Maps/Classes/CustomAlert/MobileInternetAlert/MWMMobileInternetAlert.mm +++ b/iphone/Maps/Classes/CustomAlert/MobileInternetAlert/MWMMobileInternetAlert.mm @@ -22,7 +22,7 @@ NSString * const kStatisticsEvent = @"Mobile Internet Settings Alert"; { [Statistics logEvent:kStatisticsEvent withParameters:@{kStatAction : kStatOpen}]; MWMMobileInternetAlert * alert = - [[[NSBundle mainBundle] loadNibNamed:[MWMMobileInternetAlert className] owner:nil options:nil] + [[[NSBundle mainBundle] loadNibNamed:[self className] owner:nil options:nil] firstObject]; alert.completionBlock = block; return alert; diff --git a/iphone/Maps/Classes/CustomAlert/RoutingDisclaimerAlert/MWMRoutingDisclaimerAlert.mm b/iphone/Maps/Classes/CustomAlert/RoutingDisclaimerAlert/MWMRoutingDisclaimerAlert.mm index 33b498bbf6..77c2ac1d6f 100644 --- a/iphone/Maps/Classes/CustomAlert/RoutingDisclaimerAlert/MWMRoutingDisclaimerAlert.mm +++ b/iphone/Maps/Classes/CustomAlert/RoutingDisclaimerAlert/MWMRoutingDisclaimerAlert.mm @@ -20,7 +20,7 @@ static NSString * const kStatisticsEvent = @"Routing Disclaimer Alert"; { [Statistics logEvent:kStatisticsEvent withParameters:@{kStatAction : kStatOpen}]; MWMRoutingDisclaimerAlert * alert = - [[[NSBundle mainBundle] loadNibNamed:[MWMRoutingDisclaimerAlert className] + [[[NSBundle mainBundle] loadNibNamed:[self className] owner:nil options:nil] firstObject]; NSString * message = [NSString stringWithFormat:@"%@\n\n%@\n\n%@\n\n%@\n\n%@", diff --git a/iphone/Maps/Classes/CustomAlert/SearchAlert/MWMSearchNoResultsAlert.mm b/iphone/Maps/Classes/CustomAlert/SearchAlert/MWMSearchNoResultsAlert.mm index d7116c0512..775cd8c6f6 100644 --- a/iphone/Maps/Classes/CustomAlert/SearchAlert/MWMSearchNoResultsAlert.mm +++ b/iphone/Maps/Classes/CustomAlert/SearchAlert/MWMSearchNoResultsAlert.mm @@ -23,7 +23,7 @@ NSString * const kStatisticsEvent = @"Search No Results Alert"; { [Statistics logEvent:kStatisticsEvent withParameters:@{kStatAction : kStatOpen}]; MWMSearchNoResultsAlert * alert = [ - [[NSBundle mainBundle] loadNibNamed:[MWMSearchNoResultsAlert className] owner:nil options:nil] + [[NSBundle mainBundle] loadNibNamed:[self className] owner:nil options:nil] firstObject]; return alert; } diff --git a/iphone/Maps/Classes/CustomAlert/Toast/MWMToast.mm b/iphone/Maps/Classes/CustomAlert/Toast/MWMToast.mm index 686a169e81..08c5ca707d 100644 --- a/iphone/Maps/Classes/CustomAlert/Toast/MWMToast.mm +++ b/iphone/Maps/Classes/CustomAlert/Toast/MWMToast.mm @@ -21,14 +21,14 @@ NSUInteger const kWordsPerSecond = 3; + (void)showWithText:(NSString *)text { - MWMToast * toast = [MWMToast toast]; + MWMToast * toast = [self toast]; toast.label.text = text; toast.label.textColor = [UIColor blackPrimaryText]; toast.rootView.backgroundColor = [UIColor toastBackground]; [toast show]; } -+ (BOOL)affectsStatusBar { return [MWMToast toast].rootView.superview != nil; } ++ (BOOL)affectsStatusBar { return [self toast].rootView.superview != nil; } + (UIStatusBarStyle)preferredStatusBarStyle { setStatusBarBackgroundColor([UIColor clearColor]); @@ -50,7 +50,7 @@ NSUInteger const kWordsPerSecond = 3; self = [super init]; if (self) { - [[NSBundle mainBundle] loadNibNamed:[MWMToast className] owner:self options:nil]; + [[NSBundle mainBundle] loadNibNamed:[[self class] className] owner:self options:nil]; self.rootView.translatesAutoresizingMaskIntoConstraints = NO; } return self; diff --git a/iphone/Maps/Classes/CustomViews/CircularProgress/MWMCircularProgress.mm b/iphone/Maps/Classes/CustomViews/CircularProgress/MWMCircularProgress.mm index 37e49fe7e7..93999f36b8 100644 --- a/iphone/Maps/Classes/CustomViews/CircularProgress/MWMCircularProgress.mm +++ b/iphone/Maps/Classes/CustomViews/CircularProgress/MWMCircularProgress.mm @@ -24,7 +24,7 @@ UINib * const progressViewNib = + (nonnull instancetype)downloaderProgressForParentView:(nonnull UIView *)parentView { - MWMCircularProgress * progress = [[MWMCircularProgress alloc] initWithParentView:parentView]; + MWMCircularProgress * progress = [[self alloc] initWithParentView:parentView]; progress.rootView.suspendRefreshProgress = YES; diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Sound/MWMTextToSpeech.mm b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Sound/MWMTextToSpeech.mm index c230d231f0..ef022bba55 100644 --- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Sound/MWMTextToSpeech.mm +++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Sound/MWMTextToSpeech.mm @@ -72,7 +72,7 @@ vector> availableLanguages() { _availableLanguages = availableLanguages(); - NSString * saved = [MWMTextToSpeech savedLanguage]; + NSString * saved = [[self class] savedLanguage]; NSString * preferedLanguageBcp47; if (saved.length) preferedLanguageBcp47 = saved; @@ -131,10 +131,10 @@ vector> availableLanguages() + (BOOL)isTTSEnabled { return [[NSUserDefaults standardUserDefaults] boolForKey:kIsTTSEnabled]; } + (void)setTTSEnabled:(BOOL)enabled { - if ([MWMTextToSpeech isTTSEnabled] == enabled) + if ([self isTTSEnabled] == enabled) return; if (!enabled) - [[MWMTextToSpeech tts] setActive:NO]; + [[self tts] setActive:NO]; NSUserDefaults * ud = [NSUserDefaults standardUserDefaults]; [ud setBool:enabled forKey:kIsTTSEnabled]; [ud synchronize]; @@ -142,12 +142,12 @@ vector> availableLanguages() object:nil userInfo:nil]; if (enabled) - [[MWMTextToSpeech tts] setActive:YES]; + [[self tts] setActive:YES]; } - (void)setActive:(BOOL)active { - if (![MWMTextToSpeech isTTSEnabled] || self.active == active) + if (![[self class] isTTSEnabled] || self.active == active) return; if (active && ![self isValid]) [self createSynthesizer]; @@ -155,7 +155,7 @@ vector> availableLanguages() GetFramework().EnableTurnNotifications(active ? true : false); runAsyncOnMainQueue(^{ [[NSNotificationCenter defaultCenter] - postNotificationName:[MWMTextToSpeech ttsStatusNotificationKey] + postNotificationName:[[self class] ttsStatusNotificationKey] object:nil userInfo:nil]; }); @@ -163,7 +163,7 @@ vector> availableLanguages() - (BOOL)active { - return [MWMTextToSpeech isTTSEnabled] && GetFramework().AreTurnNotificationsEnabled() ? YES : NO; + return [[self class] isTTSEnabled] && GetFramework().AreTurnNotificationsEnabled() ? YES : NO; } + (NSString *)savedLanguage @@ -176,7 +176,7 @@ vector> availableLanguages() dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{ self.speechSynthesizer = [[AVSpeechSynthesizer alloc] init]; self.speechSynthesizer.delegate = self; - [self createVoice:[MWMTextToSpeech savedLanguage]]; + [self createVoice:[[self class] savedLanguage]]; }); // TODO(vbykoianko) Use [NSLocale preferredLanguages] instead of [AVSpeechSynthesisVoice // currentLanguageCode]. diff --git a/iphone/Maps/Classes/MWMSegue.mm b/iphone/Maps/Classes/MWMSegue.mm index e20ebd1e48..6e08bea8a8 100644 --- a/iphone/Maps/Classes/MWMSegue.mm +++ b/iphone/Maps/Classes/MWMSegue.mm @@ -5,7 +5,7 @@ + (void)segueFrom:(UIViewController *)source to:(UIViewController *)destination { - [[[MWMSegue alloc] initWithIdentifier:@"" source:source destination:destination] perform]; + [[[self alloc] initWithIdentifier:@"" source:source destination:destination] perform]; } - (void)perform diff --git a/iphone/Maps/Common/Keyboard/MWMKeyboard.mm b/iphone/Maps/Common/Keyboard/MWMKeyboard.mm index 5e5cf70d39..5b062c4335 100644 --- a/iphone/Maps/Common/Keyboard/MWMKeyboard.mm +++ b/iphone/Maps/Common/Keyboard/MWMKeyboard.mm @@ -15,7 +15,7 @@ using TObservers = NSHashTable<__kindof TObserver>; @implementation MWMKeyboard -+ (void)applicationDidBecomeActive { [MWMKeyboard manager]; } ++ (void)applicationDidBecomeActive { [self manager]; } + (MWMKeyboard *)manager { static MWMKeyboard * manager; @@ -47,17 +47,17 @@ using TObservers = NSHashTable<__kindof TObserver>; } - (void)dealloc { [[NSNotificationCenter defaultCenter] removeObserver:self]; } -+ (CGFloat)keyboardHeight { return [MWMKeyboard manager].keyboardHeight; } ++ (CGFloat)keyboardHeight { return [self manager].keyboardHeight; } #pragma mark - Add/Remove Observers + (void)addObserver:(id)observer { - [[MWMKeyboard manager].observers addObject:observer]; + [[self manager].observers addObject:observer]; } + (void)removeObserver:(id)observer { - [[MWMKeyboard manager].observers removeObject:observer]; + [[self manager].observers removeObject:observer]; } #pragma mark - Notifications diff --git a/iphone/Maps/Common/Statistics/Statistics.mm b/iphone/Maps/Common/Statistics/Statistics.mm index 86fd4de84e..33117a97b5 100644 --- a/iphone/Maps/Common/Statistics/Statistics.mm +++ b/iphone/Maps/Common/Statistics/Statistics.mm @@ -128,7 +128,7 @@ void checkFlurryLogStatus(FlurryEventRecordStatus status) static dispatch_once_t onceToken; dispatch_once(&onceToken, ^ { - instance = [[Statistics alloc] init]; + instance = [[self alloc] init]; }); return instance; } diff --git a/iphone/Maps/Core/Location/MWMLocationManager.mm b/iphone/Maps/Core/Location/MWMLocationManager.mm index 76fa81fd52..670821adfe 100644 --- a/iphone/Maps/Core/Location/MWMLocationManager.mm +++ b/iphone/Maps/Core/Location/MWMLocationManager.mm @@ -202,7 +202,7 @@ void setPermissionRequested() + (void)addObserver:(TObserver)observer { runAsyncOnMainQueue(^{ - MWMLocationManager * manager = [MWMLocationManager manager]; + MWMLocationManager * manager = [self manager]; [manager.observers addObject:observer]; [manager processLocationUpdate:manager.lastLocationInfo]; }); @@ -211,7 +211,7 @@ void setPermissionRequested() + (void)removeObserver:(TObserver)observer { runAsyncOnMainQueue(^{ - [[MWMLocationManager manager].observers removeObject:observer]; + [[self manager].observers removeObject:observer]; }); } @@ -220,13 +220,13 @@ void setPermissionRequested() + (void)applicationDidBecomeActive { if (isPermissionRequested() || ![Alohalytics isFirstSession]) - [MWMLocationManager manager].started = YES; + [self manager].started = YES; } + (void)applicationWillResignActive { BOOL const keepRunning = isPermissionRequested() && keepRunningInBackground(); - MWMLocationManager * manager = [MWMLocationManager manager]; + MWMLocationManager * manager = [self manager]; CLLocationManager * locationManager = manager.locationManager; if ([locationManager respondsToSelector:@selector(setAllowsBackgroundLocationUpdates:)]) [locationManager setAllowsBackgroundLocationUpdates:keepRunning]; @@ -237,7 +237,7 @@ void setPermissionRequested() + (CLLocation *)lastLocation { - MWMLocationManager * manager = [MWMLocationManager manager]; + MWMLocationManager * manager = [self manager]; if (!manager.started || !manager.lastLocationInfo || manager.lastLocationInfo.horizontalAccuracy < 0 || manager.lastLocationStatus != location::TLocationError::ENoError) @@ -247,12 +247,12 @@ void setPermissionRequested() + (location::TLocationError)lastLocationStatus { - return [MWMLocationManager manager].lastLocationStatus; + return [self manager].lastLocationStatus; } + (CLHeading *)lastHeading { - MWMLocationManager * manager = [MWMLocationManager manager]; + MWMLocationManager * manager = [self manager]; if (!manager.started || !manager.lastHeadingInfo || manager.lastHeadingInfo.headingAccuracy < 0) return nil; return manager.lastHeadingInfo; @@ -337,7 +337,7 @@ void setPermissionRequested() + (void)setMyPositionMode:(location::EMyPositionMode)mode { - MWMLocationManager * manager = [MWMLocationManager manager]; + MWMLocationManager * manager = [self manager]; [manager.predictor setMyPositionMode:mode]; [manager processLocationStatus:manager.lastLocationStatus]; auto const & f = GetFramework(); diff --git a/iphone/Maps/Core/Routing/MWMRouter.mm b/iphone/Maps/Core/Routing/MWMRouter.mm index 820ac5e844..1da3740069 100644 --- a/iphone/Maps/Core/Routing/MWMRouter.mm +++ b/iphone/Maps/Core/Routing/MWMRouter.mm @@ -63,7 +63,7 @@ bool isMarkerPoint(MWMRoutePoint const & point) { return point.IsValid() && !poi + (BOOL)isTaxi { return GetFramework().GetRouter() == routing::RouterType::Taxi; } + (void)startRouting { - auto router = [MWMRouter router]; + auto router = [self router]; if (![self isTaxi]) { [router start]; @@ -88,7 +88,7 @@ bool isMarkerPoint(MWMRoutePoint const & point) { return point.IsValid() && !poi + (void)stopRouting { - [[MWMRouter router] stop]; + [[self router] stop]; [MWMNavigationDashboardManager manager].taxiDataSource = nil; } @@ -191,7 +191,7 @@ bool isMarkerPoint(MWMRoutePoint const & point) { return point.IsValid() && !poi auto const & startPoint = self.startPoint.Point(); auto const & finishPoint = self.finishPoint.Point(); // Taxi can't be used as best router. - if (bestRouter && ![MWMRouter isTaxi]) + if (bestRouter && ![[self class] isTaxi]) self.type = GetFramework().GetBestRouter(startPoint, finishPoint); f.BuildRoute(startPoint, finishPoint, isP2P, 0 /* timeoutSec */); f.SetRouteStartPoint(startPoint, isMarkerPoint(self.startPoint)); @@ -261,7 +261,7 @@ bool isMarkerPoint(MWMRoutePoint const & point) { return point.IsValid() && !poi - (void)doStop { // Don't save taxi routing type as default. - if ([MWMRouter isTaxi]) + if ([[self class] isTaxi]) GetFramework().SetRouter(routing::RouterType::Vehicle); [self clearAltitudeImagesData]; @@ -288,7 +288,7 @@ bool isMarkerPoint(MWMRoutePoint const & point) { return point.IsValid() && !poi - (void)routeAltitudeImageForSize:(CGSize)size completion:(MWMImageHeightBlock)block { dispatch_async(self.renderAltitudeImagesQueue, ^{ - if (![MWMRouter hasRouteAltitude]) + if (![[self class] hasRouteAltitude]) return; CGFloat const screenScale = [UIScreen mainScreen].scale; CGSize const scaledSize = {.width = size.width * screenScale, @@ -380,7 +380,7 @@ bool isMarkerPoint(MWMRoutePoint const & point) { return point.IsValid() && !poi else [mapViewControlsManager onRouteReady]; [self updateFollowingInfo]; - if (![MWMRouter isTaxi]) + if (![[self class] isTaxi]) [[MWMNavigationDashboardManager manager] setRouteBuilderProgress:100]; mapViewControlsManager.searchHidden = YES; @@ -409,7 +409,7 @@ bool isMarkerPoint(MWMRoutePoint const & point) { return point.IsValid() && !poi - (void)processRouteBuilderProgress:(CGFloat)progress { - if (![MWMRouter isTaxi]) + if (![[self class] isTaxi]) [[MWMNavigationDashboardManager manager] setRouteBuilderProgress:progress]; } @@ -433,14 +433,14 @@ bool isMarkerPoint(MWMRoutePoint const & point) { return point.IsValid() && !poi code:code cancelBlock:^{ if (code != routing::IRouter::NeedMoreMaps) - [[MWMRouter router] stop]; + [[[self class] router] stop]; } downloadBlock:^(storage::TCountriesVec const & downloadCountries, TMWMVoidBlock onSuccess) { [MWMStorage downloadNodes:downloadCountries onSuccess:onSuccess]; } downloadCompleteBlock:^{ - [[MWMRouter router] rebuildWithBestRouter:NO]; + [[[self class] router] rebuildWithBestRouter:NO]; }]; } else diff --git a/iphone/Maps/Core/Routing/MWMRouterSavedState.mm b/iphone/Maps/Core/Routing/MWMRouterSavedState.mm index 15d0138ced..423716b797 100644 --- a/iphone/Maps/Core/Routing/MWMRouterSavedState.mm +++ b/iphone/Maps/Core/Routing/MWMRouterSavedState.mm @@ -25,7 +25,7 @@ static NSString * const kETAKey = @"eta"; { _forceStateChange = MWMRouterForceStateChange::None; NSDictionary * const stateDict = - [NSDictionary dictionaryWithContentsOfURL:[MWMRouterSavedState stateFileURL]]; + [NSDictionary dictionaryWithContentsOfURL:[[self class] stateFileURL]]; if (stateDict) { m2::PointD point; @@ -58,12 +58,12 @@ static NSString * const kETAKey = @"eta"; NSGetSizeAndAlignment(@encode(m2::PointD), &size, nullptr); stateDict[kEndPointKey] = [NSData dataWithBytes:&endPoint length:size]; stateDict[kETAKey] = [NSDate dateWithTimeIntervalSinceNow:routeInfo.m_time]; - [stateDict writeToURL:[MWMRouterSavedState stateFileURL] atomically:YES]; + [stateDict writeToURL:[self stateFileURL] atomically:YES]; } + (void)remove { - [[NSFileManager defaultManager] removeItemAtURL:[MWMRouterSavedState stateFileURL] error:nil]; + [[NSFileManager defaultManager] removeItemAtURL:[self stateFileURL] error:nil]; } + (NSURL *)stateFileURL @@ -77,7 +77,7 @@ static NSString * const kETAKey = @"eta"; if (GetFramework().IsRoutingActive()) return; if ([MWMRouterSavedState state].forceStateChange == MWMRouterForceStateChange::None) - [MWMRouterSavedState remove]; + [self remove]; } @end diff --git a/iphone/Maps/UI/Editor/MWMEditorAdditionalNamesHeader.mm b/iphone/Maps/UI/Editor/MWMEditorAdditionalNamesHeader.mm index 0612758636..7be32891f9 100644 --- a/iphone/Maps/UI/Editor/MWMEditorAdditionalNamesHeader.mm +++ b/iphone/Maps/UI/Editor/MWMEditorAdditionalNamesHeader.mm @@ -14,7 +14,7 @@ + (instancetype)header:(TMWMVoidBlock)toggleBlock { - MWMEditorAdditionalNamesHeader * h = [[[NSBundle mainBundle] loadNibNamed:[MWMEditorAdditionalNamesHeader className] owner:nil options:nil] + MWMEditorAdditionalNamesHeader * h = [[[NSBundle mainBundle] loadNibNamed:[self className] owner:nil options:nil] firstObject]; h.label.localizedText = L(@"place_name").uppercaseString; h.toggleBlock = toggleBlock; diff --git a/iphone/Maps/UI/Editor/MWMEditorNotesFooter.mm b/iphone/Maps/UI/Editor/MWMEditorNotesFooter.mm index 3f5b4cfe5d..f636b4b4a6 100644 --- a/iphone/Maps/UI/Editor/MWMEditorNotesFooter.mm +++ b/iphone/Maps/UI/Editor/MWMEditorNotesFooter.mm @@ -10,7 +10,7 @@ + (instancetype)footerForController:(UIViewController *)controller { - MWMEditorNotesFooter * f = [[[NSBundle mainBundle] loadNibNamed:[MWMEditorNotesFooter className] owner:nil options:nil] + MWMEditorNotesFooter * f = [[[NSBundle mainBundle] loadNibNamed:[self className] owner:nil options:nil] firstObject]; f.controller = controller; [f setNeedsLayout]; diff --git a/iphone/Maps/UI/PlacePage/PlacePageLayout/ActionBar/MWMActionBarButton.mm b/iphone/Maps/UI/PlacePage/PlacePageLayout/ActionBar/MWMActionBarButton.mm index 83b707ed1d..1ec17cbabe 100644 --- a/iphone/Maps/UI/PlacePage/PlacePageLayout/ActionBar/MWMActionBarButton.mm +++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/ActionBar/MWMActionBarButton.mm @@ -120,7 +120,7 @@ NSString * titleForButton(EButton type, BOOL isSelected) { if (view.subviews.count) return; - MWMActionBarButton * button = [[[NSBundle mainBundle] loadNibNamed:[MWMActionBarButton className] owner:nil options:nil] firstObject]; + MWMActionBarButton * button = [[[NSBundle mainBundle] loadNibNamed:[self className] owner:nil options:nil] firstObject]; button.delegate = delegate; button.type = type; [view addSubview:button]; diff --git a/iphone/Maps/UI/Search/Filters/MWMSearchHotelsFilterViewController.mm b/iphone/Maps/UI/Search/Filters/MWMSearchHotelsFilterViewController.mm index a4bb84e8cd..7205f3b44d 100644 --- a/iphone/Maps/UI/Search/Filters/MWMSearchHotelsFilterViewController.mm +++ b/iphone/Maps/UI/Search/Filters/MWMSearchHotelsFilterViewController.mm @@ -75,7 +75,7 @@ void configButton(UIButton * button, NSString * primaryText, NSString * secondar + (MWMSearchHotelsFilterViewController *)controller { - NSString * identifier = [MWMSearchHotelsFilterViewController className]; + NSString * identifier = [self className]; return static_cast( [self controllerWithIdentifier:identifier]); } diff --git a/iphone/Maps/UI/Search/MWMSearchNoResults.mm b/iphone/Maps/UI/Search/MWMSearchNoResults.mm index e6c3696d64..73fdc78a37 100644 --- a/iphone/Maps/UI/Search/MWMSearchNoResults.mm +++ b/iphone/Maps/UI/Search/MWMSearchNoResults.mm @@ -21,7 +21,7 @@ CGFloat constexpr kExtraCompactHeight = 52; + (instancetype)viewWithImage:(UIImage *)image title:(NSString *)title text:(NSString *)text { MWMSearchNoResults * view = - [[[NSBundle mainBundle] loadNibNamed:[MWMSearchNoResults className] owner:nil options:nil] + [[[NSBundle mainBundle] loadNibNamed:[self className] owner:nil options:nil] firstObject]; view.image.image = image; if (title) From b06a0ff7c99bc55da3cd4c10a6b34014cbd81622 Mon Sep 17 00:00:00 2001 From: Ilya Grechuhin Date: Tue, 10 Jan 2017 17:18:31 +0300 Subject: [PATCH 14/14] =?UTF-8?q?[cleanup]=20[ios]=20Removed=20outdated=20?= =?UTF-8?q?what=E2=80=99s=20new=20controllers.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...MWhatsNewBookingBicycleRoutingController.h | 5 - ...WhatsNewBookingBicycleRoutingController.mm | 73 -- .../MWMWhatsNewDownloaderEditorController.h | 5 - .../MWMWhatsNewDownloaderEditorController.mm | 82 -- .../Welcome/MWMWhatsNewEditorController.h | 5 - .../Welcome/MWMWhatsNewEditorController.mm | 100 -- .../Welcome/MWMWhatsNewNavigationController.h | 5 - .../MWMWhatsNewNavigationController.mm | 76 -- .../Welcome/MWMWhatsNewNightModeController.h | 5 - .../Welcome/MWMWhatsNewNightModeController.mm | 65 - .../MWMWhatsNewProfileBookingController.h | 5 - .../MWMWhatsNewProfileBookingController.mm | 68 -- .../Welcome/MWMWhatsNewUberController.h | 5 - .../Welcome/MWMWhatsNewUberController.mm | 58 - .../Welcome/Welcome.storyboard | 1072 +---------------- iphone/Maps/Maps.xcodeproj/project.pbxproj | 70 -- 16 files changed, 1 insertion(+), 1698 deletions(-) delete mode 100644 iphone/Maps/Classes/CustomViews/MapViewControls/Welcome/MWMWhatsNewBookingBicycleRoutingController.h delete mode 100644 iphone/Maps/Classes/CustomViews/MapViewControls/Welcome/MWMWhatsNewBookingBicycleRoutingController.mm delete mode 100644 iphone/Maps/Classes/CustomViews/MapViewControls/Welcome/MWMWhatsNewDownloaderEditorController.h delete mode 100644 iphone/Maps/Classes/CustomViews/MapViewControls/Welcome/MWMWhatsNewDownloaderEditorController.mm delete mode 100644 iphone/Maps/Classes/CustomViews/MapViewControls/Welcome/MWMWhatsNewEditorController.h delete mode 100644 iphone/Maps/Classes/CustomViews/MapViewControls/Welcome/MWMWhatsNewEditorController.mm delete mode 100644 iphone/Maps/Classes/CustomViews/MapViewControls/Welcome/MWMWhatsNewNavigationController.h delete mode 100644 iphone/Maps/Classes/CustomViews/MapViewControls/Welcome/MWMWhatsNewNavigationController.mm delete mode 100644 iphone/Maps/Classes/CustomViews/MapViewControls/Welcome/MWMWhatsNewNightModeController.h delete mode 100644 iphone/Maps/Classes/CustomViews/MapViewControls/Welcome/MWMWhatsNewNightModeController.mm delete mode 100644 iphone/Maps/Classes/CustomViews/MapViewControls/Welcome/MWMWhatsNewProfileBookingController.h delete mode 100644 iphone/Maps/Classes/CustomViews/MapViewControls/Welcome/MWMWhatsNewProfileBookingController.mm delete mode 100644 iphone/Maps/Classes/CustomViews/MapViewControls/Welcome/MWMWhatsNewUberController.h delete mode 100644 iphone/Maps/Classes/CustomViews/MapViewControls/Welcome/MWMWhatsNewUberController.mm diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/Welcome/MWMWhatsNewBookingBicycleRoutingController.h b/iphone/Maps/Classes/CustomViews/MapViewControls/Welcome/MWMWhatsNewBookingBicycleRoutingController.h deleted file mode 100644 index 56a9442686..0000000000 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/Welcome/MWMWhatsNewBookingBicycleRoutingController.h +++ /dev/null @@ -1,5 +0,0 @@ -#import "MWMWelcomeController.h" - -@interface MWMWhatsNewBookingBicycleRoutingController : MWMWelcomeController - -@end diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/Welcome/MWMWhatsNewBookingBicycleRoutingController.mm b/iphone/Maps/Classes/CustomViews/MapViewControls/Welcome/MWMWhatsNewBookingBicycleRoutingController.mm deleted file mode 100644 index 60acbf1099..0000000000 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/Welcome/MWMWhatsNewBookingBicycleRoutingController.mm +++ /dev/null @@ -1,73 +0,0 @@ -#import "MWMPageController.h" -#import "MWMWhatsNewBookingBicycleRoutingController.h" - -@interface MWMWhatsNewBookingBicycleRoutingController () - -@property (weak, nonatomic) IBOutlet UIView * containerView; -@property (weak, nonatomic) IBOutlet UIImageView * image; -@property (weak, nonatomic) IBOutlet UILabel * alertTitle; -@property (weak, nonatomic) IBOutlet UILabel * alertText; -@property (weak, nonatomic) IBOutlet UIButton * nextPageButton; -@property (weak, nonatomic) IBOutlet NSLayoutConstraint * containerWidth; -@property (weak, nonatomic) IBOutlet NSLayoutConstraint * containerHeight; - -@property (weak, nonatomic) IBOutlet NSLayoutConstraint * imageMinHeight; -@property (weak, nonatomic) IBOutlet NSLayoutConstraint * imageHeight; - -@property (weak, nonatomic) IBOutlet NSLayoutConstraint * titleTopOffset; -@property (weak, nonatomic) IBOutlet NSLayoutConstraint * titleImageOffset; - -@end - -namespace -{ -NSArray * pagesConfigBlocks = @[ - [^(MWMWhatsNewBookingBicycleRoutingController * controller) { - controller.image.image = [UIImage imageNamed:@"img_booking"]; - controller.alertTitle.text = L(@"whatsnew_booking_header"); - controller.alertText.text = L(@"whatsnew_booking_message"); - controller.nextPageButton.hidden = YES; - } copy], - [^(MWMWhatsNewBookingBicycleRoutingController * controller) { - controller.image.image = [UIImage imageNamed:@"img_bikecycle_navigation"]; - controller.alertTitle.text = L(@"whatsnew_cycle_navigation_header"); - controller.alertText.text = L(@"whatsnew_cycle_navigation_message"); - controller.nextPageButton.hidden = YES; - } copy] -]; - -} // namespace - -@implementation MWMWhatsNewBookingBicycleRoutingController - -+ (NSString *)udWelcomeWasShownKey -{ - return @"WhatsNewBookingBicycleRoutingWasShown"; -} - -+ (NSArray *)pagesConfig -{ - return pagesConfigBlocks; -} - -- (IBAction)close -{ - [self.pageController close]; -} - -#pragma mark - Properties - -- (void)setSize:(CGSize)size -{ - super.size = size; - CGSize const newSize = super.size; - CGFloat const width = newSize.width; - CGFloat const height = newSize.height; - BOOL const hideImage = (self.imageHeight.multiplier * height <= self.imageMinHeight.constant); - self.titleImageOffset.priority = hideImage ? UILayoutPriorityDefaultLow : UILayoutPriorityDefaultHigh; - self.image.hidden = hideImage; - self.containerWidth.constant = width; - self.containerHeight.constant = height; -} - -@end diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/Welcome/MWMWhatsNewDownloaderEditorController.h b/iphone/Maps/Classes/CustomViews/MapViewControls/Welcome/MWMWhatsNewDownloaderEditorController.h deleted file mode 100644 index ea988b01a9..0000000000 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/Welcome/MWMWhatsNewDownloaderEditorController.h +++ /dev/null @@ -1,5 +0,0 @@ -#import "MWMWelcomeController.h" - -@interface MWMWhatsNewDownloaderEditorController : MWMWelcomeController - -@end diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/Welcome/MWMWhatsNewDownloaderEditorController.mm b/iphone/Maps/Classes/CustomViews/MapViewControls/Welcome/MWMWhatsNewDownloaderEditorController.mm deleted file mode 100644 index d96666ff5e..0000000000 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/Welcome/MWMWhatsNewDownloaderEditorController.mm +++ /dev/null @@ -1,82 +0,0 @@ -#import "MWMPageController.h" -#import "MWMWhatsNewDownloaderEditorController.h" - -@interface MWMWhatsNewDownloaderEditorController () - -@property (weak, nonatomic) IBOutlet UIView * containerView; -@property (weak, nonatomic) IBOutlet UIImageView * image; -@property (weak, nonatomic) IBOutlet UILabel * alertTitle; -@property (weak, nonatomic) IBOutlet UILabel * alertText; -@property (weak, nonatomic) IBOutlet UIButton * nextPageButton; -@property (weak, nonatomic) IBOutlet NSLayoutConstraint * containerWidth; -@property (weak, nonatomic) IBOutlet NSLayoutConstraint * containerHeight; - -@property (weak, nonatomic) IBOutlet NSLayoutConstraint * imageMinHeight; -@property (weak, nonatomic) IBOutlet NSLayoutConstraint * imageHeight; - -@property (weak, nonatomic) IBOutlet NSLayoutConstraint * titleTopOffset; -@property (weak, nonatomic) IBOutlet NSLayoutConstraint * titleImageOffset; - -@end - -namespace -{ -NSArray * pagesConfigBlocks = @[ - [^(MWMWhatsNewDownloaderEditorController * controller) { - controller.image.image = [UIImage imageNamed:@"img_whatsnew_migration"]; - controller.alertTitle.text = L(@"whatsnew_smallmwm_header"); - controller.alertText.text = L(@"whatsnew_smallmwm_message"); - [controller.nextPageButton setTitle:L(@"whats_new_next_button") forState:UIControlStateNormal]; - [controller.nextPageButton addTarget:controller.pageController - action:@selector(nextPage) - forControlEvents:UIControlEventTouchUpInside]; - } copy], - [^(MWMWhatsNewDownloaderEditorController * controller) { - controller.image.image = [UIImage imageNamed:@"img_whatsnew_editdata"]; - controller.alertTitle.text = L(@"whatsnew_editor_title"); - controller.alertText.text = [NSString stringWithFormat:@"%@\n\n%@", L(@"whatsnew_editor_message_1"), L(@"whatsnew_editor_message_2")]; - [controller.nextPageButton setTitle:L(@"whats_new_next_button") forState:UIControlStateNormal]; - [controller.nextPageButton addTarget:controller.pageController - action:@selector(nextPage) - forControlEvents:UIControlEventTouchUpInside]; - } copy], - [^(MWMWhatsNewDownloaderEditorController * controller) { - controller.image.image = [UIImage imageNamed:@"img_whatsnew_update_search"]; - controller.alertTitle.text = L(@"whatsnew_search_header"); - controller.alertText.text = L(@"whatsnew_search_message"); - [controller.nextPageButton setTitle:L(@"done") forState:UIControlStateNormal]; - [controller.nextPageButton addTarget:controller.pageController - action:@selector(close) - forControlEvents:UIControlEventTouchUpInside]; - } copy] -]; -} // namespace - -@implementation MWMWhatsNewDownloaderEditorController - -+ (NSString *)udWelcomeWasShownKey -{ - return @"WhatsNewWithDownloaderEditorSearchWasShown"; -} - -+ (NSArray *)pagesConfig -{ - return pagesConfigBlocks; -} - -#pragma mark - Properties - -- (void)setSize:(CGSize)size -{ - super.size = size; - CGSize const newSize = super.size; - CGFloat const width = newSize.width; - CGFloat const height = newSize.height; - BOOL const hideImage = (self.imageHeight.multiplier * height <= self.imageMinHeight.constant); - self.titleImageOffset.priority = hideImage ? UILayoutPriorityDefaultLow : UILayoutPriorityDefaultHigh; - self.image.hidden = hideImage; - self.containerWidth.constant = width; - self.containerHeight.constant = height; -} - -@end diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/Welcome/MWMWhatsNewEditorController.h b/iphone/Maps/Classes/CustomViews/MapViewControls/Welcome/MWMWhatsNewEditorController.h deleted file mode 100644 index bf21eebd23..0000000000 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/Welcome/MWMWhatsNewEditorController.h +++ /dev/null @@ -1,5 +0,0 @@ -#import "MWMWelcomeController.h" - -@interface MWMWhatsNewEditorController : MWMWelcomeController - -@end diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/Welcome/MWMWhatsNewEditorController.mm b/iphone/Maps/Classes/CustomViews/MapViewControls/Welcome/MWMWhatsNewEditorController.mm deleted file mode 100644 index 52288b14ce..0000000000 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/Welcome/MWMWhatsNewEditorController.mm +++ /dev/null @@ -1,100 +0,0 @@ -#import "MapsAppDelegate.h" -#import "MapViewController.h" -#import "MWMPageController.h" -#import "MWMWhatsNewEditorController.h" - -#include "platform/local_country_file_utils.hpp" - -@interface MWMWhatsNewEditorController () - -@property (weak, nonatomic) IBOutlet UIView * containerView; -@property (weak, nonatomic) IBOutlet UIImageView * image; -@property (weak, nonatomic) IBOutlet UILabel * alertTitle; -@property (weak, nonatomic) IBOutlet UILabel * alertText; -@property (weak, nonatomic) IBOutlet UIButton * primaryButton; -@property (weak, nonatomic) IBOutlet UIButton * secondaryButton; -@property (weak, nonatomic) IBOutlet NSLayoutConstraint * containerWidth; -@property (weak, nonatomic) IBOutlet NSLayoutConstraint * containerHeight; - -@property (weak, nonatomic) IBOutlet NSLayoutConstraint * imageMinHeight; -@property (weak, nonatomic) IBOutlet NSLayoutConstraint * imageHeight; - -@property (weak, nonatomic) IBOutlet NSLayoutConstraint * titleTopOffset; -@property (weak, nonatomic) IBOutlet NSLayoutConstraint * titleImageOffset; - -@property (weak, nonatomic) IBOutlet NSLayoutConstraint * buttonsSpacing; - -@end - -namespace -{ -NSArray * pagesConfigBlocks = @[ - [^(MWMWhatsNewEditorController * controller) { - controller.image.image = [UIImage imageNamed:@"img_editor_upd"]; - controller.alertTitle.text = L(@"whatsnew_update_editor_title"); - MWMPageController * pageController = controller.pageController; - if (platform::migrate::NeedMigrate()) - { - controller.alertText.text = - [NSString stringWithFormat:@"%@\n\n%@", L(@"whatsnew_update_editor_message"), - L(@"whatsnew_update_editor_message_update")]; - [controller.primaryButton setTitle:L(@"downloader_update_all_button") - forState:UIControlStateNormal]; - [controller.primaryButton addTarget:controller - action:@selector(openMigration) - forControlEvents:UIControlEventTouchUpInside]; - [controller.secondaryButton setTitle:L(@"not_now") - forState:UIControlStateNormal]; - [controller.secondaryButton addTarget:pageController - action:@selector(close) - forControlEvents:UIControlEventTouchUpInside]; - } - else - { - controller.alertText.text = L(@"whatsnew_update_editor_message"); - controller.secondaryButton.hidden = YES; - controller.buttonsSpacing.priority = UILayoutPriorityDefaultLow; - [controller.primaryButton setTitle:L(@"done") - forState:UIControlStateNormal]; - [controller.primaryButton addTarget:pageController - action:@selector(close) - forControlEvents:UIControlEventTouchUpInside]; - } - } copy] -]; -} // namespace - -@implementation MWMWhatsNewEditorController - -+ (NSString *)udWelcomeWasShownKey -{ - return @"WhatsNewWithEditorWasShown"; -} - -+ (NSArray *)pagesConfig -{ - return pagesConfigBlocks; -} - -- (void)openMigration -{ - [self.pageController close]; - [[MapViewController controller] openMigration]; -} - -#pragma mark - Properties - -- (void)setSize:(CGSize)size -{ - super.size = size; - CGSize const newSize = super.size; - CGFloat const width = newSize.width; - CGFloat const height = newSize.height; - BOOL const hideImage = (self.imageHeight.multiplier * height <= self.imageMinHeight.constant); - self.titleImageOffset.priority = hideImage ? UILayoutPriorityDefaultLow : UILayoutPriorityDefaultHigh; - self.image.hidden = hideImage; - self.containerWidth.constant = width; - self.containerHeight.constant = height; -} - -@end diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/Welcome/MWMWhatsNewNavigationController.h b/iphone/Maps/Classes/CustomViews/MapViewControls/Welcome/MWMWhatsNewNavigationController.h deleted file mode 100644 index a68cdcc76f..0000000000 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/Welcome/MWMWhatsNewNavigationController.h +++ /dev/null @@ -1,5 +0,0 @@ -#import "MWMWelcomeController.h" - -@interface MWMWhatsNewNavigationController : MWMWelcomeController - -@end diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/Welcome/MWMWhatsNewNavigationController.mm b/iphone/Maps/Classes/CustomViews/MapViewControls/Welcome/MWMWhatsNewNavigationController.mm deleted file mode 100644 index 7518dc7b6c..0000000000 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/Welcome/MWMWhatsNewNavigationController.mm +++ /dev/null @@ -1,76 +0,0 @@ -#import "MWMWhatsNewNavigationController.h" -#import "MWMPageController.h" - -@interface MWMWhatsNewNavigationController () - -@property(weak, nonatomic) IBOutlet UIView * containerView; -@property(weak, nonatomic) IBOutlet UIImageView * image; -@property(weak, nonatomic) IBOutlet UILabel * alertTitle; -@property(weak, nonatomic) IBOutlet UILabel * alertText; -@property(weak, nonatomic) IBOutlet UIButton * nextPageButton; -@property(weak, nonatomic) IBOutlet NSLayoutConstraint * containerWidth; -@property(weak, nonatomic) IBOutlet NSLayoutConstraint * containerHeight; - -@property(weak, nonatomic) IBOutlet NSLayoutConstraint * imageMinHeight; -@property(weak, nonatomic) IBOutlet NSLayoutConstraint * imageHeight; - -@property(weak, nonatomic) IBOutlet NSLayoutConstraint * titleTopOffset; -@property(weak, nonatomic) IBOutlet NSLayoutConstraint * titleImageOffset; - -@end - -namespace -{ -NSArray * pagesConfigBlocks = @[ - [^(MWMWhatsNewNavigationController * controller) { - controller.image.image = [UIImage imageNamed:@"img_whatsnew_car_navigation"]; - controller.alertTitle.text = L(@"whatsnew_car_navigation_header"); - controller.alertText.text = L(@"whatsnew_car_navigation_message"); - [controller.nextPageButton setTitle:L(@"whats_new_next_button") forState:UIControlStateNormal]; - [controller.nextPageButton addTarget:controller.pageController - action:@selector(nextPage) - forControlEvents:UIControlEventTouchUpInside]; - } copy], - [^(MWMWhatsNewNavigationController * controller) { - controller.image.image = [UIImage imageNamed:@"img_whatsnew_cycle_navigation_improved"]; - controller.alertTitle.text = L(@"whatsnew_cycle_navigation_2_header"); - controller.alertText.text = L(@"whatsnew_cycle_navigation_2_message"); - [controller.nextPageButton setTitle:L(@"whats_new_next_button") forState:UIControlStateNormal]; - [controller.nextPageButton addTarget:controller.pageController - action:@selector(nextPage) - forControlEvents:UIControlEventTouchUpInside]; - } copy], - [^(MWMWhatsNewNavigationController * controller) { - controller.image.image = [UIImage imageNamed:@"img_whatsnew_booking_improved"]; - controller.alertTitle.text = L(@"whatsnew_booking_2_header"); - controller.alertText.text = L(@"whatsnew_booking_2_message"); - [controller.nextPageButton setTitle:L(@"done") forState:UIControlStateNormal]; - [controller.nextPageButton addTarget:controller.pageController - action:@selector(close) - forControlEvents:UIControlEventTouchUpInside]; - } copy] -]; -} // namespace - -@implementation MWMWhatsNewNavigationController - -+ (NSString *)udWelcomeWasShownKey { return @"WhatsNewWithNavigationWasShown"; } -+ (NSArray *)pagesConfig { return pagesConfigBlocks; } -- (IBAction)close { [self.pageController close]; } -#pragma mark - Properties - -- (void)setSize:(CGSize)size -{ - super.size = size; - CGSize const newSize = super.size; - CGFloat const width = newSize.width; - CGFloat const height = newSize.height; - BOOL const hideImage = (self.imageHeight.multiplier * height <= self.imageMinHeight.constant); - self.titleImageOffset.priority = - hideImage ? UILayoutPriorityDefaultLow : UILayoutPriorityDefaultHigh; - self.image.hidden = hideImage; - self.containerWidth.constant = width; - self.containerHeight.constant = height; -} - -@end diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/Welcome/MWMWhatsNewNightModeController.h b/iphone/Maps/Classes/CustomViews/MapViewControls/Welcome/MWMWhatsNewNightModeController.h deleted file mode 100644 index e45cbd9b39..0000000000 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/Welcome/MWMWhatsNewNightModeController.h +++ /dev/null @@ -1,5 +0,0 @@ -#import "MWMWelcomeController.h" - -@interface MWMWhatsNewNightModeController : MWMWelcomeController - -@end diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/Welcome/MWMWhatsNewNightModeController.mm b/iphone/Maps/Classes/CustomViews/MapViewControls/Welcome/MWMWhatsNewNightModeController.mm deleted file mode 100644 index 6336f37379..0000000000 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/Welcome/MWMWhatsNewNightModeController.mm +++ /dev/null @@ -1,65 +0,0 @@ -#import "MWMPageController.h" -#import "MWMWhatsNewNightModeController.h" - -@interface MWMWhatsNewNightModeController () - -@property (weak, nonatomic) IBOutlet UIView * containerView; -@property (weak, nonatomic) IBOutlet UIImageView * image; -@property (weak, nonatomic) IBOutlet UILabel * alertTitle; -@property (weak, nonatomic) IBOutlet UILabel * alertText; -@property (weak, nonatomic) IBOutlet UIButton * nextPageButton; -@property (weak, nonatomic) IBOutlet NSLayoutConstraint * containerWidth; -@property (weak, nonatomic) IBOutlet NSLayoutConstraint * containerHeight; - -@property (weak, nonatomic) IBOutlet NSLayoutConstraint * imageMinHeight; -@property (weak, nonatomic) IBOutlet NSLayoutConstraint * imageHeight; - -@property (weak, nonatomic) IBOutlet NSLayoutConstraint * titleTopOffset; -@property (weak, nonatomic) IBOutlet NSLayoutConstraint * titleImageOffset; - -@end - -namespace -{ -NSArray * pagesConfigBlocks = @[ - [^(MWMWhatsNewNightModeController * controller) - { - controller.image.image = [UIImage imageNamed:@"img_nightmode"]; - controller.alertTitle.text = L(@"whats_new_night_caption"); - controller.alertText.text = L(@"whats_new_night_body"); - [controller.nextPageButton setTitle:L(@"done") forState:UIControlStateNormal]; - [controller.nextPageButton addTarget:controller.pageController - action:@selector(close) - forControlEvents:UIControlEventTouchUpInside]; - } copy] -]; -} // namespace - -@implementation MWMWhatsNewNightModeController - -+ (NSString *)udWelcomeWasShownKey -{ - return @"WhatsNewWithNightModeWasShown"; -} - -+ (NSArray *)pagesConfig -{ - return pagesConfigBlocks; -} - -#pragma mark - Properties - -- (void)setSize:(CGSize)size -{ - super.size = size; - CGSize const newSize = super.size; - CGFloat const width = newSize.width; - CGFloat const height = newSize.height; - BOOL const hideImage = (self.imageHeight.multiplier * height <= self.imageMinHeight.constant); - self.titleImageOffset.priority = hideImage ? UILayoutPriorityDefaultLow : UILayoutPriorityDefaultHigh; - self.image.hidden = hideImage; - self.containerWidth.constant = width; - self.containerHeight.constant = height; -} - -@end diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/Welcome/MWMWhatsNewProfileBookingController.h b/iphone/Maps/Classes/CustomViews/MapViewControls/Welcome/MWMWhatsNewProfileBookingController.h deleted file mode 100644 index 99a345c269..0000000000 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/Welcome/MWMWhatsNewProfileBookingController.h +++ /dev/null @@ -1,5 +0,0 @@ -#import "MWMWelcomeController.h" - -@interface MWMWhatsNewProfileBookingController : MWMWelcomeController - -@end diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/Welcome/MWMWhatsNewProfileBookingController.mm b/iphone/Maps/Classes/CustomViews/MapViewControls/Welcome/MWMWhatsNewProfileBookingController.mm deleted file mode 100644 index f24c1cb611..0000000000 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/Welcome/MWMWhatsNewProfileBookingController.mm +++ /dev/null @@ -1,68 +0,0 @@ -#import "MWMWhatsNewProfileBookingController.h" -#import "MWMPageController.h" - -@interface MWMWhatsNewProfileBookingController () - -@property(weak, nonatomic) IBOutlet UIView * containerView; -@property(weak, nonatomic) IBOutlet UIImageView * image; -@property(weak, nonatomic) IBOutlet UILabel * alertTitle; -@property(weak, nonatomic) IBOutlet UILabel * alertText; -@property(weak, nonatomic) IBOutlet UIButton * nextPageButton; -@property(weak, nonatomic) IBOutlet NSLayoutConstraint * containerWidth; -@property(weak, nonatomic) IBOutlet NSLayoutConstraint * containerHeight; - -@property(weak, nonatomic) IBOutlet NSLayoutConstraint * imageMinHeight; -@property(weak, nonatomic) IBOutlet NSLayoutConstraint * imageHeight; - -@property(weak, nonatomic) IBOutlet NSLayoutConstraint * titleTopOffset; -@property(weak, nonatomic) IBOutlet NSLayoutConstraint * titleImageOffset; - -@end - -namespace -{ -NSArray * pagesConfigBlocks = @[ - [^(MWMWhatsNewProfileBookingController * controller) { - controller.image.image = [UIImage imageNamed:@"img_whatsnew_route_profile"]; - controller.alertTitle.text = L(@"whats_new_route_profile_title"); - controller.alertText.text = L(@"whats_new_route_profile_message"); - [controller.nextPageButton setTitle:L(@"whats_new_next_button") forState:UIControlStateNormal]; - [controller.nextPageButton addTarget:controller.pageController - action:@selector(nextPage) - forControlEvents:UIControlEventTouchUpInside]; - } copy], - [^(MWMWhatsNewProfileBookingController * controller) { - controller.image.image = [UIImage imageNamed:@"img_whatsnew_booking_improved"]; - controller.alertTitle.text = L(@"whats_new_booking_improve_title"); - controller.alertText.text = L(@"whats_new_booking_improve_message"); - [controller.nextPageButton setTitle:L(@"done") forState:UIControlStateNormal]; - [controller.nextPageButton addTarget:controller.pageController - action:@selector(close) - forControlEvents:UIControlEventTouchUpInside]; - } copy] -]; - -} // namespace - -@implementation MWMWhatsNewProfileBookingController - -+ (NSString *)udWelcomeWasShownKey { return @"WhatsNewProfileBookingWasShown"; } -+ (NSArray *)pagesConfig { return pagesConfigBlocks; } -- (IBAction)close { [self.pageController close]; } -#pragma mark - Properties - -- (void)setSize:(CGSize)size -{ - super.size = size; - CGSize const newSize = super.size; - CGFloat const width = newSize.width; - CGFloat const height = newSize.height; - BOOL const hideImage = (self.imageHeight.multiplier * height <= self.imageMinHeight.constant); - self.titleImageOffset.priority = - hideImage ? UILayoutPriorityDefaultLow : UILayoutPriorityDefaultHigh; - self.image.hidden = hideImage; - self.containerWidth.constant = width; - self.containerHeight.constant = height; -} - -@end diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/Welcome/MWMWhatsNewUberController.h b/iphone/Maps/Classes/CustomViews/MapViewControls/Welcome/MWMWhatsNewUberController.h deleted file mode 100644 index 94793e1535..0000000000 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/Welcome/MWMWhatsNewUberController.h +++ /dev/null @@ -1,5 +0,0 @@ -#import "MWMWelcomeController.h" - -@interface MWMWhatsNewUberController : MWMWelcomeController - -@end diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/Welcome/MWMWhatsNewUberController.mm b/iphone/Maps/Classes/CustomViews/MapViewControls/Welcome/MWMWhatsNewUberController.mm deleted file mode 100644 index 9ea8b7f7ff..0000000000 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/Welcome/MWMWhatsNewUberController.mm +++ /dev/null @@ -1,58 +0,0 @@ -#import "MWMWhatsNewUberController.h" -#import "MWMPageController.h" - -@interface MWMWhatsNewUberController () - -@property(weak, nonatomic) IBOutlet UIView * containerView; -@property(weak, nonatomic) IBOutlet UIImageView * image; -@property(weak, nonatomic) IBOutlet UILabel * alertTitle; -@property(weak, nonatomic) IBOutlet UILabel * alertText; -@property(weak, nonatomic) IBOutlet UIButton * nextPageButton; -@property(weak, nonatomic) IBOutlet NSLayoutConstraint * containerWidth; -@property(weak, nonatomic) IBOutlet NSLayoutConstraint * containerHeight; - -@property(weak, nonatomic) IBOutlet NSLayoutConstraint * imageMinHeight; -@property(weak, nonatomic) IBOutlet NSLayoutConstraint * imageHeight; - -@property(weak, nonatomic) IBOutlet NSLayoutConstraint * titleTopOffset; -@property(weak, nonatomic) IBOutlet NSLayoutConstraint * titleImageOffset; - -@end - -namespace -{ - NSArray * pagesConfigBlocks = @[ - [^(MWMWhatsNewUberController * controller) { - controller.image.image = [UIImage imageNamed:@"img_whatsnew_uber"]; - controller.alertTitle.text = L(@"whatsnew_uber_header"); - controller.alertText.text = L(@"whatsnew_uber_message"); - [controller.nextPageButton setTitle:L(@"done") forState:UIControlStateNormal]; - [controller.nextPageButton addTarget:controller.pageController - action:@selector(close) - forControlEvents:UIControlEventTouchUpInside]; - } copy]]; - -} // namespace - -@implementation MWMWhatsNewUberController - -+ (NSString *)udWelcomeWasShownKey { return @"MWMWhatsNewUberController"; } -+ (NSArray *)pagesConfig { return pagesConfigBlocks; } -- (IBAction)close { [self.pageController close]; } -#pragma mark - Properties - -- (void)setSize:(CGSize)size -{ - super.size = size; - CGSize const newSize = super.size; - CGFloat const width = newSize.width; - CGFloat const height = newSize.height; - BOOL const hideImage = (self.imageHeight.multiplier * height <= self.imageMinHeight.constant); - self.titleImageOffset.priority = - hideImage ? UILayoutPriorityDefaultLow : UILayoutPriorityDefaultHigh; - self.image.hidden = hideImage; - self.containerWidth.constant = width; - self.containerHeight.constant = height; -} - -@end diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/Welcome/Welcome.storyboard b/iphone/Maps/Classes/CustomViews/MapViewControls/Welcome/Welcome.storyboard index 37826ff66e..0df830f1f2 100644 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/Welcome/Welcome.storyboard +++ b/iphone/Maps/Classes/CustomViews/MapViewControls/Welcome/Welcome.storyboard @@ -1,5 +1,5 @@ - + @@ -16,151 +16,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -310,311 +165,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -623,626 +173,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/iphone/Maps/Maps.xcodeproj/project.pbxproj b/iphone/Maps/Maps.xcodeproj/project.pbxproj index 106a6e4f8b..d62b0c8368 100644 --- a/iphone/Maps/Maps.xcodeproj/project.pbxproj +++ b/iphone/Maps/Maps.xcodeproj/project.pbxproj @@ -245,24 +245,10 @@ 34A759B81DC795090078C3AE /* MWMPageControllerDataSource.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34A759B61DC795090078C3AE /* MWMPageControllerDataSource.mm */; }; 34A759C91DC795140078C3AE /* MWMFirstLaunchController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34A759BA1DC795140078C3AE /* MWMFirstLaunchController.mm */; }; 34A759CA1DC795140078C3AE /* MWMWelcomeController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34A759BC1DC795140078C3AE /* MWMWelcomeController.mm */; }; - 34A759CB1DC795140078C3AE /* MWMWhatsNewBookingBicycleRoutingController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34A759BE1DC795140078C3AE /* MWMWhatsNewBookingBicycleRoutingController.mm */; }; - 34A759CC1DC795140078C3AE /* MWMWhatsNewDownloaderEditorController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34A759C01DC795140078C3AE /* MWMWhatsNewDownloaderEditorController.mm */; }; - 34A759CD1DC795140078C3AE /* MWMWhatsNewEditorController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34A759C21DC795140078C3AE /* MWMWhatsNewEditorController.mm */; }; - 34A759CE1DC795140078C3AE /* MWMWhatsNewNavigationController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34A759C41DC795140078C3AE /* MWMWhatsNewNavigationController.mm */; }; - 34A759CF1DC795140078C3AE /* MWMWhatsNewNightModeController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34A759C61DC795140078C3AE /* MWMWhatsNewNightModeController.mm */; }; - 34A759D01DC795140078C3AE /* MWMWhatsNewProfileBookingController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34A759C81DC795140078C3AE /* MWMWhatsNewProfileBookingController.mm */; }; 34A759D21DC7953A0078C3AE /* Welcome.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 34A759D11DC7953A0078C3AE /* Welcome.storyboard */; }; - 34A759D81DC795D10078C3AE /* MWMWhatsNewUberController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34A759D71DC795D10078C3AE /* MWMWhatsNewUberController.mm */; }; - 34A759D91DC795D10078C3AE /* MWMWhatsNewUberController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34A759D71DC795D10078C3AE /* MWMWhatsNewUberController.mm */; }; 34A759DA1DC797790078C3AE /* MWMFirstLaunchController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34A759BA1DC795140078C3AE /* MWMFirstLaunchController.mm */; }; 34A759DB1DC797830078C3AE /* Welcome.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 34A759D11DC7953A0078C3AE /* Welcome.storyboard */; }; 34A759DC1DC797880078C3AE /* MWMWelcomeController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34A759BC1DC795140078C3AE /* MWMWelcomeController.mm */; }; - 34A759DD1DC7978E0078C3AE /* MWMWhatsNewBookingBicycleRoutingController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34A759BE1DC795140078C3AE /* MWMWhatsNewBookingBicycleRoutingController.mm */; }; - 34A759DE1DC797920078C3AE /* MWMWhatsNewDownloaderEditorController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34A759C01DC795140078C3AE /* MWMWhatsNewDownloaderEditorController.mm */; }; - 34A759DF1DC797960078C3AE /* MWMWhatsNewEditorController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34A759C21DC795140078C3AE /* MWMWhatsNewEditorController.mm */; }; - 34A759E01DC797990078C3AE /* MWMWhatsNewNavigationController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34A759C41DC795140078C3AE /* MWMWhatsNewNavigationController.mm */; }; - 34A759E11DC7979C0078C3AE /* MWMWhatsNewNightModeController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34A759C61DC795140078C3AE /* MWMWhatsNewNightModeController.mm */; }; - 34A759E21DC797A00078C3AE /* MWMWhatsNewProfileBookingController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34A759C81DC795140078C3AE /* MWMWhatsNewProfileBookingController.mm */; }; 34A759E31DC797CB0078C3AE /* MWMPageController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34A759B41DC795090078C3AE /* MWMPageController.mm */; }; 34A759E41DC797CE0078C3AE /* MWMPageControllerDataSource.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34A759B61DC795090078C3AE /* MWMPageControllerDataSource.mm */; }; 34AB39C11D2BD8310021857D /* MWMStopButton.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34AB39C01D2BD8310021857D /* MWMStopButton.mm */; }; @@ -581,7 +567,6 @@ 849CF6841DE842290024A8A5 /* MWMShareActivityItem.mm in Sources */ = {isa = PBXBuildFile; fileRef = 340837151B72451A00B5C185 /* MWMShareActivityItem.mm */; }; 849CF6891DE842290024A8A5 /* MWMFacebookAlert.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6BC1E511ACBF98600EF0360 /* MWMFacebookAlert.mm */; }; 849CF68A1DE842290024A8A5 /* MWMDefaultAlert.mm in Sources */ = {isa = PBXBuildFile; fileRef = F64F198B1AB81A00006EAF7E /* MWMDefaultAlert.mm */; }; - 849CF68B1DE842290024A8A5 /* MWMWhatsNewDownloaderEditorController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34A759C01DC795140078C3AE /* MWMWhatsNewDownloaderEditorController.mm */; }; 849CF6911DE842290024A8A5 /* MWMSideButtons.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3490D2DA1CE9DD2500D0B838 /* MWMSideButtons.mm */; }; 849CF6971DE842290024A8A5 /* MapsAppDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1D3623250D0F684500981E51 /* MapsAppDelegate.mm */; }; 849CF6981DE842290024A8A5 /* MWMAPIBarView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 341522BE1B666A550077AA8F /* MWMAPIBarView.mm */; }; @@ -601,7 +586,6 @@ 849CF6C31DE842290024A8A5 /* MWMEditorViralAlert.mm in Sources */ = {isa = PBXBuildFile; fileRef = F64D9C9E1C899C350063FA30 /* MWMEditorViralAlert.mm */; }; 849CF6C61DE842290024A8A5 /* MWMInputPasswordValidator.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34ABA62B1C2D57D500FE1BEC /* MWMInputPasswordValidator.mm */; }; 849CF6C71DE842290024A8A5 /* MWMAuthorizationOSMLoginViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34ABA6151C2D185B00FE1BEC /* MWMAuthorizationOSMLoginViewController.mm */; }; - 849CF6CB1DE842290024A8A5 /* MWMWhatsNewNightModeController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34A759C61DC795140078C3AE /* MWMWhatsNewNightModeController.mm */; }; 849CF6CC1DE842290024A8A5 /* MWMLocationAlert.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6BBF2C51B4FFB72000CF8E2 /* MWMLocationAlert.mm */; }; 849CF6CE1DE842290024A8A5 /* MWMPlaceDoesntExistAlert.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6FE3C371CC50FFD00A73196 /* MWMPlaceDoesntExistAlert.mm */; }; 849CF6CF1DE842290024A8A5 /* MWMAlertViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = F64F19821AB81A00006EAF7E /* MWMAlertViewController.mm */; }; @@ -611,7 +595,6 @@ 849CF6D81DE842290024A8A5 /* MWMSegue.mm in Sources */ = {isa = PBXBuildFile; fileRef = F607C18D1C047FDC00B53A87 /* MWMSegue.mm */; }; 849CF6D91DE842290024A8A5 /* Framework.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 34479C751C60C6130065D261 /* Framework.cpp */; }; 849CF6DC1DE842290024A8A5 /* MWMRoutePreview.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6BD337E1B62403B00F2CE18 /* MWMRoutePreview.mm */; }; - 849CF6DD1DE842290024A8A5 /* MWMWhatsNewNavigationController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34A759C41DC795140078C3AE /* MWMWhatsNewNavigationController.mm */; }; 849CF6DE1DE842290024A8A5 /* MWMRoutePointLayout.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6BB6CC21BB1860D00DF1DF2 /* MWMRoutePointLayout.mm */; }; 849CF6DF1DE842290024A8A5 /* MWMAuthorizationCommon.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34BF0CC51C31304A00D097EB /* MWMAuthorizationCommon.mm */; }; 849CF6E11DE842290024A8A5 /* MWMDownloaderDialogHeader.mm in Sources */ = {isa = PBXBuildFile; fileRef = F64F4B731B4A45FD0081A24A /* MWMDownloaderDialogHeader.mm */; }; @@ -624,7 +607,6 @@ 849CF6F61DE842290024A8A5 /* MWMNavigationDashboardEntity.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6BD33861B62412E00F2CE18 /* MWMNavigationDashboardEntity.mm */; }; 849CF6FB1DE842290024A8A5 /* BookmarksVC.mm in Sources */ = {isa = PBXBuildFile; fileRef = FA36B80615403A4F004560CC /* BookmarksVC.mm */; }; 849CF6FC1DE842290024A8A5 /* MWMSideButtonsView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3490D2DC1CE9DD2500D0B838 /* MWMSideButtonsView.mm */; }; - 849CF7051DE842290024A8A5 /* MWMWhatsNewUberController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34A759D71DC795D10078C3AE /* MWMWhatsNewUberController.mm */; }; 849CF7071DE842290024A8A5 /* LocaleTranslator.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6381BF41CD12045004CA943 /* LocaleTranslator.mm */; }; 849CF70A1DE842290024A8A5 /* MWMTaxiPreviewDataSource.mm in Sources */ = {isa = PBXBuildFile; fileRef = F68FCB841DA7BBA6007CC7D7 /* MWMTaxiPreviewDataSource.mm */; }; 849CF70D1DE842290024A8A5 /* MWMAddPlaceNavigationBar.mm in Sources */ = {isa = PBXBuildFile; fileRef = F653CE151C71F60200A453F1 /* MWMAddPlaceNavigationBar.mm */; }; @@ -652,7 +634,6 @@ 849CF7461DE842290024A8A5 /* MWMTableViewCell.mm in Sources */ = {isa = PBXBuildFile; fileRef = F626D52D1C3E6CAA00C17D15 /* MWMTableViewCell.mm */; }; 849CF7471DE842290024A8A5 /* MWMDownloaderDialogCell.mm in Sources */ = {isa = PBXBuildFile; fileRef = F64F4B6C1B46A51F0081A24A /* MWMDownloaderDialogCell.mm */; }; 849CF74C1DE842290024A8A5 /* MWMLocationNotFoundAlert.mm in Sources */ = {isa = PBXBuildFile; fileRef = 346B42AA1DD5E3D20094EBEE /* MWMLocationNotFoundAlert.mm */; }; - 849CF74F1DE842290024A8A5 /* MWMWhatsNewProfileBookingController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34A759C81DC795140078C3AE /* MWMWhatsNewProfileBookingController.mm */; }; 849CF7561DE842290024A8A5 /* MWMRoutingDisclaimerAlert.mm in Sources */ = {isa = PBXBuildFile; fileRef = F63774E91B59376F00BCF54D /* MWMRoutingDisclaimerAlert.mm */; }; 849CF7581DE842290024A8A5 /* MWMDownloadTransitMapAlert.mm in Sources */ = {isa = PBXBuildFile; fileRef = F64F19971AB81A00006EAF7E /* MWMDownloadTransitMapAlert.mm */; }; 849CF75C1DE842290024A8A5 /* MWMNavigationView.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6BD33831B6240F200F2CE18 /* MWMNavigationView.mm */; }; @@ -661,13 +642,11 @@ 849CF7621DE842290024A8A5 /* MWMBottomMenuView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 349C26B81BB04ED30005DF2F /* MWMBottomMenuView.mm */; }; 849CF7631DE842290024A8A5 /* MWMAlert.mm in Sources */ = {isa = PBXBuildFile; fileRef = F64F19861AB81A00006EAF7E /* MWMAlert.mm */; }; 849CF7651DE842290024A8A5 /* ColorPickerView.mm in Sources */ = {isa = PBXBuildFile; fileRef = ED48BBB417C267F5003E7E92 /* ColorPickerView.mm */; }; - 849CF7661DE842290024A8A5 /* MWMWhatsNewBookingBicycleRoutingController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34A759BE1DC795140078C3AE /* MWMWhatsNewBookingBicycleRoutingController.mm */; }; 849CF7671DE842290024A8A5 /* CircleView.mm in Sources */ = {isa = PBXBuildFile; fileRef = ED48BBB917C2B1E2003E7E92 /* CircleView.mm */; }; 849CF7691DE842290024A8A5 /* MWMTaxiPreviewCell.mm in Sources */ = {isa = PBXBuildFile; fileRef = F68FCB881DA7BD20007CC7D7 /* MWMTaxiPreviewCell.mm */; }; 849CF76C1DE842290024A8A5 /* MWMWelcomeController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34A759BC1DC795140078C3AE /* MWMWelcomeController.mm */; }; 849CF76D1DE842290024A8A5 /* AddSetTableViewCell.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34D15BA61BD8F93C00C8BCBE /* AddSetTableViewCell.mm */; }; 849CF76E1DE842290024A8A5 /* MWMEditorViralActivityItem.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6A218481CA3F26800BE2CC6 /* MWMEditorViralActivityItem.mm */; }; - 849CF7711DE842290024A8A5 /* MWMWhatsNewEditorController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34A759C21DC795140078C3AE /* MWMWhatsNewEditorController.mm */; }; 849CF7741DE842290024A8A5 /* SafariServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F659FC691CF35C24000A06B1 /* SafariServices.framework */; settings = {ATTRIBUTES = (Weak, ); }; }; 849CF7751DE842290024A8A5 /* libc++.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 845C89331C8983F300940D7F /* libc++.tbd */; }; 849CF7761DE842290024A8A5 /* CoreSpotlight.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 34BF68621D7459E6001752F6 /* CoreSpotlight.framework */; settings = {ATTRIBUTES = (Weak, ); }; }; @@ -1598,21 +1577,7 @@ 34A759BA1DC795140078C3AE /* MWMFirstLaunchController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMFirstLaunchController.mm; sourceTree = ""; }; 34A759BB1DC795140078C3AE /* MWMWelcomeController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMWelcomeController.h; sourceTree = ""; }; 34A759BC1DC795140078C3AE /* MWMWelcomeController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMWelcomeController.mm; sourceTree = ""; }; - 34A759BD1DC795140078C3AE /* MWMWhatsNewBookingBicycleRoutingController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMWhatsNewBookingBicycleRoutingController.h; sourceTree = ""; }; - 34A759BE1DC795140078C3AE /* MWMWhatsNewBookingBicycleRoutingController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMWhatsNewBookingBicycleRoutingController.mm; sourceTree = ""; }; - 34A759BF1DC795140078C3AE /* MWMWhatsNewDownloaderEditorController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMWhatsNewDownloaderEditorController.h; sourceTree = ""; }; - 34A759C01DC795140078C3AE /* MWMWhatsNewDownloaderEditorController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMWhatsNewDownloaderEditorController.mm; sourceTree = ""; }; - 34A759C11DC795140078C3AE /* MWMWhatsNewEditorController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMWhatsNewEditorController.h; sourceTree = ""; }; - 34A759C21DC795140078C3AE /* MWMWhatsNewEditorController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMWhatsNewEditorController.mm; sourceTree = ""; }; - 34A759C31DC795140078C3AE /* MWMWhatsNewNavigationController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMWhatsNewNavigationController.h; sourceTree = ""; }; - 34A759C41DC795140078C3AE /* MWMWhatsNewNavigationController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMWhatsNewNavigationController.mm; sourceTree = ""; }; - 34A759C51DC795140078C3AE /* MWMWhatsNewNightModeController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMWhatsNewNightModeController.h; sourceTree = ""; }; - 34A759C61DC795140078C3AE /* MWMWhatsNewNightModeController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMWhatsNewNightModeController.mm; sourceTree = ""; }; - 34A759C71DC795140078C3AE /* MWMWhatsNewProfileBookingController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMWhatsNewProfileBookingController.h; sourceTree = ""; }; - 34A759C81DC795140078C3AE /* MWMWhatsNewProfileBookingController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMWhatsNewProfileBookingController.mm; sourceTree = ""; }; 34A759D11DC7953A0078C3AE /* Welcome.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = Welcome.storyboard; sourceTree = ""; }; - 34A759D61DC795D10078C3AE /* MWMWhatsNewUberController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMWhatsNewUberController.h; sourceTree = ""; }; - 34A759D71DC795D10078C3AE /* MWMWhatsNewUberController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMWhatsNewUberController.mm; sourceTree = ""; }; 34AB39BF1D2BD8310021857D /* MWMStopButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMStopButton.h; sourceTree = ""; }; 34AB39C01D2BD8310021857D /* MWMStopButton.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMStopButton.mm; sourceTree = ""; }; 34ABA6141C2D185B00FE1BEC /* MWMAuthorizationOSMLoginViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMAuthorizationOSMLoginViewController.h; sourceTree = ""; }; @@ -3260,20 +3225,6 @@ 34A759BA1DC795140078C3AE /* MWMFirstLaunchController.mm */, 34A759BB1DC795140078C3AE /* MWMWelcomeController.h */, 34A759BC1DC795140078C3AE /* MWMWelcomeController.mm */, - 34A759BD1DC795140078C3AE /* MWMWhatsNewBookingBicycleRoutingController.h */, - 34A759BE1DC795140078C3AE /* MWMWhatsNewBookingBicycleRoutingController.mm */, - 34A759BF1DC795140078C3AE /* MWMWhatsNewDownloaderEditorController.h */, - 34A759C01DC795140078C3AE /* MWMWhatsNewDownloaderEditorController.mm */, - 34A759C11DC795140078C3AE /* MWMWhatsNewEditorController.h */, - 34A759C21DC795140078C3AE /* MWMWhatsNewEditorController.mm */, - 34A759C31DC795140078C3AE /* MWMWhatsNewNavigationController.h */, - 34A759C41DC795140078C3AE /* MWMWhatsNewNavigationController.mm */, - 34A759C51DC795140078C3AE /* MWMWhatsNewNightModeController.h */, - 34A759C61DC795140078C3AE /* MWMWhatsNewNightModeController.mm */, - 34A759C71DC795140078C3AE /* MWMWhatsNewProfileBookingController.h */, - 34A759C81DC795140078C3AE /* MWMWhatsNewProfileBookingController.mm */, - 34A759D61DC795D10078C3AE /* MWMWhatsNewUberController.h */, - 34A759D71DC795D10078C3AE /* MWMWhatsNewUberController.mm */, 341966841E000CDD00F96327 /* MWMWhatsNewTrafficController.h */, 341966851E000CDD00F96327 /* MWMWhatsNewTrafficController.mm */, ); @@ -4750,7 +4701,6 @@ F6E2FF5C1E097BA00083EBEC /* MWMRecentTrackSettingsController.mm in Sources */, F6E2FDE81E097BA00083EBEC /* MWMObjectsCategorySelectorController.mm in Sources */, F64F199D1AB81A00006EAF7E /* MWMDefaultAlert.mm in Sources */, - 34A759CC1DC795140078C3AE /* MWMWhatsNewDownloaderEditorController.mm in Sources */, F6E2FEC01E097BA00083EBEC /* MWMConsole.mm in Sources */, 3490D2DE1CE9DD2500D0B838 /* MWMSideButtons.mm in Sources */, F6E2FDF71E097BA00083EBEC /* MWMOpeningHoursAllDayTableViewCell.mm in Sources */, @@ -4807,7 +4757,6 @@ F6E2FEDE1E097BA00083EBEC /* MWMSearchManager+Layout.mm in Sources */, 3454D7D31E07F045004AF2AD /* UIImageView+Coloring.mm in Sources */, 3463BA661DE81DB90082417F /* MWMTrafficButtonViewController.mm in Sources */, - 34A759CF1DC795140078C3AE /* MWMWhatsNewNightModeController.mm in Sources */, F6BBF2C61B4FFB72000CF8E2 /* MWMLocationAlert.mm in Sources */, F6E2FDA01E097BA00083EBEC /* MWMEditorAdditionalNamesTableViewController.mm in Sources */, F6FE3C381CC50FFD00A73196 /* MWMPlaceDoesntExistAlert.mm in Sources */, @@ -4835,7 +4784,6 @@ F6E2FE241E097BA00083EBEC /* MWMOpeningHoursModel.mm in Sources */, F6BD33811B62403B00F2CE18 /* MWMRoutePreview.mm in Sources */, F6E2FD8B1E097BA00083EBEC /* MWMNoMapsView.mm in Sources */, - 34A759CE1DC795140078C3AE /* MWMWhatsNewNavigationController.mm in Sources */, F6BB6CC31BB1860D00DF1DF2 /* MWMRoutePointLayout.mm in Sources */, F6E2FD701E097BA00083EBEC /* MWMMapDownloaderTableViewCell.mm in Sources */, F6E2FE4E1E097BA00083EBEC /* MWMActionBarButton.mm in Sources */, @@ -4875,7 +4823,6 @@ F6E2FE391E097BA00083EBEC /* MWMMigrationView.mm in Sources */, F6E2FF3B1E097BA00083EBEC /* MWMSearchTableView.mm in Sources */, F6E2FF651E097BA00083EBEC /* MWMTTSSettingsViewController.mm in Sources */, - 34A759D81DC795D10078C3AE /* MWMWhatsNewUberController.mm in Sources */, F6381BF51CD12045004CA943 /* LocaleTranslator.mm in Sources */, 340475551E081A4600C92850 /* Statistics.mm in Sources */, F68FCB851DA7BBA6007CC7D7 /* MWMTaxiPreviewDataSource.mm in Sources */, @@ -4950,7 +4897,6 @@ 340475761E081A4600C92850 /* MWMTrafficManager.mm in Sources */, 3400AB381E02E8CE004036E2 /* MWMTableViewCell+CellId.swift in Sources */, 346B42AB1DD5E3D20094EBEE /* MWMLocationNotFoundAlert.mm in Sources */, - 34A759D01DC795140078C3AE /* MWMWhatsNewProfileBookingController.mm in Sources */, F6E2FF021E097BA00083EBEC /* MWMSearchHistoryClearCell.mm in Sources */, F63774EA1B59376F00BCF54D /* MWMRoutingDisclaimerAlert.mm in Sources */, 340475081E08199E00C92850 /* MWMMyTarget.mm in Sources */, @@ -4971,7 +4917,6 @@ F64F199B1AB81A00006EAF7E /* MWMAlert.mm in Sources */, ED48BBB517C267F5003E7E92 /* ColorPickerView.mm in Sources */, F6E2FF561E097BA00083EBEC /* MWMMobileInternetViewController.mm in Sources */, - 34A759CB1DC795140078C3AE /* MWMWhatsNewBookingBicycleRoutingController.mm in Sources */, ED48BBBA17C2B1E2003E7E92 /* CircleView.mm in Sources */, F6E2FEEA1E097BA00083EBEC /* MWMSearchTextField.mm in Sources */, F68FCB8A1DA7BD20007CC7D7 /* MWMTaxiPreviewCell.mm in Sources */, @@ -4984,7 +4929,6 @@ F6E2FED51E097BA00083EBEC /* MWMSearchChangeModeView.mm in Sources */, F6A218491CA3F26800BE2CC6 /* MWMEditorViralActivityItem.mm in Sources */, 34845DB21E165E24003D55B9 /* SearchNoResultsViewController.swift in Sources */, - 34A759CD1DC795140078C3AE /* MWMWhatsNewEditorController.mm in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -5039,7 +4983,6 @@ 6741A9C01BF340DE002C974C /* MWMTextView.mm in Sources */, F6E2FDB61E097BA00083EBEC /* MWMEditorAdditionalNamesHeader.mm in Sources */, F6E2FDC81E097BA00083EBEC /* MWMEditorNotesFooter.mm in Sources */, - 34A759E01DC797990078C3AE /* MWMWhatsNewNavigationController.mm in Sources */, F6E2FD651E097BA00083EBEC /* MWMMapDownloaderPlaceTableViewCell.mm in Sources */, 340475681E081A4600C92850 /* MWMRouterSavedState.mm in Sources */, F6E2FF2D1E097BA00083EBEC /* MWMSearchCell.mm in Sources */, @@ -5052,7 +4995,6 @@ F653CE191C71F62700A453F1 /* MWMAddPlaceNavigationBar.mm in Sources */, 340475621E081A4600C92850 /* MWMNetworkPolicy.mm in Sources */, F6E2FEE51E097BA00083EBEC /* MWMSearchNoResults.mm in Sources */, - 34A759D91DC795D10078C3AE /* MWMWhatsNewUberController.mm in Sources */, F6E2FF631E097BA00083EBEC /* MWMTTSLanguageViewController.mm in Sources */, 342EE4121C43DAA7009F6A49 /* MWMAuthorizationWebViewLoginViewController.mm in Sources */, 34479C7D1C60C6130065D261 /* MWMFrameworkListener.mm in Sources */, @@ -5060,7 +5002,6 @@ 34845DAF1E1649F6003D55B9 /* DownloaderNoResultsEmbedViewController.swift in Sources */, F6791B141C43DF0B007A8A6E /* MWMStartButton.mm in Sources */, F6E2FEDF1E097BA00083EBEC /* MWMSearchManager+Layout.mm in Sources */, - 34A759DF1DC797960078C3AE /* MWMWhatsNewEditorController.mm in Sources */, F64D9CA01C899C350063FA30 /* MWMEditorViralAlert.mm in Sources */, 6741A9CF1BF340DE002C974C /* MWMLocationAlert.mm in Sources */, 34ABA62D1C2D57D500FE1BEC /* MWMInputPasswordValidator.mm in Sources */, @@ -5169,8 +5110,6 @@ F6E2FDBC1E097BA00083EBEC /* MWMEditorAdditionalNameTableViewCell.mm in Sources */, F6E2FF4B1E097BA00083EBEC /* SettingsTableViewSwitchCell.swift in Sources */, F6E2FE791E097BA00083EBEC /* MWMOpeningHoursLayoutHelper.mm in Sources */, - 34A759DD1DC7978E0078C3AE /* MWMWhatsNewBookingBicycleRoutingController.mm in Sources */, - 34A759DE1DC797920078C3AE /* MWMWhatsNewDownloaderEditorController.mm in Sources */, F6B97B271CD0CA990009B612 /* MWMBookmarkNameCell.mm in Sources */, 34ABA6211C2D517500FE1BEC /* MWMInputValidator.mm in Sources */, F6E2FD7D1E097BA00083EBEC /* MWMMapDownloaderExtendedDataSource.mm in Sources */, @@ -5199,7 +5138,6 @@ F6E2FEFD1E097BA00083EBEC /* MWMSearchCategoryCell.mm in Sources */, 3454D7BF1E07F045004AF2AD /* DateComponentsFormatter+ETA.swift in Sources */, 6741AA1C1BF340DE002C974C /* MWMRoutingDisclaimerAlert.mm in Sources */, - 34A759E21DC797A00078C3AE /* MWMWhatsNewProfileBookingController.mm in Sources */, F6E2FE971E097BA00083EBEC /* ContextViews.mm in Sources */, 6741AA1D1BF340DE002C974C /* MWMDownloadTransitMapAlert.mm in Sources */, 3400AB391E02E8CE004036E2 /* MWMTableViewCell+CellId.swift in Sources */, @@ -5212,7 +5150,6 @@ 3404754D1E081A4600C92850 /* MWMKeyboard.mm in Sources */, 34EF94291C05A6F30050B714 /* MWMSegue.mm in Sources */, F6E2FDA71E097BA00083EBEC /* MWMButtonCell.mm in Sources */, - 34A759E11DC7979C0078C3AE /* MWMWhatsNewNightModeController.mm in Sources */, F6E2FEF11E097BA00083EBEC /* MWMSearchBookmarksCell.mm in Sources */, F6E2FE731E097BA00083EBEC /* MWMOpeningHours.mm in Sources */, 6741AA251BF340DE002C974C /* MWMBottomMenuView.mm in Sources */, @@ -5264,7 +5201,6 @@ F6E2FEC21E097BA00083EBEC /* MWMConsole.mm in Sources */, 845E4B1C1DEC839800D6BED8 /* MWMTrafficButtonViewController.mm in Sources */, F6E2FDF91E097BA00083EBEC /* MWMOpeningHoursAllDayTableViewCell.mm in Sources */, - 849CF68B1DE842290024A8A5 /* MWMWhatsNewDownloaderEditorController.mm in Sources */, F6E2FE1A1E097BA00083EBEC /* MWMOpeningHoursTimeSpanTableViewCell.mm in Sources */, F6E2FDED1E097BA00083EBEC /* MWMOpeningHoursAddClosedTableViewCell.mm in Sources */, F6E2FE111E097BA00083EBEC /* MWMOpeningHoursTableViewCell.mm in Sources */, @@ -5317,7 +5253,6 @@ F6E2FEE01E097BA00083EBEC /* MWMSearchManager+Layout.mm in Sources */, 849CF6C61DE842290024A8A5 /* MWMInputPasswordValidator.mm in Sources */, 849CF6C71DE842290024A8A5 /* MWMAuthorizationOSMLoginViewController.mm in Sources */, - 849CF6CB1DE842290024A8A5 /* MWMWhatsNewNightModeController.mm in Sources */, 849CF6CC1DE842290024A8A5 /* MWMLocationAlert.mm in Sources */, F6E2FDA21E097BA00083EBEC /* MWMEditorAdditionalNamesTableViewController.mm in Sources */, 849CF6CE1DE842290024A8A5 /* MWMPlaceDoesntExistAlert.mm in Sources */, @@ -5350,7 +5285,6 @@ F6E2FD721E097BA00083EBEC /* MWMMapDownloaderTableViewCell.mm in Sources */, F6E2FE501E097BA00083EBEC /* MWMActionBarButton.mm in Sources */, 849CF6DC1DE842290024A8A5 /* MWMRoutePreview.mm in Sources */, - 849CF6DD1DE842290024A8A5 /* MWMWhatsNewNavigationController.mm in Sources */, F6E2FD781E097BA00083EBEC /* MWMMapDownloaderDataSource.mm in Sources */, 849CF6DE1DE842290024A8A5 /* MWMRoutePointLayout.mm in Sources */, 849CF6DF1DE842290024A8A5 /* MWMAuthorizationCommon.mm in Sources */, @@ -5389,7 +5323,6 @@ 849CF6FB1DE842290024A8A5 /* BookmarksVC.mm in Sources */, 849CF6FC1DE842290024A8A5 /* MWMSideButtonsView.mm in Sources */, 3454D7C01E07F045004AF2AD /* DateComponentsFormatter+ETA.swift in Sources */, - 849CF7051DE842290024A8A5 /* MWMWhatsNewUberController.mm in Sources */, F6E2FE9B1E097BA00083EBEC /* MWMiPadPlacePageLayoutImpl.mm in Sources */, 849CF7071DE842290024A8A5 /* LocaleTranslator.mm in Sources */, 340475821E081B3300C92850 /* iosOGLContextFactory.mm in Sources */, @@ -5463,7 +5396,6 @@ 849CF74C1DE842290024A8A5 /* MWMLocationNotFoundAlert.mm in Sources */, F6E2FF041E097BA00083EBEC /* MWMSearchHistoryClearCell.mm in Sources */, 340475541E081A4600C92850 /* MWMCustomFacebookEvents.mm in Sources */, - 849CF74F1DE842290024A8A5 /* MWMWhatsNewProfileBookingController.mm in Sources */, 3404750A1E08199E00C92850 /* MWMMyTarget.mm in Sources */, 849CF7561DE842290024A8A5 /* MWMRoutingDisclaimerAlert.mm in Sources */, F6E2FDA81E097BA00083EBEC /* MWMButtonCell.mm in Sources */, @@ -5482,7 +5414,6 @@ 849CF7631DE842290024A8A5 /* MWMAlert.mm in Sources */, F6E2FF581E097BA00083EBEC /* MWMMobileInternetViewController.mm in Sources */, 849CF7651DE842290024A8A5 /* ColorPickerView.mm in Sources */, - 849CF7661DE842290024A8A5 /* MWMWhatsNewBookingBicycleRoutingController.mm in Sources */, F6E2FEEC1E097BA00083EBEC /* MWMSearchTextField.mm in Sources */, 3454D7DE1E07F045004AF2AD /* UISwitch+RuntimeAttributes.m in Sources */, 849CF7671DE842290024A8A5 /* CircleView.mm in Sources */, @@ -5494,7 +5425,6 @@ F6E2FED71E097BA00083EBEC /* MWMSearchChangeModeView.mm in Sources */, 849CF76E1DE842290024A8A5 /* MWMEditorViralActivityItem.mm in Sources */, 34845DB41E165E24003D55B9 /* SearchNoResultsViewController.swift in Sources */, - 849CF7711DE842290024A8A5 /* MWMWhatsNewEditorController.mm in Sources */, ); runOnlyForDeploymentPostprocessing = 0; };