diff --git a/iphone/CoreApi/CoreApi/Framework/MWMFrameworkHelper.h b/iphone/CoreApi/CoreApi/Framework/MWMFrameworkHelper.h index f8e2cf5460..353cf1d0f4 100644 --- a/iphone/CoreApi/CoreApi/Framework/MWMFrameworkHelper.h +++ b/iphone/CoreApi/CoreApi/Framework/MWMFrameworkHelper.h @@ -32,6 +32,9 @@ NS_SWIFT_NAME(FrameworkHelper) + (void)updatePositionArrowOffset:(BOOL)useDefault offset:(int)offsetY; + (BOOL)shouldShowCrown; + (void)uploadUGC:(void (^)(UIBackgroundFetchResult))completionHandler; ++ (NSString *)userAccessToken; ++ (NSString *)userAgent; ++ (NSNumber *)dataVersion; @end diff --git a/iphone/CoreApi/CoreApi/Framework/MWMFrameworkHelper.mm b/iphone/CoreApi/CoreApi/Framework/MWMFrameworkHelper.mm index 3cf0fff889..08ecc1dd60 100644 --- a/iphone/CoreApi/CoreApi/Framework/MWMFrameworkHelper.mm +++ b/iphone/CoreApi/CoreApi/Framework/MWMFrameworkHelper.mm @@ -142,4 +142,16 @@ }); } ++ (NSString *)userAccessToken { + return @(GetFramework().GetUser().GetAccessToken().c_str()); +} + ++ (NSString *)userAgent { + return @(GetPlatform().GetAppUserAgent().Get().c_str()); +} + ++ (NSNumber *)dataVersion { + return @(GetFramework().GetCurrentDataVersion()); +} + @end diff --git a/iphone/Maps/Categories/CALayer+RuntimeAttributes.mm b/iphone/Maps/Categories/CALayer+RuntimeAttributes.m similarity index 78% rename from iphone/Maps/Categories/CALayer+RuntimeAttributes.mm rename to iphone/Maps/Categories/CALayer+RuntimeAttributes.m index 36dfb07dfd..c13f1c85b6 100644 --- a/iphone/Maps/Categories/CALayer+RuntimeAttributes.mm +++ b/iphone/Maps/Categories/CALayer+RuntimeAttributes.m @@ -9,7 +9,7 @@ - (UIColor *)borderUIColor { - return [UIColor colorWithCGColor:static_cast(self.borderColor)]; + return [UIColor colorWithCGColor:self.borderColor]; } - (void)setBorderColorName:(NSString *)colorName @@ -24,7 +24,7 @@ - (UIColor *)shadowUIColor { - return [UIColor colorWithCGColor:static_cast(self.shadowColor)]; + return [UIColor colorWithCGColor:self.shadowColor]; } - (void)setShadowColorName:(NSString *)colorName diff --git a/iphone/Maps/Categories/NSString+Categories.h b/iphone/Maps/Categories/NSString+Categories.h index cb87d1147d..d57f657021 100644 --- a/iphone/Maps/Categories/NSString+Categories.h +++ b/iphone/Maps/Categories/NSString+Categories.h @@ -1,5 +1,3 @@ -#include - @interface NSString (MapsMeSize) - (CGSize)sizeWithDrawSize:(CGSize)size font:(UIFont *)font; @@ -8,6 +6,6 @@ @interface NSString (MapsMeRanges) -- (std::vector)rangesOfString:(NSString *)aString; +- (NSArray *)rangesOfString:(NSString *)aString; @end diff --git a/iphone/Maps/Categories/NSString+Categories.m b/iphone/Maps/Categories/NSString+Categories.m new file mode 100644 index 0000000000..dc907e7bcf --- /dev/null +++ b/iphone/Maps/Categories/NSString+Categories.m @@ -0,0 +1,36 @@ +#import "NSString+Categories.h" + +@implementation NSString (MapsMeSize) + +- (CGSize)sizeWithDrawSize:(CGSize)drawSize font:(UIFont *)font { + CGRect rect = [self boundingRectWithSize:drawSize + options:NSStringDrawingUsesLineFragmentOrigin + attributes:@{NSFontAttributeName : font} + context:nil]; + return CGRectIntegral(rect).size; +} + +@end + +@implementation NSString (MapsMeRanges) + +- (NSArray *)rangesOfString:(NSString *)aString { + NSMutableArray *result = [NSMutableArray array]; + if (self.length == 0) { + return [result copy]; + } + + NSRange searchRange = NSMakeRange(0, self.length); + while (searchRange.location < self.length) { + searchRange.length = self.length - searchRange.location; + NSRange foundRange = [self rangeOfString:aString options:NSCaseInsensitiveSearch range:searchRange]; + if (foundRange.location == NSNotFound) { + break; + } + searchRange.location = foundRange.location + foundRange.length; + [result addObject:[NSValue valueWithRange:foundRange]]; + } + return result; +} + +@end diff --git a/iphone/Maps/Categories/NSString+Categories.mm b/iphone/Maps/Categories/NSString+Categories.mm deleted file mode 100644 index c04b96c764..0000000000 --- a/iphone/Maps/Categories/NSString+Categories.mm +++ /dev/null @@ -1,34 +0,0 @@ -#import "NSString+Categories.h" - -@implementation NSString (MapsMeSize) - -- (CGSize)sizeWithDrawSize:(CGSize)drawSize font:(UIFont *)font -{ - CGRect rect = [self boundingRectWithSize:drawSize options:NSStringDrawingUsesLineFragmentOrigin attributes:@{NSFontAttributeName : font} context:nil]; - return CGRectIntegral(rect).size; -} - -@end - -@implementation NSString (MapsMeRanges) - -- (std::vector)rangesOfString:(NSString *)aString -{ - std::vector r; - if (self.length == 0) - return r; - - NSRange searchRange = {0, self.length}; - while (searchRange.location < self.length) - { - searchRange.length = self.length - searchRange.location; - NSRange const foundRange = [self rangeOfString:aString options:NSCaseInsensitiveSearch range:searchRange]; - if (foundRange.location == NSNotFound) - break; - searchRange.location = foundRange.location + foundRange.length; - r.push_back(foundRange); - } - return r; -} - -@end diff --git a/iphone/Maps/Categories/UIButton+Orientation.mm b/iphone/Maps/Categories/UIButton+Orientation.m similarity index 87% rename from iphone/Maps/Categories/UIButton+Orientation.mm rename to iphone/Maps/Categories/UIButton+Orientation.m index 4a8df5e65a..aff3bfa3a6 100644 --- a/iphone/Maps/Categories/UIButton+Orientation.mm +++ b/iphone/Maps/Categories/UIButton+Orientation.m @@ -1,6 +1,6 @@ #import "UIButton+Orientation.h" -#import +#import @implementation UIButton (Orientation) diff --git a/iphone/Maps/Categories/UIButton+RuntimeAttributes.mm b/iphone/Maps/Categories/UIButton+RuntimeAttributes.m similarity index 100% rename from iphone/Maps/Categories/UIButton+RuntimeAttributes.mm rename to iphone/Maps/Categories/UIButton+RuntimeAttributes.m diff --git a/iphone/Maps/Categories/UIColor+MapsMeColor.h b/iphone/Maps/Categories/UIColor+MapsMeColor.h index 6323fc05ac..1e4e7685b4 100644 --- a/iphone/Maps/Categories/UIColor+MapsMeColor.h +++ b/iphone/Maps/Categories/UIColor+MapsMeColor.h @@ -1,5 +1,7 @@ #import "UIColor+PartnerColor.h" + NS_ASSUME_NONNULL_BEGIN + @interface UIColor (MapsMeColor) + (UIColor *)primaryDark; @@ -75,4 +77,5 @@ NS_ASSUME_NONNULL_BEGIN + (UIColor *)facebookButtonBackgroundDisabled; @end + NS_ASSUME_NONNULL_END diff --git a/iphone/Maps/Categories/UIColor+MapsMeColor.m b/iphone/Maps/Categories/UIColor+MapsMeColor.m new file mode 100644 index 0000000000..b9bb928f9a --- /dev/null +++ b/iphone/Maps/Categories/UIColor+MapsMeColor.m @@ -0,0 +1,482 @@ +#import "UIColorRoutines.h" +#import "UIColor+MapsMeColor.h" + +static BOOL isNightMode = NO; +static NSDictionary *day; +static NSDictionary *night; + +static UIColor * color(SEL cmd) { + return (isNightMode ? night : day)[NSStringFromSelector(cmd)]; +} + +@implementation UIColor (MapsMeColor) + ++ (void)load { + day = @{ + @"primaryDark" : + [UIColor colorWithRed:scaled(24.) green:scaled(128) blue:scaled(68.) alpha:alpha100], + @"primary" : + [UIColor colorWithRed:scaled(32.) green:scaled(152.) blue:scaled(82.) alpha:alpha100], + @"secondary" : [UIColor colorWithRed:scaled(45) green:scaled(137) blue:scaled(83) alpha:alpha100], + // Light green color + @"primaryLight" : + [UIColor colorWithRed:scaled(36.) green:scaled(180.) blue:scaled(98.) alpha:alpha100], + @"menuBackground" : [UIColor colorWithWhite:1. alpha:alpha80], + @"downloadBadgeBackground" : + [UIColor colorWithRed:scaled(255.) green:scaled(55.) blue:scaled(35.) alpha:alpha100], + // Background color && press color + @"pressBackground" : + [UIColor colorWithRed:scaled(245.) green:scaled(245.) blue:scaled(245.) alpha:alpha100], + // Red color (use for status closed in place page) + @"red" : [UIColor colorWithRed:scaled(230.) green:scaled(15.) blue:scaled(35.) alpha:alpha100], + @"errorPink" : + [UIColor colorWithRed:scaled(246.) green:scaled(60.) blue:scaled(51.) alpha:alpha12], + // Orange color (use for status 15 min in place page) + @"orange" : [UIColor colorWithRed:1. green:scaled(120.) blue:scaled(5.) alpha:alpha100], + // Blue color (use for links and phone numbers) + @"linkBlue" : + [UIColor colorWithRed:scaled(30.) green:scaled(150.) blue:scaled(240.) alpha:alpha100], + @"linkBlueHighlighted" : + [UIColor colorWithRed:scaled(30.) green:scaled(150.) blue:scaled(240.) alpha:alpha30], + @"linkBlueDark" : + [UIColor colorWithRed:scaled(25.) green:scaled(135.) blue:scaled(215.) alpha:alpha100], + @"buttonRed" : + [UIColor colorWithRed:scaled(244.) green:scaled(67.) blue:scaled(67.) alpha:alpha100], + @"buttonRedHighlighted" : + [UIColor colorWithRed:scaled(183.) green:scaled(28.) blue:scaled(28.) alpha:alpha100], + @"blackPrimaryText" : [UIColor colorWithWhite:0. alpha:alpha87], + @"blackSecondaryText" : [UIColor colorWithWhite:0. alpha:alpha54], + @"blackHintText" : [UIColor colorWithWhite:0. alpha:alpha26], + @"blackDividers" : [UIColor colorWithWhite:0. alpha:alpha12], + @"white" : [UIColor colorWithWhite:1. alpha:alpha100], + @"whiteSecondaryText" : [UIColor colorWithWhite:1. alpha:alpha54], + @"whiteHintText" : [UIColor colorWithWhite:1. alpha:alpha30], + @"buttonDisabledBlueText" : + [UIColor colorWithRed:scaled(3.) green:scaled(122.) blue:scaled(255.) alpha:alpha26], + @"alertBackground" : [UIColor colorWithWhite:1. alpha:alpha90], + @"blackOpaque" : [UIColor colorWithWhite:0. alpha:alpha04], + @"toastBackground" : [UIColor colorWithWhite:1. alpha:alpha87], + @"statusBarBackground" : [UIColor colorWithWhite:1. alpha:alpha36], + @"bannerBackground" : [UIColor colorWithRed:scaled(249) green:scaled(251) blue:scaled(231) alpha:alpha100], + @"border" : [UIColor colorWithWhite:0. alpha:alpha04], + @"discountBackground" : [UIColor colorWithRed:scaled(240) green:scaled(100) blue:scaled(60) alpha:alpha100], + @"bookmarkSubscriptionBackground" : [UIColor colorWithRed:scaled(240) green:scaled(252) blue:scaled(255) alpha:alpha100], + @"bookmarkSubscriptionScrollBackground" : [UIColor colorWithRed:scaled(137) green:scaled(217) blue:scaled(255) alpha:alpha100], + @"bookmarkSubscriptionFooterBackground" : [UIColor colorWithRed:scaled(47) green:scaled(58) blue:scaled(73) alpha:alpha100], + }; + + night = @{ + @"primaryDark": + [UIColor colorWithRed:scaled(25.) green:scaled(30) blue:scaled(35.) alpha:alpha100], + @"primary": [UIColor colorWithRed:scaled(45.) green:scaled(50.) blue:scaled(55.) alpha:alpha100], + @"secondary": [UIColor colorWithRed:scaled(0x25) green:scaled(0x28) blue:scaled(0x2b) alpha:alpha100], + // Light green color + @"primaryLight": + [UIColor colorWithRed:scaled(65.) green:scaled(70.) blue:scaled(75.) alpha:alpha100], + @"menuBackground": + [UIColor colorWithRed:scaled(45.) green:scaled(50.) blue:scaled(55.) alpha:alpha80], + @"downloadBadgeBackground": + [UIColor colorWithRed:scaled(230.) green:scaled(70.) blue:scaled(60.) alpha:alpha100], + // Background color && press color + @"pressBackground": + [UIColor colorWithRed:scaled(50.) green:scaled(54.) blue:scaled(58.) alpha:alpha100], + // Red color (use for status closed in place page) + @"red": [UIColor colorWithRed:scaled(230.) green:scaled(70.) blue:scaled(60.) alpha:alpha100], + @"errorPink": + [UIColor colorWithRed:scaled(246.) green:scaled(60.) blue:scaled(51.) alpha:alpha26], + // Orange color (use for status 15 min in place page) + @"orange": [UIColor colorWithRed:scaled(250.) green:scaled(190.) blue:scaled(10.) alpha:alpha100], + // Blue color (use for links and phone numbers) + @"linkBlue": + [UIColor colorWithRed:scaled(80.) green:scaled(195.) blue:scaled(240.) alpha:alpha100], + @"linkBlueHighlighted": + [UIColor colorWithRed:scaled(60.) green:scaled(155.) blue:scaled(190.) alpha:alpha30], + @"linkBlueDark": + [UIColor colorWithRed:scaled(75.) green:scaled(185.) blue:scaled(230.) alpha:alpha100], + @"buttonRed": + [UIColor colorWithRed:scaled(244.) green:scaled(67.) blue:scaled(67.) alpha:alpha100], + @"buttonRedHighlighted": + [UIColor colorWithRed:scaled(183.) green:scaled(28.) blue:scaled(28.) alpha:alpha100], + @"blackPrimaryText": [UIColor colorWithWhite:1. alpha:alpha90], + @"blackSecondaryText": [UIColor colorWithWhite:1. alpha:alpha70], + @"blackHintText": [UIColor colorWithWhite:1. alpha:alpha30], + @"blackDividers": [UIColor colorWithWhite:1. alpha:alpha12], + @"white": [UIColor colorWithRed:scaled(60.) green:scaled(64.) blue:scaled(68.) alpha:alpha100], + @"whiteSecondaryText": [UIColor colorWithWhite:0. alpha:alpha70], + @"whiteHintText": [UIColor colorWithWhite:0. alpha:alpha26], + @"buttonDisabledBlueText": + [UIColor colorWithRed:scaled(255.) green:scaled(230.) blue:scaled(140.) alpha:alpha30], + @"alertBackground": + [UIColor colorWithRed:scaled(60.) green:scaled(64.) blue:scaled(68.) alpha:alpha90], + @"blackOpaque": [UIColor colorWithWhite:1. alpha:alpha04], + @"toastBackground": [UIColor colorWithWhite:0. alpha:alpha87], + @"statusBarBackground": [UIColor colorWithWhite:0. alpha:alpha32], + @"bannerBackground" : [UIColor colorWithRed:scaled(71) green:scaled(75) blue:scaled(79) alpha:alpha100], + @"border" : [UIColor colorWithWhite:1. alpha:alpha04], + @"discountBackground" : [UIColor colorWithRed:scaled(240) green:scaled(100) blue:scaled(60) alpha:alpha100], + @"bookmarkSubscriptionBackground" : [UIColor colorWithRed:scaled(60.) green:scaled(64.) blue:scaled(68.) alpha:alpha100], + @"bookmarkSubscriptionScrollBackground" : [UIColor colorWithRed:scaled(137) green:scaled(217) blue:scaled(255) alpha:alpha100], + @"bookmarkSubscriptionFooterBackground" : [UIColor colorWithRed:scaled(47) green:scaled(58) blue:scaled(73) alpha:alpha100], + }; +} + +// hex string without # ++ (UIColor *)colorFromHexString:(NSString *)hexString +{ + unsigned rgbValue = 0; + NSScanner *scanner = [NSScanner scannerWithString:hexString]; + [scanner setScanLocation:0]; + [scanner scanHexInt:&rgbValue]; + return [UIColor colorWithRed:((rgbValue & 0xFF0000) >> 16)/255.0 green:((rgbValue & 0xFF00) >> 8)/255.0 blue:(rgbValue & 0xFF)/255.0 alpha:1.0]; +} + ++ (void)setNightMode:(BOOL)mode +{ + isNightMode = mode; +} + ++ (BOOL)isNightMode +{ + return isNightMode; +} + +- (UIColor *)opposite +{ + NSString * key = [(isNightMode ? day : night) allKeysForObject:self].firstObject; + UIColor * color = (key == nil ? nil : (isNightMode ? night : day)[key]); + return color ?: self; +} + +// Dark green color ++ (UIColor *)primaryDark +{ + return color(_cmd); +} + +// Green color ++ (UIColor *)primary +{ + return color(_cmd); +} + ++ (UIColor *)secondary +{ + return color(_cmd); +} + +// Light green color ++ (UIColor *)primaryLight +{ + return color(_cmd); +} + +// Use for opaque fullscreen ++ (UIColor *)fadeBackground +{ + return [UIColor colorWithWhite:0. alpha:alpha80]; +} + ++ (UIColor *)menuBackground +{ + return color(_cmd); +} + ++ (UIColor *)downloadBadgeBackground +{ + return color(_cmd); +} +// Background color && press color ++ (UIColor *)pressBackground +{ + return color(_cmd); +} +// Red color (use for status closed in place page) ++ (UIColor *)red +{ + return color(_cmd); +} +// Yellow color (use for hotel's stars) ++ (UIColor *)yellow +{ + return [UIColor colorWithRed:scaled(255.) green:scaled(200.) blue:scaled(40.) alpha:alpha100]; +} +// Green color (use for booking rating) ++ (UIColor *)green +{ + return [UIColor colorWithRed:scaled(85.) green:scaled(139.) blue:scaled(47.) alpha:alpha100]; +} +// Pink background for invalid fields ++ (UIColor *)errorPink +{ + return color(_cmd); +} +// Orange color (use for status 15 min in place page) ++ (UIColor *)orange +{ + return color(_cmd); +} + +// Blue color (use for links and phone numbers) ++ (UIColor *)linkBlue +{ + return color(_cmd); +} + ++ (UIColor *)linkBlueHighlighted +{ + return color(_cmd); +} + ++ (UIColor *)linkBlueDark +{ + return color(_cmd); +} ++ (UIColor *)buttonRed { return color(_cmd); } ++ (UIColor *)buttonRedHighlighted { return color(_cmd); } ++ (UIColor *)blackPrimaryText +{ + return color(_cmd); +} + ++ (UIColor *)blackSecondaryText +{ + return color(_cmd); +} + ++ (UIColor *)blackStatusBarBackground +{ + return [UIColor colorWithWhite:0. alpha:alpha40]; +} + ++ (UIColor *)blackHintText +{ + return color(_cmd); +} + ++ (UIColor *)blackDividers +{ + return color(_cmd); +} + ++ (UIColor *)white +{ + return color(_cmd); +} + ++ (UIColor *)whitePrimaryText +{ + return [UIColor colorWithWhite:1. alpha:alpha87]; +} + ++ (UIColor *)whitePrimaryTextHighlighted +{ + // use only for highlighted colors! + return [UIColor colorWithWhite:1. alpha:alpha30]; +} + ++ (UIColor *)whiteSecondaryText +{ + return color(_cmd); +} + ++ (UIColor *)whiteHintText +{ + return color(_cmd); +} + ++ (UIColor *)whiteDividers +{ + return [UIColor colorWithWhite:1. alpha:alpha12]; +} + ++ (UIColor *)buttonDisabledBlueText +{ + return color(_cmd); +} + ++ (UIColor *)buttonHighlightedBlueText +{ + return [UIColor colorWithRed:scaled(3.) green:scaled(122.) blue:scaled(255.) alpha:alpha54]; +} + ++ (UIColor *)alertBackground +{ + return color(_cmd); +} + ++ (UIColor *)blackOpaque +{ + return color(_cmd); +} + ++ (UIColor *)bookingBackground +{ + return [UIColor colorWithRed:scaled(25.) green:scaled(69.) blue:scaled(125.) alpha:alpha100]; +} + ++ (UIColor *)opentableBackground +{ + return [UIColor colorWithRed:scaled(218.) green:scaled(55) blue:scaled(67) alpha:alpha100]; +} + ++ (UIColor *)transparentGreen +{ + return [UIColor colorWithRed:scaled(233) green:scaled(244) blue:scaled(233) alpha:alpha26]; +} + ++ (UIColor *)ratingRed +{ + return [UIColor colorWithRed:scaled(229) green:scaled(57) blue:scaled(53) alpha:alpha100]; +} + ++ (UIColor *)ratingOrange +{ + return [UIColor colorWithRed:scaled(244) green:scaled(81) blue:scaled(30) alpha:alpha100]; +} + ++ (UIColor *)ratingYellow +{ + return [UIColor colorWithRed:scaled(245) green:scaled(176) blue:scaled(39) alpha:alpha100]; +} + ++ (UIColor *)ratingLightGreen +{ + return [UIColor colorWithRed:scaled(124) green:scaled(179) blue:scaled(66) alpha:alpha100]; +} + ++ (UIColor *)ratingGreen +{ + return [UIColor colorWithRed:scaled(67) green:scaled(160) blue:scaled(71) alpha:alpha100]; +} + ++ (UIColor *)bannerBackground +{ + return color(_cmd); +} + ++ (UIColor *)border +{ + return color(_cmd); +} + ++ (UIColor *)bannerButtonBackground +{ + return [UIColor blackDividers]; +} + ++ (UIColor *)toastBackground { return color(_cmd); } ++ (UIColor *)statusBarBackground { return color(_cmd); } ++ (UIColor *)colorWithName:(NSString *)colorName +{ +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Warc-performSelector-leaks" + return [[UIColor class] performSelector:NSSelectorFromString(colorName)]; +#pragma clang diagnostic pop +} + ++ (UIColor *)facebookButtonBackground { + return [UIColor colorWithRed:scaled(59) green:scaled(89) blue:scaled(152) alpha:alpha100]; +} + ++ (UIColor *)facebookButtonBackgroundDisabled { + return [self.facebookButtonBackground colorWithAlphaComponent:alpha70]; +} + ++ (UIColor *)speedLimitRed { + return [UIColor colorWithRed:scaled(224) green:scaled(31) blue:scaled(31) alpha:alpha100]; +} + ++ (UIColor *)speedLimitGeen { + return [UIColor colorWithRed:scaled(1) green:scaled(104) blue:scaled(44) alpha:alpha100]; +} + ++ (UIColor *)speedLimitWhite { + return [UIColor colorWithRed:scaled(255) green:scaled(255) blue:scaled(255) alpha:alpha80]; +} + ++ (UIColor *)speedLimitLightGray { + return [UIColor colorWithRed:scaled(0) green:scaled(0) blue:scaled(0) alpha:alpha20]; +} + ++ (UIColor *)speedLimitDarkGray { + return [UIColor colorWithRed:scaled(51) green:scaled(51) blue:scaled(50) alpha:alpha100]; +} + ++ (UIColor *)shadowColorBlue { + return [UIColor colorWithRed:scaled(5) green:scaled(70) blue:scaled(134) alpha:alpha100]; +} + ++ (UIColor *)shadowColorPurple { + return [UIColor colorWithRed:scaled(88) green:scaled(0) blue:scaled(153) alpha:alpha100]; +} + ++ (UIColor *)subscriptionCellBorder { + return [UIColor colorWithRed:scaled(174) green:scaled(184) blue:scaled(190) alpha:alpha100]; +} + ++ (UIColor *)subscriptionCellBackground { + return [UIColor colorWithRed:scaled(208) green:scaled(246) blue:scaled(255) alpha:alpha100]; +} + ++ (UIColor *)subscriptionCellTitle { + return [UIColor colorWithRed:scaled(14) green:scaled(101) blue:scaled(188) alpha:alpha100]; +} + + ++ (UIColor *)discountBackground +{ + return color(_cmd); +} + ++ (UIColor *)bookmarkSubscriptionScrollBackground +{ + return color(_cmd); +} + ++ (UIColor *)bookmarkSubscriptionBackground +{ + return color(_cmd); +} + ++ (UIColor *)bookmarkSubscriptionFooterBackground +{ + return color(_cmd); +} + +//NO NIGHT COLORS ++ (UIColor *)allPassSubscriptionTitle +{ + return [UIColor colorWithWhite:1. alpha:alpha40]; +} + ++ (UIColor *)allPassSubscriptionDescription +{ + return [UIColor colorWithWhite:1. alpha:alpha100]; +} + ++ (UIColor *)allPassSubscriptionSubTitle +{ + return [UIColor colorWithRed:scaled(30.) green:scaled(150.) blue:scaled(240.) alpha:alpha100]; +} + ++ (UIColor *)allPassSubscriptionMonthlyBackground +{ + return [UIColor colorWithWhite:0.88 alpha:alpha80]; +} + ++ (UIColor *)allPassSubscriptionMonthlyTitle +{ + return [UIColor colorWithWhite:0 alpha:alpha87]; +} + ++ (UIColor *)allPassSubscriptionDiscountBackground +{ + return [UIColor colorWithRed:scaled(245.) green:scaled(210.) blue:scaled(12.) alpha:alpha100]; +} + ++ (UIColor *)allPassSubscriptionTermsTitle +{ + return [UIColor colorWithWhite:1 alpha:alpha70]; +} +//END NO NIGHT +@end diff --git a/iphone/Maps/Categories/UIColor+MapsMeColor.mm b/iphone/Maps/Categories/UIColor+MapsMeColor.mm deleted file mode 100644 index 33627819e6..0000000000 --- a/iphone/Maps/Categories/UIColor+MapsMeColor.mm +++ /dev/null @@ -1,498 +0,0 @@ -#import "UIColorRoutines.h" -#import "UIColor+MapsMeColor.h" - -namespace -{ -BOOL isNightMode = NO; - -NSDictionary * night = @{ - @"primaryDark": - [UIColor colorWithRed:scaled(25.) green:scaled(30) blue:scaled(35.) alpha:alpha100], - @"primary": [UIColor colorWithRed:scaled(45.) green:scaled(50.) blue:scaled(55.) alpha:alpha100], - @"secondary": [UIColor colorWithRed:scaled(0x25) green:scaled(0x28) blue:scaled(0x2b) alpha:alpha100], - // Light green color - @"primaryLight": - [UIColor colorWithRed:scaled(65.) green:scaled(70.) blue:scaled(75.) alpha:alpha100], - @"menuBackground": - [UIColor colorWithRed:scaled(45.) green:scaled(50.) blue:scaled(55.) alpha:alpha80], - @"downloadBadgeBackground": - [UIColor colorWithRed:scaled(230.) green:scaled(70.) blue:scaled(60.) alpha:alpha100], - // Background color && press color - @"pressBackground": - [UIColor colorWithRed:scaled(50.) green:scaled(54.) blue:scaled(58.) alpha:alpha100], - // Red color (use for status closed in place page) - @"red": [UIColor colorWithRed:scaled(230.) green:scaled(70.) blue:scaled(60.) alpha:alpha100], - @"errorPink": - [UIColor colorWithRed:scaled(246.) green:scaled(60.) blue:scaled(51.) alpha:alpha26], - // Orange color (use for status 15 min in place page) - @"orange": [UIColor colorWithRed:scaled(250.) green:scaled(190.) blue:scaled(10.) alpha:alpha100], - // Blue color (use for links and phone numbers) - @"linkBlue": - [UIColor colorWithRed:scaled(80.) green:scaled(195.) blue:scaled(240.) alpha:alpha100], - @"linkBlueHighlighted": - [UIColor colorWithRed:scaled(60.) green:scaled(155.) blue:scaled(190.) alpha:alpha30], - @"linkBlueDark": - [UIColor colorWithRed:scaled(75.) green:scaled(185.) blue:scaled(230.) alpha:alpha100], - @"buttonRed": - [UIColor colorWithRed:scaled(244.) green:scaled(67.) blue:scaled(67.) alpha:alpha100], - @"buttonRedHighlighted": - [UIColor colorWithRed:scaled(183.) green:scaled(28.) blue:scaled(28.) alpha:alpha100], - @"blackPrimaryText": [UIColor colorWithWhite:1. alpha:alpha90], - @"blackSecondaryText": [UIColor colorWithWhite:1. alpha:alpha70], - @"blackHintText": [UIColor colorWithWhite:1. alpha:alpha30], - @"blackDividers": [UIColor colorWithWhite:1. alpha:alpha12], - @"white": [UIColor colorWithRed:scaled(60.) green:scaled(64.) blue:scaled(68.) alpha:alpha100], - @"whiteSecondaryText": [UIColor colorWithWhite:0. alpha:alpha70], - @"whiteHintText": [UIColor colorWithWhite:0. alpha:alpha26], - @"buttonDisabledBlueText": - [UIColor colorWithRed:scaled(255.) green:scaled(230.) blue:scaled(140.) alpha:alpha30], - @"alertBackground": - [UIColor colorWithRed:scaled(60.) green:scaled(64.) blue:scaled(68.) alpha:alpha90], - @"blackOpaque": [UIColor colorWithWhite:1. alpha:alpha04], - @"toastBackground": [UIColor colorWithWhite:0. alpha:alpha87], - @"statusBarBackground": [UIColor colorWithWhite:0. alpha:alpha32], - @"bannerBackground" : [UIColor colorWithRed:scaled(71) green:scaled(75) blue:scaled(79) alpha:alpha100], - @"border" : [UIColor colorWithWhite:1. alpha:alpha04], - @"discountBackground" : [UIColor colorWithRed:scaled(240) green:scaled(100) blue:scaled(60) alpha:alpha100], - @"bookmarkSubscriptionBackground" : [UIColor colorWithRed:scaled(60.) green:scaled(64.) blue:scaled(68.) alpha:alpha100], - @"bookmarkSubscriptionScrollBackground" : [UIColor colorWithRed:scaled(137) green:scaled(217) blue:scaled(255) alpha:alpha100], - @"bookmarkSubscriptionFooterBackground" : [UIColor colorWithRed:scaled(47) green:scaled(58) blue:scaled(73) alpha:alpha100], - //NO NIGHT - @"allPassSubscriptionTitle" : [UIColor colorWithWhite:1. alpha:alpha40], - @"allPassSubscriptionSubTitle" :[UIColor colorWithRed:scaled(30.) green:scaled(150.) blue:scaled(240.) alpha:alpha100], - @"allPassSubscriptionDescription" : [UIColor colorWithWhite:1. alpha:alpha100], - @"allPassSubscriptionMonthlyBackground" :[UIColor colorWithWhite:0.88 alpha:alpha80], - @"allPassSubscriptionMonthlyTitle" :[UIColor colorWithWhite:0 alpha:alpha87], - @"allPassSubscriptionDiscountBackground" :[UIColor colorWithRed:scaled(245.) green:scaled(210.) blue:scaled(12.) alpha:alpha100], - @"allPassSubscriptionTermsTitle" :[UIColor colorWithWhite:1 alpha:alpha70], - //END NO NIGHT -}; - -NSDictionary * day = @{ - @"primaryDark" : - [UIColor colorWithRed:scaled(24.) green:scaled(128) blue:scaled(68.) alpha:alpha100], - @"primary" : - [UIColor colorWithRed:scaled(32.) green:scaled(152.) blue:scaled(82.) alpha:alpha100], - @"secondary" : [UIColor colorWithRed:scaled(45) green:scaled(137) blue:scaled(83) alpha:alpha100], - // Light green color - @"primaryLight" : - [UIColor colorWithRed:scaled(36.) green:scaled(180.) blue:scaled(98.) alpha:alpha100], - @"menuBackground" : [UIColor colorWithWhite:1. alpha:alpha80], - @"downloadBadgeBackground" : - [UIColor colorWithRed:scaled(255.) green:scaled(55.) blue:scaled(35.) alpha:alpha100], - // Background color && press color - @"pressBackground" : - [UIColor colorWithRed:scaled(245.) green:scaled(245.) blue:scaled(245.) alpha:alpha100], - // Red color (use for status closed in place page) - @"red" : [UIColor colorWithRed:scaled(230.) green:scaled(15.) blue:scaled(35.) alpha:alpha100], - @"errorPink" : - [UIColor colorWithRed:scaled(246.) green:scaled(60.) blue:scaled(51.) alpha:alpha12], - // Orange color (use for status 15 min in place page) - @"orange" : [UIColor colorWithRed:1. green:scaled(120.) blue:scaled(5.) alpha:alpha100], - // Blue color (use for links and phone numbers) - @"linkBlue" : - [UIColor colorWithRed:scaled(30.) green:scaled(150.) blue:scaled(240.) alpha:alpha100], - @"linkBlueHighlighted" : - [UIColor colorWithRed:scaled(30.) green:scaled(150.) blue:scaled(240.) alpha:alpha30], - @"linkBlueDark" : - [UIColor colorWithRed:scaled(25.) green:scaled(135.) blue:scaled(215.) alpha:alpha100], - @"buttonRed" : - [UIColor colorWithRed:scaled(244.) green:scaled(67.) blue:scaled(67.) alpha:alpha100], - @"buttonRedHighlighted" : - [UIColor colorWithRed:scaled(183.) green:scaled(28.) blue:scaled(28.) alpha:alpha100], - @"blackPrimaryText" : [UIColor colorWithWhite:0. alpha:alpha87], - @"blackSecondaryText" : [UIColor colorWithWhite:0. alpha:alpha54], - @"blackHintText" : [UIColor colorWithWhite:0. alpha:alpha26], - @"blackDividers" : [UIColor colorWithWhite:0. alpha:alpha12], - @"white" : [UIColor colorWithWhite:1. alpha:alpha100], - @"whiteSecondaryText" : [UIColor colorWithWhite:1. alpha:alpha54], - @"whiteHintText" : [UIColor colorWithWhite:1. alpha:alpha30], - @"buttonDisabledBlueText" : - [UIColor colorWithRed:scaled(3.) green:scaled(122.) blue:scaled(255.) alpha:alpha26], - @"alertBackground" : [UIColor colorWithWhite:1. alpha:alpha90], - @"blackOpaque" : [UIColor colorWithWhite:0. alpha:alpha04], - @"toastBackground" : [UIColor colorWithWhite:1. alpha:alpha87], - @"statusBarBackground" : [UIColor colorWithWhite:1. alpha:alpha36], - @"bannerBackground" : [UIColor colorWithRed:scaled(249) green:scaled(251) blue:scaled(231) alpha:alpha100], - @"border" : [UIColor colorWithWhite:0. alpha:alpha04], - @"discountBackground" : [UIColor colorWithRed:scaled(240) green:scaled(100) blue:scaled(60) alpha:alpha100], - @"bookmarkSubscriptionBackground" : [UIColor colorWithRed:scaled(240) green:scaled(252) blue:scaled(255) alpha:alpha100], - @"bookmarkSubscriptionScrollBackground" : [UIColor colorWithRed:scaled(137) green:scaled(217) blue:scaled(255) alpha:alpha100], - @"bookmarkSubscriptionFooterBackground" : [UIColor colorWithRed:scaled(47) green:scaled(58) blue:scaled(73) alpha:alpha100], - //NO NIGHT - @"allPassSubscriptionTitle" : [UIColor colorWithWhite:1. alpha:alpha40], - @"allPassSubscriptionSubTitle" :[UIColor colorWithRed:scaled(30.) green:scaled(150.) blue:scaled(240.) alpha:alpha100], - @"allPassSubscriptionDescription" : [UIColor colorWithWhite:1. alpha:alpha100], - @"allPassSubscriptionMonthlyBackground" :[UIColor colorWithWhite:0.88 alpha:alpha80], - @"allPassSubscriptionMonthlyTitle" :[UIColor colorWithWhite:0 alpha:alpha87], - @"allPassSubscriptionDiscountBackground" :[UIColor colorWithRed:scaled(245.) green:scaled(210.) blue:scaled(12.) alpha:alpha100], - @"allPassSubscriptionTermsTitle" :[UIColor colorWithWhite:1 alpha:alpha70], - //END NO NIGHT -}; - -UIColor * color(SEL cmd) -{ - return (isNightMode ? night : day)[NSStringFromSelector(cmd)]; -} - -} // namespace - -@implementation UIColor (MapsMeColor) - -// hex string without # -+ (UIColor *)colorFromHexString:(NSString *)hexString -{ - unsigned rgbValue = 0; - NSScanner *scanner = [NSScanner scannerWithString:hexString]; - [scanner setScanLocation:0]; - [scanner scanHexInt:&rgbValue]; - return [UIColor colorWithRed:((rgbValue & 0xFF0000) >> 16)/255.0 green:((rgbValue & 0xFF00) >> 8)/255.0 blue:(rgbValue & 0xFF)/255.0 alpha:1.0]; -} - -+ (void)setNightMode:(BOOL)mode -{ - isNightMode = mode; -} - -+ (BOOL)isNightMode -{ - return isNightMode; -} - -- (UIColor *)opposite -{ - NSString * key = [(isNightMode ? day : night) allKeysForObject:self].firstObject; - UIColor * color = (key == nil ? nil : (isNightMode ? night : day)[key]); - return color ?: self; -} - -// Dark green color -+ (UIColor *)primaryDark -{ - return color(_cmd); -} - -// Green color -+ (UIColor *)primary -{ - return color(_cmd); -} - -+ (UIColor *)secondary -{ - return color(_cmd); -} - -// Light green color -+ (UIColor *)primaryLight -{ - return color(_cmd); -} - -// Use for opaque fullscreen -+ (UIColor *)fadeBackground -{ - return [UIColor colorWithWhite:0. alpha:alpha80]; -} - -+ (UIColor *)menuBackground -{ - return color(_cmd); -} - -+ (UIColor *)downloadBadgeBackground -{ - return color(_cmd); -} -// Background color && press color -+ (UIColor *)pressBackground -{ - return color(_cmd); -} -// Red color (use for status closed in place page) -+ (UIColor *)red -{ - return color(_cmd); -} -// Yellow color (use for hotel's stars) -+ (UIColor *)yellow -{ - return [UIColor colorWithRed:scaled(255.) green:scaled(200.) blue:scaled(40.) alpha:alpha100]; -} -// Green color (use for booking rating) -+ (UIColor *)green -{ - return [UIColor colorWithRed:scaled(85.) green:scaled(139.) blue:scaled(47.) alpha:alpha100]; -} -// Pink background for invalid fields -+ (UIColor *)errorPink -{ - return color(_cmd); -} -// Orange color (use for status 15 min in place page) -+ (UIColor *)orange -{ - return color(_cmd); -} - -// Blue color (use for links and phone numbers) -+ (UIColor *)linkBlue -{ - return color(_cmd); -} - -+ (UIColor *)linkBlueHighlighted -{ - return color(_cmd); -} - -+ (UIColor *)linkBlueDark -{ - return color(_cmd); -} -+ (UIColor *)buttonRed { return color(_cmd); } -+ (UIColor *)buttonRedHighlighted { return color(_cmd); } -+ (UIColor *)blackPrimaryText -{ - return color(_cmd); -} - -+ (UIColor *)blackSecondaryText -{ - return color(_cmd); -} - -+ (UIColor *)blackStatusBarBackground -{ - return [UIColor colorWithWhite:0. alpha:alpha40]; -} - -+ (UIColor *)blackHintText -{ - return color(_cmd); -} - -+ (UIColor *)blackDividers -{ - return color(_cmd); -} - -+ (UIColor *)white -{ - return color(_cmd); -} - -+ (UIColor *)whitePrimaryText -{ - return [UIColor colorWithWhite:1. alpha:alpha87]; -} - -+ (UIColor *)whitePrimaryTextHighlighted -{ - // use only for highlighted colors! - return [UIColor colorWithWhite:1. alpha:alpha30]; -} - -+ (UIColor *)whiteSecondaryText -{ - return color(_cmd); -} - -+ (UIColor *)whiteHintText -{ - return color(_cmd); -} - -+ (UIColor *)whiteDividers -{ - return [UIColor colorWithWhite:1. alpha:alpha12]; -} - -+ (UIColor *)buttonDisabledBlueText -{ - return color(_cmd); -} - -+ (UIColor *)buttonHighlightedBlueText -{ - return [UIColor colorWithRed:scaled(3.) green:scaled(122.) blue:scaled(255.) alpha:alpha54]; -} - -+ (UIColor *)alertBackground -{ - return color(_cmd); -} - -+ (UIColor *)blackOpaque -{ - return color(_cmd); -} - -+ (UIColor *)bookingBackground -{ - return [UIColor colorWithRed:scaled(25.) green:scaled(69.) blue:scaled(125.) alpha:alpha100]; -} - -+ (UIColor *)opentableBackground -{ - return [UIColor colorWithRed:scaled(218.) green:scaled(55) blue:scaled(67) alpha:alpha100]; -} - -+ (UIColor *)transparentGreen -{ - return [UIColor colorWithRed:scaled(233) green:scaled(244) blue:scaled(233) alpha:alpha26]; -} - -+ (UIColor *)ratingRed -{ - return [UIColor colorWithRed:scaled(229) green:scaled(57) blue:scaled(53) alpha:alpha100]; -} - -+ (UIColor *)ratingOrange -{ - return [UIColor colorWithRed:scaled(244) green:scaled(81) blue:scaled(30) alpha:alpha100]; -} - -+ (UIColor *)ratingYellow -{ - return [UIColor colorWithRed:scaled(245) green:scaled(176) blue:scaled(39) alpha:alpha100]; -} - -+ (UIColor *)ratingLightGreen -{ - return [UIColor colorWithRed:scaled(124) green:scaled(179) blue:scaled(66) alpha:alpha100]; -} - -+ (UIColor *)ratingGreen -{ - return [UIColor colorWithRed:scaled(67) green:scaled(160) blue:scaled(71) alpha:alpha100]; -} - -+ (UIColor *)bannerBackground -{ - return color(_cmd); -} - -+ (UIColor *)border -{ - return color(_cmd); -} - -+ (UIColor *)bannerButtonBackground -{ - return [UIColor blackDividers]; -} - -+ (UIColor *)toastBackground { return color(_cmd); } -+ (UIColor *)statusBarBackground { return color(_cmd); } -+ (UIColor *)colorWithName:(NSString *)colorName -{ -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Warc-performSelector-leaks" - return [[UIColor class] performSelector:NSSelectorFromString(colorName)]; -#pragma clang diagnostic pop -} - -+ (UIColor *)facebookButtonBackground { - return [UIColor colorWithRed:scaled(59) green:scaled(89) blue:scaled(152) alpha:alpha100]; -} - -+ (UIColor *)facebookButtonBackgroundDisabled { - return [self.facebookButtonBackground colorWithAlphaComponent:alpha70]; -} - -+ (UIColor *)speedLimitRed { - return [UIColor colorWithRed:scaled(224) green:scaled(31) blue:scaled(31) alpha:alpha100]; -} - -+ (UIColor *)speedLimitGeen { - return [UIColor colorWithRed:scaled(1) green:scaled(104) blue:scaled(44) alpha:alpha100]; -} - -+ (UIColor *)speedLimitWhite { - return [UIColor colorWithRed:scaled(255) green:scaled(255) blue:scaled(255) alpha:alpha80]; -} - -+ (UIColor *)speedLimitLightGray { - return [UIColor colorWithRed:scaled(0) green:scaled(0) blue:scaled(0) alpha:alpha20]; -} - -+ (UIColor *)speedLimitDarkGray { - return [UIColor colorWithRed:scaled(51) green:scaled(51) blue:scaled(50) alpha:alpha100]; -} - -+ (UIColor *)shadowColorBlue { - return [UIColor colorWithRed:scaled(5) green:scaled(70) blue:scaled(134) alpha:alpha100]; -} - -+ (UIColor *)shadowColorPurple { - return [UIColor colorWithRed:scaled(88) green:scaled(0) blue:scaled(153) alpha:alpha100]; -} - -+ (UIColor *)subscriptionCellBorder { - return [UIColor colorWithRed:scaled(174) green:scaled(184) blue:scaled(190) alpha:alpha100]; -} - -+ (UIColor *)subscriptionCellBackground { - return [UIColor colorWithRed:scaled(208) green:scaled(246) blue:scaled(255) alpha:alpha100]; -} - -+ (UIColor *)subscriptionCellTitle { - return [UIColor colorWithRed:scaled(14) green:scaled(101) blue:scaled(188) alpha:alpha100]; -} - - -+ (UIColor *)discountBackground -{ - return color(_cmd); -} - -+ (UIColor *)bookmarkSubscriptionScrollBackground -{ - return color(_cmd); -} - -+ (UIColor *)bookmarkSubscriptionBackground -{ - return color(_cmd); -} - -+ (UIColor *)bookmarkSubscriptionFooterBackground -{ - return color(_cmd); -} - -//NO NIGHT COLORS -+ (UIColor *)allPassSubscriptionTitle -{ - return color(_cmd); -} - -+ (UIColor *)allPassSubscriptionDescription -{ - return color(_cmd); -} - -+ (UIColor *)allPassSubscriptionSubTitle -{ - return color(_cmd); -} -+ (UIColor *)allPassSubscriptionMonthlyBackground -{ - return color(_cmd); -} - -+ (UIColor *)allPassSubscriptionMonthlyTitle -{ - return color(_cmd); -} -+ (UIColor *)allPassSubscriptionDiscountBackground -{ - return color(_cmd); -} -+ (UIColor *)allPassSubscriptionTermsTitle -{ - return color(_cmd); -} -//END NO NIGHT -@end diff --git a/iphone/Maps/Categories/UIColor+PartnerColor.mm b/iphone/Maps/Categories/UIColor+PartnerColor.m similarity index 100% rename from iphone/Maps/Categories/UIColor+PartnerColor.mm rename to iphone/Maps/Categories/UIColor+PartnerColor.m diff --git a/iphone/Maps/Categories/UIFont+MapsMeFonts.mm b/iphone/Maps/Categories/UIFont+MapsMeFonts.m similarity index 96% rename from iphone/Maps/Categories/UIFont+MapsMeFonts.mm rename to iphone/Maps/Categories/UIFont+MapsMeFonts.m index 05491d13e5..aa7e8ab86a 100644 --- a/iphone/Maps/Categories/UIFont+MapsMeFonts.mm +++ b/iphone/Maps/Categories/UIFont+MapsMeFonts.m @@ -1,6 +1,3 @@ -NSString * const kMediumFontName = @"HelveticaNeue-Medium"; -NSString * const kLightFontName = @"HelveticaNeue-Light"; - @implementation UIFont (MapsMeFonts) + (UIFont *)regular9 { return [UIFont systemFontOfSize:9]; } diff --git a/iphone/Maps/Categories/UIImage+RGBAData.m b/iphone/Maps/Categories/UIImage+RGBAData.m new file mode 100644 index 0000000000..543c3cf4e2 --- /dev/null +++ b/iphone/Maps/Categories/UIImage+RGBAData.m @@ -0,0 +1,36 @@ +#import "UIImage+RGBAData.h" + +static void releaseCallback(void *info, const void *data, size_t size) { + CFRelease((CFDataRef)info); +} + +@implementation UIImage (RGBAData) + ++ (UIImage *)imageWithRGBAData:(NSData *)data width:(size_t)width height:(size_t)height { + size_t bytesPerPixel = 4; + size_t bitsPerComponent = 8; + size_t bitsPerPixel = bitsPerComponent * bytesPerPixel; + size_t bytesPerRow = bytesPerPixel * width; + CGBitmapInfo bitmapInfo = kCGBitmapByteOrderDefault | kCGImageAlphaLast; + + CGColorSpaceRef colorSpace = CGColorSpaceCreateDeviceRGB(); + CFDataRef cfData = (__bridge_retained CFDataRef)data; + CGDataProviderRef provider = CGDataProviderCreateWithData((void *)cfData, + data.bytes, + height * bytesPerRow, + releaseCallback); + + CGImageRef cgImage = CGImageCreate(width, height, bitsPerComponent, bitsPerPixel, bytesPerRow, + colorSpace, bitmapInfo, provider, + NULL, YES, kCGRenderingIntentDefault); + + UIImage *image = [UIImage imageWithCGImage:cgImage]; + + CGColorSpaceRelease(colorSpace); + CGDataProviderRelease(provider); + CGImageRelease(cgImage); + + return image; +} + +@end diff --git a/iphone/Maps/Categories/UIImage+RGBAData.mm b/iphone/Maps/Categories/UIImage+RGBAData.mm deleted file mode 100644 index 4ac4025df7..0000000000 --- a/iphone/Maps/Categories/UIImage+RGBAData.mm +++ /dev/null @@ -1,28 +0,0 @@ -#import "UIImage+RGBAData.h" - -@implementation UIImage (RGBAData) - -+ (UIImage *)imageWithRGBAData:(NSData *)data width:(size_t)width height:(size_t)height -{ - size_t constexpr bytesPerPixel = 4; - size_t constexpr bitsPerComponent = 8; - size_t constexpr bitsPerPixel = bitsPerComponent * bytesPerPixel; - size_t const bytesPerRow = bytesPerPixel * width; - bool constexpr shouldInterpolate = true; - CGBitmapInfo constexpr bitmapInfo = kCGBitmapByteOrderDefault | kCGImageAlphaLast; - - CGColorSpaceRef colorSpace = CGColorSpaceCreateDeviceRGB(); - CGDataProviderRef provider = CGDataProviderCreateWithData(NULL, data.bytes, height * bytesPerRow, NULL); - - CGImageRef cgImage = CGImageCreate(width, height, bitsPerComponent, bitsPerPixel, bytesPerRow, colorSpace, bitmapInfo, provider, NULL, shouldInterpolate, kCGRenderingIntentDefault); - - UIImage * image = [UIImage imageWithCGImage:cgImage]; - - CGColorSpaceRelease(colorSpace); - CGDataProviderRelease(provider); - CGImageRelease(cgImage); - - return image; -} - -@end diff --git a/iphone/Maps/Categories/UIImageView+Coloring.mm b/iphone/Maps/Categories/UIImageView+Coloring.m similarity index 96% rename from iphone/Maps/Categories/UIImageView+Coloring.mm rename to iphone/Maps/Categories/UIImageView+Coloring.m index 50e0c8b7ad..a75c416c4f 100644 --- a/iphone/Maps/Categories/UIImageView+Coloring.mm +++ b/iphone/Maps/Categories/UIImageView+Coloring.m @@ -24,8 +24,7 @@ - (MWMImageColoring)mwm_coloring { - return static_cast( - [objc_getAssociatedObject(self, @selector(mwm_coloring)) integerValue]); + return [objc_getAssociatedObject(self, @selector(mwm_coloring)) integerValue]; } - (void)applyColoring diff --git a/iphone/Maps/Categories/UIKitCategories.mm b/iphone/Maps/Categories/UIKitCategories.m similarity index 97% rename from iphone/Maps/Categories/UIKitCategories.mm rename to iphone/Maps/Categories/UIKitCategories.m index 3d91f832d5..d7b1d1ce0c 100644 --- a/iphone/Maps/Categories/UIKitCategories.mm +++ b/iphone/Maps/Categories/UIKitCategories.m @@ -270,7 +270,7 @@ if (!url) { NSAssert(false, @"URL is nil!"); - auto err = [[NSError alloc] initWithDomain:kMapsmeErrorDomain + NSError *err = [[NSError alloc] initWithDomain:kMapsmeErrorDomain code:0 userInfo:@{ @"Trying to open nil url" : @YES @@ -282,8 +282,8 @@ if (!([scheme isEqualToString:@"http"] || [scheme isEqualToString:@"https"])) { NSAssert(false, @"Incorrect url's scheme!"); - auto urlString = url.absoluteString; - auto err = [[NSError alloc] initWithDomain:kMapsmeErrorDomain + NSString *urlString = url.absoluteString; + NSError *err = [[NSError alloc] initWithDomain:kMapsmeErrorDomain code:0 userInfo:@{ @"Trying to open incorrect url" : urlString diff --git a/iphone/Maps/Categories/UILabel+RuntimeAttributes.mm b/iphone/Maps/Categories/UILabel+RuntimeAttributes.m similarity index 100% rename from iphone/Maps/Categories/UILabel+RuntimeAttributes.mm rename to iphone/Maps/Categories/UILabel+RuntimeAttributes.m diff --git a/iphone/Maps/Categories/UITextField+RuntimeAttributes.mm b/iphone/Maps/Categories/UITextField+RuntimeAttributes.m similarity index 100% rename from iphone/Maps/Categories/UITextField+RuntimeAttributes.mm rename to iphone/Maps/Categories/UITextField+RuntimeAttributes.m diff --git a/iphone/Maps/Categories/UITextView+RuntimeAttributes.mm b/iphone/Maps/Categories/UITextView+RuntimeAttributes.m similarity index 100% rename from iphone/Maps/Categories/UITextView+RuntimeAttributes.mm rename to iphone/Maps/Categories/UITextView+RuntimeAttributes.m diff --git a/iphone/Maps/Categories/UIViewController+Navigation.mm b/iphone/Maps/Categories/UIViewController+Navigation.m similarity index 81% rename from iphone/Maps/Categories/UIViewController+Navigation.mm rename to iphone/Maps/Categories/UIViewController+Navigation.m index cd30380d1c..1bb4b57dad 100644 --- a/iphone/Maps/Categories/UIViewController+Navigation.mm +++ b/iphone/Maps/Categories/UIViewController+Navigation.m @@ -1,10 +1,7 @@ #import "UIButton+Orientation.h" #import "UIViewController+Navigation.h" -namespace -{ -CGFloat constexpr kButtonExtraWidth = 16.0; -} // namespace +static CGFloat const kButtonExtraWidth = 16.0; @implementation UIViewController (Navigation) @@ -20,8 +17,7 @@ CGFloat constexpr kButtonExtraWidth = 16.0; - (UIBarButtonItem *)buttonWithImage:(UIImage *)image action:(SEL)action { - CGSize const buttonSize = {image.size.width + kButtonExtraWidth, image.size.height}; - UIButton * button = [[UIButton alloc] initWithFrame:{{}, buttonSize}]; + UIButton * button = [[UIButton alloc] initWithFrame:CGRectMake(0, 0, image.size.width + kButtonExtraWidth, image.size.height)]; [button setImage:image forState:UIControlStateNormal]; [button matchInterfaceOrientation]; [button addTarget:self action:action forControlEvents:UIControlEventTouchUpInside]; diff --git a/iphone/Maps/Classes/CircleView.mm b/iphone/Maps/Classes/CircleView.m similarity index 100% rename from iphone/Maps/Classes/CircleView.mm rename to iphone/Maps/Classes/CircleView.m diff --git a/iphone/Maps/Classes/Components/MWMButton.mm b/iphone/Maps/Classes/Components/MWMButton.m similarity index 95% rename from iphone/Maps/Classes/Components/MWMButton.mm rename to iphone/Maps/Classes/Components/MWMButton.m index b4e8f1d4fc..5b7a0354c5 100644 --- a/iphone/Maps/Classes/Components/MWMButton.mm +++ b/iphone/Maps/Classes/Components/MWMButton.m @@ -1,11 +1,8 @@ #import "MWMButton.h" -namespace -{ - NSString * const kDefaultPattern = @"%@_%@"; - NSString * const kHighlightedPattern = @"%@_highlighted_%@"; - NSString * const kSelectedPattern = @"%@_selected_%@"; -} // namespace +static NSString * const kDefaultPattern = @"%@_%@"; +static NSString * const kHighlightedPattern = @"%@_highlighted_%@"; +static NSString * const kSelectedPattern = @"%@_selected_%@"; @implementation MWMButton diff --git a/iphone/Maps/Classes/Components/MWMCollectionViewController.mm b/iphone/Maps/Classes/Components/MWMCollectionViewController.m similarity index 100% rename from iphone/Maps/Classes/Components/MWMCollectionViewController.mm rename to iphone/Maps/Classes/Components/MWMCollectionViewController.m diff --git a/iphone/Maps/Classes/Components/MWMDropDown.mm b/iphone/Maps/Classes/Components/MWMDropDown.m similarity index 77% rename from iphone/Maps/Classes/Components/MWMDropDown.mm rename to iphone/Maps/Classes/Components/MWMDropDown.m index abdd334b81..e6b211624b 100644 --- a/iphone/Maps/Classes/Components/MWMDropDown.mm +++ b/iphone/Maps/Classes/Components/MWMDropDown.m @@ -1,13 +1,8 @@ #import "MWMDropDown.h" -namespace -{ - -CGFloat const kLeadingOffset = 16.; -CGFloat const kBottomOffset = 3.; -CGFloat const kTopOffset = 25.; - -} // namespace +static CGFloat const kLeadingOffset = 16.; +static CGFloat const kBottomOffset = 3.; +static CGFloat const kTopOffset = 25.; #pragma mark - _MWMDropDownView (private) @@ -21,10 +16,10 @@ CGFloat const kTopOffset = 25.; - (void)layoutSubviews { - CGFloat const superviewWidth = self.superview.width; + CGFloat superviewWidth = self.superview.width; self.message.width = superviewWidth - 2 * kLeadingOffset; [self.message sizeToFit]; - self.size = {superviewWidth, kTopOffset + kBottomOffset + self.message.height}; + self.size = CGSizeMake(superviewWidth, kTopOffset + kBottomOffset + self.message.height); self.message.midX = self.superview.midX; [super layoutSubviews]; } @@ -62,7 +57,7 @@ CGFloat const kTopOffset = 25.; self.dropDown.alpha = 0.; [self.dropDown setNeedsLayout]; [self.superview addSubview:self.dropDown]; - self.dropDown.origin = {0., -self.dropDown.height}; + self.dropDown.origin = CGPointMake(0., -self.dropDown.height); [self show]; } @@ -71,7 +66,7 @@ CGFloat const kTopOffset = 25.; [UIView animateWithDuration:kDefaultAnimationDuration animations:^ { self.dropDown.alpha = 0.; - self.dropDown.origin = {0., -self.dropDown.height}; + self.dropDown.origin = CGPointMake(0., -self.dropDown.height); } completion:^(BOOL finished) { @@ -86,7 +81,7 @@ CGFloat const kTopOffset = 25.; [UIView animateWithDuration:kDefaultAnimationDuration animations:^ { self.dropDown.alpha = 1.; - self.dropDown.origin = {}; + self.dropDown.origin = CGPointZero; }]; [self performAfterDelay:3 block:^ diff --git a/iphone/Maps/Classes/Components/MWMMailViewController.mm b/iphone/Maps/Classes/Components/MWMMailViewController.m similarity index 100% rename from iphone/Maps/Classes/Components/MWMMailViewController.mm rename to iphone/Maps/Classes/Components/MWMMailViewController.m diff --git a/iphone/Maps/Classes/Components/MWMMultilineLabel.h b/iphone/Maps/Classes/Components/MWMMultilineLabel.h deleted file mode 100644 index 737a2639d0..0000000000 --- a/iphone/Maps/Classes/Components/MWMMultilineLabel.h +++ /dev/null @@ -1,3 +0,0 @@ -@interface MWMMultilineLabel : UILabel - -@end diff --git a/iphone/Maps/Classes/Components/MWMMultilineLabel.mm b/iphone/Maps/Classes/Components/MWMMultilineLabel.mm deleted file mode 100644 index 893836b6d3..0000000000 --- a/iphone/Maps/Classes/Components/MWMMultilineLabel.mm +++ /dev/null @@ -1,21 +0,0 @@ -#import "MWMMultilineLabel.h" - -#import - -@implementation MWMMultilineLabel - -- (void)setBounds:(CGRect)bounds -{ - [super setBounds:bounds]; - - // If this is a multiline label, need to make sure - // preferredMaxLayoutWidth always matches the frame width - // (i.e. orientation change can mess this up) - if (self.numberOfLines == 0 && !equalScreenDimensions(bounds.size.width, self.preferredMaxLayoutWidth)) - { - self.preferredMaxLayoutWidth = self.bounds.size.width; - [self setNeedsUpdateConstraints]; - } -} - -@end diff --git a/iphone/Maps/Classes/Components/MWMStartButton.mm b/iphone/Maps/Classes/Components/MWMStartButton.m similarity index 100% rename from iphone/Maps/Classes/Components/MWMStartButton.mm rename to iphone/Maps/Classes/Components/MWMStartButton.m diff --git a/iphone/Maps/Classes/Components/MWMStopButton.mm b/iphone/Maps/Classes/Components/MWMStopButton.m similarity index 100% rename from iphone/Maps/Classes/Components/MWMStopButton.mm rename to iphone/Maps/Classes/Components/MWMStopButton.m diff --git a/iphone/Maps/Classes/Components/MWMTableViewController.mm b/iphone/Maps/Classes/Components/MWMTableViewController.m similarity index 100% rename from iphone/Maps/Classes/Components/MWMTableViewController.mm rename to iphone/Maps/Classes/Components/MWMTableViewController.m diff --git a/iphone/Maps/Classes/Components/MWMViewController.mm b/iphone/Maps/Classes/Components/MWMViewController.m similarity index 100% rename from iphone/Maps/Classes/Components/MWMViewController.mm rename to iphone/Maps/Classes/Components/MWMViewController.m diff --git a/iphone/Maps/Classes/CustomAlert/DownloadTransitMapsAlert/MWMDownloaderDialogCell.mm b/iphone/Maps/Classes/CustomAlert/DownloadTransitMapsAlert/MWMDownloaderDialogCell.m similarity index 100% rename from iphone/Maps/Classes/CustomAlert/DownloadTransitMapsAlert/MWMDownloaderDialogCell.mm rename to iphone/Maps/Classes/CustomAlert/DownloadTransitMapsAlert/MWMDownloaderDialogCell.m diff --git a/iphone/Maps/Classes/CustomAlert/LocationAlert/MWMLocationAlert.mm b/iphone/Maps/Classes/CustomAlert/LocationAlert/MWMLocationAlert.m similarity index 100% rename from iphone/Maps/Classes/CustomAlert/LocationAlert/MWMLocationAlert.mm rename to iphone/Maps/Classes/CustomAlert/LocationAlert/MWMLocationAlert.m diff --git a/iphone/Maps/Classes/CustomAlert/MWMOsmAuthAlert.mm b/iphone/Maps/Classes/CustomAlert/MWMOsmAuthAlert.mm index 25005ba786..e2a69534db 100644 --- a/iphone/Maps/Classes/CustomAlert/MWMOsmAuthAlert.mm +++ b/iphone/Maps/Classes/CustomAlert/MWMOsmAuthAlert.mm @@ -4,7 +4,8 @@ #include "editor/osm_auth.hpp" -extern NSString * const kMap2OsmLoginSegue; +static NSString * const kMap2OsmLoginSegue = @"Map2OsmLogin"; + extern NSString * const kMap2FBLoginSegue; extern NSString * const kMap2GoogleLoginSegue; diff --git a/iphone/Maps/Classes/CustomAlert/MWMPlaceDoesntExistAlert.mm b/iphone/Maps/Classes/CustomAlert/MWMPlaceDoesntExistAlert.m similarity index 100% rename from iphone/Maps/Classes/CustomAlert/MWMPlaceDoesntExistAlert.mm rename to iphone/Maps/Classes/CustomAlert/MWMPlaceDoesntExistAlert.m diff --git a/iphone/Maps/Classes/CustomAlert/RateAlert/MWMRateAlert.mm b/iphone/Maps/Classes/CustomAlert/RateAlert/MWMRateAlert.mm index e96f99b8bb..8ff57ab76d 100644 --- a/iphone/Maps/Classes/CustomAlert/RateAlert/MWMRateAlert.mm +++ b/iphone/Maps/Classes/CustomAlert/RateAlert/MWMRateAlert.mm @@ -11,8 +11,8 @@ #include "platform/platform.hpp" extern NSString * const kUDAlreadyRatedKey; -extern NSString * const kLocaleUsedInSupportEmails; -extern NSString * const kRateAlertEventName = @"rateAlertEvent"; + +static NSString * const kRateAlertEventName = @"rateAlertEvent"; static NSString * const kRateAlertNibName = @"MWMRateAlert"; static NSString * const kRateEmail = @"rating@maps.me"; diff --git a/iphone/Maps/Classes/CustomAlert/RoutingDisclaimerAlert/MWMRoutingDisclaimerAlert.mm b/iphone/Maps/Classes/CustomAlert/RoutingDisclaimerAlert/MWMRoutingDisclaimerAlert.m similarity index 100% rename from iphone/Maps/Classes/CustomAlert/RoutingDisclaimerAlert/MWMRoutingDisclaimerAlert.mm rename to iphone/Maps/Classes/CustomAlert/RoutingDisclaimerAlert/MWMRoutingDisclaimerAlert.m diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/APIBar/MWMAPIBar.h b/iphone/Maps/Classes/CustomViews/MapViewControls/APIBar/MWMAPIBar.h deleted file mode 100644 index e913d6390e..0000000000 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/APIBar/MWMAPIBar.h +++ /dev/null @@ -1,7 +0,0 @@ -@interface MWMAPIBar : NSObject - -- (nullable instancetype)initWithController:(nonnull UIViewController *)controller; - -- (void)back; - -@end diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/APIBar/MWMAPIBar.mm b/iphone/Maps/Classes/CustomViews/MapViewControls/APIBar/MWMAPIBar.mm deleted file mode 100644 index 1c9b6d75d0..0000000000 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/APIBar/MWMAPIBar.mm +++ /dev/null @@ -1,58 +0,0 @@ -#import "MWMAPIBar.h" -#import "MWMAPIBarView.h" -#import "Statistics.h" - -#include - -static NSString * const kKeyPath = @"subviews"; - -@interface MWMAPIBar () - -@property (nonatomic) IBOutlet MWMAPIBarView * rootView; -@property (weak, nonatomic) IBOutlet UIImageView * backArrow; -@property (weak, nonatomic) IBOutlet UILabel * backLabel; -@property (weak, nonatomic) IBOutlet UILabel * timeLabel; - -@property (nonatomic) NSDateFormatter * timeFormatter; -@property (nonatomic) NSTimer * timer; - -@property (weak, nonatomic) UIViewController * controller; - -@end - -@implementation MWMAPIBar - -- (nullable instancetype)initWithController:(nonnull UIViewController *)controller -{ - self = [super init]; - if (self) - { - self.controller = controller; - [NSBundle.mainBundle loadNibNamed:@"MWMAPIBarView" owner:self options:nil]; - - self.timeFormatter = [[NSDateFormatter alloc] init]; - self.timeFormatter.dateStyle = NSDateFormatterNoStyle; - self.timeFormatter.timeStyle = NSDateFormatterShortStyle; - } - return self; -} - -- (void)timerUpdate -{ - self.timeLabel.text = [self.timeFormatter stringFromDate:[NSDate date]]; -} - -#pragma mark - Actions - -- (IBAction)back -{ - [Statistics logEvent:kStatEventName(kStatAPI, kStatBack)]; - Framework & f = GetFramework(); - f.DeactivateMapSelection(true); - auto & bmManager = f.GetBookmarkManager(); - bmManager.GetEditSession().ClearGroup(UserMark::Type::API); - NSURL * url = [NSURL URLWithString:@(f.GetApiDataHolder().GetGlobalBackUrl().c_str())]; - [UIApplication.sharedApplication openURL:url options:@{} completionHandler:nil]; -} - -@end diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/APIBar/MWMAPIBarView.h b/iphone/Maps/Classes/CustomViews/MapViewControls/APIBar/MWMAPIBarView.h deleted file mode 100644 index 570ffb143a..0000000000 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/APIBar/MWMAPIBarView.h +++ /dev/null @@ -1,8 +0,0 @@ -#import - -@interface MWMAPIBarView : UIView - -- (nonnull instancetype)initWithFrame:(CGRect)frame __attribute__((unavailable("initWithFrame is not available"))); -- (nonnull instancetype)init __attribute__((unavailable("init is not available"))); - -@end diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/APIBar/MWMAPIBarView.mm b/iphone/Maps/Classes/CustomViews/MapViewControls/APIBar/MWMAPIBarView.mm deleted file mode 100644 index 628c44113f..0000000000 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/APIBar/MWMAPIBarView.mm +++ /dev/null @@ -1,19 +0,0 @@ -#import "MWMAPIBarView.h" - -@implementation MWMAPIBarView - -- (instancetype)initWithCoder:(NSCoder *)aDecoder -{ - self = [super initWithCoder:aDecoder]; - if (self) - self.autoresizingMask = UIViewAutoresizingFlexibleWidth; - return self; -} - -- (void)layoutSubviews -{ - self.frame = {{}, {self.superview.bounds.size.width, 20.0}}; - [super layoutSubviews]; -} - -@end diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/APIBar/MWMAPIBarView.xib b/iphone/Maps/Classes/CustomViews/MapViewControls/APIBar/MWMAPIBarView.xib deleted file mode 100644 index 43d9648948..0000000000 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/APIBar/MWMAPIBarView.xib +++ /dev/null @@ -1,110 +0,0 @@ - - - - - - - - - - - - - - HelveticaNeue - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.mm b/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.mm index 558d700ff7..cb061bf7e1 100644 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.mm +++ b/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.mm @@ -29,8 +29,6 @@ namespace NSString * const kMapToCategorySelectorSegue = @"MapToCategorySelectorSegue"; } // namespace -extern NSString * const kAlohalyticsTapEventKey; - @interface MWMMapViewControlsManager () @property(nonatomic) MWMSideButtons * sideButtons; diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/SideButtons/MWMSideButtons.mm b/iphone/Maps/Classes/CustomViews/MapViewControls/SideButtons/MWMSideButtons.mm index 362faa5ef7..68d17c222b 100644 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/SideButtons/MWMSideButtons.mm +++ b/iphone/Maps/Classes/CustomViews/MapViewControls/SideButtons/MWMSideButtons.mm @@ -11,8 +11,6 @@ #include -extern NSString * const kAlohalyticsTapEventKey; - namespace { NSString * const kMWMSideButtonsViewNibName = @"MWMSideButtonsView"; diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager.mm b/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager.mm index fff220568a..bca38fac62 100644 --- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager.mm +++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager.mm @@ -7,8 +7,6 @@ #import "SwiftBridge.h" -extern NSString * const kAlohalyticsTapEventKey; - namespace { NSString * const kRoutePreviewIPADXibName = @"MWMiPadRoutePreview"; diff --git a/iphone/Maps/Classes/InputValidators/MWMInputEmailValidator.mm b/iphone/Maps/Classes/InputValidators/MWMInputEmailValidator.m similarity index 95% rename from iphone/Maps/Classes/InputValidators/MWMInputEmailValidator.mm rename to iphone/Maps/Classes/InputValidators/MWMInputEmailValidator.m index 7dce50fce5..c1ba54adc1 100644 --- a/iphone/Maps/Classes/InputValidators/MWMInputEmailValidator.mm +++ b/iphone/Maps/Classes/InputValidators/MWMInputEmailValidator.m @@ -15,7 +15,7 @@ static NSString * const kEmailRegexPattern = @"[A-Z0-9a-z._%+-]+@[A-Za-z0-9.-]+\ error:&err]; NSAssert(!err, @"Invalid regular expression"); NSMutableArray * matches = [@[] mutableCopy]; - NSRange const range{0, string.length}; + NSRange range = NSMakeRange(0, string.length); [regex enumerateMatchesInString:string options:NSMatchingReportProgress range:range diff --git a/iphone/Maps/Classes/InputValidators/MWMInputLoginValidator.mm b/iphone/Maps/Classes/InputValidators/MWMInputLoginValidator.m similarity index 83% rename from iphone/Maps/Classes/InputValidators/MWMInputLoginValidator.mm rename to iphone/Maps/Classes/InputValidators/MWMInputLoginValidator.m index 6c5df1ecee..dc92567b60 100644 --- a/iphone/Maps/Classes/InputValidators/MWMInputLoginValidator.mm +++ b/iphone/Maps/Classes/InputValidators/MWMInputLoginValidator.m @@ -1,6 +1,6 @@ #import "MWMInputLoginValidator.h" -NSUInteger constexpr minLoginLength = 3; +static NSUInteger const minLoginLength = 3; @implementation MWMInputLoginValidator diff --git a/iphone/Maps/Classes/InputValidators/MWMInputPasswordValidator.mm b/iphone/Maps/Classes/InputValidators/MWMInputPasswordValidator.m similarity index 83% rename from iphone/Maps/Classes/InputValidators/MWMInputPasswordValidator.mm rename to iphone/Maps/Classes/InputValidators/MWMInputPasswordValidator.m index 7f4d539adf..1df0d92def 100644 --- a/iphone/Maps/Classes/InputValidators/MWMInputPasswordValidator.mm +++ b/iphone/Maps/Classes/InputValidators/MWMInputPasswordValidator.m @@ -1,6 +1,6 @@ #import "MWMInputPasswordValidator.h" -NSUInteger constexpr minPasswordLength = 8; +static NSUInteger const minPasswordLength = 8; @implementation MWMInputPasswordValidator diff --git a/iphone/Maps/Classes/InputValidators/MWMInputValidator.mm b/iphone/Maps/Classes/InputValidators/MWMInputValidator.m similarity index 100% rename from iphone/Maps/Classes/InputValidators/MWMInputValidator.mm rename to iphone/Maps/Classes/InputValidators/MWMInputValidator.m diff --git a/iphone/Maps/Classes/InputValidators/MWMInputValidatorFactory.mm b/iphone/Maps/Classes/InputValidators/MWMInputValidatorFactory.m similarity index 100% rename from iphone/Maps/Classes/InputValidators/MWMInputValidatorFactory.mm rename to iphone/Maps/Classes/InputValidators/MWMInputValidatorFactory.m diff --git a/iphone/Maps/Classes/MWMTableViewCell.mm b/iphone/Maps/Classes/MWMTableViewCell.m similarity index 100% rename from iphone/Maps/Classes/MWMTableViewCell.mm rename to iphone/Maps/Classes/MWMTableViewCell.m diff --git a/iphone/Maps/Classes/MapViewController.h b/iphone/Maps/Classes/MapViewController.h index 65836c7034..784bf639a9 100644 --- a/iphone/Maps/Classes/MapViewController.h +++ b/iphone/Maps/Classes/MapViewController.h @@ -6,7 +6,6 @@ @class MWMWelcomePageController; @class MWMMapViewControlsManager; -@class MWMAPIBar; @class MWMPlacePageData; @class EAGLView; @class MWMMapDownloadDialog; @@ -50,7 +49,6 @@ - (void)disableCarPlayRepresentation; @property(nonatomic, readonly) MWMMapViewControlsManager * controlsManager; -@property(nonatomic) MWMAPIBar * apiBar; @property(nonatomic) MWMWelcomePageController * welcomePageController; @property(nonatomic, readonly) MWMMapDownloadDialog * downloadDialog; diff --git a/iphone/Maps/Classes/MapViewController.mm b/iphone/Maps/Classes/MapViewController.mm index 4b01769492..7aa8fdcbfb 100644 --- a/iphone/Maps/Classes/MapViewController.mm +++ b/iphone/Maps/Classes/MapViewController.mm @@ -1,7 +1,6 @@ #import "MapViewController.h" #import "BookmarksVC.h" #import "EAGLView.h" -#import "MWMAPIBar.h" #import "MWMAuthorizationCommon.h" #import "MWMAuthorizationWebViewLoginViewController.h" #import "MWMAutoupdateController.h" @@ -32,8 +31,6 @@ // folder. #import "../../../private.h" -extern NSString * const kAlohalyticsTapEventKey = @"$onClick"; -extern NSString * const kMap2OsmLoginSegue = @"Map2OsmLogin"; extern NSString * const kMap2FBLoginSegue = @"Map2FBLogin"; extern NSString * const kMap2GoogleLoginSegue = @"Map2GoogleLogin"; @@ -706,15 +703,6 @@ NSString * const kHotelFacilitiesSegue = @"Map2FacilitiesSegue"; } } -#pragma mark - API bar - -- (MWMAPIBar *)apiBar -{ - if (!_apiBar) - _apiBar = [[MWMAPIBar alloc] initWithController:self]; - return _apiBar; -} - #pragma mark - ShowDialog callback - (void)presentDisabledLocationAlert { [self.alertController presentDisabledLocationAlert]; } diff --git a/iphone/Maps/Classes/MapsAppDelegate.mm b/iphone/Maps/Classes/MapsAppDelegate.mm index fd3cedbc15..05607614a6 100644 --- a/iphone/Maps/Classes/MapsAppDelegate.mm +++ b/iphone/Maps/Classes/MapsAppDelegate.mm @@ -44,10 +44,8 @@ // If you have a "missing header error" here, then please run configure.sh script in the root repo // folder. -extern NSString * const MapsStatusChangedNotification = @"MapsStatusChangedNotification"; // Alert keys. extern NSString * const kUDAlreadyRatedKey = @"UserAlreadyRatedApp"; -extern NSString * const kUDAlreadySharedKey = @"UserAlreadyShared"; namespace { diff --git a/iphone/Maps/Common/MWMConsts.h b/iphone/Maps/Common/MWMConsts.h index 9c997e3e43..2423d06413 100644 --- a/iphone/Maps/Common/MWMConsts.h +++ b/iphone/Maps/Common/MWMConsts.h @@ -6,3 +6,5 @@ static uint64_t const KB = 1024; static uint64_t const MB = 1024 * 1024; // The last 5% are left for applying diffs. static float const kMaxProgress = 0.95f; +static NSString * const kLocaleUsedInSupportEmails = @"en_gb"; +static NSString * const kAlohalyticsTapEventKey = @"$onClick"; diff --git a/iphone/Maps/Common/WebViewController.mm b/iphone/Maps/Common/WebViewController.m similarity index 90% rename from iphone/Maps/Common/WebViewController.mm rename to iphone/Maps/Common/WebViewController.m index 5c0406642b..22683e6eb5 100644 --- a/iphone/Maps/Common/WebViewController.mm +++ b/iphone/Maps/Common/WebViewController.m @@ -1,5 +1,5 @@ #import "WebViewController.h" -#include +#import @interface WebViewController() @@ -39,7 +39,7 @@ - (NSString *)configuredHtmlWithText:(NSString *)htmlText { - auto html = [htmlText stringByReplacingOccurrencesOfString:@"" + NSString *html = [htmlText stringByReplacingOccurrencesOfString:@"" withString:@""]; html = [htmlText stringByReplacingOccurrencesOfString:@"" withString:@""]; return html; @@ -64,7 +64,7 @@ UIView * view = self.view; view.backgroundColor = UIColor.whiteColor; - self.webView = [[WKWebView alloc] initWithFrame:{}]; + self.webView = [[WKWebView alloc] initWithFrame:CGRectZero]; self.webView.navigationDelegate = self; [view addSubview:self.webView]; @@ -105,16 +105,15 @@ } else { - auto request = [NSMutableURLRequest requestWithURL:self.m_url]; + NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:self.m_url]; for (NSString *header in headers.allKeys) { [request setValue:headers[header] forHTTPHeaderField:header]; } - [request setValue:@(GetPlatform().GetAppUserAgent().Get().c_str()) forHTTPHeaderField:@"User-Agent"]; + [request setValue:[MWMFrameworkHelper userAgent] forHTTPHeaderField:@"User-Agent"]; if (self.shouldAddAccessToken) { - auto authHeader = [NSString stringWithFormat:@"Bearer %@", - @(GetFramework().GetUser().GetAccessToken().c_str())]; + NSString *authHeader = [NSString stringWithFormat:@"Bearer %@", [MWMFrameworkHelper userAccessToken]]; [request setValue:authHeader forHTTPHeaderField:@"Authorization"]; } [self.webView loadRequest:request]; @@ -149,11 +148,11 @@ NSURLRequest * inRequest = navigationAction.request; if ([inRequest.URL.host isEqualToString:@"localhost"]) { - auto query = inRequest.URL.query; + NSString *query = inRequest.URL.query; NSArray * components = [query componentsSeparatedByString:@"="]; if (components.count != 2) { - ASSERT(false, ("Incorrect query:", query.UTF8String)); + NSAssert(false, @"Incorrect query:", query); [self pop]; decisionHandler(WKNavigationActionPolicyCancel); return; diff --git a/iphone/Maps/Core/Ads/Mopub/MPNativeAd+MWM.mm b/iphone/Maps/Core/Ads/Mopub/MPNativeAd+MWM.m similarity index 81% rename from iphone/Maps/Core/Ads/Mopub/MPNativeAd+MWM.mm rename to iphone/Maps/Core/Ads/Mopub/MPNativeAd+MWM.m index 13d3ce6917..492af050ed 100644 --- a/iphone/Maps/Core/Ads/Mopub/MPNativeAd+MWM.mm +++ b/iphone/Maps/Core/Ads/Mopub/MPNativeAd+MWM.m @@ -18,13 +18,13 @@ - (void)setAdView:(UIView *)view actionButtons:(NSArray *)buttons { - self.associatedView = static_cast(view); - static_cast(view).mpNativeAd = self; + self.associatedView = (MPNativeView *)view; + ((MWMAdBanner *)view).mpNativeAd = self; if (!self.hasAttachedToView) { - auto adapter = self.adAdapter; + id adapter = self.adAdapter; if ([adapter isKindOfClass:[FacebookNativeAdAdapter class]]) { - auto fbAdapter = static_cast(adapter); + FacebookNativeAdAdapter *fbAdapter = (FacebookNativeAdAdapter *)adapter; [fbAdapter.fbNativeAd registerViewForInteraction:self.associatedView withViewController:[self viewControllerForPresentingModalView] withClickableViews:buttons]; @@ -45,14 +45,14 @@ - (void)unregister { - auto adapter = self.adAdapter; + id adapter = self.adAdapter; self.delegate = nil; [self nativeViewWillMoveToSuperview:nil]; self.associatedView = nil; self.hasAttachedToView = NO; if ([adapter isKindOfClass:[FacebookNativeAdAdapter class]]) { - auto fbAdapter = static_cast(adapter); + FacebookNativeAdAdapter *fbAdapter = (FacebookNativeAdAdapter *)adapter; [fbAdapter.fbNativeAd unregisterView]; } } diff --git a/iphone/Maps/Maps.xcodeproj/project.pbxproj b/iphone/Maps/Maps.xcodeproj/project.pbxproj index ffda66ce17..2e44eef6e3 100644 --- a/iphone/Maps/Maps.xcodeproj/project.pbxproj +++ b/iphone/Maps/Maps.xcodeproj/project.pbxproj @@ -8,14 +8,14 @@ /* Begin PBXBuildFile section */ 1DA7908820762CEB008BDD6B /* libopen_location_code.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1DA7908920762CEB008BDD6B /* libopen_location_code.a */; }; - 1DFA2F6A20D3B57400FB2C66 /* UIColor+PartnerColor.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1DFA2F6920D3B57400FB2C66 /* UIColor+PartnerColor.mm */; }; + 1DFA2F6A20D3B57400FB2C66 /* UIColor+PartnerColor.m in Sources */ = {isa = PBXBuildFile; fileRef = 1DFA2F6920D3B57400FB2C66 /* UIColor+PartnerColor.m */; }; 33010DB321B7E14700925411 /* MWMPlaceDescriptionCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 33010DB221B7E14700925411 /* MWMPlaceDescriptionCell.xib */; }; 3304306D21D4EAFB00317CA3 /* SearchCategoryCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3304306C21D4EAFB00317CA3 /* SearchCategoryCell.swift */; }; 33046832219C57180041F3A8 /* CategorySettingsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33046831219C57180041F3A8 /* CategorySettingsViewController.swift */; }; 33046836219C5A4E0041F3A8 /* CategorySettings.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 33046835219C5A4E0041F3A8 /* CategorySettings.storyboard */; }; 330473EA21F7440C00DC4AEA /* MWMHotelParams.mm in Sources */ = {isa = PBXBuildFile; fileRef = 330473E921F7440C00DC4AEA /* MWMHotelParams.mm */; }; 331630D12191D74B00BB91A9 /* TagSectionHeaderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 331630D02191D74B00BB91A9 /* TagSectionHeaderView.swift */; }; - 331922AF21BAD29900D4AAC5 /* MWMPlaceDescriptionCell.mm in Sources */ = {isa = PBXBuildFile; fileRef = 331922AE21BAD29900D4AAC5 /* MWMPlaceDescriptionCell.mm */; }; + 331922AF21BAD29900D4AAC5 /* MWMPlaceDescriptionCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 331922AE21BAD29900D4AAC5 /* MWMPlaceDescriptionCell.m */; }; 3358607E217632A2006D11F2 /* BookmarksSharingViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3358607D217632A2006D11F2 /* BookmarksSharingViewController.swift */; }; 33603C85219F0F6300B11FFE /* SharingPropertiesViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33603C84219F0F6300B11FFE /* SharingPropertiesViewController.swift */; }; 337F98A321D37B5800C8AC27 /* SearchHistoryViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 337F98A021D37B5700C8AC27 /* SearchHistoryViewController.xib */; }; @@ -47,7 +47,7 @@ 340475501E081A4600C92850 /* fabric_logging_ios.mm in Sources */ = {isa = PBXBuildFile; fileRef = 340475201E081A4600C92850 /* fabric_logging_ios.mm */; }; 340475531E081A4600C92850 /* MWMCustomFacebookEvents.mm in Sources */ = {isa = PBXBuildFile; fileRef = 340475221E081A4600C92850 /* MWMCustomFacebookEvents.mm */; }; 340475561E081A4600C92850 /* Statistics.mm in Sources */ = {isa = PBXBuildFile; fileRef = 340475241E081A4600C92850 /* Statistics.mm */; }; - 340475591E081A4600C92850 /* WebViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 340475271E081A4600C92850 /* WebViewController.mm */; }; + 340475591E081A4600C92850 /* WebViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 340475271E081A4600C92850 /* WebViewController.m */; }; 3404755C1E081A4600C92850 /* MWMLocationManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3404752C1E081A4600C92850 /* MWMLocationManager.mm */; }; 3404755F1E081A4600C92850 /* MWMLocationPredictor.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3404752F1E081A4600C92850 /* MWMLocationPredictor.mm */; }; 340475621E081A4600C92850 /* MWMNetworkPolicy+UI.m in Sources */ = {isa = PBXBuildFile; fileRef = 340475321E081A4600C92850 /* MWMNetworkPolicy+UI.m */; }; @@ -92,7 +92,7 @@ 342EE4121C43DAA7009F6A49 /* MWMAuthorizationWebViewLoginViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 342EE4101C43DAA7009F6A49 /* MWMAuthorizationWebViewLoginViewController.mm */; }; 3430291D1F87BF4400D0A07C /* ReviewsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3430291A1F87BC3000D0A07C /* ReviewsViewController.swift */; }; 343064411E9FDC7300DC7665 /* SearchIndex.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3430643F1E9FDC7300DC7665 /* SearchIndex.swift */; }; - 343E75981E5B1EE20041226A /* MWMCollectionViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 343E75961E5B1EE20041226A /* MWMCollectionViewController.mm */; }; + 343E75981E5B1EE20041226A /* MWMCollectionViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 343E75961E5B1EE20041226A /* MWMCollectionViewController.m */; }; 3444DFCD1F1760B900E73099 /* WidgetsArea.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3444DFCB1F1760B900E73099 /* WidgetsArea.swift */; }; 3444DFD21F17620C00E73099 /* MWMMapWidgetsHelper.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3444DFD01F17620C00E73099 /* MWMMapWidgetsHelper.mm */; }; 3444DFDE1F18A5AF00E73099 /* SideButtonsArea.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3444DFDC1F18A5AF00E73099 /* SideButtonsArea.swift */; }; @@ -107,21 +107,21 @@ 344BEAF61F66BDC30045DC45 /* RatingSummaryViewSettings.swift in Sources */ = {isa = PBXBuildFile; fileRef = 344BEAF11F66BDC30045DC45 /* RatingSummaryViewSettings.swift */; }; 344D63181E795A3C006F17CB /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 344D63161E795A2D006F17CB /* SystemConfiguration.framework */; }; 3451F4EE1F026DAF00A981F2 /* PlacePageTaxiCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3451F4EC1F026DAF00A981F2 /* PlacePageTaxiCell.swift */; }; - 3454D7B91E07F045004AF2AD /* CALayer+RuntimeAttributes.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3454D79A1E07F045004AF2AD /* CALayer+RuntimeAttributes.mm */; }; + 3454D7B91E07F045004AF2AD /* CALayer+RuntimeAttributes.m in Sources */ = {isa = PBXBuildFile; fileRef = 3454D79A1E07F045004AF2AD /* CALayer+RuntimeAttributes.m */; }; 3454D7BC1E07F045004AF2AD /* CLLocation+Mercator.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3454D79C1E07F045004AF2AD /* CLLocation+Mercator.mm */; }; 3454D7BF1E07F045004AF2AD /* DateComponentsFormatter+ETA.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3454D79D1E07F045004AF2AD /* DateComponentsFormatter+ETA.swift */; }; - 3454D7C21E07F045004AF2AD /* NSString+Categories.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3454D79F1E07F045004AF2AD /* NSString+Categories.mm */; }; - 3454D7C51E07F045004AF2AD /* UIButton+Orientation.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3454D7A11E07F045004AF2AD /* UIButton+Orientation.mm */; }; - 3454D7C81E07F045004AF2AD /* UIButton+RuntimeAttributes.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3454D7A31E07F045004AF2AD /* UIButton+RuntimeAttributes.mm */; }; - 3454D7CB1E07F045004AF2AD /* UIColor+MapsMeColor.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3454D7A51E07F045004AF2AD /* UIColor+MapsMeColor.mm */; }; - 3454D7CE1E07F045004AF2AD /* UIFont+MapsMeFonts.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3454D7A71E07F045004AF2AD /* UIFont+MapsMeFonts.mm */; }; - 3454D7D11E07F045004AF2AD /* UIImage+RGBAData.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3454D7A91E07F045004AF2AD /* UIImage+RGBAData.mm */; }; - 3454D7D41E07F045004AF2AD /* UIImageView+Coloring.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3454D7AB1E07F045004AF2AD /* UIImageView+Coloring.mm */; }; - 3454D7D71E07F045004AF2AD /* UIKitCategories.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3454D7AD1E07F045004AF2AD /* UIKitCategories.mm */; }; - 3454D7DA1E07F045004AF2AD /* UILabel+RuntimeAttributes.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3454D7AF1E07F045004AF2AD /* UILabel+RuntimeAttributes.mm */; }; + 3454D7C21E07F045004AF2AD /* NSString+Categories.m in Sources */ = {isa = PBXBuildFile; fileRef = 3454D79F1E07F045004AF2AD /* NSString+Categories.m */; }; + 3454D7C51E07F045004AF2AD /* UIButton+Orientation.m in Sources */ = {isa = PBXBuildFile; fileRef = 3454D7A11E07F045004AF2AD /* UIButton+Orientation.m */; }; + 3454D7C81E07F045004AF2AD /* UIButton+RuntimeAttributes.m in Sources */ = {isa = PBXBuildFile; fileRef = 3454D7A31E07F045004AF2AD /* UIButton+RuntimeAttributes.m */; }; + 3454D7CB1E07F045004AF2AD /* UIColor+MapsMeColor.m in Sources */ = {isa = PBXBuildFile; fileRef = 3454D7A51E07F045004AF2AD /* UIColor+MapsMeColor.m */; }; + 3454D7CE1E07F045004AF2AD /* UIFont+MapsMeFonts.m in Sources */ = {isa = PBXBuildFile; fileRef = 3454D7A71E07F045004AF2AD /* UIFont+MapsMeFonts.m */; }; + 3454D7D11E07F045004AF2AD /* UIImage+RGBAData.m in Sources */ = {isa = PBXBuildFile; fileRef = 3454D7A91E07F045004AF2AD /* UIImage+RGBAData.m */; }; + 3454D7D41E07F045004AF2AD /* UIImageView+Coloring.m in Sources */ = {isa = PBXBuildFile; fileRef = 3454D7AB1E07F045004AF2AD /* UIImageView+Coloring.m */; }; + 3454D7D71E07F045004AF2AD /* UIKitCategories.m in Sources */ = {isa = PBXBuildFile; fileRef = 3454D7AD1E07F045004AF2AD /* UIKitCategories.m */; }; + 3454D7DA1E07F045004AF2AD /* UILabel+RuntimeAttributes.m in Sources */ = {isa = PBXBuildFile; fileRef = 3454D7AF1E07F045004AF2AD /* UILabel+RuntimeAttributes.m */; }; 3454D7DD1E07F045004AF2AD /* UISwitch+RuntimeAttributes.m in Sources */ = {isa = PBXBuildFile; fileRef = 3454D7B11E07F045004AF2AD /* UISwitch+RuntimeAttributes.m */; }; - 3454D7E01E07F045004AF2AD /* UITextField+RuntimeAttributes.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3454D7B31E07F045004AF2AD /* UITextField+RuntimeAttributes.mm */; }; - 3454D7E31E07F045004AF2AD /* UITextView+RuntimeAttributes.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3454D7B51E07F045004AF2AD /* UITextView+RuntimeAttributes.mm */; }; + 3454D7E01E07F045004AF2AD /* UITextField+RuntimeAttributes.m in Sources */ = {isa = PBXBuildFile; fileRef = 3454D7B31E07F045004AF2AD /* UITextField+RuntimeAttributes.m */; }; + 3454D7E31E07F045004AF2AD /* UITextView+RuntimeAttributes.m in Sources */ = {isa = PBXBuildFile; fileRef = 3454D7B51E07F045004AF2AD /* UITextView+RuntimeAttributes.m */; }; 3454D7E61E07F045004AF2AD /* UIView+RuntimeAttributes.m in Sources */ = {isa = PBXBuildFile; fileRef = 3454D7B71E07F045004AF2AD /* UIView+RuntimeAttributes.m */; }; 34574A671E3B85F80061E839 /* ThemeManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34574A651E3B85F80061E839 /* ThemeManager.swift */; }; 3457C4261F680F1900028233 /* String+BoundingRect.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3457C4241F680F1900028233 /* String+BoundingRect.swift */; }; @@ -196,7 +196,7 @@ 349D1CE41E3F836900A878FD /* UIViewController+Hierarchy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 349D1CE21E3F836900A878FD /* UIViewController+Hierarchy.swift */; }; 349FC5481F680DAE00968C9F /* ExpandableReviewView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 349FC5451F680DAE00968C9F /* ExpandableReviewView.swift */; }; 349FC54B1F680DAE00968C9F /* ExpandableReviewSettings.swift in Sources */ = {isa = PBXBuildFile; fileRef = 349FC5461F680DAE00968C9F /* ExpandableReviewSettings.swift */; }; - 34AB39C21D2BD8310021857D /* MWMStopButton.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34AB39C01D2BD8310021857D /* MWMStopButton.mm */; }; + 34AB39C21D2BD8310021857D /* MWMStopButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 34AB39C01D2BD8310021857D /* MWMStopButton.m */; }; 34AB66051FC5AA320078E451 /* MWMNavigationDashboardManager+Entity.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34AB65C51FC5AA320078E451 /* MWMNavigationDashboardManager+Entity.mm */; }; 34AB66081FC5AA320078E451 /* MWMNavigationDashboardManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34AB65C61FC5AA320078E451 /* MWMNavigationDashboardManager.mm */; }; 34AB660B1FC5AA320078E451 /* MWMNavigationDashboardEntity.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34AB65CB1FC5AA320078E451 /* MWMNavigationDashboardEntity.mm */; }; @@ -244,10 +244,10 @@ 34AB66891FC5AA330078E451 /* NavigationControlView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34AB66021FC5AA320078E451 /* NavigationControlView.swift */; }; 34AB668C1FC5AA330078E451 /* NavigationStreetNameView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34AB66031FC5AA320078E451 /* NavigationStreetNameView.swift */; }; 34ABA6171C2D185C00FE1BEC /* MWMAuthorizationOSMLoginViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34ABA6151C2D185B00FE1BEC /* MWMAuthorizationOSMLoginViewController.mm */; }; - 34ABA6211C2D517500FE1BEC /* MWMInputValidator.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34ABA61F1C2D517500FE1BEC /* MWMInputValidator.mm */; }; - 34ABA6251C2D551900FE1BEC /* MWMInputValidatorFactory.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34ABA6231C2D551900FE1BEC /* MWMInputValidatorFactory.mm */; }; - 34ABA6291C2D567B00FE1BEC /* MWMInputLoginValidator.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34ABA6271C2D567B00FE1BEC /* MWMInputLoginValidator.mm */; }; - 34ABA62D1C2D57D500FE1BEC /* MWMInputPasswordValidator.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34ABA62B1C2D57D500FE1BEC /* MWMInputPasswordValidator.mm */; }; + 34ABA6211C2D517500FE1BEC /* MWMInputValidator.m in Sources */ = {isa = PBXBuildFile; fileRef = 34ABA61F1C2D517500FE1BEC /* MWMInputValidator.m */; }; + 34ABA6251C2D551900FE1BEC /* MWMInputValidatorFactory.m in Sources */ = {isa = PBXBuildFile; fileRef = 34ABA6231C2D551900FE1BEC /* MWMInputValidatorFactory.m */; }; + 34ABA6291C2D567B00FE1BEC /* MWMInputLoginValidator.m in Sources */ = {isa = PBXBuildFile; fileRef = 34ABA6271C2D567B00FE1BEC /* MWMInputLoginValidator.m */; }; + 34ABA62D1C2D57D500FE1BEC /* MWMInputPasswordValidator.m in Sources */ = {isa = PBXBuildFile; fileRef = 34ABA62B1C2D57D500FE1BEC /* MWMInputPasswordValidator.m */; }; 34AC8FD11EFC02C000E7F910 /* MWMRoutePoint.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34AC8FC71EFC01F500E7F910 /* MWMRoutePoint.mm */; }; 34AC8FDB1EFC07FE00E7F910 /* UILabel+NumberOfVisibleLines.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34AC8FD91EFC062400E7F910 /* UILabel+NumberOfVisibleLines.swift */; }; 34B127EA1FBDD410008713D9 /* MWMRouterTransitStepInfo.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34B127E81FBDD410008713D9 /* MWMRouterTransitStepInfo.mm */; }; @@ -257,7 +257,7 @@ 34B846A12029DCC10081ECCD /* BMCCategoriesHeader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34B846A02029DCC10081ECCD /* BMCCategoriesHeader.swift */; }; 34B846A32029DFEB0081ECCD /* BMCPermissionsHeader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34B846A22029DFEB0081ECCD /* BMCPermissionsHeader.swift */; }; 34B846A82029E8110081ECCD /* BMCDefaultViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34B846A72029E8110081ECCD /* BMCDefaultViewModel.swift */; }; - 34B924431DC8A29C0008D971 /* MWMMailViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34B924411DC8A29C0008D971 /* MWMMailViewController.mm */; }; + 34B924431DC8A29C0008D971 /* MWMMailViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34B924411DC8A29C0008D971 /* MWMMailViewController.m */; }; 34BBD6471F82649D0070CA50 /* GoogleSignIn.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 34BBD6451F8264980070CA50 /* GoogleSignIn.bundle */; }; 34BBD64C1F826DB10070CA50 /* AuthorizationViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34BBD64A1F826DB10070CA50 /* AuthorizationViewController.swift */; }; 34BBD6581F826F810070CA50 /* AuthorizationTransitioningManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34BBD6561F826F810070CA50 /* AuthorizationTransitioningManager.swift */; }; @@ -266,8 +266,8 @@ 34BBD6641F8270AC0070CA50 /* AuthorizationTransitioning.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34BBD6621F8270AC0070CA50 /* AuthorizationTransitioning.swift */; }; 34BBD6681F8273350070CA50 /* AuthorizationViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34BBD6661F8273350070CA50 /* AuthorizationViewController.xib */; }; 34BF0CC71C31304A00D097EB /* MWMAuthorizationCommon.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34BF0CC51C31304A00D097EB /* MWMAuthorizationCommon.mm */; }; - 34C9BD031C6DB693000DC38D /* MWMTableViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34C9BCFF1C6DB693000DC38D /* MWMTableViewController.mm */; }; - 34C9BD051C6DB693000DC38D /* MWMViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34C9BD011C6DB693000DC38D /* MWMViewController.mm */; }; + 34C9BD031C6DB693000DC38D /* MWMTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34C9BCFF1C6DB693000DC38D /* MWMTableViewController.m */; }; + 34C9BD051C6DB693000DC38D /* MWMViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34C9BD011C6DB693000DC38D /* MWMViewController.m */; }; 34C9BD0A1C6DBCDA000DC38D /* MWMNavigationController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34C9BD081C6DBCDA000DC38D /* MWMNavigationController.m */; }; 34D1B6F11E95096B0057E9C7 /* libicu.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34D1B6F01E95096B0057E9C7 /* libicu.a */; }; 34D3AFE21E376F7E004100F9 /* UITableView+Updates.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34D3AFE01E376F7E004100F9 /* UITableView+Updates.swift */; }; @@ -275,22 +275,22 @@ 34D3AFF21E37945B004100F9 /* UITableView+Cells.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34D3AFF01E37945B004100F9 /* UITableView+Cells.swift */; }; 34D3AFF61E37A36A004100F9 /* UICollectionView+Cells.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34D3AFF41E37A36A004100F9 /* UICollectionView+Cells.swift */; }; 34D3B0181E389D05004100F9 /* EditorAdditionalNamePlaceholderTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34D3AFFD1E389D05004100F9 /* EditorAdditionalNamePlaceholderTableViewCell.swift */; }; - 34D3B01B1E389D05004100F9 /* MWMButtonCell.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34D3AFFF1E389D05004100F9 /* MWMButtonCell.mm */; }; + 34D3B01B1E389D05004100F9 /* MWMButtonCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 34D3AFFF1E389D05004100F9 /* MWMButtonCell.m */; }; 34D3B01E1E389D05004100F9 /* MWMButtonCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34D3B0001E389D05004100F9 /* MWMButtonCell.xib */; }; - 34D3B0211E389D05004100F9 /* MWMEditorAddAdditionalNameTableViewCell.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34D3B0021E389D05004100F9 /* MWMEditorAddAdditionalNameTableViewCell.mm */; }; + 34D3B0211E389D05004100F9 /* MWMEditorAddAdditionalNameTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 34D3B0021E389D05004100F9 /* MWMEditorAddAdditionalNameTableViewCell.m */; }; 34D3B0241E389D05004100F9 /* MWMEditorAddAdditionalNameTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34D3B0031E389D05004100F9 /* MWMEditorAddAdditionalNameTableViewCell.xib */; }; 34D3B0271E389D05004100F9 /* EditorAdditionalNamePlaceholderTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34D3B0041E389D05004100F9 /* EditorAdditionalNamePlaceholderTableViewCell.xib */; }; - 34D3B02A1E389D05004100F9 /* MWMEditorAdditionalNameTableViewCell.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34D3B0061E389D05004100F9 /* MWMEditorAdditionalNameTableViewCell.mm */; }; + 34D3B02A1E389D05004100F9 /* MWMEditorAdditionalNameTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 34D3B0061E389D05004100F9 /* MWMEditorAdditionalNameTableViewCell.m */; }; 34D3B02D1E389D05004100F9 /* MWMEditorAdditionalNameTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34D3B0071E389D05004100F9 /* MWMEditorAdditionalNameTableViewCell.xib */; }; - 34D3B0301E389D05004100F9 /* MWMEditorCategoryCell.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34D3B0091E389D05004100F9 /* MWMEditorCategoryCell.mm */; }; + 34D3B0301E389D05004100F9 /* MWMEditorCategoryCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 34D3B0091E389D05004100F9 /* MWMEditorCategoryCell.m */; }; 34D3B0331E389D05004100F9 /* MWMEditorCategoryCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34D3B00A1E389D05004100F9 /* MWMEditorCategoryCell.xib */; }; - 34D3B0361E389D05004100F9 /* MWMEditorSelectTableViewCell.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34D3B00C1E389D05004100F9 /* MWMEditorSelectTableViewCell.mm */; }; + 34D3B0361E389D05004100F9 /* MWMEditorSelectTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 34D3B00C1E389D05004100F9 /* MWMEditorSelectTableViewCell.m */; }; 34D3B0391E389D05004100F9 /* MWMEditorSelectTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34D3B00D1E389D05004100F9 /* MWMEditorSelectTableViewCell.xib */; }; - 34D3B03C1E389D05004100F9 /* MWMEditorSwitchTableViewCell.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34D3B00F1E389D05004100F9 /* MWMEditorSwitchTableViewCell.mm */; }; + 34D3B03C1E389D05004100F9 /* MWMEditorSwitchTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 34D3B00F1E389D05004100F9 /* MWMEditorSwitchTableViewCell.m */; }; 34D3B03F1E389D05004100F9 /* MWMEditorSwitchTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34D3B0101E389D05004100F9 /* MWMEditorSwitchTableViewCell.xib */; }; - 34D3B0421E389D05004100F9 /* MWMEditorTextTableViewCell.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34D3B0121E389D05004100F9 /* MWMEditorTextTableViewCell.mm */; }; + 34D3B0421E389D05004100F9 /* MWMEditorTextTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 34D3B0121E389D05004100F9 /* MWMEditorTextTableViewCell.m */; }; 34D3B0451E389D05004100F9 /* MWMEditorTextTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34D3B0131E389D05004100F9 /* MWMEditorTextTableViewCell.xib */; }; - 34D3B0481E389D05004100F9 /* MWMNoteCell.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34D3B0151E389D05004100F9 /* MWMNoteCell.mm */; }; + 34D3B0481E389D05004100F9 /* MWMNoteCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 34D3B0151E389D05004100F9 /* MWMNoteCell.m */; }; 34D3B04B1E389D05004100F9 /* MWMNoteCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34D3B0161E389D05004100F9 /* MWMNoteCell.xib */; }; 34D3B04F1E38A20C004100F9 /* Bundle+Init.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34D3B04D1E38A20C004100F9 /* Bundle+Init.swift */; }; 34D4FA631E26572D003F53EF /* FirstLaunchController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34D4FA611E26572D003F53EF /* FirstLaunchController.swift */; }; @@ -316,14 +316,14 @@ 34F407351E9E1AFF00E57AC0 /* CoreBanner.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34F407201E9E1AFF00E57AC0 /* CoreBanner.swift */; }; 34F407381E9E1AFF00E57AC0 /* FacebookBanner.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34F407221E9E1AFF00E57AC0 /* FacebookBanner.swift */; }; 34F4073B1E9E1AFF00E57AC0 /* MopubBanner.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34F407241E9E1AFF00E57AC0 /* MopubBanner.swift */; }; - 34F4073E1E9E1AFF00E57AC0 /* MPNativeAd+MWM.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34F407261E9E1AFF00E57AC0 /* MPNativeAd+MWM.mm */; }; + 34F4073E1E9E1AFF00E57AC0 /* MPNativeAd+MWM.m in Sources */ = {isa = PBXBuildFile; fileRef = 34F407261E9E1AFF00E57AC0 /* MPNativeAd+MWM.m */; }; 34F407411E9E1AFF00E57AC0 /* RBBanner.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34F4072A1E9E1AFF00E57AC0 /* RBBanner.swift */; }; 34F409891E9E1DD200E57AC0 /* libMopub.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F4075D1E9E1D7A00E57AC0 /* libMopub.a */; }; 34F5E0D41E3F254800B1C415 /* UIView+Hierarchy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34F5E0D21E3F254800B1C415 /* UIView+Hierarchy.swift */; }; 34F73F9C1E082FF800AC1FD6 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 34F73F5F1E082FF700AC1FD6 /* InfoPlist.strings */; }; 34F73F9F1E082FF800AC1FD6 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 34F73F611E082FF800AC1FD6 /* Localizable.strings */; }; 34F73FA31E08300E00AC1FD6 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 34F73FA11E08300E00AC1FD6 /* Images.xcassets */; }; - 34F742321E0834F400AC1FD6 /* UIViewController+Navigation.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34F742301E0834F400AC1FD6 /* UIViewController+Navigation.mm */; }; + 34F742321E0834F400AC1FD6 /* UIViewController+Navigation.m in Sources */ = {isa = PBXBuildFile; fileRef = 34F742301E0834F400AC1FD6 /* UIViewController+Navigation.m */; }; 34FE5A6F1F18F30F00BCA729 /* TrafficButtonArea.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34FE5A6D1F18F30F00BCA729 /* TrafficButtonArea.swift */; }; 3D15ACEE2155117000F725D5 /* MWMObjectsCategorySelectorDataSource.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3D15ACED2155117000F725D5 /* MWMObjectsCategorySelectorDataSource.mm */; }; 3D1958EB213804B6009A83EC /* libmetrics.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3D1958EA213804B6009A83EC /* libmetrics.a */; }; @@ -453,7 +453,7 @@ 47F86D0120C93D8D00FEE291 /* TabViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 47F86D0020C93D8D00FEE291 /* TabViewController.swift */; }; 47FA14D1230D52FC003DA979 /* PhoneNumberAuthorizationViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 47FA14D0230D52FC003DA979 /* PhoneNumberAuthorizationViewController.swift */; }; 4A300ED51C6DCFD400140018 /* countries-strings in Resources */ = {isa = PBXBuildFile; fileRef = 4A300ED31C6DCFD400140018 /* countries-strings */; }; - 56C74C391C74A3BC00B71B9F /* MWMInputEmailValidator.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34ABA62F1C2D58F300FE1BEC /* MWMInputEmailValidator.mm */; }; + 56C74C391C74A3BC00B71B9F /* MWMInputEmailValidator.m in Sources */ = {isa = PBXBuildFile; fileRef = 34ABA62F1C2D58F300FE1BEC /* MWMInputEmailValidator.m */; }; 56EE14D11FE804550036F20C /* libtransit.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 56EE14D21FE804550036F20C /* libtransit.a */; }; 671E78D31E6A423300B2859B /* librouting_common.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 671E78D21E6A423300B2859B /* librouting_common.a */; }; 6741A9421BF340DE002C974C /* sound-strings in Resources */ = {isa = PBXBuildFile; fileRef = 5605022E1B6211E100169CAD /* sound-strings */; }; @@ -490,7 +490,6 @@ 6741A97F1BF340DE002C974C /* resources-mdpi_clear in Resources */ = {isa = PBXBuildFile; fileRef = 4A23D1581B8B4DD700D4EB6F /* resources-mdpi_clear */; }; 6741A9811BF340DE002C974C /* MWMRateAlert.xib in Resources */ = {isa = PBXBuildFile; fileRef = F61579351AC2CEB60032D8E9 /* MWMRateAlert.xib */; }; 6741A9871BF340DE002C974C /* drules_proto_clear.bin in Resources */ = {isa = PBXBuildFile; fileRef = 4A23D1561B8B4DD700D4EB6F /* drules_proto_clear.bin */; }; - 6741A9881BF340DE002C974C /* MWMAPIBarView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 341C2A5A1B720B8A00AD41A1 /* MWMAPIBarView.xib */; }; 6741A98B1BF340DE002C974C /* MWMCircularProgress.xib in Resources */ = {isa = PBXBuildFile; fileRef = 349A35771B53D4C9009677EE /* MWMCircularProgress.xib */; }; 6741A9901BF340DE002C974C /* resources-mdpi_dark in Resources */ = {isa = PBXBuildFile; fileRef = 4A7D89C21B2EBF3B00AC843E /* resources-mdpi_dark */; }; 6741A9951BF340DE002C974C /* MWMDownloaderDialogCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = F64F4B6E1B46A5380081A24A /* MWMDownloaderDialogCell.xib */; }; @@ -501,28 +500,25 @@ 6741A9A51BF340DE002C974C /* MWMShareActivityItem.mm in Sources */ = {isa = PBXBuildFile; fileRef = 340837151B72451A00B5C185 /* MWMShareActivityItem.mm */; }; 6741A9A91BF340DE002C974C /* MWMDefaultAlert.mm in Sources */ = {isa = PBXBuildFile; fileRef = F64F198B1AB81A00006EAF7E /* MWMDefaultAlert.mm */; }; 6741A9B01BF340DE002C974C /* MapsAppDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1D3623250D0F684500981E51 /* MapsAppDelegate.mm */; }; - 6741A9B11BF340DE002C974C /* MWMAPIBarView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 341522BE1B666A550077AA8F /* MWMAPIBarView.mm */; }; 6741A9B71BF340DE002C974C /* EAGLView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 46F26CD710F623BA00ECCA39 /* EAGLView.mm */; }; 6741A9B81BF340DE002C974C /* MapViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = EED10A4411F78D120095FAD4 /* MapViewController.mm */; }; 6741A9B91BF340DE002C974C /* MWMRateAlert.mm in Sources */ = {isa = PBXBuildFile; fileRef = F61579331AC2CE9A0032D8E9 /* MWMRateAlert.mm */; }; 6741A9C01BF340DE002C974C /* MWMTextView.m in Sources */ = {isa = PBXBuildFile; fileRef = F6588E2B1B15C26700EE1E58 /* MWMTextView.m */; }; - 6741A9CF1BF340DE002C974C /* MWMLocationAlert.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6BBF2C51B4FFB72000CF8E2 /* MWMLocationAlert.mm */; }; + 6741A9CF1BF340DE002C974C /* MWMLocationAlert.m in Sources */ = {isa = PBXBuildFile; fileRef = F6BBF2C51B4FFB72000CF8E2 /* MWMLocationAlert.m */; }; 6741A9D41BF340DE002C974C /* MWMAlertViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = F64F19821AB81A00006EAF7E /* MWMAlertViewController.mm */; }; 6741A9E01BF340DE002C974C /* MWMDownloaderDialogHeader.mm in Sources */ = {isa = PBXBuildFile; fileRef = F64F4B731B4A45FD0081A24A /* MWMDownloaderDialogHeader.mm */; }; 6741A9E71BF340DE002C974C /* MWMCircularProgressView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 349A35791B53D4C9009677EE /* MWMCircularProgressView.mm */; }; - 6741A9E81BF340DE002C974C /* MWMAPIBar.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3465E7D71B6658C000854C4D /* MWMAPIBar.mm */; }; 6741A9EC1BF340DE002C974C /* MWMCircularProgress.mm in Sources */ = {isa = PBXBuildFile; fileRef = 349A35761B53D4C9009677EE /* MWMCircularProgress.mm */; }; 6741A9F51BF340DE002C974C /* BookmarksVC.mm in Sources */ = {isa = PBXBuildFile; fileRef = FA36B80615403A4F004560CC /* BookmarksVC.mm */; }; 6741A9FE1BF340DE002C974C /* SelectSetVC.mm in Sources */ = {isa = PBXBuildFile; fileRef = FA054611155C465E001F4E37 /* SelectSetVC.mm */; }; 6741AA031BF340DE002C974C /* MWMActivityViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 340837121B7243CE00B5C185 /* MWMActivityViewController.mm */; }; 6741AA0B1BF340DE002C974C /* MWMMapViewControlsManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34BC72111B0DECAE0012A34B /* MWMMapViewControlsManager.mm */; }; - 6741AA141BF340DE002C974C /* MWMMultilineLabel.mm in Sources */ = {isa = PBXBuildFile; fileRef = 346EDADA1B9F0E35004F8DB5 /* MWMMultilineLabel.mm */; }; - 6741AA191BF340DE002C974C /* MWMDownloaderDialogCell.mm in Sources */ = {isa = PBXBuildFile; fileRef = F64F4B6C1B46A51F0081A24A /* MWMDownloaderDialogCell.mm */; }; - 6741AA1C1BF340DE002C974C /* MWMRoutingDisclaimerAlert.mm in Sources */ = {isa = PBXBuildFile; fileRef = F63774E91B59376F00BCF54D /* MWMRoutingDisclaimerAlert.mm */; }; + 6741AA191BF340DE002C974C /* MWMDownloaderDialogCell.m in Sources */ = {isa = PBXBuildFile; fileRef = F64F4B6C1B46A51F0081A24A /* MWMDownloaderDialogCell.m */; }; + 6741AA1C1BF340DE002C974C /* MWMRoutingDisclaimerAlert.m in Sources */ = {isa = PBXBuildFile; fileRef = F63774E91B59376F00BCF54D /* MWMRoutingDisclaimerAlert.m */; }; 6741AA1D1BF340DE002C974C /* MWMDownloadTransitMapAlert.mm in Sources */ = {isa = PBXBuildFile; fileRef = F64F19971AB81A00006EAF7E /* MWMDownloadTransitMapAlert.mm */; }; 6741AA281BF340DE002C974C /* MWMAlert.mm in Sources */ = {isa = PBXBuildFile; fileRef = F64F19861AB81A00006EAF7E /* MWMAlert.mm */; }; 6741AA291BF340DE002C974C /* ColorPickerView.mm in Sources */ = {isa = PBXBuildFile; fileRef = ED48BBB417C267F5003E7E92 /* ColorPickerView.mm */; }; - 6741AA2B1BF340DE002C974C /* CircleView.mm in Sources */ = {isa = PBXBuildFile; fileRef = ED48BBB917C2B1E2003E7E92 /* CircleView.mm */; }; + 6741AA2B1BF340DE002C974C /* CircleView.m in Sources */ = {isa = PBXBuildFile; fileRef = ED48BBB917C2B1E2003E7E92 /* CircleView.m */; }; 6741AA361BF340DE002C974C /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 34570A3A1B13222600E6D4FD /* libz.dylib */; settings = {ATTRIBUTES = (Required, ); }; }; 6741AABD1BF356BA002C974C /* libagg.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6741AAA21BF356B9002C974C /* libagg.a */; }; 6741AABE1BF356BA002C974C /* libalohalitics.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6741AAA31BF356B9002C974C /* libalohalitics.a */; }; @@ -640,7 +636,7 @@ F623DA6F1C9C2E62006A3436 /* MWMAddPlaceNavigationBar.xib in Resources */ = {isa = PBXBuildFile; fileRef = F653CE171C71F62400A453F1 /* MWMAddPlaceNavigationBar.xib */; }; F62607FD207B790300176C5A /* SpinnerAlert.swift in Sources */ = {isa = PBXBuildFile; fileRef = F62607FC207B790300176C5A /* SpinnerAlert.swift */; }; F62607FF207B83C400176C5A /* MWMSpinnerAlert.xib in Resources */ = {isa = PBXBuildFile; fileRef = F62607FE207B83C400176C5A /* MWMSpinnerAlert.xib */; }; - F626D52F1C3E83F800C17D15 /* MWMTableViewCell.mm in Sources */ = {isa = PBXBuildFile; fileRef = F626D52D1C3E6CAA00C17D15 /* MWMTableViewCell.mm */; }; + F626D52F1C3E83F800C17D15 /* MWMTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = F626D52D1C3E6CAA00C17D15 /* MWMTableViewCell.m */; }; F6381BF61CD12045004CA943 /* LocaleTranslator.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6381BF41CD12045004CA943 /* LocaleTranslator.mm */; }; F63AF5061EA6162400A1DB98 /* FilterTypeCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = F63AF5041EA6162400A1DB98 /* FilterTypeCell.swift */; }; F63AF50B1EA6213F00A1DB98 /* FilterRatingCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = F63AF5091EA6213F00A1DB98 /* FilterRatingCell.swift */; }; @@ -650,7 +646,7 @@ F64D9CA01C899C350063FA30 /* MWMEditorViralAlert.mm in Sources */ = {isa = PBXBuildFile; fileRef = F64D9C9E1C899C350063FA30 /* MWMEditorViralAlert.mm */; }; F64D9CA31C899C760063FA30 /* MWMEditorViralAlert.xib in Resources */ = {isa = PBXBuildFile; fileRef = F64D9CA11C899C760063FA30 /* MWMEditorViralAlert.xib */; }; F653CE0E1C6DEB2E00A453F1 /* MWMDropDown.xib in Resources */ = {isa = PBXBuildFile; fileRef = F652B2E91C6DE8E500D20C8C /* MWMDropDown.xib */; }; - F653CE121C6DEC8E00A453F1 /* MWMDropDown.mm in Sources */ = {isa = PBXBuildFile; fileRef = F653CE101C6DEB5A00A453F1 /* MWMDropDown.mm */; }; + F653CE121C6DEC8E00A453F1 /* MWMDropDown.m in Sources */ = {isa = PBXBuildFile; fileRef = F653CE101C6DEB5A00A453F1 /* MWMDropDown.m */; }; F653CE191C71F62700A453F1 /* MWMAddPlaceNavigationBar.mm in Sources */ = {isa = PBXBuildFile; fileRef = F653CE151C71F60200A453F1 /* MWMAddPlaceNavigationBar.mm */; }; F6550C1F1FD81B3800352D88 /* RatingSummaryView+DefaultConfig.swift in Sources */ = {isa = PBXBuildFile; fileRef = F6550C1D1FD81B3800352D88 /* RatingSummaryView+DefaultConfig.swift */; }; F6558DA21E642CC0002203AE /* MWMFacilitiesController.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6558DA01E642CC0002203AE /* MWMFacilitiesController.mm */; }; @@ -664,7 +660,7 @@ F6664C051E6459DA00E703C2 /* PPReviewHeaderCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = F6664C001E6459DA00E703C2 /* PPReviewHeaderCell.xib */; }; F6664C131E645A4100E703C2 /* MWMPPReviewCell.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6664C101E645A4100E703C2 /* MWMPPReviewCell.mm */; }; F6664C161E645A4100E703C2 /* MWMPPReviewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = F6664C111E645A4100E703C2 /* MWMPPReviewCell.xib */; }; - F6791B141C43DF0B007A8A6E /* MWMStartButton.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6791B121C43DEA7007A8A6E /* MWMStartButton.mm */; }; + F6791B141C43DF0B007A8A6E /* MWMStartButton.m in Sources */ = {isa = PBXBuildFile; fileRef = F6791B121C43DEA7007A8A6E /* MWMStartButton.m */; }; F682249B1E5B104600BC1C18 /* PPHotelDescriptionCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = F68224991E5B104600BC1C18 /* PPHotelDescriptionCell.swift */; }; F682249F1E5B105900BC1C18 /* PPHotelDescriptionCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = F682249D1E5B105900BC1C18 /* PPHotelDescriptionCell.xib */; }; F68BDF061EEA9A830009BB81 /* MyTargetSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F68BDF041EEA9A830009BB81 /* MyTargetSDK.framework */; }; @@ -703,7 +699,7 @@ F6E2FD831E097BA00083EBEC /* MWMMapDownloaderSearchDataSource.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FC1D1E097B9F0083EBEC /* MWMMapDownloaderSearchDataSource.mm */; }; F6E2FD861E097BA00083EBEC /* MWMBaseMapDownloaderViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FC1F1E097B9F0083EBEC /* MWMBaseMapDownloaderViewController.mm */; }; F6E2FD891E097BA00083EBEC /* MWMMapDownloaderViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FC231E097B9F0083EBEC /* MWMMapDownloaderViewController.mm */; }; - F6E2FD8C1E097BA00083EBEC /* MWMNoMapsView.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FC261E097B9F0083EBEC /* MWMNoMapsView.mm */; }; + F6E2FD8C1E097BA00083EBEC /* MWMNoMapsView.m in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FC261E097B9F0083EBEC /* MWMNoMapsView.m */; }; F6E2FD8F1E097BA00083EBEC /* MWMNoMapsViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FC281E097B9F0083EBEC /* MWMNoMapsViewController.mm */; }; F6E2FD921E097BA00083EBEC /* MWMBookmarkColorViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FC2B1E097B9F0083EBEC /* MWMBookmarkColorViewController.mm */; }; F6E2FD951E097BA00083EBEC /* MWMBookmarkColorViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = F6E2FC2C1E097B9F0083EBEC /* MWMBookmarkColorViewController.xib */; }; @@ -712,9 +708,9 @@ F6E2FD9E1E097BA00083EBEC /* MWMEditBookmarkController.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FC311E097B9F0083EBEC /* MWMEditBookmarkController.mm */; }; F6E2FDA11E097BA00083EBEC /* MWMEditorAdditionalNamesTableViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FC351E097B9F0083EBEC /* MWMEditorAdditionalNamesTableViewController.mm */; }; F6E2FDA41E097BA00083EBEC /* MWMCuisineEditorViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FC381E097B9F0083EBEC /* MWMCuisineEditorViewController.mm */; }; - F6E2FDB61E097BA00083EBEC /* MWMEditorAdditionalNamesHeader.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FC411E097B9F0083EBEC /* MWMEditorAdditionalNamesHeader.mm */; }; + F6E2FDB61E097BA00083EBEC /* MWMEditorAdditionalNamesHeader.m in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FC411E097B9F0083EBEC /* MWMEditorAdditionalNamesHeader.m */; }; F6E2FDB91E097BA00083EBEC /* MWMEditorAdditionalNamesHeader.xib in Resources */ = {isa = PBXBuildFile; fileRef = F6E2FC421E097B9F0083EBEC /* MWMEditorAdditionalNamesHeader.xib */; }; - F6E2FDC81E097BA00083EBEC /* MWMEditorNotesFooter.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FC4B1E097B9F0083EBEC /* MWMEditorNotesFooter.mm */; }; + F6E2FDC81E097BA00083EBEC /* MWMEditorNotesFooter.m in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FC4B1E097B9F0083EBEC /* MWMEditorNotesFooter.m */; }; F6E2FDCB1E097BA00083EBEC /* MWMEditorNotesFooter.xib in Resources */ = {isa = PBXBuildFile; fileRef = F6E2FC4C1E097B9F0083EBEC /* MWMEditorNotesFooter.xib */; }; F6E2FDE01E097BA00083EBEC /* MWMEditorViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FC571E097B9F0083EBEC /* MWMEditorViewController.mm */; }; F6E2FDE91E097BA00083EBEC /* MWMObjectsCategorySelectorController.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FC5C1E097B9F0083EBEC /* MWMObjectsCategorySelectorController.mm */; }; @@ -739,7 +735,7 @@ F6E2FE221E097BA00083EBEC /* MWMOpeningHoursEditorViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FC7D1E097B9F0083EBEC /* MWMOpeningHoursEditorViewController.mm */; }; F6E2FE251E097BA00083EBEC /* MWMOpeningHoursModel.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FC7F1E097B9F0083EBEC /* MWMOpeningHoursModel.mm */; }; F6E2FE281E097BA00083EBEC /* MWMOpeningHoursSection.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FC811E097B9F0083EBEC /* MWMOpeningHoursSection.mm */; }; - F6E2FE2B1E097BA00083EBEC /* MWMStreetEditorEditTableViewCell.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FC841E097B9F0083EBEC /* MWMStreetEditorEditTableViewCell.mm */; }; + F6E2FE2B1E097BA00083EBEC /* MWMStreetEditorEditTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FC841E097B9F0083EBEC /* MWMStreetEditorEditTableViewCell.m */; }; F6E2FE2E1E097BA00083EBEC /* MWMStreetEditorEditTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = F6E2FC851E097B9F0083EBEC /* MWMStreetEditorEditTableViewCell.xib */; }; F6E2FE311E097BA00083EBEC /* MWMStreetEditorViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FC871E097B9F0083EBEC /* MWMStreetEditorViewController.mm */; }; F6E2FE431E097BA00083EBEC /* MWMDirectionView.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FC951E097B9F0083EBEC /* MWMDirectionView.mm */; }; @@ -761,7 +757,7 @@ F6E2FE791E097BA00083EBEC /* MWMOpeningHoursLayoutHelper.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FCBA1E097B9F0083EBEC /* MWMOpeningHoursLayoutHelper.mm */; }; F6E2FE7C1E097BA00083EBEC /* MWMPlacePageOpeningHoursCell.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FCBC1E097B9F0083EBEC /* MWMPlacePageOpeningHoursCell.mm */; }; F6E2FE7F1E097BA00083EBEC /* MWMPlacePageOpeningHoursCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = F6E2FCBD1E097B9F0083EBEC /* MWMPlacePageOpeningHoursCell.xib */; }; - F6E2FE821E097BA00083EBEC /* MWMPlacePageOpeningHoursDayView.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FCBF1E097B9F0083EBEC /* MWMPlacePageOpeningHoursDayView.mm */; }; + F6E2FE821E097BA00083EBEC /* MWMPlacePageOpeningHoursDayView.m in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FCBF1E097B9F0083EBEC /* MWMPlacePageOpeningHoursDayView.m */; }; F6E2FE851E097BA00083EBEC /* MWMPlacePageOpeningHoursWeekDayView.xib in Resources */ = {isa = PBXBuildFile; fileRef = F6E2FCC01E097B9F0083EBEC /* MWMPlacePageOpeningHoursWeekDayView.xib */; }; F6E2FE881E097BA00083EBEC /* MWMPlacePageRegularCell.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FCC31E097B9F0083EBEC /* MWMPlacePageRegularCell.mm */; }; F6E2FE8B1E097BA00083EBEC /* MWMPlacePageInfoCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = F6E2FCC41E097B9F0083EBEC /* MWMPlacePageInfoCell.xib */; }; @@ -784,11 +780,11 @@ F6E2FED01E097BA00083EBEC /* MWMSearchFilterViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FCEE1E097B9F0083EBEC /* MWMSearchFilterViewController.mm */; }; F6E2FED31E097BA00083EBEC /* MWMSearchHotelsFilterViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FCF11E097B9F0083EBEC /* MWMSearchHotelsFilterViewController.mm */; }; F6E2FED61E097BA00083EBEC /* MWMSearchChangeModeView.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FCF31E097B9F0083EBEC /* MWMSearchChangeModeView.mm */; }; - F6E2FED91E097BA00083EBEC /* MWMSearchContentView.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FCF51E097B9F0083EBEC /* MWMSearchContentView.mm */; }; + F6E2FED91E097BA00083EBEC /* MWMSearchContentView.m in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FCF51E097B9F0083EBEC /* MWMSearchContentView.m */; }; F6E2FEDC1E097BA00083EBEC /* MWMSearchManager+Filter.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FCF71E097B9F0083EBEC /* MWMSearchManager+Filter.mm */; }; - F6E2FEDF1E097BA00083EBEC /* MWMSearchManager+Layout.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FCF91E097B9F0083EBEC /* MWMSearchManager+Layout.mm */; }; + F6E2FEDF1E097BA00083EBEC /* MWMSearchManager+Layout.m in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FCF91E097B9F0083EBEC /* MWMSearchManager+Layout.m */; }; F6E2FEE21E097BA00083EBEC /* MWMSearchManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FCFB1E097B9F0083EBEC /* MWMSearchManager.mm */; }; - F6E2FEE51E097BA00083EBEC /* MWMSearchNoResults.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FCFD1E097B9F0083EBEC /* MWMSearchNoResults.mm */; }; + F6E2FEE51E097BA00083EBEC /* MWMSearchNoResults.m in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FCFD1E097B9F0083EBEC /* MWMSearchNoResults.m */; }; F6E2FEE81E097BA00083EBEC /* MWMSearchNoResults.xib in Resources */ = {isa = PBXBuildFile; fileRef = F6E2FCFE1E097B9F0083EBEC /* MWMSearchNoResults.xib */; }; F6E2FEEB1E097BA00083EBEC /* MWMSearchTextField.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FD001E097B9F0083EBEC /* MWMSearchTextField.mm */; }; F6E2FEEE1E097BA00083EBEC /* MWMSearchView.xib in Resources */ = {isa = PBXBuildFile; fileRef = F6E2FD011E097B9F0083EBEC /* MWMSearchView.xib */; }; @@ -800,15 +796,15 @@ F6E2FF331E097BA00083EBEC /* MWMSearchCommonCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = F6E2FD2D1E097BA00083EBEC /* MWMSearchCommonCell.xib */; }; F6E2FF361E097BA00083EBEC /* MWMSearchSuggestionCell.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FD2F1E097BA00083EBEC /* MWMSearchSuggestionCell.mm */; }; F6E2FF391E097BA00083EBEC /* MWMSearchSuggestionCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = F6E2FD301E097BA00083EBEC /* MWMSearchSuggestionCell.xib */; }; - F6E2FF3C1E097BA00083EBEC /* MWMSearchTableView.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FD321E097BA00083EBEC /* MWMSearchTableView.mm */; }; + F6E2FF3C1E097BA00083EBEC /* MWMSearchTableView.m in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FD321E097BA00083EBEC /* MWMSearchTableView.m */; }; F6E2FF3F1E097BA00083EBEC /* MWMSearchTableViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FD341E097BA00083EBEC /* MWMSearchTableViewController.mm */; }; F6E2FF421E097BA00083EBEC /* MWMSearchTableViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = F6E2FD351E097BA00083EBEC /* MWMSearchTableViewController.xib */; }; F6E2FF451E097BA00083EBEC /* SettingsTableViewLinkCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FD381E097BA00083EBEC /* SettingsTableViewLinkCell.swift */; }; F6E2FF481E097BA00083EBEC /* SettingsTableViewSelectableCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FD391E097BA00083EBEC /* SettingsTableViewSelectableCell.swift */; }; F6E2FF4B1E097BA00083EBEC /* SettingsTableViewSwitchCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FD3A1E097BA00083EBEC /* SettingsTableViewSwitchCell.swift */; }; - F6E2FF4E1E097BA00083EBEC /* MWMAboutController.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FD3C1E097BA00083EBEC /* MWMAboutController.mm */; }; + F6E2FF4E1E097BA00083EBEC /* MWMAboutController.m in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FD3C1E097BA00083EBEC /* MWMAboutController.m */; }; F6E2FF511E097BA00083EBEC /* MWMAboutControllerHeader.xib in Resources */ = {isa = PBXBuildFile; fileRef = F6E2FD3D1E097BA00083EBEC /* MWMAboutControllerHeader.xib */; }; - F6E2FF541E097BA00083EBEC /* MWMHelpController.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FD3F1E097BA00083EBEC /* MWMHelpController.mm */; }; + F6E2FF541E097BA00083EBEC /* MWMHelpController.m in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FD3F1E097BA00083EBEC /* MWMHelpController.m */; }; F6E2FF571E097BA00083EBEC /* MWMMobileInternetViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FD411E097BA00083EBEC /* MWMMobileInternetViewController.m */; }; F6E2FF5A1E097BA00083EBEC /* MWMNightModeController.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FD431E097BA00083EBEC /* MWMNightModeController.mm */; }; F6E2FF5D1E097BA00083EBEC /* MWMRecentTrackSettingsController.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FD451E097BA00083EBEC /* MWMRecentTrackSettingsController.mm */; }; @@ -821,9 +817,9 @@ F6EBB26F1FD7E33300B69B6A /* DiscoveryNoResultsCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = F6EBB26D1FD7E33300B69B6A /* DiscoveryNoResultsCell.swift */; }; F6EBB2731FD7E4FD00B69B6A /* DiscoveryNoResultsCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = F6EBB2711FD7E4FD00B69B6A /* DiscoveryNoResultsCell.xib */; }; F6F8E3C51EF8469700F2DE8F /* libugc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F6F8E3C41EF8469700F2DE8F /* libugc.a */; }; - F6FE3C391CC50FFD00A73196 /* MWMPlaceDoesntExistAlert.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6FE3C371CC50FFD00A73196 /* MWMPlaceDoesntExistAlert.mm */; }; + F6FE3C391CC50FFD00A73196 /* MWMPlaceDoesntExistAlert.m in Sources */ = {isa = PBXBuildFile; fileRef = F6FE3C371CC50FFD00A73196 /* MWMPlaceDoesntExistAlert.m */; }; F6FE3C3C1CC5106500A73196 /* MWMPlaceDoesntExistAlert.xib in Resources */ = {isa = PBXBuildFile; fileRef = F6FE3C3A1CC5106500A73196 /* MWMPlaceDoesntExistAlert.xib */; }; - F6FEA82E1C58F108007223CC /* MWMButton.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6FEA82C1C58E89B007223CC /* MWMButton.mm */; }; + F6FEA82E1C58F108007223CC /* MWMButton.m in Sources */ = {isa = PBXBuildFile; fileRef = F6FEA82C1C58E89B007223CC /* MWMButton.m */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -851,7 +847,7 @@ 1DA7908720762B6F008BDD6B /* libopen_location_code.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libopen_location_code.a; sourceTree = BUILT_PRODUCTS_DIR; }; 1DA7908920762CEB008BDD6B /* libopen_location_code.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libopen_location_code.a; sourceTree = BUILT_PRODUCTS_DIR; }; 1DFA2F6820D3B52F00FB2C66 /* UIColor+PartnerColor.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "UIColor+PartnerColor.h"; sourceTree = ""; }; - 1DFA2F6920D3B57400FB2C66 /* UIColor+PartnerColor.mm */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 4; lineEnding = 0; path = "UIColor+PartnerColor.mm"; sourceTree = ""; }; + 1DFA2F6920D3B57400FB2C66 /* UIColor+PartnerColor.m */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 4; lineEnding = 0; path = "UIColor+PartnerColor.m"; sourceTree = ""; }; 1DFA2F6E20D3CA9200FB2C66 /* UIColorRoutines.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = UIColorRoutines.h; sourceTree = ""; }; 28A0AB4B0D9B1048005BE974 /* Maps_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = Maps_Prefix.pch; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objc; }; 29B97316FDCFA39411CA2CEA /* main.mm */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 4; path = main.mm; sourceTree = ""; }; @@ -863,7 +859,7 @@ 330473E921F7440C00DC4AEA /* MWMHotelParams.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMHotelParams.mm; sourceTree = ""; }; 331630D02191D74B00BB91A9 /* TagSectionHeaderView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TagSectionHeaderView.swift; sourceTree = ""; }; 331922AD21BAD29900D4AAC5 /* MWMPlaceDescriptionCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMPlaceDescriptionCell.h; sourceTree = ""; }; - 331922AE21BAD29900D4AAC5 /* MWMPlaceDescriptionCell.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMPlaceDescriptionCell.mm; sourceTree = ""; }; + 331922AE21BAD29900D4AAC5 /* MWMPlaceDescriptionCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MWMPlaceDescriptionCell.m; sourceTree = ""; }; 3358607D217632A2006D11F2 /* BookmarksSharingViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BookmarksSharingViewController.swift; sourceTree = ""; }; 33603C84219F0F6300B11FFE /* SharingPropertiesViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SharingPropertiesViewController.swift; sourceTree = ""; }; 337F98A021D37B5700C8AC27 /* SearchHistoryViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = SearchHistoryViewController.xib; sourceTree = ""; }; @@ -907,7 +903,7 @@ 340475241E081A4600C92850 /* Statistics.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = Statistics.mm; sourceTree = ""; }; 340475251E081A4600C92850 /* StatisticsStrings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StatisticsStrings.h; sourceTree = ""; }; 340475261E081A4600C92850 /* WebViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebViewController.h; sourceTree = ""; }; - 340475271E081A4600C92850 /* WebViewController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebViewController.mm; sourceTree = ""; }; + 340475271E081A4600C92850 /* WebViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WebViewController.m; sourceTree = ""; }; 3404752A1E081A4600C92850 /* MWMLocationHelpers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMLocationHelpers.h; sourceTree = ""; }; 3404752B1E081A4600C92850 /* MWMLocationManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMLocationManager.h; sourceTree = ""; }; 3404752C1E081A4600C92850 /* MWMLocationManager.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMLocationManager.mm; sourceTree = ""; }; @@ -966,9 +962,6 @@ 340FDC072031C39E00F140AD /* BMCPermissionsPendingCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BMCPermissionsPendingCell.swift; sourceTree = ""; }; 340FDC082031C39E00F140AD /* BMCPermissionsPendingCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = BMCPermissionsPendingCell.xib; sourceTree = ""; }; 3411387C1C15AE73002E3B3E /* libeditor.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libeditor.a; path = "../../../omim-xcode-build/Debug/libeditor.a"; sourceTree = ""; }; - 341522BD1B666A550077AA8F /* MWMAPIBarView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMAPIBarView.h; sourceTree = ""; }; - 341522BE1B666A550077AA8F /* MWMAPIBarView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMAPIBarView.mm; sourceTree = ""; }; - 341C2A5A1B720B8A00AD41A1 /* MWMAPIBarView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMAPIBarView.xib; sourceTree = ""; }; 341F09831C20138100F18AC5 /* libpugixml.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpugixml.a; path = "../../../omim-xcode-build/Debug/libpugixml.a"; sourceTree = ""; }; 34201E0B1DC0E33100D24118 /* libtracking.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libtracking.a; path = "../../../omim-xcode-build/Debug/libtracking.a"; sourceTree = ""; }; 342639461EA0FDB30025EB89 /* MWMSearchItemType.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMSearchItemType.h; sourceTree = ""; }; @@ -983,7 +976,7 @@ 3430291B1F87BC3000D0A07C /* ReviewsViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ReviewsViewController.xib; sourceTree = ""; }; 3430643F1E9FDC7300DC7665 /* SearchIndex.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SearchIndex.swift; sourceTree = ""; }; 343E75951E5B1EE20041226A /* MWMCollectionViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMCollectionViewController.h; sourceTree = ""; }; - 343E75961E5B1EE20041226A /* MWMCollectionViewController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMCollectionViewController.mm; sourceTree = ""; }; + 343E75961E5B1EE20041226A /* MWMCollectionViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MWMCollectionViewController.m; sourceTree = ""; }; 3444DFCB1F1760B900E73099 /* WidgetsArea.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WidgetsArea.swift; sourceTree = ""; }; 3444DFCF1F17620C00E73099 /* MWMMapWidgetsHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMMapWidgetsHelper.h; sourceTree = ""; }; 3444DFD01F17620C00E73099 /* MWMMapWidgetsHelper.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMMapWidgetsHelper.mm; sourceTree = ""; }; @@ -1001,34 +994,34 @@ 345050211E028B8000A8DC59 /* Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Bridging-Header.h"; sourceTree = ""; }; 3451F4EC1F026DAF00A981F2 /* PlacePageTaxiCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PlacePageTaxiCell.swift; sourceTree = ""; }; 3454D7991E07F045004AF2AD /* CALayer+RuntimeAttributes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "CALayer+RuntimeAttributes.h"; sourceTree = ""; }; - 3454D79A1E07F045004AF2AD /* CALayer+RuntimeAttributes.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = "CALayer+RuntimeAttributes.mm"; sourceTree = ""; }; + 3454D79A1E07F045004AF2AD /* CALayer+RuntimeAttributes.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "CALayer+RuntimeAttributes.m"; sourceTree = ""; }; 3454D79B1E07F045004AF2AD /* CLLocation+Mercator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "CLLocation+Mercator.h"; sourceTree = ""; }; 3454D79C1E07F045004AF2AD /* CLLocation+Mercator.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = "CLLocation+Mercator.mm"; sourceTree = ""; }; 3454D79D1E07F045004AF2AD /* DateComponentsFormatter+ETA.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "DateComponentsFormatter+ETA.swift"; sourceTree = ""; }; 3454D79E1E07F045004AF2AD /* NSString+Categories.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSString+Categories.h"; sourceTree = ""; }; - 3454D79F1E07F045004AF2AD /* NSString+Categories.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = "NSString+Categories.mm"; sourceTree = ""; }; + 3454D79F1E07F045004AF2AD /* NSString+Categories.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSString+Categories.m"; sourceTree = ""; }; 3454D7A01E07F045004AF2AD /* UIButton+Orientation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIButton+Orientation.h"; sourceTree = ""; }; - 3454D7A11E07F045004AF2AD /* UIButton+Orientation.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = "UIButton+Orientation.mm"; sourceTree = ""; }; + 3454D7A11E07F045004AF2AD /* UIButton+Orientation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIButton+Orientation.m"; sourceTree = ""; }; 3454D7A21E07F045004AF2AD /* UIButton+RuntimeAttributes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIButton+RuntimeAttributes.h"; sourceTree = ""; }; - 3454D7A31E07F045004AF2AD /* UIButton+RuntimeAttributes.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = "UIButton+RuntimeAttributes.mm"; sourceTree = ""; }; + 3454D7A31E07F045004AF2AD /* UIButton+RuntimeAttributes.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIButton+RuntimeAttributes.m"; sourceTree = ""; }; 3454D7A41E07F045004AF2AD /* UIColor+MapsMeColor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIColor+MapsMeColor.h"; sourceTree = ""; }; - 3454D7A51E07F045004AF2AD /* UIColor+MapsMeColor.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; lineEnding = 0; path = "UIColor+MapsMeColor.mm"; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; + 3454D7A51E07F045004AF2AD /* UIColor+MapsMeColor.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = "UIColor+MapsMeColor.m"; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; 3454D7A61E07F045004AF2AD /* UIFont+MapsMeFonts.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIFont+MapsMeFonts.h"; sourceTree = ""; }; - 3454D7A71E07F045004AF2AD /* UIFont+MapsMeFonts.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = "UIFont+MapsMeFonts.mm"; sourceTree = ""; }; + 3454D7A71E07F045004AF2AD /* UIFont+MapsMeFonts.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIFont+MapsMeFonts.m"; sourceTree = ""; }; 3454D7A81E07F045004AF2AD /* UIImage+RGBAData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIImage+RGBAData.h"; sourceTree = ""; }; - 3454D7A91E07F045004AF2AD /* UIImage+RGBAData.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = "UIImage+RGBAData.mm"; sourceTree = ""; }; + 3454D7A91E07F045004AF2AD /* UIImage+RGBAData.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIImage+RGBAData.m"; sourceTree = ""; }; 3454D7AA1E07F045004AF2AD /* UIImageView+Coloring.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIImageView+Coloring.h"; sourceTree = ""; }; - 3454D7AB1E07F045004AF2AD /* UIImageView+Coloring.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = "UIImageView+Coloring.mm"; sourceTree = ""; }; + 3454D7AB1E07F045004AF2AD /* UIImageView+Coloring.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIImageView+Coloring.m"; sourceTree = ""; }; 3454D7AC1E07F045004AF2AD /* UIKitCategories.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIKitCategories.h; sourceTree = ""; }; - 3454D7AD1E07F045004AF2AD /* UIKitCategories.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; lineEnding = 0; path = UIKitCategories.mm; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; + 3454D7AD1E07F045004AF2AD /* UIKitCategories.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = UIKitCategories.m; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; 3454D7AE1E07F045004AF2AD /* UILabel+RuntimeAttributes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UILabel+RuntimeAttributes.h"; sourceTree = ""; }; - 3454D7AF1E07F045004AF2AD /* UILabel+RuntimeAttributes.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = "UILabel+RuntimeAttributes.mm"; sourceTree = ""; }; + 3454D7AF1E07F045004AF2AD /* UILabel+RuntimeAttributes.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UILabel+RuntimeAttributes.m"; sourceTree = ""; }; 3454D7B01E07F045004AF2AD /* UISwitch+RuntimeAttributes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UISwitch+RuntimeAttributes.h"; sourceTree = ""; }; 3454D7B11E07F045004AF2AD /* UISwitch+RuntimeAttributes.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UISwitch+RuntimeAttributes.m"; sourceTree = ""; }; 3454D7B21E07F045004AF2AD /* UITextField+RuntimeAttributes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UITextField+RuntimeAttributes.h"; sourceTree = ""; }; - 3454D7B31E07F045004AF2AD /* UITextField+RuntimeAttributes.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = "UITextField+RuntimeAttributes.mm"; sourceTree = ""; }; + 3454D7B31E07F045004AF2AD /* UITextField+RuntimeAttributes.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UITextField+RuntimeAttributes.m"; sourceTree = ""; }; 3454D7B41E07F045004AF2AD /* UITextView+RuntimeAttributes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UITextView+RuntimeAttributes.h"; sourceTree = ""; }; - 3454D7B51E07F045004AF2AD /* UITextView+RuntimeAttributes.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = "UITextView+RuntimeAttributes.mm"; sourceTree = ""; }; + 3454D7B51E07F045004AF2AD /* UITextView+RuntimeAttributes.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UITextView+RuntimeAttributes.m"; sourceTree = ""; }; 3454D7B61E07F045004AF2AD /* UIView+RuntimeAttributes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIView+RuntimeAttributes.h"; sourceTree = ""; }; 3454D7B71E07F045004AF2AD /* UIView+RuntimeAttributes.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIView+RuntimeAttributes.m"; sourceTree = ""; }; 34570A3A1B13222600E6D4FD /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; }; @@ -1043,8 +1036,6 @@ 3463BA631DE81DB90082417F /* MWMTrafficButtonViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMTrafficButtonViewController.h; sourceTree = ""; }; 3463BA641DE81DB90082417F /* MWMTrafficButtonViewController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMTrafficButtonViewController.mm; sourceTree = ""; }; 3463BA651DE81DB90082417F /* MWMTrafficButtonViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMTrafficButtonViewController.xib; sourceTree = ""; }; - 3465E7D61B6658C000854C4D /* MWMAPIBar.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMAPIBar.h; sourceTree = ""; }; - 3465E7D71B6658C000854C4D /* MWMAPIBar.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMAPIBar.mm; sourceTree = ""; }; 3467CEB1202C6EEE00D3C670 /* BMCNotificationsHeader.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BMCNotificationsHeader.swift; sourceTree = ""; }; 3467CEB4202C6FA900D3C670 /* BMCNotificationsCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BMCNotificationsCell.swift; sourceTree = ""; }; 3467CEB5202C6FA900D3C670 /* BMCNotificationsCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = BMCNotificationsCell.xib; sourceTree = ""; }; @@ -1060,8 +1051,6 @@ 346DB8231E5C4F6700E3123E /* GalleryViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = GalleryViewController.xib; sourceTree = ""; }; 346DB8251E5C4F6700E3123E /* GalleryItemModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GalleryItemModel.swift; sourceTree = ""; }; 346DB8261E5C4F6700E3123E /* GalleryModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GalleryModel.swift; sourceTree = ""; }; - 346EDAD91B9F0E35004F8DB5 /* MWMMultilineLabel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMMultilineLabel.h; sourceTree = ""; }; - 346EDADA1B9F0E35004F8DB5 /* MWMMultilineLabel.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMMultilineLabel.mm; sourceTree = ""; }; 3470402E1EA6470700038379 /* BorderedButton.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BorderedButton.swift; sourceTree = ""; }; 3472B5C9200F43EF00DC6CD5 /* BackgroundFetchScheduler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BackgroundFetchScheduler.swift; sourceTree = ""; }; 3472B5CD200F4A2B00DC6CD5 /* BackgroundFetchTask.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BackgroundFetchTask.swift; sourceTree = ""; }; @@ -1142,7 +1131,7 @@ 349FC5451F680DAE00968C9F /* ExpandableReviewView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ExpandableReviewView.swift; sourceTree = ""; }; 349FC5461F680DAE00968C9F /* ExpandableReviewSettings.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ExpandableReviewSettings.swift; sourceTree = ""; }; 34AB39BF1D2BD8310021857D /* MWMStopButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMStopButton.h; sourceTree = ""; }; - 34AB39C01D2BD8310021857D /* MWMStopButton.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMStopButton.mm; sourceTree = ""; }; + 34AB39C01D2BD8310021857D /* MWMStopButton.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MWMStopButton.m; sourceTree = ""; }; 34AB65C51FC5AA320078E451 /* MWMNavigationDashboardManager+Entity.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = "MWMNavigationDashboardManager+Entity.mm"; sourceTree = ""; }; 34AB65C61FC5AA320078E451 /* MWMNavigationDashboardManager.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMNavigationDashboardManager.mm; sourceTree = ""; }; 34AB65C71FC5AA320078E451 /* MWMNavigationDashboardManager+Entity.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "MWMNavigationDashboardManager+Entity.h"; sourceTree = ""; }; @@ -1204,15 +1193,15 @@ 34ABA6141C2D185B00FE1BEC /* MWMAuthorizationOSMLoginViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMAuthorizationOSMLoginViewController.h; sourceTree = ""; }; 34ABA6151C2D185B00FE1BEC /* MWMAuthorizationOSMLoginViewController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMAuthorizationOSMLoginViewController.mm; sourceTree = ""; }; 34ABA61E1C2D517500FE1BEC /* MWMInputValidator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMInputValidator.h; sourceTree = ""; }; - 34ABA61F1C2D517500FE1BEC /* MWMInputValidator.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMInputValidator.mm; sourceTree = ""; }; + 34ABA61F1C2D517500FE1BEC /* MWMInputValidator.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MWMInputValidator.m; sourceTree = ""; }; 34ABA6221C2D551900FE1BEC /* MWMInputValidatorFactory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMInputValidatorFactory.h; sourceTree = ""; }; - 34ABA6231C2D551900FE1BEC /* MWMInputValidatorFactory.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMInputValidatorFactory.mm; sourceTree = ""; }; + 34ABA6231C2D551900FE1BEC /* MWMInputValidatorFactory.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MWMInputValidatorFactory.m; sourceTree = ""; }; 34ABA6261C2D567B00FE1BEC /* MWMInputLoginValidator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMInputLoginValidator.h; sourceTree = ""; }; - 34ABA6271C2D567B00FE1BEC /* MWMInputLoginValidator.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMInputLoginValidator.mm; sourceTree = ""; }; + 34ABA6271C2D567B00FE1BEC /* MWMInputLoginValidator.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MWMInputLoginValidator.m; sourceTree = ""; }; 34ABA62A1C2D57D500FE1BEC /* MWMInputPasswordValidator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMInputPasswordValidator.h; sourceTree = ""; }; - 34ABA62B1C2D57D500FE1BEC /* MWMInputPasswordValidator.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMInputPasswordValidator.mm; sourceTree = ""; }; + 34ABA62B1C2D57D500FE1BEC /* MWMInputPasswordValidator.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MWMInputPasswordValidator.m; sourceTree = ""; }; 34ABA62E1C2D58F300FE1BEC /* MWMInputEmailValidator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMInputEmailValidator.h; sourceTree = ""; }; - 34ABA62F1C2D58F300FE1BEC /* MWMInputEmailValidator.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMInputEmailValidator.mm; sourceTree = ""; }; + 34ABA62F1C2D58F300FE1BEC /* MWMInputEmailValidator.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MWMInputEmailValidator.m; sourceTree = ""; }; 34AC7F901F06538B0050DE2B /* MWMPlacePageTaxiProvider.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMPlacePageTaxiProvider.h; sourceTree = ""; }; 34AC8FC71EFC01F500E7F910 /* MWMRoutePoint.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMRoutePoint.mm; sourceTree = ""; }; 34AC8FC81EFC01F500E7F910 /* MWMRoutePoint+CPP.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "MWMRoutePoint+CPP.h"; sourceTree = ""; }; @@ -1228,7 +1217,7 @@ 34B846A22029DFEB0081ECCD /* BMCPermissionsHeader.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BMCPermissionsHeader.swift; sourceTree = ""; }; 34B846A72029E8110081ECCD /* BMCDefaultViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BMCDefaultViewModel.swift; sourceTree = ""; }; 34B924401DC8A29C0008D971 /* MWMMailViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMMailViewController.h; sourceTree = ""; }; - 34B924411DC8A29C0008D971 /* MWMMailViewController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMMailViewController.mm; sourceTree = ""; }; + 34B924411DC8A29C0008D971 /* MWMMailViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MWMMailViewController.m; sourceTree = ""; }; 34BBD6451F8264980070CA50 /* GoogleSignIn.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; name = GoogleSignIn.bundle; path = 3party/GoogleSignIn/GoogleSignIn.bundle; sourceTree = ""; }; 34BBD64A1F826DB10070CA50 /* AuthorizationViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AuthorizationViewController.swift; sourceTree = ""; }; 34BBD6561F826F810070CA50 /* AuthorizationTransitioningManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AuthorizationTransitioningManager.swift; sourceTree = ""; }; @@ -1241,9 +1230,9 @@ 34BF0CC51C31304A00D097EB /* MWMAuthorizationCommon.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMAuthorizationCommon.mm; sourceTree = ""; }; 34BF0CC81C31306300D097EB /* MWMAuthorizationCommon.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMAuthorizationCommon.h; sourceTree = ""; }; 34C9BCFE1C6DB693000DC38D /* MWMTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMTableViewController.h; sourceTree = ""; }; - 34C9BCFF1C6DB693000DC38D /* MWMTableViewController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; lineEnding = 0; path = MWMTableViewController.mm; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; + 34C9BCFF1C6DB693000DC38D /* MWMTableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = MWMTableViewController.m; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; 34C9BD001C6DB693000DC38D /* MWMViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMViewController.h; sourceTree = ""; }; - 34C9BD011C6DB693000DC38D /* MWMViewController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; lineEnding = 0; path = MWMViewController.mm; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; + 34C9BD011C6DB693000DC38D /* MWMViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = MWMViewController.m; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; 34C9BD061C6DB6F3000DC38D /* MWMController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMController.h; sourceTree = ""; }; 34C9BD071C6DBCDA000DC38D /* MWMNavigationController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMNavigationController.h; sourceTree = ""; }; 34C9BD081C6DBCDA000DC38D /* MWMNavigationController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MWMNavigationController.m; sourceTree = ""; }; @@ -1254,29 +1243,29 @@ 34D3AFF41E37A36A004100F9 /* UICollectionView+Cells.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UICollectionView+Cells.swift"; sourceTree = ""; }; 34D3AFFD1E389D05004100F9 /* EditorAdditionalNamePlaceholderTableViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EditorAdditionalNamePlaceholderTableViewCell.swift; sourceTree = ""; }; 34D3AFFE1E389D05004100F9 /* MWMButtonCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMButtonCell.h; sourceTree = ""; }; - 34D3AFFF1E389D05004100F9 /* MWMButtonCell.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMButtonCell.mm; sourceTree = ""; }; + 34D3AFFF1E389D05004100F9 /* MWMButtonCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MWMButtonCell.m; sourceTree = ""; }; 34D3B0001E389D05004100F9 /* MWMButtonCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMButtonCell.xib; sourceTree = ""; }; 34D3B0011E389D05004100F9 /* MWMEditorAddAdditionalNameTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMEditorAddAdditionalNameTableViewCell.h; sourceTree = ""; }; - 34D3B0021E389D05004100F9 /* MWMEditorAddAdditionalNameTableViewCell.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMEditorAddAdditionalNameTableViewCell.mm; sourceTree = ""; }; + 34D3B0021E389D05004100F9 /* MWMEditorAddAdditionalNameTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MWMEditorAddAdditionalNameTableViewCell.m; sourceTree = ""; }; 34D3B0031E389D05004100F9 /* MWMEditorAddAdditionalNameTableViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMEditorAddAdditionalNameTableViewCell.xib; sourceTree = ""; }; 34D3B0041E389D05004100F9 /* EditorAdditionalNamePlaceholderTableViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = EditorAdditionalNamePlaceholderTableViewCell.xib; sourceTree = ""; }; 34D3B0051E389D05004100F9 /* MWMEditorAdditionalNameTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMEditorAdditionalNameTableViewCell.h; sourceTree = ""; }; - 34D3B0061E389D05004100F9 /* MWMEditorAdditionalNameTableViewCell.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMEditorAdditionalNameTableViewCell.mm; sourceTree = ""; }; + 34D3B0061E389D05004100F9 /* MWMEditorAdditionalNameTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MWMEditorAdditionalNameTableViewCell.m; sourceTree = ""; }; 34D3B0071E389D05004100F9 /* MWMEditorAdditionalNameTableViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMEditorAdditionalNameTableViewCell.xib; sourceTree = ""; }; 34D3B0081E389D05004100F9 /* MWMEditorCategoryCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMEditorCategoryCell.h; sourceTree = ""; }; - 34D3B0091E389D05004100F9 /* MWMEditorCategoryCell.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMEditorCategoryCell.mm; sourceTree = ""; }; + 34D3B0091E389D05004100F9 /* MWMEditorCategoryCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MWMEditorCategoryCell.m; sourceTree = ""; }; 34D3B00A1E389D05004100F9 /* MWMEditorCategoryCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMEditorCategoryCell.xib; sourceTree = ""; }; 34D3B00B1E389D05004100F9 /* MWMEditorSelectTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMEditorSelectTableViewCell.h; sourceTree = ""; }; - 34D3B00C1E389D05004100F9 /* MWMEditorSelectTableViewCell.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMEditorSelectTableViewCell.mm; sourceTree = ""; }; + 34D3B00C1E389D05004100F9 /* MWMEditorSelectTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MWMEditorSelectTableViewCell.m; sourceTree = ""; }; 34D3B00D1E389D05004100F9 /* MWMEditorSelectTableViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMEditorSelectTableViewCell.xib; sourceTree = ""; }; 34D3B00E1E389D05004100F9 /* MWMEditorSwitchTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMEditorSwitchTableViewCell.h; sourceTree = ""; }; - 34D3B00F1E389D05004100F9 /* MWMEditorSwitchTableViewCell.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMEditorSwitchTableViewCell.mm; sourceTree = ""; }; + 34D3B00F1E389D05004100F9 /* MWMEditorSwitchTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MWMEditorSwitchTableViewCell.m; sourceTree = ""; }; 34D3B0101E389D05004100F9 /* MWMEditorSwitchTableViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMEditorSwitchTableViewCell.xib; sourceTree = ""; }; 34D3B0111E389D05004100F9 /* MWMEditorTextTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMEditorTextTableViewCell.h; sourceTree = ""; }; - 34D3B0121E389D05004100F9 /* MWMEditorTextTableViewCell.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMEditorTextTableViewCell.mm; sourceTree = ""; }; + 34D3B0121E389D05004100F9 /* MWMEditorTextTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MWMEditorTextTableViewCell.m; sourceTree = ""; }; 34D3B0131E389D05004100F9 /* MWMEditorTextTableViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMEditorTextTableViewCell.xib; sourceTree = ""; }; 34D3B0141E389D05004100F9 /* MWMNoteCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMNoteCell.h; sourceTree = ""; }; - 34D3B0151E389D05004100F9 /* MWMNoteCell.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMNoteCell.mm; sourceTree = ""; }; + 34D3B0151E389D05004100F9 /* MWMNoteCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MWMNoteCell.m; sourceTree = ""; }; 34D3B0161E389D05004100F9 /* MWMNoteCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMNoteCell.xib; sourceTree = ""; }; 34D3B04D1E38A20C004100F9 /* Bundle+Init.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Bundle+Init.swift"; sourceTree = ""; }; 34D4FA611E26572D003F53EF /* FirstLaunchController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FirstLaunchController.swift; sourceTree = ""; }; @@ -1309,7 +1298,7 @@ 34F407221E9E1AFF00E57AC0 /* FacebookBanner.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FacebookBanner.swift; sourceTree = ""; }; 34F407241E9E1AFF00E57AC0 /* MopubBanner.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MopubBanner.swift; sourceTree = ""; }; 34F407251E9E1AFF00E57AC0 /* MPNativeAd+MWM.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "MPNativeAd+MWM.h"; sourceTree = ""; }; - 34F407261E9E1AFF00E57AC0 /* MPNativeAd+MWM.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = "MPNativeAd+MWM.mm"; sourceTree = ""; }; + 34F407261E9E1AFF00E57AC0 /* MPNativeAd+MWM.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "MPNativeAd+MWM.m"; sourceTree = ""; }; 34F407271E9E1AFF00E57AC0 /* MWMBanner.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMBanner.h; sourceTree = ""; }; 34F407281E9E1AFF00E57AC0 /* MWMBannerHelpers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMBannerHelpers.h; sourceTree = ""; }; 34F4072A1E9E1AFF00E57AC0 /* RBBanner.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RBBanner.swift; sourceTree = ""; }; @@ -1377,7 +1366,7 @@ 34F73F9A1E082FF800AC1FD6 /* zh-Hant */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hant"; path = "zh-Hant.lproj/Localizable.strings"; sourceTree = ""; }; 34F73FA11E08300E00AC1FD6 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = ""; }; 34F7422F1E0834F400AC1FD6 /* UIViewController+Navigation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIViewController+Navigation.h"; sourceTree = ""; }; - 34F742301E0834F400AC1FD6 /* UIViewController+Navigation.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = "UIViewController+Navigation.mm"; sourceTree = ""; }; + 34F742301E0834F400AC1FD6 /* UIViewController+Navigation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIViewController+Navigation.m"; sourceTree = ""; }; 34FB47581E3B928D00D94ED8 /* MWMCoreUnits.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMCoreUnits.h; sourceTree = ""; }; 34FE4C431BCC013500066718 /* MWMMapWidgets.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMMapWidgets.h; sourceTree = ""; }; 34FE4C441BCC013500066718 /* MWMMapWidgets.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMMapWidgets.mm; sourceTree = ""; }; @@ -1719,7 +1708,7 @@ ED48BBB317C267F5003E7E92 /* ColorPickerView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ColorPickerView.h; sourceTree = ""; }; ED48BBB417C267F5003E7E92 /* ColorPickerView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ColorPickerView.mm; sourceTree = ""; }; ED48BBB817C2B1E2003E7E92 /* CircleView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CircleView.h; sourceTree = ""; }; - ED48BBB917C2B1E2003E7E92 /* CircleView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = CircleView.mm; sourceTree = ""; }; + ED48BBB917C2B1E2003E7E92 /* CircleView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CircleView.m; sourceTree = ""; }; EE026F0511D6AC0D00645242 /* classificator.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = classificator.txt; path = ../../data/classificator.txt; sourceTree = SOURCE_ROOT; }; EE164810135CEE49003B8A3E /* 06_code2000.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = 06_code2000.ttf; path = ../../data/06_code2000.ttf; sourceTree = SOURCE_ROOT; }; EE583CBA12F773F00042CBE3 /* unicode_blocks.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = unicode_blocks.txt; path = ../../data/unicode_blocks.txt; sourceTree = ""; }; @@ -1749,10 +1738,10 @@ F62607FC207B790300176C5A /* SpinnerAlert.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SpinnerAlert.swift; sourceTree = ""; }; F62607FE207B83C400176C5A /* MWMSpinnerAlert.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MWMSpinnerAlert.xib; sourceTree = ""; }; F626D52C1C3E6CAA00C17D15 /* MWMTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMTableViewCell.h; sourceTree = ""; }; - F626D52D1C3E6CAA00C17D15 /* MWMTableViewCell.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMTableViewCell.mm; sourceTree = ""; }; + F626D52D1C3E6CAA00C17D15 /* MWMTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MWMTableViewCell.m; sourceTree = ""; }; F63774E61B59375E00BCF54D /* MWMRoutingDisclaimerAlert.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMRoutingDisclaimerAlert.xib; sourceTree = ""; }; F63774E81B59376F00BCF54D /* MWMRoutingDisclaimerAlert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMRoutingDisclaimerAlert.h; sourceTree = ""; }; - F63774E91B59376F00BCF54D /* MWMRoutingDisclaimerAlert.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; lineEnding = 0; path = MWMRoutingDisclaimerAlert.mm; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; + F63774E91B59376F00BCF54D /* MWMRoutingDisclaimerAlert.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = MWMRoutingDisclaimerAlert.m; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; F6381BF41CD12045004CA943 /* LocaleTranslator.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; lineEnding = 0; path = LocaleTranslator.mm; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; F63AF5041EA6162400A1DB98 /* FilterTypeCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FilterTypeCell.swift; sourceTree = ""; }; F63AF5091EA6213F00A1DB98 /* FilterRatingCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FilterRatingCell.swift; sourceTree = ""; }; @@ -1774,14 +1763,14 @@ F64F19971AB81A00006EAF7E /* MWMDownloadTransitMapAlert.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; lineEnding = 0; path = MWMDownloadTransitMapAlert.mm; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; F64F19981AB81A00006EAF7E /* MWMDownloadTransitMapAlert.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMDownloadTransitMapAlert.xib; sourceTree = ""; }; F64F4B6B1B46A51F0081A24A /* MWMDownloaderDialogCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMDownloaderDialogCell.h; sourceTree = ""; }; - F64F4B6C1B46A51F0081A24A /* MWMDownloaderDialogCell.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMDownloaderDialogCell.mm; sourceTree = ""; }; + F64F4B6C1B46A51F0081A24A /* MWMDownloaderDialogCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MWMDownloaderDialogCell.m; sourceTree = ""; }; F64F4B6E1B46A5380081A24A /* MWMDownloaderDialogCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMDownloaderDialogCell.xib; sourceTree = ""; }; F64F4B701B4A41D40081A24A /* MWMDownloaderDialogHeader.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMDownloaderDialogHeader.xib; sourceTree = ""; }; F64F4B721B4A45FD0081A24A /* MWMDownloaderDialogHeader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMDownloaderDialogHeader.h; sourceTree = ""; }; F64F4B731B4A45FD0081A24A /* MWMDownloaderDialogHeader.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; lineEnding = 0; path = MWMDownloaderDialogHeader.mm; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; F652B2E91C6DE8E500D20C8C /* MWMDropDown.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMDropDown.xib; sourceTree = ""; }; F653CE0F1C6DEB5A00A453F1 /* MWMDropDown.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMDropDown.h; sourceTree = ""; }; - F653CE101C6DEB5A00A453F1 /* MWMDropDown.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMDropDown.mm; sourceTree = ""; }; + F653CE101C6DEB5A00A453F1 /* MWMDropDown.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MWMDropDown.m; sourceTree = ""; }; F653CE141C71F60200A453F1 /* MWMAddPlaceNavigationBar.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMAddPlaceNavigationBar.h; sourceTree = ""; }; F653CE151C71F60200A453F1 /* MWMAddPlaceNavigationBar.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; lineEnding = 0; path = MWMAddPlaceNavigationBar.mm; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; F653CE171C71F62400A453F1 /* MWMAddPlaceNavigationBar.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMAddPlaceNavigationBar.xib; sourceTree = ""; }; @@ -1802,7 +1791,7 @@ F6664C101E645A4100E703C2 /* MWMPPReviewCell.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMPPReviewCell.mm; sourceTree = ""; }; F6664C111E645A4100E703C2 /* MWMPPReviewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMPPReviewCell.xib; sourceTree = ""; }; F6791B111C43DEA7007A8A6E /* MWMStartButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMStartButton.h; sourceTree = ""; }; - F6791B121C43DEA7007A8A6E /* MWMStartButton.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMStartButton.mm; sourceTree = ""; }; + F6791B121C43DEA7007A8A6E /* MWMStartButton.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MWMStartButton.m; sourceTree = ""; }; F68224991E5B104600BC1C18 /* PPHotelDescriptionCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PPHotelDescriptionCell.swift; sourceTree = ""; }; F682249D1E5B105900BC1C18 /* PPHotelDescriptionCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = PPHotelDescriptionCell.xib; sourceTree = ""; }; F68224A11E5B1B1A00BC1C18 /* MWMPlacePageButtonsProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMPlacePageButtonsProtocol.h; sourceTree = ""; }; @@ -1819,7 +1808,7 @@ F6A218471CA3F26800BE2CC6 /* MWMEditorViralActivityItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMEditorViralActivityItem.h; sourceTree = ""; }; F6A218481CA3F26800BE2CC6 /* MWMEditorViralActivityItem.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMEditorViralActivityItem.mm; sourceTree = ""; }; F6BBF2C41B4FFB72000CF8E2 /* MWMLocationAlert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMLocationAlert.h; sourceTree = ""; }; - F6BBF2C51B4FFB72000CF8E2 /* MWMLocationAlert.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; lineEnding = 0; path = MWMLocationAlert.mm; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; + F6BBF2C51B4FFB72000CF8E2 /* MWMLocationAlert.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = MWMLocationAlert.m; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; F6BBF2C71B4FFB8C000CF8E2 /* MWMLocationAlert.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMLocationAlert.xib; sourceTree = ""; }; F6BD1D1E1CA412920047B8E8 /* MWMOsmAuthAlert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMOsmAuthAlert.h; sourceTree = ""; }; F6BD1D1F1CA412920047B8E8 /* MWMOsmAuthAlert.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; lineEnding = 0; path = MWMOsmAuthAlert.mm; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; @@ -1868,7 +1857,7 @@ F6E2FC221E097B9F0083EBEC /* MWMMapDownloaderViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMMapDownloaderViewController.h; sourceTree = ""; }; F6E2FC231E097B9F0083EBEC /* MWMMapDownloaderViewController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMMapDownloaderViewController.mm; sourceTree = ""; }; F6E2FC251E097B9F0083EBEC /* MWMNoMapsView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMNoMapsView.h; sourceTree = ""; }; - F6E2FC261E097B9F0083EBEC /* MWMNoMapsView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMNoMapsView.mm; sourceTree = ""; }; + F6E2FC261E097B9F0083EBEC /* MWMNoMapsView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MWMNoMapsView.m; sourceTree = ""; }; F6E2FC271E097B9F0083EBEC /* MWMNoMapsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMNoMapsViewController.h; sourceTree = ""; }; F6E2FC281E097B9F0083EBEC /* MWMNoMapsViewController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMNoMapsViewController.mm; sourceTree = ""; }; F6E2FC2A1E097B9F0083EBEC /* MWMBookmarkColorViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMBookmarkColorViewController.h; sourceTree = ""; }; @@ -1884,11 +1873,11 @@ F6E2FC371E097B9F0083EBEC /* MWMCuisineEditorViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMCuisineEditorViewController.h; sourceTree = ""; }; F6E2FC381E097B9F0083EBEC /* MWMCuisineEditorViewController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMCuisineEditorViewController.mm; sourceTree = ""; }; F6E2FC401E097B9F0083EBEC /* MWMEditorAdditionalNamesHeader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMEditorAdditionalNamesHeader.h; sourceTree = ""; }; - F6E2FC411E097B9F0083EBEC /* MWMEditorAdditionalNamesHeader.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; lineEnding = 0; path = MWMEditorAdditionalNamesHeader.mm; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; + F6E2FC411E097B9F0083EBEC /* MWMEditorAdditionalNamesHeader.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = MWMEditorAdditionalNamesHeader.m; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; F6E2FC421E097B9F0083EBEC /* MWMEditorAdditionalNamesHeader.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMEditorAdditionalNamesHeader.xib; sourceTree = ""; }; F6E2FC491E097B9F0083EBEC /* MWMEditorCommon.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMEditorCommon.h; sourceTree = ""; }; F6E2FC4A1E097B9F0083EBEC /* MWMEditorNotesFooter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMEditorNotesFooter.h; sourceTree = ""; }; - F6E2FC4B1E097B9F0083EBEC /* MWMEditorNotesFooter.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; lineEnding = 0; path = MWMEditorNotesFooter.mm; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; + F6E2FC4B1E097B9F0083EBEC /* MWMEditorNotesFooter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = MWMEditorNotesFooter.m; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; F6E2FC4C1E097B9F0083EBEC /* MWMEditorNotesFooter.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMEditorNotesFooter.xib; sourceTree = ""; }; F6E2FC561E097B9F0083EBEC /* MWMEditorViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMEditorViewController.h; sourceTree = ""; }; F6E2FC571E097B9F0083EBEC /* MWMEditorViewController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; lineEnding = 0; path = MWMEditorViewController.mm; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; @@ -1930,7 +1919,7 @@ F6E2FC801E097B9F0083EBEC /* MWMOpeningHoursSection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMOpeningHoursSection.h; sourceTree = ""; }; F6E2FC811E097B9F0083EBEC /* MWMOpeningHoursSection.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMOpeningHoursSection.mm; sourceTree = ""; }; F6E2FC831E097B9F0083EBEC /* MWMStreetEditorEditTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMStreetEditorEditTableViewCell.h; sourceTree = ""; }; - F6E2FC841E097B9F0083EBEC /* MWMStreetEditorEditTableViewCell.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMStreetEditorEditTableViewCell.mm; sourceTree = ""; }; + F6E2FC841E097B9F0083EBEC /* MWMStreetEditorEditTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MWMStreetEditorEditTableViewCell.m; sourceTree = ""; }; F6E2FC851E097B9F0083EBEC /* MWMStreetEditorEditTableViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMStreetEditorEditTableViewCell.xib; sourceTree = ""; }; F6E2FC861E097B9F0083EBEC /* MWMStreetEditorViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMStreetEditorViewController.h; sourceTree = ""; }; F6E2FC871E097B9F0083EBEC /* MWMStreetEditorViewController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMStreetEditorViewController.mm; sourceTree = ""; }; @@ -1967,7 +1956,7 @@ F6E2FCBC1E097B9F0083EBEC /* MWMPlacePageOpeningHoursCell.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; lineEnding = 0; path = MWMPlacePageOpeningHoursCell.mm; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; F6E2FCBD1E097B9F0083EBEC /* MWMPlacePageOpeningHoursCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMPlacePageOpeningHoursCell.xib; sourceTree = ""; }; F6E2FCBE1E097B9F0083EBEC /* MWMPlacePageOpeningHoursDayView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMPlacePageOpeningHoursDayView.h; sourceTree = ""; }; - F6E2FCBF1E097B9F0083EBEC /* MWMPlacePageOpeningHoursDayView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMPlacePageOpeningHoursDayView.mm; sourceTree = ""; }; + F6E2FCBF1E097B9F0083EBEC /* MWMPlacePageOpeningHoursDayView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MWMPlacePageOpeningHoursDayView.m; sourceTree = ""; }; F6E2FCC01E097B9F0083EBEC /* MWMPlacePageOpeningHoursWeekDayView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMPlacePageOpeningHoursWeekDayView.xib; sourceTree = ""; }; F6E2FCC21E097B9F0083EBEC /* MWMPlacePageRegularCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMPlacePageRegularCell.h; sourceTree = ""; }; F6E2FCC31E097B9F0083EBEC /* MWMPlacePageRegularCell.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMPlacePageRegularCell.mm; sourceTree = ""; }; @@ -2003,15 +1992,15 @@ F6E2FCF21E097B9F0083EBEC /* MWMSearchChangeModeView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMSearchChangeModeView.h; sourceTree = ""; }; F6E2FCF31E097B9F0083EBEC /* MWMSearchChangeModeView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMSearchChangeModeView.mm; sourceTree = ""; }; F6E2FCF41E097B9F0083EBEC /* MWMSearchContentView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMSearchContentView.h; sourceTree = ""; }; - F6E2FCF51E097B9F0083EBEC /* MWMSearchContentView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMSearchContentView.mm; sourceTree = ""; }; + F6E2FCF51E097B9F0083EBEC /* MWMSearchContentView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MWMSearchContentView.m; sourceTree = ""; }; F6E2FCF61E097B9F0083EBEC /* MWMSearchManager+Filter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "MWMSearchManager+Filter.h"; sourceTree = ""; }; F6E2FCF71E097B9F0083EBEC /* MWMSearchManager+Filter.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = "MWMSearchManager+Filter.mm"; sourceTree = ""; }; F6E2FCF81E097B9F0083EBEC /* MWMSearchManager+Layout.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "MWMSearchManager+Layout.h"; sourceTree = ""; }; - F6E2FCF91E097B9F0083EBEC /* MWMSearchManager+Layout.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = "MWMSearchManager+Layout.mm"; sourceTree = ""; }; + F6E2FCF91E097B9F0083EBEC /* MWMSearchManager+Layout.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "MWMSearchManager+Layout.m"; sourceTree = ""; }; F6E2FCFA1E097B9F0083EBEC /* MWMSearchManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMSearchManager.h; sourceTree = ""; }; F6E2FCFB1E097B9F0083EBEC /* MWMSearchManager.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMSearchManager.mm; sourceTree = ""; }; F6E2FCFC1E097B9F0083EBEC /* MWMSearchNoResults.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMSearchNoResults.h; sourceTree = ""; }; - F6E2FCFD1E097B9F0083EBEC /* MWMSearchNoResults.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; lineEnding = 0; path = MWMSearchNoResults.mm; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; + F6E2FCFD1E097B9F0083EBEC /* MWMSearchNoResults.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = MWMSearchNoResults.m; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; F6E2FCFE1E097B9F0083EBEC /* MWMSearchNoResults.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMSearchNoResults.xib; sourceTree = ""; }; F6E2FCFF1E097B9F0083EBEC /* MWMSearchTextField.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMSearchTextField.h; sourceTree = ""; }; F6E2FD001E097B9F0083EBEC /* MWMSearchTextField.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMSearchTextField.mm; sourceTree = ""; }; @@ -2029,7 +2018,7 @@ F6E2FD2F1E097BA00083EBEC /* MWMSearchSuggestionCell.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMSearchSuggestionCell.mm; sourceTree = ""; }; F6E2FD301E097BA00083EBEC /* MWMSearchSuggestionCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMSearchSuggestionCell.xib; sourceTree = ""; }; F6E2FD311E097BA00083EBEC /* MWMSearchTableView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMSearchTableView.h; sourceTree = ""; }; - F6E2FD321E097BA00083EBEC /* MWMSearchTableView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMSearchTableView.mm; sourceTree = ""; }; + F6E2FD321E097BA00083EBEC /* MWMSearchTableView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MWMSearchTableView.m; sourceTree = ""; }; F6E2FD331E097BA00083EBEC /* MWMSearchTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMSearchTableViewController.h; sourceTree = ""; }; F6E2FD341E097BA00083EBEC /* MWMSearchTableViewController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; lineEnding = 0; path = MWMSearchTableViewController.mm; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; F6E2FD351E097BA00083EBEC /* MWMSearchTableViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMSearchTableViewController.xib; sourceTree = ""; }; @@ -2037,10 +2026,10 @@ F6E2FD391E097BA00083EBEC /* SettingsTableViewSelectableCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SettingsTableViewSelectableCell.swift; sourceTree = ""; }; F6E2FD3A1E097BA00083EBEC /* SettingsTableViewSwitchCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SettingsTableViewSwitchCell.swift; sourceTree = ""; }; F6E2FD3B1E097BA00083EBEC /* MWMAboutController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMAboutController.h; sourceTree = ""; }; - F6E2FD3C1E097BA00083EBEC /* MWMAboutController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMAboutController.mm; sourceTree = ""; }; + F6E2FD3C1E097BA00083EBEC /* MWMAboutController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MWMAboutController.m; sourceTree = ""; }; F6E2FD3D1E097BA00083EBEC /* MWMAboutControllerHeader.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMAboutControllerHeader.xib; sourceTree = ""; }; F6E2FD3E1E097BA00083EBEC /* MWMHelpController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMHelpController.h; sourceTree = ""; }; - F6E2FD3F1E097BA00083EBEC /* MWMHelpController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMHelpController.mm; sourceTree = ""; }; + F6E2FD3F1E097BA00083EBEC /* MWMHelpController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MWMHelpController.m; sourceTree = ""; }; F6E2FD401E097BA00083EBEC /* MWMMobileInternetViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMMobileInternetViewController.h; sourceTree = ""; }; F6E2FD411E097BA00083EBEC /* MWMMobileInternetViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MWMMobileInternetViewController.m; sourceTree = ""; }; F6E2FD421E097BA00083EBEC /* MWMNightModeController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMNightModeController.h; sourceTree = ""; }; @@ -2062,10 +2051,10 @@ F6EBB2711FD7E4FD00B69B6A /* DiscoveryNoResultsCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = DiscoveryNoResultsCell.xib; sourceTree = ""; }; F6F8E3C41EF8469700F2DE8F /* libugc.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libugc.a; path = "../../../../Library/Developer/Xcode/DerivedData/omim-fbvotunmmtqmjnezabjibwxwryev/Build/Products/Debug-iphonesimulator/libugc.a"; sourceTree = ""; }; F6FE3C361CC50FFD00A73196 /* MWMPlaceDoesntExistAlert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMPlaceDoesntExistAlert.h; sourceTree = ""; }; - F6FE3C371CC50FFD00A73196 /* MWMPlaceDoesntExistAlert.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; lineEnding = 0; path = MWMPlaceDoesntExistAlert.mm; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; + F6FE3C371CC50FFD00A73196 /* MWMPlaceDoesntExistAlert.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = MWMPlaceDoesntExistAlert.m; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; F6FE3C3A1CC5106500A73196 /* MWMPlaceDoesntExistAlert.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMPlaceDoesntExistAlert.xib; sourceTree = ""; }; F6FEA82B1C58E89B007223CC /* MWMButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMButton.h; sourceTree = ""; }; - F6FEA82C1C58E89B007223CC /* MWMButton.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMButton.mm; sourceTree = ""; }; + F6FEA82C1C58E89B007223CC /* MWMButton.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MWMButton.m; sourceTree = ""; }; FA054610155C465E001F4E37 /* SelectSetVC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SelectSetVC.h; path = Bookmarks/SelectSetVC.h; sourceTree = SOURCE_ROOT; }; FA054611155C465E001F4E37 /* SelectSetVC.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = SelectSetVC.mm; path = Bookmarks/SelectSetVC.mm; sourceTree = SOURCE_ROOT; }; FA36B80515403A4F004560CC /* BookmarksVC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; name = BookmarksVC.h; path = Bookmarks/BookmarksVC.h; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; @@ -2194,7 +2183,7 @@ 1D3623250D0F684500981E51 /* MapsAppDelegate.mm */, F613FA741AB330AF002394D4 /* MapViewController */, F626D52C1C3E6CAA00C17D15 /* MWMTableViewCell.h */, - F626D52D1C3E6CAA00C17D15 /* MWMTableViewCell.mm */, + F626D52D1C3E6CAA00C17D15 /* MWMTableViewCell.m */, F607C18B1C047FCA00B53A87 /* Segue */, 340837101B7243B500B5C185 /* Share */, F6588E291B15C25C00EE1E58 /* TextView */, @@ -2336,7 +2325,7 @@ children = ( 33010DB221B7E14700925411 /* MWMPlaceDescriptionCell.xib */, 331922AD21BAD29900D4AAC5 /* MWMPlaceDescriptionCell.h */, - 331922AE21BAD29900D4AAC5 /* MWMPlaceDescriptionCell.mm */, + 331922AE21BAD29900D4AAC5 /* MWMPlaceDescriptionCell.m */, ); path = DescriptionCell; sourceTree = ""; @@ -2438,7 +2427,7 @@ 3404751C1E081A4600C92850 /* MWMMacros.h */, 3404751E1E081A4600C92850 /* Statistics */, 340475261E081A4600C92850 /* WebViewController.h */, - 340475271E081A4600C92850 /* WebViewController.mm */, + 340475271E081A4600C92850 /* WebViewController.m */, 3427AF0B1E49E3A500D466DB /* MWMConsts.h */, ); path = Common; @@ -2717,46 +2706,46 @@ children = ( 34D3B04D1E38A20C004100F9 /* Bundle+Init.swift */, 3454D7991E07F045004AF2AD /* CALayer+RuntimeAttributes.h */, - 3454D79A1E07F045004AF2AD /* CALayer+RuntimeAttributes.mm */, + 3454D79A1E07F045004AF2AD /* CALayer+RuntimeAttributes.m */, 3454D79B1E07F045004AF2AD /* CLLocation+Mercator.h */, 3454D79C1E07F045004AF2AD /* CLLocation+Mercator.mm */, 3454D79D1E07F045004AF2AD /* DateComponentsFormatter+ETA.swift */, 3454D79E1E07F045004AF2AD /* NSString+Categories.h */, - 3454D79F1E07F045004AF2AD /* NSString+Categories.mm */, + 3454D79F1E07F045004AF2AD /* NSString+Categories.m */, F6550C1D1FD81B3800352D88 /* RatingSummaryView+DefaultConfig.swift */, 3457C4241F680F1900028233 /* String+BoundingRect.swift */, 34763F051F3092E700F4D2D3 /* String+Format.swift */, 3454D7A01E07F045004AF2AD /* UIButton+Orientation.h */, - 3454D7A11E07F045004AF2AD /* UIButton+Orientation.mm */, + 3454D7A11E07F045004AF2AD /* UIButton+Orientation.m */, 3454D7A21E07F045004AF2AD /* UIButton+RuntimeAttributes.h */, - 3454D7A31E07F045004AF2AD /* UIButton+RuntimeAttributes.mm */, + 3454D7A31E07F045004AF2AD /* UIButton+RuntimeAttributes.m */, 34D3AFF41E37A36A004100F9 /* UICollectionView+Cells.swift */, 1DFA2F6E20D3CA9200FB2C66 /* UIColorRoutines.h */, 1DFA2F6820D3B52F00FB2C66 /* UIColor+PartnerColor.h */, - 1DFA2F6920D3B57400FB2C66 /* UIColor+PartnerColor.mm */, + 1DFA2F6920D3B57400FB2C66 /* UIColor+PartnerColor.m */, 3454D7A41E07F045004AF2AD /* UIColor+MapsMeColor.h */, - 3454D7A51E07F045004AF2AD /* UIColor+MapsMeColor.mm */, + 3454D7A51E07F045004AF2AD /* UIColor+MapsMeColor.m */, 3488B0181E9D0B230068AFD8 /* UIColor+Modifications.swift */, 3454D7A61E07F045004AF2AD /* UIFont+MapsMeFonts.h */, - 3454D7A71E07F045004AF2AD /* UIFont+MapsMeFonts.mm */, + 3454D7A71E07F045004AF2AD /* UIFont+MapsMeFonts.m */, 3454D7A81E07F045004AF2AD /* UIImage+RGBAData.h */, - 3454D7A91E07F045004AF2AD /* UIImage+RGBAData.mm */, + 3454D7A91E07F045004AF2AD /* UIImage+RGBAData.m */, 3454D7AA1E07F045004AF2AD /* UIImageView+Coloring.h */, - 3454D7AB1E07F045004AF2AD /* UIImageView+Coloring.mm */, + 3454D7AB1E07F045004AF2AD /* UIImageView+Coloring.m */, 3454D7AC1E07F045004AF2AD /* UIKitCategories.h */, - 3454D7AD1E07F045004AF2AD /* UIKitCategories.mm */, + 3454D7AD1E07F045004AF2AD /* UIKitCategories.m */, 34AC8FD91EFC062400E7F910 /* UILabel+NumberOfVisibleLines.swift */, 3454D7AE1E07F045004AF2AD /* UILabel+RuntimeAttributes.h */, - 3454D7AF1E07F045004AF2AD /* UILabel+RuntimeAttributes.mm */, + 3454D7AF1E07F045004AF2AD /* UILabel+RuntimeAttributes.m */, 34D3AFE81E378AF1004100F9 /* UINib+Init.swift */, 3454D7B01E07F045004AF2AD /* UISwitch+RuntimeAttributes.h */, 3454D7B11E07F045004AF2AD /* UISwitch+RuntimeAttributes.m */, 34D3AFF01E37945B004100F9 /* UITableView+Cells.swift */, 34D3AFE01E376F7E004100F9 /* UITableView+Updates.swift */, 3454D7B21E07F045004AF2AD /* UITextField+RuntimeAttributes.h */, - 3454D7B31E07F045004AF2AD /* UITextField+RuntimeAttributes.mm */, + 3454D7B31E07F045004AF2AD /* UITextField+RuntimeAttributes.m */, 3454D7B41E07F045004AF2AD /* UITextView+RuntimeAttributes.h */, - 3454D7B51E07F045004AF2AD /* UITextView+RuntimeAttributes.mm */, + 3454D7B51E07F045004AF2AD /* UITextView+RuntimeAttributes.m */, 348B926B1FF3B5E100379009 /* UIView+Animation.swift */, 3404164A1E7BF42D00E2B6D6 /* UIView+Coordinates.swift */, 34F5E0D21E3F254800B1C415 /* UIView+Hierarchy.swift */, @@ -2765,7 +2754,7 @@ 340416461E7BF28E00E2B6D6 /* UIView+Snapshot.swift */, 349D1CE21E3F836900A878FD /* UIViewController+Hierarchy.swift */, 34F7422F1E0834F400AC1FD6 /* UIViewController+Navigation.h */, - 34F742301E0834F400AC1FD6 /* UIViewController+Navigation.mm */, + 34F742301E0834F400AC1FD6 /* UIViewController+Navigation.m */, 33E905452180C40900868CAC /* UIViewController+Authorization.swift */, 347E03981FAC5F1D00426032 /* UIWindow+InputLanguage.swift */, 4767CDA320AAF66B00BD8166 /* NSAttributedString+HTML.swift */, @@ -2834,18 +2823,6 @@ path = TrafficButton; sourceTree = ""; }; - 3465E7D51B66589900854C4D /* APIBar */ = { - isa = PBXGroup; - children = ( - 3465E7D61B6658C000854C4D /* MWMAPIBar.h */, - 3465E7D71B6658C000854C4D /* MWMAPIBar.mm */, - 341522BD1B666A550077AA8F /* MWMAPIBarView.h */, - 341522BE1B666A550077AA8F /* MWMAPIBarView.mm */, - 341C2A5A1B720B8A00AD41A1 /* MWMAPIBarView.xib */, - ); - path = APIBar; - sourceTree = ""; - }; 3467CEB3202C6F7F00D3C670 /* Notifications */ = { isa = PBXGroup; children = ( @@ -2908,24 +2885,22 @@ F652B2E81C6DE8CF00D20C8C /* DropDown */, 349FC5441F680DAE00968C9F /* ExpandableReviewView */, F6FEA82B1C58E89B007223CC /* MWMButton.h */, - F6FEA82C1C58E89B007223CC /* MWMButton.mm */, + F6FEA82C1C58E89B007223CC /* MWMButton.m */, 343E75951E5B1EE20041226A /* MWMCollectionViewController.h */, - 343E75961E5B1EE20041226A /* MWMCollectionViewController.mm */, + 343E75961E5B1EE20041226A /* MWMCollectionViewController.m */, 34C9BD061C6DB6F3000DC38D /* MWMController.h */, 34B924401DC8A29C0008D971 /* MWMMailViewController.h */, - 34B924411DC8A29C0008D971 /* MWMMailViewController.mm */, - 346EDAD91B9F0E35004F8DB5 /* MWMMultilineLabel.h */, - 346EDADA1B9F0E35004F8DB5 /* MWMMultilineLabel.mm */, + 34B924411DC8A29C0008D971 /* MWMMailViewController.m */, 34C9BD071C6DBCDA000DC38D /* MWMNavigationController.h */, 34C9BD081C6DBCDA000DC38D /* MWMNavigationController.m */, F6791B111C43DEA7007A8A6E /* MWMStartButton.h */, - F6791B121C43DEA7007A8A6E /* MWMStartButton.mm */, + F6791B121C43DEA7007A8A6E /* MWMStartButton.m */, 34AB39BF1D2BD8310021857D /* MWMStopButton.h */, - 34AB39C01D2BD8310021857D /* MWMStopButton.mm */, + 34AB39C01D2BD8310021857D /* MWMStopButton.m */, 34C9BCFE1C6DB693000DC38D /* MWMTableViewController.h */, - 34C9BCFF1C6DB693000DC38D /* MWMTableViewController.mm */, + 34C9BCFF1C6DB693000DC38D /* MWMTableViewController.m */, 34C9BD001C6DB693000DC38D /* MWMViewController.h */, - 34C9BD011C6DB693000DC38D /* MWMViewController.mm */, + 34C9BD011C6DB693000DC38D /* MWMViewController.m */, 344BEAEF1F66BDC30045DC45 /* RatingSummaryView */, 348A8DF01F66775A00D83026 /* RatingView */, 4767CD9E20AAD48A00BD8166 /* Checkmark.swift */, @@ -3218,15 +3193,15 @@ isa = PBXGroup; children = ( 34ABA6221C2D551900FE1BEC /* MWMInputValidatorFactory.h */, - 34ABA6231C2D551900FE1BEC /* MWMInputValidatorFactory.mm */, + 34ABA6231C2D551900FE1BEC /* MWMInputValidatorFactory.m */, 34ABA61E1C2D517500FE1BEC /* MWMInputValidator.h */, - 34ABA61F1C2D517500FE1BEC /* MWMInputValidator.mm */, + 34ABA61F1C2D517500FE1BEC /* MWMInputValidator.m */, 34ABA6261C2D567B00FE1BEC /* MWMInputLoginValidator.h */, - 34ABA6271C2D567B00FE1BEC /* MWMInputLoginValidator.mm */, + 34ABA6271C2D567B00FE1BEC /* MWMInputLoginValidator.m */, 34ABA62A1C2D57D500FE1BEC /* MWMInputPasswordValidator.h */, - 34ABA62B1C2D57D500FE1BEC /* MWMInputPasswordValidator.mm */, + 34ABA62B1C2D57D500FE1BEC /* MWMInputPasswordValidator.m */, 34ABA62E1C2D58F300FE1BEC /* MWMInputEmailValidator.h */, - 34ABA62F1C2D58F300FE1BEC /* MWMInputEmailValidator.mm */, + 34ABA62F1C2D58F300FE1BEC /* MWMInputEmailValidator.m */, ); name = "Input Validators"; path = InputValidators; @@ -3252,7 +3227,6 @@ isa = PBXGroup; children = ( 474A450520EBA03900C10B4E /* Layers */, - 3465E7D51B66589900854C4D /* APIBar */, 340537621BBED98600D452C6 /* MWMMapViewControlsCommon.h */, 34BC72101B0DECAE0012A34B /* MWMMapViewControlsManager.h */, 34BC72111B0DECAE0012A34B /* MWMMapViewControlsManager.mm */, @@ -3269,28 +3243,28 @@ 34D3AFFD1E389D05004100F9 /* EditorAdditionalNamePlaceholderTableViewCell.swift */, 34D3B0041E389D05004100F9 /* EditorAdditionalNamePlaceholderTableViewCell.xib */, 34D3AFFE1E389D05004100F9 /* MWMButtonCell.h */, - 34D3AFFF1E389D05004100F9 /* MWMButtonCell.mm */, + 34D3AFFF1E389D05004100F9 /* MWMButtonCell.m */, 34D3B0001E389D05004100F9 /* MWMButtonCell.xib */, 34D3B0011E389D05004100F9 /* MWMEditorAddAdditionalNameTableViewCell.h */, - 34D3B0021E389D05004100F9 /* MWMEditorAddAdditionalNameTableViewCell.mm */, + 34D3B0021E389D05004100F9 /* MWMEditorAddAdditionalNameTableViewCell.m */, 34D3B0031E389D05004100F9 /* MWMEditorAddAdditionalNameTableViewCell.xib */, 34D3B0051E389D05004100F9 /* MWMEditorAdditionalNameTableViewCell.h */, - 34D3B0061E389D05004100F9 /* MWMEditorAdditionalNameTableViewCell.mm */, + 34D3B0061E389D05004100F9 /* MWMEditorAdditionalNameTableViewCell.m */, 34D3B0071E389D05004100F9 /* MWMEditorAdditionalNameTableViewCell.xib */, 34D3B0081E389D05004100F9 /* MWMEditorCategoryCell.h */, - 34D3B0091E389D05004100F9 /* MWMEditorCategoryCell.mm */, + 34D3B0091E389D05004100F9 /* MWMEditorCategoryCell.m */, 34D3B00A1E389D05004100F9 /* MWMEditorCategoryCell.xib */, 34D3B00B1E389D05004100F9 /* MWMEditorSelectTableViewCell.h */, - 34D3B00C1E389D05004100F9 /* MWMEditorSelectTableViewCell.mm */, + 34D3B00C1E389D05004100F9 /* MWMEditorSelectTableViewCell.m */, 34D3B00D1E389D05004100F9 /* MWMEditorSelectTableViewCell.xib */, 34D3B00E1E389D05004100F9 /* MWMEditorSwitchTableViewCell.h */, - 34D3B00F1E389D05004100F9 /* MWMEditorSwitchTableViewCell.mm */, + 34D3B00F1E389D05004100F9 /* MWMEditorSwitchTableViewCell.m */, 34D3B0101E389D05004100F9 /* MWMEditorSwitchTableViewCell.xib */, 34D3B0111E389D05004100F9 /* MWMEditorTextTableViewCell.h */, - 34D3B0121E389D05004100F9 /* MWMEditorTextTableViewCell.mm */, + 34D3B0121E389D05004100F9 /* MWMEditorTextTableViewCell.m */, 34D3B0131E389D05004100F9 /* MWMEditorTextTableViewCell.xib */, 34D3B0141E389D05004100F9 /* MWMNoteCell.h */, - 34D3B0151E389D05004100F9 /* MWMNoteCell.mm */, + 34D3B0151E389D05004100F9 /* MWMNoteCell.m */, 34D3B0161E389D05004100F9 /* MWMNoteCell.xib */, ); path = Cells; @@ -3341,7 +3315,7 @@ children = ( 34F407241E9E1AFF00E57AC0 /* MopubBanner.swift */, 34F407251E9E1AFF00E57AC0 /* MPNativeAd+MWM.h */, - 34F407261E9E1AFF00E57AC0 /* MPNativeAd+MWM.mm */, + 34F407261E9E1AFF00E57AC0 /* MPNativeAd+MWM.m */, ); path = Mopub; sourceTree = ""; @@ -3599,7 +3573,7 @@ children = ( 995739022355CA5D0019AEE7 /* Pages */, ED48BBB817C2B1E2003E7E92 /* CircleView.h */, - ED48BBB917C2B1E2003E7E92 /* CircleView.mm */, + ED48BBB917C2B1E2003E7E92 /* CircleView.m */, 349A35741B53D4C9009677EE /* CircularProgress */, ED48BBB317C267F5003E7E92 /* ColorPickerView.h */, ED48BBB417C267F5003E7E92 /* ColorPickerView.mm */, @@ -3837,7 +3811,7 @@ children = ( F63774E61B59375E00BCF54D /* MWMRoutingDisclaimerAlert.xib */, F63774E81B59376F00BCF54D /* MWMRoutingDisclaimerAlert.h */, - F63774E91B59376F00BCF54D /* MWMRoutingDisclaimerAlert.mm */, + F63774E91B59376F00BCF54D /* MWMRoutingDisclaimerAlert.m */, ); path = RoutingDisclaimerAlert; sourceTree = ""; @@ -3914,7 +3888,7 @@ F64F19971AB81A00006EAF7E /* MWMDownloadTransitMapAlert.mm */, F64F19981AB81A00006EAF7E /* MWMDownloadTransitMapAlert.xib */, F64F4B6B1B46A51F0081A24A /* MWMDownloaderDialogCell.h */, - F64F4B6C1B46A51F0081A24A /* MWMDownloaderDialogCell.mm */, + F64F4B6C1B46A51F0081A24A /* MWMDownloaderDialogCell.m */, F64F4B6E1B46A5380081A24A /* MWMDownloaderDialogCell.xib */, F64F4B701B4A41D40081A24A /* MWMDownloaderDialogHeader.xib */, F64F4B721B4A45FD0081A24A /* MWMDownloaderDialogHeader.h */, @@ -3928,7 +3902,7 @@ children = ( F652B2E91C6DE8E500D20C8C /* MWMDropDown.xib */, F653CE0F1C6DEB5A00A453F1 /* MWMDropDown.h */, - F653CE101C6DEB5A00A453F1 /* MWMDropDown.mm */, + F653CE101C6DEB5A00A453F1 /* MWMDropDown.m */, ); name = DropDown; sourceTree = ""; @@ -4017,7 +3991,7 @@ isa = PBXGroup; children = ( F6BBF2C41B4FFB72000CF8E2 /* MWMLocationAlert.h */, - F6BBF2C51B4FFB72000CF8E2 /* MWMLocationAlert.mm */, + F6BBF2C51B4FFB72000CF8E2 /* MWMLocationAlert.m */, F6BBF2C71B4FFB8C000CF8E2 /* MWMLocationAlert.xib */, ); path = LocationAlert; @@ -4132,7 +4106,7 @@ isa = PBXGroup; children = ( F6E2FC251E097B9F0083EBEC /* MWMNoMapsView.h */, - F6E2FC261E097B9F0083EBEC /* MWMNoMapsView.mm */, + F6E2FC261E097B9F0083EBEC /* MWMNoMapsView.m */, F6E2FC271E097B9F0083EBEC /* MWMNoMapsViewController.h */, F6E2FC281E097B9F0083EBEC /* MWMNoMapsViewController.mm */, 34845DAD1E1649F6003D55B9 /* DownloaderNoResultsEmbedViewController.swift */, @@ -4162,11 +4136,11 @@ 34D3AFFC1E389D05004100F9 /* Cells */, F6E2FC361E097B9F0083EBEC /* Cuisine */, F6E2FC401E097B9F0083EBEC /* MWMEditorAdditionalNamesHeader.h */, - F6E2FC411E097B9F0083EBEC /* MWMEditorAdditionalNamesHeader.mm */, + F6E2FC411E097B9F0083EBEC /* MWMEditorAdditionalNamesHeader.m */, F6E2FC421E097B9F0083EBEC /* MWMEditorAdditionalNamesHeader.xib */, F6E2FC491E097B9F0083EBEC /* MWMEditorCommon.h */, F6E2FC4A1E097B9F0083EBEC /* MWMEditorNotesFooter.h */, - F6E2FC4B1E097B9F0083EBEC /* MWMEditorNotesFooter.mm */, + F6E2FC4B1E097B9F0083EBEC /* MWMEditorNotesFooter.m */, F6E2FC4C1E097B9F0083EBEC /* MWMEditorNotesFooter.xib */, F6E2FC561E097B9F0083EBEC /* MWMEditorViewController.h */, F6E2FC571E097B9F0083EBEC /* MWMEditorViewController.mm */, @@ -4253,7 +4227,7 @@ isa = PBXGroup; children = ( F6E2FC831E097B9F0083EBEC /* MWMStreetEditorEditTableViewCell.h */, - F6E2FC841E097B9F0083EBEC /* MWMStreetEditorEditTableViewCell.mm */, + F6E2FC841E097B9F0083EBEC /* MWMStreetEditorEditTableViewCell.m */, F6E2FC851E097B9F0083EBEC /* MWMStreetEditorEditTableViewCell.xib */, F6E2FC861E097B9F0083EBEC /* MWMStreetEditorViewController.h */, F6E2FC871E097B9F0083EBEC /* MWMStreetEditorViewController.mm */, @@ -4377,7 +4351,7 @@ F6E2FCBC1E097B9F0083EBEC /* MWMPlacePageOpeningHoursCell.mm */, F6E2FCBD1E097B9F0083EBEC /* MWMPlacePageOpeningHoursCell.xib */, F6E2FCBE1E097B9F0083EBEC /* MWMPlacePageOpeningHoursDayView.h */, - F6E2FCBF1E097B9F0083EBEC /* MWMPlacePageOpeningHoursDayView.mm */, + F6E2FCBF1E097B9F0083EBEC /* MWMPlacePageOpeningHoursDayView.m */, F6E2FCC01E097B9F0083EBEC /* MWMPlacePageOpeningHoursWeekDayView.xib */, ); path = OpeningHoursCell; @@ -4440,15 +4414,15 @@ F6E2FCF21E097B9F0083EBEC /* MWMSearchChangeModeView.h */, F6E2FCF31E097B9F0083EBEC /* MWMSearchChangeModeView.mm */, F6E2FCF41E097B9F0083EBEC /* MWMSearchContentView.h */, - F6E2FCF51E097B9F0083EBEC /* MWMSearchContentView.mm */, + F6E2FCF51E097B9F0083EBEC /* MWMSearchContentView.m */, F6E2FCF61E097B9F0083EBEC /* MWMSearchManager+Filter.h */, F6E2FCF71E097B9F0083EBEC /* MWMSearchManager+Filter.mm */, F6E2FCF81E097B9F0083EBEC /* MWMSearchManager+Layout.h */, - F6E2FCF91E097B9F0083EBEC /* MWMSearchManager+Layout.mm */, + F6E2FCF91E097B9F0083EBEC /* MWMSearchManager+Layout.m */, F6E2FCFA1E097B9F0083EBEC /* MWMSearchManager.h */, F6E2FCFB1E097B9F0083EBEC /* MWMSearchManager.mm */, F6E2FCFC1E097B9F0083EBEC /* MWMSearchNoResults.h */, - F6E2FCFD1E097B9F0083EBEC /* MWMSearchNoResults.mm */, + F6E2FCFD1E097B9F0083EBEC /* MWMSearchNoResults.m */, F6E2FCFE1E097B9F0083EBEC /* MWMSearchNoResults.xib */, F6E2FCFF1E097B9F0083EBEC /* MWMSearchTextField.h */, F6E2FD001E097B9F0083EBEC /* MWMSearchTextField.mm */, @@ -4529,7 +4503,7 @@ F6E2FD2F1E097BA00083EBEC /* MWMSearchSuggestionCell.mm */, F6E2FD301E097BA00083EBEC /* MWMSearchSuggestionCell.xib */, F6E2FD311E097BA00083EBEC /* MWMSearchTableView.h */, - F6E2FD321E097BA00083EBEC /* MWMSearchTableView.mm */, + F6E2FD321E097BA00083EBEC /* MWMSearchTableView.m */, F6E2FD331E097BA00083EBEC /* MWMSearchTableViewController.h */, F6E2FD341E097BA00083EBEC /* MWMSearchTableViewController.mm */, F6E2FD351E097BA00083EBEC /* MWMSearchTableViewController.xib */, @@ -4542,10 +4516,10 @@ children = ( F6E2FD371E097BA00083EBEC /* Cells */, F6E2FD3B1E097BA00083EBEC /* MWMAboutController.h */, - F6E2FD3C1E097BA00083EBEC /* MWMAboutController.mm */, + F6E2FD3C1E097BA00083EBEC /* MWMAboutController.m */, F6E2FD3D1E097BA00083EBEC /* MWMAboutControllerHeader.xib */, F6E2FD3E1E097BA00083EBEC /* MWMHelpController.h */, - F6E2FD3F1E097BA00083EBEC /* MWMHelpController.mm */, + F6E2FD3F1E097BA00083EBEC /* MWMHelpController.m */, F6E2FD401E097BA00083EBEC /* MWMMobileInternetViewController.h */, F6E2FD411E097BA00083EBEC /* MWMMobileInternetViewController.m */, F6E2FD421E097BA00083EBEC /* MWMNightModeController.h */, @@ -4605,7 +4579,7 @@ isa = PBXGroup; children = ( F6FE3C361CC50FFD00A73196 /* MWMPlaceDoesntExistAlert.h */, - F6FE3C371CC50FFD00A73196 /* MWMPlaceDoesntExistAlert.mm */, + F6FE3C371CC50FFD00A73196 /* MWMPlaceDoesntExistAlert.m */, F6FE3C3A1CC5106500A73196 /* MWMPlaceDoesntExistAlert.xib */, ); name = PlaceDoesntExist; @@ -4879,7 +4853,6 @@ F6E2FE521E097BA00083EBEC /* MWMActionBarButton.xib in Resources */, F623DA6F1C9C2E62006A3436 /* MWMAddPlaceNavigationBar.xib in Resources */, 6741A9991BF340DE002C974C /* MWMAlertViewController.xib in Resources */, - 6741A9881BF340DE002C974C /* MWMAPIBarView.xib in Resources */, F6E2FE641E097BA00083EBEC /* MWMBookmarkCell.xib in Resources */, B366130B20D5E2E000E7DC3E /* CatalogCategoryCell.xib in Resources */, F6E2FD951E097BA00083EBEC /* MWMBookmarkColorViewController.xib in Resources */, @@ -5148,7 +5121,7 @@ 34D3B04F1E38A20C004100F9 /* Bundle+Init.swift in Sources */, 47EF05B321504D8F00EAC269 /* RemoveAdsPresentationController.swift in Sources */, 34AB666E1FC5AA330078E451 /* TransportTransitStepsCollectionView.swift in Sources */, - F6E2FF541E097BA00083EBEC /* MWMHelpController.mm in Sources */, + F6E2FF541E097BA00083EBEC /* MWMHelpController.m in Sources */, 349FC5481F680DAE00968C9F /* ExpandableReviewView.swift in Sources */, F6E2FF5A1E097BA00083EBEC /* MWMNightModeController.mm in Sources */, 47F86D0120C93D8D00FEE291 /* TabViewController.swift in Sources */, @@ -5156,7 +5129,7 @@ 6741A9A51BF340DE002C974C /* MWMShareActivityItem.mm in Sources */, 3408963F1F83CEDE00BC7117 /* MWMAuthorizationViewModel.mm in Sources */, F6E2FE1F1E097BA00083EBEC /* MWMOpeningHoursCommon.mm in Sources */, - 3454D7B91E07F045004AF2AD /* CALayer+RuntimeAttributes.mm in Sources */, + 3454D7B91E07F045004AF2AD /* CALayer+RuntimeAttributes.m in Sources */, F6E2FF5D1E097BA00083EBEC /* MWMRecentTrackSettingsController.mm in Sources */, 34AB66651FC5AA330078E451 /* TransportTransitTrain.swift in Sources */, 343064411E9FDC7300DC7665 /* SearchIndex.swift in Sources */, @@ -5190,32 +5163,31 @@ 47C8789D22DF662700A772DA /* SubscriptionExpiredViewController.swift in Sources */, 6741A9B01BF340DE002C974C /* MapsAppDelegate.mm in Sources */, 4719A645219CBD65009F9AA7 /* IPendingTransactionsHandler.swift in Sources */, - 34F742321E0834F400AC1FD6 /* UIViewController+Navigation.mm in Sources */, + 34F742321E0834F400AC1FD6 /* UIViewController+Navigation.m in Sources */, 340475811E081B3300C92850 /* iosOGLContextFactory.mm in Sources */, 34AB66561FC5AA330078E451 /* TransportTransitPedestrian.swift in Sources */, BB8123D62130427E00ADE512 /* MetalContextFactory.mm in Sources */, F6D67CE9206929590032FD38 /* PPPSearchSimilarButton.swift in Sources */, - 6741A9B11BF340DE002C974C /* MWMAPIBarView.mm in Sources */, 3467CEB2202C6EEE00D3C670 /* BMCNotificationsHeader.swift in Sources */, 34F4072F1E9E1AFF00E57AC0 /* BannersCache.swift in Sources */, - 34D3B0211E389D05004100F9 /* MWMEditorAddAdditionalNameTableViewCell.mm in Sources */, + 34D3B0211E389D05004100F9 /* MWMEditorAddAdditionalNameTableViewCell.m in Sources */, F6E2FE491E097BA00083EBEC /* MWMPlacePageData.mm in Sources */, 99D363192358685300941BF4 /* SubscriptionGroupItem.swift in Sources */, 348F8A531F863B6100060C2A /* UGCReview.swift in Sources */, 340475501E081A4600C92850 /* fabric_logging_ios.mm in Sources */, CDCA273A2237FCFE00167D87 /* SearchTemplateBuilder.swift in Sources */, - 34F4073E1E9E1AFF00E57AC0 /* MPNativeAd+MWM.mm in Sources */, + 34F4073E1E9E1AFF00E57AC0 /* MPNativeAd+MWM.m in Sources */, F6E2FED01E097BA00083EBEC /* MWMSearchFilterViewController.mm in Sources */, 34D4FA671E265749003F53EF /* WhatsNewController.swift in Sources */, CDB92CEE229E9CF900EC757C /* MWMDiscoveryMapObjects.mm in Sources */, 34B6FD5F2015E6BF00C18E97 /* DiscoveryBookingCell.swift in Sources */, - 34D3B01B1E389D05004100F9 /* MWMButtonCell.mm in Sources */, - 34ABA6291C2D567B00FE1BEC /* MWMInputLoginValidator.mm in Sources */, + 34D3B01B1E389D05004100F9 /* MWMButtonCell.m in Sources */, + 34ABA6291C2D567B00FE1BEC /* MWMInputLoginValidator.m in Sources */, 337F98B421D3C9F200C8AC27 /* SearchHistoryViewController.swift in Sources */, 3404F49D2028A2430090E401 /* BMCActionsCreateCell.swift in Sources */, F6E2FD8F1E097BA00083EBEC /* MWMNoMapsViewController.mm in Sources */, F63AF50B1EA6213F00A1DB98 /* FilterRatingCell.swift in Sources */, - 34D3B0421E389D05004100F9 /* MWMEditorTextTableViewCell.mm in Sources */, + 34D3B0421E389D05004100F9 /* MWMEditorTextTableViewCell.m in Sources */, 47FA14D1230D52FC003DA979 /* PhoneNumberAuthorizationViewController.swift in Sources */, 340708651F2905A500029ECC /* NavigationInfoArea.swift in Sources */, 34AB666B1FC5AA330078E451 /* TransportTransitCell.swift in Sources */, @@ -5226,7 +5198,7 @@ F6E2FEA31E097BA00083EBEC /* MWMPPView.mm in Sources */, 3D15ACEE2155117000F725D5 /* MWMObjectsCategorySelectorDataSource.mm in Sources */, F69739B21FD197DB00FDA07D /* MWMDiscoveryTableManager.mm in Sources */, - 3454D7D11E07F045004AF2AD /* UIImage+RGBAData.mm in Sources */, + 3454D7D11E07F045004AF2AD /* UIImage+RGBAData.m in Sources */, 6741A9B71BF340DE002C974C /* EAGLView.mm in Sources */, 6741A9B81BF340DE002C974C /* MapViewController.mm in Sources */, 34AB662C1FC5AA330078E451 /* RouteManagerViewModel.swift in Sources */, @@ -5239,11 +5211,11 @@ F6E2FDE01E097BA00083EBEC /* MWMEditorViewController.mm in Sources */, 6741A9C01BF340DE002C974C /* MWMTextView.m in Sources */, B32FE74320D2B09600EF7446 /* CatalogWebViewController.swift in Sources */, - F6E2FDB61E097BA00083EBEC /* MWMEditorAdditionalNamesHeader.mm in Sources */, - F6E2FDC81E097BA00083EBEC /* MWMEditorNotesFooter.mm in Sources */, + F6E2FDB61E097BA00083EBEC /* MWMEditorAdditionalNamesHeader.m in Sources */, + F6E2FDC81E097BA00083EBEC /* MWMEditorNotesFooter.m in Sources */, F6E2FD651E097BA00083EBEC /* MWMMapDownloaderPlaceTableViewCell.mm in Sources */, F6E2FF2D1E097BA00083EBEC /* MWMSearchCell.mm in Sources */, - 3454D7C51E07F045004AF2AD /* UIButton+Orientation.mm in Sources */, + 3454D7C51E07F045004AF2AD /* UIButton+Orientation.m in Sources */, 3454D7E61E07F045004AF2AD /* UIView+RuntimeAttributes.m in Sources */, 34AB66831FC5AA330078E451 /* NavigationAddPointToastView.swift in Sources */, F6E2FE4C1E097BA00083EBEC /* MWMPlacePageManager.mm in Sources */, @@ -5253,10 +5225,10 @@ F6E2FD5C1E097BA00083EBEC /* MWMMapDownloaderCellHeader.m in Sources */, CDCA278E2248F34C00167D87 /* MWMRoutingManager.mm in Sources */, 34D3AFF21E37945B004100F9 /* UITableView+Cells.swift in Sources */, - 34D3B0301E389D05004100F9 /* MWMEditorCategoryCell.mm in Sources */, + 34D3B0301E389D05004100F9 /* MWMEditorCategoryCell.m in Sources */, F653CE191C71F62700A453F1 /* MWMAddPlaceNavigationBar.mm in Sources */, 340475621E081A4600C92850 /* MWMNetworkPolicy+UI.m in Sources */, - F6E2FEE51E097BA00083EBEC /* MWMSearchNoResults.mm in Sources */, + F6E2FEE51E097BA00083EBEC /* MWMSearchNoResults.m in Sources */, F6E2FF631E097BA00083EBEC /* MWMTTSLanguageViewController.mm in Sources */, 342EE4121C43DAA7009F6A49 /* MWMAuthorizationWebViewLoginViewController.mm in Sources */, 47E3C7292111E614008B3B27 /* FadeInAnimatedTransitioning.swift in Sources */, @@ -5266,19 +5238,19 @@ 47E3C72D2111E6A2008B3B27 /* FadeTransitioning.swift in Sources */, 34845DAF1E1649F6003D55B9 /* DownloaderNoResultsEmbedViewController.swift in Sources */, CD6E8677226774C700D1EDF7 /* CPConstants.swift in Sources */, - F6791B141C43DF0B007A8A6E /* MWMStartButton.mm in Sources */, + F6791B141C43DF0B007A8A6E /* MWMStartButton.m in Sources */, 479D306522C664CE00D18278 /* MWMDownloadBannerViewController.m in Sources */, - F6E2FEDF1E097BA00083EBEC /* MWMSearchManager+Layout.mm in Sources */, + F6E2FEDF1E097BA00083EBEC /* MWMSearchManager+Layout.m in Sources */, F64D9CA01C899C350063FA30 /* MWMEditorViralAlert.mm in Sources */, 34AC8FD11EFC02C000E7F910 /* MWMRoutePoint.mm in Sources */, CDB4D5012231412900104869 /* ListTemplateBuilder.swift in Sources */, - 6741A9CF1BF340DE002C974C /* MWMLocationAlert.mm in Sources */, + 6741A9CF1BF340DE002C974C /* MWMLocationAlert.m in Sources */, 474AC76C2139E4F2002F9BF9 /* RemoveAdsViewController.swift in Sources */, - 34ABA62D1C2D57D500FE1BEC /* MWMInputPasswordValidator.mm in Sources */, + 34ABA62D1C2D57D500FE1BEC /* MWMInputPasswordValidator.m in Sources */, BBED27022292F6C000788143 /* BookmarksSection.mm in Sources */, F6E2FDA11E097BA00083EBEC /* MWMEditorAdditionalNamesTableViewController.mm in Sources */, 4767CDA620AB1F6200BD8166 /* LeftAlignedIconButton.swift in Sources */, - 3454D7D41E07F045004AF2AD /* UIImageView+Coloring.mm in Sources */, + 3454D7D41E07F045004AF2AD /* UIImageView+Coloring.m in Sources */, 3463BA671DE81DB90082417F /* MWMTrafficButtonViewController.mm in Sources */, F6E2FE551E097BA00083EBEC /* MWMPlacePageActionBar.mm in Sources */, 34AB66051FC5AA320078E451 /* MWMNavigationDashboardManager+Entity.mm in Sources */, @@ -5293,7 +5265,7 @@ CDB4D5022231412900104869 /* SettingsTemplateBuilder.swift in Sources */, F6EBB26F1FD7E33300B69B6A /* DiscoveryNoResultsCell.swift in Sources */, 47D0026721999DA900F651A2 /* PendingTransactionsHandler.swift in Sources */, - F6FE3C391CC50FFD00A73196 /* MWMPlaceDoesntExistAlert.mm in Sources */, + F6FE3C391CC50FFD00A73196 /* MWMPlaceDoesntExistAlert.m in Sources */, F6E2FDFE1E097BA00083EBEC /* MWMOpeningHoursClosedSpanTableViewCell.mm in Sources */, F6E2FEDC1E097BA00083EBEC /* MWMSearchManager+Filter.mm in Sources */, 34B846A12029DCC10081ECCD /* BMCCategoriesHeader.swift in Sources */, @@ -5321,9 +5293,9 @@ 34AB66501FC5AA330078E451 /* RoutePreviewTaxiCell.swift in Sources */, F6E2FE251E097BA00083EBEC /* MWMOpeningHoursModel.mm in Sources */, 34F407351E9E1AFF00E57AC0 /* CoreBanner.swift in Sources */, - 34C9BD031C6DB693000DC38D /* MWMTableViewController.mm in Sources */, - F6E2FD8C1E097BA00083EBEC /* MWMNoMapsView.mm in Sources */, - 34D3B0361E389D05004100F9 /* MWMEditorSelectTableViewCell.mm in Sources */, + 34C9BD031C6DB693000DC38D /* MWMTableViewController.m in Sources */, + F6E2FD8C1E097BA00083EBEC /* MWMNoMapsView.m in Sources */, + 34D3B0361E389D05004100F9 /* MWMEditorSelectTableViewCell.m in Sources */, F6E2FD711E097BA00083EBEC /* MWMMapDownloaderTableViewCell.mm in Sources */, F6E2FE4F1E097BA00083EBEC /* MWMActionBarButton.mm in Sources */, 47F86CFF20C936FC00FEE291 /* TabView.swift in Sources */, @@ -5343,10 +5315,10 @@ CDCA2748223FD24600167D87 /* MWMCarPlaySearchResultObject.mm in Sources */, 349D1AD81E2E325C004A2006 /* MWMBottomMenuLayout.m in Sources */, F6E2FEBE1E097BA00083EBEC /* MWMPPPreviewLayoutHelper.mm in Sources */, - 3454D7E01E07F045004AF2AD /* UITextField+RuntimeAttributes.mm in Sources */, - 1DFA2F6A20D3B57400FB2C66 /* UIColor+PartnerColor.mm in Sources */, + 3454D7E01E07F045004AF2AD /* UITextField+RuntimeAttributes.m in Sources */, + 1DFA2F6A20D3B57400FB2C66 /* UIColor+PartnerColor.m in Sources */, 347BFA901F27909200E5531F /* MenuArea.swift in Sources */, - 343E75981E5B1EE20041226A /* MWMCollectionViewController.mm in Sources */, + 343E75981E5B1EE20041226A /* MWMCollectionViewController.m in Sources */, B3E3B50220D485FA00DA8C13 /* DownloadedBookmarksDataSource.swift in Sources */, 477D7AC7218F1515007EE2CB /* IPaidRoutePurchase.swift in Sources */, 34E776141F14B17F003040B3 /* AvailableArea.swift in Sources */, @@ -5369,7 +5341,6 @@ 4767CD9F20AAD48A00BD8166 /* Checkmark.swift in Sources */, F6E2FD981E097BA00083EBEC /* MWMBookmarkTitleCell.m in Sources */, 33E905462180C40900868CAC /* UIViewController+Authorization.swift in Sources */, - 6741A9E81BF340DE002C974C /* MWMAPIBar.mm in Sources */, CDCA2745223FCFD200167D87 /* SearchResultInfo.swift in Sources */, 349A13831DEC138C00C7DB60 /* MWMMobileInternetAlert.m in Sources */, 349D1ADE1E2E325C004A2006 /* MWMBottomMenuViewController.mm in Sources */, @@ -5377,7 +5348,7 @@ 6741A9EC1BF340DE002C974C /* MWMCircularProgress.mm in Sources */, 470A89FD21342A9D00D72FBF /* TutorialBlurView.swift in Sources */, 342CC5F21C2D7730005F3FE5 /* MWMAuthorizationLoginViewController.mm in Sources */, - 340475591E081A4600C92850 /* WebViewController.mm in Sources */, + 340475591E081A4600C92850 /* WebViewController.m in Sources */, 3404F4992028A20D0090E401 /* BMCCategoryCell.swift in Sources */, 47F6E51721FB3C51004580CA /* Notifications.swift in Sources */, F62607FD207B790300176C5A /* SpinnerAlert.swift in Sources */, @@ -5400,7 +5371,7 @@ F63AF5131EA6250F00A1DB98 /* FilterCollectionHolderCell.swift in Sources */, 34AB663E1FC5AA330078E451 /* RouteManagerTransitioning.swift in Sources */, 34BBD65C1F826FD30070CA50 /* AuthorizationiPhonePresentationController.swift in Sources */, - 56C74C391C74A3BC00B71B9F /* MWMInputEmailValidator.mm in Sources */, + 56C74C391C74A3BC00B71B9F /* MWMInputEmailValidator.m in Sources */, 6741A9F51BF340DE002C974C /* BookmarksVC.mm in Sources */, 472C40E4232A7B9F009AA777 /* CatalogSingleItemCell.swift in Sources */, B33D21B820E130D000BAD749 /* BookmarksTabViewController.swift in Sources */, @@ -5429,10 +5400,10 @@ 3472B5CF200F4A2B00DC6CD5 /* BackgroundFetchTask.swift in Sources */, 477219052243E79500E5B227 /* DrivingOptionsViewController.swift in Sources */, CDB4D4E4222E8FF600104869 /* CarPlayService.swift in Sources */, - F6E2FF3C1E097BA00083EBEC /* MWMSearchTableView.mm in Sources */, + F6E2FF3C1E097BA00083EBEC /* MWMSearchTableView.m in Sources */, F6E2FF661E097BA00083EBEC /* MWMTTSSettingsViewController.mm in Sources */, 3DD1A20F22D8DD1100B158F4 /* MWMPromoApi.mm in Sources */, - 3454D7C21E07F045004AF2AD /* NSString+Categories.mm in Sources */, + 3454D7C21E07F045004AF2AD /* NSString+Categories.m in Sources */, 6741A9FE1BF340DE002C974C /* SelectSetVC.mm in Sources */, 4767CDC120B477BA00BD8166 /* WelcomeViewController.swift in Sources */, 34E7761F1F14DB48003040B3 /* PlacePageArea.swift in Sources */, @@ -5443,17 +5414,17 @@ F6381BF61CD12045004CA943 /* LocaleTranslator.mm in Sources */, 3444DFCD1F1760B900E73099 /* WidgetsArea.swift in Sources */, F6E2FE9A1E097BA00083EBEC /* MWMiPadPlacePageLayoutImpl.mm in Sources */, - 34D3B03C1E389D05004100F9 /* MWMEditorSwitchTableViewCell.mm in Sources */, + 34D3B03C1E389D05004100F9 /* MWMEditorSwitchTableViewCell.m in Sources */, 344532381F6FFE6A0059FBCC /* UGCRating.swift in Sources */, 47A6F3C5235F47B90053FBA4 /* BookmarksSubscriptionButton.swift in Sources */, 34AB66411FC5AA330078E451 /* RouteManagerTransitioningManager.swift in Sources */, - 3454D7CE1E07F045004AF2AD /* UIFont+MapsMeFonts.mm in Sources */, + 3454D7CE1E07F045004AF2AD /* UIFont+MapsMeFonts.m in Sources */, F682249B1E5B104600BC1C18 /* PPHotelDescriptionCell.swift in Sources */, 3454D7DD1E07F045004AF2AD /* UISwitch+RuntimeAttributes.m in Sources */, CD4A1F1A230EADC100F2A6B6 /* CatalogConnectionErrorView.swift in Sources */, 4719A647219CBD7F009F9AA7 /* IBillingPendingTransaction.swift in Sources */, 340416581E7C0D4100E2B6D6 /* PhotosOverlayView.swift in Sources */, - F6E2FE821E097BA00083EBEC /* MWMPlacePageOpeningHoursDayView.mm in Sources */, + F6E2FE821E097BA00083EBEC /* MWMPlacePageOpeningHoursDayView.m in Sources */, 340FDC092031C39E00F140AD /* BMCPermissionsPendingCell.swift in Sources */, F6E2FD6B1E097BA00083EBEC /* MWMMapDownloaderSubplaceTableViewCell.mm in Sources */, CDCA27842245090900167D87 /* ListenerContainer.swift in Sources */, @@ -5468,7 +5439,7 @@ F6E2FE9D1E097BA00083EBEC /* MWMiPhonePlacePageLayoutImpl.mm in Sources */, CDCA27382237F1BD00167D87 /* BookmarkInfo.swift in Sources */, 34AB668C1FC5AA330078E451 /* NavigationStreetNameView.swift in Sources */, - 3454D7C81E07F045004AF2AD /* UIButton+RuntimeAttributes.mm in Sources */, + 3454D7C81E07F045004AF2AD /* UIButton+RuntimeAttributes.m in Sources */, 337F98A621D37B7400C8AC27 /* SearchTabViewController.swift in Sources */, 479D306122C6634900D18278 /* MWMMegafonBannerViewController.m in Sources */, 3488B0131E9D0AEC0068AFD8 /* AdBanner.swift in Sources */, @@ -5478,23 +5449,23 @@ 472E3F472146BCD30020E412 /* SubscriptionManager.swift in Sources */, F6E2FE131E097BA00083EBEC /* MWMOpeningHoursTimeSelectorTableViewCell.mm in Sources */, 344532311F6FE5880059FBCC /* UGCSummaryRatingStarsCell.swift in Sources */, - F626D52F1C3E83F800C17D15 /* MWMTableViewCell.mm in Sources */, + F626D52F1C3E83F800C17D15 /* MWMTableViewCell.m in Sources */, 34AB66591FC5AA330078E451 /* TransportTransitFlowLayout.swift in Sources */, 3486B5191E27AD3B0069C126 /* MWMFrameworkListener.mm in Sources */, 3404756B1E081A4600C92850 /* MWMSearch+CoreSpotlight.mm in Sources */, CD9AD96C2281B56900EC174A /* CPViewPortState.swift in Sources */, - F653CE121C6DEC8E00A453F1 /* MWMDropDown.mm in Sources */, + F653CE121C6DEC8E00A453F1 /* MWMDropDown.m in Sources */, 3404755C1E081A4600C92850 /* MWMLocationManager.mm in Sources */, 3454D7BC1E07F045004AF2AD /* CLLocation+Mercator.mm in Sources */, 47E3C7272111E5A8008B3B27 /* AlertPresentationController.swift in Sources */, - F6E2FF4E1E097BA00083EBEC /* MWMAboutController.mm in Sources */, + F6E2FF4E1E097BA00083EBEC /* MWMAboutController.m in Sources */, 47B06DF921B95F5E0094CCAD /* IGeoTracker.swift in Sources */, CDCA27812243F59800167D87 /* CarPlayRouter.swift in Sources */, 34F407381E9E1AFF00E57AC0 /* FacebookBanner.swift in Sources */, 34F5E0D41E3F254800B1C415 /* UIView+Hierarchy.swift in Sources */, 33BCDF8B218C976D00EF5B74 /* TagsCollectionViewLayout.swift in Sources */, 6741AA0B1BF340DE002C974C /* MWMMapViewControlsManager.mm in Sources */, - F6E2FED91E097BA00083EBEC /* MWMSearchContentView.mm in Sources */, + F6E2FED91E097BA00083EBEC /* MWMSearchContentView.m in Sources */, F6E2FD891E097BA00083EBEC /* MWMMapDownloaderViewController.mm in Sources */, F6BD1D211CA412920047B8E8 /* MWMOsmAuthAlert.mm in Sources */, 34AB66321FC5AA330078E451 /* RouteManagerHeaderView.swift in Sources */, @@ -5503,7 +5474,7 @@ F6E2FF4B1E097BA00083EBEC /* SettingsTableViewSwitchCell.swift in Sources */, F6E2FE791E097BA00083EBEC /* MWMOpeningHoursLayoutHelper.mm in Sources */, 472E3F4A2146C4CD0020E412 /* MWMPurchaseManager.mm in Sources */, - 34ABA6211C2D517500FE1BEC /* MWMInputValidator.mm in Sources */, + 34ABA6211C2D517500FE1BEC /* MWMInputValidator.m in Sources */, 47C7F97521930F5300C2760C /* IInAppBilling.swift in Sources */, 4719A64E21A30C3B009F9AA7 /* PaidRouteStatistics.swift in Sources */, 34BBD6601F8270360070CA50 /* AuthorizationiPadPresentationController.swift in Sources */, @@ -5527,7 +5498,7 @@ 4767CDA820AB401000BD8166 /* LinkTextView.swift in Sources */, 47289E5A2212DFFF002ABFC0 /* EditOnWebAlertViewController.swift in Sources */, 34763EE71F2F392300F4D2D3 /* MWMTextToSpeech.mm in Sources */, - 34ABA6251C2D551900FE1BEC /* MWMInputValidatorFactory.mm in Sources */, + 34ABA6251C2D551900FE1BEC /* MWMInputValidatorFactory.m in Sources */, F6E2FD861E097BA00083EBEC /* MWMBaseMapDownloaderViewController.mm in Sources */, 348F8A4F1F863A8500060C2A /* UGCYourReview.swift in Sources */, F6E2FEE21E097BA00083EBEC /* MWMSearchManager.mm in Sources */, @@ -5535,7 +5506,6 @@ 34943BBB1E2626B200B14F84 /* WelcomePageController.swift in Sources */, 34D3AFE21E376F7E004100F9 /* UITableView+Updates.swift in Sources */, 3404164C1E7BF42E00E2B6D6 /* UIView+Coordinates.swift in Sources */, - 6741AA141BF340DE002C974C /* MWMMultilineLabel.mm in Sources */, 349D1ADB1E2E325C004A2006 /* MWMBottomMenuView.m in Sources */, 344BEAF61F66BDC30045DC45 /* RatingSummaryViewSettings.swift in Sources */, F6E2FD921E097BA00083EBEC /* MWMBookmarkColorViewController.mm in Sources */, @@ -5548,15 +5518,15 @@ 33F8BA4E2199AB9500ECA8EE /* TagsDataSource.swift in Sources */, 47F67D1521CAB21B0069754E /* MWMImageCoder.m in Sources */, 34AB66861FC5AA330078E451 /* MWMNavigationInfoView.mm in Sources */, - 34C9BD051C6DB693000DC38D /* MWMViewController.mm in Sources */, + 34C9BD051C6DB693000DC38D /* MWMViewController.m in Sources */, 47699A0A21F0C4C8009E6585 /* NotificationManager.swift in Sources */, 331630D12191D74B00BB91A9 /* TagSectionHeaderView.swift in Sources */, 47868A7D22145A95000AFC86 /* GuideDescriptionViewController.swift in Sources */, F6E2FDA41E097BA00083EBEC /* MWMCuisineEditorViewController.mm in Sources */, - 3454D7CB1E07F045004AF2AD /* UIColor+MapsMeColor.mm in Sources */, + 3454D7CB1E07F045004AF2AD /* UIColor+MapsMeColor.m in Sources */, 34B127EA1FBDD410008713D9 /* MWMRouterTransitStepInfo.mm in Sources */, 34926BE71EA4C2A700DCF14C /* SearchBanners.swift in Sources */, - 34D3B02A1E389D05004100F9 /* MWMEditorAdditionalNameTableViewCell.mm in Sources */, + 34D3B02A1E389D05004100F9 /* MWMEditorAdditionalNameTableViewCell.m in Sources */, 33C558E3217F6CF100299E70 /* UploadActionCell.swift in Sources */, 4726254921C27D4B00C7BAAD /* PlacePageDescriptionViewController.swift in Sources */, 347E039A1FAC5F1D00426032 /* UIWindow+InputLanguage.swift in Sources */, @@ -5566,13 +5536,13 @@ 34E50DE01F6FCBA1008EED49 /* UGCAddReviewCell.swift in Sources */, 34D4FA631E26572D003F53EF /* FirstLaunchController.swift in Sources */, 3404756E1E081A4600C92850 /* MWMSearch.mm in Sources */, - 6741AA191BF340DE002C974C /* MWMDownloaderDialogCell.mm in Sources */, + 6741AA191BF340DE002C974C /* MWMDownloaderDialogCell.m in Sources */, 3DE1762422D614B8000214FF /* PromoAfterBookingViewController.swift in Sources */, 34AB66441FC5AA330078E451 /* RouteManagerViewModelProtocol.swift in Sources */, 3486B5081E27A4B50069C126 /* LocalNotificationManager.mm in Sources */, 3454D7BF1E07F045004AF2AD /* DateComponentsFormatter+ETA.swift in Sources */, - 6741AA1C1BF340DE002C974C /* MWMRoutingDisclaimerAlert.mm in Sources */, - 34D3B0481E389D05004100F9 /* MWMNoteCell.mm in Sources */, + 6741AA1C1BF340DE002C974C /* MWMRoutingDisclaimerAlert.m in Sources */, + 34D3B0481E389D05004100F9 /* MWMNoteCell.m in Sources */, CD9AD967228067F500EC174A /* MapInfo.swift in Sources */, 47F6E51221F61908004580CA /* CoreNotificationWrapper.mm in Sources */, F6E2FE971E097BA00083EBEC /* ContextViews.mm in Sources */, @@ -5582,7 +5552,7 @@ 340475091E08199E00C92850 /* MWMMyTarget.mm in Sources */, 340416501E7C086000E2B6D6 /* PhotoViewController.swift in Sources */, 47800D1D20BEEE2E00072F42 /* TermsOfUseController.swift in Sources */, - 331922AF21BAD29900D4AAC5 /* MWMPlaceDescriptionCell.mm in Sources */, + 331922AF21BAD29900D4AAC5 /* MWMPlaceDescriptionCell.m in Sources */, 674A7E301C0DB10B003D48E1 /* MWMMapWidgets.mm in Sources */, 34AB66291FC5AA330078E451 /* RouteManagerViewController.swift in Sources */, 33B19C65218B46C100B323A7 /* SharingTagsViewController.swift in Sources */, @@ -5596,16 +5566,16 @@ 99E2B0122368A8C700FFABC5 /* MWMCategory+PlacesCountTitle.swift in Sources */, F6D67CDC2062B9C00032FD38 /* BCCreateCategoryAlert.swift in Sources */, F6E2FF601E097BA00083EBEC /* MWMSettingsViewController.mm in Sources */, - F6E2FE2B1E097BA00083EBEC /* MWMStreetEditorEditTableViewCell.mm in Sources */, + F6E2FE2B1E097BA00083EBEC /* MWMStreetEditorEditTableViewCell.m in Sources */, 34AB66891FC5AA330078E451 /* NavigationControlView.swift in Sources */, 479EE94A2292FB03009DEBA6 /* ActivityIndicator.swift in Sources */, 34AB661D1FC5AA330078E451 /* MWMTaxiPreviewDataSource.mm in Sources */, F69CE8D61E5C49B4002B5881 /* PPHotelCarouselCell.swift in Sources */, 47B9065321C7FA400079C85E /* MWMImageCache.m in Sources */, 472C40E8232BA810009AA777 /* CatalogPromoItem.m in Sources */, - F6FEA82E1C58F108007223CC /* MWMButton.mm in Sources */, + F6FEA82E1C58F108007223CC /* MWMButton.m in Sources */, 3445324E1F714FD70059FBCC /* UGCAddReviewController.swift in Sources */, - 34B924431DC8A29C0008D971 /* MWMMailViewController.mm in Sources */, + 34B924431DC8A29C0008D971 /* MWMMailViewController.m in Sources */, 340475651E081A4600C92850 /* MWMRouter.mm in Sources */, 47E3C72F2111F472008B3B27 /* CoverVerticalModalTransitioning.swift in Sources */, 471C448C2322A7C800C307EC /* SubscriptionGoToCatalogViewController.swift in Sources */, @@ -5613,9 +5583,9 @@ 34E776101F14B165003040B3 /* VisibleArea.swift in Sources */, 330473EA21F7440C00DC4AEA /* MWMHotelParams.mm in Sources */, 47C8789922DF622400A772DA /* SubscriptionFailViewController.swift in Sources */, - 3454D7D71E07F045004AF2AD /* UIKitCategories.mm in Sources */, + 3454D7D71E07F045004AF2AD /* UIKitCategories.m in Sources */, 47E6CB0B2178BA3600EA102B /* SearchBannerCell.swift in Sources */, - 34AB39C21D2BD8310021857D /* MWMStopButton.mm in Sources */, + 34AB39C21D2BD8310021857D /* MWMStopButton.m in Sources */, 995739082355CB660019AEE7 /* AllPassSubscriptionViewController.swift in Sources */, 3488B01A1E9D0B230068AFD8 /* UIColor+Modifications.swift in Sources */, 34E50DD81F6FCAB1008EED49 /* UGCSummaryRatingCell.swift in Sources */, @@ -5627,7 +5597,7 @@ 340416441E7BED3900E2B6D6 /* PhotosTransitionAnimator.swift in Sources */, 34AB66261FC5AA330078E451 /* RouteManagerDimView.swift in Sources */, 6741AA291BF340DE002C974C /* ColorPickerView.mm in Sources */, - 6741AA2B1BF340DE002C974C /* CircleView.mm in Sources */, + 6741AA2B1BF340DE002C974C /* CircleView.m in Sources */, F6E2FEEB1E097BA00083EBEC /* MWMSearchTextField.mm in Sources */, CD08887422B7ABB400C1368D /* MWMDiscoveryCollectionView.mm in Sources */, 4788739220EE326500F6826B /* VerticallyAlignedButton.swift in Sources */, @@ -5641,9 +5611,9 @@ 47B06DED21B696C20094CCAD /* GeoTracker.swift in Sources */, 349FC54B1F680DAE00968C9F /* ExpandableReviewSettings.swift in Sources */, F6E2FE0A1E097BA00083EBEC /* MWMOpeningHoursDeleteScheduleTableViewCell.mm in Sources */, - 3454D7DA1E07F045004AF2AD /* UILabel+RuntimeAttributes.mm in Sources */, + 3454D7DA1E07F045004AF2AD /* UILabel+RuntimeAttributes.m in Sources */, 34AB66531FC5AA330078E451 /* MWMiPadRoutePreview.m in Sources */, - 3454D7E31E07F045004AF2AD /* UITextView+RuntimeAttributes.mm in Sources */, + 3454D7E31E07F045004AF2AD /* UITextView+RuntimeAttributes.m in Sources */, F6A2184A1CA3F26800BE2CC6 /* MWMEditorViralActivityItem.mm in Sources */, F6E2FED61E097BA00083EBEC /* MWMSearchChangeModeView.mm in Sources */, 33603C85219F0F6300B11FFE /* SharingPropertiesViewController.swift in Sources */, diff --git a/iphone/Maps/UI/BottomMenu/MWMBottomMenuViewController.mm b/iphone/Maps/UI/BottomMenu/MWMBottomMenuViewController.mm index 047cbdd682..8a8ccff13b 100644 --- a/iphone/Maps/UI/BottomMenu/MWMBottomMenuViewController.mm +++ b/iphone/Maps/UI/BottomMenu/MWMBottomMenuViewController.mm @@ -14,9 +14,6 @@ #include -extern NSString * const kAlohalyticsTapEventKey; -extern NSString * const kSearchStateKey; - namespace { CGFloat constexpr kLayoutThreshold = 420.0; diff --git a/iphone/Maps/UI/Downloader/Cells/MWMMapDownloaderTableViewCell.mm b/iphone/Maps/UI/Downloader/Cells/MWMMapDownloaderTableViewCell.mm index c3d5b353ac..6fd1db651a 100644 --- a/iphone/Maps/UI/Downloader/Cells/MWMMapDownloaderTableViewCell.mm +++ b/iphone/Maps/UI/Downloader/Cells/MWMMapDownloaderTableViewCell.mm @@ -45,8 +45,8 @@ [attrTitle addAttributes:unselectedAttrs range:{0, str.length}]; if (!self.searchQuery) return [attrTitle copy]; - for (auto const & range : [str rangesOfString:self.searchQuery]) - [attrTitle addAttributes:selectedAttrs range:range]; + for (NSValue *range : [str rangesOfString:self.searchQuery]) + [attrTitle addAttributes:selectedAttrs range:range.rangeValue]; return [attrTitle copy]; } diff --git a/iphone/Maps/UI/Downloader/NoMaps/MWMNoMapsView.mm b/iphone/Maps/UI/Downloader/NoMaps/MWMNoMapsView.m similarity index 88% rename from iphone/Maps/UI/Downloader/NoMaps/MWMNoMapsView.mm rename to iphone/Maps/UI/Downloader/NoMaps/MWMNoMapsView.m index bef2ce3cd1..ce9aced7ec 100644 --- a/iphone/Maps/UI/Downloader/NoMaps/MWMNoMapsView.mm +++ b/iphone/Maps/UI/Downloader/NoMaps/MWMNoMapsView.m @@ -44,11 +44,11 @@ - (void)configForSize:(CGSize)size { - CGSize const iPadSize = {520, 600}; - CGSize const newSize = IPAD ? iPadSize : size; - CGFloat const width = newSize.width; - CGFloat const height = newSize.height; - BOOL const hideImage = (self.imageHeight.multiplier * height <= self.imageMinHeight.constant); + CGSize iPadSize = CGSizeMake(520, 600); + CGSize newSize = IPAD ? iPadSize : size; + CGFloat width = newSize.width; + CGFloat height = newSize.height; + BOOL hideImage = (self.imageHeight.multiplier * height <= self.imageMinHeight.constant); if (hideImage) { self.titleImageOffset.priority = UILayoutPriorityDefaultLow; diff --git a/iphone/Maps/UI/Editor/Cells/MWMButtonCell.mm b/iphone/Maps/UI/Editor/Cells/MWMButtonCell.m similarity index 100% rename from iphone/Maps/UI/Editor/Cells/MWMButtonCell.mm rename to iphone/Maps/UI/Editor/Cells/MWMButtonCell.m diff --git a/iphone/Maps/UI/Editor/Cells/MWMEditorAddAdditionalNameTableViewCell.mm b/iphone/Maps/UI/Editor/Cells/MWMEditorAddAdditionalNameTableViewCell.m similarity index 100% rename from iphone/Maps/UI/Editor/Cells/MWMEditorAddAdditionalNameTableViewCell.mm rename to iphone/Maps/UI/Editor/Cells/MWMEditorAddAdditionalNameTableViewCell.m diff --git a/iphone/Maps/UI/Editor/Cells/MWMEditorAdditionalNameTableViewCell.h b/iphone/Maps/UI/Editor/Cells/MWMEditorAdditionalNameTableViewCell.h index a7e01dbc0d..dddd6bde0a 100644 --- a/iphone/Maps/UI/Editor/Cells/MWMEditorAdditionalNameTableViewCell.h +++ b/iphone/Maps/UI/Editor/Cells/MWMEditorAdditionalNameTableViewCell.h @@ -1,8 +1,6 @@ #import "MWMEditorCommon.h" #import "MWMTableViewCell.h" -#include "indexer/editable_map_object.hpp" - @interface MWMEditorAdditionalNameTableViewCell : MWMTableViewCell @property(nonatomic, readonly) NSInteger code; diff --git a/iphone/Maps/UI/Editor/Cells/MWMEditorAdditionalNameTableViewCell.mm b/iphone/Maps/UI/Editor/Cells/MWMEditorAdditionalNameTableViewCell.m similarity index 97% rename from iphone/Maps/UI/Editor/Cells/MWMEditorAdditionalNameTableViewCell.mm rename to iphone/Maps/UI/Editor/Cells/MWMEditorAdditionalNameTableViewCell.m index fbf0516df7..1765095021 100644 --- a/iphone/Maps/UI/Editor/Cells/MWMEditorAdditionalNameTableViewCell.mm +++ b/iphone/Maps/UI/Editor/Cells/MWMEditorAdditionalNameTableViewCell.m @@ -1,9 +1,6 @@ #import "MWMEditorAdditionalNameTableViewCell.h" -namespace -{ -CGFloat const kErrorLabelHeight = 16; -} // namespace +static CGFloat const kErrorLabelHeight = 16; @interface MWMEditorAdditionalNameTableViewCell () diff --git a/iphone/Maps/UI/Editor/Cells/MWMEditorCategoryCell.mm b/iphone/Maps/UI/Editor/Cells/MWMEditorCategoryCell.m similarity index 97% rename from iphone/Maps/UI/Editor/Cells/MWMEditorCategoryCell.mm rename to iphone/Maps/UI/Editor/Cells/MWMEditorCategoryCell.m index 14185d17d9..c35b34c432 100644 --- a/iphone/Maps/UI/Editor/Cells/MWMEditorCategoryCell.mm +++ b/iphone/Maps/UI/Editor/Cells/MWMEditorCategoryCell.m @@ -1,10 +1,7 @@ #import "MWMEditorCategoryCell.h" #import "MWMEditorCommon.h" -namespace -{ CGFloat const kDetailShortRightSpace = 16; -} // namespace @interface MWMEditorCategoryCell () diff --git a/iphone/Maps/UI/Editor/Cells/MWMEditorSelectTableViewCell.mm b/iphone/Maps/UI/Editor/Cells/MWMEditorSelectTableViewCell.m similarity index 100% rename from iphone/Maps/UI/Editor/Cells/MWMEditorSelectTableViewCell.mm rename to iphone/Maps/UI/Editor/Cells/MWMEditorSelectTableViewCell.m diff --git a/iphone/Maps/UI/Editor/Cells/MWMEditorSwitchTableViewCell.mm b/iphone/Maps/UI/Editor/Cells/MWMEditorSwitchTableViewCell.m similarity index 100% rename from iphone/Maps/UI/Editor/Cells/MWMEditorSwitchTableViewCell.mm rename to iphone/Maps/UI/Editor/Cells/MWMEditorSwitchTableViewCell.m diff --git a/iphone/Maps/UI/Editor/Cells/MWMEditorTextTableViewCell.mm b/iphone/Maps/UI/Editor/Cells/MWMEditorTextTableViewCell.m similarity index 97% rename from iphone/Maps/UI/Editor/Cells/MWMEditorTextTableViewCell.mm rename to iphone/Maps/UI/Editor/Cells/MWMEditorTextTableViewCell.m index 5324a91556..f9563ece97 100644 --- a/iphone/Maps/UI/Editor/Cells/MWMEditorTextTableViewCell.mm +++ b/iphone/Maps/UI/Editor/Cells/MWMEditorTextTableViewCell.m @@ -2,10 +2,7 @@ #import "MWMEditorCommon.h" #import "UIImageView+Coloring.h" -namespace -{ -CGFloat const kErrorLabelDefaultTopSpace = 4.; -} // namespace +static CGFloat const kErrorLabelDefaultTopSpace = 4.; @interface MWMEditorTextTableViewCell () diff --git a/iphone/Maps/UI/Editor/Cells/MWMNoteCell.mm b/iphone/Maps/UI/Editor/Cells/MWMNoteCell.m similarity index 89% rename from iphone/Maps/UI/Editor/Cells/MWMNoteCell.mm rename to iphone/Maps/UI/Editor/Cells/MWMNoteCell.m index ada881b49f..45c3504f2f 100644 --- a/iphone/Maps/UI/Editor/Cells/MWMNoteCell.mm +++ b/iphone/Maps/UI/Editor/Cells/MWMNoteCell.m @@ -1,13 +1,9 @@ #import "MWMNoteCell.h" #import "MWMTextView.h" -namespace -{ -CGFloat const kTopTextViewOffset = 12.; -NSString * const kTextViewContentSizeKeyPath = @"contentSize"; -CGFloat const kMinimalTextViewHeight = 104.; - -} // namespace +static CGFloat const kTopTextViewOffset = 12.; +static NSString * const kTextViewContentSizeKeyPath = @"contentSize"; +static CGFloat const kMinimalTextViewHeight = 104.; @interface MWMNoteCell () @@ -42,7 +38,7 @@ static void * kContext = &kContext; } else { - CGFloat const currentHeight = self.textViewHeight.constant; + CGFloat currentHeight = self.textViewHeight.constant; if (currentHeight > kMinimalTextViewHeight) { self.textViewHeight.constant = kMinimalTextViewHeight; @@ -61,7 +57,7 @@ static void * kContext = &kContext; if (context == kContext) { NSValue * s = change[@"new"]; - CGFloat const height = s.CGSizeValue.height; + CGFloat height = s.CGSizeValue.height; [self updateTextViewForHeight:height]; return; } diff --git a/iphone/Maps/UI/Editor/MWMEditorAdditionalNamesHeader.mm b/iphone/Maps/UI/Editor/MWMEditorAdditionalNamesHeader.m similarity index 100% rename from iphone/Maps/UI/Editor/MWMEditorAdditionalNamesHeader.mm rename to iphone/Maps/UI/Editor/MWMEditorAdditionalNamesHeader.m diff --git a/iphone/Maps/UI/Editor/MWMEditorNotesFooter.mm b/iphone/Maps/UI/Editor/MWMEditorNotesFooter.m similarity index 100% rename from iphone/Maps/UI/Editor/MWMEditorNotesFooter.mm rename to iphone/Maps/UI/Editor/MWMEditorNotesFooter.m diff --git a/iphone/Maps/UI/Editor/Street/MWMStreetEditorEditTableViewCell.mm b/iphone/Maps/UI/Editor/Street/MWMStreetEditorEditTableViewCell.m similarity index 100% rename from iphone/Maps/UI/Editor/Street/MWMStreetEditorEditTableViewCell.mm rename to iphone/Maps/UI/Editor/Street/MWMStreetEditorEditTableViewCell.m diff --git a/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/DescriptionCell/MWMPlaceDescriptionCell.mm b/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/DescriptionCell/MWMPlaceDescriptionCell.m similarity index 100% rename from iphone/Maps/UI/PlacePage/PlacePageLayout/Content/DescriptionCell/MWMPlaceDescriptionCell.mm rename to iphone/Maps/UI/PlacePage/PlacePageLayout/Content/DescriptionCell/MWMPlaceDescriptionCell.m diff --git a/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/OpeningHoursCell/MWMPlacePageOpeningHoursDayView.mm b/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/OpeningHoursCell/MWMPlacePageOpeningHoursDayView.m similarity index 85% rename from iphone/Maps/UI/PlacePage/PlacePageLayout/Content/OpeningHoursCell/MWMPlacePageOpeningHoursDayView.mm rename to iphone/Maps/UI/PlacePage/PlacePageLayout/Content/OpeningHoursCell/MWMPlacePageOpeningHoursDayView.m index 0aeec73248..9bdb7f2636 100644 --- a/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/OpeningHoursCell/MWMPlacePageOpeningHoursDayView.mm +++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/OpeningHoursCell/MWMPlacePageOpeningHoursDayView.m @@ -43,18 +43,18 @@ - (void)setBreaks:(NSArray *)breaks { - NSUInteger const breaksCount = breaks.count; - BOOL const haveBreaks = breaksCount != 0; + NSUInteger breaksCount = breaks.count; + BOOL haveBreaks = breaksCount != 0; [self.breaksHolder.subviews makeObjectsPerformSelector:@selector(removeFromSuperview)]; if (haveBreaks) { - CGFloat const breakSpacerHeight = 4.0; + CGFloat breakSpacerHeight = 4.0; self.breakLabel.hidden = NO; self.breaksHolder.hidden = NO; CGFloat labelY = 0.0; for (NSString * br in breaks) { - UILabel * label = [[UILabel alloc] initWithFrame:{{0, labelY},{}}]; + UILabel * label = [[UILabel alloc] initWithFrame:CGRectMake(0, labelY, 0, 0)]; label.text = br; label.font = self.currentDay ? [UIFont regular14] : [UIFont light12]; label.textColor = [UIColor blackSecondaryText]; @@ -89,29 +89,29 @@ if (self.isCompatibility) { [self.compatibilityLabel sizeToIntegralFit]; - CGFloat const compatibilityLabelVerticalOffsets = 24.0; + CGFloat compatibilityLabelVerticalOffsets = 24.0; viewHeight = self.compatibilityLabel.height + compatibilityLabelVerticalOffsets; } else { UILabel * label = self.label; UILabel * openTime = self.openTime; - CGFloat const labelOpenTimeLabelSpacing = self.labelOpenTimeLabelSpacing.constant; + CGFloat labelOpenTimeLabelSpacing = self.labelOpenTimeLabelSpacing.constant; [label sizeToIntegralFit]; self.labelWidth.constant = MIN(label.width, openTime.minX - label.minX - labelOpenTimeLabelSpacing); [self.breakLabel sizeToIntegralFit]; self.breakLabelWidth.constant = self.breakLabel.width; - CGFloat const verticalSuperviewSpacing = self.labelTopSpacing.constant; - CGFloat const minHeight = label.height + 2 * verticalSuperviewSpacing; - CGFloat const breaksHolderHeight = self.breaksHolderHeight.constant; - CGFloat const additionalHeight = (breaksHolderHeight > 0 ? 4.0 : 0.0); + CGFloat verticalSuperviewSpacing = self.labelTopSpacing.constant; + CGFloat minHeight = label.height + 2 * verticalSuperviewSpacing; + CGFloat breaksHolderHeight = self.breaksHolderHeight.constant; + CGFloat additionalHeight = (breaksHolderHeight > 0 ? 4.0 : 0.0); viewHeight = minHeight + breaksHolderHeight + additionalHeight; if (self.closedLabel && !self.closedLabel.hidden) { - CGFloat const heightForClosedLabel = 20.0; + CGFloat heightForClosedLabel = 20.0; viewHeight += heightForClosedLabel; } } diff --git a/iphone/Maps/UI/Search/MWMSearchChangeModeView.mm b/iphone/Maps/UI/Search/MWMSearchChangeModeView.mm index c63e7596b8..606282b61c 100644 --- a/iphone/Maps/UI/Search/MWMSearchChangeModeView.mm +++ b/iphone/Maps/UI/Search/MWMSearchChangeModeView.mm @@ -2,8 +2,6 @@ #import "MWMButton.h" #import "UIButton+RuntimeAttributes.h" -extern NSString * const kSearchStateKey; - @interface MWMSearchChangeModeView () @property(weak, nonatomic) IBOutlet UIButton * changeModeButton; diff --git a/iphone/Maps/UI/Search/MWMSearchContentView.mm b/iphone/Maps/UI/Search/MWMSearchContentView.m similarity index 100% rename from iphone/Maps/UI/Search/MWMSearchContentView.mm rename to iphone/Maps/UI/Search/MWMSearchContentView.m diff --git a/iphone/Maps/UI/Search/MWMSearchManager+Layout.mm b/iphone/Maps/UI/Search/MWMSearchManager+Layout.m similarity index 97% rename from iphone/Maps/UI/Search/MWMSearchManager+Layout.mm rename to iphone/Maps/UI/Search/MWMSearchManager+Layout.m index 9821e8a0db..868d69d096 100644 --- a/iphone/Maps/UI/Search/MWMSearchManager+Layout.mm +++ b/iphone/Maps/UI/Search/MWMSearchManager+Layout.m @@ -2,10 +2,7 @@ #import -namespace -{ -CGFloat const kWidthForiPad = 320.0; -} // namespace +static CGFloat const kWidthForiPad = 320.0; @interface MWMSearchManager () diff --git a/iphone/Maps/UI/Search/MWMSearchManager.mm b/iphone/Maps/UI/Search/MWMSearchManager.mm index be7181648e..36e535da5f 100644 --- a/iphone/Maps/UI/Search/MWMSearchManager.mm +++ b/iphone/Maps/UI/Search/MWMSearchManager.mm @@ -11,9 +11,6 @@ #import "Statistics.h" #import "SwiftBridge.h" -extern NSString * const kAlohalyticsTapEventKey; -extern NSString * const kSearchStateKey = @"SearchStateKey"; - namespace { typedef NS_ENUM(NSUInteger, MWMSearchManagerActionBarState) { diff --git a/iphone/Maps/UI/Search/MWMSearchNoResults.mm b/iphone/Maps/UI/Search/MWMSearchNoResults.m similarity index 69% rename from iphone/Maps/UI/Search/MWMSearchNoResults.mm rename to iphone/Maps/UI/Search/MWMSearchNoResults.m index 78301633a6..2e23cb930f 100644 --- a/iphone/Maps/UI/Search/MWMSearchNoResults.mm +++ b/iphone/Maps/UI/Search/MWMSearchNoResults.m @@ -1,10 +1,7 @@ #import "MWMSearchNoResults.h" -namespace -{ -CGFloat constexpr kCompactHeight = 216; -CGFloat constexpr kExtraCompactHeight = 52; -} // namespace +static CGFloat const kCompactHeight = 216; +static CGFloat const kExtraCompactHeight = 52; @interface MWMSearchNoResults () @@ -18,17 +15,13 @@ CGFloat constexpr kExtraCompactHeight = 52; @implementation MWMSearchNoResults -+ (instancetype)viewWithImage:(UIImage *)image title:(NSString *)title text:(NSString *)text -{ ++ (instancetype)viewWithImage:(UIImage *)image title:(NSString *)title text:(NSString *)text { MWMSearchNoResults * view = [NSBundle.mainBundle loadNibNamed:[self className] owner:nil options:nil].firstObject; view.image.image = image; - if (title) - { + if (title) { view.title.text = title; - } - else - { + } else { [view.title removeFromSuperview]; view.textOffsetToImage.priority = UILayoutPriorityDefaultHigh; } @@ -36,15 +29,13 @@ CGFloat constexpr kExtraCompactHeight = 52; return view; } -- (void)layoutSubviews -{ +- (void)layoutSubviews { [super layoutSubviews]; self.frame = self.superview.bounds; - BOOL const compact = self.height < kCompactHeight; + BOOL compact = self.height < kCompactHeight; self.image.hidden = compact; - self.textCenterY.priority = - compact ? UILayoutPriorityDefaultHigh : UILayoutPriorityFittingSizeLevel; - BOOL const extraCompact = self.height < kExtraCompactHeight; + self.textCenterY.priority = compact ? UILayoutPriorityDefaultHigh : UILayoutPriorityFittingSizeLevel; + BOOL extraCompact = self.height < kExtraCompactHeight; self.title.hidden = extraCompact; } diff --git a/iphone/Maps/UI/Search/TableView/MWMSearchCommonCell.xib b/iphone/Maps/UI/Search/TableView/MWMSearchCommonCell.xib index dd298c379b..aa8ffc39d9 100644 --- a/iphone/Maps/UI/Search/TableView/MWMSearchCommonCell.xib +++ b/iphone/Maps/UI/Search/TableView/MWMSearchCommonCell.xib @@ -1,11 +1,9 @@ - - - - + + - + @@ -15,10 +13,10 @@ - + - -