From 20569f6af4989a89f21c0f6647463e8ac8b554c4 Mon Sep 17 00:00:00 2001 From: Ilya Grechuhin Date: Fri, 26 Jun 2015 11:28:08 +0300 Subject: [PATCH] [ios] Upgraded iOS target to 7.0 --- iphone/Maps/Bookmarks/BookmarkCell.mm | 2 +- iphone/Maps/Bookmarks/BookmarksRootVC.mm | 3 +- iphone/Maps/Bookmarks/BookmarksVC.mm | 4 +- iphone/Maps/Bookmarks/SelectSetVC.mm | 2 +- iphone/Maps/Categories/UIKitCategories.m | 17 ++----- .../AlertController/MWMAlertViewController.mm | 8 --- .../Maps/Classes/LocalNotificationManager.mm | 35 +++++-------- iphone/Maps/Classes/MWMTextView.mm | 3 +- iphone/Maps/Classes/MapCell.mm | 4 -- iphone/Maps/Classes/MapViewController.mm | 15 ++---- iphone/Maps/Classes/MapsAppDelegate.mm | 42 +++++----------- iphone/Maps/Classes/RouteView.mm | 11 ++--- iphone/Maps/Classes/SearchBar.mm | 3 +- iphone/Maps/Classes/SearchResultCell.m | 32 ++++-------- iphone/Maps/Classes/SearchView.mm | 39 +++++++-------- iphone/Maps/Classes/ShareActionSheet.mm | 8 +-- iphone/Maps/Classes/TwoButtonsView.m | 8 +-- .../WatchEventHandler/MWMWatchNotification.mm | 3 -- .../ApiBarBackground6@2x.png | Bin 1299 -> 0 bytes .../ApiBarBackground6.imageset/Contents.json | 21 -------- .../AppIcon.appiconset/29x29.png | Bin 7600 -> 0 bytes .../AppIcon.appiconset/50x50.png | Bin 10122 -> 0 bytes .../AppIcon.appiconset/50x50@2x.png | Bin 17538 -> 0 bytes .../AppIcon.appiconset/57x57.png | Bin 10488 -> 0 bytes .../AppIcon.appiconset/57x57@2x.png | Bin 17571 -> 0 bytes .../AppIcon.appiconset/72x72.png | Bin 12346 -> 0 bytes .../AppIcon.appiconset/72x72@2x.png | Bin 21473 -> 0 bytes .../AppIcon.appiconset/Contents.json | 42 ---------------- iphone/Maps/Maps.xcodeproj/project.pbxproj | 46 +++++++++--------- iphone/Maps/Platform/LocationManager.mm | 1 - tools/mkspecs/iphonedevice-clang/qmake.conf | 6 +-- .../mkspecs/iphonesimulator-clang/qmake.conf | 6 +-- 32 files changed, 104 insertions(+), 257 deletions(-) delete mode 100644 iphone/Maps/Images.xcassets/ApiBarBackground6.imageset/ApiBarBackground6@2x.png delete mode 100644 iphone/Maps/Images.xcassets/ApiBarBackground6.imageset/Contents.json delete mode 100644 iphone/Maps/Images.xcassets/AppIcon.appiconset/29x29.png delete mode 100644 iphone/Maps/Images.xcassets/AppIcon.appiconset/50x50.png delete mode 100644 iphone/Maps/Images.xcassets/AppIcon.appiconset/50x50@2x.png delete mode 100644 iphone/Maps/Images.xcassets/AppIcon.appiconset/57x57.png delete mode 100644 iphone/Maps/Images.xcassets/AppIcon.appiconset/57x57@2x.png delete mode 100644 iphone/Maps/Images.xcassets/AppIcon.appiconset/72x72.png delete mode 100644 iphone/Maps/Images.xcassets/AppIcon.appiconset/72x72@2x.png diff --git a/iphone/Maps/Bookmarks/BookmarkCell.mm b/iphone/Maps/Bookmarks/BookmarkCell.mm index 0495f86327..a379c60cfd 100644 --- a/iphone/Maps/Bookmarks/BookmarkCell.mm +++ b/iphone/Maps/Bookmarks/BookmarkCell.mm @@ -63,7 +63,7 @@ CGFloat xDelim = (int)(r.origin.x + w / 2); if (_bmDistance.text.length) { - CGSize const distanceTextSize = [_bmDistance.text sizeWithFont:_bmDistance.font]; + CGSize const distanceTextSize = [_bmDistance.text sizeWithAttributes:@{NSFontAttributeName:_bmDistance.font}]; if (xDelim + distanceTextSize.width < r.origin.x + w) xDelim = r.origin.x + w - distanceTextSize.width - KPaddingX; } diff --git a/iphone/Maps/Bookmarks/BookmarksRootVC.mm b/iphone/Maps/Bookmarks/BookmarksRootVC.mm index 5e98c3c752..ad3a85ed21 100644 --- a/iphone/Maps/Bookmarks/BookmarksRootVC.mm +++ b/iphone/Maps/Bookmarks/BookmarksRootVC.mm @@ -136,7 +136,8 @@ if ([string length] < tailLength + incrementStep) return string; BOOL firstTime = YES; - while ([string sizeWithFont:font].width > width) + NSDictionary * attrs = @{NSFontAttributeName:font}; + while ([string sizeWithAttributes:attrs].width > width) { if (!firstTime) string = [[string substringToIndex:([string length] - tailLength - incrementStep)] stringByAppendingString:@"..."]; diff --git a/iphone/Maps/Bookmarks/BookmarksVC.mm b/iphone/Maps/Bookmarks/BookmarksVC.mm index 15b6d22c63..34f6bcaae7 100644 --- a/iphone/Maps/Bookmarks/BookmarksVC.mm +++ b/iphone/Maps/Bookmarks/BookmarksVC.mm @@ -284,7 +284,7 @@ - (void)mailComposeController:(MFMailComposeViewController *)controller didFinishWithResult:(MFMailComposeResult)result error:(NSError *)error { - [self dismissModalViewControllerAnimated:YES]; + [self dismissViewControllerAnimated:YES completion:nil]; [[Statistics instance] logEvent:@"KML Export"]; } @@ -434,7 +434,7 @@ NSData * myData = [[NSData alloc] initWithContentsOfFile:filePath]; [mailVC addAttachmentData:myData mimeType:mimeType fileName:[NSString stringWithFormat:@"%@%@", catName, fileExtension]]; [mailVC setMessageBody:[NSString stringWithFormat:L(@"share_bookmarks_email_body"), catName] isHTML:NO]; - [self presentModalViewController:mailVC animated:YES]; + [self presentViewController:mailVC animated:YES completion:nil]; } - (void)calculateSections diff --git a/iphone/Maps/Bookmarks/SelectSetVC.mm b/iphone/Maps/Bookmarks/SelectSetVC.mm index d6e2d8c88d..cc44298132 100644 --- a/iphone/Maps/Bookmarks/SelectSetVC.mm +++ b/iphone/Maps/Bookmarks/SelectSetVC.mm @@ -128,7 +128,7 @@ AddSetVC * asVC = [[AddSetVC alloc] init]; asVC.delegate = self; if (IPAD) - [asVC setContentSizeForViewInPopover:[self contentSizeForViewInPopover]]; + asVC.preferredContentSize = self.preferredContentSize; [self.navigationController pushViewController:asVC animated:YES]; } else diff --git a/iphone/Maps/Categories/UIKitCategories.m b/iphone/Maps/Categories/UIKitCategories.m index 49e1585e20..8ac5a5cfe7 100644 --- a/iphone/Maps/Categories/UIKitCategories.m +++ b/iphone/Maps/Categories/UIKitCategories.m @@ -159,10 +159,7 @@ + (void)animateWithDuration:(NSTimeInterval)duration delay:(NSTimeInterval)delay damping:(double)dampingRatio initialVelocity:(double)springVelocity options:(UIViewAnimationOptions)options animations:(void (^)(void))animations completion:(void (^)(BOOL))completion { - if ([UIView respondsToSelector:@selector(animateWithDuration:delay:usingSpringWithDamping:initialSpringVelocity:options:animations:completion:)]) - [UIView animateWithDuration:duration delay:delay usingSpringWithDamping:dampingRatio initialSpringVelocity:springVelocity options:options animations:animations completion:completion]; - else - [UIView animateWithDuration:(duration * dampingRatio) delay:delay options:options animations:animations completion:completion]; + [UIView animateWithDuration:duration delay:delay usingSpringWithDamping:dampingRatio initialSpringVelocity:springVelocity options:options animations:animations completion:completion]; } - (void)sizeToIntegralFit @@ -189,16 +186,8 @@ - (CGSize)sizeWithDrawSize:(CGSize)drawSize font:(UIFont *)font { - if ([self respondsToSelector:@selector(boundingRectWithSize:options:attributes:context:)]) - { - CGRect rect = [self boundingRectWithSize:drawSize options:NSStringDrawingUsesLineFragmentOrigin attributes:@{NSFontAttributeName : font} context:nil]; - return CGRectIntegral(rect).size; - } - else - { - CGSize size = [self sizeWithFont:font constrainedToSize:drawSize lineBreakMode:NSLineBreakByWordWrapping]; - return CGRectIntegral(CGRectMake(0, 0, size.width, size.height)).size; - } + CGRect rect = [self boundingRectWithSize:drawSize options:NSStringDrawingUsesLineFragmentOrigin attributes:@{NSFontAttributeName : font} context:nil]; + return CGRectIntegral(rect).size; } @end diff --git a/iphone/Maps/Classes/CustomAlert/AlertController/MWMAlertViewController.mm b/iphone/Maps/Classes/CustomAlert/AlertController/MWMAlertViewController.mm index c85aaf2bc9..a1bad1ea66 100644 --- a/iphone/Maps/Classes/CustomAlert/AlertController/MWMAlertViewController.mm +++ b/iphone/Maps/Classes/CustomAlert/AlertController/MWMAlertViewController.mm @@ -27,14 +27,6 @@ static NSString * const kAlertControllerNibIdentifier = @"MWMAlertViewController return self; } -- (void)viewDidLoad -{ - [super viewDidLoad]; - // Need only for iOS 5. - if (isIOSVersionLessThan(6)) - self.tap.delegate = self; -} - #pragma mark - Actions - (void)presentRateAlert diff --git a/iphone/Maps/Classes/LocalNotificationManager.mm b/iphone/Maps/Classes/LocalNotificationManager.mm index 3f1b535ea3..a8c036ebc9 100644 --- a/iphone/Maps/Classes/LocalNotificationManager.mm +++ b/iphone/Maps/Classes/LocalNotificationManager.mm @@ -104,33 +104,20 @@ typedef void (^CompletionHandler)(UIBackgroundFetchResult); if ([action isEqualToString:@"Share"]) { - NSURL * link = [NSURL URLWithString:notificationInfo[@"NotificationShareLink"]]; UIImage * shareImage = [UIImage imageNamed:notificationInfo[@"NotifiicationShareImage"]]; LocalNotificationInfoProvider * infoProvider = [[LocalNotificationInfoProvider alloc] initWithDictionary:notificationInfo]; - if (isIOSVersionLessThan(6)) - { - UIPasteboard * pasteboard = [UIPasteboard generalPasteboard]; - pasteboard.URL = link; - NSString * message = [NSString stringWithFormat:L(@"copied_to_clipboard"), [link absoluteString]]; - UIAlertView * alertView = [[UIAlertView alloc] initWithTitle:message message:nil delegate:nil cancelButtonTitle:L(@"ok") otherButtonTitles:nil]; - [alertView show]; - } - else - { - NSMutableArray * itemsToShare = [NSMutableArray arrayWithObject:infoProvider]; - if (shareImage) - [itemsToShare addObject:shareImage]; - - UIActivityViewController * activityVC = [[UIActivityViewController alloc] initWithActivityItems:itemsToShare applicationActivities:nil]; - NSMutableArray * excludedActivityTypes = [@[UIActivityTypePrint, UIActivityTypeAssignToContact, UIActivityTypeSaveToCameraRoll] mutableCopy]; - if (!isIOSVersionLessThan(7)) - [excludedActivityTypes addObject:UIActivityTypeAirDrop]; - activityVC.excludedActivityTypes = excludedActivityTypes; - UIWindow * window = [[UIApplication sharedApplication].windows firstObject]; - NavigationController * vc = (NavigationController *)window.rootViewController; - [vc presentViewController:activityVC animated:YES completion:nil]; - } + NSMutableArray * itemsToShare = [NSMutableArray arrayWithObject:infoProvider]; + if (shareImage) + [itemsToShare addObject:shareImage]; + + UIActivityViewController * activityVC = [[UIActivityViewController alloc] initWithActivityItems:itemsToShare applicationActivities:nil]; + NSMutableArray * excludedActivityTypes = [@[UIActivityTypePrint, UIActivityTypeAssignToContact, UIActivityTypeSaveToCameraRoll] mutableCopy]; + [excludedActivityTypes addObject:UIActivityTypeAirDrop]; + activityVC.excludedActivityTypes = excludedActivityTypes; + UIWindow * window = [[UIApplication sharedApplication].windows firstObject]; + NavigationController * vc = (NavigationController *)window.rootViewController; + [vc presentViewController:activityVC animated:YES completion:nil]; } } diff --git a/iphone/Maps/Classes/MWMTextView.mm b/iphone/Maps/Classes/MWMTextView.mm index d86767b571..944c960623 100644 --- a/iphone/Maps/Classes/MWMTextView.mm +++ b/iphone/Maps/Classes/MWMTextView.mm @@ -50,8 +50,7 @@ static CGFloat const kDefaultTextLeftInset = 5.; self.placeholderView.font = self.font; self.placeholderView.isAccessibilityElement = NO; - if (!isIOSVersionLessThan(7)) - [self setTextContainerInset:UIEdgeInsetsZero]; + [self setTextContainerInset:UIEdgeInsetsZero]; [self updatePlaceholderVisibility]; diff --git a/iphone/Maps/Classes/MapCell.mm b/iphone/Maps/Classes/MapCell.mm index 2cab626188..a717f03dc0 100644 --- a/iphone/Maps/Classes/MapCell.mm +++ b/iphone/Maps/Classes/MapCell.mm @@ -171,10 +171,6 @@ self.separatorBottom.frame = CGRectMake(0, self.contentView.height - PIXEL, self.contentView.width, PIXEL); self.separatorBottom.autoresizingMask = UIViewAutoresizingFlexibleTopMargin | UIViewAutoresizingFlexibleTopMargin; - - // On iOS6 and lower table view looks different, we won't show separators there. - if (isIOSVersionLessThan(7)) - self.separatorTop.alpha = self.separator.alpha = self.separatorBottom.alpha = 0.0; } - (void)prepareForReuse diff --git a/iphone/Maps/Classes/MapViewController.mm b/iphone/Maps/Classes/MapViewController.mm index afe98563b3..61179bc827 100644 --- a/iphone/Maps/Classes/MapViewController.mm +++ b/iphone/Maps/Classes/MapViewController.mm @@ -618,10 +618,7 @@ typedef NS_OPTIONS(NSUInteger, MapInfoView) - (void)updateStatusBarStyle { - if ([self respondsToSelector:@selector(setNeedsStatusBarAppearanceUpdate)]) - [self setNeedsStatusBarAppearanceUpdate]; - else - [UIApplication sharedApplication].statusBarStyle = [self preferredStatusBarStyle]; + [self setNeedsStatusBarAppearanceUpdate]; } - (id)initWithCoder:(NSCoder *)coder @@ -736,13 +733,7 @@ typedef NS_OPTIONS(NSUInteger, MapInfoView) (void)Settings::Get("IsDisclaimerApproved", isDisclaimerApproved); if (!isDisclaimerApproved) { - NSString * title; - NSString * message; - if (isIOSVersionLessThan(7)) - message = L(@"routing_disclaimer"); - else - title = L(@"routing_disclaimer"); - UIAlertView * alert = [[UIAlertView alloc] initWithTitle:title message:message delegate:self cancelButtonTitle:L(@"cancel") otherButtonTitles:L(@"ok"), nil]; + UIAlertView * alert = [[UIAlertView alloc] initWithTitle:L(@"routing_disclaimer") message:@"" delegate:self cancelButtonTitle:L(@"cancel") otherButtonTitles:L(@"ok"), nil]; alert.tag = ALERT_VIEW_ROUTING_DISCLAIMER; [alert show]; } @@ -825,7 +816,7 @@ typedef NS_OPTIONS(NSUInteger, MapInfoView) { if (!_apiBar) { - UIImage * image = isIOSVersionLessThan(7) ? [UIImage imageNamed:@"ApiBarBackground6"] : [UIImage imageNamed:@"ApiBarBackground7"]; + UIImage * image = [UIImage imageNamed:@"ApiBarBackground7"]; _apiBar = [[UIImageView alloc] initWithImage:[image resizableImageWithCapInsets:UIEdgeInsetsZero]]; _apiBar.width = self.view.width; _apiBar.userInteractionEnabled = YES; diff --git a/iphone/Maps/Classes/MapsAppDelegate.mm b/iphone/Maps/Classes/MapsAppDelegate.mm index c16a8fa766..0548d8f498 100644 --- a/iphone/Maps/Classes/MapsAppDelegate.mm +++ b/iphone/Maps/Classes/MapsAppDelegate.mm @@ -196,8 +196,8 @@ void InitLocalizedStrings() self.standbyCounter = 0; - if ([application respondsToSelector:@selector(setMinimumBackgroundFetchInterval:)]) - [application setMinimumBackgroundFetchInterval:(6 * 60 * 60)]; + NSTimeInterval const minimumBackgroundFetchIntervalInSeconds = 6 * 60 * 60; + [application setMinimumBackgroundFetchInterval:minimumBackgroundFetchIntervalInSeconds]; [self registerNotifications:application launchOptions:launchOptions]; @@ -221,9 +221,6 @@ void InitLocalizedStrings() application.applicationIconBadgeNumber = f.GetCountryTree().GetActiveMapLayout().GetOutOfDateCount(); f.GetLocationState()->InvalidatePosition(); - if (isIOSVersionLessThan(7)) - return [launchOptions objectForKey:UIApplicationLaunchOptionsURLKey] != nil; - return [[FBSDKApplicationDelegate sharedInstance] application:application didFinishLaunchingWithOptions:launchOptions]; } @@ -313,9 +310,7 @@ void InitLocalizedStrings() m_mwmURL = nil; m_fileURL = nil; - if (!isIOSVersionLessThan(7)) - [FBSDKAppEvents activateApp]; - + [FBSDKAppEvents activateApp]; [self restoreRouteState]; } @@ -356,27 +351,17 @@ void InitLocalizedStrings() - (void)customizeAppearance { NSMutableDictionary * attributes = [[NSMutableDictionary alloc] init]; - attributes[UITextAttributeTextColor] = [UIColor whiteColor]; - attributes[UITextAttributeTextShadowColor] = [UIColor clearColor]; + attributes[NSForegroundColorAttributeName] = [UIColor whiteColor]; Class const navigationControllerClass = [NavigationController class]; - if (!isIOSVersionLessThan(7)) - { - [[UINavigationBar appearanceWhenContainedIn:navigationControllerClass, nil] setTintColor:[UIColor whiteColor]]; - [[UIBarButtonItem appearance] setTitleTextAttributes:attributes forState:UIControlStateNormal]; - [[UINavigationBar appearanceWhenContainedIn:navigationControllerClass, nil] setBarTintColor:[UIColor colorWithColorCode:@"0e8639"]]; - attributes[UITextAttributeFont] = [UIFont fontWithName:@"HelveticaNeue" size:17.5]; - } - else - { - [[UINavigationBar appearanceWhenContainedIn:navigationControllerClass, nil] setTintColor:[UIColor colorWithColorCode:@"15c584"]]; - [[UINavigationBar appearanceWhenContainedIn:navigationControllerClass, nil] setBackgroundImage:[UIImage imageNamed:@"NavigationBarBackground7"] forBarMetrics:UIBarMetricsCompactPrompt]; - } + [[UINavigationBar appearanceWhenContainedIn:navigationControllerClass, nil] setTintColor:[UIColor whiteColor]]; + [[UIBarButtonItem appearance] setTitleTextAttributes:attributes forState:UIControlStateNormal]; + [[UINavigationBar appearanceWhenContainedIn:navigationControllerClass, nil] setBarTintColor:[UIColor colorWithColorCode:@"0e8639"]]; + attributes[NSFontAttributeName] = [UIFont fontWithName:@"HelveticaNeue" size:17.5]; - if ([UINavigationBar instancesRespondToSelector:@selector(setShadowImage:)]) - [[UINavigationBar appearanceWhenContainedIn:navigationControllerClass, nil] setShadowImage:[[UIImage alloc] init]]; - - [[UINavigationBar appearanceWhenContainedIn:navigationControllerClass, nil] setTitleTextAttributes:attributes]; + UINavigationBar * navBar = [UINavigationBar appearanceWhenContainedIn:navigationControllerClass, nil]; + navBar.shadowImage = [[UIImage alloc] init]; + navBar.titleTextAttributes = attributes; } - (void)application:(UIApplication *)application didReceiveLocalNotification:(UILocalNotification *)notification @@ -392,9 +377,6 @@ void InitLocalizedStrings() if ([self checkLaunchURL:url]) return YES; - if (isIOSVersionLessThan(7)) - return NO; - return [[FBSDKApplicationDelegate sharedInstance] application:application openURL:url sourceApplication:sourceApplication annotation:annotation]; } @@ -587,7 +569,7 @@ void InitLocalizedStrings() - (void)showFacebookAlert { - if (isIOSVersionLessThan(7) || !Reachability.reachabilityForInternetConnection.isReachable) + if (!Reachability.reachabilityForInternetConnection.isReachable) return; UIViewController *topViewController = [(UINavigationController*)m_window.rootViewController visibleViewController]; diff --git a/iphone/Maps/Classes/RouteView.mm b/iphone/Maps/Classes/RouteView.mm index dfc16ddc3c..2673aec07c 100644 --- a/iphone/Maps/Classes/RouteView.mm +++ b/iphone/Maps/Classes/RouteView.mm @@ -124,7 +124,7 @@ extern NSString * const kAlohalyticsTapEventKey; - (void)didMoveToSuperview { - self.minY = [self viewMinY]; + self.minY = 0.0; [self setState:RouteViewStateHidden animated:NO]; } @@ -189,11 +189,6 @@ extern NSString * const kAlohalyticsTapEventKey; } completion:nil]; } -- (CGFloat)viewMinY -{ - return isIOSVersionLessThan(7) ? -20 : 0; -} - - (UIView *)phoneIdiomView { if (!_phoneIdiomView) @@ -210,7 +205,7 @@ extern NSString * const kAlohalyticsTapEventKey; if (!_phoneTurnInstructions) { _phoneTurnInstructions = [[UIView alloc] initWithFrame:CGRectZero]; - _phoneTurnInstructions.backgroundColor = [[UIColor whiteColor] colorWithAlphaComponent:0.94];; + _phoneTurnInstructions.backgroundColor = [[UIColor whiteColor] colorWithAlphaComponent:0.94]; _phoneTurnInstructions.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleBottomMargin; UIImageView * shadow = [[UIImageView alloc] initWithFrame:CGRectMake(0, 0, _phoneTurnInstructions.width, 18)]; @@ -272,7 +267,7 @@ extern NSString * const kAlohalyticsTapEventKey; if (!_routeInfo) { _routeInfo = [[UIView alloc] initWithFrame:CGRectZero]; - _routeInfo.backgroundColor = [[UIColor whiteColor] colorWithAlphaComponent:0.94];; + _routeInfo.backgroundColor = [[UIColor whiteColor] colorWithAlphaComponent:0.94]; _routeInfo.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleBottomMargin; UIImageView * shadow = [[UIImageView alloc] initWithFrame:CGRectMake(0, 0, _routeInfo.width, 18)]; diff --git a/iphone/Maps/Classes/SearchBar.mm b/iphone/Maps/Classes/SearchBar.mm index 4ee3479068..18c6b5498b 100644 --- a/iphone/Maps/Classes/SearchBar.mm +++ b/iphone/Maps/Classes/SearchBar.mm @@ -45,8 +45,7 @@ extern NSString * const kAlohalyticsTapEventKey; self.textField.midY = self.height / 2 - 3; self.textField.minX = 36.; - if ([self.textField respondsToSelector:@selector(setTintColor:)]) - self.textField.tintColor = [UIColor blackHintText]; + self.textField.tintColor = [UIColor blackHintText]; return self; } diff --git a/iphone/Maps/Classes/SearchResultCell.m b/iphone/Maps/Classes/SearchResultCell.m index 1867b26f76..d15f095c2b 100644 --- a/iphone/Maps/Classes/SearchResultCell.m +++ b/iphone/Maps/Classes/SearchResultCell.m @@ -37,25 +37,16 @@ static CGFloat const kOffset = 16.; - (void)setTitle:(NSString *)title selectedRanges:(NSArray *)selectedRanges { - if ([self.titleLabel respondsToSelector:@selector(setAttributedText:)]) - { - // iOS 6 and higher - - if (!title) - title = @""; + if (!title) + title = @""; - NSMutableAttributedString * attributedTitle = [[NSMutableAttributedString alloc] initWithString:title]; - [attributedTitle addAttributes:[self unselectedTitleAttributes] range:NSMakeRange(0, [title length])]; - for (NSValue * range in selectedRanges) - [attributedTitle addAttributes:[self selectedTitleAttributes] range:[range rangeValue]]; + NSMutableAttributedString * attributedTitle = [[NSMutableAttributedString alloc] initWithString:title]; + [attributedTitle addAttributes:[self unselectedTitleAttributes] range:NSMakeRange(0, [title length])]; + NSDictionary * selectedTitleAttributes = [self selectedTitleAttributes]; + for (NSValue * range in selectedRanges) + [attributedTitle addAttributes:selectedTitleAttributes range:[range rangeValue]]; - self.titleLabel.attributedText = attributedTitle; - } - else - { - // iOS 5 - self.titleLabel.text = title; - } + self.titleLabel.attributedText = attributedTitle; } - (NSDictionary *)selectedTitleAttributes @@ -164,11 +155,8 @@ static CGFloat const kOffset = 16.; _titleLabel.backgroundColor = [UIColor clearColor]; _titleLabel.numberOfLines = 0; _titleLabel.lineBreakMode = NSLineBreakByWordWrapping; - if (![_titleLabel respondsToSelector:@selector(setAttributedText:)]) - { - _titleLabel.font = TITLE_FONT; - _titleLabel.textColor = [UIColor blackPrimaryText]; - } + _titleLabel.font = TITLE_FONT; + _titleLabel.textColor = [UIColor blackPrimaryText]; } return _titleLabel; } diff --git a/iphone/Maps/Classes/SearchView.mm b/iphone/Maps/Classes/SearchView.mm index b19240c3e7..f6b3de98b2 100644 --- a/iphone/Maps/Classes/SearchView.mm +++ b/iphone/Maps/Classes/SearchView.mm @@ -28,16 +28,6 @@ #include "../../geometry/angles.hpp" #include "../../geometry/distance_on_sphere.hpp" - -static NSString * GetKeyboardInputLanguage() -{ - UITextInputMode * mode = [UITextInputMode currentInputMode]; - if (mode) - return mode.primaryLanguage; - // Use system language as a fall-back - return [[NSLocale preferredLanguages] firstObject]; -} - @interface SearchResultsWrapper : NSObject - (id)initWithResults:(search::Results const &)res; @@ -144,14 +134,10 @@ typedef NS_ENUM(NSUInteger, CellType) [self setState:SearchViewStateHidden animated:NO]; - if ([self.tableView respondsToSelector:@selector(registerClass:forCellReuseIdentifier:)]) - { - // only for iOS 6 and higher - [self.tableView registerClass:[SearchCategoryCell class] forCellReuseIdentifier:[SearchCategoryCell className]]; - [self.tableView registerClass:[SearchResultCell class] forCellReuseIdentifier:[SearchResultCell className]]; - [self.tableView registerClass:[SearchSuggestCell class] forCellReuseIdentifier:[SearchSuggestCell className]]; - [self.tableView registerClass:[SearchShowOnMapCell class] forCellReuseIdentifier:[SearchShowOnMapCell className]]; - } + [self.tableView registerClass:[SearchCategoryCell class] forCellReuseIdentifier:[SearchCategoryCell className]]; + [self.tableView registerClass:[SearchResultCell class] forCellReuseIdentifier:[SearchResultCell className]]; + [self.tableView registerClass:[SearchSuggestCell class] forCellReuseIdentifier:[SearchSuggestCell className]]; + [self.tableView registerClass:[SearchShowOnMapCell class] forCellReuseIdentifier:[SearchShowOnMapCell className]]; [self layoutSubviews]; self.tableView.contentOffset = CGPointMake(0, -self.topBackgroundView.height); @@ -313,7 +299,7 @@ static BOOL keyboardLoaded = NO; [self frameworkDidAddSearchResult:wrapper]; }); }; - sp.SetInputLocale([GetKeyboardInputLanguage() UTF8String]); + sp.SetInputLocale([[self keyboardInputLanguage] UTF8String]); sp.SetForceSearch(force == YES); } @@ -479,7 +465,7 @@ static BOOL keyboardLoaded = NO; search::SearchParams params; params.m_query = [[self.searchBar.textField.text precomposedStringWithCompatibilityMapping] UTF8String]; - params.SetInputLocale([GetKeyboardInputLanguage() UTF8String]); + params.SetInputLocale([[self keyboardInputLanguage] UTF8String]); f.StartInteractiveSearch(params); @@ -504,12 +490,12 @@ static BOOL keyboardLoaded = NO; - (CGFloat)defaultSearchBarMinY { - return isIOSVersionLessThan(7) ? 3 : 20; + return 20.0; } - (CGFloat)defaultTopBackgroundHeight { - return isIOSVersionLessThan(7) ? 44 : 64; + return 64.0; } - (BOOL)iPhoneInLandscape @@ -804,6 +790,15 @@ static BOOL keyboardLoaded = NO; [[NSNotificationCenter defaultCenter] removeObserver:self]; } +- (NSString *)keyboardInputLanguage +{ + UITextInputMode * mode = [self textInputMode]; + if (mode) + return mode.primaryLanguage; + // Use system language as a fall-back + return [[NSLocale preferredLanguages] firstObject]; +} + #pragma mark - Properties - (CGRect)infoRect diff --git a/iphone/Maps/Classes/ShareActionSheet.mm b/iphone/Maps/Classes/ShareActionSheet.mm index b91a475409..44d310be4b 100644 --- a/iphone/Maps/Classes/ShareActionSheet.mm +++ b/iphone/Maps/Classes/ShareActionSheet.mm @@ -104,7 +104,7 @@ [mailVC setMessageBody:body isHTML:NO]; [mailVC setSubject:subject]; mailVC.mailComposeDelegate = self; - [self.viewController presentModalViewController:mailVC animated:YES]; + [self.viewController presentViewController:mailVC animated:YES completion:nil]; } else if ([self canUseGmailApp]) { @@ -124,19 +124,19 @@ else [messageVC setBody:[NSString stringWithFormat:L(@"bookmark_share_sms"), shortUrl, httpGe0Url]]; messageVC.messageComposeDelegate = self; - [self.viewController presentModalViewController:messageVC animated:YES]; + [self.viewController presentViewController:messageVC animated:YES completion:nil]; } - (void)messageComposeViewController:(MFMessageComposeViewController *)controller didFinishWithResult:(MessageComposeResult)result { - [self.viewController dismissModalViewControllerAnimated:YES]; + [self.viewController dismissViewControllerAnimated:YES completion:nil]; if (result == MessageComposeResultSent) [[Statistics instance] logEvent:@"ge0(zero) MESSAGE Export"]; } - (void)mailComposeController:(MFMailComposeViewController *)controller didFinishWithResult:(MFMailComposeResult)result error:(NSError *)error { - [self.viewController dismissModalViewControllerAnimated:YES]; + [self.viewController dismissViewControllerAnimated:YES completion:nil]; if (result == MFMailComposeResultSent || result == MFMailComposeResultSaved) [[Statistics instance] logEvent:@"ge0(zero) MAIL Export"]; } diff --git a/iphone/Maps/Classes/TwoButtonsView.m b/iphone/Maps/Classes/TwoButtonsView.m index 4b3cd67324..6859e52399 100644 --- a/iphone/Maps/Classes/TwoButtonsView.m +++ b/iphone/Maps/Classes/TwoButtonsView.m @@ -19,14 +19,14 @@ self.leftButton = [UIButton buttonWithType:UIButtonTypeRoundedRect]; [self.leftButton addTarget:target action:leftSel forControlEvents:UIControlEventTouchUpInside]; [self.leftButton setTitle:leftTitle forState:UIControlStateNormal]; - self.leftButton.titleLabel.lineBreakMode = UILineBreakModeWordWrap; - self.leftButton.titleLabel.textAlignment = UITextAlignmentCenter; + self.leftButton.titleLabel.lineBreakMode = NSLineBreakByWordWrapping; + self.leftButton.titleLabel.textAlignment = NSTextAlignmentCenter; self.rightButton = [UIButton buttonWithType:UIButtonTypeRoundedRect]; [self.rightButton addTarget:target action:rightSel forControlEvents:UIControlEventTouchUpInside]; [self.rightButton setTitle:rightTitle forState:UIControlStateNormal]; - self.rightButton.titleLabel.lineBreakMode = UILineBreakModeWordWrap; - self.rightButton.titleLabel.textAlignment = UITextAlignmentCenter; + self.rightButton.titleLabel.lineBreakMode = NSLineBreakByWordWrapping; + self.rightButton.titleLabel.textAlignment = NSTextAlignmentCenter; [self addSubview:self.leftButton]; [self addSubview:self.rightButton]; diff --git a/iphone/Maps/Classes/WatchEventHandler/MWMWatchNotification.mm b/iphone/Maps/Classes/WatchEventHandler/MWMWatchNotification.mm index 49fddf5304..f536d0f4f2 100644 --- a/iphone/Maps/Classes/WatchEventHandler/MWMWatchNotification.mm +++ b/iphone/Maps/Classes/WatchEventHandler/MWMWatchNotification.mm @@ -27,9 +27,6 @@ static NSString * const kMWMWatchNotificationArchiveNameFormat = @"%@.archive"; - (instancetype)init { - if (![[NSFileManager defaultManager] respondsToSelector:@selector(containerURLForSecurityApplicationGroupIdentifier:)]) - return nil; - self = [super init]; if (self) { diff --git a/iphone/Maps/Images.xcassets/ApiBarBackground6.imageset/ApiBarBackground6@2x.png b/iphone/Maps/Images.xcassets/ApiBarBackground6.imageset/ApiBarBackground6@2x.png deleted file mode 100644 index 04936b8b570b69cfd799a8dbc923c8bb4c2c2b85..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1299 zcmd^9J#W)M7{0VpRVum{7EUe$NciLYmBeaj(>S4#NQu%&WI^iLcWJEFK4V`Sw-Qpt zfCNnZ0RBRE#6TDs7#LXi14szL1S_1=q%c$+Sg~H&_whc@`|YRg%{z+=R~G;Pi_HzU z1HjC&Soh{<#QV#G57)%!3a|J07VGmNPAI4n=26%T@eb`!Ob#EuqbmT+ra`yId#$^U z&q4*~I!YGC0u8{*Y8GREmvZRQogk`6-(SCxU_dI;eXFIl;u;+U8%GJ!Gd(3I^bzNklkc?uS}yVy{!D7-u>;&gHP_%7|EzguoSkp!Dc1gyTRgw`c5@HrLN_`?t@Z?{U zrwXUkyi@+_oavEh$9#D<2V!$JNi-7UlZZKaZ?rQ23U<@2cC$}kKcYpjHa{ADe)(b> z{OZSV*S=ln0r@ct4jx?sqvL`QFgusa<)vJ-?OaYT{;Ru_rNSH-sf8!ce!hC1|E8Mt KP4{Gd`|)q3U36ps diff --git a/iphone/Maps/Images.xcassets/ApiBarBackground6.imageset/Contents.json b/iphone/Maps/Images.xcassets/ApiBarBackground6.imageset/Contents.json deleted file mode 100644 index bba92e6904..0000000000 --- a/iphone/Maps/Images.xcassets/ApiBarBackground6.imageset/Contents.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "idiom" : "universal", - "scale" : "2x", - "filename" : "ApiBarBackground6@2x.png" - }, - { - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/iphone/Maps/Images.xcassets/AppIcon.appiconset/29x29.png b/iphone/Maps/Images.xcassets/AppIcon.appiconset/29x29.png deleted file mode 100644 index 53a52771f00a793f990468c653a92de1a1fd5daf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7600 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 diff --git a/iphone/Maps/Images.xcassets/AppIcon.appiconset/50x50.png b/iphone/Maps/Images.xcassets/AppIcon.appiconset/50x50.png deleted file mode 100644 index ebcdcb88c4f46f5e49506c0432679f04a1bc2331..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10122 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 UO-%j%ng5P6qL}FyleUHZ7d)=K8UO$Q diff --git a/iphone/Maps/Images.xcassets/AppIcon.appiconset/50x50@2x.png b/iphone/Maps/Images.xcassets/AppIcon.appiconset/50x50@2x.png deleted file mode 100644 index ff16ec0b80a7af9ad346a8b8882afd858449f59a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 17538 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 diff --git a/iphone/Maps/Images.xcassets/AppIcon.appiconset/57x57.png b/iphone/Maps/Images.xcassets/AppIcon.appiconset/57x57.png deleted file mode 100644 index 7c9995564f0ba6faf55cc8091d97d914d2769eec..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10488 zcmch72{@Gd`@Sqimh2HS)=11^7BiO2j1g(5{j)o z%O1ZEMWj=;2rC#ZU#bUNnu9}cx333*c$~}v93#6>X!?p1_bU_u6q3H89Sje`dtk|~ z6cc|2*~Z`8mgs++h$JcQHUQ}PqSypfGK&E4rMlCYC|`ZWFT5!B@ycbOBH#;zbzEQZ zt5NoNO8}P6AOm1pFij!|3NtgQ)#pg>3z7zX(EqsZ3A zAUUI~jf}tPVxQ?Ny0TavC?L?s$4ARYTZ_(c0fLc8BoG7vLLi!KgeKFE#v=G?(wIu$ z8H~tGB7@?=qR?r86-L4_x))1dk!|T$7pNYqv^3_oFtGy$^d)!z!CIgdm%ac=#8sS! z7sLIFauN|pb|+KGG!~PM1+QW~T1#Nr?yb3t16f*oHyHz zZvpu!nrZ9jK?YirnRG7(k&N?Zo2m5O8z#$|{C7P6g*Y4jMc4y{WsnIhI>VMucmJMc z%kTaIur_dj8lFI;&{hJVzM}4%1lfqdBI_%%a}LsE|AKUE!7vmAj?#u}fY`|geTCxb zB#N`&Ds-hVG(k{XFaiZ-mj_e>r2RLPU2r4ZP)H~Y27v=ZAvhRJ8w3X9w9#NF+z4k3*FkD)gN@-v-(`*H zM6Z?Hf0rfwEo;1nfGLr^CfK3*a$>{I zDOvHK0xRsl6acQH3k-rl0oG&|+u8p$o&Q2`J>3*b0%;A8zT8?*9t?wgH{FCzB?D}T z3^JLv2ICswb#*{j!}Eg<0L8)vzLuh2NUW<31p4lgjR&3OPH}N%{ZiMO`1Ld);D8_e zS;LiofY#%Lf&i;lufg~qkoEW=NPrEQ#V$=3<{ETABGzL=Kz{W2S5f^Lay@p~55E73 z`@eDPG3)$yNvsi#pCQ*{hv}>q+^<9Z6X1H>>_q~A18gY%{#sfCyq?8y(2rHSM&kbgT95O`RrB)~%8!Wk*kFhsE&OHe{{*=% z`~SoG1pnem{qwl|N@6`vR^I4eUg7{d3ey#^kHTcFk1R;osML>oHh3JF_=q08^UgN}Mg(dv8|)lgtFHLAoY< zJw0Ds!qTZ81e)I(-2VajSA1(H_Y2p*$}5@R&T?JDB9pH-|9{!?C1U_0-D9l?{hd%T95-?pRKtpk(2asJuf+rZ0<-4JLSAwd{82nsdE!ogr83=(F9 zL?d;uARI&+3dW)JzUXzQtZt(XR@#u2Rsw1a$6$02APDwr8=!*#8{@!mBo1MO)y5)q z)|NCv!x30*9S{`sP0|<+LBn)(FxtjCFeDDMw&Z%P$J&y{2!t^hjDUg=e_M+-*1>>~ zP$Uil`GvLrltd!XFdPz!L0}U2zi;`pA$zW77VxEKM-hlCvj}}fb~C~5 zh}jLw*UOZjbfW8} z(GVnfrL@@{+|T>hZyx`*)o>JKWe)UxAn?Co^*3tvBbVkvW{V+{7B5v5glnS(>D%hU*M>-(bNke{#k{_^~i``24~-e%m4%RC<|d`h?~ zuCVTIYH~8CVvSB(n1N?2T3T}Mu;m_-tg%b?Mv@4*cSHaM2sJoSSFUzF9OfQH>O)=8 zFZ0oyu-)&I*}|ut-Y7qz>XbR(o}X(|5fC)&L$j+HmeW{_OIEJ2wDI9pe4wV%ONn^(ZRY@%hGetQ1dWD&vP`6z zWq7!j=*2i)l|e)C?p{r;8yf^G6BI2qIG}gSe)C6*#i>OY?^MH;h*fNV{)mHaI9YF* zkn|daww}x+1#+lyo>Z=_QRWevSL2COrkjwJMdCv@sJ}YDs8@M1G)IratnhAmOeO$`HJGJ4Y#R>U9H!)#Ko{dyHJUeO8>)ZQRapjIGzKiu5FW6{3Oh0TfUrjja;LN!6$$2QVPznjcewP zP^XDs*38JU-#z3%kdb;XP$JsmueM1q&Cr`RV;CJCQx5TzJJ#(a)#r_!WFfWpdCT31 zUZovNSzOj0!dLdyX#*nt@^Fa7mu4F=s-ltobHbVu0jJzIOJJB5yxeFj?jAK1x4N$w zf*d*5NJ2?($_<0{&F!rZlXx1MZpPy0K09T|5up?Zc&1P(EFcwEmjPH*i7Zl@j`&m^ zrF+;(c1A8bbzc-o511~l)EqM+n7?=9BKio>{cwK^^g7}~nLH&_NHkE;$?oCMvomEC zhP%bDoO-(9S*1qh^$k^Yg{NR!fip(U@z-y-@?`#I#(gv3_jpgKq+ouZ0ec#BzGCV^ zP}9=vwsM1{+6-Q6z&yiHOmHwgr1iW7R7>boQ0Q1&O5v_reSumQpT1@&@xolea&aSe znKE%nv%mtlu^^FRqe#X+Afo|%RMdP)?4SK^zRp=q?-Cy1++UYn2$-DqJ6eA^W?I+r zev8*zS<1sb>Ur*E#VKQ>>iUkwBt0z=(W>%U%#2RNZLOl?ri)egHMN_j%oie~dzRmy z)05tJIc}c_BR$hZ`E`7k&6cRsGnZ?mT&vrT4r)C+k~|{!R3dtKuSd?(I2W`Q;LE7W zag8#ls}_bjK48hVS`B1JN(s;gUv{Sr4?Z5=A@!t?&8-~cjO{xi|6p(Vx9}N zEYJv-aBWSmi<_>c9+rHJ=)Nbe2i9JxOCPJ*xA z?AU4GCoL^6J)*K;SZBO&vZ9$@YBoqAl~&4QA=B5}=##>2xCvRR7JK4dP$yru-NQGX zBfcQ1z$@;5*t<%_K$n`Q_jAh05B-+w5_h@(uSAuH+iVqcd$&U~wHE5-ZyA8Jy^XPj zAEU0}WXb!|&ihWE!)S|LwzRAU&X3M*%rNJqYP32bE+w4;poM_*K&%0Ib6s(#*;!$8 zQ*Kv1J@I@;_r3`fD~aMJVmHF86SH8h+6+G;oziRdn#1gKuJ;B}8*LNe_x|M~Ek$6W zoUxw$EblGtGbICQ3SJ{m^+$9gApA=e9gu+Bw?iaVbqH*>ROmrlxoXU5E}lo*jU!|V zVhFlnNudJi0yug`dE{K_4e#wcc`)0Ba`l978l63&2TvLK&0o_M!#}aul43V->26zN z$wJR2tKDePF6mg2L;2nN0pZT&bCj2HZ!hTLZTIa@8H%6%>qtkr()fV4;}Gwo58|k| z$2(|m3?Pq`<}ZJ`cA!YEs#$?$&8QJftKtoBGOm`Ny?V=1GGot$#_~*NQuOTz>g5My z(@3jqWjj?5j$;SkR-j%od=Jf^{Lb8FBX2>~H^l6+>y(9^{?FQFgr z!Q84j3}3i%d%EMvzMWvnKB=jj#H(W7R~!|?Ee92q{agFNlde4FPH?ZPT(k!AbU>;f z&n}`YRZ!jJ(;T!hwF24sK!-pOP5R4u^qqxca+YP3niVfRj_cT4UX=gis|)$F2@4vH zb9G0|g2)%93sNH$y6)v+XrJCBMh!n0&gE=7mFdrap|ymMYToO2bIw?=xxK*R7=_u% zJ)l-^LYS;dZRK{Gh$-VAA3rrZ0-lJ%JmNi~^)X}Ua&4@YA!MT`#BIpbLOs;>ox0o& z`K0UhwIpruLRhD5tAd)|9%-S{@(o~kM!xi;=+h*o;`tBObyHi~4MOWejf}R8^L*@W zyXkYJn+q%8cRu=jOhCDr%ch8KlsfoWVrb|w6_@J9$DjAeIpk&Rk1rKbgs3>^q(;!a zqV!Km*R(1_(@ijKl@$rSFcivJj3-@+W85$ ztuL$|7HEsV5*|708j@}%wslx$a^tQ1<5y&QCq9ktn#$9>l3X4;IrbYdQfBjQpWv%I zGsD9aGm0pE_s*srF^A(D2=BEj<*=S{LnUn#ug#731zHN1y@t)tzNuDaU!{)*<})eQ|04JEqOk__iwHknM0kav)y7PGHjh54aqe3d-hm^o7aI+ z6hgO;{otx>S+dj&_o2RXu*to)ohg5I%&Beh1%G2g-LIE*PZ=Be* zdBib+S@^V>T=z}{vNO?a!=z6)lapxdq4Xf_&er7lCqN$Sk;hhGTx|clqh7m+ZT->p zgT=^f0+)F|_O{=sP2bhP=?h8)M7L+Bul1GnFAhXip4?n2;&wLS_V!v`j~b?Z7{8sZ zHP{b|U^vV?QB(V{{al^k$I@-tk3UNdxF$l-@C6b34f5Pi4i$CVJ>Pk2RD3}8^~FJQ zd&vcxEj#pXX-(%#w=o-i8_S2gZ{4HzynT?)(_L5tzPt4C0d~{jlR+;(F&tBZ4h=T& zb${BOS>cv)*B7;&zqqDSSU5ZNJpE}?X1ZirS-v`I3GoQctu&YqLY7L5rcs**1O8=K-d2 zVMfvp1|rw%+b+>_^wr%NZ)4MwS#+n~4~hbWq9UmTwaFMog=~JJICJM8dhxe8s{bNv zQZ*UddWfIu_DV+K$i_Mk=)^1OzAl~;esoiG<7`I>T{cHv>--)TKC0Bf!G$h_vg|xM zAfNBhB;`IPj(W2H@a`7K3A|MH3+pcNhbJng!aC&Wg6-s%=cbrT>Nl%Qw_-10iJv~rfqR`~}dY9UK)|7?bk%c!s3C!3HuheKZVtI~71IB`0o+xy- zXxGf;ha1v3{5_W-q>q@Fp_#R3=C!4E9=z=H=IXnJScil6c8#39px|+x&z*DTWw^T1vlnjqWe`AVfKK$+hfAjrkoCw z96-9}-iclz_lhLWgL*nVdAOiFa;Z#H-XHTPnJjKxoKwCXWllXBwxyUB`hn?nqn1E|Tw({4V^th<4K}nd z3=AL3m(AH&=My<5;Z$wZ@_0iapV%f1{d9&TkY|A_f{UAMMVyW|xLRz`_Ces01)GQRC9kw?%rV7g#k+`*L<@{kK)cQ1xPINgwB1X zgrWu?Pw%mYtu`0ajh^NEc_bR_4h=WH=la~$U>|;;(ehSAJ0=P z8^`&=ULr4NX1@g}+C@n~D=}JSn=M}sS1K-b_ZX_UY)U(C?4hHj>@&$H_OAzyy|wqd zWMTcnZt~pJ#;s?X=bh(AjZX&@y;a%uN6P&d4Ry!I%lF$Gl`iBh1UnyeiGfJ!Qye}V z8Xc|fmV(_%RBhWS^t(~q|#aI(jPJ2@899@gC8NPNS&WSLl^tO`!prx0Xv zUo_iSX?nkFeL;c#$?lV91R|^?Zf)6QTkG*bNT)~+nS9iGs6+42J6(sAXLgQTa&`&- z5$JI87_7C!4;(KtfUXR#iVp4tC4Z1=dD?OyGyicymeZAJRIYgy44KlqJ*nAkymN^&HuIu(xuFFi2Fm=RxG011OcURdGc0pB}d~c*8qkN0vXEFSV2=70Awo6YE z+MR^s&%V5qM{(M8&nyo5O8vQPQzD0EtJpoNqi%6m9=lDrR^97a8SwG$tS-OY@szaa z&Mj14h2qbl%ahQl_cD;a5Z#yEpFh@J*pFrTEjeEOGbE%a*F(V?_3(W!LAmrJSfzzH zLE@d4c}8&6t=X$VKNF<3w?SZNc5lib@ikd-l9e5C%5%4g(@E6pQ=Nyi_Xp1|-YANE z&8YeK%)i`y5@8O(OVPLaU>n3;nhw6x<EB?NZp=0;`7ro%$zExui7f*&ON>-IxG#L&c*J z{Ui1u19B4FH?|_#mcu!m9A?~B1h}Yir)H{!RGrA7% z;u__OejljY4IUSyC92(wE+H3EOx@#VP=PM9<2Ua6T={VIv7$j3zN7rl`7OjYVg7LT z8s}-6p||};mBWS|n{`76@%nwP3Yt0Y5b628sNg$GQhDbh zIQY}ysgIQW8Zy*FOif6lmbHaV2~N>wdYr%apRAT!jCEin)kw)u2jX#W&kD!NpM~Y} z#f@BC?yEj|aOgFLaP5^3pWKD|CNura1y9bc5eai|4cjIz{+>~3A~k=4+A&*^9E9OA opVN%kGby?}A@lC}G9QRTb6bRd%0(WtmH$OF#hDuwV2+0V4_GI@O8@`> diff --git a/iphone/Maps/Images.xcassets/AppIcon.appiconset/57x57@2x.png b/iphone/Maps/Images.xcassets/AppIcon.appiconset/57x57@2x.png deleted file mode 100644 index 7a514da210316d1e00af8c21c89759e36b58b7d5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 17571 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 diff --git a/iphone/Maps/Images.xcassets/AppIcon.appiconset/72x72@2x.png b/iphone/Maps/Images.xcassets/AppIcon.appiconset/72x72@2x.png deleted file mode 100644 index 29b9c5a53624ba43613f9856ca77e8f4c2bdcd70..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 21473 zcmce-1y~&E(l(4c!QI_q1|2-Oy9IZ5cMI;p3BiK|2=4AKK>~z8u;3CLf`60UJ$v>& z?`Cs;pAeiBeXSLPa7(f`EWPm5~-#1;4)f@rM8f{%=L?ehhvgaFcl9 zrsinj=4tF=4k2RZXktz-V{dF}u4-;<=IuOUE&u_6-C(W$!tI5EJfEqfJ*)8#8dfiR zConezgn+P@ld-9-xf{8Oxuvy(Amwpe7bUs1nINSWmjXb+NzB~JTH43OT+K&O-PFg{ zl-G<>ScqJ}iw_K7Z|-JH?qzT1;L7JENckHsANc)`!)%n~zmd4v3R3>A)C&b=axq62 zb8;?LE*4V&kdvH;mlenb8<2wq$j%4gBF!QSalSO?cX+yr(Qo0qW@8;}+7!=&E`%}oEK zb8>gF`%So+DVw>SxxKlAn=66m%Zd-YTV@X3dW|^4nG{g@I%}m9OmN2ZsvlN;Ftqgz`p>HI*^Nx zotuw?n+X68KHzs!1xGV$3-3QkePX8cQHGgCeb zM;Cizu)C~(TqA5w4wk=3Q&8ZOad34rb}%)U5f`KctIBF^ZN?`m3gYGw7vbgN;s5}F z5*#8xPHu4tNp27?2M17+Tl`=(nrRaM2#)~cxPu# z{%^Y9XcUd@!7<tSuwqM8s0@yjpRn6VN z#{OTE`Cl;pO18DKvDr^7`t8)O_<>yP|59Dr(cYX~&D6!*+~FsPKOz3549-8@^A{Q9 z)=FyJKNIv19KVzX0Q}1$H77?mJ8MfTw||uNQ~F;?;^8L$i#ql3ABiTi`*SBSq(>AzC^ z3QZeage<{ z5B)o&Y(JXA-)m>Ke^<@_qq_e0;eVCwBH-4+6d3Yp& zKpsv2&%d=5kpzhXcsY3`*xCO<+yCU`?*0e)-X`J}3P7#N9I zg1gqg>)pA?|7_j=x_tjny7UdT$BUI!67N~zr6qZw1Pt& z$jiqL05&0tAFm zuZ*~ey4UAJe|RI}fw`x7rdHOykLBjNl}2jv-TC+kEWxi{ZBn@{`wnH8*ocaX!p~-f z`XRz#iXtFVLx$`%2iGvSj7iL7`?T@vFY-M#X2@Uk4md zywSeDs%#UZ4>bnG%fJp52A+O0^r~k(v%Gk5A$FMZ;$ZhUw6R9mIgYR;`&MkjlXi|N z#*eM6^@T{8X(CeLJrND5WVELA9PJHsxbl5+8D#(twj=sYSpIkYenn}!xJ|0)!QmjH zcOuTpi(=EO(g8NaQZldl`Dye*Fd-!o0qgXTb<%g=rKLsb4Wed5a2_}i(YgFaQ0tvk z=iUjw9iNi5qFuoP0l5G8| zCPw;+<^oDJe#ok5S@K5vrlgkrmTNRuTsmn9?GER&6$Q&;bZ&WAS}Vubr?Oxfak)j& zr0U`IlOPFtfio4ajM3B?!cGdDVFPdNsWrIMWr^np7su3r68LO zt`2{5q!lPCOL?70ZetwqQes_Hx`+A|(i^J-d>2ADXX+s9wG{e5ZLw4a9eVF-t2pVx z3e2yAlDG)W7`!ZV>5&Auw&;lzp#wtVrEf7CPpZ4kiwFhD<;aT33!Kd(G3Tgqh8bS@ zMR~F0^h<96-@M03ZcZAFHqvQSfM!VFUm2MxmH^ft zYQON~lwc9UL=R^ez#lRRM;@rBubkO#UVg*8(d}=B!9*_7EsjYgoka~y>PB3Qiab#U zF&aU^KfM&{kwJRv*8FT2H%<*`5K%4D}kLIucd~@NI#B6yIuwFW)+hT5NZa-x|%q3bjC0_ZXRl+2pQp7v_Zly0lJ{Rs8;$Es{IAXK1K1P zS`zO9`9=nuy7bpTE)*NCjB!M@5!^IF7B6PmL4!egk>?*>aA#R+A^R|!1N1&B%g2Az zWU*;_HBO06dq9(t*NT7wy^atGSp|YYJwx;*(9kJnVxftN87`15D+n6@FyRxd?17|j z-`=LRYrnI!G%!h;kJkxn#DQh;J&wtNVWc~c`W@y}Z_=sa$){JebmQWU1&k`*ivYYx z+pFOrd}?RcmrU4%qz8V?lOzQNw5vXcF3m5^hl^3PLOBc4;cM_QA4sQd`!BcL7Nc4j zzV14Ib$1WKqF4vbK#kUAF^1$0=aM&P`z-`~>sI;ZMRaVl!?!L;96Aw1o0r*cLZLbI4-mCB&&wu5EU(W-m%J<3) za46fn;}n@Ieu*F#qS?Q(!Nl)?6qVnP;3)b+i2zSN@`hHKO%Df85hT{LjZG{@;4tW4 z;E3)`-26cO5LH5?L?pKW$%Wro<=u}KB_>7>k%@J&gieSF?5B8kNUWDOXw{w5%>eHJ z{a{TUYqUQe%7B#)@oMP<={>04UD%gAv_`Q2LcIuoua>is5msG#Lce~_$ftfy7}~g7 z%k90nIGmc)R)fjDEX>BVKfyBrM0$yg7jb&^km#Y1HLFy&qa(Ghv6eX&0u33=va<=# z`F#3wEWXiy%7N^G#)mc%0S=SXM&eg{hq{^TjnL6pVwF5^gQ9^nuEo@ZH}-rLPgqtK zUCB(Dy*GDg+<4QsMz@qf(yjTNZfD)QKpZs7)SbcyAXOOn=#Zha_DT|hFeMHKUpfPd ztVp7lt611co(nG-LASP^M!tXeDEMVa>ON*0-OT0APPT96IyRQE?3^upMo2_6Ro>fW zQK_z}V-X<;$%F$D^Jx%?@%hwosW?0--eJKe1bOhl3(bu)y3))z4*{PT`C%idbHZV2c$o(je-t)X*{-1KU4h z5sXyRxCvLH1N8)ziXe#;H^d=e^+kPgv`_WV!|G5h4-o8+7KRV)O|D6{;)A7OtAjA0 zv(xBQoTfZZJBPV9F+5j9yx~-)5}+WAA=mLsh;*gq6gcE73K+RQ9B%USz&F}G>qHhK ze$O0*07M~D)dsnv(^y9{;{Zl%05y_H)mull-3l_eZ_QNX?B`SoxpCZ@3;mRtj-iZO zLB}tV6?PV7d|kTgoh!eL=SX^x0eGg|xtDFID##_Hgq{$@)TFuE;4*>(;gA}G=rhW4 z1tf&`%pTlMPLe(d^pZZLKTTYRkOiYbKrx2upJ5{@lcb4{?4p#wrG5|Agzwgjc-~w8 zV(_FO4a06)5?k@*2xP(zN}siG%{_hZsJb~@U7)Vj(EQYui1U=_i=J!BUJ#7}bPg>AQKxEj-XH$TSHWyh@#Avp@`RblQ7%@@-RAK+(gD5z4sw<<9M{fPdUo7cRgsq zsgPJq6fr&0k%;F8pU+26OY?}0#WF7wrJ$@2Fk3~!CxKbsjeGKoj>$2G7sAK>dq>^4 zR5?4;$f5KEGQ2FWdDS!B$b|NL!od=8kd^>?u(M7DX?)03ki2V9Yx)gm6|3yy8IHMX z@})9H9KM^!VpY(n&_!CZY2A)-QT}>F*nXRz0b%13gOCE48B5Rdv6{C$W9vFCJ3-nJ z#|Yn+H@z#RcA-DN1|7d=Q7skNaI0IYSxTa|D}{N1FmzIQ(<{yxX=|=Qt>E#_C}iar z=eB3)w&n(2YpF_IuuSXZaqfEmO>on?1NA#6cHD=V=hUz!ydvSsn(R`c#1r zTDeT_!tTpwdEIS2XoOT7V z-mozZEpKBt29V2B#Ef#N%%J5UVG@X>C=PGRHp`scce~rJ>o&oxSW0|@>BBaUk-3ff zy4#8dMdl5g5LX|zC9hkk`aCuAy^d6bCEF>$hxBATDC17mQvQen+V~%p*JZuJo2=)E@w8v^kiDO_;b!0Lv?R5 zj72??Y>0W18qN)i=nzg4Y{Vkf@$IT-k|MsJ3y~2`9%;|k>JYILW*9*U=oz$zI!!pu zA*ax|lm@P}`LQ#qWCgb)Mt%I*(2kB{^NMraDDzYMwbs*BmqtlB7ZxqLh+gUV22>>` zNUu?F56gi)YR4j}{w+qr!mU;&$w0r~XphnIQn05{zY<3lIoS->t?St&-#F*7@tbJ+ z9l%Xo8K9=|nFJ7#YD7&dmv#|=+F4?}Hv5VDd5i?}@I2*RJJXS{CMn+_X;;HtW#6(f zz}m@zIV+@EJ*org9>9`aIzWm+2p8^EAj>!tykU*>;}X6v~+~>{<)Hx$b=P#jr&MhnGKs@wMR-X zdC)jnwqut{7_L`8kBNKnZf2MYwmd*zp*RRvA9gq8$x zlFUGT7b@A7c+s{FHFoO=VMM#9#=Tg9Ui`0yn~TL9o-ji8>$=3DRD+kZUkgz+3P~ZT zl>KnYZ&3=UyU*5A&nLICyb2MTq{$G7h5NYz7u-$-hU{>3JTF#|1)5(mr_?)u&=jbM zgfjEfl&cF5Z~CLO;@)aM_Osup=`n6_(5xhDss_9dI(t`S(-xL9m(6pH(BZ=2r2mbn zbLgcm-*-hyLW0PZAa-BF*B8MBNPw53#F^4U!oed=X?X(FbfV(Yyr}Plxcrc!u!dUF zWLl#RV&)lvpO9+j{FN|N%;*mDSibt_&mj|zN|lS(=21RQyt@~#N-Llq%eqIP#MHP( zTL>O{U%+%1`j~pe13994BDwT1APmh1mukeX?B~aL>49B_phzi;p8p*YUowZXRGihi zCOwNbSy3qof12e&6?7xLR}}{oB!~SXcIU9)idr8UQY}Gudy+Cut;dg@YUDBv(SCO2&Hob?LoVvbe z`vlX{QZuogGaKbbG3asVNbX4bXxL8$I_r`3)hy+F3$GD4yyDO5nd7Y$6iQCqPu<=t z`(x`lI>|xNPcdEepkGA=2%mwAHt3f_R6fCt5({ePh_S^qa*6Jl&nede&PMJnz9GbZ zKA+ebZLdkHgm~WceH9JMUxgRQVzXUS2Cbba4X?mJ>#$W^gHrOYd*H1zu!3=srTMgP zdD=WaOf5EftK0|X_;wOCk1U#|jfVQthx0&zpyfHCfaKEJm~t@D4u(Jg_8Kt0*UduU zgAA`FzG7t_BU0(h;d^&wl-A~}qn;yh>EyAzT}a6hhbT>5Wk?8@BONKLQaXbD9Aa?V zT{ncE?3@2R?G9thK-N7`Fb7Y~-H>WSp6~!nMNEBhc_Jk*%{)J{PCAUT^4MjshK)P} z4R~tmI;03xeA3wSA05(O@LsxFn~ZApF?i-_?Yq+4cv6_yT3t?O)E?uhhR>zKlb>11 zTqG;Imt<1boWVRwb)KX|gc;rl>)F2T`vBqlF1}KOW|qo5334Vncul9$%_S0sCKvV7 z`w_!O(>t`SQHM^;Mq3I%qTk{RYCRGLO$IB_(c0Dexh@`jA$IV`M3l>WRz;I$cyCe4 z^P$mIUg-$Glf}+e2SPuG)^%}}vnKUAb89G?JxkS-3?|vDGyjlbUxSs!oy-rf9Wo?) zlt|!ONZi(so z9akK$0JMdHyffw5G?nN=5U~Q@bEU+CG}Dkr&r*HcUJJU^xgM!YG~Z%9%^O|`0fH-s z)LMG?9=jVfjNU`&ICO>#?#{uERe9)XOQx3=r0gMo+J9X<3xCsNpHBiS-Z}q$?wLwH zvqDa-Bm&*Hke1JcpL`Oxpm<3dH4SHb+`l0N=!o+Th<{+#AeM(yr6i%N;G@a%cx|Jj z97i0c7O}YPs$j`RpTR^%h%I2t?+C=QV6w)=nT9V!N-88LEp0HuuJGu@f?I$t>JsPy z(VzmHh$^xU$bH{s9|u)7Bx-I=&z@OuhFy_vJX?~9m^pm=o{m>dGL9;MRTUkb$l7{+ zNiXX_@0_`XKwv<((-S`yQnauJg_4FUm6Al=&A)-YN5-Hc)yjp+`?Hu8crJsB!>YWp zOC^|adH!(OditDG{ZmYI1Ra1kkceg?b1hRJ?s^R;!if5@U~>gYCz}UBQHgC~w#SpJ zZbIsl>4|066dJQirovDh-9ZTpbC#j>pe12C4zs~>4JCcJ8-A+GhMZin6KX2{j+b?1 z4@Cfq;C4m6=j2IFK-6V{G|i_(*m&M1k5%9ofPSnhMG7BW+6hywBvLpO1>2aaylb9# zFm#7JiAnr>2EEF|wkH4Md)wWKsMaWqYY3W9G8IZ#Eu|9lX##TrZxbdH*!-Z}YWBd_ zE=XdT)mI&;9a9t6KCc$oWD#CR3Q$=9zFP28C@2FXmx#SQ)7#eblkT=$gLT2H_q3sZ zU{z6>s<%xy?3zgT2UPMvWwTB9OK9v#g`cg(HF z_ofFP(=TexXLb!W>_nQDc!?|FXw(e0s9M*P?s;$21jmtX&VJ?lZUawIfeD?Bc*wLY zFPjS~fkcY-y&7H&z9)3JBn0{dZIvjmBUx3waLO=!N|5}SDoEuyXz*Yt*O70B@;uCP zdxE%x2${G+YZvyxg8V{Kl#P*6mfqWeNyMI#%J^`z4eonz-S}!6e_a;q-TB(sx;nJp zQqVx4gdW$3b1^1^ns^;nv%DepaBzuVmS8~O$cJ$=Kg^q!M`5?qY%Djd6lyMG6$AM) zrv}nkHd7S>R_z#3GSAa5!sAau_=+t9$k1#LRXbs&w+wvNh((b!-&GN{phZga%RIxb z{77v;174VJ&P+?Kbe~d`J`n(69I}GGW7bmp*n&C}c%3?}=fk#-Q>JOc%<`kuOX8cH zD-#}a+c$4)g?W?}G|tvXA~>xD&gd9sq_w)XA9iTckd;Pb*axxV==@f11*fnYT0e*G z%0nsIJj8ym)<%CG{4t-LvT+FY*;iyzN42eFm+O`n3s3b1x-#hpm<5P?h_E@WiMQy> zxiO9r6fQ2YxYs8gJgwWo>e@~*86x+H%?)_oWu=UCdv+#Q$EMeJ{S;2aEEx^Zy{vD) z-#~CZENeU%+#i&#>vC@IS6{~dh@VP6LugHC!iTG z6`H+#B0P_9cU*IB8ZDJ5vDz3K7bU^zaQ%>24mK!99iRNxzt9k|BO1Mw@N2$bIN)=z zHo1bzUn>aiNO>pWqty-LbS`Y^;dt8N+qu;~oX_WfBvE|aomV%kM$FS}uNMxbS)?6+i z{{{`B{2qFu>!l4n2q6OTs=K&%7l>6XTV@h%tV*D-BbutdJ8J9BRYp7|)yC7g=8utb z^EefJti#$`w|O;A!cS$~+;y?D&@i#L?n|7M95k~@FdWz&mzr4AbsYF8Kig#9bjUcQ zv`YAynOYII0Na2UiS2c&>Gx(?O0!LbSeSjkWY-3l#4mCofpexlP>J-32DFi};iI$C zH8NWrFP%{G^N3xMl6f?hcAp2mh=uhaMTe%qE&$ZNVhlai6~%+zV=R(oax*t|YrvgJ zDjPaJ_E|GuEl+mC>am7yOTy7nITGJw8PD~!-61jVo*7PKKM4)CULN3VKk~h9Yos5j z;)&&_I=;})|KhYmua7Ci%%!4!NLYjk)k0;w3H7zL-zQ(R{aMHQ9S^-B23A3+uy#XH zADdw4G+dsYcK`j*Id0TfGT270Iw}4e#qQELPrRfX9CdF7eLY#6gt-K0ub@W)c3nMR zr3L>gZ^PX8xo$y%C;nqaO*pGrOW5N#X|9In_vZ+n_2k?8)}vwUuJC;2(TsO>J6q=! zb(_|qOo!=R$Bzgq^jwOyv4hkoH2C*0o6pt1=-uHolD)tQ4hi&r!peD|HpNxllR=Lj z##B8@Dv*CO-OIQV^eT-C1`hVa%w%do%9uXNyR2+a+Kk-O@ERlOEcHZI?)4P!mZtMg zt&XQGiwvJE{(#c0q^#*^Y^Ms3ivS&T#YJh@Bu4xsC7f^1xcu1b-P5+Rq~~JW)ehV* zNdvkukBw6(cVJXxbR*u~si!ouP;?QU&*ay;9yxkF>5FMe49JlybWnMQJequ+tc@zOq-04y$$*n zEp8gqwHTAGn$sFnyz5bzKwL!hh$uITo@njW(+)al$@Pn-GsTB5Yh<)Z+=crcg$XIq zq3;g0GaS5V3HRv;>4v$;(CiOzeWFV-RWKq&LB*40irq@`q3C*844G>h$U7yU*KdDNCq!6ZPsO(Ow!L zm@?5G6nGQ@oeANr_U|4Oo`pS2;E9brWyvvT>-YS$EygK;XVGY)Bt$Q#7IFjQ0|{(@%}^&JEiJvH(qK%sI@BYk!YGy83f zNch?m;dQH|#qoNI)SdHL?@SL?1txkiRKE@Le7w%I?b;Uwrv zyH2K8vESz$qp$O8@j48A=}A>zN7Q_0a`-u48KF7@7wZzM+v`1(p1wTJmw9hI^asvWi=nGv1s!DG%C93kKNRy~Ztl9ZtegYDGA!oY5LQxaC2vkQ&3Yt0U zlCkQgmy(5pJr?(WP#-89Y|KBRz@{!dB%710kWSPHQ(qT(UjCZbq#M-}$KI=OqlfGh zTdqk~R;*@W(1|^Bpj&&uy>q2|yTfwFmo7i=6UUaz;>dpYZ@Md&UBV*5or%`%pFOs? zZnXS|d>&g1=I$0lx*rn&5qK@>cQA$y3-I1wa6f5F^8w@9HQdn{o><9A06vX(O=Ibq z)_i@@OCXhQ)kBYR)C{C{p_(p5!;*_VAvA7m42ha?4ENiL?d>*fMG~`TbNjZr@BI!{ z?`Xu~reT!T5>kZ`9K?{9RIAF{n(jKgP&+fZbTXPpJFZxs_`hD7dUC`qELL{3fHGs? zDcka`9s;(X!|FRn^49k^m`LM~UfpKv?cC4P+`SeHQ-_>U1Zh50$lE5*hzTJdrd4r| zfSlX&C#ig9O8knTQJkP`oL(B2sgm_J50@OuTqmivJ7w*zwMM@ypkpLuERthCenw>N zTf5;rm1Y0FEr-<86TD)Xg%IGEaaFpL!3aU3PWK) zAbADQ-J6h{gs70H-1_3DMWg@hk-u`7MXjgcM$4OVG!pXq z&P+{!ET5v;Qu-p|l0p?eBe8M#H1YuJ?i*8w?(2s{pv62L6KTb~MjPlF^yL$O>$iuc zwN(z@M2W-N#<^oyp`1LT1?yhz~Nq>zzD9kVYI=+*NSd; zM$%$c?+$e=8n?veUTsLp!F9#$m7uzqR!BI^vkkn69+dlFZ~K^_3EZR`7QKTB3ERoh zHw;IR=_c@3>Trkx!3O!35l?C@#frj%F#san zQ#6e+lD((Ig%69PbYt#YM}Blpua?@r`M94nsK<%$v)Jf13Vz@7`tpg^;;Hr?mMJ>D zxa(2lMr-8|hL>OYZTSk(=ceHXW^y<+E(h}^i>7fh%zId~N8q>bAEJ->7F^#*3#w|3(NCi0Tf1bb`gtxU92|)VU5S);n+B=@AVG#Ufo<)F*R>S=VYP&W zkS6FA%+ksw8dljWn*r-ye0~Be8A!J<*Egiq1}=$0=u?ovyFcoRsR9#r%^;{6Cv{(6a{5-SKAYWMJ zwsM`G8tue9W(&kNmcMCXq*uP)?1U##O}m{nX>}E`UY0tnK#qcjQm?el4*%fp;PQ(1 zf^R3ISUj7AvnnNGzwC=+V3 zd#Xrd=KE3!kVeq5J{q!VFsg01rI2C;+0kvS1}i%_e(G0P;Q|{ayL3lzliNBN=+JM& zw1FCKwj&eSqC5)9Mq0~yJMy!83pjd$ItyJjC%1AH>BQypiMV>j z6X+w6+B|C)Q`&_OgQVf8R@H>7(T0{ZYSvhHxkP;Eo-RGyK`SCbkgzDIB;B-gUV3ND zO^$NkdXNuADcpYdCWW+Bu-dim`e+*J{cGMcZ>OeY=Ah26iLaFSRxa$f=MYtq5NA_^ z{9!{mZY{+=;=WIjJt&)IfdHc zcPzGb&BmAozi*u7a0sqga4P3YMWx(Zft`om@WII_NDS~biGYHSOZ`^RaCEQm^OyMv z6QFd{8!M;e zO|$K?z~5}@>*Ysqe&1^qtbqkcX$ZvtDKZ#bK(=!?nLhvwG8f+(VY1fiLwqc!_z1It z>4fei*Vl$;_7<^avc(=5f@P{Qa~tL&HKaB@spx>u(SNCp2EKl~Elm=xS?fYbx5e3K zrG7X+Y|?uS8CME$2WqxAU)tY<5arc39%O+^Be9q&H==?CK7!U?sHQOj+xsE3beMs3 z{`3jtQyeGWitDINe2!3fmhUS)EKlkr?8n%fW-9Cs+UF(KbYj)4L>0!7=%o;~+l#+$ zzXuJMJbp-P)%=Xe1gbz8gwh!uxKd8TWzo@Sc2jzX7MF*(6v{R zUIe^!$%aVOEreF1Tioe9535HAJBat|%s**;lf?vC=iJ&#(xcQ9TW96O2k3;Y283H zSIjMAX3}Y|H&Vf>bF2*zh2hxxhHH9Z8vcq6o~BUmfwq4JRF@2>UT^OmoN8v>IWm7A ziaHLi>MObr2Q|XR)@#5iZI5cFyQhbsLAJfjsoA3mhX{;M2}m;Fceq509E*7fjL= zrv@cb)usZ7hah*9q1>m|OTOUOJV0O!e5r{VF1<6?TSq!N+}@aJeY<`tzNwS&XRp?cH`xSe-6 zhbWw}})OYec>hk0_I9KKdgoN2$IZX zK}N@pZ(x`&3qmd%ang$Vjax-0_mULU`1aNZ2O~nd{ry$cc2A|D57Jozb6!bOCl*C; zg?Mi;PQ96OFTNG01gTiRQlHe|m)`r5CqTQoEkxuL660!1sV?f>EJ9&oI7bsF}`( zmh7nPH5km~2t!`3D)N0}>Kej*GdW2|0$9;)nI{QWV%j}33xFZVQH8};`Z6B?pHc2o z)}C-2mj7Tkrg7oeC;t>i z>D%E}p?oF8j1Z?yVrUpVc(V=VU8gcQxoF%kS}qHDYv93s-dBqe8rczczVBB|cIit= zNoWBZ-!WopN{2DPD|ZF9yWbg;+ z4cVthJR48<*t1ok(xmX)T1bmDTxTXZIr8_AGl;8pZH+(A)W0^)gbW4Lj#=N910&s4 zCpUfGac)RbxCchfh*EVJj27-bc3!fho7km{W^QQkY#T1%+sJy6c)&R`C`Zw_IWO;- z>G0pMLg$YW0`T{w7EPbO|Jokna;rkV6DKNTo$n@92GU4Ga)}xYmltFGi8+?2+T%Hr&EEcyFOP%9dkK8+mKLw0!+WAD;9XzandL{hshO9$ z`#6W#p`oab=x;h?`}Z93uMu3;D+x--(l0XG-+M)@WWV%$e*D2&7h%#=8s)Xjd05(U zbBiMSTlEBe$@E9tU13LWo^q(050_6AH||=p^*W#C`Sk5!^|^YSv62I3k z5TYOaA-z=-8xwZ@+8#|%_5MI+P=>qr>Y}??<`xlK(we1(LUwo~*L`Jm(%o-~GntmY zI-bZkmjv^{+zqj6%NIf?;*-T1AzIqgXu`b~X&Wtd0ehKQsqfa{nUqC_A_>d*eERao zvFmRLewt;IZ)NtMK-Tu+GYFW-)<;2c8~ zadz3)gjGWh1g&2!jat%%QHhPkq>p=!J0Km+sk1?_(0}k7Jyl<=lhb3uZK`N~drm5e z@^Z82d5l0mDIC}LwtY+a!qP~_&+3=;L8r09d?PPmE6w?#bK?uLG^SI7Q7qWkTLcQ4 zbnvdlZf_pJ9r2!49J+PeCn!E~kF<5l?A2rHZ8nYutA#W zusQGj?2?=ddRg>^vN@NF& z7mw2Q=m03SMEM{um7sIuaE-o*CIBl^=p{)#UYcN*0GqEt3z<^*u5jZYdr2KF;)l6R zFWn)5>EqAB;ys26D#_S9*gnt^8(YxdSGuU3A*DAAl;duHco6uQ7p2WP95oB47h&7s zO%*=Be%e|?t{X4zY1wXk@2c@3DB1!Yo^*_I;Vk=6rCZ*o1L2AhuoF#_*piCoNA}I~S!UEa zo&wql^kr+!s4+~faqmP+Rd*=Iddzj$)fiW5>!@1nY}-xFGASJ20F&41gZKsi9|2Aj>^W(0Cpdsl~B z^vn1AZaMB=zC-_)Y5REabOf}F1YeDd7loEpLyc2(g{*~#iIEsBRFnXUM|gL2pQ*H2 zjV!>cdEm;W96r3*dTg~NQ?7hM+Iu2P{>mjRoAIdu$a-+MN=HO1q;?s)-PWOzA*g=} zsy2jl*6gkQ)KEatOvh7iup8*?`HsSP;T?9^kQcwPVBbAUi-qMH$5c^YvyqeSCrYm^a3>f*>0h4D_iqxK<6c$7TN;@I1MJNB;5tgKBW zC|Uq-Cz0orzkscCx4H}14&riNy?ReYQiBk-2jOeg7Fg0gzKwFe2i|9Z^G@J;LqU9g z1bsPpN)^?*qCQ+SA0;yxF`^XMefHDS0b!)lgC=}LLQXKVXn5N=K2{o2+f9; z*>wpQst@L<%x<>ty0OL{UKBo|j>U-WDguu|X=*N_qi_A|h0})$y`{@5+mzFTruH{| zRdqcPsnzlp56)N)K3~qmQ8He0>RYs3;0bnRDrRRK5p!C-vABAHx0+46n~rF4(!qw( z=~h4ytsUBvYawuXIvT+sa1B!xnf1_dwZ--A(qI~ybx7x$5PpU5I$0vqM-Q9>)jZ22+ybnI9OWttr5J8;4`kKuEK7XgAB35M2pK=kB9-%cY% zge-v(&=Kl!*LsiOOZY7G(5MbkGISaa2X@RslTq#Pbow^>zL>rfn{^#FKz7Nv?|s5` z1@{W7tgRbFU!f<#G(~?W`}h6Kjnu?U%CZx>E2f-XUz=!S7tM3`_3_tJJyRkyZzn32 zHC>QnzT?3^v43%bS{5^~n9kemjb`?G&thlGzwoTv(FR)9Y;k2JER4Qbu^L1qFHVZCHNkK=%`)S=FMfRZ zk_e{{@6P{;>^$n8`MyBj-+($kzx;{wWCrapeQOA}+%P@xvOH(u_Im)l^#?zQ84xPv z-HQ){5sU#`j3mxVi`g{lr{ybw5b)m9=a%FMTA%f)-?lqFhVZCzN`T!<~+ur(R*X#=TFPp9bGMB7UC>C9JrH|taBPG7U!K{{R|crv5$ zWZCf1e7=N1%_NcZ)J#Ehm{k1S1nU_DDGWRgo!&)Ne_M6)scWJS?Ip*Bx6=oU)$Ij= zsxH9`MX`6&R49Z_Z?kK0UftXjLbqcRmbkc5y0Uh2b?2VG?WWp78-8Q`Qm3`CcKHqCQD&~m+iG|Zh74Ilo#Vw+?ra~&yV{62;c%# zrSSurfgjJp?4&!fWditlIjgVB0Su`j@fQ*lschzZufoVZK54y$$PcUOoNSS8nf*+Z z6X=L~2pRwhmIw4z2@COLoQgU-DPD6#u+{0gcrKE-Y^^JwE9q7-y&Zl2ogL4ob~`l$-mKUmaOYU(c*k!Y@;ziA@Wbz~_FaBMJ`x@zhW6t7&ieeF z(yrJ#p652k8VbSa2$DwUs1`a4zS#4^j$u#V5th;0ojU`k({I+{ShaBiW^~3FBM^hI zlDjwiJ1J~-nX|2V6j_wHN9Rk=8=i0@_h=Eb3C|uY+BrKZz^rGb>*}y+d5&WnUQBOJPW0lNQ)6E3f%&f*cI;% z*2)0}d9HPYdl*vi_`!*Q+r(8SuZVsM+?tb;WJZ`wBZ>(hQQ=-K6h8)uOmTCxteoo# ze(W5$h-REhE()N!^p<5gX1C&wsJ%!y?H;X=@b?+kfl!~K%Cqz$VQ8RIvQh>qcM#0` z#O(UTK4iAe__M+p; zf#EAY`A-t&4-Z?y;3fG8!Z(9>k#lGPk45J>EqtyrIMjP5aAEd=gABegZgy_# zJ&F`$^$D^gYS0AI^*;AJ%>uOTcl*maShF7B)u$(takF~XCOsc16NuY}oH>q~9ePtgPv5=#=UeARg|vlv&#Lvgv<+dK1#^1uN0SRDV~} znEP((Gnqj3ct=4jW5cVo#Ei;m7-rGuw7Ww*FhrWI^YmYkyY1BGW@lq(J>Z0gR67}O z5A?fN&!WV9Gdjl3@V;ngo}A5YPbI=u(r{L?6(C7fLyB!Im=ok*O$bQzq?)Gc@^{mCCqpOl(ZZgwxv-dG z=w|!4`!|LS?x{ed#Iz5^vaaARWAw-yG{c*o=#4Q$&vXGVXu}JK=ikvsuzj(@0M#V$ z8ud<~r96mUwk8#?b%s?Ip_mLw^Rqg?y)5DlFP`E5IEzAeh!VipRc(=jPUF+ib=UrbC5?uPW#rD(8-&?`Mr4vudtW0d_|-k~ zBP#9P#{uLtLljaIw2&uX$GtD<{H$tRUhjRsLU*7gYS?4=Fc1cj`nxAZx3stZhb%(t7`ZVFXlNWTj>2`LH%4i zSn*+D=jx}*%=a@@3xbaAoF^_=byZo6G1Q*|a8k^uy&xM$>25!8On@KVkFccf7^0$w zBRlfm_z+SBLg4q}dP03$#4Jg9-1RKuuKF}p!!ccsO<$H?taplNC9sR{ z`)31-+_3626`I700k$zbQp|gY6&9ln?_yWh8Uw!^cTJZ%rSL|f`8H>zch)Z*UgqT0 z$!b59LDRkoh91v%X}z!+($Ly^Qev;WMt)@JyasQ=U(^J?QMyP~9!QKM?8Fa_5zlD- zo?}qc6kf@<3$oF1$zJ+THH#RAsR;)`b~lqGRgW7b#&`%xPbWL;`d;_yG}QW8MMKLt%Te zh4$pUUjHEFx4Gc1r{iuiT@W6=5p@33{|P<=!TfKq!LJZtvQ=y2Twde@4fzB6_mztS zlqDbrw+?M<2sZ3z4jyBU_lUiDxWPShha`*6c`=?elQ|DAn-`2OqAYAA_^D}SCIC- zK@5YjaH18rI4Nf-RZ^|5oNSm3AeAZJ_Ng8>LI4!?OP-fO+{5Ie6wK9^LW{mkz?5dA zm3P7O&oG{Hx$UwUrc=@{_2m%P!F3*Ejx{q!`h>ndeqc}-91@3uVhEfh76CSVcm=eS z6G-9|fT|~S@TfMz0=`5(nO{s7O)yNT)KwG>w_?S`y5Ajo?{&|=4zWkp`27%-_%!6l+`ipF&YLRwQ~ z48O1_lM4c6-R|G{j&IBE(4Ka_!$~>|zCiBtH2_R$|Gk2@L+G;LmdS<*Qw)=5n$M^= z)TiGsYqUxq-`@~u_{6_$AG7~3dj#&Mlq@k4hObWK?5hQs5;@S5K-+r7J}Yh=qpuyS z8&jv3egHyce)z~sC)e2&+;?2s1MTP$_GpW=mpXD11)!F{f=es1UJUWYlt>nEAyweS z3IRFj(?iUmpf_Zc7Eg?=(N$OLDod%d5?x8HzB>Kxg308ilj~|>Te|peS2*H+h-nVL zs~nl|JUeNvrE6rIzM3KFuXK7$1i47^HuNJUKpgC(9R$Kk zSb;8rxdK-&V*Er*U_}ndNKg#=kZ+J51gQm|w@c^_zrPOjixJKR@l}24SGiBVHu+4E zeV8O*VjL3i^NB+}q23T;c#MNTMTEk1Lk>I$oDPII&U$rpDHziF0u&4sEAdu@ji@qse fZ~;&M{|PVvT~9t3x(rJM00000NkvXXu0mjf1R48E diff --git a/iphone/Maps/Images.xcassets/AppIcon.appiconset/Contents.json b/iphone/Maps/Images.xcassets/AppIcon.appiconset/Contents.json index 3f27b3531a..c01af0501a 100644 --- a/iphone/Maps/Images.xcassets/AppIcon.appiconset/Contents.json +++ b/iphone/Maps/Images.xcassets/AppIcon.appiconset/Contents.json @@ -1,11 +1,5 @@ { "images" : [ - { - "size" : "29x29", - "idiom" : "iphone", - "filename" : "29x29.png", - "scale" : "1x" - }, { "size" : "29x29", "idiom" : "iphone", @@ -30,18 +24,6 @@ "filename" : "40x40@3x.png", "scale" : "3x" }, - { - "size" : "57x57", - "idiom" : "iphone", - "filename" : "57x57.png", - "scale" : "1x" - }, - { - "size" : "57x57", - "idiom" : "iphone", - "filename" : "57x57@2x.png", - "scale" : "2x" - }, { "size" : "60x60", "idiom" : "iphone", @@ -78,30 +60,6 @@ "filename" : "40x40@2x-1.png", "scale" : "2x" }, - { - "size" : "50x50", - "idiom" : "ipad", - "filename" : "50x50.png", - "scale" : "1x" - }, - { - "size" : "50x50", - "idiom" : "ipad", - "filename" : "50x50@2x.png", - "scale" : "2x" - }, - { - "size" : "72x72", - "idiom" : "ipad", - "filename" : "72x72.png", - "scale" : "1x" - }, - { - "size" : "72x72", - "idiom" : "ipad", - "filename" : "72x72@2x.png", - "scale" : "2x" - }, { "size" : "76x76", "idiom" : "ipad", diff --git a/iphone/Maps/Maps.xcodeproj/project.pbxproj b/iphone/Maps/Maps.xcodeproj/project.pbxproj index 1a45d17142..f7d000b26e 100644 --- a/iphone/Maps/Maps.xcodeproj/project.pbxproj +++ b/iphone/Maps/Maps.xcodeproj/project.pbxproj @@ -9,7 +9,7 @@ /* Begin PBXBuildFile section */ 1D3623260D0F684500981E51 /* MapsAppDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1D3623250D0F684500981E51 /* MapsAppDelegate.mm */; }; 1D60589B0D05DD56006BFB54 /* main.mm in Sources */ = {isa = PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* main.mm */; }; - 1D60589F0D05DD5A006BFB54 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D30AB110D05D00D00671497 /* Foundation.framework */; settings = {ATTRIBUTES = (Weak, ); }; }; + 1D60589F0D05DD5A006BFB54 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D30AB110D05D00D00671497 /* Foundation.framework */; settings = {ATTRIBUTES = (Required, ); }; }; 1DF5F4E00D08C38300B7A737 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */; settings = {ATTRIBUTES = (Required, ); }; }; 288765080DF74369002DB57D /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 288765070DF74369002DB57D /* CoreGraphics.framework */; }; 28AD73880D9D96C1002E5188 /* MainWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 28AD73870D9D96C1002E5188 /* MainWindow.xib */; }; @@ -17,14 +17,14 @@ 343F262E1AEFC4A300388A6D /* MWMFrameworkUtils.mm in Sources */ = {isa = PBXBuildFile; fileRef = 343F262D1AEFC4A300388A6D /* MWMFrameworkUtils.mm */; }; 343F26301AEFDB1A00388A6D /* Framework.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 343F262F1AEFDB1A00388A6D /* Framework.cpp */; }; 343F26311AEFDF3E00388A6D /* resources-xhdpi in Resources */ = {isa = PBXBuildFile; fileRef = 97FC99DA19C1A2CD00C1CF98 /* resources-xhdpi */; }; - 34570A361B13217C00E6D4FD /* Bolts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 34570A331B13217C00E6D4FD /* Bolts.framework */; settings = {ATTRIBUTES = (Weak, ); }; }; - 34570A371B13217C00E6D4FD /* Parse.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 34570A341B13217C00E6D4FD /* Parse.framework */; settings = {ATTRIBUTES = (Weak, ); }; }; - 34570A381B13217C00E6D4FD /* ParseFacebookUtilsV4.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 34570A351B13217C00E6D4FD /* ParseFacebookUtilsV4.framework */; settings = {ATTRIBUTES = (Weak, ); }; }; - 34570A391B13219600E6D4FD /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 97C98653186C5F0500AF7E9E /* AudioToolbox.framework */; settings = {ATTRIBUTES = (Weak, ); }; }; - 34570A3B1B13222600E6D4FD /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 34570A3A1B13222600E6D4FD /* libz.dylib */; settings = {ATTRIBUTES = (Weak, ); }; }; - 34570A3D1B13223000E6D4FD /* libsqlite3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 34570A3C1B13223000E6D4FD /* libsqlite3.dylib */; settings = {ATTRIBUTES = (Weak, ); }; }; - 34570A3F1B13225500E6D4FD /* Accounts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 34570A3E1B13225500E6D4FD /* Accounts.framework */; settings = {ATTRIBUTES = (Weak, ); }; }; - 34570A411B13229300E6D4FD /* FBSDKLoginKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 34570A401B13229300E6D4FD /* FBSDKLoginKit.framework */; settings = {ATTRIBUTES = (Weak, ); }; }; + 34570A361B13217C00E6D4FD /* Bolts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 34570A331B13217C00E6D4FD /* Bolts.framework */; settings = {ATTRIBUTES = (Required, ); }; }; + 34570A371B13217C00E6D4FD /* Parse.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 34570A341B13217C00E6D4FD /* Parse.framework */; settings = {ATTRIBUTES = (Required, ); }; }; + 34570A381B13217C00E6D4FD /* ParseFacebookUtilsV4.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 34570A351B13217C00E6D4FD /* ParseFacebookUtilsV4.framework */; settings = {ATTRIBUTES = (Required, ); }; }; + 34570A391B13219600E6D4FD /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 97C98653186C5F0500AF7E9E /* AudioToolbox.framework */; settings = {ATTRIBUTES = (Required, ); }; }; + 34570A3B1B13222600E6D4FD /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 34570A3A1B13222600E6D4FD /* libz.dylib */; settings = {ATTRIBUTES = (Required, ); }; }; + 34570A3D1B13223000E6D4FD /* libsqlite3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 34570A3C1B13223000E6D4FD /* libsqlite3.dylib */; settings = {ATTRIBUTES = (Required, ); }; }; + 34570A3F1B13225500E6D4FD /* Accounts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 34570A3E1B13225500E6D4FD /* Accounts.framework */; settings = {ATTRIBUTES = (Required, ); }; }; + 34570A411B13229300E6D4FD /* FBSDKLoginKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 34570A401B13229300E6D4FD /* FBSDKLoginKit.framework */; settings = {ATTRIBUTES = (Required, ); }; }; 345C31711AE798DD00EA0CC2 /* MWMCategoriesInterfaceCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 345C316E1AE798DD00EA0CC2 /* MWMCategoriesInterfaceCell.m */; }; 345C31721AE798DD00EA0CC2 /* MWMCategoriesInterfaceController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 345C31701AE798DD00EA0CC2 /* MWMCategoriesInterfaceController.mm */; }; 345C31781AE799B600EA0CC2 /* MWMSearchResultCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 345C31751AE799B600EA0CC2 /* MWMSearchResultCell.m */; }; @@ -133,10 +133,10 @@ 97CC93BB19599F4700369B42 /* SearchSuggestCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 97CC93BA19599F4700369B42 /* SearchSuggestCell.m */; }; 97D40C0A184D031900A1D572 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97D40C09184D031900A1D572 /* Images.xcassets */; }; 97D807BE18A93C8800D416E0 /* iAd.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 97C98651186C5EF000AF7E9E /* iAd.framework */; }; - 97ECD871183620CE00F77A46 /* AdSupport.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 97ECD870183620CE00F77A46 /* AdSupport.framework */; settings = {ATTRIBUTES = (Weak, ); }; }; + 97ECD871183620CE00F77A46 /* AdSupport.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 97ECD870183620CE00F77A46 /* AdSupport.framework */; settings = {ATTRIBUTES = (Required, ); }; }; 97ECD87818362B3D00F77A46 /* CoreTelephony.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 97ECD87718362B3D00F77A46 /* CoreTelephony.framework */; }; 97ECD87A18362B5400F77A46 /* MobileCoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 97ECD87918362B5400F77A46 /* MobileCoreServices.framework */; }; - 97ECD87F1836594400F77A46 /* StoreKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 97ECD87E1836594400F77A46 /* StoreKit.framework */; settings = {ATTRIBUTES = (Weak, ); }; }; + 97ECD87F1836594400F77A46 /* StoreKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 97ECD87E1836594400F77A46 /* StoreKit.framework */; settings = {ATTRIBUTES = (Required, ); }; }; 97F0817E19AF72590098FB0B /* BadgeView.m in Sources */ = {isa = PBXBuildFile; fileRef = 97F0817D19AF72590098FB0B /* BadgeView.m */; }; 97F61781183E6172009919E2 /* LocationButton.mm in Sources */ = {isa = PBXBuildFile; fileRef = 97F6177F183E6172009919E2 /* LocationButton.mm */; }; 97F61794183E7445009919E2 /* LinkCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 97F61793183E7445009919E2 /* LinkCell.m */; }; @@ -151,8 +151,8 @@ B00511041A1101F600A61AA4 /* CoreData.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B00511031A1101F600A61AA4 /* CoreData.framework */; }; B00511061A1101FC00A61AA4 /* CoreMedia.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B00511051A1101FC00A61AA4 /* CoreMedia.framework */; }; B08AA8CE1A24C7BC00810B1C /* LocalNotificationInfoProvider.m in Sources */ = {isa = PBXBuildFile; fileRef = B08AA8CD1A24C7BC00810B1C /* LocalNotificationInfoProvider.m */; }; - B08AA8D51A25E58500810B1C /* PassKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 97C9864F186C5EDE00AF7E9E /* PassKit.framework */; settings = {ATTRIBUTES = (Weak, ); }; }; - B08AA8D61A25E58C00810B1C /* Social.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 97C9864D186C5ED300AF7E9E /* Social.framework */; settings = {ATTRIBUTES = (Weak, ); }; }; + B08AA8D51A25E58500810B1C /* PassKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 97C9864F186C5EDE00AF7E9E /* PassKit.framework */; settings = {ATTRIBUTES = (Required, ); }; }; + B08AA8D61A25E58C00810B1C /* Social.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 97C9864D186C5ED300AF7E9E /* Social.framework */; settings = {ATTRIBUTES = (Required, ); }; }; B08AA8DA1A26299A00810B1C /* TimeUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = B08AA8D91A26299A00810B1C /* TimeUtils.m */; }; B0DFE6311A1B78A200B6C35E /* LocalNotifications.plist in Resources */ = {isa = PBXBuildFile; fileRef = B0DFE62F1A1B78A200B6C35E /* LocalNotifications.plist */; }; B0E1FCDC1A23399E00A8E08B /* RouteOverallInfoView.m in Sources */ = {isa = PBXBuildFile; fileRef = B0E1FCDB1A23399E00A8E08B /* RouteOverallInfoView.m */; }; @@ -211,8 +211,8 @@ F69A16A31AF24A3300EF43F0 /* libMyTracker.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F69A16A21AF24A3300EF43F0 /* libMyTracker.a */; }; F6BACD021AD946C3004E99B1 /* World.mwm in Resources */ = {isa = PBXBuildFile; fileRef = FAFF42291347F101009BBB14 /* World.mwm */; }; F6BACD031AD946C3004E99B1 /* WorldCoasts.mwm in Resources */ = {isa = PBXBuildFile; fileRef = FA459EB314327AF700B5BB3C /* WorldCoasts.mwm */; }; - F6BC1E4D1ACBE96100EF0360 /* FBSDKCoreKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F6BC1E4B1ACBE96100EF0360 /* FBSDKCoreKit.framework */; settings = {ATTRIBUTES = (Weak, ); }; }; - F6BC1E4E1ACBE96100EF0360 /* FBSDKShareKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F6BC1E4C1ACBE96100EF0360 /* FBSDKShareKit.framework */; settings = {ATTRIBUTES = (Weak, ); }; }; + F6BC1E4D1ACBE96100EF0360 /* FBSDKCoreKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F6BC1E4B1ACBE96100EF0360 /* FBSDKCoreKit.framework */; settings = {ATTRIBUTES = (Required, ); }; }; + F6BC1E4E1ACBE96100EF0360 /* FBSDKShareKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F6BC1E4C1ACBE96100EF0360 /* FBSDKShareKit.framework */; settings = {ATTRIBUTES = (Required, ); }; }; F6BC1E521ACBF98600EF0360 /* MWMFacebookAlert.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6BC1E511ACBF98600EF0360 /* MWMFacebookAlert.mm */; }; F6BC1E541ACBF9AB00EF0360 /* MWMFacebookAlert.xib in Resources */ = {isa = PBXBuildFile; fileRef = F6BC1E531ACBF9AB00EF0360 /* MWMFacebookAlert.xib */; }; F6C6FE201AD6BEA0009FDED7 /* MWMWatchLocationTracker.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6C6FE1F1AD6BEA0009FDED7 /* MWMWatchLocationTracker.mm */; }; @@ -2337,7 +2337,7 @@ ../../3party/boost, ../../, ); - IPHONEOS_DEPLOYMENT_TARGET = 5.1; + IPHONEOS_DEPLOYMENT_TARGET = 7.0; LIBRARY_SEARCH_PATHS = ( "\"$(SRCROOT)/../../../omim-iphone-release-drape-$(CURRENT_ARCH)/out/release\"", "$(PROJECT_DIR)/MyTracker", @@ -2448,7 +2448,7 @@ ../../3party/boost, ../../, ); - IPHONEOS_DEPLOYMENT_TARGET = 5.1; + IPHONEOS_DEPLOYMENT_TARGET = 7.0; LIBRARY_SEARCH_PATHS = ( "\"$(SRCROOT)/../../../omim-iphone-debug-drape-$(CURRENT_ARCH)/out/debug\"", "$(PROJECT_DIR)/MyTracker", @@ -2960,7 +2960,7 @@ ../../3party/boost, ../../, ); - IPHONEOS_DEPLOYMENT_TARGET = 5.1; + IPHONEOS_DEPLOYMENT_TARGET = 7.0; LIBRARY_SEARCH_PATHS = ( "\"$(SRCROOT)/../../../omim-iphone-debug-i386/out/debug\"", "$(PROJECT_DIR)/MyTracker", @@ -3067,7 +3067,7 @@ ../../3party/boost, ../../, ); - IPHONEOS_DEPLOYMENT_TARGET = 5.1; + IPHONEOS_DEPLOYMENT_TARGET = 7.0; LIBRARY_SEARCH_PATHS = ( "\"$(SRCROOT)/../../../omim-iphone-debug-$(CURRENT_ARCH)/out/debug\"", "$(PROJECT_DIR)/MyTracker", @@ -3179,7 +3179,7 @@ ../../3party/boost, ../../, ); - IPHONEOS_DEPLOYMENT_TARGET = 5.1; + IPHONEOS_DEPLOYMENT_TARGET = 7.0; LIBRARY_SEARCH_PATHS = ( "\"$(SRCROOT)/../../../omim-iphone-production-$(CURRENT_ARCH)/out/production\"", "$(PROJECT_DIR)/MyTracker", @@ -3291,7 +3291,7 @@ ../../3party/boost, ../../, ); - IPHONEOS_DEPLOYMENT_TARGET = 5.1; + IPHONEOS_DEPLOYMENT_TARGET = 7.0; LIBRARY_SEARCH_PATHS = ( "\"$(SRCROOT)/../../../omim-iphone-production-$(CURRENT_ARCH)/out/production\"", "$(PROJECT_DIR)/MyTracker", @@ -3401,7 +3401,7 @@ ../../3party/boost, ../../, ); - IPHONEOS_DEPLOYMENT_TARGET = 5.1; + IPHONEOS_DEPLOYMENT_TARGET = 7.0; LIBRARY_SEARCH_PATHS = ( "\"$(SRCROOT)/../../../omim-iphone-release-$(CURRENT_ARCH)/out/release\"", "$(PROJECT_DIR)/MyTracker", @@ -3510,7 +3510,7 @@ ../../3party/boost, ../../, ); - IPHONEOS_DEPLOYMENT_TARGET = 5.1; + IPHONEOS_DEPLOYMENT_TARGET = 7.0; LIBRARY_SEARCH_PATHS = ( "\"$(SRCROOT)/../../../omim-iphone-release-i386/out/release\"", "$(PROJECT_DIR)/MyTracker", diff --git a/iphone/Maps/Platform/LocationManager.mm b/iphone/Maps/Platform/LocationManager.mm index 4fed1dacdf..73db8b3330 100644 --- a/iphone/Maps/Platform/LocationManager.mm +++ b/iphone/Maps/Platform/LocationManager.mm @@ -20,7 +20,6 @@ static NSString * const kAlohalyticsLocationRequestAlwaysFailed = @"$locationAlw { m_locationManager = [[CLLocationManager alloc] init]; m_locationManager.delegate = self; - m_locationManager.purpose = L(@"location_services_are_needed_desc"); [UIDevice currentDevice].batteryMonitoringEnabled = YES; [self refreshAccuracy]; m_locationManager.headingFilter = 3.0; diff --git a/tools/mkspecs/iphonedevice-clang/qmake.conf b/tools/mkspecs/iphonedevice-clang/qmake.conf index e3ab2a4cbe..a7a4567cba 100644 --- a/tools/mkspecs/iphonedevice-clang/qmake.conf +++ b/tools/mkspecs/iphonedevice-clang/qmake.conf @@ -61,7 +61,7 @@ QMAKE_PREFIX_STATICLIB = lib QMAKE_EXTENSION_STATICLIB = a QMAKE_COMPILER_DEFINES += __GNUC__ -DEFINES += __IPHONE_OS_VERSION_MIN_REQUIRED=50100 +DEFINES += __IPHONE_OS_VERSION_MIN_REQUIRED=70000 #QMAKE_CFLAGS += -isysroot $$IPHONE_SDK_PATH #QMAKE_CFLAGS += -I$$IPHONE_SDK_PATH/usr/include QMAKE_CFLAGS += --sysroot=$$IPHONE_SDK_PATH @@ -69,7 +69,7 @@ QMAKE_CFLAGS += -isystem $$IPHONE_SDK_PATH/usr/include QMAKE_CFLAGS += -iwithsysroot $$IPHONE_SDK_PATH #QMAKE_CFLAGS += -iwithsysroot $$IPHONE_SDK_PATH/System/Library/Frameworks/ QMAKE_CFLAGS += -fmessage-length=0 -QMAKE_CFLAGS += -pipe -miphoneos-version-min=5.1 -Wno-deprecated-register +QMAKE_CFLAGS += -pipe -miphoneos-version-min=7.0 -Wno-deprecated-register QMAKE_CFLAGS_DEPS += -M QMAKE_CFLAGS_WARN_ON += -Wall -W QMAKE_CFLAGS_WARN_OFF += -w @@ -110,7 +110,7 @@ QMAKE_LINK = $$QMAKE_CXX QMAKE_LINK_SHLIB = $$QMAKE_CXX QMAKE_LINK_C = $$QMAKE_CC QMAKE_LINK_C_SHLIB = $$QMAKE_CC -QMAKE_LFLAGS += -stdlib=libc++ -miphoneos-version-min=5.1 -headerpad_max_install_names -Xlinker "-syslibroot $$IPHONE_SDK_PATH" +QMAKE_LFLAGS += -stdlib=libc++ -miphoneos-version-min=7.0 -headerpad_max_install_names -Xlinker "-syslibroot $$IPHONE_SDK_PATH" QMAKE_LFLAGS_RELEASE += -O3 QMAKE_LFLAGS_DEBUG += QMAKE_LFLAGS_APP += diff --git a/tools/mkspecs/iphonesimulator-clang/qmake.conf b/tools/mkspecs/iphonesimulator-clang/qmake.conf index 8a24d0d358..eb89a767f5 100644 --- a/tools/mkspecs/iphonesimulator-clang/qmake.conf +++ b/tools/mkspecs/iphonesimulator-clang/qmake.conf @@ -59,9 +59,9 @@ QMAKE_PREFIX_STATICLIB = lib QMAKE_EXTENSION_STATICLIB = a QMAKE_COMPILER_DEFINES += -DEFINES += __IPHONE_OS_VERSION_MIN_REQUIRED=50100 +DEFINES += __IPHONE_OS_VERSION_MIN_REQUIRED=70000 QMAKE_CFLAGS += --sysroot=$$IPHONE_SDK_PATH -fmessage-length=0 -fpascal-strings -fasm-blocks -QMAKE_CFLAGS += -pipe -arch i386 -mios-simulator-version-min=5.1 -Wno-deprecated-register +QMAKE_CFLAGS += -pipe -arch i386 -mios-simulator-version-min=7.0 -Wno-deprecated-register QMAKE_CFLAGS_DEPS += -M QMAKE_CFLAGS_WARN_ON += -Wall -W QMAKE_CFLAGS_WARN_OFF += -w @@ -102,7 +102,7 @@ QMAKE_LINK = $$QMAKE_CXX QMAKE_LINK_SHLIB = $$QMAKE_CXX QMAKE_LINK_C = $$QMAKE_CC QMAKE_LINK_C_SHLIB = $$QMAKE_CC -QMAKE_LFLAGS += -headerpad_max_install_names -stdlib=libc++ -mios-simulator-version-min=5.1 +QMAKE_LFLAGS += -headerpad_max_install_names -stdlib=libc++ -mios-simulator-version-min=7.0 QMAKE_LFLAGS_RELEASE += QMAKE_LFLAGS_DEBUG += QMAKE_LFLAGS_APP +=