From e529fa71276895bef349017e5e79fccf4bcf08f1 Mon Sep 17 00:00:00 2001 From: VladiMihaylenko Date: Fri, 29 Jan 2016 18:49:45 +0300 Subject: [PATCH] [ios] Optimized iOS version checking. --- iphone/Maps/Categories/UIKitCategories.mm | 4 ++-- iphone/Maps/Classes/Common.h | 3 +++ .../CustomAlert/AlertController/MWMAlertViewController.mm | 7 +++---- iphone/Maps/Classes/CustomAlert/BaseAlert/MWMAlert.mm | 2 +- .../PedestrianShareAlert/MWMPedestrianShareAlert.mm | 2 +- .../RoutingDisclaimerAlert/MWMRoutingDisclaimerAlert.mm | 4 ++-- .../Login/MWMAuthorizationLoginViewController.mm | 2 +- .../CustomViews/MapViewControls/APIBar/MWMAPIBar.mm | 4 ++-- .../MapViewControls/BottomMenu/MWMBottomMenuView.mm | 4 ++-- .../TabbedView/HistoryTab/MWMSearchHistoryRequestCell.mm | 2 +- .../Search/TableView/MWMSearchCommonCell.mm | 2 +- .../Views/Dashboard/MWMNavigationDashboard.mm | 2 +- iphone/Maps/Classes/EAGLView.mm | 2 +- iphone/Maps/Classes/MWMSegue.mm | 2 +- iphone/Maps/Classes/MapViewController.mm | 8 ++++---- iphone/Maps/Classes/MapsAppDelegate.mm | 2 +- iphone/Maps/Platform/LocationManager.mm | 2 +- iphone/Maps/Settings/SettingsViewController.mm | 2 +- iphone/Maps/ViewController.mm | 2 +- 19 files changed, 30 insertions(+), 28 deletions(-) diff --git a/iphone/Maps/Categories/UIKitCategories.mm b/iphone/Maps/Categories/UIKitCategories.mm index ea3734d70f..0cca579ba9 100644 --- a/iphone/Maps/Categories/UIKitCategories.mm +++ b/iphone/Maps/Categories/UIKitCategories.mm @@ -138,7 +138,7 @@ - (void)rateVersionFrom:(NSString *)launchPlaceName { - NSString * urlString = isIOSVersionLessThan(8) ? + NSString * urlString = isIOS7 ? [NSString stringWithFormat:@"itms-apps://itunes.apple.com/app/id510623322?mt=8&at=1l3v7ya&ct=%@", launchPlaceName] : @"itms-apps://itunes.apple.com/WebObjects/MZStore.woa/wa/viewContentsUserReviews?id=510623322&onlyLatestVersion=true&pageNumber=0&sortOrdering=1&type=Purple+Software"; [self openURL:[NSURL URLWithString:urlString]]; @@ -306,7 +306,7 @@ - (void)makeImageAlwaysTemplate { - if (isIOSVersionLessThan(8)) + if (isIOS7) self.image = [self.image imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate]; } diff --git a/iphone/Maps/Classes/Common.h b/iphone/Maps/Classes/Common.h index 1af14cdf67..3d597537e5 100644 --- a/iphone/Maps/Classes/Common.h +++ b/iphone/Maps/Classes/Common.h @@ -59,6 +59,9 @@ static inline BOOL isIOSVersionLessThan(NSUInteger version) return isIOSVersionLessThan([NSString stringWithFormat:@"%@", @(version)]); } +static BOOL const isIOS7 = isIOSVersionLessThan(8); +static BOOL const isIOS8 = !isIOS7 && isIOSVersionLessThan(9); + static uint64_t const KB = 1024; static uint64_t const MB = 1024 * 1024; diff --git a/iphone/Maps/Classes/CustomAlert/AlertController/MWMAlertViewController.mm b/iphone/Maps/Classes/CustomAlert/AlertController/MWMAlertViewController.mm index d0965fb959..4b49479010 100644 --- a/iphone/Maps/Classes/CustomAlert/AlertController/MWMAlertViewController.mm +++ b/iphone/Maps/Classes/CustomAlert/AlertController/MWMAlertViewController.mm @@ -38,7 +38,7 @@ static NSString * const kAlertControllerNibIdentifier = @"MWMAlertViewController NSString * title = L(@"location_is_disabled_long_text"); NSString * cancel = L(@"cancel"); NSString * openSettings = L(@"settings"); - if (isIOSVersionLessThan(8)) + if (isIOS7) { UIAlertView * alertView = [[UIAlertView alloc] initWithTitle:title message:nil delegate:nil cancelButtonTitle:cancel otherButtonTitles:nil]; [alertView show]; @@ -121,12 +121,11 @@ static NSString * const kAlertControllerNibIdentifier = @"MWMAlertViewController - (void)displayAlert:(MWMAlert *)alert { - BOOL const iOS7 = isIOSVersionLessThan(8); alert.alertController = self; [self.ownerViewController addChildViewController:self]; self.view.alpha = 0.; alert.alpha = 0.; - if (!iOS7) + if (!isIOS7) { CGFloat const scale = 1.1; alert.transform = CGAffineTransformMakeScale(scale, scale); @@ -135,7 +134,7 @@ static NSString * const kAlertControllerNibIdentifier = @"MWMAlertViewController { self.view.alpha = 1.; alert.alpha = 1.; - if (!iOS7) + if (!isIOS7) alert.transform = CGAffineTransformIdentity; }]; } diff --git a/iphone/Maps/Classes/CustomAlert/BaseAlert/MWMAlert.mm b/iphone/Maps/Classes/CustomAlert/BaseAlert/MWMAlert.mm index bcfbecaef2..296a726402 100644 --- a/iphone/Maps/Classes/CustomAlert/BaseAlert/MWMAlert.mm +++ b/iphone/Maps/Classes/CustomAlert/BaseAlert/MWMAlert.mm @@ -132,7 +132,7 @@ - (void)rotate:(UIInterfaceOrientation)toInterfaceOrientation duration:(NSTimeInterval)duration { - if (isIOSVersionLessThan(8) && [self respondsToSelector:@selector(setTransform:)]) + if (isIOS7 && [self respondsToSelector:@selector(setTransform:)]) { [UIView animateWithDuration:duration animations:^ { diff --git a/iphone/Maps/Classes/CustomAlert/PedestrianShareAlert/MWMPedestrianShareAlert.mm b/iphone/Maps/Classes/CustomAlert/PedestrianShareAlert/MWMPedestrianShareAlert.mm index c8538a7cf3..54e77cea14 100644 --- a/iphone/Maps/Classes/CustomAlert/PedestrianShareAlert/MWMPedestrianShareAlert.mm +++ b/iphone/Maps/Classes/CustomAlert/PedestrianShareAlert/MWMPedestrianShareAlert.mm @@ -53,7 +53,7 @@ static NSString * const kStatisticsEvent = @"Pedestrian Share Alert"; [[Statistics instance] logEvent:kStatisticsEvent withParameters:@{kStatAction : kStatApply}]; [Alohalytics logEvent:kStatisticsEvent withValue:@"shareTap"]; MWMActivityViewController * shareVC = [MWMActivityViewController shareControllerForPedestrianRoutesToast]; - if (IPAD && !isIOSVersionLessThan(8)) + if (IPAD && !isIOS7) { shareVC.completionWithItemsHandler = ^(NSString * activityType, BOOL completed, NSArray * returnedItems, NSError * activityError) diff --git a/iphone/Maps/Classes/CustomAlert/RoutingDisclaimerAlert/MWMRoutingDisclaimerAlert.mm b/iphone/Maps/Classes/CustomAlert/RoutingDisclaimerAlert/MWMRoutingDisclaimerAlert.mm index 8d612ae5b9..79db2d6ddb 100644 --- a/iphone/Maps/Classes/CustomAlert/RoutingDisclaimerAlert/MWMRoutingDisclaimerAlert.mm +++ b/iphone/Maps/Classes/CustomAlert/RoutingDisclaimerAlert/MWMRoutingDisclaimerAlert.mm @@ -36,7 +36,7 @@ static NSString * const kStatisticsEvent = @"Routing Disclaimer Alert"; [alert.textView sizeToFit]; UIWindow * window = UIApplication.sharedApplication.keyWindow; CGFloat height; - if (isIOSVersionLessThan(8)) + if (isIOS7) height = UIInterfaceOrientationIsLandscape(orientation) ? window.width : window.height; else height = window.height; @@ -67,7 +67,7 @@ static NSString * const kStatisticsEvent = @"Routing Disclaimer Alert"; - (CGFloat)bounded:(CGFloat)f withHeight:(CGFloat)h { CGFloat const currentHeight = [self.subviews.firstObject height]; - CGFloat const maximumHeight = h - (isIOSVersionLessThan(8) ? 4. : 2.) * kMinimumOffset; + CGFloat const maximumHeight = h - (isIOS7 ? 4. : 2.) * kMinimumOffset; CGFloat const availableHeight = maximumHeight - currentHeight; return MIN(f, availableHeight + self.textViewHeight.constant); } diff --git a/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationLoginViewController.mm b/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationLoginViewController.mm index 980fa42724..110e0e9f2e 100644 --- a/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationLoginViewController.mm +++ b/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationLoginViewController.mm @@ -236,7 +236,7 @@ using namespace osm; { NSString * cancel = L(@"cancel"); NSString * del = L(@"delete"); - if (isIOSVersionLessThan(8)) + if (isIOS7) { UIActionSheet * actionSheet = [[UIActionSheet alloc] initWithTitle:nil delegate:self cancelButtonTitle:cancel destructiveButtonTitle:del otherButtonTitles:nil]; [actionSheet showInView:self.view]; diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/APIBar/MWMAPIBar.mm b/iphone/Maps/Classes/CustomViews/MapViewControls/APIBar/MWMAPIBar.mm index a4dccde010..6d354f6c6a 100644 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/APIBar/MWMAPIBar.mm +++ b/iphone/Maps/Classes/CustomViews/MapViewControls/APIBar/MWMAPIBar.mm @@ -68,7 +68,7 @@ static NSString * const kKeyPath = @"subviews"; - (BOOL)isVisible { - if (isIOSVersionLessThan(9)) + if (isIOS7 || isIOS8) return _isVisible; return NO; } @@ -77,7 +77,7 @@ static NSString * const kKeyPath = @"subviews"; { // Status bar in iOS 9 already provides back button if the app has been launched from another app. // For iOS version less than 9 we just try to mimic the default iOS 9 status bar. - if (!isIOSVersionLessThan(9)) + if (!(isIOS7 || isIOS8)) return; if (_isVisible == isVisible) return; diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuView.mm b/iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuView.mm index 1c13744aa3..9438097d7b 100644 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuView.mm +++ b/iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuView.mm @@ -270,7 +270,7 @@ break; } UIImage * image = [UIImage imageNamed:name]; - if (isIOSVersionLessThan(8)) + if (isIOS7) image = [image imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate]; [btn setImage:image forState:UIControlStateNormal]; } @@ -298,7 +298,7 @@ - (void)refreshButtonsColor { - if (!isIOSVersionLessThan(8)) + if (!isIOS7) return; auto const coloring = self.p2pButton.coloring; self.p2pButton.coloring = coloring; diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/Search/TabbedView/HistoryTab/MWMSearchHistoryRequestCell.mm b/iphone/Maps/Classes/CustomViews/MapViewControls/Search/TabbedView/HistoryTab/MWMSearchHistoryRequestCell.mm index c2bef58e22..45c23047e9 100644 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/Search/TabbedView/HistoryTab/MWMSearchHistoryRequestCell.mm +++ b/iphone/Maps/Classes/CustomViews/MapViewControls/Search/TabbedView/HistoryTab/MWMSearchHistoryRequestCell.mm @@ -24,7 +24,7 @@ { self.title.text = title; [self.title sizeToFit]; - if (isIOSVersionLessThan(8)) + if (isIOS7) [self layoutIfNeeded]; } diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/Search/TableView/MWMSearchCommonCell.mm b/iphone/Maps/Classes/CustomViews/MapViewControls/Search/TableView/MWMSearchCommonCell.mm index 1f6d8bbfbc..6a77157a22 100644 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/Search/TableView/MWMSearchCommonCell.mm +++ b/iphone/Maps/Classes/CustomViews/MapViewControls/Search/TableView/MWMSearchCommonCell.mm @@ -60,7 +60,7 @@ self.distanceLabel.text = @(distanceStr.c_str()); } } - if (isIOSVersionLessThan(8)) + if (isIOS7) [self layoutIfNeeded]; } diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/Dashboard/MWMNavigationDashboard.mm b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/Dashboard/MWMNavigationDashboard.mm index 63d2f839c0..fe2df67ce1 100644 --- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/Dashboard/MWMNavigationDashboard.mm +++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/Dashboard/MWMNavigationDashboard.mm @@ -13,7 +13,7 @@ - (void)setCenter:(CGPoint)center { //TODO(Vlad): There is hack for "cut" iOS7. - if (isIOSVersionLessThan(8)) + if (isIOS7) return; [super setCenter:center]; } diff --git a/iphone/Maps/Classes/EAGLView.mm b/iphone/Maps/Classes/EAGLView.mm index 6534585cc2..3bb2c92f75 100644 --- a/iphone/Maps/Classes/EAGLView.mm +++ b/iphone/Maps/Classes/EAGLView.mm @@ -26,7 +26,7 @@ double correctContentScale() { UIScreen * uiScreen = [UIScreen mainScreen]; - if (isIOSVersionLessThan(8)) + if (isIOS7) return [uiScreen respondsToSelector:@selector(scale)] ? [uiScreen scale] : 1.f; else return [uiScreen respondsToSelector:@selector(nativeScale)] ? [uiScreen nativeScale] : 1.f; diff --git a/iphone/Maps/Classes/MWMSegue.mm b/iphone/Maps/Classes/MWMSegue.mm index 1fff647a6a..d4e760a178 100644 --- a/iphone/Maps/Classes/MWMSegue.mm +++ b/iphone/Maps/Classes/MWMSegue.mm @@ -7,7 +7,7 @@ { UINavigationController * nc = self.sourceViewController.navigationController; UIViewController * dvc = self.destinationViewController; - if (isIOSVersionLessThan(8)) + if (isIOS7) { if ([dvc isMemberOfClass:[UINavigationController class]]) [nc presentViewController:dvc animated:YES completion:nil]; diff --git a/iphone/Maps/Classes/MapViewController.mm b/iphone/Maps/Classes/MapViewController.mm index 2ad17772fd..f65eaa6193 100644 --- a/iphone/Maps/Classes/MapViewController.mm +++ b/iphone/Maps/Classes/MapViewController.mm @@ -306,7 +306,7 @@ NSString * const kAuthorizationSegue = @"Map2AuthorizationSegue"; - (BOOL)hasForceTouch { - if (isIOSVersionLessThan(9)) + if (isIOS7 || isIOS8) return NO; return self.view.traitCollection.forceTouchCapability == UIForceTouchCapabilityAvailable; } @@ -443,7 +443,7 @@ NSString * const kAuthorizationSegue = @"Map2AuthorizationSegue"; - (void)showWhatsNewIfNeeded { - if (isIOSVersionLessThan(8)) + if (isIOS7) return; NSUserDefaults * ud = [NSUserDefaults standardUserDefaults]; @@ -477,7 +477,7 @@ NSString * const kAuthorizationSegue = @"Map2AuthorizationSegue"; animated:(BOOL)flag completion:(TMWMVoidBlock)completion { - if (isIOSVersionLessThan(8)) + if (isIOS7) self.menuRestoreState = self.controlsManager.menuState; [super presentViewController:viewControllerToPresent animated:flag completion:completion]; } @@ -765,7 +765,7 @@ NSString * const kAuthorizationSegue = @"Map2AuthorizationSegue"; (void)Settings::Get(kAdServerForbiddenKey, adServerForbidden); bool adForbidden = false; (void)Settings::Get(kAdForbiddenSettingsKey, adForbidden); - if (isIOSVersionLessThan(8) || adServerForbidden || adForbidden) + if (isIOS7 || adServerForbidden || adForbidden) { self.appWallAd = nil; return; diff --git a/iphone/Maps/Classes/MapsAppDelegate.mm b/iphone/Maps/Classes/MapsAppDelegate.mm index e2050102c1..c32b7e6594 100644 --- a/iphone/Maps/Classes/MapsAppDelegate.mm +++ b/iphone/Maps/Classes/MapsAppDelegate.mm @@ -639,7 +639,7 @@ void InitLocalizedStrings() navigationBar.shadowImage = [UIImage imageWithColor:[UIColor fadeBackground]]; navigationBar.titleTextAttributes = [self navigationBarTextAttributes]; // Workaround for ios 7 crash. - if (!isIOSVersionLessThan(8)) + if (!isIOS7) navigationBar.translucent = NO; } diff --git a/iphone/Maps/Platform/LocationManager.mm b/iphone/Maps/Platform/LocationManager.mm index dd4d1317d6..eb32303c40 100644 --- a/iphone/Maps/Platform/LocationManager.mm +++ b/iphone/Maps/Platform/LocationManager.mm @@ -36,7 +36,7 @@ static NSString * const kAlohalyticsLocationRequestAlwaysFailed = @"$locationAlw m_locationManager.delegate = self; [UIDevice currentDevice].batteryMonitoringEnabled = YES; [self refreshAccuracy]; - if (!isIOSVersionLessThan(9)) + if (!(isIOS7 || isIOS8)) m_locationManager.allowsBackgroundLocationUpdates = YES; m_locationManager.pausesLocationUpdatesAutomatically = YES; m_locationManager.headingFilter = 3.0; diff --git a/iphone/Maps/Settings/SettingsViewController.mm b/iphone/Maps/Settings/SettingsViewController.mm index 8d6ba5eea9..d84e3db63e 100644 --- a/iphone/Maps/Settings/SettingsViewController.mm +++ b/iphone/Maps/Settings/SettingsViewController.mm @@ -49,7 +49,7 @@ typedef NS_ENUM(NSUInteger, Section) self.tableView.backgroundView = nil; bool adServerForbidden = false; (void)Settings::Get(kAdServerForbiddenKey, adServerForbidden); - if (isIOSVersionLessThan(8) || adServerForbidden) + if (isIOS7 || adServerForbidden) sections = {SectionMetrics, SectionMap, SectionRouting, SectionCalibration, SectionStatistics}; else sections = {SectionMetrics, SectionMap, SectionRouting, SectionCalibration, SectionAd, SectionStatistics}; diff --git a/iphone/Maps/ViewController.mm b/iphone/Maps/ViewController.mm index 491a322847..a14c6c9cab 100644 --- a/iphone/Maps/ViewController.mm +++ b/iphone/Maps/ViewController.mm @@ -39,7 +39,7 @@ - (void)showAlert:(NSString *)alert withButtonTitle:(NSString *)buttonTitle { - if (isIOSVersionLessThan(8)) + if (isIOS7) { UIAlertView * alertView = [[UIAlertView alloc] initWithTitle:alert message:nil