AndrewShkrob/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Added overload for version check.

Browse source
This commit is contained in:
Ilya Grechuhin 2015-06-04 11:09:53 +03:00 • committed by Alex Zolotarev
parent 566a954577
commit 8891fcd369
17 changed files with 113 additions and 102 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
iphone/Maps/Bookmarks/BookmarksRootVC.mm
View file

@ -1,5 +1,6 @@
#import "BookmarksRootVC.h"
#import "BookmarksVC.h"
#import "Common.h"
#import "Statistics.h"
#import "UIKitCategories.h"

11
iphone/Maps/Bookmarks/BookmarksVC.mm
View file

@ -1,11 +1,12 @@
#import "BookmarksVC.h"
#import "CustomNavigationView.h"
#import "MapsAppDelegate.h"
#import "BookmarkCell.h"
#import "MapViewController.h"
#import "Statistics.h"
#import "BookmarksVC.h"
#import "CircleView.h"
#import "ColorPickerView.h"
#import "Common.h"
#import "CustomNavigationView.h"
#import "MapsAppDelegate.h"
#import "MapViewController.h"
#import "Statistics.h"
#import "UIKitCategories.h"
#import <MessageUI/MFMailComposeViewController.h>

5
iphone/Maps/Classes/Common.h
View file

@ -53,3 +53,8 @@ static inline BOOL isIOSVersionLessThan(NSString * version)
{
return firstVersionIsLessThanSecond([UIDevice currentDevice].systemVersion, version);
}
static inline BOOL isIOSVersionLessThan(NSUInteger version)
{
return isIOSVersionLessThan([NSString stringWithFormat:@"%@", @(version)]);
}

4
iphone/Maps/Classes/CustomAlert/AlertController/MWMAlertViewController.mm
View file

@ -6,9 +6,9 @@
// Copyright (c) 2015 MapsWithMe. All rights reserved.
//
#import "Common.h"
#import "MWMAlertViewController.h"
#import "MWMDownloadTransitMapAlert.h"
#import "Common.h"
static NSString * const kAlertControllerNibIdentifier = @"MWMAlertViewController";
@ -33,7 +33,7 @@ static NSString * const kAlertControllerNibIdentifier = @"MWMAlertViewController
{
[super viewDidLoad];
// Need only for iOS 5.
if (isIOSVersionLessThan(@"6"))
if (isIOSVersionLessThan(6))
self.tap.delegate = self;
}

6
iphone/Maps/Classes/EAGLView.mm
View file

