diff options
| author | Sergey Yershov <syershov@maps.me> | 2016-12-16 10:10:39 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-16 10:10:39 +0300 |
| commit | 04d05b53d200e35c125d0b80fbaa716a063cbea0 (patch) | |
| tree | f43f1d5efdc4fc6e4fe73d1a1f7748afcefd89a6 | |
| parent | ec9c0cd876b66d37b31116f3483ed7fc5241f62c (diff) | |
| parent | 959974e43c1060d0717988bc67672af0247666bd (diff) | |
Merge pull request #5010 from igrechuhin/swift
[ios] Added Swift support.
35 files changed, 535 insertions, 773 deletions
diff --git a/iphone/Maps/Bridging-Header.h b/iphone/Maps/Bridging-Header.h new file mode 100644 index 0000000000..1fb8b2c9f8 --- /dev/null +++ b/iphone/Maps/Bridging-Header.h @@ -0,0 +1,9 @@ +// +// Use this file to import your target's public headers that you would like to expose to Swift. +// + +#import <UIKit/UIKit.h> + +#import "MWMTableViewCell.h" +#import "UIColor+MapsMeColor.h" +#import "UIFont+MapsMeFonts.h" diff --git a/iphone/Maps/Classes/MWMTableViewCell+CellId.swift b/iphone/Maps/Classes/MWMTableViewCell+CellId.swift new file mode 100644 index 0000000000..2f07f390cd --- /dev/null +++ b/iphone/Maps/Classes/MWMTableViewCell+CellId.swift @@ -0,0 +1,3 @@ +extension MWMTableViewCell { + static func cellId() -> String { return String(describing: self) } +} diff --git a/iphone/Maps/CommunityVC.h b/iphone/Maps/CommunityVC.h deleted file mode 100644 index d52a00e57d..0000000000 --- a/iphone/Maps/CommunityVC.h +++ /dev/null @@ -1,5 +0,0 @@ -#import "MWMTableViewController.h" - -@interface CommunityVC : MWMTableViewController - -@end diff --git a/iphone/Maps/CommunityVC.mm b/iphone/Maps/CommunityVC.mm deleted file mode 100644 index bf82186103..0000000000 --- a/iphone/Maps/CommunityVC.mm +++ /dev/null @@ -1,127 +0,0 @@ -#import "CommunityVC.h" -#import "MWMMailViewController.h" -#import "Statistics.h" -#import "UIImageView+Coloring.h" -#import "UIViewController+Navigation.h" - -#import "../../3party/Alohalytics/src/alohalytics_objc.h" - -extern NSString * const kAlohalyticsTapEventKey; - -@interface CommunityVC () <MFMailComposeViewControllerDelegate> - -@property (nonatomic) NSArray * items; - -@end - -@implementation CommunityVC - -- (void)viewDidLoad -{ - [super viewDidLoad]; - self.title = L(@"maps_me_community"); - - self.items = @[@{@"Title" : @"", - @"Items" : @[@{@"Id" : @"Facebook", @"Title" : L(@"like_on_facebook"), @"Icon" : @"IconFacebook"}, - @{@"Id" : @"Twitter", @"Title" : L(@"follow_on_twitter"), @"Icon" : @"IconTwitter"}, - @{@"Id" : @"Subscribe", @"Title" : L(@"subscribe_to_news"), @"Icon" : @"IconSubscribe"}]}, - @{@"Title" : @"", - @"Items" : @[@{@"Id" : @"Contact", @"Title" : L(@"contact_us"), @"Icon" : @"IconReportABug"}]}]; -} - -- (CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section -{ - return 0.001; -} - -- (CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section -{ - return 20; -} - -- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView -{ - return [self.items count]; -} - -- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section -{ - return [self.items[section][@"Items"] count]; -} - -- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath -{ - NSDictionary * item = self.items[indexPath.section][@"Items"][indexPath.row]; - - UITableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:[UITableViewCell className]]; - if (!cell) // iOS 5 - cell = [[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:[UITableViewCell className]]; - - cell.textLabel.text = item[@"Title"]; - cell.imageView.image = [UIImage imageNamed:item[@"Icon"]]; - cell.imageView.mwm_coloring = MWMImageColoringBlack; - return cell; -} - -- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath -{ - NSString * itemId = self.items[indexPath.section][@"Items"][indexPath.row][@"Id"]; - [Statistics logEvent:kStatEventName(kStatSocial, kStatToggleCompassCalibration) - withParameters:@{kStatValue : itemId}]; - if ([itemId isEqualToString:@"Facebook"]) - { - [Alohalytics logEvent:kAlohalyticsTapEventKey withValue:@"likeOnFb"]; - [self openUrl:[NSURL URLWithString:@"https://facebook.com/MapsWithMe"]]; - } - else if ([itemId isEqualToString:@"Twitter"]) - { - [Alohalytics logEvent:kAlohalyticsTapEventKey withValue:@"followOnTwitter"]; - [self openUrl:[NSURL URLWithString:@"https://twitter.com/MAPS_ME"]]; - } - else if ([itemId isEqualToString:@"Contact"]) - { - [Alohalytics logEvent:kAlohalyticsTapEventKey withValue:@"contactUs"]; - [self contact]; - } - else if ([itemId isEqualToString:@"Subscribe"]) - { - [Alohalytics logEvent:kAlohalyticsTapEventKey withValue:@"subscribeToNews"]; - [self subscribe]; - } - [tableView deselectRowAtIndexPath:indexPath animated:YES]; -} - -- (void)contact -{ - [self sendEmailWithText:nil subject:@"MAPS.ME" toRecipient:@"ios@maps.me"]; -} - -- (void)subscribe -{ - [self sendEmailWithText:L(@"subscribe_me_body") subject:L(@"subscribe_me_subject") toRecipient:@"subscribe@maps.me"]; -} - -- (void)sendEmailWithText:(NSString *)text subject:(NSString *)subject toRecipient:(NSString *)email -{ - if ([MWMMailViewController canSendMail]) - { - MWMMailViewController * vc = [[MWMMailViewController alloc] init]; - vc.mailComposeDelegate = self; - [vc setSubject:subject]; - [vc setMessageBody:text isHTML:NO]; - [vc setToRecipients:@[email]]; - [self presentViewController:vc animated:YES completion:nil]; - } - else - { - NSString * text = [NSString stringWithFormat:L(@"email_error_body"), email]; - [[[UIAlertView alloc] initWithTitle:L(@"email_error_title") message:text delegate:nil cancelButtonTitle:L(@"ok") otherButtonTitles:nil] show]; - } -} - -- (void)mailComposeController:(MFMailComposeViewController *)controller didFinishWithResult:(MFMailComposeResult)result error:(NSError *)error -{ - [self dismissViewControllerAnimated:YES completion:nil]; -} - -@end diff --git a/iphone/Maps/Maps.xcodeproj/project.pbxproj b/iphone/Maps/Maps.xcodeproj/project.pbxproj index 78ec3c7614..94ab1de4aa 100644 --- a/iphone/Maps/Maps.xcodeproj/project.pbxproj +++ b/iphone/Maps/Maps.xcodeproj/project.pbxproj @@ -16,6 +16,9 @@ 34002A6E1D2F9D0700AC201E /* MWMRouter.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34002A6C1D2F9D0700AC201E /* MWMRouter.mm */; }; 3400A6811CA29D7D003DA0EC /* NSString+Categories.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3400A6801CA29D7D003DA0EC /* NSString+Categories.mm */; }; 3400A6821CA29D7D003DA0EC /* NSString+Categories.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3400A6801CA29D7D003DA0EC /* NSString+Categories.mm */; }; + 3400AB381E02E8CE004036E2 /* MWMTableViewCell+CellId.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3400AB371E02E8CE004036E2 /* MWMTableViewCell+CellId.swift */; }; + 3400AB391E02E8CE004036E2 /* MWMTableViewCell+CellId.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3400AB371E02E8CE004036E2 /* MWMTableViewCell+CellId.swift */; }; + 3400AB3A1E02E8CE004036E2 /* MWMTableViewCell+CellId.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3400AB371E02E8CE004036E2 /* MWMTableViewCell+CellId.swift */; }; 3401CD671C3C03A80028C6F8 /* MWMEditorTextTableViewCell.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3401CD651C3C03A80028C6F8 /* MWMEditorTextTableViewCell.mm */; }; 3401CD681C3C03A80028C6F8 /* MWMEditorTextTableViewCell.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3401CD651C3C03A80028C6F8 /* MWMEditorTextTableViewCell.mm */; }; 3401CD691C3C03A80028C6F8 /* MWMEditorTextTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3401CD661C3C03A80028C6F8 /* MWMEditorTextTableViewCell.xib */; }; @@ -129,6 +132,12 @@ 34479C7D1C60C6130065D261 /* MWMFrameworkListener.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34479C781C60C6130065D261 /* MWMFrameworkListener.mm */; }; 344D77B41D1BD7C800DBED70 /* MWMLocationManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = 344D77B31D1BD7C800DBED70 /* MWMLocationManager.mm */; }; 344D77B51D1BD7C800DBED70 /* MWMLocationManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = 344D77B31D1BD7C800DBED70 /* MWMLocationManager.mm */; }; + 345050121E02887000A8DC59 /* MWMSettingsViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 345050111E02887000A8DC59 /* MWMSettingsViewController.mm */; }; + 345050131E02887000A8DC59 /* MWMSettingsViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 345050111E02887000A8DC59 /* MWMSettingsViewController.mm */; }; + 345050141E02887000A8DC59 /* MWMSettingsViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 345050111E02887000A8DC59 /* MWMSettingsViewController.mm */; }; + 345050231E028CB500A8DC59 /* SettingsTableViewLinkCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 345050221E028CB400A8DC59 /* SettingsTableViewLinkCell.swift */; }; + 345050241E028CB500A8DC59 /* SettingsTableViewLinkCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 345050221E028CB400A8DC59 /* SettingsTableViewLinkCell.swift */; }; + 345050251E028CB500A8DC59 /* SettingsTableViewLinkCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 345050221E028CB400A8DC59 /* SettingsTableViewLinkCell.swift */; }; 3454E05F1DF00DAE00F40F46 /* banners.txt in Resources */ = {isa = PBXBuildFile; fileRef = 3454E05E1DF00DAE00F40F46 /* banners.txt */; }; 3454E0601DF00DC000F40F46 /* banners.txt in Resources */ = {isa = PBXBuildFile; fileRef = 3454E05E1DF00DAE00F40F46 /* banners.txt */; }; 3454E0611DF00DC100F40F46 /* banners.txt in Resources */ = {isa = PBXBuildFile; fileRef = 3454E05E1DF00DAE00F40F46 /* banners.txt */; }; @@ -421,6 +430,12 @@ 34FED54D1D1D45B900183B1B /* MWMLocationPredictor.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34FED54C1D1D45B900183B1B /* MWMLocationPredictor.mm */; }; 34FED5501D21121000183B1B /* CLLocation+Mercator.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34FED54F1D21121000183B1B /* CLLocation+Mercator.mm */; }; 34FED5511D21121000183B1B /* CLLocation+Mercator.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34FED54F1D21121000183B1B /* CLLocation+Mercator.mm */; }; + 34FFADC81E02991A0061AC4D /* SettingsTableViewSelectableCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34FFADC71E02991A0061AC4D /* SettingsTableViewSelectableCell.swift */; }; + 34FFADC91E02991A0061AC4D /* SettingsTableViewSelectableCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34FFADC71E02991A0061AC4D /* SettingsTableViewSelectableCell.swift */; }; + 34FFADCA1E02991A0061AC4D /* SettingsTableViewSelectableCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34FFADC71E02991A0061AC4D /* SettingsTableViewSelectableCell.swift */; }; + 34FFADCC1E029C550061AC4D /* SettingsTableViewSwitchCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34FFADCB1E029C550061AC4D /* SettingsTableViewSwitchCell.swift */; }; + 34FFADCD1E029C550061AC4D /* SettingsTableViewSwitchCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34FFADCB1E029C550061AC4D /* SettingsTableViewSwitchCell.swift */; }; + 34FFADCE1E029C550061AC4D /* SettingsTableViewSwitchCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34FFADCB1E029C550061AC4D /* SettingsTableViewSwitchCell.swift */; }; 4519503A1B7A3E070085DA05 /* patterns.txt in Resources */ = {isa = PBXBuildFile; fileRef = 451950391B7A3E070085DA05 /* patterns.txt */; }; 452FCA3B1B6A3DF7007019AB /* colors.txt in Resources */ = {isa = PBXBuildFile; fileRef = 452FCA3A1B6A3DF7007019AB /* colors.txt */; }; 46F26C7310F61FD600ECCA39 /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 46F26C7210F61FD600ECCA39 /* OpenGLES.framework */; }; @@ -520,7 +535,6 @@ 6741A99A1BF340DE002C974C /* MWMBookmarkColorViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = F6588E321B15D73100EE1E58 /* MWMBookmarkColorViewController.xib */; }; 6741A99B1BF340DE002C974C /* PlacePageInfoCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = F6CB215B1AEE704D00FB8963 /* PlacePageInfoCell.xib */; }; 6741A99F1BF340DE002C974C /* 07_roboto_medium.ttf in Resources */ = {isa = PBXBuildFile; fileRef = FAF30A94173AB23900818BF6 /* 07_roboto_medium.ttf */; }; - 6741A9A21BF340DE002C974C /* CommunityVC.mm in Sources */ = {isa = PBXBuildFile; fileRef = 978D4A241996B0EC00D72CA7 /* CommunityVC.mm */; }; 6741A9A31BF340DE002C974C /* main.mm in Sources */ = {isa = PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* main.mm */; }; 6741A9A41BF340DE002C974C /* MWMSearchTabbedViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34CC4C071B81F3B500E44C1F /* MWMSearchTabbedViewController.mm */; }; 6741A9A51BF340DE002C974C /* MWMShareActivityItem.mm in Sources */ = {isa = PBXBuildFile; fileRef = 340837151B72451A00B5C185 /* MWMShareActivityItem.mm */; }; @@ -563,7 +577,6 @@ 6741A9EB1BF340DE002C974C /* ContextViews.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6D409F91B319BD70041730F /* ContextViews.mm */; }; 6741A9EC1BF340DE002C974C /* MWMCircularProgress.mm in Sources */ = {isa = PBXBuildFile; fileRef = 349A35761B53D4C9009677EE /* MWMCircularProgress.mm */; }; 6741A9EE1BF340DE002C974C /* MWMSearchCell.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34B82AD91B847FFC00180497 /* MWMSearchCell.mm */; }; - 6741A9F01BF340DE002C974C /* MWMSettingsViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 978F9239183B660F000D6C7C /* MWMSettingsViewController.mm */; }; 6741A9F11BF340DE002C974C /* MWMNavigationDashboardEntity.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6BD33861B62412E00F2CE18 /* MWMNavigationDashboardEntity.mm */; }; 6741A9F21BF340DE002C974C /* MWMPlacePageInfoCell.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6CB215F1AEE7A5B00FB8963 /* MWMPlacePageInfoCell.mm */; }; 6741A9F31BF340DE002C974C /* MWMSearchHistoryManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = 340E105F1B944DAB00D975D5 /* MWMSearchHistoryManager.mm */; }; @@ -585,19 +598,16 @@ 6741AA0D1BF340DE002C974C /* LocalNotificationManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = 974D041B1977DE430081D0A7 /* LocalNotificationManager.mm */; }; 6741AA0E1BF340DE002C974C /* AppInfo.mm in Sources */ = {isa = PBXBuildFile; fileRef = 97C98520186AE3CF00AF7E9E /* AppInfo.mm */; }; 6741AA0F1BF340DE002C974C /* MWMSearchHistoryMyPositionCell.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6A750B81BE8C74400981B41 /* MWMSearchHistoryMyPositionCell.mm */; }; - 6741AA101BF340DE002C974C /* SelectableCell.mm in Sources */ = {isa = PBXBuildFile; fileRef = 978F923A183B660F000D6C7C /* SelectableCell.mm */; }; 6741AA111BF340DE002C974C /* MWMSearchCategoriesManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34B82AE11B84AC5E00180497 /* MWMSearchCategoriesManager.mm */; }; 6741AA131BF340DE002C974C /* UIColor+MapsMeColor.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6F533A21B3C248900C1940B /* UIColor+MapsMeColor.mm */; }; 6741AA141BF340DE002C974C /* MWMMultilineLabel.mm in Sources */ = {isa = PBXBuildFile; fileRef = 346EDADA1B9F0E35004F8DB5 /* MWMMultilineLabel.mm */; }; 6741AA151BF340DE002C974C /* Statistics.mm in Sources */ = {isa = PBXBuildFile; fileRef = CB252D6C16FF82C8001E41E9 /* Statistics.mm */; }; 6741AA161BF340DE002C974C /* MWMCustomFacebookEvents.mm in Sources */ = {isa = PBXBuildFile; fileRef = 6BA0BCD01B74DDBA00CC9969 /* MWMCustomFacebookEvents.mm */; }; - 6741AA171BF340DE002C974C /* SwitchCell.mm in Sources */ = {isa = PBXBuildFile; fileRef = 978F923B183B660F000D6C7C /* SwitchCell.mm */; }; 6741AA181BF340DE002C974C /* UIView+RuntimeAttributes.mm in Sources */ = {isa = PBXBuildFile; fileRef = 342AD7711B53D32F00E0B997 /* UIView+RuntimeAttributes.mm */; }; 6741AA191BF340DE002C974C /* MWMDownloaderDialogCell.mm in Sources */ = {isa = PBXBuildFile; fileRef = F64F4B6C1B46A51F0081A24A /* MWMDownloaderDialogCell.mm */; }; 6741AA1B1BF340DE002C974C /* MWMDirectionView.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6ED13531B1643900095C6DE /* MWMDirectionView.mm */; }; 6741AA1C1BF340DE002C974C /* MWMRoutingDisclaimerAlert.mm in Sources */ = {isa = PBXBuildFile; fileRef = F63774E91B59376F00BCF54D /* MWMRoutingDisclaimerAlert.mm */; }; 6741AA1D1BF340DE002C974C /* MWMDownloadTransitMapAlert.mm in Sources */ = {isa = PBXBuildFile; fileRef = F64F19971AB81A00006EAF7E /* MWMDownloadTransitMapAlert.mm */; }; - 6741AA1E1BF340DE002C974C /* LinkCell.mm in Sources */ = {isa = PBXBuildFile; fileRef = 97F61793183E7445009919E2 /* LinkCell.mm */; }; 6741AA1F1BF340DE002C974C /* MWMSearchBookmarksCell.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34B82ACE1B846B2C00180497 /* MWMSearchBookmarksCell.mm */; }; 6741AA221BF340DE002C974C /* MWMNavigationView.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6BD33831B6240F200F2CE18 /* MWMNavigationView.mm */; }; 6741AA231BF340DE002C974C /* UIFont+MapsMeFonts.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3472EC041B4D44BE0085CB79 /* UIFont+MapsMeFonts.mm */; }; @@ -831,7 +841,6 @@ 849CF67D1DE842290024A8A5 /* PlacePageInfoCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = F6CB215B1AEE704D00FB8963 /* PlacePageInfoCell.xib */; }; 849CF67E1DE842290024A8A5 /* 07_roboto_medium.ttf in Resources */ = {isa = PBXBuildFile; fileRef = FAF30A94173AB23900818BF6 /* 07_roboto_medium.ttf */; }; 849CF67F1DE842290024A8A5 /* MWMMapDownloaderButtonTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34E0EECD1CC51B1D008E4919 /* MWMMapDownloaderButtonTableViewCell.xib */; }; - 849CF6811DE842290024A8A5 /* CommunityVC.mm in Sources */ = {isa = PBXBuildFile; fileRef = 978D4A241996B0EC00D72CA7 /* CommunityVC.mm */; }; 849CF6821DE842290024A8A5 /* main.mm in Sources */ = {isa = PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* main.mm */; }; 849CF6831DE842290024A8A5 /* MWMSearchTabbedViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34CC4C071B81F3B500E44C1F /* MWMSearchTabbedViewController.mm */; }; 849CF6841DE842290024A8A5 /* MWMShareActivityItem.mm in Sources */ = {isa = PBXBuildFile; fileRef = 340837151B72451A00B5C185 /* MWMShareActivityItem.mm */; }; @@ -943,7 +952,6 @@ 849CF6F11DE842290024A8A5 /* MWMCircularProgress.mm in Sources */ = {isa = PBXBuildFile; fileRef = 349A35761B53D4C9009677EE /* MWMCircularProgress.mm */; }; 849CF6F21DE842290024A8A5 /* MWMSearchCell.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34B82AD91B847FFC00180497 /* MWMSearchCell.mm */; }; 849CF6F31DE842290024A8A5 /* MWMButton.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6FEA82C1C58E89B007223CC /* MWMButton.mm */; }; - 849CF6F41DE842290024A8A5 /* MWMSettingsViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 978F9239183B660F000D6C7C /* MWMSettingsViewController.mm */; }; 849CF6F51DE842290024A8A5 /* MWMPlacePageLayout.mm in Sources */ = {isa = PBXBuildFile; fileRef = F67517A11D76FC46008FE34F /* MWMPlacePageLayout.mm */; }; 849CF6F61DE842290024A8A5 /* MWMNavigationDashboardEntity.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6BD33861B62412E00F2CE18 /* MWMNavigationDashboardEntity.mm */; }; 849CF6F71DE842290024A8A5 /* MWMPlacePageInfoCell.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6CB215F1AEE7A5B00FB8963 /* MWMPlacePageInfoCell.mm */; }; @@ -1005,7 +1013,6 @@ 849CF72F1DE842290024A8A5 /* MWMInputValidator.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34ABA61F1C2D517500FE1BEC /* MWMInputValidator.mm */; }; 849CF7301DE842290024A8A5 /* MWMActionBarButton.mm in Sources */ = {isa = PBXBuildFile; fileRef = F639883A1CF70FE500226B6B /* MWMActionBarButton.mm */; }; 849CF7311DE842290024A8A5 /* MWMKeyboard.mm in Sources */ = {isa = PBXBuildFile; fileRef = 348868F21D87DFB70069BBA3 /* MWMKeyboard.mm */; }; - 849CF7321DE842290024A8A5 /* SelectableCell.mm in Sources */ = {isa = PBXBuildFile; fileRef = 978F923A183B660F000D6C7C /* SelectableCell.mm */; }; 849CF7331DE842290024A8A5 /* MWMInputValidatorFactory.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34ABA6231C2D551900FE1BEC /* MWMInputValidatorFactory.mm */; }; 849CF7341DE842290024A8A5 /* MWMSearchChangeModeView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34257D1A1DC9FD9400DC5BB9 /* MWMSearchChangeModeView.mm */; }; 849CF7351DE842290024A8A5 /* MWMSearchCategoriesManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34B82AE11B84AC5E00180497 /* MWMSearchCategoriesManager.mm */; }; @@ -1023,7 +1030,6 @@ 849CF7411DE842290024A8A5 /* MWMMapDownloaderSubplaceTableViewCell.mm in Sources */ = {isa = PBXBuildFile; fileRef = 341F99D01C6B1165001C67B8 /* MWMMapDownloaderSubplaceTableViewCell.mm */; }; 849CF7421DE842290024A8A5 /* MWMNoMapsView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 343FAC491CBFBDFC00A45D3B /* MWMNoMapsView.mm */; }; 849CF7431DE842290024A8A5 /* MWMCustomFacebookEvents.mm in Sources */ = {isa = PBXBuildFile; fileRef = 6BA0BCD01B74DDBA00CC9969 /* MWMCustomFacebookEvents.mm */; }; - 849CF7441DE842290024A8A5 /* SwitchCell.mm in Sources */ = {isa = PBXBuildFile; fileRef = 978F923B183B660F000D6C7C /* SwitchCell.mm */; }; 849CF7451DE842290024A8A5 /* UIView+RuntimeAttributes.mm in Sources */ = {isa = PBXBuildFile; fileRef = 342AD7711B53D32F00E0B997 /* UIView+RuntimeAttributes.mm */; }; 849CF7461DE842290024A8A5 /* MWMTableViewCell.mm in Sources */ = {isa = PBXBuildFile; fileRef = F626D52D1C3E6CAA00C17D15 /* MWMTableViewCell.mm */; }; 849CF7471DE842290024A8A5 /* MWMDownloaderDialogCell.mm in Sources */ = {isa = PBXBuildFile; fileRef = F64F4B6C1B46A51F0081A24A /* MWMDownloaderDialogCell.mm */; }; @@ -1045,7 +1051,6 @@ 849CF7571DE842290024A8A5 /* MWMMigrationViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34E273201C737A4100463965 /* MWMMigrationViewController.mm */; }; 849CF7581DE842290024A8A5 /* MWMDownloadTransitMapAlert.mm in Sources */ = {isa = PBXBuildFile; fileRef = F64F19971AB81A00006EAF7E /* MWMDownloadTransitMapAlert.mm */; }; 849CF7591DE842290024A8A5 /* MWMMapDownloaderDefaultDataSource.mm in Sources */ = {isa = PBXBuildFile; fileRef = 341F99E71C6B119E001C67B8 /* MWMMapDownloaderDefaultDataSource.mm */; }; - 849CF75A1DE842290024A8A5 /* LinkCell.mm in Sources */ = {isa = PBXBuildFile; fileRef = 97F61793183E7445009919E2 /* LinkCell.mm */; }; 849CF75B1DE842290024A8A5 /* MWMSearchBookmarksCell.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34B82ACE1B846B2C00180497 /* MWMSearchBookmarksCell.mm */; }; 849CF75C1DE842290024A8A5 /* MWMNavigationView.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6BD33831B6240F200F2CE18 /* MWMNavigationView.mm */; }; 849CF75D1DE842290024A8A5 /* UIFont+MapsMeFonts.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3472EC041B4D44BE0085CB79 /* UIFont+MapsMeFonts.mm */; }; @@ -1113,12 +1118,8 @@ 974D041D1977DE430081D0A7 /* LocalNotificationManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = 974D041B1977DE430081D0A7 /* LocalNotificationManager.mm */; }; 97719D451843B6DC00BDD815 /* MessageUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 97719D441843B6DC00BDD815 /* MessageUI.framework */; }; 97719D491843B6F700BDD815 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 97719D471843B6F200BDD815 /* Security.framework */; }; - 978D4A251996B0EC00D72CA7 /* CommunityVC.mm in Sources */ = {isa = PBXBuildFile; fileRef = 978D4A241996B0EC00D72CA7 /* CommunityVC.mm */; }; 978D4A291996C17300D72CA7 /* RichTextVC.mm in Sources */ = {isa = PBXBuildFile; fileRef = 978D4A281996C17300D72CA7 /* RichTextVC.mm */; }; 978D4A31199A11E600D72CA7 /* faq.html in Resources */ = {isa = PBXBuildFile; fileRef = 978D4A30199A11E600D72CA7 /* faq.html */; }; - 978F9240183B660F000D6C7C /* MWMSettingsViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 978F9239183B660F000D6C7C /* MWMSettingsViewController.mm */; }; - 978F9242183B660F000D6C7C /* SelectableCell.mm in Sources */ = {isa = PBXBuildFile; fileRef = 978F923A183B660F000D6C7C /* SelectableCell.mm */; }; - 978F9244183B660F000D6C7C /* SwitchCell.mm in Sources */ = {isa = PBXBuildFile; fileRef = 978F923B183B660F000D6C7C /* SwitchCell.mm */; }; 97A5967F19B9CD47007A963F /* copyright.html in Resources */ = {isa = PBXBuildFile; fileRef = 97A5967E19B9CD47007A963F /* copyright.html */; }; 97C98522186AE3CF00AF7E9E /* AppInfo.mm in Sources */ = {isa = PBXBuildFile; fileRef = 97C98520186AE3CF00AF7E9E /* AppInfo.mm */; }; 97D40C0A184D031900A1D572 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97D40C09184D031900A1D572 /* Images.xcassets */; }; @@ -1126,7 +1127,6 @@ 97ECD871183620CE00F77A46 /* AdSupport.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 97ECD870183620CE00F77A46 /* AdSupport.framework */; settings = {ATTRIBUTES = (Required, ); }; }; 97ECD87818362B3D00F77A46 /* CoreTelephony.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 97ECD87718362B3D00F77A46 /* CoreTelephony.framework */; }; 97ECD87A18362B5400F77A46 /* MobileCoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 97ECD87918362B5400F77A46 /* MobileCoreServices.framework */; }; - 97F61794183E7445009919E2 /* LinkCell.mm in Sources */ = {isa = PBXBuildFile; fileRef = 97F61793183E7445009919E2 /* LinkCell.mm */; }; 9DA46A091C47E92100EF52BA /* resources-hdpi_legacy in Resources */ = {isa = PBXBuildFile; fileRef = 9DA46A041C47E92100EF52BA /* resources-hdpi_legacy */; }; 9DA46A0A1C47E92100EF52BA /* resources-mdpi_legacy in Resources */ = {isa = PBXBuildFile; fileRef = 9DA46A051C47E92100EF52BA /* resources-mdpi_legacy */; }; 9DA46A0B1C47E92100EF52BA /* resources-mdpi_legacy in Resources */ = {isa = PBXBuildFile; fileRef = 9DA46A051C47E92100EF52BA /* resources-mdpi_legacy */; }; @@ -1419,6 +1419,7 @@ 34002A6C1D2F9D0700AC201E /* MWMRouter.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMRouter.mm; sourceTree = "<group>"; }; 3400A67F1CA29D7D003DA0EC /* NSString+Categories.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "NSString+Categories.h"; path = "Categories/NSString+Categories.h"; sourceTree = "<group>"; }; 3400A6801CA29D7D003DA0EC /* NSString+Categories.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = "NSString+Categories.mm"; path = "Categories/NSString+Categories.mm"; sourceTree = "<group>"; }; + 3400AB371E02E8CE004036E2 /* MWMTableViewCell+CellId.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "MWMTableViewCell+CellId.swift"; sourceTree = "<group>"; }; 3401CD641C3C03A80028C6F8 /* MWMEditorTextTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMEditorTextTableViewCell.h; sourceTree = "<group>"; }; 3401CD651C3C03A80028C6F8 /* MWMEditorTextTableViewCell.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMEditorTextTableViewCell.mm; sourceTree = "<group>"; }; 3401CD661C3C03A80028C6F8 /* MWMEditorTextTableViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMEditorTextTableViewCell.xib; sourceTree = "<group>"; }; @@ -1553,6 +1554,10 @@ 344BDB021B9069810076DB31 /* MWMSearchTabbedViewProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMSearchTabbedViewProtocol.h; sourceTree = "<group>"; }; 344D77B21D1BD7C800DBED70 /* MWMLocationManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMLocationManager.h; sourceTree = "<group>"; }; 344D77B31D1BD7C800DBED70 /* MWMLocationManager.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMLocationManager.mm; sourceTree = "<group>"; }; + 345050101E02887000A8DC59 /* MWMSettingsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMSettingsViewController.h; sourceTree = "<group>"; }; + 345050111E02887000A8DC59 /* MWMSettingsViewController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMSettingsViewController.mm; sourceTree = "<group>"; }; + 345050211E028B8000A8DC59 /* Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Bridging-Header.h"; sourceTree = "<group>"; }; + 345050221E028CB400A8DC59 /* SettingsTableViewLinkCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SettingsTableViewLinkCell.swift; sourceTree = "<group>"; }; 3454E05E1DF00DAE00F40F46 /* banners.txt */ = {isa = PBXFileReference; lastKnownFileType = text; name = banners.txt; path = ../../data/banners.txt; sourceTree = "<group>"; }; 3456E0201DC0C4030055DF50 /* HockeySDK.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = HockeySDK.framework; path = Frameworks/HockeySDK.embeddedframework/HockeySDK.framework; sourceTree = "<group>"; }; 3456E0251DC0C4500055DF50 /* HockeySDKResources.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; name = HockeySDKResources.bundle; path = Frameworks/HockeySDK.embeddedframework/Resources/HockeySDKResources.bundle; sourceTree = "<group>"; }; @@ -1722,7 +1727,7 @@ 34ABA62E1C2D58F300FE1BEC /* MWMInputEmailValidator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMInputEmailValidator.h; sourceTree = "<group>"; }; 34ABA62F1C2D58F300FE1BEC /* MWMInputEmailValidator.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMInputEmailValidator.mm; sourceTree = "<group>"; }; 34B104201D6EE45700C8B577 /* MWMUnitsController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMUnitsController.h; sourceTree = "<group>"; }; - 34B104211D6EE45700C8B577 /* MWMUnitsController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMUnitsController.mm; sourceTree = "<group>"; }; + 34B104211D6EE45700C8B577 /* MWMUnitsController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; lineEnding = 0; path = MWMUnitsController.mm; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; 34B104241D6F040E00C8B577 /* MWMAboutController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMAboutController.h; sourceTree = "<group>"; }; 34B104251D6F040E00C8B577 /* MWMAboutController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMAboutController.mm; sourceTree = "<group>"; }; 34B646BB1CEB6FC000E0C7A5 /* MWMEditorAdditionalNameTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMEditorAdditionalNameTableViewCell.h; sourceTree = "<group>"; }; @@ -1847,6 +1852,8 @@ 34FED54E1D21121000183B1B /* CLLocation+Mercator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "CLLocation+Mercator.h"; sourceTree = "<group>"; }; 34FED54F1D21121000183B1B /* CLLocation+Mercator.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = "CLLocation+Mercator.mm"; sourceTree = "<group>"; }; 34FED5521D2123CE00183B1B /* MWMLocationHelpers.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMLocationHelpers.h; sourceTree = "<group>"; }; + 34FFADC71E02991A0061AC4D /* SettingsTableViewSelectableCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SettingsTableViewSelectableCell.swift; sourceTree = "<group>"; }; + 34FFADCB1E029C550061AC4D /* SettingsTableViewSwitchCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SettingsTableViewSwitchCell.swift; sourceTree = "<group>"; }; 3D443C9C19E421EE0025C2FC /* sv */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sv; path = sv.lproj/Localizable.strings; sourceTree = "<group>"; }; 3DDB4BC31DAB98F000F4D021 /* libpartners_api.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpartners_api.a; path = "../../../omim-xcode-build/Debug-iphonesimulator/libpartners_api.a"; sourceTree = "<group>"; }; 451950391B7A3E070085DA05 /* patterns.txt */ = {isa = PBXFileReference; lastKnownFileType = text; name = patterns.txt; path = ../../data/patterns.txt; sourceTree = "<group>"; }; @@ -1926,17 +1933,9 @@ 974D041C1977DE430081D0A7 /* LocalNotificationManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LocalNotificationManager.h; sourceTree = "<group>"; }; 97719D441843B6DC00BDD815 /* MessageUI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MessageUI.framework; path = System/Library/Frameworks/MessageUI.framework; sourceTree = SDKROOT; }; 97719D471843B6F200BDD815 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; }; - 978D4A231996B0EC00D72CA7 /* CommunityVC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CommunityVC.h; sourceTree = "<group>"; }; - 978D4A241996B0EC00D72CA7 /* CommunityVC.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = CommunityVC.mm; sourceTree = "<group>"; }; 978D4A271996C17300D72CA7 /* RichTextVC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RichTextVC.h; sourceTree = "<group>"; }; 978D4A281996C17300D72CA7 /* RichTextVC.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = RichTextVC.mm; sourceTree = "<group>"; }; 978D4A30199A11E600D72CA7 /* faq.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; name = faq.html; path = ../../data/faq.html; sourceTree = "<group>"; }; - 978F9239183B660F000D6C7C /* MWMSettingsViewController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; lineEnding = 0; name = MWMSettingsViewController.mm; path = Settings/MWMSettingsViewController.mm; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; - 978F923A183B660F000D6C7C /* SelectableCell.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = SelectableCell.mm; path = Settings/SelectableCell.mm; sourceTree = "<group>"; }; - 978F923B183B660F000D6C7C /* SwitchCell.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = SwitchCell.mm; path = Settings/SwitchCell.mm; sourceTree = "<group>"; }; - 978F923D183B660F000D6C7C /* SwitchCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SwitchCell.h; path = Settings/SwitchCell.h; sourceTree = "<group>"; }; - 978F923E183B660F000D6C7C /* SelectableCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SelectableCell.h; path = Settings/SelectableCell.h; sourceTree = "<group>"; }; - 978F923F183B660F000D6C7C /* MWMSettingsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MWMSettingsViewController.h; path = Settings/MWMSettingsViewController.h; sourceTree = "<group>"; }; 97A5967E19B9CD47007A963F /* copyright.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; name = copyright.html; path = ../../data/copyright.html; sourceTree = "<group>"; }; 97C98520186AE3CF00AF7E9E /* AppInfo.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; lineEnding = 0; path = AppInfo.mm; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; 97C98521186AE3CF00AF7E9E /* AppInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppInfo.h; sourceTree = "<group>"; }; @@ -1951,8 +1950,6 @@ 97ECD870183620CE00F77A46 /* AdSupport.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AdSupport.framework; path = System/Library/Frameworks/AdSupport.framework; sourceTree = SDKROOT; }; 97ECD87718362B3D00F77A46 /* CoreTelephony.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreTelephony.framework; path = System/Library/Frameworks/CoreTelephony.framework; sourceTree = SDKROOT; }; 97ECD87918362B5400F77A46 /* MobileCoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MobileCoreServices.framework; path = System/Library/Frameworks/MobileCoreServices.framework; sourceTree = SDKROOT; }; - 97F6178F183E742E009919E2 /* LinkCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = LinkCell.h; path = Settings/LinkCell.h; sourceTree = "<group>"; }; - 97F61793183E7445009919E2 /* LinkCell.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = LinkCell.mm; path = Settings/LinkCell.mm; sourceTree = "<group>"; }; 9DA46A041C47E92100EF52BA /* resources-hdpi_legacy */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "resources-hdpi_legacy"; path = "../../data/resources-hdpi_legacy"; sourceTree = "<group>"; }; 9DA46A051C47E92100EF52BA /* resources-mdpi_legacy */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "resources-mdpi_legacy"; path = "../../data/resources-mdpi_legacy"; sourceTree = "<group>"; }; 9DA46A061C47E92100EF52BA /* resources-xhdpi_legacy */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "resources-xhdpi_legacy"; path = "../../data/resources-xhdpi_legacy"; sourceTree = "<group>"; }; @@ -2078,7 +2075,7 @@ F65B31F41DD2106700105FDE /* MWMiPadPlacePageLayoutImpl.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMiPadPlacePageLayoutImpl.mm; sourceTree = "<group>"; }; F6671C6A1BA2EFD500548008 /* libFlurry_7.1.0.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libFlurry_7.1.0.a; path = Frameworks/libFlurry_7.1.0.a; sourceTree = "<group>"; }; F668F6541BCD4507002D6FFC /* MWMTTSSettingsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMTTSSettingsViewController.h; sourceTree = "<group>"; }; - F668F6551BCD4507002D6FFC /* MWMTTSSettingsViewController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMTTSSettingsViewController.mm; sourceTree = "<group>"; }; + F668F6551BCD4507002D6FFC /* MWMTTSSettingsViewController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; lineEnding = 0; path = MWMTTSSettingsViewController.mm; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; F67223751D74800600A3BDA2 /* MWMPlacePagePreviewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMPlacePagePreviewCell.xib; sourceTree = "<group>"; }; F67517A01D76FC46008FE34F /* MWMPlacePageLayout.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMPlacePageLayout.h; sourceTree = "<group>"; }; F67517A11D76FC46008FE34F /* MWMPlacePageLayout.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMPlacePageLayout.mm; sourceTree = "<group>"; }; @@ -2107,7 +2104,7 @@ F6AD57B91C87039F00CED368 /* MWMEditorCategoryCell.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMEditorCategoryCell.mm; sourceTree = "<group>"; }; F6AD57BC1C870A3C00CED368 /* MWMEditorCategoryCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMEditorCategoryCell.xib; sourceTree = "<group>"; }; F6B2E61D1C3D5F31005562DF /* MWMNightModeController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMNightModeController.h; sourceTree = "<group>"; }; - F6B2E61E1C3D5F31005562DF /* MWMNightModeController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMNightModeController.mm; sourceTree = "<group>"; }; + F6B2E61E1C3D5F31005562DF /* MWMNightModeController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; lineEnding = 0; path = MWMNightModeController.mm; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; F6B870141DDCA03600BE8D94 /* MWMPlacePageEntity.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMPlacePageEntity.h; sourceTree = "<group>"; }; F6B870151DDCA03600BE8D94 /* MWMPlacePageEntity.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMPlacePageEntity.mm; sourceTree = "<group>"; }; F6B8701A1DDCB2F400BE8D94 /* MWMPPPreviewBannerCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMPPPreviewBannerCell.h; sourceTree = "<group>"; }; @@ -2141,7 +2138,7 @@ F6BD33861B62412E00F2CE18 /* MWMNavigationDashboardEntity.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMNavigationDashboardEntity.mm; sourceTree = "<group>"; }; F6BED3761CE3726A008D31E7 /* MWMBookmarkTitleCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMBookmarkTitleCell.xib; sourceTree = "<group>"; }; F6C641AE1C15BBE6008FCAF3 /* MWMRecentTrackSettingsController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMRecentTrackSettingsController.h; sourceTree = "<group>"; }; - F6C641AF1C15BBE6008FCAF3 /* MWMRecentTrackSettingsController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMRecentTrackSettingsController.mm; sourceTree = "<group>"; }; + F6C641AF1C15BBE6008FCAF3 /* MWMRecentTrackSettingsController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; lineEnding = 0; path = MWMRecentTrackSettingsController.mm; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; F6CB215B1AEE704D00FB8963 /* PlacePageInfoCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = PlacePageInfoCell.xib; sourceTree = "<group>"; }; F6CB215E1AEE7A5B00FB8963 /* MWMPlacePageInfoCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMPlacePageInfoCell.h; sourceTree = "<group>"; }; F6CB215F1AEE7A5B00FB8963 /* MWMPlacePageInfoCell.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; lineEnding = 0; path = MWMPlacePageInfoCell.mm; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; @@ -2424,6 +2421,7 @@ 974D041B1977DE430081D0A7 /* LocalNotificationManager.mm */, B0DFE62F1A1B78A200B6C35E /* LocalNotifications.plist */, F626D52C1C3E6CAA00C17D15 /* MWMTableViewCell.h */, + 3400AB371E02E8CE004036E2 /* MWMTableViewCell+CellId.swift */, F626D52D1C3E6CAA00C17D15 /* MWMTableViewCell.mm */, 46F26CD610F623BA00ECCA39 /* EAGLView.h */, 46F26CD710F623BA00ECCA39 /* EAGLView.mm */, @@ -2477,10 +2475,11 @@ 29B97315FDCFA39411CA2CEA /* Other Sources */ = { isa = PBXGroup; children = ( - 28A0AB4B0D9B1048005BE974 /* Maps_Prefix.pch */, - 29B97316FDCFA39411CA2CEA /* main.mm */, - 34EC27091CB2A7120084FA36 /* fabric_logging.hpp */, + 345050211E028B8000A8DC59 /* Bridging-Header.h */, 34EC27081CB2A7120084FA36 /* fabric_logging_ios.mm */, + 34EC27091CB2A7120084FA36 /* fabric_logging.hpp */, + 29B97316FDCFA39411CA2CEA /* main.mm */, + 28A0AB4B0D9B1048005BE974 /* Maps_Prefix.pch */, ); name = "Other Sources"; sourceTree = "<group>"; @@ -2736,6 +2735,16 @@ path = Location; sourceTree = "<group>"; }; + 34504FFB1E0287C400A8DC59 /* Cells */ = { + isa = PBXGroup; + children = ( + 345050221E028CB400A8DC59 /* SettingsTableViewLinkCell.swift */, + 34FFADC71E02991A0061AC4D /* SettingsTableViewSelectableCell.swift */, + 34FFADCB1E029C550061AC4D /* SettingsTableViewSwitchCell.swift */, + ); + path = Cells; + sourceTree = "<group>"; + }; 345C34661CE9D32500BB2224 /* SideButtons */ = { isa = PBXGroup; children = ( @@ -3376,19 +3385,6 @@ name = Categories; sourceTree = "<group>"; }; - 978F924D183BB5D6000D6C7C /* Cells */ = { - isa = PBXGroup; - children = ( - 978F923E183B660F000D6C7C /* SelectableCell.h */, - 978F923A183B660F000D6C7C /* SelectableCell.mm */, - 978F923D183B660F000D6C7C /* SwitchCell.h */, - 978F923B183B660F000D6C7C /* SwitchCell.mm */, - 97F6178F183E742E009919E2 /* LinkCell.h */, - 97F61793183E7445009919E2 /* LinkCell.mm */, - ); - name = Cells; - sourceTree = "<group>"; - }; 97B4E9271851DAB300BEC5D7 /* Custom Views */ = { isa = PBXGroup; children = ( @@ -3922,23 +3918,7 @@ FA4135DF120A25B90062D5B4 /* Settings */ = { isa = PBXGroup; children = ( - 978F924D183BB5D6000D6C7C /* Cells */, - 978F923F183B660F000D6C7C /* MWMSettingsViewController.h */, - 978F9239183B660F000D6C7C /* MWMSettingsViewController.mm */, - F668F6541BCD4507002D6FFC /* MWMTTSSettingsViewController.h */, - F668F6551BCD4507002D6FFC /* MWMTTSSettingsViewController.mm */, - F63BA36F1BCD5B520044C504 /* MWMTTSLanguageViewController.h */, - F63BA3701BCD5B520044C504 /* MWMTTSLanguageViewController.mm */, - F6C641AE1C15BBE6008FCAF3 /* MWMRecentTrackSettingsController.h */, - F6C641AF1C15BBE6008FCAF3 /* MWMRecentTrackSettingsController.mm */, - F6B2E61D1C3D5F31005562DF /* MWMNightModeController.h */, - F6B2E61E1C3D5F31005562DF /* MWMNightModeController.mm */, - 978D4A231996B0EC00D72CA7 /* CommunityVC.h */, - 978D4A241996B0EC00D72CA7 /* CommunityVC.mm */, - 34618BFB1D6DAAE600EDEEF4 /* MWMSettings.h */, - 34618BFC1D6DAAE600EDEEF4 /* MWMSettings.mm */, - 34B104201D6EE45700C8B577 /* MWMUnitsController.h */, - 34B104211D6EE45700C8B577 /* MWMUnitsController.mm */, + 34504FFB1E0287C400A8DC59 /* Cells */, 34B104241D6F040E00C8B577 /* MWMAboutController.h */, 34B104251D6F040E00C8B577 /* MWMAboutController.mm */, 34AA09D61DC3A14A002E8083 /* MWMAboutControllerHeader.xib */, @@ -3946,9 +3926,23 @@ 348C26041D701B9F00813924 /* MWMHelpController.mm */, 349A137A1DEC0B6200C7DB60 /* MWMMobileInternetViewController.h */, 349A137B1DEC0B6200C7DB60 /* MWMMobileInternetViewController.mm */, + F6B2E61D1C3D5F31005562DF /* MWMNightModeController.h */, + F6B2E61E1C3D5F31005562DF /* MWMNightModeController.mm */, + F6C641AE1C15BBE6008FCAF3 /* MWMRecentTrackSettingsController.h */, + F6C641AF1C15BBE6008FCAF3 /* MWMRecentTrackSettingsController.mm */, + 34618BFB1D6DAAE600EDEEF4 /* MWMSettings.h */, + 34618BFC1D6DAAE600EDEEF4 /* MWMSettings.mm */, + 345050101E02887000A8DC59 /* MWMSettingsViewController.h */, + 345050111E02887000A8DC59 /* MWMSettingsViewController.mm */, + F63BA36F1BCD5B520044C504 /* MWMTTSLanguageViewController.h */, + F63BA3701BCD5B520044C504 /* MWMTTSLanguageViewController.mm */, + F668F6541BCD4507002D6FFC /* MWMTTSSettingsViewController.h */, + F668F6551BCD4507002D6FFC /* MWMTTSSettingsViewController.mm */, + 34B104201D6EE45700C8B577 /* MWMUnitsController.h */, + 34B104211D6EE45700C8B577 /* MWMUnitsController.mm */, ); name = Settings; - path = ..; + path = ../Settings; sourceTree = "<group>"; }; FA6E1F1B124E6B2800F59149 /* Platform */ = { @@ -4034,6 +4028,7 @@ TargetAttributes = { 1D6058900D05DD3D006BFB54 = { DevelopmentTeam = 3T6FSDE8C7; + LastSwiftMigration = 0820; ProvisioningStyle = Automatic; SystemCapabilities = { com.apple.ApplicationGroups.iOS = { @@ -4055,6 +4050,7 @@ }; 6741A93D1BF340DE002C974C = { DevelopmentTeam = 3T6FSDE8C7; + LastSwiftMigration = 0820; ProvisioningStyle = Automatic; SystemCapabilities = { com.apple.Push = { @@ -4064,6 +4060,7 @@ }; 849CF5E21DE842290024A8A5 = { DevelopmentTeam = 3T6FSDE8C7; + LastSwiftMigration = 0820; ProvisioningStyle = Automatic; }; }; @@ -4680,7 +4677,6 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 978D4A251996B0EC00D72CA7 /* CommunityVC.mm in Sources */, 1D60589B0D05DD56006BFB54 /* main.mm in Sources */, 34CC4C091B81F3B500E44C1F /* MWMSearchTabbedViewController.mm in Sources */, 340837161B72451A00B5C185 /* MWMShareActivityItem.mm in Sources */, @@ -4793,11 +4789,11 @@ 349A13821DEC138C00C7DB60 /* MWMMobileInternetAlert.mm in Sources */, 347FD8851C60B2CE002FB65E /* MWMOpeningHoursTimeSelectorTableViewCell.mm in Sources */, 34EB84581C073DF70004689F /* MWMOpeningHoursEditorViewController.mm in Sources */, + 34FFADCC1E029C550061AC4D /* SettingsTableViewSwitchCell.swift in Sources */, F617B4E31D8FDDD5007A1A4E /* MWMBookmarkCell.mm in Sources */, 349A357A1B53D4C9009677EE /* MWMCircularProgress.mm in Sources */, 34B82ADA1B847FFC00180497 /* MWMSearchCell.mm in Sources */, F6FEA82D1C58E89B007223CC /* MWMButton.mm in Sources */, - 978F9240183B660F000D6C7C /* MWMSettingsViewController.mm in Sources */, F67517A21D76FC46008FE34F /* MWMPlacePageLayout.mm in Sources */, F6BD33871B62412E00F2CE18 /* MWMNavigationDashboardEntity.mm in Sources */, F6CB21601AEE7A5B00FB8963 /* MWMPlacePageInfoCell.mm in Sources */, @@ -4823,9 +4819,11 @@ F68FCB851DA7BBA6007CC7D7 /* MWMTaxiPreviewDataSource.mm in Sources */, 34257D151DC9FB0D00DC5BB9 /* MWMSearchFilterViewController.mm in Sources */, 34BC1E561C2ADBD3009BBF51 /* MWMOpeningHoursCommon.mm in Sources */, + 345050231E028CB500A8DC59 /* SettingsTableViewLinkCell.swift in Sources */, F653CE161C71F60200A453F1 /* MWMAddPlaceNavigationBar.mm in Sources */, A32B6D4D1A14980500E54A65 /* iosOGLContextFactory.mm in Sources */, 349C3AEC1D33A933002AC7A9 /* MWMNavigationInfoView.mm in Sources */, + 345050121E02887000A8DC59 /* MWMSettingsViewController.mm in Sources */, 34B104221D6EE45700C8B577 /* MWMUnitsController.mm in Sources */, 347FD8671C60B2CE002FB65E /* MWMOpeningHoursAddClosedTableViewCell.mm in Sources */, FA054612155C465E001F4E37 /* SelectSetVC.mm in Sources */, @@ -4860,7 +4858,6 @@ 34ABA6201C2D517500FE1BEC /* MWMInputValidator.mm in Sources */, F639883B1CF70FE500226B6B /* MWMActionBarButton.mm in Sources */, 348868F31D87DFB70069BBA3 /* MWMKeyboard.mm in Sources */, - 978F9242183B660F000D6C7C /* SelectableCell.mm in Sources */, 34ABA6241C2D551900FE1BEC /* MWMInputValidatorFactory.mm in Sources */, 34257D1B1DC9FD9400DC5BB9 /* MWMSearchChangeModeView.mm in Sources */, 34EA976C1DEC779D00616B11 /* MWMNetworkPolicy.mm in Sources */, @@ -4881,7 +4878,6 @@ 343FAC4A1CBFBDFC00A45D3B /* MWMNoMapsView.mm in Sources */, F63421EF1DF975A800A96868 /* MWMPlacePageTaxiCell.mm in Sources */, 6BA0BCD11B74DDBA00CC9969 /* MWMCustomFacebookEvents.mm in Sources */, - 978F9244183B660F000D6C7C /* SwitchCell.mm in Sources */, 342AD7721B53D32F00E0B997 /* UIView+RuntimeAttributes.mm in Sources */, F626D52E1C3E6CAA00C17D15 /* MWMTableViewCell.mm in Sources */, F64F4B6D1B46A51F0081A24A /* MWMDownloaderDialogCell.mm in Sources */, @@ -4889,6 +4885,7 @@ 3491E7CB1C06F1F10042FE24 /* MWMPlacePageButtonCell.mm in Sources */, 348C26051D701B9F00813924 /* MWMHelpController.mm in Sources */, 348868EB1D8721650069BBA3 /* MWMSearchNoResults.mm in Sources */, + 3400AB381E02E8CE004036E2 /* MWMTableViewCell+CellId.swift in Sources */, 346B42AB1DD5E3D20094EBEE /* MWMLocationNotFoundAlert.mm in Sources */, 34BBB7231DD0853B0002E025 /* MWMSearchManager+Layout.mm in Sources */, 341F99D91C6B1165001C67B8 /* MWMMapDownloaderPlaceTableViewCell.mm in Sources */, @@ -4903,7 +4900,6 @@ 34E273211C737A4100463965 /* MWMMigrationViewController.mm in Sources */, F64F19A31AB81A00006EAF7E /* MWMDownloadTransitMapAlert.mm in Sources */, 341F99E81C6B119E001C67B8 /* MWMMapDownloaderDefaultDataSource.mm in Sources */, - 97F61794183E7445009919E2 /* LinkCell.mm in Sources */, 34B82AD01B846B2C00180497 /* MWMSearchBookmarksCell.mm in Sources */, F6BD33841B6240F200F2CE18 /* MWMNavigationView.mm in Sources */, 3472EC051B4D44BE0085CB79 /* UIFont+MapsMeFonts.mm in Sources */, @@ -4921,6 +4917,7 @@ F68FCB8A1DA7BD20007CC7D7 /* MWMTaxiPreviewCell.mm in Sources */, F6E9BF291CE364150050E534 /* MWMEditBookmarkController.mm in Sources */, F65B31F11DD20E9600105FDE /* MWMiPhonePlacePageLayoutImpl.mm in Sources */, + 34FFADC81E02991A0061AC4D /* SettingsTableViewSelectableCell.swift in Sources */, 34A759CA1DC795140078C3AE /* MWMWelcomeController.mm in Sources */, 34D15BA81BD8F93C00C8BCBE /* AddSetTableViewCell.mm in Sources */, F6A218491CA3F26800BE2CC6 /* MWMEditorViralActivityItem.mm in Sources */, @@ -4934,7 +4931,6 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 6741A9A21BF340DE002C974C /* CommunityVC.mm in Sources */, 34FED5511D21121000183B1B /* CLLocation+Mercator.mm in Sources */, 6741A9A31BF340DE002C974C /* main.mm in Sources */, 6741A9A41BF340DE002C974C /* MWMSearchTabbedViewController.mm in Sources */, @@ -5047,11 +5043,11 @@ 349A13831DEC138C00C7DB60 /* MWMMobileInternetAlert.mm in Sources */, 347FD8861C60B2CE002FB65E /* MWMOpeningHoursTimeSelectorTableViewCell.mm in Sources */, 6741A9EB1BF340DE002C974C /* ContextViews.mm in Sources */, + 34FFADCD1E029C550061AC4D /* SettingsTableViewSwitchCell.swift in Sources */, 6741A9EC1BF340DE002C974C /* MWMCircularProgress.mm in Sources */, 342CC5F21C2D7730005F3FE5 /* MWMAuthorizationLoginViewController.mm in Sources */, 6741A9EE1BF340DE002C974C /* MWMSearchCell.mm in Sources */, F617B4E41D8FDDD5007A1A4E /* MWMBookmarkCell.mm in Sources */, - 6741A9F01BF340DE002C974C /* MWMSettingsViewController.mm in Sources */, 6741A9F11BF340DE002C974C /* MWMNavigationDashboardEntity.mm in Sources */, 6741A9F21BF340DE002C974C /* MWMPlacePageInfoCell.mm in Sources */, 6741A9F31BF340DE002C974C /* MWMSearchHistoryManager.mm in Sources */, @@ -5077,9 +5073,11 @@ F6381BF61CD12045004CA943 /* LocaleTranslator.mm in Sources */, 34257D161DC9FB0D00DC5BB9 /* MWMSearchFilterViewController.mm in Sources */, F6D4A73B1CC1267E00BD4E5B /* MWMNoteCell.mm in Sources */, + 345050241E028CB500A8DC59 /* SettingsTableViewLinkCell.swift in Sources */, F68FCB861DA7BBA6007CC7D7 /* MWMTaxiPreviewDataSource.mm in Sources */, 347FD8681C60B2CE002FB65E /* MWMOpeningHoursAddClosedTableViewCell.mm in Sources */, 6741A9FF1BF340DE002C974C /* AddSetVC.mm in Sources */, + 345050131E02887000A8DC59 /* MWMSettingsViewController.mm in Sources */, 6741AA011BF340DE002C974C /* MWMSearchTabbedViewLayout.mm in Sources */, 349C3AED1D33A933002AC7A9 /* MWMNavigationInfoView.mm in Sources */, 34B104231D6EE45700C8B577 /* MWMUnitsController.mm in Sources */, @@ -5109,7 +5107,6 @@ 6741AA0F1BF340DE002C974C /* MWMSearchHistoryMyPositionCell.mm in Sources */, 34A759DD1DC7978E0078C3AE /* MWMWhatsNewBookingBicycleRoutingController.mm in Sources */, 34A759DE1DC797920078C3AE /* MWMWhatsNewDownloaderEditorController.mm in Sources */, - 6741AA101BF340DE002C974C /* SelectableCell.mm in Sources */, F6B97B271CD0CA990009B612 /* MWMBookmarkNameCell.mm in Sources */, 6741AA111BF340DE002C974C /* MWMSearchCategoriesManager.mm in Sources */, 34ABA6211C2D517500FE1BEC /* MWMInputValidator.mm in Sources */, @@ -5127,7 +5124,6 @@ 34C9BD051C6DB693000DC38D /* MWMViewController.mm in Sources */, F69E912B1D9A877A00D7A778 /* MWMOpeningHours.mm in Sources */, 6741AA161BF340DE002C974C /* MWMCustomFacebookEvents.mm in Sources */, - 6741AA171BF340DE002C974C /* SwitchCell.mm in Sources */, 6741AA181BF340DE002C974C /* UIView+RuntimeAttributes.mm in Sources */, 341F99DE1C6B1165001C67B8 /* MWMMapDownloaderSubplaceTableViewCell.mm in Sources */, F69AEEBA1DDB263E00BE034A /* MWMOpeningHoursLayoutHelper.mm in Sources */, @@ -5143,11 +5139,11 @@ 6741AA1D1BF340DE002C974C /* MWMDownloadTransitMapAlert.mm in Sources */, 341F99DA1C6B1165001C67B8 /* MWMMapDownloaderPlaceTableViewCell.mm in Sources */, 341F99D61C6B1165001C67B8 /* MWMMapDownloaderLargeCountryTableViewCell.mm in Sources */, + 3400AB391E02E8CE004036E2 /* MWMTableViewCell+CellId.swift in Sources */, 346B42AC1DD5E3D20094EBEE /* MWMLocationNotFoundAlert.mm in Sources */, 34BBB7241DD0853B0002E025 /* MWMSearchManager+Layout.mm in Sources */, 348C26061D701B9F00813924 /* MWMHelpController.mm in Sources */, 348868EC1D8721650069BBA3 /* MWMSearchNoResults.mm in Sources */, - 6741AA1E1BF340DE002C974C /* LinkCell.mm in Sources */, 345FD7E81CEC7D8400F58045 /* MWMEditorAdditionalNamesHeader.mm in Sources */, 347FD8701C60B2CE002FB65E /* MWMOpeningHoursAllDayTableViewCell.mm in Sources */, 6741AA1F1BF340DE002C974C /* MWMSearchBookmarksCell.mm in Sources */, @@ -5175,6 +5171,7 @@ 56D545631C74A41900E3719C /* Framework.cpp in Sources */, F68FCB8B1DA7BD20007CC7D7 /* MWMTaxiPreviewCell.mm in Sources */, F65B31F21DD20E9600105FDE /* MWMiPhonePlacePageLayoutImpl.mm in Sources */, + 34FFADC91E02991A0061AC4D /* SettingsTableViewSelectableCell.swift in Sources */, F6E9BF2A1CE364150050E534 /* MWMEditBookmarkController.mm in Sources */, 6741AA2C1BF340DE002C974C /* MWMSearchBookmarksManager.mm in Sources */, F6A2184A1CA3F26800BE2CC6 /* MWMEditorViralActivityItem.mm in Sources */, @@ -5188,7 +5185,6 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 849CF6811DE842290024A8A5 /* CommunityVC.mm in Sources */, 849CF6821DE842290024A8A5 /* main.mm in Sources */, 849CF6831DE842290024A8A5 /* MWMSearchTabbedViewController.mm in Sources */, 849CF6841DE842290024A8A5 /* MWMShareActivityItem.mm in Sources */, @@ -5244,6 +5240,7 @@ 849CF6B41DE842290024A8A5 /* MWMPlacePageActionBar.mm in Sources */, 849CF6B51DE842290024A8A5 /* MWMMigrationView.mm in Sources */, 849CF6B61DE842290024A8A5 /* MWMOpeningHoursDeleteScheduleTableViewCell.mm in Sources */, + 34FFADCA1E02991A0061AC4D /* SettingsTableViewSelectableCell.swift in Sources */, 849CF6B71DE842290024A8A5 /* MWMCuisineEditorViewController.mm in Sources */, 849CF6B81DE842290024A8A5 /* UIButton+Orientation.mm in Sources */, 849CF6B91DE842290024A8A5 /* MWMSearchCommonCell.mm in Sources */, @@ -5274,6 +5271,7 @@ 849CF6D41DE842290024A8A5 /* MWMRouterSavedState.mm in Sources */, 849CF6D51DE842290024A8A5 /* MWMTableViewController.mm in Sources */, 849CF6D61DE842290024A8A5 /* MWMTTSLanguageViewController.mm in Sources */, + 345050251E028CB500A8DC59 /* SettingsTableViewLinkCell.swift in Sources */, 849CF6D71DE842290024A8A5 /* UISwitch+RuntimeAttributes.m in Sources */, 849CF6D81DE842290024A8A5 /* MWMSegue.mm in Sources */, 849CF6D91DE842290024A8A5 /* Framework.cpp in Sources */, @@ -5303,9 +5301,9 @@ 849CF6F11DE842290024A8A5 /* MWMCircularProgress.mm in Sources */, 849CF6F21DE842290024A8A5 /* MWMSearchCell.mm in Sources */, 849CF6F31DE842290024A8A5 /* MWMButton.mm in Sources */, - 849CF6F41DE842290024A8A5 /* MWMSettingsViewController.mm in Sources */, 849CF6F51DE842290024A8A5 /* MWMPlacePageLayout.mm in Sources */, 849CF6F61DE842290024A8A5 /* MWMNavigationDashboardEntity.mm in Sources */, + 34FFADCE1E029C550061AC4D /* SettingsTableViewSwitchCell.swift in Sources */, 849CF6F71DE842290024A8A5 /* MWMPlacePageInfoCell.mm in Sources */, 849CF6F81DE842290024A8A5 /* MWMSearchHistoryManager.mm in Sources */, 849CF6F91DE842290024A8A5 /* CALayer+RuntimeAttributes.mm in Sources */, @@ -5345,6 +5343,7 @@ 849CF71A1DE842290024A8A5 /* MWMDropDown.mm in Sources */, 849CF71B1DE842290024A8A5 /* MWMEditorSelectTableViewCell.mm in Sources */, 849CF71C1DE842290024A8A5 /* MWMPageController.mm in Sources */, + 3400AB3A1E02E8CE004036E2 /* MWMTableViewCell+CellId.swift in Sources */, 849CF71D1DE842290024A8A5 /* MWMNavigationDashboardManager.mm in Sources */, 849CF71E1DE842290024A8A5 /* MWMEditorViewController.mm in Sources */, 849CF71F1DE842290024A8A5 /* MWMMapDownloaderExtendedDataSourceWithAds.mm in Sources */, @@ -5367,7 +5366,6 @@ 849CF72F1DE842290024A8A5 /* MWMInputValidator.mm in Sources */, 849CF7301DE842290024A8A5 /* MWMActionBarButton.mm in Sources */, 849CF7311DE842290024A8A5 /* MWMKeyboard.mm in Sources */, - 849CF7321DE842290024A8A5 /* SelectableCell.mm in Sources */, 849CF7331DE842290024A8A5 /* MWMInputValidatorFactory.mm in Sources */, 849CF7341DE842290024A8A5 /* MWMSearchChangeModeView.mm in Sources */, 849CF7351DE842290024A8A5 /* MWMSearchCategoriesManager.mm in Sources */, @@ -5387,11 +5385,11 @@ 849CF7421DE842290024A8A5 /* MWMNoMapsView.mm in Sources */, 849CF7431DE842290024A8A5 /* MWMCustomFacebookEvents.mm in Sources */, 349B926E1DF0518E007779DD /* MWMToast.mm in Sources */, - 849CF7441DE842290024A8A5 /* SwitchCell.mm in Sources */, 849CF7451DE842290024A8A5 /* UIView+RuntimeAttributes.mm in Sources */, 849CF7461DE842290024A8A5 /* MWMTableViewCell.mm in Sources */, 849CF7471DE842290024A8A5 /* MWMDownloaderDialogCell.mm in Sources */, 849CF7481DE842290024A8A5 /* MWMPlacePageEntity.mm in Sources */, + 345050141E02887000A8DC59 /* MWMSettingsViewController.mm in Sources */, 849CF7491DE842290024A8A5 /* MWMPlacePageButtonCell.mm in Sources */, 849CF74A1DE842290024A8A5 /* MWMHelpController.mm in Sources */, 849CF74B1DE842290024A8A5 /* MWMSearchNoResults.mm in Sources */, @@ -5409,7 +5407,6 @@ 849CF7571DE842290024A8A5 /* MWMMigrationViewController.mm in Sources */, 849CF7581DE842290024A8A5 /* MWMDownloadTransitMapAlert.mm in Sources */, 849CF7591DE842290024A8A5 /* MWMMapDownloaderDefaultDataSource.mm in Sources */, - 849CF75A1DE842290024A8A5 /* LinkCell.mm in Sources */, 849CF75B1DE842290024A8A5 /* MWMSearchBookmarksCell.mm in Sources */, 849CF75C1DE842290024A8A5 /* MWMNavigationView.mm in Sources */, 849CF75D1DE842290024A8A5 /* UIFont+MapsMeFonts.mm in Sources */, @@ -5524,11 +5521,13 @@ 6741AA551BF340DE002C974C /* Simulator */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_MODULES = YES; ENABLE_BITCODE = YES; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/Frameworks/HockeySDK.embeddedframework", ); + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_NAME = "xc dbg"; }; name = Simulator; @@ -5536,11 +5535,13 @@ 6741AA561BF340DE002C974C /* Simulator Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_MODULES = YES; ENABLE_BITCODE = YES; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/Frameworks/HockeySDK.embeddedframework", ); + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_NAME = "xc rel"; }; name = "Simulator Release"; @@ -5548,11 +5549,13 @@ 6741AA571BF340DE002C974C /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_MODULES = YES; ENABLE_BITCODE = YES; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/Frameworks/HockeySDK.embeddedframework", ); + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_NAME = "xc dbg"; VALID_ARCHS = "arm64 armv7 armv7s i386 x86_64"; }; @@ -5561,11 +5564,13 @@ 6741AA591BF340DE002C974C /* AdHoc */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_MODULES = YES; ENABLE_BITCODE = YES; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/Frameworks/HockeySDK.embeddedframework", ); + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_NAME = "xc beta"; }; name = AdHoc; @@ -5573,11 +5578,13 @@ 6741AA5A1BF340DE002C974C /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_MODULES = YES; ENABLE_BITCODE = YES; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/Frameworks/HockeySDK.embeddedframework", ); + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_NAME = "xc rel"; VALID_ARCHS = "arm64 armv7 armv7s i386 x86_64"; }; @@ -5586,11 +5593,13 @@ 6741AA5C1BF340DE002C974C /* Production Full */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_MODULES = YES; ENABLE_BITCODE = YES; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/Frameworks/HockeySDK.embeddedframework", ); + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_NAME = "xc pf"; }; name = "Production Full"; @@ -5599,12 +5608,14 @@ isa = XCBuildConfiguration; buildSettings = { BUILD_DIR = "$(BUILD_ROOT)"; + CLANG_ENABLE_MODULES = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; DEVELOPMENT_TEAM = 3T6FSDE8C7; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/Frameworks/HockeySDK.embeddedframework", ); + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; LIBRARY_SEARCH_PATHS = ( "$(inherited)", "$(OMIM_ROOT)/../omim-iphone-cmake-debug-$(CURRENT_ARCH)/out/debug", @@ -5647,12 +5658,14 @@ isa = XCBuildConfiguration; buildSettings = { BUILD_DIR = "$(BUILD_ROOT)"; + CLANG_ENABLE_MODULES = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; DEVELOPMENT_TEAM = 3T6FSDE8C7; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/Frameworks/HockeySDK.embeddedframework", ); + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; LIBRARY_SEARCH_PATHS = ( "$(inherited)", "$(OMIM_ROOT)/../omim-iphone-cmake-release-$(CURRENT_ARCH)/out/release", @@ -5695,12 +5708,14 @@ isa = XCBuildConfiguration; buildSettings = { BUILD_DIR = "$(BUILD_ROOT)"; + CLANG_ENABLE_MODULES = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; DEVELOPMENT_TEAM = 3T6FSDE8C7; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/Frameworks/HockeySDK.embeddedframework", ); + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; LIBRARY_SEARCH_PATHS = ( "$(inherited)", "$(OMIM_ROOT)/../omim-iphone-cmake-debug-$(CURRENT_ARCH)/out/debug", @@ -5743,12 +5758,14 @@ isa = XCBuildConfiguration; buildSettings = { BUILD_DIR = "$(BUILD_ROOT)"; + CLANG_ENABLE_MODULES = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; DEVELOPMENT_TEAM = 3T6FSDE8C7; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/Frameworks/HockeySDK.embeddedframework", ); + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; LIBRARY_SEARCH_PATHS = ( "$(inherited)", "$(OMIM_ROOT)/../omim-iphone-cmake-release-$(CURRENT_ARCH)/out/release", @@ -5791,12 +5808,14 @@ isa = XCBuildConfiguration; buildSettings = { BUILD_DIR = "$(BUILD_ROOT)"; + CLANG_ENABLE_MODULES = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; DEVELOPMENT_TEAM = 3T6FSDE8C7; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/Frameworks/HockeySDK.embeddedframework", ); + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; LIBRARY_SEARCH_PATHS = ( "$(inherited)", "$(OMIM_ROOT)/../omim-iphone-cmake-release-$(CURRENT_ARCH)/out/release", @@ -5839,12 +5858,14 @@ isa = XCBuildConfiguration; buildSettings = { BUILD_DIR = "$(BUILD_ROOT)"; + CLANG_ENABLE_MODULES = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; DEVELOPMENT_TEAM = 3T6FSDE8C7; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/Frameworks/HockeySDK.embeddedframework", ); + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; LIBRARY_SEARCH_PATHS = ( "$(inherited)", "$(OMIM_ROOT)/../omim-iphone-cmake-release-$(CURRENT_ARCH)/out/release", @@ -5918,6 +5939,11 @@ PRODUCT_NAME = "maps.me dbg"; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = "iphonesimulator iphoneos"; + SWIFT_OBJC_BRIDGING_HEADER = "Bridging-Header.h"; + SWIFT_OBJC_INTERFACE_HEADER_NAME = SwiftBridge.h; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 3.0; + SWIFT_WHOLE_MODULE_OPTIMIZATION = YES; TARGETED_DEVICE_FAMILY = "1,2"; VALID_ARCHS = "i386 x86_64"; VERSIONING_SYSTEM = "apple-generic"; @@ -5928,10 +5954,12 @@ isa = XCBuildConfiguration; buildSettings = { BUILD_DIR = "$(BUILD_ROOT)"; + CLANG_ENABLE_MODULES = YES; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/Frameworks/HockeySDK.embeddedframework", ); + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; LIBRARY_SEARCH_PATHS = ( "$(inherited)", "$(OMIM_ROOT)/../omim-iphone-debug-$(CURRENT_ARCH)/out/debug", @@ -6001,6 +6029,11 @@ PRODUCT_NAME = "maps.me dbg"; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = "iphonesimulator iphoneos"; + SWIFT_OBJC_BRIDGING_HEADER = "Bridging-Header.h"; + SWIFT_OBJC_INTERFACE_HEADER_NAME = SwiftBridge.h; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 3.0; + SWIFT_WHOLE_MODULE_OPTIMIZATION = YES; TARGETED_DEVICE_FAMILY = "1,2"; VALID_ARCHS = "armv7 armv7s arm64"; VERSIONING_SYSTEM = "apple-generic"; @@ -6011,10 +6044,12 @@ isa = XCBuildConfiguration; buildSettings = { BUILD_DIR = "$(BUILD_ROOT)"; + CLANG_ENABLE_MODULES = YES; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/Frameworks/HockeySDK.embeddedframework", ); + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; LIBRARY_SEARCH_PATHS = ( "$(inherited)", "$(OMIM_ROOT)/../omim-iphone-debug-$(CURRENT_ARCH)/out/debug", @@ -6086,6 +6121,11 @@ PRODUCT_NAME = "maps.me beta"; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = "iphonesimulator iphoneos"; + SWIFT_OBJC_BRIDGING_HEADER = "Bridging-Header.h"; + SWIFT_OBJC_INTERFACE_HEADER_NAME = SwiftBridge.h; + SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; + SWIFT_VERSION = 3.0; + SWIFT_WHOLE_MODULE_OPTIMIZATION = YES; TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = YES; VALID_ARCHS = "armv7 armv7s arm64"; @@ -6097,10 +6137,12 @@ isa = XCBuildConfiguration; buildSettings = { BUILD_DIR = "$(BUILD_ROOT)"; + CLANG_ENABLE_MODULES = YES; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/Frameworks/HockeySDK.embeddedframework", ); + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; LIBRARY_SEARCH_PATHS = ( "$(inherited)", "$(OMIM_ROOT)/../omim-iphone-production-$(CURRENT_ARCH)/out/production", @@ -6172,6 +6214,11 @@ PRODUCT_NAME = maps.me; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = "iphonesimulator iphoneos"; + SWIFT_OBJC_BRIDGING_HEADER = "Bridging-Header.h"; + SWIFT_OBJC_INTERFACE_HEADER_NAME = SwiftBridge.h; + SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; + SWIFT_VERSION = 3.0; + SWIFT_WHOLE_MODULE_OPTIMIZATION = YES; TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = YES; VALID_ARCHS = "armv7 armv7s arm64"; @@ -6183,10 +6230,12 @@ isa = XCBuildConfiguration; buildSettings = { BUILD_DIR = "$(BUILD_ROOT)"; + CLANG_ENABLE_MODULES = YES; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/Frameworks/HockeySDK.embeddedframework", ); + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; LIBRARY_SEARCH_PATHS = ( "$(inherited)", "$(OMIM_ROOT)/../omim-iphone-production-$(CURRENT_ARCH)/out/production", @@ -6259,6 +6308,11 @@ PRODUCT_NAME = "maps.me rel"; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = "iphonesimulator iphoneos"; + SWIFT_OBJC_BRIDGING_HEADER = "Bridging-Header.h"; + SWIFT_OBJC_INTERFACE_HEADER_NAME = SwiftBridge.h; + SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; + SWIFT_VERSION = 3.0; + SWIFT_WHOLE_MODULE_OPTIMIZATION = YES; TARGETED_DEVICE_FAMILY = "1,2"; VALID_ARCHS = "armv7 armv7s arm64"; VERSIONING_SYSTEM = "apple-generic"; @@ -6269,10 +6323,12 @@ isa = XCBuildConfiguration; buildSettings = { BUILD_DIR = "$(BUILD_ROOT)"; + CLANG_ENABLE_MODULES = YES; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/Frameworks/HockeySDK.embeddedframework", ); + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; LIBRARY_SEARCH_PATHS = ( "$(inherited)", "$(OMIM_ROOT)/../omim-iphone-release-$(CURRENT_ARCH)/out/release", @@ -6346,6 +6402,11 @@ PRODUCT_NAME = "maps.me rel"; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = "iphonesimulator iphoneos"; + SWIFT_OBJC_BRIDGING_HEADER = "Bridging-Header.h"; + SWIFT_OBJC_INTERFACE_HEADER_NAME = SwiftBridge.h; + SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; + SWIFT_VERSION = 3.0; + SWIFT_WHOLE_MODULE_OPTIMIZATION = YES; TARGETED_DEVICE_FAMILY = "1,2"; VALID_ARCHS = "i386 x86_64"; VERSIONING_SYSTEM = "apple-generic"; @@ -6356,10 +6417,12 @@ isa = XCBuildConfiguration; buildSettings = { BUILD_DIR = "$(BUILD_ROOT)"; + CLANG_ENABLE_MODULES = YES; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/Frameworks/HockeySDK.embeddedframework", ); + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; LIBRARY_SEARCH_PATHS = ( "$(inherited)", "$(OMIM_ROOT)/../omim-iphone-release-$(CURRENT_ARCH)/out/release", diff --git a/iphone/Maps/Settings.storyboard b/iphone/Maps/Settings.storyboard index 674d23df9a..ddf5124ab1 100644 --- a/iphone/Maps/Settings.storyboard +++ b/iphone/Maps/Settings.storyboard @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11542" systemVersion="16B2555" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES"> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11762" systemVersion="16C67" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES"> <device id="retina4_7" orientation="portrait"> <adaptation id="fullscreen"/> </device> <dependencies> <deployment identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11524"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11757"/> <capability name="Constraints to layout margins" minToolsVersion="6.0"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> @@ -21,11 +21,11 @@ <sections> <tableViewSection id="eZf-AO-B39"> <cells> - <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="LinkCell" id="yh8-cr-14c" customClass="LinkCell"> + <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewLinkCell" id="yh8-cr-14c" customClass="SettingsTableViewLinkCell" customModule="cmMAPS_ME" customModuleProvider="target"> <rect key="frame" x="0.0" y="35" width="375" height="44"/> <autoresizingMask key="autoresizingMask"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="yh8-cr-14c" id="MYm-HI-oOR"> - <rect key="frame" x="0.0" y="0.0" width="342" height="43"/> + <rect key="frame" x="0.0" y="0.0" width="342" height="44"/> <autoresizingMask key="autoresizingMask"/> <subviews> <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Профиль" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="8jb-wX-P4h"> @@ -33,21 +33,12 @@ <fontDescription key="fontDescription" type="system" pointSize="17"/> <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <nil key="highlightedColor"/> - <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular17"/> - <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="profile"/> - </userDefinedRuntimeAttributes> </label> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="300" verticalHuggingPriority="251" horizontalCompressionResistancePriority="700" text="igortomko" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="gix-nv-IcA"> <rect key="frame" x="264" y="12" width="78" height="20"/> <fontDescription key="fontDescription" type="system" pointSize="17"/> <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.54000000000000004" colorSpace="custom" customColorSpace="sRGB"/> <nil key="highlightedColor"/> - <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackSecondaryText"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular17"/> - </userDefinedRuntimeAttributes> </label> </subviews> <constraints> @@ -60,19 +51,16 @@ <constraint firstAttribute="bottom" secondItem="8jb-wX-P4h" secondAttribute="bottom" constant="12" id="ox3-NV-T2v"/> </constraints> </tableViewCellContentView> - <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/> - </userDefinedRuntimeAttributes> <connections> - <outlet property="infoLabel" destination="gix-nv-IcA" id="euY-EZ-gJc"/> - <outlet property="titleLabel" destination="8jb-wX-P4h" id="swZ-rt-c36"/> + <outlet property="info" destination="gix-nv-IcA" id="euY-EZ-gJc"/> + <outlet property="title" destination="8jb-wX-P4h" id="swZ-rt-c36"/> </connections> </tableViewCell> </cells> </tableViewSection> <tableViewSection headerTitle="ОБЩИЕ НАСТРОЙКИ" footerTitle="Сбор статистики помогает нам совершенствовать приложение." id="Swo-3Q-lWx"> <cells> - <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="LinkCell" id="Igk-BI-aHN" customClass="LinkCell"> + <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewLinkCell" id="Igk-BI-aHN" customClass="SettingsTableViewLinkCell" customModule="cmMAPS_ME" customModuleProvider="target"> <rect key="frame" x="0.0" y="135" width="375" height="44"/> <autoresizingMask key="autoresizingMask"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Igk-BI-aHN" id="Qae-gb-v0B"> @@ -84,21 +72,12 @@ <fontDescription key="fontDescription" type="system" pointSize="17"/> <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <nil key="highlightedColor"/> - <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular17"/> - <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="measurement_units"/> - </userDefinedRuntimeAttributes> </label> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="300" verticalHuggingPriority="251" horizontalCompressionResistancePriority="700" text="Километры " textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ZzK-qL-wC4"> <rect key="frame" x="246" y="12" width="96" height="19"/> <fontDescription key="fontDescription" type="system" pointSize="17"/> <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.54000000000000004" colorSpace="custom" customColorSpace="sRGB"/> <nil key="highlightedColor"/> - <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackSecondaryText"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular17"/> - </userDefinedRuntimeAttributes> </label> </subviews> <constraints> @@ -111,15 +90,12 @@ <constraint firstItem="RB1-Nr-K3T" firstAttribute="top" secondItem="Qae-gb-v0B" secondAttribute="top" constant="12" id="wFF-IM-coX"/> </constraints> </tableViewCellContentView> - <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/> - </userDefinedRuntimeAttributes> <connections> - <outlet property="infoLabel" destination="ZzK-qL-wC4" id="rKh-6z-ePx"/> - <outlet property="titleLabel" destination="RB1-Nr-K3T" id="qLp-eT-hWj"/> + <outlet property="info" destination="ZzK-qL-wC4" id="rKh-6z-ePx"/> + <outlet property="title" destination="RB1-Nr-K3T" id="qLp-eT-hWj"/> </connections> </tableViewCell> - <tableViewCell contentMode="scaleToFill" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SwitchCell" id="LYi-oF-eGj" customClass="SwitchCell"> + <tableViewCell contentMode="scaleToFill" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewSwitchCell" id="LYi-oF-eGj" customClass="SettingsTableViewSwitchCell" customModule="cmMAPS_ME" customModuleProvider="target"> <rect key="frame" x="0.0" y="179" width="375" height="44"/> <autoresizingMask key="autoresizingMask"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="LYi-oF-eGj" id="6SA-kx-JeG"> @@ -132,19 +108,11 @@ <fontDescription key="fontDescription" type="system" pointSize="17"/> <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <nil key="highlightedColor"/> - <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular17"/> - <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="pref_zoom_title"/> - </userDefinedRuntimeAttributes> </label> <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="taQ-3Z-nh3"> <rect key="frame" x="310" y="6" width="51" height="31"/> <inset key="insetFor6xAndEarlier" minX="3" minY="-2" maxX="-3" maxY="2"/> <color key="onTintColor" red="0.1176470588" green="0.58823529409999997" blue="0.94117647059999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> - <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="onTintColorName" value="linkBlue"/> - </userDefinedRuntimeAttributes> </switch> </subviews> <constraints> @@ -156,15 +124,12 @@ <constraint firstItem="OM9-RZ-sca" firstAttribute="leading" secondItem="6SA-kx-JeG" secondAttribute="leadingMargin" constant="8" id="zFD-3E-gZ3"/> </constraints> </tableViewCellContentView> - <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/> - </userDefinedRuntimeAttributes> <connections> <outlet property="switchButton" destination="taQ-3Z-nh3" id="5XW-3N-pah"/> - <outlet property="titleLabel" destination="OM9-RZ-sca" id="Zoz-kD-Jq9"/> + <outlet property="title" destination="OM9-RZ-sca" id="Zoz-kD-Jq9"/> </connections> </tableViewCell> - <tableViewCell contentMode="scaleToFill" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SwitchCell" id="0Lf-xU-P2U" customClass="SwitchCell"> + <tableViewCell contentMode="scaleToFill" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewSwitchCell" id="0Lf-xU-P2U" customClass="SettingsTableViewSwitchCell" customModule="cmMAPS_ME" customModuleProvider="target"> <rect key="frame" x="0.0" y="223" width="375" height="44"/> <autoresizingMask key="autoresizingMask"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="0Lf-xU-P2U" id="3Q1-iE-5pP"> @@ -177,19 +142,11 @@ <fontDescription key="fontDescription" type="system" pointSize="17"/> <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <nil key="highlightedColor"/> - <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular17"/> - <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="pref_map_3d_buildings_title"/> - </userDefinedRuntimeAttributes> </label> <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="aMo-Df-9LS"> <rect key="frame" x="310" y="6" width="51" height="31"/> <inset key="insetFor6xAndEarlier" minX="3" minY="-2" maxX="-3" maxY="2"/> <color key="onTintColor" red="0.1176470588" green="0.58823529409999997" blue="0.94117647059999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> - <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="onTintColorName" value="linkBlue"/> - </userDefinedRuntimeAttributes> </switch> </subviews> <constraints> @@ -201,15 +158,12 @@ <constraint firstItem="aMo-Df-9LS" firstAttribute="centerY" secondItem="3Q1-iE-5pP" secondAttribute="centerY" id="yzl-H4-Wgy"/> </constraints> </tableViewCellContentView> - <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/> - </userDefinedRuntimeAttributes> <connections> <outlet property="switchButton" destination="aMo-Df-9LS" id="ArK-mj-6W2"/> - <outlet property="titleLabel" destination="tU0-tQ-usy" id="DLR-0f-D2j"/> + <outlet property="title" destination="tU0-tQ-usy" id="DLR-0f-D2j"/> </connections> </tableViewCell> - <tableViewCell contentMode="scaleToFill" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SwitchCell" id="eE4-OC-9uX" customClass="SwitchCell"> + <tableViewCell contentMode="scaleToFill" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewSwitchCell" id="eE4-OC-9uX" customClass="SettingsTableViewSwitchCell" customModule="cmMAPS_ME" customModuleProvider="target"> <rect key="frame" x="0.0" y="267" width="375" height="44"/> <autoresizingMask key="autoresizingMask"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="eE4-OC-9uX" id="xJx-2K-AIP"> @@ -222,19 +176,11 @@ <fontDescription key="fontDescription" type="system" pointSize="17"/> <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <nil key="highlightedColor"/> - <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular17"/> - <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="autodownload"/> - </userDefinedRuntimeAttributes> </label> <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="f8R-Di-osU"> <rect key="frame" x="310" y="6" width="51" height="31"/> <inset key="insetFor6xAndEarlier" minX="3" minY="-2" maxX="-3" maxY="2"/> <color key="onTintColor" red="0.1176470588" green="0.58823529409999997" blue="0.94117647059999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> - <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="onTintColorName" value="linkBlue"/> - </userDefinedRuntimeAttributes> </switch> </subviews> <constraints> @@ -246,15 +192,12 @@ <constraint firstItem="f8R-Di-osU" firstAttribute="centerY" secondItem="xJx-2K-AIP" secondAttribute="centerY" id="nux-0a-Yed"/> </constraints> </tableViewCellContentView> - <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/> - </userDefinedRuntimeAttributes> <connections> <outlet property="switchButton" destination="f8R-Di-osU" id="Ulm-3T-fZ2"/> - <outlet property="titleLabel" destination="6ZU-5V-v0J" id="o2Z-fX-Ivz"/> + <outlet property="title" destination="6ZU-5V-v0J" id="o2Z-fX-Ivz"/> </connections> </tableViewCell> - <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="LinkCell" id="6NC-QX-WiF" customClass="LinkCell"> + <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewLinkCell" id="6NC-QX-WiF" customClass="SettingsTableViewLinkCell" customModule="cmMAPS_ME" customModuleProvider="target"> <rect key="frame" x="0.0" y="311" width="375" height="44"/> <autoresizingMask key="autoresizingMask"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="6NC-QX-WiF" id="gGY-3t-Lik"> @@ -266,21 +209,12 @@ <fontDescription key="fontDescription" type="system" pointSize="17"/> <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <nil key="highlightedColor"/> - <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular17"/> - <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="mobile_data"/> - </userDefinedRuntimeAttributes> </label> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="300" verticalHuggingPriority="251" horizontalCompressionResistancePriority="700" text="Никогда" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="d32-tz-eSW"> <rect key="frame" x="275" y="12" width="67" height="19"/> <fontDescription key="fontDescription" type="system" pointSize="17"/> <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.54000000000000004" colorSpace="custom" customColorSpace="sRGB"/> <nil key="highlightedColor"/> - <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackSecondaryText"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular17"/> - </userDefinedRuntimeAttributes> </label> </subviews> <constraints> @@ -293,15 +227,12 @@ <constraint firstItem="wjW-GA-wVI" firstAttribute="leading" secondItem="gGY-3t-Lik" secondAttribute="leading" constant="16" id="f8g-ep-puI"/> </constraints> </tableViewCellContentView> - <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/> - </userDefinedRuntimeAttributes> <connections> - <outlet property="infoLabel" destination="d32-tz-eSW" id="LJ4-Lc-Sd7"/> - <outlet property="titleLabel" destination="wjW-GA-wVI" id="9DP-zL-FLr"/> + <outlet property="info" destination="d32-tz-eSW" id="LJ4-Lc-Sd7"/> + <outlet property="title" destination="wjW-GA-wVI" id="9DP-zL-FLr"/> </connections> </tableViewCell> - <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="LinkCell" id="VyW-Wh-2QX" customClass="LinkCell"> + <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewLinkCell" id="VyW-Wh-2QX" customClass="SettingsTableViewLinkCell" customModule="cmMAPS_ME" customModuleProvider="target"> <rect key="frame" x="0.0" y="355" width="375" height="44"/> <autoresizingMask key="autoresizingMask"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="VyW-Wh-2QX" id="ihq-PO-ic8"> @@ -313,21 +244,12 @@ <fontDescription key="fontDescription" type="system" pointSize="17"/> <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <nil key="highlightedColor"/> - <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular17"/> - <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="pref_track_record_title"/> - </userDefinedRuntimeAttributes> </label> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="300" verticalHuggingPriority="251" horizontalCompressionResistancePriority="700" text="12 часов " textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="E18-yq-nve"> <rect key="frame" x="269" y="12" width="73" height="19"/> <fontDescription key="fontDescription" type="system" pointSize="17"/> <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.54000000000000004" colorSpace="custom" customColorSpace="sRGB"/> <nil key="highlightedColor"/> - <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackSecondaryText"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular17"/> - </userDefinedRuntimeAttributes> </label> </subviews> <constraints> @@ -340,15 +262,12 @@ <constraint firstAttribute="trailing" secondItem="E18-yq-nve" secondAttribute="trailing" id="zZk-q5-KZ1"/> </constraints> </tableViewCellContentView> - <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/> - </userDefinedRuntimeAttributes> <connections> - <outlet property="infoLabel" destination="E18-yq-nve" id="0h2-2n-46q"/> - <outlet property="titleLabel" destination="3ew-eh-kVT" id="69S-4H-yeg"/> + <outlet property="info" destination="E18-yq-nve" id="0h2-2n-46q"/> + <outlet property="title" destination="3ew-eh-kVT" id="69S-4H-yeg"/> </connections> </tableViewCell> - <tableViewCell contentMode="scaleToFill" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SwitchCell" id="P5e-67-f4k" customClass="SwitchCell"> + <tableViewCell contentMode="scaleToFill" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewSwitchCell" id="P5e-67-f4k" customClass="SettingsTableViewSwitchCell" customModule="cmMAPS_ME" customModuleProvider="target"> <rect key="frame" x="0.0" y="399" width="375" height="44"/> <autoresizingMask key="autoresizingMask"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="P5e-67-f4k" id="RlB-hW-A2l"> @@ -361,19 +280,11 @@ <fontDescription key="fontDescription" type="system" pointSize="17"/> <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <nil key="highlightedColor"/> - <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular17"/> - <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="pref_calibration_title"/> - </userDefinedRuntimeAttributes> </label> <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="hRC-jd-ViV"> <rect key="frame" x="310" y="6" width="51" height="31"/> <inset key="insetFor6xAndEarlier" minX="3" minY="-2" maxX="-3" maxY="2"/> <color key="onTintColor" red="0.1176470588" green="0.58823529409999997" blue="0.94117647059999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> - <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="onTintColorName" value="linkBlue"/> - </userDefinedRuntimeAttributes> </switch> </subviews> <constraints> @@ -385,15 +296,12 @@ <constraint firstAttribute="bottomMargin" secondItem="Xqo-QZ-3fd" secondAttribute="bottom" constant="3.5" id="exZ-ZW-bNy"/> </constraints> </tableViewCellContentView> - <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/> - </userDefinedRuntimeAttributes> <connections> <outlet property="switchButton" destination="hRC-jd-ViV" id="sx8-t9-edf"/> - <outlet property="titleLabel" destination="Xqo-QZ-3fd" id="W1h-0a-CQ2"/> + <outlet property="title" destination="Xqo-QZ-3fd" id="W1h-0a-CQ2"/> </connections> </tableViewCell> - <tableViewCell contentMode="scaleToFill" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SwitchCell" id="F1Y-qu-HAo" customClass="SwitchCell"> + <tableViewCell contentMode="scaleToFill" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewSwitchCell" id="F1Y-qu-HAo" customClass="SettingsTableViewSwitchCell" customModule="cmMAPS_ME" customModuleProvider="target"> <rect key="frame" x="0.0" y="443" width="375" height="44"/> <autoresizingMask key="autoresizingMask"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="F1Y-qu-HAo" id="59j-Py-CGY"> @@ -406,19 +314,11 @@ <fontDescription key="fontDescription" type="system" pointSize="17"/> <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <nil key="highlightedColor"/> - <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular17"/> - <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="showcase_settings_title"/> - </userDefinedRuntimeAttributes> </label> <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="fDF-O1-urS"> <rect key="frame" x="310" y="6" width="51" height="31"/> <inset key="insetFor6xAndEarlier" minX="3" minY="-2" maxX="-3" maxY="2"/> <color key="onTintColor" red="0.1176470588" green="0.58823529409999997" blue="0.94117647059999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> - <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="onTintColorName" value="linkBlue"/> - </userDefinedRuntimeAttributes> </switch> </subviews> <constraints> @@ -430,15 +330,12 @@ <constraint firstItem="fDF-O1-urS" firstAttribute="centerY" secondItem="59j-Py-CGY" secondAttribute="centerY" id="zFW-en-N73"/> </constraints> </tableViewCellContentView> - <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/> - </userDefinedRuntimeAttributes> <connections> <outlet property="switchButton" destination="fDF-O1-urS" id="u77-6w-0Fv"/> - <outlet property="titleLabel" destination="g5e-wH-Cqs" id="p9Q-lw-L34"/> + <outlet property="title" destination="g5e-wH-Cqs" id="p9Q-lw-L34"/> </connections> </tableViewCell> - <tableViewCell contentMode="scaleToFill" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SwitchCell" id="NOt-bc-7ls" customClass="SwitchCell"> + <tableViewCell contentMode="scaleToFill" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewSwitchCell" id="NOt-bc-7ls" customClass="SettingsTableViewSwitchCell" customModule="cmMAPS_ME" customModuleProvider="target"> <rect key="frame" x="0.0" y="487" width="375" height="44"/> <autoresizingMask key="autoresizingMask"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="NOt-bc-7ls" id="xdj-y5-zpk"> @@ -451,19 +348,11 @@ <fontDescription key="fontDescription" type="system" pointSize="17"/> <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <nil key="highlightedColor"/> - <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular17"/> - <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="allow_statistics"/> - </userDefinedRuntimeAttributes> </label> <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Y8g-7o-Lbp"> <rect key="frame" x="310" y="6" width="51" height="31"/> <inset key="insetFor6xAndEarlier" minX="3" minY="-2" maxX="-3" maxY="2"/> <color key="onTintColor" red="0.1176470588" green="0.58823529409999997" blue="0.94117647059999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> - <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="onTintColorName" value="linkBlue"/> - </userDefinedRuntimeAttributes> </switch> </subviews> <constraints> @@ -475,20 +364,17 @@ <constraint firstAttribute="bottomMargin" secondItem="K9e-I1-pZu" secondAttribute="bottom" constant="3.5" id="zwv-h0-yDO"/> </constraints> </tableViewCellContentView> - <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/> - </userDefinedRuntimeAttributes> <connections> <outlet property="switchButton" destination="Y8g-7o-Lbp" id="lHw-br-NTe"/> - <outlet property="titleLabel" destination="K9e-I1-pZu" id="76h-uJ-wp0"/> + <outlet property="title" destination="K9e-I1-pZu" id="76h-uJ-wp0"/> </connections> </tableViewCell> </cells> </tableViewSection> <tableViewSection headerTitle="НАВИГАЦИЯ" id="E4E-hs-9xW"> <cells> - <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="LinkCell" id="QNt-XC-xma" customClass="LinkCell"> - <rect key="frame" x="0.0" y="616" width="375" height="44"/> + <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewLinkCell" id="QNt-XC-xma" customClass="SettingsTableViewLinkCell" customModule="cmMAPS_ME" customModuleProvider="target"> + <rect key="frame" x="0.0" y="615" width="375" height="44"/> <autoresizingMask key="autoresizingMask"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="QNt-XC-xma" id="fBV-aJ-Mo8"> <rect key="frame" x="0.0" y="0.0" width="342" height="43"/> @@ -499,21 +385,12 @@ <fontDescription key="fontDescription" type="system" pointSize="17"/> <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <nil key="highlightedColor"/> - <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular17"/> - <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="pref_map_style_title"/> - </userDefinedRuntimeAttributes> </label> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="300" verticalHuggingPriority="251" horizontalCompressionResistancePriority="700" text="Автоматически" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="g5c-Yk-svX"> <rect key="frame" x="218" y="12" width="124" height="19"/> <fontDescription key="fontDescription" type="system" pointSize="17"/> <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.54000000000000004" colorSpace="custom" customColorSpace="sRGB"/> <nil key="highlightedColor"/> - <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackSecondaryText"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular17"/> - </userDefinedRuntimeAttributes> </label> </subviews> <constraints> @@ -526,16 +403,13 @@ <constraint firstAttribute="bottom" secondItem="g5c-Yk-svX" secondAttribute="bottom" constant="12" id="o3r-EN-Yys"/> </constraints> </tableViewCellContentView> - <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/> - </userDefinedRuntimeAttributes> <connections> - <outlet property="infoLabel" destination="g5c-Yk-svX" id="mDn-DI-WVe"/> - <outlet property="titleLabel" destination="q7P-cj-3tZ" id="3sG-Xy-G0r"/> + <outlet property="info" destination="g5c-Yk-svX" id="mDn-DI-WVe"/> + <outlet property="title" destination="q7P-cj-3tZ" id="3sG-Xy-G0r"/> </connections> </tableViewCell> - <tableViewCell contentMode="scaleToFill" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SwitchCell" id="X5R-fv-yd7" customClass="SwitchCell"> - <rect key="frame" x="0.0" y="660" width="375" height="44"/> + <tableViewCell contentMode="scaleToFill" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewSwitchCell" id="X5R-fv-yd7" customClass="SettingsTableViewSwitchCell" customModule="cmMAPS_ME" customModuleProvider="target"> + <rect key="frame" x="0.0" y="659" width="375" height="44"/> <autoresizingMask key="autoresizingMask"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="X5R-fv-yd7" id="s7y-Nu-Y01"> <rect key="frame" x="0.0" y="0.0" width="375" height="43"/> @@ -547,19 +421,11 @@ <fontDescription key="fontDescription" type="system" pointSize="17"/> <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <nil key="highlightedColor"/> - <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular17"/> - <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="pref_map_3d_title"/> - </userDefinedRuntimeAttributes> </label> <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="m0S-BP-FrU"> <rect key="frame" x="310" y="6" width="51" height="31"/> <inset key="insetFor6xAndEarlier" minX="3" minY="-2" maxX="-3" maxY="2"/> <color key="onTintColor" red="0.1176470588" green="0.58823529409999997" blue="0.94117647059999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> - <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="onTintColorName" value="linkBlue"/> - </userDefinedRuntimeAttributes> </switch> </subviews> <constraints> @@ -571,16 +437,13 @@ <constraint firstAttribute="bottomMargin" secondItem="tmn-CU-6EB" secondAttribute="bottom" constant="3.5" id="rka-6b-tiF"/> </constraints> </tableViewCellContentView> - <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/> - </userDefinedRuntimeAttributes> <connections> <outlet property="switchButton" destination="m0S-BP-FrU" id="XHn-HC-wmQ"/> - <outlet property="titleLabel" destination="tmn-CU-6EB" id="OMB-Ug-n6a"/> + <outlet property="title" destination="tmn-CU-6EB" id="OMB-Ug-n6a"/> </connections> </tableViewCell> - <tableViewCell contentMode="scaleToFill" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SwitchCell" id="veW-Fm-2Hl" customClass="SwitchCell"> - <rect key="frame" x="0.0" y="704" width="375" height="44"/> + <tableViewCell contentMode="scaleToFill" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewSwitchCell" id="veW-Fm-2Hl" customClass="SettingsTableViewSwitchCell" customModule="cmMAPS_ME" customModuleProvider="target"> + <rect key="frame" x="0.0" y="703" width="375" height="44"/> <autoresizingMask key="autoresizingMask"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="veW-Fm-2Hl" id="AP7-jd-F4b"> <rect key="frame" x="0.0" y="0.0" width="375" height="43"/> @@ -592,19 +455,11 @@ <fontDescription key="fontDescription" type="system" pointSize="17"/> <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <nil key="highlightedColor"/> - <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular17"/> - <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="pref_map_auto_zoom"/> - </userDefinedRuntimeAttributes> </label> <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="ipg-f4-K5Q"> <rect key="frame" x="310" y="6" width="51" height="31"/> <inset key="insetFor6xAndEarlier" minX="3" minY="-2" maxX="-3" maxY="2"/> <color key="onTintColor" red="0.1176470588" green="0.58823529409999997" blue="0.94117647059999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> - <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="onTintColorName" value="linkBlue"/> - </userDefinedRuntimeAttributes> </switch> </subviews> <constraints> @@ -616,16 +471,13 @@ <constraint firstItem="ipg-f4-K5Q" firstAttribute="leading" secondItem="qL3-bA-5tn" secondAttribute="trailing" constant="8" id="shR-d1-nGm"/> </constraints> </tableViewCellContentView> - <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/> - </userDefinedRuntimeAttributes> <connections> <outlet property="switchButton" destination="ipg-f4-K5Q" id="B3l-Gn-D3R"/> - <outlet property="titleLabel" destination="qL3-bA-5tn" id="erU-oe-Lg5"/> + <outlet property="title" destination="qL3-bA-5tn" id="erU-oe-Lg5"/> </connections> </tableViewCell> - <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="LinkCell" id="nED-2n-gN6" customClass="LinkCell"> - <rect key="frame" x="0.0" y="748" width="375" height="44"/> + <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewLinkCell" id="nED-2n-gN6" customClass="SettingsTableViewLinkCell" customModule="cmMAPS_ME" customModuleProvider="target"> + <rect key="frame" x="0.0" y="747" width="375" height="44"/> <autoresizingMask key="autoresizingMask"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="nED-2n-gN6" id="2oQ-0g-poj"> <rect key="frame" x="0.0" y="0.0" width="342" height="43"/> @@ -636,21 +488,12 @@ <fontDescription key="fontDescription" type="system" pointSize="17"/> <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <nil key="highlightedColor"/> - <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular17"/> - <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="pref_tts_language_title"/> - </userDefinedRuntimeAttributes> </label> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="300" verticalHuggingPriority="251" horizontalCompressionResistancePriority="700" text="Nederlands" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="DQG-mX-mR7"> <rect key="frame" x="254" y="12" width="88" height="19"/> <fontDescription key="fontDescription" type="system" pointSize="17"/> <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.54000000000000004" colorSpace="custom" customColorSpace="sRGB"/> <nil key="highlightedColor"/> - <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackSecondaryText"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular17"/> - </userDefinedRuntimeAttributes> </label> </subviews> <constraints> @@ -663,60 +506,59 @@ <constraint firstAttribute="bottom" secondItem="2v2-mU-aWi" secondAttribute="bottom" constant="12" id="yX7-xN-djG"/> </constraints> </tableViewCellContentView> - <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/> - </userDefinedRuntimeAttributes> <connections> - <outlet property="infoLabel" destination="DQG-mX-mR7" id="f74-qg-BH5"/> - <outlet property="titleLabel" destination="2v2-mU-aWi" id="Zp1-zJ-xDM"/> + <outlet property="info" destination="DQG-mX-mR7" id="f74-qg-BH5"/> + <outlet property="title" destination="2v2-mU-aWi" id="Zp1-zJ-xDM"/> </connections> </tableViewCell> </cells> </tableViewSection> <tableViewSection headerTitle="ИНФОРМАЦИЯ" id="i4H-WV-BaS"> <cells> - <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="LinkCell" id="JTZ-K9-RVv" customClass="LinkCell"> - <rect key="frame" x="0.0" y="841" width="375" height="44"/> + <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewLinkCell" id="JTZ-K9-RVv" customClass="SettingsTableViewLinkCell" customModule="cmMAPS_ME" customModuleProvider="target"> + <rect key="frame" x="0.0" y="839" width="375" height="44"/> <autoresizingMask key="autoresizingMask"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="JTZ-K9-RVv" id="mHA-wn-hse"> <rect key="frame" x="0.0" y="0.0" width="342" height="43"/> <autoresizingMask key="autoresizingMask"/> <subviews> - <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Спавочный центр" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="7ty-Jh-0Rp"> - <rect key="frame" x="16" y="12" width="310" height="19"/> + <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Справочный центр" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="7ty-Jh-0Rp"> + <rect key="frame" x="16" y="12" width="322" height="19"/> <fontDescription key="fontDescription" type="system" pointSize="17"/> <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <nil key="highlightedColor"/> - <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular17"/> - <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="help"/> - </userDefinedRuntimeAttributes> + </label> + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="300" verticalHuggingPriority="251" horizontalCompressionResistancePriority="700" text="" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="vlu-iM-vCC"> + <rect key="frame" x="342" y="12" width="0.0" height="19"/> + <fontDescription key="fontDescription" type="system" pointSize="17"/> + <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.54000000000000004" colorSpace="custom" customColorSpace="sRGB"/> + <nil key="highlightedColor"/> </label> </subviews> <constraints> + <constraint firstAttribute="bottom" secondItem="vlu-iM-vCC" secondAttribute="bottom" constant="12" id="9Ud-vK-qsL"/> <constraint firstItem="7ty-Jh-0Rp" firstAttribute="top" secondItem="mHA-wn-hse" secondAttribute="top" constant="12" id="AMe-NV-Ved"/> <constraint firstAttribute="bottom" secondItem="7ty-Jh-0Rp" secondAttribute="bottom" constant="12" id="J65-Bz-2GH"/> + <constraint firstAttribute="trailing" secondItem="vlu-iM-vCC" secondAttribute="trailing" id="S5J-OF-5pJ"/> <constraint firstItem="7ty-Jh-0Rp" firstAttribute="leading" secondItem="mHA-wn-hse" secondAttribute="leading" constant="16" id="XTm-r1-9pS"/> - <constraint firstAttribute="trailing" secondItem="7ty-Jh-0Rp" secondAttribute="trailing" constant="16" id="mPn-eQ-3sq"/> + <constraint firstItem="vlu-iM-vCC" firstAttribute="top" secondItem="mHA-wn-hse" secondAttribute="top" constant="12" id="boE-vl-fNZ"/> + <constraint firstItem="vlu-iM-vCC" firstAttribute="leading" secondItem="7ty-Jh-0Rp" secondAttribute="trailing" constant="4" id="dFN-xS-NgI"/> </constraints> </tableViewCellContentView> - <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/> - </userDefinedRuntimeAttributes> <connections> - <outlet property="titleLabel" destination="7ty-Jh-0Rp" id="5ls-qT-ZNd"/> + <outlet property="info" destination="vlu-iM-vCC" id="4OC-0x-RyY"/> + <outlet property="title" destination="7ty-Jh-0Rp" id="5ls-qT-ZNd"/> </connections> </tableViewCell> - <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="LinkCell" id="Kv3-pO-jV5" customClass="LinkCell"> - <rect key="frame" x="0.0" y="885" width="375" height="44"/> + <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewLinkCell" id="Kv3-pO-jV5" customClass="SettingsTableViewLinkCell" customModule="cmMAPS_ME" customModuleProvider="target"> + <rect key="frame" x="0.0" y="883" width="375" height="44"/> <autoresizingMask key="autoresizingMask"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Kv3-pO-jV5" id="8mJ-wm-9uJ"> <rect key="frame" x="0.0" y="0.0" width="342" height="43"/> <autoresizingMask key="autoresizingMask"/> <subviews> <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="О приложении" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="cS1-Lw-pFx"> - <rect key="frame" x="16" y="12" width="310" height="19"/> + <rect key="frame" x="16" y="12" width="322" height="19"/> <fontDescription key="fontDescription" type="system" pointSize="17"/> <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <nil key="highlightedColor"/> @@ -726,19 +568,26 @@ <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="about_menu_title"/> </userDefinedRuntimeAttributes> </label> + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="300" verticalHuggingPriority="251" horizontalCompressionResistancePriority="700" text="" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="FxV-a4-ylD"> + <rect key="frame" x="342" y="12" width="0.0" height="19"/> + <fontDescription key="fontDescription" type="system" pointSize="17"/> + <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.54000000000000004" colorSpace="custom" customColorSpace="sRGB"/> + <nil key="highlightedColor"/> + </label> </subviews> <constraints> + <constraint firstAttribute="bottom" secondItem="FxV-a4-ylD" secondAttribute="bottom" constant="12" id="47K-7V-rBb"/> <constraint firstItem="cS1-Lw-pFx" firstAttribute="leading" secondItem="8mJ-wm-9uJ" secondAttribute="leading" constant="16" id="5Uc-bQ-8tB"/> <constraint firstItem="cS1-Lw-pFx" firstAttribute="top" secondItem="8mJ-wm-9uJ" secondAttribute="top" constant="12" id="Ahq-cJ-F3G"/> - <constraint firstAttribute="trailing" secondItem="cS1-Lw-pFx" secondAttribute="trailing" constant="16" id="LjD-d7-1Oz"/> + <constraint firstItem="FxV-a4-ylD" firstAttribute="top" secondItem="8mJ-wm-9uJ" secondAttribute="top" constant="12" id="C0n-Xf-cRI"/> + <constraint firstAttribute="trailing" secondItem="FxV-a4-ylD" secondAttribute="trailing" id="b4S-iB-ff5"/> + <constraint firstItem="FxV-a4-ylD" firstAttribute="leading" secondItem="cS1-Lw-pFx" secondAttribute="trailing" constant="4" id="gFM-hr-GJG"/> <constraint firstAttribute="bottom" secondItem="cS1-Lw-pFx" secondAttribute="bottom" constant="12" id="u83-F1-nPx"/> </constraints> </tableViewCellContentView> - <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/> - </userDefinedRuntimeAttributes> <connections> - <outlet property="titleLabel" destination="cS1-Lw-pFx" id="Ca5-KM-OSc"/> + <outlet property="info" destination="FxV-a4-ylD" id="gBN-aE-bD7"/> + <outlet property="title" destination="cS1-Lw-pFx" id="Ca5-KM-OSc"/> </connections> </tableViewCell> </cells> @@ -793,11 +642,11 @@ <sections> <tableViewSection id="XFW-hZ-fJo"> <cells> - <tableViewCell contentMode="scaleToFill" selectionStyle="default" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SelectableCell" id="Hgm-jL-Gnn" customClass="SelectableCell"> + <tableViewCell contentMode="scaleToFill" selectionStyle="default" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewSelectableCell" id="Hgm-jL-Gnn" customClass="SettingsTableViewSelectableCell" customModule="cmMAPS_ME" customModuleProvider="target"> <rect key="frame" x="0.0" y="35" width="375" height="44"/> <autoresizingMask key="autoresizingMask"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Hgm-jL-Gnn" id="LeE-yP-Eoi"> - <rect key="frame" x="0.0" y="0.0" width="375" height="43"/> + <rect key="frame" x="0.0" y="0.0" width="375" height="44"/> <autoresizingMask key="autoresizingMask"/> <subviews> <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Auto" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="sHx-XL-o9h"> @@ -819,18 +668,15 @@ <constraint firstItem="sHx-XL-o9h" firstAttribute="top" secondItem="LeE-yP-Eoi" secondAttribute="topMargin" constant="3" id="yw2-AG-4Y6"/> </constraints> </tableViewCellContentView> - <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/> - </userDefinedRuntimeAttributes> <connections> - <outlet property="titleLabel" destination="sHx-XL-o9h" id="gfO-dz-iqf"/> + <outlet property="title" destination="sHx-XL-o9h" id="gfO-dz-iqf"/> </connections> </tableViewCell> - <tableViewCell contentMode="scaleToFill" selectionStyle="default" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SelectableCell" id="WyO-qs-a7i" customClass="SelectableCell"> + <tableViewCell contentMode="scaleToFill" selectionStyle="default" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewSelectableCell" id="WyO-qs-a7i" customClass="SettingsTableViewSelectableCell" customModule="cmMAPS_ME" customModuleProvider="target"> <rect key="frame" x="0.0" y="79" width="375" height="44"/> <autoresizingMask key="autoresizingMask"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="WyO-qs-a7i" id="q2k-AU-VdG"> - <rect key="frame" x="0.0" y="0.0" width="375" height="43"/> + <rect key="frame" x="0.0" y="0.0" width="375" height="44"/> <autoresizingMask key="autoresizingMask"/> <subviews> <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="On" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="um4-D2-sR5"> @@ -852,18 +698,15 @@ <constraint firstItem="um4-D2-sR5" firstAttribute="top" secondItem="q2k-AU-VdG" secondAttribute="topMargin" constant="3" id="zoa-XR-3HA"/> </constraints> </tableViewCellContentView> - <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/> - </userDefinedRuntimeAttributes> <connections> - <outlet property="titleLabel" destination="um4-D2-sR5" id="ysd-Sz-e53"/> + <outlet property="title" destination="um4-D2-sR5" id="ysd-Sz-e53"/> </connections> </tableViewCell> - <tableViewCell contentMode="scaleToFill" selectionStyle="default" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SelectableCell" id="HHw-BT-UeJ" customClass="SelectableCell"> + <tableViewCell contentMode="scaleToFill" selectionStyle="default" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewSelectableCell" id="HHw-BT-UeJ" customClass="SettingsTableViewSelectableCell" customModule="cmMAPS_ME" customModuleProvider="target"> <rect key="frame" x="0.0" y="123" width="375" height="44"/> <autoresizingMask key="autoresizingMask"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="HHw-BT-UeJ" id="WD5-kW-BlC"> - <rect key="frame" x="0.0" y="0.0" width="375" height="43"/> + <rect key="frame" x="0.0" y="0.0" width="375" height="44"/> <autoresizingMask key="autoresizingMask"/> <subviews> <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Off" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="abU-K0-dr3"> @@ -885,11 +728,8 @@ <constraint firstItem="abU-K0-dr3" firstAttribute="leading" secondItem="WD5-kW-BlC" secondAttribute="leadingMargin" constant="8" id="s24-rN-zC6"/> </constraints> </tableViewCellContentView> - <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/> - </userDefinedRuntimeAttributes> <connections> - <outlet property="titleLabel" destination="abU-K0-dr3" id="iv6-Rz-AdP"/> + <outlet property="title" destination="abU-K0-dr3" id="iv6-Rz-AdP"/> </connections> </tableViewCell> </cells> @@ -921,11 +761,11 @@ <sections> <tableViewSection id="0dw-og-Sit"> <cells> - <tableViewCell contentMode="scaleToFill" selectionStyle="default" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SelectableCell" id="HL5-jQ-yNK" customClass="SelectableCell"> + <tableViewCell contentMode="scaleToFill" selectionStyle="default" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewSelectableCell" id="HL5-jQ-yNK" customClass="SettingsTableViewSelectableCell" customModule="cmMAPS_ME" customModuleProvider="target"> <rect key="frame" x="0.0" y="35" width="375" height="44"/> <autoresizingMask key="autoresizingMask"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="HL5-jQ-yNK" id="DYw-KH-oDU"> - <rect key="frame" x="0.0" y="0.0" width="375" height="43"/> + <rect key="frame" x="0.0" y="0.0" width="375" height="44"/> <autoresizingMask key="autoresizingMask"/> <subviews> <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="None" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2i3-c9-tdU"> @@ -947,18 +787,15 @@ <constraint firstItem="2i3-c9-tdU" firstAttribute="top" secondItem="DYw-KH-oDU" secondAttribute="topMargin" constant="3" id="NN8-hB-oG8"/> </constraints> </tableViewCellContentView> - <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/> - </userDefinedRuntimeAttributes> <connections> - <outlet property="titleLabel" destination="2i3-c9-tdU" id="enq-hG-Uv3"/> + <outlet property="title" destination="2i3-c9-tdU" id="enq-hG-Uv3"/> </connections> </tableViewCell> - <tableViewCell contentMode="scaleToFill" selectionStyle="default" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SelectableCell" id="8Cq-dm-roX" customClass="SelectableCell"> + <tableViewCell contentMode="scaleToFill" selectionStyle="default" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewSelectableCell" id="8Cq-dm-roX" customClass="SettingsTableViewSelectableCell" customModule="cmMAPS_ME" customModuleProvider="target"> <rect key="frame" x="0.0" y="79" width="375" height="44"/> <autoresizingMask key="autoresizingMask"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="8Cq-dm-roX" id="62b-vT-xng"> - <rect key="frame" x="0.0" y="0.0" width="375" height="43"/> + <rect key="frame" x="0.0" y="0.0" width="375" height="44"/> <autoresizingMask key="autoresizingMask"/> <subviews> <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="1 hour" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="J1O-iW-GF3"> @@ -980,18 +817,15 @@ <constraint firstItem="J1O-iW-GF3" firstAttribute="top" secondItem="62b-vT-xng" secondAttribute="topMargin" constant="3" id="l65-YD-2Ix"/> </constraints> </tableViewCellContentView> - <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/> - </userDefinedRuntimeAttributes> <connections> - <outlet property="titleLabel" destination="J1O-iW-GF3" id="aMM-LR-032"/> + <outlet property="title" destination="J1O-iW-GF3" id="aMM-LR-032"/> </connections> </tableViewCell> - <tableViewCell contentMode="scaleToFill" selectionStyle="default" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SelectableCell" id="DIL-q2-mUp" customClass="SelectableCell"> + <tableViewCell contentMode="scaleToFill" selectionStyle="default" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewSelectableCell" id="DIL-q2-mUp" customClass="SettingsTableViewSelectableCell" customModule="cmMAPS_ME" customModuleProvider="target"> <rect key="frame" x="0.0" y="123" width="375" height="44"/> <autoresizingMask key="autoresizingMask"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="DIL-q2-mUp" id="IqW-Xu-xVP"> - <rect key="frame" x="0.0" y="0.0" width="375" height="43"/> + <rect key="frame" x="0.0" y="0.0" width="375" height="44"/> <autoresizingMask key="autoresizingMask"/> <subviews> <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="2 hours" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="55i-C3-b9S"> @@ -1013,18 +847,15 @@ <constraint firstAttribute="bottomMargin" secondItem="55i-C3-b9S" secondAttribute="bottom" constant="3.5" id="qwE-hz-7Kj"/> </constraints> </tableViewCellContentView> - <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/> - </userDefinedRuntimeAttributes> <connections> - <outlet property="titleLabel" destination="55i-C3-b9S" id="BqS-iD-fzu"/> + <outlet property="title" destination="55i-C3-b9S" id="BqS-iD-fzu"/> </connections> </tableViewCell> - <tableViewCell contentMode="scaleToFill" selectionStyle="default" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SelectableCell" id="1Mm-WA-eyt" customClass="SelectableCell"> + <tableViewCell contentMode="scaleToFill" selectionStyle="default" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewSelectableCell" id="1Mm-WA-eyt" customClass="SettingsTableViewSelectableCell" customModule="cmMAPS_ME" customModuleProvider="target"> <rect key="frame" x="0.0" y="167" width="375" height="44"/> <autoresizingMask key="autoresizingMask"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="1Mm-WA-eyt" id="lNb-wL-PFo"> - <rect key="frame" x="0.0" y="0.0" width="375" height="43"/> + <rect key="frame" x="0.0" y="0.0" width="375" height="44"/> <autoresizingMask key="autoresizingMask"/> <subviews> <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="6 hours" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="QrP-xT-fcM"> @@ -1046,18 +877,15 @@ <constraint firstAttribute="bottomMargin" secondItem="QrP-xT-fcM" secondAttribute="bottom" constant="3.5" id="rFT-cJ-n4M"/> </constraints> </tableViewCellContentView> - <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/> - </userDefinedRuntimeAttributes> <connections> - <outlet property="titleLabel" destination="QrP-xT-fcM" id="UYW-6c-FWG"/> + <outlet property="title" destination="QrP-xT-fcM" id="UYW-6c-FWG"/> </connections> </tableViewCell> - <tableViewCell contentMode="scaleToFill" selectionStyle="default" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SelectableCell" id="JLY-Qt-y88" customClass="SelectableCell"> + <tableViewCell contentMode="scaleToFill" selectionStyle="default" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewSelectableCell" id="JLY-Qt-y88" customClass="SettingsTableViewSelectableCell" customModule="cmMAPS_ME" customModuleProvider="target"> <rect key="frame" x="0.0" y="211" width="375" height="44"/> <autoresizingMask key="autoresizingMask"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="JLY-Qt-y88" id="jPr-Kt-mLi"> - <rect key="frame" x="0.0" y="0.0" width="375" height="43"/> + <rect key="frame" x="0.0" y="0.0" width="375" height="44"/> <autoresizingMask key="autoresizingMask"/> <subviews> <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="12 hours" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="HyC-if-zpD"> @@ -1079,18 +907,15 @@ <constraint firstAttribute="trailingMargin" secondItem="HyC-if-zpD" secondAttribute="trailing" constant="10" id="mah-ig-QAM"/> </constraints> </tableViewCellContentView> - <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/> - </userDefinedRuntimeAttributes> <connections> - <outlet property="titleLabel" destination="HyC-if-zpD" id="BMT-M4-hk7"/> + <outlet property="title" destination="HyC-if-zpD" id="BMT-M4-hk7"/> </connections> </tableViewCell> - <tableViewCell contentMode="scaleToFill" selectionStyle="default" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SelectableCell" id="mbv-1J-wSI" customClass="SelectableCell"> + <tableViewCell contentMode="scaleToFill" selectionStyle="default" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewSelectableCell" id="mbv-1J-wSI" customClass="SettingsTableViewSelectableCell" customModule="cmMAPS_ME" customModuleProvider="target"> <rect key="frame" x="0.0" y="255" width="375" height="44"/> <autoresizingMask key="autoresizingMask"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="mbv-1J-wSI" id="oPS-HW-hfW"> - <rect key="frame" x="0.0" y="0.0" width="375" height="43"/> + <rect key="frame" x="0.0" y="0.0" width="375" height="44"/> <autoresizingMask key="autoresizingMask"/> <subviews> <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="1 day" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="uhN-0k-BL7"> @@ -1112,11 +937,8 @@ <constraint firstAttribute="bottomMargin" secondItem="uhN-0k-BL7" secondAttribute="bottom" constant="3.5" id="nz1-ZZ-q4U"/> </constraints> </tableViewCellContentView> - <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/> - </userDefinedRuntimeAttributes> <connections> - <outlet property="titleLabel" destination="uhN-0k-BL7" id="9Mv-uo-A5S"/> + <outlet property="title" destination="uhN-0k-BL7" id="9Mv-uo-A5S"/> </connections> </tableViewCell> </cells> @@ -1149,7 +971,7 @@ <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <color key="backgroundColor" red="0.96078431372549022" green="0.96078431372549022" blue="0.96078431372549022" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <prototypes> - <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="checkmark" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SelectableCell" id="79I-kz-hl4" customClass="SelectableCell"> + <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="checkmark" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewSelectableCell" id="79I-kz-hl4" customClass="SettingsTableViewSelectableCell" customModule="cmMAPS_ME" customModuleProvider="target"> <rect key="frame" x="0.0" y="56" width="375" height="44"/> <autoresizingMask key="autoresizingMask"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="79I-kz-hl4" id="gBB-ji-big"> @@ -1174,14 +996,11 @@ <constraint firstItem="FSn-fP-n3e" firstAttribute="leading" secondItem="gBB-ji-big" secondAttribute="leadingMargin" constant="8" id="KXd-hd-5in"/> </constraints> </tableViewCellContentView> - <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/> - </userDefinedRuntimeAttributes> <connections> - <outlet property="titleLabel" destination="FSn-fP-n3e" id="CKZ-Gb-7Wa"/> + <outlet property="title" destination="FSn-fP-n3e" id="CKZ-Gb-7Wa"/> </connections> </tableViewCell> - <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="LinkCell" id="lO6-zb-qb8" customClass="LinkCell"> + <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewLinkCell" id="lO6-zb-qb8" customClass="SettingsTableViewLinkCell" customModule="cmMAPS_ME" customModuleProvider="target"> <rect key="frame" x="0.0" y="100" width="375" height="44"/> <autoresizingMask key="autoresizingMask"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="lO6-zb-qb8" id="35k-Nb-XSD"> @@ -1189,28 +1008,31 @@ <autoresizingMask key="autoresizingMask"/> <subviews> <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Other" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="arm-Sx-diY"> - <rect key="frame" x="16" y="11" width="308" height="21"/> + <rect key="frame" x="16" y="12" width="322" height="19.5"/> <fontDescription key="fontDescription" type="system" pointSize="17"/> <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <nil key="highlightedColor"/> - <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular17"/> - </userDefinedRuntimeAttributes> + </label> + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="300" verticalHuggingPriority="251" horizontalCompressionResistancePriority="700" text="" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="8HI-p3-Ef4"> + <rect key="frame" x="342" y="11.5" width="0.0" height="20"/> + <fontDescription key="fontDescription" type="system" pointSize="17"/> + <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.54000000000000004" colorSpace="custom" customColorSpace="sRGB"/> + <nil key="highlightedColor"/> </label> </subviews> <constraints> <constraint firstItem="arm-Sx-diY" firstAttribute="leading" secondItem="35k-Nb-XSD" secondAttribute="leadingMargin" constant="8" id="8xX-eo-OZI"/> - <constraint firstItem="arm-Sx-diY" firstAttribute="top" secondItem="35k-Nb-XSD" secondAttribute="topMargin" constant="3" id="9Jx-Qg-8qw"/> - <constraint firstAttribute="bottomMargin" secondItem="arm-Sx-diY" secondAttribute="bottom" constant="3.5" id="WH3-ny-wEN"/> - <constraint firstAttribute="trailingMargin" secondItem="arm-Sx-diY" secondAttribute="trailing" constant="10" id="xT2-p0-snO"/> + <constraint firstItem="arm-Sx-diY" firstAttribute="top" secondItem="35k-Nb-XSD" secondAttribute="top" constant="12" id="9Jx-Qg-8qw"/> + <constraint firstItem="8HI-p3-Ef4" firstAttribute="top" secondItem="35k-Nb-XSD" secondAttribute="top" constant="12" id="DZU-S7-U8b"/> + <constraint firstItem="8HI-p3-Ef4" firstAttribute="leading" secondItem="arm-Sx-diY" secondAttribute="trailing" constant="4" id="Mlw-aC-ISe"/> + <constraint firstAttribute="bottom" secondItem="arm-Sx-diY" secondAttribute="bottom" constant="12" id="WH3-ny-wEN"/> + <constraint firstAttribute="trailing" secondItem="8HI-p3-Ef4" secondAttribute="trailing" id="cUZ-jL-4ti"/> + <constraint firstAttribute="bottom" secondItem="8HI-p3-Ef4" secondAttribute="bottom" constant="12" id="euX-o5-N0M"/> </constraints> </tableViewCellContentView> - <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/> - </userDefinedRuntimeAttributes> <connections> - <outlet property="titleLabel" destination="arm-Sx-diY" id="yow-av-5HT"/> + <outlet property="info" destination="8HI-p3-Ef4" id="6Fv-BW-idT"/> + <outlet property="title" destination="arm-Sx-diY" id="yow-av-5HT"/> </connections> </tableViewCell> </prototypes> @@ -1238,7 +1060,7 @@ <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <color key="backgroundColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <prototypes> - <tableViewCell contentMode="scaleToFill" selectionStyle="default" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SelectableCell" id="6Px-TO-sMc" customClass="SelectableCell"> + <tableViewCell contentMode="scaleToFill" selectionStyle="default" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewSelectableCell" id="6Px-TO-sMc" customClass="SettingsTableViewSelectableCell" customModule="cmMAPS_ME" customModuleProvider="target"> <rect key="frame" x="0.0" y="56" width="375" height="44"/> <autoresizingMask key="autoresizingMask"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="6Px-TO-sMc" id="aqp-aV-B3y"> @@ -1263,11 +1085,8 @@ <constraint firstAttribute="bottomMargin" secondItem="wBg-nH-SXL" secondAttribute="bottom" constant="3.5" id="yh9-ce-ftK"/> </constraints> </tableViewCellContentView> - <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/> - </userDefinedRuntimeAttributes> <connections> - <outlet property="titleLabel" destination="wBg-nH-SXL" id="MCZ-tX-MGv"/> + <outlet property="title" destination="wBg-nH-SXL" id="MCZ-tX-MGv"/> <segue destination="SWt-Am-yp4" kind="unwind" identifier="UnwindToTTSSettings" unwindAction="unwind:" id="bpg-7g-3lb"/> </connections> </tableViewCell> @@ -1295,11 +1114,11 @@ <sections> <tableViewSection id="YbY-TG-Fq9"> <cells> - <tableViewCell contentMode="scaleToFill" selectionStyle="default" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SelectableCell" id="233-Ku-OFh" customClass="SelectableCell"> + <tableViewCell contentMode="scaleToFill" selectionStyle="default" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewSelectableCell" id="233-Ku-OFh" customClass="SettingsTableViewSelectableCell" customModule="cmMAPS_ME" customModuleProvider="target"> <rect key="frame" x="0.0" y="35" width="375" height="44"/> <autoresizingMask key="autoresizingMask"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="233-Ku-OFh" id="Tig-SC-0oN"> - <rect key="frame" x="0.0" y="0.0" width="375" height="43"/> + <rect key="frame" x="0.0" y="0.0" width="375" height="44"/> <autoresizingMask key="autoresizingMask"/> <subviews> <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Километры" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="m0T-TK-aex"> @@ -1321,15 +1140,12 @@ <constraint firstItem="m0T-TK-aex" firstAttribute="top" secondItem="Tig-SC-0oN" secondAttribute="topMargin" constant="3" id="zvL-DV-q7h"/> </constraints> </tableViewCellContentView> - <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/> - </userDefinedRuntimeAttributes> </tableViewCell> - <tableViewCell contentMode="scaleToFill" selectionStyle="default" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SelectableCell" id="XGu-p4-IVy" customClass="SelectableCell"> + <tableViewCell contentMode="scaleToFill" selectionStyle="default" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewSelectableCell" id="XGu-p4-IVy" customClass="SettingsTableViewSelectableCell" customModule="cmMAPS_ME" customModuleProvider="target"> <rect key="frame" x="0.0" y="79" width="375" height="44"/> <autoresizingMask key="autoresizingMask"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="XGu-p4-IVy" id="c5A-yh-Pec"> - <rect key="frame" x="0.0" y="0.0" width="375" height="43"/> + <rect key="frame" x="0.0" y="0.0" width="375" height="44"/> <autoresizingMask key="autoresizingMask"/> <subviews> <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Мили" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="xrt-1n-szu"> @@ -1351,9 +1167,6 @@ <constraint firstAttribute="bottomMargin" secondItem="xrt-1n-szu" secondAttribute="bottom" constant="3.5" id="raH-6r-jMt"/> </constraints> </tableViewCellContentView> - <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/> - </userDefinedRuntimeAttributes> </tableViewCell> </cells> </tableViewSection> @@ -1438,11 +1251,11 @@ <sections> <tableViewSection id="Fph-fY-iFA"> <cells> - <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" id="WfS-iR-EYh" customClass="LinkCell"> + <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" id="WfS-iR-EYh" customClass="SettingsTableViewLinkCell" customModule="cmMAPS_ME" customModuleProvider="target"> <rect key="frame" x="0.0" y="35" width="375" height="44"/> <autoresizingMask key="autoresizingMask"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="WfS-iR-EYh" id="pud-iP-cPv"> - <rect key="frame" x="0.0" y="0.0" width="342" height="43"/> + <rect key="frame" x="0.0" y="0.0" width="342" height="44"/> <autoresizingMask key="autoresizingMask"/> <subviews> <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Веб-сайт" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dRQ-jj-BMn"> @@ -1464,15 +1277,12 @@ <constraint firstAttribute="trailingMargin" secondItem="dRQ-jj-BMn" secondAttribute="trailing" constant="10" id="g79-4i-uXm"/> </constraints> </tableViewCellContentView> - <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/> - </userDefinedRuntimeAttributes> </tableViewCell> - <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" id="orf-4x-6qF" customClass="LinkCell"> + <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" id="orf-4x-6qF" customClass="SettingsTableViewLinkCell" customModule="cmMAPS_ME" customModuleProvider="target"> <rect key="frame" x="0.0" y="79" width="375" height="44"/> <autoresizingMask key="autoresizingMask"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="orf-4x-6qF" id="HLu-xY-s47"> - <rect key="frame" x="0.0" y="0.0" width="342" height="43"/> + <rect key="frame" x="0.0" y="0.0" width="342" height="44"/> <autoresizingMask key="autoresizingMask"/> <subviews> <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Блог" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Usf-eP-UhD"> @@ -1494,15 +1304,12 @@ <constraint firstItem="Usf-eP-UhD" firstAttribute="leading" secondItem="HLu-xY-s47" secondAttribute="leadingMargin" constant="8" id="xJj-hO-Kkq"/> </constraints> </tableViewCellContentView> - <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/> - </userDefinedRuntimeAttributes> </tableViewCell> - <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" id="AwY-rw-AMm" customClass="LinkCell"> + <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" id="AwY-rw-AMm" customClass="SettingsTableViewLinkCell" customModule="cmMAPS_ME" customModuleProvider="target"> <rect key="frame" x="0.0" y="123" width="375" height="44"/> <autoresizingMask key="autoresizingMask"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="AwY-rw-AMm" id="AUp-Ql-usV"> - <rect key="frame" x="0.0" y="0.0" width="342" height="43"/> + <rect key="frame" x="0.0" y="0.0" width="342" height="44"/> <autoresizingMask key="autoresizingMask"/> <subviews> <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Facebook" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="VRr-XH-vvX"> @@ -1524,15 +1331,12 @@ <constraint firstAttribute="bottomMargin" secondItem="VRr-XH-vvX" secondAttribute="bottom" constant="3.5" id="w53-vF-beO"/> </constraints> </tableViewCellContentView> - <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/> - </userDefinedRuntimeAttributes> </tableViewCell> - <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" id="PYl-5B-hBB" customClass="LinkCell"> + <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" id="PYl-5B-hBB" customClass="SettingsTableViewLinkCell" customModule="cmMAPS_ME" customModuleProvider="target"> <rect key="frame" x="0.0" y="167" width="375" height="44"/> <autoresizingMask key="autoresizingMask"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="PYl-5B-hBB" id="99g-g6-dgY"> - <rect key="frame" x="0.0" y="0.0" width="342" height="43"/> + <rect key="frame" x="0.0" y="0.0" width="342" height="44"/> <autoresizingMask key="autoresizingMask"/> <subviews> <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Twitter" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="snB-CD-ffn"> @@ -1554,15 +1358,12 @@ <constraint firstAttribute="trailingMargin" secondItem="snB-CD-ffn" secondAttribute="trailing" constant="10" id="TRb-qk-L6W"/> </constraints> </tableViewCellContentView> - <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/> - </userDefinedRuntimeAttributes> </tableViewCell> - <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" id="q9S-xP-Mmy" customClass="LinkCell"> + <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" id="q9S-xP-Mmy" customClass="SettingsTableViewLinkCell" customModule="cmMAPS_ME" customModuleProvider="target"> <rect key="frame" x="0.0" y="211" width="375" height="44"/> <autoresizingMask key="autoresizingMask"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="q9S-xP-Mmy" id="itl-Sl-h7g"> - <rect key="frame" x="0.0" y="0.0" width="342" height="43"/> + <rect key="frame" x="0.0" y="0.0" width="342" height="44"/> <autoresizingMask key="autoresizingMask"/> <subviews> <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Подписаться на новости" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="1mC-fY-VIc"> @@ -1585,19 +1386,16 @@ </constraints> </tableViewCellContentView> <inset key="separatorInset" minX="0.0" minY="0.0" maxX="0.0" maxY="0.0"/> - <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/> - </userDefinedRuntimeAttributes> </tableViewCell> </cells> </tableViewSection> <tableViewSection id="wsr-ZV-X15"> <cells> - <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" id="jhU-Ha-kE2" customClass="LinkCell"> + <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" id="jhU-Ha-kE2" customClass="SettingsTableViewLinkCell"> <rect key="frame" x="0.0" y="291" width="375" height="44"/> <autoresizingMask key="autoresizingMask"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="jhU-Ha-kE2" id="BJb-8F-OEp"> - <rect key="frame" x="0.0" y="0.0" width="342" height="43"/> + <rect key="frame" x="0.0" y="0.0" width="342" height="44"/> <autoresizingMask key="autoresizingMask"/> <subviews> <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Оценить приложение" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Spi-mD-g8U"> @@ -1628,11 +1426,11 @@ </tableViewSection> <tableViewSection id="Vce-Ld-skc"> <cells> - <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" id="VXa-CM-OXP" customClass="LinkCell"> + <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" id="VXa-CM-OXP" customClass="SettingsTableViewLinkCell"> <rect key="frame" x="0.0" y="371" width="375" height="44"/> <autoresizingMask key="autoresizingMask"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="VXa-CM-OXP" id="Vot-vJ-3MU"> - <rect key="frame" x="0.0" y="0.0" width="342" height="43"/> + <rect key="frame" x="0.0" y="0.0" width="342" height="44"/> <autoresizingMask key="autoresizingMask"/> <subviews> <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Copyright" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="uhV-at-6HM"> @@ -1703,11 +1501,11 @@ Приложение не использует мобильный интернет в роуминге.</string> <cells> - <tableViewCell contentMode="scaleToFill" selectionStyle="default" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SelectableCell" id="gS7-2k-8yw" customClass="SelectableCell"> + <tableViewCell contentMode="scaleToFill" selectionStyle="default" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewSelectableCell" id="gS7-2k-8yw" customClass="SettingsTableViewSelectableCell" customModule="cmMAPS_ME" customModuleProvider="target"> <rect key="frame" x="0.0" y="35" width="375" height="44"/> <autoresizingMask key="autoresizingMask"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="gS7-2k-8yw" id="1pg-RV-MG8"> - <rect key="frame" x="0.0" y="0.0" width="375" height="43"/> + <rect key="frame" x="0.0" y="0.0" width="375" height="44"/> <autoresizingMask key="autoresizingMask"/> <subviews> <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Использовать всегда" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="vX5-wa-tBM"> @@ -1729,18 +1527,15 @@ <constraint firstAttribute="trailingMargin" secondItem="vX5-wa-tBM" secondAttribute="trailing" constant="10" id="zBx-Iu-XhP"/> </constraints> </tableViewCellContentView> - <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/> - </userDefinedRuntimeAttributes> <connections> - <outlet property="titleLabel" destination="vX5-wa-tBM" id="KIZ-8U-XsY"/> + <outlet property="title" destination="vX5-wa-tBM" id="KIZ-8U-XsY"/> </connections> </tableViewCell> - <tableViewCell contentMode="scaleToFill" selectionStyle="default" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SelectableCell" id="lTE-DT-aCE" customClass="SelectableCell"> + <tableViewCell contentMode="scaleToFill" selectionStyle="default" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewSelectableCell" id="lTE-DT-aCE" customClass="SettingsTableViewSelectableCell" customModule="cmMAPS_ME" customModuleProvider="target"> <rect key="frame" x="0.0" y="79" width="375" height="44"/> <autoresizingMask key="autoresizingMask"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="lTE-DT-aCE" id="N6p-8U-90b"> - <rect key="frame" x="0.0" y="0.0" width="375" height="43"/> + <rect key="frame" x="0.0" y="0.0" width="375" height="44"/> <autoresizingMask key="autoresizingMask"/> <subviews> <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Спрашивать" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="cOW-yT-WYH"> @@ -1762,18 +1557,15 @@ <constraint firstAttribute="trailingMargin" secondItem="cOW-yT-WYH" secondAttribute="trailing" constant="10" id="syt-Dy-KI6"/> </constraints> </tableViewCellContentView> - <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/> - </userDefinedRuntimeAttributes> <connections> - <outlet property="titleLabel" destination="cOW-yT-WYH" id="3si-Gj-sn7"/> + <outlet property="title" destination="cOW-yT-WYH" id="3si-Gj-sn7"/> </connections> </tableViewCell> - <tableViewCell contentMode="scaleToFill" selectionStyle="default" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SelectableCell" id="9uV-jg-h2A" customClass="SelectableCell"> + <tableViewCell contentMode="scaleToFill" selectionStyle="default" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewSelectableCell" id="9uV-jg-h2A" customClass="SettingsTableViewSelectableCell" customModule="cmMAPS_ME" customModuleProvider="target"> <rect key="frame" x="0.0" y="123" width="375" height="44"/> <autoresizingMask key="autoresizingMask"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="9uV-jg-h2A" id="z0N-m2-ums"> - <rect key="frame" x="0.0" y="0.0" width="375" height="43"/> + <rect key="frame" x="0.0" y="0.0" width="375" height="44"/> <autoresizingMask key="autoresizingMask"/> <subviews> <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Никогда не использовать" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="gum-Lg-Uby"> @@ -1795,11 +1587,8 @@ <constraint firstItem="gum-Lg-Uby" firstAttribute="leading" secondItem="z0N-m2-ums" secondAttribute="leadingMargin" constant="8" id="nYN-fb-U26"/> </constraints> </tableViewCellContentView> - <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/> - </userDefinedRuntimeAttributes> <connections> - <outlet property="titleLabel" destination="gum-Lg-Uby" id="Dxz-wY-hna"/> + <outlet property="title" destination="gum-Lg-Uby" id="Dxz-wY-hna"/> </connections> </tableViewCell> </cells> diff --git a/iphone/Maps/Settings/Cells/SettingsTableViewLinkCell.swift b/iphone/Maps/Settings/Cells/SettingsTableViewLinkCell.swift new file mode 100644 index 0000000000..2ca6547bec --- /dev/null +++ b/iphone/Maps/Settings/Cells/SettingsTableViewLinkCell.swift @@ -0,0 +1,27 @@ +@objc final class SettingsTableViewLinkCell: MWMTableViewCell { + + @IBOutlet fileprivate weak var title: UILabel! + @IBOutlet fileprivate weak var info: UILabel! + + func config(title: String, info: String?) { + backgroundColor = UIColor.white() + + self.title.text = title + styleTitle() + + self.info.text = info + self.info.isHidden = info == nil + styleInfo() + } + + fileprivate func styleTitle() { + title.textColor = UIColor.blackPrimaryText() + title.font = UIFont.regular17() + } + + fileprivate func styleInfo() { + info.textColor = UIColor.blackSecondaryText() + info.font = UIFont.regular17() + } + +} diff --git a/iphone/Maps/Settings/Cells/SettingsTableViewSelectableCell.swift b/iphone/Maps/Settings/Cells/SettingsTableViewSelectableCell.swift new file mode 100644 index 0000000000..d5df003c07 --- /dev/null +++ b/iphone/Maps/Settings/Cells/SettingsTableViewSelectableCell.swift @@ -0,0 +1,17 @@ +@objc final class SettingsTableViewSelectableCell: MWMTableViewCell { + + @IBOutlet fileprivate weak var title: UILabel! + + func config(title: String) { + backgroundColor = UIColor.white() + + self.title.text = title + styleTitle() + } + + fileprivate func styleTitle() { + title.textColor = UIColor.blackPrimaryText() + title.font = UIFont.regular17() + } + +} diff --git a/iphone/Maps/Settings/Cells/SettingsTableViewSwitchCell.swift b/iphone/Maps/Settings/Cells/SettingsTableViewSwitchCell.swift new file mode 100644 index 0000000000..0335f2d8d9 --- /dev/null +++ b/iphone/Maps/Settings/Cells/SettingsTableViewSwitchCell.swift @@ -0,0 +1,43 @@ +@objc protocol SettingsTableViewSwitchCellDelegate { + + func switchCell(_ cell: SettingsTableViewSwitchCell, didChangeValue value: Bool) + +} + +@objc final class SettingsTableViewSwitchCell: MWMTableViewCell { + + @IBOutlet fileprivate weak var title: UILabel! + @IBOutlet fileprivate weak var switchButton: UISwitch! { + didSet { + switchButton.addTarget(self, action: #selector(switchChanged), for: .valueChanged) + } + } + + weak var delegate: SettingsTableViewSwitchCellDelegate? + + func config(delegate: SettingsTableViewSwitchCellDelegate, title: String, isOn: Bool) { + backgroundColor = UIColor.white() + + self.delegate = delegate + + self.title.text = title + styleTitle() + + self.switchButton.isOn = isOn + styleSwitchButton() + } + + @IBAction fileprivate func switchChanged() { + delegate?.switchCell(self, didChangeValue: switchButton.isOn) + } + + fileprivate func styleTitle() { + title.textColor = UIColor.blackPrimaryText() + title.font = UIFont.regular17() + } + + fileprivate func styleSwitchButton() { + switchButton.onTintColor = UIColor.linkBlue() + } + +} diff --git a/iphone/Maps/Settings/LinkCell.h b/iphone/Maps/Settings/LinkCell.h deleted file mode 100644 index abbfce412d..0000000000 --- a/iphone/Maps/Settings/LinkCell.h +++ /dev/null @@ -1,8 +0,0 @@ -#import "MWMTableViewCell.h" - -@interface LinkCell : MWMTableViewCell - -@property(nonatomic) IBOutlet UILabel * titleLabel; -@property(nonatomic) IBOutlet UILabel * infoLabel; - -@end diff --git a/iphone/Maps/Settings/LinkCell.mm b/iphone/Maps/Settings/LinkCell.mm deleted file mode 100644 index 1ca486d125..0000000000 --- a/iphone/Maps/Settings/LinkCell.mm +++ /dev/null @@ -1,12 +0,0 @@ -#import "LinkCell.h" -#import "UIColor+MapsMeColor.h" - -@implementation LinkCell - -- (void)awakeFromNib -{ - [super awakeFromNib]; - self.backgroundColor = [UIColor white]; -} - -@end diff --git a/iphone/Maps/MWMAboutController.h b/iphone/Maps/Settings/MWMAboutController.h index bf44d902da..bf44d902da 100644 --- a/iphone/Maps/MWMAboutController.h +++ b/iphone/Maps/Settings/MWMAboutController.h diff --git a/iphone/Maps/MWMAboutController.mm b/iphone/Maps/Settings/MWMAboutController.mm index 6df96a4dc4..ba58e96647 100644 --- a/iphone/Maps/MWMAboutController.mm +++ b/iphone/Maps/Settings/MWMAboutController.mm @@ -1,8 +1,8 @@ #import "MWMAboutController.h" #import "AppInfo.h" -#import "LinkCell.h" #import "MWMMailViewController.h" #import "Statistics.h" +#import "SwiftBridge.h" #import "WebViewController.h" #import "3party/Alohalytics/src/alohalytics_objc.h" @@ -18,13 +18,13 @@ extern NSString * const kAlohalyticsTapEventKey; @property(weak, nonatomic) IBOutlet UILabel * versionLabel; @property(weak, nonatomic) IBOutlet UILabel * dateLabel; -@property(weak, nonatomic) IBOutlet LinkCell * websiteCell; -@property(weak, nonatomic) IBOutlet LinkCell * blogCell; -@property(weak, nonatomic) IBOutlet LinkCell * facebookCell; -@property(weak, nonatomic) IBOutlet LinkCell * twitterCell; -@property(weak, nonatomic) IBOutlet LinkCell * subscribeCell; -@property(weak, nonatomic) IBOutlet LinkCell * rateCell; -@property(weak, nonatomic) IBOutlet LinkCell * copyrightCell; +@property(weak, nonatomic) IBOutlet SettingsTableViewLinkCell * websiteCell; +@property(weak, nonatomic) IBOutlet SettingsTableViewLinkCell * blogCell; +@property(weak, nonatomic) IBOutlet SettingsTableViewLinkCell * facebookCell; +@property(weak, nonatomic) IBOutlet SettingsTableViewLinkCell * twitterCell; +@property(weak, nonatomic) IBOutlet SettingsTableViewLinkCell * subscribeCell; +@property(weak, nonatomic) IBOutlet SettingsTableViewLinkCell * rateCell; +@property(weak, nonatomic) IBOutlet SettingsTableViewLinkCell * copyrightCell; @property(nonatomic) IBOutlet UIView * headerView; @@ -56,7 +56,7 @@ extern NSString * const kAlohalyticsTapEventKey; - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { [tableView deselectRowAtIndexPath:indexPath animated:YES]; - LinkCell * cell = static_cast<LinkCell *>([tableView cellForRowAtIndexPath:indexPath]); + auto cell = static_cast<SettingsTableViewLinkCell *>([tableView cellForRowAtIndexPath:indexPath]); if (cell == self.websiteCell) { [Alohalytics logEvent:kAlohalyticsTapEventKey withValue:@"website"]; diff --git a/iphone/Maps/MWMAboutControllerHeader.xib b/iphone/Maps/Settings/MWMAboutControllerHeader.xib index 8adc47bd07..8adc47bd07 100644 --- a/iphone/Maps/MWMAboutControllerHeader.xib +++ b/iphone/Maps/Settings/MWMAboutControllerHeader.xib diff --git a/iphone/Maps/MWMHelpController.h b/iphone/Maps/Settings/MWMHelpController.h index 8906ecbabb..8906ecbabb 100644 --- a/iphone/Maps/MWMHelpController.h +++ b/iphone/Maps/Settings/MWMHelpController.h diff --git a/iphone/Maps/MWMHelpController.mm b/iphone/Maps/Settings/MWMHelpController.mm index 5ba66f4395..5ba66f4395 100644 --- a/iphone/Maps/MWMHelpController.mm +++ b/iphone/Maps/Settings/MWMHelpController.mm diff --git a/iphone/Maps/MWMMobileInternetViewController.h b/iphone/Maps/Settings/MWMMobileInternetViewController.h index bdd9ce1e5b..bdd9ce1e5b 100644 --- a/iphone/Maps/MWMMobileInternetViewController.h +++ b/iphone/Maps/Settings/MWMMobileInternetViewController.h diff --git a/iphone/Maps/MWMMobileInternetViewController.mm b/iphone/Maps/Settings/MWMMobileInternetViewController.mm index 822e791003..a2bca313fd 100644 --- a/iphone/Maps/MWMMobileInternetViewController.mm +++ b/iphone/Maps/Settings/MWMMobileInternetViewController.mm @@ -1,17 +1,17 @@ #import "MWMMobileInternetViewController.h" #import "MWMNetworkPolicy.h" -#import "SelectableCell.h" #import "Statistics.h" +#import "SwiftBridge.h" using namespace network_policy; using np = platform::NetworkPolicy; @interface MWMMobileInternetViewController () -@property(weak, nonatomic) IBOutlet SelectableCell * always; -@property(weak, nonatomic) IBOutlet SelectableCell * ask; -@property(weak, nonatomic) IBOutlet SelectableCell * never; -@property(weak, nonatomic) SelectableCell * selected; +@property(weak, nonatomic) IBOutlet SettingsTableViewSelectableCell * always; +@property(weak, nonatomic) IBOutlet SettingsTableViewSelectableCell * ask; +@property(weak, nonatomic) IBOutlet SettingsTableViewSelectableCell * never; +@property(weak, nonatomic) SettingsTableViewSelectableCell * selected; @end @@ -22,7 +22,7 @@ using np = platform::NetworkPolicy; [super viewDidLoad]; self.title = L(@"mobile_data"); - SelectableCell * selected; + SettingsTableViewSelectableCell * selected; switch (GetStage()) { case np::Stage::Always: selected = self.always; break; @@ -33,7 +33,7 @@ using np = platform::NetworkPolicy; self.selected = selected; } -- (void)setSelected:(SelectableCell *)selected +- (void)setSelected:(SettingsTableViewSelectableCell *)selected { if ([_selected isEqual:selected]) return; @@ -61,7 +61,7 @@ using np = platform::NetworkPolicy; - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { - SelectableCell * selected = self.selected; + SettingsTableViewSelectableCell * selected = self.selected; selected.accessoryType = UITableViewCellAccessoryNone; selected = [tableView cellForRowAtIndexPath:indexPath]; selected.accessoryType = UITableViewCellAccessoryCheckmark; diff --git a/iphone/Maps/MWMNightModeController.h b/iphone/Maps/Settings/MWMNightModeController.h index 27b77f6f56..27b77f6f56 100644 --- a/iphone/Maps/MWMNightModeController.h +++ b/iphone/Maps/Settings/MWMNightModeController.h diff --git a/iphone/Maps/MWMNightModeController.mm b/iphone/Maps/Settings/MWMNightModeController.mm index 0ffb6f81db..96e209e88d 100644 --- a/iphone/Maps/MWMNightModeController.mm +++ b/iphone/Maps/Settings/MWMNightModeController.mm @@ -1,18 +1,18 @@ #import "MWMNightModeController.h" #import "MWMSettings.h" #import "MapsAppDelegate.h" -#import "SelectableCell.h" #import "Statistics.h" +#import "SwiftBridge.h" #import "UIColor+MapsMeColor.h" #include "Framework.h" @interface MWMNightModeController () -@property(weak, nonatomic) IBOutlet SelectableCell * autoSwitch; -@property(weak, nonatomic) IBOutlet SelectableCell * on; -@property(weak, nonatomic) IBOutlet SelectableCell * off; -@property(weak, nonatomic) SelectableCell * selectedCell; +@property(weak, nonatomic) IBOutlet SettingsTableViewSelectableCell * autoSwitch; +@property(weak, nonatomic) IBOutlet SettingsTableViewSelectableCell * on; +@property(weak, nonatomic) IBOutlet SettingsTableViewSelectableCell * off; +@property(weak, nonatomic) SettingsTableViewSelectableCell * selectedCell; @end @@ -45,7 +45,7 @@ } } -- (void)setSelectedCell:(SelectableCell *)cell +- (void)setSelectedCell:(SettingsTableViewSelectableCell *)cell { if ([_selectedCell isEqual:cell]) return; @@ -91,7 +91,7 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { - SelectableCell * selectedCell = self.selectedCell; + SettingsTableViewSelectableCell * selectedCell = self.selectedCell; selectedCell.accessoryType = UITableViewCellAccessoryNone; selectedCell = [tableView cellForRowAtIndexPath:indexPath]; selectedCell.accessoryType = UITableViewCellAccessoryCheckmark; diff --git a/iphone/Maps/MWMRecentTrackSettingsController.h b/iphone/Maps/Settings/MWMRecentTrackSettingsController.h index 4266571020..4266571020 100644 --- a/iphone/Maps/MWMRecentTrackSettingsController.h +++ b/iphone/Maps/Settings/MWMRecentTrackSettingsController.h diff --git a/iphone/Maps/MWMRecentTrackSettingsController.mm b/iphone/Maps/Settings/MWMRecentTrackSettingsController.mm index 3b0ec4a2f8..5e3b726ec9 100644 --- a/iphone/Maps/MWMRecentTrackSettingsController.mm +++ b/iphone/Maps/Settings/MWMRecentTrackSettingsController.mm @@ -1,6 +1,6 @@ #import "MWMRecentTrackSettingsController.h" -#import "SelectableCell.h" #import "Statistics.h" +#import "SwiftBridge.h" #include "Framework.h" @@ -12,13 +12,13 @@ typedef NS_ENUM(NSUInteger, DurationInHours) { One = 1, Two = 2, Six = 6, Twelve @interface MWMRecentTrackSettingsController () -@property(weak, nonatomic) IBOutlet SelectableCell * none; -@property(weak, nonatomic) IBOutlet SelectableCell * oneHour; -@property(weak, nonatomic) IBOutlet SelectableCell * twoHours; -@property(weak, nonatomic) IBOutlet SelectableCell * sixHours; -@property(weak, nonatomic) IBOutlet SelectableCell * twelveHours; -@property(weak, nonatomic) IBOutlet SelectableCell * oneDay; -@property(weak, nonatomic) SelectableCell * selectedCell; +@property(weak, nonatomic) IBOutlet SettingsTableViewSelectableCell * none; +@property(weak, nonatomic) IBOutlet SettingsTableViewSelectableCell * oneHour; +@property(weak, nonatomic) IBOutlet SettingsTableViewSelectableCell * twoHours; +@property(weak, nonatomic) IBOutlet SettingsTableViewSelectableCell * sixHours; +@property(weak, nonatomic) IBOutlet SettingsTableViewSelectableCell * twelveHours; +@property(weak, nonatomic) IBOutlet SettingsTableViewSelectableCell * oneDay; +@property(weak, nonatomic) SettingsTableViewSelectableCell * selectedCell; @end @@ -48,7 +48,7 @@ typedef NS_ENUM(NSUInteger, DurationInHours) { One = 1, Two = 2, Six = 6, Twelve self.selectedCell.accessoryType = UITableViewCellAccessoryCheckmark; } -- (void)setSelectedCell:(SelectableCell *)selectedCell +- (void)setSelectedCell:(SettingsTableViewSelectableCell *)selectedCell { _selectedCell = selectedCell; auto & f = GetFramework(); @@ -90,7 +90,7 @@ typedef NS_ENUM(NSUInteger, DurationInHours) { One = 1, Two = 2, Six = 6, Twelve - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { - SelectableCell * selectedCell = self.selectedCell; + SettingsTableViewSelectableCell * selectedCell = self.selectedCell; selectedCell.accessoryType = UITableViewCellAccessoryNone; selectedCell = [tableView cellForRowAtIndexPath:indexPath]; selectedCell.selected = NO; diff --git a/iphone/Maps/MWMSettings.h b/iphone/Maps/Settings/MWMSettings.h index f2d612c6db..f2d612c6db 100644 --- a/iphone/Maps/MWMSettings.h +++ b/iphone/Maps/Settings/MWMSettings.h diff --git a/iphone/Maps/MWMSettings.mm b/iphone/Maps/Settings/MWMSettings.mm index bcb055a62b..bcb055a62b 100644 --- a/iphone/Maps/MWMSettings.mm +++ b/iphone/Maps/Settings/MWMSettings.mm diff --git a/iphone/Maps/Settings/MWMSettingsViewController.mm b/iphone/Maps/Settings/MWMSettingsViewController.mm index 881db9ec5d..873141db22 100644 --- a/iphone/Maps/Settings/MWMSettingsViewController.mm +++ b/iphone/Maps/Settings/MWMSettingsViewController.mm @@ -1,12 +1,11 @@ #import "MWMSettingsViewController.h" -#import "LinkCell.h" #import "LocaleTranslator.h" #import "MWMAuthorizationCommon.h" #import "MWMNetworkPolicy.h" #import "MWMSettings.h" #import "MWMTextToSpeech.h" #import "Statistics.h" -#import "SwitchCell.h" +#import "SwiftBridge.h" #import "WebViewController.h" #import "3party/Alohalytics/src/alohalytics_objc.h" @@ -17,27 +16,27 @@ extern NSString * const kAlohalyticsTapEventKey; -@interface MWMSettingsViewController ()<SwitchCellDelegate> +@interface MWMSettingsViewController ()<SettingsTableViewSwitchCellDelegate> -@property(weak, nonatomic) IBOutlet LinkCell * profileCell; +@property(weak, nonatomic) IBOutlet SettingsTableViewLinkCell * profileCell; -@property(weak, nonatomic) IBOutlet LinkCell * unitsCell; -@property(weak, nonatomic) IBOutlet SwitchCell * zoomButtonsCell; -@property(weak, nonatomic) IBOutlet SwitchCell * is3dCell; -@property(weak, nonatomic) IBOutlet SwitchCell * autoDownloadCell; -@property(weak, nonatomic) IBOutlet LinkCell * mobileInternetCell; -@property(weak, nonatomic) IBOutlet LinkCell * recentTrackCell; -@property(weak, nonatomic) IBOutlet SwitchCell * compassCalibrationCell; -@property(weak, nonatomic) IBOutlet SwitchCell * showOffersCell; -@property(weak, nonatomic) IBOutlet SwitchCell * statisticsCell; +@property(weak, nonatomic) IBOutlet SettingsTableViewLinkCell * unitsCell; +@property(weak, nonatomic) IBOutlet SettingsTableViewSwitchCell * zoomButtonsCell; +@property(weak, nonatomic) IBOutlet SettingsTableViewSwitchCell * is3dCell; +@property(weak, nonatomic) IBOutlet SettingsTableViewSwitchCell * autoDownloadCell; +@property(weak, nonatomic) IBOutlet SettingsTableViewLinkCell * mobileInternetCell; +@property(weak, nonatomic) IBOutlet SettingsTableViewLinkCell * recentTrackCell; +@property(weak, nonatomic) IBOutlet SettingsTableViewSwitchCell * compassCalibrationCell; +@property(weak, nonatomic) IBOutlet SettingsTableViewSwitchCell * showOffersCell; +@property(weak, nonatomic) IBOutlet SettingsTableViewSwitchCell * statisticsCell; -@property(weak, nonatomic) IBOutlet LinkCell * nightModeCell; -@property(weak, nonatomic) IBOutlet SwitchCell * perspectiveViewCell; -@property(weak, nonatomic) IBOutlet SwitchCell * autoZoomCell; -@property(weak, nonatomic) IBOutlet LinkCell * voiceInstructionsCell; +@property(weak, nonatomic) IBOutlet SettingsTableViewLinkCell * nightModeCell; +@property(weak, nonatomic) IBOutlet SettingsTableViewSwitchCell * perspectiveViewCell; +@property(weak, nonatomic) IBOutlet SettingsTableViewSwitchCell * autoZoomCell; +@property(weak, nonatomic) IBOutlet SettingsTableViewLinkCell * voiceInstructionsCell; -@property(weak, nonatomic) IBOutlet LinkCell * helpCell; -@property(weak, nonatomic) IBOutlet LinkCell * aboutCell; +@property(weak, nonatomic) IBOutlet SettingsTableViewLinkCell * helpCell; +@property(weak, nonatomic) IBOutlet SettingsTableViewLinkCell * aboutCell; @end @@ -60,116 +59,126 @@ extern NSString * const kAlohalyticsTapEventKey; [self configProfileSection]; [self configCommonSection]; [self configNavigationSection]; + [self configInfoSection]; } - (void)configProfileSection { NSString * userName = osm_auth_ios::OSMUserName(); - self.profileCell.infoLabel.text = userName.length != 0 ? userName : @""; + [self.profileCell configWithTitle:L(@"profile") info:userName.length != 0 ? userName : @""]; } - (void)configCommonSection { + NSString * units = nil; switch ([MWMSettings measurementUnits]) { - case measurement_utils::Units::Metric: self.unitsCell.infoLabel.text = L(@"kilometres"); break; - case measurement_utils::Units::Imperial: self.unitsCell.infoLabel.text = L(@"miles"); break; + case measurement_utils::Units::Metric: units = L(@"kilometres"); break; + case measurement_utils::Units::Imperial: units = L(@"miles"); break; } + [self.unitsCell configWithTitle:L(@"measurement_units") info:units]; - self.zoomButtonsCell.switchButton.on = [MWMSettings zoomButtonsEnabled]; - self.zoomButtonsCell.delegate = self; + [self.zoomButtonsCell configWithDelegate:self + title:L(@"pref_zoom_title") + isOn:[MWMSettings zoomButtonsEnabled]]; bool on = true, _ = true; GetFramework().Load3dMode(_, on); - self.is3dCell.switchButton.on = on; - self.is3dCell.delegate = self; + [self.is3dCell configWithDelegate:self title:L(@"pref_map_3d_buildings_title") isOn:on]; - self.autoDownloadCell.switchButton.on = [MWMSettings autoDownloadEnabled]; - self.autoDownloadCell.delegate = self; + [self.autoDownloadCell configWithDelegate:self + title:L(@"autodownload") + isOn:[MWMSettings autoDownloadEnabled]]; - NSString * internetLabel = nil; - using np = platform::NetworkPolicy; + NSString * mobileInternet = nil; + using stage = platform::NetworkPolicy::Stage; switch (network_policy::GetStage()) { - case np::Stage::Always: internetLabel = L(@"mobile_data_option_always"); break; - case np::Stage::Session: internetLabel = L(@"mobile_data_option_today"); break; - case np::Stage::Never: internetLabel = L(@"mobile_data_option_never"); break; + case stage::Always: mobileInternet = L(@"mobile_data_option_always"); break; + case stage::Session: mobileInternet = L(@"mobile_data_option_today"); break; + case stage::Never: mobileInternet = L(@"mobile_data_option_never"); break; } - self.mobileInternetCell.infoLabel.text = internetLabel; + [self.mobileInternetCell configWithTitle:L(@"mobile_data") info:mobileInternet]; + + NSString * recentTrack = nil; if (!GpsTracker::Instance().IsEnabled()) { - self.recentTrackCell.infoLabel.text = L(@"duration_disabled"); + recentTrack = L(@"duration_disabled"); } else { switch (GpsTracker::Instance().GetDuration().count()) { - case 1: self.recentTrackCell.infoLabel.text = L(@"duration_1_hour"); break; - case 2: self.recentTrackCell.infoLabel.text = L(@"duration_2_hours"); break; - case 6: self.recentTrackCell.infoLabel.text = L(@"duration_6_hours"); break; - case 12: self.recentTrackCell.infoLabel.text = L(@"duration_12_hours"); break; - case 24: self.recentTrackCell.infoLabel.text = L(@"duration_1_day"); break; + case 1: recentTrack = L(@"duration_1_hour"); break; + case 2: recentTrack = L(@"duration_2_hours"); break; + case 6: recentTrack = L(@"duration_6_hours"); break; + case 12: recentTrack = L(@"duration_12_hours"); break; + case 24: recentTrack = L(@"duration_1_day"); break; default: NSAssert(false, @"Incorrect hours value"); break; } } + [self.recentTrackCell configWithTitle:L(@"pref_track_record_title") info:recentTrack]; + - self.compassCalibrationCell.switchButton.on = [MWMSettings compassCalibrationEnabled]; - self.compassCalibrationCell.delegate = self; + [self.compassCalibrationCell configWithDelegate:self + title:L(@"pref_calibration_title") + isOn:[MWMSettings compassCalibrationEnabled]]; - self.showOffersCell.switchButton.on = ![MWMSettings adForbidden]; - self.showOffersCell.delegate = self; + [self.showOffersCell configWithDelegate:self + title:L(@"showcase_settings_title") + isOn:![MWMSettings adForbidden]]; - self.statisticsCell.switchButton.on = [MWMSettings statisticsEnabled]; - self.statisticsCell.delegate = self; + [self.statisticsCell configWithDelegate:self + title:L(@"allow_statistics") + isOn:[MWMSettings statisticsEnabled]]; } - (void)configNavigationSection { + NSString * nightMode = nil; if ([MWMSettings autoNightModeEnabled]) - { - self.nightModeCell.infoLabel.text = L(@"pref_map_style_auto"); - } + nightMode = L(@"pref_map_style_auto"); + else if (GetFramework().GetMapStyle() == MapStyleDark) + nightMode = L(@"pref_map_style_night"); else - { - switch (GetFramework().GetMapStyle()) - { - case MapStyleDark: self.nightModeCell.infoLabel.text = L(@"pref_map_style_night"); break; - default: self.nightModeCell.infoLabel.text = L(@"pref_map_style_default"); break; - } - } + nightMode = L(@"pref_map_style_default"); + [self.nightModeCell configWithTitle:L(@"pref_map_style_title") info:nightMode]; bool _ = true, on = true; GetFramework().Load3dMode(on, _); - self.perspectiveViewCell.switchButton.on = on; - self.perspectiveViewCell.delegate = self; + [self.perspectiveViewCell configWithDelegate:self title:L(@"pref_map_3d_title") isOn:on]; - self.autoZoomCell.switchButton.on = GetFramework().LoadAutoZoom(); - self.autoZoomCell.delegate = self; + [self.autoZoomCell configWithDelegate:self + title:L(@"pref_map_auto_zoom") + isOn:GetFramework().LoadAutoZoom()]; + NSString * voiceInstructions = nil; if ([MWMTextToSpeech isTTSEnabled]) { NSString * savedLanguage = [MWMTextToSpeech savedLanguage]; if (savedLanguage.length != 0) { string const savedLanguageTwine = locale_translator::bcp47ToTwineLanguage(savedLanguage); - NSString * language = @(tts::translatedTwine(savedLanguageTwine).c_str()); - self.voiceInstructionsCell.infoLabel.text = language; - } - else - { - self.voiceInstructionsCell.infoLabel.text = @""; + voiceInstructions = @(tts::translatedTwine(savedLanguageTwine).c_str()); } } else { - self.voiceInstructionsCell.infoLabel.text = L(@"duration_disabled"); + voiceInstructions = L(@"duration_disabled"); } + [self.voiceInstructionsCell configWithTitle:L(@"pref_tts_language_title") info:voiceInstructions]; +} + +- (void)configInfoSection +{ + [self.helpCell configWithTitle:L(@"help") info:nil]; + [self.aboutCell configWithTitle:L(@"about_menu_title") info:nil]; } -#pragma mark - SwitchCellDelegate +#pragma mark - SettingsTableViewSwitchCellDelegate -- (void)switchCell:(SwitchCell *)cell didChangeValue:(BOOL)value +- (void)switchCell:(SettingsTableViewSwitchCell *)cell didChangeValue:(BOOL)value { if (cell == self.zoomButtonsCell) { @@ -240,7 +249,7 @@ extern NSString * const kAlohalyticsTapEventKey; - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { - LinkCell * cell = static_cast<LinkCell *>([tableView cellForRowAtIndexPath:indexPath]); + auto cell = static_cast<SettingsTableViewLinkCell *>([tableView cellForRowAtIndexPath:indexPath]); if (cell == self.profileCell) { [Statistics logEvent:kStatSettingsOpenSection withParameters:@{kStatName : kStatAuthorization}]; diff --git a/iphone/Maps/MWMTTSLanguageViewController.h b/iphone/Maps/Settings/MWMTTSLanguageViewController.h index a7b6a64ac2..a7b6a64ac2 100644 --- a/iphone/Maps/MWMTTSLanguageViewController.h +++ b/iphone/Maps/Settings/MWMTTSLanguageViewController.h diff --git a/iphone/Maps/MWMTTSLanguageViewController.mm b/iphone/Maps/Settings/MWMTTSLanguageViewController.mm index 8b1e2b269a..4529c4214f 100644 --- a/iphone/Maps/MWMTTSLanguageViewController.mm +++ b/iphone/Maps/Settings/MWMTTSLanguageViewController.mm @@ -1,7 +1,7 @@ -#import "MWMTextToSpeech.h" #import "MWMTTSLanguageViewController.h" #import "MWMTTSSettingsViewController.h" -#import "SelectableCell.h" +#import "MWMTextToSpeech.h" +#import "SwiftBridge.h" #import "UIColor+MapsMeColor.h" static NSString * const kUnwingSegueIdentifier = @"UnwindToTTSSettings"; @@ -15,7 +15,7 @@ static NSString * const kUnwingSegueIdentifier = @"UnwindToTTSSettings"; self.tableView.separatorColor = [UIColor blackDividers]; } -- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(SelectableCell *)sender +- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(SettingsTableViewSelectableCell *)sender { if (![segue.identifier isEqualToString:kUnwingSegueIdentifier]) return; @@ -31,10 +31,14 @@ static NSString * const kUnwingSegueIdentifier = @"UnwindToTTSSettings"; return [[MWMTextToSpeech tts] availableLanguages].size(); } -- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath +- (UITableViewCell *)tableView:(UITableView *)tableView + cellForRowAtIndexPath:(NSIndexPath *)indexPath { - SelectableCell * cell = (SelectableCell *)[tableView dequeueReusableCellWithIdentifier:[SelectableCell className]]; - cell.titleLabel.text = @([[MWMTextToSpeech tts] availableLanguages][indexPath.row].second.c_str()); + auto cellId = [SettingsTableViewSelectableCell cellId]; + auto cell = static_cast<SettingsTableViewSelectableCell *>( + [tableView dequeueReusableCellWithIdentifier:cellId]); + [cell + configWithTitle:@([[MWMTextToSpeech tts] availableLanguages][indexPath.row].second.c_str())]; return cell; } diff --git a/iphone/Maps/MWMTTSSettingsViewController.h b/iphone/Maps/Settings/MWMTTSSettingsViewController.h index 9c364a5247..f52576ce96 100644 --- a/iphone/Maps/MWMTTSSettingsViewController.h +++ b/iphone/Maps/Settings/MWMTTSSettingsViewController.h @@ -1,7 +1,7 @@ #import "MWMTableViewController.h" -#include "std/utility.hpp" #include "std/string.hpp" +#include "std/utility.hpp" @interface MWMTTSSettingsViewController : MWMTableViewController diff --git a/iphone/Maps/MWMTTSSettingsViewController.mm b/iphone/Maps/Settings/MWMTTSSettingsViewController.mm index bc120aee3c..36c040c4a1 100644 --- a/iphone/Maps/MWMTTSSettingsViewController.mm +++ b/iphone/Maps/Settings/MWMTTSSettingsViewController.mm @@ -1,9 +1,8 @@ #import "MWMTTSSettingsViewController.h" #import <AVFoundation/AVFoundation.h> -#import "LinkCell.h" #import "MWMTextToSpeech.h" -#import "SelectableCell.h" #import "Statistics.h" +#import "SwiftBridge.h" #import "UIColor+MapsMeColor.h" #import "WebViewController.h" @@ -110,10 +109,12 @@ using namespace locale_translator; { if (indexPath.row == 0) { - SelectableCell * cell = (SelectableCell *)[tableView - dequeueReusableCellWithIdentifier:[SelectableCell className]]; - cell.titleLabel.text = L(@"duration_disabled"); - cell.accessoryType = [MWMTextToSpeech isTTSEnabled] ? UITableViewCellAccessoryNone : UITableViewCellAccessoryCheckmark; + auto cellId = [SettingsTableViewSelectableCell cellId]; + auto cell = static_cast<SettingsTableViewSelectableCell *>( + [tableView dequeueReusableCellWithIdentifier:cellId]); + [cell configWithTitle:L(@"duration_disabled")]; + cell.accessoryType = [MWMTextToSpeech isTTSEnabled] ? UITableViewCellAccessoryNone + : UITableViewCellAccessoryCheckmark; return cell; } else @@ -121,17 +122,19 @@ using namespace locale_translator; NSInteger const row = indexPath.row - 1; if (row == _languages.size()) { - LinkCell * cell = - (LinkCell *)[tableView dequeueReusableCellWithIdentifier:[LinkCell className]]; - cell.titleLabel.text = L(@"pref_tts_other_section_title"); + auto cellId = [SettingsTableViewLinkCell cellId]; + auto cell = static_cast<SettingsTableViewLinkCell *>( + [tableView dequeueReusableCellWithIdentifier:cellId]); + [cell configWithTitle:L(@"pref_tts_other_section_title") info:nil]; return cell; } else { - SelectableCell * cell = (SelectableCell *)[tableView - dequeueReusableCellWithIdentifier:[SelectableCell className]]; + auto cellId = [SettingsTableViewSelectableCell cellId]; + auto cell = static_cast<SettingsTableViewSelectableCell *>( + [tableView dequeueReusableCellWithIdentifier:cellId]); pair<string, string> const p = _languages[row]; - cell.titleLabel.text = @(p.second.c_str()); + [cell configWithTitle:@(p.second.c_str())]; BOOL const isSelected = [@(p.first.c_str()) isEqualToString:[MWMTextToSpeech savedLanguage]]; cell.accessoryType = [MWMTextToSpeech isTTSEnabled] && isSelected @@ -143,9 +146,10 @@ using namespace locale_translator; } else { - LinkCell * cell = - (LinkCell *)[tableView dequeueReusableCellWithIdentifier:[LinkCell className]]; - cell.titleLabel.text = L(@"pref_tts_how_to_set_up_voice"); + auto cellId = [SettingsTableViewLinkCell cellId]; + auto cell = static_cast<SettingsTableViewLinkCell *>( + [tableView dequeueReusableCellWithIdentifier:cellId]); + [cell configWithTitle:L(@"pref_tts_how_to_set_up_voice") info:nil]; return cell; } } diff --git a/iphone/Maps/MWMUnitsController.h b/iphone/Maps/Settings/MWMUnitsController.h index 9135e1df1e..9135e1df1e 100644 --- a/iphone/Maps/MWMUnitsController.h +++ b/iphone/Maps/Settings/MWMUnitsController.h diff --git a/iphone/Maps/MWMUnitsController.mm b/iphone/Maps/Settings/MWMUnitsController.mm index 859b99e12c..d82139c005 100644 --- a/iphone/Maps/MWMUnitsController.mm +++ b/iphone/Maps/Settings/MWMUnitsController.mm @@ -1,13 +1,13 @@ #import "MWMUnitsController.h" #import "MWMSettings.h" -#import "SelectableCell.h" #import "Statistics.h" +#import "SwiftBridge.h" @interface MWMUnitsController () -@property(weak, nonatomic) IBOutlet SelectableCell * kilometers; -@property(weak, nonatomic) IBOutlet SelectableCell * miles; -@property(weak, nonatomic) SelectableCell * selectedCell; +@property(weak, nonatomic) IBOutlet SettingsTableViewSelectableCell * kilometers; +@property(weak, nonatomic) IBOutlet SettingsTableViewSelectableCell * miles; +@property(weak, nonatomic) SettingsTableViewSelectableCell * selectedCell; @end @@ -25,9 +25,9 @@ } } -- (void)setSelectedCell:(SelectableCell *)cell +- (void)setSelectedCell:(SettingsTableViewSelectableCell *)cell { - SelectableCell * selectedCell = _selectedCell; + SettingsTableViewSelectableCell * selectedCell = _selectedCell; if (selectedCell == cell) return; diff --git a/iphone/Maps/Settings/SelectableCell.h b/iphone/Maps/Settings/SelectableCell.h deleted file mode 100644 index d86d8819d1..0000000000 --- a/iphone/Maps/Settings/SelectableCell.h +++ /dev/null @@ -1,7 +0,0 @@ -#import "MWMTableViewCell.h" - -@interface SelectableCell : MWMTableViewCell - -@property (weak, nonatomic) IBOutlet UILabel * titleLabel; - -@end diff --git a/iphone/Maps/Settings/SelectableCell.mm b/iphone/Maps/Settings/SelectableCell.mm deleted file mode 100644 index 289e5c7b23..0000000000 --- a/iphone/Maps/Settings/SelectableCell.mm +++ /dev/null @@ -1,12 +0,0 @@ -#import "SelectableCell.h" -#import "UIColor+MapsMeColor.h" - -@implementation SelectableCell - -- (void)awakeFromNib -{ - [super awakeFromNib]; - self.backgroundColor = [UIColor white]; -} - -@end diff --git a/iphone/Maps/Settings/SwitchCell.h b/iphone/Maps/Settings/SwitchCell.h deleted file mode 100644 index 8dfb1ad1c4..0000000000 --- a/iphone/Maps/Settings/SwitchCell.h +++ /dev/null @@ -1,17 +0,0 @@ -#import "MWMTableViewCell.h" - -@class SwitchCell; -@protocol SwitchCellDelegate <NSObject> - -- (void)switchCell:(SwitchCell *)cell didChangeValue:(BOOL)value; - -@end - -@interface SwitchCell : MWMTableViewCell - -@property(weak, nonatomic) IBOutlet UILabel * titleLabel; -@property(weak, nonatomic) IBOutlet UISwitch * switchButton; - -@property(weak, nonatomic) id<SwitchCellDelegate> delegate; - -@end diff --git a/iphone/Maps/Settings/SwitchCell.mm b/iphone/Maps/Settings/SwitchCell.mm deleted file mode 100644 index 292ec81b43..0000000000 --- a/iphone/Maps/Settings/SwitchCell.mm +++ /dev/null @@ -1,18 +0,0 @@ -#import "SwitchCell.h" -#import "UIColor+MapsMeColor.h" - -@implementation SwitchCell - -- (void)awakeFromNib -{ - [super awakeFromNib]; - [self.switchButton addTarget:self action:@selector(switchChanged:) forControlEvents:UIControlEventValueChanged]; - self.backgroundColor = [UIColor white]; -} - -- (void)switchChanged:(UISwitch *)sender -{ - [self.delegate switchCell:self didChangeValue:sender.on]; -} - -@end |