@ -1,10 +1,10 @@
#import <QuartzCore/QuartzCore.h>
#import <OpenGLES/EAGLDrawable.h>
#import "Common.h"
#import "EAGLView.h"
#import "../Categories/UIKitCategories.h"
#import "EAGLView.h"
#include "Framework.h"
#ifndef USE_DRAPE
@ -201,7 +201,7 @@
- (double)correctContentScale
{
UIScreen * uiScreen = [UIScreen mainScreen];
if (isIOSVersionLessThan(@"8"))
if (isIOSVersionLessThan(8))
return uiScreen.scale;
else
return uiScreen.nativeScale;

16
iphone/Maps/Classes/LocalNotificationManager.mm
View file

@ -1,14 +1,14 @@
#import "LocalNotificationManager.h"
#import "MapsAppDelegate.h"
#import "Framework.h"
#import "AppInfo.h"
#import "Common.h"
#import "Framework.h"
#import "LocalNotificationInfoProvider.h"
#import "LocalNotificationManager.h"
#import "LocationManager.h"
#import "MapsAppDelegate.h"
#import "MapViewController.h"
#import "Statistics.h"
#import "UIKitCategories.h"
#import "TimeUtils.h"
#import "LocalNotificationInfoProvider.h"
#import "UIKitCategories.h"
#include "../../../storage/storage_defines.hpp"
@ -106,7 +106,7 @@ typedef void (^CompletionHandler)(UIBackgroundFetchResult);
UIImage * shareImage = [UIImage imageNamed:notificationInfo[@"NotifiicationShareImage"]];
LocalNotificationInfoProvider * infoProvider = [[LocalNotificationInfoProvider alloc] initWithDictionary:notificationInfo];
if (isIOSVersionLessThan(@"6.0"))
if (isIOSVersionLessThan(6))
{
UIPasteboard * pasteboard = [UIPasteboard generalPasteboard];
pasteboard.URL = link;
@ -122,7 +122,7 @@ typedef void (^CompletionHandler)(UIBackgroundFetchResult);
UIActivityViewController * activityVC = [[UIActivityViewController alloc] initWithActivityItems:itemsToShare applicationActivities:nil];
NSMutableArray * excludedActivityTypes = [@[UIActivityTypePrint, UIActivityTypeAssignToContact, UIActivityTypeSaveToCameraRoll] mutableCopy];
if (!isIOSVersionLessThan(@"7.0"))
if (!isIOSVersionLessThan(7))
[excludedActivityTypes addObject:UIActivityTypeAirDrop];
activityVC.excludedActivityTypes = excludedActivityTypes;
UIWindow * window = [[UIApplication sharedApplication].windows firstObject];

4
iphone/Maps/Classes/MapCell.mm
View file

@ -1,4 +1,4 @@
#import "Common.h"
#import "MapCell.h"
#import "UIKitCategories.h"
@ -173,7 +173,7 @@
self.separatorBottom.autoresizingMask = UIViewAutoresizingFlexibleTopMargin | UIViewAutoresizingFlexibleTopMargin;
// On iOS6 and lower table view looks different, we won't show separators there.
if (isIOSVersionLessThan(@"7.0"))
if (isIOSVersionLessThan(7))
self.separatorTop.alpha = self.separator.alpha = self.separatorBottom.alpha = 0.0;
}

28
iphone/Maps/Classes/MapViewController.mm
View file

@ -1,21 +1,23 @@
#import "MapViewController.h"
#import "MapsAppDelegate.h"
#import "EAGLView.h"
#import "UIKitCategories.h"
#import "UIViewController+Navigation.h"
#import "ShareActionSheet.h"
#import "AppInfo.h"
#import "ContainerView.h"
#import "SelectSetVC.h"
#import "BookmarkDescriptionVC.h"
#import "BookmarkNameVC.h"
#import "RouteView.h"
#import "Reachability.h"
#import "Common.h"
#import "ContainerView.h"
#import "EAGLView.h"
#import "MapsAppDelegate.h"
#import "MapViewController.h"
#import "MWMAlertViewController.h"
#import "MWMMapViewControlsManager.h"
#import "Reachability.h"
#import "RouteState.h"
#import "RouteView.h"
#import "SelectSetVC.h"
#import "ShareActionSheet.h"
#import "UIKitCategories.h"
#import "UIViewController+Navigation.h"
#import "../../../3party/Alohalytics/src/alohalytics_objc.h"
#import "../../Common/CustomAlertView.h"
#import "RouteState.h"
#include "Framework.h"
#include "RenderContext.hpp"
@ -747,7 +749,7 @@ typedef NS_ENUM(NSUInteger, ForceRoutingStateChange)
{
NSString * title;
NSString * message;
if (isIOSVersionLessThan(@"7"))
if (isIOSVersionLessThan(7))
message = L(@"routing_disclaimer");
else
title = L(@"routing_disclaimer");
@ -861,7 +863,7 @@ typedef NS_ENUM(NSUInteger, ForceRoutingStateChange)
{
if (!_apiBar)
{
UIImage * image = isIOSVersionLessThan(@"7") ? [UIImage imageNamed:@"ApiBarBackground6"] : [UIImage imageNamed:@"ApiBarBackground7"];
UIImage * image = isIOSVersionLessThan(7) ? [UIImage imageNamed:@"ApiBarBackground6"] : [UIImage imageNamed:@"ApiBarBackground7"];
_apiBar = [[UIImageView alloc] initWithImage:[image resizableImageWithCapInsets:UIEdgeInsetsZero]];
_apiBar.width = self.view.width;
_apiBar.userInteractionEnabled = YES;

43
iphone/Maps/Classes/MapsAppDelegate.mm
View file

@ -1,25 +1,26 @@
#import "AppInfo.h"
#import "Common.h"
#import "LocalNotificationManager.h"
#import "LocationManager.h"
#import "MapsAppDelegate.h"
#import "MapViewController.h"
#import "Preferences.h"
#import "LocationManager.h"
#import "Statistics.h"
#import "UIKitCategories.h"
#import "AppInfo.h"
#import "LocalNotificationManager.h"
#import "MWMAlertViewController.h"
#import "Reachability.h"
#import "MWMWatchEventInfo.h"
#import "Common.h"
#import "RouteState.h"
#include <sys/xattr.h>
#import "MRMyTracker.h"
#import "MRTrackerParams.h"
#import "MWMAlertViewController.h"
#import "MWMWatchEventInfo.h"
#import "Preferences.h"
#import "Reachability.h"
#import "RouteState.h"
#import "Statistics.h"
#import "UIKitCategories.h"
#import <FBSDKCoreKit/FBSDKCoreKit.h>
#import <Parse/Parse.h>
#import <ParseFacebookUtilsV4/PFFacebookUtils.h>
#import "3party/Alohalytics/src/alohalytics_objc.h"
#include <sys/xattr.h>
#include "storage/storage_defines.hpp"
#import "platform/http_thread_apple.h"
@ -28,8 +29,6 @@
#include "platform/platform_ios.hpp"
#include "platform/preferred_languages.hpp"
#import "3party/Alohalytics/src/alohalytics_objc.h"
extern NSString * const MapsStatusChangedNotification = @"MapsStatusChangedNotification";
// Alert keys.
static NSString * const kUDLastLaunchDateKey = @"LastLaunchDate";
@ -219,7 +218,7 @@ void InitLocalizedStrings()
application.applicationIconBadgeNumber = f.GetCountryTree().GetActiveMapLayout().GetOutOfDateCount();
f.GetLocationState()->InvalidatePosition();
if (isIOSVersionLessThan(@"7"))
if (isIOSVersionLessThan(7))
return [launchOptions objectForKey:UIApplicationLaunchOptionsURLKey] != nil;
return [[FBSDKApplicationDelegate sharedInstance] application:application didFinishLaunchingWithOptions:launchOptions];
@ -307,7 +306,7 @@ void InitLocalizedStrings()
m_mwmURL = nil;
m_fileURL = nil;
if (!isIOSVersionLessThan(@"7"))
if (!isIOSVersionLessThan(7))
[FBSDKAppEvents activateApp];
[self restoreRouteState];
@ -354,7 +353,7 @@ void InitLocalizedStrings()
attributes[UITextAttributeTextShadowColor] = [UIColor clearColor];
[[UINavigationBar appearanceWhenContainedIn:[NavigationController class], nil] setTintColor:[UIColor colorWithColorCode:@"15c584"]];
if (!isIOSVersionLessThan(@"7"))
if (!isIOSVersionLessThan(7))
{
[[UIBarButtonItem appearance] setTitleTextAttributes:attributes forState:UIControlStateNormal];
@ -382,7 +381,7 @@ void InitLocalizedStrings()
if ([self checkLaunchURL:url])
return YES;
if (isIOSVersionLessThan(@"7"))
if (isIOSVersionLessThan(7))
return NO;
return [[FBSDKApplicationDelegate sharedInstance] application:application openURL:url sourceApplication:sourceApplication annotation:annotation];
@ -482,7 +481,7 @@ void InitLocalizedStrings()
- (void)trackWatchUser
{
if (isIOSVersionLessThan(@"8"))
if (isIOSVersionLessThan(8))
return;
NSUserDefaults *standartDefaults = [NSUserDefaults standardUserDefaults];
@ -569,7 +568,7 @@ void InitLocalizedStrings()
- (void)showFacebookAlert
{
if (isIOSVersionLessThan(@"7") || !Reachability.reachabilityForInternetConnection.isReachable)
if (isIOSVersionLessThan(7) || !Reachability.reachabilityForInternetConnection.isReachable)
return;
UIViewController *topViewController = [(UINavigationController*)m_window.rootViewController visibleViewController];

22
iphone/Maps/Classes/PlacePageView.mm
View file

@ -1,15 +1,17 @@
#import "PlacePageView.h"
#import "BookmarksRootVC.h"
#import "ColorPickerView.h"
#import "Common.h"
#import "ContextViews.h"
#import "Framework.h"
#import "MapsAppDelegate.h"
#import "MapViewController.h"
#import "BookmarksRootVC.h"
#import "Framework.h"
#import "ContextViews.h"
#import "PlacePageInfoCell.h"
#import "PlacePageEditCell.h"
#import "PlacePageShareCell.h"
#import "PlacePageBookmarkDescriptionCell.h"
#import "ColorPickerView.h"
#import "PlacePageEditCell.h"
#import "PlacePageInfoCell.h"
#import "PlacePageShareCell.h"
#import "PlacePageView.h"
#import "Statistics.h"
#import "../../3party/Alohalytics/src/alohalytics_objc.h"
#include "../../base/string_utils.hpp"
@ -472,7 +474,7 @@ typedef NS_ENUM(NSUInteger, CellRow)
- (CGFloat)viewMinY
{
return self.statusBarIncluded ? (isIOSVersionLessThan(@"7") ? -20 : 0) : -20;
return self.statusBarIncluded ? (isIOSVersionLessThan(7) ? -20 : 0) : -20;
}
- (CGFloat)arrowMinYForHeaderWithHeight:(CGFloat)headerHeight
@ -1183,7 +1185,7 @@ typedef NS_ENUM(NSUInteger, CellRow)
_headerView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleBottomMargin;
UITapGestureRecognizer * tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(tap:)];
if (isIOSVersionLessThan(@"6"))
if (isIOSVersionLessThan(6))
{
UIView * touchView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, _headerView.width - 64, _headerView.height)];
[_headerView addSubview:touchView];

13
iphone/Maps/Classes/RouteView.m → iphone/Maps/Classes/RouteView.mm
View file

@ -1,9 +1,10 @@
#import "RouteView.h"
#import "UIKitCategories.h"
#import "TimeUtils.h"
#import "RouteOverallInfoView.h"
#import "Common.h"
#import "NextTurnPhoneView.h"
#import "RouteOverallInfoView.h"
#import "RouteView.h"
#import "TimeUtils.h"
#import "UIKitCategories.h"
#import "../../3party/Alohalytics/src/alohalytics_objc.h"
extern NSString * const kAlohalyticsTapEventKey;
@ -190,7 +191,7 @@ extern NSString * const kAlohalyticsTapEventKey;
- (CGFloat)viewMinY
{
return isIOSVersionLessThan(@"7") ? -20 : 0;
return isIOSVersionLessThan(7) ? -20 : 0;
}
- (UIView *)phoneIdiomView

24
iphone/Maps/Classes/SearchView.mm
View file

@ -1,17 +1,17 @@
#import "SearchView.h"
#import "UIKitCategories.h"
#import "Common.h"
#import "LocationManager.h"
#import "LocationManager.h"
#import "MapsAppDelegate.h"
#import "LocationManager.h"
#import "Statistics.h"
#import "MapViewController.h"
#import "LocationManager.h"
#import "ToastView.h"
#import "SearchSuggestCell.h"
#import "MWMMapViewControlsManager.h"
#import "SearchCategoryCell.h"
#import "SearchResultCell.h"
#import "SearchShowOnMapCell.h"
#import "SearchCategoryCell.h"
#import "MWMMapViewControlsManager.h"
#import "SearchSuggestCell.h"
#import "SearchView.h"
#import "Statistics.h"
#import "ToastView.h"
#import "UIKitCategories.h"
#include "Framework.h"
@ -502,12 +502,12 @@ static void onSearchResultCallback(search::Results const & results)
- (CGFloat)defaultSearchBarMinY
{
return isIOSVersionLessThan(@"7") ? 3 : 20;
return isIOSVersionLessThan(7) ? 3 : 20;
}
- (CGFloat)defaultTopBackgroundHeight
{
return isIOSVersionLessThan(@"7") ? 44 : 64;
return isIOSVersionLessThan(7) ? 44 : 64;
}
- (BOOL)iPhoneInLandscape

6
iphone/Maps/Classes/UIViewController+Navigation.m → iphone/Maps/Classes/UIViewController+Navigation.mm
View file

@ -1,6 +1,6 @@
#import "UIViewController+Navigation.h"
#import "Common.h"
#import "UIKitCategories.h"
#import "UIViewController+Navigation.h"
@implementation UIViewController (Navigation)
@ -11,7 +11,7 @@
[backButton setImage:[UIImage imageNamed:@"NavigationBarBackButton"] forState:UIControlStateNormal];
UIBarButtonItem * space = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemFixedSpace target:nil action:nil];
space.width = isIOSVersionLessThan(@"7") ? -8 : -16;
space.width = isIOSVersionLessThan(7) ? -8 : -16;
UIBarButtonItem * item = [[UIBarButtonItem alloc] initWithCustomView:backButton];
self.navigationItem.leftBarButtonItems = @[space, item];
}

2
iphone/Maps/Classes/WatchEventHandler/MWMWatchNotification.m → iphone/Maps/Classes/WatchEventHandler/MWMWatchNotification.mm
View file

@ -6,8 +6,8 @@
// Copyright (c) 2015 MapsWithMe. All rights reserved.
//
#import "MWMWatchNotification.h"
#import "Common.h"
#import "MWMWatchNotification.h"
#include <CoreFoundation/CoreFoundation.h>

28
iphone/Maps/Maps.xcodeproj/project.pbxproj
View file

@ -92,18 +92,18 @@
6C24A3B31AD7D65500A47B99 /* MWMWatchEventInfo.mm in Sources */ = {isa = PBXBuildFile; fileRef = 6C24A3B11AD7D65500A47B99 /* MWMWatchEventInfo.mm */; };
6C47C8BF1AD6C47E000C52C1 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = FA99CB71147089B100689A9A /* Localizable.strings */; };
6C47C8C51AD6C78A000C52C1 /* MWMNoLocationInterfaceController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 6C47C8C41AD6C78A000C52C1 /* MWMNoLocationInterfaceController.mm */; };
6C93FAEC1AD8063900A2C4AE /* MWMWatchNotification.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C93FAEB1AD8063900A2C4AE /* MWMWatchNotification.m */; };
6C93FAED1AD8063900A2C4AE /* MWMWatchNotification.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C93FAEB1AD8063900A2C4AE /* MWMWatchNotification.m */; };
6C93FAEC1AD8063900A2C4AE /* MWMWatchNotification.mm in Sources */ = {isa = PBXBuildFile; fileRef = 6C93FAEB1AD8063900A2C4AE /* MWMWatchNotification.mm */; };
6C93FAED1AD8063900A2C4AE /* MWMWatchNotification.mm in Sources */ = {isa = PBXBuildFile; fileRef = 6C93FAEB1AD8063900A2C4AE /* MWMWatchNotification.mm */; };
6CFBB8771AD84E1C009845A3 /* MWMFinishInterfaceController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6CFBB8761AD84E1C009845A3 /* MWMFinishInterfaceController.m */; };
974386DD19373EA400FD5659 /* ToastView.m in Sources */ = {isa = PBXBuildFile; fileRef = 974386DC19373EA400FD5659 /* ToastView.m */; };
9747264318323080006B7CB7 /* UIKitCategories.m in Sources */ = {isa = PBXBuildFile; fileRef = 9747264118323080006B7CB7 /* UIKitCategories.m */; };
9747278418338F0C006B7CB7 /* UIViewController+Navigation.m in Sources */ = {isa = PBXBuildFile; fileRef = 9747278318338F0C006B7CB7 /* UIViewController+Navigation.m */; };
9747278418338F0C006B7CB7 /* UIViewController+Navigation.mm in Sources */ = {isa = PBXBuildFile; fileRef = 9747278318338F0C006B7CB7 /* UIViewController+Navigation.mm */; };
974D041D1977DE430081D0A7 /* LocalNotificationManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = 974D041B1977DE430081D0A7 /* LocalNotificationManager.mm */; };
97508423199522D300A7457D /* SettingsAndMoreVC.mm in Sources */ = {isa = PBXBuildFile; fileRef = 97508422199522D300A7457D /* SettingsAndMoreVC.mm */; };
9769D6EF1912BF3000CA6158 /* ContainerView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 9769D6EE1912BF3000CA6158 /* ContainerView.mm */; };
976D86EC19C8697700C920EF /* ProgressView.m in Sources */ = {isa = PBXBuildFile; fileRef = 976D86EB19C8697700C920EF /* ProgressView.m */; };
976D86F119C877E600C920EF /* MapCell.mm in Sources */ = {isa = PBXBuildFile; fileRef = 976D86F019C877E600C920EF /* MapCell.mm */; };
976D86F519CB21BD00C920EF /* RouteView.m in Sources */ = {isa = PBXBuildFile; fileRef = 976D86F419CB21BD00C920EF /* RouteView.m */; };
976D86F519CB21BD00C920EF /* RouteView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 976D86F419CB21BD00C920EF /* RouteView.mm */; };
97719D451843B6DC00BDD815 /* MessageUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 97719D441843B6DC00BDD815 /* MessageUI.framework */; };
97719D491843B6F700BDD815 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 97719D471843B6F200BDD815 /* Security.framework */; };
97719D4B1843B86700BDD815 /* Main_iPad.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97719D4A1843B86700BDD815 /* Main_iPad.storyboard */; };
@ -391,7 +391,7 @@
6C47C8C71AD6C825000C52C1 /* MWMNoMapInterfaceController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMNoMapInterfaceController.h; sourceTree = "<group>"; };
6C47C8C81AD6C825000C52C1 /* MWMNoMapInterfaceController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMNoMapInterfaceController.mm; sourceTree = "<group>"; };
6C93FAEA1AD8063900A2C4AE /* MWMWatchNotification.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMWatchNotification.h; sourceTree = "<group>"; };
6C93FAEB1AD8063900A2C4AE /* MWMWatchNotification.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MWMWatchNotification.m; sourceTree = "<group>"; };
6C93FAEB1AD8063900A2C4AE /* MWMWatchNotification.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMWatchNotification.mm; sourceTree = "<group>"; };
6CFBB8751AD84E1C009845A3 /* MWMFinishInterfaceController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMFinishInterfaceController.h; sourceTree = "<group>"; };
6CFBB8761AD84E1C009845A3 /* MWMFinishInterfaceController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MWMFinishInterfaceController.m; sourceTree = "<group>"; };
772923C9184E0440008C1EDC /* hu */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = hu; path = hu.lproj/Localizable.strings; sourceTree = "<group>"; };
@ -404,7 +404,7 @@
9747264118323080006B7CB7 /* UIKitCategories.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = UIKitCategories.m; path = Categories/UIKitCategories.m; sourceTree = "<group>"; };
9747264218323080006B7CB7 /* UIKitCategories.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = UIKitCategories.h; path = Categories/UIKitCategories.h; sourceTree = "<group>"; };
9747278218338F0C006B7CB7 /* UIViewController+Navigation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "UIViewController+Navigation.h"; path = "Classes/UIViewController+Navigation.h"; sourceTree = "<group>"; };
9747278318338F0C006B7CB7 /* UIViewController+Navigation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "UIViewController+Navigation.m"; path = "Classes/UIViewController+Navigation.m"; sourceTree = "<group>"; };
9747278318338F0C006B7CB7 /* UIViewController+Navigation.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = "UIViewController+Navigation.mm"; path = "Classes/UIViewController+Navigation.mm"; sourceTree = "<group>"; };
974D041B1977DE430081D0A7 /* LocalNotificationManager.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = LocalNotificationManager.mm; sourceTree = "<group>"; };
974D041C1977DE430081D0A7 /* LocalNotificationManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LocalNotificationManager.h; sourceTree = "<group>"; };
97508421199522D300A7457D /* SettingsAndMoreVC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SettingsAndMoreVC.h; sourceTree = "<group>"; };
@ -416,7 +416,7 @@
976D86EF19C877E600C920EF /* MapCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MapCell.h; path = Classes/MapCell.h; sourceTree = "<group>"; };
976D86F019C877E600C920EF /* MapCell.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = MapCell.mm; path = Classes/MapCell.mm; sourceTree = "<group>"; };
976D86F319CB21BD00C920EF /* RouteView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RouteView.h; sourceTree = "<group>"; };
976D86F419CB21BD00C920EF /* RouteView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RouteView.m; sourceTree = "<group>"; };
976D86F419CB21BD00C920EF /* RouteView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = RouteView.mm; sourceTree = "<group>"; };
97719D441843B6DC00BDD815 /* MessageUI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MessageUI.framework; path = System/Library/Frameworks/MessageUI.framework; sourceTree = SDKROOT; };
97719D471843B6F200BDD815 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; };
97719D4A1843B86700BDD815 /* Main_iPad.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = Main_iPad.storyboard; sourceTree = "<group>"; };
@ -1076,7 +1076,7 @@
B08AA8D81A26299A00810B1C /* TimeUtils.h */,
B08AA8D91A26299A00810B1C /* TimeUtils.m */,
9747278218338F0C006B7CB7 /* UIViewController+Navigation.h */,
9747278318338F0C006B7CB7 /* UIViewController+Navigation.m */,
9747278318338F0C006B7CB7 /* UIViewController+Navigation.mm */,
F6DBF9B41AA8779300F2EC2C /* CALayer+RuntimeAttributes.h */,
F6DBF9B51AA8779300F2EC2C /* CALayer+RuntimeAttributes.m */,
F62404F91AAF3DB200B58DB6 /* UILabel+RuntimeAttributes.h */,
@ -1204,7 +1204,7 @@
isa = PBXGroup;
children = (
976D86F319CB21BD00C920EF /* RouteView.h */,
976D86F419CB21BD00C920EF /* RouteView.m */,
976D86F419CB21BD00C920EF /* RouteView.mm */,
B0E1FCDD1A2343BC00A8E08B /* NextTurnPhoneView.h */,
B0E1FCDE1A2343BC00A8E08B /* NextTurnPhoneView.m */,
B0E1FCDA1A23399E00A8E08B /* RouteOverallInfoView.h */,
@ -1280,7 +1280,7 @@
6C24A3B01AD7D65500A47B99 /* MWMWatchEventInfo.h */,
6C24A3B11AD7D65500A47B99 /* MWMWatchEventInfo.mm */,
6C93FAEA1AD8063900A2C4AE /* MWMWatchNotification.h */,
6C93FAEB1AD8063900A2C4AE /* MWMWatchNotification.m */,
6C93FAEB1AD8063900A2C4AE /* MWMWatchNotification.mm */,
);
path = WatchEventHandler;
sourceTree = "<group>";
@ -1882,7 +1882,7 @@
978D4A251996B0EC00D72CA7 /* CommunityVC.m in Sources */,
1D60589B0D05DD56006BFB54 /* main.mm in Sources */,
978D4A291996C17300D72CA7 /* RichTextVC.m in Sources */,
9747278418338F0C006B7CB7 /* UIViewController+Navigation.m in Sources */,
9747278418338F0C006B7CB7 /* UIViewController+Navigation.mm in Sources */,
F6BC1E521ACBF98600EF0360 /* MWMFacebookAlert.mm in Sources */,
97908B30196591F7003DD7C6 /* SearchShowOnMapCell.m in Sources */,
F64F199D1AB81A00006EAF7E /* MWMDefaultAlert.mm in Sources */,
@ -1899,7 +1899,7 @@
34F209691B18BCEE005744D6 /* MWMLocationButtonStatusLabel.m in Sources */,
A3CC2CD41A1C723900B832E1 /* LocationPredictor.mm in Sources */,
EE7F29811219ECA300EB67A9 /* RenderBuffer.mm in Sources */,
6C93FAEC1AD8063900A2C4AE /* MWMWatchNotification.m in Sources */,
6C93FAEC1AD8063900A2C4AE /* MWMWatchNotification.mm in Sources */,
F62404FB1AAF3DB200B58DB6 /* UILabel+RuntimeAttributes.m in Sources */,
97D092B5190A6E1D00FF645B /* PlacePageEditCell.mm in Sources */,
34BC72291B0DECAE0012A34B /* MWMZoomButtons.mm in Sources */,
@ -1925,7 +1925,7 @@
97908B2C19658767003DD7C6 /* SearchCategoryCell.m in Sources */,
9778E9A5191A86D800AD850A /* SelectedColorView.m in Sources */,
B08AA8DA1A26299A00810B1C /* TimeUtils.m in Sources */,
976D86F519CB21BD00C920EF /* RouteView.m in Sources */,
976D86F519CB21BD00C920EF /* RouteView.mm in Sources */,
FA29FDAA141E77F8004ADF66 /* Preferences.mm in Sources */,
97A8000C18B21363000C07A2 /* SearchView.mm in Sources */,
FAA5C2A2144F135F005337F6 /* LocationManager.mm in Sources */,
@ -1984,7 +1984,7 @@
343F26301AEFDB1A00388A6D /* Framework.cpp in Sources */,
34A743001AE5468200CE15EB /* storage.cpp in Sources */,
34A742FE1AE5461A00CE15EB /* index.cpp in Sources */,
6C93FAED1AD8063900A2C4AE /* MWMWatchNotification.m in Sources */,
6C93FAED1AD8063900A2C4AE /* MWMWatchNotification.mm in Sources */,
345C31711AE798DD00EA0CC2 /* MWMCategoriesInterfaceCell.m in Sources */,
6CFBB8771AD84E1C009845A3 /* MWMFinishInterfaceController.m in Sources */,
6C24A3AD1AD7CA1000A47B99 /* MWMNoMapInterfaceController.mm in Sources */,

1
iphone/Maps/Maps_Prefix.pch
View file

@ -6,5 +6,4 @@
#import <Foundation/Foundation.h>
#import <UIKit/UIKit.h>
#import <CoreLocation/CoreLocation.h>
#import "Common.h"
#endif

1
iphone/Maps/main.mm
View file

@ -1,6 +1,7 @@
#import <UIKit/UIKit.h>
#import <Foundation/Foundation.h>
#import <Foundation/NSThread.h>
#import "Common.h"
#include "../../platform/file_logging.hpp"
#include "../../platform/platform.hpp"