diff options
| author | Alexander Boriskov <a.boriskov@corp.mail.ru> | 2020-01-17 15:59:24 +0300 |
|---|---|---|
| committer | Daria Volvenkova <d.volvenkova@corp.mail.ru> | 2020-02-12 14:37:51 +0300 |
| commit | 91d7242682d9c8eebea2b226bbed0851fcccc0d8 (patch) | |
| tree | 63cc69bec3cd11c401e7bc8a195ad4e16363cf3f /iphone/Maps | |
| parent | e85ac9d4dae886f24a5377467cef28444b4c80f1 (diff) | |
[iOS] Refactored old styles
Diffstat (limited to 'iphone/Maps')
253 files changed, 2506 insertions, 4413 deletions
diff --git a/iphone/Maps/Bookmarks/BookmarksTabViewController.swift b/iphone/Maps/Bookmarks/BookmarksTabViewController.swift index 452fee93da..3700621c19 100644 --- a/iphone/Maps/Bookmarks/BookmarksTabViewController.swift +++ b/iphone/Maps/Bookmarks/BookmarksTabViewController.swift @@ -24,11 +24,6 @@ final class BookmarksTabViewController: TabViewController { viewControllers = [bookmarks, catalog] title = L("bookmarks_guides"); - tabView.backgroundColor = .pressBackground() - tabView.barTintColor = .primary() - tabView.tintColor = .white() - tabView.headerTextAttributes = [.foregroundColor: UIColor.whitePrimaryText(), - .font: UIFont.medium14()] tabView.selectedIndex = activeTab.rawValue tabView.delegate = self } diff --git a/iphone/Maps/Bookmarks/BookmarksVC.mm b/iphone/Maps/Bookmarks/BookmarksVC.mm index 260d4b773e..6856d1d89a 100644 --- a/iphone/Maps/Bookmarks/BookmarksVC.mm +++ b/iphone/Maps/Bookmarks/BookmarksVC.mm @@ -2,6 +2,7 @@ #import "BookmarksSection.h" #import "InfoSection.h" #import "MWMCategoryInfoCell.h" +#import "SwiftBridge.h" #import "MWMKeyboard.h" #import "MWMLocationObserver.h" @@ -209,17 +210,15 @@ using namespace std; - (void)viewDidLoad { [super viewDidLoad]; - UIColor *searchBarColor = [UIColor primary]; self.searchBar.delegate = self; - self.statusBarBackground.backgroundColor = self.searchBar.barTintColor = searchBarColor; - self.searchBar.backgroundImage = [UIImage imageWithColor:searchBarColor]; + [self.statusBarBackground setStyleAndApply:@"SearchBarView"]; + [self.searchBar setStyleAndApply: @"SearchBar"]; self.searchBar.placeholder = L(@"search_in_the_list"); [self.noResultsView setTranslatesAutoresizingMaskIntoConstraints:NO]; self.tableView.estimatedRowHeight = 44; [self.tableView registerWithCellClass:MWMCategoryInfoCell.class]; - self.tableView.separatorColor = [UIColor blackDividers]; auto regularTitleAttributes = @{ NSFontAttributeName: [UIFont regular16], NSForegroundColorAttributeName: [UIColor linkBlue] }; @@ -682,10 +681,6 @@ using namespace std; - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { UITableViewCell *cell = [[self currentSections][indexPath.section] tableView:tableView cellForRow:indexPath.row]; - - cell.backgroundColor = [UIColor white]; - cell.textLabel.textColor = [UIColor blackPrimaryText]; - cell.detailTextLabel.textColor = [UIColor blackSecondaryText]; return cell; } @@ -746,12 +741,6 @@ using namespace std; } } -- (void)tableView:(UITableView *)tableView willDisplayHeaderView:(UIView *)view forSection:(NSInteger)section { - auto header = (UITableViewHeaderFooterView *)view; - header.textLabel.textColor = [UIColor blackSecondaryText]; - header.textLabel.font = [UIFont medium14]; -} - #pragma mark - InfoSectionDelegate - (void)infoSectionUpdates:(void (^)(void))updates { diff --git a/iphone/Maps/Bookmarks/BookmarksVC.xib b/iphone/Maps/Bookmarks/BookmarksVC.xib index 967181c74e..0b7475648f 100644 --- a/iphone/Maps/Bookmarks/BookmarksVC.xib +++ b/iphone/Maps/Bookmarks/BookmarksVC.xib @@ -1,11 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> - <device id="retina4_7" orientation="portrait"> - <adaptation id="fullscreen"/> - </device> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15705" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> + <device id="retina4_7" orientation="portrait" appearance="light"/> <dependencies> <deployment identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14490.49"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15706"/> <capability name="Safe area layout guides" minToolsVersion="9.0"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> @@ -43,14 +41,14 @@ <constraint firstAttribute="width" secondItem="eGH-Rr-EJq" secondAttribute="height" multiplier="1:1" priority="999" id="LzS-Q2-IYS"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Background"/> </userDefinedRuntimeAttributes> </view> <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" style="grouped" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="18" sectionFooterHeight="18" translatesAutoresizingMaskIntoConstraints="NO" id="sBT-45-bnw"> - <rect key="frame" x="0.0" y="76" width="375" height="547"/> + <rect key="frame" x="0.0" y="56" width="375" height="567"/> <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="pressBackground"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="TableView:PressBackground"/> </userDefinedRuntimeAttributes> <connections> <outlet property="dataSource" destination="-1" id="iBs-44-PxC"/> @@ -76,7 +74,7 @@ <barButtonItem width="8" style="plain" systemItem="fixedSpace" id="lFC-24-CEh"/> </items> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Background"/> </userDefinedRuntimeAttributes> </toolbar> <toolbar opaque="NO" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="uNd-fM-YVD"> @@ -98,18 +96,18 @@ <barButtonItem width="8" style="plain" systemItem="fixedSpace" id="YAt-eE-x2I"/> </items> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Background"/> </userDefinedRuntimeAttributes> </toolbar> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="S4A-UM-s8p"> - <rect key="frame" x="0.0" y="-32" width="375" height="108"/> + <rect key="frame" x="0.0" y="-52" width="375" height="108"/> <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> <constraints> <constraint firstAttribute="height" constant="108" id="R0d-xI-qxQ"/> </constraints> </view> <searchBar contentMode="redraw" translatesAutoresizingMaskIntoConstraints="NO" id="CQZ-YM-Mk4"> - <rect key="frame" x="0.0" y="20" width="375" height="56"/> + <rect key="frame" x="0.0" y="0.0" width="375" height="56"/> <constraints> <constraint firstAttribute="height" relation="greaterThanOrEqual" priority="750" constant="44" id="GJx-FV-8CF"/> <constraint firstAttribute="height" priority="250" id="rHp-eh-4pP"/> @@ -143,7 +141,7 @@ </constraints> <viewLayoutGuide key="safeArea" id="vUN-kp-3ea"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="PressBackground"/> </userDefinedRuntimeAttributes> <point key="canvasLocation" x="53.600000000000001" y="48.125937031484263"/> </view> diff --git a/iphone/Maps/Bookmarks/Catalog/CatalogCategoryCell.swift b/iphone/Maps/Bookmarks/Catalog/CatalogCategoryCell.swift index bc7459c8ca..382bf9e38a 100644 --- a/iphone/Maps/Bookmarks/Catalog/CatalogCategoryCell.swift +++ b/iphone/Maps/Bookmarks/Catalog/CatalogCategoryCell.swift @@ -7,24 +7,9 @@ final class CatalogCategoryCell: MWMTableViewCell { weak var delegate: CatalogCategoryCellDelegate? - @IBOutlet weak var visibleCheckmark: Checkmark! { - didSet { - visibleCheckmark.offTintColor = .blackHintText() - visibleCheckmark.onTintColor = .linkBlue() - } - } - @IBOutlet weak var titleLabel: UILabel! { - didSet { - titleLabel.font = .regular16() - titleLabel.textColor = .blackPrimaryText() - } - } - @IBOutlet weak var subtitleLabel: UILabel! { - didSet { - subtitleLabel.font = .regular14() - subtitleLabel.textColor = .blackSecondaryText() - } - } + @IBOutlet weak var visibleCheckmark: Checkmark! + @IBOutlet weak var titleLabel: UILabel! + @IBOutlet weak var subtitleLabel: UILabel! @IBOutlet weak var moreButton: UIButton! @IBAction func onVisibleChanged(_ sender: Checkmark) { diff --git a/iphone/Maps/Bookmarks/Catalog/CatalogCategoryCell.xib b/iphone/Maps/Bookmarks/Catalog/CatalogCategoryCell.xib index 84b5e41ddc..d8dbd0c7c1 100644 --- a/iphone/Maps/Bookmarks/Catalog/CatalogCategoryCell.xib +++ b/iphone/Maps/Bookmarks/Catalog/CatalogCategoryCell.xib @@ -1,11 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14113" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> - <device id="retina4_7" orientation="portrait"> - <adaptation id="fullscreen"/> - </device> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> + <device id="retina4_7" orientation="portrait" appearance="light"/> <dependencies> <deployment identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/> <capability name="Safe area layout guides" minToolsVersion="9.0"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> @@ -16,11 +14,11 @@ <rect key="frame" x="0.0" y="0.0" width="320" height="60"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM"> - <rect key="frame" x="0.0" y="0.0" width="320" height="59.5"/> + <rect key="frame" x="0.0" y="0.0" width="320" height="60"/> <autoresizingMask key="autoresizingMask"/> <subviews> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="TYb-q4-3hJ" customClass="Checkmark" customModule="maps_me" customModuleProvider="target"> - <rect key="frame" x="0.0" y="0.0" width="56" height="60"/> + <rect key="frame" x="0.0" y="0.0" width="56" height="60.5"/> <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> <constraints> <constraint firstAttribute="width" constant="56" id="gNZ-kZ-bfY"/> @@ -38,21 +36,27 @@ <fontDescription key="fontDescription" type="system" pointSize="17"/> <nil key="textColor"/> <nil key="highlightedColor"/> + <userDefinedRuntimeAttributes> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular16:blackPrimaryText"/> + </userDefinedRuntimeAttributes> </label> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="DlK-AV-gvk"> <rect key="frame" x="56" y="33" width="208" height="19"/> <fontDescription key="fontDescription" type="system" pointSize="17"/> <nil key="textColor"/> <nil key="highlightedColor"/> + <userDefinedRuntimeAttributes> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular14:blackSecondaryText"/> + </userDefinedRuntimeAttributes> </label> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Uym-iO-PUK"> - <rect key="frame" x="264" y="0.0" width="56" height="60"/> + <rect key="frame" x="264" y="0.0" width="56" height="60.5"/> <constraints> <constraint firstAttribute="width" constant="56" id="MHu-fs-l19"/> </constraints> <state key="normal" image="ic24PxMore"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="tintColorName" value="blackSecondaryText"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="MWMBlack"/> </userDefinedRuntimeAttributes> <connections> <action selector="onMoreButton:" destination="KGk-i7-Jjw" eventType="touchUpInside" id="SQV-hf-5f6"/> @@ -82,6 +86,7 @@ <outlet property="titleLabel" destination="9gp-G7-fer" id="Ubj-0i-YWi"/> <outlet property="visibleCheckmark" destination="TYb-q4-3hJ" id="EdR-5o-6bz"/> </connections> + <point key="canvasLocation" x="139" y="154"/> </tableViewCell> </objects> <resources> diff --git a/iphone/Maps/Bookmarks/Catalog/CatalogConnectionErrorView.swift b/iphone/Maps/Bookmarks/Catalog/CatalogConnectionErrorView.swift index bcfb7468ef..7c36f733d3 100644 --- a/iphone/Maps/Bookmarks/Catalog/CatalogConnectionErrorView.swift +++ b/iphone/Maps/Bookmarks/Catalog/CatalogConnectionErrorView.swift @@ -30,7 +30,6 @@ class CatalogConnectionErrorView: UIView { extension CatalogConnectionErrorView { func xibSetup() { - backgroundColor = UIColor.clear let nib = UINib(nibName: "CatalogConnectionErrorView", bundle: nil) let view = nib.instantiate(withOwner: self, options: nil).first as! UIView view.translatesAutoresizingMaskIntoConstraints = false diff --git a/iphone/Maps/Bookmarks/Catalog/CatalogConnectionErrorView.xib b/iphone/Maps/Bookmarks/Catalog/CatalogConnectionErrorView.xib index 9a7091be0a..d9daf03601 100644 --- a/iphone/Maps/Bookmarks/Catalog/CatalogConnectionErrorView.xib +++ b/iphone/Maps/Bookmarks/Catalog/CatalogConnectionErrorView.xib @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14865.1" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> <device id="retina6_1" orientation="portrait" appearance="light"/> <dependencies> <deployment identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14819.2"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/> <capability name="Safe area layout guides" minToolsVersion="9.0"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> @@ -33,8 +33,7 @@ <nil key="textColor"/> <nil key="highlightedColor"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular20"/> - <userDefinedRuntimeAttribute type="string" keyPath="textColorName" value="blackPrimaryText"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular20:blackPrimaryText"/> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="catalog_no_internet_title"/> </userDefinedRuntimeAttributes> </label> @@ -45,14 +44,7 @@ </constraints> <state key="normal" title="Button"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="textColorHighlightedName" value="whitePrimaryTextHighlighted"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="semibold14"/> - <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius"> - <integer key="value" value="8"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="string" keyPath="textColorName" value="whitePrimaryText"/> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="linkBlue"/> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundHighlightedColorName" value="linkBlueHighlighted"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="FlatNormalButton"/> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="catalog_no_internet_button"/> </userDefinedRuntimeAttributes> <connections> @@ -60,6 +52,7 @@ </connections> </button> </subviews> + <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> <constraints> <constraint firstAttribute="trailing" secondItem="kyS-Dc-8Qc" secondAttribute="trailing" id="2gU-Ct-ccl"/> <constraint firstAttribute="trailing" secondItem="dSI-8v-q0T" secondAttribute="trailing" constant="5" id="5lL-7g-AdH"/> @@ -75,7 +68,7 @@ <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/> <viewLayoutGuide key="safeArea" id="vUN-kp-3ea"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Background"/> </userDefinedRuntimeAttributes> <point key="canvasLocation" x="53.623188405797109" y="56.584821428571423"/> </view> diff --git a/iphone/Maps/Bookmarks/Catalog/CatalogWebViewController.swift b/iphone/Maps/Bookmarks/Catalog/CatalogWebViewController.swift index 6e92fe0fc0..38c2762a7d 100644 --- a/iphone/Maps/Bookmarks/Catalog/CatalogWebViewController.swift +++ b/iphone/Maps/Bookmarks/Catalog/CatalogWebViewController.swift @@ -87,8 +87,7 @@ final class CatalogWebViewController: WebViewController { progressView.translatesAutoresizingMaskIntoConstraints = false progressBgView.translatesAutoresizingMaskIntoConstraints = false loadingIndicator.translatesAutoresizingMaskIntoConstraints = false - numberOfTasksLabel.font = UIFont.medium14() - numberOfTasksLabel.textColor = UIColor.white + numberOfTasksLabel.styleName = "medium14:whiteText" numberOfTasksLabel.text = "0" progressBgView.layer.cornerRadius = 8 progressBgView.clipsToBounds = true @@ -125,7 +124,9 @@ final class CatalogWebViewController: WebViewController { progressBgView.leftAnchor.constraint(equalTo: view.leftAnchor, constant: 8).isActive = true } - progressView.tintColor = UIColor.white() + progressView.styleName = "MWMWhite" + self.view.styleName = "Background" + updateProgress() let backButton = UIBarButtonItem(image: UIImage(named: "ic_nav_bar_back"), style: .plain, diff --git a/iphone/Maps/Bookmarks/Catalog/Dialogs/BookmarksLoadedViewController.xib b/iphone/Maps/Bookmarks/Catalog/Dialogs/BookmarksLoadedViewController.xib index 8cd4a2b0d5..fe720c68a3 100644 --- a/iphone/Maps/Bookmarks/Catalog/Dialogs/BookmarksLoadedViewController.xib +++ b/iphone/Maps/Bookmarks/Catalog/Dialogs/BookmarksLoadedViewController.xib @@ -1,11 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14113" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> - <device id="retina4_7" orientation="portrait"> - <adaptation id="fullscreen"/> - </device> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> + <device id="retina4_7" orientation="portrait" appearance="light"/> <dependencies> <deployment identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/> <capability name="Safe area layout guides" minToolsVersion="9.0"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> @@ -29,8 +27,7 @@ succesfully downloaded</string> <nil key="highlightedColor"/> <userDefinedRuntimeAttributes> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="guide_downloaded_title"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="medium18"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="medium18:blackPrimaryText"/> </userDefinedRuntimeAttributes> </label> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalCompressionResistancePriority="749" verticalCompressionResistancePriority="749" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2MR-ae-0PS"> @@ -42,8 +39,7 @@ new places from the list</string> <nil key="highlightedColor"/> <userDefinedRuntimeAttributes> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="guide_downloaded_subtitle"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular14"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackSecondaryText"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular14:blackSecondaryText"/> </userDefinedRuntimeAttributes> </label> <button opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="rBj-dl-R2V"> @@ -57,14 +53,7 @@ new places from the list</string> <state key="normal" title="View on map"/> <userDefinedRuntimeAttributes> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="search_show_on_map"/> - <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius"> - <integer key="value" value="5"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="medium16"/> - <userDefinedRuntimeAttribute type="string" keyPath="textColorHighlightedName" value="white"/> - <userDefinedRuntimeAttribute type="string" keyPath="textColorName" value="white"/> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="linkBlue"/> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundHighlightedColorName" value="linkBlueHighlighted"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="FlatNormalButton"/> </userDefinedRuntimeAttributes> <connections> <action selector="onViewMap:" destination="-1" eventType="touchUpInside" id="XDB-72-rMm"/> @@ -81,10 +70,8 @@ new places from the list</string> <color key="titleColor" white="0.0" alpha="0.37976241438356162" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> </state> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="medium16"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="FlatGrayTransButton"/> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="not_now"/> - <userDefinedRuntimeAttribute type="string" keyPath="textColorHighlightedName" value="blackHintText"/> - <userDefinedRuntimeAttribute type="string" keyPath="textColorName" value="blackSecondaryText"/> </userDefinedRuntimeAttributes> <connections> <action selector="onNotNow:" destination="-1" eventType="touchUpInside" id="YAU-5T-vzd"/> @@ -110,7 +97,7 @@ new places from the list</string> <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/> <viewLayoutGuide key="safeArea" id="fnl-2z-Ty3"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Background"/> </userDefinedRuntimeAttributes> <point key="canvasLocation" x="-24" y="148"/> </view> diff --git a/iphone/Maps/Bookmarks/Catalog/Dialogs/SubscriptionExpiredViewController.xib b/iphone/Maps/Bookmarks/Catalog/Dialogs/SubscriptionExpiredViewController.xib index d942bf9f63..dc2fec8863 100644 --- a/iphone/Maps/Bookmarks/Catalog/Dialogs/SubscriptionExpiredViewController.xib +++ b/iphone/Maps/Bookmarks/Catalog/Dialogs/SubscriptionExpiredViewController.xib @@ -1,7 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15400" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> + <device id="retina6_1" orientation="portrait" appearance="light"/> <dependencies> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15404"/> + <deployment identifier="iOS"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/> <capability name="Safe area layout guides" minToolsVersion="9.0"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> @@ -16,18 +18,17 @@ <rect key="frame" x="0.0" y="0.0" width="284" height="451"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> - <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" image="bookmarksSubscriptionFail" translatesAutoresizingMaskIntoConstraints="NO" id="aPq-P8-sA5"> - <rect key="frame" x="-5" y="16" width="294" height="134"/> + <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="bookmarksSubscriptionFail" translatesAutoresizingMaskIntoConstraints="NO" id="aPq-P8-sA5"> + <rect key="frame" x="68.5" y="16" width="147" height="134"/> </imageView> - <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="Your subscription has expired" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="D7k-iL-1r7"> + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Your subscription has expired" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="D7k-iL-1r7"> <rect key="frame" x="16" y="166" width="252" height="50.5"/> <fontDescription key="fontDescription" type="boldSystem" pointSize="21"/> <nil key="textColor"/> <nil key="highlightedColor"/> <userDefinedRuntimeAttributes> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="renewal_screen_title"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="bold22"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="bold22:blackPrimaryText"/> </userDefinedRuntimeAttributes> </label> <button opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="7V3-cv-Cng" userLabel="Continue"> @@ -44,29 +45,21 @@ <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> </state> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="textColorHighlightedName" value="white"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="medium16"/> - <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius"> - <integer key="value" value="6"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="string" keyPath="textColorName" value="white"/> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="linkBlue"/> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundHighlightedColorName" value="linkBlueHighlighted"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="FlatNormalButton"/> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="renewal_screen_button_restore"/> </userDefinedRuntimeAttributes> <connections> <action selector="onSubscribe:" destination="-1" eventType="touchUpInside" id="gD5-39-MrO"/> </connections> </button> - <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="All the guides downloaded by subscription are going to be deleted. Want to resume the subscription and keep them?" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="CJe-NE-j8c"> + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="All the guides downloaded by subscription are going to be deleted. Want to resume the subscription and keep them?" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="CJe-NE-j8c"> <rect key="frame" x="16" y="232.5" width="252" height="67"/> <fontDescription key="fontDescription" type="system" pointSize="14"/> <color key="textColor" white="0.0" alpha="0.39696596750000002" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> <nil key="highlightedColor"/> <userDefinedRuntimeAttributes> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="renewal_screen_message"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular14"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackSecondaryText"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular14:blackSecondaryText"/> </userDefinedRuntimeAttributes> </label> <button opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="OOr-Od-TtY" userLabel="Continue"> @@ -82,9 +75,7 @@ <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> </state> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="textColorName" value="red"/> - <userDefinedRuntimeAttribute type="string" keyPath="textColorHighlightedName" value="red"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="medium16"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="FlatRedTransButton"/> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="renewal_screen_button_cancel"/> </userDefinedRuntimeAttributes> <connections> diff --git a/iphone/Maps/Bookmarks/Catalog/Dialogs/SubscriptionFailViewController.xib b/iphone/Maps/Bookmarks/Catalog/Dialogs/SubscriptionFailViewController.xib index aecc3fe0c7..224af1781a 100644 --- a/iphone/Maps/Bookmarks/Catalog/Dialogs/SubscriptionFailViewController.xib +++ b/iphone/Maps/Bookmarks/Catalog/Dialogs/SubscriptionFailViewController.xib @@ -1,7 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15400" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> + <device id="retina6_1" orientation="portrait" appearance="light"/> <dependencies> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15404"/> + <deployment identifier="iOS"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/> <capability name="Safe area layout guides" minToolsVersion="9.0"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> @@ -16,18 +18,17 @@ <rect key="frame" x="0.0" y="0.0" width="284" height="343"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> - <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" image="bookmarksSubscriptionFail" translatesAutoresizingMaskIntoConstraints="NO" id="QsQ-Qr-kgU"> - <rect key="frame" x="-5" y="16" width="294" height="134"/> + <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="bookmarksSubscriptionFail" translatesAutoresizingMaskIntoConstraints="NO" id="QsQ-Qr-kgU"> + <rect key="frame" x="68.5" y="16" width="147" height="134"/> </imageView> - <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="Purchase has failed" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="BQC-4m-6q5"> + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Purchase has failed" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="BQC-4m-6q5"> <rect key="frame" x="16" y="166" width="252" height="25.5"/> <fontDescription key="fontDescription" type="boldSystem" pointSize="21"/> <nil key="textColor"/> <nil key="highlightedColor"/> <userDefinedRuntimeAttributes> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="subscription_error_ping_title"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="bold22"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="bold22:blackPrimaryText"/> </userDefinedRuntimeAttributes> </label> <button opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="N2j-Or-SOC" userLabel="Continue"> @@ -44,29 +45,21 @@ <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> </state> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="textColorHighlightedName" value="white"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="medium14"/> - <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius"> - <integer key="value" value="6"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="string" keyPath="textColorName" value="white"/> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="linkBlue"/> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundHighlightedColorName" value="linkBlueHighlighted"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="FlatNormalButton"/> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="subscription_error_button"/> </userDefinedRuntimeAttributes> <connections> <action selector="onOk:" destination="-1" eventType="touchUpInside" id="TOs-X1-qKX"/> </connections> </button> - <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="The service is currently unavailable in your region. Please try again later." textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="lrT-fS-BfP"> + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="The service is currently unavailable in your region. Please try again later." textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="lrT-fS-BfP"> <rect key="frame" x="16" y="207.5" width="252" height="33.5"/> <fontDescription key="fontDescription" type="system" pointSize="14"/> <color key="textColor" white="0.0" alpha="0.39696596750000002" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> <nil key="highlightedColor"/> <userDefinedRuntimeAttributes> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="subscription_error_message"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular14"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackSecondaryText"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular14:blackSecondaryText"/> </userDefinedRuntimeAttributes> </label> </subviews> diff --git a/iphone/Maps/Bookmarks/Catalog/Dialogs/SubscriptionGoToCatalogViewController.xib b/iphone/Maps/Bookmarks/Catalog/Dialogs/SubscriptionGoToCatalogViewController.xib index 513db939a7..3885dfb0fa 100644 --- a/iphone/Maps/Bookmarks/Catalog/Dialogs/SubscriptionGoToCatalogViewController.xib +++ b/iphone/Maps/Bookmarks/Catalog/Dialogs/SubscriptionGoToCatalogViewController.xib @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15400" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> <device id="retina6_1" orientation="portrait" appearance="light"/> <dependencies> <deployment identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15404"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/> <capability name="Safe area layout guides" minToolsVersion="9.0"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> @@ -30,8 +30,7 @@ <nil key="highlightedColor"/> <userDefinedRuntimeAttributes> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="popup_subscription_success_map_title"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="bold22"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="bold22:blackPrimaryText"/> </userDefinedRuntimeAttributes> </label> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Now, yout can add to your map detailed description of the best places" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="OsJ-Ey-N4m"> @@ -41,8 +40,7 @@ <nil key="highlightedColor"/> <userDefinedRuntimeAttributes> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="popup_subscription_success_map_message"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular16"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackSecondaryText"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular16:blackSecondaryText"/> </userDefinedRuntimeAttributes> </label> <button opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Xa4-LJ-vic" userLabel="Continue"> @@ -59,14 +57,7 @@ <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> </state> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="textColorHighlightedName" value="white"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="medium14"/> - <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius"> - <integer key="value" value="6"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="string" keyPath="textColorName" value="white"/> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="linkBlue"/> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundHighlightedColorName" value="linkBlueHighlighted"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="FlatNormalButton"/> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="popup_subscription_success_map_start_button"/> </userDefinedRuntimeAttributes> <connections> @@ -85,14 +76,7 @@ <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> </state> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="textColorHighlightedName" value="linkBlueHighlighted"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="medium14"/> - <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius"> - <integer key="value" value="6"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="string" keyPath="textColorName" value="linkBlue"/> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundHighlightedColorName" value="white"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="FlatGrayTransButton"/> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="popup_subscription_success_map_not_now_button"/> </userDefinedRuntimeAttributes> <connections> diff --git a/iphone/Maps/Bookmarks/Catalog/Dialogs/SubscriptionSuccessViewController.xib b/iphone/Maps/Bookmarks/Catalog/Dialogs/SubscriptionSuccessViewController.xib index 3f23393d78..3db33d91ed 100644 --- a/iphone/Maps/Bookmarks/Catalog/Dialogs/SubscriptionSuccessViewController.xib +++ b/iphone/Maps/Bookmarks/Catalog/Dialogs/SubscriptionSuccessViewController.xib @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15400" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> <device id="retina4_7" orientation="portrait" appearance="light"/> <dependencies> <deployment identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15404"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/> <capability name="Safe area layout guides" minToolsVersion="9.0"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> @@ -30,8 +30,7 @@ <nil key="highlightedColor"/> <userDefinedRuntimeAttributes> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="subscription_success_dialog_title"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="bold22"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="bold22:blackPrimaryText"/> </userDefinedRuntimeAttributes> </label> <button opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Dxe-ly-peO" userLabel="Continue"> @@ -48,14 +47,7 @@ <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> </state> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="textColorHighlightedName" value="white"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="medium14"/> - <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius"> - <integer key="value" value="6"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="string" keyPath="textColorName" value="white"/> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="linkBlue"/> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundHighlightedColorName" value="linkBlueHighlighted"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="FlatNormalButton"/> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="button_layer_got_it"/> </userDefinedRuntimeAttributes> <connections> @@ -69,8 +61,7 @@ <nil key="highlightedColor"/> <userDefinedRuntimeAttributes> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="subscription_success_dialog_message"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular16"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackSecondaryText"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular16:blackSecondaryText"/> </userDefinedRuntimeAttributes> </label> </subviews> @@ -92,7 +83,7 @@ <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/> <viewLayoutGuide key="safeArea" id="fnl-2z-Ty3"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Background"/> </userDefinedRuntimeAttributes> <point key="canvasLocation" x="47.200000000000003" y="143.02848575712144"/> </view> diff --git a/iphone/Maps/Bookmarks/Catalog/DownloadedBookmarksViewController.swift b/iphone/Maps/Bookmarks/Catalog/DownloadedBookmarksViewController.swift index af4b707f3b..b90e6854cf 100644 --- a/iphone/Maps/Bookmarks/Catalog/DownloadedBookmarksViewController.swift +++ b/iphone/Maps/Bookmarks/Catalog/DownloadedBookmarksViewController.swift @@ -25,8 +25,6 @@ class DownloadedBookmarksViewController: MWMViewController { override func viewDidLoad() { super.viewDidLoad() - tableView.backgroundColor = UIColor.pressBackground() - tableView.separatorColor = UIColor.blackDividers() tableView.tableHeaderView = bottomView tableView.registerNib(cell: CatalogCategoryCell.self) tableView.registerNibForHeaderFooterView(BMCCategoriesHeader.self) diff --git a/iphone/Maps/Bookmarks/Catalog/DownloadedBookmarksViewController.xib b/iphone/Maps/Bookmarks/Catalog/DownloadedBookmarksViewController.xib index 6cd1627bee..ca65c74bd8 100644 --- a/iphone/Maps/Bookmarks/Catalog/DownloadedBookmarksViewController.xib +++ b/iphone/Maps/Bookmarks/Catalog/DownloadedBookmarksViewController.xib @@ -1,11 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> - <device id="retina4_7" orientation="portrait"> - <adaptation id="fullscreen"/> - </device> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> + <device id="retina4_7" orientation="portrait" appearance="light"/> <dependencies> <deployment identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14490.49"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/> <capability name="Safe area layout guides" minToolsVersion="9.0"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> @@ -38,14 +36,7 @@ <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> </state> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="textColorHighlightedName" value="whitePrimaryTextHighlighted"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="medium14"/> - <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius"> - <integer key="value" value="8"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="string" keyPath="textColorName" value="whitePrimaryText"/> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="linkBlue"/> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundHighlightedColorName" value="linkBlueHighlighted"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="FlatNormalButton"/> </userDefinedRuntimeAttributes> <connections> <action selector="onDownloadBookmarks:" destination="-1" eventType="touchUpInside" id="sde-zI-dEe"/> @@ -57,8 +48,7 @@ <color key="textColor" white="0.0" alpha="0.5586472602739726" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> <nil key="highlightedColor"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="medium14"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackSecondaryText"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="medium14:blackSecondaryText"/> </userDefinedRuntimeAttributes> </label> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="lZi-fE-uf3"> @@ -69,8 +59,7 @@ <nil key="highlightedColor"/> <userDefinedRuntimeAttributes> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="cached_guides_placeholder_subtitle"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular14"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackSecondaryText"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular14:blackSecondaryText"/> </userDefinedRuntimeAttributes> </label> </subviews> @@ -96,15 +85,18 @@ <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> <tableView opaque="NO" clipsSubviews="YES" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" bouncesZoom="NO" style="grouped" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="18" sectionFooterHeight="18" translatesAutoresizingMaskIntoConstraints="NO" id="i5M-Pr-FkT"> - <rect key="frame" x="0.0" y="20" width="375" height="647"/> + <rect key="frame" x="0.0" y="0.0" width="375" height="667"/> <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/> + <userDefinedRuntimeAttributes> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="TableView:PressBackground"/> + </userDefinedRuntimeAttributes> <connections> <outlet property="dataSource" destination="-1" id="Tng-2m-Rnh"/> <outlet property="delegate" destination="-1" id="9aC-8N-iBw"/> </connections> </tableView> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="EF0-Bq-c6F"> - <rect key="frame" x="0.0" y="20" width="375" height="647"/> + <rect key="frame" x="0.0" y="0.0" width="375" height="667"/> <subviews> <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="749" verticalCompressionResistancePriority="749" image="img_empty_bookmarks" translatesAutoresizingMaskIntoConstraints="NO" id="ahy-M3-meH"> <rect key="frame" x="87.5" y="40" width="200" height="200"/> @@ -119,8 +111,7 @@ <nil key="highlightedColor"/> <userDefinedRuntimeAttributes> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="guides_catalogue_title"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular18"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular18:blackPrimaryText"/> </userDefinedRuntimeAttributes> </label> <label opaque="NO" userInteractionEnabled="NO" contentMode="TopLeft" horizontalHuggingPriority="251" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="1gY-vv-QfN"> @@ -131,8 +122,7 @@ <nil key="highlightedColor"/> <userDefinedRuntimeAttributes> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="cached_guides_placeholder_subtitle"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular14"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackSecondaryText"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular14:blackSecondaryText"/> </userDefinedRuntimeAttributes> </label> <button opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="kER-re-108" userLabel="Download Bookmarks"> @@ -147,14 +137,7 @@ <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> </state> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="textColorHighlightedName" value="whitePrimaryTextHighlighted"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="medium14"/> - <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius"> - <integer key="value" value="8"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="string" keyPath="textColorName" value="whitePrimaryText"/> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="linkBlue"/> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundHighlightedColorName" value="linkBlueHighlighted"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="FlatNormalButton"/> </userDefinedRuntimeAttributes> <connections> <action selector="onDownloadBookmarks:" destination="-1" eventType="touchUpInside" id="u6w-gS-8w1"/> @@ -177,7 +160,7 @@ <constraint firstItem="ahy-M3-meH" firstAttribute="top" secondItem="EF0-Bq-c6F" secondAttribute="top" constant="40" id="tdz-sP-cyI"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="PressBackground"/> </userDefinedRuntimeAttributes> </view> </subviews> diff --git a/iphone/Maps/Bookmarks/Catalog/PaidRouteViewController.swift b/iphone/Maps/Bookmarks/Catalog/PaidRouteViewController.swift index 5d31fa4ad7..270903ac8c 100644 --- a/iphone/Maps/Bookmarks/Catalog/PaidRouteViewController.swift +++ b/iphone/Maps/Bookmarks/Catalog/PaidRouteViewController.swift @@ -73,7 +73,6 @@ class PaidRouteViewController: MWMViewController { override func viewDidLoad() { super.viewDidLoad() - buyButton.layer.borderColor = UIColor.linkBlue().cgColor routeTitleLabel.text = name routeAuthorLabel.text = author if let url = imageUrl { diff --git a/iphone/Maps/Bookmarks/Catalog/PaidRouteViewController.xib b/iphone/Maps/Bookmarks/Catalog/PaidRouteViewController.xib index 86163a12a6..530505dff9 100644 --- a/iphone/Maps/Bookmarks/Catalog/PaidRouteViewController.xib +++ b/iphone/Maps/Bookmarks/Catalog/PaidRouteViewController.xib @@ -1,9 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14868" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> - <device id="retina4_0" orientation="portrait" appearance="light"/> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15705" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> <dependencies> - <deployment identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14824"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15706"/> <capability name="Safe area layout guides" minToolsVersion="9.0"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> @@ -27,20 +25,20 @@ <rect key="frame" x="0.0" y="0.0" width="320" height="568"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> - <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" verticalCompressionResistancePriority="749" image="img_guides_placeholder" translatesAutoresizingMaskIntoConstraints="NO" id="1jX-9f-swC"> - <rect key="frame" x="0.0" y="-380.5" width="320" height="485"/> + <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" verticalCompressionResistancePriority="749" ambiguous="YES" image="img_guides_placeholder" translatesAutoresizingMaskIntoConstraints="NO" id="1jX-9f-swC"> + <rect key="frame" x="0.0" y="-380.5" width="1000" height="485"/> <color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> <constraints> <constraint firstAttribute="width" secondItem="1jX-9f-swC" secondAttribute="height" multiplier="500:758" id="ZSu-8v-nw1"/> </constraints> </imageView> - <imageView userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="200" verticalHuggingPriority="200" verticalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="wJO-dJ-F8G"> + <imageView userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="200" verticalHuggingPriority="200" verticalCompressionResistancePriority="250" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="wJO-dJ-F8G"> <rect key="frame" x="0.0" y="0.0" width="320" height="104.5"/> </imageView> - <scrollView multipleTouchEnabled="YES" contentMode="scaleToFill" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" translatesAutoresizingMaskIntoConstraints="NO" id="q1n-JA-q3D"> + <scrollView multipleTouchEnabled="YES" contentMode="scaleToFill" ambiguous="YES" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" translatesAutoresizingMaskIntoConstraints="NO" id="q1n-JA-q3D"> <rect key="frame" x="0.0" y="104.5" width="320" height="463.5"/> <subviews> - <view contentMode="scaleToFill" horizontalCompressionResistancePriority="751" verticalCompressionResistancePriority="751" translatesAutoresizingMaskIntoConstraints="NO" id="pbL-bL-mXm"> + <view contentMode="scaleToFill" horizontalCompressionResistancePriority="751" verticalCompressionResistancePriority="751" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="pbL-bL-mXm"> <rect key="frame" x="0.0" y="0.0" width="320" height="463.5"/> <subviews> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="252" verticalCompressionResistancePriority="752" text="..." textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Pwv-EO-6fY"> @@ -49,8 +47,7 @@ <color key="textColor" white="0.0" alpha="0.37553510273972601" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> <nil key="highlightedColor"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="medium14"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackHintText"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="medium14:blackHintText"/> </userDefinedRuntimeAttributes> </label> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="YlO-Qt-ILN"> @@ -60,7 +57,7 @@ <constraint firstAttribute="height" constant="1" id="LSa-3h-jdQ"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="blackDividers"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Divider"/> </userDefinedRuntimeAttributes> </view> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="252" verticalCompressionResistancePriority="751" text="Have a dinner with Hemingway and Castro in Havana" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="4PP-cK-o7Y"> @@ -70,8 +67,7 @@ <nil key="highlightedColor"/> <userDefinedRuntimeAttributes> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value=""/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular24"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular24:blackPrimaryText"/> </userDefinedRuntimeAttributes> </label> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="252" verticalCompressionResistancePriority="752" text="by Julio Mulio" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="H6m-mO-TFt"> @@ -81,11 +77,10 @@ <nil key="highlightedColor"/> <userDefinedRuntimeAttributes> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value=""/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular14"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular14:blackPrimaryText"/> </userDefinedRuntimeAttributes> </label> - <button opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" verticalCompressionResistancePriority="751" enabled="NO" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="1XW-gh-X68" userLabel="Download Bookmarks"> + <button opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" verticalCompressionResistancePriority="751" ambiguous="YES" enabled="NO" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="1XW-gh-X68" userLabel="Download Bookmarks"> <rect key="frame" x="24" y="210" width="272" height="48"/> <color key="backgroundColor" red="0.11764705882352941" green="0.58823529411764708" blue="0.94117647058823528" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <constraints> @@ -97,20 +92,13 @@ <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> </state> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="textColorHighlightedName" value="whitePrimaryTextHighlighted"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="medium14"/> - <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius"> - <integer key="value" value="8"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="string" keyPath="textColorName" value="whitePrimaryText"/> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="linkBlue"/> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundHighlightedColorName" value="linkBlueHighlighted"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="FlatNormalButton"/> </userDefinedRuntimeAttributes> <connections> <action selector="onSubscribe:" destination="-1" eventType="touchUpInside" id="vKT-Jw-oYb"/> </connections> </button> - <button hidden="YES" opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" verticalCompressionResistancePriority="751" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Y4X-z8-enR" userLabel="Buy"> + <button hidden="YES" opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" verticalCompressionResistancePriority="751" ambiguous="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Y4X-z8-enR" userLabel="Buy"> <rect key="frame" x="24" y="268" width="272" height="48"/> <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/> <constraints> @@ -122,24 +110,16 @@ <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> </state> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="textColorHighlightedName" value="linkBlueHighlighted"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="medium14"/> - <userDefinedRuntimeAttribute type="string" keyPath="textColorName" value="linkBlue"/> - <userDefinedRuntimeAttribute type="number" keyPath="layer.borderWidth"> - <integer key="value" value="1"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius"> - <integer key="value" value="8"/> - </userDefinedRuntimeAttribute> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="FlatNormalTransButton"/> </userDefinedRuntimeAttributes> <connections> <action selector="onBuy:" destination="-1" eventType="touchUpInside" id="2iV-Mk-Qcg"/> </connections> </button> - <activityIndicatorView opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" hidesWhenStopped="YES" animating="YES" style="white" translatesAutoresizingMaskIntoConstraints="NO" id="Yat-hc-p6d"> + <activityIndicatorView opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" ambiguous="YES" hidesWhenStopped="YES" animating="YES" style="white" translatesAutoresizingMaskIntoConstraints="NO" id="Yat-hc-p6d"> <rect key="frame" x="150" y="224" width="20" height="20"/> </activityIndicatorView> - <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" textAlignment="justified" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ikF-tk-1jf"> + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" textAlignment="justified" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ikF-tk-1jf"> <rect key="frame" x="20" y="348" width="280" height="75.5"/> <string key="text">Payment will be charged to your iTunes account at confirmation of purchase. The subscription will automatically renew unless auto-renew is turned off at least 24 hours before the end of the current period. Your account will be charged according to your plan for renewal within 24 hours prior to the end of the current period. You can manage or turn off auto-renew in your Apple ID account settings at any time of your purchase.</string> <fontDescription key="fontDescription" type="system" pointSize="9"/> @@ -147,11 +127,10 @@ <nil key="highlightedColor"/> <userDefinedRuntimeAttributes> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="subscription_terms"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular9"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular9:blackPrimaryText"/> </userDefinedRuntimeAttributes> </label> - <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="afE-a3-MQI"> + <button opaque="NO" contentMode="scaleToFill" ambiguous="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="afE-a3-MQI"> <rect key="frame" x="20" y="423.5" width="64" height="32"/> <constraints> <constraint firstAttribute="height" constant="32" id="gYt-Pg-xeh"/> @@ -161,16 +140,14 @@ <color key="titleColor" white="0.33896576909169757" alpha="1" colorSpace="calibratedWhite"/> </state> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="textColorName" value="blackSecondaryText"/> - <userDefinedRuntimeAttribute type="string" keyPath="textColorHighlightedName" value="blackHintText"/> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="terms_of_use"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="medium10"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="TermsOfUseGrayButton"/> </userDefinedRuntimeAttributes> <connections> <action selector="onTerms:" destination="-1" eventType="touchUpInside" id="9bk-bP-2bT"/> </connections> </button> - <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="tUc-za-PqS"> + <button opaque="NO" contentMode="scaleToFill" ambiguous="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="tUc-za-PqS"> <rect key="frame" x="233" y="423" width="67" height="32"/> <constraints> <constraint firstAttribute="height" constant="32" id="nHF-aZ-Dei"/> @@ -180,10 +157,8 @@ <color key="titleColor" white="0.33896576909999998" alpha="1" colorSpace="calibratedWhite"/> </state> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="textColorName" value="blackSecondaryText"/> - <userDefinedRuntimeAttribute type="string" keyPath="textColorHighlightedName" value="blackHintText"/> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="privacy_policy"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="medium10"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="TermsOfUseGrayButton"/> </userDefinedRuntimeAttributes> <connections> <action selector="onPrivacy:" destination="-1" eventType="touchUpInside" id="E7z-WW-KLD"/> @@ -228,7 +203,7 @@ <constraint firstItem="Yat-hc-p6d" firstAttribute="centerY" secondItem="1XW-gh-X68" secondAttribute="centerY" id="xdk-le-mv7"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Background"/> </userDefinedRuntimeAttributes> <variation key="default"> <mask key="constraints"> @@ -293,8 +268,7 @@ <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius"> <integer key="value" value="16"/> </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/> - <userDefinedRuntimeAttribute type="string" keyPath="tintColorName" value="linkBlue"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Background:MWMBlue"/> </userDefinedRuntimeAttributes> <connections> <action selector="onCancel:" destination="-1" eventType="touchUpInside" id="qqu-Pr-Tyn"/> @@ -314,7 +288,7 @@ <constraint firstItem="m8U-2p-bdf" firstAttribute="centerX" secondItem="I10-rL-z9q" secondAttribute="centerX" id="rsy-NP-WQ1"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="toastBackground"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="ToastBackground"/> </userDefinedRuntimeAttributes> </view> </subviews> @@ -341,7 +315,7 @@ </constraints> <viewLayoutGuide key="safeArea" id="fnl-2z-Ty3"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Background"/> </userDefinedRuntimeAttributes> <variation key="default"> <mask key="constraints"> diff --git a/iphone/Maps/Bookmarks/Catalog/Subscription/AllPassSubscriptionViewController.swift b/iphone/Maps/Bookmarks/Catalog/Subscription/AllPassSubscriptionViewController.swift index e8eb3d5c41..8846fb2821 100644 --- a/iphone/Maps/Bookmarks/Catalog/Subscription/AllPassSubscriptionViewController.swift +++ b/iphone/Maps/Bookmarks/Catalog/Subscription/AllPassSubscriptionViewController.swift @@ -59,11 +59,6 @@ class AllPassSubscriptionViewController: BaseSubscriptionViewController { price: "...", enabled: false) - annualDiscountLabel.layer.shadowRadius = 4 - annualDiscountLabel.layer.shadowOffset = CGSize(width: 0, height: 2) - annualDiscountLabel.layer.shadowColor = UIColor.blackHintText().cgColor - annualDiscountLabel.layer.shadowOpacity = 0.62 - annualDiscountLabel.layer.cornerRadius = 6 annualDiscountLabel.isHidden = true self.configure(buttons: [ diff --git a/iphone/Maps/Bookmarks/Catalog/Subscription/AllPassSubscriptionViewController.xib b/iphone/Maps/Bookmarks/Catalog/Subscription/AllPassSubscriptionViewController.xib index b10341ca9c..68f1057caf 100644 --- a/iphone/Maps/Bookmarks/Catalog/Subscription/AllPassSubscriptionViewController.xib +++ b/iphone/Maps/Bookmarks/Catalog/Subscription/AllPassSubscriptionViewController.xib @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> <device id="retina4_0" orientation="portrait" appearance="light"/> <dependencies> <deployment identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15510"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/> <capability name="Safe area layout guides" minToolsVersion="9.0"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> @@ -40,7 +40,7 @@ <rect key="frame" x="0.0" y="0.0" width="320" height="568"/> <subviews> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="TaY-K1-Hdb"> - <rect key="frame" x="0.0" y="0.0" width="320" height="782.5"/> + <rect key="frame" x="0.0" y="0.0" width="320" height="781.5"/> <subviews> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="try to subscribe" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="v4o-CM-FZh"> <rect key="frame" x="24" y="62" width="272" height="14.5"/> @@ -48,24 +48,22 @@ <color key="textColor" red="0.89803921568627454" green="0.89803921568627454" blue="0.89803921568627454" alpha="0.5" colorSpace="custom" customColorSpace="sRGB"/> <nil key="highlightedColor"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="semibold12"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="AllPassSubscriptionTitle"/> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="all_pass_subscription_header"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="allPassSubscriptionTitle"/> </userDefinedRuntimeAttributes> </label> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="All Pass Premium" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="PQG-Je-4JN"> - <rect key="frame" x="24" y="84.5" width="272" height="30.5"/> + <rect key="frame" x="24" y="84.5" width="272" height="29.5"/> <fontDescription key="fontDescription" name="FredokaOne-Regular" family="Fredoka One" pointSize="25"/> <nil key="textColor"/> <nil key="highlightedColor"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="fredokaRegular25"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="allPassSubscriptionSubTitle"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="AllPassSubscriptionSubTitle"/> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="all_pass_subscription_subheader"/> </userDefinedRuntimeAttributes> </label> <scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" directionalLockEnabled="YES" bounces="NO" pagingEnabled="YES" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" bouncesZoom="NO" translatesAutoresizingMaskIntoConstraints="NO" id="pyJ-8x-bjL"> - <rect key="frame" x="0.0" y="115" width="320" height="230"/> + <rect key="frame" x="0.0" y="114" width="320" height="230"/> <subviews> <stackView opaque="NO" contentMode="scaleToFill" distribution="fillEqually" translatesAutoresizingMaskIntoConstraints="NO" id="dDh-cr-cQb"> <rect key="frame" x="0.0" y="0.0" width="960" height="230"/> @@ -79,8 +77,7 @@ <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> <nil key="highlightedColor"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="allPassSubscriptionDescription"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="bold34"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="AllPassSubscriptionDescription1"/> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="all_pass_subscription_message_title"/> </userDefinedRuntimeAttributes> </label> @@ -90,8 +87,7 @@ <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> <nil key="highlightedColor"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="medium18"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="allPassSubscriptionDescription"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="AllPassSubscriptionDescription2"/> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="all_pass_subscription_message_subtitle"/> </userDefinedRuntimeAttributes> </label> @@ -117,8 +113,7 @@ <nil key="textColor"/> <nil key="highlightedColor"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="bold34"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="allPassSubscriptionDescription"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="AllPassSubscriptionDescription1"/> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="all_pass_subscription_message_title_2"/> </userDefinedRuntimeAttributes> </label> @@ -128,8 +123,7 @@ <nil key="textColor"/> <nil key="highlightedColor"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="medium18"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="allPassSubscriptionDescription"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="AllPassSubscriptionDescription2"/> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="all_pass_subscription_message_subtitle_2"/> </userDefinedRuntimeAttributes> </label> @@ -155,8 +149,7 @@ <nil key="textColor"/> <nil key="highlightedColor"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="bold34"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="allPassSubscriptionDescription"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="AllPassSubscriptionDescription1"/> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="all_pass_subscription_message_title_3"/> </userDefinedRuntimeAttributes> </label> @@ -166,8 +159,7 @@ <nil key="textColor"/> <nil key="highlightedColor"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="medium18"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="allPassSubscriptionDescription"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="AllPassSubscriptionDescription2"/> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="all_pass_subscription_message_subtitle_3"/> </userDefinedRuntimeAttributes> </label> @@ -200,11 +192,11 @@ </connections> </scrollView> <view contentMode="scaleToFill" placeholderIntrinsicWidth="106" placeholderIntrinsicHeight="16" translatesAutoresizingMaskIntoConstraints="NO" id="2G3-Jk-HS0" customClass="PageIndicator" customModule="maps_me" customModuleProvider="target"> - <rect key="frame" x="107" y="345" width="106" height="16"/> + <rect key="frame" x="107" y="344" width="106" height="16"/> <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> </view> <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="16" translatesAutoresizingMaskIntoConstraints="NO" id="kgh-BN-Pin"> - <rect key="frame" x="20" y="431" width="280" height="144"/> + <rect key="frame" x="20" y="430" width="280" height="144"/> <subviews> <button opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Lg7-Sn-MNZ" userLabel="Continue" customClass="BookmarksSubscriptionButton" customModule="maps_me" customModuleProvider="target"> <rect key="frame" x="0.0" y="0.0" width="280" height="64"/> @@ -219,14 +211,7 @@ <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> </state> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="textColorHighlightedName" value="white"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="medium14"/> - <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius"> - <integer key="value" value="6"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="string" keyPath="textColorName" value="allPassSubscriptionDescription"/> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="allPassSubscriptionSubTitle"/> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundHighlightedColorName" value="linkBlueHighlighted"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="AllPassSubscriptionYearlyButton"/> </userDefinedRuntimeAttributes> <connections> <action selector="onAnnualButtonTap:" destination="-1" eventType="touchUpInside" id="95i-dj-7pg"/> @@ -245,18 +230,7 @@ <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> </state> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="textColorHighlightedName" value="white"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="medium14"/> - <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius"> - <integer key="value" value="6"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="string" keyPath="textColorName" value="allPassSubscriptionMonthlyTitle"/> - <userDefinedRuntimeAttribute type="number" keyPath="layer.borderWidth"> - <integer key="value" value="1"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="string" keyPath="borderColorName" value="blackHintText"/> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundHighlightedColorName" value="blackDividers"/> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="allPassSubscriptionMonthlyBackground"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="AllPassSubscriptionMonthlyButton"/> </userDefinedRuntimeAttributes> <connections> <action selector="onMonthlyButtonTap:" destination="-1" eventType="touchUpInside" id="iKa-Pf-ltA"/> @@ -265,7 +239,7 @@ </subviews> </stackView> <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="- $38" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="12" adjustsLetterSpacingToFitWidth="YES" translatesAutoresizingMaskIntoConstraints="NO" id="HUV-kf-oUo" customClass="BookmarksSubscriptionDiscountLabel" customModule="maps_me" customModuleProvider="target"> - <rect key="frame" x="28" y="408" width="48.5" height="35"/> + <rect key="frame" x="28" y="407" width="48.5" height="35"/> <color key="backgroundColor" systemColor="systemPurpleColor" red="0.68627450980000004" green="0.32156862749999998" blue="0.87058823529999996" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <constraints> <constraint firstAttribute="height" constant="35" id="BYp-RT-R6I"/> @@ -274,13 +248,11 @@ <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> <nil key="highlightedColor"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="allPassSubscriptionDiscountBackground"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="discountText"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="bold17"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="AllPassSubscriptionDiscount"/> </userDefinedRuntimeAttributes> </label> <button opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="wL2-uQ-ivp" userLabel="Restore"> - <rect key="frame" x="50" y="585" width="220" height="50"/> + <rect key="frame" x="50" y="584" width="220" height="50"/> <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> <accessibility key="accessibilityConfiguration" identifier="welcome_storyboard.button_next2"/> <constraints> @@ -291,9 +263,7 @@ <color key="titleColor" red="0.1176470588" green="0.58823529409999997" blue="0.94117647059999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> </state> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="textColorHighlightedName" value="linkBlueHighlighted"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="medium14"/> - <userDefinedRuntimeAttribute type="string" keyPath="textColorName" value="allPassSubscriptionDescription"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="AllPassSubscriptionRestoreButton"/> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="restore_subscription"/> </userDefinedRuntimeAttributes> <connections> @@ -301,19 +271,18 @@ </connections> </button> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" textAlignment="justified" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Frp-JY-kuq"> - <rect key="frame" x="20" y="643" width="280" height="75.5"/> + <rect key="frame" x="20" y="642" width="280" height="75.5"/> <string key="text">Payment will be charged to your iTunes account at confirmation of purchase. The subscription will automatically renew unless auto-renew is turned off at least 24 hours before the end of the current period. Your account will be charged according to your plan for renewal within 24 hours prior to the end of the current period. You can manage or turn off auto-renew in your Apple ID account settings at any time of your purchase.</string> <fontDescription key="fontDescription" type="system" pointSize="9"/> <color key="textColor" white="0.0" alpha="0.31555008559999997" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> <nil key="highlightedColor"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular9"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="allPassSubscriptionTermsTitle"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="AllPassSubscriptionTerms"/> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="subscription_terms_guides"/> </userDefinedRuntimeAttributes> </label> <button opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="tailTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="2O1-n3-hBU" userLabel="TermsOfUse"> - <rect key="frame" x="20" y="718.5" width="66" height="44"/> + <rect key="frame" x="20" y="717.5" width="66" height="44"/> <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> <accessibility key="accessibilityConfiguration" identifier="welcome_storyboard.button_next2"/> <constraints> @@ -324,9 +293,7 @@ <color key="titleColor" white="0.55912912869999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> </state> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="textColorHighlightedName" value="blackHintText"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="medium10"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="allPassSubscriptionTermsTitle"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="AllPassSubscriptionTitle"/> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="terms_of_use"/> </userDefinedRuntimeAttributes> <connections> @@ -334,7 +301,7 @@ </connections> </button> <button opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" horizontalCompressionResistancePriority="749" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="tailTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="FUY-sv-eiY" userLabel="PrivacyPolicy"> - <rect key="frame" x="231" y="718.5" width="69" height="44"/> + <rect key="frame" x="231" y="717.5" width="69" height="44"/> <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> <accessibility key="accessibilityConfiguration" identifier="welcome_storyboard.button_next2"/> <constraints> @@ -345,10 +312,8 @@ <color key="titleColor" white="0.55912912869999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> </state> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="textColorHighlightedName" value="blackHintText"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="medium10"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="allPassSubscriptionTermsTitle"/> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="privacy_policy"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="AllPassSubscriptionTitle"/> </userDefinedRuntimeAttributes> <connections> <action selector="onPrivacy:" destination="-1" eventType="touchUpInside" id="rNQ-Ud-B0f"/> @@ -436,7 +401,7 @@ <constraint firstItem="JNf-wP-Nb4" firstAttribute="centerY" secondItem="je2-0p-PRM" secondAttribute="centerY" id="fkm-e4-8kG"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="toastBackground"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="ToastBackground"/> </userDefinedRuntimeAttributes> </view> </subviews> @@ -462,7 +427,7 @@ </constraints> <viewLayoutGuide key="safeArea" id="LdD-sY-6l2"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Background"/> </userDefinedRuntimeAttributes> <point key="canvasLocation" x="46.376811594202906" y="110.86956521739131"/> </view> diff --git a/iphone/Maps/Bookmarks/Catalog/Subscription/BookmarksSubscriptionButton.swift b/iphone/Maps/Bookmarks/Catalog/Subscription/BookmarksSubscriptionButton.swift index 251a5e8664..098db17e64 100644 --- a/iphone/Maps/Bookmarks/Catalog/Subscription/BookmarksSubscriptionButton.swift +++ b/iphone/Maps/Bookmarks/Catalog/Subscription/BookmarksSubscriptionButton.swift @@ -25,8 +25,10 @@ class BookmarksSubscriptionButton: UIButton { override func setTitleColor(_ color: UIColor?, for state: UIControl.State) { super.setTitleColor(color, for: state) - descriptionLabel.textColor = color - priceLabel.textColor = color + if state == .normal { + descriptionLabel.textColor = color + priceLabel.textColor = color + } } override func setTitle(_ title: String?, for state: UIControl.State) { diff --git a/iphone/Maps/Bookmarks/Catalog/Subscription/BookmarksSubscriptionViewController.swift b/iphone/Maps/Bookmarks/Catalog/Subscription/BookmarksSubscriptionViewController.swift index 787f43bf14..37f1b6beb2 100644 --- a/iphone/Maps/Bookmarks/Catalog/Subscription/BookmarksSubscriptionViewController.swift +++ b/iphone/Maps/Bookmarks/Catalog/Subscription/BookmarksSubscriptionViewController.swift @@ -32,14 +32,6 @@ import SafariServices monthlySubscriptionButton.config(title: L("montly_subscription_title"), price: "...", enabled: false) - - if !UIColor.isNightMode() { - annualDiscountLabel.layer.shadowRadius = 4 - annualDiscountLabel.layer.shadowOffset = CGSize(width: 0, height: 2) - annualDiscountLabel.layer.shadowColor = UIColor.blackHintText().cgColor - annualDiscountLabel.layer.shadowOpacity = 0.62 - } - annualDiscountLabel.layer.cornerRadius = 6 annualDiscountLabel.isHidden = true self.configure(buttons: [ diff --git a/iphone/Maps/Bookmarks/Catalog/Subscription/BookmarksSubscriptionViewController.xib b/iphone/Maps/Bookmarks/Catalog/Subscription/BookmarksSubscriptionViewController.xib index 9b645df3ff..9f8230d554 100644 --- a/iphone/Maps/Bookmarks/Catalog/Subscription/BookmarksSubscriptionViewController.xib +++ b/iphone/Maps/Bookmarks/Catalog/Subscription/BookmarksSubscriptionViewController.xib @@ -1,9 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> - <device id="retina5_5" orientation="portrait" appearance="light"/> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15705" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> <dependencies> - <deployment identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15510"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15706"/> <capability name="Safe area layout guides" minToolsVersion="9.0"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> @@ -27,7 +25,7 @@ <rect key="frame" x="0.0" y="0.0" width="414" height="736"/> <subviews> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Eiz-QQ-h0b"> - <rect key="frame" x="0.0" y="0.0" width="414" height="1015"/> + <rect key="frame" x="0.0" y="0.0" width="414" height="1014.5"/> <subviews> <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="bookmarksSubscriptionHeader" translatesAutoresizingMaskIntoConstraints="NO" id="Y38-kF-ZnW"> <rect key="frame" x="0.0" y="0.0" width="414" height="212"/> @@ -36,29 +34,27 @@ </constraints> </imageView> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Sightseeing" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bOS-sQ-rkD"> - <rect key="frame" x="24" y="232" width="366" height="33.666666666666686"/> + <rect key="frame" x="24" y="232" width="366" height="33.5"/> <fontDescription key="fontDescription" type="boldSystem" pointSize="28"/> <nil key="textColor"/> <nil key="highlightedColor"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="bold28"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="linkBlue"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="bold28:linkBlueText"/> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="sightseeing_subscription_header_sightseeing"/> </userDefinedRuntimeAttributes> </label> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Subscription" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="vzD-qz-Fwt"> - <rect key="frame" x="24" y="269.66666666666669" width="366" height="33.666666666666686"/> + <rect key="frame" x="24" y="269.5" width="366" height="33.5"/> <fontDescription key="fontDescription" type="boldSystem" pointSize="28"/> <nil key="textColor"/> <nil key="highlightedColor"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="bold28"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="bold28:blackPrimaryText"/> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="sightseeing_subscription_header_subscription"/> </userDefinedRuntimeAttributes> </label> <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="equalSpacing" spacing="16" translatesAutoresizingMaskIntoConstraints="NO" id="PSz-Kf-Ihe"> - <rect key="frame" x="16" y="327.33333333333331" width="382" height="192.99999999999994"/> + <rect key="frame" x="16" y="327" width="382" height="193"/> <subviews> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="6wz-nj-9Hk"> <rect key="frame" x="0.0" y="0.0" width="382" height="50"/> @@ -76,8 +72,7 @@ <nil key="textColor"/> <nil key="highlightedColor"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="medium17"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="medium17:blackPrimaryText"/> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="sightseeing_subscription_message"/> </userDefinedRuntimeAttributes> </label> @@ -108,8 +103,7 @@ <nil key="textColor"/> <nil key="highlightedColor"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="medium17"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="medium17:blackPrimaryText"/> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="sightseeing_subscription_message_2"/> </userDefinedRuntimeAttributes> </label> @@ -140,8 +134,7 @@ <nil key="textColor"/> <nil key="highlightedColor"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="medium17"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="medium17:blackPrimaryText"/> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="sightseeing_subscription_message_3"/> </userDefinedRuntimeAttributes> </label> @@ -165,7 +158,7 @@ </constraints> </stackView> <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="16" translatesAutoresizingMaskIntoConstraints="NO" id="pHi-wc-Fah"> - <rect key="frame" x="20" y="564.33333333333337" width="374" height="144"/> + <rect key="frame" x="20" y="564" width="374" height="144"/> <subviews> <button opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="neX-0h-hs4" userLabel="Continue" customClass="BookmarksSubscriptionButton" customModule="maps_me" customModuleProvider="target"> <rect key="frame" x="0.0" y="0.0" width="374" height="64"/> @@ -180,14 +173,7 @@ <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> </state> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="textColorHighlightedName" value="white"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="medium14"/> - <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius"> - <integer key="value" value="6"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="string" keyPath="textColorName" value="white"/> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="linkBlue"/> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundHighlightedColorName" value="linkBlueHighlighted"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="FlatNormalButton"/> </userDefinedRuntimeAttributes> <connections> <action selector="onAnnualButtonTap:" destination="-1" eventType="touchUpInside" id="KEE-ZN-J9Y"/> @@ -206,17 +192,7 @@ <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> </state> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="textColorHighlightedName" value="white"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="medium14"/> - <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius"> - <integer key="value" value="6"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="string" keyPath="textColorName" value="blackHintText"/> - <userDefinedRuntimeAttribute type="number" keyPath="layer.borderWidth"> - <integer key="value" value="1"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="string" keyPath="borderColorName" value="blackHintText"/> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundHighlightedColorName" value="blackDividers"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="BookmarksSubscriptionMonthlyButton"/> </userDefinedRuntimeAttributes> <connections> <action selector="onMonthlyButtonTap:" destination="-1" eventType="touchUpInside" id="Uc2-Qk-Flp"/> @@ -225,7 +201,7 @@ </subviews> </stackView> <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="- $38" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="12" adjustsLetterSpacingToFitWidth="YES" translatesAutoresizingMaskIntoConstraints="NO" id="YH0-h4-ZEb" customClass="BookmarksSubscriptionDiscountLabel" customModule="maps_me" customModuleProvider="target"> - <rect key="frame" x="28.000000000000004" y="541.33333333333337" width="48.333333333333343" height="35"/> + <rect key="frame" x="28" y="541" width="48.5" height="35"/> <color key="backgroundColor" systemColor="systemPurpleColor" red="0.68627450980000004" green="0.32156862749999998" blue="0.87058823529999996" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <constraints> <constraint firstAttribute="height" constant="35" id="ix5-N3-6ov"/> @@ -234,11 +210,11 @@ <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> <nil key="highlightedColor"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="discountBackground"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="BookmarksSubscriptionDiscount"/> </userDefinedRuntimeAttributes> </label> <button opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="a64-qc-DrZ" userLabel="Restore"> - <rect key="frame" x="50" y="718.33333333333337" width="314" height="50"/> + <rect key="frame" x="50" y="718" width="314" height="50"/> <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> <accessibility key="accessibilityConfiguration" identifier="welcome_storyboard.button_next2"/> <constraints> @@ -249,9 +225,7 @@ <color key="titleColor" red="0.1176470588" green="0.58823529409999997" blue="0.94117647059999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> </state> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="textColorHighlightedName" value="linkBlueHighlighted"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="medium14"/> - <userDefinedRuntimeAttribute type="string" keyPath="textColorName" value="linkBlue"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="FlatNormalTransButton"/> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="restore_subscription"/> </userDefinedRuntimeAttributes> <connections> @@ -259,19 +233,18 @@ </connections> </button> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" textAlignment="justified" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="tWZ-GP-RxW"> - <rect key="frame" x="20" y="776.33333333333337" width="374" height="64.666666666666629"/> + <rect key="frame" x="20" y="776" width="374" height="64.5"/> <string key="text">Payment will be charged to your iTunes account at confirmation of purchase. The subscription will automatically renew unless auto-renew is turned off at least 24 hours before the end of the current period. Your account will be charged according to your plan for renewal within 24 hours prior to the end of the current period. You can manage or turn off auto-renew in your Apple ID account settings at any time of your purchase.</string> <fontDescription key="fontDescription" type="system" pointSize="9"/> <color key="textColor" white="0.0" alpha="0.31555008561643838" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> <nil key="highlightedColor"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular9"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackHintText"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular9:blackHintText"/> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="subscription_terms_guides"/> </userDefinedRuntimeAttributes> </label> <button opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="tailTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="awa-we-Pjk" userLabel="TermsOfUse"> - <rect key="frame" x="20" y="841" width="66" height="44"/> + <rect key="frame" x="20" y="840.5" width="66" height="44"/> <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> <accessibility key="accessibilityConfiguration" identifier="welcome_storyboard.button_next2"/> <constraints> @@ -282,9 +255,7 @@ <color key="titleColor" white="0.5591291287173964" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> </state> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="textColorHighlightedName" value="blackHintText"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="medium10"/> - <userDefinedRuntimeAttribute type="string" keyPath="textColorName" value="blackSecondaryText"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="TermsOfUseGrayButton"/> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="terms_of_use"/> </userDefinedRuntimeAttributes> <connections> @@ -292,7 +263,7 @@ </connections> </button> <button opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" horizontalCompressionResistancePriority="749" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="tailTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="60B-kT-Eev" userLabel="PrivacyPolicy"> - <rect key="frame" x="325" y="841" width="69" height="44"/> + <rect key="frame" x="325" y="840.5" width="69" height="44"/> <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> <accessibility key="accessibilityConfiguration" identifier="welcome_storyboard.button_next2"/> <constraints> @@ -303,9 +274,7 @@ <color key="titleColor" white="0.55912912869999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> </state> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="textColorHighlightedName" value="blackHintText"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="medium10"/> - <userDefinedRuntimeAttribute type="string" keyPath="textColorName" value="blackSecondaryText"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="TermsOfUseGrayButton"/> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="privacy_policy"/> </userDefinedRuntimeAttributes> <connections> @@ -313,16 +282,16 @@ </connections> </button> <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="bookmarksSubscriptionFooter" translatesAutoresizingMaskIntoConstraints="NO" id="GUc-JW-T3W"> - <rect key="frame" x="0.0" y="786.33333333333337" width="414" height="228.66666666666663"/> + <rect key="frame" x="0.0" y="786" width="414" height="228.5"/> <constraints> <constraint firstAttribute="width" secondItem="GUc-JW-T3W" secondAttribute="height" multiplier="375:207" id="yvv-rm-Tjg"/> </constraints> </imageView> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="MPt-NS-DbA"> - <rect key="frame" x="0.0" y="1015" width="414" height="736"/> + <rect key="frame" x="0.0" y="1014.5" width="414" height="736"/> <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="bookmarkSubscriptionFooterBackground"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="BookmarkSubscriptionFooterBackground"/> </userDefinedRuntimeAttributes> </view> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="v0Z-5m-unD"> @@ -380,7 +349,7 @@ <constraint firstItem="bOS-sQ-rkD" firstAttribute="top" secondItem="Y38-kF-ZnW" secondAttribute="bottom" constant="20" id="xYU-mb-XeF"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="bookmarkSubscriptionBackground"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="BookmarkSubscriptionBackground"/> </userDefinedRuntimeAttributes> </view> </subviews> @@ -393,14 +362,14 @@ <constraint firstItem="Eiz-QQ-h0b" firstAttribute="width" secondItem="0eE-hs-sId" secondAttribute="width" id="ke9-ke-QPG"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="bookmarkSubscriptionScrollBackground"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="BookmarkSubscriptionScrollBackground"/> </userDefinedRuntimeAttributes> </scrollView> <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="BHb-cU-Ze3"> <rect key="frame" x="0.0" y="0.0" width="414" height="736"/> <subviews> <activityIndicatorView opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" animating="YES" style="whiteLarge" translatesAutoresizingMaskIntoConstraints="NO" id="XZg-yN-Jtv"> - <rect key="frame" x="188.66666666666666" y="349.66666666666669" width="37" height="37"/> + <rect key="frame" x="188.5" y="349.5" width="37" height="37"/> <color key="color" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> </activityIndicatorView> </subviews> @@ -410,7 +379,7 @@ <constraint firstItem="XZg-yN-Jtv" firstAttribute="centerY" secondItem="BHb-cU-Ze3" secondAttribute="centerY" id="CQX-i5-ZcY"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="toastBackground"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="ToastBackground"/> </userDefinedRuntimeAttributes> </view> </subviews> @@ -427,7 +396,7 @@ </constraints> <viewLayoutGuide key="safeArea" id="k4r-ns-RCJ"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Background"/> </userDefinedRuntimeAttributes> <point key="canvasLocation" x="46.376811594202906" y="110.86956521739131"/> </view> diff --git a/iphone/Maps/Bookmarks/Categories/Actions/BMCActionsCreateCell.swift b/iphone/Maps/Bookmarks/Categories/Actions/BMCActionsCreateCell.swift index 8fedd3f21c..b137295b97 100644 --- a/iphone/Maps/Bookmarks/Categories/Actions/BMCActionsCreateCell.swift +++ b/iphone/Maps/Bookmarks/Categories/Actions/BMCActionsCreateCell.swift @@ -1,16 +1,7 @@ final class BMCActionsCreateCell: MWMTableViewCell { - @IBOutlet private weak var actionImage: UIImageView! { - didSet { - actionImage.tintColor = .linkBlue() - } - } + @IBOutlet private weak var actionImage: UIImageView! - @IBOutlet private weak var actionTitle: UILabel! { - didSet { - actionTitle.font = .regular16() - actionTitle.textColor = .blackPrimaryText() - } - } + @IBOutlet private weak var actionTitle: UILabel! private var model: BMCAction! { didSet { diff --git a/iphone/Maps/Bookmarks/Categories/Actions/BMCActionsCreateCell.xib b/iphone/Maps/Bookmarks/Categories/Actions/BMCActionsCreateCell.xib index 9b6d7cb0e8..e82878279f 100644 --- a/iphone/Maps/Bookmarks/Categories/Actions/BMCActionsCreateCell.xib +++ b/iphone/Maps/Bookmarks/Categories/Actions/BMCActionsCreateCell.xib @@ -1,11 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14109" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> - <device id="retina4_7" orientation="portrait"> - <adaptation id="fullscreen"/> - </device> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> + <device id="retina4_7" orientation="portrait" appearance="light"/> <dependencies> <deployment identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/> <capability name="Safe area layout guides" minToolsVersion="9.0"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> @@ -16,7 +14,7 @@ <rect key="frame" x="0.0" y="0.0" width="320" height="44"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM"> - <rect key="frame" x="0.0" y="0.0" width="320" height="43.5"/> + <rect key="frame" x="0.0" y="0.0" width="320" height="44"/> <autoresizingMask key="autoresizingMask"/> <subviews> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="YDi-5J-vFD"> @@ -28,12 +26,18 @@ <constraint firstAttribute="height" constant="24" id="S7u-WM-dEL"/> <constraint firstAttribute="width" constant="24" id="WgB-k6-NoZ"/> </constraints> + <userDefinedRuntimeAttributes> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="MWMBlue"/> + </userDefinedRuntimeAttributes> </imageView> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2jJ-Pu-pjy"> <rect key="frame" x="56" y="11.5" width="248" height="21"/> <fontDescription key="fontDescription" type="system" pointSize="17"/> <nil key="textColor"/> <nil key="highlightedColor"/> + <userDefinedRuntimeAttributes> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular16:blackPrimaryText"/> + </userDefinedRuntimeAttributes> </label> </subviews> <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> @@ -58,6 +62,7 @@ <outlet property="actionImage" destination="paw-km-zXg" id="CfG-Wg-jon"/> <outlet property="actionTitle" destination="2jJ-Pu-pjy" id="YFu-jA-Abl"/> </connections> + <point key="canvasLocation" x="139" y="155"/> </tableViewCell> </objects> <resources> diff --git a/iphone/Maps/Bookmarks/Categories/BMCView/BMCViewController.swift b/iphone/Maps/Bookmarks/Categories/BMCView/BMCViewController.swift index acb805be15..29bfdde3e5 100644 --- a/iphone/Maps/Bookmarks/Categories/BMCView/BMCViewController.swift +++ b/iphone/Maps/Bookmarks/Categories/BMCView/BMCViewController.swift @@ -32,7 +32,6 @@ final class BMCViewController: MWMViewController { override func viewDidLoad() { super.viewDidLoad() viewModel = BMCDefaultViewModel() - tableView.separatorColor = UIColor.blackDividers() } override func viewWillAppear(_ animated: Bool) { diff --git a/iphone/Maps/Bookmarks/Categories/BMCView/BMCViewController.xib b/iphone/Maps/Bookmarks/Categories/BMCView/BMCViewController.xib index 5733af89d0..92dc8e6c38 100644 --- a/iphone/Maps/Bookmarks/Categories/BMCView/BMCViewController.xib +++ b/iphone/Maps/Bookmarks/Categories/BMCView/BMCViewController.xib @@ -1,11 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> - <device id="retina4_7" orientation="portrait"> - <adaptation id="fullscreen"/> - </device> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15705" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> <dependencies> - <deployment identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14460.20"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15706"/> <capability name="Safe area layout guides" minToolsVersion="9.0"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> @@ -25,10 +21,10 @@ <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" canCancelContentTouches="NO" style="grouped" separatorStyle="default" allowsSelectionDuringEditing="YES" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="-1" estimatedSectionHeaderHeight="-1" sectionFooterHeight="1" estimatedSectionFooterHeight="1" translatesAutoresizingMaskIntoConstraints="NO" id="2ia-hi-UhQ"> - <rect key="frame" x="0.0" y="20" width="375" height="647"/> + <rect key="frame" x="0.0" y="0.0" width="375" height="667"/> <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="pressBackground"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="TableView:PressBackground"/> </userDefinedRuntimeAttributes> <connections> <outlet property="delegate" destination="-1" id="P7h-mr-lVO"/> @@ -57,12 +53,18 @@ <fontDescription key="fontDescription" type="system" pointSize="17"/> <nil key="textColor"/> <nil key="highlightedColor"/> + <userDefinedRuntimeAttributes> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="medium14:blackSecondaryText"/> + </userDefinedRuntimeAttributes> </label> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="cae-1g-tnD"> <rect key="frame" x="319" y="0.0" width="56" height="48"/> <constraints> <constraint firstAttribute="width" constant="56" id="ikc-0Z-8Po"/> </constraints> + <userDefinedRuntimeAttributes> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="MWMBlack"/> + </userDefinedRuntimeAttributes> <connections> <action selector="buttonAction" destination="JS4-5h-4t1" eventType="touchUpInside" id="65k-ep-2Id"/> </connections> @@ -74,7 +76,7 @@ <constraint firstAttribute="height" constant="1" id="Eaq-LR-1Kk"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="blackDividers"/> + <userDefinedRuntimeAttribute type="string" keyPath="StyleName" value="Divider"/> </userDefinedRuntimeAttributes> </view> </subviews> @@ -127,6 +129,9 @@ <fontDescription key="fontDescription" type="system" pointSize="17"/> <nil key="textColor"/> <nil key="highlightedColor"/> + <userDefinedRuntimeAttributes> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="medium14:blackSecondaryText"/> + </userDefinedRuntimeAttributes> </label> </subviews> <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> diff --git a/iphone/Maps/Bookmarks/Categories/Categories/BMCCategoriesHeader.swift b/iphone/Maps/Bookmarks/Categories/Categories/BMCCategoriesHeader.swift index 368403002c..a39af1ffa4 100644 --- a/iphone/Maps/Bookmarks/Categories/Categories/BMCCategoriesHeader.swift +++ b/iphone/Maps/Bookmarks/Categories/Categories/BMCCategoriesHeader.swift @@ -3,18 +3,8 @@ protocol BMCCategoriesHeaderDelegate { } final class BMCCategoriesHeader: UITableViewHeaderFooterView { - @IBOutlet private weak var label: UILabel! { - didSet { - label.font = .medium14() - label.textColor = .blackSecondaryText() - } - } - - @IBOutlet private weak var button: UIButton! { - didSet { - button.setTitleColor(.linkBlue(), for: .normal) - } - } + @IBOutlet private weak var label: UILabel! + @IBOutlet private weak var button: UIButton! var isShowAll = false { didSet { diff --git a/iphone/Maps/Bookmarks/Categories/Categories/BMCCategoriesHeader.xib b/iphone/Maps/Bookmarks/Categories/Categories/BMCCategoriesHeader.xib index 64d0fc0b5d..6d4918675a 100644 --- a/iphone/Maps/Bookmarks/Categories/Categories/BMCCategoriesHeader.xib +++ b/iphone/Maps/Bookmarks/Categories/Categories/BMCCategoriesHeader.xib @@ -1,11 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14109" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> - <device id="retina4_7" orientation="portrait"> - <adaptation id="fullscreen"/> - </device> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> + <device id="retina4_7" orientation="portrait" appearance="light"/> <dependencies> <deployment identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/> <capability name="Safe area layout guides" minToolsVersion="9.0"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> @@ -20,15 +18,21 @@ <rect key="frame" x="0.0" y="0.0" width="375" height="48"/> <subviews> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="PGC-cy-M2K"> - <rect key="frame" x="16" y="13" width="42" height="21"/> + <rect key="frame" x="16" y="13.5" width="42" height="21"/> <fontDescription key="fontDescription" type="system" pointSize="17"/> <nil key="textColor"/> <nil key="highlightedColor"/> + <userDefinedRuntimeAttributes> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="medium14:blackSecondaryText"/> + </userDefinedRuntimeAttributes> </label> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="3hn-pU-MI1"> <rect key="frame" x="302" y="0.0" width="73" height="48"/> <inset key="contentEdgeInsets" minX="0.0" minY="0.0" maxX="14" maxY="0.0"/> <state key="normal" title="Show All"/> + <userDefinedRuntimeAttributes> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="linkBlueText"/> + </userDefinedRuntimeAttributes> <connections> <action selector="buttonAction" destination="hpL-he-7N6" eventType="touchUpInside" id="mQo-HU-GKM"/> </connections> diff --git a/iphone/Maps/Bookmarks/Categories/Categories/BMCCategoryCell.swift b/iphone/Maps/Bookmarks/Categories/Categories/BMCCategoryCell.swift index 06c5b0be94..cabdc9ca39 100644 --- a/iphone/Maps/Bookmarks/Categories/Categories/BMCCategoryCell.swift +++ b/iphone/Maps/Bookmarks/Categories/Categories/BMCCategoryCell.swift @@ -5,33 +5,16 @@ protocol BMCCategoryCellDelegate { final class BMCCategoryCell: MWMTableViewCell { @IBOutlet private weak var accessImageView: UIImageView! - @IBOutlet private weak var titleLabel: UILabel! { - didSet { - titleLabel.font = .regular16() - titleLabel.textColor = .blackPrimaryText() - } - } - - @IBOutlet private weak var subtitleLabel: UILabel! { - didSet { - subtitleLabel.font = .regular14() - subtitleLabel.textColor = .blackSecondaryText() - } - } + @IBOutlet private weak var titleLabel: UILabel! + @IBOutlet private weak var subtitleLabel: UILabel! @IBOutlet private weak var moreButton: UIButton! { didSet { - moreButton.tintColor = .blackSecondaryText() moreButton.setImage(#imageLiteral(resourceName: "ic24PxMore"), for: .normal) } } - @IBOutlet weak var visibleCheckmark: Checkmark! { - didSet { - visibleCheckmark.offTintColor = .blackHintText() - visibleCheckmark.onTintColor = .linkBlue() - } - } + @IBOutlet weak var visibleCheckmark: Checkmark! private var category: MWMCategory? { didSet { diff --git a/iphone/Maps/Bookmarks/Categories/Categories/BMCCategoryCell.xib b/iphone/Maps/Bookmarks/Categories/Categories/BMCCategoryCell.xib index 2a467932db..70851cac01 100644 --- a/iphone/Maps/Bookmarks/Categories/Categories/BMCCategoryCell.xib +++ b/iphone/Maps/Bookmarks/Categories/Categories/BMCCategoryCell.xib @@ -1,11 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> - <device id="retina4_7" orientation="portrait"> - <adaptation id="fullscreen"/> - </device> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> + <device id="retina4_7" orientation="portrait" appearance="light"/> <dependencies> <deployment identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14460.20"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/> <capability name="Safe area layout guides" minToolsVersion="9.0"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> @@ -16,11 +14,11 @@ <rect key="frame" x="0.0" y="0.0" width="320" height="60"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM"> - <rect key="frame" x="0.0" y="0.0" width="320" height="59.5"/> + <rect key="frame" x="0.0" y="0.0" width="320" height="60"/> <autoresizingMask key="autoresizingMask"/> <subviews> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="wcq-KH-q74" customClass="Checkmark" customModule="maps_me" customModuleProvider="target"> - <rect key="frame" x="0.0" y="0.0" width="56" height="60"/> + <rect key="frame" x="0.0" y="0.0" width="56" height="60.5"/> <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> <constraints> <constraint firstAttribute="width" constant="56" id="iRO-vl-eYM"/> @@ -38,18 +36,27 @@ <fontDescription key="fontDescription" type="system" pointSize="17"/> <nil key="textColor"/> <nil key="highlightedColor"/> + <userDefinedRuntimeAttributes> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular16:blackPrimaryText"/> + </userDefinedRuntimeAttributes> </label> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Public • 12 Bookmarks" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="jBd-Tj-RiW"> - <rect key="frame" x="71" y="35" width="189" height="14.5"/> + <rect key="frame" x="71" y="35" width="189" height="15"/> <fontDescription key="fontDescription" type="system" pointSize="14"/> <color key="textColor" white="0.0" alpha="0.5781785102739726" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> <nil key="highlightedColor"/> + <userDefinedRuntimeAttributes> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular14:blackSecondaryText"/> + </userDefinedRuntimeAttributes> </label> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="2gi-fk-gR6"> - <rect key="frame" x="264" y="0.0" width="56" height="59.5"/> + <rect key="frame" x="264" y="0.0" width="56" height="60"/> <constraints> <constraint firstAttribute="width" constant="56" id="ot8-q5-ynR"/> </constraints> + <userDefinedRuntimeAttributes> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="MWMGray"/> + </userDefinedRuntimeAttributes> <connections> <action selector="moreAction" destination="KGk-i7-Jjw" eventType="touchUpInside" id="zmP-yn-CEM"/> </connections> diff --git a/iphone/Maps/Bookmarks/Categories/Category settings/CategorySettings.storyboard b/iphone/Maps/Bookmarks/Categories/Category settings/CategorySettings.storyboard index af02c0c9f6..316ba26ef6 100644 --- a/iphone/Maps/Bookmarks/Categories/Category settings/CategorySettings.storyboard +++ b/iphone/Maps/Bookmarks/Categories/Category settings/CategorySettings.storyboard @@ -1,11 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="tgw-vx-qJ3"> - <device id="retina4_7" orientation="portrait"> - <adaptation id="fullscreen"/> - </device> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="tgw-vx-qJ3"> + <device id="retina4_7" orientation="portrait" appearance="light"/> <dependencies> <deployment identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14460.20"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> <scenes> @@ -21,20 +19,20 @@ <tableViewSection id="jeV-o1-epf"> <cells> <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" rowHeight="48" id="LjQ-0n-eLM" customClass="MWMTableViewCell"> - <rect key="frame" x="0.0" y="35" width="375" height="48"/> + <rect key="frame" x="0.0" y="18" width="375" height="48"/> <autoresizingMask key="autoresizingMask"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="LjQ-0n-eLM" id="hTk-4S-Yxd"> - <rect key="frame" x="0.0" y="0.0" width="375" height="47.5"/> + <rect key="frame" x="0.0" y="0.0" width="375" height="48"/> <autoresizingMask key="autoresizingMask"/> <subviews> <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" text="Bars in Saint-Petersburg" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="cbH-NH-2Hd"> - <rect key="frame" x="16" y="14" width="343" height="20"/> + <rect key="frame" x="16" y="13.5" width="343" height="21"/> + <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> <color key="textColor" white="0.0" alpha="0.87" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> <fontDescription key="fontDescription" type="system" pointSize="16"/> <textInputTraits key="textInputTraits"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular16"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular16:blackPrimaryText"/> <userDefinedRuntimeAttribute type="string" keyPath="localizedPlaceholder" value="ugc_route_edit_list_name"/> </userDefinedRuntimeAttributes> <connections> @@ -45,15 +43,15 @@ <constraints> <constraint firstItem="cbH-NH-2Hd" firstAttribute="centerY" secondItem="hTk-4S-Yxd" secondAttribute="centerY" id="4Aq-WF-Dgv"/> <constraint firstAttribute="trailing" secondItem="cbH-NH-2Hd" secondAttribute="trailing" constant="16" id="fy4-PC-J2J"/> - <constraint firstItem="cbH-NH-2Hd" firstAttribute="leading" secondItem="hTk-4S-Yxd" secondAttribute="leading" constant="16" id="i3e-o0-1X5"/> + <constraint firstItem="cbH-NH-2Hd" firstAttribute="leading" secondItem="hTk-4S-Yxd" secondAttribute="leadingMargin" id="i3e-o0-1X5"/> </constraints> </tableViewCellContentView> </tableViewCell> <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" accessoryType="disclosureIndicator" indentationWidth="10" rowHeight="48" id="D4f-KS-vQs" customClass="MWMTableViewCell"> - <rect key="frame" x="0.0" y="83" width="375" height="48"/> + <rect key="frame" x="0.0" y="66" width="375" height="48"/> <autoresizingMask key="autoresizingMask"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="D4f-KS-vQs" id="0jc-u2-nKr"> - <rect key="frame" x="0.0" y="0.0" width="341" height="47.5"/> + <rect key="frame" x="0.0" y="0.0" width="348" height="48"/> <autoresizingMask key="autoresizingMask"/> <subviews> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Sharing options" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="rM4-Nu-8WD"> @@ -63,8 +61,7 @@ <nil key="highlightedColor"/> <userDefinedRuntimeAttributes> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="sharing_options"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular16"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular16:blackPrimaryText"/> </userDefinedRuntimeAttributes> </label> </subviews> @@ -84,14 +81,14 @@ <tableViewSection id="WFB-XH-2pJ"> <cells> <tableViewCell clipsSubviews="YES" contentMode="TopLeft" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" rowHeight="96" id="MI7-01-a5u" customClass="MWMTableViewCell"> - <rect key="frame" x="0.0" y="167" width="375" height="96"/> + <rect key="frame" x="0.0" y="150" width="375" height="96"/> <autoresizingMask key="autoresizingMask"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="TopLeft" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="MI7-01-a5u" id="Ahn-rC-HXu"> - <rect key="frame" x="0.0" y="0.0" width="375" height="95.5"/> + <rect key="frame" x="0.0" y="0.0" width="375" height="96"/> <autoresizingMask key="autoresizingMask"/> <subviews> <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" bounces="NO" scrollEnabled="NO" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" text="Lorem ipsum dolor sit er elit lamet, consectetaur cillium adipisicing pecu" translatesAutoresizingMaskIntoConstraints="NO" id="2hT-xL-Vpf" customClass="MWMTextView"> - <rect key="frame" x="16" y="12" width="343" height="71.5"/> + <rect key="frame" x="16" y="12" width="343" height="72"/> <constraints> <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="71" id="y1P-L7-Lg2"/> </constraints> @@ -99,14 +96,10 @@ <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/> <userDefinedRuntimeAttributes> <userDefinedRuntimeAttribute type="string" keyPath="localizedPlaceholder" value="ugc_route_edit_description_hint"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular16"/> <userDefinedRuntimeAttribute type="number" keyPath="textContainer.lineFragmentPadding"> <integer key="value" value="0"/> </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/> - <userDefinedRuntimeAttribute type="rect" keyPath="textContainerInset"> - <rect key="value" x="0.0" y="0.0" width="0.0" height="0.0"/> - </userDefinedRuntimeAttribute> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="BookmarksCategoryTextView"/> </userDefinedRuntimeAttributes> <connections> <outlet property="delegate" destination="tgw-vx-qJ3" id="Qxk-m9-jcG"/> @@ -126,10 +119,10 @@ <tableViewSection id="LeZ-S5-Rxs"> <cells> <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" id="WjK-j0-RKa" customClass="MWMTableViewCell"> - <rect key="frame" x="0.0" y="299" width="375" height="44"/> + <rect key="frame" x="0.0" y="282" width="375" height="44"/> <autoresizingMask key="autoresizingMask"/> - <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="WjK-j0-RKa" id="5HB-S5-Pl2"> - <rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/> + <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" ambiguous="YES" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="WjK-j0-RKa" id="5HB-S5-Pl2"> + <rect key="frame" x="0.0" y="0.0" width="375" height="44"/> <autoresizingMask key="autoresizingMask"/> <subviews> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="u56-Jh-ACU"> @@ -142,10 +135,8 @@ <color key="titleColor" red="0.95686274510000002" green="0.26274509800000001" blue="0.21176470589999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> </state> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular17"/> - <userDefinedRuntimeAttribute type="string" keyPath="textColorName" value="red"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="BookmarksCategoryDeleteButton"/> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="delete_list"/> - <userDefinedRuntimeAttribute type="string" keyPath="textColorDisabledName" value="blackHintText"/> </userDefinedRuntimeAttributes> <connections> <action selector="deleteListButtonPressed:" destination="tgw-vx-qJ3" eventType="touchUpInside" id="hEg-uB-1pl"/> @@ -163,6 +154,9 @@ </cells> </tableViewSection> </sections> + <userDefinedRuntimeAttributes> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="TableView:PressBackground"/> + </userDefinedRuntimeAttributes> <connections> <outlet property="dataSource" destination="tgw-vx-qJ3" id="cij-qD-O59"/> <outlet property="delegate" destination="tgw-vx-qJ3" id="FFI-DX-Gfg"/> diff --git a/iphone/Maps/Bookmarks/Categories/Notifications/BMCNotificationsCell.swift b/iphone/Maps/Bookmarks/Categories/Notifications/BMCNotificationsCell.swift index b31e256a5b..83187caba6 100644 --- a/iphone/Maps/Bookmarks/Categories/Notifications/BMCNotificationsCell.swift +++ b/iphone/Maps/Bookmarks/Categories/Notifications/BMCNotificationsCell.swift @@ -9,8 +9,6 @@ final class BMCNotificationsCell: MWMTableViewCell { @IBOutlet private weak var label: UILabel! { didSet { label.text = L("load_kmz_title") - label.font = .regular16() - label.textColor = .blackPrimaryText() } } diff --git a/iphone/Maps/Bookmarks/Categories/Notifications/BMCNotificationsCell.xib b/iphone/Maps/Bookmarks/Categories/Notifications/BMCNotificationsCell.xib index cc495d7d47..8294272bed 100644 --- a/iphone/Maps/Bookmarks/Categories/Notifications/BMCNotificationsCell.xib +++ b/iphone/Maps/Bookmarks/Categories/Notifications/BMCNotificationsCell.xib @@ -1,23 +1,20 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> - <device id="retina4_7" orientation="portrait"> - <adaptation id="fullscreen"/> - </device> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> + <device id="retina4_7" orientation="portrait" appearance="light"/> <dependencies> <deployment identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/> - <capability name="Constraints to layout margins" minToolsVersion="6.0"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/> <capability name="Safe area layout guides" minToolsVersion="9.0"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> <objects> <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/> <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/> - <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="KGk-i7-Jjw" customClass="BMCNotificationsCell" customModule="maps_me" customModuleProvider="target" propertyAccessControl="all"> + <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="KGk-i7-Jjw" customClass="BMCNotificationsCell" customModule="maps_me" customModuleProvider="target" propertyAccessControl="none"> <rect key="frame" x="0.0" y="0.0" width="320" height="48"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM"> - <rect key="frame" x="0.0" y="0.0" width="320" height="47.5"/> + <rect key="frame" x="0.0" y="0.0" width="320" height="48"/> <autoresizingMask key="autoresizingMask"/> <subviews> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="23z-Ov-GrT"> @@ -29,7 +26,7 @@ </constraints> </view> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ydm-M6-i2D"> - <rect key="frame" x="56" y="14" width="232" height="21"/> + <rect key="frame" x="56" y="13.5" width="233" height="21"/> <fontDescription key="fontDescription" type="system" pointSize="17"/> <nil key="textColor"/> <nil key="highlightedColor"/> @@ -45,10 +42,14 @@ </constraints> </tableViewCellContentView> <viewLayoutGuide key="safeArea" id="njF-e1-oar"/> + <userDefinedRuntimeAttributes> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular16:blackPrimaryText"/> + </userDefinedRuntimeAttributes> <connections> <outlet property="label" destination="ydm-M6-i2D" id="FJz-8r-GV0"/> <outlet property="spinner" destination="23z-Ov-GrT" id="9Me-CJ-fX6"/> </connections> + <point key="canvasLocation" x="139" y="154"/> </tableViewCell> </objects> </document> diff --git a/iphone/Maps/Bookmarks/Categories/Notifications/BMCNotificationsHeader.swift b/iphone/Maps/Bookmarks/Categories/Notifications/BMCNotificationsHeader.swift index d932104846..5134e7d6eb 100644 --- a/iphone/Maps/Bookmarks/Categories/Notifications/BMCNotificationsHeader.swift +++ b/iphone/Maps/Bookmarks/Categories/Notifications/BMCNotificationsHeader.swift @@ -1,8 +1,6 @@ final class BMCNotificationsHeader: UIView { @IBOutlet private weak var label: UILabel! { didSet { - label.font = .medium14() - label.textColor = .blackSecondaryText() label.text = L("bookmarks_groups").uppercased() } } diff --git a/iphone/Maps/Bookmarks/Categories/Permissions/BMCPermissionsCell.swift b/iphone/Maps/Bookmarks/Categories/Permissions/BMCPermissionsCell.swift index 53272f54d1..b6127ecaf5 100644 --- a/iphone/Maps/Bookmarks/Categories/Permissions/BMCPermissionsCell.swift +++ b/iphone/Maps/Bookmarks/Categories/Permissions/BMCPermissionsCell.swift @@ -3,23 +3,9 @@ protocol BMCPermissionsCellDelegate { } final class BMCPermissionsCell: MWMTableViewCell { - @IBOutlet private weak var label: UILabel! { - didSet { - label.font = .regular14() - label.textColor = .blackSecondaryText() - } - } + @IBOutlet private weak var label: UILabel! - @IBOutlet private weak var button: UIButton! { - didSet { - button.setTitleColor(UIColor.whitePrimaryText(), for: .normal) - button.setTitleColor(UIColor.whitePrimaryTextHighlighted(), for: .highlighted) - button.setBackgroundColor(.linkBlue(), for: .normal) - button.titleLabel?.font = .medium14() - button.layer.cornerRadius = 6 - button.clipsToBounds = true - } - } + @IBOutlet private weak var button: UIButton! private var permission: BMCPermission! { didSet { diff --git a/iphone/Maps/Bookmarks/Categories/Permissions/BMCPermissionsCell.xib b/iphone/Maps/Bookmarks/Categories/Permissions/BMCPermissionsCell.xib index f370e50f0e..53636b15cf 100644 --- a/iphone/Maps/Bookmarks/Categories/Permissions/BMCPermissionsCell.xib +++ b/iphone/Maps/Bookmarks/Categories/Permissions/BMCPermissionsCell.xib @@ -1,11 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> - <device id="retina4_7" orientation="portrait"> - <adaptation id="fullscreen"/> - </device> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> + <device id="retina4_7" orientation="portrait" appearance="light"/> <dependencies> <deployment identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14460.20"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/> <capability name="Safe area layout guides" minToolsVersion="9.0"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> @@ -16,21 +14,27 @@ <rect key="frame" x="0.0" y="0.0" width="320" height="113"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM"> - <rect key="frame" x="0.0" y="0.0" width="320" height="112.5"/> + <rect key="frame" x="0.0" y="0.0" width="320" height="113"/> <autoresizingMask key="autoresizingMask"/> <subviews> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="h0a-ss-bey"> - <rect key="frame" x="16" y="16" width="288" height="16.5"/> + <rect key="frame" x="16" y="16" width="288" height="17"/> <fontDescription key="fontDescription" type="system" pointSize="17"/> <nil key="textColor"/> <nil key="highlightedColor"/> + <userDefinedRuntimeAttributes> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular14:blackSecondaryText"/> + </userDefinedRuntimeAttributes> </label> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Zb4-aL-Ldq"> - <rect key="frame" x="16" y="48.5" width="288" height="44"/> + <rect key="frame" x="16" y="49" width="288" height="44"/> <constraints> <constraint firstAttribute="height" constant="44" id="Dik-ca-lyT"/> </constraints> <state key="normal" title="Button"/> + <userDefinedRuntimeAttributes> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="FlatNormalButton"/> + </userDefinedRuntimeAttributes> <connections> <action selector="buttonAction" destination="KGk-i7-Jjw" eventType="touchUpInside" id="vVV-Mk-uw3"/> </connections> @@ -49,10 +53,14 @@ </tableViewCellContentView> <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> <viewLayoutGuide key="safeArea" id="njF-e1-oar"/> + <userDefinedRuntimeAttributes> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="PressBackground"/> + </userDefinedRuntimeAttributes> <connections> <outlet property="button" destination="Zb4-aL-Ldq" id="Sgz-Oh-anC"/> <outlet property="label" destination="h0a-ss-bey" id="LbI-bT-OKg"/> </connections> + <point key="canvasLocation" x="141" y="154"/> </tableViewCell> </objects> </document> diff --git a/iphone/Maps/Bookmarks/Categories/Permissions/BMCPermissionsHeader.swift b/iphone/Maps/Bookmarks/Categories/Permissions/BMCPermissionsHeader.swift index d8045fe472..00d56d9db8 100644 --- a/iphone/Maps/Bookmarks/Categories/Permissions/BMCPermissionsHeader.swift +++ b/iphone/Maps/Bookmarks/Categories/Permissions/BMCPermissionsHeader.swift @@ -7,16 +7,13 @@ final class BMCPermissionsHeader: UIView { @IBOutlet private weak var label: UILabel! { didSet { - label.font = .medium14() - label.textColor = .blackSecondaryText() label.text = L("settings_backup_bookmarks").uppercased() } } @IBOutlet private weak var button: UIButton! { didSet { - button.setImage(#imageLiteral(resourceName: "ic24PxChevronUp"), for: .normal) - button.tintColor = .blackSecondaryText() + button.setImage(UIImage(named: "ic24PxChevronUp")?.withRenderingMode(.alwaysTemplate), for: .normal) updateButton() } } diff --git a/iphone/Maps/Bookmarks/Categories/Permissions/BMCPermissionsPendingCell.swift b/iphone/Maps/Bookmarks/Categories/Permissions/BMCPermissionsPendingCell.swift index 583d4daef7..fec6a384ca 100644 --- a/iphone/Maps/Bookmarks/Categories/Permissions/BMCPermissionsPendingCell.swift +++ b/iphone/Maps/Bookmarks/Categories/Permissions/BMCPermissionsPendingCell.swift @@ -1,10 +1,5 @@ final class BMCPermissionsPendingCell: MWMTableViewCell { - @IBOutlet private weak var label: UILabel! { - didSet { - label.font = .regular14() - label.textColor = .blackSecondaryText() - } - } + @IBOutlet private weak var label: UILabel! @IBOutlet private weak var spinner: UIView! @IBOutlet private var spinnerBottom: NSLayoutConstraint! diff --git a/iphone/Maps/Bookmarks/Categories/Permissions/BMCPermissionsPendingCell.xib b/iphone/Maps/Bookmarks/Categories/Permissions/BMCPermissionsPendingCell.xib index 23922d73e4..2a7a79bf63 100644 --- a/iphone/Maps/Bookmarks/Categories/Permissions/BMCPermissionsPendingCell.xib +++ b/iphone/Maps/Bookmarks/Categories/Permissions/BMCPermissionsPendingCell.xib @@ -1,11 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14109" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> - <device id="retina4_7" orientation="portrait"> - <adaptation id="fullscreen"/> - </device> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> + <device id="retina4_7" orientation="portrait" appearance="light"/> <dependencies> <deployment identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/> <capability name="Safe area layout guides" minToolsVersion="9.0"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> @@ -16,17 +14,20 @@ <rect key="frame" x="0.0" y="0.0" width="320" height="93"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM"> - <rect key="frame" x="0.0" y="0.0" width="320" height="92.5"/> + <rect key="frame" x="0.0" y="0.0" width="320" height="93"/> <autoresizingMask key="autoresizingMask"/> <subviews> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Myl-MN-cW3"> - <rect key="frame" x="16" y="16" width="288" height="20.5"/> + <rect key="frame" x="16" y="16" width="288" height="21"/> <fontDescription key="fontDescription" type="system" pointSize="17"/> <nil key="textColor"/> <nil key="highlightedColor"/> + <userDefinedRuntimeAttributes> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular14:blackSecondaryText"/> + </userDefinedRuntimeAttributes> </label> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="XML-iy-vLE"> - <rect key="frame" x="148" y="52.5" width="24" height="24"/> + <rect key="frame" x="148" y="53" width="24" height="24"/> <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> <constraints> <constraint firstAttribute="width" constant="24" id="ZPD-dz-wcS"/> diff --git a/iphone/Maps/Bookmarks/Categories/Sharing/BookmarksSharingFlow.storyboard b/iphone/Maps/Bookmarks/Categories/Sharing/BookmarksSharingFlow.storyboard index 8fa743576c..ac1e48ee26 100644 --- a/iphone/Maps/Bookmarks/Categories/Sharing/BookmarksSharingFlow.storyboard +++ b/iphone/Maps/Bookmarks/Categories/Sharing/BookmarksSharingFlow.storyboard @@ -1,11 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="Yad-RH-i8M"> - <device id="retina4_7" orientation="portrait"> - <adaptation id="fullscreen"/> - </device> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15705" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="Yad-RH-i8M"> <dependencies> - <deployment identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14490.49"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15706"/> <capability name="Safe area layout guides" minToolsVersion="9.0"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> @@ -15,53 +11,53 @@ <objects> <tableViewController id="Yad-RH-i8M" customClass="BookmarksSharingViewController" customModule="maps_me" customModuleProvider="target" sceneMemberID="viewController"> <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="static" style="grouped" separatorStyle="default" rowHeight="-1" estimatedRowHeight="44" sectionHeaderHeight="18" sectionFooterHeight="18" id="1pz-95-Ts3"> - <rect key="frame" x="0.0" y="0.0" width="375" height="667"/> + <rect key="frame" x="0.0" y="0.0" width="600" height="600"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/> <sections> <tableViewSection headerTitle="Limited access" id="GtE-jP-p4q"> <cells> <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" rowHeight="56" id="90b-ef-VUJ" customClass="UploadActionCell" customModule="maps_me" customModuleProvider="target"> - <rect key="frame" x="0.0" y="55.5" width="375" height="56"/> + <rect key="frame" x="0.0" y="55.5" width="600" height="56"/> <autoresizingMask key="autoresizingMask"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="90b-ef-VUJ" id="AlV-ie-H63"> - <rect key="frame" x="0.0" y="0.0" width="375" height="55.5"/> + <rect key="frame" x="0.0" y="0.0" width="600" height="56"/> <autoresizingMask key="autoresizingMask"/> <subviews> <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="ic24PxLink" translatesAutoresizingMaskIntoConstraints="NO" id="saz-sU-6Ej"> - <rect key="frame" x="16" y="16" width="24" height="24"/> + <rect key="frame" x="20" y="16" width="24" height="24"/> <color key="tintColor" red="0.1176470588" green="0.58823529409999997" blue="0.94117647059999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <constraints> <constraint firstAttribute="width" constant="24" id="1xP-Cc-gIc"/> <constraint firstAttribute="height" constant="24" id="gmf-FK-0kF"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="coloring" value="MWMBlue"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="MWMBlue"/> </userDefinedRuntimeAttributes> </imageView> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Upload and get a direct link" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="eP0-FF-mrr"> - <rect key="frame" x="56" y="18" width="199" height="20"/> + <rect key="frame" x="60" y="18" width="199" height="20"/> <fontDescription key="fontDescription" type="system" pointSize="16"/> <color key="textColor" red="0.1176470588" green="0.58823529409999997" blue="0.94117647059999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <nil key="highlightedColor"/> </label> <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="2Ai-cK-Fh3" customClass="ActivityIndicator" customModule="maps_me" customModuleProvider="target"> - <rect key="frame" x="335" y="16" width="24" height="24"/> + <rect key="frame" x="560" y="16" width="24" height="24"/> <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> <constraints> <constraint firstAttribute="height" constant="24" id="4Ee-n2-9vE"/> <constraint firstAttribute="width" constant="24" id="cE0-J8-T89"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="tintColorName" value="linkBlue"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="MWMBlue"/> </userDefinedRuntimeAttributes> </view> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Ept-QQ-o9W"> - <rect key="frame" x="335" y="16" width="24" height="24"/> + <rect key="frame" x="560" y="16" width="24" height="24"/> <color key="tintColor" red="0.1176470588" green="0.58823529409999997" blue="0.94117647059999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <state key="normal" title="Button" image="ic24PxShare"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="tintColorName" value="linkBlue"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="MWMBlue"/> </userDefinedRuntimeAttributes> <connections> <action selector="shareButtonPressed:" destination="90b-ef-VUJ" eventType="touchUpInside" id="D5v-pl-bJ3"/> @@ -90,21 +86,20 @@ </connections> </tableViewCell> <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" rowHeight="50" id="4dc-7Z-s7O" customClass="MWMTableViewCell"> - <rect key="frame" x="0.0" y="111.5" width="375" height="50"/> + <rect key="frame" x="0.0" y="111.5" width="600" height="50"/> <autoresizingMask key="autoresizingMask"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="4dc-7Z-s7O" id="5YA-YS-3K5"> - <rect key="frame" x="0.0" y="0.0" width="375" height="49.5"/> + <rect key="frame" x="0.0" y="0.0" width="600" height="50"/> <autoresizingMask key="autoresizingMask"/> <subviews> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Anyone this the link will see your list" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="XQh-26-CNo"> - <rect key="frame" x="56" y="18" width="303" height="13.5"/> + <rect key="frame" x="56" y="18" width="528" height="14"/> <fontDescription key="fontDescription" type="system" pointSize="14"/> <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="localizedText" value="get_direct_link_desc"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackSecondaryText"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular14"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular14:blackSecondaryText"/> </userDefinedRuntimeAttributes> </label> </subviews> @@ -117,32 +112,31 @@ </tableViewCellContentView> </tableViewCell> <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" rowHeight="50" id="aAa-cf-kTL" customClass="MWMTableViewCell"> - <rect key="frame" x="0.0" y="161.5" width="375" height="50"/> + <rect key="frame" x="0.0" y="161.5" width="600" height="50"/> <autoresizingMask key="autoresizingMask"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="aAa-cf-kTL" id="IXm-Uq-qPs"> - <rect key="frame" x="0.0" y="0.0" width="375" height="49.5"/> + <rect key="frame" x="0.0" y="0.0" width="600" height="50"/> <autoresizingMask key="autoresizingMask"/> <subviews> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Update guide" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="AbE-1A-kJm"> - <rect key="frame" x="56" y="15" width="303" height="20"/> + <rect key="frame" x="60" y="15" width="524" height="20"/> <fontDescription key="fontDescription" type="system" pointSize="16"/> <color key="textColor" red="0.1176470588" green="0.58823529409999997" blue="0.94117647059999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <nil key="highlightedColor"/> <userDefinedRuntimeAttributes> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="update_guide"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="linkBlue"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular16"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular16:linkBlueText"/> </userDefinedRuntimeAttributes> </label> <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="ic24PxUpdate" translatesAutoresizingMaskIntoConstraints="NO" id="mcr-7c-yuH"> - <rect key="frame" x="16" y="13" width="24" height="24"/> + <rect key="frame" x="20" y="13" width="24" height="24"/> <color key="tintColor" red="0.1176470588" green="0.58823529409999997" blue="0.94117647059999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <constraints> <constraint firstAttribute="height" constant="24" id="6pT-bN-NlA"/> <constraint firstAttribute="width" constant="24" id="qbJ-aO-ytm"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="coloring" value="MWMBlue"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="MWMBlue"/> </userDefinedRuntimeAttributes> </imageView> </subviews> @@ -160,46 +154,46 @@ <tableViewSection headerTitle="Public access" id="wSk-N4-gbo"> <cells> <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" rowHeight="56" id="YW0-jq-Isw" customClass="UploadActionCell" customModule="maps_me" customModuleProvider="target"> - <rect key="frame" x="0.0" y="267.5" width="375" height="56"/> + <rect key="frame" x="0.0" y="267.5" width="600" height="56"/> <autoresizingMask key="autoresizingMask"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="YW0-jq-Isw" id="ayR-ii-DjA"> - <rect key="frame" x="0.0" y="0.0" width="375" height="55.5"/> + <rect key="frame" x="0.0" y="0.0" width="600" height="56"/> <autoresizingMask key="autoresizingMask"/> <subviews> <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="ic24PxGlobe" translatesAutoresizingMaskIntoConstraints="NO" id="fmA-82-rPS"> - <rect key="frame" x="16" y="16" width="24" height="24"/> + <rect key="frame" x="20" y="16" width="24" height="24"/> <color key="tintColor" red="0.11764705882352941" green="0.58823529411764708" blue="0.94117647058823528" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <constraints> <constraint firstAttribute="height" constant="24" id="5bK-ck-alK"/> <constraint firstAttribute="width" constant="24" id="RId-hH-I1b"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="coloring" value="MWMBlue"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="MWMBlue"/> </userDefinedRuntimeAttributes> </imageView> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Upload and publish" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="uMP-YO-wbu"> - <rect key="frame" x="56" y="18" width="140" height="20"/> + <rect key="frame" x="60" y="18" width="140" height="20"/> <fontDescription key="fontDescription" type="system" pointSize="16"/> <color key="textColor" red="0.11764705882352941" green="0.58823529411764708" blue="0.94117647058823528" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <nil key="highlightedColor"/> </label> <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="lF2-pc-Qo7" customClass="ActivityIndicator" customModule="maps_me" customModuleProvider="target"> - <rect key="frame" x="335" y="16" width="24" height="24"/> + <rect key="frame" x="560" y="16" width="24" height="24"/> <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> <constraints> <constraint firstAttribute="height" constant="24" id="9r2-mf-DsT"/> <constraint firstAttribute="width" constant="24" id="Gon-Yr-8Fq"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="tintColorName" value="linkBlue"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="MWMBlue"/> </userDefinedRuntimeAttributes> </view> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="PYo-PL-9Fc"> - <rect key="frame" x="335" y="16" width="24" height="24"/> + <rect key="frame" x="560" y="16" width="24" height="24"/> <color key="tintColor" red="0.1176470588" green="0.58823529409999997" blue="0.94117647059999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <state key="normal" title="Button" image="ic24PxShare"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="tintColorName" value="linkBlue"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="MWMBlue"/> </userDefinedRuntimeAttributes> <connections> <action selector="shareButtonPressed:" destination="YW0-jq-Isw" eventType="touchUpInside" id="j1d-qF-UIt"/> @@ -228,14 +222,14 @@ </connections> </tableViewCell> <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" rowHeight="86" id="3UL-dT-hKc" customClass="MWMTableViewCell"> - <rect key="frame" x="0.0" y="323.5" width="375" height="86"/> + <rect key="frame" x="0.0" y="323.5" width="600" height="86"/> <autoresizingMask key="autoresizingMask"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="3UL-dT-hKc" id="402-ot-2TF"> - <rect key="frame" x="0.0" y="0.0" width="375" height="85.5"/> + <rect key="frame" x="0.0" y="0.0" width="600" height="86"/> <autoresizingMask key="autoresizingMask"/> <subviews> <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" scrollEnabled="NO" editable="NO" text="Please note: by proceeding, you accept the license agreement" translatesAutoresizingMaskIntoConstraints="NO" id="dsV-Vs-oCo" customClass="LinkTextView" customModule="maps_me" customModuleProvider="target"> - <rect key="frame" x="56" y="18" width="303" height="49.5"/> + <rect key="frame" x="56" y="18" width="528" height="50"/> <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> <color key="tintColor" red="0.1176470588" green="0.58823529409999997" blue="0.94117647059999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.54000000000000004" colorSpace="custom" customColorSpace="sRGB"/> @@ -245,10 +239,7 @@ <userDefinedRuntimeAttribute type="number" keyPath="textContainer.lineFragmentPadding"> <integer key="value" value="0"/> </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="rect" keyPath="textContainerInset"> - <rect key="value" x="0.0" y="0.0" width="0.0" height="0.0"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="string" keyPath="tintColorName" value="linkBlue"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="BookmarkSharingLicense"/> </userDefinedRuntimeAttributes> </textView> </subviews> @@ -261,32 +252,31 @@ </tableViewCellContentView> </tableViewCell> <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" rowHeight="50" id="7OC-5n-kuV" customClass="MWMTableViewCell"> - <rect key="frame" x="0.0" y="409.5" width="375" height="50"/> + <rect key="frame" x="0.0" y="409.5" width="600" height="50"/> <autoresizingMask key="autoresizingMask"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="7OC-5n-kuV" id="ycu-0k-aXG"> - <rect key="frame" x="0.0" y="0.0" width="375" height="49.5"/> + <rect key="frame" x="0.0" y="0.0" width="600" height="50"/> <autoresizingMask key="autoresizingMask"/> <subviews> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Update guide" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="L3P-U3-xdo"> - <rect key="frame" x="56" y="15" width="303" height="20"/> + <rect key="frame" x="60" y="15" width="524" height="20"/> <fontDescription key="fontDescription" type="system" pointSize="16"/> <color key="textColor" red="0.1176470588" green="0.58823529409999997" blue="0.94117647059999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <nil key="highlightedColor"/> <userDefinedRuntimeAttributes> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="update_guide"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="linkBlue"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular16"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular16:linkBlueText"/> </userDefinedRuntimeAttributes> </label> <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="ic24PxUpdate" translatesAutoresizingMaskIntoConstraints="NO" id="2cF-g6-zQ1"> - <rect key="frame" x="16" y="13" width="24" height="24"/> + <rect key="frame" x="20" y="13" width="24" height="24"/> <color key="tintColor" red="0.1176470588" green="0.58823529409999997" blue="0.94117647059999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <constraints> <constraint firstAttribute="width" constant="24" id="OCh-zc-INp"/> <constraint firstAttribute="height" constant="24" id="aO1-pe-dmU"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="coloring" value="MWMBlue"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="MWMBlue"/> </userDefinedRuntimeAttributes> </imageView> </subviews> @@ -304,38 +294,32 @@ <tableViewSection headerTitle="Web editor" id="Ycc-hd-WDM"> <cells> <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" rowHeight="129" id="wRG-8I-r2U" customClass="MWMTableViewCell"> - <rect key="frame" x="0.0" y="515.5" width="375" height="129"/> + <rect key="frame" x="0.0" y="515.5" width="600" height="129"/> <autoresizingMask key="autoresizingMask"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="wRG-8I-r2U" id="BPo-ON-rJH"> - <rect key="frame" x="0.0" y="0.0" width="375" height="128.5"/> + <rect key="frame" x="0.0" y="0.0" width="600" height="129"/> <autoresizingMask key="autoresizingMask"/> <subviews> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Upload your guide and get the link for edit from desktop" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="h4Z-cZ-Nmn"> - <rect key="frame" x="16" y="16" width="343" height="36.5"/> + <rect key="frame" x="16" y="16" width="568" height="37"/> <fontDescription key="fontDescription" type="system" pointSize="14"/> <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="localizedText" value="web_editor_description"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackSecondaryText"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular14"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular14:blackSecondaryText"/> </userDefinedRuntimeAttributes> </label> <button opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ULn-RX-CjB"> - <rect key="frame" x="16" y="68.5" width="343" height="44"/> + <rect key="frame" x="16" y="69" width="568" height="44"/> <color key="backgroundColor" red="0.1176470588" green="0.58823529409999997" blue="0.94117647059999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <constraints> <constraint firstAttribute="height" constant="44" id="GBG-1m-bkN"/> </constraints> <state key="normal" title="Edit on web"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius"> - <integer key="value" value="8"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="string" keyPath="textColorName" value="whitePrimaryText"/> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="linkBlue"/> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundHighlightedColorName" value="linkBlueHighlighted"/> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="edit_on_web"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="FlatNormalButton"/> </userDefinedRuntimeAttributes> <connections> <segue destination="FPL-Dh-v8t" kind="show" identifier="editOnWeb" id="XOx-hn-7qC"/> @@ -380,27 +364,26 @@ <objects> <viewController storyboardIdentifier="tags" id="xf5-2c-0zi" customClass="SharingTagsViewController" customModule="maps_me" customModuleProvider="target" sceneMemberID="viewController"> <view key="view" contentMode="scaleToFill" id="2YU-O5-UMg"> - <rect key="frame" x="0.0" y="0.0" width="375" height="667"/> + <rect key="frame" x="0.0" y="0.0" width="600" height="600"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="7vG-MC-M3b"> - <rect key="frame" x="0.0" y="20" width="375" height="603"/> + <rect key="frame" x="0.0" y="0.0" width="600" height="551"/> <subviews> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="KY2-7H-0bb"> - <rect key="frame" x="0.0" y="0.0" width="375" height="72"/> + <rect key="frame" x="0.0" y="0.0" width="600" height="72"/> <subviews> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Please, select tags to help other travelers find your guide. This is mandatory." textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="tjK-HW-d6t"> - <rect key="frame" x="16" y="19.5" width="343" height="33.5"/> + <rect key="frame" x="16" y="27.5" width="568" height="17"/> <fontDescription key="fontDescription" type="system" pointSize="14"/> <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.54000000000000004" colorSpace="calibratedRGB"/> <nil key="highlightedColor"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackSecondaryText"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular14"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular14:blackSecondaryText"/> </userDefinedRuntimeAttributes> </label> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="1u2-6K-X3l"> - <rect key="frame" x="0.0" y="71" width="375" height="1"/> + <rect key="frame" x="0.0" y="71" width="600" height="1"/> <color key="backgroundColor" white="0.0" alpha="0.1213077910958904" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> <constraints> <constraint firstAttribute="height" constant="1" id="dzg-PZ-65P"/> @@ -419,10 +402,10 @@ </constraints> </view> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="tUs-JB-h8i"> - <rect key="frame" x="0.0" y="72" width="375" height="105"/> + <rect key="frame" x="0.0" y="72" width="600" height="105"/> <subviews> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="RMh-DN-eFb"> - <rect key="frame" x="169.5" y="28" width="36" height="36"/> + <rect key="frame" x="282" y="28" width="36" height="36"/> <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> <constraints> <constraint firstAttribute="width" constant="36" id="bQK-LD-adI"/> @@ -430,14 +413,13 @@ </constraints> </view> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Loading tags..." textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="27q-vH-fsJ"> - <rect key="frame" x="140" y="88" width="95.5" height="17"/> + <rect key="frame" x="252.5" y="88" width="95.5" height="17"/> <fontDescription key="fontDescription" type="system" pointSize="14"/> <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.54000000000000004" colorSpace="calibratedRGB"/> <nil key="highlightedColor"/> <userDefinedRuntimeAttributes> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="ugc_route_tags_progress_msg"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackSecondaryText"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular14"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular14:blackSecondaryText"/> </userDefinedRuntimeAttributes> </label> </subviews> @@ -451,10 +433,10 @@ </constraints> </view> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="crb-Hn-y9s"> - <rect key="frame" x="0.0" y="177" width="375" height="426"/> + <rect key="frame" x="0.0" y="177" width="600" height="374"/> <subviews> <collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="UZU-x1-VBd"> - <rect key="frame" x="0.0" y="0.0" width="375" height="426"/> + <rect key="frame" x="0.0" y="0.0" width="600" height="374"/> <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> <viewLayoutGuide key="safeArea" id="AgH-PG-DAM"/> <collectionViewFlowLayout key="collectionViewLayout" minimumLineSpacing="10" minimumInteritemSpacing="10" id="fbB-dB-9OF" customClass="TagsCollectionViewLayout" customModule="maps_me" customModuleProvider="target"> @@ -495,7 +477,7 @@ <userDefinedRuntimeAttribute type="number" keyPath="layer.borderWidth"> <integer key="value" value="1"/> </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Background"/> </userDefinedRuntimeAttributes> </view> </subviews> @@ -513,7 +495,7 @@ </collectionViewCell> </cells> <collectionReusableView key="sectionHeaderView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" reuseIdentifier="TagHeaderIdentifier" id="hXP-fc-7dB" customClass="TagSectionHeaderView" customModule="maps_me" customModuleProvider="target"> - <rect key="frame" x="0.0" y="0.0" width="375" height="24"/> + <rect key="frame" x="0.0" y="0.0" width="600" height="24"/> <autoresizingMask key="autoresizingMask"/> <subviews> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="SIGHTSEEING" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="W6H-nE-Qck"> @@ -522,8 +504,7 @@ <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.38" colorSpace="calibratedRGB"/> <nil key="highlightedColor"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackSecondaryText"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular14"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular14:blackSecondaryText"/> </userDefinedRuntimeAttributes> </label> </subviews> @@ -563,7 +544,7 @@ </constraints> <viewLayoutGuide key="safeArea" id="0d6-uC-MKC"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Background"/> </userDefinedRuntimeAttributes> </view> <toolbarItems/> @@ -590,32 +571,31 @@ <objects> <tableViewController storyboardIdentifier="chooseProperties" id="fDN-IN-IEc" customClass="SharingPropertiesViewController" customModule="maps_me" customModuleProvider="target" sceneMemberID="viewController"> <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="static" style="grouped" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="18" sectionFooterHeight="18" id="ibV-nf-9aS"> - <rect key="frame" x="0.0" y="0.0" width="375" height="667"/> + <rect key="frame" x="0.0" y="0.0" width="600" height="600"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/> <sections> <tableViewSection headerTitle="LOCAL OR TRAVELLER" id="M1K-Vf-5wl"> <cells> <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" rowHeight="115" id="BxX-r9-FhR" customClass="MWMTableViewCell"> - <rect key="frame" x="0.0" y="55.5" width="375" height="115"/> + <rect key="frame" x="0.0" y="55.5" width="600" height="115"/> <autoresizingMask key="autoresizingMask"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="BxX-r9-FhR" id="2z2-uI-iUF"> - <rect key="frame" x="0.0" y="0.0" width="375" height="114.5"/> + <rect key="frame" x="0.0" y="0.0" width="600" height="115"/> <autoresizingMask key="autoresizingMask"/> <subviews> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" text="You have visited places in this guide as" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="RD2-dA-33d"> - <rect key="frame" x="0.0" y="16" width="375" height="19.5"/> + <rect key="frame" x="0.0" y="16" width="600" height="19.5"/> <fontDescription key="fontDescription" type="system" pointSize="16"/> <nil key="textColor"/> <nil key="highlightedColor"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular16"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular16:blackPrimaryText"/> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="custom_props_desc"/> </userDefinedRuntimeAttributes> </label> <button opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="4Aq-yf-HLJ" customClass="MWMButton"> - <rect key="frame" x="16" y="66.5" width="161.5" height="32"/> + <rect key="frame" x="16" y="67" width="274" height="32"/> <color key="backgroundColor" red="0.11764705882352941" green="0.58823529411764708" blue="0.94117647058823528" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <constraints> <constraint firstAttribute="height" constant="32" id="qqI-Vk-fJA"/> @@ -625,20 +605,14 @@ <color key="titleColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> </state> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="bold14"/> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="linkBlue"/> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundHighlightedColorName" value="linkBlueHighlighted"/> - <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius"> - <integer key="value" value="6"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="string" keyPath="tintColorName" value="white"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="FlatNormalButton"/> </userDefinedRuntimeAttributes> <connections> <action selector="localButtonWasPressed:" destination="fDN-IN-IEc" eventType="touchUpInside" id="eY9-Ds-2Yj"/> </connections> </button> <button opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="D7h-er-9Kx" customClass="MWMButton"> - <rect key="frame" x="197.5" y="66.5" width="161.5" height="32"/> + <rect key="frame" x="310" y="67" width="274" height="32"/> <color key="backgroundColor" red="0.11764705882352941" green="0.58823529411764708" blue="0.94117647058823528" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <constraints> <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="32" id="nKF-9s-YhE"/> @@ -649,13 +623,7 @@ <color key="titleColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> </state> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="bold14"/> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="linkBlue"/> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundHighlightedColorName" value="linkBlueHighlighted"/> - <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius"> - <integer key="value" value="6"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="string" keyPath="tintColorName" value="white"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="FlatNormalButton"/> </userDefinedRuntimeAttributes> <connections> <action selector="travelerButtonPressed:" destination="fDN-IN-IEc" eventType="touchUpInside" id="GcO-Mh-UZT"/> @@ -697,46 +665,44 @@ <objects> <viewController id="FPL-Dh-v8t" customClass="EditOnWebViewController" customModule="maps_me" customModuleProvider="target" sceneMemberID="viewController"> <view key="view" contentMode="scaleToFill" id="XST-Aa-nm6"> - <rect key="frame" x="0.0" y="0.0" width="375" height="667"/> + <rect key="frame" x="0.0" y="0.0" width="600" height="600"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> - <imageView userInteractionEnabled="NO" contentMode="scaleToFill" image="img_guide_editonweb" translatesAutoresizingMaskIntoConstraints="NO" id="Q8X-cu-CGX"> - <rect key="frame" x="67.5" y="64" width="240" height="240"/> + <imageView userInteractionEnabled="NO" contentMode="scaleToFill" ambiguous="YES" image="img_guide_editonweb" translatesAutoresizingMaskIntoConstraints="NO" id="Q8X-cu-CGX"> + <rect key="frame" x="67.5" y="38" width="240" height="240"/> <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> <constraints> <constraint firstAttribute="width" secondItem="Q8X-cu-CGX" secondAttribute="height" multiplier="1:1" id="18O-yd-NGO"/> <constraint firstAttribute="width" priority="750" constant="240" id="lBW-13-AL5"/> </constraints> </imageView> - <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="YNH-ha-MaJ"> - <rect key="frame" x="20" y="328" width="335" height="237"/> + <view contentMode="scaleToFill" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="YNH-ha-MaJ"> + <rect key="frame" x="47.5" y="302" width="532.5" height="237"/> <subviews> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="751" verticalCompressionResistancePriority="751" text="Edit your guide on the web" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="pqq-0d-RGh"> - <rect key="frame" x="38" y="0.0" width="259" height="26.5"/> + <rect key="frame" x="137" y="0.0" width="258.5" height="26.5"/> <fontDescription key="fontDescription" type="system" weight="medium" pointSize="22"/> <color key="textColor" white="0.0" alpha="0.87" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> <nil key="highlightedColor"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="bold22"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="bold22:blackPrimaryText"/> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="edit_guide_title"/> </userDefinedRuntimeAttributes> </label> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" verticalCompressionResistancePriority="751" textAlignment="center" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="oZZ-eC-b5K"> - <rect key="frame" x="0.0" y="42.5" width="335" height="64.5"/> + <rect key="frame" x="0.0" y="42.5" width="532.5" height="43"/> <string key="text">Get a link to edit your guide via web app: add descriptions for POI, upload photos and more</string> <fontDescription key="fontDescription" type="system" pointSize="18"/> <color key="textColor" white="0.0" alpha="0.54000000000000004" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> <nil key="highlightedColor"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular18"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackSecondaryText"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular18:blackSecondaryText"/> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="edit_guide_subtitle"/> </userDefinedRuntimeAttributes> </label> <button opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" verticalCompressionResistancePriority="751" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="PKE-El-ftz" customClass="MWMButton"> - <rect key="frame" x="16" y="131" width="303" height="48"/> + <rect key="frame" x="16" y="109.5" width="500.5" height="48"/> <color key="backgroundColor" red="0.1176470588" green="0.58823529409999997" blue="0.94117647059999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <constraints> <constraint firstAttribute="height" constant="48" id="b2Z-cP-PLt"/> @@ -746,20 +712,14 @@ upload photos and more</string> <color key="titleColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> </state> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="bold14"/> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="linkBlue"/> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundHighlightedColorName" value="linkBlueHighlighted"/> - <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius"> - <integer key="value" value="6"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="string" keyPath="tintColorName" value="white"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="FlatNormalButton"/> </userDefinedRuntimeAttributes> <connections> <action selector="sendMeLinkButtonPressed:" destination="FPL-Dh-v8t" eventType="touchUpInside" id="azx-ep-f7p"/> </connections> </button> <button opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" verticalCompressionResistancePriority="751" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="2gt-S9-kRm" userLabel="Cancel"> - <rect key="frame" x="16" y="189" width="303" height="48"/> + <rect key="frame" x="16" y="167.5" width="500.5" height="48"/> <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/> <constraints> <constraint firstAttribute="height" constant="48" id="gOT-uV-6tC"/> @@ -770,16 +730,14 @@ upload photos and more</string> <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> </state> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="textColorHighlightedName" value="linkBlueHighlighted"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="medium14"/> - <userDefinedRuntimeAttribute type="string" keyPath="textColorName" value="linkBlue"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="FlatNormalTransButton"/> </userDefinedRuntimeAttributes> <connections> <action selector="cancelButtonPressed:" destination="FPL-Dh-v8t" eventType="touchUpInside" id="Dcz-Ke-Dqs"/> </connections> </button> <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="osb-Nl-1fT" customClass="ActivityIndicator" customModule="maps_me" customModuleProvider="target"> - <rect key="frame" x="155.5" y="143" width="24" height="24"/> + <rect key="frame" x="254.5" y="121.5" width="24" height="24"/> <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> <constraints> <constraint firstAttribute="height" constant="24" id="2dy-Vg-dQd"/> @@ -828,7 +786,7 @@ upload photos and more</string> </constraints> <viewLayoutGuide key="safeArea" id="S4c-kp-N1N"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Background"/> </userDefinedRuntimeAttributes> <variation key="default"> <mask key="constraints"> @@ -908,7 +866,7 @@ upload photos and more</string> <objects> <tableViewController storyboardIdentifier="guideName" id="cvj-kq-BmC" customClass="GuideNameViewController" customModule="maps_me" customModuleProvider="target" sceneMemberID="viewController"> <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="static" style="grouped" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="18" sectionFooterHeight="18" id="Uwp-K9-cnW"> - <rect key="frame" x="0.0" y="0.0" width="375" height="667"/> + <rect key="frame" x="0.0" y="0.0" width="600" height="600"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/> <sections> @@ -918,20 +876,18 @@ upload photos and more</string> The name shouldn't contain special symbols or digits. The name shouldn't be 'My places'</string> <cells> <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" id="L0q-Dk-RQu" customClass="MWMTableViewCell"> - <rect key="frame" x="0.0" y="55.5" width="375" height="44"/> + <rect key="frame" x="0.0" y="55.5" width="600" height="44"/> <autoresizingMask key="autoresizingMask"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="L0q-Dk-RQu" id="ny0-9t-pzR"> - <rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/> + <rect key="frame" x="0.0" y="0.0" width="600" height="44"/> <autoresizingMask key="autoresizingMask"/> <subviews> <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="e.g. Sightseeing in London" minimumFontSize="16" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="JAZ-st-xqM"> - <rect key="frame" x="16" y="12" width="343" height="20"/> - <nil key="textColor"/> + <rect key="frame" x="16" y="12" width="568" height="20"/> <fontDescription key="fontDescription" name=".AppleSystemUIFont" family=".AppleSystemUIFont" pointSize="16"/> <textInputTraits key="textInputTraits"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/> - <userDefinedRuntimeAttribute type="string" keyPath="tintColorName" value="linkBlue"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="MWMBlue:blackPrimaryText"/> </userDefinedRuntimeAttributes> <connections> <action selector="onEditName:" destination="cvj-kq-BmC" eventType="editingChanged" id="pfy-5S-MSz"/> @@ -976,21 +932,21 @@ The name shouldn't contain special symbols or digits. The name shouldn't be 'My <objects> <tableViewController storyboardIdentifier="guideDescription" id="Stq-Tq-XqB" customClass="GuideDescriptionViewController" customModule="maps_me" customModuleProvider="target" sceneMemberID="viewController"> <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="static" style="grouped" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="18" sectionFooterHeight="18" id="Y7n-SR-xIH"> - <rect key="frame" x="0.0" y="0.0" width="375" height="667"/> + <rect key="frame" x="0.0" y="0.0" width="600" height="600"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/> <sections> <tableViewSection headerTitle="Enter description" footerTitle="Guide description should contain at least 30 symbols (13 for oriental languages)." id="C3r-nD-p7y"> <cells> <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" rowHeight="160" id="NR5-qU-x6v" customClass="MWMTableViewCell"> - <rect key="frame" x="0.0" y="55.5" width="375" height="160"/> + <rect key="frame" x="0.0" y="55.5" width="600" height="160"/> <autoresizingMask key="autoresizingMask"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="NR5-qU-x6v" id="gPI-nK-hOK"> - <rect key="frame" x="0.0" y="0.0" width="375" height="159.5"/> + <rect key="frame" x="0.0" y="0.0" width="600" height="160"/> <autoresizingMask key="autoresizingMask"/> <subviews> <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" scrollEnabled="NO" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" textAlignment="natural" translatesAutoresizingMaskIntoConstraints="NO" id="Vso-9t-xe5" customClass="MWMTextView"> - <rect key="frame" x="16" y="12" width="343" height="135.5"/> + <rect key="frame" x="16" y="12" width="568" height="136"/> <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> <fontDescription key="fontDescription" type="system" pointSize="16"/> <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/> @@ -998,9 +954,7 @@ The name shouldn't contain special symbols or digits. The name shouldn't be 'My <userDefinedRuntimeAttribute type="number" keyPath="textContainer.lineFragmentPadding"> <integer key="value" value="0"/> </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/> - <userDefinedRuntimeAttribute type="string" keyPath="tintColorName" value="linkBlue"/> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/> + <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="Background:MWMBlue:blackPrimaryText"/> </userDefinedRuntimeAttributes> <connections> <outlet property="delegate" destination="Stq-Tq-XqB" id="vUs-Qc-Ooa"/> diff --git a/iphone/Maps/Bookmarks/Categories/Sharing/BookmarksSharingViewController.swift b/iphone/Maps/Bookmarks/Categories/Sharing/BookmarksSharingViewController.swift index 85ae0be45f..2a68433e21 100644 --- a/iphone/Maps/Bookmarks/Categories/Sharing/BookmarksSharingViewController.swift +++ b/iphone/Maps/Bookmarks/Categories/Sharing/BookmarksSharingViewController.swift @@ -51,10 +51,8 @@ final class BookmarksSharingViewController: MWMTableViewController { didSet { let htmlString = String(coreFormat: L("ugc_routes_user_agreement"), arguments: [User.termsOfUseLink()]) - let attributes: [NSAttributedString.Key : Any] = [NSAttributedString.Key.font: UIFont.regular14(), - NSAttributedString.Key.foregroundColor: UIColor.blackSecondaryText()] licenseAgreementTextView.attributedText = NSAttributedString.string(withHtml: htmlString, - defaultAttributes: attributes) + defaultAttributes: [:]) licenseAgreementTextView.delegate = self } } diff --git a/iphone/Maps/Bookmarks/Categories/Sharing/EditOnWebAlertViewController.xib b/iphone/Maps/Bookmarks/Categories/Sharing/EditOnWebAlertViewController.xib index 3f1e57a84c..1213a7661e 100644 --- a/iphone/Maps/Bookmarks/Categories/Sharing/EditOnWebAlertViewController.xib +++ b/iphone/Maps/Bookmarks/Categories/Sharing/EditOnWebAlertViewController.xib @@ -1,11 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> - <device id="retina4_7" orientation="portrait"> - <adaptation id="fullscreen"/> - </device> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> + <device id="retina4_7" orientation="portrait" appearance="light"/> <dependencies> <deployment identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14460.20"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/> <capability name="Safe area layout guides" minToolsVersion="9.0"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> @@ -30,8 +28,7 @@ <nil key="textColor"/> <nil key="highlightedColor"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="bold17"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="bold17:blackPrimaryText"/> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="public_or_limited_access_after_edit_online_error_title"/> </userDefinedRuntimeAttributes> </label> @@ -41,8 +38,7 @@ <color key="textColor" white="0.0" alpha="0.5442155393835616" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> <nil key="highlightedColor"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular14"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackSecondaryText"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular14:blackSecondaryText"/> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="public_or_limited_access_after_edit_online_error_message"/> </userDefinedRuntimeAttributes> </label> @@ -58,9 +54,7 @@ <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> </state> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="textColorHighlightedName" value="linkBlueHighlighted"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="medium16"/> - <userDefinedRuntimeAttribute type="string" keyPath="textColorName" value="blackSecondaryText"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="FlatGrayTransButton"/> </userDefinedRuntimeAttributes> <connections> <action selector="onCancel:" destination="-1" eventType="touchUpInside" id="YMO-gu-PBi"/> @@ -78,13 +72,7 @@ <color key="titleColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> </state> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="medium16"/> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="linkBlue"/> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundHighlightedColorName" value="linkBlueHighlighted"/> - <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius"> - <integer key="value" value="8"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="string" keyPath="tintColorName" value="white"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="FlatNormalButton"/> </userDefinedRuntimeAttributes> <connections> <action selector="onAccept:" destination="-1" eventType="touchUpInside" id="2Fj-t8-3OH"/> @@ -110,7 +98,7 @@ <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/> <viewLayoutGuide key="safeArea" id="fnl-2z-Ty3"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Background"/> </userDefinedRuntimeAttributes> <point key="canvasLocation" x="128.80000000000001" y="-31.03448275862069"/> </view> diff --git a/iphone/Maps/Bookmarks/Categories/Sharing/EditOnWebViewController.swift b/iphone/Maps/Bookmarks/Categories/Sharing/EditOnWebViewController.swift index ba3de555bb..5245879e93 100644 --- a/iphone/Maps/Bookmarks/Categories/Sharing/EditOnWebViewController.swift +++ b/iphone/Maps/Bookmarks/Categories/Sharing/EditOnWebViewController.swift @@ -6,12 +6,7 @@ final class EditOnWebViewController: MWMViewController { weak var delegate: EditOnWebViewControllerDelegate? var category: MWMCategory! - @IBOutlet weak var activityIndicator: ActivityIndicator! { - didSet { - activityIndicator.tintColor = UIColor.white() - } - } - + @IBOutlet weak var activityIndicator: ActivityIndicator! @IBOutlet weak var sendMeLinkButton: MWMButton! { didSet { sendMeLinkButton.setTitle(L("send_a_link_btn").uppercased(), for: .normal) diff --git a/iphone/Maps/Bookmarks/Categories/Sharing/UploadActionCell.swift b/iphone/Maps/Bookmarks/Categories/Sharing/UploadActionCell.swift index b4af15d36f..684b29b69b 100644 --- a/iphone/Maps/Bookmarks/Categories/Sharing/UploadActionCell.swift +++ b/iphone/Maps/Bookmarks/Categories/Sharing/UploadActionCell.swift @@ -31,41 +31,36 @@ final class UploadActionCell: MWMTableViewCell { switch cellState { case .normal: progressView.isHidden = true - actionImage.tintColor = .linkBlue() - actionTitle.textColor = .linkBlue() - actionTitle.font = .regular16() + actionImage.setStyleAndApply("MWMBlue") + actionTitle.setStyleAndApply("regular16:linkBlueText") actionTitle.text = titles?[.normal] shareButton.isHidden = true selectionStyle = .default case .inProgress: progressView.isHidden = false - actionImage.tintColor = .blackSecondaryText() - actionTitle.textColor = .blackSecondaryText() - actionTitle.font = .italic16() + actionImage.setStyleAndApply("MWMBlack") + actionTitle.setStyleAndApply("italic16:blackSecondaryText") actionTitle.text = titles?[.inProgress] shareButton.isHidden = true selectionStyle = .none case .updating: progressView.isHidden = false - actionImage.tintColor = .blackSecondaryText() - actionTitle.textColor = .blackSecondaryText() - actionTitle.font = .italic16() + actionImage.setStyleAndApply("MWMBlack") + actionTitle.setStyleAndApply("italic16:blackSecondaryText") actionTitle.text = titles?[.updating] shareButton.isHidden = true selectionStyle = .none case .completed: progressView.isHidden = true - actionImage.tintColor = .blackSecondaryText() - actionTitle.textColor = .blackSecondaryText() - actionTitle.font = .regular16() + actionImage.setStyleAndApply("MWMBlack") + actionTitle.setStyleAndApply("regular16:blackSecondaryText") actionTitle.text = titles?[.completed] shareButton.isHidden = false selectionStyle = .none case .disabled: progressView.isHidden = true - actionImage.tintColor = .blackSecondaryText() - actionTitle.textColor = .blackSecondaryText() - actionTitle.font = .regular16() + actionImage.setStyleAndApply("MWMBlack") + actionTitle.setStyleAndApply("regular16:blackSecondaryText") actionTitle.text = titles?[.disabled] shareButton.isHidden = true selectionStyle = .none diff --git a/iphone/Maps/Bookmarks/MWMCategoryInfoCell.xib b/iphone/Maps/Bookmarks/MWMCategoryInfoCell.xib index 5472342d6d..83be4f9355 100644 --- a/iphone/Maps/Bookmarks/MWMCategoryInfoCell.xib +++ b/iphone/Maps/Bookmarks/MWMCategoryInfoCell.xib @@ -1,11 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> - <device id="retina4_7" orientation="portrait"> - <adaptation id="fullscreen"/> - </device> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> + <device id="retina4_7" orientation="portrait" appearance="light"/> <dependencies> <deployment identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14460.20"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/> <capability name="Safe area layout guides" minToolsVersion="9.0"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> @@ -16,7 +14,7 @@ <rect key="frame" x="0.0" y="0.0" width="320" height="120"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="TopLeft" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM"> - <rect key="frame" x="0.0" y="0.0" width="320" height="119.5"/> + <rect key="frame" x="0.0" y="0.0" width="320" height="120"/> <autoresizingMask key="autoresizingMask"/> <subviews> <label opaque="NO" userInteractionEnabled="NO" contentMode="TopLeft" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="My 5-days route to the USA" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2Sb-Xn-590"> @@ -25,7 +23,7 @@ <nil key="textColor"/> <color key="highlightedColor" white="0.0" alpha="0.86847174657534243" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="blackPrimaryText"/> </userDefinedRuntimeAttributes> </label> <label opaque="NO" userInteractionEnabled="NO" contentMode="TopLeft" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="by Eugene Lisovskiy" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="mV8-w9-Csf"> @@ -34,7 +32,7 @@ <nil key="textColor"/> <color key="highlightedColor" white="0.0" alpha="0.38184931506849318" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackSecondaryText"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="blackSecondaryText"/> </userDefinedRuntimeAttributes> </label> <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="TopLeft" horizontalHuggingPriority="251" verticalCompressionResistancePriority="250" scrollEnabled="NO" editable="NO" textAlignment="natural" selectable="NO" translatesAutoresizingMaskIntoConstraints="NO" id="nXr-iD-TLp"> @@ -51,18 +49,18 @@ <userDefinedRuntimeAttribute type="rect" keyPath="textContainerInset"> <rect key="value" x="0.0" y="0.0" width="0.0" height="0.0"/> </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="blackPrimaryText"/> </userDefinedRuntimeAttributes> </textView> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="hdk-zR-sUE"> - <rect key="frame" x="16" y="88.5" width="45" height="20"/> + <rect key="frame" x="16" y="88.5" width="45" height="20.5"/> <constraints> <constraint firstAttribute="height" priority="750" constant="20" id="HMg-Nx-kYJ"/> </constraints> <fontDescription key="fontDescription" type="system" pointSize="14"/> <state key="normal" title="...more"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="textColorName" value="linkBlue"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="linkBlueText"/> </userDefinedRuntimeAttributes> <connections> <action selector="onMoreButton:" destination="KGk-i7-Jjw" eventType="touchUpInside" id="FBX-DJ-aPn"/> diff --git a/iphone/Maps/Bridging-Header.h b/iphone/Maps/Bridging-Header.h index 6355b4b1b5..bc809e705e 100644 --- a/iphone/Maps/Bridging-Header.h +++ b/iphone/Maps/Bridging-Header.h @@ -91,3 +91,4 @@ #import "MapsAppDelegate.h" #import "DeepLinkRouteStrategyAdapter.h" #import "MWMMapViewControlsManager.h" +#import "SwizzleStyle.h" diff --git a/iphone/Maps/Classes/Components/DimBackground.swift b/iphone/Maps/Classes/Components/DimBackground.swift index 0ff395cca3..46be7d2fe1 100644 --- a/iphone/Maps/Classes/Components/DimBackground.swift +++ b/iphone/Maps/Classes/Components/DimBackground.swift @@ -7,7 +7,7 @@ final class DimBackground: SolidTouchView { self.mainView = mainView self.tapAction = tapAction super.init(frame: mainView.superview!.bounds) - backgroundColor = UIColor.fadeBackground() + styleName = "FadeBackground" autoresizingMask = [.flexibleWidth, .flexibleHeight] addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(onTap))) } diff --git a/iphone/Maps/Classes/Components/ExpandableReviewView/ExpandableReviewView.swift b/iphone/Maps/Classes/Components/ExpandableReviewView/ExpandableReviewView.swift index 7cedc21a6a..fadb0e9ba0 100644 --- a/iphone/Maps/Classes/Components/ExpandableReviewView/ExpandableReviewView.swift +++ b/iphone/Maps/Classes/Components/ExpandableReviewView/ExpandableReviewView.swift @@ -76,8 +76,8 @@ final class ExpandableReviewView: UIView { self.moreLabel.text = settings.expandText } - override func mwm_refreshUI() { - super.mwm_refreshUI() + override func applyTheme() { + super.applyTheme() settings.textColor = settings.textColor.opposite() settings.expandTextColor = settings.expandTextColor.opposite() } diff --git a/iphone/Maps/Classes/Components/MWMAddPlaceNavigationBar.mm b/iphone/Maps/Classes/Components/MWMAddPlaceNavigationBar.mm index 3deea9f061..f5c23eba82 100644 --- a/iphone/Maps/Classes/Components/MWMAddPlaceNavigationBar.mm +++ b/iphone/Maps/Classes/Components/MWMAddPlaceNavigationBar.mm @@ -6,6 +6,7 @@ @property(copy, nonatomic) MWMVoidBlock doneBlock; @property(copy, nonatomic) MWMVoidBlock cancelBlock; +@property(assign, nonatomic) NSLayoutConstraint* topConstraint; @end @@ -23,10 +24,14 @@ navBar.width = superview.width; navBar.doneBlock = done; navBar.cancelBlock = cancel; - navBar.autoresizingMask = UIViewAutoresizingFlexibleWidth; - [navBar setNeedsLayout]; - navBar.origin = {0., -navBar.height}; + navBar.translatesAutoresizingMaskIntoConstraints = false; + [superview addSubview:navBar]; + navBar.topConstraint = [navBar.topAnchor constraintEqualToAnchor:superview.topAnchor]; + navBar.topConstraint.active = true; + navBar.topConstraint.constant = -navBar.height; + [navBar.trailingAnchor constraintEqualToAnchor:superview.trailingAnchor].active = true; + [navBar.leadingAnchor constraintEqualToAnchor:superview.leadingAnchor].active = true; [navBar show:isBusiness applyPosition:applyPosition position:position]; } @@ -38,7 +43,7 @@ [UIView animateWithDuration:kDefaultAnimationDuration animations:^ { - self.transform = CGAffineTransformMakeTranslation(0., self.height); + self.topConstraint.constant = 0; }]; } @@ -50,7 +55,7 @@ [UIView animateWithDuration:kDefaultAnimationDuration animations:^ { - self.transform = CGAffineTransformMakeTranslation(0., -self.height); + self.topConstraint.constant = -self.height; } completion:^(BOOL finished) { @@ -69,11 +74,4 @@ [self dismissWithBlock:self.cancelBlock]; } -- (void)layoutSubviews -{ - if (self.superview) - self.width = self.superview.width; - [super layoutSubviews]; -} - @end diff --git a/iphone/Maps/Classes/Components/MWMAddPlaceNavigationBar.xib b/iphone/Maps/Classes/Components/MWMAddPlaceNavigationBar.xib index a2f9dcba50..cc0ec936a4 100644 --- a/iphone/Maps/Classes/Components/MWMAddPlaceNavigationBar.xib +++ b/iphone/Maps/Classes/Components/MWMAddPlaceNavigationBar.xib @@ -1,36 +1,38 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> - <device id="retina4_7" orientation="portrait"> - <adaptation id="fullscreen"/> - </device> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> + <device id="retina4_7" orientation="portrait" appearance="light"/> <dependencies> <deployment identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/> - <capability name="Constraints to layout margins" minToolsVersion="6.0"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/> <capability name="Safe area layout guides" minToolsVersion="9.0"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> <objects> <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/> <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/> - <view contentMode="scaleToFill" id="BJ6-My-yAy" customClass="MWMAddPlaceNavigationBar" propertyAccessControl="all"> - <rect key="frame" x="0.0" y="0.0" width="320" height="120"/> + <view contentMode="scaleToFill" id="BJ6-My-yAy" customClass="MWMAddPlaceNavigationBar" propertyAccessControl="none"> + <rect key="frame" x="0.0" y="0.0" width="320" height="100"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <subviews> + <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="IhK-ce-TXk"> + <rect key="frame" x="0.0" y="0.0" width="320" height="44"/> + <color key="backgroundColor" red="0.1176470588" green="0.58823529409999997" blue="0.31372549020000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> + <userDefinedRuntimeAttributes> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="PrimaryBackground"/> + </userDefinedRuntimeAttributes> + </view> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ZKD-Be-eMp"> - <rect key="frame" x="0.0" y="0.0" width="320" height="64"/> + <rect key="frame" x="0.0" y="0.0" width="320" height="44"/> <subviews> <button opaque="NO" contentMode="scaleToFill" horizontalCompressionResistancePriority="1000" contentHorizontalAlignment="right" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="zs9-MX-bIe"> - <rect key="frame" x="258" y="32" width="54" height="19"/> + <rect key="frame" x="258" y="12" width="54" height="19"/> <constraints> <constraint firstAttribute="height" constant="19" id="psK-YU-lUF"/> </constraints> <fontDescription key="fontDescription" type="system" pointSize="17"/> <state key="normal" title="Готово"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular17"/> - <userDefinedRuntimeAttribute type="string" keyPath="textColorName" value="whitePrimaryText"/> - <userDefinedRuntimeAttribute type="string" keyPath="textColorHighlightedName" value="whitePrimaryTextHighlighted"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="NavigationButton"/> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="done"/> </userDefinedRuntimeAttributes> <connections> @@ -38,7 +40,7 @@ </connections> </button> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="1000" text="Местоположение" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="8So-22-JS1"> - <rect key="frame" x="89.5" y="32" width="141" height="20"/> + <rect key="frame" x="89.5" y="12" width="141" height="20"/> <constraints> <constraint firstAttribute="height" constant="20" id="JFT-iW-rJY"/> <constraint firstAttribute="height" constant="20" id="mun-d1-wdT"/> @@ -47,22 +49,19 @@ <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <nil key="highlightedColor"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="whitePrimaryText"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular17"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="NavigationButton"/> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="editor_add_select_location"/> </userDefinedRuntimeAttributes> </label> <button opaque="NO" contentMode="scaleToFill" horizontalCompressionResistancePriority="1000" contentHorizontalAlignment="left" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="boX-sU-7DW"> - <rect key="frame" x="8" y="32" width="62" height="19"/> + <rect key="frame" x="8" y="12" width="62" height="19"/> <constraints> <constraint firstAttribute="height" constant="19" id="KDz-RG-UH2"/> </constraints> <fontDescription key="fontDescription" type="system" pointSize="17"/> <state key="normal" title="Отмена"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular17"/> - <userDefinedRuntimeAttribute type="string" keyPath="textColorName" value="whitePrimaryText"/> - <userDefinedRuntimeAttribute type="string" keyPath="textColorHighlightedName" value="whitePrimaryTextHighlighted"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="NavigationButton"/> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="cancel"/> </userDefinedRuntimeAttributes> <connections> @@ -72,20 +71,20 @@ </subviews> <color key="backgroundColor" red="0.1176470588" green="0.58823529409999997" blue="0.31372549020000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <constraints> - <constraint firstAttribute="height" constant="64" id="5VI-KR-aXh"/> - <constraint firstItem="zs9-MX-bIe" firstAttribute="top" secondItem="ZKD-Be-eMp" secondAttribute="top" constant="32" id="BNr-Gr-o3j"/> - <constraint firstItem="8So-22-JS1" firstAttribute="top" secondItem="ZKD-Be-eMp" secondAttribute="top" constant="32" id="CCm-fM-FcD"/> - <constraint firstItem="boX-sU-7DW" firstAttribute="top" secondItem="ZKD-Be-eMp" secondAttribute="top" constant="32" id="Ofu-8n-bBo"/> + <constraint firstAttribute="height" constant="44" id="5VI-KR-aXh"/> + <constraint firstItem="zs9-MX-bIe" firstAttribute="top" secondItem="ZKD-Be-eMp" secondAttribute="top" constant="12" id="BNr-Gr-o3j"/> + <constraint firstItem="8So-22-JS1" firstAttribute="top" secondItem="ZKD-Be-eMp" secondAttribute="top" constant="12" id="CCm-fM-FcD"/> + <constraint firstItem="boX-sU-7DW" firstAttribute="top" secondItem="ZKD-Be-eMp" secondAttribute="top" constant="12" id="Ofu-8n-bBo"/> <constraint firstItem="boX-sU-7DW" firstAttribute="leading" secondItem="ZKD-Be-eMp" secondAttribute="leading" constant="8" id="Sbg-dn-iro"/> <constraint firstAttribute="trailing" secondItem="zs9-MX-bIe" secondAttribute="trailing" constant="8" id="jiJ-gk-0bx"/> <constraint firstItem="8So-22-JS1" firstAttribute="centerX" secondItem="ZKD-Be-eMp" secondAttribute="centerX" id="m6T-st-PPz"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="primary"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="PrimaryBackground"/> </userDefinedRuntimeAttributes> </view> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="UsM-Al-MCC"> - <rect key="frame" x="0.0" y="64" width="320" height="56"/> + <rect key="frame" x="0.0" y="44" width="320" height="56"/> <subviews> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Потяните карту, чтобы выбрать правильное местоположение места. " lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="R6E-kO-6Lb"> <rect key="frame" x="14" y="16" width="292" height="30"/> @@ -93,8 +92,7 @@ <color key="textColor" cocoaTouchSystemColor="darkTextColor"/> <nil key="highlightedColor"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular12"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackSecondaryText"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular12:blackSecondaryText"/> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="editor_focus_map_on_location"/> </userDefinedRuntimeAttributes> </label> @@ -108,23 +106,27 @@ <constraint firstAttribute="bottomMargin" secondItem="R6E-kO-6Lb" secondAttribute="bottom" constant="2" id="e1g-Jr-sY9"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="menuBackground"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="MenuBackground"/> </userDefinedRuntimeAttributes> </view> </subviews> <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/> <constraints> + <constraint firstAttribute="top" secondItem="IhK-ce-TXk" secondAttribute="top" id="B9q-oF-68E"/> <constraint firstItem="UsM-Al-MCC" firstAttribute="leading" secondItem="BJ6-My-yAy" secondAttribute="leading" id="C3j-SM-MSO"/> <constraint firstItem="ZKD-Be-eMp" firstAttribute="leading" secondItem="BJ6-My-yAy" secondAttribute="leading" id="Ckp-sr-B7c"/> - <constraint firstItem="ZKD-Be-eMp" firstAttribute="top" secondItem="BJ6-My-yAy" secondAttribute="top" id="Drs-L4-75n"/> + <constraint firstItem="ZKD-Be-eMp" firstAttribute="top" secondItem="tvs-e8-vSU" secondAttribute="top" id="Drs-L4-75n"/> + <constraint firstItem="IhK-ce-TXk" firstAttribute="leading" secondItem="tvs-e8-vSU" secondAttribute="leading" id="E1h-R5-QaY"/> <constraint firstAttribute="bottom" secondItem="UsM-Al-MCC" secondAttribute="bottom" id="Eii-Wt-WAj"/> + <constraint firstItem="tvs-e8-vSU" firstAttribute="trailing" secondItem="IhK-ce-TXk" secondAttribute="trailing" id="FcR-B0-Kwb"/> <constraint firstAttribute="trailing" secondItem="UsM-Al-MCC" secondAttribute="trailing" id="FrY-zu-zwd"/> + <constraint firstItem="UsM-Al-MCC" firstAttribute="top" secondItem="IhK-ce-TXk" secondAttribute="bottom" id="Tfo-lj-gPb"/> <constraint firstAttribute="trailing" secondItem="ZKD-Be-eMp" secondAttribute="trailing" id="Yrh-qN-0sk"/> - <constraint firstItem="UsM-Al-MCC" firstAttribute="top" secondItem="ZKD-Be-eMp" secondAttribute="bottom" id="uo0-z1-7ix"/> + <constraint firstItem="IhK-ce-TXk" firstAttribute="bottom" secondItem="ZKD-Be-eMp" secondAttribute="bottom" id="fae-mk-c1a"/> </constraints> <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/> <viewLayoutGuide key="safeArea" id="tvs-e8-vSU"/> - <point key="canvasLocation" x="319" y="296"/> + <point key="canvasLocation" x="321.60000000000002" y="248.27586206896552"/> </view> </objects> </document> diff --git a/iphone/Maps/Classes/Components/MWMButton.m b/iphone/Maps/Classes/Components/MWMButton.m index 5b7a0354c5..f782c0b7db 100644 --- a/iphone/Maps/Classes/Components/MWMButton.m +++ b/iphone/Maps/Classes/Components/MWMButton.m @@ -1,5 +1,5 @@ #import "MWMButton.h" - +#import "SwiftBridge.h" static NSString * const kDefaultPattern = @"%@_%@"; static NSString * const kHighlightedPattern = @"%@_highlighted_%@"; static NSString * const kSelectedPattern = @"%@_selected_%@"; @@ -12,10 +12,10 @@ static NSString * const kSelectedPattern = @"%@_selected_%@"; [self setDefaultImages]; } -- (void)mwm_refreshUI +- (void)applyTheme { [self changeColoringToOpposite]; - [super mwm_refreshUI]; + [super applyTheme]; } - (void)setColoring:(MWMButtonColoring)coloring diff --git a/iphone/Maps/Classes/Components/MWMCollectionViewController.m b/iphone/Maps/Classes/Components/MWMCollectionViewController.m index b8f9636bf0..918952a62a 100644 --- a/iphone/Maps/Classes/Components/MWMCollectionViewController.m +++ b/iphone/Maps/Classes/Components/MWMCollectionViewController.m @@ -2,6 +2,7 @@ #import "3party/Alohalytics/src/alohalytics_objc.h" #import "MWMAlertViewController.h" #import "MapViewController.h" +#import "SwiftBridge.h" @interface MWMCollectionViewController () @@ -12,22 +13,11 @@ @implementation MWMCollectionViewController - (BOOL)prefersStatusBarHidden { return NO; } -- (void)mwm_refreshUI -{ - [self.navigationController.navigationBar mwm_refreshUI]; - MapViewController * mapViewController = [MapViewController sharedController]; - for (UIViewController * vc in self.navigationController.viewControllers.reverseObjectEnumerator) - { - if (![vc isEqual:mapViewController]) - [vc.view mwm_refreshUI]; - } - [mapViewController mwm_refreshUI]; -} - (void)viewDidLoad { [super viewDidLoad]; - self.collectionView.backgroundColor = [UIColor pressBackground]; + self.collectionView.styleName = @"PressBackground"; [self.navigationController.navigationBar setTranslucent:NO]; } diff --git a/iphone/Maps/Classes/Components/MWMController.h b/iphone/Maps/Classes/Components/MWMController.h index aed06f2547..f2a45cfb05 100644 --- a/iphone/Maps/Classes/Components/MWMController.h +++ b/iphone/Maps/Classes/Components/MWMController.h @@ -6,6 +6,4 @@ @property (nonatomic, readonly) MWMAlertViewController * alertController; -- (void)mwm_refreshUI; - @end diff --git a/iphone/Maps/Classes/Components/MWMDropDown.xib b/iphone/Maps/Classes/Components/MWMDropDown.xib index a663e27154..6ae59bef78 100644 --- a/iphone/Maps/Classes/Components/MWMDropDown.xib +++ b/iphone/Maps/Classes/Components/MWMDropDown.xib @@ -1,11 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> - <device id="retina4_7" orientation="portrait"> - <adaptation id="fullscreen"/> - </device> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> + <device id="retina4_7" orientation="portrait" appearance="light"/> <dependencies> <deployment identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/> <capability name="Safe area layout guides" minToolsVersion="9.0"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> @@ -16,7 +14,7 @@ </connections> </placeholder> <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/> - <view contentMode="scaleToFill" id="iN0-l3-epB" customClass="_MWMDropDownView" propertyAccessControl="all"> + <view contentMode="scaleToFill" id="iN0-l3-epB" customClass="_MWMDropDownView" propertyAccessControl="none"> <rect key="frame" x="0.0" y="0.0" width="320" height="48"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> @@ -27,7 +25,7 @@ <color key="textColor" red="1" green="1" blue="1" alpha="0.69999999999999996" colorSpace="custom" customColorSpace="sRGB"/> <nil key="highlightedColor"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular17"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular17"/> </userDefinedRuntimeAttributes> </label> </subviews> diff --git a/iphone/Maps/Classes/Components/MWMNavigationController.m b/iphone/Maps/Classes/Components/MWMNavigationController.m index 79c82f3fb9..e630a1b88d 100644 --- a/iphone/Maps/Classes/Components/MWMNavigationController.m +++ b/iphone/Maps/Classes/Components/MWMNavigationController.m @@ -1,5 +1,6 @@ #import "MWMNavigationController.h" #import "MWMController.h" +#import "SwiftBridge.h" #import <SafariServices/SafariServices.h> @@ -20,6 +21,10 @@ self.delegate = self; self.navigationItem.leftBarButtonItem.tintColor = [UIColor whitePrimaryText]; self.navigationItem.rightBarButtonItem.tintColor = [UIColor whitePrimaryText]; + + if (@available(iOS 13.0, *)) { + [MWMThemeManager setDarkModeEnabled: self.traitCollection.userInterfaceStyle == UIUserInterfaceStyleDark]; + } } - (void)navigationController:(UINavigationController *)navigationController @@ -60,6 +65,16 @@ [super setViewControllers:viewControllers animated:animated]; } +- (void)traitCollectionDidChange:(UITraitCollection *)previousTraitCollection +{ + [super traitCollectionDidChange: previousTraitCollection]; + if (@available(iOS 13.0, *)) { + if (self.traitCollection.userInterfaceStyle != previousTraitCollection.userInterfaceStyle) { + [MWMThemeManager setDarkModeEnabled: self.traitCollection.userInterfaceStyle == UIUserInterfaceStyleDark]; + } + } +} + - (BOOL)shouldAutorotate { return YES; diff --git a/iphone/Maps/Classes/Components/MWMStartButton.m b/iphone/Maps/Classes/Components/MWMStartButton.m index 1c921e44c9..428a9a9b14 100644 --- a/iphone/Maps/Classes/Components/MWMStartButton.m +++ b/iphone/Maps/Classes/Components/MWMStartButton.m @@ -2,11 +2,4 @@ @implementation MWMStartButton -- (void)mwm_refreshUI -{ - [super mwm_refreshUI]; - [self setBackgroundImage:[UIImage imageWithColor:[UIColor linkBlue]] forState:UIControlStateNormal]; - [self setBackgroundImage:[UIImage imageWithColor:[UIColor linkBlueHighlighted]] forState:UIControlStateHighlighted]; -} - @end diff --git a/iphone/Maps/Classes/Components/MWMStopButton.m b/iphone/Maps/Classes/Components/MWMStopButton.m index 5c0b1fb43d..6ebb0ed6dd 100644 --- a/iphone/Maps/Classes/Components/MWMStopButton.m +++ b/iphone/Maps/Classes/Components/MWMStopButton.m @@ -1,14 +1,5 @@ #import "MWMStopButton.h" - +#import "SwiftBridge.h" @implementation MWMStopButton -- (void)mwm_refreshUI -{ - [super mwm_refreshUI]; - [self setBackgroundImage:[UIImage imageWithColor:[UIColor buttonRed]] - forState:UIControlStateNormal]; - [self setBackgroundImage:[UIImage imageWithColor:[UIColor buttonRedHighlighted]] - forState:UIControlStateHighlighted]; -} - @end diff --git a/iphone/Maps/Classes/Components/MWMTableViewController.m b/iphone/Maps/Classes/Components/MWMTableViewController.m index 4e075410aa..5ef357b03a 100644 --- a/iphone/Maps/Classes/Components/MWMTableViewController.m +++ b/iphone/Maps/Classes/Components/MWMTableViewController.m @@ -3,6 +3,7 @@ #import "MWMAlertViewController.h" #import "MWMTableViewCell.h" #import "MWMTableViewController.h" +#import "SwiftBridge.h" #import "3party/Alohalytics/src/alohalytics_objc.h" @@ -19,25 +20,12 @@ return NO; } -- (void)mwm_refreshUI -{ - [self.navigationController.navigationBar mwm_refreshUI]; - MapViewController * mapViewController = [MapViewController sharedController]; - for (UIViewController * vc in self.navigationController.viewControllers.reverseObjectEnumerator) - { - if (![vc isEqual:mapViewController]) - [vc.view mwm_refreshUI]; - } - [mapViewController mwm_refreshUI]; -} - - (void)viewDidLoad { [super viewDidLoad]; if (@available(iOS 11.0, *)) self.tableView.insetsContentViewsToSafeArea = YES; - self.tableView.backgroundColor = [UIColor pressBackground]; - self.tableView.separatorColor = [UIColor blackDividers]; + self.tableView.styleName = @"TableView:PressBackground"; [self.navigationController.navigationBar setTranslucent:NO]; [self.tableView registerClass:[MWMTableViewCell class] forCellReuseIdentifier:[UITableViewCell className]]; diff --git a/iphone/Maps/Classes/Components/MWMViewController.m b/iphone/Maps/Classes/Components/MWMViewController.m index 56c22db117..d423cd264f 100644 --- a/iphone/Maps/Classes/Components/MWMViewController.m +++ b/iphone/Maps/Classes/Components/MWMViewController.m @@ -28,14 +28,6 @@ return NO; } -- (void)mwm_refreshUI -{ - [self.navigationController.navigationBar mwm_refreshUI]; - [self.view mwm_refreshUI]; - if (![self isKindOfClass:[MapViewController class]]) - [[MapViewController sharedController] mwm_refreshUI]; -} - - (void)viewDidLoad { [super viewDidLoad]; diff --git a/iphone/Maps/Classes/Components/Modal/DimmedModalPresentationController.swift b/iphone/Maps/Classes/Components/Modal/DimmedModalPresentationController.swift index b2c68b6af8..e2f55cb13d 100644 --- a/iphone/Maps/Classes/Components/Modal/DimmedModalPresentationController.swift +++ b/iphone/Maps/Classes/Components/Modal/DimmedModalPresentationController.swift @@ -5,7 +5,7 @@ class DimmedModalPresentationController: UIPresentationController { private lazy var dimView: UIView = { let view = UIView() - view.backgroundColor = UIColor.blackStatusBarBackground() + view.styleName = "BlackStatusBarBackground" if isCancellable { view.addGestureRecognizer(onTapGr) } diff --git a/iphone/Maps/Classes/Components/RatingView/RatingView.swift b/iphone/Maps/Classes/Components/RatingView/RatingView.swift index 07046e000a..ab3fc4ffaa 100644 --- a/iphone/Maps/Classes/Components/RatingView/RatingView.swift +++ b/iphone/Maps/Classes/Components/RatingView/RatingView.swift @@ -330,8 +330,8 @@ import UIKit return viewSize } - override func mwm_refreshUI() { - super.mwm_refreshUI() + override func applyTheme() { + super.applyTheme() leftTextColor = leftTextColor.opposite() rightTextColor = rightTextColor.opposite() topTextColor = topTextColor.opposite() diff --git a/iphone/Maps/Classes/CustomAlert/CreateBookmarkCategory/BCCreateCategoryAlert.swift b/iphone/Maps/Classes/CustomAlert/CreateBookmarkCategory/BCCreateCategoryAlert.swift index f90d996153..fdaa4a8c6c 100644 --- a/iphone/Maps/Classes/CustomAlert/CreateBookmarkCategory/BCCreateCategoryAlert.swift +++ b/iphone/Maps/Classes/CustomAlert/CreateBookmarkCategory/BCCreateCategoryAlert.swift @@ -13,11 +13,7 @@ final class BCCreateCategoryAlert: MWMAlert { @IBOutlet private weak var centerHorizontaly: NSLayoutConstraint! @IBOutlet private weak var errorLabel: UILabel! @IBOutlet private weak var charactersCountLabel: UILabel! - @IBOutlet private weak var rightButton: UIButton! { - didSet { - rightButton.setTitleColor(UIColor.blackHintText(), for: .disabled) - } - } + @IBOutlet private weak var rightButton: UIButton! private var maxCharactersNum: UInt? private var minCharactersNum: UInt? diff --git a/iphone/Maps/Classes/CustomAlert/CreateBookmarkCategory/MWMBCCreateCategoryAlert.xib b/iphone/Maps/Classes/CustomAlert/CreateBookmarkCategory/MWMBCCreateCategoryAlert.xib index 0d7eec1f0e..9b769a375f 100644 --- a/iphone/Maps/Classes/CustomAlert/CreateBookmarkCategory/MWMBCCreateCategoryAlert.xib +++ b/iphone/Maps/Classes/CustomAlert/CreateBookmarkCategory/MWMBCCreateCategoryAlert.xib @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14868" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15705" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> <device id="retina4_7" orientation="portrait" appearance="light"/> <dependencies> <deployment identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14824"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15706"/> <capability name="Safe area layout guides" minToolsVersion="9.0"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> @@ -27,8 +27,7 @@ <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="medium18"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="medium18:blackPrimaryText"/> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="bookmarks_create_new_group"/> </userDefinedRuntimeAttributes> </label> @@ -45,10 +44,9 @@ <fontDescription key="fontDescription" type="system" pointSize="14"/> <textInputTraits key="textInputTraits" autocapitalizationType="sentences" autocorrectionType="no" returnKeyType="done" textContentType="name"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular14"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular14:blackPrimaryText"/> <userDefinedRuntimeAttribute type="string" keyPath="localizedPlaceholder" value="bookmark_set_name"/> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Background"/> </userDefinedRuntimeAttributes> <connections> <action selector="editingChangedWithSender:" destination="QQB-Ml-wwB" eventType="editingChanged" id="Rab-rj-UaD"/> @@ -65,13 +63,7 @@ <constraint firstItem="xlp-ke-FxI" firstAttribute="height" secondItem="otE-Ct-TPM" secondAttribute="height" id="tj3-TS-dmp"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="color" keyPath="layer.borderUIColor"> - <color key="value" red="0.0" green="0.0" blue="0.0" alpha="0.12" colorSpace="custom" customColorSpace="sRGB"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="number" keyPath="layer.borderWidth"> - <real key="value" value="0.5"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="AlertViewTextField"/> </userDefinedRuntimeAttributes> </view> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="uxx-Di-f1Q" userLabel="hDivider"> @@ -81,7 +73,7 @@ <constraint firstAttribute="height" constant="1" id="9Ur-cw-cWk"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="blackDividers"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Divider"/> </userDefinedRuntimeAttributes> </view> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Wxi-5V-caq" userLabel="left"> @@ -98,8 +90,7 @@ <state key="highlighted" backgroundImage="dialog_btn_press"/> <userDefinedRuntimeAttributes> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="cancel"/> - <userDefinedRuntimeAttribute type="string" keyPath="textColorName" value="linkBlue"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="medium17"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="medium17:linkBlueText"/> </userDefinedRuntimeAttributes> <connections> <action selector="leftButtonTap" destination="QQB-Ml-wwB" eventType="touchUpInside" id="q1X-dI-dSs"/> @@ -118,8 +109,7 @@ <state key="highlighted" backgroundImage="dialog_btn_press"/> <userDefinedRuntimeAttributes> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="create"/> - <userDefinedRuntimeAttribute type="string" keyPath="textColorName" value="linkBlue"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="medium17"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="medium17:blackHintText"/> </userDefinedRuntimeAttributes> <connections> <action selector="rightButtonTap" destination="QQB-Ml-wwB" eventType="touchUpInside" id="HT2-dB-W2f"/> @@ -133,7 +123,7 @@ <constraint firstAttribute="height" constant="44" id="eaZ-L1-nnD"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="blackDividers"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Divider"/> </userDefinedRuntimeAttributes> </view> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="This name is too long" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dX9-2y-ZEd" userLabel="Error label"> @@ -146,8 +136,7 @@ <nil key="textColor"/> <nil key="highlightedColor"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular11"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="buttonRed"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular11:buttonRedText"/> </userDefinedRuntimeAttributes> </label> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="750" verticalHuggingPriority="251" text="69 / 60" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="WKj-KX-xnU" userLabel="Count label"> @@ -159,8 +148,7 @@ <nil key="textColor"/> <nil key="highlightedColor"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular11"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="buttonRed"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular11:buttonRedText"/> </userDefinedRuntimeAttributes> </label> </subviews> @@ -187,22 +175,7 @@ <constraint firstItem="WKj-KX-xnU" firstAttribute="top" secondItem="otE-Ct-TPM" secondAttribute="bottom" constant="6" id="zK8-7y-xuI"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="size" keyPath="layer.shadowOffset"> - <size key="value" width="0.0" height="3"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="color" keyPath="layer.shadowUIColor"> - <color key="value" red="0.0" green="0.0" blue="0.0" alpha="0.22" colorSpace="custom" customColorSpace="sRGB"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="number" keyPath="layer.shadowRadius"> - <integer key="value" value="6"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius"> - <integer key="value" value="12"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="number" keyPath="layer.shadowOpacity"> - <integer key="value" value="1"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="alertBackground"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="AlertView"/> </userDefinedRuntimeAttributes> </view> </subviews> diff --git a/iphone/Maps/Classes/CustomAlert/DefaultAlert/MWMDefaultAlert.xib b/iphone/Maps/Classes/CustomAlert/DefaultAlert/MWMDefaultAlert.xib index 6d1cef92a5..aa5606a90a 100644 --- a/iphone/Maps/Classes/CustomAlert/DefaultAlert/MWMDefaultAlert.xib +++ b/iphone/Maps/Classes/CustomAlert/DefaultAlert/MWMDefaultAlert.xib @@ -1,32 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> - <device id="retina4_7" orientation="portrait"> - <adaptation id="fullscreen"/> - </device> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> + <device id="retina4_7" orientation="portrait" appearance="light"/> <dependencies> <deployment identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/> <capability name="Safe area layout guides" minToolsVersion="9.0"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> - <customFonts key="customFonts"> - <array key="HelveticaNeue.ttc"> - <string>HelveticaNeue</string> - <string>HelveticaNeue-Medium</string> - </array> - </customFonts> <objects> <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/> <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/> - <view contentMode="scaleToFill" id="iN0-l3-epB" customClass="MWMDefaultAlert" propertyAccessControl="all"> + <view contentMode="scaleToFill" id="iN0-l3-epB" customClass="MWMDefaultAlert" propertyAccessControl="none"> <rect key="frame" x="0.0" y="0.0" width="375" height="667"/> <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/> <subviews> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="zso-DD-6SG" userLabel="ContainerView"> - <rect key="frame" x="47.5" y="264" width="280" height="139"/> + <rect key="frame" x="47.5" y="264.5" width="280" height="138.5"/> <subviews> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Title" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Grl-z5-2cE" userLabel="Title"> - <rect key="frame" x="20" y="20" width="240" height="22"/> + <rect key="frame" x="20" y="20" width="240" height="21.5"/> <constraints> <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="20" id="0SG-Lk-wkv"/> <constraint firstAttribute="width" constant="240" id="9rm-Av-9eY"/> @@ -35,12 +27,11 @@ <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="medium18"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="medium18:blackPrimaryText"/> </userDefinedRuntimeAttributes> </label> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Message" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="0D6-oV-Lio" userLabel="Message"> - <rect key="frame" x="20" y="54" width="240" height="20"/> + <rect key="frame" x="20" y="53.5" width="240" height="20"/> <constraints> <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="20" id="dG8-qs-ZWQ"/> <constraint firstAttribute="width" constant="240" id="wbf-hD-V6a"/> @@ -49,22 +40,21 @@ <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="regular14"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular14:blackSecondaryText"/> </userDefinedRuntimeAttributes> </label> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="f8D-qe-39W" userLabel="hDivider"> - <rect key="frame" x="0.0" y="94" width="280" height="1"/> + <rect key="frame" x="0.0" y="93.5" width="280" height="1"/> <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.12" colorSpace="custom" customColorSpace="sRGB"/> <constraints> <constraint firstAttribute="height" constant="1" id="HTM-C2-dMq"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="blackDividers"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Divider"/> </userDefinedRuntimeAttributes> </view> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="jAg-cp-4Ms" userLabel="left"> - <rect key="frame" x="0.0" y="95" width="140" height="44"/> + <rect key="frame" x="0.0" y="94.5" width="140" height="44"/> <accessibility key="accessibilityConfiguration" identifier="cancelButton"/> <constraints> <constraint firstAttribute="width" constant="140" id="4bW-b0-naB"/> @@ -78,8 +68,7 @@ <state key="highlighted" backgroundImage="dialog_btn_press"/> <userDefinedRuntimeAttributes> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="ok"/> - <userDefinedRuntimeAttribute type="string" keyPath="textColorName" value="linkBlue"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="medium17"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="medium17:linkBlueText"/> </userDefinedRuntimeAttributes> <connections> <action selector="leftButtonTap" destination="iN0-l3-epB" eventType="touchUpInside" id="xE7-aE-OzM"/> @@ -93,11 +82,11 @@ <constraint firstAttribute="width" constant="1" id="ORs-aP-K10"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="blackDividers"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Divider"/> </userDefinedRuntimeAttributes> </view> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="RSB-i6-pEP" userLabel="right"> - <rect key="frame" x="140" y="95" width="140" height="44"/> + <rect key="frame" x="140" y="94.5" width="140" height="44"/> <accessibility key="accessibilityConfiguration" identifier="OKButton"/> <constraints> <constraint firstAttribute="width" constant="140" id="C3i-gd-pxv"/> @@ -111,8 +100,7 @@ <state key="highlighted" backgroundImage="dialog_btn_press"/> <userDefinedRuntimeAttributes> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="ok"/> - <userDefinedRuntimeAttribute type="string" keyPath="textColorName" value="linkBlue"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="medium17"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="medium17:linkBlueText"/> </userDefinedRuntimeAttributes> <connections> <action selector="rightButtonTap" destination="iN0-l3-epB" eventType="touchUpInside" id="UO8-7c-q1i"/> @@ -139,22 +127,7 @@ <constraint firstAttribute="centerX" secondItem="Grl-z5-2cE" secondAttribute="centerX" id="zap-Oc-W3i"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="size" keyPath="layer.shadowOffset"> - <size key="value" width="0.0" height="3"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="color" keyPath="layer.shadowUIColor"> - <color key="value" red="0.0" green="0.0" blue="0.0" alpha="0.22" colorSpace="custom" customColorSpace="sRGB"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="number" keyPath="layer.shadowRadius"> - <integer key="value" value="6"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius"> - <integer key="value" value="12"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="number" keyPath="layer.shadowOpacity"> - <integer key="value" value="1"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="alertBackground"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="AlertView"/> </userDefinedRuntimeAttributes> </view> </subviews> diff --git a/iphone/Maps/Classes/CustomAlert/DownloadTransitMapsAlert/MWMDownloadTransitMapAlert.mm b/iphone/Maps/Classes/CustomAlert/DownloadTransitMapsAlert/MWMDownloadTransitMapAlert.mm index 8017051bd9..bdb20222c7 100644 --- a/iphone/Maps/Classes/CustomAlert/DownloadTransitMapsAlert/MWMDownloadTransitMapAlert.mm +++ b/iphone/Maps/Classes/CustomAlert/DownloadTransitMapsAlert/MWMDownloadTransitMapAlert.mm @@ -321,7 +321,7 @@ CGFloat const kAnimationDuration = .05; - (UIView *)tableView:(UITableView *)tableView viewForFooterInSection:(NSInteger)section { UIView * view = [[UIView alloc] init]; - view.backgroundColor = UIColor.blackOpaque; + view.styleName = @"BlackOpaqueBackground"; return view; } diff --git a/iphone/Maps/Classes/CustomAlert/DownloadTransitMapsAlert/MWMDownloadTransitMapAlert.xib b/iphone/Maps/Classes/CustomAlert/DownloadTransitMapsAlert/MWMDownloadTransitMapAlert.xib index b6832674aa..82adef76eb 100644 --- a/iphone/Maps/Classes/CustomAlert/DownloadTransitMapsAlert/MWMDownloadTransitMapAlert.xib +++ b/iphone/Maps/Classes/CustomAlert/DownloadTransitMapsAlert/MWMDownloadTransitMapAlert.xib @@ -1,24 +1,16 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> - <device id="retina4_7" orientation="portrait"> - <adaptation id="fullscreen"/> - </device> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> + <device id="retina4_7" orientation="portrait" appearance="light"/> <dependencies> <deployment identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/> <capability name="Safe area layout guides" minToolsVersion="9.0"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> - <customFonts key="customFonts"> - <array key="HelveticaNeue.ttc"> - <string>HelveticaNeue</string> - <string>HelveticaNeue-Medium</string> - </array> - </customFonts> <objects> <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/> <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/> - <view contentMode="scaleToFill" id="jqI-GQ-yDh" customClass="MWMDownloadTransitMapAlert" propertyAccessControl="all"> + <view contentMode="scaleToFill" id="jqI-GQ-yDh" customClass="MWMDownloadTransitMapAlert" propertyAccessControl="none"> <rect key="frame" x="0.0" y="0.0" width="375" height="667"/> <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/> <subviews> @@ -37,8 +29,7 @@ <size key="shadowOffset" width="0.0" height="0.0"/> <userDefinedRuntimeAttributes> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="routing_download_maps_along"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="medium18"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="medium18:blackPrimaryText"/> </userDefinedRuntimeAttributes> </label> <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="bco-zh-ekL"> @@ -60,8 +51,7 @@ <nil key="highlightedColor"/> <userDefinedRuntimeAttributes> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="routing_requires_all_map"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackSecondaryText"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular14"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular14:blackSecondaryText"/> </userDefinedRuntimeAttributes> </label> <tableView clipsSubviews="YES" contentMode="scaleToFill" verticalHuggingPriority="1000" alwaysBounceVertical="YES" scrollEnabled="NO" style="grouped" separatorStyle="none" rowHeight="32" sectionHeaderHeight="44" sectionFooterHeight="1" translatesAutoresizingMaskIntoConstraints="NO" id="1lL-cj-2oS"> @@ -86,7 +76,7 @@ <constraint firstAttribute="height" constant="1" id="l1s-jg-dng"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="blackDividers"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Divider"/> </userDefinedRuntimeAttributes> </view> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="q87-qQ-0rn"> @@ -104,8 +94,7 @@ <state key="highlighted" backgroundImage="dialog_btn_press"/> <userDefinedRuntimeAttributes> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="download"/> - <userDefinedRuntimeAttribute type="string" keyPath="textColorName" value="linkBlue"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="medium17"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="medium17:linkBlueText"/> </userDefinedRuntimeAttributes> <connections> <action selector="downloadButtonTap" destination="jqI-GQ-yDh" eventType="touchUpInside" id="wBd-0C-U51"/> @@ -126,8 +115,7 @@ <state key="highlighted" backgroundImage="dialog_btn_press"/> <userDefinedRuntimeAttributes> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="later"/> - <userDefinedRuntimeAttribute type="string" keyPath="textColorName" value="linkBlue"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="medium17"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="medium17:linkBlueText"/> </userDefinedRuntimeAttributes> <connections> <action selector="cancelButtonTap" destination="jqI-GQ-yDh" eventType="touchUpInside" id="xii-qA-4BV"/> @@ -141,7 +129,7 @@ <constraint firstAttribute="height" constant="44" id="vYd-td-NOl"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="blackDividers"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Divider"/> </userDefinedRuntimeAttributes> </view> </subviews> @@ -171,22 +159,7 @@ <constraint firstItem="1lL-cj-2oS" firstAttribute="top" secondItem="Q3X-9G-3PT" secondAttribute="bottom" priority="500" constant="20" id="xQk-cL-cLn"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="size" keyPath="layer.shadowOffset"> - <size key="value" width="0.0" height="3"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="color" keyPath="layer.shadowUIColor"> - <color key="value" red="0.0" green="0.0" blue="0.0" alpha="0.22" colorSpace="custom" customColorSpace="sRGB"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="number" keyPath="layer.shadowRadius"> - <integer key="value" value="6"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius"> - <integer key="value" value="12"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="number" keyPath="layer.shadowOpacity"> - <integer key="value" value="1"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="alertBackground"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="AlertView"/> </userDefinedRuntimeAttributes> </view> </subviews> diff --git a/iphone/Maps/Classes/CustomAlert/DownloadTransitMapsAlert/MWMDownloaderDialogCell.xib b/iphone/Maps/Classes/CustomAlert/DownloadTransitMapsAlert/MWMDownloaderDialogCell.xib index 10c86d2d58..68f535c19c 100644 --- a/iphone/Maps/Classes/CustomAlert/DownloadTransitMapsAlert/MWMDownloaderDialogCell.xib +++ b/iphone/Maps/Classes/CustomAlert/DownloadTransitMapsAlert/MWMDownloaderDialogCell.xib @@ -1,27 +1,20 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> - <device id="retina4_7" orientation="portrait"> - <adaptation id="fullscreen"/> - </device> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> + <device id="retina4_7" orientation="portrait" appearance="light"/> <dependencies> <deployment identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/> <capability name="Safe area layout guides" minToolsVersion="9.0"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> - <customFonts key="customFonts"> - <array key="HelveticaNeue.ttc"> - <string>HelveticaNeue</string> - </array> - </customFonts> <objects> <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/> <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/> - <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="MWMDownloaderDialogCell" rowHeight="33" id="LWd-Zy-XGd" customClass="MWMDownloaderDialogCell" propertyAccessControl="all"> + <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="MWMDownloaderDialogCell" rowHeight="33" id="LWd-Zy-XGd" customClass="MWMDownloaderDialogCell" propertyAccessControl="none"> <rect key="frame" x="0.0" y="0.0" width="280" height="33"/> <autoresizingMask key="autoresizingMask"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="LWd-Zy-XGd" id="gf8-bS-tvq"> - <rect key="frame" x="0.0" y="0.0" width="280" height="32.5"/> + <rect key="frame" x="0.0" y="0.0" width="280" height="33"/> <autoresizingMask key="autoresizingMask"/> <subviews> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="1B4-T1-g4X"> @@ -33,8 +26,7 @@ <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="regular14"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular14:blackSecondaryText"/> </userDefinedRuntimeAttributes> </label> </subviews> @@ -46,13 +38,13 @@ <constraint firstItem="1B4-T1-g4X" firstAttribute="leading" secondItem="gf8-bS-tvq" secondAttribute="leading" constant="20" id="sZo-pt-LJL"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="pressBackground"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="PressBackground"/> </userDefinedRuntimeAttributes> </tableViewCellContentView> <color key="backgroundColor" red="0.90196078431372551" green="0.90196078431372551" blue="0.90196078431372551" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <viewLayoutGuide key="safeArea" id="hHf-it-4Q9"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="pressBackground"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="PressBackground"/> </userDefinedRuntimeAttributes> <connections> <outlet property="titleLabel" destination="1B4-T1-g4X" id="m4n-H9-1Ta"/> diff --git a/iphone/Maps/Classes/CustomAlert/DownloadTransitMapsAlert/MWMDownloaderDialogHeader.xib b/iphone/Maps/Classes/CustomAlert/DownloadTransitMapsAlert/MWMDownloaderDialogHeader.xib index 5de8c0425f..53f8c167b4 100644 --- a/iphone/Maps/Classes/CustomAlert/DownloadTransitMapsAlert/MWMDownloaderDialogHeader.xib +++ b/iphone/Maps/Classes/CustomAlert/DownloadTransitMapsAlert/MWMDownloaderDialogHeader.xib @@ -1,23 +1,16 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> - <device id="retina4_7" orientation="portrait"> - <adaptation id="fullscreen"/> - </device> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> + <device id="retina6_1" orientation="portrait" appearance="light"/> <dependencies> <deployment identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/> <capability name="Safe area layout guides" minToolsVersion="9.0"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> - <customFonts key="customFonts"> - <array key="HelveticaNeue.ttc"> - <string>HelveticaNeue</string> - </array> - </customFonts> <objects> <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/> <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/> - <view contentMode="scaleToFill" id="iN0-l3-epB" customClass="MWMDownloaderDialogHeader" propertyAccessControl="all"> + <view contentMode="scaleToFill" id="iN0-l3-epB" customClass="MWMDownloaderDialogHeader" propertyAccessControl="none"> <rect key="frame" x="0.0" y="0.0" width="280" height="44"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> @@ -31,8 +24,7 @@ <color key="textColor" red="0.0977349653840065" green="0.0977320596575737" blue="0.09773370623588562" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <nil key="highlightedColor"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular14"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular14:blackPrimaryText"/> </userDefinedRuntimeAttributes> </label> <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="ic_arrow_gray_down" translatesAutoresizingMaskIntoConstraints="NO" id="eqn-NQ-zOk"> @@ -42,7 +34,7 @@ <constraint firstAttribute="height" constant="28" id="mLX-ow-5er"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="coloring" value="MWMGray"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="MWMGray"/> </userDefinedRuntimeAttributes> </imageView> <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="tqG-fM-g6J"> @@ -52,7 +44,7 @@ <constraint firstAttribute="height" constant="1" id="Vc3-uM-vHv"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="blackDividers"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Divider"/> </userDefinedRuntimeAttributes> </view> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="size" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="m8f-ps-pFV"> @@ -65,8 +57,7 @@ <color key="textColor" red="0.0977349653840065" green="0.0977320596575737" blue="0.09773370623588562" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <nil key="highlightedColor"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular14"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular14:blackPrimaryText"/> </userDefinedRuntimeAttributes> </label> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="eIt-Yb-1Yl"> @@ -99,7 +90,7 @@ <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/> <viewLayoutGuide key="safeArea" id="gAS-Hf-5F8"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="blackOpaque"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="BlackOpaqueBackground"/> </userDefinedRuntimeAttributes> <connections> <outlet property="dividerView" destination="tqG-fM-g6J" id="eOr-3y-kbn"/> diff --git a/iphone/Maps/Classes/CustomAlert/LocationAlert/MWMLocationAlert.xib b/iphone/Maps/Classes/CustomAlert/LocationAlert/MWMLocationAlert.xib index 814d834fa1..3db6731c4d 100644 --- a/iphone/Maps/Classes/CustomAlert/LocationAlert/MWMLocationAlert.xib +++ b/iphone/Maps/Classes/CustomAlert/LocationAlert/MWMLocationAlert.xib @@ -1,29 +1,21 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> - <device id="retina4_7" orientation="portrait"> - <adaptation id="fullscreen"/> - </device> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> + <device id="retina4_7" orientation="portrait" appearance="light"/> <dependencies> <deployment identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/> <capability name="Safe area layout guides" minToolsVersion="9.0"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> - <customFonts key="customFonts"> - <array key="HelveticaNeue.ttc"> - <string>HelveticaNeue</string> - <string>HelveticaNeue-Medium</string> - </array> - </customFonts> <objects> <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/> <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/> - <view contentMode="scaleToFill" id="mnY-7K-ids" customClass="MWMLocationAlert" propertyAccessControl="all"> + <view contentMode="scaleToFill" id="mnY-7K-ids" customClass="MWMLocationAlert" propertyAccessControl="none"> <rect key="frame" x="0.0" y="0.0" width="375" height="667"/> <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/> <subviews> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="8dg-2G-Gkm" userLabel="ContainerView"> - <rect key="frame" x="47.5" y="198.5" width="280" height="291"/> + <rect key="frame" x="47.5" y="198.5" width="280" height="291.5"/> <subviews> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Title" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="D5k-he-a1F" userLabel="Title"> <rect key="frame" x="20" y="20" width="240" height="22"/> @@ -35,13 +27,12 @@ <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="localizedText" value="location_services_disabled_header"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="medium18"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="medium18:blackPrimaryText"/> </userDefinedRuntimeAttributes> </label> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Message" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="0fV-Pc-ec6" userLabel="Message"> - <rect key="frame" x="20" y="53" width="240" height="20"/> + <rect key="frame" x="20" y="53.5" width="240" height="20"/> <constraints> <constraint firstAttribute="width" constant="240" id="bjX-A8-pbd"/> <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="20" id="kX0-pg-KbR"/> @@ -50,23 +41,22 @@ <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="localizedText" value="location_services_disabled_message"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular14"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular14:blackSecondaryText"/> </userDefinedRuntimeAttributes> </label> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="oy8-sO-eim" userLabel="hDivider"> - <rect key="frame" x="0.0" y="247" width="280" height="1"/> + <rect key="frame" x="0.0" y="247.5" width="280" height="1"/> <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.12" colorSpace="custom" customColorSpace="sRGB"/> <constraints> <constraint firstAttribute="height" constant="1" id="v6N-0M-ODb"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="blackDividers"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Divider"/> </userDefinedRuntimeAttributes> </view> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="opl-lk-5kD" userLabel="left"> - <rect key="frame" x="0.0" y="247" width="140" height="44"/> + <rect key="frame" x="0.0" y="247.5" width="140" height="44"/> <constraints> <constraint firstAttribute="width" constant="140" id="Ant-We-sLi"/> <constraint firstAttribute="height" constant="44" id="eOg-pv-nif"/> @@ -79,15 +69,14 @@ <state key="highlighted" backgroundImage="dialog_btn_press"/> <userDefinedRuntimeAttributes> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="cancel"/> - <userDefinedRuntimeAttribute type="string" keyPath="textColorName" value="linkBlue"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="medium17"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="medium17:linkBlueText"/> </userDefinedRuntimeAttributes> <connections> <action selector="closeTap" destination="mnY-7K-ids" eventType="touchUpInside" id="X82-1U-rec"/> </connections> </button> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="1Ho-Pk-bDe" userLabel="right"> - <rect key="frame" x="140" y="247" width="140" height="44"/> + <rect key="frame" x="140" y="247.5" width="140" height="44"/> <constraints> <constraint firstAttribute="width" constant="140" id="5wg-5d-hPp"/> <constraint firstAttribute="height" constant="44" id="Mdl-Ix-DGD"/> @@ -99,48 +88,47 @@ </state> <state key="highlighted" backgroundImage="dialog_btn_press"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="textColorName" value="linkBlue"/> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="settings"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="medium17"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="medium17:linkBlueText"/> </userDefinedRuntimeAttributes> <connections> <action selector="settingsTap" destination="mnY-7K-ids" eventType="touchUpInside" id="y48-t3-n6f"/> </connections> </button> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="oO4-NM-mFk" userLabel="vDivider"> - <rect key="frame" x="140" y="247" width="1" height="44"/> + <rect key="frame" x="140" y="247.5" width="1" height="44"/> <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.12" colorSpace="custom" customColorSpace="sRGB"/> <constraints> <constraint firstAttribute="width" constant="1" id="mcR-0M-Ul0"/> <constraint firstAttribute="height" constant="44" id="zL6-eK-WfS"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="blackDividers"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Divider"/> </userDefinedRuntimeAttributes> </view> <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="ic_settings" translatesAutoresizingMaskIntoConstraints="NO" id="icc-OP-m6N" userLabel="settings"> - <rect key="frame" x="20" y="101" width="28" height="28"/> + <rect key="frame" x="20" y="101.5" width="28" height="28"/> <constraints> <constraint firstAttribute="height" constant="28" id="Ush-HH-2TA"/> <constraint firstAttribute="width" constant="28" id="r2M-fp-8z4"/> </constraints> </imageView> <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="ic_geoposition" translatesAutoresizingMaskIntoConstraints="NO" id="S4o-n9-iX5" userLabel="geoposition"> - <rect key="frame" x="20" y="145" width="28" height="28"/> + <rect key="frame" x="20" y="145.5" width="28" height="28"/> <constraints> <constraint firstAttribute="height" constant="28" id="Gdg-65-WkZ"/> <constraint firstAttribute="width" constant="28" id="Wf3-ar-r44"/> </constraints> </imageView> <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="ic_select" translatesAutoresizingMaskIntoConstraints="NO" id="4hl-PR-x4M" userLabel="turnon"> - <rect key="frame" x="20" y="189" width="28" height="28"/> + <rect key="frame" x="20" y="189.5" width="28" height="28"/> <constraints> <constraint firstAttribute="height" constant="28" id="A5h-wL-BHj"/> <constraint firstAttribute="width" constant="28" id="mOL-nA-Afc"/> </constraints> </imageView> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="1. Откройте Настройки" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="EHh-Zz-Us5" userLabel="openSettings"> - <rect key="frame" x="56" y="105" width="204" height="20"/> + <rect key="frame" x="56" y="105.5" width="204" height="20"/> <constraints> <constraint firstAttribute="width" constant="204" id="4JO-6s-aaI"/> <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="20" id="jD6-K3-YYh"/> @@ -149,13 +137,12 @@ <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="localizedText" value="location_services_disabled_1"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular14"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular14:blackSecondaryText"/> </userDefinedRuntimeAttributes> </label> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="2. Нажмите Геопозиция" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="stQ-KI-WeP" userLabel="openSettings"> - <rect key="frame" x="56" y="149" width="204" height="20"/> + <rect key="frame" x="56" y="149.5" width="204" height="20"/> <constraints> <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="20" id="AAw-Ri-mbT"/> <constraint firstAttribute="width" constant="204" id="cNm-sH-jni"/> @@ -164,13 +151,12 @@ <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="localizedText" value="location_services_disabled_2"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular14"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular14:blackSecondaryText"/> </userDefinedRuntimeAttributes> </label> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="3. Выберите "Всегда"" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="eiz-Ie-23H" userLabel="select "Always""> - <rect key="frame" x="56" y="193" width="204" height="20"/> + <rect key="frame" x="56" y="193.5" width="204" height="20"/> <constraints> <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="20" id="bIH-9x-S0s"/> <constraint firstAttribute="width" constant="204" id="qBs-0m-j1B"/> @@ -179,9 +165,8 @@ <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="localizedText" value="location_services_disabled_3"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular14"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular14:blackSecondaryText"/> </userDefinedRuntimeAttributes> </label> </subviews> @@ -217,10 +202,7 @@ <constraint firstItem="opl-lk-5kD" firstAttribute="leading" secondItem="8dg-2G-Gkm" secondAttribute="leading" id="z9J-7w-u9C"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius"> - <integer key="value" value="12"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="alertBackground"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="AlertView"/> </userDefinedRuntimeAttributes> </view> </subviews> diff --git a/iphone/Maps/Classes/CustomAlert/MWMEditorViralAlert.xib b/iphone/Maps/Classes/CustomAlert/MWMEditorViralAlert.xib index aece36cd55..ce89f83c19 100644 --- a/iphone/Maps/Classes/CustomAlert/MWMEditorViralAlert.xib +++ b/iphone/Maps/Classes/CustomAlert/MWMEditorViralAlert.xib @@ -1,32 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> - <device id="retina4_7" orientation="portrait"> - <adaptation id="fullscreen"/> - </device> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> + <device id="retina4_7" orientation="portrait" appearance="light"/> <dependencies> <deployment identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/> <capability name="Safe area layout guides" minToolsVersion="9.0"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> - <customFonts key="customFonts"> - <array key="HelveticaNeue.ttc"> - <string>HelveticaNeue</string> - <string>HelveticaNeue-Medium</string> - </array> - </customFonts> <objects> <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/> <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/> - <view contentMode="scaleToFill" id="wbZ-na-kON" customClass="MWMEditorViralAlert" propertyAccessControl="all"> + <view contentMode="scaleToFill" id="wbZ-na-kON" customClass="MWMEditorViralAlert" propertyAccessControl="none"> <rect key="frame" x="0.0" y="0.0" width="375" height="667"/> <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/> <subviews> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="rDD-mO-naE" userLabel="ContainerView"> - <rect key="frame" x="47.5" y="154" width="280" height="359"/> + <rect key="frame" x="47.5" y="154" width="280" height="359.5"/> <subviews> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Title" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="3wz-0B-pzw" userLabel="Title"> - <rect key="frame" x="20" y="20" width="240" height="21"/> + <rect key="frame" x="20" y="20" width="240" height="21.5"/> <constraints> <constraint firstAttribute="width" constant="240" id="AAb-Ak-tXG"/> <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="20" id="CmO-EK-KSV"/> @@ -35,20 +27,19 @@ <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="localizedText" value="thank_you"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="medium17"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="medium17:blackPrimaryText"/> </userDefinedRuntimeAttributes> </label> <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="img_socializing" translatesAutoresizingMaskIntoConstraints="NO" id="m8G-07-Mf3"> - <rect key="frame" x="60" y="53" width="160" height="160"/> + <rect key="frame" x="60" y="53.5" width="160" height="160"/> <constraints> <constraint firstAttribute="height" constant="160" id="j6u-9U-ijj"/> <constraint firstAttribute="width" constant="160" id="zUT-wz-832"/> </constraints> </imageView> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Message" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ffp-Nm-vdI" userLabel="Message"> - <rect key="frame" x="20" y="229" width="240" height="20"/> + <rect key="frame" x="20" y="229.5" width="240" height="20"/> <constraints> <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="20" id="Zgj-S1-C3z"/> <constraint firstAttribute="width" constant="240" id="t4I-mS-iNs"/> @@ -57,23 +48,22 @@ <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="regular14"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular14:blackSecondaryText"/> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="editor_done_dialog_1"/> </userDefinedRuntimeAttributes> </label> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="G21-zf-Val" userLabel="hDivider"> - <rect key="frame" x="0.0" y="269" width="280" height="1"/> + <rect key="frame" x="0.0" y="269.5" width="280" height="1"/> <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.12" colorSpace="custom" customColorSpace="sRGB"/> <constraints> <constraint firstAttribute="height" constant="1" id="3gT-zA-0eH"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="blackDividers"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Divider"/> </userDefinedRuntimeAttributes> </view> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Xcl-gD-T7R" userLabel="share"> - <rect key="frame" x="0.0" y="271" width="280" height="44"/> + <rect key="frame" x="0.0" y="271.5" width="280" height="44"/> <constraints> <constraint firstAttribute="height" constant="44" id="SEe-k7-fDw"/> </constraints> @@ -85,15 +75,14 @@ <state key="highlighted" backgroundImage="dialog_btn_press"/> <userDefinedRuntimeAttributes> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="share_with_friends"/> - <userDefinedRuntimeAttribute type="string" keyPath="textColorName" value="linkBlue"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular17"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular17:linkBlueText"/> </userDefinedRuntimeAttributes> <connections> <action selector="shareTap" destination="wbZ-na-kON" eventType="touchUpInside" id="MpR-Gj-JSK"/> </connections> </button> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="esF-hg-RBd" userLabel="hDivider"> - <rect key="frame" x="0.0" y="315" width="280" height="1"/> + <rect key="frame" x="0.0" y="315.5" width="280" height="1"/> <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.12" colorSpace="custom" customColorSpace="sRGB"/> <constraints> <constraint firstAttribute="width" constant="280" id="3KO-Rx-bS3"/> @@ -101,11 +90,11 @@ <constraint firstAttribute="height" constant="1" id="ygB-DZ-ZOQ"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="blackDividers"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Divider"/> </userDefinedRuntimeAttributes> </view> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Ze2-KM-H8v" userLabel="close"> - <rect key="frame" x="0.0" y="315" width="280" height="44"/> + <rect key="frame" x="0.0" y="315.5" width="280" height="44"/> <constraints> <constraint firstAttribute="height" constant="44" id="TIQ-yL-HbA"/> </constraints> @@ -117,8 +106,7 @@ <state key="highlighted" backgroundImage="dialog_btn_press"/> <userDefinedRuntimeAttributes> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="close"/> - <userDefinedRuntimeAttribute type="string" keyPath="textColorName" value="linkBlue"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular17"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular17:linkBlueText"/> </userDefinedRuntimeAttributes> <connections> <action selector="cancelTap" destination="wbZ-na-kON" eventType="touchUpInside" id="JO8-4H-lud"/> @@ -147,10 +135,7 @@ <constraint firstAttribute="centerX" secondItem="ffp-Nm-vdI" secondAttribute="centerX" id="uxr-Im-ERl"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius"> - <integer key="value" value="12"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="alertBackground"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="AlertView"/> </userDefinedRuntimeAttributes> </view> </subviews> diff --git a/iphone/Maps/Classes/CustomAlert/MWMOsmAuthAlert.xib b/iphone/Maps/Classes/CustomAlert/MWMOsmAuthAlert.xib index a3cabbe987..7f1fa73844 100644 --- a/iphone/Maps/Classes/CustomAlert/MWMOsmAuthAlert.xib +++ b/iphone/Maps/Classes/CustomAlert/MWMOsmAuthAlert.xib @@ -1,25 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> - <device id="retina4_7" orientation="portrait"> - <adaptation id="fullscreen"/> - </device> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15705" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> <dependencies> - <deployment identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/> - <capability name="Aspect ratio constraints" minToolsVersion="5.1"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15706"/> <capability name="Safe area layout guides" minToolsVersion="9.0"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> - <customFonts key="customFonts"> - <array key="HelveticaNeue.ttc"> - <string>HelveticaNeue</string> - <string>HelveticaNeue-Medium</string> - </array> - </customFonts> <objects> <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/> <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/> - <view contentMode="scaleToFill" id="J1a-qv-gDF" customClass="MWMOsmAuthAlert" propertyAccessControl="all"> + <view contentMode="scaleToFill" id="J1a-qv-gDF" customClass="MWMOsmAuthAlert" propertyAccessControl="none"> <rect key="frame" x="0.0" y="0.0" width="375" height="667"/> <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/> <subviews> @@ -39,7 +28,7 @@ <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> </state> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="coloringName" value="MWMBlack"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="MWMBlack"/> </userDefinedRuntimeAttributes> <connections> <action selector="closeTap" destination="J1a-qv-gDF" eventType="touchUpInside" id="vUi-Os-Czy"/> @@ -57,8 +46,7 @@ <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="medium17"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="medium17:blackPrimaryText"/> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="login_to_make_edits_visible"/> </userDefinedRuntimeAttributes> </label> @@ -94,17 +82,13 @@ </constraints> <state key="normal" title="OpenStreetMap"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="linkBlue"/> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundHighlightedColorName" value="linkBlueHighlighted"/> - <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius"> - <integer key="value" value="6"/> - </userDefinedRuntimeAttribute> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="FlatNormalButtonBig"/> </userDefinedRuntimeAttributes> <connections> <action selector="osmTap" destination="J1a-qv-gDF" eventType="touchUpInside" id="6yw-kg-9NC"/> </connections> </button> - <button opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="y0p-Db-vW6"> + <button opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="y0p-Db-vW6" userLabel="Я"> <rect key="frame" x="20" y="329" width="240" height="44"/> <constraints> <constraint firstAttribute="height" constant="44" id="I2g-A3-lui"/> @@ -112,14 +96,8 @@ </constraints> <state key="normal" title="Sign Up Now"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular17"/> - <userDefinedRuntimeAttribute type="string" keyPath="textColorName" value="linkBlue"/> - <userDefinedRuntimeAttribute type="string" keyPath="textColorHighlightedName" value="linkBlueHighlighted"/> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="clearColor"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="FlatNormalTransButtonBig"/> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="register_at_openstreetmap"/> - <userDefinedRuntimeAttribute type="color" keyPath="layer.borderUIColor"> - <color key="value" red="0.11764705882352941" green="0.58823529411764708" blue="0.94117647058823528" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> - </userDefinedRuntimeAttribute> </userDefinedRuntimeAttributes> <connections> <action selector="signUpTap" destination="J1a-qv-gDF" eventType="touchUpInside" id="hOM-N1-C34"/> @@ -155,10 +133,7 @@ <constraint firstItem="1Oa-Ks-27P" firstAttribute="top" secondItem="iX9-ov-Ks7" secondAttribute="bottom" constant="20" id="ucL-aV-J1p"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius"> - <integer key="value" value="12"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="alertBackground"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="AlertView"/> </userDefinedRuntimeAttributes> <variation key="default"> <mask key="constraints"> diff --git a/iphone/Maps/Classes/CustomAlert/MWMPlaceDoesntExistAlert.xib b/iphone/Maps/Classes/CustomAlert/MWMPlaceDoesntExistAlert.xib index bf68f9cf82..936ed04744 100644 --- a/iphone/Maps/Classes/CustomAlert/MWMPlaceDoesntExistAlert.xib +++ b/iphone/Maps/Classes/CustomAlert/MWMPlaceDoesntExistAlert.xib @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14868" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15705" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> <device id="retina4_7" orientation="portrait" appearance="light"/> <dependencies> <deployment identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14824"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15706"/> <capability name="Safe area layout guides" minToolsVersion="9.0"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> @@ -27,8 +27,7 @@ <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="medium18"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="medium18:blackPrimaryText"/> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="editor_place_doesnt_exist"/> </userDefinedRuntimeAttributes> </label> @@ -42,8 +41,7 @@ <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="regular14"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular14:blackSecondaryText"/> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="editor_detailed_description"/> </userDefinedRuntimeAttributes> </label> @@ -60,10 +58,9 @@ <fontDescription key="fontDescription" type="system" pointSize="14"/> <textInputTraits key="textInputTraits"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular14"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular14:blackPrimaryText"/> <userDefinedRuntimeAttribute type="string" keyPath="localizedPlaceholder" value="editor_comment_hint"/> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Background"/> </userDefinedRuntimeAttributes> </textField> </subviews> @@ -76,13 +73,7 @@ <constraint firstItem="0f8-vD-nJT" firstAttribute="height" secondItem="npf-dH-f50" secondAttribute="height" id="zHi-xB-aCQ"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="color" keyPath="layer.borderUIColor"> - <color key="value" red="0.0" green="0.0" blue="0.0" alpha="0.12" colorSpace="custom" customColorSpace="sRGB"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="number" keyPath="layer.borderWidth"> - <real key="value" value="0.5"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="AlertViewTextField"/> </userDefinedRuntimeAttributes> </view> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="kEx-DM-ynC" userLabel="hDivider"> @@ -92,7 +83,7 @@ <constraint firstAttribute="height" constant="1" id="JKX-3f-YE4"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="blackDividers"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Divider"/> </userDefinedRuntimeAttributes> </view> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="zaM-0A-71d" userLabel="left"> @@ -109,8 +100,7 @@ <state key="highlighted" backgroundImage="dialog_btn_press"/> <userDefinedRuntimeAttributes> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="cancel"/> - <userDefinedRuntimeAttribute type="string" keyPath="textColorName" value="linkBlue"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="medium17"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="medium17:linkBlueText"/> </userDefinedRuntimeAttributes> <connections> <action selector="leftButtonTap" destination="bh1-8l-voy" eventType="touchUpInside" id="Ge7-Dx-Pf3"/> @@ -130,8 +120,7 @@ <state key="highlighted" backgroundImage="dialog_btn_press"/> <userDefinedRuntimeAttributes> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="editor_report_problem_send_button"/> - <userDefinedRuntimeAttribute type="string" keyPath="textColorName" value="linkBlue"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="medium17"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="medium17:linkBlueText"/> </userDefinedRuntimeAttributes> <connections> <action selector="rightButtonTap" destination="bh1-8l-voy" eventType="touchUpInside" id="4FZ-zi-TAB"/> @@ -145,7 +134,7 @@ <constraint firstAttribute="height" constant="44" id="jEO-cN-3PZ"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="blackDividers"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Divider"/> </userDefinedRuntimeAttributes> </view> </subviews> @@ -170,22 +159,7 @@ <constraint firstItem="kEx-DM-ynC" firstAttribute="centerX" secondItem="XjH-qf-m6h" secondAttribute="centerX" id="vop-cl-2u7"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="size" keyPath="layer.shadowOffset"> - <size key="value" width="0.0" height="3"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="color" keyPath="layer.shadowUIColor"> - <color key="value" red="0.0" green="0.0" blue="0.0" alpha="0.22" colorSpace="custom" customColorSpace="sRGB"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="number" keyPath="layer.shadowRadius"> - <integer key="value" value="6"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius"> - <integer key="value" value="12"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="number" keyPath="layer.shadowOpacity"> - <integer key="value" value="1"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="alertBackground"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="AlertView"/> </userDefinedRuntimeAttributes> </view> </subviews> diff --git a/iphone/Maps/Classes/CustomAlert/MobileInternetAlert/MWMMobileInternetAlert.xib b/iphone/Maps/Classes/CustomAlert/MobileInternetAlert/MWMMobileInternetAlert.xib index 8aaaa4744b..02e34b8cfe 100644 --- a/iphone/Maps/Classes/CustomAlert/MobileInternetAlert/MWMMobileInternetAlert.xib +++ b/iphone/Maps/Classes/CustomAlert/MobileInternetAlert/MWMMobileInternetAlert.xib @@ -1,32 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> - <device id="retina4_7" orientation="portrait"> - <adaptation id="fullscreen"/> - </device> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> + <device id="retina4_7" orientation="portrait" appearance="light"/> <dependencies> <deployment identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/> <capability name="Safe area layout guides" minToolsVersion="9.0"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> - <customFonts key="customFonts"> - <array key="HelveticaNeue.ttc"> - <string>HelveticaNeue</string> - <string>HelveticaNeue-Medium</string> - </array> - </customFonts> <objects> <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/> <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/> - <view contentMode="scaleToFill" id="Tlh-TS-tkk" customClass="MWMMobileInternetAlert" propertyAccessControl="all"> + <view contentMode="scaleToFill" id="Tlh-TS-tkk" customClass="MWMMobileInternetAlert" propertyAccessControl="none"> <rect key="frame" x="0.0" y="0.0" width="375" height="667"/> <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/> <subviews> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Tx8-cY-Dyg" userLabel="ContainerView"> - <rect key="frame" x="48" y="219" width="280" height="229"/> + <rect key="frame" x="47.5" y="219.5" width="280" height="228.5"/> <subviews> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Title" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="REz-A0-Vg9" userLabel="Title"> - <rect key="frame" x="20" y="20" width="240" height="22"/> + <rect key="frame" x="20" y="20" width="240" height="21.5"/> <constraints> <constraint firstAttribute="width" constant="240" id="QEO-gJ-c3y"/> <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="20" id="RsI-at-W6p"/> @@ -35,13 +27,12 @@ <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="medium18"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="medium18:blackPrimaryText"/> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="mobile_data"/> </userDefinedRuntimeAttributes> </label> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Message" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="fGq-0K-ugB" userLabel="Message"> - <rect key="frame" x="20" y="54" width="240" height="20"/> + <rect key="frame" x="20" y="53.5" width="240" height="20"/> <constraints> <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="20" id="F3h-lQ-gSS"/> <constraint firstAttribute="width" constant="240" id="XgA-ox-stk"/> @@ -50,13 +41,12 @@ <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="regular14"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular14:blackSecondaryText"/> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="mobile_data_dialog"/> </userDefinedRuntimeAttributes> </label> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="0vG-Ty-4hj" userLabel="button1"> - <rect key="frame" x="0.0" y="95" width="280" height="44"/> + <rect key="frame" x="0.0" y="94.5" width="280" height="44"/> <constraints> <constraint firstAttribute="height" constant="44" id="RyA-xn-gAo"/> </constraints> @@ -68,15 +58,14 @@ <state key="highlighted" backgroundImage="dialog_btn_press"/> <userDefinedRuntimeAttributes> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="mobile_data_option_always"/> - <userDefinedRuntimeAttribute type="string" keyPath="textColorName" value="linkBlue"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="bold17"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="bold17:linkBlueText"/> </userDefinedRuntimeAttributes> <connections> <action selector="alwaysTap" destination="Tlh-TS-tkk" eventType="touchUpInside" id="fuJ-lY-I2V"/> </connections> </button> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="d5L-hE-z56" userLabel="button2"> - <rect key="frame" x="0.0" y="140" width="280" height="44"/> + <rect key="frame" x="0.0" y="139.5" width="280" height="44"/> <fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="17"/> <state key="normal" title="Спрашивать"> <color key="titleColor" red="0.0" green="0.47843137250000001" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> @@ -85,15 +74,14 @@ <state key="highlighted" backgroundImage="dialog_btn_press"/> <userDefinedRuntimeAttributes> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="mobile_data_option_today"/> - <userDefinedRuntimeAttribute type="string" keyPath="textColorName" value="linkBlue"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="medium17"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="medium17:linkBlueText"/> </userDefinedRuntimeAttributes> <connections> <action selector="askTap" destination="Tlh-TS-tkk" eventType="touchUpInside" id="brA-aR-BSr"/> </connections> </button> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Xff-AT-bjO" userLabel="button3"> - <rect key="frame" x="0.0" y="185" width="280" height="44"/> + <rect key="frame" x="0.0" y="184.5" width="280" height="44"/> <fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="17"/> <state key="normal" title="Никогда не использовать"> <color key="titleColor" red="0.0" green="0.47843137250000001" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> @@ -102,35 +90,34 @@ <state key="highlighted" backgroundImage="dialog_btn_press"/> <userDefinedRuntimeAttributes> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="mobile_data_option_not_today"/> - <userDefinedRuntimeAttribute type="string" keyPath="textColorName" value="linkBlue"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="medium17"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="medium17:linkBlueText"/> </userDefinedRuntimeAttributes> <connections> <action selector="neverTap" destination="Tlh-TS-tkk" eventType="touchUpInside" id="wMh-1n-svo"/> </connections> </button> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="VZe-Gu-rIx" userLabel="hDivider1"> - <rect key="frame" x="0.0" y="94" width="280" height="1"/> + <rect key="frame" x="0.0" y="93.5" width="280" height="1"/> <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.12" colorSpace="custom" customColorSpace="sRGB"/> <constraints> <constraint firstAttribute="height" constant="1" id="J0l-nh-ng5"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="blackDividers"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Divider"/> </userDefinedRuntimeAttributes> </view> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="pNk-h2-LSK" userLabel="hDivider2"> - <rect key="frame" x="0.0" y="139" width="280" height="1"/> + <rect key="frame" x="0.0" y="138.5" width="280" height="1"/> <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.12" colorSpace="custom" customColorSpace="sRGB"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="blackDividers"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Divider"/> </userDefinedRuntimeAttributes> </view> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ZZ7-CE-a8J" userLabel="hDivider3"> - <rect key="frame" x="0.0" y="184" width="280" height="1"/> + <rect key="frame" x="0.0" y="183.5" width="280" height="1"/> <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.12" colorSpace="custom" customColorSpace="sRGB"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="blackDividers"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Divider"/> </userDefinedRuntimeAttributes> </view> </subviews> @@ -166,22 +153,7 @@ <constraint firstItem="fGq-0K-ugB" firstAttribute="top" secondItem="REz-A0-Vg9" secondAttribute="bottom" constant="12" id="xjY-UE-eIh"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="size" keyPath="layer.shadowOffset"> - <size key="value" width="0.0" height="3"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="color" keyPath="layer.shadowUIColor"> - <color key="value" red="0.0" green="0.0" blue="0.0" alpha="0.22" colorSpace="custom" customColorSpace="sRGB"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="number" keyPath="layer.shadowRadius"> - <integer key="value" value="6"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius"> - <integer key="value" value="12"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="number" keyPath="layer.shadowOpacity"> - <integer key="value" value="1"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="alertBackground"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="AlertView"/> </userDefinedRuntimeAttributes> </view> </subviews> diff --git a/iphone/Maps/Classes/CustomAlert/RateAlert/MWMRateAlert.xib b/iphone/Maps/Classes/CustomAlert/RateAlert/MWMRateAlert.xib index 98ad1c9f56..5e37f6d97e 100644 --- a/iphone/Maps/Classes/CustomAlert/RateAlert/MWMRateAlert.xib +++ b/iphone/Maps/Classes/CustomAlert/RateAlert/MWMRateAlert.xib @@ -1,23 +1,21 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14109" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> - <device id="retina4_7" orientation="portrait"> - <adaptation id="fullscreen"/> - </device> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> + <device id="retina4_7" orientation="portrait" appearance="light"/> <dependencies> <deployment identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/> <capability name="Safe area layout guides" minToolsVersion="9.0"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> <objects> <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/> <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/> - <view contentMode="scaleToFill" id="xqS-d4-Cm7" customClass="MWMRateAlert" propertyAccessControl="all"> + <view contentMode="scaleToFill" id="xqS-d4-Cm7" customClass="MWMRateAlert" propertyAccessControl="none"> <rect key="frame" x="0.0" y="0.0" width="375" height="667"/> <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/> <subviews> <view opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ecm-mK-5iV" userLabel="ContainerView"> - <rect key="frame" x="47.5" y="191" width="280" height="284"/> + <rect key="frame" x="47.5" y="190.5" width="280" height="285"/> <subviews> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="8dQ-Vo-xwe" userLabel="Done" customClass="MWMButton"> <rect key="frame" x="240" y="0.0" width="40" height="40"/> @@ -32,14 +30,14 @@ <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> </state> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="coloringName" value="MWMBlack"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="MWMBlack"/> </userDefinedRuntimeAttributes> <connections> <action selector="doneTap" destination="xqS-d4-Cm7" eventType="touchUpInside" id="l7v-bf-FLp"/> </connections> </button> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Оцените нашу работу" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="pFt-mm-wUl"> - <rect key="frame" x="40" y="12" width="200" height="21.5"/> + <rect key="frame" x="40" y="12" width="200" height="22"/> <constraints> <constraint firstAttribute="width" constant="200" id="fCS-vI-z7G"/> <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="22" id="w6i-mI-DNF"/> @@ -48,13 +46,12 @@ <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="fontName" value="medium18"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="medium18:blackPrimaryText"/> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="rate_alert_title"/> </userDefinedRuntimeAttributes> </label> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Спасибо что пользуетесь картами MAPS.ME. Пожалуйста, оцените приложение. Ваши оценки и отзывы помогают нам становиться лучше." textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="aP7-fq-KaH" userLabel="Message"> - <rect key="frame" x="20" y="44" width="240" height="82"/> + <rect key="frame" x="20" y="45" width="240" height="82"/> <constraints> <constraint firstAttribute="width" constant="240" id="HJM-e9-0wo"/> <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="16" id="v4x-De-gsX"/> @@ -63,13 +60,12 @@ <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="fontName" value="regular14"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackSecondaryText"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular14:blackSecondaryText"/> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="rate_alert_default_message"/> </userDefinedRuntimeAttributes> </label> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ftg-qc-aFl" userLabel="Star box"> - <rect key="frame" x="20" y="137" width="240" height="59"/> + <rect key="frame" x="20" y="138" width="240" height="59"/> <subviews> <button opaque="NO" tag="1" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="xu8-rO-3BP"> <rect key="frame" x="0.0" y="0.0" width="48" height="48"/> @@ -153,8 +149,7 @@ <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="fontName" value="regular10"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackSecondaryText"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular10:blackSecondaryText"/> </userDefinedRuntimeAttributes> </label> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="2" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="a6h-xZ-4kL"> @@ -164,8 +159,7 @@ <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="fontName" value="regular10"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackSecondaryText"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular10:blackSecondaryText"/> </userDefinedRuntimeAttributes> </label> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="3" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="u3c-7R-fKb"> @@ -175,8 +169,7 @@ <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="fontName" value="regular10"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackSecondaryText"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular10:blackSecondaryText"/> </userDefinedRuntimeAttributes> </label> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="4" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Chn-mM-h8X"> @@ -186,8 +179,7 @@ <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="fontName" value="regular10"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackSecondaryText"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular10:blackSecondaryText"/> </userDefinedRuntimeAttributes> </label> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="5" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="s2o-QH-kdH"> @@ -197,8 +189,7 @@ <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="fontName" value="regular10"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackSecondaryText"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular10:blackSecondaryText"/> </userDefinedRuntimeAttributes> </label> </subviews> @@ -209,7 +200,7 @@ </constraints> </view> <button opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" enabled="NO" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="kfl-QR-Dkk" userLabel="Share"> - <rect key="frame" x="20" y="220" width="240" height="44"/> + <rect key="frame" x="20" y="221" width="240" height="44"/> <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/> <constraints> <constraint firstAttribute="height" constant="44" id="O3d-0W-SpN"/> @@ -222,19 +213,8 @@ </state> <state key="disabled" title="Оценить"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="textColorName" value="linkBlue"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="medium17"/> - <userDefinedRuntimeAttribute type="string" keyPath="textColorHighlightedName" value="white"/> - <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius"> - <integer key="value" value="8"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="string" keyPath="layer.borderColorName" value="linkBlue"/> - <userDefinedRuntimeAttribute type="number" keyPath="layer.borderWidth"> - <integer key="value" value="1"/> - </userDefinedRuntimeAttribute> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="RateAppButton"/> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="rate_the_app"/> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="clearColor"/> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundHighlightedColorName" value="linkBlue"/> </userDefinedRuntimeAttributes> <connections> <action selector="rateTap" destination="xqS-d4-Cm7" eventType="touchUpInside" id="lqd-4T-LF7"/> @@ -257,22 +237,7 @@ <constraint firstAttribute="bottom" secondItem="kfl-QR-Dkk" secondAttribute="bottom" constant="20" id="y6i-Ea-kjD"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="size" keyPath="layer.shadowOffset"> - <size key="value" width="0.0" height="3"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="number" keyPath="layer.shadowRadius"> - <integer key="value" value="6"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius"> - <integer key="value" value="12"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="color" keyPath="layer.shadowUIColor"> - <color key="value" red="0.0" green="0.0" blue="0.0" alpha="0.28000000000000003" colorSpace="custom" customColorSpace="sRGB"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="number" keyPath="layer.shadowOpacity"> - <integer key="value" value="1"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="alertBackground"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="AlertView"/> </userDefinedRuntimeAttributes> </view> </subviews> diff --git a/iphone/Maps/Classes/CustomAlert/RoutingDisclaimerAlert/MWMRoutingDisclaimerAlert.xib b/iphone/Maps/Classes/CustomAlert/RoutingDisclaimerAlert/MWMRoutingDisclaimerAlert.xib index 499d5c0ccb..0939c79e92 100644 --- a/iphone/Maps/Classes/CustomAlert/RoutingDisclaimerAlert/MWMRoutingDisclaimerAlert.xib +++ b/iphone/Maps/Classes/CustomAlert/RoutingDisclaimerAlert/MWMRoutingDisclaimerAlert.xib @@ -1,31 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> - <device id="retina4_7" orientation="portrait"> - <adaptation id="fullscreen"/> - </device> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> + <device id="retina4_7" orientation="portrait" appearance="light"/> <dependencies> <deployment identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/> <capability name="Safe area layout guides" minToolsVersion="9.0"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> - <customFonts key="customFonts"> - <array key="HelveticaNeue.ttc"> - <string>HelveticaNeue-Medium</string> - </array> - </customFonts> <objects> <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/> <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/> - <view contentMode="scaleToFill" id="Ie9-JJ-hnZ" customClass="MWMRoutingDisclaimerAlert" propertyAccessControl="all"> + <view contentMode="scaleToFill" id="Ie9-JJ-hnZ" customClass="MWMRoutingDisclaimerAlert" propertyAccessControl="none"> <rect key="frame" x="0.0" y="0.0" width="375" height="667"/> <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/> <subviews> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Ogu-AE-Ohh" userLabel="ContainerView"> - <rect key="frame" x="47.5" y="265" width="280" height="137"/> + <rect key="frame" x="47.5" y="265" width="280" height="137.5"/> <subviews> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Title" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="S3s-j7-v6E" userLabel="Title"> - <rect key="frame" x="20" y="20" width="240" height="21"/> + <rect key="frame" x="20" y="20" width="240" height="21.5"/> <constraints> <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="20" id="uht-Xi-vWk"/> <constraint firstAttribute="width" constant="240" id="wsn-Cq-kJT"/> @@ -35,12 +28,11 @@ <nil key="highlightedColor"/> <userDefinedRuntimeAttributes> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="dialog_routing_disclaimer_title"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="medium18"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="medium18:blackPrimaryText"/> </userDefinedRuntimeAttributes> </label> <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" editable="NO" usesAttributedText="YES" selectable="NO" translatesAutoresizingMaskIntoConstraints="NO" id="lbr-Xd-hLF"> - <rect key="frame" x="20" y="52" width="240" height="20"/> + <rect key="frame" x="20" y="52.5" width="240" height="20"/> <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/> <constraints> <constraint firstAttribute="width" constant="240" id="GeJ-mk-jko"/> @@ -57,22 +49,21 @@ </attributedString> <textInputTraits key="textInputTraits" autocapitalizationType="sentences" autocorrectionType="no" spellCheckingType="no"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackSecondaryText"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular14"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular14:blackSecondaryText"/> </userDefinedRuntimeAttributes> </textView> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="XIL-q9-MMp" userLabel="hDivider"> - <rect key="frame" x="0.0" y="92" width="280" height="1"/> + <rect key="frame" x="0.0" y="92.5" width="280" height="1"/> <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.12" colorSpace="custom" customColorSpace="sRGB"/> <constraints> <constraint firstAttribute="height" constant="1" id="g4E-tB-Y4R"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="blackDividers"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Divider"/> </userDefinedRuntimeAttributes> </view> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="aCY-1G-NL5" userLabel="right"> - <rect key="frame" x="140.5" y="93" width="139.5" height="44"/> + <rect key="frame" x="140.5" y="93.5" width="139.5" height="44"/> <accessibility key="accessibilityConfiguration" identifier="acceptButton"/> <constraints> <constraint firstAttribute="height" constant="44" id="AAv-pX-uuc"/> @@ -85,15 +76,14 @@ <state key="highlighted" backgroundImage="dialog_btn_press"/> <userDefinedRuntimeAttributes> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="accept"/> - <userDefinedRuntimeAttribute type="string" keyPath="textColorName" value="linkBlue"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="medium17"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="medium17:linkBlueText"/> </userDefinedRuntimeAttributes> <connections> <action selector="okTap" destination="Ie9-JJ-hnZ" eventType="touchUpInside" id="vfz-Rd-Kh6"/> </connections> </button> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="JfV-qu-qmI" userLabel="left"> - <rect key="frame" x="0.0" y="93" width="139.5" height="44"/> + <rect key="frame" x="0.0" y="93.5" width="139.5" height="44"/> <accessibility key="accessibilityConfiguration" identifier="cancelButton"/> <fontDescription key="fontDescription" name="HelveticaNeue-Medium" family="Helvetica Neue" pointSize="17"/> <state key="normal" title="left"> @@ -103,21 +93,20 @@ <state key="highlighted" backgroundImage="dialog_btn_press"/> <userDefinedRuntimeAttributes> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="decline"/> - <userDefinedRuntimeAttribute type="string" keyPath="textColorName" value="linkBlue"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="medium17"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="medium17:linkBlueText"/> </userDefinedRuntimeAttributes> <connections> <action selector="cancelTap" destination="Ie9-JJ-hnZ" eventType="touchUpInside" id="KWl-Dn-BpU"/> </connections> </button> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="930-J1-9o0" userLabel="vDivider"> - <rect key="frame" x="139.5" y="93" width="1" height="44"/> + <rect key="frame" x="139.5" y="93.5" width="1" height="44"/> <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.12" colorSpace="custom" customColorSpace="sRGB"/> <constraints> <constraint firstAttribute="width" constant="1" id="mf2-e7-Qg6"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="blackDividers"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Divider"/> </userDefinedRuntimeAttributes> </view> </subviews> @@ -144,22 +133,7 @@ <constraint firstItem="aCY-1G-NL5" firstAttribute="top" secondItem="XIL-q9-MMp" secondAttribute="bottom" id="swb-Yx-lVo"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="size" keyPath="layer.shadowOffset"> - <size key="value" width="0.0" height="3"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="number" keyPath="layer.shadowRadius"> - <integer key="value" value="6"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius"> - <integer key="value" value="12"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="color" keyPath="layer.shadowUIColor"> - <color key="value" red="0.0" green="0.0" blue="0.0" alpha="0.28000000000000003" colorSpace="custom" customColorSpace="sRGB"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="number" keyPath="layer.shadowOpacity"> - <integer key="value" value="1"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="alertBackground"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="AlertView"/> </userDefinedRuntimeAttributes> </view> </subviews> diff --git a/iphone/Maps/Classes/CustomAlert/SearchAlert/MWMSearchNoResultsAlert.xib b/iphone/Maps/Classes/CustomAlert/SearchAlert/MWMSearchNoResultsAlert.xib index 15005cf0be..4bae1f4491 100644 --- a/iphone/Maps/Classes/CustomAlert/SearchAlert/MWMSearchNoResultsAlert.xib +++ b/iphone/Maps/Classes/CustomAlert/SearchAlert/MWMSearchNoResultsAlert.xib @@ -1,32 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> - <device id="retina4_7" orientation="portrait"> - <adaptation id="fullscreen"/> - </device> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> + <device id="retina4_7" orientation="portrait" appearance="light"/> <dependencies> <deployment identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/> <capability name="Safe area layout guides" minToolsVersion="9.0"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> - <customFonts key="customFonts"> - <array key="HelveticaNeue.ttc"> - <string>HelveticaNeue</string> - <string>HelveticaNeue-Medium</string> - </array> - </customFonts> <objects> <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/> <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/> - <view contentMode="scaleToFill" id="Tlh-TS-tkk" customClass="MWMSearchNoResultsAlert" propertyAccessControl="all"> + <view contentMode="scaleToFill" id="Tlh-TS-tkk" customClass="MWMSearchNoResultsAlert" propertyAccessControl="none"> <rect key="frame" x="0.0" y="0.0" width="375" height="667"/> <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/> <subviews> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Tx8-cY-Dyg" userLabel="ContainerView"> - <rect key="frame" x="48" y="219" width="280" height="229"/> + <rect key="frame" x="47.5" y="219.5" width="280" height="228.5"/> <subviews> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Title" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="REz-A0-Vg9" userLabel="Title"> - <rect key="frame" x="20" y="20" width="240" height="22"/> + <rect key="frame" x="20" y="20" width="240" height="21.5"/> <constraints> <constraint firstAttribute="width" constant="240" id="QEO-gJ-c3y"/> <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="20" id="RsI-at-W6p"/> @@ -35,13 +27,12 @@ <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="medium18"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="medium18:blackPrimaryText"/> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="search_no_results_title"/> </userDefinedRuntimeAttributes> </label> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Message" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="fGq-0K-ugB" userLabel="Message"> - <rect key="frame" x="20" y="54" width="240" height="20"/> + <rect key="frame" x="20" y="53.5" width="240" height="20"/> <constraints> <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="20" id="F3h-lQ-gSS"/> <constraint firstAttribute="width" constant="240" id="XgA-ox-stk"/> @@ -50,13 +41,12 @@ <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="regular14"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular14:blackSecondaryText"/> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="search_no_results_message"/> </userDefinedRuntimeAttributes> </label> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="0vG-Ty-4hj" userLabel="button1"> - <rect key="frame" x="0.0" y="95" width="280" height="44"/> + <rect key="frame" x="0.0" y="94.5" width="280" height="44"/> <constraints> <constraint firstAttribute="height" constant="44" id="RyA-xn-gAo"/> </constraints> @@ -68,15 +58,14 @@ <state key="highlighted" backgroundImage="dialog_btn_press"/> <userDefinedRuntimeAttributes> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="search_no_results_expand_area_button"/> - <userDefinedRuntimeAttribute type="string" keyPath="textColorName" value="linkBlue"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="medium17"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="medium17:linkBlueText"/> </userDefinedRuntimeAttributes> <connections> <action selector="expandSearchAreaTap" destination="Tlh-TS-tkk" eventType="touchUpInside" id="BOy-Da-JAH"/> </connections> </button> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="d5L-hE-z56" userLabel="button2"> - <rect key="frame" x="0.0" y="140" width="280" height="44"/> + <rect key="frame" x="0.0" y="139.5" width="280" height="44"/> <fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="17"/> <state key="normal" title="Reset filters"> <color key="titleColor" red="0.090196078430000007" green="0.61960784310000006" blue="0.30196078430000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> @@ -85,15 +74,14 @@ <state key="highlighted" backgroundImage="dialog_btn_press"/> <userDefinedRuntimeAttributes> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="search_no_results_reset_button"/> - <userDefinedRuntimeAttribute type="string" keyPath="textColorName" value="linkBlue"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="medium17"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="medium17:linkBlueText"/> </userDefinedRuntimeAttributes> <connections> <action selector="resetFiltersTap" destination="Tlh-TS-tkk" eventType="touchUpInside" id="zKG-eV-x9U"/> </connections> </button> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Xff-AT-bjO" userLabel="button3"> - <rect key="frame" x="0.0" y="185" width="280" height="44"/> + <rect key="frame" x="0.0" y="184.5" width="280" height="44"/> <fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="17"/> <state key="normal" title="Cancel"> <color key="titleColor" red="0.090196078430000007" green="0.61960784310000006" blue="0.30196078430000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> @@ -102,35 +90,34 @@ <state key="highlighted" backgroundImage="dialog_btn_press"/> <userDefinedRuntimeAttributes> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="cancel"/> - <userDefinedRuntimeAttribute type="string" keyPath="textColorName" value="linkBlue"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="medium17"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="medium17:linkBlueText"/> </userDefinedRuntimeAttributes> <connections> <action selector="cancelTap" destination="Tlh-TS-tkk" eventType="touchUpInside" id="tpm-i0-vma"/> </connections> </button> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="VZe-Gu-rIx" userLabel="hDivider1"> - <rect key="frame" x="0.0" y="94" width="280" height="1"/> + <rect key="frame" x="0.0" y="93.5" width="280" height="1"/> <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.12" colorSpace="custom" customColorSpace="sRGB"/> <constraints> <constraint firstAttribute="height" constant="1" id="J0l-nh-ng5"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="blackDividers"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Divider"/> </userDefinedRuntimeAttributes> </view> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="pNk-h2-LSK" userLabel="hDivider2"> - <rect key="frame" x="0.0" y="139" width="280" height="1"/> + <rect key="frame" x="0.0" y="138.5" width="280" height="1"/> <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.12" colorSpace="custom" customColorSpace="sRGB"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="blackDividers"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Divider"/> </userDefinedRuntimeAttributes> </view> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ZZ7-CE-a8J" userLabel="hDivider3"> - <rect key="frame" x="0.0" y="184" width="280" height="1"/> + <rect key="frame" x="0.0" y="183.5" width="280" height="1"/> <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.12" colorSpace="custom" customColorSpace="sRGB"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="blackDividers"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Divider"/> </userDefinedRuntimeAttributes> </view> </subviews> @@ -167,22 +154,7 @@ <constraint firstItem="fGq-0K-ugB" firstAttribute="top" secondItem="REz-A0-Vg9" secondAttribute="bottom" constant="12" id="xjY-UE-eIh"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="size" keyPath="layer.shadowOffset"> - <size key="value" width="0.0" height="3"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="number" keyPath="layer.shadowRadius"> - <integer key="value" value="6"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius"> - <integer key="value" value="12"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="color" keyPath="layer.shadowUIColor"> - <color key="value" red="0.0" green="0.0" blue="0.0" alpha="0.28000000000000003" colorSpace="custom" customColorSpace="sRGB"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="number" keyPath="layer.shadowOpacity"> - <integer key="value" value="1"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="alertBackground"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="AlertView"/> </userDefinedRuntimeAttributes> </view> </subviews> diff --git a/iphone/Maps/Classes/CustomAlert/SpinnerAlert/MWMSpinnerAlert.xib b/iphone/Maps/Classes/CustomAlert/SpinnerAlert/MWMSpinnerAlert.xib index 822eff50e1..a8ba78b749 100644 --- a/iphone/Maps/Classes/CustomAlert/SpinnerAlert/MWMSpinnerAlert.xib +++ b/iphone/Maps/Classes/CustomAlert/SpinnerAlert/MWMSpinnerAlert.xib @@ -1,20 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> - <device id="retina4_7" orientation="portrait"> - <adaptation id="fullscreen"/> - </device> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> + <device id="retina4_7" orientation="portrait" appearance="light"/> <dependencies> <deployment identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/> <capability name="Safe area layout guides" minToolsVersion="9.0"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> - <customFonts key="customFonts"> - <array key="HelveticaNeue.ttc"> - <string>HelveticaNeue</string> - <string>HelveticaNeue-Medium</string> - </array> - </customFonts> <objects> <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/> <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/> @@ -23,10 +15,10 @@ <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/> <subviews> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="fZW-Y8-F8A" userLabel="ContainerView"> - <rect key="frame" x="48" y="264" width="280" height="139"/> + <rect key="frame" x="47.5" y="264.5" width="280" height="138.5"/> <subviews> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="6Ik-Gs-Yc7" userLabel="button1"> - <rect key="frame" x="0.0" y="95" width="280" height="44"/> + <rect key="frame" x="0.0" y="94.5" width="280" height="44"/> <constraints> <constraint firstAttribute="height" constant="44" id="ejP-Qr-J5O"/> </constraints> @@ -38,21 +30,20 @@ <state key="highlighted" backgroundImage="dialog_btn_press"/> <userDefinedRuntimeAttributes> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="cancel"/> - <userDefinedRuntimeAttribute type="string" keyPath="textColorName" value="linkBlue"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="bold17"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="bold17:linkBlueText"/> </userDefinedRuntimeAttributes> <connections> <action selector="tap" destination="zbk-bu-cTT" eventType="touchUpInside" id="a2c-ED-0jy"/> </connections> </button> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="lX1-uE-UHN" userLabel="hDivider1"> - <rect key="frame" x="0.0" y="94" width="280" height="1"/> + <rect key="frame" x="0.0" y="93.5" width="280" height="1"/> <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.12" colorSpace="custom" customColorSpace="sRGB"/> <constraints> <constraint firstAttribute="height" constant="1" id="f9v-KZ-u2L"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="blackDividers"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Divider"/> </userDefinedRuntimeAttributes> </view> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="kq1-MC-Bth"> @@ -64,7 +55,7 @@ </constraints> </view> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Title" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="JHp-iN-vQc" userLabel="Title"> - <rect key="frame" x="20" y="56" width="240" height="22"/> + <rect key="frame" x="20" y="56" width="240" height="21.5"/> <constraints> <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="20" id="57O-O2-CsM"/> <constraint firstAttribute="width" constant="240" id="M8o-cf-xqy"/> @@ -73,8 +64,7 @@ <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="medium18"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="medium18:blackPrimaryText"/> </userDefinedRuntimeAttributes> </label> </subviews> @@ -94,22 +84,7 @@ <constraint firstItem="JHp-iN-vQc" firstAttribute="top" secondItem="kq1-MC-Bth" secondAttribute="bottom" constant="8" id="yW9-DY-uxC"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="size" keyPath="layer.shadowOffset"> - <size key="value" width="0.0" height="3"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="color" keyPath="layer.shadowUIColor"> - <color key="value" red="0.0" green="0.0" blue="0.0" alpha="0.22" colorSpace="custom" customColorSpace="sRGB"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="number" keyPath="layer.shadowRadius"> - <integer key="value" value="6"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius"> - <integer key="value" value="12"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="number" keyPath="layer.shadowOpacity"> - <integer key="value" value="1"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="alertBackground"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="AlertView"/> </userDefinedRuntimeAttributes> </view> </subviews> diff --git a/iphone/Maps/Classes/CustomViews/CircularProgress/MWMCircularProgress.xib b/iphone/Maps/Classes/CustomViews/CircularProgress/MWMCircularProgress.xib index b18e631e34..5cc3d7c155 100644 --- a/iphone/Maps/Classes/CustomViews/CircularProgress/MWMCircularProgress.xib +++ b/iphone/Maps/Classes/CustomViews/CircularProgress/MWMCircularProgress.xib @@ -1,11 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> - <device id="retina4_7" orientation="portrait"> - <adaptation id="fullscreen"/> - </device> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> + <device id="retina4_7" orientation="portrait" appearance="light"/> <dependencies> <deployment identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/> <capability name="Safe area layout guides" minToolsVersion="9.0"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> @@ -16,7 +14,7 @@ </connections> </placeholder> <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/> - <view contentMode="scaleToFill" id="2DE-Qh-89K" customClass="MWMCircularProgressView" propertyAccessControl="all"> + <view contentMode="scaleToFill" id="2DE-Qh-89K" customClass="MWMCircularProgressView" propertyAccessControl="none"> <rect key="frame" x="0.0" y="0.0" width="32" height="32"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <subviews> @@ -27,7 +25,7 @@ <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> </state> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="coloringName" value="MWMBlack"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="MWMBlack"/> </userDefinedRuntimeAttributes> <connections> <action selector="buttonTouchUpInside:" destination="-1" eventType="touchUpInside" id="aPG-4e-uSw"/> @@ -60,6 +58,7 @@ <outlet property="owner" destination="-1" id="0n7-PI-5tO"/> <outlet property="spinner" destination="aMt-XV-9UK" id="bmp-bV-h3C"/> </connections> + <point key="canvasLocation" x="139" y="155"/> </view> </objects> </document> diff --git a/iphone/Maps/Classes/CustomViews/CircularProgress/MWMCircularProgressView.m b/iphone/Maps/Classes/CustomViews/CircularProgress/MWMCircularProgressView.m index de402494e3..ca6c4b2a69 100644 --- a/iphone/Maps/Classes/CustomViews/CircularProgress/MWMCircularProgressView.m +++ b/iphone/Maps/Classes/CustomViews/CircularProgress/MWMCircularProgressView.m @@ -69,8 +69,9 @@ static CGFloat angleWithProgress(CGFloat progress) { return 2.0 * M_PI * progres [self setColoring:MWMButtonColoringBlue forState:MWMCircularProgressStateCompleted]; } -- (void)mwm_refreshUI +- (void)applyTheme { + [super applyTheme]; self.suspendRefreshProgress = YES; [self setupColors]; self.suspendRefreshProgress = NO; diff --git a/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationCommon.h b/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationCommon.h index 4c2eeaaed6..d51989098e 100644 --- a/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationCommon.h +++ b/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationCommon.h @@ -10,9 +10,6 @@ enum class AuthorizationButtonType AuthorizationButtonTypeOSM }; -UIColor * AuthorizationButtonBackgroundColor(AuthorizationButtonType type); -void AuthorizationConfigButton(UIButton * btn, AuthorizationButtonType type); - // Deletes any stored credentials if called with empty key or secret. void AuthorizationStoreCredentials(osm::KeySecret const & keySecret); BOOL AuthorizationHaveCredentials(); diff --git a/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationCommon.mm b/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationCommon.mm index ffd16a0091..60e2a12809 100644 --- a/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationCommon.mm +++ b/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationCommon.mm @@ -38,42 +38,6 @@ void SetEmptyOSMUserName() [ud synchronize]; } -UIColor * AuthorizationButtonTextColor(AuthorizationButtonType type) -{ - switch (type) - { - case AuthorizationButtonType::AuthorizationButtonTypeGoogle: return UIColor.blackColor; - case AuthorizationButtonType::AuthorizationButtonTypeFacebook: return UIColor.whiteColor; - case AuthorizationButtonType::AuthorizationButtonTypeOSM: return [UIColor white]; - } - return UIColor.clearColor; -} - -UIColor * AuthorizationButtonBackgroundColor(AuthorizationButtonType type) -{ - switch (type) - { - case AuthorizationButtonType::AuthorizationButtonTypeGoogle: return UIColor.whiteColor; - case AuthorizationButtonType::AuthorizationButtonTypeFacebook: - return [UIColor colorWithRed:72. / 255. green:97. / 255. blue:163. / 255. alpha:1.]; - case AuthorizationButtonType::AuthorizationButtonTypeOSM: return [UIColor linkBlue]; - } - return UIColor.clearColor; -} - -void AuthorizationConfigButton(UIButton * btn, AuthorizationButtonType type) -{ - UIColor * txtCol = AuthorizationButtonTextColor(type); - UIColor * bgCol = AuthorizationButtonBackgroundColor(type); - - CGFloat const highlightedAlpha = 0.3; - [btn setTitleColor:txtCol forState:UIControlStateNormal]; - [btn setTitleColor:[txtCol colorWithAlphaComponent:highlightedAlpha] forState:UIControlStateHighlighted]; - - [btn setBackgroundColor:bgCol forState:UIControlStateNormal]; - [btn setBackgroundColor:[bgCol colorWithAlphaComponent:highlightedAlpha] forState:UIControlStateHighlighted]; -} - void AuthorizationStoreCredentials(osm::KeySecret const & keySecret) { NSUserDefaults * ud = NSUserDefaults.standardUserDefaults; diff --git a/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationLoginViewController.mm b/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationLoginViewController.mm index f5eca1a396..8357310256 100644 --- a/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationLoginViewController.mm +++ b/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationLoginViewController.mm @@ -63,11 +63,7 @@ using namespace osm_auth_ios; self.loginGoogleButton.enabled = isConnected; self.loginFacebookButton.enabled = isConnected; self.signupButton.enabled = isConnected; - - AuthorizationConfigButton(self.loginGoogleButton, AuthorizationButtonType::AuthorizationButtonTypeGoogle); - AuthorizationConfigButton(self.loginFacebookButton, AuthorizationButtonType::AuthorizationButtonTypeFacebook); - AuthorizationConfigButton(self.loginOSMButton, AuthorizationButtonType::AuthorizationButtonTypeOSM); - + if (!isConnected) { self.loginGoogleButton.layer.borderColor = UIColor.clearColor.CGColor; diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/Layers/LayersViewController.swift b/iphone/Maps/Classes/CustomViews/MapViewControls/Layers/LayersViewController.swift index 746a05f0aa..3506b353c9 100644 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/Layers/LayersViewController.swift +++ b/iphone/Maps/Classes/CustomViews/MapViewControls/Layers/LayersViewController.swift @@ -38,14 +38,12 @@ final class LayersViewController: MWMViewController { private func updateTrafficButton() { let enabled = MapOverlayManager.trafficEnabled() - trafficButton.setTitleColor(enabled ? UIColor.linkBlue() : UIColor.blackSecondaryText(), for: .normal) - trafficButton.imageName = enabled ? "btn_menu_traffic_on" : "btn_menu_traffic_off" + trafficButton.setStyleAndApply(enabled ? "LayersTrafficButtonEnabled" : "LayersTrafficButtonDisabled") } private func updateSubwayButton() { let enabled = MapOverlayManager.transitEnabled() - subwayButton.setTitleColor(enabled ? UIColor.linkBlue() : UIColor.blackSecondaryText(), for: .normal) - subwayButton.imageName = enabled ? "btn_menu_subway_on" : "btn_menu_subway_off" + subwayButton.setStyleAndApply(enabled ? "LayersSubwayButtonEnabled" : "LayersSubwayButtonDisabled") } private func updateIsoLinesButton() { diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/Layers/LayersViewController.xib b/iphone/Maps/Classes/CustomViews/MapViewControls/Layers/LayersViewController.xib index 8a59c9c6f4..c9a0e4707c 100644 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/Layers/LayersViewController.xib +++ b/iphone/Maps/Classes/CustomViews/MapViewControls/Layers/LayersViewController.xib @@ -31,7 +31,7 @@ <constraint firstAttribute="height" constant="1" id="EIs-1H-8tP"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="blackDividers"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Divider"/> </userDefinedRuntimeAttributes> </view> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Map Layers" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Kii-gP-WiK"> @@ -40,7 +40,7 @@ <nil key="textColor"/> <nil key="highlightedColor"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="blackPrimaryText"/> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="layers_title"/> </userDefinedRuntimeAttributes> </label> @@ -62,7 +62,7 @@ <rect key="frame" x="0.0" y="0.0" width="114.5" height="106"/> <subviews> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="1Ig-dd-0gQ" customClass="VerticallyAlignedButton" customModule="maps_me" customModuleProvider="target"> - <rect key="frame" x="-9.5" y="33" width="133" height="40"/> + <rect key="frame" x="50" y="33.5" width="72" height="40"/> <fontDescription key="fontDescription" type="system" pointSize="10"/> <state key="normal" title="Traffic" image="btn_menu_traffic_off_light"> <color key="titleColor" white="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> @@ -85,7 +85,7 @@ <rect key="frame" x="114.5" y="0.0" width="114" height="106"/> <subviews> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="cf2-qe-I3a" customClass="VerticallyAlignedButton" customModule="maps_me" customModuleProvider="target"> - <rect key="frame" x="-13" y="33" width="140" height="40"/> + <rect key="frame" x="47" y="33.5" width="78" height="40"/> <fontDescription key="fontDescription" type="system" pointSize="10"/> <state key="normal" title="Contour" image="btn_menu_isomaps_off_light"> <color key="titleColor" white="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> @@ -142,7 +142,7 @@ <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/> <viewLayoutGuide key="safeArea" id="Rhj-gh-MIj"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Background"/> </userDefinedRuntimeAttributes> <point key="canvasLocation" x="33.5" y="-237"/> </view> diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.h b/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.h index c7485eae7d..a83acf462a 100644 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.h +++ b/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.h @@ -27,8 +27,6 @@ - (UIView *)anchorView; -- (void)mwm_refreshUI; - - (void)viewWillTransitionToSize:(CGSize)size withTransitionCoordinator:(id<UIViewControllerTransitionCoordinator>)coordinator; diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.mm b/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.mm index 4fb9a5f26d..d35ac4b1ed 100644 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.mm +++ b/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.mm @@ -101,17 +101,6 @@ NSString * const kMapToCategorySelectorSegue = @"MapToCategorySelectorSegue"; return self.menuController.view; } -- (void)mwm_refreshUI -{ - [self.trafficButton mwm_refreshUI]; - [self.sideButtons mwm_refreshUI]; - [self.navigationManager mwm_refreshUI]; - [self.searchManager mwm_refreshUI]; - [self.menuController mwm_refreshUI]; - [self.promoButton mwm_refreshUI]; - [self.ownerController setNeedsStatusBarAppearanceUpdate]; -} - - (void)viewWillTransitionToSize:(CGSize)size withTransitionCoordinator:(id<UIViewControllerTransitionCoordinator>)coordinator { diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/PromoButton/PromoButton.swift b/iphone/Maps/Classes/CustomViews/MapViewControls/PromoButton/PromoButton.swift index d273413365..893ea2daba 100644 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/PromoButton/PromoButton.swift +++ b/iphone/Maps/Classes/CustomViews/MapViewControls/PromoButton/PromoButton.swift @@ -1,6 +1,6 @@ import UIKit -@objc class PromoButton: UIButton { +@objc class PromoButton: MWMButton { private let coordinator: PromoCoordinator private let buttonSize: CGSize = CGSize(width: 48, height: 48) @@ -27,11 +27,7 @@ import UIKit } private func configureDiscovery() { - if UIColor.isNightMode() { - setImage(UIImage.init(named: "promo_discovery_button_night"), for: .normal) - } else { - setImage(UIImage.init(named: "promo_discovery_button_day"), for: .normal) - } + setStyleAndApply("PromoDiscroveryButton") addTarget(self, action: #selector(onButtonPress), for: .touchUpInside) imageView?.clipsToBounds = false @@ -59,9 +55,4 @@ import UIKit self?.isHidden = true; }) } - - override func mwm_refreshUI() { - super.mwm_refreshUI() - configure() - } } diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/SideButtons/MWMSideButtons.h b/iphone/Maps/Classes/CustomViews/MapViewControls/SideButtons/MWMSideButtons.h index 6243fdca6c..adc10907c8 100644 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/SideButtons/MWMSideButtons.h +++ b/iphone/Maps/Classes/CustomViews/MapViewControls/SideButtons/MWMSideButtons.h @@ -10,7 +10,6 @@ - (instancetype)init __attribute__((unavailable("init is not available"))); - (instancetype)initWithParentView:(UIView *)view; -- (void)mwm_refreshUI; - (void)processMyPositionStateModeEvent:(MWMMyPositionMode)mode; diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/SideButtons/MWMSideButtons.mm b/iphone/Maps/Classes/CustomViews/MapViewControls/SideButtons/MWMSideButtons.mm index 68d17c222b..0080b0fc69 100644 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/SideButtons/MWMSideButtons.mm +++ b/iphone/Maps/Classes/CustomViews/MapViewControls/SideButtons/MWMSideButtons.mm @@ -72,12 +72,6 @@ NSString * const kMWMSideButtonsViewNibName = @"MWMSideButtonsView"; GetFramework().Scale(Framework::SCALE_MIN, true); } -- (void)mwm_refreshUI -{ - [self.sideView mwm_refreshUI]; - [self refreshLocationButtonState:self.locationMode]; -} - - (void)processMyPositionStateModeEvent:(MWMMyPositionMode)mode { [self refreshLocationButtonState:mode]; @@ -94,14 +88,14 @@ NSString * const kMWMSideButtonsViewNibName = @"MWMSideButtonsView"; { case MWMMyPositionModePendingPosition: { - locBtn.imageName = @"btn_pending"; + [locBtn setStyleAndApply: @"ButtonPending"]; [locBtn.imageView startRotation:1]; break; } case MWMMyPositionModeNotFollow: - case MWMMyPositionModeNotFollowNoPosition: locBtn.imageName = @"btn_get_position"; break; - case MWMMyPositionModeFollow: locBtn.imageName = @"btn_follow"; break; - case MWMMyPositionModeFollowAndRotate: locBtn.imageName = @"btn_follow_and_rotate"; break; + case MWMMyPositionModeNotFollowNoPosition: [locBtn setStyleAndApply: @"ButtonGetPosition"]; break; + case MWMMyPositionModeFollow: [locBtn setStyleAndApply: @"ButtonFollow"]; break; + case MWMMyPositionModeFollowAndRotate: [locBtn setStyleAndApply: @"ButtonFollowAndRotate"]; break; } } diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/SideButtons/MWMSideButtonsView.xib b/iphone/Maps/Classes/CustomViews/MapViewControls/SideButtons/MWMSideButtonsView.xib index 97ec1f65d5..c317aa632d 100644 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/SideButtons/MWMSideButtonsView.xib +++ b/iphone/Maps/Classes/CustomViews/MapViewControls/SideButtons/MWMSideButtonsView.xib @@ -1,11 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> - <device id="retina4_7" orientation="portrait"> - <adaptation id="fullscreen"/> - </device> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> + <device id="retina4_7" orientation="portrait" appearance="light"/> <dependencies> <deployment identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/> <capability name="Safe area layout guides" minToolsVersion="9.0"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> @@ -18,7 +16,7 @@ <outlet property="zoomOutButton" destination="hwn-8L-cFX" id="fYk-mf-gUY"/> </connections> </placeholder> - <view contentMode="scaleToFill" id="ek2-ZW-pCm" customClass="MWMSideButtonsView" propertyAccessControl="all"> + <view contentMode="scaleToFill" id="ek2-ZW-pCm" customClass="MWMSideButtonsView" propertyAccessControl="none"> <rect key="frame" x="0.0" y="0.0" width="56" height="228"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <subviews> @@ -29,7 +27,7 @@ <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> </state> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="imageName" value="btn_zoom_in"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="ButtonZoomIn"/> </userDefinedRuntimeAttributes> <connections> <action selector="zoomTouchDown:" destination="-1" eventType="touchDown" id="5VF-m8-Lwc"/> @@ -44,7 +42,7 @@ <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> </state> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="imageName" value="btn_zoom_out"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="ButtonZoomOut"/> </userDefinedRuntimeAttributes> <connections> <action selector="zoomTouchDown:" destination="-1" eventType="touchDown" id="o4X-Kp-9ka"/> diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/TrafficButton/MWMTrafficButtonViewController.h b/iphone/Maps/Classes/CustomViews/MapViewControls/TrafficButton/MWMTrafficButtonViewController.h index 56c92dfe94..f17ca3efc0 100644 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/TrafficButton/MWMTrafficButtonViewController.h +++ b/iphone/Maps/Classes/CustomViews/MapViewControls/TrafficButton/MWMTrafficButtonViewController.h @@ -6,8 +6,6 @@ @property(nonatomic) BOOL hidden; -- (void)mwm_refreshUI; - + (void)updateAvailableArea:(CGRect)frame; @end diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/TrafficButton/MWMTrafficButtonViewController.mm b/iphone/Maps/Classes/CustomViews/MapViewControls/TrafficButton/MWMTrafficButtonViewController.mm index 800faca757..ee1b206dff 100644 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/TrafficButton/MWMTrafficButtonViewController.mm +++ b/iphone/Maps/Classes/CustomViews/MapViewControls/TrafficButton/MWMTrafficButtonViewController.mm @@ -33,7 +33,7 @@ NSArray<UIImage *> * imagesWithName(NSString * name) @end -@interface MWMTrafficButtonViewController ()<MWMMapOverlayManagerObserver> +@interface MWMTrafficButtonViewController ()<MWMMapOverlayManagerObserver, ThemeListener> @property(nonatomic) NSLayoutConstraint * topOffset; @property(nonatomic) NSLayoutConstraint * leftOffset; @@ -57,12 +57,17 @@ NSArray<UIImage *> * imagesWithName(NSString * name) [ovc addChildViewController:self]; [ovc.controlsView addSubview:self.view]; [self configLayout]; - [self refreshAppearance]; + [[StyleManager instance] addListener: self]; [MWMMapOverlayManager addObserver:self]; } return self; } +- (void)dealloc +{ + [[StyleManager instance] removeListener: self]; +} + - (void)configLayout { UIView * sv = self.view; @@ -75,12 +80,6 @@ NSArray<UIImage *> * imagesWithName(NSString * name) self.leftOffset.active = YES; } -- (void)mwm_refreshUI -{ - [self.view mwm_refreshUI]; - [self refreshAppearance]; -} - - (void)setHidden:(BOOL)hidden { _hidden = hidden; @@ -100,7 +99,7 @@ NSArray<UIImage *> * imagesWithName(NSString * name) }); } -- (void)refreshAppearance +- (void)applyTheme { MWMButton * btn = static_cast<MWMButton *>(self.view); UIImageView * iv = btn.imageView; @@ -189,8 +188,8 @@ NSArray<UIImage *> * imagesWithName(NSString * name) #pragma mark - MWMMapOverlayManagerObserver -- (void)onTrafficStateUpdated { [self refreshAppearance]; } -- (void)onTransitStateUpdated { [self refreshAppearance]; } +- (void)onTrafficStateUpdated { [self applyTheme]; } +- (void)onTransitStateUpdated { [self applyTheme]; } - (void)onIsoLinesStateUpdated { [self refreshAppearance]; } @end diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager.h b/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager.h index e60fb6ea1f..f44ebb233d 100644 --- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager.h +++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager.h @@ -23,7 +23,6 @@ typedef NS_ENUM(NSUInteger, MWMNavigationDashboardState) { - (instancetype)init __attribute__((unavailable("init is not available"))); - (instancetype)initWithParentView:(UIView *)view; - (void)setRouteBuilderProgress:(CGFloat)progress; -- (void)mwm_refreshUI; - (void)onRoutePrepare; - (void)onRoutePlanning; diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager.mm b/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager.mm index ec75eb334c..395a296eaf 100644 --- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager.mm +++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager.mm @@ -96,17 +96,6 @@ using Observers = NSHashTable<Observer>; [button setTitle:title forState:UIControlStateNormal]; } -- (void)mwm_refreshUI -{ - [_routePreview mwm_refreshUI]; - [_navigationInfoView mwm_refreshUI]; - [_navigationControlView mwm_refreshUI]; - [_baseRoutePreviewStatus mwm_refreshUI]; - [_transportRoutePreviewStatus mwm_refreshUI]; - _etaAttributes = nil; - _etaSecondaryAttributes = nil; -} - - (void)onNavigationInfoUpdated { auto entity = self.entity; diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/MWMNavigationInfoView.mm b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/MWMNavigationInfoView.mm index 147f019208..796f2cf77b 100644 --- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/MWMNavigationInfoView.mm +++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/MWMNavigationInfoView.mm @@ -290,7 +290,6 @@ BOOL defaultOrientation(CGSize const & size) { [self setTurnsViewVisible:YES]; self.nextTurnImageView.image = info.turnImage; - self.nextTurnImageView.mwm_coloring = MWMImageColoringWhite; if (info.roundExitNumber == 0) { @@ -324,7 +323,6 @@ BOOL defaultOrientation(CGSize const & size) { self.secondTurnView.hidden = NO; self.secondTurnImageView.image = info.nextTurnImage; - self.secondTurnImageView.mwm_coloring = MWMImageColoringBlack; } else { @@ -525,7 +523,6 @@ BOOL defaultOrientation(CGSize const & size) [self setNeedsLayout]; if (isVisible) { - self.bookmarksButton.imageName = @"ic_routing_bookmark"; [self setSearchState:NavigationSearchState::MinimizedNormal animated:NO]; self.turnsWidth.constant = IPAD ? kTurnsiPadWidth : kTurnsiPhoneWidth; UIView * sv = self.ownerView; @@ -562,4 +559,10 @@ BOOL defaultOrientation(CGSize const & size) }]; } +//MARK: Update Theme +- (void)applyTheme +{ + [self setSearchState:_searchState]; + +} @end diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/MWMNavigationInfoView.xib b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/MWMNavigationInfoView.xib index 489e71cbea..22e9cf2959 100644 --- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/MWMNavigationInfoView.xib +++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/MWMNavigationInfoView.xib @@ -1,9 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14865.1" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> - <device id="retina4_7" orientation="portrait" appearance="light"/> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15705" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> <dependencies> - <deployment identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14819.2"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15706"/> <capability name="Safe area layout guides" minToolsVersion="9.0"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> @@ -27,28 +25,37 @@ <constraints> <constraint firstAttribute="height" constant="100" id="6em-0e-zym"/> </constraints> + <userDefinedRuntimeAttributes> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Background"/> + </userDefinedRuntimeAttributes> </view> <button opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="240" verticalHuggingPriority="240" contentHorizontalAlignment="left" contentVerticalAlignment="center" lineBreakMode="wordWrap" translatesAutoresizingMaskIntoConstraints="NO" id="OJ3-VB-hqA"> - <rect key="frame" x="0.0" y="0.0" width="971" height="48"/> + <rect key="frame" x="0.0" y="0.0" width="951" height="48"/> <constraints> <constraint firstAttribute="height" constant="48" id="oPW-KZ-iX3"/> </constraints> <inset key="contentEdgeInsets" minX="12" minY="0.0" maxX="0.0" maxY="0.0"/> <inset key="titleEdgeInsets" minX="12" minY="0.0" maxX="0.0" maxY="0.0"/> <state key="normal" title="Button" image="ic_search_toast"/> + <userDefinedRuntimeAttributes> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="FlatNormalTransButton:MWMBlue:regular16"/> + </userDefinedRuntimeAttributes> <connections> <action selector="openSearch" destination="iN0-l3-epB" eventType="touchUpInside" id="rRN-4C-luO"/> </connections> </button> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="pWX-NL-dy3"> - <rect key="frame" x="971" y="8" width="1" height="32"/> + <rect key="frame" x="951" y="8" width="1" height="32"/> <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> <constraints> <constraint firstAttribute="width" constant="1" id="5sH-RH-vPb"/> </constraints> + <userDefinedRuntimeAttributes> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Divider"/> + </userDefinedRuntimeAttributes> </view> <button opaque="NO" contentMode="scaleToFill" horizontalCompressionResistancePriority="900" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="wordWrap" translatesAutoresizingMaskIntoConstraints="NO" id="fh6-Nu-aYU"> - <rect key="frame" x="972" y="0.0" width="52" height="48"/> + <rect key="frame" x="952" y="0.0" width="72" height="48"/> <accessibility key="accessibilityConfiguration" identifier="routePlaningButtomPanelUseLocation"/> <constraints> <constraint firstAttribute="height" constant="48" id="1d3-V3-ab6"/> @@ -56,6 +63,9 @@ </constraints> <inset key="contentEdgeInsets" minX="16" minY="0.0" maxX="16" maxY="0.0"/> <state key="normal" image="ic_get_position"/> + <userDefinedRuntimeAttributes> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="MWMBlue"/> + </userDefinedRuntimeAttributes> <connections> <action selector="addLocationRoutePoint" destination="iN0-l3-epB" eventType="touchUpInside" id="4bf-b1-JqQ"/> </connections> @@ -91,19 +101,7 @@ <rect key="frame" x="-100" y="-100" width="1424" height="157.5"/> <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/> - <userDefinedRuntimeAttribute type="number" keyPath="layer.shadowRadius"> - <integer key="value" value="2"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="color" keyPath="layer.shadowUIColor"> - <color key="value" red="0.0" green="0.0" blue="0.0" alpha="0.23999999999999999" colorSpace="custom" customColorSpace="sRGB"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="number" keyPath="layer.shadowOpacity"> - <integer key="value" value="1"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="size" keyPath="layer.shadowOffset"> - <size key="value" width="0.0" height="1"/> - </userDefinedRuntimeAttribute> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="StreetNameBackgroundView"/> </userDefinedRuntimeAttributes> </view> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="600" verticalCompressionResistancePriority="600" text="Ленинградский проспект" textAlignment="center" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ShI-bz-5g8"> @@ -115,7 +113,7 @@ <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="styleName" value="blackPrimaryText"/> </userDefinedRuntimeAttributes> </label> </subviews> @@ -145,6 +143,9 @@ <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="AJe-8N-rpk"> <rect key="frame" x="0.0" y="0.0" width="72" height="72"/> <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/> + <userDefinedRuntimeAttributes> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="MWMWhite"/> + </userDefinedRuntimeAttributes> </imageView> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="1" textAlignment="center" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="teB-QQ-oib"> <rect key="frame" x="30" y="21.5" width="12" height="29"/> @@ -152,7 +153,7 @@ <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <nil key="highlightedColor"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="white"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="whiteText"/> </userDefinedRuntimeAttributes> </label> </subviews> @@ -173,7 +174,7 @@ <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <nil key="highlightedColor"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="white"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="whiteText"/> </userDefinedRuntimeAttributes> </label> </subviews> @@ -188,22 +189,7 @@ <constraint firstItem="KuR-1J-VI2" firstAttribute="top" secondItem="tnR-CA-hkI" secondAttribute="bottom" constant="4" id="y5u-lH-Ytt"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="linkBlue"/> - <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius"> - <integer key="value" value="4"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="number" keyPath="layer.shadowRadius"> - <integer key="value" value="2"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="color" keyPath="layer.shadowUIColor"> - <color key="value" red="0.0" green="0.0" blue="0.0" alpha="0.23999999999999999" colorSpace="custom" customColorSpace="sRGB"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="number" keyPath="layer.shadowOpacity"> - <integer key="value" value="1"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="size" keyPath="layer.shadowOffset"> - <size key="value" width="0.0" height="1"/> - </userDefinedRuntimeAttribute> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="FirstTurnView"/> </userDefinedRuntimeAttributes> </view> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="8Zu-Ff-6p2" userLabel="Second turn" customClass="SolidTouchView"> @@ -215,6 +201,9 @@ <constraint firstAttribute="width" constant="24" id="4ye-1W-bU2"/> <constraint firstAttribute="height" constant="24" id="Fxo-9b-MUJ"/> </constraints> + <userDefinedRuntimeAttributes> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="MWMBlack"/> + </userDefinedRuntimeAttributes> </imageView> </subviews> <color key="backgroundColor" red="1" green="1" blue="1" alpha="0.80000000000000004" colorSpace="custom" customColorSpace="sRGB"/> @@ -224,22 +213,7 @@ <constraint firstAttribute="height" constant="32" id="n57-ET-oyc"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius"> - <integer key="value" value="4"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/> - <userDefinedRuntimeAttribute type="number" keyPath="layer.shadowRadius"> - <integer key="value" value="2"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="color" keyPath="layer.shadowUIColor"> - <color key="value" red="0.0" green="0.0" blue="0.0" alpha="0.23999999999999999" colorSpace="custom" customColorSpace="sRGB"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="number" keyPath="layer.shadowOpacity"> - <integer key="value" value="1"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="size" keyPath="layer.shadowOffset"> - <size key="value" width="0.0" height="1"/> - </userDefinedRuntimeAttribute> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="SecondTurnView"/> </userDefinedRuntimeAttributes> </view> </subviews> @@ -266,6 +240,9 @@ <constraint firstAttribute="height" constant="56" id="p3i-Ly-sTx"/> </constraints> <state key="normal" image="ic_routing_search_light"/> + <userDefinedRuntimeAttributes> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="ButtonMapBookmarks"/> + </userDefinedRuntimeAttributes> <connections> <action selector="bookmarksButtonTouchUpInside" destination="iN0-l3-epB" eventType="touchUpInside" id="YwB-gA-E8p"/> </connections> @@ -274,54 +251,54 @@ <rect key="frame" x="-72" y="615" width="200" height="200"/> <subviews> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="2Bv-7H-IZt" userLabel="Gas" customClass="MWMButton"> - <rect key="frame" x="78" y="14" width="44" height="44"/> + <rect key="frame" x="76" y="14" width="48" height="48"/> <constraints> <constraint firstAttribute="width" priority="750" constant="44" id="KKe-fH-h2n"/> <constraint firstAttribute="width" secondItem="2Bv-7H-IZt" secondAttribute="height" multiplier="1:1" id="mN1-Tu-Mon"/> </constraints> <state key="normal" image="ic_routing_fuel_on"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="coloringName" value="MWMBlack"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="MWMBlack"/> </userDefinedRuntimeAttributes> <connections> <action selector="searchButtonTouchUpInside:" destination="iN0-l3-epB" eventType="touchUpInside" id="14l-BK-iDr"/> </connections> </button> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="RP3-01-Pj7" userLabel="Parking" customClass="MWMButton"> - <rect key="frame" x="122" y="34" width="44" height="44"/> + <rect key="frame" x="118" y="34" width="48" height="48"/> <state key="normal" image="ic_routing_parking_on"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="coloringName" value="MWMBlack"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="MWMBlack"/> </userDefinedRuntimeAttributes> <connections> <action selector="searchButtonTouchUpInside:" destination="iN0-l3-epB" eventType="touchUpInside" id="uiN-0q-kol"/> </connections> </button> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="GcK-FI-VXw" userLabel="Eat" customClass="MWMButton"> - <rect key="frame" x="142" y="78" width="44" height="44"/> + <rect key="frame" x="138" y="76" width="48" height="48"/> <state key="normal" image="ic_routing_eat_on"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="coloringName" value="MWMBlack"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="MWMBlack"/> </userDefinedRuntimeAttributes> <connections> <action selector="searchButtonTouchUpInside:" destination="iN0-l3-epB" eventType="touchUpInside" id="3le-Cd-rvC"/> </connections> </button> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Ggf-tc-U3R" userLabel="Food" customClass="MWMButton"> - <rect key="frame" x="122" y="122" width="44" height="44"/> + <rect key="frame" x="118" y="118" width="48" height="48"/> <state key="normal" image="ic_routing_food_on"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="coloringName" value="MWMBlack"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="MWMBlack"/> </userDefinedRuntimeAttributes> <connections> <action selector="searchButtonTouchUpInside:" destination="iN0-l3-epB" eventType="touchUpInside" id="hkk-Xo-uPg"/> </connections> </button> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="uoS-b2-FcN" userLabel="ATM" customClass="MWMButton"> - <rect key="frame" x="78" y="142" width="44" height="44"/> + <rect key="frame" x="76" y="138" width="48" height="48"/> <state key="normal" image="ic_routing_atm_on"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="coloringName" value="MWMBlack"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="MWMBlack"/> </userDefinedRuntimeAttributes> <connections> <action selector="searchButtonTouchUpInside:" destination="iN0-l3-epB" eventType="touchUpInside" id="Pqo-CT-Cog"/> @@ -362,7 +339,7 @@ <constraint firstItem="Ggf-tc-U3R" firstAttribute="trailing" secondItem="uoS-b2-FcN" secondAttribute="leading" priority="250" id="vcn-Dj-WUu"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="menuBackground"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="MenuBackground"/> </userDefinedRuntimeAttributes> </view> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Xna-Q1-7zW" customClass="MWMButton"> diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/NavigationAddPointToastView.swift b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/NavigationAddPointToastView.swift index fac1fb42bf..00e5c98d71 100644 --- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/NavigationAddPointToastView.swift +++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/NavigationAddPointToastView.swift @@ -1,31 +1,9 @@ @objc(MWMNavigationAddPointToastView) final class NavigationAddPointToastView: UIView { - @IBOutlet private var actionButton: UIButton! { - didSet { - actionButton.setTitleColor(UIColor.linkBlue(), for: .normal) - actionButton.tintColor = UIColor.linkBlue() - actionButton.titleLabel?.font = UIFont.regular16() - } - } - - @IBOutlet private var locationButton: UIButton! { - didSet { - locationButton.tintColor = UIColor.linkBlue() - } - } - - @IBOutlet private var separator: UIView! { - didSet { - separator.backgroundColor = UIColor.blackDividers() - } - } - - @IBOutlet private weak var extraBottomBackground: UIView! { - didSet { - extraBottomBackground.backgroundColor = UIColor.white() - } - } - + @IBOutlet private var actionButton: UIButton! + @IBOutlet private var locationButton: UIButton! + @IBOutlet private var separator: UIView! + @IBOutlet private weak var extraBottomBackground: UIView! @objc private(set) var isStart = true @objc func config(isStart: Bool, withLocationButton: Bool) { diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/NavigationControlView.swift b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/NavigationControlView.swift index eef56266fc..cce0faa647 100644 --- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/NavigationControlView.swift +++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/NavigationControlView.swift @@ -120,12 +120,6 @@ final class NavigationControlView: SolidTouchView, MWMTextToSpeechObserver, MapO }) } - override func mwm_refreshUI() { - if isVisible { - super.mwm_refreshUI() - } - } - override func awakeFromNib() { super.awakeFromNib() translatesAutoresizingMaskIntoConstraints = false diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/NavigationControlView.xib b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/NavigationControlView.xib index f327808494..cdfd6cfa9b 100644 --- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/NavigationControlView.xib +++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/NavigationControlView.xib @@ -1,11 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> - <device id="retina4_7" orientation="portrait"> - <adaptation id="fullscreen"/> - </device> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> + <device id="retina4_7" orientation="portrait" appearance="light"/> <dependencies> <deployment identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14460.20"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/> <capability name="Safe area layout guides" minToolsVersion="9.0"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> @@ -24,7 +22,7 @@ <rect key="frame" x="-100" y="0.0" width="520" height="216"/> <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Background"/> </userDefinedRuntimeAttributes> </view> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="u7O-n6-ZXy"> @@ -45,7 +43,7 @@ <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="styleName" value="blackPrimaryText"/> </userDefinedRuntimeAttributes> </label> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="wgS-eK-vfD"> @@ -54,7 +52,7 @@ <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="blackSecondaryText"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="blackSecondaryText"/> </userDefinedRuntimeAttributes> </label> </subviews> @@ -83,11 +81,12 @@ <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="styleName" value="blackPrimaryText"/> </userDefinedRuntimeAttributes> </label> <pageControl opaque="NO" contentMode="scaleToFill" verticalCompressionResistancePriority="100" contentHorizontalAlignment="center" contentVerticalAlignment="center" numberOfPages="2" translatesAutoresizingMaskIntoConstraints="NO" id="ppd-rW-dYo"> <rect key="frame" x="52.5" y="4" width="23" height="13"/> + <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> <constraints> <constraint firstAttribute="height" constant="13" id="BmO-Rd-DKp"/> </constraints> @@ -121,7 +120,7 @@ <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="styleName" value="blackPrimaryText"/> </userDefinedRuntimeAttributes> </label> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="7dx-1W-LWs"> @@ -130,7 +129,7 @@ <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="blackSecondaryText"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="blackSecondaryText"/> </userDefinedRuntimeAttributes> </label> </subviews> @@ -155,7 +154,7 @@ <constraint firstAttribute="width" id="vxl-iA-p8N"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="linkBlue"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="BlueBackground"/> </userDefinedRuntimeAttributes> </view> </subviews> @@ -183,7 +182,7 @@ </constraints> <state key="normal" image="ic_menu"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="coloringName" value="MWMBlack"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="MWMBlack"/> </userDefinedRuntimeAttributes> <connections> <action selector="extendAction" destination="9fq-65-qd9" eventType="touchUpInside" id="uAL-Qn-4ne"/> @@ -236,7 +235,7 @@ <state key="normal" image="ic_voice_on"/> <state key="selected" image="ic_voice_off"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="coloringName" value="MWMBlack"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="MWMBlack"/> </userDefinedRuntimeAttributes> <connections> <action selector="ttsButtonAction" destination="-1" eventType="touchUpInside" id="2U8-vo-LOQ"/> @@ -247,7 +246,7 @@ <state key="normal" image="ic_setting_traffic_on"/> <state key="selected" image="ic_setting_traffic_off"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="coloringName" value="MWMBlack"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="MWMBlack"/> </userDefinedRuntimeAttributes> <connections> <action selector="trafficButtonAction" destination="-1" eventType="touchUpInside" id="ZI3-1D-OeH"/> @@ -257,7 +256,7 @@ <rect key="frame" x="138.5" y="0.0" width="57.5" height="64"/> <state key="normal" image="ic_menu_settings"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="coloringName" value="MWMBlack"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="MWMBlack"/> </userDefinedRuntimeAttributes> <connections> <action selector="settingsButtonAction" destination="-1" eventType="touchUpInside" id="m7v-S7-aqm"/> @@ -274,14 +273,7 @@ <color key="titleColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> </state> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular17"/> - <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius"> - <integer key="value" value="8"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="current_location_unknown_stop_button"/> - <userDefinedRuntimeAttribute type="string" keyPath="textColorName" value="whitePrimaryText"/> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="buttonRed"/> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundHighlightedColorName" value="buttonRedHighlighted"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="FlatRedButton:regular17"/> </userDefinedRuntimeAttributes> <connections> <action selector="stopRoutingButtonAction" destination="-1" eventType="touchUpInside" id="Xvf-fv-3GR"/> diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMiPadRoutePreview.xib b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMiPadRoutePreview.xib index 2831980945..7576f0f1e5 100644 --- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMiPadRoutePreview.xib +++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMiPadRoutePreview.xib @@ -1,11 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> - <device id="retina4_7" orientation="portrait"> - <adaptation id="fullscreen"/> - </device> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15705" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> + <device id="retina4_7" orientation="portrait" appearance="light"/> <dependencies> <deployment identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14490.49"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15706"/> <capability name="Safe area layout guides" minToolsVersion="9.0"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> @@ -33,7 +31,7 @@ <constraint firstAttribute="height" constant="20" id="0AS-cy-xIW"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="primary"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="PrimaryBackground"/> </userDefinedRuntimeAttributes> </view> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="l7E-Ns-2Nn" userLabel="Options View"> @@ -59,7 +57,7 @@ </constraints> <viewLayoutGuide key="safeArea" id="THL-V3-3xS"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="secondary"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="SecondaryBackground"/> </userDefinedRuntimeAttributes> </view> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="3s2-BV-X5i" customClass="SolidTouchView"> @@ -156,7 +154,7 @@ <constraint firstAttribute="bottom" secondItem="sXu-tl-a0m" secondAttribute="bottom" constant="4" id="wEf-uh-sfy"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="primary"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="PrimaryBackground"/> </userDefinedRuntimeAttributes> </view> <view clipsSubviews="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="87p-Qg-8f3" customClass="MWMBaseRoutePreviewStatus"> @@ -172,8 +170,7 @@ <nil key="highlightedColor"/> <userDefinedRuntimeAttributes> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="routing_planning_error"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="red"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular17"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular17:redText"/> </userDefinedRuntimeAttributes> </label> </subviews> @@ -193,8 +190,7 @@ <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"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular17:blackSecondaryText"/> </userDefinedRuntimeAttributes> </label> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Arrive at 12:24" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="oec-Ee-6ha"> @@ -203,8 +199,7 @@ <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="medium14"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="medium14:blackSecondaryText"/> </userDefinedRuntimeAttributes> </label> </subviews> @@ -230,8 +225,7 @@ <nil key="textColor"/> <nil key="highlightedColor"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="linkBlue"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="medium14"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="medium14:linkBlueText"/> </userDefinedRuntimeAttributes> </label> </subviews> @@ -278,7 +272,7 @@ <constraint firstAttribute="height" constant="1" id="ZFh-zw-f9W"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="blackDividers"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Divider"/> </userDefinedRuntimeAttributes> </view> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="NAs-km-8uw"> @@ -286,6 +280,9 @@ <inset key="contentEdgeInsets" minX="8" minY="0.0" maxX="0.0" maxY="0.0"/> <inset key="imageEdgeInsets" minX="-16" minY="0.0" maxX="0.0" maxY="0.0"/> <state key="normal" title="ManageRoute" image="ic_24px_manager"/> + <userDefinedRuntimeAttributes> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="medium14:MWMBlack"/> + </userDefinedRuntimeAttributes> <connections> <action selector="showRouteManager" destination="-1" eventType="touchUpInside" id="eOk-zR-QEb"/> </connections> @@ -314,7 +311,7 @@ <inset key="sectionInset" minX="0.0" minY="0.0" maxX="0.0" maxY="0.0"/> </collectionViewFlowLayout> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Background"/> </userDefinedRuntimeAttributes> </collectionView> </subviews> @@ -358,13 +355,7 @@ <constraint firstItem="QEP-6s-YTM" firstAttribute="leading" secondItem="87p-Qg-8f3" secondAttribute="leading" id="x6v-27-R7O"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="color" keyPath="layer.borderUIColor"> - <color key="value" red="0.0" green="0.0" blue="0.0" alpha="0.12" colorSpace="custom" customColorSpace="sRGB"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="number" keyPath="layer.borderWidth"> - <integer key="value" value="1"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="RouteBasePreview"/> </userDefinedRuntimeAttributes> <connections> <outlet property="arriveLabel" destination="oec-Ee-6ha" id="FLF-8X-PAf"/> @@ -415,13 +406,7 @@ <constraint firstAttribute="height" priority="100" constant="80" id="lLi-5o-PDI"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="color" keyPath="layer.borderUIColor"> - <color key="value" red="0.0" green="0.0" blue="0.0" alpha="0.12" colorSpace="custom" customColorSpace="sRGB"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="number" keyPath="layer.borderWidth"> - <integer key="value" value="1"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="RouteBasePreview"/> </userDefinedRuntimeAttributes> <connections> <outlet property="etaLabel" destination="tuZ-25-ltG" id="Rwo-UC-mvq"/> @@ -441,11 +426,8 @@ <color key="titleColor" red="0.0" green="0.0" blue="0.0" alpha="0.26000000000000001" colorSpace="custom" customColorSpace="sRGB"/> </state> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular17"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="FlatNormalButtonBig"/> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="p2p_start"/> - <userDefinedRuntimeAttribute type="string" keyPath="textColorName" value="white"/> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="linkBlue"/> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundHighlightedColorName" value="linkBlueHighlighted"/> </userDefinedRuntimeAttributes> <connections> <action selector="routingStartTouchUpInside" destination="-1" eventType="touchUpInside" id="S0p-CT-EfI"/> @@ -461,13 +443,7 @@ <constraint firstAttribute="bottom" secondItem="4IJ-pR-Ztp" secondAttribute="bottom" id="iof-B4-bI3"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="color" keyPath="layer.borderUIColor"> - <color key="value" red="0.0" green="0.0" blue="0.0" alpha="0.12" colorSpace="custom" customColorSpace="sRGB"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="number" keyPath="layer.borderWidth"> - <integer key="value" value="1"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="RouteBasePreview"/> </userDefinedRuntimeAttributes> </view> </subviews> @@ -495,19 +471,7 @@ <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/> <viewLayoutGuide key="safeArea" id="rhh-dY-ZHT"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="number" keyPath="layer.shadowRadius"> - <integer key="value" value="2"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="color" keyPath="layer.shadowUIColor"> - <color key="value" red="0.0" green="0.0" blue="0.0" alpha="0.23999999999999999" colorSpace="custom" customColorSpace="sRGB"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="number" keyPath="layer.shadowOpacity"> - <integer key="value" value="1"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="size" keyPath="layer.shadowOffset"> - <size key="value" width="3" height="0.0"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="pressBackground"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="RoutePreview"/> </userDefinedRuntimeAttributes> <connections> <outlet property="backButton" destination="a4n-5I-PN3" id="42W-5B-Z8i"/> diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMiPhoneRoutePreview.xib b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMiPhoneRoutePreview.xib index d61b20d851..4962513b69 100644 --- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMiPhoneRoutePreview.xib +++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMiPhoneRoutePreview.xib @@ -1,11 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> - <device id="retina4_7" orientation="portrait"> - <adaptation id="fullscreen"/> - </device> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15705" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> + <device id="retina4_7" orientation="portrait" appearance="light"/> <dependencies> <deployment identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14490.49"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15706"/> <capability name="Safe area layout guides" minToolsVersion="9.0"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> @@ -47,7 +45,7 @@ <constraint firstAttribute="height" constant="48" id="l8l-Ii-g5U"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="secondary"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="SecondaryBackground"/> </userDefinedRuntimeAttributes> </view> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="tRj-9k-ciR"> @@ -57,7 +55,7 @@ <constraint firstAttribute="height" constant="44" id="QYY-96-CiC"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="primary"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="PrimaryBackground"/> </userDefinedRuntimeAttributes> </view> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="WqK-Yb-PmP" customClass="SolidTouchView"> @@ -167,7 +165,7 @@ <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="oQc-l8-sZH" secondAttribute="trailing" constant="4" id="yBS-u8-1oX"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="primary"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="PrimaryBackground"/> </userDefinedRuntimeAttributes> </view> </subviews> @@ -207,13 +205,7 @@ <rect key="frame" x="-100" y="0.0" width="520" height="252"/> <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="color" keyPath="layer.borderUIColor"> - <color key="value" red="0.0" green="0.0" blue="0.0" alpha="0.12" colorSpace="custom" customColorSpace="sRGB"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="number" keyPath="layer.borderWidth"> - <integer key="value" value="1"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="RouteBasePreview"/> </userDefinedRuntimeAttributes> </view> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="fD2-1N-x27" userLabel="Error Box"> @@ -226,8 +218,7 @@ <nil key="highlightedColor"/> <userDefinedRuntimeAttributes> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="routing_planning_error"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="red"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular17"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular17:redText"/> </userDefinedRuntimeAttributes> </label> </subviews> @@ -247,8 +238,7 @@ <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"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular17:blackSecondaryText"/> </userDefinedRuntimeAttributes> </label> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Zzm-Yo-BvL"> @@ -256,6 +246,9 @@ <inset key="contentEdgeInsets" minX="8" minY="0.0" maxX="0.0" maxY="0.0"/> <inset key="imageEdgeInsets" minX="-16" minY="0.0" maxX="0.0" maxY="0.0"/> <state key="normal" title="ManageRoute" image="ic_24px_manager"/> + <userDefinedRuntimeAttributes> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="medium14:MWMBlack"/> + </userDefinedRuntimeAttributes> <connections> <action selector="showRouteManager" destination="-1" eventType="touchUpInside" id="KZh-LJ-k72"/> </connections> @@ -273,14 +266,8 @@ <color key="titleColor" red="0.0" green="0.0" blue="0.0" alpha="0.26000000000000001" colorSpace="custom" customColorSpace="sRGB"/> </state> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular17"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="FlatNormalButton:regular17"/> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="p2p_start"/> - <userDefinedRuntimeAttribute type="string" keyPath="textColorName" value="white"/> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="linkBlue"/> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundHighlightedColorName" value="linkBlueHighlighted"/> - <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius"> - <integer key="value" value="6"/> - </userDefinedRuntimeAttribute> </userDefinedRuntimeAttributes> <connections> <action selector="routingStartTouchUpInside" destination="-1" eventType="touchUpInside" id="IWD-gV-wDp"/> @@ -340,6 +327,9 @@ <inset key="contentEdgeInsets" minX="8" minY="0.0" maxX="0.0" maxY="0.0"/> <inset key="imageEdgeInsets" minX="-16" minY="0.0" maxX="0.0" maxY="0.0"/> <state key="normal" title="ManageRoute" image="ic_24px_manager"/> + <userDefinedRuntimeAttributes> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="medium14:MWMBlack"/> + </userDefinedRuntimeAttributes> <connections> <action selector="showRouteManager" destination="-1" eventType="touchUpInside" id="Nvr-ZO-h84"/> </connections> @@ -369,7 +359,7 @@ <inset key="sectionInset" minX="0.0" minY="0.0" maxX="0.0" maxY="0.0"/> </collectionViewFlowLayout> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Background"/> </userDefinedRuntimeAttributes> </collectionView> <button hidden="YES" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="tailTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ZXz-KM-xQz" userLabel="Go" customClass="MWMRouteStartButton"> @@ -385,14 +375,8 @@ <color key="titleColor" red="0.0" green="0.0" blue="0.0" alpha="0.26000000000000001" colorSpace="custom" customColorSpace="sRGB"/> </state> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular17"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="FlatNormalButtonBig"/> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="p2p_start"/> - <userDefinedRuntimeAttribute type="string" keyPath="textColorName" value="white"/> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="linkBlue"/> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundHighlightedColorName" value="linkBlueHighlighted"/> - <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius"> - <integer key="value" value="6"/> - </userDefinedRuntimeAttribute> </userDefinedRuntimeAttributes> <connections> <action selector="routingStartTouchUpInside" destination="-1" eventType="touchUpInside" id="zAg-HJ-CL1"/> @@ -472,13 +456,7 @@ <rect key="frame" x="-100" y="0.0" width="520" height="180"/> <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="color" keyPath="layer.borderUIColor"> - <color key="value" red="0.0" green="0.0" blue="0.0" alpha="0.12" colorSpace="custom" customColorSpace="sRGB"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="number" keyPath="layer.borderWidth"> - <integer key="value" value="1"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="RouteBasePreview"/> </userDefinedRuntimeAttributes> </view> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Iu4-M8-t6g"> diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RouteManager/RouteManagerCell.swift b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RouteManager/RouteManagerCell.swift index 35d3c3f14c..c085a3815f 100644 --- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RouteManager/RouteManagerCell.swift +++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RouteManager/RouteManagerCell.swift @@ -1,19 +1,7 @@ final class RouteManagerCell: MWMTableViewCell { @IBOutlet private weak var typeImage: UIImageView! - @IBOutlet private weak var titleLabel: UILabel! { - didSet { - titleLabel.textColor = UIColor.blackPrimaryText() - titleLabel.font = UIFont.regular16() - } - } - - @IBOutlet weak var subtitleLabel: UILabel! { - didSet { - subtitleLabel.textColor = UIColor.blackSecondaryText() - subtitleLabel.font = UIFont.regular14() - } - } - + @IBOutlet private weak var titleLabel: UILabel! + @IBOutlet weak var subtitleLabel: UILabel! @IBOutlet private weak var dragImage: UIImageView! { didSet { dragImage.image = #imageLiteral(resourceName: "ic_route_manager_move") @@ -23,17 +11,11 @@ final class RouteManagerCell: MWMTableViewCell { @IBOutlet private weak var separator1: UIView! { didSet { - separator1.backgroundColor = UIColor.blackDividers() separator1.layer.cornerRadius = 2 } } - @IBOutlet weak var separator2: UIView! { - didSet { - separator2.backgroundColor = UIColor.blackDividers() - } - } - + @IBOutlet weak var separator2: UIView! private var index: Int! private var model: MWMRoutePoint! @IBOutlet var subtitleConstraints: [NSLayoutConstraint]! @@ -41,9 +23,9 @@ final class RouteManagerCell: MWMTableViewCell { override var snapshot: UIView { let skipViews: [UIView] = [typeImage, separator1, separator2] skipViews.forEach { $0.isHidden = true } - backgroundColor = UIColor.blackOpaque() + setStyleAndApply("BlackOpaqueBackground") let snapshot = super.snapshot - backgroundColor = UIColor.white() + setStyleAndApply("Background") skipViews.forEach { $0.isHidden = false } return snapshot } @@ -52,7 +34,6 @@ final class RouteManagerCell: MWMTableViewCell { self.model = model self.index = index - backgroundColor = UIColor.white() setupTypeImage() setupLabels() setupSeparators() @@ -110,4 +91,9 @@ final class RouteManagerCell: MWMTableViewCell { separator1.isHidden = isSeparatorsHidden separator2.isHidden = isSeparatorsHidden } + + override func applyTheme() { + super.applyTheme() + self.setupTypeImage() + } } diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RouteManager/RouteManagerCell.xib b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RouteManager/RouteManagerCell.xib index 1bd149849d..c1fe8529d4 100644 --- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RouteManager/RouteManagerCell.xib +++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RouteManager/RouteManagerCell.xib @@ -1,65 +1,74 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> - <device id="retina4_7" orientation="portrait"> - <adaptation id="fullscreen"/> - </device> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> + <device id="retina4_7" orientation="portrait" appearance="light"/> <dependencies> <deployment identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/> - <capability name="Aspect ratio constraints" minToolsVersion="5.1"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/> <capability name="Safe area layout guides" minToolsVersion="9.0"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> <objects> <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/> <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/> - <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="KGk-i7-Jjw" customClass="RouteManagerCell" customModule="maps_me" customModuleProvider="target" propertyAccessControl="all"> + <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="KGk-i7-Jjw" customClass="RouteManagerCell" customModule="maps_me" customModuleProvider="target" propertyAccessControl="none"> <rect key="frame" x="0.0" y="0.0" width="320" height="66"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM"> - <rect key="frame" x="0.0" y="0.0" width="320" height="65.5"/> + <rect key="frame" x="0.0" y="0.0" width="320" height="66"/> <autoresizingMask key="autoresizingMask"/> <subviews> <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="We3-dE-JYe"> - <rect key="frame" x="16" y="20" width="24" height="24"/> + <rect key="frame" x="16" y="21" width="24" height="24"/> <constraints> <constraint firstAttribute="width" secondItem="We3-dE-JYe" secondAttribute="height" multiplier="1:1" id="LD8-kb-Haz"/> <constraint firstAttribute="width" constant="24" id="jtH-Dc-l1B"/> </constraints> </imageView> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="E8T-WR-b4P"> - <rect key="frame" x="60" y="12" width="212" height="21"/> + <rect key="frame" x="60" y="12" width="212" height="20.5"/> <fontDescription key="fontDescription" type="system" pointSize="17"/> <nil key="textColor"/> <nil key="highlightedColor"/> + <userDefinedRuntimeAttributes> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular16:blackPrimaryText"/> + </userDefinedRuntimeAttributes> </label> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ec0-Sc-NrV"> - <rect key="frame" x="60" y="37" width="212" height="16.5"/> + <rect key="frame" x="60" y="36.5" width="212" height="17.5"/> <fontDescription key="fontDescription" type="system" pointSize="17"/> <nil key="textColor"/> <nil key="highlightedColor"/> + <userDefinedRuntimeAttributes> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular16:blackSecondaryText"/> + </userDefinedRuntimeAttributes> </label> <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="a6S-xz-wDs"> - <rect key="frame" x="280" y="20" width="24" height="24"/> + <rect key="frame" x="280" y="21" width="24" height="24"/> <constraints> <constraint firstAttribute="width" constant="24" id="4YZ-4p-E4H"/> <constraint firstAttribute="width" secondItem="a6S-xz-wDs" secondAttribute="height" multiplier="1:1" id="QCB-eE-cuO"/> </constraints> </imageView> <view clipsSubviews="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="e4S-qN-tx8"> - <rect key="frame" x="26" y="61.5" width="4" height="4"/> + <rect key="frame" x="26" y="62" width="4" height="4"/> <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> <constraints> <constraint firstAttribute="width" secondItem="e4S-qN-tx8" secondAttribute="height" multiplier="1:1" id="Fec-Pg-5YG"/> <constraint firstAttribute="width" constant="4" id="bHk-pR-fsG"/> </constraints> + <userDefinedRuntimeAttributes> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Divider"/> + </userDefinedRuntimeAttributes> </view> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="E4r-3f-9l2"> - <rect key="frame" x="60" y="64.5" width="260" height="1"/> + <rect key="frame" x="60" y="65" width="260" height="1"/> <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> <constraints> <constraint firstAttribute="height" constant="1" id="iTg-i0-sIJ"/> </constraints> + <userDefinedRuntimeAttributes> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Divider"/> + </userDefinedRuntimeAttributes> </view> </subviews> <constraints> @@ -94,6 +103,7 @@ <outletCollection property="subtitleConstraints" destination="vdO-bJ-CRg" collectionClass="NSMutableArray" id="YBl-7I-Qow"/> <outletCollection property="subtitleConstraints" destination="OFV-X4-OWD" collectionClass="NSMutableArray" id="0A7-Qz-hws"/> </connections> + <point key="canvasLocation" x="139" y="154"/> </tableViewCell> </objects> </document> diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RouteManager/RouteManagerDimView.swift b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RouteManager/RouteManagerDimView.swift index d9591a9a1b..2aef184652 100644 --- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RouteManager/RouteManagerDimView.swift +++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RouteManager/RouteManagerDimView.swift @@ -1,13 +1,6 @@ final class RouteManagerDimView: UIView { @IBOutlet private weak var image: UIImageView! - @IBOutlet private weak var label: UILabel! { - didSet { - label.text = L("planning_route_remove_title") - label.font = UIFont.regular18() - label.textColor = UIColor.white() - } - } - + @IBOutlet private weak var label: UILabel! @IBOutlet private weak var messageView: UIView! @IBOutlet private weak var messageViewContainer: UIView! @IBOutlet private var messageViewVerticalCenter: NSLayoutConstraint! @@ -43,7 +36,7 @@ final class RouteManagerDimView: UIView { didSet { guard isVisible != oldValue else { return } let componentsAlpha: CGFloat = 0.5 - backgroundColor = UIColor.blackStatusBarBackground() + setStyleAndApply("BlackStatusBarBackground") alpha = isVisible ? 0 : 1 image.alpha = isVisible ? 0 : componentsAlpha label.alpha = isVisible ? 0 : componentsAlpha diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RouteManager/RouteManagerFooterView.swift b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RouteManager/RouteManagerFooterView.swift index cc80fdf585..b6bd220c26 100644 --- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RouteManager/RouteManagerFooterView.swift +++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RouteManager/RouteManagerFooterView.swift @@ -1,31 +1,8 @@ final class RouteManagerFooterView: UIView { - @IBOutlet private weak var cancelButton: UIButton! { - didSet { - cancelButton.setTitle(L("cancel"), for: .normal) - cancelButton.setTitleColor(UIColor.linkBlue(), for: .normal) - } - } - - @IBOutlet private weak var planButton: UIButton! { - didSet { - planButton.setTitle(L("button_plan"), for: .normal) - planButton.setTitleColor(UIColor.linkBlue(), for: .normal) - planButton.setTitleColor(UIColor.buttonDisabledBlueText(), for: .disabled) - } - } - - @IBOutlet weak var separator: UIView! { - didSet { - separator.backgroundColor = UIColor.blackDividers() - } - } - - @IBOutlet weak var background: UIView! { - didSet { - background.backgroundColor = UIColor.blackOpaque() - } - } - + @IBOutlet private weak var cancelButton: UIButton! + @IBOutlet private weak var planButton: UIButton! + @IBOutlet weak var separator: UIView! + @IBOutlet weak var background: UIView! var isPlanButtonEnabled = true { didSet { planButton.isEnabled = isPlanButtonEnabled diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RouteManager/RouteManagerHeaderView.swift b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RouteManager/RouteManagerHeaderView.swift index af1028e494..66f731813a 100644 --- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RouteManager/RouteManagerHeaderView.swift +++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RouteManager/RouteManagerHeaderView.swift @@ -1,11 +1,5 @@ final class RouteManagerHeaderView: UIView { - @IBOutlet private weak var titleLabel: UILabel! { - didSet { - titleLabel.text = L("planning_route_manage_route") - titleLabel.font = UIFont.bold22() - titleLabel.textColor = UIColor.blackPrimaryText() - } - } + @IBOutlet private weak var titleLabel: UILabel! @IBOutlet private weak var addLocationButton: UIButton! { didSet { // TODO(igrechuhin): Uncomment when start_from_my_position translation is ready. @@ -20,11 +14,7 @@ final class RouteManagerHeaderView: UIView { // addLocationButton.imageView?.transform = flipLR } } - @IBOutlet weak var separator: UIView! { - didSet { - separator.backgroundColor = UIColor.blackDividers() - } - } + @IBOutlet weak var separator: UIView! var isLocationButtonEnabled = true { didSet { @@ -35,6 +25,10 @@ final class RouteManagerHeaderView: UIView { override func awakeFromNib() { super.awakeFromNib() - backgroundColor = UIColor.white() + } + + override func applyTheme() { + super.applyTheme() + addLocationButton.tintColor = isLocationButtonEnabled ? UIColor.linkBlue() : UIColor.buttonDisabledBlueText() } } diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RouteManager/RouteManagerViewController.swift b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RouteManager/RouteManagerViewController.swift index c2330e3545..cc0364d85b 100644 --- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RouteManager/RouteManagerViewController.swift +++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RouteManager/RouteManagerViewController.swift @@ -14,7 +14,7 @@ final class RouteManagerViewController: MWMViewController, UITableViewDataSource lazy var chromeView: UIView = { let view = UIView() - view.backgroundColor = UIColor.blackStatusBarBackground() + view.styleName = "BlackStatusBarBackground" return view }() diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RouteManager/RouteManagerViewController.xib b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RouteManager/RouteManagerViewController.xib index 526e7bf751..2da6c99319 100644 --- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RouteManager/RouteManagerViewController.xib +++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RouteManager/RouteManagerViewController.xib @@ -1,13 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> - <device id="retina4_7" orientation="portrait"> - <adaptation id="fullscreen"/> - </device> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15705" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> <dependencies> - <deployment identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/> - <capability name="Aspect ratio constraints" minToolsVersion="5.1"/> - <capability name="Constraints to layout margins" minToolsVersion="6.0"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15706"/> <capability name="Safe area layout guides" minToolsVersion="9.0"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> @@ -27,14 +21,14 @@ </connections> </placeholder> <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/> - <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="3y4-jh-JUF" customClass="RouteManagerDimView" customModule="maps_me" customModuleProvider="target" propertyAccessControl="all"> + <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="3y4-jh-JUF" customClass="RouteManagerDimView" customModule="maps_me" customModuleProvider="target" propertyAccessControl="none"> <rect key="frame" x="0.0" y="0.0" width="375" height="667"/> <subviews> <view userInteractionEnabled="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="TC7-xW-EwE"> <rect key="frame" x="0.0" y="0.0" width="375" height="667"/> <subviews> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="kTd-fr-ia7"> - <rect key="frame" x="166.5" y="264.5" width="42" height="136.5"/> + <rect key="frame" x="166.5" y="265.5" width="42" height="136.5"/> <subviews> <imageView userInteractionEnabled="NO" alpha="0.0" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="ic_route_manager_trash" translatesAutoresizingMaskIntoConstraints="NO" id="ZEN-kK-2CA"> <rect key="frame" x="-3" y="40" width="48" height="48"/> @@ -48,6 +42,10 @@ <fontDescription key="fontDescription" type="system" pointSize="17"/> <nil key="textColor"/> <nil key="highlightedColor"/> + <userDefinedRuntimeAttributes> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular18:whiteText"/> + <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="planning_route_remove_title"/> + </userDefinedRuntimeAttributes> </label> </subviews> <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> @@ -93,7 +91,7 @@ </connections> <point key="canvasLocation" x="288" y="-49"/> </view> - <view contentMode="scaleToFill" id="TKX-qe-h4F" propertyAccessControl="all"> + <view contentMode="scaleToFill" id="TKX-qe-h4F" propertyAccessControl="none"> <rect key="frame" x="0.0" y="0.0" width="375" height="667"/> <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/> <subviews> @@ -108,9 +106,13 @@ <fontDescription key="fontDescription" type="system" pointSize="17"/> <nil key="textColor"/> <nil key="highlightedColor"/> + <userDefinedRuntimeAttributes> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="bold22:blackPrimaryText"/> + <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="planning_route_manage_route"/> + </userDefinedRuntimeAttributes> </label> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="0Fo-Ae-QrQ"> - <rect key="frame" x="331" y="0.0" width="28" height="48"/> + <rect key="frame" x="311" y="0.0" width="48" height="48"/> <inset key="contentEdgeInsets" minX="8" minY="0.0" maxX="0.0" maxY="0.0"/> <inset key="imageEdgeInsets" minX="-8" minY="0.0" maxX="0.0" maxY="0.0"/> <state key="normal" image="ic_get_position"/> @@ -124,6 +126,9 @@ <constraints> <constraint firstAttribute="height" constant="1" id="aOa-8P-yGw"/> </constraints> + <userDefinedRuntimeAttributes> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Divider"/> + </userDefinedRuntimeAttributes> </view> </subviews> <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> @@ -139,6 +144,9 @@ <constraint firstItem="dQh-uc-65J" firstAttribute="leading" secondItem="s0L-ul-gog" secondAttribute="leading" constant="16" id="qSi-Cf-iFz"/> <constraint firstAttribute="trailing" secondItem="0Fo-Ae-QrQ" secondAttribute="trailing" constant="16" id="zfn-hK-yiy"/> </constraints> + <userDefinedRuntimeAttributes> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Background"/> + </userDefinedRuntimeAttributes> <connections> <outlet property="addLocationButton" destination="0Fo-Ae-QrQ" id="svZ-xA-Txe"/> <outlet property="separator" destination="MJB-bK-y5c" id="xZC-xh-fJh"/> @@ -151,6 +159,9 @@ <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="or0-Gy-0su"> <rect key="frame" x="-100" y="0.0" width="575" height="148"/> <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> + <userDefinedRuntimeAttributes> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="BlackOpaqueBackground"/> + </userDefinedRuntimeAttributes> </view> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="pjx-6o-NWS"> <rect key="frame" x="0.0" y="0.0" width="375" height="1"/> @@ -158,10 +169,17 @@ <constraints> <constraint firstAttribute="height" constant="1" id="jFT-3E-Yrc"/> </constraints> + <userDefinedRuntimeAttributes> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Divider"/> + </userDefinedRuntimeAttributes> </view> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="2WE-hS-hzl"> <rect key="frame" x="16" y="0.0" width="46" height="48"/> <state key="normal" title="Button"/> + <userDefinedRuntimeAttributes> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="FlatNormalTransButton"/> + <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="cancel"/> + </userDefinedRuntimeAttributes> <connections> <action selector="onCancel" destination="-1" eventType="touchUpInside" id="Lzk-mL-6Jg"/> </connections> @@ -169,6 +187,10 @@ <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="u3h-0s-UBo"> <rect key="frame" x="313" y="0.0" width="46" height="48"/> <state key="normal" title="Button"/> + <userDefinedRuntimeAttributes> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="FlatNormalTransButton"/> + <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="button_plan"/> + </userDefinedRuntimeAttributes> <connections> <action selector="onPlan" destination="-1" eventType="touchUpInside" id="M1B-dr-vZS"/> </connections> diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RoutePreviewStatus/BaseRoutePreviewStatus.swift b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RoutePreviewStatus/BaseRoutePreviewStatus.swift index 72c84459d6..e06c6d0a69 100644 --- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RoutePreviewStatus/BaseRoutePreviewStatus.swift +++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RoutePreviewStatus/BaseRoutePreviewStatus.swift @@ -7,7 +7,7 @@ final class BaseRoutePreviewStatus: SolidTouchView { @IBOutlet weak var manageRouteBoxBackground: UIView! { didSet { iPhoneSpecific { - manageRouteBoxBackground.backgroundColor = UIColor.blackOpaque() + manageRouteBoxBackground.styleName = "BlackOpaqueColor" } } } @@ -117,9 +117,7 @@ final class BaseRoutePreviewStatus: SolidTouchView { } private func configManageRouteButton(_ button: UIButton) { - button.titleLabel?.font = UIFont.medium14() button.setTitle(L("planning_route_manage_route"), for: .normal) - button.tintColor = UIColor.blackSecondaryText() } override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) { diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RoutePreviewStatus/TransportTransitSteps/TransportTransitSeparator.swift b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RoutePreviewStatus/TransportTransitSteps/TransportTransitSeparator.swift index 834a3d5493..3bff179ccd 100644 --- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RoutePreviewStatus/TransportTransitSteps/TransportTransitSeparator.swift +++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RoutePreviewStatus/TransportTransitSteps/TransportTransitSeparator.swift @@ -1,8 +1,4 @@ final class TransportTransitSeparator: UICollectionReusableView { - enum Config { - static var imageColor: UIColor { return UIColor.blackSecondaryText() } - } - override init(frame: CGRect) { super.init(frame: frame) setup() @@ -15,7 +11,7 @@ final class TransportTransitSeparator: UICollectionReusableView { private func setup() { let image = UIImageView(image: #imageLiteral(resourceName: "ic_arrow")) - image.tintColor = Config.imageColor + image.styleName = "MWMBlack" image.contentMode = .scaleAspectFit addSubview(image) } diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RoutePreviewTaxiCell.swift b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RoutePreviewTaxiCell.swift index b9fe20a464..a3c96d695b 100644 --- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RoutePreviewTaxiCell.swift +++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RoutePreviewTaxiCell.swift @@ -2,19 +2,8 @@ final class RoutePreviewTaxiCell: UICollectionViewCell { @IBOutlet private weak var icon: UIImageView! - @IBOutlet private weak var title: UILabel! { - didSet { - title.font = UIFont.bold14() - title.textColor = UIColor.blackPrimaryText() - } - } - - @IBOutlet private weak var info: UILabel! { - didSet { - info.font = UIFont.regular14() - info.textColor = UIColor.blackSecondaryText() - } - } + @IBOutlet private weak var title: UILabel! + @IBOutlet private weak var info: UILabel! @objc func config(type: MWMRoutePreviewTaxiCellType, title: String, eta: String, price: String, currency: String) { let iconImage = { () -> UIImage in diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RoutePreviewTaxiCell.xib b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RoutePreviewTaxiCell.xib index dddb8faf0a..ec306e49e8 100644 --- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RoutePreviewTaxiCell.xib +++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RoutePreviewTaxiCell.xib @@ -1,18 +1,16 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> - <device id="retina4_7" orientation="portrait"> - <adaptation id="fullscreen"/> - </device> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> + <device id="retina4_7" orientation="portrait" appearance="light"/> <dependencies> <deployment identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/> <capability name="Safe area layout guides" minToolsVersion="9.0"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> <objects> <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/> <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/> - <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="" id="gTV-IL-0wX" customClass="MWMRoutePreviewTaxiCell" propertyAccessControl="all"> + <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="" id="gTV-IL-0wX" customClass="MWMRoutePreviewTaxiCell" propertyAccessControl="none"> <rect key="frame" x="0.0" y="0.0" width="270" height="64"/> <autoresizingMask key="autoresizingMask"/> <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"> @@ -34,12 +32,18 @@ <fontDescription key="fontDescription" type="boldSystem" pointSize="14"/> <nil key="textColor"/> <nil key="highlightedColor"/> + <userDefinedRuntimeAttributes> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="bold14:blackPrimaryText"/> + </userDefinedRuntimeAttributes> </label> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Ожидание 9 мин" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="TWl-RV-DGe"> <rect key="frame" x="0.0" y="17" width="210" height="17"/> <fontDescription key="fontDescription" type="system" pointSize="14"/> <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.54000000000000004" colorSpace="calibratedRGB"/> <nil key="highlightedColor"/> + <userDefinedRuntimeAttributes> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular14:blackSecondaryText"/> + </userDefinedRuntimeAttributes> </label> </subviews> <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> @@ -65,7 +69,7 @@ <viewLayoutGuide key="safeArea" id="7f1-jQ-gbO"/> <size key="customSize" width="251" height="44"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Background"/> </userDefinedRuntimeAttributes> <connections> <outlet property="icon" destination="fMe-7t-K8o" id="qnl-i9-6sf"/> diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RouteStartButton.swift b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RouteStartButton.swift index 14c081bf2a..23993e2fe4 100644 --- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RouteStartButton.swift +++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RouteStartButton.swift @@ -15,9 +15,9 @@ final class RouteStartButton: UIButton { isEnabled = true } - override func mwm_refreshUI() { - super.mwm_refreshUI() - setBackgroundColor(UIColor.linkBlue(), for: .normal) - setBackgroundColor(UIColor.linkBlueHighlighted(), for: .highlighted) + override func applyTheme() { + super.applyTheme() + setBackgroundImage(UIColor.linkBlue().getImage(), for: .normal) + setBackgroundImage(UIColor.linkBlueHighlighted().getImage(), for: .highlighted) } } diff --git a/iphone/Maps/Classes/MWMTableViewCell.h b/iphone/Maps/Classes/MWMTableViewCell.h index 139a57b300..a7e7a6603c 100644 --- a/iphone/Maps/Classes/MWMTableViewCell.h +++ b/iphone/Maps/Classes/MWMTableViewCell.h @@ -3,7 +3,6 @@ @property(nonatomic) BOOL isSeparatorHidden; - (void)awakeFromNib NS_REQUIRES_SUPER; -- (void)configure; @end diff --git a/iphone/Maps/Classes/MWMTableViewCell.m b/iphone/Maps/Classes/MWMTableViewCell.m index cbcd02d10e..2072f19369 100644 --- a/iphone/Maps/Classes/MWMTableViewCell.m +++ b/iphone/Maps/Classes/MWMTableViewCell.m @@ -5,24 +5,12 @@ - (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]; - if (self) - [self configure]; return self; } - (void)awakeFromNib { [super awakeFromNib]; - [self configure]; -} - -- (void)configure -{ - self.backgroundColor = [UIColor white]; - self.textLabel.textColor = [UIColor blackPrimaryText]; - self.detailTextLabel.textColor = [UIColor blackSecondaryText]; - self.selectedBackgroundView = [[UIView alloc] init]; - self.selectedBackgroundView.backgroundColor = [UIColor pressBackground]; } - (void)addSubview:(UIView *)view diff --git a/iphone/Maps/Classes/MapViewController.mm b/iphone/Maps/Classes/MapViewController.mm index ad957d52bc..702ea9f50c 100644 --- a/iphone/Maps/Classes/MapViewController.mm +++ b/iphone/Maps/Classes/MapViewController.mm @@ -338,12 +338,10 @@ NSString * const kPP2BookmarkEditingSegue = @"PP2BookmarkEditing"; [self.mapView createDrapeEngine]; } -- (void)mwm_refreshUI +- (void)applyTheme { + [super applyTheme]; [MapsAppDelegate customizeAppearance]; - [self.navigationController.navigationBar mwm_refreshUI]; - [self.controlsManager mwm_refreshUI]; - [self.downloadDialog mwm_refreshUI]; } - (void)closePageController:(MWMWelcomePageController *)pageController diff --git a/iphone/Maps/Classes/MapsAppDelegate.mm b/iphone/Maps/Classes/MapsAppDelegate.mm index f3fb7fdcca..15ad206a48 100644 --- a/iphone/Maps/Classes/MapsAppDelegate.mm +++ b/iphone/Maps/Classes/MapsAppDelegate.mm @@ -279,7 +279,6 @@ using namespace osm_auth_ios; [MoPubKit grantConsent]; [[DeepLinkHandler shared] applicationDidFinishLaunching:launchOptions]; - return YES; } @@ -570,12 +569,6 @@ continueUserActivity:(NSUserActivity *)userActivity + (void)customizeAppearanceForNavigationBar:(UINavigationBar *)navigationBar { - navigationBar.tintColor = [UIColor primary]; - navigationBar.barTintColor = [UIColor primary]; - navigationBar.titleTextAttributes = [self navigationBarTextAttributes]; - navigationBar.translucent = NO; - [navigationBar setBackgroundImage:[UIImage new] forBarMetrics:UIBarMetricsDefault]; - navigationBar.shadowImage = [UIImage new]; auto backImage = [[UIImage imageNamed:@"ic_nav_bar_back_sys"] imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal]; navigationBar.backIndicatorImage = backImage; @@ -597,29 +590,9 @@ continueUserActivity:(NSUserActivity *)userActivity forState:UIControlStateDisabled]; [UIBarButtonItem appearanceWhenContainedInInstancesOfClasses:@[[UINavigationBar class]]].tintColor = [UIColor whitePrimaryText]; - UIPageControl * pageControl = [UIPageControl appearance]; - pageControl.pageIndicatorTintColor = [UIColor blackHintText]; - pageControl.currentPageIndicatorTintColor = [UIColor blackSecondaryText]; - pageControl.backgroundColor = [UIColor white]; - UITextField * textField = [UITextField appearance]; textField.keyboardAppearance = [UIColor isNightMode] ? UIKeyboardAppearanceDark : UIKeyboardAppearanceDefault; - - UISearchBar * searchBar = [UISearchBar appearance]; - searchBar.barTintColor = [UIColor primary]; - - UIBarButtonItem *searchButtonApperance = [UIBarButtonItem appearanceWhenContainedInInstancesOfClasses:@[[UISearchBar class]]]; - searchButtonApperance.tintColor = [UIColor whitePrimaryText]; - - UITextField * textFieldInSearchBar = - [UITextField appearanceWhenContainedInInstancesOfClasses:@[[UISearchBar class]]]; - - textField.backgroundColor = [UIColor white]; - textFieldInSearchBar.defaultTextAttributes = @{ - NSForegroundColorAttributeName : [UIColor blackPrimaryText], - NSFontAttributeName : [UIFont regular14] - }; } - (BOOL)application:(UIApplication *)app openURL:(NSURL *)url options:(NSDictionary<UIApplicationOpenURLOptionsKey, id> *)options diff --git a/iphone/Maps/Classes/Widgets/MWMBookmarksBannerViewController.xib b/iphone/Maps/Classes/Widgets/MWMBookmarksBannerViewController.xib index 5c8f87f247..b5334c0398 100644 --- a/iphone/Maps/Classes/Widgets/MWMBookmarksBannerViewController.xib +++ b/iphone/Maps/Classes/Widgets/MWMBookmarksBannerViewController.xib @@ -1,11 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> - <device id="retina4_7" orientation="portrait"> - <adaptation id="fullscreen"/> - </device> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> + <device id="retina4_7" orientation="portrait" appearance="light"/> <dependencies> <deployment identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14490.49"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/> <capability name="Safe area layout guides" minToolsVersion="9.0"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> @@ -34,14 +32,8 @@ <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> </state> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="textColorHighlightedName" value="white"/> - <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius"> - <integer key="value" value="8"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="string" keyPath="textColorName" value="white"/> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="linkBlue"/> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundHighlightedColorName" value="linkBlueHighlighted"/> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="popup_mwm_download_guides_cta"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="FlatNormalButton"/> </userDefinedRuntimeAttributes> <variation key="default"> <mask key="constraints"> @@ -64,7 +56,7 @@ <nil key="highlightedColor"/> <userDefinedRuntimeAttributes> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="popup_mwm_download_guides_title"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="blackPrimaryText"/> </userDefinedRuntimeAttributes> </label> </subviews> diff --git a/iphone/Maps/Classes/Widgets/MWMMapDownloadDialog.xib b/iphone/Maps/Classes/Widgets/MWMMapDownloadDialog.xib index 0df6984ba2..4f86f42683 100644 --- a/iphone/Maps/Classes/Widgets/MWMMapDownloadDialog.xib +++ b/iphone/Maps/Classes/Widgets/MWMMapDownloadDialog.xib @@ -1,11 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> - <device id="retina4_0" orientation="portrait"> - <adaptation id="fullscreen"/> - </device> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> + <device id="retina6_1" orientation="portrait" appearance="light"/> <dependencies> <deployment identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14490.49"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/> <capability name="Safe area layout guides" minToolsVersion="9.0"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> @@ -22,8 +20,7 @@ <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="medium16"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="medium16:blackSecondaryText"/> </userDefinedRuntimeAttributes> </label> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="260" verticalCompressionResistancePriority="751" text="Доминиканская республика" textAlignment="center" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="vMH-GY-Vm2"> @@ -32,8 +29,7 @@ <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="medium20"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="medium20:blackPrimaryText"/> </userDefinedRuntimeAttributes> </label> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="260" text="16 МБ" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="vU4-G9-kcd"> @@ -42,8 +38,7 @@ <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="medium14"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="medium14:blackSecondaryText"/> </userDefinedRuntimeAttributes> </label> <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Gtz-YD-7lc"> @@ -57,7 +52,7 @@ <constraint firstAttribute="height" constant="1" id="vwI-d2-CG4"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="blackDividers"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Divider"/> </userDefinedRuntimeAttributes> <variation key="default"> <mask key="constraints"> @@ -141,14 +136,8 @@ <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> </state> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="textColorName" value="white"/> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="linkBlue"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular16"/> - <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius"> - <integer key="value" value="8"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundHighlightedColorName" value="linkBlueHighlighted"/> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="country_status_download_without_size"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="FlatNormalButton"/> </userDefinedRuntimeAttributes> <connections> <action selector="downloadAction" destination="I6H-BQ-1TG" eventType="touchUpInside" id="gK1-oH-Xye"/> @@ -192,23 +181,7 @@ <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/> <viewLayoutGuide key="safeArea" id="REG-N0-yuL"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius"> - <integer key="value" value="8"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="number" keyPath="layer.shadowRadius"> - <integer key="value" value="2"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="color" keyPath="layer.shadowUIColor"> - <color key="value" red="0.0" green="0.0" blue="0.0" alpha="0.23999999999999999" colorSpace="custom" customColorSpace="sRGB"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="number" keyPath="layer.shadowOpacity"> - <integer key="value" value="1"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="size" keyPath="layer.shadowOffset"> - <size key="value" width="0.0" height="1"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/> - <userDefinedRuntimeAttribute type="boolean" keyPath="clipsToBounds" value="YES"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="DialogView"/> </userDefinedRuntimeAttributes> <variation key="default"> <mask key="constraints"> diff --git a/iphone/Maps/Classes/Widgets/MWMMegafonBannerViewController.xib b/iphone/Maps/Classes/Widgets/MWMMegafonBannerViewController.xib index ec91168a9b..62fceeb5bf 100644 --- a/iphone/Maps/Classes/Widgets/MWMMegafonBannerViewController.xib +++ b/iphone/Maps/Classes/Widgets/MWMMegafonBannerViewController.xib @@ -1,11 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> - <device id="retina4_0" orientation="landscape"> - <adaptation id="fullscreen"/> - </device> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> + <device id="retina4_0" orientation="landscape" appearance="light"/> <dependencies> <deployment identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14490.49"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/> <capability name="Safe area layout guides" minToolsVersion="9.0"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> @@ -30,7 +28,7 @@ <nil key="highlightedColor"/> <userDefinedRuntimeAttributes> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="banner_megafon_banner_message"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="blackPrimaryText"/> </userDefinedRuntimeAttributes> </label> <button opaque="NO" contentMode="scaleToFill" verticalCompressionResistancePriority="751" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="pol-d8-Kul"> diff --git a/iphone/Maps/Common/WebViewController.m b/iphone/Maps/Common/WebViewController.m index 603ac35b56..87a0ae2991 100644 --- a/iphone/Maps/Common/WebViewController.m +++ b/iphone/Maps/Common/WebViewController.m @@ -1,5 +1,6 @@ #import "WebViewController.h" #import <CoreApi/MWMFrameworkHelper.h> +#import "SwiftBridge.h" @interface WebViewController() @@ -62,9 +63,12 @@ { [super viewDidLoad]; UIView * view = self.view; - view.backgroundColor = UIColor.whiteColor; + view.styleName = @"Background"; self.webView = [[WKWebView alloc] initWithFrame:CGRectZero]; +// [self.webView.scrollView setStyleAndApply:@"Background"]; + self.webView.backgroundColor = UIColor.clearColor; + self.webView.opaque = false; self.webView.navigationDelegate = self; [view addSubview:self.webView]; @@ -88,7 +92,6 @@ [self.webView.leadingAnchor constraintEqualToAnchor:leadingAnchor].active = YES; [self.webView.trailingAnchor constraintEqualToAnchor:trailingAnchor].active = YES; - self.webView.backgroundColor = UIColor.whiteColor; self.webView.allowsLinkPreview = NO; [self.webView setCustomUserAgent:[MWMFrameworkHelper userAgent]]; @@ -116,6 +119,10 @@ NSString *authHeader = [NSString stringWithFormat:@"Bearer %@", [MWMFrameworkHelper userAccessToken]]; [request setValue:authHeader forHTTPHeaderField:@"Authorization"]; } + if ([UIColor isNightMode]) + { + [request setValue:@"dark" forHTTPHeaderField:@"x-mapsme-theme"]; + } [self.webView loadRequest:request]; } } diff --git a/iphone/Maps/Images.xcassets/Welcome/promo_discovery_button_day.imageset/Contents.json b/iphone/Maps/Images.xcassets/Welcome/promo_discovery_button_dark.imageset/Contents.json index 355cec4b64..355cec4b64 100644 --- a/iphone/Maps/Images.xcassets/Welcome/promo_discovery_button_day.imageset/Contents.json +++ b/iphone/Maps/Images.xcassets/Welcome/promo_discovery_button_dark.imageset/Contents.json diff --git a/iphone/Maps/Images.xcassets/Welcome/promo_discovery_button_night.imageset/Group 334.png b/iphone/Maps/Images.xcassets/Welcome/promo_discovery_button_dark.imageset/Group 334.png Binary files differindex 8ef7334199..8ef7334199 100644 --- a/iphone/Maps/Images.xcassets/Welcome/promo_discovery_button_night.imageset/Group 334.png +++ b/iphone/Maps/Images.xcassets/Welcome/promo_discovery_button_dark.imageset/Group 334.png diff --git a/iphone/Maps/Images.xcassets/Welcome/promo_discovery_button_night.imageset/Group 334@2x.png b/iphone/Maps/Images.xcassets/Welcome/promo_discovery_button_dark.imageset/Group 334@2x.png Binary files differindex 168007266d..168007266d 100644 --- a/iphone/Maps/Images.xcassets/Welcome/promo_discovery_button_night.imageset/Group 334@2x.png +++ b/iphone/Maps/Images.xcassets/Welcome/promo_discovery_button_dark.imageset/Group 334@2x.png diff --git a/iphone/Maps/Images.xcassets/Welcome/promo_discovery_button_night.imageset/Group 334@3x.png b/iphone/Maps/Images.xcassets/Welcome/promo_discovery_button_dark.imageset/Group 334@3x.png Binary files differindex 2c7475ac13..2c7475ac13 100644 --- a/iphone/Maps/Images.xcassets/Welcome/promo_discovery_button_night.imageset/Group 334@3x.png +++ b/iphone/Maps/Images.xcassets/Welcome/promo_discovery_button_dark.imageset/Group 334@3x.png diff --git a/iphone/Maps/Images.xcassets/Welcome/promo_discovery_button_night.imageset/Contents.json b/iphone/Maps/Images.xcassets/Welcome/promo_discovery_button_light.imageset/Contents.json index 355cec4b64..355cec4b64 100644 --- a/iphone/Maps/Images.xcassets/Welcome/promo_discovery_button_night.imageset/Contents.json +++ b/iphone/Maps/Images.xcassets/Welcome/promo_discovery_button_light.imageset/Contents.json diff --git a/iphone/Maps/Images.xcassets/Welcome/promo_discovery_button_day.imageset/Group 334.png b/iphone/Maps/Images.xcassets/Welcome/promo_discovery_button_light.imageset/Group 334.png Binary files differindex 0c0da6fece..0c0da6fece 100644 --- a/iphone/Maps/Images.xcassets/Welcome/promo_discovery_button_day.imageset/Group 334.png +++ b/iphone/Maps/Images.xcassets/Welcome/promo_discovery_button_light.imageset/Group 334.png diff --git a/iphone/Maps/Images.xcassets/Welcome/promo_discovery_button_day.imageset/Group 334@2x.png b/iphone/Maps/Images.xcassets/Welcome/promo_discovery_button_light.imageset/Group 334@2x.png Binary files differindex d75a9b4e1e..d75a9b4e1e 100644 --- a/iphone/Maps/Images.xcassets/Welcome/promo_discovery_button_day.imageset/Group 334@2x.png +++ b/iphone/Maps/Images.xcassets/Welcome/promo_discovery_button_light.imageset/Group 334@2x.png diff --git a/iphone/Maps/Images.xcassets/Welcome/promo_discovery_button_day.imageset/Group 334@3x.png b/iphone/Maps/Images.xcassets/Welcome/promo_discovery_button_light.imageset/Group 334@3x.png Binary files differindex bdda5c2a00..bdda5c2a00 100644 --- a/iphone/Maps/Images.xcassets/Welcome/promo_discovery_button_day.imageset/Group 334@3x.png +++ b/iphone/Maps/Images.xcassets/Welcome/promo_discovery_button_light.imageset/Group 334@3x.png diff --git a/iphone/Maps/UI/Ads/AdBanner.xib b/iphone/Maps/UI/Ads/AdBanner.xib index 3386c3189b..4954b5f5ad 100644 --- a/iphone/Maps/UI/Ads/AdBanner.xib +++ b/iphone/Maps/UI/Ads/AdBanner.xib @@ -1,11 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14313.18" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> - <device id="retina4_7" orientation="portrait"> - <adaptation id="fullscreen"/> - </device> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15705" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> + <device id="retina4_7" orientation="portrait" appearance="light"/> <dependencies> <deployment identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14283.14"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15706"/> <capability name="Safe area layout guides" minToolsVersion="9.0"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> @@ -16,18 +14,18 @@ <rect key="frame" x="0.0" y="0.0" width="375" height="110"/> <autoresizingMask key="autoresizingMask"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="WK2-gA-ocn" id="f76-qn-ne5"> - <rect key="frame" x="0.0" y="0.0" width="375" height="109.5"/> + <rect key="frame" x="0.0" y="0.0" width="375" height="110"/> <autoresizingMask key="autoresizingMask"/> <subviews> <view clipsSubviews="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ucm-4E-iB7"> - <rect key="frame" x="0.0" y="0.0" width="375" height="109.5"/> + <rect key="frame" x="0.0" y="0.0" width="375" height="110"/> <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> <constraints> <constraint firstAttribute="height" priority="999" constant="109" id="9T6-aq-miV"/> </constraints> </view> <view clipsSubviews="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="f76-qn-ne4"> - <rect key="frame" x="4" y="4" width="367" height="101.5"/> + <rect key="frame" x="4" y="4" width="367" height="102"/> <subviews> <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="EuF-Rm-DHQ"> <rect key="frame" x="-40" y="8" width="40" height="40"/> @@ -36,16 +34,7 @@ <constraint firstAttribute="height" constant="40" id="eTa-1E-6Of"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius"> - <integer key="value" value="4"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="boolean" keyPath="layer.masksToBounds" value="YES"/> - <userDefinedRuntimeAttribute type="number" keyPath="layer.borderWidth"> - <integer key="value" value="1"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="color" keyPath="layer.borderUIColor"> - <color key="value" white="0.0" alpha="0.12" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> - </userDefinedRuntimeAttribute> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="AdsIconImage"/> </userDefinedRuntimeAttributes> </imageView> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="zWu-Gh-Vf7" userLabel="Privacy images"> @@ -79,10 +68,7 @@ <constraint firstItem="U70-zR-E2N" firstAttribute="leading" secondItem="zWu-Gh-Vf7" secondAttribute="leading" id="ovH-QV-FXc"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius"> - <integer key="value" value="4"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="boolean" keyPath="layer.masksToBounds" value="YES"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="AdBannerPrivacyImage"/> </userDefinedRuntimeAttributes> </view> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="300" text="Delivery Club" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="kIR-cO-v6L"> @@ -91,23 +77,21 @@ <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.59999999999999998" colorSpace="calibratedRGB"/> <nil key="highlightedColor"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="bold12"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackSecondaryText"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="bold12:blackSecondaryText"/> </userDefinedRuntimeAttributes> </label> <label opaque="NO" userInteractionEnabled="NO" contentMode="TopLeft" horizontalHuggingPriority="451" verticalHuggingPriority="249" horizontalCompressionResistancePriority="249" text="Как " textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Ev3-yY-ql1"> - <rect key="frame" x="8" y="26.5" width="270" height="67"/> + <rect key="frame" x="8" y="26.5" width="270" height="67.5"/> <fontDescription key="fontDescription" type="system" pointSize="12"/> <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.59999999999999998" colorSpace="calibratedRGB"/> <nil key="highlightedColor"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular12"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackSecondaryText"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular12:blackSecondaryText"/> </userDefinedRuntimeAttributes> </label> <button opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="551" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="9qA-JC-fkn"> <rect key="frame" x="282" y="24" width="69" height="24"/> - <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> + <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> <constraints> <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="64" id="N7a-ng-e6p"/> <constraint firstAttribute="height" constant="24" id="XME-fd-3O8"/> @@ -118,18 +102,12 @@ <color key="titleColor" red="0.59999999999999998" green="0.58823529411764708" blue="0.56862745098039214" alpha="0.40000000000000002" colorSpace="calibratedRGB"/> </state> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="medium12"/> - <userDefinedRuntimeAttribute type="string" keyPath="textColorName" value="blackSecondaryText"/> - <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius"> - <integer key="value" value="10"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="boolean" keyPath="layer.masksToBounds" value="YES"/> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="bannerButtonBackground"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="AdCallToActionButton"/> </userDefinedRuntimeAttributes> </button> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="EIT-s3-8BF"> - <rect key="frame" x="12" y="101.5" width="165.5" height="36"/> - <color key="backgroundColor" red="0.95294117649999999" green="0.92156862750000001" blue="0.85490196080000003" alpha="1" colorSpace="calibratedRGB"/> + <rect key="frame" x="12" y="102" width="165.5" height="36"/> + <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> <constraints> <constraint firstAttribute="height" constant="36" id="Sec-LO-NfY"/> </constraints> @@ -137,13 +115,7 @@ <color key="titleColor" red="0.0" green="0.0" blue="0.0" alpha="0.40000000000000002" colorSpace="calibratedRGB"/> </state> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="medium14"/> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="bannerButtonBackground"/> - <userDefinedRuntimeAttribute type="string" keyPath="textColorName" value="blackSecondaryText"/> - <userDefinedRuntimeAttribute type="boolean" keyPath="layer.masksToBounds" value="YES"/> - <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius"> - <integer key="value" value="8"/> - </userDefinedRuntimeAttribute> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="AdBannerButton"/> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="remove_ads"/> </userDefinedRuntimeAttributes> <connections> @@ -151,8 +123,8 @@ </connections> </button> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="NKM-3R-3g1"> - <rect key="frame" x="189.5" y="101.5" width="165.5" height="36"/> - <color key="backgroundColor" red="0.95294117647058818" green="0.92156862745098034" blue="0.85490196078431369" alpha="1" colorSpace="calibratedRGB"/> + <rect key="frame" x="189.5" y="102" width="165.5" height="36"/> + <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> <constraints> <constraint firstAttribute="height" constant="36" id="JMM-je-O9e"/> </constraints> @@ -160,18 +132,12 @@ <color key="titleColor" red="0.0" green="0.0" blue="0.0" alpha="0.40000000000000002" colorSpace="calibratedRGB"/> </state> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="medium14"/> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="bannerButtonBackground"/> - <userDefinedRuntimeAttribute type="string" keyPath="textColorName" value="blackSecondaryText"/> - <userDefinedRuntimeAttribute type="boolean" keyPath="layer.masksToBounds" value="YES"/> - <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius"> - <integer key="value" value="8"/> - </userDefinedRuntimeAttribute> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="AdBannerButton"/> </userDefinedRuntimeAttributes> </button> <button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="54O-iN-1Gg"> - <rect key="frame" x="0.0" y="0.0" width="367" height="101.5"/> - <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> + <rect key="frame" x="0.0" y="0.0" width="367" height="102"/> + <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> </button> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="So8-wM-Cgz"> <rect key="frame" x="6" y="8" width="42" height="16"/> @@ -244,13 +210,7 @@ <constraint firstItem="So8-wM-Cgz" firstAttribute="trailing" secondItem="zWu-Gh-Vf7" secondAttribute="trailing" id="zGz-Sf-G1b"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="number" keyPath="layer.borderWidth"> - <integer key="value" value="2"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="color" keyPath="layer.borderUIColor"> - <color key="value" white="0.0" alpha="0.12" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="bannerBackground"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="NativeAdView"/> </userDefinedRuntimeAttributes> </view> </subviews> @@ -269,7 +229,7 @@ <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> <viewLayoutGuide key="safeArea" id="P08-Dn-WdZ"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Background"/> </userDefinedRuntimeAttributes> <connections> <outlet property="DAAImage" destination="U70-zR-E2N" id="xY2-Lz-w3W"/> @@ -298,7 +258,7 @@ <outletCollection property="detailedModeConstraints" destination="5CH-Fo-S70" collectionClass="NSMutableArray" id="U1k-ax-zNd"/> <outletCollection property="detailedModeConstraints" destination="HHb-Vh-rIl" collectionClass="NSMutableArray" id="Xye-5k-1LM"/> </connections> - <point key="canvasLocation" x="-285.5" y="-205"/> + <point key="canvasLocation" x="-285.60000000000002" y="-205.09745127436284"/> </tableViewCell> </objects> <resources> diff --git a/iphone/Maps/UI/Ads/RemoveAdsViewController.swift b/iphone/Maps/UI/Ads/RemoveAdsViewController.swift index 33c4c26237..9300eda105 100644 --- a/iphone/Maps/UI/Ads/RemoveAdsViewController.swift +++ b/iphone/Maps/UI/Ads/RemoveAdsViewController.swift @@ -22,22 +22,13 @@ import SafariServices @IBOutlet weak var saveLabel: UILabel! @IBOutlet weak var productsLoadingIndicator: UIActivityIndicatorView! @IBOutlet weak var whySupportView: UIView! - @IBOutlet weak var optionsView: UIView! { - didSet { - optionsView.layer.borderColor = UIColor.blackDividers().cgColor - optionsView.layer.borderWidth = 1 - } - } + @IBOutlet weak var optionsView: UIView! @IBOutlet weak var moreOptionsButton: UIButton! { didSet { moreOptionsButton.setTitle(L("options_dropdown_title").uppercased(), for: .normal) } } - @IBOutlet weak var moreOptionsButtonImage: UIImageView! { - didSet { - moreOptionsButtonImage.tintColor = UIColor.blackSecondaryText() - } - } + @IBOutlet weak var moreOptionsButtonImage: UIImageView! @IBOutlet weak var titleLabel: UILabel! { didSet { titleLabel.text = L("remove_ads_title").uppercased() diff --git a/iphone/Maps/UI/Ads/RemoveAdsViewController.xib b/iphone/Maps/UI/Ads/RemoveAdsViewController.xib index d5eb69fb3a..47a04b513d 100644 --- a/iphone/Maps/UI/Ads/RemoveAdsViewController.xib +++ b/iphone/Maps/UI/Ads/RemoveAdsViewController.xib @@ -1,11 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> - <device id="retina4_7" orientation="portrait"> - <adaptation id="fullscreen"/> - </device> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> + <device id="retina6_1" orientation="portrait" appearance="light"/> <dependencies> <deployment identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14460.20"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/> <capability name="Safe area layout guides" minToolsVersion="9.0"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> @@ -33,11 +31,11 @@ </placeholder> <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/> <view clearsContextBeforeDrawing="NO" contentMode="scaleToFill" id="i5T-Pr-FkT"> - <rect key="frame" x="0.0" y="0.0" width="375" height="667"/> + <rect key="frame" x="0.0" y="0.0" width="414" height="896"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="T82-qa-a8r"> - <rect key="frame" x="0.0" y="0.0" width="375" height="667"/> + <rect key="frame" x="0.0" y="0.0" width="414" height="896"/> <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> <gestureRecognizers/> <connections> @@ -45,22 +43,21 @@ </connections> </view> <view clipsSubviews="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="raA-Qo-8vn" userLabel="Container View" customClass="MWMTouchOpaqueView"> - <rect key="frame" x="5" y="58.5" width="365" height="570"/> + <rect key="frame" x="24" y="100" width="366" height="706"/> <subviews> <scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" bounces="NO" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" translatesAutoresizingMaskIntoConstraints="NO" id="aRL-MT-ZBH"> - <rect key="frame" x="0.0" y="0.0" width="365" height="570"/> + <rect key="frame" x="0.0" y="0.0" width="366" height="706"/> <subviews> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="i5M-Pr-FkT"> - <rect key="frame" x="0.0" y="0.0" width="365" height="570"/> + <rect key="frame" x="0.0" y="0.0" width="366" height="706"/> <subviews> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="752" verticalCompressionResistancePriority="752" text="Remove all Ads and support MAPS.ME" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="vCa-Yl-SkC"> - <rect key="frame" x="24" y="24" width="317" height="21.5"/> + <rect key="frame" x="24" y="24" width="318" height="21.5"/> <fontDescription key="fontDescription" type="system" weight="medium" pointSize="18"/> <nil key="textColor"/> <nil key="highlightedColor"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="medium18"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="medium18:blackPrimaryText"/> </userDefinedRuntimeAttributes> </label> <button opaque="NO" contentMode="scaleToFill" verticalHuggingPriority="251" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="3V5-Dx-w2P"> @@ -74,16 +71,14 @@ </state> <userDefinedRuntimeAttributes> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="why_support"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular14"/> - <userDefinedRuntimeAttribute type="string" keyPath="textColorName" value="blackSecondaryText"/> - <userDefinedRuntimeAttribute type="string" keyPath="textColorHighlightedName" value="blackHintText"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="FlatGrayTransButton"/> </userDefinedRuntimeAttributes> <connections> <action selector="onWhySupport:" destination="-1" eventType="touchUpInside" id="lgd-75-mK8"/> </connections> </button> <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="751" verticalCompressionResistancePriority="751" image="dog" translatesAutoresizingMaskIntoConstraints="NO" id="AmL-7Q-Kas"> - <rect key="frame" x="112.5" y="89.5" width="140" height="110"/> + <rect key="frame" x="113" y="89.5" width="140" height="110"/> <constraints> <constraint firstAttribute="height" id="E4W-ij-UBq"/> </constraints> @@ -104,20 +99,19 @@ </variation> </imageView> <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="pAe-qE-h95"> - <rect key="frame" x="0.0" y="24" width="365" height="142.5"/> + <rect key="frame" x="0.0" y="24" width="366" height="142.5"/> <subviews> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="752" verticalCompressionResistancePriority="752" text="Why support MAPS.ME?" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="YQ4-oq-7XN"> - <rect key="frame" x="24" y="0.0" width="317" height="21.5"/> + <rect key="frame" x="24" y="0.0" width="318" height="21.5"/> <fontDescription key="fontDescription" type="system" weight="medium" pointSize="18"/> <nil key="textColor"/> <nil key="highlightedColor"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="medium18"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="medium18:blackPrimaryText"/> </userDefinedRuntimeAttributes> </label> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Jhy-EZ-HaR"> - <rect key="frame" x="35" y="33.5" width="290" height="18"/> + <rect key="frame" x="35" y="33.5" width="291" height="18"/> <subviews> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="252" verticalHuggingPriority="251" horizontalCompressionResistancePriority="751" text="•" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="SqJ-F7-qg1"> <rect key="frame" x="0.0" y="0.0" width="7" height="18"/> @@ -125,19 +119,17 @@ <nil key="textColor"/> <nil key="highlightedColor"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular15"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="linkBlue"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular15:linkBlueText"/> </userDefinedRuntimeAttributes> </label> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="We will remove all ads for you" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="4wA-Tm-jmm"> - <rect key="frame" x="15" y="0.0" width="275" height="18"/> + <rect key="frame" x="15" y="0.0" width="276" height="18"/> <fontDescription key="fontDescription" type="system" pointSize="15"/> <nil key="textColor"/> <nil key="highlightedColor"/> <userDefinedRuntimeAttributes> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="why_support_item1"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular15"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular15:blackPrimaryText"/> </userDefinedRuntimeAttributes> </label> </subviews> @@ -151,7 +143,7 @@ </constraints> </view> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="N1P-1l-fOT"> - <rect key="frame" x="35" y="63.5" width="290" height="18"/> + <rect key="frame" x="35" y="63.5" width="291" height="18"/> <subviews> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="252" verticalHuggingPriority="251" horizontalCompressionResistancePriority="751" text="•" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="3CU-Qm-qr9"> <rect key="frame" x="0.0" y="0.0" width="7" height="18"/> @@ -159,19 +151,17 @@ <nil key="textColor"/> <nil key="highlightedColor"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular15"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="linkBlue"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular15:linkBlueText"/> </userDefinedRuntimeAttributes> </label> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="You help us improve MAPS.ME" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="WMR-ho-FUS"> - <rect key="frame" x="15" y="0.0" width="275" height="18"/> + <rect key="frame" x="15" y="0.0" width="276" height="18"/> <fontDescription key="fontDescription" type="system" pointSize="15"/> <nil key="textColor"/> <nil key="highlightedColor"/> <userDefinedRuntimeAttributes> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="why_support_item2"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular15"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular15:blackPrimaryText"/> </userDefinedRuntimeAttributes> </label> </subviews> @@ -185,7 +175,7 @@ </constraints> </view> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Q0y-IM-H43"> - <rect key="frame" x="35" y="93.5" width="290" height="36"/> + <rect key="frame" x="35" y="93.5" width="291" height="36"/> <subviews> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="252" verticalHuggingPriority="251" horizontalCompressionResistancePriority="751" text="•" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="PXD-OM-5Xd"> <rect key="frame" x="0.0" y="0.0" width="7" height="18"/> @@ -193,19 +183,17 @@ <nil key="textColor"/> <nil key="highlightedColor"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular15"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="linkBlue"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular15:linkBlueText"/> </userDefinedRuntimeAttributes> </label> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="You help us improve open
maps OpenStreetMap.org" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Yos-eN-bY1"> - <rect key="frame" x="15" y="0.0" width="275" height="36"/> + <rect key="frame" x="15" y="0.0" width="276" height="36"/> <fontDescription key="fontDescription" type="system" pointSize="15"/> <nil key="textColor"/> <nil key="highlightedColor"/> <userDefinedRuntimeAttributes> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="why_support_item3"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular15"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular15:blackPrimaryText"/> </userDefinedRuntimeAttributes> </label> </subviews> @@ -237,11 +225,11 @@ <constraint firstItem="Q0y-IM-H43" firstAttribute="leading" secondItem="pAe-qE-h95" secondAttribute="leading" constant="35" id="xC8-Qq-IYT"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Background"/> </userDefinedRuntimeAttributes> </view> <button opaque="NO" contentMode="scaleToFill" enabled="NO" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="yaj-2x-NKs"> - <rect key="frame" x="42.5" y="199.5" width="280" height="72"/> + <rect key="frame" x="43" y="199.5" width="280" height="72"/> <color key="backgroundColor" red="0.14000108506944445" green="0.60983615451388884" blue="0.94859483506944442" alpha="1" colorSpace="calibratedRGB"/> <constraints> <constraint firstAttribute="height" constant="72" id="GcQ-JZ-VF4"/> @@ -250,19 +238,14 @@ <fontDescription key="fontDescription" type="boldSystem" pointSize="20"/> <inset key="contentEdgeInsets" minX="0.0" minY="-18" maxX="0.0" maxY="0.0"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius"> - <integer key="value" value="5"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="boolean" keyPath="clipsToBounds" value="YES"/> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="linkBlue"/> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundHighlightedColorName" value="linkBlueHighlighted"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="FlatNormalButton"/> </userDefinedRuntimeAttributes> <connections> <action selector="onPay:" destination="-1" eventType="touchUpInside" id="Q4Z-5u-bTt"/> </connections> </button> <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="paws" translatesAutoresizingMaskIntoConstraints="NO" id="W0Z-x0-4FR"> - <rect key="frame" x="112.5" y="185.5" width="140" height="22"/> + <rect key="frame" x="113" y="185.5" width="140" height="22"/> <constraints> <constraint firstAttribute="height" id="j8t-KG-jau"/> </constraints> @@ -283,16 +266,16 @@ </variation> </imageView> <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="save $46.49/year" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2o9-EE-vAM"> - <rect key="frame" x="126" y="241.5" width="113" height="17"/> + <rect key="frame" x="126.5" y="241.5" width="113" height="17"/> <fontDescription key="fontDescription" type="system" pointSize="14"/> <color key="textColor" white="1" alpha="0.79757063356164382" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> <nil key="highlightedColor"/> </label> <activityIndicatorView opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" hidesWhenStopped="YES" animating="YES" style="whiteLarge" translatesAutoresizingMaskIntoConstraints="NO" id="nA0-bV-sRz"> - <rect key="frame" x="164" y="217" width="37" height="37"/> + <rect key="frame" x="164.5" y="217" width="37" height="37"/> </activityIndicatorView> <button opaque="NO" contentMode="scaleToFill" verticalHuggingPriority="251" horizontalCompressionResistancePriority="751" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="tailTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="sqh-fz-YqI"> - <rect key="frame" x="16" y="532" width="66" height="38"/> + <rect key="frame" x="16" y="668" width="66" height="38"/> <constraints> <constraint firstAttribute="height" constant="38" id="t1x-kz-iai"/> </constraints> @@ -301,17 +284,15 @@ <color key="titleColor" white="0.0" alpha="0.53486194350000005" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> </state> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="textColorName" value="blackSecondaryText"/> - <userDefinedRuntimeAttribute type="string" keyPath="textColorHighlightedName" value="blackHintText"/> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="terms_of_use"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="medium10"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="TermsOfUseGrayButton"/> </userDefinedRuntimeAttributes> <connections> <action selector="onTerms:" destination="-1" eventType="touchUpInside" id="5sM-cW-7D2"/> </connections> </button> <button opaque="NO" contentMode="scaleToFill" verticalHuggingPriority="251" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="tailTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="vrh-YL-rbL"> - <rect key="frame" x="280" y="532" width="69" height="38"/> + <rect key="frame" x="281" y="668" width="69" height="38"/> <constraints> <constraint firstAttribute="height" constant="38" id="VbV-Hi-sC7"/> </constraints> @@ -320,29 +301,26 @@ <color key="titleColor" white="0.0" alpha="0.53486194350000005" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> </state> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="textColorName" value="blackSecondaryText"/> - <userDefinedRuntimeAttribute type="string" keyPath="textColorHighlightedName" value="blackHintText"/> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="privacy_policy"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="medium10"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="TermsOfUseGrayButton"/> </userDefinedRuntimeAttributes> <connections> <action selector="onPrivacy:" destination="-1" eventType="touchUpInside" id="6Us-IS-SLf"/> </connections> </button> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" textAlignment="justified" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="RqJ-1V-4Qt"> - <rect key="frame" x="16" y="466" width="333" height="64.5"/> + <rect key="frame" x="16" y="602" width="334" height="64.5"/> <string key="text">Payment will be charged to your iTunes account at confirmation of purchase. The subscription will automatically renew unless auto-renew is turned off at least 24 hours before the end of the current period. Your account will be charged according to your plan for renewal within 24 hours prior to the end of the current period. You can manage or turn off auto-renew in your Apple ID account settings at any time of your purchase.</string> <fontDescription key="fontDescription" type="system" pointSize="9"/> <color key="textColor" white="0.0" alpha="0.5448683647260274" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> <nil key="highlightedColor"/> <userDefinedRuntimeAttributes> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="subscription_terms"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular9"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular9:blackPrimaryText"/> </userDefinedRuntimeAttributes> </label> <view hidden="YES" clipsSubviews="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="moF-VX-t4N"> - <rect key="frame" x="75" y="286.5" width="215" height="36"/> + <rect key="frame" x="75.5" y="286.5" width="215" height="36"/> <subviews> <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="fillEqually" spacing="1" translatesAutoresizingMaskIntoConstraints="NO" id="zJa-b8-ObU"> <rect key="frame" x="0.0" y="0.0" width="215" height="109"/> @@ -357,11 +335,7 @@ </state> <userDefinedRuntimeAttributes> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="options_dropdown_title"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular12"/> - <userDefinedRuntimeAttribute type="string" keyPath="textColorName" value="blackSecondaryText"/> - <userDefinedRuntimeAttribute type="string" keyPath="textColorHighlightedName" value="blackHintText"/> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="border"/> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundHighlightedColorName" value="blackDividers"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="RemoveAdsOptionsButton"/> </userDefinedRuntimeAttributes> <connections> <action selector="onMoreOptions:" destination="-1" eventType="touchUpInside" id="XWb-f3-MaZ"/> @@ -377,11 +351,7 @@ </state> <userDefinedRuntimeAttributes> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="options_dropdown_title"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular12"/> - <userDefinedRuntimeAttribute type="string" keyPath="textColorName" value="blackSecondaryText"/> - <userDefinedRuntimeAttribute type="string" keyPath="textColorHighlightedName" value="blackHintText"/> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="border"/> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundHighlightedColorName" value="blackDividers"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="RemoveAdsOptionsButton"/> </userDefinedRuntimeAttributes> <connections> <action selector="onMonth:" destination="-1" eventType="touchUpInside" id="4ir-Kn-VPR"/> @@ -397,11 +367,7 @@ </state> <userDefinedRuntimeAttributes> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="options_dropdown_title"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular12"/> - <userDefinedRuntimeAttribute type="string" keyPath="textColorName" value="blackSecondaryText"/> - <userDefinedRuntimeAttribute type="string" keyPath="textColorHighlightedName" value="blackHintText"/> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="border"/> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundHighlightedColorName" value="blackDividers"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="RemoveAdsOptionsButton"/> </userDefinedRuntimeAttributes> <connections> <action selector="onWeek:" destination="-1" eventType="touchUpInside" id="8da-h3-KW6"/> @@ -419,6 +385,9 @@ <constraint firstAttribute="width" constant="40" id="dq9-eC-S0v"/> <constraint firstAttribute="height" constant="48" id="ekZ-0u-t8B"/> </constraints> + <userDefinedRuntimeAttributes> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="MWMBlack"/> + </userDefinedRuntimeAttributes> </imageView> </subviews> <constraints> @@ -432,10 +401,7 @@ <constraint firstAttribute="height" constant="36" id="u0h-Qx-wo9"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius"> - <integer key="value" value="9"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="blackDividers"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="RemoveAdsOptionsView"/> </userDefinedRuntimeAttributes> </view> </subviews> @@ -476,7 +442,7 @@ <constraint firstItem="RqJ-1V-4Qt" firstAttribute="top" secondItem="moF-VX-t4N" secondAttribute="bottom" priority="250" constant="20" id="z3U-uz-oiR"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Background"/> </userDefinedRuntimeAttributes> <variation key="default"> <mask key="constraints"> @@ -518,7 +484,7 @@ </constraints> </scrollView> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="sW4-fw-4Az"> - <rect key="frame" x="321" y="0.0" width="44" height="44"/> + <rect key="frame" x="322" y="0.0" width="44" height="44"/> <constraints> <constraint firstAttribute="width" constant="44" id="Jsn-5x-Xxq"/> <constraint firstAttribute="height" constant="44" id="Z3Z-BM-iFO"/> @@ -531,10 +497,10 @@ </connections> </button> <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="7Al-wo-fvb"> - <rect key="frame" x="0.0" y="0.0" width="365" height="570"/> + <rect key="frame" x="0.0" y="0.0" width="366" height="706"/> <subviews> <activityIndicatorView opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" animating="YES" style="whiteLarge" translatesAutoresizingMaskIntoConstraints="NO" id="LhO-RQ-vOf"> - <rect key="frame" x="164" y="266.5" width="37" height="37"/> + <rect key="frame" x="164.5" y="334.5" width="37" height="37"/> <color key="color" white="0.33333333333333331" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> </activityIndicatorView> </subviews> @@ -544,7 +510,7 @@ <constraint firstItem="LhO-RQ-vOf" firstAttribute="centerY" secondItem="7Al-wo-fvb" secondAttribute="centerY" id="AAS-WB-BvS"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="toastBackground"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="ToastBackground"/> </userDefinedRuntimeAttributes> </view> </subviews> diff --git a/iphone/Maps/UI/Authorization/AuthorizationViewController.swift b/iphone/Maps/UI/Authorization/AuthorizationViewController.swift index b562e30914..cf10ecb6d1 100644 --- a/iphone/Maps/UI/Authorization/AuthorizationViewController.swift +++ b/iphone/Maps/UI/Authorization/AuthorizationViewController.swift @@ -15,7 +15,7 @@ final class AuthorizationViewController: MWMViewController { lazy var chromeView: UIView = { let view = UIView() - view.backgroundColor = UIColor.blackStatusBarBackground() + view.styleName = "BlackStatusBarBackground" return view }() @@ -25,45 +25,14 @@ final class AuthorizationViewController: MWMViewController { } } - @IBOutlet private weak var contentView: UIView! { - didSet { - contentView.backgroundColor = UIColor.white() - } - } - - @IBOutlet private weak var titleLabel: UILabel! { - didSet { - titleLabel.font = UIFont.bold22() - titleLabel.textColor = UIColor.blackPrimaryText() - titleLabel.text = L("profile_authorization_title") - } - } - - @IBOutlet weak var separator: UIView! { - didSet { - separator.backgroundColor = UIColor.blackDividers() - } - } - - @IBOutlet private weak var textLabel: UILabel! { - didSet { - textLabel.font = UIFont.regular14() - textLabel.textColor = UIColor.blackSecondaryText() - textLabel.text = L("sign_message_gdpr") - } - } + @IBOutlet private weak var contentView: UIView! + @IBOutlet private weak var titleLabel: UILabel! + @IBOutlet weak var separator: UIView! + @IBOutlet private weak var textLabel: UILabel! @IBOutlet private weak var googleButton: UIButton! { didSet { - let layer = googleButton.layer - layer.cornerRadius = 8 - layer.borderWidth = 1 - layer.borderColor = UIColor.blackDividers().cgColor - googleButton.clipsToBounds = true googleButton.setTitle("Google", for: .normal) - googleButton.setTitleColor(UIColor.blackPrimaryText(), for: .normal) - googleButton.setTitleColor(UIColor.blackSecondaryText(), for: .disabled) - googleButton.titleLabel?.font = UIFont.bold14() googleButton.isEnabled = false } } @@ -81,11 +50,6 @@ final class AuthorizationViewController: MWMViewController { @IBOutlet private weak var facebookButton: UIButton! { didSet { - facebookButton.layer.cornerRadius = 8 - facebookButton.clipsToBounds = true - facebookButton.titleLabel?.font = UIFont.bold14() - facebookButton.setBackgroundColor(UIColor.facebookButtonBackground(), for: .normal) - facebookButton.setBackgroundColor(UIColor.facebookButtonBackgroundDisabled(), for: .disabled) facebookButton.isEnabled = false } } @@ -120,29 +84,9 @@ final class AuthorizationViewController: MWMViewController { } } - @IBOutlet private weak var privacyPolicyCheck: Checkmark! { - didSet { - privacyPolicyCheck.offTintColor = .blackHintText() - privacyPolicyCheck.onTintColor = .linkBlue() - privacyPolicyCheck.contentHorizontalAlignment = .left - } - } - - @IBOutlet private weak var termsOfUseCheck: Checkmark! { - didSet { - termsOfUseCheck.offTintColor = .blackHintText() - termsOfUseCheck.onTintColor = .linkBlue() - termsOfUseCheck.contentHorizontalAlignment = .left - } - } - - @IBOutlet private weak var latestNewsCheck: Checkmark! { - didSet { - latestNewsCheck.offTintColor = .blackHintText() - latestNewsCheck.onTintColor = .linkBlue() - latestNewsCheck.contentHorizontalAlignment = .left - } - } + @IBOutlet private weak var privacyPolicyCheck: Checkmark! + @IBOutlet private weak var termsOfUseCheck: Checkmark! + @IBOutlet private weak var latestNewsCheck: Checkmark! @IBAction func onCheck(_ sender: Checkmark) { let allButtonsChecked = privacyPolicyCheck.isChecked && @@ -156,10 +100,8 @@ final class AuthorizationViewController: MWMViewController { @IBOutlet private weak var privacyPolicyTextView: UITextView! { didSet { let htmlString = String(coreFormat: L("sign_agree_pp_gdpr"), arguments: [User.privacyPolicyLink()]) - let attributes: [NSAttributedString.Key : Any] = [NSAttributedString.Key.font: UIFont.regular16(), - NSAttributedString.Key.foregroundColor: UIColor.blackPrimaryText()] privacyPolicyTextView.attributedText = NSAttributedString.string(withHtml: htmlString, - defaultAttributes: attributes) + defaultAttributes: [:]) privacyPolicyTextView.delegate = self } } @@ -167,10 +109,8 @@ final class AuthorizationViewController: MWMViewController { @IBOutlet private weak var termsOfUseTextView: UITextView! { didSet { let htmlString = String(coreFormat: L("sign_agree_tof_gdpr"), arguments: [User.termsOfUseLink()]) - let attributes: [NSAttributedString.Key : Any] = [NSAttributedString.Key.font: UIFont.regular16(), - NSAttributedString.Key.foregroundColor: UIColor.blackPrimaryText()] termsOfUseTextView.attributedText = NSAttributedString.string(withHtml: htmlString, - defaultAttributes: attributes) + defaultAttributes: [:]) termsOfUseTextView.delegate = self } } @@ -178,9 +118,7 @@ final class AuthorizationViewController: MWMViewController { @IBOutlet private weak var latestNewsTextView: UITextView! { didSet { let text = L("sign_agree_news_gdpr") - let attributes: [NSAttributedString.Key : Any] = [NSAttributedString.Key.font: UIFont.regular16(), - NSAttributedString.Key.foregroundColor: UIColor.blackPrimaryText()] - latestNewsTextView.attributedText = NSAttributedString(string: text, attributes: attributes) + latestNewsTextView.attributedText = NSAttributedString(string: text, attributes: [:]) } } diff --git a/iphone/Maps/UI/Authorization/AuthorizationViewController.xib b/iphone/Maps/UI/Authorization/AuthorizationViewController.xib index 7a1280ded2..395a6cbce4 100644 --- a/iphone/Maps/UI/Authorization/AuthorizationViewController.xib +++ b/iphone/Maps/UI/Authorization/AuthorizationViewController.xib @@ -1,9 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES"> - <device id="retina4_7" orientation="portrait" appearance="light"/> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15705" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES"> <dependencies> - <deployment identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15510"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15706"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> <objects> @@ -28,11 +26,11 @@ </placeholder> <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/> <view contentMode="scaleToFill" id="iN0-l3-epB"> - <rect key="frame" x="0.0" y="0.0" width="375" height="667"/> + <rect key="frame" x="0.0" y="0.0" width="414" height="896"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="dEd-Ve-1pc"> - <rect key="frame" x="0.0" y="0.0" width="375" height="667"/> + <rect key="frame" x="0.0" y="0.0" width="414" height="896"/> <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> <gestureRecognizers/> <connections> @@ -40,26 +38,33 @@ </connections> </view> <view contentMode="scaleToFill" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="mb9-vK-FLE"> - <rect key="frame" x="0.0" y="174" width="375" height="493"/> + <rect key="frame" x="0.0" y="441.5" width="414" height="454.5"/> <subviews> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Sign in with social" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="LFT-Lb-6jj"> - <rect key="frame" x="16" y="10" width="343" height="24"/> + <rect key="frame" x="16" y="10" width="382" height="24"/> <fontDescription key="fontDescription" type="boldSystem" pointSize="20"/> <nil key="textColor"/> <nil key="highlightedColor"/> + <userDefinedRuntimeAttributes> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="bold22:blackPrimaryText"/> + <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="profile_authorization_title"/> + </userDefinedRuntimeAttributes> </label> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="hWD-aE-jYh"> - <rect key="frame" x="16" y="44" width="343" height="1"/> + <rect key="frame" x="16" y="44" width="382" height="1"/> <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> <constraints> <constraint firstAttribute="height" constant="1" id="KJA-Gs-fVA"/> </constraints> + <userDefinedRuntimeAttributes> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Divider"/> + </userDefinedRuntimeAttributes> </view> <scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" verticalHuggingPriority="750" verticalCompressionResistancePriority="250" bounces="NO" bouncesZoom="NO" translatesAutoresizingMaskIntoConstraints="NO" id="C1g-0v-suZ"> - <rect key="frame" x="0.0" y="45" width="375" height="448"/> + <rect key="frame" x="0.0" y="45" width="414" height="409.5"/> <subviews> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="H2u-Ej-d0V"> - <rect key="frame" x="0.0" y="0.0" width="375" height="448"/> + <rect key="frame" x="0.0" y="0.0" width="414" height="409.5"/> <subviews> <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="16" translatesAutoresizingMaskIntoConstraints="NO" id="AlH-L6-B76"> <rect key="frame" x="16" y="16" width="343" height="416"/> @@ -71,7 +76,7 @@ <nil key="highlightedColor"/> </label> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Cdf-p5-Bbb"> - <rect key="frame" x="0.0" y="49.5" width="343" height="50"/> + <rect key="frame" x="32" y="59" width="350" height="55.5"/> <subviews> <view opaque="NO" contentMode="center" translatesAutoresizingMaskIntoConstraints="NO" id="33D-0u-y3N" customClass="Checkmark" customModule="maps_me" customModuleProvider="target"> <rect key="frame" x="0.0" y="5" width="40" height="40"/> @@ -99,6 +104,7 @@ <userDefinedRuntimeAttribute type="rect" keyPath="textContainerInset"> <rect key="value" x="0.0" y="0.0" width="0.0" height="0.0"/> </userDefinedRuntimeAttribute> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="TermsOfUseLinkText"/> </userDefinedRuntimeAttributes> <connections> <outlet property="delegate" destination="-1" id="JGn-dX-5rs"/> @@ -117,7 +123,7 @@ </constraints> </view> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="XHd-bd-GsP"> - <rect key="frame" x="0.0" y="115.5" width="343" height="50"/> + <rect key="frame" x="32" y="114.5" width="350" height="55.5"/> <subviews> <view opaque="NO" contentMode="center" translatesAutoresizingMaskIntoConstraints="NO" id="3cN-Qb-mdM" customClass="Checkmark" customModule="maps_me" customModuleProvider="target"> <rect key="frame" x="0.0" y="5" width="40" height="40"/> @@ -145,6 +151,7 @@ <userDefinedRuntimeAttribute type="rect" keyPath="textContainerInset"> <rect key="value" x="0.0" y="0.0" width="0.0" height="0.0"/> </userDefinedRuntimeAttribute> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="TermsOfUseLinkText"/> </userDefinedRuntimeAttributes> </textView> </subviews> @@ -185,6 +192,7 @@ <userDefinedRuntimeAttribute type="rect" keyPath="textContainerInset"> <rect key="value" x="0.0" y="0.0" width="0.0" height="0.0"/> </userDefinedRuntimeAttribute> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="TermsOfUseLinkText"/> </userDefinedRuntimeAttributes> </textView> </subviews> @@ -200,49 +208,54 @@ </constraints> </view> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="8iU-Se-s8N" customClass="LeftAlignedIconButton" customModule="maps_me" customModuleProvider="target"> - <rect key="frame" x="0.0" y="252" width="343" height="44"/> + <rect key="frame" x="32" y="237.5" width="350" height="40"/> <constraints> <constraint firstAttribute="height" constant="44" id="GEc-UM-DNb"/> </constraints> <inset key="imageEdgeInsets" minX="16" minY="0.0" maxX="0.0" maxY="0.0"/> <state key="normal" title="Google" image="login_google_button"/> + <userDefinedRuntimeAttributes> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="GoogleButton"/> + </userDefinedRuntimeAttributes> <connections> <action selector="googleSignIn" destination="-1" eventType="touchUpInside" id="pit-ir-2fB"/> </connections> </button> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="O8A-fR-loh" customClass="LeftAlignedIconButton" customModule="maps_me" customModuleProvider="target"> - <rect key="frame" x="0.0" y="312" width="343" height="44"/> + <rect key="frame" x="32" y="293.5" width="350" height="40"/> <color key="backgroundColor" red="0.23137254901960785" green="0.34901960784313724" blue="0.59607843137254901" alpha="1" colorSpace="calibratedRGB"/> <constraints> <constraint firstAttribute="height" constant="44" id="Evn-BD-u7u"/> </constraints> <inset key="imageEdgeInsets" minX="16" minY="0.0" maxX="0.0" maxY="0.0"/> <state key="normal" title="Facebook" image="login_facebook_button"/> + <userDefinedRuntimeAttributes> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="FacebookButton"/> + </userDefinedRuntimeAttributes> <connections> <action selector="facebookSignIn" destination="-1" eventType="touchUpInside" id="t2x-dC-1bh"/> </connections> </button> <button opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ZDx-fj-xoO"> - <rect key="frame" x="0.0" y="372" width="343" height="44"/> + <rect key="frame" x="32" y="349.5" width="350" height="40"/> <color key="backgroundColor" red="0.0" green="0.47843137250000001" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <constraints> <constraint firstAttribute="height" constant="44" id="jEe-rd-j73"/> </constraints> <state key="normal" title="Phone number"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="bold14"/> - <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius"> - <integer key="value" value="8"/> - </userDefinedRuntimeAttribute> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="phone_number"/> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="linkBlue"/> - <userDefinedRuntimeAttribute type="string" keyPath="textColorHighlightedName" value="whitePrimaryTextHighlighted"/> - <userDefinedRuntimeAttribute type="string" keyPath="textColorName" value="whitePrimaryText"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="FlatNormalButton"/> </userDefinedRuntimeAttributes> <connections> <action selector="phoneSignIn" destination="-1" eventType="touchUpInside" id="EmS-LY-4qT"/> </connections> </button> + <rect key="frame" x="32" y="20" width="350" height="33.5"/> + <userDefinedRuntimeAttributes> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular14:blackSecondaryText"/> + <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="sign_message_gdpr"/> + </userDefinedRuntimeAttributes> </subviews> </stackView> </subviews> @@ -278,6 +291,9 @@ <constraint firstItem="LFT-Lb-6jj" firstAttribute="leading" secondItem="hWD-aE-jYh" secondAttribute="leading" id="fUK-k0-dou"/> <constraint firstAttribute="trailing" secondItem="LFT-Lb-6jj" secondAttribute="trailing" constant="16" id="zlP-rs-etN"/> </constraints> + <userDefinedRuntimeAttributes> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Background"/> + </userDefinedRuntimeAttributes> </view> </subviews> <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> diff --git a/iphone/Maps/UI/Autoupdate/MWMAutoupdateController.xib b/iphone/Maps/UI/Autoupdate/MWMAutoupdateController.xib index 06b386c424..e50e4cb92a 100644 --- a/iphone/Maps/UI/Autoupdate/MWMAutoupdateController.xib +++ b/iphone/Maps/UI/Autoupdate/MWMAutoupdateController.xib @@ -1,21 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES"> - <device id="retina4_7" orientation="portrait"> - <adaptation id="fullscreen"/> - </device> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15705" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES"> <dependencies> - <deployment identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/> - <capability name="Aspect ratio constraints" minToolsVersion="5.1"/> - <capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15706"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> - <customFonts key="customFonts"> - <array key="HelveticaNeue.ttc"> - <string>HelveticaNeue</string> - <string>HelveticaNeue-Medium</string> - </array> - </customFonts> <objects> <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="MWMAutoupdateController"> <connections> @@ -23,21 +11,21 @@ </connections> </placeholder> <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/> - <view contentMode="scaleToFill" id="4Q8-tQ-qqq" customClass="MWMAutoupdateView"> - <rect key="frame" x="0.0" y="0.0" width="375" height="667"/> + <view contentMode="scaleToFill" id="4Q8-tQ-qqq" customClass="MWMAutoupdateView" propertyAccessControl="none"> + <rect key="frame" x="0.0" y="0.0" width="414" height="896"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="CrL-6X-EJl" userLabel="Container"> - <rect key="frame" x="0.0" y="0.0" width="375" height="667"/> + <rect key="frame" x="0.0" y="0.0" width="414" height="896"/> <subviews> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="5Cw-y3-ipv" userLabel="BoundsView"> - <rect key="frame" x="16" y="100" width="343" height="421"/> + <rect key="frame" x="16" y="100" width="382" height="650"/> <subviews> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="vVR-Wh-jf5" userLabel="CenteredView"> - <rect key="frame" x="0.0" y="84.5" width="343" height="253"/> + <rect key="frame" x="0.0" y="198.5" width="382" height="253"/> <subviews> <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalCompressionResistancePriority="749" image="wn_autoupdate" translatesAutoresizingMaskIntoConstraints="NO" id="ym1-j4-Fn7"> - <rect key="frame" x="91.5" y="0.0" width="160" height="160"/> + <rect key="frame" x="111" y="0.0" width="160" height="160"/> <constraints> <constraint firstAttribute="height" relation="lessThanOrEqual" priority="800" constant="240" id="0ZT-MS-DwR"/> <constraint firstAttribute="height" relation="lessThanOrEqual" priority="800" constant="160" id="lKy-F4-tpj"/> @@ -45,24 +33,22 @@ </constraints> </imageView> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Update your downloaded maps " textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="MdA-9O-3gH" userLabel="Title"> - <rect key="frame" x="0.0" y="180" width="343" height="24"/> + <rect key="frame" x="0.0" y="180" width="382" height="24"/> <fontDescription key="fontDescription" name="HelveticaNeue-Medium" family="Helvetica Neue" pointSize="20"/> <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="fontName" value="medium18"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="medium18:blackPrimaryText"/> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="whats_new_auto_update_title"/> </userDefinedRuntimeAttributes> </label> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Updated maps supports information about objects in the current state" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="WLZ-Z2-pj2" userLabel="Text"> - <rect key="frame" x="0.0" y="220" width="343" height="33"/> + <rect key="frame" x="0.0" y="220" width="382" height="33"/> <fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="14"/> <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="fontName" value="regular14"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackSecondaryText"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular14:blackSecondaryText"/> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="whats_new_auto_update_message"/> </userDefinedRuntimeAttributes> </label> @@ -95,7 +81,7 @@ </constraints> </view> <button opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="5nF-zu-Yw0"> - <rect key="frame" x="67.5" y="549" width="240" height="44"/> + <rect key="frame" x="87" y="778" width="240" height="44"/> <color key="backgroundColor" red="0.12549019610000001" green="0.58823529409999997" blue="0.95294117649999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <constraints> <constraint firstAttribute="width" constant="240" id="ARV-BQ-Avk"/> @@ -106,20 +92,14 @@ <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> </state> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular17"/> - <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius"> - <integer key="value" value="8"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="string" keyPath="textColorName" value="whiteColor"/> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="linkBlue"/> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundHighlightedColorName" value="linkBlueHighlighted"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="FlatNormalButton"/> </userDefinedRuntimeAttributes> <connections> <action selector="updateTap" destination="-1" eventType="touchUpInside" id="Xf3-wC-jZS"/> </connections> </button> <button opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" adjustsImageWhenHighlighted="NO" lineBreakMode="wordWrap" translatesAutoresizingMaskIntoConstraints="NO" id="iEE-M5-NnV"> - <rect key="frame" x="67.5" y="603" width="240" height="44"/> + <rect key="frame" x="87" y="832" width="240" height="44"/> <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/> <constraints> <constraint firstAttribute="width" constant="240" id="adp-HR-zDl"/> @@ -131,16 +111,14 @@ <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> </state> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular14"/> - <userDefinedRuntimeAttribute type="string" keyPath="textColorName" value="linkBlue"/> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="clearColor"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="FlatNormalTransButton"/> </userDefinedRuntimeAttributes> <connections> <action selector="hideTap" destination="-1" eventType="touchUpInside" id="fN3-tg-y0A"/> </connections> </button> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="SqI-nm-lNO"> - <rect key="frame" x="169.5" y="537" width="36" height="36"/> + <rect key="frame" x="189" y="766" width="36" height="36"/> <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/> <constraints> <constraint firstAttribute="width" constant="36" id="Lfg-Ln-a6V"/> @@ -148,23 +126,21 @@ </constraints> </view> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Bax-Ah-It4"> - <rect key="frame" x="187" y="581" width="0.0" height="0.0"/> + <rect key="frame" x="207" y="810" width="0.0" height="0.0"/> <fontDescription key="fontDescription" type="system" pointSize="17"/> <nil key="textColor"/> <nil key="highlightedColor"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular14"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackSecondaryText"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular14:blackSecondaryText"/> </userDefinedRuntimeAttributes> </label> - <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="BGi-NW-WUx" propertyAccessControl="all"> - <rect key="frame" x="187" y="583" width="0.0" height="0.0"/> + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="BGi-NW-WUx" propertyAccessControl="none"> + <rect key="frame" x="207" y="812" width="0.0" height="0.0"/> <fontDescription key="fontDescription" type="system" pointSize="17"/> <nil key="textColor"/> <nil key="highlightedColor"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular14"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackSecondaryText"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular14:blackSecondaryText"/> </userDefinedRuntimeAttributes> </label> </subviews> @@ -191,19 +167,7 @@ <constraint firstItem="Bax-Ah-It4" firstAttribute="top" secondItem="SqI-nm-lNO" secondAttribute="bottom" constant="8" id="uM5-w3-HCC"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="size" keyPath="layer.shadowOffset"> - <size key="value" width="0.0" height="3"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="number" keyPath="layer.shadowRadius"> - <integer key="value" value="6"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius"> - <integer key="value" value="4"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="number" keyPath="layer.shadowOpacity"> - <integer key="value" value="1"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="MapAutoupdateView"/> </userDefinedRuntimeAttributes> </view> </subviews> @@ -228,6 +192,7 @@ <outlet property="titleImageOffset" destination="vk2-tC-DOE" id="40I-iU-krz"/> <outlet property="titleTopOffset" destination="dh3-iA-fGg" id="pM9-PQ-ryI"/> </connections> + <point key="canvasLocation" x="138" y="154"/> </view> </objects> <resources> diff --git a/iphone/Maps/UI/BottomMenu/MWMBottomMenuCollectionViewCell.m b/iphone/Maps/UI/BottomMenu/MWMBottomMenuCollectionViewCell.m index 45a6a65870..0699435bee 100644 --- a/iphone/Maps/UI/BottomMenu/MWMBottomMenuCollectionViewCell.m +++ b/iphone/Maps/UI/BottomMenu/MWMBottomMenuCollectionViewCell.m @@ -35,8 +35,8 @@ self.badgeCount.hidden = YES; } self.isEnabled = isEnabled; - self.icon.mwm_coloring = isEnabled ? MWMImageColoringBlack : MWMImageColoringGray; - self.label.textColor = isEnabled ? [UIColor blackPrimaryText] : [UIColor blackHintText]; + [self.icon setStyleAndApply: isEnabled ? @"MWMBlack" : @"MWMGray" ]; + [self.label setStyleAndApply: isEnabled ? @"blackPrimaryText" : @"blackHintText"]; self.promo = NO; } @@ -45,8 +45,8 @@ { self.icon.image = [UIImage imageNamed:imageName]; self.label.text = label; - self.icon.mwm_coloring = MWMImageColoringBlue; - self.label.textColor = [UIColor linkBlue]; + [self.icon setStyleAndApply:@"MWMBlue"]; + [self.label setStyleAndApply:@"linkBlueText"]; self.badgeBackground.hidden = YES; self.badgeCount.hidden = YES; self.isEnabled = YES; @@ -60,9 +60,9 @@ [super setHighlighted:highlighted]; if (self.promo) - self.label.textColor = highlighted ? [UIColor linkBlueHighlighted] : [UIColor linkBlue]; + [self.label setStyleAndApply: highlighted ? @"linkBlueHighlightedText" : @"linkBlueText"]; else - self.label.textColor = highlighted ? [UIColor blackHintText] : [UIColor blackPrimaryText]; + [self.label setStyleAndApply: highlighted ? @"blackHintText" : @"blackPrimaryText"]; } - (void)setSelected:(BOOL)selected diff --git a/iphone/Maps/UI/BottomMenu/MWMBottomMenuCollectionViewLandscapeCell.xib b/iphone/Maps/UI/BottomMenu/MWMBottomMenuCollectionViewLandscapeCell.xib index a11427522e..a03e887f87 100644 --- a/iphone/Maps/UI/BottomMenu/MWMBottomMenuCollectionViewLandscapeCell.xib +++ b/iphone/Maps/UI/BottomMenu/MWMBottomMenuCollectionViewLandscapeCell.xib @@ -1,23 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES"> - <device id="retina4_7" orientation="portrait"> - <adaptation id="fullscreen"/> - </device> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES"> + <device id="retina4_7" orientation="portrait" appearance="light"/> <dependencies> <deployment identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> - <customFonts key="customFonts"> - <array key="HelveticaNeue.ttc"> - <string>HelveticaNeue</string> - <string>HelveticaNeue-Medium</string> - </array> - </customFonts> <objects> <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/> <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/> - <collectionViewCell clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" restorationIdentifier="MWMBottomMenuCollectionViewLandscapeCell" id="gTV-IL-0wX" customClass="MWMBottomMenuCollectionViewLandscapeCell" propertyAccessControl="all"> + <collectionViewCell clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" restorationIdentifier="MWMBottomMenuCollectionViewLandscapeCell" id="gTV-IL-0wX" customClass="MWMBottomMenuCollectionViewLandscapeCell" propertyAccessControl="none"> <rect key="frame" x="0.0" y="0.0" width="108" height="64"/> <autoresizingMask key="autoresizingMask"/> <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"> @@ -31,17 +23,16 @@ <constraint firstAttribute="height" constant="28" id="zil-Ys-XYB"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="coloring" value="MWMBlack"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="MWMBlack"/> </userDefinedRuntimeAttributes> </imageView> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="5Uc-o1-PsF"> - <rect key="frame" x="42" y="40" width="25" height="12"/> + <rect key="frame" x="42" y="40" width="24.5" height="12"/> <fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="10"/> <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="fontName" value="regular10"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular10:blackPrimaryText"/> </userDefinedRuntimeAttributes> </label> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="con-tP-3dJ" userLabel="DownloadBadgeBackground"> @@ -62,11 +53,7 @@ <constraint firstAttribute="width" constant="32" id="ubK-0L-pDn"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius"> - <integer key="value" value="10"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="downloadBadgeBackground"/> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="red"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Badge"/> </userDefinedRuntimeAttributes> </view> </subviews> diff --git a/iphone/Maps/UI/BottomMenu/MWMBottomMenuCollectionViewPortraitCell.xib b/iphone/Maps/UI/BottomMenu/MWMBottomMenuCollectionViewPortraitCell.xib index 95305c086f..e6af12f54a 100644 --- a/iphone/Maps/UI/BottomMenu/MWMBottomMenuCollectionViewPortraitCell.xib +++ b/iphone/Maps/UI/BottomMenu/MWMBottomMenuCollectionViewPortraitCell.xib @@ -1,23 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES"> - <device id="retina4_7" orientation="portrait"> - <adaptation id="fullscreen"/> - </device> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES"> + <device id="retina6_1" orientation="portrait" appearance="light"/> <dependencies> <deployment identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> - <customFonts key="customFonts"> - <array key="HelveticaNeue.ttc"> - <string>HelveticaNeue</string> - <string>HelveticaNeue-Medium</string> - </array> - </customFonts> <objects> <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/> <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/> - <collectionViewCell clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" restorationIdentifier="MWMBottomMenuCollectionViewPortraitCell" id="gTV-IL-0wX" customClass="MWMBottomMenuCollectionViewPortraitCell" propertyAccessControl="all"> + <collectionViewCell clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" restorationIdentifier="MWMBottomMenuCollectionViewPortraitCell" id="gTV-IL-0wX" customClass="MWMBottomMenuCollectionViewPortraitCell" propertyAccessControl="none"> <rect key="frame" x="0.0" y="0.0" width="320" height="52"/> <autoresizingMask key="autoresizingMask"/> <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"> @@ -31,7 +23,7 @@ <constraint firstAttribute="height" constant="28" id="zil-Ys-XYB"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="coloring" value="MWMBlack"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="MWMBlack"/> </userDefinedRuntimeAttributes> </imageView> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="5Uc-o1-PsF"> @@ -40,8 +32,7 @@ <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="fontName" value="regular16"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular16:blackPrimaryText"/> </userDefinedRuntimeAttributes> </label> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="con-tP-3dJ" userLabel="DownloadBadgeBackground"> @@ -65,11 +56,7 @@ <constraint firstAttribute="width" constant="32" id="ubK-0L-pDn"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius"> - <integer key="value" value="10"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="downloadBadgeBackground"/> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="red"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Badge"/> </userDefinedRuntimeAttributes> </view> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="4OJ-wN-dY4" userLabel="Separator"> @@ -79,7 +66,7 @@ <constraint firstAttribute="height" constant="1" id="tDM-AP-ern"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="blackDividers"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Divider"/> </userDefinedRuntimeAttributes> </view> </subviews> diff --git a/iphone/Maps/UI/BottomMenu/MWMBottomMenuView.m b/iphone/Maps/UI/BottomMenu/MWMBottomMenuView.m index cec7e33abd..0e87d77305 100644 --- a/iphone/Maps/UI/BottomMenu/MWMBottomMenuView.m +++ b/iphone/Maps/UI/BottomMenu/MWMBottomMenuView.m @@ -1,6 +1,7 @@ #import "MWMBottomMenuView.h" #import "MWMAvailableAreaAffectDirection.h" #import "MWMButton.h" +#import "SwiftBridge.h" //#import <CoreApi/MWMCommon.h> static CGFloat kAdditionalHeight = 64; @@ -52,6 +53,12 @@ static CGFloat kDefaultMainButtonsHeight = 48; [super layoutSubviews]; } +- (void)applyTheme +{ + [super applyTheme]; + [self updateAppearance]; +} + - (void)updateAppearance { [self updateAlphaAndColor]; @@ -64,12 +71,12 @@ static CGFloat kDefaultMainButtonsHeight = 48; { case MWMBottomMenuStateHidden: break; case MWMBottomMenuStateInactive: - self.extraBottomView.backgroundColor = [UIColor menuBackground]; + [self.extraBottomView setStyleAndApply: @"MenuBackground"]; self.downloadBadge.alpha = [self isCompact] ? 0.0 : 1.0; self.additionalButtons.alpha = 0.0; break; case MWMBottomMenuStateActive: - self.extraBottomView.backgroundColor = [UIColor white]; + [self.extraBottomView setStyleAndApply: @"Background"]; self.downloadBadge.alpha = 0.0; self.additionalButtons.alpha = 1.0; break; diff --git a/iphone/Maps/UI/BottomMenu/MWMBottomMenuViewController.h b/iphone/Maps/UI/BottomMenu/MWMBottomMenuViewController.h index c265a4f7ad..f3f93be0a3 100644 --- a/iphone/Maps/UI/BottomMenu/MWMBottomMenuViewController.h +++ b/iphone/Maps/UI/BottomMenu/MWMBottomMenuViewController.h @@ -12,7 +12,6 @@ - (instancetype)initWithParentController:(MapViewController *)controller delegate:(id<MWMBottomMenuControllerProtocol>)delegate; -- (void)mwm_refreshUI; - (void)updateBadgeVisible:(BOOL)visible; + (void)updateAvailableArea:(CGRect)frame; diff --git a/iphone/Maps/UI/BottomMenu/MWMBottomMenuViewController.mm b/iphone/Maps/UI/BottomMenu/MWMBottomMenuViewController.mm index 18be6e13c5..ac1ca38021 100644 --- a/iphone/Maps/UI/BottomMenu/MWMBottomMenuViewController.mm +++ b/iphone/Maps/UI/BottomMenu/MWMBottomMenuViewController.mm @@ -106,7 +106,6 @@ typedef NS_ENUM(NSUInteger, MWMBottomMenuViewCell) { [self refreshLayout]; } -- (void)mwm_refreshUI { [self.view mwm_refreshUI]; } - (void)updateBadgeVisible:(BOOL)visible { self.downloadBadge.hidden = !visible; } #pragma mark - Refresh Collection View layout diff --git a/iphone/Maps/UI/BottomMenu/MWMBottomMenuViewController.xib b/iphone/Maps/UI/BottomMenu/MWMBottomMenuViewController.xib index 6292335a0b..8b86bfc2bc 100644 --- a/iphone/Maps/UI/BottomMenu/MWMBottomMenuViewController.xib +++ b/iphone/Maps/UI/BottomMenu/MWMBottomMenuViewController.xib @@ -1,12 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14113" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> - <device id="retina5_9" orientation="portrait"> - <adaptation id="fullscreen"/> - </device> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15705" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> <dependencies> - <deployment identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/> - <capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15706"/> <capability name="Safe area layout guides" minToolsVersion="9.0"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> @@ -25,7 +20,7 @@ </connections> </placeholder> <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/> - <view clearsContextBeforeDrawing="NO" contentMode="scaleToFill" id="zuH-WU-hiP" customClass="MWMBottomMenuView" propertyAccessControl="all"> + <view clearsContextBeforeDrawing="NO" contentMode="scaleToFill" id="zuH-WU-hiP" customClass="MWMBottomMenuView" propertyAccessControl="none"> <rect key="frame" x="0.0" y="0.0" width="320" height="197"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> @@ -41,7 +36,7 @@ <accessibility key="accessibilityConfiguration" identifier="searchButton"/> <state key="normal" image="ic_menu_search"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="coloringName" value="MWMBlack"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="MWMBlack"/> </userDefinedRuntimeAttributes> <connections> <action selector="searchButtonTouchUpInside" destination="-1" eventType="touchUpInside" id="uiJ-y8-jqM"/> @@ -52,7 +47,7 @@ <accessibility key="accessibilityConfiguration" identifier="p2pButton"/> <state key="normal" image="ic_menu_point_to_point"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="coloringName" value="MWMBlack"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="MWMBlack"/> </userDefinedRuntimeAttributes> <connections> <action selector="point2PointButtonTouchUpInside:" destination="-1" eventType="touchUpInside" id="Lss-d4-B9C"/> @@ -63,7 +58,7 @@ <accessibility key="accessibilityConfiguration" identifier="discoveryButton"/> <state key="normal" image="ic_menu_discovery"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="coloringName" value="MWMBlack"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="MWMBlack"/> </userDefinedRuntimeAttributes> <connections> <action selector="discoveryTap" destination="-1" eventType="touchUpInside" id="TlT-QN-jAJ"/> @@ -74,7 +69,7 @@ <accessibility key="accessibilityConfiguration" identifier="bookmarksButton"/> <state key="normal" image="ic_menu_bookmark_list"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="coloringName" value="MWMBlack"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="MWMBlack"/> </userDefinedRuntimeAttributes> <connections> <action selector="bookmarksButtonTouchUpInside" destination="-1" eventType="touchUpInside" id="SXl-Zi-E37"/> @@ -85,7 +80,7 @@ <accessibility key="accessibilityConfiguration" identifier="menuButton"/> <state key="normal" image="ic_menu"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="coloringName" value="MWMBlack"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="MWMBlack"/> </userDefinedRuntimeAttributes> <connections> <action selector="menuButtonTouchUpInside" destination="-1" eventType="touchUpInside" id="Bz9-ty-nzH"/> @@ -99,10 +94,7 @@ <constraint firstAttribute="height" constant="10" id="wNg-5Z-7AO"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius"> - <integer key="value" value="5"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="downloadBadgeBackground"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Badge"/> </userDefinedRuntimeAttributes> </view> </subviews> @@ -142,7 +134,7 @@ <constraint firstAttribute="height" constant="1" id="wSx-Bp-1WM"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="blackDividers"/> + <userDefinedRuntimeAttribute type="string" keyPath="StyleName" value="Divider"/> </userDefinedRuntimeAttributes> </view> <collectionView clipsSubviews="YES" contentMode="scaleToFill" bounces="NO" scrollEnabled="NO" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" delaysContentTouches="NO" bouncesZoom="NO" dataMode="none" translatesAutoresizingMaskIntoConstraints="NO" id="NfG-tt-q8G" userLabel="AdditionalButtons"> diff --git a/iphone/Maps/UI/CarPlay/CarPlayMapViewController.swift b/iphone/Maps/UI/CarPlay/CarPlayMapViewController.swift index 2a9355be71..8b4856eb92 100644 --- a/iphone/Maps/UI/CarPlay/CarPlayMapViewController.swift +++ b/iphone/Maps/UI/CarPlay/CarPlayMapViewController.swift @@ -147,4 +147,9 @@ final class CarPlayMapViewController: MWMViewController { super.traitCollectionDidChange(previousTraitCollection) ThemeManager.invalidate() } + + override func applyTheme() { + super.applyTheme() + updateSpeedControl() + } } diff --git a/iphone/Maps/UI/Discovery/Collection Cells/DiscoveryBookingCell.swift b/iphone/Maps/UI/Discovery/Collection Cells/DiscoveryBookingCell.swift index c4766e93cd..5f526a9337 100644 --- a/iphone/Maps/UI/Discovery/Collection Cells/DiscoveryBookingCell.swift +++ b/iphone/Maps/UI/Discovery/Collection Cells/DiscoveryBookingCell.swift @@ -1,45 +1,14 @@ @objc(MWMDiscoveryBookingCell) final class DiscoveryBookingCell: UICollectionViewCell { @IBOutlet private weak var avatar: UIImageView! - @IBOutlet private weak var name: UILabel! { - didSet { - name.font = UIFont.medium14() - name.textColor = UIColor.blackPrimaryText() - } - } - - @IBOutlet private weak var stars: UILabel! { - didSet { - stars.font = UIFont.regular12() - stars.textColor = UIColor.blackSecondaryText() - } - } - - @IBOutlet private weak var price: UILabel! { - didSet { - price.font = UIFont.medium14() - price.textColor = UIColor.blackSecondaryText() - } - } - - @IBOutlet private weak var rating: RatingSummaryView! { - didSet { - rating.defaultConfig() - rating.textFont = UIFont.bold12() - rating.textSize = 12 - } - } - - @IBOutlet private weak var distance: UILabel! { - didSet { - distance.font = UIFont.medium14() - distance.textColor = UIColor.linkBlue() - } - } + @IBOutlet private weak var name: UILabel! + @IBOutlet private weak var stars: UILabel! + @IBOutlet private weak var price: UILabel! + @IBOutlet private weak var rating: RatingSummaryView! + @IBOutlet private weak var distance: UILabel! @IBOutlet private weak var buildRoute: UIButton! { didSet { - buildRoute.setTitleColor(UIColor.linkBlue(), for: .normal) buildRoute.setTitle(L("p2p_to_here"), for: .normal) } } @@ -95,6 +64,5 @@ final class DiscoveryBookingCell: UICollectionViewCell { override func awakeFromNib() { super.awakeFromNib() - layer.borderColor = UIColor.blackDividers().cgColor } } diff --git a/iphone/Maps/UI/Discovery/Collection Cells/DiscoveryBookingCell.xib b/iphone/Maps/UI/Discovery/Collection Cells/DiscoveryBookingCell.xib index de91a244e8..aecbd9a447 100644 --- a/iphone/Maps/UI/Discovery/Collection Cells/DiscoveryBookingCell.xib +++ b/iphone/Maps/UI/Discovery/Collection Cells/DiscoveryBookingCell.xib @@ -1,17 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES"> - <device id="retina4_7" orientation="portrait"> - <adaptation id="fullscreen"/> - </device> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15705" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES"> + <device id="retina4_7" orientation="portrait" appearance="light"/> <dependencies> <deployment identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15706"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> <objects> <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/> <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/> - <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="DiscoveryBookingCell" id="bjC-eX-cME" customClass="MWMDiscoveryBookingCell" propertyAccessControl="all"> + <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="DiscoveryBookingCell" id="bjC-eX-cME" customClass="MWMDiscoveryBookingCell" propertyAccessControl="none"> <rect key="frame" x="0.0" y="0.0" width="160" height="138"/> <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/> <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO"> @@ -33,8 +31,7 @@ <nil key="textColor"/> <nil key="highlightedColor"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="medium14"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="medium14:blackPrimaryText"/> </userDefinedRuntimeAttributes> </label> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="iw8-ju-uOt"> @@ -45,12 +42,18 @@ <fontDescription key="fontDescription" type="system" pointSize="17"/> <nil key="textColor"/> <nil key="highlightedColor"/> + <userDefinedRuntimeAttributes> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular12:blackSecondaryText"/> + </userDefinedRuntimeAttributes> </label> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Mlf-pU-xTQ" userLabel="Price"> <rect key="frame" x="12" y="54" width="42" height="20"/> <fontDescription key="fontDescription" type="system" pointSize="17"/> <nil key="textColor"/> <nil key="highlightedColor"/> + <userDefinedRuntimeAttributes> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="medium14:blackSecondaryText"/> + </userDefinedRuntimeAttributes> </label> <view contentMode="scaleToFill" horizontalHuggingPriority="252" horizontalCompressionResistancePriority="752" translatesAutoresizingMaskIntoConstraints="NO" id="KmA-vt-YxO" customClass="RatingSummaryView" customModule="maps_me" customModuleProvider="target"> <rect key="frame" x="54" y="54" width="48" height="20"/> @@ -60,11 +63,7 @@ <constraint firstAttribute="height" constant="20" id="jcd-OG-vjG"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="image" keyPath="excellentImage" value="ic_24px_rating_excellent"/> - <userDefinedRuntimeAttribute type="image" keyPath="goodImage" value="ic_24px_rating_excellent"/> - <userDefinedRuntimeAttribute type="image" keyPath="normalImage" value="ic_24px_rating_normal"/> - <userDefinedRuntimeAttribute type="image" keyPath="badImage" value="ic_24px_rating_bad"/> - <userDefinedRuntimeAttribute type="image" keyPath="horribleImage" value="ic_24px_rating_horrible"/> + <userDefinedRuntimeAttribute type="image" keyPath="styleName" value="RatingSummaryView24:bold12"/> <userDefinedRuntimeAttribute type="number" keyPath="topOffset"> <real key="value" value="2"/> </userDefinedRuntimeAttribute> @@ -80,7 +79,6 @@ <userDefinedRuntimeAttribute type="number" keyPath="trailingTextOffset"> <real key="value" value="6"/> </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="image" keyPath="noValueImage" value="ic_12px_rating_normal"/> </userDefinedRuntimeAttributes> </view> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="5vR-oH-2gt"> @@ -92,7 +90,7 @@ </constraints> <state key="normal" title="Button"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="textColorName" value="linkBlue"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="medium14:linkBlueText"/> </userDefinedRuntimeAttributes> <connections> <action selector="buildRouteAction" destination="bjC-eX-cME" eventType="touchUpInside" id="8vR-L4-RUL"/> @@ -103,6 +101,9 @@ <fontDescription key="fontDescription" type="system" pointSize="17"/> <nil key="textColor"/> <nil key="highlightedColor"/> + <userDefinedRuntimeAttributes> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="medium14:linkBlueText"/> + </userDefinedRuntimeAttributes> </label> </subviews> </view> @@ -131,13 +132,7 @@ </constraints> <size key="customSize" width="160" height="218"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius"> - <integer key="value" value="6"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="number" keyPath="layer.borderWidth"> - <integer key="value" value="1"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="DiscoveryCell"/> </userDefinedRuntimeAttributes> <connections> <outlet property="avatar" destination="WIp-9D-zCf" id="tTe-VB-e8W"/> @@ -152,10 +147,6 @@ </collectionViewCell> </objects> <resources> - <image name="ic_12px_rating_normal" width="12" height="12"/> - <image name="ic_24px_rating_bad" width="24" height="24"/> - <image name="ic_24px_rating_excellent" width="24" height="24"/> - <image name="ic_24px_rating_horrible" width="24" height="24"/> - <image name="ic_24px_rating_normal" width="24" height="24"/> + <image name="RatingSummaryView24:bold12" width="16" height="16"/> </resources> </document> diff --git a/iphone/Maps/UI/Discovery/Collection Cells/DiscoveryGuideCell.swift b/iphone/Maps/UI/Discovery/Collection Cells/DiscoveryGuideCell.swift index 362c384f50..1faa518c63 100644 --- a/iphone/Maps/UI/Discovery/Collection Cells/DiscoveryGuideCell.swift +++ b/iphone/Maps/UI/Discovery/Collection Cells/DiscoveryGuideCell.swift @@ -3,25 +3,18 @@ final class DiscoveryGuideCell: UICollectionViewCell { @IBOutlet var avatar: UIImageView! @IBOutlet var titleLabel: UILabel! { didSet { - titleLabel.font = UIFont.medium14() - titleLabel.textColor = UIColor.blackPrimaryText() titleLabel.numberOfLines = 2 } } @IBOutlet var subtitleLabel: UILabel! { didSet { - subtitleLabel.font = UIFont.regular12() - subtitleLabel.textColor = UIColor.blackSecondaryText() subtitleLabel.numberOfLines = 1 } } @IBOutlet var proLabel: UILabel! { didSet { - proLabel.font = UIFont.bold12() - proLabel.textColor = UIColor.white() - proLabel.backgroundColor = .clear proLabel.text = ""; } } @@ -30,8 +23,6 @@ final class DiscoveryGuideCell: UICollectionViewCell { @IBOutlet var detailsButton: UIButton! { didSet { - detailsButton.titleLabel?.font = UIFont.semibold14() - detailsButton.setTitleColor(UIColor.linkBlue(), for: .normal) detailsButton.setTitle(L("details"), for: .normal) } } @@ -51,7 +42,6 @@ final class DiscoveryGuideCell: UICollectionViewCell { override func awakeFromNib() { super.awakeFromNib() - layer.borderColor = UIColor.blackDividers().cgColor } override func prepareForReuse() { @@ -92,7 +82,7 @@ final class DiscoveryGuideCell: UICollectionViewCell { if let labelHexColor = labelHexColor, labelHexColor.count == 6 { proContainer.backgroundColor = UIColor(fromHexString: labelHexColor) } else { - proContainer.backgroundColor = UIColor.ratingRed() + proContainer.backgroundColor = UIColor.red } proContainer.isHidden = false } diff --git a/iphone/Maps/UI/Discovery/Collection Cells/DiscoveryGuideCell.xib b/iphone/Maps/UI/Discovery/Collection Cells/DiscoveryGuideCell.xib index ab7419c436..04d3b59b48 100644 --- a/iphone/Maps/UI/Discovery/Collection Cells/DiscoveryGuideCell.xib +++ b/iphone/Maps/UI/Discovery/Collection Cells/DiscoveryGuideCell.xib @@ -1,11 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> - <device id="retina6_1" orientation="portrait"> - <adaptation id="fullscreen"/> - </device> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> + <device id="retina6_1" orientation="portrait" appearance="light"/> <dependencies> <deployment identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14490.49"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/> <capability name="Safe area layout guides" minToolsVersion="9.0"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> @@ -35,23 +33,29 @@ <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="14"/> <state key="normal" title="Button"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="textColorName" value="linkBlue"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="semibold14:linkBlueText"/> </userDefinedRuntimeAttributes> <connections> <action selector="detailsAction" destination="gTV-IL-0wX" eventType="touchUpInside" id="LKy-hf-jCB"/> </connections> </button> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="7eA-bJ-coY"> - <rect key="frame" x="12" y="94" width="136" height="21"/> - <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="17"/> + <rect key="frame" x="12" y="94" width="136" height="20"/> + <fontDescription key="fontDescription" type="system" pointSize="17"/> <nil key="textColor"/> <nil key="highlightedColor"/> + <userDefinedRuntimeAttributes> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="medium14:blackPrimaryText"/> + </userDefinedRuntimeAttributes> </label> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="fEh-1z-Iwj"> - <rect key="frame" x="12" y="119" width="136" height="21"/> + <rect key="frame" x="12" y="118" width="136" height="21"/> <fontDescription key="fontDescription" type="system" pointSize="17"/> <nil key="textColor"/> <nil key="highlightedColor"/> + <userDefinedRuntimeAttributes> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular12:blackSecondaryText"/> + </userDefinedRuntimeAttributes> </label> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="C9b-m0-Yo8"> <rect key="frame" x="0.0" y="46" width="54" height="24"/> @@ -61,6 +65,9 @@ <fontDescription key="fontDescription" type="system" pointSize="17"/> <nil key="textColor"/> <nil key="highlightedColor"/> + <userDefinedRuntimeAttributes> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="bold12:whiteText"/> + </userDefinedRuntimeAttributes> </label> </subviews> <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> @@ -93,13 +100,7 @@ <viewLayoutGuide key="safeArea" id="ZTg-uK-7eu"/> <size key="customSize" width="160" height="194"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius"> - <integer key="value" value="6"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="number" keyPath="layer.borderWidth"> - <integer key="value" value="1"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="DiscoveryCell"/> </userDefinedRuntimeAttributes> <connections> <outlet property="avatar" destination="PVI-wd-HVI" id="zzN-X5-o2N"/> diff --git a/iphone/Maps/UI/Discovery/Collection Cells/DiscoveryMoreCell.swift b/iphone/Maps/UI/Discovery/Collection Cells/DiscoveryMoreCell.swift index 424dd50bd2..a57105f92a 100644 --- a/iphone/Maps/UI/Discovery/Collection Cells/DiscoveryMoreCell.swift +++ b/iphone/Maps/UI/Discovery/Collection Cells/DiscoveryMoreCell.swift @@ -12,6 +12,5 @@ final class DiscoveryMoreCell: UICollectionViewCell { required init?(coder aDecoder: NSCoder) { super.init(coder: aDecoder) - layer.borderColor = UIColor.blackDividers().cgColor } } diff --git a/iphone/Maps/UI/Discovery/Collection Cells/DiscoveryMoreCell.xib b/iphone/Maps/UI/Discovery/Collection Cells/DiscoveryMoreCell.xib index 38ad424b46..d826a34535 100644 --- a/iphone/Maps/UI/Discovery/Collection Cells/DiscoveryMoreCell.xib +++ b/iphone/Maps/UI/Discovery/Collection Cells/DiscoveryMoreCell.xib @@ -1,11 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14109" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> - <device id="retina4_7" orientation="portrait"> - <adaptation id="fullscreen"/> - </device> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> + <device id="retina4_7" orientation="portrait" appearance="light"/> <dependencies> <deployment identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/> <capability name="Safe area layout guides" minToolsVersion="9.0"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> @@ -29,19 +27,17 @@ <constraint firstAttribute="height" constant="56" id="aJg-fF-VSP"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="mwm_name" value="btn_float_more"/> - <userDefinedRuntimeAttribute type="string" keyPath="coloring" value="MWMOther"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="DiscoveryMoreImage"/> </userDefinedRuntimeAttributes> </imageView> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="S1v-vC-wOE"> - <rect key="frame" x="0.0" y="64" width="160" height="20.5"/> + <rect key="frame" x="0.0" y="64" width="160" height="20"/> <fontDescription key="fontDescription" type="system" pointSize="17"/> <nil key="textColor"/> <nil key="highlightedColor"/> <userDefinedRuntimeAttributes> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="placepage_more_button"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="medium14"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="linkBlue"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="medium14:linkBlueText"/> </userDefinedRuntimeAttributes> </label> </subviews> @@ -71,7 +67,7 @@ <userDefinedRuntimeAttribute type="number" keyPath="layer.borderWidth"> <integer key="value" value="1"/> </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="DiscoveryCell"/> </userDefinedRuntimeAttributes> <point key="canvasLocation" x="-187" y="-19"/> </collectionViewCell> diff --git a/iphone/Maps/UI/Discovery/Collection Cells/DiscoverySearchCell.swift b/iphone/Maps/UI/Discovery/Collection Cells/DiscoverySearchCell.swift index 561c15d9d4..580e2a3d9b 100644 --- a/iphone/Maps/UI/Discovery/Collection Cells/DiscoverySearchCell.swift +++ b/iphone/Maps/UI/Discovery/Collection Cells/DiscoverySearchCell.swift @@ -3,19 +3,8 @@ final class DiscoverySearchCell: UICollectionViewCell { @IBOutlet private weak var titleLabel: UILabel! @IBOutlet private weak var subtitleLabel: UILabel! @IBOutlet private weak var distanceLabel: UILabel! - @IBOutlet private weak var popularView: UIView! { - didSet { - popularView.tintColor = UIColor.linkBlue() - } - } - - @IBOutlet private weak var ratingView: RatingSummaryView! { - didSet { - ratingView.defaultConfig() - ratingView.textFont = UIFont.bold12() - ratingView.textSize = 12 - } - } + @IBOutlet private weak var popularView: UIView! + @IBOutlet private weak var ratingView: RatingSummaryView! typealias Tap = () -> () private var tap: Tap? @@ -52,6 +41,5 @@ final class DiscoverySearchCell: UICollectionViewCell { required init?(coder aDecoder: NSCoder) { super.init(coder: aDecoder) - layer.borderColor = UIColor.blackDividers().cgColor } } diff --git a/iphone/Maps/UI/Discovery/Collection Cells/DiscoverySearchCell.xib b/iphone/Maps/UI/Discovery/Collection Cells/DiscoverySearchCell.xib index c6c9e87a61..26582e94c4 100644 --- a/iphone/Maps/UI/Discovery/Collection Cells/DiscoverySearchCell.xib +++ b/iphone/Maps/UI/Discovery/Collection Cells/DiscoverySearchCell.xib @@ -1,11 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14113" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES"> - <device id="retina4_7" orientation="portrait"> - <adaptation id="fullscreen"/> - </device> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15705" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES"> + <device id="retina6_1" orientation="portrait" appearance="light"/> <dependencies> <deployment identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15706"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> <objects> @@ -19,7 +17,7 @@ <autoresizingMask key="autoresizingMask"/> <subviews> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="c6x-nr-TLZ"> - <rect key="frame" x="0.0" y="103" width="160" height="40"/> + <rect key="frame" x="0.0" y="102" width="160" height="40"/> <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.040000000000000001" colorSpace="custom" customColorSpace="sRGB"/> <constraints> <constraint firstAttribute="width" constant="160" id="2EQ-Jv-uS6"/> @@ -27,15 +25,15 @@ </constraints> <state key="normal" title="Button"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="textColorName" value="linkBlue"/> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="p2p_to_here"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="medium14:linkBlueText"/> </userDefinedRuntimeAttributes> <connections> <action selector="routeTo" destination="A42-0e-MgA" eventType="touchUpInside" id="yyq-fQ-hhq"/> </connections> </button> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" verticalCompressionResistancePriority="751" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="L2e-OA-S0b"> - <rect key="frame" x="12" y="14" width="136" height="20.5"/> + <rect key="frame" x="12" y="14" width="136" height="20"/> <constraints> <constraint firstAttribute="height" constant="20" id="zqQ-pL-31M"/> </constraints> @@ -43,12 +41,11 @@ <nil key="textColor"/> <nil key="highlightedColor"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="medium14"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="medium14:blackPrimaryText"/> </userDefinedRuntimeAttributes> </label> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" verticalCompressionResistancePriority="751" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="YHT-YE-QdR"> - <rect key="frame" x="12" y="36.5" width="136" height="16"/> + <rect key="frame" x="12" y="36" width="136" height="16"/> <constraints> <constraint firstAttribute="height" constant="16" id="skf-mr-i6s"/> </constraints> @@ -56,23 +53,17 @@ <nil key="textColor"/> <nil key="highlightedColor"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular12"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackSecondaryText"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular12:blackSecondaryText"/> </userDefinedRuntimeAttributes> </label> <view contentMode="scaleToFill" horizontalHuggingPriority="252" verticalHuggingPriority="251" horizontalCompressionResistancePriority="752" translatesAutoresizingMaskIntoConstraints="NO" id="mdG-Tp-49e" customClass="RatingSummaryView" customModule="maps_me" customModuleProvider="target"> - <rect key="frame" x="12" y="55" width="48" height="20"/> + <rect key="frame" x="12" y="54" width="48" height="20"/> <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> <constraints> <constraint firstAttribute="width" constant="48" id="9pH-0h-0fX"/> <constraint firstAttribute="height" constant="20" id="uco-5I-Hin"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="image" keyPath="excellentImage" value="ic_24px_rating_excellent"/> - <userDefinedRuntimeAttribute type="image" keyPath="goodImage" value="ic_24px_rating_excellent"/> - <userDefinedRuntimeAttribute type="image" keyPath="normalImage" value="ic_24px_rating_normal"/> - <userDefinedRuntimeAttribute type="image" keyPath="badImage" value="ic_24px_rating_bad"/> - <userDefinedRuntimeAttribute type="image" keyPath="horribleImage" value="ic_24px_rating_horrible"/> <userDefinedRuntimeAttribute type="number" keyPath="topOffset"> <real key="value" value="2"/> </userDefinedRuntimeAttribute> @@ -88,11 +79,11 @@ <userDefinedRuntimeAttribute type="number" keyPath="trailingTextOffset"> <real key="value" value="6"/> </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="image" keyPath="noValueImage" value="ic_12px_rating_normal"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="RatingSummaryView24:bold12"/> </userDefinedRuntimeAttributes> </view> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="euO-GA-D3Q"> - <rect key="frame" x="68" y="55" width="52.5" height="20"/> + <rect key="frame" x="68" y="54" width="52.5" height="20"/> <subviews> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Popular" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.90000000000000002" adjustsLetterSpacingToFitWidth="YES" translatesAutoresizingMaskIntoConstraints="NO" id="QPJ-wc-N0V"> <rect key="frame" x="4" y="3" width="44.5" height="14.5"/> @@ -101,8 +92,7 @@ <nil key="highlightedColor"/> <userDefinedRuntimeAttributes> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="popular_place"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="linkBlue"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="bold12"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="bold12:linkBlueText"/> </userDefinedRuntimeAttributes> </label> </subviews> @@ -115,20 +105,16 @@ <constraint firstAttribute="height" constant="20" id="gsx-gp-hHI"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius"> - <integer key="value" value="10"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="linkBlueHighlighted"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="DiscoveryPopularView"/> </userDefinedRuntimeAttributes> </view> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" verticalCompressionResistancePriority="751" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="JeJ-M3-EPg"> - <rect key="frame" x="12" y="75" width="136" height="20"/> + <rect key="frame" x="12" y="74" width="136" height="20"/> <fontDescription key="fontDescription" type="system" pointSize="17"/> <nil key="textColor"/> <nil key="highlightedColor"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="medium14"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="linkBlue"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="medium14:linkBlueText"/> </userDefinedRuntimeAttributes> </label> </subviews> @@ -156,13 +142,7 @@ </constraints> <size key="customSize" width="160" height="161"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius"> - <integer key="value" value="6"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="number" keyPath="layer.borderWidth"> - <integer key="value" value="1"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="DiscoveryCell"/> </userDefinedRuntimeAttributes> <connections> <outlet property="distanceLabel" destination="JeJ-M3-EPg" id="7oY-L4-1dO"/> @@ -174,11 +154,4 @@ <point key="canvasLocation" x="-261" y="-36.5"/> </collectionViewCell> </objects> - <resources> - <image name="ic_12px_rating_normal" width="12" height="12"/> - <image name="ic_24px_rating_bad" width="24" height="24"/> - <image name="ic_24px_rating_excellent" width="24" height="24"/> - <image name="ic_24px_rating_horrible" width="24" height="24"/> - <image name="ic_24px_rating_normal" width="24" height="24"/> - </resources> </document> diff --git a/iphone/Maps/UI/Discovery/MWMDiscoveryController.xib b/iphone/Maps/UI/Discovery/MWMDiscoveryController.xib index b91aeeccef..34d85c6199 100644 --- a/iphone/Maps/UI/Discovery/MWMDiscoveryController.xib +++ b/iphone/Maps/UI/Discovery/MWMDiscoveryController.xib @@ -1,11 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> - <device id="retina4_7" orientation="portrait"> - <adaptation id="fullscreen"/> - </device> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> + <device id="retina4_7" orientation="portrait" appearance="light"/> <dependencies> <deployment identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14490.49"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/> <capability name="Safe area layout guides" minToolsVersion="9.0"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> @@ -22,10 +20,10 @@ <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" style="grouped" separatorStyle="none" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="16" sectionFooterHeight="1" translatesAutoresizingMaskIntoConstraints="NO" id="mUK-tO-itf"> - <rect key="frame" x="0.0" y="20" width="375" height="647"/> + <rect key="frame" x="0.0" y="0.0" width="375" height="667"/> <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="pressBackground"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="DiscoveryController"/> </userDefinedRuntimeAttributes> </tableView> </subviews> @@ -38,7 +36,7 @@ </constraints> <viewLayoutGuide key="safeArea" id="eY3-Qh-n8a"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="pressBackground"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="DiscoveryController"/> </userDefinedRuntimeAttributes> <point key="canvasLocation" x="33.5" y="54.5"/> </view> diff --git a/iphone/Maps/UI/Discovery/Table Cells/DiscoveryNoResultsCell.xib b/iphone/Maps/UI/Discovery/Table Cells/DiscoveryNoResultsCell.xib index 24343b670c..6a3eb29a1e 100644 --- a/iphone/Maps/UI/Discovery/Table Cells/DiscoveryNoResultsCell.xib +++ b/iphone/Maps/UI/Discovery/Table Cells/DiscoveryNoResultsCell.xib @@ -1,51 +1,46 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> - <device id="retina4_7" orientation="portrait"> - <adaptation id="fullscreen"/> - </device> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> + <device id="retina4_7" orientation="portrait" appearance="light"/> <dependencies> <deployment identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/> - <capability name="Constraints to layout margins" minToolsVersion="6.0"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> <objects> <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/> <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/> - <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="DiscoveryNoResultsCell" rowHeight="339" id="cMz-2D-HZd" propertyAccessControl="all"> + <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="DiscoveryNoResultsCell" rowHeight="339" id="cMz-2D-HZd" propertyAccessControl="none"> <rect key="frame" x="0.0" y="0.0" width="375" height="341"/> <autoresizingMask key="autoresizingMask"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="cMz-2D-HZd" id="Vm0-gk-kNj"> - <rect key="frame" x="0.0" y="0.0" width="375" height="340.5"/> + <rect key="frame" x="0.0" y="0.0" width="375" height="341"/> <autoresizingMask key="autoresizingMask"/> <subviews> <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="ic_cactus" translatesAutoresizingMaskIntoConstraints="NO" id="T2p-b9-jUK"> - <rect key="frame" x="68" y="40" width="238" height="195"/> + <rect key="frame" x="68.5" y="40" width="238" height="195"/> <constraints> <constraint firstAttribute="width" constant="238" id="cdz-1D-vK1"/> <constraint firstAttribute="height" constant="195" id="eIR-cY-Jgy"/> </constraints> </imageView> - <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="vDo-aq-cyh"> - <rect key="frame" x="28" y="277" width="319" height="21"/> + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="Label" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="vDo-aq-cyh"> + <rect key="frame" x="27" y="277" width="321" height="21"/> <fontDescription key="fontDescription" type="system" pointSize="17"/> <nil key="textColor"/> <nil key="highlightedColor"/> <userDefinedRuntimeAttributes> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="discovery_button_404_error_title"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="medium18"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="medium18:blackPrimaryText"/> </userDefinedRuntimeAttributes> </label> - <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Fs0-t4-aJM"> - <rect key="frame" x="28" y="308" width="319" height="21"/> + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="Label" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Fs0-t4-aJM"> + <rect key="frame" x="27" y="308" width="321" height="21"/> <fontDescription key="fontDescription" type="system" pointSize="17"/> <nil key="textColor"/> <nil key="highlightedColor"/> <userDefinedRuntimeAttributes> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="discovery_button_404_error_message"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular14"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackSecondaryText"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular14:blackSecondaryText"/> </userDefinedRuntimeAttributes> </label> </subviews> diff --git a/iphone/Maps/UI/Discovery/Table Cells/DiscoveryOnlineTemplateCell.swift b/iphone/Maps/UI/Discovery/Table Cells/DiscoveryOnlineTemplateCell.swift index 91f6c2b548..a316a07065 100644 --- a/iphone/Maps/UI/Discovery/Table Cells/DiscoveryOnlineTemplateCell.swift +++ b/iphone/Maps/UI/Discovery/Table Cells/DiscoveryOnlineTemplateCell.swift @@ -13,22 +13,11 @@ final class DiscoveryOnlineTemplateCell: MWMTableViewCell { } } - @IBOutlet var containerView: UIView! { - didSet { - containerView.backgroundColor = UIColor.white() - containerView.layer.cornerRadius = 6.0 - containerView.layer.borderWidth = 1.0 - containerView.layer.borderColor = UIColor.blackDividers().cgColor - } - } + @IBOutlet var containerView: UIView! @IBOutlet var header: UILabel! @IBOutlet var title: UILabel! @IBOutlet var subtitle: UILabel! - @IBOutlet var actionButton: UIButton! { - didSet { - actionButton.setTitleColor(UIColor.linkBlue(), for: .normal) - } - } + @IBOutlet var actionButton: UIButton! typealias Tap = () -> () private var tap: Tap? diff --git a/iphone/Maps/UI/Discovery/Table Cells/DiscoveryOnlineTemplateCell.xib b/iphone/Maps/UI/Discovery/Table Cells/DiscoveryOnlineTemplateCell.xib index cb96e240db..3a3fc55bea 100644 --- a/iphone/Maps/UI/Discovery/Table Cells/DiscoveryOnlineTemplateCell.xib +++ b/iphone/Maps/UI/Discovery/Table Cells/DiscoveryOnlineTemplateCell.xib @@ -1,11 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> - <device id="retina4_7" orientation="portrait"> - <adaptation id="fullscreen"/> - </device> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> + <device id="retina4_7" orientation="portrait" appearance="light"/> <dependencies> <deployment identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14490.49"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/> <capability name="Safe area layout guides" minToolsVersion="9.0"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> @@ -16,10 +14,10 @@ <rect key="frame" x="0.0" y="0.0" width="375" height="266"/> <autoresizingMask key="autoresizingMask"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="9IM-3s-P1U" id="RFj-It-lNu"> - <rect key="frame" x="0.0" y="0.0" width="375" height="265.5"/> + <rect key="frame" x="0.0" y="0.0" width="375" height="266"/> <autoresizingMask key="autoresizingMask"/> <subviews> - <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="QHe-qU-OhV"> + <view contentMode="scaleToFill" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="QHe-qU-OhV"> <rect key="frame" x="8" y="44" width="359" height="221.5"/> <subviews> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="UMh-FO-rZJ"> @@ -31,18 +29,16 @@ <nil key="textColor"/> <nil key="highlightedColor"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="medium14"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="medium14:blackPrimaryText"/> </userDefinedRuntimeAttributes> </label> - <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="4Jk-er-UUa"> + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="Label" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="4Jk-er-UUa"> <rect key="frame" x="20" y="99" width="319" height="20.5"/> <fontDescription key="fontDescription" type="system" pointSize="17"/> <nil key="textColor"/> <nil key="highlightedColor"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular12"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackSecondaryText"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular12:blackPrimaryText"/> </userDefinedRuntimeAttributes> </label> <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="dCP-Yu-fFz"> @@ -52,7 +48,7 @@ <constraint firstAttribute="height" constant="24" id="RP9-kK-iAl"/> </constraints> </imageView> - <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="WoO-mw-61q"> + <button opaque="NO" contentMode="scaleToFill" ambiguous="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="WoO-mw-61q"> <rect key="frame" x="0.0" y="181.5" width="359" height="40"/> <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.040000000000000001" colorSpace="custom" customColorSpace="sRGB"/> <constraints> @@ -61,7 +57,7 @@ <state key="normal" title="DETAILS"/> <userDefinedRuntimeAttributes> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="details"/> - <userDefinedRuntimeAttribute type="string" keyPath="textColorName" value="linkBlue"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="linkBlueText"/> </userDefinedRuntimeAttributes> <connections> <action selector="onTap" destination="9IM-3s-P1U" eventType="touchUpInside" id="wGN-bL-0IS"/> @@ -84,15 +80,17 @@ <constraint firstItem="dCP-Yu-fFz" firstAttribute="centerX" secondItem="QHe-qU-OhV" secondAttribute="centerX" id="y66-M2-Vf5"/> </constraints> <viewLayoutGuide key="safeArea" id="jpF-nO-kZW"/> + <userDefinedRuntimeAttributes> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="DiscoveryCell"/> + </userDefinedRuntimeAttributes> </view> - <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="t7L-Pc-YZX"> + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="t7L-Pc-YZX"> <rect key="frame" x="16" y="12" width="347" height="20"/> <fontDescription key="fontDescription" type="system" pointSize="17"/> <nil key="textColor"/> <nil key="highlightedColor"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackSecondaryText"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="medium14"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="medium14:blackSecondaryText"/> </userDefinedRuntimeAttributes> </label> </subviews> @@ -106,6 +104,9 @@ <constraint firstItem="QHe-qU-OhV" firstAttribute="top" secondItem="t7L-Pc-YZX" secondAttribute="bottom" constant="12" id="pKH-cU-c4t"/> <constraint firstItem="t7L-Pc-YZX" firstAttribute="top" secondItem="RFj-It-lNu" secondAttribute="top" constant="12" id="xTp-3J-4fU"/> </constraints> + <userDefinedRuntimeAttributes> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="DiscoveryCell"/> + </userDefinedRuntimeAttributes> </tableViewCellContentView> <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> <connections> diff --git a/iphone/Maps/UI/Discovery/Table Cells/DiscoverySpinnerCell.xib b/iphone/Maps/UI/Discovery/Table Cells/DiscoverySpinnerCell.xib index b504a6d4f3..ae76f678c0 100644 --- a/iphone/Maps/UI/Discovery/Table Cells/DiscoverySpinnerCell.xib +++ b/iphone/Maps/UI/Discovery/Table Cells/DiscoverySpinnerCell.xib @@ -1,21 +1,19 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES"> - <device id="retina4_7" orientation="portrait"> - <adaptation id="fullscreen"/> - </device> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES"> + <device id="retina4_7" orientation="portrait" appearance="light"/> <dependencies> <deployment identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> <objects> <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/> <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/> - <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="DiscoverySpinnerCell" rowHeight="129" id="R8F-rL-wUT" customClass="MWMDiscoverySpinnerCell" propertyAccessControl="all"> + <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="DiscoverySpinnerCell" rowHeight="129" id="R8F-rL-wUT" customClass="MWMDiscoverySpinnerCell" propertyAccessControl="none"> <rect key="frame" x="0.0" y="0.0" width="375" height="129"/> <autoresizingMask key="autoresizingMask"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="R8F-rL-wUT" id="ZpU-1p-iwg"> - <rect key="frame" x="0.0" y="0.0" width="375" height="128.5"/> + <rect key="frame" x="0.0" y="0.0" width="375" height="129"/> <autoresizingMask key="autoresizingMask"/> <subviews> <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="nnN-TV-Qoh"> @@ -26,14 +24,13 @@ </constraints> </imageView> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="HoJ-LP-bTg"> - <rect key="frame" x="20" y="76" width="335" height="20"/> + <rect key="frame" x="20" y="76" width="335" height="20.5"/> <fontDescription key="fontDescription" type="system" pointSize="17"/> <nil key="textColor"/> <nil key="highlightedColor"/> <userDefinedRuntimeAttributes> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="discovery_button_other_loading_message"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular14"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackSecondaryText"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular14:blackSecondaryText"/> </userDefinedRuntimeAttributes> </label> </subviews> @@ -45,6 +42,9 @@ <constraint firstItem="HoJ-LP-bTg" firstAttribute="top" secondItem="nnN-TV-Qoh" secondAttribute="bottom" constant="16" id="mfa-E5-wxQ"/> <constraint firstItem="nnN-TV-Qoh" firstAttribute="centerX" secondItem="ZpU-1p-iwg" secondAttribute="centerX" id="sYn-ve-NIV"/> </constraints> + <userDefinedRuntimeAttributes> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="DiscoveryController"/> + </userDefinedRuntimeAttributes> </tableViewCellContentView> <connections> <outlet property="spinner" destination="nnN-TV-Qoh" id="zyd-eX-fJN"/> diff --git a/iphone/Maps/UI/Discovery/Table Cells/Holders/DiscoveryBookingCollectionHolderCell.xib b/iphone/Maps/UI/Discovery/Table Cells/Holders/DiscoveryBookingCollectionHolderCell.xib index cb2fc92a2a..b21c2cc599 100644 --- a/iphone/Maps/UI/Discovery/Table Cells/Holders/DiscoveryBookingCollectionHolderCell.xib +++ b/iphone/Maps/UI/Discovery/Table Cells/Holders/DiscoveryBookingCollectionHolderCell.xib @@ -1,11 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> - <device id="retina4_7" orientation="portrait"> - <adaptation id="fullscreen"/> - </device> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> + <device id="retina4_7" orientation="portrait" appearance="light"/> <dependencies> <deployment identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14490.49"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> <objects> @@ -15,7 +13,7 @@ <rect key="frame" x="0.0" y="0.0" width="389" height="188"/> <autoresizingMask key="autoresizingMask"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" ambiguous="YES" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="kOb-uR-NfL" id="HJe-Ad-Mjp"> - <rect key="frame" x="0.0" y="0.0" width="389" height="187.5"/> + <rect key="frame" x="0.0" y="0.0" width="389" height="188"/> <autoresizingMask key="autoresizingMask"/> <subviews> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="mVI-Rn-1Ht"> @@ -27,8 +25,7 @@ <nil key="textColor"/> <nil key="highlightedColor"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackSecondaryText"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="medium14"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="medium14:blackSecondaryText"/> </userDefinedRuntimeAttributes> </label> <collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" dataMode="none" translatesAutoresizingMaskIntoConstraints="NO" id="hb0-w1-X0p" customClass="MWMDiscoveryCollectionView"> @@ -56,12 +53,12 @@ <constraint firstItem="hb0-w1-X0p" firstAttribute="leading" secondItem="HJe-Ad-Mjp" secondAttribute="leading" id="uPC-mg-zsI"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="pressBackground"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="DiscoveryController"/> </userDefinedRuntimeAttributes> </tableViewCellContentView> <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="pressBackground"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="DiscoveryController"/> </userDefinedRuntimeAttributes> <connections> <outlet property="collectionView" destination="hb0-w1-X0p" id="CRZ-o9-rpF"/> diff --git a/iphone/Maps/UI/Discovery/Table Cells/Holders/DiscoveryGuideCollectionHolderCell.xib b/iphone/Maps/UI/Discovery/Table Cells/Holders/DiscoveryGuideCollectionHolderCell.xib index 4ebee5d6a5..c3bbd78c26 100644 --- a/iphone/Maps/UI/Discovery/Table Cells/Holders/DiscoveryGuideCollectionHolderCell.xib +++ b/iphone/Maps/UI/Discovery/Table Cells/Holders/DiscoveryGuideCollectionHolderCell.xib @@ -1,11 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> - <device id="retina6_1" orientation="portrait"> - <adaptation id="fullscreen"/> - </device> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> + <device id="retina6_1" orientation="portrait" appearance="light"/> <dependencies> <deployment identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14490.49"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/> <capability name="Safe area layout guides" minToolsVersion="9.0"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> @@ -15,12 +13,12 @@ <tableViewCell contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="DiscoveryGuideCollectionHolderCell" rowHeight="243" id="KGk-i7-Jjw" customClass="MWMDiscoveryGuideCollectionHolderCell"> <rect key="frame" x="0.0" y="0.0" width="391" height="243"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> - <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" ambiguous="YES" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM"> - <rect key="frame" x="0.0" y="0.0" width="391" height="242.5"/> + <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM"> + <rect key="frame" x="0.0" y="0.0" width="391" height="243"/> <autoresizingMask key="autoresizingMask"/> <subviews> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="BeQ-ih-VTq"> - <rect key="frame" x="16" y="0.0" width="363" height="48.5"/> + <rect key="frame" x="16" y="0.0" width="363" height="48"/> <constraints> <constraint firstAttribute="height" constant="48" id="BTa-Cf-S7e"/> </constraints> @@ -28,12 +26,11 @@ <nil key="textColor"/> <nil key="highlightedColor"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackSecondaryText"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="medium14"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="medium14:blackSecondaryText"/> </userDefinedRuntimeAttributes> </label> <collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" dataMode="none" translatesAutoresizingMaskIntoConstraints="NO" id="NFk-MT-sfu" customClass="MWMDiscoveryCollectionView"> - <rect key="frame" x="0.0" y="48.5" width="391" height="195"/> + <rect key="frame" x="0.0" y="48" width="391" height="195"/> <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> <constraints> <constraint firstAttribute="height" constant="195" id="Nkd-D4-A27"/> @@ -56,9 +53,15 @@ <constraint firstAttribute="trailing" secondItem="NFk-MT-sfu" secondAttribute="trailing" id="ZFO-zN-y6P"/> <constraint firstAttribute="trailing" secondItem="BeQ-ih-VTq" secondAttribute="trailing" constant="12" id="jkL-TY-BMW"/> </constraints> + <userDefinedRuntimeAttributes> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="DiscoveryController"/> + </userDefinedRuntimeAttributes> </tableViewCellContentView> <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> <viewLayoutGuide key="safeArea" id="njF-e1-oar"/> + <userDefinedRuntimeAttributes> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="DiscoveryController"/> + </userDefinedRuntimeAttributes> <connections> <outlet property="collectionView" destination="NFk-MT-sfu" id="VEm-Jg-B49"/> <outlet property="header" destination="BeQ-ih-VTq" id="lvK-TC-7VT"/> diff --git a/iphone/Maps/UI/Discovery/Table Cells/Holders/DiscoverySearchCollectionHolderCell.xib b/iphone/Maps/UI/Discovery/Table Cells/Holders/DiscoverySearchCollectionHolderCell.xib index d3a6d914f6..fbb056c25f 100644 --- a/iphone/Maps/UI/Discovery/Table Cells/Holders/DiscoverySearchCollectionHolderCell.xib +++ b/iphone/Maps/UI/Discovery/Table Cells/Holders/DiscoverySearchCollectionHolderCell.xib @@ -1,11 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> - <device id="retina4_7" orientation="portrait"> - <adaptation id="fullscreen"/> - </device> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> + <device id="retina4_7" orientation="portrait" appearance="light"/> <dependencies> <deployment identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14490.49"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> <objects> @@ -15,7 +13,7 @@ <rect key="frame" x="0.0" y="0.0" width="375" height="190"/> <autoresizingMask key="autoresizingMask"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" ambiguous="YES" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="69d-dp-KY2" id="qeQ-5M-VVb"> - <rect key="frame" x="0.0" y="0.0" width="375" height="189.5"/> + <rect key="frame" x="0.0" y="0.0" width="375" height="190"/> <autoresizingMask key="autoresizingMask"/> <subviews> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="zLg-Ze-Eru"> @@ -27,8 +25,7 @@ <nil key="textColor"/> <nil key="highlightedColor"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="medium14"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackSecondaryText"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="medium14:blackSecondaryText"/> </userDefinedRuntimeAttributes> </label> <collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" dataMode="none" translatesAutoresizingMaskIntoConstraints="NO" id="5kQ-Mc-ZYQ" customClass="MWMDiscoveryCollectionView"> @@ -56,12 +53,12 @@ <constraint firstItem="5kQ-Mc-ZYQ" firstAttribute="top" secondItem="zLg-Ze-Eru" secondAttribute="bottom" id="dVf-py-a5o"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="pressBackground"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="DiscoveryController"/> </userDefinedRuntimeAttributes> </tableViewCellContentView> <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="pressBackground"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="DiscoveryController"/> </userDefinedRuntimeAttributes> <connections> <outlet property="collectionView" destination="5kQ-Mc-ZYQ" id="C7T-Ve-ayU"/> diff --git a/iphone/Maps/UI/Downloader/Cells/MWMMapDownloaderButtonTableViewCell.xib b/iphone/Maps/UI/Downloader/Cells/MWMMapDownloaderButtonTableViewCell.xib index e965c9fbdc..3b73538259 100644 --- a/iphone/Maps/UI/Downloader/Cells/MWMMapDownloaderButtonTableViewCell.xib +++ b/iphone/Maps/UI/Downloader/Cells/MWMMapDownloaderButtonTableViewCell.xib @@ -1,32 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES"> - <device id="retina4_7" orientation="portrait"> - <adaptation id="fullscreen"/> - </device> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES"> + <device id="retina4_7" orientation="portrait" appearance="light"/> <dependencies> <deployment identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> <objects> <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/> <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/> - <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="0.0" shouldIndentWhileEditing="NO" reuseIdentifier="MWMMapDownloaderButtonTableViewCell" id="KGk-i7-Jjw" customClass="MWMMapDownloaderButtonTableViewCell" propertyAccessControl="all"> + <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="0.0" shouldIndentWhileEditing="NO" reuseIdentifier="MWMMapDownloaderButtonTableViewCell" id="KGk-i7-Jjw" customClass="MWMMapDownloaderButtonTableViewCell" propertyAccessControl="none"> <rect key="frame" x="0.0" y="0.0" width="320" height="44"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM"> - <rect key="frame" x="0.0" y="0.0" width="320" height="43.5"/> + <rect key="frame" x="0.0" y="0.0" width="320" height="44"/> <autoresizingMask key="autoresizingMask"/> <subviews> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="22f-XO-fEh"> - <rect key="frame" x="0.0" y="0.0" width="320" height="43"/> + <rect key="frame" x="0.0" y="0.0" width="320" height="44"/> <constraints> <constraint firstAttribute="height" priority="750" constant="44" id="ppe-HK-X6q"/> </constraints> <state key="normal" title="Add Maps Button"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="textColorName" value="linkBlue"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular17"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular17:linkBlueText"/> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="download_maps"/> </userDefinedRuntimeAttributes> <connections> @@ -42,6 +39,7 @@ </constraints> </tableViewCellContentView> <inset key="separatorInset" minX="0.0" minY="0.0" maxX="0.0" maxY="0.0"/> + <point key="canvasLocation" x="139" y="155"/> </tableViewCell> </objects> </document> diff --git a/iphone/Maps/UI/Downloader/Cells/MWMMapDownloaderCellHeader.m b/iphone/Maps/UI/Downloader/Cells/MWMMapDownloaderCellHeader.m index 0c0460d23d..0b560154cd 100644 --- a/iphone/Maps/UI/Downloader/Cells/MWMMapDownloaderCellHeader.m +++ b/iphone/Maps/UI/Downloader/Cells/MWMMapDownloaderCellHeader.m @@ -1,4 +1,5 @@ #import "MWMMapDownloaderCellHeader.h" +#import "SwiftBridge.h" @implementation MWMMapDownloaderCellHeader @@ -7,8 +8,7 @@ self = [super initWithFrame:frame]; if (self) { - self.font = [UIFont regular12]; - self.textColor = [UIColor blackSecondaryText]; + [self setStyleAndApply:@"regular12:blackSecondaryText"]; } return self; } diff --git a/iphone/Maps/UI/Downloader/Cells/MWMMapDownloaderLargeCountryTableViewCell.xib b/iphone/Maps/UI/Downloader/Cells/MWMMapDownloaderLargeCountryTableViewCell.xib index 06f5a57c29..eb56dad0e1 100644 --- a/iphone/Maps/UI/Downloader/Cells/MWMMapDownloaderLargeCountryTableViewCell.xib +++ b/iphone/Maps/UI/Downloader/Cells/MWMMapDownloaderLargeCountryTableViewCell.xib @@ -1,26 +1,19 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" colorMatched="YES"> - <device id="retina4_7" orientation="portrait"> - <adaptation id="fullscreen"/> - </device> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" colorMatched="YES"> + <device id="retina4_7" orientation="portrait" appearance="light"/> <dependencies> <deployment identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> - <customFonts key="customFonts"> - <array key="HelveticaNeue.ttc"> - <string>HelveticaNeue</string> - </array> - </customFonts> <objects> <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/> <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/> - <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="MWMMapDownloaderLargeCountryTableViewCell" rowHeight="62" id="4CW-jw-1JP" customClass="MWMMapDownloaderLargeCountryTableViewCell" propertyAccessControl="all"> + <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="MWMMapDownloaderLargeCountryTableViewCell" rowHeight="62" id="4CW-jw-1JP" customClass="MWMMapDownloaderLargeCountryTableViewCell" propertyAccessControl="none"> <rect key="frame" x="0.0" y="0.0" width="320" height="62"/> <autoresizingMask key="autoresizingMask"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="4CW-jw-1JP" id="rFT-0r-5zy"> - <rect key="frame" x="0.0" y="0.0" width="320" height="61.5"/> + <rect key="frame" x="0.0" y="0.0" width="320" height="62"/> <autoresizingMask key="autoresizingMask"/> <subviews> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="3NQ-tT-U9b"> @@ -37,8 +30,7 @@ <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.87" colorSpace="custom" customColorSpace="sRGB"/> <nil key="highlightedColor"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular17"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular17:blackPrimaryText"/> </userDefinedRuntimeAttributes> </label> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" verticalCompressionResistancePriority="751" text="14 maps" lineBreakMode="wordWrap" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="851-fC-gEN"> @@ -47,18 +39,16 @@ <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="fontName" value="regular12"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackSecondaryText"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular12:blackSecondaryText"/> </userDefinedRuntimeAttributes> </label> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="252" verticalHuggingPriority="251" horizontalCompressionResistancePriority="760" text="405 MB" textAlignment="right" lineBreakMode="wordWrap" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="9Ni-mb-fA5"> - <rect key="frame" x="235" y="23" width="49" height="17"/> + <rect key="frame" x="235" y="22.5" width="49" height="17"/> <fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="14"/> <color key="textColor" red="0.66666666666666663" green="0.66666666666666663" blue="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <nil key="highlightedColor"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular14"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackSecondaryText"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular14:blackSecondaryText"/> </userDefinedRuntimeAttributes> </label> <imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="ic_arrow_gray_right" translatesAutoresizingMaskIntoConstraints="NO" id="7HN-EK-QXO" userLabel="Arrow"> @@ -68,7 +58,7 @@ <constraint firstAttribute="height" constant="28" id="dNb-uE-TzF"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="coloring" value="MWMGray"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="MWMGray"/> </userDefinedRuntimeAttributes> </imageView> </subviews> @@ -90,7 +80,7 @@ </tableViewCellContentView> <inset key="separatorInset" minX="60" minY="0.0" maxX="0.0" maxY="0.0"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Background"/> </userDefinedRuntimeAttributes> <connections> <outlet property="downloadSize" destination="9Ni-mb-fA5" id="btQ-8t-pIV"/> @@ -98,7 +88,7 @@ <outlet property="stateWrapper" destination="3NQ-tT-U9b" id="PJw-9U-8b3"/> <outlet property="title" destination="cum-4j-JlQ" id="f9c-KC-2dR"/> </connections> - <point key="canvasLocation" x="282" y="403"/> + <point key="canvasLocation" x="408.69565217391306" y="269.86607142857139"/> </tableViewCell> </objects> <resources> diff --git a/iphone/Maps/UI/Downloader/Cells/MWMMapDownloaderPlaceTableViewCell.xib b/iphone/Maps/UI/Downloader/Cells/MWMMapDownloaderPlaceTableViewCell.xib index be1a0552c5..f3dbc550d0 100644 --- a/iphone/Maps/UI/Downloader/Cells/MWMMapDownloaderPlaceTableViewCell.xib +++ b/iphone/Maps/UI/Downloader/Cells/MWMMapDownloaderPlaceTableViewCell.xib @@ -1,26 +1,19 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" colorMatched="YES"> - <device id="retina4_7" orientation="portrait"> - <adaptation id="fullscreen"/> - </device> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" colorMatched="YES"> + <device id="retina4_7" orientation="portrait" appearance="light"/> <dependencies> <deployment identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> - <customFonts key="customFonts"> - <array key="HelveticaNeue.ttc"> - <string>HelveticaNeue</string> - </array> - </customFonts> <objects> <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/> <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/> - <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="MWMMapDownloaderPlaceTableViewCell" rowHeight="62" id="1KI-85-wsU" customClass="MWMMapDownloaderPlaceTableViewCell" propertyAccessControl="all"> + <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="MWMMapDownloaderPlaceTableViewCell" rowHeight="62" id="1KI-85-wsU" customClass="MWMMapDownloaderPlaceTableViewCell" propertyAccessControl="none"> <rect key="frame" x="0.0" y="0.0" width="320" height="62"/> <autoresizingMask key="autoresizingMask"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="1KI-85-wsU" id="mRF-11-OKU"> - <rect key="frame" x="0.0" y="0.0" width="320" height="61.5"/> + <rect key="frame" x="0.0" y="0.0" width="320" height="62"/> <autoresizingMask key="autoresizingMask"/> <subviews> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Yb5-r1-Z2X"> @@ -40,8 +33,7 @@ <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.87" colorSpace="custom" customColorSpace="sRGB"/> <nil key="highlightedColor"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular17"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular17:blackPrimaryText"/> </userDefinedRuntimeAttributes> </label> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="UK" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="fev-4l-MY3"> @@ -50,8 +42,7 @@ <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="fontName" value="regular12"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackSecondaryText"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular12:blackSecondaryText"/> </userDefinedRuntimeAttributes> </label> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="252" verticalHuggingPriority="251" horizontalCompressionResistancePriority="760" text="45 MB" textAlignment="right" lineBreakMode="wordWrap" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="rqh-iy-Sx9"> @@ -60,8 +51,7 @@ <color key="textColor" red="0.66666666666666663" green="0.66666666666666663" blue="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <nil key="highlightedColor"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular14"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackSecondaryText"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular14:blackSecondaryText"/> </userDefinedRuntimeAttributes> </label> </subviews> @@ -82,7 +72,7 @@ </tableViewCellContentView> <inset key="separatorInset" minX="60" minY="0.0" maxX="0.0" maxY="0.0"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Background"/> </userDefinedRuntimeAttributes> <connections> <outlet property="descriptionLabel" destination="fev-4l-MY3" id="lyN-5S-iWE"/> @@ -91,7 +81,7 @@ <outlet property="title" destination="3Db-Yq-FlD" id="qtt-YF-a0V"/> <outlet property="titleBottomOffset" destination="ffv-VG-1xY" id="0kL-3a-tKy"/> </connections> - <point key="canvasLocation" x="282" y="403"/> + <point key="canvasLocation" x="408.69565217391306" y="269.86607142857139"/> </tableViewCell> </objects> </document> diff --git a/iphone/Maps/UI/Downloader/Cells/MWMMapDownloaderSubplaceTableViewCell.xib b/iphone/Maps/UI/Downloader/Cells/MWMMapDownloaderSubplaceTableViewCell.xib index 145e7f4620..9db5b8ae98 100644 --- a/iphone/Maps/UI/Downloader/Cells/MWMMapDownloaderSubplaceTableViewCell.xib +++ b/iphone/Maps/UI/Downloader/Cells/MWMMapDownloaderSubplaceTableViewCell.xib @@ -1,26 +1,19 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" colorMatched="YES"> - <device id="retina4_7" orientation="portrait"> - <adaptation id="fullscreen"/> - </device> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" colorMatched="YES"> + <device id="retina4_7" orientation="portrait" appearance="light"/> <dependencies> <deployment identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> - <customFonts key="customFonts"> - <array key="HelveticaNeue.ttc"> - <string>HelveticaNeue</string> - </array> - </customFonts> <objects> <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/> <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/> - <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="MWMMapDownloaderSubplaceTableViewCell" rowHeight="82" id="1KI-85-wsU" customClass="MWMMapDownloaderSubplaceTableViewCell" propertyAccessControl="all"> + <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="MWMMapDownloaderSubplaceTableViewCell" rowHeight="82" id="1KI-85-wsU" customClass="MWMMapDownloaderSubplaceTableViewCell" propertyAccessControl="none"> <rect key="frame" x="0.0" y="0.0" width="320" height="82"/> <autoresizingMask key="autoresizingMask"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="1KI-85-wsU" id="mRF-11-OKU"> - <rect key="frame" x="0.0" y="0.0" width="320" height="81.5"/> + <rect key="frame" x="0.0" y="0.0" width="320" height="82"/> <autoresizingMask key="autoresizingMask"/> <subviews> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Yb5-r1-Z2X"> @@ -31,18 +24,17 @@ <constraint firstAttribute="width" constant="36" id="vYF-tP-Wtw"/> </constraints> </view> - <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" verticalCompressionResistancePriority="760" text="Mossel Bay" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="x7m-Zm-8y6"> - <rect key="frame" x="60" y="12" width="199" height="17"/> + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" verticalCompressionResistancePriority="760" text="Mossel Bay" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="x7m-Zm-8y6" propertyAccessControl="none"> + <rect key="frame" x="60" y="12" width="199" height="16.5"/> <fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="14"/> <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="fontName" value="regular14"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular14:blackPrimaryText"/> </userDefinedRuntimeAttributes> </label> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" verticalCompressionResistancePriority="760" text="London" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="3Db-Yq-FlD"> - <rect key="frame" x="60" y="33" width="195" height="20"/> + <rect key="frame" x="60" y="32.5" width="195" height="20"/> <constraints> <constraint firstAttribute="height" relation="greaterThanOrEqual" priority="750" constant="20" id="CiU-uC-JVj"/> </constraints> @@ -50,18 +42,16 @@ <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.87" colorSpace="custom" customColorSpace="sRGB"/> <nil key="highlightedColor"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular17"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackSecondaryText"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular17:blackSecondaryText"/> </userDefinedRuntimeAttributes> </label> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="UK" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="fev-4l-MY3"> - <rect key="frame" x="60" y="57" width="199" height="14"/> + <rect key="frame" x="60" y="56.5" width="199" height="14"/> <fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="12"/> <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="fontName" value="regular12"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackSecondaryText"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular12:blackSecondaryText"/> </userDefinedRuntimeAttributes> </label> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="252" verticalHuggingPriority="251" horizontalCompressionResistancePriority="760" text="45 MB" textAlignment="right" lineBreakMode="wordWrap" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="rqh-iy-Sx9"> @@ -70,8 +60,7 @@ <color key="textColor" red="0.66666666666666663" green="0.66666666666666663" blue="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <nil key="highlightedColor"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular14"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackSecondaryText"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular14:blackSecondaryText"/> </userDefinedRuntimeAttributes> </label> </subviews> @@ -95,7 +84,7 @@ </tableViewCellContentView> <inset key="separatorInset" minX="60" minY="0.0" maxX="0.0" maxY="0.0"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Background"/> </userDefinedRuntimeAttributes> <connections> <outlet property="descriptionLabel" destination="fev-4l-MY3" id="1C2-OF-Vhu"/> @@ -105,7 +94,7 @@ <outlet property="title" destination="3Db-Yq-FlD" id="JdN-yn-xLw"/> <outlet property="titleBottomOffset" destination="Zic-It-hOL" id="1gW-IS-6Fc"/> </connections> - <point key="canvasLocation" x="282" y="403"/> + <point key="canvasLocation" x="408.69565217391306" y="269.86607142857139"/> </tableViewCell> </objects> </document> diff --git a/iphone/Maps/UI/Downloader/Cells/MWMMapDownloaderTableViewCell.xib b/iphone/Maps/UI/Downloader/Cells/MWMMapDownloaderTableViewCell.xib index 4a210ef3ab..06284bbdfb 100644 --- a/iphone/Maps/UI/Downloader/Cells/MWMMapDownloaderTableViewCell.xib +++ b/iphone/Maps/UI/Downloader/Cells/MWMMapDownloaderTableViewCell.xib @@ -1,26 +1,19 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" colorMatched="YES"> - <device id="retina4_7" orientation="portrait"> - <adaptation id="fullscreen"/> - </device> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" colorMatched="YES"> + <device id="retina4_7" orientation="portrait" appearance="light"/> <dependencies> <deployment identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> - <customFonts key="customFonts"> - <array key="HelveticaNeue.ttc"> - <string>HelveticaNeue</string> - </array> - </customFonts> <objects> <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/> <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/> - <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" horizontalCompressionResistancePriority="760" selectionStyle="default" indentationWidth="10" reuseIdentifier="MWMMapDownloaderTableViewCell" rowHeight="52" id="Igh-sI-4cU" customClass="MWMMapDownloaderTableViewCell" propertyAccessControl="all"> + <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" horizontalCompressionResistancePriority="760" selectionStyle="default" indentationWidth="10" reuseIdentifier="MWMMapDownloaderTableViewCell" rowHeight="52" id="Igh-sI-4cU" customClass="MWMMapDownloaderTableViewCell" propertyAccessControl="none"> <rect key="frame" x="0.0" y="0.0" width="320" height="52"/> <autoresizingMask key="autoresizingMask"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Igh-sI-4cU" id="hYr-eg-wbg"> - <rect key="frame" x="0.0" y="0.0" width="320" height="51.5"/> + <rect key="frame" x="0.0" y="0.0" width="320" height="52"/> <autoresizingMask key="autoresizingMask"/> <subviews> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="rTN-aw-5k7"> @@ -37,8 +30,7 @@ <color key="textColor" red="0.66666666666666663" green="0.66666666666666663" blue="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <nil key="highlightedColor"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular14"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackSecondaryText"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular14:blackSecondaryText"/> </userDefinedRuntimeAttributes> </label> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="260" verticalHuggingPriority="249" horizontalCompressionResistancePriority="752" verticalCompressionResistancePriority="752" text="Algeria" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="5kc-K7-7K8"> @@ -47,8 +39,7 @@ <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.87" colorSpace="custom" customColorSpace="sRGB"/> <nil key="highlightedColor"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular17"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular17:blackPrimaryText"/> </userDefinedRuntimeAttributes> </label> </subviews> @@ -65,14 +56,14 @@ </tableViewCellContentView> <inset key="separatorInset" minX="60" minY="0.0" maxX="0.0" maxY="0.0"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Background"/> </userDefinedRuntimeAttributes> <connections> <outlet property="downloadSize" destination="lgA-X0-501" id="Dl4-r1-7lU"/> <outlet property="stateWrapper" destination="rTN-aw-5k7" id="3jJ-Zp-S0C"/> <outlet property="title" destination="5kc-K7-7K8" id="SDA-Yd-DD2"/> </connections> - <point key="canvasLocation" x="285" y="406"/> + <point key="canvasLocation" x="413.04347826086962" y="271.875"/> </tableViewCell> </objects> </document> diff --git a/iphone/Maps/UI/EditBookmark/MWMBookmarkTitleCell.xib b/iphone/Maps/UI/EditBookmark/MWMBookmarkTitleCell.xib index 440b9b03e2..ec39fbbd81 100644 --- a/iphone/Maps/UI/EditBookmark/MWMBookmarkTitleCell.xib +++ b/iphone/Maps/UI/EditBookmark/MWMBookmarkTitleCell.xib @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14868" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES"> - <device id="retina4_7" orientation="portrait" appearance="light"/> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES"> + <device id="retina6_1" orientation="portrait" appearance="light"/> <dependencies> <deployment identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14824"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> <objects> @@ -21,8 +21,7 @@ <fontDescription key="fontDescription" type="system" pointSize="14"/> <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular17"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular17:blackPrimaryText"/> <userDefinedRuntimeAttribute type="string" keyPath="localizedPlaceholder" value="placepage_bookmark_name_hint"/> </userDefinedRuntimeAttributes> <connections> diff --git a/iphone/Maps/UI/EditBookmark/MWMEditBookmarkController.mm b/iphone/Maps/UI/EditBookmark/MWMEditBookmarkController.mm index 409fd2fc2d..823e9803b2 100644 --- a/iphone/Maps/UI/EditBookmark/MWMEditBookmarkController.mm +++ b/iphone/Maps/UI/EditBookmark/MWMEditBookmarkController.mm @@ -164,7 +164,7 @@ enum RowInMetaInfo auto cell = [tableView dequeueReusableCellWithCellClass:cls indexPath:indexPath]; cell.textLabel.text = self.cachedCategory; cell.imageView.image = [UIImage imageNamed:@"ic_folder"]; - cell.imageView.mwm_coloring = MWMImageColoringBlack; + cell.imageView.styleName = @"MWMBlack"; cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator; return cell; } diff --git a/iphone/Maps/UI/Editor/Cells/EditorAdditionalNamePlaceholderTableViewCell.xib b/iphone/Maps/UI/Editor/Cells/EditorAdditionalNamePlaceholderTableViewCell.xib index e990b03897..c2de34eaf5 100644 --- a/iphone/Maps/UI/Editor/Cells/EditorAdditionalNamePlaceholderTableViewCell.xib +++ b/iphone/Maps/UI/Editor/Cells/EditorAdditionalNamePlaceholderTableViewCell.xib @@ -1,25 +1,23 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES"> - <device id="retina4_7" orientation="portrait"> - <adaptation id="fullscreen"/> - </device> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES"> + <device id="retina4_7" orientation="portrait" appearance="light"/> <dependencies> <deployment identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> <objects> <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/> <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/> - <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" rowHeight="16" id="7Br-fC-W0o" customClass="MWMEditorAdditionalNamePlaceholderTableViewCell" propertyAccessControl="all"> + <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" rowHeight="16" id="7Br-fC-W0o" customClass="MWMEditorAdditionalNamePlaceholderTableViewCell" propertyAccessControl="none"> <rect key="frame" x="0.0" y="0.0" width="320" height="16"/> <autoresizingMask key="autoresizingMask"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="7Br-fC-W0o" id="58c-Uv-d0K"> - <rect key="frame" x="0.0" y="0.0" width="320" height="15.5"/> + <rect key="frame" x="0.0" y="0.0" width="320" height="16"/> <autoresizingMask key="autoresizingMask"/> <subviews> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="tYH-si-HMY"> - <rect key="frame" x="0.0" y="0.0" width="320" height="15"/> + <rect key="frame" x="0.0" y="0.0" width="320" height="16"/> <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/> <constraints> <constraint firstAttribute="height" priority="750" constant="16" id="A96-CL-Yji"/> @@ -35,7 +33,7 @@ </constraints> </tableViewCellContentView> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Background"/> </userDefinedRuntimeAttributes> <point key="canvasLocation" x="225" y="282"/> </tableViewCell> diff --git a/iphone/Maps/UI/Editor/Cells/MWMButtonCell.xib b/iphone/Maps/UI/Editor/Cells/MWMButtonCell.xib index a8d5415c9f..bbb4eb9d06 100644 --- a/iphone/Maps/UI/Editor/Cells/MWMButtonCell.xib +++ b/iphone/Maps/UI/Editor/Cells/MWMButtonCell.xib @@ -1,31 +1,28 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES"> - <device id="retina4_7" orientation="portrait"> - <adaptation id="fullscreen"/> - </device> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES"> + <device id="retina4_7" orientation="portrait" appearance="light"/> <dependencies> <deployment identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> <objects> <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/> <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/> - <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="KGk-i7-Jjw" customClass="MWMButtonCell" propertyAccessControl="all"> + <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="KGk-i7-Jjw" customClass="MWMButtonCell" propertyAccessControl="none"> <rect key="frame" x="0.0" y="0.0" width="320" height="44"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM"> - <rect key="frame" x="0.0" y="0.0" width="320" height="43.5"/> + <rect key="frame" x="0.0" y="0.0" width="320" height="44"/> <autoresizingMask key="autoresizingMask"/> <subviews> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="c7Y-Nr-P4C"> - <rect key="frame" x="0.0" y="0.0" width="320" height="43"/> + <rect key="frame" x="0.0" y="0.0" width="320" height="43.5"/> <state key="normal" title="Button"> <color key="titleColor" red="0.95686274510000002" green="0.26274509800000001" blue="0.21176470589999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> </state> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular17"/> - <userDefinedRuntimeAttribute type="string" keyPath="textColorName" value="red"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular17:redText"/> </userDefinedRuntimeAttributes> <connections> <action selector="buttonTap" destination="KGk-i7-Jjw" eventType="touchUpInside" id="kS2-aj-wfq"/> @@ -42,6 +39,7 @@ <connections> <outlet property="button" destination="c7Y-Nr-P4C" id="UDx-n5-6fr"/> </connections> + <point key="canvasLocation" x="139" y="155"/> </tableViewCell> </objects> </document> diff --git a/iphone/Maps/UI/Editor/Cells/MWMEditorAddAdditionalNameTableViewCell.xib b/iphone/Maps/UI/Editor/Cells/MWMEditorAddAdditionalNameTableViewCell.xib index 5abbb98e63..b983448fac 100644 --- a/iphone/Maps/UI/Editor/Cells/MWMEditorAddAdditionalNameTableViewCell.xib +++ b/iphone/Maps/UI/Editor/Cells/MWMEditorAddAdditionalNameTableViewCell.xib @@ -1,21 +1,17 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES"> - <device id="retina4_7" orientation="portrait"> - <adaptation id="fullscreen"/> - </device> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15705" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES"> <dependencies> - <deployment identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15706"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> <objects> <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/> <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/> - <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" id="81H-Jz-Sl2" customClass="MWMEditorAddAdditionalNameTableViewCell" propertyAccessControl="all"> + <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" id="81H-Jz-Sl2" customClass="MWMEditorAddAdditionalNameTableViewCell" propertyAccessControl="none"> <rect key="frame" x="0.0" y="0.0" width="320" height="44"/> <autoresizingMask key="autoresizingMask"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="81H-Jz-Sl2" id="EHS-hP-aIE"> - <rect key="frame" x="0.0" y="0.0" width="320" height="43.5"/> + <rect key="frame" x="0.0" y="0.0" width="320" height="44"/> <autoresizingMask key="autoresizingMask"/> <subviews> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Ua5-4V-1PH" customClass="MWMButton"> @@ -28,9 +24,7 @@ <state key="normal" title="add_language" image="ic_add_light"/> <userDefinedRuntimeAttributes> <userDefinedRuntimeAttribute type="string" keyPath="imageName" value="ic_add"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular17"/> - <userDefinedRuntimeAttribute type="string" keyPath="textColorName" value="linkBlue"/> - <userDefinedRuntimeAttribute type="string" keyPath="textColorHighlightedName" value="linkBlueHighlighted"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="FlatNormalTransButtonBig"/> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="add_language"/> </userDefinedRuntimeAttributes> <connections> @@ -45,11 +39,11 @@ <constraint firstAttribute="trailing" secondItem="Ua5-4V-1PH" secondAttribute="trailing" id="f6J-6o-AjX"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Background"/> </userDefinedRuntimeAttributes> </tableViewCellContentView> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Background"/> </userDefinedRuntimeAttributes> <point key="canvasLocation" x="342" y="257"/> </tableViewCell> diff --git a/iphone/Maps/UI/Editor/Cells/MWMEditorAdditionalNameTableViewCell.m b/iphone/Maps/UI/Editor/Cells/MWMEditorAdditionalNameTableViewCell.m index 1765095021..a78e939455 100644 --- a/iphone/Maps/UI/Editor/Cells/MWMEditorAdditionalNameTableViewCell.m +++ b/iphone/Maps/UI/Editor/Cells/MWMEditorAdditionalNameTableViewCell.m @@ -1,4 +1,5 @@ #import "MWMEditorAdditionalNameTableViewCell.h" +#import "SwiftBridge.h" static CGFloat const kErrorLabelHeight = 16; @@ -45,12 +46,12 @@ static CGFloat const kErrorLabelHeight = 16; if (self.isValid) { self.errorLabelHeight.constant = 0; - self.contentView.backgroundColor = [UIColor white]; + [self.contentView setStyleAndApply: @"Background"]; } else { self.errorLabelHeight.constant = kErrorLabelHeight; - self.contentView.backgroundColor = [UIColor errorPink]; + [self.contentView setStyleAndApply: @"ErrorBackground"]; } [self layoutIfNeeded]; } diff --git a/iphone/Maps/UI/Editor/Cells/MWMEditorAdditionalNameTableViewCell.xib b/iphone/Maps/UI/Editor/Cells/MWMEditorAdditionalNameTableViewCell.xib index 9d655ad66c..689830aebd 100644 --- a/iphone/Maps/UI/Editor/Cells/MWMEditorAdditionalNameTableViewCell.xib +++ b/iphone/Maps/UI/Editor/Cells/MWMEditorAdditionalNameTableViewCell.xib @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14868" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES"> - <device id="retina4_7" orientation="portrait" appearance="light"/> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES"> + <device id="retina6_1" orientation="portrait" appearance="light"/> <dependencies> <deployment identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14824"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> <objects> @@ -27,8 +27,7 @@ <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="fontName" value="regular14"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackSecondaryText"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular14:blackSecondaryText"/> </userDefinedRuntimeAttributes> </label> <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" horizontalCompressionResistancePriority="499" contentHorizontalAlignment="left" contentVerticalAlignment="center" textAlignment="natural" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="9BY-PA-dlA"> @@ -37,8 +36,7 @@ <fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="17"/> <textInputTraits key="textInputTraits"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular17"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular17:blackPrimaryText"/> <userDefinedRuntimeAttribute type="string" keyPath="localizedPlaceholder" value="editor_edit_place_name_hint"/> <userDefinedRuntimeAttribute type="string" keyPath="validatorName" value="MWMInputValidator"/> </userDefinedRuntimeAttributes> @@ -56,8 +54,7 @@ <color key="textColor" red="0.95686274510000002" green="0.26274509800000001" blue="0.21176470589999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <nil key="highlightedColor"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular12"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="red"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular12:redText"/> </userDefinedRuntimeAttributes> </label> </subviews> @@ -74,11 +71,11 @@ <constraint firstItem="9BY-PA-dlA" firstAttribute="top" secondItem="JQH-ks-NoC" secondAttribute="top" constant="16" id="qga-k9-pOr"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Background"/> </userDefinedRuntimeAttributes> </tableViewCellContentView> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Background"/> </userDefinedRuntimeAttributes> <connections> <outlet property="errorLabel" destination="SZa-Bj-se1" id="hqN-vX-0Hw"/> diff --git a/iphone/Maps/UI/Editor/Cells/MWMEditorCategoryCell.m b/iphone/Maps/UI/Editor/Cells/MWMEditorCategoryCell.m index c35b34c432..b44ed88d63 100644 --- a/iphone/Maps/UI/Editor/Cells/MWMEditorCategoryCell.m +++ b/iphone/Maps/UI/Editor/Cells/MWMEditorCategoryCell.m @@ -1,5 +1,6 @@ #import "MWMEditorCategoryCell.h" #import "MWMEditorCommon.h" +#import "SwiftBridge.h" CGFloat const kDetailShortRightSpace = 16; @@ -24,7 +25,7 @@ CGFloat const kDetailShortRightSpace = 16; if (isCreating) { self.selectedBackgroundView = [[UIView alloc] init]; - self.selectedBackgroundView.backgroundColor = [UIColor pressBackground]; + self.selectedBackgroundView.styleName = @"PressBackground"; } else { diff --git a/iphone/Maps/UI/Editor/Cells/MWMEditorCategoryCell.xib b/iphone/Maps/UI/Editor/Cells/MWMEditorCategoryCell.xib index d490f22c52..6e0d648100 100644 --- a/iphone/Maps/UI/Editor/Cells/MWMEditorCategoryCell.xib +++ b/iphone/Maps/UI/Editor/Cells/MWMEditorCategoryCell.xib @@ -1,21 +1,19 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" colorMatched="YES"> - <device id="retina4_7" orientation="portrait"> - <adaptation id="fullscreen"/> - </device> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" colorMatched="YES"> + <device id="retina4_7" orientation="portrait" appearance="light"/> <dependencies> <deployment identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> <objects> <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/> <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/> - <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="rsc-tP-qGq" customClass="MWMEditorCategoryCell" propertyAccessControl="all"> + <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="rsc-tP-qGq" customClass="MWMEditorCategoryCell" propertyAccessControl="none"> <rect key="frame" x="0.0" y="0.0" width="320" height="44"/> <autoresizingMask key="autoresizingMask"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="rsc-tP-qGq" id="mWc-I7-4kZ"> - <rect key="frame" x="0.0" y="0.0" width="320" height="43.5"/> + <rect key="frame" x="0.0" y="0.0" width="320" height="44"/> <autoresizingMask key="autoresizingMask"/> <subviews> <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="ic_arrow_gray_right" translatesAutoresizingMaskIntoConstraints="NO" id="uA3-ru-Ja1"> @@ -25,7 +23,7 @@ <constraint firstAttribute="height" constant="28" id="P6z-Sg-ZyD"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="coloring" value="MWMGray"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="MWMGray"/> </userDefinedRuntimeAttributes> </imageView> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Jfx-Kc-WOc"> @@ -38,13 +36,12 @@ <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="fontName" value="regular17"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular17:blackPrimaryText"/> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="editor_edit_place_category_title"/> </userDefinedRuntimeAttributes> </label> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="501" verticalHuggingPriority="251" text="Label" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="qrd-hP-nIJ"> - <rect key="frame" x="250" y="12" width="42" height="21"/> + <rect key="frame" x="250" y="11.5" width="42" height="21"/> <constraints> <constraint firstAttribute="height" constant="21" id="hsO-dV-WsY"/> </constraints> @@ -52,8 +49,7 @@ <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="fontName" value="regular17"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackSecondaryText"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular17:blackSecondaryText"/> </userDefinedRuntimeAttributes> </label> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="icU-WX-U52"> @@ -80,14 +76,14 @@ <constraint firstItem="icU-WX-U52" firstAttribute="centerY" secondItem="rsc-tP-qGq" secondAttribute="centerY" id="uky-CX-2ye"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Background"/> </userDefinedRuntimeAttributes> <connections> <outlet property="accessoryIcon" destination="uA3-ru-Ja1" id="esf-Xi-gLG"/> <outlet property="detail" destination="qrd-hP-nIJ" id="IOE-vz-HaI"/> <outlet property="detailRightSpace" destination="Rwj-G9-EoG" id="H8f-mf-vOJ"/> </connections> - <point key="canvasLocation" x="346" y="298"/> + <point key="canvasLocation" x="501.44927536231887" y="199.55357142857142"/> </tableViewCell> </objects> <resources> diff --git a/iphone/Maps/UI/Editor/Cells/MWMEditorSelectTableViewCell.m b/iphone/Maps/UI/Editor/Cells/MWMEditorSelectTableViewCell.m index b8f550818e..7c8fb05924 100644 --- a/iphone/Maps/UI/Editor/Cells/MWMEditorSelectTableViewCell.m +++ b/iphone/Maps/UI/Editor/Cells/MWMEditorSelectTableViewCell.m @@ -1,6 +1,6 @@ #import "MWMEditorSelectTableViewCell.h" #import <CoreApi/MWMCommon.h> -#import "UIImageView+Coloring.h" +#import "SwiftBridge.h" @interface MWMEditorSelectTableViewCell () @@ -24,16 +24,16 @@ self.delegate = delegate; self.icon.hidden = NO; self.icon.image = icon; - self.icon.mwm_coloring = MWMImageColoringBlack; + self.icon.styleName = @"MWMBlack"; if (text && text.length != 0) { self.label.text = text; - self.label.textColor = [UIColor blackPrimaryText]; + [self.label setStyleAndApply: @"blackPrimaryText"]; } else { self.label.text = placeholder; - self.label.textColor = [UIColor blackHintText]; + [self.label setStyleAndApply: @"blackHintText"]; } self.label.preferredMaxLayoutWidth = self.width - self.labelLeadingOffset.constant - self.labelTrailingOffset.constant; diff --git a/iphone/Maps/UI/Editor/Cells/MWMEditorSelectTableViewCell.xib b/iphone/Maps/UI/Editor/Cells/MWMEditorSelectTableViewCell.xib index 97d184dc91..615132e019 100644 --- a/iphone/Maps/UI/Editor/Cells/MWMEditorSelectTableViewCell.xib +++ b/iphone/Maps/UI/Editor/Cells/MWMEditorSelectTableViewCell.xib @@ -1,21 +1,19 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES"> - <device id="retina4_7" orientation="portrait"> - <adaptation id="fullscreen"/> - </device> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES"> + <device id="retina4_7" orientation="portrait" appearance="light"/> <dependencies> <deployment identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> <objects> <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/> <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/> - <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="xiI-ev-aU2" customClass="MWMEditorSelectTableViewCell" propertyAccessControl="all"> + <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="xiI-ev-aU2" customClass="MWMEditorSelectTableViewCell" propertyAccessControl="none"> <rect key="frame" x="0.0" y="0.0" width="320" height="44"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="xiI-ev-aU2" id="V1p-K9-KlE"> - <rect key="frame" x="0.0" y="0.0" width="320" height="43.5"/> + <rect key="frame" x="0.0" y="0.0" width="320" height="44"/> <autoresizingMask key="autoresizingMask"/> <subviews> <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="xur-tJ-HA9"> @@ -25,7 +23,7 @@ <constraint firstAttribute="height" constant="28" id="s7g-CH-05Z"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="coloring" value="MWMBlack"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="MWMBlack"/> </userDefinedRuntimeAttributes> </imageView> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="220" translatesAutoresizingMaskIntoConstraints="NO" id="MBe-6r-IsA"> @@ -37,8 +35,7 @@ <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="fontName" value="regular17"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular17:blackPrimaryText"/> </userDefinedRuntimeAttributes> </label> <imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="ic_arrow_gray_right" translatesAutoresizingMaskIntoConstraints="NO" id="jLw-GA-z3y"> @@ -48,7 +45,7 @@ <constraint firstAttribute="height" constant="28" id="PG8-LW-72y"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="coloring" value="MWMGray"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="MWMGray"/> </userDefinedRuntimeAttributes> </imageView> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="nq9-KC-Ujh"> @@ -73,12 +70,12 @@ <constraint firstAttribute="trailing" secondItem="MBe-6r-IsA" secondAttribute="trailing" constant="40" id="yG7-RB-5Pa"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Background"/> </userDefinedRuntimeAttributes> </tableViewCellContentView> <inset key="separatorInset" minX="60" minY="0.0" maxX="0.0" maxY="0.0"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Background"/> </userDefinedRuntimeAttributes> <connections> <outlet property="grayArrow" destination="jLw-GA-z3y" id="5NK-K5-4IO"/> @@ -87,6 +84,7 @@ <outlet property="labelLeadingOffset" destination="RGA-XL-gLq" id="Tb4-Ew-iDe"/> <outlet property="labelTrailingOffset" destination="yG7-RB-5Pa" id="NqK-3D-zMQ"/> </connections> + <point key="canvasLocation" x="139" y="155"/> </tableViewCell> </objects> <resources> diff --git a/iphone/Maps/UI/Editor/Cells/MWMEditorSwitchTableViewCell.m b/iphone/Maps/UI/Editor/Cells/MWMEditorSwitchTableViewCell.m index 365b03a63b..0a96a40ebc 100644 --- a/iphone/Maps/UI/Editor/Cells/MWMEditorSwitchTableViewCell.m +++ b/iphone/Maps/UI/Editor/Cells/MWMEditorSwitchTableViewCell.m @@ -1,5 +1,5 @@ #import "MWMEditorSwitchTableViewCell.h" -#import "UIImageView+Coloring.h" +#import "SwiftBridge.h" @interface MWMEditorSwitchTableViewCell () @@ -20,7 +20,7 @@ { self.delegate = delegate; self.icon.image = icon; - self.icon.mwm_coloring = MWMImageColoringBlack; + self.icon.styleName = @"MWMBlack"; self.label.text = text; self.switchControl.on = on; [self setTextColorWithSwitchValue:on]; diff --git a/iphone/Maps/UI/Editor/Cells/MWMEditorSwitchTableViewCell.xib b/iphone/Maps/UI/Editor/Cells/MWMEditorSwitchTableViewCell.xib index 59571a8cf3..24724a8f4c 100644 --- a/iphone/Maps/UI/Editor/Cells/MWMEditorSwitchTableViewCell.xib +++ b/iphone/Maps/UI/Editor/Cells/MWMEditorSwitchTableViewCell.xib @@ -1,23 +1,19 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES"> - <device id="retina4_7" orientation="portrait"> - <adaptation id="fullscreen"/> - </device> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15705" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES"> + <device id="retina4_7" orientation="portrait" appearance="light"/> <dependencies> <deployment identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/> - <capability name="Alignment constraints with different attributes" minToolsVersion="5.1"/> - <capability name="Constraints to layout margins" minToolsVersion="6.0"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15706"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> <objects> <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/> <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/> - <tableViewCell contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" id="qme-9J-aMf" customClass="MWMEditorSwitchTableViewCell" propertyAccessControl="all"> + <tableViewCell contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" id="qme-9J-aMf" customClass="MWMEditorSwitchTableViewCell" propertyAccessControl="none"> <rect key="frame" x="0.0" y="0.0" width="320" height="44"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="qme-9J-aMf" id="fpo-VO-awT"> - <rect key="frame" x="0.0" y="0.0" width="320" height="43.5"/> + <rect key="frame" x="0.0" y="0.0" width="320" height="44"/> <autoresizingMask key="autoresizingMask"/> <subviews> <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="j3u-fF-pG6"> @@ -27,7 +23,7 @@ <constraint firstAttribute="width" constant="28" id="MT3-eQ-SOL"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="coloring" value="MWMBlack"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="MWMBlack"/> </userDefinedRuntimeAttributes> </imageView> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="187" translatesAutoresizingMaskIntoConstraints="NO" id="QFf-wR-pPw"> @@ -39,15 +35,11 @@ <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="fontName" value="regular17"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular17:blackPrimaryText"/> </userDefinedRuntimeAttributes> </label> <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="qvr-u3-nNo"> - <rect key="frame" x="255" y="7" width="51" height="31"/> - <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="onTintColorName" value="linkBlue"/> - </userDefinedRuntimeAttributes> + <rect key="frame" x="255" y="6.5" width="51" height="31"/> <connections> <action selector="valueChanged" destination="qme-9J-aMf" eventType="valueChanged" id="sak-SB-Nvi"/> </connections> @@ -64,18 +56,19 @@ <constraint firstItem="qvr-u3-nNo" firstAttribute="centerY" secondItem="fpo-VO-awT" secondAttribute="centerYWithinMargins" id="opz-Nt-Q5b"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Background"/> </userDefinedRuntimeAttributes> </tableViewCellContentView> <inset key="separatorInset" minX="60" minY="0.0" maxX="0.0" maxY="0.0"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Background"/> </userDefinedRuntimeAttributes> <connections> <outlet property="icon" destination="j3u-fF-pG6" id="nIz-cY-MCW"/> <outlet property="label" destination="QFf-wR-pPw" id="1MO-Vf-bt6"/> <outlet property="switchControl" destination="qvr-u3-nNo" id="hfe-x6-0cw"/> </connections> + <point key="canvasLocation" x="139" y="155"/> </tableViewCell> </objects> </document> diff --git a/iphone/Maps/UI/Editor/Cells/MWMEditorTextTableViewCell.m b/iphone/Maps/UI/Editor/Cells/MWMEditorTextTableViewCell.m index f9563ece97..13e9586474 100644 --- a/iphone/Maps/UI/Editor/Cells/MWMEditorTextTableViewCell.m +++ b/iphone/Maps/UI/Editor/Cells/MWMEditorTextTableViewCell.m @@ -1,7 +1,7 @@ #import "MWMEditorTextTableViewCell.h" #import "MWMEditorCommon.h" #import "UIImageView+Coloring.h" - +#import "SwiftBridge.h" static CGFloat const kErrorLabelDefaultTopSpace = 4.; @interface MWMEditorTextTableViewCell ()<UITextFieldDelegate> @@ -49,7 +49,7 @@ static CGFloat const kErrorLabelDefaultTopSpace = 4.; { self.delegate = delegate; self.icon.image = icon; - self.icon.mwm_coloring = MWMImageColoringBlack; + [self.icon setStyleAndApply: @"MWMBlack"]; self.icon.hidden = (icon == nil); self.textField.text = text; @@ -70,13 +70,13 @@ static CGFloat const kErrorLabelDefaultTopSpace = 4.; { self.labelHeight.priority = UILayoutPriorityDefaultHigh; self.errorLabelTopSpace.constant = 0.; - self.contentView.backgroundColor = [UIColor white]; + [self.contentView setStyleAndApply: @"Background"]; } else { self.labelHeight.priority = UILayoutPriorityDefaultLow; self.errorLabelTopSpace.constant = kErrorLabelDefaultTopSpace; - self.contentView.backgroundColor = [UIColor errorPink]; + [self.contentView setStyleAndApply: @"ErrorBackground"]; } [self layoutIfNeeded]; } diff --git a/iphone/Maps/UI/Editor/Cells/MWMEditorTextTableViewCell.xib b/iphone/Maps/UI/Editor/Cells/MWMEditorTextTableViewCell.xib index 0e6772c65e..7a81c99fd6 100644 --- a/iphone/Maps/UI/Editor/Cells/MWMEditorTextTableViewCell.xib +++ b/iphone/Maps/UI/Editor/Cells/MWMEditorTextTableViewCell.xib @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14868" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES"> - <device id="retina4_7" orientation="portrait" appearance="light"/> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES"> + <device id="retina6_1" orientation="portrait" appearance="light"/> <dependencies> <deployment identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14824"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> <objects> @@ -23,7 +23,7 @@ <constraint firstAttribute="width" constant="28" id="nbm-T8-Yob"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="coloring" value="MWMBlack"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="MWMBlack"/> </userDefinedRuntimeAttributes> </imageView> <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="bottom" textAlignment="natural" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="krN-k2-9qO"> @@ -35,8 +35,7 @@ <fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="17"/> <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular17"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular17:blackPrimaryText"/> </userDefinedRuntimeAttributes> <connections> <outlet property="delegate" destination="KGk-i7-Jjw" id="GO4-EB-MG9"/> @@ -52,8 +51,7 @@ <color key="textColor" red="0.95686274510000002" green="0.26274509800000001" blue="0.21176470589999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <nil key="highlightedColor"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular12"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="red"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular12:redText"/> </userDefinedRuntimeAttributes> </label> </subviews> @@ -69,12 +67,12 @@ <constraint firstItem="krN-k2-9qO" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="60" id="w8z-Hi-yGr"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Background"/> </userDefinedRuntimeAttributes> </tableViewCellContentView> <inset key="separatorInset" minX="60" minY="0.0" maxX="0.0" maxY="0.0"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Background"/> </userDefinedRuntimeAttributes> <connections> <outlet property="errorLabel" destination="Lht-i1-s0H" id="N2I-je-OSW"/> diff --git a/iphone/Maps/UI/Editor/Cells/MWMNoteCell.xib b/iphone/Maps/UI/Editor/Cells/MWMNoteCell.xib index 2442991468..8104d79122 100644 --- a/iphone/Maps/UI/Editor/Cells/MWMNoteCell.xib +++ b/iphone/Maps/UI/Editor/Cells/MWMNoteCell.xib @@ -1,25 +1,23 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES"> - <device id="retina4_7" orientation="portrait"> - <adaptation id="fullscreen"/> - </device> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES"> + <device id="retina4_7" orientation="portrait" appearance="light"/> <dependencies> <deployment identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> <objects> <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/> <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/> - <tableViewCell contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" rowHeight="129" id="KGk-i7-Jjw" customClass="MWMNoteCell" propertyAccessControl="all"> + <tableViewCell contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" rowHeight="129" id="KGk-i7-Jjw" customClass="MWMNoteCell" propertyAccessControl="none"> <rect key="frame" x="0.0" y="0.0" width="320" height="129"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM"> - <rect key="frame" x="0.0" y="0.0" width="320" height="128.5"/> + <rect key="frame" x="0.0" y="0.0" width="320" height="129"/> <autoresizingMask key="autoresizingMask"/> <subviews> <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" textAlignment="natural" translatesAutoresizingMaskIntoConstraints="NO" id="d32-xF-MvW" customClass="MWMTextView"> - <rect key="frame" x="16" y="12" width="288" height="104"/> + <rect key="frame" x="16" y="12" width="288" height="105"/> <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <constraints> <constraint firstAttribute="height" priority="750" constant="104" id="J3M-HG-f2p"/> @@ -27,9 +25,7 @@ <fontDescription key="fontDescription" type="system" pointSize="14"/> <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular17"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Background:regular17:blackPrimaryText"/> </userDefinedRuntimeAttributes> <connections> <outlet property="delegate" destination="KGk-i7-Jjw" id="b3Z-HX-D7g"/> diff --git a/iphone/Maps/UI/Editor/Cuisine/MWMCuisineEditorViewController.mm b/iphone/Maps/UI/Editor/Cuisine/MWMCuisineEditorViewController.mm index bd0d76c8e3..0e4a3b0111 100644 --- a/iphone/Maps/UI/Editor/Cuisine/MWMCuisineEditorViewController.mm +++ b/iphone/Maps/UI/Editor/Cuisine/MWMCuisineEditorViewController.mm @@ -134,7 +134,6 @@ std::vector<std::string> SliceKeys(std::vector<std::pair<std::string, std::strin - (void)configSearchBar { self.isSearch = NO; - self.searchBar.backgroundImage = [UIImage imageWithColor:[UIColor primary]]; self.searchBar.placeholder = L(@"search"); } @@ -154,8 +153,6 @@ std::vector<std::string> SliceKeys(std::vector<std::pair<std::string, std::strin - (void)configTable { - self.tableView.backgroundColor = [UIColor pressBackground]; - self.tableView.separatorColor = [UIColor blackDividers]; [self.tableView registerClass:[MWMTableViewCell class] forCellReuseIdentifier:[UITableViewCell className]]; } diff --git a/iphone/Maps/UI/Editor/MWMEditorAdditionalNamesHeader.xib b/iphone/Maps/UI/Editor/MWMEditorAdditionalNamesHeader.xib index 136675387b..0eb3576183 100644 --- a/iphone/Maps/UI/Editor/MWMEditorAdditionalNamesHeader.xib +++ b/iphone/Maps/UI/Editor/MWMEditorAdditionalNamesHeader.xib @@ -1,18 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES"> - <device id="retina4_7" orientation="portrait"> - <adaptation id="fullscreen"/> - </device> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES"> + <device id="retina6_1" orientation="portrait" appearance="light"/> <dependencies> <deployment identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/> - <capability name="Constraints to layout margins" minToolsVersion="6.0"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> <objects> <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/> <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/> - <view contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" id="fMr-en-6Lb" customClass="MWMEditorAdditionalNamesHeader" propertyAccessControl="all"> + <view contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" id="fMr-en-6Lb" customClass="MWMEditorAdditionalNamesHeader" propertyAccessControl="none"> <rect key="frame" x="0.0" y="0.0" width="320" height="40"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <subviews> @@ -22,8 +19,7 @@ <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="fontName" value="regular13"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackSecondaryText"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular13:blackSecondaryText"/> </userDefinedRuntimeAttributes> </label> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="right" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="fgf-k2-uT4" customClass="MWMButton"> @@ -37,9 +33,7 @@ <color key="titleColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> </state> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular13"/> - <userDefinedRuntimeAttribute type="string" keyPath="textColorName" value="linkBlue"/> - <userDefinedRuntimeAttribute type="string" keyPath="textColorHighlightedName" value="linkBlueHighlighted"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="MoreButton:regular13"/> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="show"/> </userDefinedRuntimeAttributes> <connections> diff --git a/iphone/Maps/UI/Editor/MWMEditorNotesFooter.xib b/iphone/Maps/UI/Editor/MWMEditorNotesFooter.xib index 340ea8c0af..aa13ab04c5 100644 --- a/iphone/Maps/UI/Editor/MWMEditorNotesFooter.xib +++ b/iphone/Maps/UI/Editor/MWMEditorNotesFooter.xib @@ -1,23 +1,20 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" colorMatched="YES"> - <device id="retina4_7" orientation="portrait"> - <adaptation id="fullscreen"/> - </device> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" colorMatched="YES"> + <device id="retina4_7" orientation="portrait" appearance="light"/> <dependencies> <deployment identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/> - <capability name="Constraints to layout margins" minToolsVersion="6.0"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> <objects> <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/> <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/> - <view contentMode="scaleToFill" id="IBb-39-rly" customClass="MWMEditorNotesFooter" propertyAccessControl="all"> + <view contentMode="scaleToFill" id="IBb-39-rly" customClass="MWMEditorNotesFooter" propertyAccessControl="none"> <rect key="frame" x="0.0" y="0.0" width="320" height="144"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <subviews> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="xcv-fG-OmU"> - <rect key="frame" x="0.0" y="-15" width="320" height="173"/> + <rect key="frame" x="0.0" y="-14.5" width="320" height="173"/> <subviews> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="288" translatesAutoresizingMaskIntoConstraints="NO" id="vxr-iR-qGP"> <rect key="frame" x="16" y="0.0" width="288" height="143"/> @@ -29,8 +26,7 @@ <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="fontName" value="regular14"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackSecondaryText"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular14:blackSecondaryText"/> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="editor_detailed_description"/> </userDefinedRuntimeAttributes> </label> @@ -42,9 +38,7 @@ <state key="normal" title="Button"/> <userDefinedRuntimeAttributes> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="editor_more_about_osm"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular14"/> - <userDefinedRuntimeAttribute type="string" keyPath="textColorName" value="linkBlue"/> - <userDefinedRuntimeAttribute type="string" keyPath="textColorHighlightedName" value="linkBlueHighlighted"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="MoreButton:regular14"/> </userDefinedRuntimeAttributes> <connections> <action selector="osmTap" destination="IBb-39-rly" eventType="touchUpInside" id="EjN-0s-Ycy"/> @@ -71,7 +65,7 @@ </constraints> <nil key="simulatedTopBarMetrics"/> <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/> - <point key="canvasLocation" x="452" y="465"/> + <point key="canvasLocation" x="655.07246376811599" y="311.38392857142856"/> </view> </objects> </document> diff --git a/iphone/Maps/UI/Editor/MWMObjectsCategorySelectorController.mm b/iphone/Maps/UI/Editor/MWMObjectsCategorySelectorController.mm index 4b6f4319de..2756d26798 100644 --- a/iphone/Maps/UI/Editor/MWMObjectsCategorySelectorController.mm +++ b/iphone/Maps/UI/Editor/MWMObjectsCategorySelectorController.mm @@ -50,8 +50,6 @@ NSString * const kToEditorSegue = @"CategorySelectorToEditorSegue"; - (void)configTable { - self.tableView.backgroundColor = [UIColor pressBackground]; - self.tableView.separatorColor = [UIColor blackDividers]; [self.tableView registerClass:[MWMTableViewCell class] forCellReuseIdentifier:[UITableViewCell className]]; } @@ -69,7 +67,6 @@ NSString * const kToEditorSegue = @"CategorySelectorToEditorSegue"; - (void)configNavBar { self.title = L(@"editor_add_select_category"); } - (void)configSearchBar { - self.searchBar.backgroundImage = [UIImage imageWithColor:[UIColor primary]]; self.searchBar.placeholder = L(@"search"); } diff --git a/iphone/Maps/UI/Editor/OpeningHours/Cells/MWMOpeningHoursAddClosedTableViewCell.xib b/iphone/Maps/UI/Editor/OpeningHours/Cells/MWMOpeningHoursAddClosedTableViewCell.xib index de299ad3d5..52c42cb353 100644 --- a/iphone/Maps/UI/Editor/OpeningHours/Cells/MWMOpeningHoursAddClosedTableViewCell.xib +++ b/iphone/Maps/UI/Editor/OpeningHours/Cells/MWMOpeningHoursAddClosedTableViewCell.xib @@ -1,46 +1,39 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> - <device id="retina4_7" orientation="portrait"> - <adaptation id="fullscreen"/> - </device> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15705" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> <dependencies> - <deployment identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15706"/> <capability name="Safe area layout guides" minToolsVersion="9.0"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> <objects> <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/> <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/> - <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="KGk-i7-Jjw" customClass="MWMOpeningHoursAddClosedTableViewCell" propertyAccessControl="all"> + <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="KGk-i7-Jjw" customClass="MWMOpeningHoursAddClosedTableViewCell" propertyAccessControl="none"> <rect key="frame" x="0.0" y="0.0" width="320" height="44"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM"> - <rect key="frame" x="0.0" y="0.0" width="320" height="43.5"/> + <rect key="frame" x="0.0" y="0.0" width="320" height="44"/> <autoresizingMask key="autoresizingMask"/> <subviews> <button opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="DPW-UE-5UN"> - <rect key="frame" x="0.0" y="0.0" width="320" height="42"/> + <rect key="frame" x="0.0" y="0.0" width="320" height="42.5"/> <fontDescription key="fontDescription" type="system" pointSize="17"/> <state key="normal" title="Add Hours Closed"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular17"/> - <userDefinedRuntimeAttribute type="string" keyPath="textColorName" value="linkBlue"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="FlatNormalTransButtonBig"/> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="editor_time_add_closed"/> - <userDefinedRuntimeAttribute type="string" keyPath="textColorHighlightedName" value="linkBlueHighlighted"/> - <userDefinedRuntimeAttribute type="string" keyPath="textColorDisabledName" value="linkBlueHighlighted"/> </userDefinedRuntimeAttributes> <connections> <action selector="addClosedTap" destination="KGk-i7-Jjw" eventType="touchUpInside" id="HxR-3Y-SiG"/> </connections> </button> <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="separator_image" translatesAutoresizingMaskIntoConstraints="NO" id="6P1-ZO-JMA"> - <rect key="frame" x="0.0" y="43" width="320" height="1"/> + <rect key="frame" x="0.0" y="43.5" width="320" height="1"/> <constraints> <constraint firstAttribute="height" constant="1" id="ckb-Sc-MTJ"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="coloring" value="MWMSeparator"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="MWMSeparator"/> </userDefinedRuntimeAttributes> </imageView> </subviews> @@ -54,16 +47,17 @@ <constraint firstItem="6P1-ZO-JMA" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" id="yxQ-et-0D2"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Background"/> </userDefinedRuntimeAttributes> </tableViewCellContentView> <viewLayoutGuide key="safeArea" id="nLi-ui-Rk2"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Background"/> </userDefinedRuntimeAttributes> <connections> <outlet property="addClosedButton" destination="DPW-UE-5UN" id="Z5D-1Z-Hxa"/> </connections> + <point key="canvasLocation" x="139" y="155"/> </tableViewCell> </objects> <resources> diff --git a/iphone/Maps/UI/Editor/OpeningHours/Cells/MWMOpeningHoursAddScheduleTableViewCell.xib b/iphone/Maps/UI/Editor/OpeningHours/Cells/MWMOpeningHoursAddScheduleTableViewCell.xib index 973be289c2..3a93e40314 100644 --- a/iphone/Maps/UI/Editor/OpeningHours/Cells/MWMOpeningHoursAddScheduleTableViewCell.xib +++ b/iphone/Maps/UI/Editor/OpeningHours/Cells/MWMOpeningHoursAddScheduleTableViewCell.xib @@ -1,26 +1,19 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES"> - <device id="retina4_7" orientation="portrait"> - <adaptation id="fullscreen"/> - </device> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES"> + <device id="retina4_7" orientation="portrait" appearance="light"/> <dependencies> <deployment identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> - <customFonts key="customFonts"> - <array key="HelveticaNeue.ttc"> - <string>HelveticaNeue</string> - </array> - </customFonts> <objects> <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/> <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/> - <tableViewCell contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" rowHeight="84" id="KGk-i7-Jjw" customClass="MWMOpeningHoursAddScheduleTableViewCell" propertyAccessControl="all"> + <tableViewCell contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" rowHeight="84" id="KGk-i7-Jjw" customClass="MWMOpeningHoursAddScheduleTableViewCell" propertyAccessControl="none"> <rect key="frame" x="0.0" y="0.0" width="320" height="84"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM"> - <rect key="frame" x="0.0" y="0.0" width="320" height="83.5"/> + <rect key="frame" x="0.0" y="0.0" width="320" height="84"/> <autoresizingMask key="autoresizingMask"/> <subviews> <button opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Rja-9J-5hA"> @@ -35,17 +28,7 @@ <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> </state> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="textColorName" value="linkBlue"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular14"/> - <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius"> - <integer key="value" value="8"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="string" keyPath="layer.borderColorName" value="linkBlue"/> - <userDefinedRuntimeAttribute type="number" keyPath="layer.borderWidth"> - <integer key="value" value="1"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="string" keyPath="textColorHighlightedName" value="linkBlueHighlighted"/> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="clearColor"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="EditButton"/> </userDefinedRuntimeAttributes> <connections> <action selector="addScheduleTap" destination="KGk-i7-Jjw" eventType="touchUpInside" id="u6e-fL-daC"/> @@ -64,6 +47,7 @@ <connections> <outlet property="addScheduleButton" destination="Rja-9J-5hA" id="Ubq-Fn-Zg0"/> </connections> + <point key="canvasLocation" x="139" y="155"/> </tableViewCell> </objects> </document> diff --git a/iphone/Maps/UI/Editor/OpeningHours/Cells/MWMOpeningHoursAllDayTableViewCell.xib b/iphone/Maps/UI/Editor/OpeningHours/Cells/MWMOpeningHoursAllDayTableViewCell.xib index 0db8830ebf..9df89c4d65 100644 --- a/iphone/Maps/UI/Editor/OpeningHours/Cells/MWMOpeningHoursAllDayTableViewCell.xib +++ b/iphone/Maps/UI/Editor/OpeningHours/Cells/MWMOpeningHoursAllDayTableViewCell.xib @@ -1,28 +1,19 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES"> - <device id="retina4_7" orientation="portrait"> - <adaptation id="fullscreen"/> - </device> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15705" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES"> + <device id="retina4_7" orientation="portrait" appearance="light"/> <dependencies> <deployment identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/> - <capability name="Alignment constraints with different attributes" minToolsVersion="5.1"/> - <capability name="Constraints to layout margins" minToolsVersion="6.0"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15706"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> - <customFonts key="customFonts"> - <array key="HelveticaNeue.ttc"> - <string>HelveticaNeue</string> - </array> - </customFonts> <objects> <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/> <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/> - <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="KGk-i7-Jjw" customClass="MWMOpeningHoursAllDayTableViewCell" propertyAccessControl="all"> + <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="KGk-i7-Jjw" customClass="MWMOpeningHoursAllDayTableViewCell" propertyAccessControl="none"> <rect key="frame" x="0.0" y="0.0" width="320" height="44"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM"> - <rect key="frame" x="0.0" y="0.0" width="320" height="43.5"/> + <rect key="frame" x="0.0" y="0.0" width="320" height="44"/> <autoresizingMask key="autoresizingMask"/> <subviews> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="All Day (24 hours)" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="223" translatesAutoresizingMaskIntoConstraints="NO" id="0Ni-TD-6Ia"> @@ -30,27 +21,23 @@ <fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="17"/> <nil key="highlightedColor"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular17"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular17:blackPrimaryText"/> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="editor_time_allday"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/> </userDefinedRuntimeAttributes> </label> <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="0BP-HJ-Tdq"> - <rect key="frame" x="255" y="9" width="51" height="27"/> - <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="onTintColorName" value="linkBlue"/> - </userDefinedRuntimeAttributes> + <rect key="frame" x="255" y="7.5" width="51" height="29"/> <connections> <action selector="onSwitch" destination="KGk-i7-Jjw" eventType="valueChanged" id="qZA-HV-PB6"/> </connections> </switch> <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="separator_image" translatesAutoresizingMaskIntoConstraints="NO" id="lbK-kB-c4p"> - <rect key="frame" x="0.0" y="43" width="320" height="1"/> + <rect key="frame" x="0.0" y="43.5" width="320" height="1"/> <constraints> <constraint firstAttribute="height" constant="1" id="JvF-ZU-maq"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="coloring" value="MWMSeparator"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="MWMSeparator"/> </userDefinedRuntimeAttributes> </imageView> </subviews> @@ -66,16 +53,17 @@ <constraint firstAttribute="bottom" secondItem="lbK-kB-c4p" secondAttribute="bottom" constant="-0.5" id="jbG-hH-bln"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Background"/> </userDefinedRuntimeAttributes> </tableViewCellContentView> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Background"/> </userDefinedRuntimeAttributes> <connections> <outlet property="label" destination="0Ni-TD-6Ia" id="zLO-3p-8E4"/> <outlet property="switcher" destination="0BP-HJ-Tdq" id="mHZ-4O-ve2"/> </connections> + <point key="canvasLocation" x="139" y="155"/> </tableViewCell> </objects> <resources> diff --git a/iphone/Maps/UI/Editor/OpeningHours/Cells/MWMOpeningHoursClosedSpanTableViewCell.xib b/iphone/Maps/UI/Editor/OpeningHours/Cells/MWMOpeningHoursClosedSpanTableViewCell.xib index 402de37116..7a39180a42 100644 --- a/iphone/Maps/UI/Editor/OpeningHours/Cells/MWMOpeningHoursClosedSpanTableViewCell.xib +++ b/iphone/Maps/UI/Editor/OpeningHours/Cells/MWMOpeningHoursClosedSpanTableViewCell.xib @@ -1,26 +1,19 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES"> - <device id="retina4_7" orientation="portrait"> - <adaptation id="fullscreen"/> - </device> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES"> + <device id="retina4_7" orientation="portrait" appearance="light"/> <dependencies> <deployment identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> - <customFonts key="customFonts"> - <array key="HelveticaNeue.ttc"> - <string>HelveticaNeue</string> - </array> - </customFonts> <objects> <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/> <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/> - <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="KGk-i7-Jjw" customClass="MWMOpeningHoursClosedSpanTableViewCell" propertyAccessControl="all"> + <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="KGk-i7-Jjw" customClass="MWMOpeningHoursClosedSpanTableViewCell" propertyAccessControl="none"> <rect key="frame" x="0.0" y="0.0" width="320" height="44"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM"> - <rect key="frame" x="0.0" y="0.0" width="320" height="43.5"/> + <rect key="frame" x="0.0" y="0.0" width="320" height="44"/> <autoresizingMask key="autoresizingMask"/> <subviews> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="eHW-h6-k3U" userLabel="Cancel Button" customClass="MWMButton"> @@ -30,7 +23,7 @@ </constraints> <state key="normal" image="ic_clear_sys"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="coloringName" value="MWMBlack"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="MWMBlack"/> </userDefinedRuntimeAttributes> <connections> <action selector="cancelTap" destination="KGk-i7-Jjw" eventType="touchUpInside" id="UKS-mG-ZJG"/> @@ -42,12 +35,11 @@ <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="styleName" value="regular17:blackPrimaryText"/> </userDefinedRuntimeAttributes> </label> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="14:00-15:00" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="170" translatesAutoresizingMaskIntoConstraints="NO" id="hOg-Ps-YH4"> - <rect key="frame" x="134" y="11" width="170" height="20"/> + <rect key="frame" x="134" y="11.5" width="170" height="20"/> <constraints> <constraint firstAttribute="width" constant="170" id="lQt-Xw-FNV"/> </constraints> @@ -55,8 +47,7 @@ <color key="textColor" red="0.49803921569999998" green="0.49803921569999998" blue="0.49803921569999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <nil key="highlightedColor"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular17"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackHintText"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular17:blackHintText"/> </userDefinedRuntimeAttributes> </label> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="3cC-7h-Nyb" userLabel="Expand Button"> @@ -67,12 +58,12 @@ </connections> </button> <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="separator_image" translatesAutoresizingMaskIntoConstraints="NO" id="fZN-J3-A1c"> - <rect key="frame" x="0.0" y="43" width="320" height="1"/> + <rect key="frame" x="0.0" y="43.5" width="320" height="1"/> <constraints> <constraint firstAttribute="height" constant="1" id="Vyg-vJ-QBa"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="coloring" value="MWMSeparator"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="MWMSeparator"/> </userDefinedRuntimeAttributes> </imageView> </subviews> @@ -98,11 +89,11 @@ <constraint firstAttribute="trailing" secondItem="lia-DA-sOa" secondAttribute="trailing" priority="250" constant="8" id="zjM-Hg-INM"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Background"/> </userDefinedRuntimeAttributes> </tableViewCellContentView> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Background"/> </userDefinedRuntimeAttributes> <connections> <outlet property="hoursClosedLabel" destination="lia-DA-sOa" id="tUx-Cy-R9r"/> @@ -111,6 +102,7 @@ <outlet property="timeSpanLabel" destination="hOg-Ps-YH4" id="dyB-M5-ePt"/> <outlet property="timeSpanVerticalAlignment" destination="ne6-qS-gOV" id="i2Q-La-wrT"/> </connections> + <point key="canvasLocation" x="139" y="155"/> </tableViewCell> </objects> <resources> diff --git a/iphone/Maps/UI/Editor/OpeningHours/Cells/MWMOpeningHoursDaysSelectorTableViewCell.mm b/iphone/Maps/UI/Editor/OpeningHours/Cells/MWMOpeningHoursDaysSelectorTableViewCell.mm index a3a59055b9..a939fb036d 100644 --- a/iphone/Maps/UI/Editor/OpeningHours/Cells/MWMOpeningHoursDaysSelectorTableViewCell.mm +++ b/iphone/Maps/UI/Editor/OpeningHours/Cells/MWMOpeningHoursDaysSelectorTableViewCell.mm @@ -1,5 +1,5 @@ #import "MWMOpeningHoursDaysSelectorTableViewCell.h" -#import "UIImageView+Coloring.h" +#import "SwiftBridge.h" @interface MWMOpeningHoursDaysSelectorTableViewCell () @@ -73,7 +73,7 @@ using namespace osmoh; if (image.tag == tag) { image.image = [UIImage imageNamed:selected ? @"radioBtnOn" : @"radioBtnOff"]; - image.mwm_coloring = selected ? MWMImageColoringBlue : MWMImageColoringGray; + [image setStyleAndApply: selected ? @"MWMBlue" : @"MWMGray"]; } } } diff --git a/iphone/Maps/UI/Editor/OpeningHours/Cells/MWMOpeningHoursDaysSelectorTableViewCell.xib b/iphone/Maps/UI/Editor/OpeningHours/Cells/MWMOpeningHoursDaysSelectorTableViewCell.xib index 0cd2ad93d2..ea7e29452b 100644 --- a/iphone/Maps/UI/Editor/OpeningHours/Cells/MWMOpeningHoursDaysSelectorTableViewCell.xib +++ b/iphone/Maps/UI/Editor/OpeningHours/Cells/MWMOpeningHoursDaysSelectorTableViewCell.xib @@ -1,26 +1,19 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES"> - <device id="retina4_7" orientation="portrait"> - <adaptation id="fullscreen"/> - </device> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES"> + <device id="retina4_7" orientation="portrait" appearance="light"/> <dependencies> <deployment identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> - <customFonts key="customFonts"> - <array key="HelveticaNeue.ttc"> - <string>HelveticaNeue</string> - </array> - </customFonts> <objects> <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/> <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/> - <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" rowHeight="76" id="KGk-i7-Jjw" customClass="MWMOpeningHoursDaysSelectorTableViewCell" propertyAccessControl="all"> + <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" rowHeight="76" id="KGk-i7-Jjw" customClass="MWMOpeningHoursDaysSelectorTableViewCell" propertyAccessControl="none"> <rect key="frame" x="0.0" y="0.0" width="320" height="76"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM"> - <rect key="frame" x="0.0" y="0.0" width="320" height="75.5"/> + <rect key="frame" x="0.0" y="0.0" width="320" height="76"/> <autoresizingMask key="autoresizingMask"/> <subviews> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="CCr-vZ-lZV" userLabel="Day#1"> @@ -38,17 +31,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="fontName" value="regular17"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular17"/> </userDefinedRuntimeAttributes> </label> <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="radioBtnOff" highlightedImage="radioBtnOn" translatesAutoresizingMaskIntoConstraints="NO" id="eN6-Is-HP5"> - <rect key="frame" x="10" y="40" width="22" height="22"/> + <rect key="frame" x="9.5" y="40" width="22" height="22"/> <constraints> <constraint firstAttribute="height" constant="22" id="6PM-WV-5ha"/> <constraint firstAttribute="width" constant="22" id="Wid-uC-2rb"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="coloring" value="MWMBlue"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="MWMBlue"/> </userDefinedRuntimeAttributes> </imageView> </subviews> @@ -65,7 +58,7 @@ <constraint firstItem="tQj-bk-oM9" firstAttribute="top" secondItem="CCr-vZ-lZV" secondAttribute="top" id="z4X-lt-MRQ"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Background"/> </userDefinedRuntimeAttributes> </view> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="d7U-Vz-ZXn" userLabel="Day#2"> @@ -83,17 +76,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="fontName" value="regular17"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular17"/> </userDefinedRuntimeAttributes> </label> <imageView userInteractionEnabled="NO" tag="1" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="radioBtnOff" highlightedImage="radioBtnOn" translatesAutoresizingMaskIntoConstraints="NO" id="PA6-gY-SsH"> - <rect key="frame" x="9" y="40" width="22" height="22"/> + <rect key="frame" x="9.5" y="40" width="22" height="22"/> <constraints> <constraint firstAttribute="height" constant="22" id="ACp-b4-BbL"/> <constraint firstAttribute="width" constant="22" id="PHS-nj-MJ1"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="coloring" value="MWMBlue"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="MWMBlue"/> </userDefinedRuntimeAttributes> </imageView> </subviews> @@ -110,7 +103,7 @@ <constraint firstItem="TX4-wv-r7d" firstAttribute="leading" secondItem="d7U-Vz-ZXn" secondAttribute="leading" id="uIH-NW-Yob"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Background"/> </userDefinedRuntimeAttributes> </view> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="J8L-sr-yWu" userLabel="Day#3"> @@ -128,17 +121,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="fontName" value="regular17"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular17"/> </userDefinedRuntimeAttributes> </label> <imageView userInteractionEnabled="NO" tag="2" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="radioBtnOff" highlightedImage="radioBtnOn" translatesAutoresizingMaskIntoConstraints="NO" id="eLh-R1-Lvc"> - <rect key="frame" x="10" y="40" width="22" height="22"/> + <rect key="frame" x="9.5" y="40" width="22" height="22"/> <constraints> <constraint firstAttribute="height" constant="22" id="0ck-A4-4EU"/> <constraint firstAttribute="width" constant="22" id="OuD-FL-tq0"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="coloring" value="MWMBlue"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="MWMBlue"/> </userDefinedRuntimeAttributes> </imageView> </subviews> @@ -155,7 +148,7 @@ <constraint firstItem="eLh-R1-Lvc" firstAttribute="centerX" secondItem="J8L-sr-yWu" secondAttribute="centerX" id="vJl-bp-Rdn"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Background"/> </userDefinedRuntimeAttributes> </view> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="8q8-c5-QBM" userLabel="Day#4"> @@ -173,17 +166,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="fontName" value="regular17"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular17"/> </userDefinedRuntimeAttributes> </label> <imageView userInteractionEnabled="NO" tag="3" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="radioBtnOff" highlightedImage="radioBtnOn" translatesAutoresizingMaskIntoConstraints="NO" id="IVB-FW-ULI"> - <rect key="frame" x="10" y="40" width="22" height="22"/> + <rect key="frame" x="9.5" y="40" width="22" height="22"/> <constraints> <constraint firstAttribute="height" constant="22" id="rkz-jd-7Vx"/> <constraint firstAttribute="width" constant="22" id="zeP-ls-q95"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="coloring" value="MWMBlue"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="MWMBlue"/> </userDefinedRuntimeAttributes> </imageView> </subviews> @@ -200,7 +193,7 @@ <constraint firstItem="gSE-qV-osv" firstAttribute="top" secondItem="8q8-c5-QBM" secondAttribute="top" constant="12" id="lfH-66-upM"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Background"/> </userDefinedRuntimeAttributes> </view> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="15A-tH-C45" userLabel="Day#5"> @@ -218,17 +211,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="fontName" value="regular17"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular17"/> </userDefinedRuntimeAttributes> </label> <imageView userInteractionEnabled="NO" tag="4" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="radioBtnOff" highlightedImage="radioBtnOn" translatesAutoresizingMaskIntoConstraints="NO" id="WaR-h2-4mE"> - <rect key="frame" x="10" y="40" width="22" height="22"/> + <rect key="frame" x="9.5" y="40" width="22" height="22"/> <constraints> <constraint firstAttribute="width" constant="22" id="2WN-hW-NfA"/> <constraint firstAttribute="height" constant="22" id="paI-VA-gTy"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="coloring" value="MWMBlue"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="MWMBlue"/> </userDefinedRuntimeAttributes> </imageView> </subviews> @@ -245,7 +238,7 @@ <constraint firstAttribute="trailing" secondItem="JHH-2W-e7Q" secondAttribute="trailing" id="ns8-PY-dck"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Background"/> </userDefinedRuntimeAttributes> </view> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Tqf-QU-RCZ" userLabel="Day#6"> @@ -263,17 +256,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="fontName" value="regular17"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular17"/> </userDefinedRuntimeAttributes> </label> <imageView userInteractionEnabled="NO" tag="5" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="radioBtnOff" highlightedImage="radioBtnOn" translatesAutoresizingMaskIntoConstraints="NO" id="Qo3-ii-YnF"> - <rect key="frame" x="10.5" y="40" width="22" height="22"/> + <rect key="frame" x="10" y="40" width="22" height="22"/> <constraints> <constraint firstAttribute="width" constant="22" id="9Ya-Qr-OeU"/> <constraint firstAttribute="height" constant="22" id="jS5-JM-9BC"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="coloring" value="MWMBlue"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="MWMBlue"/> </userDefinedRuntimeAttributes> </imageView> </subviews> @@ -290,7 +283,7 @@ <constraint firstAttribute="trailing" secondItem="Kid-OJ-nOc" secondAttribute="trailing" id="tHe-1w-a4t"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Background"/> </userDefinedRuntimeAttributes> </view> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="lBL-06-25g" userLabel="Day#7"> @@ -308,17 +301,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="fontName" value="regular17"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular17"/> </userDefinedRuntimeAttributes> </label> <imageView userInteractionEnabled="NO" tag="6" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="radioBtnOff" highlightedImage="radioBtnOn" translatesAutoresizingMaskIntoConstraints="NO" id="vIl-li-8uM"> - <rect key="frame" x="10" y="40" width="22" height="22"/> + <rect key="frame" x="9.5" y="40" width="22" height="22"/> <constraints> <constraint firstAttribute="height" constant="22" id="D4F-jl-d8J"/> <constraint firstAttribute="width" constant="22" id="nOA-Kh-nx9"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="coloring" value="MWMBlue"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="MWMBlue"/> </userDefinedRuntimeAttributes> </imageView> </subviews> @@ -335,16 +328,16 @@ <constraint firstItem="l5X-og-86Q" firstAttribute="top" secondItem="lBL-06-25g" secondAttribute="top" id="yir-ep-anV"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Background"/> </userDefinedRuntimeAttributes> </view> <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="separator_image" translatesAutoresizingMaskIntoConstraints="NO" id="i4V-yS-NEg"> - <rect key="frame" x="0.0" y="75" width="320" height="1"/> + <rect key="frame" x="0.0" y="75.5" width="320" height="1"/> <constraints> <constraint firstAttribute="height" constant="1" id="ebA-bw-LdR"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="coloring" value="MWMSeparator"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="MWMSeparator"/> </userDefinedRuntimeAttributes> </imageView> <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="separator_image" translatesAutoresizingMaskIntoConstraints="NO" id="131-Pr-FGS"> @@ -353,7 +346,7 @@ <constraint firstAttribute="height" constant="1" id="qnM-sM-4SM"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="coloring" value="MWMSeparator"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="MWMSeparator"/> </userDefinedRuntimeAttributes> </imageView> </subviews> @@ -394,11 +387,11 @@ <constraint firstAttribute="bottom" secondItem="CCr-vZ-lZV" secondAttribute="bottom" id="zPu-9q-ZMS"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Background"/> </userDefinedRuntimeAttributes> </tableViewCellContentView> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Background"/> </userDefinedRuntimeAttributes> <connections> <outletCollection property="buttons" destination="tQj-bk-oM9" id="pbb-m3-HUd"/> @@ -423,6 +416,7 @@ <outletCollection property="images" destination="Qo3-ii-YnF" id="gtk-HH-8Z7"/> <outletCollection property="images" destination="vIl-li-8uM" id="tE0-YJ-8Rh"/> </connections> + <point key="canvasLocation" x="139" y="155"/> </tableViewCell> </objects> <resources> diff --git a/iphone/Maps/UI/Editor/OpeningHours/Cells/MWMOpeningHoursDeleteScheduleTableViewCell.xib b/iphone/Maps/UI/Editor/OpeningHours/Cells/MWMOpeningHoursDeleteScheduleTableViewCell.xib index c5b5c73d64..1c03f29c98 100644 --- a/iphone/Maps/UI/Editor/OpeningHours/Cells/MWMOpeningHoursDeleteScheduleTableViewCell.xib +++ b/iphone/Maps/UI/Editor/OpeningHours/Cells/MWMOpeningHoursDeleteScheduleTableViewCell.xib @@ -1,26 +1,19 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES"> - <device id="retina4_7" orientation="portrait"> - <adaptation id="fullscreen"/> - </device> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES"> + <device id="retina4_7" orientation="portrait" appearance="light"/> <dependencies> <deployment identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> - <customFonts key="customFonts"> - <array key="HelveticaNeue.ttc"> - <string>HelveticaNeue</string> - </array> - </customFonts> <objects> <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/> <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/> - <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="KGk-i7-Jjw" customClass="MWMOpeningHoursDeleteScheduleTableViewCell" propertyAccessControl="all"> + <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="KGk-i7-Jjw" customClass="MWMOpeningHoursDeleteScheduleTableViewCell" propertyAccessControl="none"> <rect key="frame" x="0.0" y="0.0" width="320" height="44"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM"> - <rect key="frame" x="0.0" y="0.0" width="320" height="43.5"/> + <rect key="frame" x="0.0" y="0.0" width="320" height="44"/> <autoresizingMask key="autoresizingMask"/> <subviews> <button opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="6sA-sN-4Dk"> @@ -31,22 +24,20 @@ <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> </state> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular17"/> - <userDefinedRuntimeAttribute type="string" keyPath="textColorName" value="downloadBadgeBackground"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="FlatRedTransButtonBig"/> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="editor_time_delete"/> - <userDefinedRuntimeAttribute type="string" keyPath="textColorDisabledName" value="blackHintText"/> </userDefinedRuntimeAttributes> <connections> <action selector="deleteScheduleTap" destination="KGk-i7-Jjw" eventType="touchUpInside" id="Wrd-G9-gDM"/> </connections> </button> <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="separator_image" translatesAutoresizingMaskIntoConstraints="NO" id="pwt-wM-TFm"> - <rect key="frame" x="0.0" y="43" width="320" height="1"/> + <rect key="frame" x="0.0" y="43.5" width="320" height="1"/> <constraints> <constraint firstAttribute="height" constant="1" id="uj7-UU-MSZ"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="coloring" value="MWMSeparator"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="MWMSeparator"/> </userDefinedRuntimeAttributes> </imageView> </subviews> @@ -60,12 +51,13 @@ <constraint firstItem="6sA-sN-4Dk" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" id="ywG-MR-eI2"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Background"/> </userDefinedRuntimeAttributes> </tableViewCellContentView> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Background"/> </userDefinedRuntimeAttributes> + <point key="canvasLocation" x="139" y="155"/> </tableViewCell> </objects> <resources> diff --git a/iphone/Maps/UI/Editor/OpeningHours/Cells/MWMOpeningHoursTimeSelectorTableViewCell.xib b/iphone/Maps/UI/Editor/OpeningHours/Cells/MWMOpeningHoursTimeSelectorTableViewCell.xib index 3fde43f081..56679789e0 100644 --- a/iphone/Maps/UI/Editor/OpeningHours/Cells/MWMOpeningHoursTimeSelectorTableViewCell.xib +++ b/iphone/Maps/UI/Editor/OpeningHours/Cells/MWMOpeningHoursTimeSelectorTableViewCell.xib @@ -1,29 +1,23 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES"> - <device id="retina4_7" orientation="portrait"> - <adaptation id="fullscreen"/> - </device> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES"> + <device id="retina4_7" orientation="portrait" appearance="light"/> <dependencies> <deployment identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/> - <capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> <objects> <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/> <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/> - <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" rowHeight="180" id="KGk-i7-Jjw" customClass="MWMOpeningHoursTimeSelectorTableViewCell" propertyAccessControl="all"> + <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" rowHeight="180" id="KGk-i7-Jjw" customClass="MWMOpeningHoursTimeSelectorTableViewCell" propertyAccessControl="none"> <rect key="frame" x="0.0" y="0.0" width="320" height="180"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM"> - <rect key="frame" x="0.0" y="0.0" width="320" height="179.5"/> + <rect key="frame" x="0.0" y="0.0" width="320" height="180"/> <autoresizingMask key="autoresizingMask"/> <subviews> <datePicker contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" datePickerMode="time" minuteInterval="5" translatesAutoresizingMaskIntoConstraints="NO" id="GQP-ns-cE1"> <rect key="frame" x="16" y="0.0" width="128" height="180"/> - <date key="date" timeIntervalSinceReferenceDate="470650837.69387299"> - <!--2015-12-01 08:20:37 +0000--> - </date> <locale key="locale" localeIdentifier="ru"/> <connections> <action selector="openValueChanged" destination="KGk-i7-Jjw" eventType="valueChanged" id="abn-DQ-iYH"/> @@ -31,16 +25,13 @@ </datePicker> <datePicker contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" datePickerMode="time" minuteInterval="5" translatesAutoresizingMaskIntoConstraints="NO" id="w7f-Rh-vzg"> <rect key="frame" x="176" y="0.0" width="128" height="180"/> - <date key="date" timeIntervalSinceReferenceDate="470650837.69387299"> - <!--2015-12-01 08:20:37 +0000--> - </date> <locale key="locale" localeIdentifier="ru"/> <connections> <action selector="closeValueChanged" destination="KGk-i7-Jjw" eventType="valueChanged" id="dwu-wx-oRQ"/> </connections> </datePicker> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text=":" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="8" translatesAutoresizingMaskIntoConstraints="NO" id="6b2-fN-HrU"> - <rect key="frame" x="72" y="80" width="8" height="21"/> + <rect key="frame" x="72" y="79.5" width="8" height="21"/> <constraints> <constraint firstAttribute="height" constant="21" id="CFL-td-w0X"/> <constraint firstAttribute="width" constant="8" id="YVE-JC-Z8n"/> @@ -50,7 +41,7 @@ <nil key="highlightedColor"/> </label> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="—" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="24" translatesAutoresizingMaskIntoConstraints="NO" id="ArA-iX-w8F"> - <rect key="frame" x="148" y="80" width="24" height="21"/> + <rect key="frame" x="148" y="79.5" width="24" height="21"/> <constraints> <constraint firstAttribute="width" constant="24" id="CeN-3u-tRz"/> <constraint firstAttribute="height" constant="21" id="oBr-Rr-mKP"/> @@ -60,7 +51,7 @@ <nil key="highlightedColor"/> </label> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text=":" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="8" translatesAutoresizingMaskIntoConstraints="NO" id="MQr-gL-ImO"> - <rect key="frame" x="232" y="80" width="8" height="21"/> + <rect key="frame" x="232" y="79.5" width="8" height="21"/> <constraints> <constraint firstAttribute="width" constant="8" id="KIB-6H-1UD"/> <constraint firstAttribute="height" constant="21" id="Xad-ok-Mz7"/> @@ -70,12 +61,12 @@ <nil key="highlightedColor"/> </label> <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="separator_image" translatesAutoresizingMaskIntoConstraints="NO" id="rOS-aO-0gb"> - <rect key="frame" x="0.0" y="179" width="320" height="1"/> + <rect key="frame" x="0.0" y="179.5" width="320" height="1"/> <constraints> <constraint firstAttribute="height" constant="1" id="etc-9t-7gU"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="coloring" value="MWMSeparator"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="MWMSeparator"/> </userDefinedRuntimeAttributes> </imageView> </subviews> @@ -99,16 +90,17 @@ <constraint firstItem="ArA-iX-w8F" firstAttribute="centerY" secondItem="H2p-sc-9uM" secondAttribute="centerY" id="zKO-lN-XyI"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="blackDividers"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Divider"/> </userDefinedRuntimeAttributes> </tableViewCellContentView> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Background"/> </userDefinedRuntimeAttributes> <connections> <outlet property="closeTimePicker" destination="w7f-Rh-vzg" id="jdP-dK-pwF"/> <outlet property="openTimePicker" destination="GQP-ns-cE1" id="qnP-We-WvA"/> </connections> + <point key="canvasLocation" x="139" y="155"/> </tableViewCell> </objects> <resources> diff --git a/iphone/Maps/UI/Editor/OpeningHours/Cells/MWMOpeningHoursTimeSpanTableViewCell.xib b/iphone/Maps/UI/Editor/OpeningHours/Cells/MWMOpeningHoursTimeSpanTableViewCell.xib index 31caff6f36..f71aa3a734 100644 --- a/iphone/Maps/UI/Editor/OpeningHours/Cells/MWMOpeningHoursTimeSpanTableViewCell.xib +++ b/iphone/Maps/UI/Editor/OpeningHours/Cells/MWMOpeningHoursTimeSpanTableViewCell.xib @@ -1,87 +1,76 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES"> - <device id="retina4_7" orientation="portrait"> - <adaptation id="fullscreen"/> - </device> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES"> + <device id="retina4_7" orientation="portrait" appearance="light"/> <dependencies> <deployment identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> - <customFonts key="customFonts"> - <array key="HelveticaNeue.ttc"> - <string>HelveticaNeue</string> - </array> - </customFonts> <objects> <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/> <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/> - <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" rowHeight="64" id="KGk-i7-Jjw" customClass="MWMOpeningHoursTimeSpanTableViewCell" propertyAccessControl="all"> + <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" rowHeight="64" id="KGk-i7-Jjw" customClass="MWMOpeningHoursTimeSpanTableViewCell" propertyAccessControl="none"> <rect key="frame" x="0.0" y="0.0" width="320" height="64"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM"> - <rect key="frame" x="0.0" y="0.0" width="320" height="63.5"/> + <rect key="frame" x="0.0" y="0.0" width="320" height="64"/> <autoresizingMask key="autoresizingMask"/> <subviews> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Open time" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="128" translatesAutoresizingMaskIntoConstraints="NO" id="CgC-lU-buo"> - <rect key="frame" x="16" y="12" width="131" height="16"/> + <rect key="frame" x="16" y="12" width="131.5" height="16"/> <fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="14"/> <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="fontName" value="regular14"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular14:blackPrimaryText"/> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="editor_time_open"/> </userDefinedRuntimeAttributes> </label> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="8:00" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="128" translatesAutoresizingMaskIntoConstraints="NO" id="CuG-0G-4pB"> - <rect key="frame" x="16" y="32" width="131" height="17"/> + <rect key="frame" x="16" y="32" width="131.5" height="17"/> <fontDescription key="fontDescription" type="system" pointSize="14"/> <color key="textColor" red="0.1176470588" green="0.58823529409999997" blue="0.94117647059999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <nil key="highlightedColor"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular17"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="linkBlue"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular17:linkBlueText"/> </userDefinedRuntimeAttributes> </label> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="oux-nC-xpk" userLabel="VerticalSeparator"> - <rect key="frame" x="159" y="0.0" width="1" height="64"/> + <rect key="frame" x="159.5" y="0.0" width="1" height="64"/> <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.12" colorSpace="custom" customColorSpace="sRGB"/> <constraints> <constraint firstAttribute="width" constant="1" id="1m4-5Q-ym8"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="blackDividers"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Divider"/> </userDefinedRuntimeAttributes> </view> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Close time" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="127" translatesAutoresizingMaskIntoConstraints="NO" id="cGX-Q7-Ddh"> - <rect key="frame" x="176" y="12" width="128" height="16"/> + <rect key="frame" x="176.5" y="12" width="127.5" height="16"/> <fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="14"/> <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="fontName" value="regular14"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular14:blackPrimaryText"/> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="editor_time_close"/> </userDefinedRuntimeAttributes> </label> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="20:30" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="127" translatesAutoresizingMaskIntoConstraints="NO" id="o59-Hp-LIf"> - <rect key="frame" x="176" y="32" width="128" height="17"/> + <rect key="frame" x="176.5" y="32" width="127.5" height="17"/> <fontDescription key="fontDescription" type="system" pointSize="14"/> <color key="textColor" red="0.0" green="0.47843137250000001" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <nil key="highlightedColor"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular17"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="linkBlue"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular17:linkBlueText"/> </userDefinedRuntimeAttributes> </label> <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="separator_image" translatesAutoresizingMaskIntoConstraints="NO" id="qsf-WG-QJW"> - <rect key="frame" x="0.0" y="63" width="320" height="1"/> + <rect key="frame" x="0.0" y="63.5" width="320" height="1"/> <constraints> <constraint firstAttribute="height" constant="1" id="Pfd-8E-gxy"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="coloring" value="MWMSeparator"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="MWMSeparator"/> </userDefinedRuntimeAttributes> </imageView> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="jNP-mE-elz" userLabel="Expand Button"> @@ -117,16 +106,17 @@ <constraint firstItem="cGX-Q7-Ddh" firstAttribute="leading" secondItem="oux-nC-xpk" secondAttribute="trailing" constant="16" id="xCE-ly-lub"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Background"/> </userDefinedRuntimeAttributes> </tableViewCellContentView> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Background"/> </userDefinedRuntimeAttributes> <connections> <outlet property="closeTimeLabel" destination="o59-Hp-LIf" id="U3D-MI-UR4"/> <outlet property="openTimeLabel" destination="CuG-0G-4pB" id="aDq-t8-Eag"/> </connections> + <point key="canvasLocation" x="139" y="155"/> </tableViewCell> </objects> <resources> diff --git a/iphone/Maps/UI/Editor/Street/MWMStreetEditorEditTableViewCell.xib b/iphone/Maps/UI/Editor/Street/MWMStreetEditorEditTableViewCell.xib index 6db7c6ec0c..05aea81e83 100644 --- a/iphone/Maps/UI/Editor/Street/MWMStreetEditorEditTableViewCell.xib +++ b/iphone/Maps/UI/Editor/Street/MWMStreetEditorEditTableViewCell.xib @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14868" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES"> - <device id="retina4_7" orientation="portrait" appearance="light"/> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES"> + <device id="retina6_1" orientation="portrait" appearance="light"/> <dependencies> <deployment identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14824"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> <objects> @@ -24,8 +24,7 @@ <fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="17"/> <textInputTraits key="textInputTraits"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular17"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular17:blackPrimaryText"/> <userDefinedRuntimeAttribute type="string" keyPath="validatorName" value="MWMInputValidator"/> <userDefinedRuntimeAttribute type="string" keyPath="localizedPlaceholder" value="add_street"/> </userDefinedRuntimeAttributes> @@ -41,11 +40,11 @@ <constraint firstItem="8Pj-WT-J59" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" constant="12" id="wRV-57-6CZ"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Background"/> </userDefinedRuntimeAttributes> </tableViewCellContentView> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Background"/> </userDefinedRuntimeAttributes> <connections> <outlet property="textField" destination="8Pj-WT-J59" id="lqN-IV-C5E"/> diff --git a/iphone/Maps/UI/PlacePage/PlacePageLayout/ActionBar/MWMActionBarButton.xib b/iphone/Maps/UI/PlacePage/PlacePageLayout/ActionBar/MWMActionBarButton.xib index 1520182b84..02de9d7717 100644 --- a/iphone/Maps/UI/PlacePage/PlacePageLayout/ActionBar/MWMActionBarButton.xib +++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/ActionBar/MWMActionBarButton.xib @@ -1,15 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES"> - <device id="retina4_7" orientation="portrait" appearance="light"/> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES"> + <device id="retina6_1" orientation="portrait" appearance="light"/> <dependencies> <deployment identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15510"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> <objects> <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="MWMActionBarButton"/> <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/> - <view contentMode="scaleToFill" id="iN0-l3-epB" customClass="MWMActionBarButton"> + <view contentMode="scaleToFill" id="iN0-l3-epB" customClass="MWMActionBarButton" propertyAccessControl="none"> <rect key="frame" x="0.0" y="0.0" width="80" height="48"/> <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/> <subviews> @@ -20,7 +20,7 @@ <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="W07-Hz-J60" customClass="MWMButton"> <rect key="frame" x="0.0" y="2" width="80" height="33"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="coloringName" value="MWMBlack"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="MWMBlack"/> </userDefinedRuntimeAttributes> <connections> <action selector="tap" destination="iN0-l3-epB" eventType="touchUpInside" id="yKY-7K-Wyl"/> @@ -35,8 +35,7 @@ <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="blackSecondaryText"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular10"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular10:blackSecondaryText"/> </userDefinedRuntimeAttributes> </label> </subviews> @@ -61,7 +60,7 @@ <outlet property="extraBackground" destination="R50-Tj-X0W" id="c90-1d-BSU"/> <outlet property="label" destination="rrI-0A-w3s" id="LMD-pz-agZ"/> </connections> - <point key="canvasLocation" x="139" y="124"/> + <point key="canvasLocation" x="139" y="154"/> </view> </objects> </document> diff --git a/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/BookingCells/FacilityCell.xib b/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/BookingCells/FacilityCell.xib index f84647125c..a647c32932 100644 --- a/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/BookingCells/FacilityCell.xib +++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/BookingCells/FacilityCell.xib @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES"> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES"> <device id="retina4_7" orientation="portrait" appearance="light"/> <dependencies> <deployment identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15510"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> <objects> @@ -22,8 +22,7 @@ <nil key="textColor"/> <nil key="highlightedColor"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular16"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular16:blackPrimaryText"/> </userDefinedRuntimeAttributes> </label> </subviews> diff --git a/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/OpeningHoursCell/MWMPlacePageOpeningHoursCell.mm b/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/OpeningHoursCell/MWMPlacePageOpeningHoursCell.mm index ac0da220b4..683dd52554 100644 --- a/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/OpeningHoursCell/MWMPlacePageOpeningHoursCell.mm +++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/OpeningHoursCell/MWMPlacePageOpeningHoursCell.mm @@ -2,7 +2,7 @@ #import <CoreApi/MWMCommon.h> #import <CoreApi/MWMOpeningHoursCommon.h> #import "MWMPlacePageOpeningHoursDayView.h" -#import "UIImageView+Coloring.h" +#import "SwiftBridge.h" #include "editor/ui2oh.hpp" @@ -71,7 +71,7 @@ WeekDayView getWeekDayView() self.toggleButton.hidden = !delegate.forcedButton; self.expandImage.hidden = !delegate.forcedButton; self.expandImage.image = [UIImage imageNamed:@"ic_arrow_gray_right"]; - self.expandImage.mwm_coloring = MWMImageColoringGray; + self.expandImage.styleName = @"MWMGray"; if (isInterfaceRightToLeft()) self.expandImage.transform = CGAffineTransformMakeScale(-1, 1); NSAssert(info, @"Schedule can not be empty"); @@ -133,7 +133,7 @@ WeekDayView getWeekDayView() else self.expandImage.image = [UIImage imageNamed:@"ic_arrow_gray_down"]; - self.expandImage.mwm_coloring = MWMImageColoringGray; + self.expandImage.styleName = @"MWMGray"; if (isInterfaceRightToLeft()) self.expandImage.transform = CGAffineTransformMakeScale(-1, 1); diff --git a/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/OpeningHoursCell/MWMPlacePageOpeningHoursCell.xib b/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/OpeningHoursCell/MWMPlacePageOpeningHoursCell.xib index 615a15a87e..1d2148236a 100644 --- a/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/OpeningHoursCell/MWMPlacePageOpeningHoursCell.xib +++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/OpeningHoursCell/MWMPlacePageOpeningHoursCell.xib @@ -1,39 +1,31 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES"> - <device id="retina4_7" orientation="portrait"> - <adaptation id="fullscreen"/> - </device> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES"> + <device id="retina4_7" orientation="portrait" appearance="light"/> <dependencies> <deployment identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> - <customFonts key="customFonts"> - <array key="HelveticaNeue.ttc"> - <string>HelveticaNeue</string> - </array> - </customFonts> <objects> <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/> <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/> - <tableViewCell contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" id="KGk-i7-Jjw" customClass="MWMPlacePageOpeningHoursCell" propertyAccessControl="all"> + <tableViewCell contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" id="KGk-i7-Jjw" customClass="MWMPlacePageOpeningHoursCell" propertyAccessControl="none"> <rect key="frame" x="0.0" y="0.0" width="320" height="249"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM"> - <rect key="frame" x="0.0" y="0.0" width="320" height="248.5"/> + <rect key="frame" x="0.0" y="0.0" width="320" height="249"/> <autoresizingMask key="autoresizingMask"/> <subviews> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="swk-um-XzG" customClass="MWMPlacePageOpeningHoursDayView"> <rect key="frame" x="0.0" y="0.0" width="320" height="126"/> <subviews> <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Mo-Su 11:00-24:00" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="228" translatesAutoresizingMaskIntoConstraints="NO" id="ZdV-4y-cz4"> - <rect key="frame" x="60" y="54" width="228" height="19"/> + <rect key="frame" x="60" y="53.5" width="228" height="19"/> <fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="16"/> <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="fontName" value="regular16"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular16:blackPrimaryText"/> </userDefinedRuntimeAttributes> </label> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="300" text="Сегодня" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="14" preferredMaxLayoutWidth="68" translatesAutoresizingMaskIntoConstraints="NO" id="Ot5-QJ-jhp"> @@ -46,8 +38,7 @@ <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="fontName" value="regular16"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular16:blackPrimaryText"/> </userDefinedRuntimeAttributes> </label> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="10:00—20:00" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="140" translatesAutoresizingMaskIntoConstraints="NO" id="oTF-IZ-Un1"> @@ -59,8 +50,7 @@ <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="regular16"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular16:blackPrimaryText"/> </userDefinedRuntimeAttributes> </label> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Перерыв" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="94" translatesAutoresizingMaskIntoConstraints="NO" id="hpw-oR-ZSb"> @@ -72,8 +62,7 @@ <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="blackSecondaryText"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular14"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular14:blackSecondaryText"/> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="editor_hours_closed"/> </userDefinedRuntimeAttributes> </label> @@ -93,7 +82,7 @@ <color key="textColor" red="1" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <nil key="highlightedColor"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="red"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="redText"/> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="closed_now"/> </userDefinedRuntimeAttributes> </label> @@ -104,7 +93,7 @@ <constraint firstAttribute="height" constant="24" id="OJ4-4J-1uv"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="coloring" value="MWMGray"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="MWMGray"/> </userDefinedRuntimeAttributes> </imageView> <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="ic_placepage_open_hours" translatesAutoresizingMaskIntoConstraints="NO" id="pa0-fe-w8W"> @@ -114,7 +103,7 @@ <constraint firstAttribute="height" constant="28" id="gd5-OU-PDF"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="coloring" value="MWMBlack"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="MWMBlack"/> </userDefinedRuntimeAttributes> </imageView> <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="3Fa-V6-tC5" userLabel="Toggle Button"> @@ -177,7 +166,7 @@ <constraint firstAttribute="height" constant="1" id="5lV-kq-jGM"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="coloring" value="MWMSeparator"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="MWMSeparator"/> </userDefinedRuntimeAttributes> </imageView> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="fNU-1q-AiR"> @@ -200,13 +189,10 @@ <constraint firstAttribute="trailing" secondItem="swk-um-XzG" secondAttribute="trailing" id="zir-No-59Q"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Background"/> </userDefinedRuntimeAttributes> </tableViewCellContentView> <inset key="separatorInset" minX="60" minY="0.0" maxX="0.0" maxY="0.0"/> - <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="red"/> - </userDefinedRuntimeAttributes> <connections> <outlet property="currentDay" destination="swk-um-XzG" id="CJG-LQ-Pu8"/> <outlet property="expandImage" destination="mGc-k4-uvQ" id="ohq-Yq-hLX"/> @@ -218,6 +204,7 @@ <outlet property="weekDaysView" destination="fNU-1q-AiR" id="zM3-OD-vBA"/> <outlet property="weekDaysViewHeight" destination="Ifb-EB-LIb" id="sEe-Y1-ubY"/> </connections> + <point key="canvasLocation" x="139" y="155"/> </tableViewCell> </objects> <resources> diff --git a/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/OpeningHoursCell/MWMPlacePageOpeningHoursDayView.m b/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/OpeningHoursCell/MWMPlacePageOpeningHoursDayView.m index 9bdb7f2636..c99d480127 100644 --- a/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/OpeningHoursCell/MWMPlacePageOpeningHoursDayView.m +++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/OpeningHoursCell/MWMPlacePageOpeningHoursDayView.m @@ -1,4 +1,5 @@ #import "MWMPlacePageOpeningHoursDayView.h" +#import "SwiftBridge.h" @interface MWMPlacePageOpeningHoursDayView () @@ -28,11 +29,11 @@ UILabel * label = self.label; label.text = text; if (isRed) - label.textColor = [UIColor red]; + [label setStyleAndApply:@"redText"]; else if (self.currentDay) - label.textColor = [UIColor blackPrimaryText]; + [label setStyleAndApply:@"blackPrimaryText"]; else - label.textColor = [UIColor blackSecondaryText]; + [label setStyleAndApply:@"blackSecondaryText"]; } - (void)setOpenTimeText:(NSString *)text diff --git a/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/OpeningHoursCell/MWMPlacePageOpeningHoursWeekDayView.xib b/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/OpeningHoursCell/MWMPlacePageOpeningHoursWeekDayView.xib index fd251ebe1a..0e89a6436e 100644 --- a/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/OpeningHoursCell/MWMPlacePageOpeningHoursWeekDayView.xib +++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/OpeningHoursCell/MWMPlacePageOpeningHoursWeekDayView.xib @@ -1,27 +1,20 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES"> - <device id="retina4_7" orientation="portrait"> - <adaptation id="fullscreen"/> - </device> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES"> + <device id="retina4_7" orientation="portrait" appearance="light"/> <dependencies> <deployment identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> - <customFonts key="customFonts"> - <array key="HelveticaNeue.ttc"> - <string>HelveticaNeue</string> - </array> - </customFonts> <objects> <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/> <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/> - <view contentMode="scaleToFill" id="SUx-BN-Qk1" customClass="MWMPlacePageOpeningHoursDayView" propertyAccessControl="all"> + <view contentMode="scaleToFill" id="SUx-BN-Qk1" customClass="MWMPlacePageOpeningHoursDayView" propertyAccessControl="none"> <rect key="frame" x="0.0" y="0.0" width="375" height="102"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <subviews> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Пн-Пт" textAlignment="natural" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="68" translatesAutoresizingMaskIntoConstraints="NO" id="DqS-ds-oj4"> - <rect key="frame" x="60" y="4" width="68" height="17"/> + <rect key="frame" x="60" y="4" width="68" height="16.5"/> <constraints> <constraint firstAttribute="width" relation="greaterThanOrEqual" priority="750" constant="68" id="TSk-hp-vXl"/> </constraints> @@ -29,12 +22,11 @@ <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="blackSecondaryText"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular14"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular14:blackSecondaryText"/> </userDefinedRuntimeAttributes> </label> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="10:00—20:00" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="180" translatesAutoresizingMaskIntoConstraints="NO" id="Pzb-84-nVN"> - <rect key="frame" x="136" y="4" width="100" height="16"/> + <rect key="frame" x="136" y="4.5" width="100" height="16"/> <constraints> <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="100" id="HSs-ZO-QYt"/> </constraints> @@ -42,12 +34,11 @@ <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="blackSecondaryText"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular14"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular14:blackSecondaryText"/> </userDefinedRuntimeAttributes> </label> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Перерыв" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="68" translatesAutoresizingMaskIntoConstraints="NO" id="LY3-Eu-ESE"> - <rect key="frame" x="60" y="25" width="68" height="14"/> + <rect key="frame" x="60" y="24.5" width="68" height="14"/> <constraints> <constraint firstAttribute="width" relation="greaterThanOrEqual" priority="750" constant="68" id="zcl-0l-OMI"/> </constraints> @@ -55,13 +46,12 @@ <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="blackSecondaryText"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular12"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular12:blackSecondaryText"/> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="editor_hours_closed"/> </userDefinedRuntimeAttributes> </label> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="skl-yW-xDB"> - <rect key="frame" x="136" y="25" width="100" height="58"/> + <rect key="frame" x="136" y="24.5" width="100" height="58"/> <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/> <constraints> <constraint firstAttribute="height" constant="58" id="JQd-xS-lP1"/> diff --git a/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/OpeningHoursCell/_MWMOHHeaderCell.xib b/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/OpeningHoursCell/_MWMOHHeaderCell.xib index b7e3394ccd..a8f4a76a72 100644 --- a/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/OpeningHoursCell/_MWMOHHeaderCell.xib +++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/OpeningHoursCell/_MWMOHHeaderCell.xib @@ -1,21 +1,19 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" colorMatched="YES"> - <device id="retina4_7" orientation="portrait"> - <adaptation id="fullscreen"/> - </device> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" colorMatched="YES"> + <device id="retina4_7" orientation="portrait" appearance="light"/> <dependencies> <deployment identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> <objects> <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/> <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/> - <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="_MWMOHHeaderCell" id="LXG-cP-akO" customClass="_MWMOHHeaderCell" propertyAccessControl="all"> + <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="_MWMOHHeaderCell" id="LXG-cP-akO" customClass="_MWMOHHeaderCell" propertyAccessControl="none"> <rect key="frame" x="0.0" y="0.0" width="375" height="48"/> <autoresizingMask key="autoresizingMask"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="LXG-cP-akO" id="WuT-dc-opP"> - <rect key="frame" x="0.0" y="0.0" width="375" height="47.5"/> + <rect key="frame" x="0.0" y="0.0" width="375" height="48"/> <autoresizingMask key="autoresizingMask"/> <subviews> <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="ic_placepage_open_hours" translatesAutoresizingMaskIntoConstraints="NO" id="nwH-Nj-buF"> @@ -25,11 +23,11 @@ <constraint firstAttribute="width" constant="24" id="RuT-UD-d6E"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="coloring" value="MWMBlack"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="MWMBlack"/> </userDefinedRuntimeAttributes> </imageView> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Сегодня 8:00 – 18:00" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="qDh-SU-MHG" userLabel="Text"> - <rect key="frame" x="60" y="14" width="271" height="19.5"/> + <rect key="frame" x="60" y="14" width="271" height="20"/> <fontDescription key="fontDescription" type="system" pointSize="17"/> <nil key="textColor"/> <nil key="highlightedColor"/> @@ -41,11 +39,11 @@ <constraint firstAttribute="width" constant="28" id="qap-Cz-ia0"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="coloring" value="MWMBlack"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="MWMBlack"/> </userDefinedRuntimeAttributes> </imageView> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Mvv-gY-euE"> - <rect key="frame" x="0.0" y="0.0" width="375" height="47.5"/> + <rect key="frame" x="0.0" y="0.0" width="375" height="48"/> <connections> <action selector="extendTap" destination="LXG-cP-akO" eventType="touchUpInside" id="yMy-04-GCs"/> </connections> @@ -72,7 +70,7 @@ <outlet property="arrowIcon" destination="VHY-FB-giE" id="j5m-f3-Wv6"/> <outlet property="text" destination="qDh-SU-MHG" id="OTq-0N-S6b"/> </connections> - <point key="canvasLocation" x="45.5" y="43"/> + <point key="canvasLocation" x="65.94202898550725" y="28.794642857142854"/> </tableViewCell> </objects> <resources> diff --git a/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/OpeningHoursCell/_MWMOHSubCell.xib b/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/OpeningHoursCell/_MWMOHSubCell.xib index b24c67b9bd..3add5f312e 100644 --- a/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/OpeningHoursCell/_MWMOHSubCell.xib +++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/OpeningHoursCell/_MWMOHSubCell.xib @@ -1,21 +1,19 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" colorMatched="YES"> - <device id="retina4_7" orientation="portrait"> - <adaptation id="fullscreen"/> - </device> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" colorMatched="YES"> + <device id="retina4_7" orientation="portrait" appearance="light"/> <dependencies> <deployment identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> <objects> <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/> <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/> - <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="_MWMOHSubCell" id="QJs-zE-xfN" customClass="_MWMOHSubCell" propertyAccessControl="all"> + <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="_MWMOHSubCell" id="QJs-zE-xfN" customClass="_MWMOHSubCell" propertyAccessControl="none"> <rect key="frame" x="0.0" y="0.0" width="375" height="75"/> <autoresizingMask key="autoresizingMask"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="QJs-zE-xfN" id="n1O-q5-zmj"> - <rect key="frame" x="0.0" y="0.0" width="375" height="74.5"/> + <rect key="frame" x="0.0" y="0.0" width="375" height="75"/> <autoresizingMask key="autoresizingMask"/> <subviews> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="248" verticalHuggingPriority="251" text="Sun-Wed, Fri-Sat" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="YIs-LL-j77" userLabel="Days"> @@ -24,8 +22,7 @@ <nil key="textColor"/> <nil key="highlightedColor"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular15"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular15:blackPrimaryText"/> </userDefinedRuntimeAttributes> </label> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="All Day (24 hours)" textAlignment="right" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="vjg-UU-FVu" userLabel="Schedule"> @@ -34,18 +31,16 @@ <nil key="textColor"/> <nil key="highlightedColor"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular15"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular15:blackPrimaryText"/> </userDefinedRuntimeAttributes> </label> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Перерыв 12:00 – 13:00" textAlignment="right" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="iYw-fc-mKi"> - <rect key="frame" x="60" y="38.5" width="299" height="21"/> + <rect key="frame" x="60" y="38.5" width="299" height="21.5"/> <fontDescription key="fontDescription" type="system" pointSize="17"/> <nil key="textColor"/> <nil key="highlightedColor"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular13"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackSecondaryText"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular13:blackSecondaryText"/> </userDefinedRuntimeAttributes> </label> </subviews> @@ -67,7 +62,7 @@ <outlet property="days" destination="YIs-LL-j77" id="dqM-WD-2NN"/> <outlet property="schedule" destination="vjg-UU-FVu" id="Xdv-dH-NPZ"/> </connections> - <point key="canvasLocation" x="-66.5" y="24.5"/> + <point key="canvasLocation" x="-96.376811594202906" y="16.40625"/> </tableViewCell> </objects> </document> diff --git a/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/UGC/UGCAddReview/UGCAddReviewRatingCell.swift b/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/UGC/UGCAddReview/UGCAddReviewRatingCell.swift index 934281d937..0b5481b7c1 100644 --- a/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/UGC/UGCAddReview/UGCAddReviewRatingCell.swift +++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/UGC/UGCAddReview/UGCAddReviewRatingCell.swift @@ -1,15 +1,7 @@ final class UGCAddReviewRatingCell: MWMTableViewCell { - @IBOutlet weak var titleLabel: UILabel! { - didSet { - titleLabel.font = UIFont.regular16() - titleLabel.textColor = UIColor.blackPrimaryText() - } - } - + @IBOutlet weak var titleLabel: UILabel! @IBOutlet weak var ratingView: RatingView! { didSet { - ratingView.filledColor = UIColor.ratingYellow() - ratingView.emptyColor = UIColor.blackDividers() ratingView.borderWidth = 0 ratingView.delegate = self } diff --git a/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/UGC/UGCAddReview/UGCAddReviewRatingCell.xib b/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/UGC/UGCAddReview/UGCAddReviewRatingCell.xib index cea550a767..2eca081bff 100644 --- a/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/UGC/UGCAddReview/UGCAddReviewRatingCell.xib +++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/UGC/UGCAddReview/UGCAddReviewRatingCell.xib @@ -1,28 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES"> - <device id="retina4_7" orientation="portrait"> - <adaptation id="fullscreen"/> - </device> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES"> + <device id="retina4_7" orientation="portrait" appearance="light"/> <dependencies> <deployment identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> <objects> <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/> <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/> - <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="KGk-i7-Jjw" customClass="UGCAddReviewRatingCell" customModule="maps_me" customModuleProvider="target" propertyAccessControl="all"> + <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="KGk-i7-Jjw" customClass="UGCAddReviewRatingCell" customModule="maps_me" customModuleProvider="target" propertyAccessControl="none"> <rect key="frame" x="0.0" y="0.0" width="320" height="44"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM"> - <rect key="frame" x="0.0" y="0.0" width="320" height="43.5"/> + <rect key="frame" x="0.0" y="0.0" width="320" height="44"/> <autoresizingMask key="autoresizingMask"/> <subviews> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ZYO-sw-mr0"> - <rect key="frame" x="16" y="14" width="42" height="15.5"/> + <rect key="frame" x="16" y="14" width="42" height="16"/> <fontDescription key="fontDescription" type="system" pointSize="17"/> <nil key="textColor"/> <nil key="highlightedColor"/> + <userDefinedRuntimeAttributes> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular16:blackPrimaryText"/> + </userDefinedRuntimeAttributes> </label> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="FRG-q1-pKr" customClass="RatingView" customModule="maps_me" customModuleProvider="target"> <rect key="frame" x="172" y="10" width="132" height="24"/> @@ -50,6 +51,7 @@ <outlet property="ratingView" destination="FRG-q1-pKr" id="JeO-LW-1So"/> <outlet property="titleLabel" destination="ZYO-sw-mr0" id="HPm-he-K6V"/> </connections> + <point key="canvasLocation" x="139" y="154"/> </tableViewCell> </objects> </document> diff --git a/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/UGC/UGCReviewCell.swift b/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/UGC/UGCReviewCell.swift index b4776b6c0f..5fcdf71d89 100644 --- a/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/UGC/UGCReviewCell.swift +++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/UGC/UGCReviewCell.swift @@ -1,27 +1,8 @@ @objc(MWMUGCReviewCell) final class UGCReviewCell: MWMTableViewCell { - @IBOutlet private weak var titleLabel: UILabel! { - didSet { - titleLabel.font = UIFont.bold14() - titleLabel.textColor = UIColor.blackPrimaryText() - } - } - - @IBOutlet private weak var dateLabel: UILabel! { - didSet { - dateLabel.font = UIFont.regular12() - dateLabel.textColor = UIColor.blackSecondaryText() - } - } - - @IBOutlet private weak var ratingView: RatingSummaryView! { - didSet { - ratingView.defaultConfig() - ratingView.textFont = UIFont.bold16() - ratingView.textSize = 16 - } - } - + @IBOutlet private weak var titleLabel: UILabel! + @IBOutlet private weak var dateLabel: UILabel! + @IBOutlet private weak var ratingView: RatingSummaryView! @IBOutlet private weak var reviewLabel: ExpandableReviewView! { didSet { let settings = ExpandableReviewSettings(expandText: L("placepage_more_button"), diff --git a/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/UGC/UGCReviewCell.xib b/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/UGC/UGCReviewCell.xib index 75b15b8ef5..612fc82113 100644 --- a/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/UGC/UGCReviewCell.xib +++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/UGC/UGCReviewCell.xib @@ -1,37 +1,41 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES"> - <device id="retina4_7" orientation="portrait"> - <adaptation id="fullscreen"/> - </device> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15705" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES"> + <device id="retina4_7" orientation="portrait" appearance="light"/> <dependencies> <deployment identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14460.20"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15706"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> <objects> <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/> <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/> - <tableViewCell contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="UGCReviewCell" id="KGk-i7-Jjw" customClass="MWMUGCReviewCell" propertyAccessControl="all"> + <tableViewCell contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="UGCReviewCell" id="KGk-i7-Jjw" customClass="MWMUGCReviewCell" propertyAccessControl="none"> <rect key="frame" x="0.0" y="0.0" width="320" height="135"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM"> - <rect key="frame" x="0.0" y="0.0" width="320" height="134.5"/> + <rect key="frame" x="0.0" y="0.0" width="320" height="135"/> <autoresizingMask key="autoresizingMask"/> <subviews> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="sVT-L4-Mlw"> - <rect key="frame" x="0.0" y="-1" width="320" height="135"/> + <rect key="frame" x="0.0" y="-1" width="320" height="135.5"/> <subviews> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="252" verticalCompressionResistancePriority="751" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="3PE-rI-3N0"> <rect key="frame" x="16" y="16" width="42" height="20.5"/> <fontDescription key="fontDescription" type="system" pointSize="17"/> <nil key="textColor"/> <nil key="highlightedColor"/> + <userDefinedRuntimeAttributes> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="bold14:blackPrimaryText"/> + </userDefinedRuntimeAttributes> </label> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="252" verticalCompressionResistancePriority="751" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="CfZ-eF-OFu"> <rect key="frame" x="16" y="40.5" width="42" height="21"/> <fontDescription key="fontDescription" type="system" pointSize="17"/> <nil key="textColor"/> <nil key="highlightedColor"/> + <userDefinedRuntimeAttributes> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular12:blackSecondaryText"/> + </userDefinedRuntimeAttributes> </label> <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="yfk-2d-jIs" customClass="RatingSummaryView" customModule="maps_me" customModuleProvider="target"> <rect key="frame" x="256" y="16" width="48" height="20"/> @@ -40,19 +44,22 @@ <constraint firstAttribute="height" constant="20" placeholder="YES" id="GCB-u9-ND9"/> <constraint firstAttribute="width" constant="48" placeholder="YES" id="TVO-Dx-h45"/> </constraints> + <userDefinedRuntimeAttributes> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="RatingSummaryView24"/> + </userDefinedRuntimeAttributes> </view> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="762-NT-BKz" customClass="ExpandableReviewView" customModule="maps_me" customModuleProvider="target"> - <rect key="frame" x="16" y="77.5" width="288" height="40.5"/> + <rect key="frame" x="16" y="77.5" width="288" height="41"/> <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> </view> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="d1v-ce-wSZ"> - <rect key="frame" x="0.0" y="134" width="320" height="1"/> + <rect key="frame" x="0.0" y="134.5" width="320" height="1"/> <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> <constraints> <constraint firstAttribute="height" constant="1" id="juL-ad-Qhb"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="blackDividers"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Divider"/> </userDefinedRuntimeAttributes> </view> </subviews> @@ -87,6 +94,7 @@ <outlet property="reviewLabel" destination="762-NT-BKz" id="sqO-tb-UuV"/> <outlet property="titleLabel" destination="3PE-rI-3N0" id="YqB-6N-buv"/> </connections> + <point key="canvasLocation" x="141" y="155"/> </tableViewCell> </objects> </document> diff --git a/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/UGC/UGCSummaryRatingCell.swift b/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/UGC/UGCSummaryRatingCell.swift index c976c4c69d..7f4a268217 100644 --- a/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/UGC/UGCSummaryRatingCell.swift +++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/UGC/UGCSummaryRatingCell.swift @@ -1,32 +1,8 @@ @objc(MWMUGCSummaryRatingCell) final class UGCSummaryRatingCell: MWMTableViewCell { - @IBOutlet private weak var titleLabel: UILabel! { - didSet { - titleLabel.font = UIFont.bold22() - titleLabel.textColor = UIColor.blackPrimaryText() - titleLabel.text = L("placepage_summary_rating") - } - } - - @IBOutlet private weak var countLabel: UILabel! { - didSet { - countLabel.font = UIFont.regular12() - countLabel.textColor = UIColor.blackSecondaryText() - } - } - - @IBOutlet private weak var ratingSummaryView: RatingSummaryView! { - didSet { - ratingSummaryView.horribleColor = UIColor.ratingRed() - ratingSummaryView.badColor = UIColor.ratingOrange() - ratingSummaryView.normalColor = UIColor.ratingYellow() - ratingSummaryView.goodColor = UIColor.ratingLightGreen() - ratingSummaryView.excellentColor = UIColor.ratingGreen() - ratingSummaryView.textFont = UIFont.bold28() - ratingSummaryView.textSize = 28 - } - } - + @IBOutlet private weak var titleLabel: UILabel! + @IBOutlet private weak var countLabel: UILabel! + @IBOutlet private weak var ratingSummaryView: RatingSummaryView! @IBOutlet private weak var ratingCollectionViewHeight: NSLayoutConstraint! @IBOutlet private weak var ratingCollectionView: UICollectionView! { didSet { diff --git a/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/UGC/UGCSummaryRatingCell.xib b/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/UGC/UGCSummaryRatingCell.xib index feba785fa7..39b2a603d9 100644 --- a/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/UGC/UGCSummaryRatingCell.xib +++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/UGC/UGCSummaryRatingCell.xib @@ -1,21 +1,19 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES"> - <device id="retina4_7" orientation="portrait"> - <adaptation id="fullscreen"/> - </device> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15705" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES"> + <device id="retina4_7" orientation="portrait" appearance="light"/> <dependencies> <deployment identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15706"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> <objects> <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/> <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/> - <tableViewCell contentMode="scaleToFill" selectionStyle="none" indentationWidth="0.0" reuseIdentifier="UGCSummaryRatingCell" id="KGk-i7-Jjw" customClass="MWMUGCSummaryRatingCell" propertyAccessControl="all"> + <tableViewCell contentMode="scaleToFill" selectionStyle="none" indentationWidth="0.0" reuseIdentifier="UGCSummaryRatingCell" id="KGk-i7-Jjw" customClass="MWMUGCSummaryRatingCell" propertyAccessControl="none"> <rect key="frame" x="0.0" y="0.0" width="320" height="135"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM"> - <rect key="frame" x="0.0" y="0.0" width="320" height="134.5"/> + <rect key="frame" x="0.0" y="0.0" width="320" height="135"/> <autoresizingMask key="autoresizingMask"/> <subviews> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="MSt-Fx-y5y"> @@ -26,12 +24,19 @@ <fontDescription key="fontDescription" type="system" pointSize="17"/> <nil key="textColor"/> <nil key="highlightedColor"/> + <userDefinedRuntimeAttributes> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="bold22:blackPrimaryText"/> + <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="placepage_summary_rating"/> + </userDefinedRuntimeAttributes> </label> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dL4-7I-zUJ"> <rect key="frame" x="16" y="41" width="42" height="21"/> <fontDescription key="fontDescription" type="system" pointSize="17"/> <nil key="textColor"/> <nil key="highlightedColor"/> + <userDefinedRuntimeAttributes> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular12:blackSecondaryText"/> + </userDefinedRuntimeAttributes> </label> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="1wF-gY-Wza" customClass="RatingSummaryView" customModule="maps_me" customModuleProvider="target"> <rect key="frame" x="200" y="19" width="104" height="40"/> @@ -41,11 +46,7 @@ <constraint firstAttribute="height" constant="40" placeholder="YES" id="XNy-10-mxa"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="image" keyPath="horribleImage" value="ic_24px_rating_horrible"/> - <userDefinedRuntimeAttribute type="image" keyPath="badImage" value="ic_24px_rating_bad"/> - <userDefinedRuntimeAttribute type="image" keyPath="normalImage" value="ic_24px_rating_normal"/> - <userDefinedRuntimeAttribute type="image" keyPath="goodImage" value="ic_24px_rating_good"/> - <userDefinedRuntimeAttribute type="image" keyPath="excellentImage" value="ic_24px_rating_excellent"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="RatingSummaryView24:bold28"/> </userDefinedRuntimeAttributes> </view> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Ks7-ZL-gaO"> @@ -55,7 +56,7 @@ <constraint firstAttribute="height" constant="1" id="0Ow-i9-Mmd"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="blackDividers"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Divider"/> </userDefinedRuntimeAttributes> </view> </subviews> @@ -74,7 +75,7 @@ </constraints> </view> <collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" bounces="NO" pagingEnabled="YES" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" dataMode="none" prefetchingEnabled="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ek3-Zj-cfu"> - <rect key="frame" x="0.0" y="78" width="320" height="55.5"/> + <rect key="frame" x="0.0" y="78" width="320" height="56"/> <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> <constraints> <constraint firstAttribute="height" priority="999" constant="56" id="NOt-1H-Ou6"/> @@ -90,13 +91,13 @@ </connections> </collectionView> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="deV-cR-pmt"> - <rect key="frame" x="0.0" y="133.5" width="320" height="1"/> + <rect key="frame" x="0.0" y="134" width="320" height="1"/> <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> <constraints> <constraint firstAttribute="height" constant="1" id="xWy-nC-DYA"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="blackDividers"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Divider"/> </userDefinedRuntimeAttributes> </view> </subviews> @@ -120,13 +121,7 @@ <outlet property="ratingSummaryView" destination="1wF-gY-Wza" id="Cik-Nz-9lb"/> <outlet property="titleLabel" destination="vuk-Pr-u1F" id="BS6-tI-lXe"/> </connections> + <point key="canvasLocation" x="139" y="155"/> </tableViewCell> </objects> - <resources> - <image name="ic_24px_rating_bad" width="24" height="24"/> - <image name="ic_24px_rating_excellent" width="24" height="24"/> - <image name="ic_24px_rating_good" width="24" height="24"/> - <image name="ic_24px_rating_horrible" width="24" height="24"/> - <image name="ic_24px_rating_normal" width="24" height="24"/> - </resources> </document> diff --git a/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/UGC/UGCSummaryRatingStarsCell.swift b/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/UGC/UGCSummaryRatingStarsCell.swift index d840532253..f5c23ebe1e 100644 --- a/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/UGC/UGCSummaryRatingStarsCell.swift +++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/UGC/UGCSummaryRatingStarsCell.swift @@ -5,8 +5,6 @@ final class UGCSummaryRatingStarsCell: UICollectionViewCell { didSet { ratingView.topTextFont = UIFont.regular10() ratingView.topTextColor = UIColor.blackSecondaryText() - ratingView.filledColor = UIColor.ratingYellow() - ratingView.emptyColor = UIColor.blackDividers() ratingView.borderWidth = 0 } } diff --git a/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/UGC/UGCYourReviewCell.swift b/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/UGC/UGCYourReviewCell.swift index 6e197924c6..62c90d4e96 100644 --- a/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/UGC/UGCYourReviewCell.swift +++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/UGC/UGCYourReviewCell.swift @@ -4,21 +4,8 @@ final class UGCYourReviewCell: MWMTableViewCell { static let defaultReviewBottomOffset: CGFloat = 16 } - @IBOutlet private weak var titleLabel: UILabel! { - didSet { - titleLabel.font = UIFont.bold14() - titleLabel.textColor = UIColor.blackPrimaryText() - titleLabel.text = L("placepage_reviews_your_comment") - } - } - - @IBOutlet private weak var dateLabel: UILabel! { - didSet { - dateLabel.font = UIFont.regular12() - dateLabel.textColor = UIColor.blackSecondaryText() - } - } - + @IBOutlet private weak var titleLabel: UILabel! + @IBOutlet private weak var dateLabel: UILabel! @IBOutlet private weak var reviewLabel: ExpandableReviewView! { didSet { let settings = ExpandableReviewSettings(expandText: L("placepage_more_button"), diff --git a/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/UGC/UGCYourReviewCell.xib b/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/UGC/UGCYourReviewCell.xib index f3f152fe9c..3a3317b063 100644 --- a/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/UGC/UGCYourReviewCell.xib +++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/UGC/UGCYourReviewCell.xib @@ -1,50 +1,55 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES"> - <device id="retina4_7" orientation="portrait"> - <adaptation id="fullscreen"/> - </device> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES"> + <device id="retina4_7" orientation="portrait" appearance="light"/> <dependencies> <deployment identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14460.20"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> <objects> <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/> <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/> - <tableViewCell contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="UGCYourReviewCell" id="KGk-i7-Jjw" customClass="MWMUGCYourReviewCell"> + <tableViewCell contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="UGCYourReviewCell" id="KGk-i7-Jjw" customClass="MWMUGCYourReviewCell" propertyAccessControl="none"> <rect key="frame" x="0.0" y="0.0" width="320" height="192"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM"> - <rect key="frame" x="0.0" y="0.0" width="320" height="191.5"/> + <rect key="frame" x="0.0" y="0.0" width="320" height="192"/> <autoresizingMask key="autoresizingMask"/> <subviews> - <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="M3q-L0-4Y7" propertyAccessControl="all"> - <rect key="frame" x="0.0" y="0.0" width="320" height="134.5"/> + <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="M3q-L0-4Y7" propertyAccessControl="none"> + <rect key="frame" x="0.0" y="0.0" width="320" height="135"/> <subviews> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="252" verticalCompressionResistancePriority="751" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="nht-6C-S3i"> <rect key="frame" x="16" y="16" width="42" height="20.5"/> <fontDescription key="fontDescription" type="system" pointSize="17"/> <nil key="textColor"/> <nil key="highlightedColor"/> + <userDefinedRuntimeAttributes> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="bold14:blackPrimaryText"/> + <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="placepage_reviews_your_comment"/> + </userDefinedRuntimeAttributes> </label> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="252" verticalCompressionResistancePriority="751" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="qZ5-I9-7dJ"> <rect key="frame" x="16" y="40.5" width="42" height="21"/> <fontDescription key="fontDescription" type="system" pointSize="17"/> <nil key="textColor"/> <nil key="highlightedColor"/> + <userDefinedRuntimeAttributes> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular12:blackSecondaryText"/> + </userDefinedRuntimeAttributes> </label> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="G4x-pj-fmv" customClass="ExpandableReviewView" customModule="maps_me" customModuleProvider="target"> - <rect key="frame" x="16" y="77.5" width="288" height="40"/> + <rect key="frame" x="16" y="77.5" width="288" height="40.5"/> <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> </view> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="aOE-yo-hUQ"> - <rect key="frame" x="16" y="133.5" width="304" height="1"/> + <rect key="frame" x="16" y="134" width="304" height="1"/> <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> <constraints> <constraint firstAttribute="height" constant="1" id="E6L-PS-9ij"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="blackDividers"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Divider"/> </userDefinedRuntimeAttributes> </view> </subviews> @@ -64,7 +69,7 @@ </constraints> </view> <collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" bounces="NO" pagingEnabled="YES" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" dataMode="none" prefetchingEnabled="NO" translatesAutoresizingMaskIntoConstraints="NO" id="w6j-GC-6Bv"> - <rect key="frame" x="0.0" y="134.5" width="320" height="56"/> + <rect key="frame" x="0.0" y="135" width="320" height="56"/> <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> <constraints> <constraint firstAttribute="height" priority="999" constant="56" id="2hn-mr-UAw"/> @@ -80,13 +85,13 @@ </connections> </collectionView> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="l8v-v7-2Xf"> - <rect key="frame" x="0.0" y="190.5" width="320" height="1"/> + <rect key="frame" x="0.0" y="191" width="320" height="1"/> <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> <constraints> <constraint firstAttribute="height" constant="1" id="FbW-ej-brB"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="blackDividers"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Divider"/> </userDefinedRuntimeAttributes> </view> </subviews> @@ -114,6 +119,7 @@ <outlet property="reviewLabel" destination="G4x-pj-fmv" id="pWq-RG-xv0"/> <outlet property="titleLabel" destination="nht-6C-S3i" id="1lQ-nA-n7z"/> </connections> + <point key="canvasLocation" x="139" y="155"/> </tableViewCell> </objects> </document> diff --git a/iphone/Maps/UI/Promo/PromoAfterBookingViewController.xib b/iphone/Maps/UI/Promo/PromoAfterBookingViewController.xib index eb2c0d4722..8b735dfc18 100644 --- a/iphone/Maps/UI/Promo/PromoAfterBookingViewController.xib +++ b/iphone/Maps/UI/Promo/PromoAfterBookingViewController.xib @@ -1,11 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> - <device id="retina4_7" orientation="landscape"> - <adaptation id="fullscreen"/> - </device> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> + <device id="retina6_1" orientation="portrait" appearance="light"/> <dependencies> <deployment identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14490.49"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/> <capability name="Safe area layout guides" minToolsVersion="9.0"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> @@ -35,8 +33,7 @@ <nil key="highlightedColor"/> <userDefinedRuntimeAttributes> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="popup_booking_download_guides_title"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="bold18"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="bold18:blackPrimaryText"/> </userDefinedRuntimeAttributes> </label> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Take a look at ready-made trips around the place!" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="9tQ-SL-jQU"> @@ -56,14 +53,7 @@ <state key="normal" title="Discover Guides"/> <userDefinedRuntimeAttributes> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="popup_mwm_download_guides_cta"/> - <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius"> - <integer key="value" value="8"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="bold16"/> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="linkBlue"/> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundHighlightedColorName" value="linkBlueHighlighted"/> - <userDefinedRuntimeAttribute type="string" keyPath="textColorHighlightedName" value="whitePrimaryTextHighlighted"/> - <userDefinedRuntimeAttribute type="string" keyPath="textColorName" value="whitePrimaryText"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="FlatNormalButton:bold16"/> </userDefinedRuntimeAttributes> <connections> <action selector="onOk" destination="-1" eventType="touchUpInside" id="fNr-s9-Hg3"/> @@ -80,11 +70,7 @@ </state> <userDefinedRuntimeAttributes> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="cancel"/> - <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius"> - <integer key="value" value="8"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="string" keyPath="textColorHighlightedName" value="blackSecondaryText"/> - <userDefinedRuntimeAttribute type="string" keyPath="textColorName" value="blackSecondaryText"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="FlatGrayTransButton"/> </userDefinedRuntimeAttributes> <connections> <action selector="onCancel" destination="-1" eventType="touchUpInside" id="cRZ-PQ-NWh"/> @@ -113,10 +99,10 @@ <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/> <viewLayoutGuide key="safeArea" id="KOL-sB-eMa"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/> <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius"> <integer key="value" value="8"/> </userDefinedRuntimeAttribute> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Background"/> </userDefinedRuntimeAttributes> <point key="canvasLocation" x="-779.46026986506752" y="-103.2"/> </view> diff --git a/iphone/Maps/UI/Search/Filters/FilterCheckCell.swift b/iphone/Maps/UI/Search/Filters/FilterCheckCell.swift index c8098d1e0b..b227eab9f3 100644 --- a/iphone/Maps/UI/Search/Filters/FilterCheckCell.swift +++ b/iphone/Maps/UI/Search/Filters/FilterCheckCell.swift @@ -10,16 +10,12 @@ final class FilterCheckCell: MWMTableViewCell { @IBOutlet weak var checkInLabel: UILabel! { didSet { checkInLabel.text = L("booking_filters_check_in").uppercased() - checkInLabel.font = .regular14() - checkInLabel.textColor = .blackSecondaryText() } } @IBOutlet weak var checkOutLabel: UILabel! { didSet { checkOutLabel.text = L("booking_filters_check_out").uppercased() - checkOutLabel.font = .regular14() - checkOutLabel.textColor = .blackSecondaryText() } } @@ -27,8 +23,6 @@ final class FilterCheckCell: MWMTableViewCell { @IBOutlet weak var checkOut: UIButton! @IBOutlet private weak var offlineLabel: UILabel! { didSet { - offlineLabel.font = UIFont.regular12() - offlineLabel.textColor = UIColor.red offlineLabel.text = L("booking_filters_offline") } } @@ -50,26 +44,8 @@ final class FilterCheckCell: MWMTableViewCell { delegate?.checkCellButtonTap(sender) } - fileprivate func setupButton(_ button: UIButton) { - button.setTitleColor(UIColor.blackPrimaryText(), for: .normal) - button.setTitleColor(UIColor.blackDividers(), for: .disabled) - button.setBackgroundColor(UIColor.white(), for: .normal) - let label = button.titleLabel! - label.textAlignment = .natural - label.font = UIFont.regular14() - let layer = button.layer - layer.cornerRadius = 4 - layer.borderWidth = 1 - layer.borderColor = UIColor.blackDividers().cgColor - } - - @objc func refreshButtonsAppearance() { - checkButtons.forEach { setupButton($0) } - } - override func awakeFromNib() { super.awakeFromNib() isSeparatorHidden = true - backgroundColor = UIColor.clear } } diff --git a/iphone/Maps/UI/Search/Filters/FilterCollectionHolderCell.swift b/iphone/Maps/UI/Search/Filters/FilterCollectionHolderCell.swift index a40b5e1684..ecdcf71e42 100644 --- a/iphone/Maps/UI/Search/Filters/FilterCollectionHolderCell.swift +++ b/iphone/Maps/UI/Search/Filters/FilterCollectionHolderCell.swift @@ -34,7 +34,6 @@ final class FilterCollectionHolderCell: MWMTableViewCell { override func awakeFromNib() { super.awakeFromNib() isSeparatorHidden = true - backgroundColor = UIColor.clear } override func layoutSubviews() { diff --git a/iphone/Maps/UI/Search/Filters/FilterPriceCategoryCell.swift b/iphone/Maps/UI/Search/Filters/FilterPriceCategoryCell.swift index c781d17711..f6f916d886 100644 --- a/iphone/Maps/UI/Search/Filters/FilterPriceCategoryCell.swift +++ b/iphone/Maps/UI/Search/Filters/FilterPriceCategoryCell.swift @@ -1,16 +1,7 @@ @objc(MWMFilterPriceCategoryCell) final class FilterPriceCategoryCell: MWMTableViewCell { - @IBOutlet private var priceButtons: [UIButton]! { - didSet { - priceButtons.map { $0.layer }.forEach { - $0.cornerRadius = 4 - $0.borderWidth = 1 - $0.borderColor = UIColor.blackDividers().cgColor - } - } - } - + @IBOutlet private var priceButtons: [UIButton]! @IBOutlet weak var one: UIButton! @IBOutlet weak var two: UIButton! @IBOutlet weak var three: UIButton! @@ -36,6 +27,5 @@ final class FilterPriceCategoryCell: MWMTableViewCell { override func awakeFromNib() { super.awakeFromNib() isSeparatorHidden = true - backgroundColor = UIColor.clear } } diff --git a/iphone/Maps/UI/Search/Filters/FilterRatingCell.swift b/iphone/Maps/UI/Search/Filters/FilterRatingCell.swift index 5c14c825c7..60d66313f0 100644 --- a/iphone/Maps/UI/Search/Filters/FilterRatingCell.swift +++ b/iphone/Maps/UI/Search/Filters/FilterRatingCell.swift @@ -1,14 +1,6 @@ @objc(MWMFilterRatingCell) final class FilterRatingCell: MWMTableViewCell { - @IBOutlet private var ratingButtons: [UIButton]! { - didSet { - ratingButtons.map { $0.layer }.forEach { - $0.cornerRadius = 4 - $0.borderWidth = 1 - $0.borderColor = UIColor.blackDividers().cgColor - } - } - } + @IBOutlet private var ratingButtons: [UIButton]! @IBOutlet weak var any: UIButton! @IBOutlet weak var good: UIButton! @@ -40,6 +32,5 @@ final class FilterRatingCell: MWMTableViewCell { override func awakeFromNib() { super.awakeFromNib() isSeparatorHidden = true - backgroundColor = UIColor.clear } } diff --git a/iphone/Maps/UI/Search/Filters/MWMSearchFilterViewController.mm b/iphone/Maps/UI/Search/Filters/MWMSearchFilterViewController.mm index 75d1454fc6..838b55f303 100644 --- a/iphone/Maps/UI/Search/Filters/MWMSearchFilterViewController.mm +++ b/iphone/Maps/UI/Search/Filters/MWMSearchFilterViewController.mm @@ -15,7 +15,4 @@ auto storyboard = [UIStoryboard instance:MWMStoryboardSearchFilters]; return [storyboard instantiateViewControllerWithIdentifier:identifier]; } - -- (void)mwm_refreshUI { [self.view mwm_refreshUI]; } - @end diff --git a/iphone/Maps/UI/Search/Filters/MWMSearchHotelsFilterViewController.mm b/iphone/Maps/UI/Search/Filters/MWMSearchHotelsFilterViewController.mm index 56ebe6bc58..ed89402981 100644 --- a/iphone/Maps/UI/Search/Filters/MWMSearchHotelsFilterViewController.mm +++ b/iphone/Maps/UI/Search/Filters/MWMSearchHotelsFilterViewController.mm @@ -194,7 +194,6 @@ void configButton(UIButton * button, NSString * primaryText, NSString * secondar - (void)refreshViewAppearance { - self.view.backgroundColor = [UIColor pressBackground]; self.tableView.backgroundColor = [UIColor clearColor]; self.tableView.contentInset = {-20, 0, 80, 0}; } @@ -254,7 +253,6 @@ void configButton(UIButton * button, NSString * primaryText, NSString * secondar - (void)initialCheckConfig { MWMFilterCheckCell * check = self.check; - [check refreshButtonsAppearance]; check.isOffline = !Platform::IsConnected(); check.delegate = self; } diff --git a/iphone/Maps/UI/Search/MWMSearchChangeModeView.mm b/iphone/Maps/UI/Search/MWMSearchChangeModeView.mm index 606282b61c..0009ab5561 100644 --- a/iphone/Maps/UI/Search/MWMSearchChangeModeView.mm +++ b/iphone/Maps/UI/Search/MWMSearchChangeModeView.mm @@ -1,6 +1,7 @@ #import "MWMSearchChangeModeView.h" #import "MWMButton.h" #import "UIButton+RuntimeAttributes.h" +#import "SwiftBridge.h" @interface MWMSearchChangeModeView ()<MWMSearchObserver> @@ -35,11 +36,11 @@ switch (state) { case MWMSearchManagerStateTableSearch: - self.backgroundColor = [UIColor pressBackground]; + [self setStyleAndApply: @"PressBackground"]; [changeModeButton setTitle:L(@"search_show_on_map") forState:UIControlStateNormal]; break; case MWMSearchManagerStateMapSearch: - self.backgroundColor = [UIColor white]; + [self setStyleAndApply: @"Background"]; [changeModeButton setTitle:L(@"search_in_table") forState:UIControlStateNormal]; break; default: break; @@ -56,22 +57,14 @@ return; if (hasFilter) { - [self.filterButton setBackgroundColorName:@"linkBlue"]; - [self.filterButton setBackgroundHighlightedColorName:@"linkBlueHighlighted"]; - [self.filterButton setTitleColor:[UIColor white] forState:UIControlStateNormal]; - [self.cancelFilterButton setImage:[UIImage imageNamed:@"ic_clear_filters"] - forState:UIControlStateNormal]; - self.cancelFilterButton.coloring = MWMButtonColoringWhite; + [self.filterButton setStyleAndApply:@"SearchFilterButtonActive"]; + [self.cancelFilterButton setStyleAndApply:@"SearchCancelButtonActive"]; [self bringSubviewToFront:self.cancelFilterButton]; } else { - [self.filterButton setBackgroundColorName:@"clearColor"]; - [self.filterButton setBackgroundHighlightedColorName:@"clearColor"]; - [self.filterButton setTitleColor:[UIColor linkBlue] forState:UIControlStateNormal]; - [self.cancelFilterButton setImage:[UIImage imageNamed:@"ic_filter"] - forState:UIControlStateNormal]; - self.cancelFilterButton.coloring = MWMButtonColoringBlue; + [self.filterButton setStyleAndApply:@"SearchFilterButtonInActive"]; + [self.cancelFilterButton setStyleAndApply:@"SearchCancelButtonInActive"]; [self sendSubviewToBack:self.cancelFilterButton]; } [self sendSubviewToBack:self.changeModeBackground]; diff --git a/iphone/Maps/UI/Search/MWMSearchManager.h b/iphone/Maps/UI/Search/MWMSearchManager.h index 56a4252e52..9b151c51cd 100644 --- a/iphone/Maps/UI/Search/MWMSearchManager.h +++ b/iphone/Maps/UI/Search/MWMSearchManager.h @@ -22,8 +22,6 @@ typedef NS_ENUM(NSInteger, MWMSearchManagerRoutingTooltipSearch) { @property(nonnull, nonatomic) IBOutletCollection(UIView) NSArray * topViews; -- (void)mwm_refreshUI; - - (void)searchText:(nonnull NSString *)text forInputLocale:(nullable NSString *)locale; #pragma mark - Layout diff --git a/iphone/Maps/UI/Search/MWMSearchManager.mm b/iphone/Maps/UI/Search/MWMSearchManager.mm index 5a8b665aa9..b14efd957a 100644 --- a/iphone/Maps/UI/Search/MWMSearchManager.mm +++ b/iphone/Maps/UI/Search/MWMSearchManager.mm @@ -76,14 +76,6 @@ using Observers = NSHashTable<Observer>; return self; } -- (void)mwm_refreshUI -{ - [self.searchBarView mwm_refreshUI]; - [self.actionBarView mwm_refreshUI]; - [self.tableViewController mwm_refreshUI]; - [self.noMapsController mwm_refreshUI]; -} - - (void)beginSearch { if (self.state != MWMSearchManagerStateHidden) @@ -237,6 +229,7 @@ using Observers = NSHashTable<Observer>; [self viewHidden:NO]; self.actionBarState = MWMSearchManagerActionBarStateHidden; [self.searchTextField becomeFirstResponder]; + [self.searchBarView applyTheme]; } - (void)changeToTableSearchState diff --git a/iphone/Maps/UI/Search/MWMSearchNoResults.xib b/iphone/Maps/UI/Search/MWMSearchNoResults.xib index ab2db130f8..1ba8fa71f1 100644 --- a/iphone/Maps/UI/Search/MWMSearchNoResults.xib +++ b/iphone/Maps/UI/Search/MWMSearchNoResults.xib @@ -1,12 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES"> - <device id="retina4_7" orientation="portrait"> - <adaptation id="fullscreen"/> - </device> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES"> + <device id="retina4_7" orientation="portrait" appearance="light"/> <dependencies> <deployment identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/> - <capability name="Aspect ratio constraints" minToolsVersion="5.1"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> <objects> @@ -17,30 +14,28 @@ <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="400" verticalCompressionResistancePriority="400" translatesAutoresizingMaskIntoConstraints="NO" id="Yc4-sP-zqq"> - <rect key="frame" x="91" y="24" width="137" height="137"/> + <rect key="frame" x="91.5" y="24" width="137" height="137"/> <constraints> <constraint firstAttribute="height" relation="lessThanOrEqual" constant="160" id="8QI-AM-7wH"/> <constraint firstAttribute="width" secondItem="Yc4-sP-zqq" secondAttribute="height" multiplier="1:1" id="tkN-yC-YFM"/> </constraints> </imageView> - <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="1000" verticalCompressionResistancePriority="1000" text="Label" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="288" translatesAutoresizingMaskIntoConstraints="NO" id="vGi-FH-krh"> - <rect key="frame" x="16" y="173" width="288" height="21"/> + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="1000" verticalCompressionResistancePriority="1000" text="Label" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="288" translatesAutoresizingMaskIntoConstraints="NO" id="vGi-FH-krh" propertyAccessControl="none"> + <rect key="frame" x="16" y="173" width="288" height="20.5"/> <fontDescription key="fontDescription" type="system" pointSize="17"/> <color key="textColor" cocoaTouchSystemColor="darkTextColor"/> <nil key="highlightedColor"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="medium18"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="blackPrimaryText:medium18"/> </userDefinedRuntimeAttributes> </label> - <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="1000" verticalCompressionResistancePriority="1000" text="Label" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="288" translatesAutoresizingMaskIntoConstraints="NO" id="2Z7-NG-6sZ"> - <rect key="frame" x="16" y="206" width="288" height="20"/> + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="1000" verticalCompressionResistancePriority="1000" text="Label" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="288" translatesAutoresizingMaskIntoConstraints="NO" id="2Z7-NG-6sZ" propertyAccessControl="none"> + <rect key="frame" x="16" y="205.5" width="288" height="20.5"/> <fontDescription key="fontDescription" type="system" pointSize="17"/> <color key="textColor" cocoaTouchSystemColor="darkTextColor"/> <nil key="highlightedColor"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular14"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackSecondaryText"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular14:blackSecondaryText"/> </userDefinedRuntimeAttributes> </label> </subviews> @@ -66,6 +61,7 @@ <outlet property="textOffsetToImage" destination="2eV-Dh-WAy" id="y1a-WQ-nhu"/> <outlet property="title" destination="vGi-FH-krh" id="11v-W7-Rpl"/> </connections> + <point key="canvasLocation" x="139" y="154"/> </view> </objects> </document> diff --git a/iphone/Maps/UI/Search/MWMSearchTextField.mm b/iphone/Maps/UI/Search/MWMSearchTextField.mm index 2cdee64173..e482c6f47a 100644 --- a/iphone/Maps/UI/Search/MWMSearchTextField.mm +++ b/iphone/Maps/UI/Search/MWMSearchTextField.mm @@ -1,6 +1,7 @@ #import "MWMSearchTextField.h" #import "MWMSearch.h" #import "UIImageView+Coloring.h" +#import "SwiftBridge.h" namespace { @@ -22,7 +23,6 @@ NSTimeInterval constexpr kOnSearchCompletedDelay = 0.2; { [self setStaticIcon]; self.leftViewMode = UITextFieldViewModeAlways; - self.textColor = [UIColor blackSecondaryText]; [MWMSearch addObserver:self]; } return self; @@ -50,6 +50,7 @@ NSTimeInterval constexpr kOnSearchCompletedDelay = 0.2; UIViewAutoresizingFlexibleRightMargin | UIViewAutoresizingFlexibleBottomMargin; [view startAnimating]; view.bounds = self.leftView.bounds; + view.styleName = @"SearchSearchTextFieldIcon"; self.leftView = view; } else @@ -61,7 +62,7 @@ NSTimeInterval constexpr kOnSearchCompletedDelay = 0.2; - (void)setStaticIcon { self.leftView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"ic_search"]]; - static_cast<UIImageView *>(self.leftView).mwm_coloring = MWMImageColoringBlack; + [self.leftView setStyleAndApply:@"SearchSearchTextFieldIcon"]; } - (void)stopSpinner { self.isSearching = NO; } diff --git a/iphone/Maps/UI/Search/MWMSearchView.xib b/iphone/Maps/UI/Search/MWMSearchView.xib index 401e3abeb6..248d690d14 100644 --- a/iphone/Maps/UI/Search/MWMSearchView.xib +++ b/iphone/Maps/UI/Search/MWMSearchView.xib @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14868" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES"> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15705" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES"> <device id="retina4_7" orientation="portrait" appearance="light"/> <dependencies> <deployment identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14824"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15706"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> <objects> @@ -30,9 +30,9 @@ <subviews> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="8lb-Vi-0oJ" userLabel="StatusBarBackground"> <rect key="frame" x="-100" y="-100" width="520" height="144"/> - <color key="backgroundColor" red="0.12549019610000001" green="0.59607843140000005" blue="0.32156862749999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> + <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="primary"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="SearchBarView"/> </userDefinedRuntimeAttributes> </view> <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="fill" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" adjustsFontSizeToFit="NO" minimumFontSize="17" clearButtonMode="always" translatesAutoresizingMaskIntoConstraints="NO" id="hna-zw-Zor" userLabel="Search" customClass="MWMSearchTextField"> @@ -41,7 +41,7 @@ <fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="14"/> <textInputTraits key="textInputTraits" autocorrectionType="no" returnKeyType="search"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="SearchSearchTextField"/> <userDefinedRuntimeAttribute type="string" keyPath="localizedPlaceholder" value="search"/> </userDefinedRuntimeAttributes> <connections> @@ -63,7 +63,7 @@ </state> <userDefinedRuntimeAttributes> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="cancel"/> - <userDefinedRuntimeAttribute type="string" keyPath="textColorName" value="whitePrimaryText"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="whitePrimaryText"/> </userDefinedRuntimeAttributes> <connections> <action selector="cancelButtonPressed" destination="-1" eventType="touchUpInside" id="8EF-82-bpl"/> @@ -92,24 +92,12 @@ <nil key="simulatedStatusBarMetrics"/> <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="primary"/> - <userDefinedRuntimeAttribute type="number" keyPath="layer.shadowRadius"> - <integer key="value" value="2"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="color" keyPath="layer.shadowUIColor"> - <color key="value" red="0.0" green="0.0" blue="0.0" alpha="0.23999999999999999" colorSpace="custom" customColorSpace="sRGB"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="number" keyPath="layer.shadowOpacity"> - <integer key="value" value="1"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="size" keyPath="layer.shadowOffset"> - <size key="value" width="0.0" height="0.0"/> - </userDefinedRuntimeAttribute> + <userDefinedRuntimeAttribute type="string" keyPath="styleNane" value="SearchBar"/> </userDefinedRuntimeAttributes> <point key="canvasLocation" x="236" y="-242"/> </view> <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/> - <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="j3Y-13-kVB" userLabel="ActionBar" customClass="SolidTouchView"> + <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="j3Y-13-kVB" userLabel="ActionBar" customClass="SolidTouchView" propertyAccessControl="none"> <rect key="frame" x="0.0" y="0.0" width="320" height="48"/> <subviews> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Smx-UL-Mcd" userLabel="TabBar"> @@ -119,7 +107,7 @@ <rect key="frame" x="-100" y="0.0" width="520" height="164"/> <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Background"/> </userDefinedRuntimeAttributes> </view> </subviews> @@ -140,7 +128,7 @@ </constraint> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Background"/> </userDefinedRuntimeAttributes> </view> <view hidden="YES" contentMode="scaleToFill" verticalCompressionResistancePriority="400" translatesAutoresizingMaskIntoConstraints="NO" id="Ysx-Oh-UYF" customClass="MWMSearchChangeModeView"> @@ -150,19 +138,7 @@ <rect key="frame" x="-100" y="0.0" width="520" height="148"/> <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="pressBackground"/> - <userDefinedRuntimeAttribute type="number" keyPath="layer.shadowRadius"> - <integer key="value" value="2"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="color" keyPath="layer.shadowUIColor"> - <color key="value" red="0.0" green="0.0" blue="0.0" alpha="0.23999999999999999" colorSpace="custom" customColorSpace="sRGB"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="number" keyPath="layer.shadowOpacity"> - <integer key="value" value="1"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="size" keyPath="layer.shadowOffset"> - <size key="value" width="0.0" height="0.0"/> - </userDefinedRuntimeAttribute> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="SearchChangeModeView"/> </userDefinedRuntimeAttributes> </view> <button opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="240" verticalCompressionResistancePriority="400" contentHorizontalAlignment="left" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="JhV-gM-MgM"> @@ -171,8 +147,7 @@ <inset key="contentEdgeInsets" minX="16" minY="0.0" maxX="0.0" maxY="0.0"/> <state key="normal" title="Search on map"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="bold17"/> - <userDefinedRuntimeAttribute type="string" keyPath="textColorName" value="linkBlue"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="bold17:linkBlueText"/> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="search_show_on_map"/> </userDefinedRuntimeAttributes> <connections> @@ -189,14 +164,7 @@ <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/> </state> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular17"/> - <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius"> - <integer key="value" value="4"/> - </userDefinedRuntimeAttribute> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="booking_filters"/> - <userDefinedRuntimeAttribute type="string" keyPath="textColorName" value="white"/> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="linkBlue"/> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundHighlightedColorName" value="linkBlueHighlighted"/> </userDefinedRuntimeAttributes> <connections> <action selector="updateTap" destination="-1" eventType="touchUpInside" id="HXM-IS-ykz"/> @@ -239,19 +207,7 @@ <constraint firstItem="JhV-gM-MgM" firstAttribute="top" secondItem="Ysx-Oh-UYF" secondAttribute="top" id="y3t-5r-CMa"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="pressBackground"/> - <userDefinedRuntimeAttribute type="number" keyPath="layer.shadowRadius"> - <integer key="value" value="2"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="color" keyPath="layer.shadowUIColor"> - <color key="value" red="0.0" green="0.0" blue="0.0" alpha="0.23999999999999999" colorSpace="custom" customColorSpace="sRGB"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="number" keyPath="layer.shadowOpacity"> - <integer key="value" value="1"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="size" keyPath="layer.shadowOffset"> - <size key="value" width="0.0" height="0.0"/> - </userDefinedRuntimeAttribute> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="SearchChangeModeView"/> </userDefinedRuntimeAttributes> <connections> <outlet property="cancelFilterButton" destination="vUE-KN-mbf" id="dwF-9p-lgq"/> @@ -286,7 +242,7 @@ <rect key="frame" x="-100" y="0.0" width="520" height="502"/> <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Background"/> </userDefinedRuntimeAttributes> </view> </subviews> @@ -306,7 +262,7 @@ <nil key="simulatedStatusBarMetrics"/> <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Background"/> </userDefinedRuntimeAttributes> <point key="canvasLocation" x="236" y="229"/> </view> diff --git a/iphone/Maps/UI/Search/TableView/MWMSearchCell.mm b/iphone/Maps/UI/Search/TableView/MWMSearchCell.mm index a5391bed11..d57f719c3c 100644 --- a/iphone/Maps/UI/Search/TableView/MWMSearchCell.mm +++ b/iphone/Maps/UI/Search/TableView/MWMSearchCell.mm @@ -51,8 +51,6 @@ } self.titleLabel.attributedText = attributedTitle; [self.titleLabel sizeToFit]; - - self.backgroundColor = [UIColor white]; } - (NSDictionary *)selectedTitleAttributes diff --git a/iphone/Maps/UI/Search/TableView/MWMSearchCommonCell.mm b/iphone/Maps/UI/Search/TableView/MWMSearchCommonCell.mm index 963b249177..341ef247c2 100644 --- a/iphone/Maps/UI/Search/TableView/MWMSearchCommonCell.mm +++ b/iphone/Maps/UI/Search/TableView/MWMSearchCommonCell.mm @@ -1,12 +1,12 @@ #import "MWMSearchCommonCell.h" #import "CLLocation+Mercator.h" #import "MWMLocationManager.h" +#import "SwiftBridge.h" #include "map/place_page_info.hpp" #include "platform/localization.hpp" #include "platform/measurement_utils.hpp" - namespace { bool PopularityHasHigherPriority(bool hasPosition, double distanceInMeters) diff --git a/iphone/Maps/UI/Search/TableView/MWMSearchCommonCell.xib b/iphone/Maps/UI/Search/TableView/MWMSearchCommonCell.xib index aa8ffc39d9..d345624e3c 100644 --- a/iphone/Maps/UI/Search/TableView/MWMSearchCommonCell.xib +++ b/iphone/Maps/UI/Search/TableView/MWMSearchCommonCell.xib @@ -1,9 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14868" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES"> - <device id="retina4_7" orientation="portrait" appearance="light"/> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15705" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES"> <dependencies> - <deployment identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14824"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15706"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> <objects> @@ -23,8 +21,7 @@ <color key="textColor" red="0.12941176470588234" green="0.12941176470588234" blue="0.12941176470588234" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <nil key="highlightedColor"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="bold17"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="bold17:blackPrimaryText"/> </userDefinedRuntimeAttributes> </label> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="P8X-Xp-AaE"> @@ -33,8 +30,7 @@ <color key="textColor" red="0.12549019607843137" green="0.58823529411764708" blue="0.95294117647058818" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <nil key="highlightedColor"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular14"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="linkBlue"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular14:linkBlueText"/> </userDefinedRuntimeAttributes> </label> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="HGm-lZ-JNr" userLabel="Separator"> @@ -44,7 +40,7 @@ <constraint firstAttribute="height" constant="1" id="ZWt-cn-KrT"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="blackDividers"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Divider"/> </userDefinedRuntimeAttributes> </view> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="V8w-dT-7B1" userLabel="ClosedBackground"> @@ -56,8 +52,7 @@ <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <nil key="highlightedColor"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular12"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="white"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular12:whiteText"/> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="closed"/> </userDefinedRuntimeAttributes> </label> @@ -71,10 +66,7 @@ <constraint firstAttribute="width" constant="56" id="xkl-3E-FRu"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius"> - <integer key="value" value="4"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="blackHintText"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="SearchClosedBackground"/> </userDefinedRuntimeAttributes> </view> <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="uWz-7m-GUu"> @@ -86,8 +78,7 @@ <color key="textColor" red="0.1176470588" green="0.58823529409999997" blue="0.93983289930000002" alpha="1" colorSpace="calibratedRGB"/> <nil key="highlightedColor"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="bold12"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="linkBlue"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="bold12:linkBlueText"/> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="popular_place"/> </userDefinedRuntimeAttributes> </label> @@ -101,10 +92,7 @@ <constraint firstAttribute="trailing" secondItem="yjT-ah-SWQ" secondAttribute="trailing" constant="8" id="vYZ-sk-v7u"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="linkBlueHighlighted"/> - <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius"> - <integer key="value" value="10"/> - </userDefinedRuntimeAttribute> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="SearchPopularView"/> </userDefinedRuntimeAttributes> </view> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Сafe" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="5UO-MD-Hgx"> @@ -117,8 +105,7 @@ <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="fontName" value="regular12"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackSecondaryText"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular12:blackSecondaryText"/> </userDefinedRuntimeAttributes> </label> <view hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="AXe-5n-maZ" userLabel="Info"> @@ -130,8 +117,7 @@ <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="fontName" value="regular12"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackSecondaryText"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular12:blackSecondaryText"/> </userDefinedRuntimeAttributes> </label> <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="aNp-Yw-io2"> @@ -144,7 +130,7 @@ <constraint firstAttribute="width" constant="11" id="jwv-No-JFH"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="coloring" value="MWMGray"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="MWMGray"/> </userDefinedRuntimeAttributes> </imageView> <imageView userInteractionEnabled="NO" tag="2" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="hotel_star" translatesAutoresizingMaskIntoConstraints="NO" id="fU0-W2-tgC"> @@ -154,7 +140,7 @@ <constraint firstAttribute="height" constant="10" id="fci-53-ClD"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="coloring" value="MWMGray"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="MWMGray"/> </userDefinedRuntimeAttributes> </imageView> <imageView userInteractionEnabled="NO" tag="3" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="hotel_star" translatesAutoresizingMaskIntoConstraints="NO" id="E8B-4H-1PX"> @@ -164,7 +150,7 @@ <constraint firstAttribute="width" constant="11" id="wJe-R5-W1w"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="coloring" value="MWMGray"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="MWMGray"/> </userDefinedRuntimeAttributes> </imageView> <imageView userInteractionEnabled="NO" tag="4" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="hotel_star" translatesAutoresizingMaskIntoConstraints="NO" id="RuV-jO-kmE"> @@ -174,7 +160,7 @@ <constraint firstAttribute="height" constant="10" id="QrV-px-9rk"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="coloring" value="MWMGray"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="MWMGray"/> </userDefinedRuntimeAttributes> </imageView> <imageView userInteractionEnabled="NO" tag="5" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="hotel_star" translatesAutoresizingMaskIntoConstraints="NO" id="A5b-Hv-xec"> @@ -184,7 +170,7 @@ <constraint firstAttribute="height" constant="10" id="AcP-KG-fP6"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="coloring" value="MWMGray"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="MWMGray"/> </userDefinedRuntimeAttributes> </imageView> </subviews> @@ -208,8 +194,7 @@ <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="fontName" value="regular12"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackSecondaryText"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular12:blackSecondaryText"/> </userDefinedRuntimeAttributes> </label> </subviews> @@ -236,8 +221,7 @@ <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="fontName" value="regular12"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackSecondaryText"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular12:blackSecondaryText"/> </userDefinedRuntimeAttributes> </label> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Sold out" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Xc4-cr-hoV"> @@ -250,8 +234,7 @@ <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="fontName" value="regular12"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="ratingGreen"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular12:greenText"/> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="hotel_available"/> </userDefinedRuntimeAttributes> </label> @@ -273,8 +256,7 @@ <color key="textColor" red="0.33333333329999998" green="0.5450980392" blue="0.1843137255" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <nil key="highlightedColor"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="medium14"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="green"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="medium14:greenText"/> </userDefinedRuntimeAttributes> </label> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="$$" textAlignment="right" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="WOF-of-CqB"> @@ -283,8 +265,7 @@ <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="fontName" value="medium16"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="medium16:blackPrimaryText"/> </userDefinedRuntimeAttributes> </label> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" verticalCompressionResistancePriority="751" text="Russia, Moscow & Central, Moscow" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="6pc-4s-GyP"> @@ -294,8 +275,7 @@ <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="fontName" value="regular12"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackSecondaryText"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular12:blackSecondaryText"/> </userDefinedRuntimeAttributes> </label> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ygy-0c-QWk"> @@ -305,11 +285,11 @@ <constraint firstAttribute="width" constant="2" id="ftl-SQ-Gfg"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="ratingGreen"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="SearchSideAvaliableMarker"/> </userDefinedRuntimeAttributes> </view> <imageView hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="751" image="ic_hot_offer" translatesAutoresizingMaskIntoConstraints="NO" id="eHM-Vf-w4R"> - <rect key="frame" x="307" y="55.5" width="20" height="18"/> + <rect key="frame" x="307" y="46.5" width="40" height="36"/> </imageView> </subviews> <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> @@ -354,7 +334,7 @@ </constraints> </tableViewCellContentView> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Background"/> </userDefinedRuntimeAttributes> <connections> <outlet property="availableTypeOffset" destination="epG-jY-kzY" id="Pun-hS-54k"/> @@ -379,7 +359,7 @@ <outletCollection property="infoRatingStars" destination="RuV-jO-kmE" id="jua-fu-h8l"/> <outletCollection property="infoRatingStars" destination="A5b-Hv-xec" id="b2k-85-CCP"/> </connections> - <point key="canvasLocation" x="317" y="306.5"/> + <point key="canvasLocation" x="316.80000000000001" y="306.29685157421289"/> </tableViewCell> </objects> <resources> diff --git a/iphone/Maps/UI/Search/TableView/MWMSearchSuggestionCell.xib b/iphone/Maps/UI/Search/TableView/MWMSearchSuggestionCell.xib index 6a671a542f..add04701c5 100644 --- a/iphone/Maps/UI/Search/TableView/MWMSearchSuggestionCell.xib +++ b/iphone/Maps/UI/Search/TableView/MWMSearchSuggestionCell.xib @@ -1,26 +1,19 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES"> - <device id="retina4_7" orientation="portrait"> - <adaptation id="fullscreen"/> - </device> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES"> + <device id="retina4_7" orientation="portrait" appearance="light"/> <dependencies> <deployment identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> - <customFonts key="customFonts"> - <array key="HelveticaNeue.ttc"> - <string>HelveticaNeue-Bold</string> - </array> - </customFonts> <objects> <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/> <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/> - <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="KGk-i7-Jjw" customClass="MWMSearchSuggestionCell" propertyAccessControl="all"> + <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="KGk-i7-Jjw" customClass="MWMSearchSuggestionCell" propertyAccessControl="none"> <rect key="frame" x="0.0" y="0.0" width="320" height="44"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <tableViewCellContentView key="contentView" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM"> - <rect key="frame" x="0.0" y="0.0" width="320" height="43.5"/> + <rect key="frame" x="0.0" y="0.0" width="320" height="44"/> <autoresizingMask key="autoresizingMask"/> <subviews> <imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="ic_search" translatesAutoresizingMaskIntoConstraints="NO" id="1IA-T9-KOb"> @@ -30,25 +23,21 @@ <constraint firstAttribute="height" constant="28" id="bse-BN-jT9"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="coloring" value="MWMBlue"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="MWMBlue"/> </userDefinedRuntimeAttributes> </imageView> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="GqR-59-j1h" userLabel="Separator"> - <rect key="frame" x="60" y="42" width="260" height="1"/> + <rect key="frame" x="60" y="43" width="260" height="1"/> <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.12" colorSpace="custom" customColorSpace="sRGB"/> <constraints> <constraint firstAttribute="height" constant="1" id="Lg7-yQ-W1g"/> </constraints> </view> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="New Arbat Avenue" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="gWP-Zj-GCt"> - <rect key="frame" x="60" y="11" width="244" height="21"/> + <rect key="frame" x="60" y="11.5" width="244" height="21"/> <fontDescription key="fontDescription" name="HelveticaNeue-Bold" family="Helvetica Neue" pointSize="17"/> <color key="textColor" red="0.12549019610000001" green="0.58823529409999997" blue="0.95294117649999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <nil key="highlightedColor"/> - <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="linkBlue"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="bold17"/> - </userDefinedRuntimeAttributes> </label> </subviews> <constraints> @@ -64,13 +53,14 @@ </constraints> </tableViewCellContentView> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Background"/> </userDefinedRuntimeAttributes> <connections> <outlet property="icon" destination="1IA-T9-KOb" id="eBB-Wj-yU5"/> <outlet property="separatorLeftOffset" destination="2a5-qd-cFD" id="1MR-I8-VWr"/> <outlet property="titleLabel" destination="gWP-Zj-GCt" id="P6N-C2-ce6"/> </connections> + <point key="canvasLocation" x="139" y="154"/> </tableViewCell> </objects> <resources> diff --git a/iphone/Maps/UI/Search/TableView/MWMSearchTableViewController.mm b/iphone/Maps/UI/Search/TableView/MWMSearchTableViewController.mm index 958b5341a0..5747125e79 100644 --- a/iphone/Maps/UI/Search/TableView/MWMSearchTableViewController.mm +++ b/iphone/Maps/UI/Search/TableView/MWMSearchTableViewController.mm @@ -52,7 +52,6 @@ NSString * GetLocalizedTypeName(search::Result const & result) [self reloadData]; } -- (void)mwm_refreshUI { [self.view mwm_refreshUI]; } - (void)setupTableView { UITableView * tableView = self.tableView; diff --git a/iphone/Maps/UI/Search/TableView/MWMSearchTableViewController.xib b/iphone/Maps/UI/Search/TableView/MWMSearchTableViewController.xib index 353c8065d3..f9db80e653 100644 --- a/iphone/Maps/UI/Search/TableView/MWMSearchTableViewController.xib +++ b/iphone/Maps/UI/Search/TableView/MWMSearchTableViewController.xib @@ -1,12 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES"> - <device id="retina4_7" orientation="portrait"> - <adaptation id="fullscreen"/> - </device> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES"> + <device id="retina4_7" orientation="portrait" appearance="light"/> <dependencies> <deployment identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/> - <capability name="Aspect ratio constraints" minToolsVersion="5.1"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> <objects> @@ -17,7 +14,7 @@ </connections> </placeholder> <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/> - <view clipsSubviews="YES" contentMode="scaleToFill" id="i5M-Pr-FkT" customClass="MWMSearchTableView" propertyAccessControl="all"> + <view clipsSubviews="YES" contentMode="scaleToFill" id="i5M-Pr-FkT" customClass="MWMSearchTableView" propertyAccessControl="none"> <rect key="frame" x="0.0" y="0.0" width="320" height="460"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> @@ -45,7 +42,7 @@ <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> <inset key="separatorInset" minX="15" minY="0.0" maxX="0.0" maxY="0.0"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Background"/> </userDefinedRuntimeAttributes> <connections> <outlet property="dataSource" destination="-1" id="T9n-AG-sHf"/> @@ -69,13 +66,14 @@ <nil key="simulatedBottomBarMetrics"/> <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Background"/> </userDefinedRuntimeAttributes> <connections> <outlet property="noResultsBottomOffset" destination="P9i-5E-bpw" id="qTI-X5-KzS"/> <outlet property="noResultsContainer" destination="NsS-9j-1hr" id="BfV-Wz-ztf"/> <outlet property="noResultsWrapper" destination="0ed-oS-Uw6" id="RbW-yn-sl8"/> </connections> + <point key="canvasLocation" x="139" y="154"/> </view> </objects> </document> diff --git a/iphone/Maps/UI/Search/Tabs/CategoriesTab/SearchBannerCell.xib b/iphone/Maps/UI/Search/Tabs/CategoriesTab/SearchBannerCell.xib index 96dc737dc1..b93df6b95c 100644 --- a/iphone/Maps/UI/Search/Tabs/CategoriesTab/SearchBannerCell.xib +++ b/iphone/Maps/UI/Search/Tabs/CategoriesTab/SearchBannerCell.xib @@ -1,11 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> - <device id="retina4_7" orientation="portrait"> - <adaptation id="fullscreen"/> - </device> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15705" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> <dependencies> - <deployment identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14460.20"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15706"/> <capability name="Safe area layout guides" minToolsVersion="9.0"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> @@ -16,7 +12,7 @@ <rect key="frame" x="0.0" y="0.0" width="320" height="44"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM"> - <rect key="frame" x="0.0" y="0.0" width="320" height="43.5"/> + <rect key="frame" x="0.0" y="0.0" width="320" height="44"/> <autoresizingMask key="autoresizingMask"/> <subviews> <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="751" verticalCompressionResistancePriority="751" image="ic_megafon_light" translatesAutoresizingMaskIntoConstraints="NO" id="a9s-eh-L10" userLabel="Icon"> @@ -32,8 +28,7 @@ <color key="textColor" red="0.12941176469999999" green="0.12941176469999999" blue="0.12941176469999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <nil key="highlightedColor"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular17"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular17:blackPrimaryText"/> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="megafon"/> </userDefinedRuntimeAttributes> </label> @@ -49,13 +44,7 @@ <color key="titleColor" red="0.57254901960000004" green="0.58431372550000005" blue="0.64705882349999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> </state> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius"> - <integer key="value" value="10"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="boolean" keyPath="layer.masksToBounds" value="YES"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="medium12"/> - <userDefinedRuntimeAttribute type="string" keyPath="textColorName" value="blackSecondaryText"/> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="bannerButtonBackground"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="SearchInstallButton"/> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="details"/> </userDefinedRuntimeAttributes> <connections> @@ -63,13 +52,13 @@ </connections> </button> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="e5w-fg-vZX" userLabel="Separator"> - <rect key="frame" x="60" y="42.5" width="260" height="1"/> + <rect key="frame" x="60" y="43" width="260" height="1"/> <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.12" colorSpace="custom" customColorSpace="sRGB"/> <constraints> <constraint firstAttribute="height" constant="1" id="tzJ-6s-q0H"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="blackDividers"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Divider"/> </userDefinedRuntimeAttributes> </view> <imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="ic_ad_close" translatesAutoresizingMaskIntoConstraints="NO" id="b3T-LI-LzZ"> @@ -109,7 +98,7 @@ <constraint firstItem="a9s-eh-L10" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="16" id="wSv-qG-x9y"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="bannerBackground"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="SearchBanner"/> </userDefinedRuntimeAttributes> </tableViewCellContentView> <viewLayoutGuide key="safeArea" id="njF-e1-oar"/> diff --git a/iphone/Maps/UI/Search/Tabs/CategoriesTab/SearchCategoryCell.swift b/iphone/Maps/UI/Search/Tabs/CategoriesTab/SearchCategoryCell.swift index b57573a6b5..fb96f27922 100644 --- a/iphone/Maps/UI/Search/Tabs/CategoriesTab/SearchCategoryCell.swift +++ b/iphone/Maps/UI/Search/Tabs/CategoriesTab/SearchCategoryCell.swift @@ -1,9 +1,16 @@ final class SearchCategoryCell: MWMTableViewCell { @IBOutlet weak var iconImageView: UIImageView! @IBOutlet weak var titleLabel: UILabel! - + + private var category: String = "" func update(with category: String) { + self.category = category iconImageView.mwm_name = String(format: "ic_%@", category) titleLabel.text = L(category) } + + override func applyTheme() { + super.applyTheme() + iconImageView.mwm_name = String(format: "ic_%@", category) + } } diff --git a/iphone/Maps/UI/Search/Tabs/CategoriesTab/SearchCategoryCell.xib b/iphone/Maps/UI/Search/Tabs/CategoriesTab/SearchCategoryCell.xib index a56ebf683d..890b5bdbcb 100644 --- a/iphone/Maps/UI/Search/Tabs/CategoriesTab/SearchCategoryCell.xib +++ b/iphone/Maps/UI/Search/Tabs/CategoriesTab/SearchCategoryCell.xib @@ -1,11 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES"> - <device id="retina4_7" orientation="portrait"> - <adaptation id="fullscreen"/> - </device> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15705" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES"> <dependencies> - <deployment identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14460.20"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15706"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> <objects> @@ -15,7 +11,7 @@ <rect key="frame" x="0.0" y="0.0" width="320" height="44"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <tableViewCellContentView key="contentView" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM"> - <rect key="frame" x="0.0" y="0.0" width="320" height="43.5"/> + <rect key="frame" x="0.0" y="0.0" width="320" height="44"/> <autoresizingMask key="autoresizingMask"/> <subviews> <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="ic_food_light" translatesAutoresizingMaskIntoConstraints="NO" id="Enr-Zg-Z5s" userLabel="Icon"> @@ -26,23 +22,22 @@ </constraints> </imageView> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="WO3-AY-H0S" userLabel="Separator"> - <rect key="frame" x="60" y="42.5" width="260" height="1"/> + <rect key="frame" x="60" y="43" width="260" height="1"/> <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.12" colorSpace="custom" customColorSpace="sRGB"/> <constraints> <constraint firstAttribute="height" constant="1" id="W6j-8r-VpK"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="blackDividers"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Divider"/> </userDefinedRuntimeAttributes> </view> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Food" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ACg-C3-HtA" userLabel="Category label"> - <rect key="frame" x="60" y="12" width="244" height="20.5"/> + <rect key="frame" x="60" y="12" width="244" height="21"/> <fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="17"/> <color key="textColor" red="0.12941176469999999" green="0.12941176469999999" blue="0.12941176469999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <nil key="highlightedColor"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular17"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular17:blackPrimaryText"/> </userDefinedRuntimeAttributes> </label> </subviews> @@ -62,6 +57,7 @@ <outlet property="iconImageView" destination="Enr-Zg-Z5s" id="hN6-KJ-cc5"/> <outlet property="titleLabel" destination="ACg-C3-HtA" id="Wug-sf-nZZ"/> </connections> + <point key="canvasLocation" x="139" y="154"/> </tableViewCell> </objects> <resources> diff --git a/iphone/Maps/UI/Search/Tabs/HistoryTab/SearchHistoryClearCell.xib b/iphone/Maps/UI/Search/Tabs/HistoryTab/SearchHistoryClearCell.xib index fcbca3d73c..8c13898168 100644 --- a/iphone/Maps/UI/Search/Tabs/HistoryTab/SearchHistoryClearCell.xib +++ b/iphone/Maps/UI/Search/Tabs/HistoryTab/SearchHistoryClearCell.xib @@ -1,11 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES"> - <device id="retina4_7" orientation="portrait"> - <adaptation id="fullscreen"/> - </device> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15705" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES"> <dependencies> - <deployment identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14460.20"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15706"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> <objects> @@ -15,7 +11,7 @@ <rect key="frame" x="0.0" y="0.0" width="320" height="44"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <tableViewCellContentView key="contentView" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM"> - <rect key="frame" x="0.0" y="0.0" width="320" height="43.5"/> + <rect key="frame" x="0.0" y="0.0" width="320" height="44"/> <autoresizingMask key="autoresizingMask"/> <subviews> <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="ic_search_clear" translatesAutoresizingMaskIntoConstraints="NO" id="hch-c6-ulY" userLabel="Icon"> @@ -25,27 +21,26 @@ <constraint firstAttribute="width" constant="28" id="sop-aE-OIT"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="coloring" value="MWMBlack"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="MWMBlack"/> </userDefinedRuntimeAttributes> </imageView> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="6x5-bn-Z1n" userLabel="Separator"> - <rect key="frame" x="60" y="42.5" width="260" height="1"/> + <rect key="frame" x="60" y="43" width="260" height="1"/> <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.12" colorSpace="custom" customColorSpace="sRGB"/> <constraints> <constraint firstAttribute="height" constant="1" id="fa3-ZJ-pk5"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="blackDividers"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Divider"/> </userDefinedRuntimeAttributes> </view> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Clear History" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="uUE-gB-cha" userLabel="Clear label"> - <rect key="frame" x="60" y="12" width="244" height="20.5"/> + <rect key="frame" x="60" y="12" width="244" height="21"/> <fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" 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="fontName" value="regular17"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackSecondaryText"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular17:blackSecondaryText"/> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="clear_search"/> </userDefinedRuntimeAttributes> </label> @@ -62,6 +57,7 @@ <constraint firstAttribute="trailing" secondItem="6x5-bn-Z1n" secondAttribute="trailing" id="zbS-mM-SJH"/> </constraints> </tableViewCellContentView> + <point key="canvasLocation" x="139" y="154"/> </tableViewCell> </objects> <resources> diff --git a/iphone/Maps/UI/Search/Tabs/HistoryTab/SearchHistoryQueryCell.xib b/iphone/Maps/UI/Search/Tabs/HistoryTab/SearchHistoryQueryCell.xib index f4c95af04c..c32b1de579 100644 --- a/iphone/Maps/UI/Search/Tabs/HistoryTab/SearchHistoryQueryCell.xib +++ b/iphone/Maps/UI/Search/Tabs/HistoryTab/SearchHistoryQueryCell.xib @@ -1,11 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES"> - <device id="retina4_7" orientation="portrait"> - <adaptation id="fullscreen"/> - </device> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15705" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES"> <dependencies> - <deployment identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14460.20"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15706"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> <objects> @@ -15,7 +11,7 @@ <rect key="frame" x="0.0" y="0.0" width="320" height="44"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <tableViewCellContentView key="contentView" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM"> - <rect key="frame" x="0.0" y="0.0" width="320" height="43.5"/> + <rect key="frame" x="0.0" y="0.0" width="320" height="44"/> <autoresizingMask key="autoresizingMask"/> <subviews> <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="ic_history_label" translatesAutoresizingMaskIntoConstraints="NO" id="k5o-Xw-buz" userLabel="Icon"> @@ -25,27 +21,26 @@ <constraint firstAttribute="width" constant="28" id="jp9-B7-91r"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="coloring" value="MWMBlack"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="MWMBlack"/> </userDefinedRuntimeAttributes> </imageView> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="L0x-sD-vTW" userLabel="Separator"> - <rect key="frame" x="60" y="42.5" width="260" height="1"/> + <rect key="frame" x="60" y="43" width="260" height="1"/> <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.12" colorSpace="custom" customColorSpace="sRGB"/> <constraints> <constraint firstAttribute="height" constant="1" id="bSd-Nh-svm"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="blackDividers"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Divider"/> </userDefinedRuntimeAttributes> </view> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="t8W-bQ-Jgd"> - <rect key="frame" x="60" y="12" width="244" height="19.5"/> + <rect key="frame" x="60" y="12" width="244" height="20"/> <fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="17"/> <color key="textColor" red="0.12941176470588234" green="0.12941176470588234" blue="0.12941176470588234" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <nil key="highlightedColor"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular17"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackSecondaryText"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular17:blackSecondaryText"/> </userDefinedRuntimeAttributes> </label> </subviews> @@ -64,6 +59,7 @@ <connections> <outlet property="queryLabel" destination="t8W-bQ-Jgd" id="bF0-gL-81j"/> </connections> + <point key="canvasLocation" x="139" y="154"/> </tableViewCell> </objects> <resources> diff --git a/iphone/Maps/UI/Search/Tabs/HistoryTab/SearchHistoryViewController.xib b/iphone/Maps/UI/Search/Tabs/HistoryTab/SearchHistoryViewController.xib index eb173c2799..8fa48acd42 100644 --- a/iphone/Maps/UI/Search/Tabs/HistoryTab/SearchHistoryViewController.xib +++ b/iphone/Maps/UI/Search/Tabs/HistoryTab/SearchHistoryViewController.xib @@ -1,11 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> - <device id="retina4_7" orientation="portrait"> - <adaptation id="fullscreen"/> - </device> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> + <device id="retina4_7" orientation="portrait" appearance="light"/> <dependencies> <deployment identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14460.20"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/> <capability name="Safe area layout guides" minToolsVersion="9.0"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> @@ -23,7 +21,7 @@ <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" style="plain" separatorStyle="none" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="cDq-G7-5cR"> - <rect key="frame" x="0.0" y="20" width="375" height="647"/> + <rect key="frame" x="0.0" y="0.0" width="375" height="667"/> <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> <connections> <outlet property="dataSource" destination="-1" id="XhM-2x-4kQ"/> @@ -31,7 +29,7 @@ </connections> </tableView> <view userInteractionEnabled="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="bcr-zs-NMw"> - <rect key="frame" x="27.5" y="183.5" width="320" height="320"/> + <rect key="frame" x="27.5" y="173.5" width="320" height="320"/> <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> <constraints> <constraint firstAttribute="height" constant="320" id="07E-Xc-KMw"/> @@ -50,7 +48,7 @@ </constraints> <viewLayoutGuide key="safeArea" id="vUN-kp-3ea"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Background"/> </userDefinedRuntimeAttributes> <point key="canvasLocation" x="53.600000000000001" y="48.125937031484263"/> </view> diff --git a/iphone/Maps/UI/Search/Tabs/SearchTabViewController.swift b/iphone/Maps/UI/Search/Tabs/SearchTabViewController.swift index d4d787e350..44d5b6de0e 100644 --- a/iphone/Maps/UI/Search/Tabs/SearchTabViewController.swift +++ b/iphone/Maps/UI/Search/Tabs/SearchTabViewController.swift @@ -41,12 +41,6 @@ final class SearchTabViewController: TabViewController { } else { tabView.selectedIndex = activeTab.rawValue } - - tabView.backgroundColor = .pressBackground() - tabView.barTintColor = .primary() - tabView.tintColor = .white() - tabView.headerTextAttributes = [.foregroundColor: UIColor.whitePrimaryText(), - .font: UIFont.medium14()] tabView.delegate = self } diff --git a/iphone/Maps/UI/Settings/Cells/SettingsTableViewLinkCell.swift b/iphone/Maps/UI/Settings/Cells/SettingsTableViewLinkCell.swift index 68c4921a25..c5f4359f99 100644 --- a/iphone/Maps/UI/Settings/Cells/SettingsTableViewLinkCell.swift +++ b/iphone/Maps/UI/Settings/Cells/SettingsTableViewLinkCell.swift @@ -10,11 +10,15 @@ final class SettingsTableViewLinkCell: MWMTableViewCell { self.info?.styleName = "regular17:blackSecondaryText" } - @objc func config(title: String, info: String?) { - backgroundColor = UIColor.white() + override func awakeFromNib() { + super.awakeFromNib() + self.styleName = "Background" + self.title.styleName = "regular17:blackPrimaryText" + self.info.styleName = "regular17:blackSecondaryText" + } + @objc func config(title: String, info: String?) { self.title.text = title - styleTitle() self.info?.text = info self.info?.isHidden = info == nil diff --git a/iphone/Maps/UI/Settings/Cells/SettingsTableViewSelectableCell.swift b/iphone/Maps/UI/Settings/Cells/SettingsTableViewSelectableCell.swift index 6b1274b09c..e9c52721e0 100644 --- a/iphone/Maps/UI/Settings/Cells/SettingsTableViewSelectableCell.swift +++ b/iphone/Maps/UI/Settings/Cells/SettingsTableViewSelectableCell.swift @@ -2,15 +2,13 @@ final class SettingsTableViewSelectableCell: MWMTableViewCell { @IBOutlet fileprivate weak var title: UILabel! - @objc func config(title: String) { - backgroundColor = UIColor.white() - - self.title.text = title - styleTitle() + override func awakeFromNib() { + super.awakeFromNib() + self.styleName = "Background" + self.title.styleName = "regular17:blackPrimaryText" } - fileprivate func styleTitle() { - title.textColor = UIColor.blackPrimaryText() - title.font = UIFont.regular17() + @objc func config(title: String) { + self.title.text = title } } diff --git a/iphone/Maps/UI/Settings/Cells/SettingsTableViewSelectableProgressCell.swift b/iphone/Maps/UI/Settings/Cells/SettingsTableViewSelectableProgressCell.swift index dc13d1aee6..f49197cab2 100644 --- a/iphone/Maps/UI/Settings/Cells/SettingsTableViewSelectableProgressCell.swift +++ b/iphone/Maps/UI/Settings/Cells/SettingsTableViewSelectableProgressCell.swift @@ -3,16 +3,14 @@ final class SettingsTableViewSelectableProgressCell: MWMTableViewCell { @IBOutlet private weak var title: UILabel! @IBOutlet weak var progress: UIActivityIndicatorView! + override func awakeFromNib() { + super.awakeFromNib() + self.title.styleName = "regular17:blackPrimaryText" + } + @objc func config(title: String) { - backgroundColor = UIColor.white() progress.style = UIColor.isNightMode() ? .white : .gray self.title.text = title - styleTitle() - } - - fileprivate func styleTitle() { - title.textColor = UIColor.blackPrimaryText() - title.font = UIFont.regular17() } } diff --git a/iphone/Maps/UI/Settings/Cells/SettingsTableViewSwitchCell.swift b/iphone/Maps/UI/Settings/Cells/SettingsTableViewSwitchCell.swift index 7a2896a42c..5d5825aea9 100644 --- a/iphone/Maps/UI/Settings/Cells/SettingsTableViewSwitchCell.swift +++ b/iphone/Maps/UI/Settings/Cells/SettingsTableViewSwitchCell.swift @@ -28,6 +28,11 @@ final class SettingsTableViewSwitchCell: MWMTableViewCell { set { switchButton.isOn = newValue } } + override func awakeFromNib() { + super.awakeFromNib() + styleTitle() + } + @objc func config(delegate: SettingsTableViewSwitchCellDelegate, title: String, isOn: Bool) { backgroundColor = UIColor.white() @@ -37,7 +42,6 @@ final class SettingsTableViewSwitchCell: MWMTableViewCell { styleTitle() switchButton.isOn = isOn - styleSwitchButton() } @IBAction fileprivate func switchChanged() { @@ -45,11 +49,7 @@ final class SettingsTableViewSwitchCell: MWMTableViewCell { } fileprivate func styleTitle() { - title.textColor = isEnabled ? UIColor.blackPrimaryText() : UIColor.blackSecondaryText() - title.font = UIFont.regular17() - } - - fileprivate func styleSwitchButton() { - switchButton.onTintColor = UIColor.linkBlue() + let style = "regular17:" + (isEnabled ? "blackPrimaryText" : "blackSecondaryText") + title.setStyleAndApply(style) } } diff --git a/iphone/Maps/UI/Settings/DrivingOptions.storyboard b/iphone/Maps/UI/Settings/DrivingOptions.storyboard index 8fe1ebba8a..2d98a6e50b 100644 --- a/iphone/Maps/UI/Settings/DrivingOptions.storyboard +++ b/iphone/Maps/UI/Settings/DrivingOptions.storyboard @@ -1,11 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="8YO-Xx-cAh"> - <device id="retina4_7" orientation="portrait"> - <adaptation id="fullscreen"/> - </device> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="8YO-Xx-cAh"> + <device id="retina4_7" orientation="portrait" appearance="light"/> <dependencies> <deployment identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14490.49"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> <scenes> @@ -24,18 +22,16 @@ <rect key="frame" x="0.0" y="55.5" width="375" height="44"/> <autoresizingMask key="autoresizingMask"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="YrA-ve-xPG" id="gKI-YE-akp"> - <rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/> + <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="Avoid toll roads" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="13" translatesAutoresizingMaskIntoConstraints="NO" id="PKT-Eh-l9Q"> - <rect key="frame" x="16" y="11.5" width="286" height="20.5"/> + <rect key="frame" x="16" y="12" width="286" height="20.5"/> <inset key="insetFor6xAndEarlier" minX="0.0" minY="0.0" maxX="-25" maxY="0.0"/> <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="avoid_tolls"/> </userDefinedRuntimeAttributes> </label> @@ -63,18 +59,16 @@ <rect key="frame" x="0.0" y="99.5" width="375" height="44"/> <autoresizingMask key="autoresizingMask"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Edm-gG-iZL" id="mIt-Ku-xiU"> - <rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/> + <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="Avoid unpaved roads" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="13" translatesAutoresizingMaskIntoConstraints="NO" id="v9t-VR-YwE"> - <rect key="frame" x="16" y="11.5" width="286" height="20.5"/> + <rect key="frame" x="16" y="12" width="286" height="20.5"/> <inset key="insetFor6xAndEarlier" minX="0.0" minY="0.0" maxX="-25" maxY="0.0"/> <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="avoid_unpaved"/> </userDefinedRuntimeAttributes> </label> @@ -102,18 +96,16 @@ <rect key="frame" x="0.0" y="143.5" width="375" height="44"/> <autoresizingMask key="autoresizingMask"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="ZqG-Fn-9Da" id="7US-xU-xAU"> - <rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/> + <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="Avoid ferry crossings" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="13" translatesAutoresizingMaskIntoConstraints="NO" id="cIW-w0-eCH"> - <rect key="frame" x="16" y="11.5" width="286" height="20.5"/> + <rect key="frame" x="16" y="12" width="286" height="20.5"/> <inset key="insetFor6xAndEarlier" minX="0.0" minY="0.0" maxX="-25" maxY="0.0"/> <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="avoid_ferry"/> </userDefinedRuntimeAttributes> </label> @@ -141,18 +133,16 @@ <rect key="frame" x="0.0" y="187.5" width="375" height="44"/> <autoresizingMask key="autoresizingMask"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="EZ7-Gy-8aA" id="6ee-yF-kGr"> - <rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/> + <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="Avoid motorways" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="13" translatesAutoresizingMaskIntoConstraints="NO" id="L5B-JN-YBU"> - <rect key="frame" x="16" y="11.5" width="286" height="20.5"/> + <rect key="frame" x="16" y="12" width="286" height="20.5"/> <inset key="insetFor6xAndEarlier" minX="0.0" minY="0.0" maxX="-25" maxY="0.0"/> <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="avoid_motorways"/> </userDefinedRuntimeAttributes> </label> diff --git a/iphone/Maps/UI/Settings/MWMAboutControllerHeader.xib b/iphone/Maps/UI/Settings/MWMAboutControllerHeader.xib index 1df764317c..9269a7f4df 100644 --- a/iphone/Maps/UI/Settings/MWMAboutControllerHeader.xib +++ b/iphone/Maps/UI/Settings/MWMAboutControllerHeader.xib @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES"> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES"> <device id="retina4_7" orientation="portrait" appearance="light"/> <dependencies> <deployment identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15510"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> <objects> @@ -15,7 +15,7 @@ </connections> </placeholder> <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/> - <view contentMode="scaleToFill" id="nNn-As-qvg" propertyAccessControl="all"> + <view contentMode="scaleToFill" id="nNn-As-qvg" propertyAccessControl="none"> <rect key="frame" x="0.0" y="0.0" width="375" height="276"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <subviews> @@ -32,8 +32,7 @@ <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="medium17"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="medium17:blackPrimaryText"/> </userDefinedRuntimeAttributes> </label> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" verticalCompressionResistancePriority="1000" text="Дата 16.08.2016" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2UY-CN-bbR"> @@ -42,8 +41,7 @@ <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="blackSecondaryText"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular13"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular13:blackSecondaryText"/> </userDefinedRuntimeAttributes> </label> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" verticalCompressionResistancePriority="1000" text="Объединив усилия Mail.Ru Group и данные OpenStreetMap, мы создаем незаменимое приложение для путешествий." textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="GEL-Bz-rHg"> @@ -52,8 +50,7 @@ <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="regular13"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular13:blackPrimaryText"/> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="about_description"/> </userDefinedRuntimeAttributes> </label> @@ -74,7 +71,7 @@ </constraints> <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="pressBackground"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="PressBackground"/> </userDefinedRuntimeAttributes> <point key="canvasLocation" x="131" y="-39"/> </view> diff --git a/iphone/Maps/UI/Settings/MWMTTSLanguageViewController.mm b/iphone/Maps/UI/Settings/MWMTTSLanguageViewController.mm index 46e2e01f71..3a8e242b73 100644 --- a/iphone/Maps/UI/Settings/MWMTTSLanguageViewController.mm +++ b/iphone/Maps/UI/Settings/MWMTTSLanguageViewController.mm @@ -11,7 +11,6 @@ static NSString * const kUnwingSegueIdentifier = @"UnwindToTTSSettings"; { [super viewDidLoad]; self.title = L(@"pref_tts_other_section_title"); - self.tableView.separatorColor = [UIColor blackDividers]; } - (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(SettingsTableViewSelectableCell *)sender diff --git a/iphone/Maps/UI/Settings/MWMTTSSettingsViewController.mm b/iphone/Maps/UI/Settings/MWMTTSSettingsViewController.mm index 419a6c4d62..f046853544 100644 --- a/iphone/Maps/UI/Settings/MWMTTSSettingsViewController.mm +++ b/iphone/Maps/UI/Settings/MWMTTSSettingsViewController.mm @@ -251,7 +251,6 @@ struct FAQCellStrategy : BaseCellStategy { [super viewDidLoad]; self.title = L(@"pref_tts_enable_title"); - self.tableView.separatorColor = [UIColor blackDividers]; MWMTextToSpeech * tts = [MWMTextToSpeech tts]; m_languages.reserve(3); diff --git a/iphone/Maps/UI/Storyboard/Authorization.storyboard b/iphone/Maps/UI/Storyboard/Authorization.storyboard index 4b5fa12b5e..deed70f9e6 100644 --- a/iphone/Maps/UI/Storyboard/Authorization.storyboard +++ b/iphone/Maps/UI/Storyboard/Authorization.storyboard @@ -1,9 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14868" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> - <device id="retina4_7" orientation="portrait" appearance="light"/> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15705" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> <dependencies> - <deployment identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14824"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15706"/> <capability name="Safe area layout guides" minToolsVersion="9.0"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> @@ -13,68 +11,66 @@ <objects> <viewController storyboardIdentifier="UIViewController-4R7-Vk-fQr" id="4R7-Vk-fQr" customClass="MWMAuthorizationOSMLoginViewController" sceneMemberID="viewController"> <view key="view" contentMode="scaleToFill" id="S9T-iq-RN6"> - <rect key="frame" x="0.0" y="0.0" width="375" height="667"/> + <rect key="frame" x="0.0" y="0.0" width="600" height="600"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="2p5-BG-sgS"> - <rect key="frame" x="0.0" y="20" width="375" height="88"/> + <rect key="frame" x="0.0" y="20" width="600" height="88"/> <subviews> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="8t7-Lb-1dX" userLabel="Separator #1"> - <rect key="frame" x="0.0" y="0.0" width="375" height="1"/> + <rect key="frame" x="0.0" y="0.0" width="600" height="1"/> <color key="backgroundColor" red="0.66666666666666663" green="0.66666666666666663" blue="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <constraints> <constraint firstAttribute="height" constant="1" id="UWu-iu-DyB"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="blackDividers"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Divider"/> </userDefinedRuntimeAttributes> </view> <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="NyD-Tz-Vq4"> - <rect key="frame" x="16" y="1" width="343" height="44.5"/> + <rect key="frame" x="16" y="1" width="568" height="44.5"/> <fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="17"/> <textInputTraits key="textInputTraits" autocorrectionType="no" spellCheckingType="no" keyboardType="emailAddress"/> <userDefinedRuntimeAttributes> <userDefinedRuntimeAttribute type="string" keyPath="localizedPlaceholder" value="email_or_username"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular17"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular17:blackPrimaryText"/> <userDefinedRuntimeAttribute type="string" keyPath="validatorName" value="MWMInputLoginValidator"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/> </userDefinedRuntimeAttributes> <connections> <outlet property="delegate" destination="4R7-Vk-fQr" id="koP-R3-XiP"/> </connections> </textField> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Xl1-50-Vih" userLabel="Separator #2"> - <rect key="frame" x="16" y="43.5" width="359" height="1"/> + <rect key="frame" x="16" y="43.5" width="584" height="1"/> <color key="backgroundColor" red="0.66666666666666663" green="0.66666666666666663" blue="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <constraints> <constraint firstAttribute="height" constant="1" id="vvu-MV-Pff"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="blackDividers"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Divider"/> </userDefinedRuntimeAttributes> </view> <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="e51-Qs-t6a"> - <rect key="frame" x="16" y="44.5" width="343" height="43.5"/> + <rect key="frame" x="16" y="44.5" width="568" height="43.5"/> <fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="17"/> <textInputTraits key="textInputTraits" autocorrectionType="no" spellCheckingType="no" secureTextEntry="YES"/> <userDefinedRuntimeAttributes> <userDefinedRuntimeAttribute type="string" keyPath="localizedPlaceholder" value="password_8_chars_min"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular17"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular17:blackPrimaryText"/> <userDefinedRuntimeAttribute type="string" keyPath="validatorName" value="MWMInputPasswordValidator"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/> </userDefinedRuntimeAttributes> <connections> <outlet property="delegate" destination="4R7-Vk-fQr" id="QBg-oI-jcp"/> </connections> </textField> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="8Dm-Lz-QG7" userLabel="Separator #3"> - <rect key="frame" x="0.0" y="87" width="375" height="1"/> + <rect key="frame" x="0.0" y="87" width="600" height="1"/> <color key="backgroundColor" red="0.66666666666666663" green="0.66666666666666663" blue="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <constraints> <constraint firstAttribute="height" constant="1" id="twL-Z5-mey"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="blackDividers"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Divider"/> </userDefinedRuntimeAttributes> </view> </subviews> @@ -100,47 +96,32 @@ <constraint firstItem="e51-Qs-t6a" firstAttribute="top" secondItem="Xl1-50-Vih" secondAttribute="top" constant="1" id="zdA-r9-J51"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Background"/> </userDefinedRuntimeAttributes> </view> <button opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="QoF-Wv-nc2"> - <rect key="frame" x="16" y="128" width="343" height="44"/> + <rect key="frame" x="16" y="128" width="568" height="44"/> <constraints> <constraint firstAttribute="height" constant="44" id="g9P-gK-jg8"/> </constraints> <fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="17"/> <state key="normal" title="Log In"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="number" keyPath="layer.borderWidth"> - <integer key="value" value="1"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="color" keyPath="layer.borderUIColor"> - <color key="value" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular17"/> - <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius"> - <integer key="value" value="8"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="string" keyPath="textColorName" value="white"/> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="linkBlue"/> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundHighlightedColorName" value="linkBlueHighlighted"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="FlatNormalButton"/> </userDefinedRuntimeAttributes> <connections> <action selector="login" destination="4R7-Vk-fQr" eventType="touchUpInside" id="IIp-Wz-gj1"/> </connections> </button> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="dOX-WF-oyI"> - <rect key="frame" x="16" y="184" width="343" height="44"/> + <rect key="frame" x="16" y="184" width="568" height="44"/> <constraints> <constraint firstAttribute="height" constant="44" id="SFg-uo-s0U"/> </constraints> <fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="17"/> <state key="normal" title="Forgot Password"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular17"/> - <userDefinedRuntimeAttribute type="string" keyPath="textColorName" value="linkBlue"/> - <userDefinedRuntimeAttribute type="string" keyPath="textColorHighlightedName" value="linkBlueHighlighted"/> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="clearColor"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="FlatNormalButtonBig"/> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="forgot_password"/> </userDefinedRuntimeAttributes> <connections> @@ -148,7 +129,7 @@ </connections> </button> <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="jMt-5d-INe"> - <rect key="frame" x="177.5" y="140" width="20" height="20"/> + <rect key="frame" x="290" y="140" width="20" height="20"/> <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/> <constraints> <constraint firstAttribute="height" constant="20" id="9HJ-T7-PfS"/> @@ -172,7 +153,7 @@ </constraints> <viewLayoutGuide key="safeArea" id="UfV-5d-yA3"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="pressBackground"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="PressBackground"/> </userDefinedRuntimeAttributes> </view> <navigationItem key="navigationItem" id="8bw-ck-hd0"> @@ -199,14 +180,14 @@ <objects> <viewController storyboardIdentifier="AuthorizationLoginViewController" id="iZ6-Zi-bkZ" customClass="MWMAuthorizationLoginViewController" sceneMemberID="viewController"> <view key="view" contentMode="scaleToFill" id="i64-CY-UO1"> - <rect key="frame" x="0.0" y="0.0" width="375" height="667"/> + <rect key="frame" x="0.0" y="0.0" width="600" height="600"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="S0n-BM-V4o" userLabel="Auth view"> - <rect key="frame" x="20" y="96" width="335" height="248.5"/> + <rect key="frame" x="20" y="96" width="560" height="248.5"/> <subviews> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="tzz-yF-441"> - <rect key="frame" x="0.0" y="0.0" width="335" height="40"/> + <rect key="frame" x="0.0" y="0.0" width="560" height="40"/> <constraints> <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="20" id="sq5-AS-HML"/> </constraints> @@ -216,32 +197,22 @@ <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <nil key="highlightedColor"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="medium17"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="whitePrimaryText"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="medium17:whitePrimaryText"/> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="login_to_make_edits_visible"/> </userDefinedRuntimeAttributes> </label> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="MzH-tk-9iS" userLabel="Google btn"> - <rect key="frame" x="0.0" y="56" width="161.5" height="44"/> + <rect key="frame" x="0.0" y="56" width="274" height="44"/> <subviews> <button opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="cT8-b7-zTj"> - <rect key="frame" x="0.0" y="0.0" width="161.5" height="44"/> + <rect key="frame" x="0.0" y="0.0" width="274" height="44"/> <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <inset key="titleEdgeInsets" minX="20" minY="0.0" maxX="0.0" maxY="0.0"/> <state key="normal" title="Google"> <color key="titleColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> </state> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular17"/> - <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius"> - <integer key="value" value="8"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="number" keyPath="layer.borderWidth"> - <integer key="value" value="1"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="color" keyPath="layer.borderUIColor"> - <color key="value" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/> - </userDefinedRuntimeAttribute> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="OsmSocialLoginButton"/> </userDefinedRuntimeAttributes> <connections> <action selector="loginGoogle" destination="iZ6-Zi-bkZ" eventType="touchUpInside" id="ozK-l5-X1m"/> @@ -267,24 +238,15 @@ </constraints> </view> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="y6o-0o-dz7" userLabel="FB btn"> - <rect key="frame" x="173.5" y="56" width="161.5" height="44"/> + <rect key="frame" x="286" y="56" width="274" height="44"/> <subviews> <button opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="U4B-pb-aFf"> - <rect key="frame" x="0.0" y="0.0" width="161.5" height="44"/> + <rect key="frame" x="0.0" y="0.0" width="274" height="44"/> <color key="backgroundColor" red="0.026881167763157895" green="0.0" blue="0.93857935855263153" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <inset key="titleEdgeInsets" minX="20" minY="0.0" maxX="0.0" maxY="0.0"/> <state key="normal" title="Facebook"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular17"/> - <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius"> - <integer key="value" value="8"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="number" keyPath="layer.borderWidth"> - <integer key="value" value="1"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="color" keyPath="layer.borderUIColor"> - <color key="value" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/> - </userDefinedRuntimeAttribute> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="OsmSocialLoginButton"/> </userDefinedRuntimeAttributes> <connections> <action selector="loginFacebook" destination="iZ6-Zi-bkZ" eventType="touchUpInside" id="osd-dp-2jK"/> @@ -310,30 +272,21 @@ </constraints> </view> <button opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Gqm-JS-hos"> - <rect key="frame" x="0.0" y="112" width="335" height="44"/> + <rect key="frame" x="0.0" y="112" width="560" height="44"/> <color key="backgroundColor" red="0.0" green="0.47843137250000001" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <constraints> <constraint firstAttribute="height" constant="44" id="BfT-9z-7iV"/> </constraints> <state key="normal" title="OpenStreetMap"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular17"/> - <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius"> - <integer key="value" value="8"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="number" keyPath="layer.borderWidth"> - <integer key="value" value="1"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="color" keyPath="layer.borderUIColor"> - <color key="value" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/> - </userDefinedRuntimeAttribute> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="FlatNormalButtonBig"/> </userDefinedRuntimeAttributes> <connections> <action selector="loginOSM" destination="iZ6-Zi-bkZ" eventType="touchUpInside" id="U8A-dL-xzX"/> </connections> </button> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Don't have OpenStreetMap account?" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="nhm-W1-U8A"> - <rect key="frame" x="0.0" y="180" width="335" height="16.5"/> + <rect key="frame" x="0.0" y="180" width="560" height="16.5"/> <constraints> <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="16" id="ntS-Lm-ZFB"/> </constraints> @@ -341,22 +294,18 @@ <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <nil key="highlightedColor"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular14"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="whitePrimaryText"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular14:whitePrimaryText"/> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="no_osm_account"/> </userDefinedRuntimeAttributes> </label> <button opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="s0p-dL-PG8"> - <rect key="frame" x="0.0" y="204.5" width="335" height="44"/> + <rect key="frame" x="0.0" y="204.5" width="560" height="44"/> <constraints> <constraint firstAttribute="height" constant="44" id="4EG-ux-LH6"/> </constraints> <state key="normal" title="Sign Up Now"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular17"/> - <userDefinedRuntimeAttribute type="string" keyPath="textColorName" value="whitePrimaryText"/> - <userDefinedRuntimeAttribute type="string" keyPath="textColorHighlightedName" value="whitePrimaryTextHighlighted"/> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="clearColor"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular17:whitePrimaryText"/> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="register_at_openstreetmap"/> </userDefinedRuntimeAttributes> <connections> @@ -388,13 +337,13 @@ </constraints> </view> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="qZp-mj-lui" userLabel="Account view"> - <rect key="frame" x="0.0" y="0.0" width="375" height="667"/> + <rect key="frame" x="0.0" y="0.0" width="600" height="600"/> <subviews> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="WGF-rs-oH8" userLabel="Main view"> - <rect key="frame" x="0.0" y="0.0" width="375" height="212"/> + <rect key="frame" x="0.0" y="0.0" width="600" height="212"/> <subviews> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="−−−" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="5mN-XO-0Df"> - <rect key="frame" x="16" y="32" width="343" height="114"/> + <rect key="frame" x="16" y="32" width="568" height="114"/> <constraints> <constraint firstAttribute="height" constant="114" id="LK9-Pd-uVa"> <variation key="heightClass=compact" constant="67"/> @@ -404,31 +353,29 @@ <color key="textColor" red="0.96078431369999995" green="0.96078431369999995" blue="0.96078431369999995" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <nil key="highlightedColor"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="whitePrimaryText"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="whitePrimaryText"/> </userDefinedRuntimeAttributes> <variation key="heightClass=compact"> <fontDescription key="fontDescription" type="boldSystem" pointSize="56"/> </variation> </label> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="VERIFIED CHANGES" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="61G-Rv-3df"> - <rect key="frame" x="119" y="146" width="137" height="17"/> + <rect key="frame" x="231.5" y="146" width="137" height="17"/> <fontDescription key="fontDescription" type="boldSystem" pointSize="14"/> <color key="textColor" red="0.96078431369999995" green="0.96078431369999995" blue="0.96078431369999995" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <nil key="highlightedColor"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="bold14"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="whitePrimaryText"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="bold14:whitePrimaryText"/> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="editor_profile_changes"/> </userDefinedRuntimeAttributes> </label> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Last send 12.01.2015" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2UV-ZB-sPO"> - <rect key="frame" x="128" y="171" width="119" height="15"/> + <rect key="frame" x="240.5" y="171" width="119" height="15"/> <fontDescription key="fontDescription" type="system" pointSize="12"/> <color key="textColor" red="1" green="1" blue="1" alpha="0.40000000000000002" colorSpace="custom" customColorSpace="sRGB"/> <nil key="highlightedColor"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular12"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="whitePrimaryText"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular12:whitePrimaryText"/> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="last_upload"/> </userDefinedRuntimeAttributes> </label> @@ -449,21 +396,21 @@ </constraint> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="primary"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="PrimaryBackground"/> </userDefinedRuntimeAttributes> </view> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="7f3-Rm-QqW" userLabel="Detailed info"> - <rect key="frame" x="0.0" y="248" width="375" height="64"/> + <rect key="frame" x="0.0" y="248" width="600" height="64"/> <subviews> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="wNF-fp-3SQ" userLabel="Separator1"> - <rect key="frame" x="0.0" y="0.0" width="375" height="1"/> + <rect key="frame" x="0.0" y="0.0" width="600" height="1"/> <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.12" colorSpace="custom" customColorSpace="sRGB"/> <constraints> <constraint firstAttribute="height" constant="1" id="xWE-J3-mMV"/> </constraints> </view> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Syo-FZ-kms" userLabel="Separator2"> - <rect key="frame" x="0.0" y="63" width="375" height="1"/> + <rect key="frame" x="0.0" y="63" width="600" height="1"/> <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.12" colorSpace="custom" customColorSpace="sRGB"/> <constraints> <constraint firstAttribute="height" constant="1" id="EB6-Py-4TW"/> @@ -475,8 +422,7 @@ <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="fontName" value="medium28"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackSecondaryText"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="medium28:blackSecondaryText"/> </userDefinedRuntimeAttributes> </label> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Your Place" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ksi-Oz-YxU"> @@ -485,8 +431,7 @@ <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.87" colorSpace="custom" customColorSpace="sRGB"/> <nil key="highlightedColor"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="medium17"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="medium17:blackPrimaryText"/> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="editor_profile_rating_place"/> </userDefinedRuntimeAttributes> </label> @@ -496,8 +441,7 @@ <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="fontName" value="regular14"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackSecondaryText"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular14:blackSecondaryText"/> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="editor_profile_rating_place"/> </userDefinedRuntimeAttributes> </label> @@ -520,20 +464,18 @@ <constraint firstItem="ksi-Oz-YxU" firstAttribute="top" secondItem="7f3-Rm-QqW" secondAttribute="top" priority="500" constant="12" id="w48-Zm-FvN"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="menuBackground"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="MenuBackground"/> </userDefinedRuntimeAttributes> </view> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="bottom" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="7m7-zW-Tcq"> - <rect key="frame" x="20" y="627" width="335" height="20"/> + <rect key="frame" x="20" y="560" width="560" height="20"/> <constraints> <constraint firstAttribute="height" constant="20" id="Z6L-ma-g9a"/> </constraints> <state key="normal" title="More about OpenStreetMap"/> <userDefinedRuntimeAttributes> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="editor_more_about_osm"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular14"/> - <userDefinedRuntimeAttribute type="string" keyPath="textColorName" value="linkBlue"/> - <userDefinedRuntimeAttribute type="string" keyPath="textColorHighlightedName" value="linkBlueHighlighted"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="FlatNormalTransButton"/> </userDefinedRuntimeAttributes> <connections> <action selector="osmTap" destination="iZ6-Zi-bkZ" eventType="touchUpInside" id="BXZ-nq-gjL"/> @@ -557,7 +499,7 @@ </constraint> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="pressBackground"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="PressBackground"/> </userDefinedRuntimeAttributes> </view> </subviews> @@ -576,7 +518,7 @@ </constraints> <viewLayoutGuide key="safeArea" id="SaE-2i-TVp"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="primary"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="PrimaryBackground"/> </userDefinedRuntimeAttributes> </view> <connections> @@ -604,18 +546,18 @@ <objects> <viewController storyboardIdentifier="UIViewController-anB-7S-ebY" id="anB-7S-ebY" customClass="MWMAuthorizationWebViewLoginViewController" sceneMemberID="viewController"> <view key="view" contentMode="scaleToFill" id="2u2-L2-Hb3"> - <rect key="frame" x="0.0" y="0.0" width="375" height="667"/> + <rect key="frame" x="0.0" y="0.0" width="600" height="600"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> <webView contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Iae-5m-9Z1"> - <rect key="frame" x="0.0" y="0.0" width="375" height="667"/> + <rect key="frame" x="0.0" y="0.0" width="600" height="600"/> <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/> <connections> <outlet property="delegate" destination="anB-7S-ebY" id="EDW-sZ-Oem"/> </connections> </webView> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="WWh-HK-7a5"> - <rect key="frame" x="167.5" y="313.5" width="40" height="40"/> + <rect key="frame" x="280" y="280" width="40" height="40"/> <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/> <constraints> <constraint firstAttribute="width" constant="40" id="4e7-ir-1vf"/> diff --git a/iphone/Maps/UI/Storyboard/Main.storyboard b/iphone/Maps/UI/Storyboard/Main.storyboard index ec32465c64..17ccdfa06e 100644 --- a/iphone/Maps/UI/Storyboard/Main.storyboard +++ b/iphone/Maps/UI/Storyboard/Main.storyboard @@ -1,9 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="Wns-nH-AQU"> - <device id="retina4_7" orientation="portrait" appearance="light"/> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15705" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="Wns-nH-AQU"> <dependencies> - <deployment identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15510"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15706"/> <capability name="Safe area layout guides" minToolsVersion="9.0"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> @@ -13,49 +11,49 @@ <objects> <viewController id="xTf-lf-yxN" customClass="MapViewController" sceneMemberID="viewController"> <view key="view" clearsContextBeforeDrawing="NO" multipleTouchEnabled="YES" contentMode="scaleToFill" id="USG-6L-Uhw"> - <rect key="frame" x="0.0" y="0.0" width="375" height="667"/> + <rect key="frame" x="0.0" y="0.0" width="600" height="600"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> <imageView hidden="YES" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="ic_carplay_activated" translatesAutoresizingMaskIntoConstraints="NO" id="Tqh-46-Yrm"> - <rect key="frame" x="107.5" y="253.5" width="160" height="160"/> + <rect key="frame" x="220" y="220" width="160" height="160"/> <constraints> <constraint firstAttribute="height" constant="160" id="dkE-Cj-sE5"/> <constraint firstAttribute="width" constant="160" id="pz7-lu-Ocm"/> </constraints> </imageView> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="aPn-pa-nCx" customClass="EAGLView"> - <rect key="frame" x="0.0" y="0.0" width="375" height="667"/> + <rect key="frame" x="0.0" y="0.0" width="600" height="600"/> <color key="backgroundColor" red="0.8666666666666667" green="0.8666666666666667" blue="0.80000000000000004" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> </view> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="rL1-9E-4b7"> - <rect key="frame" x="0.0" y="0.0" width="375" height="667"/> + <rect key="frame" x="0.0" y="0.0" width="600" height="600"/> <subviews> <view hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="65S-M4-TnM" customClass="NavigationInfoArea" customModule="maps_me" customModuleProvider="target"> - <rect key="frame" x="0.0" y="0.0" width="375" height="667"/> + <rect key="frame" x="0.0" y="0.0" width="600" height="600"/> <color key="backgroundColor" red="0.0" green="0.0" blue="1" alpha="0.20000000000000001" colorSpace="calibratedRGB"/> </view> <view hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="TdT-ia-GP9" customClass="MenuArea" customModule="maps_me" customModuleProvider="target"> - <rect key="frame" x="0.0" y="0.0" width="375" height="667"/> + <rect key="frame" x="0.0" y="0.0" width="600" height="600"/> <color key="backgroundColor" red="0.0" green="0.0" blue="1" alpha="0.20000000000000001" colorSpace="calibratedRGB"/> </view> <view hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="awj-9E-eBS" customClass="PlacePageArea" customModule="maps_me" customModuleProvider="target"> - <rect key="frame" x="0.0" y="0.0" width="375" height="667"/> + <rect key="frame" x="0.0" y="0.0" width="600" height="600"/> <color key="backgroundColor" red="1" green="0.0" blue="0.0" alpha="0.20000000000000001" colorSpace="calibratedRGB"/> </view> <view hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="FFY-Dy-Wou" customClass="VisibleArea" customModule="maps_me" customModuleProvider="target"> - <rect key="frame" x="0.0" y="0.0" width="375" height="667"/> + <rect key="frame" x="0.0" y="0.0" width="600" height="600"/> <color key="backgroundColor" red="0.0" green="1" blue="0.0" alpha="0.20000000000000001" colorSpace="calibratedRGB"/> </view> <view hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="NI8-tV-i2B" customClass="WidgetsArea" customModule="maps_me" customModuleProvider="target"> - <rect key="frame" x="0.0" y="0.0" width="375" height="667"/> + <rect key="frame" x="0.0" y="0.0" width="600" height="600"/> <color key="backgroundColor" red="0.0" green="1" blue="0.0" alpha="0.20000000000000001" colorSpace="calibratedRGB"/> </view> <view hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="xJx-UU-IdV" customClass="SideButtonsArea" customModule="maps_me" customModuleProvider="target"> - <rect key="frame" x="0.0" y="0.0" width="375" height="667"/> + <rect key="frame" x="0.0" y="0.0" width="600" height="600"/> <color key="backgroundColor" red="0.0" green="0.0" blue="1" alpha="0.20000000000000001" colorSpace="calibratedRGB"/> </view> <view hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="QKu-4A-UgP" customClass="TrafficButtonArea" customModule="maps_me" customModuleProvider="target"> - <rect key="frame" x="0.0" y="0.0" width="375" height="667"/> + <rect key="frame" x="0.0" y="0.0" width="600" height="600"/> <color key="backgroundColor" red="0.0" green="1" blue="0.0" alpha="0.20000000000000001" colorSpace="calibratedRGB"/> </view> </subviews> @@ -183,6 +181,7 @@ <navigationController automaticallyAdjustsScrollViewInsets="NO" navigationBarHidden="YES" id="Wns-nH-AQU" customClass="MWMNavigationController" sceneMemberID="viewController"> <toolbarItems/> <navigationBar key="navigationBar" contentMode="scaleToFill" id="OK2-RC-YDq"> + <rect key="frame" x="0.0" y="0.0" width="1000" height="1000"/> <autoresizingMask key="autoresizingMask"/> </navigationBar> <nil name="viewControllers"/> @@ -199,7 +198,7 @@ <objects> <tableViewController id="lFr-lA-JTW" customClass="MWMEditBookmarkController" sceneMemberID="viewController"> <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" keyboardDismissMode="interactive" dataMode="prototypes" style="grouped" separatorStyle="default" rowHeight="44" sectionHeaderHeight="18" sectionFooterHeight="18" id="Rb3-ea-7LJ"> - <rect key="frame" x="0.0" y="0.0" width="375" height="667"/> + <rect key="frame" x="0.0" y="0.0" width="600" height="600"/> <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"/> <connections> @@ -219,7 +218,7 @@ <navigationController id="Psz-BY-Fy4" customClass="MWMNavigationController" sceneMemberID="viewController"> <value key="contentSizeForViewInPopover" type="size" width="600" height="600"/> <navigationBar key="navigationBar" contentMode="scaleToFill" id="SUN-3A-xgM"> - <rect key="frame" x="0.0" y="0.0" width="375" height="56"/> + <rect key="frame" x="0.0" y="0.0" width="414" height="56"/> <autoresizingMask key="autoresizingMask"/> </navigationBar> <connections> @@ -235,7 +234,7 @@ <objects> <tableViewController id="Lfa-Zp-orR" customClass="MWMEditorViewController" sceneMemberID="viewController"> <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" keyboardDismissMode="interactive" dataMode="prototypes" style="grouped" separatorStyle="default" rowHeight="44" sectionHeaderHeight="18" sectionFooterHeight="18" id="HU6-ak-Eu1"> - <rect key="frame" x="0.0" y="0.0" width="375" height="667"/> + <rect key="frame" x="0.0" y="0.0" width="600" height="600"/> <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"/> <connections> @@ -261,14 +260,14 @@ <objects> <viewController id="Ld6-gM-2hk" customClass="MWMOpeningHoursEditorViewController" sceneMemberID="viewController"> <view key="view" contentMode="scaleToFill" id="U1f-hD-9rl"> - <rect key="frame" x="0.0" y="0.0" width="375" height="667"/> + <rect key="frame" x="0.0" y="0.0" width="600" height="600"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" keyboardDismissMode="interactive" dataMode="prototypes" style="grouped" separatorStyle="none" rowHeight="44" sectionHeaderHeight="18" sectionFooterHeight="18" translatesAutoresizingMaskIntoConstraints="NO" id="X1H-IB-Nv1"> - <rect key="frame" x="0.0" y="0.0" width="375" height="623"/> + <rect key="frame" x="0.0" y="0.0" width="600" height="556"/> <color key="backgroundColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="pressBackground"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="PressBackground"/> </userDefinedRuntimeAttributes> <connections> <outlet property="dataSource" destination="Ld6-gM-2hk" id="ai8-Pg-tCM"/> @@ -276,10 +275,10 @@ </connections> </tableView> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="aQv-7U-zAP"> - <rect key="frame" x="0.0" y="0.0" width="375" height="623"/> + <rect key="frame" x="0.0" y="0.0" width="600" height="556"/> <subviews> <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" textAlignment="natural" translatesAutoresizingMaskIntoConstraints="NO" id="PrH-u2-IEv" userLabel="Editor View" customClass="MWMTextView"> - <rect key="frame" x="0.0" y="36" width="375" height="88"/> + <rect key="frame" x="0.0" y="36" width="600" height="88"/> <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <constraints> <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="88" id="oAE-yX-hVe"/> @@ -288,56 +287,54 @@ <fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="14"/> <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular17"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Background:regular17:blackPrimaryText"/> <userDefinedRuntimeAttribute type="string" keyPath="localizedPlaceholder" value="editor_time_title"/> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/> </userDefinedRuntimeAttributes> <connections> <outlet property="delegate" destination="Ld6-gM-2hk" id="Ewa-a5-hAF"/> </connections> </textView> <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="separator_image" translatesAutoresizingMaskIntoConstraints="NO" id="z2Z-G2-Np7"> - <rect key="frame" x="0.0" y="35" width="375" height="1"/> + <rect key="frame" x="0.0" y="35" width="600" height="1"/> <constraints> <constraint firstAttribute="height" constant="1" id="xUX-ck-MQb"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="coloring" value="MWMSeparator"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="MWMSeparator"/> </userDefinedRuntimeAttributes> </imageView> <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="separator_image" translatesAutoresizingMaskIntoConstraints="NO" id="ebA-fW-ddJ"> - <rect key="frame" x="0.0" y="123" width="375" height="1"/> + <rect key="frame" x="0.0" y="123" width="600" height="1"/> <constraints> <constraint firstAttribute="height" constant="1" id="HOj-tZ-b3F"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="coloring" value="MWMSeparator"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="MWMSeparator"/> </userDefinedRuntimeAttributes> </imageView> <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="separator_image" translatesAutoresizingMaskIntoConstraints="NO" id="5T5-Pp-hb5"> - <rect key="frame" x="0.0" y="578" width="375" height="1"/> + <rect key="frame" x="0.0" y="511" width="600" height="1"/> <constraints> <constraint firstAttribute="height" constant="1" id="ZXK-zv-uSz"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="coloring" value="MWMSeparator"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="MWMSeparator"/> </userDefinedRuntimeAttributes> </imageView> <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="separator_image" translatesAutoresizingMaskIntoConstraints="NO" id="IX2-yp-0oa"> - <rect key="frame" x="0.0" y="164" width="375" height="1"/> + <rect key="frame" x="0.0" y="164" width="600" height="1"/> <constraints> <constraint firstAttribute="height" constant="1" id="rD4-fE-ez2"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="coloring" value="MWMSeparator"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="MWMSeparator"/> </userDefinedRuntimeAttributes> </imageView> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="85Z-MR-kUV" userLabel="Help View"> - <rect key="frame" x="0.0" y="164" width="375" height="328"/> + <rect key="frame" x="0.0" y="164" width="600" height="328"/> <subviews> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="n79-h1-Nk3" userLabel="Button"> - <rect key="frame" x="0.0" y="0.0" width="375" height="44"/> + <rect key="frame" x="0.0" y="0.0" width="600" height="44"/> <subviews> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Example values" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="120" translatesAutoresizingMaskIntoConstraints="NO" id="dAM-iT-fzu"> <rect key="frame" x="16" y="12" width="120" height="20"/> @@ -345,32 +342,31 @@ <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="styleName" value="regular17:blackPrimaryText"/> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="editor_example_values"/> </userDefinedRuntimeAttributes> </label> <imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="ic_arrow_gray_down" translatesAutoresizingMaskIntoConstraints="NO" id="m7d-sG-5LN"> - <rect key="frame" x="343" y="10" width="24" height="24"/> + <rect key="frame" x="568" y="10" width="24" height="24"/> <constraints> <constraint firstAttribute="height" constant="24" id="2aF-WV-ER2"/> <constraint firstAttribute="width" constant="24" id="eak-KY-Xaa"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="coloring" value="MWMGray"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="MWMGray"/> </userDefinedRuntimeAttributes> </imageView> <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="separator_image" translatesAutoresizingMaskIntoConstraints="NO" id="Suj-t5-ZWs"> - <rect key="frame" x="16" y="44" width="359" height="1"/> + <rect key="frame" x="16" y="44" width="584" height="1"/> <constraints> <constraint firstAttribute="height" constant="1" id="cv8-Tg-Oin"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="coloring" value="MWMSeparator"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="MWMSeparator"/> </userDefinedRuntimeAttributes> </imageView> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="MiP-Du-s3i"> - <rect key="frame" x="0.0" y="0.0" width="375" height="44"/> + <rect key="frame" x="0.0" y="0.0" width="600" height="44"/> <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/> <connections> <action selector="toggleExample" destination="Ld6-gM-2hk" eventType="touchUpInside" id="BGK-Ap-YBq"/> @@ -393,11 +389,11 @@ <constraint firstItem="dAM-iT-fzu" firstAttribute="centerY" secondItem="n79-h1-Nk3" secondAttribute="centerY" id="u5E-mE-qqT"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Background"/> </userDefinedRuntimeAttributes> </view> <webView contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="j5R-JF-iCs"> - <rect key="frame" x="10" y="56" width="355" height="260"/> + <rect key="frame" x="10" y="56" width="580" height="260"/> <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/> <constraints> <constraint firstAttribute="height" priority="750" constant="260" id="sfy-fK-VSx"/> @@ -416,7 +412,7 @@ <constraint firstItem="n79-h1-Nk3" firstAttribute="leading" secondItem="85Z-MR-kUV" secondAttribute="leading" id="wd0-Vg-MJz"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Background"/> </userDefinedRuntimeAttributes> </view> </subviews> @@ -443,42 +439,36 @@ </constraints> </view> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="SZQ-ra-FC3" userLabel="Mode Switch"> - <rect key="frame" x="0.0" y="623" width="375" height="44"/> + <rect key="frame" x="0.0" y="556" width="600" height="44"/> <subviews> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" lineBreakMode="tailTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="fB1-w2-lJI"> - <rect key="frame" x="0.0" y="0.0" width="375" height="44"/> + <rect key="frame" x="0.0" y="0.0" width="600" height="44"/> <inset key="contentEdgeInsets" minX="16" minY="0.0" maxX="0.0" maxY="0.0"/> <state key="normal" title="Simple Mode"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular17"/> - <userDefinedRuntimeAttribute type="string" keyPath="textColorName" value="linkBlue"/> - <userDefinedRuntimeAttribute type="string" keyPath="textColorHighlightedName" value="linkBlueHighlighted"/> - <userDefinedRuntimeAttribute type="string" keyPath="textColorDisabledName" value="buttonDisabledBlueText"/> - <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius"> - <integer key="value" value="22"/> - </userDefinedRuntimeAttribute> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="FlatNormalTransButton:regular17"/> </userDefinedRuntimeAttributes> <connections> <action selector="toggleMode" destination="Ld6-gM-2hk" eventType="touchUpInside" id="W6C-Sh-gzz"/> </connections> </button> <imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="ic_arrow_gray_right" translatesAutoresizingMaskIntoConstraints="NO" id="z8F-55-5rJ"> - <rect key="frame" x="343" y="10" width="24" height="24"/> + <rect key="frame" x="568" y="10" width="24" height="24"/> <constraints> <constraint firstAttribute="width" constant="24" id="ypP-17-bfX"/> <constraint firstAttribute="height" constant="24" id="zE5-1N-qvh"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="coloring" value="MWMGray"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="MWMGray"/> </userDefinedRuntimeAttributes> </imageView> <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="separator_image" translatesAutoresizingMaskIntoConstraints="NO" id="onT-vv-01i"> - <rect key="frame" x="0.0" y="-1" width="375" height="1"/> + <rect key="frame" x="0.0" y="-1" width="600" height="1"/> <constraints> <constraint firstAttribute="height" constant="1" id="UUW-c4-eNA"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="coloring" value="MWMSeparator"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="MWMSeparator"/> </userDefinedRuntimeAttributes> </imageView> </subviews> @@ -496,7 +486,7 @@ <constraint firstAttribute="trailing" secondItem="onT-vv-01i" secondAttribute="trailing" id="zeT-UU-vSn"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Background"/> </userDefinedRuntimeAttributes> </view> </subviews> @@ -516,7 +506,7 @@ </constraints> <viewLayoutGuide key="safeArea" id="xW7-hS-tWE"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="pressBackground"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="PressBackground"/> </userDefinedRuntimeAttributes> </view> <connections> @@ -541,26 +531,26 @@ <objects> <tableViewController id="ocL-kj-jxR" customClass="MWMEditorAdditionalNamesTableViewController" sceneMemberID="viewController"> <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="28" sectionFooterHeight="28" id="tQ2-XI-QWd"> - <rect key="frame" x="0.0" y="0.0" width="375" height="667"/> + <rect key="frame" x="0.0" y="0.0" width="600" height="600"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <prototypes> <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="ListCellIdentifier" textLabel="JcK-nR-UGw" detailTextLabel="Cmi-x5-6Vt" style="IBUITableViewCellStyleSubtitle" id="RXe-xp-xlR" customClass="MWMTableViewCell"> - <rect key="frame" x="0.0" y="28" width="375" height="44"/> + <rect key="frame" x="0.0" y="28" width="600" height="44"/> <autoresizingMask key="autoresizingMask"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="RXe-xp-xlR" id="g0x-Vt-1FI"> - <rect key="frame" x="0.0" y="0.0" width="375" height="44"/> + <rect key="frame" x="0.0" y="0.0" width="600" height="44"/> <autoresizingMask key="autoresizingMask"/> <subviews> <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Title" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="JcK-nR-UGw"> - <rect key="frame" x="16" y="6" width="31.5" height="19.5"/> + <rect key="frame" x="20" y="6" width="31.5" height="19.5"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <fontDescription key="fontDescription" type="system" pointSize="16"/> <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <nil key="highlightedColor"/> </label> <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Detail" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Cmi-x5-6Vt"> - <rect key="frame" x="16" y="25.5" width="30.5" height="13.5"/> + <rect key="frame" x="20" y="25.5" width="30.5" height="13.5"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <fontDescription key="fontDescription" type="system" pointSize="11"/> <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> @@ -585,7 +575,7 @@ <objects> <tableViewController id="Heu-QR-M0N" customClass="MWMStreetEditorViewController" sceneMemberID="viewController"> <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" keyboardDismissMode="interactive" dataMode="prototypes" style="grouped" separatorStyle="default" rowHeight="44" sectionHeaderHeight="18" sectionFooterHeight="18" id="rJJ-UB-6u2"> - <rect key="frame" x="0.0" y="0.0" width="375" height="667"/> + <rect key="frame" x="0.0" y="0.0" width="600" height="600"/> <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"/> <inset key="scrollIndicatorInsets" minX="0.0" minY="44" maxX="0.0" maxY="0.0"/> @@ -604,14 +594,14 @@ <objects> <viewController id="QlF-CJ-cEG" customClass="MWMObjectsCategorySelectorController" sceneMemberID="viewController"> <view key="view" contentMode="scaleToFill" id="MIY-NW-Joh"> - <rect key="frame" x="0.0" y="0.0" width="375" height="667"/> + <rect key="frame" x="0.0" y="0.0" width="600" height="600"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" keyboardDismissMode="interactive" dataMode="prototypes" style="grouped" separatorStyle="default" rowHeight="44" sectionHeaderHeight="18" sectionFooterHeight="18" translatesAutoresizingMaskIntoConstraints="NO" id="JbV-y9-HBo"> - <rect key="frame" x="0.0" y="56" width="375" height="611"/> + <rect key="frame" x="0.0" y="56" width="600" height="544"/> <color key="backgroundColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="pressBackground"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="TableView:PressBackground"/> </userDefinedRuntimeAttributes> <connections> <outlet property="dataSource" destination="QlF-CJ-cEG" id="vD2-pf-Vhj"/> @@ -619,30 +609,18 @@ </connections> </tableView> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="rI9-RR-sKP" userLabel="Status Bar Background"> - <rect key="frame" x="0.0" y="-52" width="375" height="108"/> + <rect key="frame" x="0.0" y="-52" width="600" height="108"/> <color key="backgroundColor" red="0.1215686275" green="0.59999999999999998" blue="0.32156862749999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <color key="tintColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/> <constraints> <constraint firstAttribute="height" constant="108" id="Qw2-w6-Efn"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="primary"/> - <userDefinedRuntimeAttribute type="number" keyPath="layer.shadowRadius"> - <integer key="value" value="2"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="color" keyPath="layer.shadowUIColor"> - <color key="value" red="0.0" green="0.0" blue="0.0" alpha="0.23999999999999999" colorSpace="custom" customColorSpace="sRGB"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="number" keyPath="layer.shadowOpacity"> - <integer key="value" value="1"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="size" keyPath="layer.shadowOffset"> - <size key="value" width="0.0" height="0.0"/> - </userDefinedRuntimeAttribute> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="SearchStatusBarView"/> </userDefinedRuntimeAttributes> </view> <searchBar contentMode="redraw" translatesAutoresizingMaskIntoConstraints="NO" id="gzF-B7-8pj"> - <rect key="frame" x="0.0" y="0.0" width="375" height="56"/> + <rect key="frame" x="0.0" y="0.0" width="600" height="56"/> <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/> <constraints> <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="44" id="2uI-k6-ahr"/> @@ -669,7 +647,7 @@ </constraints> <viewLayoutGuide key="safeArea" id="lsu-H8-wQc"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="pressBackground"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="PressBackground"/> </userDefinedRuntimeAttributes> </view> <connections> @@ -687,14 +665,14 @@ <objects> <viewController id="da4-KT-kzF" customClass="MWMCuisineEditorViewController" sceneMemberID="viewController"> <view key="view" contentMode="scaleToFill" id="iTG-qE-svw"> - <rect key="frame" x="0.0" y="0.0" width="375" height="667"/> + <rect key="frame" x="0.0" y="0.0" width="600" height="600"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" keyboardDismissMode="interactive" dataMode="prototypes" style="grouped" separatorStyle="default" rowHeight="44" sectionHeaderHeight="18" sectionFooterHeight="18" translatesAutoresizingMaskIntoConstraints="NO" id="ina-WD-kps"> - <rect key="frame" x="0.0" y="56" width="375" height="611"/> + <rect key="frame" x="0.0" y="56" width="600" height="544"/> <color key="backgroundColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="pressBackground"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="TableView:PressBackground"/> </userDefinedRuntimeAttributes> <connections> <outlet property="dataSource" destination="da4-KT-kzF" id="C9h-WG-CWd"/> @@ -702,30 +680,18 @@ </connections> </tableView> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="HEU-Bu-3wh" userLabel="Status Bar Background"> - <rect key="frame" x="0.0" y="-52" width="375" height="108"/> + <rect key="frame" x="0.0" y="-52" width="600" height="108"/> <color key="backgroundColor" red="0.1215686275" green="0.59999999999999998" blue="0.32156862749999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <color key="tintColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/> <constraints> <constraint firstAttribute="height" constant="108" id="Slm-73-UcI"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="primary"/> - <userDefinedRuntimeAttribute type="number" keyPath="layer.shadowRadius"> - <integer key="value" value="2"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="color" keyPath="layer.shadowUIColor"> - <color key="value" red="0.0" green="0.0" blue="0.0" alpha="0.23999999999999999" colorSpace="custom" customColorSpace="sRGB"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="number" keyPath="layer.shadowOpacity"> - <integer key="value" value="1"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="size" keyPath="layer.shadowOffset"> - <size key="value" width="0.0" height="0.0"/> - </userDefinedRuntimeAttribute> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="SearchStatusBarView"/> </userDefinedRuntimeAttributes> </view> <searchBar contentMode="redraw" translatesAutoresizingMaskIntoConstraints="NO" id="z6s-26-dP6"> - <rect key="frame" x="0.0" y="0.0" width="375" height="56"/> + <rect key="frame" x="0.0" y="0.0" width="600" height="56"/> <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/> <constraints> <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="44" id="UAk-z1-2EY"/> @@ -752,7 +718,7 @@ </constraints> <viewLayoutGuide key="safeArea" id="aCA-5u-5ht"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="pressBackground"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="PressBackground"/> </userDefinedRuntimeAttributes> </view> <connections> @@ -769,15 +735,15 @@ <objects> <viewController storyboardIdentifier="DownloadMapsViewController" id="h4a-ne-bSJ" customClass="MWMDownloadMapsViewController" sceneMemberID="viewController"> <view key="view" contentMode="scaleToFill" id="XQZ-0V-SyR"> - <rect key="frame" x="0.0" y="0.0" width="375" height="667"/> + <rect key="frame" x="0.0" y="0.0" width="600" height="600"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="grouped" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="-1" estimatedSectionHeaderHeight="-1" sectionFooterHeight="1" translatesAutoresizingMaskIntoConstraints="NO" id="CwW-x8-G3j"> - <rect key="frame" x="0.0" y="56" width="320" height="512"/> + <rect key="frame" x="0.0" y="56" width="600" height="544"/> <color key="backgroundColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <gestureRecognizers/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="pressBackground"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="PressBackground"/> </userDefinedRuntimeAttributes> <connections> <outlet property="dataSource" destination="h4a-ne-bSJ" id="nrq-1D-7lZ"/> @@ -785,41 +751,36 @@ </connections> </tableView> <view clipsSubviews="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="st5-ZJ-F0A" userLabel="UpdateAllView"> - <rect key="frame" x="16" y="623" width="343" height="44"/> + <rect key="frame" x="16" y="556" width="568" height="44"/> <subviews> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="0aj-pt-FjD"> - <rect key="frame" x="0.0" y="0.0" width="343" height="1"/> + <rect key="frame" x="0.0" y="0.0" width="568" height="1"/> <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.12" colorSpace="custom" customColorSpace="sRGB"/> <constraints> <constraint firstAttribute="height" priority="750" constant="1" id="6LI-Em-15P"/> </constraints> </view> <button opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="GN0-2F-Ytz" customClass="MWMButton"> - <rect key="frame" x="0.0" y="0.0" width="343" height="44"/> + <rect key="frame" x="0.0" y="0.0" width="568" height="44"/> <color key="backgroundColor" red="0.034757062792778015" green="0.31522077322006226" blue="0.81491315364837646" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <state key="normal" title="Update All"> <color key="titleColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> </state> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular17"/> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="linkBlue"/> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundHighlightedColorName" value="linkBlueHighlighted"/> - <userDefinedRuntimeAttribute type="string" keyPath="coloringName" value="MWMWhite"/> - <userDefinedRuntimeAttribute type="string" keyPath="textColorName" value="white"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="FlatNormalButton:MWMWhite:regular17"/> </userDefinedRuntimeAttributes> <connections> <action selector="onAllMaps:" destination="h4a-ne-bSJ" eventType="touchUpInside" id="dBj-ob-MNu"/> </connections> </button> <button opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="bQM-6x-WHa" customClass="MWMButton"> - <rect key="frame" x="0.0" y="0.0" width="343" height="44"/> + <rect key="frame" x="0.0" y="0.0" width="568" height="44"/> <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/> <state key="normal" title="Update All"> <color key="titleColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> </state> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular17"/> - <userDefinedRuntimeAttribute type="string" keyPath="textColorName" value="red"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular17:redText"/> </userDefinedRuntimeAttributes> <connections> <action selector="onCancelAllMaps:" destination="h4a-ne-bSJ" eventType="touchUpInside" id="Vxv-zA-R1k"/> @@ -843,7 +804,7 @@ <constraint firstAttribute="height" priority="750" constant="44" id="r0c-5a-Stj"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Background"/> <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius"> <integer key="value" value="12"/> </userDefinedRuntimeAttribute> @@ -855,42 +816,33 @@ </variation> </view> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Xxz-fq-71r" userLabel="Status Bar Background"> - <rect key="frame" x="0.0" y="-52" width="375" height="108"/> + <rect key="frame" x="0.0" y="-52" width="600" height="108"/> <color key="backgroundColor" red="0.1215686275" green="0.59999999999999998" blue="0.32156862749999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <color key="tintColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/> <constraints> <constraint firstAttribute="height" constant="108" id="9ZH-dO-Jna"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="primary"/> - <userDefinedRuntimeAttribute type="number" keyPath="layer.shadowRadius"> - <integer key="value" value="2"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="color" keyPath="layer.shadowUIColor"> - <color key="value" red="0.0" green="0.0" blue="0.0" alpha="0.23999999999999999" colorSpace="custom" customColorSpace="sRGB"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="number" keyPath="layer.shadowOpacity"> - <integer key="value" value="1"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="size" keyPath="layer.shadowOffset"> - <size key="value" width="0.0" height="0.0"/> - </userDefinedRuntimeAttribute> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="SearchStatusBarView"/> </userDefinedRuntimeAttributes> </view> <searchBar contentMode="redraw" translatesAutoresizingMaskIntoConstraints="NO" id="DPt-gs-efn"> - <rect key="frame" x="0.0" y="0.0" width="375" height="56"/> + <rect key="frame" x="0.0" y="0.0" width="600" height="56"/> <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/> <constraints> <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="44" id="9M7-y1-RSU"/> </constraints> <color key="barTintColor" red="0.1215686275" green="0.59999999999999998" blue="0.32156862749999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <textInputTraits key="textInputTraits"/> + <userDefinedRuntimeAttributes> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="searchBar"/> + </userDefinedRuntimeAttributes> <connections> <outlet property="delegate" destination="h4a-ne-bSJ" id="k3P-rj-vcL"/> </connections> </searchBar> <containerView hidden="YES" opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="kXO-Oh-2vO" userLabel="No Maps Container View"> - <rect key="frame" x="0.0" y="56" width="375" height="611"/> + <rect key="frame" x="0.0" y="56" width="600" height="544"/> <connections> <segue destination="b8o-rZ-x0k" kind="embed" identifier="MapDownloaderNoResultsEmbedViewControllerSegue" id="ish-dC-mkH"/> </connections> @@ -919,7 +871,7 @@ </constraints> <viewLayoutGuide key="safeArea" id="dlW-OQ-WMO"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="pressBackground"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="PressBackground"/> </userDefinedRuntimeAttributes> </view> <connections> @@ -942,20 +894,20 @@ <objects> <viewController storyboardIdentifier="MWMNoMapsViewController" id="3el-Zi-2E4" customClass="MWMNoMapsViewController" sceneMemberID="viewController"> <view key="view" contentMode="scaleToFill" id="4WP-vj-Alg"> - <rect key="frame" x="0.0" y="0.0" width="375" height="611"/> + <rect key="frame" x="0.0" y="0.0" width="414" height="762"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Gmw-e3-n53" userLabel="Container" customClass="MWMNoMapsView"> - <rect key="frame" x="8.5" y="0.0" width="358" height="611"/> + <rect key="frame" x="3.5" y="0.0" width="407" height="762"/> <subviews> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="dCZ-PN-2Ob" userLabel="BoundsView"> - <rect key="frame" x="16" y="0.0" width="326" height="507"/> + <rect key="frame" x="16" y="0.0" width="375" height="658"/> <subviews> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="87G-jh-N8H" userLabel="CenteredView"> - <rect key="frame" x="0.0" y="129" width="326" height="249"/> + <rect key="frame" x="0.0" y="204.5" width="375" height="249"/> <subviews> <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalCompressionResistancePriority="749" image="img_no_maps" translatesAutoresizingMaskIntoConstraints="NO" id="vI9-fc-FO2"> - <rect key="frame" x="83" y="0.0" width="160" height="160"/> + <rect key="frame" x="107.5" y="0.0" width="160" height="160"/> <constraints> <constraint firstAttribute="width" secondItem="vI9-fc-FO2" secondAttribute="height" multiplier="1:1" id="f4J-1R-ewM"/> <constraint firstAttribute="height" relation="lessThanOrEqual" priority="800" constant="160" id="jwh-bM-u0p"/> @@ -963,24 +915,22 @@ </constraints> </imageView> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="У вас нет загруженных карт" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="abh-G0-Alr" userLabel="Title"> - <rect key="frame" x="0.0" y="180" width="326" height="24"/> + <rect key="frame" x="0.0" y="180" width="375" height="24"/> <fontDescription key="fontDescription" name="HelveticaNeue-Medium" family="Helvetica Neue" pointSize="20"/> <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="fontName" value="medium18"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="medium18:blackPrimaryText"/> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="downloader_no_downloaded_maps_title"/> </userDefinedRuntimeAttributes> </label> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Загрузите необходимые карты, чтобы находить места и пользоваться навигацией без интернета." textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="LaW-Ad-mYI" userLabel="Text"> - <rect key="frame" x="0.0" y="216" width="326" height="33"/> + <rect key="frame" x="0.0" y="216" width="375" height="33"/> <fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="14"/> <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="fontName" value="regular14"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackSecondaryText"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular14:blackSecondaryText"/> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="downloader_no_downloaded_maps_message"/> </userDefinedRuntimeAttributes> </label> @@ -1015,7 +965,7 @@ </constraints> </view> <button opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" adjustsImageWhenHighlighted="NO" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Moj-UK-oyl" userLabel="DownloadMaps" customClass="MWMButton"> - <rect key="frame" x="59" y="527" width="240" height="44"/> + <rect key="frame" x="83.5" y="678" width="240" height="44"/> <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/> <constraints> <constraint firstAttribute="width" constant="240" id="49x-bx-JJj"/> @@ -1026,15 +976,8 @@ <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> </state> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular17"/> - <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius"> - <integer key="value" value="8"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="linkBlue"/> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundHighlightedColorName" value="linkBlueHighlighted"/> - <userDefinedRuntimeAttribute type="string" keyPath="coloringName" value="MWMWhite"/> - <userDefinedRuntimeAttribute type="string" keyPath="textColorName" value="white"/> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="download_maps"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="FlatNormalButton:MWMWhite:regular17"/> </userDefinedRuntimeAttributes> <connections> <action selector="downloadMaps" destination="3el-Zi-2E4" eventType="touchUpInside" id="gb5-gj-vlt"/> @@ -1079,7 +1022,7 @@ </constraints> <viewLayoutGuide key="safeArea" id="6lX-F6-61M"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Background"/> </userDefinedRuntimeAttributes> </view> <navigationItem key="navigationItem" id="DHE-Sb-Bfs"/> @@ -1093,17 +1036,17 @@ <objects> <viewController storyboardIdentifier="SearchNoResultsViewController" useStoryboardIdentifierAsRestorationIdentifier="YES" id="0VQ-EO-9Sv" customClass="SearchNoResultsViewController" customModule="maps_me" customModuleProvider="target" sceneMemberID="viewController"> <view key="view" contentMode="scaleToFill" id="9jm-RW-DZK"> - <rect key="frame" x="0.0" y="0.0" width="375" height="667"/> + <rect key="frame" x="0.0" y="0.0" width="600" height="600"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="EbW-Mp-c6s"> - <rect key="frame" x="0.0" y="146" width="375" height="375"/> + <rect key="frame" x="0.0" y="0.0" width="600" height="600"/> <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> <constraints> <constraint firstAttribute="width" relation="greaterThanOrEqual" secondItem="EbW-Mp-c6s" secondAttribute="height" multiplier="1:1" id="tBC-sb-Q3g"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Background"/> </userDefinedRuntimeAttributes> </view> </subviews> @@ -1159,6 +1102,7 @@ <navigationController automaticallyAdjustsScrollViewInsets="NO" navigationBarHidden="YES" id="b8o-rZ-x0k" customClass="MWMDownloaderNoResultsEmbedViewController" sceneMemberID="viewController"> <toolbarItems/> <navigationBar key="navigationBar" contentMode="scaleToFill" id="iNT-L2-ifB"> + <rect key="frame" x="0.0" y="0.0" width="1000" height="1000"/> <autoresizingMask key="autoresizingMask"/> </navigationBar> <nil name="viewControllers"/> @@ -1182,7 +1126,7 @@ <inferredMetricsTieBreakers> <segue reference="sMq-pa-AId"/> <segue reference="4Cc-99-mlN"/> - <segue reference="OEF-kR-jKi"/> + <segue reference="gFM-Ca-ARt"/> <segue reference="0A8-4b-0A2"/> </inferredMetricsTieBreakers> </document> diff --git a/iphone/Maps/UI/Storyboard/SearchFilters.storyboard b/iphone/Maps/UI/Storyboard/SearchFilters.storyboard index 1352d0af8a..f28ea1a8fb 100644 --- a/iphone/Maps/UI/Storyboard/SearchFilters.storyboard +++ b/iphone/Maps/UI/Storyboard/SearchFilters.storyboard @@ -1,11 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> - <device id="retina4_7" orientation="portrait"> - <adaptation id="fullscreen"/> - </device> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15705" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> + <device id="retina6_1" orientation="portrait" appearance="light"/> <dependencies> <deployment identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14490.49"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15706"/> <capability name="Safe area layout guides" minToolsVersion="9.0"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> @@ -15,47 +13,59 @@ <objects> <viewController storyboardIdentifier="MWMSearchHotelsFilterViewController" useStoryboardIdentifierAsRestorationIdentifier="YES" id="LNn-Gp-Jtg" customClass="MWMSearchHotelsFilterViewController" sceneMemberID="viewController"> <view key="view" contentMode="scaleToFill" id="a4S-IT-Fgz"> - <rect key="frame" x="0.0" y="0.0" width="375" height="667"/> + <rect key="frame" x="0.0" y="0.0" width="414" height="896"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" showsVerticalScrollIndicator="NO" dataMode="prototypes" style="grouped" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="-1" estimatedSectionHeaderHeight="-1" sectionFooterHeight="1" estimatedSectionFooterHeight="1" translatesAutoresizingMaskIntoConstraints="NO" id="7db-bh-egf"> - <rect key="frame" x="0.0" y="0.0" width="375" height="667"/> + <rect key="frame" x="0.0" y="0.0" width="414" height="896"/> <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/> <prototypes> <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="MWMFilterCheckCell" rowHeight="71" id="kQ5-BZ-yUa" customClass="MWMFilterCheckCell"> - <rect key="frame" x="0.0" y="55.5" width="375" height="71"/> + <rect key="frame" x="0.0" y="55.5" width="414" height="71"/> <autoresizingMask key="autoresizingMask"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="kQ5-BZ-yUa" id="vGr-Kk-qrA"> - <rect key="frame" x="0.0" y="0.0" width="375" height="70.5"/> + <rect key="frame" x="0.0" y="0.0" width="414" height="71"/> <autoresizingMask key="autoresizingMask"/> <subviews> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="7zd-JW-kVE"> - <rect key="frame" x="16" y="8" width="42" height="14.5"/> + <rect key="frame" x="16" y="8" width="42" height="15"/> <fontDescription key="fontDescription" type="system" pointSize="17"/> <nil key="textColor"/> <nil key="highlightedColor"/> + <userDefinedRuntimeAttributes> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular14:blackSecondaryText"/> + </userDefinedRuntimeAttributes> </label> <button opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="5zu-QE-OXk"> - <rect key="frame" x="16" y="26.5" width="167.5" height="36"/> + <rect key="frame" x="16" y="27" width="187" height="36"/> <constraints> <constraint firstAttribute="height" constant="36" id="H9S-4G-HPV"/> </constraints> <inset key="contentEdgeInsets" minX="8" minY="0.0" maxX="0.0" maxY="0.0"/> <state key="normal" title="Button"/> + <userDefinedRuntimeAttributes> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="FilterCheckButton"/> + </userDefinedRuntimeAttributes> <connections> <action selector="tapWithSender:" destination="kQ5-BZ-yUa" eventType="touchUpInside" id="LTt-Kr-awO"/> </connections> </button> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="WZ7-6d-CsM"> - <rect key="frame" x="191.5" y="2" width="42" height="20.5"/> + <rect key="frame" x="211" y="2.5" width="42" height="20.5"/> <fontDescription key="fontDescription" type="system" pointSize="17"/> <nil key="textColor"/> <nil key="highlightedColor"/> + <userDefinedRuntimeAttributes> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular14:blackSecondaryText"/> + </userDefinedRuntimeAttributes> </label> <button opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="nOA-aX-aet"> - <rect key="frame" x="191.5" y="26.5" width="167.5" height="36"/> + <rect key="frame" x="211" y="27" width="187" height="36"/> <inset key="contentEdgeInsets" minX="8" minY="0.0" maxX="0.0" maxY="0.0"/> <state key="normal" title="Button"/> + <userDefinedRuntimeAttributes> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="FilterCheckButton"/> + </userDefinedRuntimeAttributes> <connections> <action selector="tapWithSender:" destination="kQ5-BZ-yUa" eventType="touchUpInside" id="O1l-vW-dJm"/> </connections> @@ -65,6 +75,9 @@ <fontDescription key="fontDescription" type="system" pointSize="17"/> <nil key="textColor"/> <nil key="highlightedColor"/> + <userDefinedRuntimeAttributes> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular12:redText"/> + </userDefinedRuntimeAttributes> </label> </subviews> <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> @@ -101,46 +114,58 @@ </connections> </tableViewCell> <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="MWMFilterRatingCell" rowHeight="52" id="HvO-7t-FdB" customClass="MWMFilterRatingCell"> - <rect key="frame" x="0.0" y="126.5" width="375" height="52"/> + <rect key="frame" x="0.0" y="126.5" width="414" height="52"/> <autoresizingMask key="autoresizingMask"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="HvO-7t-FdB" id="waN-Zz-Fjw"> - <rect key="frame" x="0.0" y="0.0" width="375" height="51.5"/> + <rect key="frame" x="0.0" y="0.0" width="414" height="52"/> <autoresizingMask key="autoresizingMask"/> <subviews> <button opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="wordWrap" translatesAutoresizingMaskIntoConstraints="NO" id="JOt-Yh-HTx"> - <rect key="frame" x="16" y="0.0" width="80" height="51.5"/> + <rect key="frame" x="16" y="0.0" width="89.5" height="52"/> <constraints> <constraint firstAttribute="height" priority="999" constant="52" id="ruI-U2-WeD"/> </constraints> <color key="tintColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> <state key="normal" title="ANY"/> + <userDefinedRuntimeAttributes> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="FilterRatingButton"/> + </userDefinedRuntimeAttributes> <connections> <action selector="tapWithSender:" destination="HvO-7t-FdB" eventType="touchUpInside" id="Jn8-i9-S7Z"/> </connections> </button> <button opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="wordWrap" translatesAutoresizingMaskIntoConstraints="NO" id="tIg-d6-2V9"> - <rect key="frame" x="104" y="0.0" width="79.5" height="51.5"/> + <rect key="frame" x="113.5" y="0.0" width="89.5" height="52"/> <color key="tintColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> <state key="normal" title="7.0+"/> <state key="disabled"> <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/> </state> + <userDefinedRuntimeAttributes> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="FilterRatingButton"/> + </userDefinedRuntimeAttributes> <connections> <action selector="tapWithSender:" destination="HvO-7t-FdB" eventType="touchUpInside" id="uqM-8E-QJL"/> </connections> </button> <button opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="wordWrap" translatesAutoresizingMaskIntoConstraints="NO" id="LLw-eV-IqX"> - <rect key="frame" x="191.5" y="0.0" width="80" height="51.5"/> + <rect key="frame" x="211" y="0.0" width="89.5" height="52"/> <color key="tintColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> <state key="normal" title="8.0+"/> + <userDefinedRuntimeAttributes> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="FilterRatingButton"/> + </userDefinedRuntimeAttributes> <connections> <action selector="tapWithSender:" destination="HvO-7t-FdB" eventType="touchUpInside" id="RPh-fR-jXK"/> </connections> </button> <button opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="wordWrap" translatesAutoresizingMaskIntoConstraints="NO" id="30K-lZ-hUy"> - <rect key="frame" x="279.5" y="0.0" width="79.5" height="51.5"/> + <rect key="frame" x="308.5" y="0.0" width="89.5" height="52"/> <color key="tintColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> <state key="normal" title="9.0+"/> + <userDefinedRuntimeAttributes> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="FilterRatingButton"/> + </userDefinedRuntimeAttributes> <connections> <action selector="tapWithSender:" destination="HvO-7t-FdB" eventType="touchUpInside" id="qSN-2y-IEP"/> </connections> @@ -182,35 +207,44 @@ </connections> </tableViewCell> <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="MWMFilterPriceCategoryCell" rowHeight="40" id="Awa-kZ-hF2" customClass="MWMFilterPriceCategoryCell"> - <rect key="frame" x="0.0" y="178.5" width="375" height="40"/> + <rect key="frame" x="0.0" y="178.5" width="414" height="40"/> <autoresizingMask key="autoresizingMask"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Awa-kZ-hF2" id="m4Z-4y-BeU"> - <rect key="frame" x="0.0" y="0.0" width="375" height="39.5"/> + <rect key="frame" x="0.0" y="0.0" width="414" height="40"/> <autoresizingMask key="autoresizingMask"/> <subviews> <button opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="wordWrap" translatesAutoresizingMaskIntoConstraints="NO" id="cm9-a2-KtE"> - <rect key="frame" x="16" y="0.0" width="109" height="39.5"/> + <rect key="frame" x="16" y="0.0" width="122" height="40"/> <constraints> <constraint firstAttribute="height" priority="999" constant="40" id="ntq-iz-6Ov"/> </constraints> <color key="tintColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> <state key="normal" title="$"/> + <userDefinedRuntimeAttributes> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="FilterRatingButton"/> + </userDefinedRuntimeAttributes> <connections> <action selector="tapWithSender:" destination="Awa-kZ-hF2" eventType="touchUpInside" id="ghA-FY-nXb"/> </connections> </button> <button opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="wordWrap" translatesAutoresizingMaskIntoConstraints="NO" id="eEn-77-iwI"> - <rect key="frame" x="133" y="0.0" width="109" height="39.5"/> + <rect key="frame" x="146" y="0.0" width="122" height="40"/> <color key="tintColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> <state key="normal" title="$$"/> + <userDefinedRuntimeAttributes> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="FilterRatingButton"/> + </userDefinedRuntimeAttributes> <connections> <action selector="tapWithSender:" destination="Awa-kZ-hF2" eventType="touchUpInside" id="J3i-Eu-nrp"/> </connections> </button> <button opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="wordWrap" translatesAutoresizingMaskIntoConstraints="NO" id="96b-HD-t1A"> - <rect key="frame" x="250" y="0.0" width="109" height="39.5"/> + <rect key="frame" x="276" y="0.0" width="122" height="40"/> <color key="tintColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> <state key="normal" title="$$$"/> + <userDefinedRuntimeAttributes> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="FilterRatingButton"/> + </userDefinedRuntimeAttributes> <connections> <action selector="tapWithSender:" destination="Awa-kZ-hF2" eventType="touchUpInside" id="Yxp-Ek-iI8"/> </connections> @@ -245,14 +279,14 @@ </connections> </tableViewCell> <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="MWMFilterCollectionHolderCell" id="MeX-wf-jsM" customClass="MWMFilterCollectionHolderCell"> - <rect key="frame" x="0.0" y="218.5" width="375" height="44"/> + <rect key="frame" x="0.0" y="218.5" width="414" height="44"/> <autoresizingMask key="autoresizingMask"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="MeX-wf-jsM" id="Kwo-Nv-Eyz"> - <rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/> + <rect key="frame" x="0.0" y="0.0" width="414" height="44"/> <autoresizingMask key="autoresizingMask"/> <subviews> <collectionView clipsSubviews="YES" contentMode="scaleToFill" bounces="NO" scrollEnabled="NO" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" bouncesZoom="NO" dataMode="prototypes" prefetchingEnabled="NO" translatesAutoresizingMaskIntoConstraints="NO" id="PXc-fE-tNi"> - <rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/> + <rect key="frame" x="0.0" y="0.0" width="414" height="44"/> <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> <constraints> <constraint firstAttribute="height" priority="999" constant="43.5" id="wiY-V3-s47"/> @@ -292,8 +326,7 @@ <nil key="textColor"/> <nil key="highlightedColor"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular14"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular14:blackPrimaryText"/> </userDefinedRuntimeAttributes> </label> </subviews> @@ -306,15 +339,7 @@ <constraint firstAttribute="trailing" secondItem="3gV-WJ-Hqd" secondAttribute="trailing" constant="12" id="sBl-KU-nY0"/> </constraints> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius"> - <integer key="value" value="16"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="color" keyPath="layer.borderUIColor"> - <color key="value" red="0.0" green="0.0" blue="0.0" alpha="0.12" colorSpace="calibratedRGB"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="number" keyPath="layer.borderWidth"> - <integer key="value" value="1"/> - </userDefinedRuntimeAttribute> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="SearchFilterTypeCell"/> </userDefinedRuntimeAttributes> <connections> <outlet property="tagName" destination="3gV-WJ-Hqd" id="3iN-Tf-ZKI"/> @@ -348,7 +373,7 @@ </connections> </tableView> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ZN9-tQ-vmX"> - <rect key="frame" x="16" y="607" width="343" height="44"/> + <rect key="frame" x="16" y="818" width="382" height="44"/> <constraints> <constraint firstAttribute="height" constant="44" id="5sg-ZZ-930"/> </constraints> @@ -375,6 +400,9 @@ <constraint firstAttribute="bottom" secondItem="7db-bh-egf" secondAttribute="bottom" id="zwQ-GR-Y9L"/> </constraints> <viewLayoutGuide key="safeArea" id="WEm-4S-gb9"/> + <userDefinedRuntimeAttributes> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="PressBackground"/> + </userDefinedRuntimeAttributes> </view> <toolbarItems/> <navigationItem key="navigationItem" title="Фильтр" id="LCw-vA-SlU"> diff --git a/iphone/Maps/UI/Storyboard/Settings.storyboard b/iphone/Maps/UI/Storyboard/Settings.storyboard index d97c282c4d..908d36f6f1 100644 --- a/iphone/Maps/UI/Storyboard/Settings.storyboard +++ b/iphone/Maps/UI/Storyboard/Settings.storyboard @@ -1,11 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> - <device id="retina4_7" orientation="portrait"> - <adaptation id="fullscreen"/> - </device> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> + <device id="retina6_1" orientation="portrait" appearance="light"/> <dependencies> <deployment identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14490.49"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/> <capability name="Safe area layout guides" minToolsVersion="9.0"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> @@ -15,27 +13,27 @@ <objects> <tableViewController storyboardIdentifier="MWMSettingsViewController" useStoryboardIdentifierAsRestorationIdentifier="YES" id="Rr6-uj-G5f" customClass="MWMSettingsViewController" sceneMemberID="viewController"> <tableView key="view" opaque="NO" clipsSubviews="YES" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="static" style="grouped" separatorStyle="default" rowHeight="44" sectionHeaderHeight="10" sectionFooterHeight="10" id="zyF-i7-Uoj"> - <rect key="frame" x="0.0" y="0.0" width="375" height="667"/> + <rect key="frame" x="0.0" y="0.0" width="414" height="896"/> <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"/> <sections> <tableViewSection id="eZf-AO-B39"> <cells> <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewLinkCell" id="yh8-cr-14c" customClass="SettingsTableViewLinkCell" customModule="maps_me" customModuleProvider="target"> - <rect key="frame" x="0.0" y="35" width="375" height="44"/> + <rect key="frame" x="0.0" y="10" width="414" 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="341" height="43.5"/> + <rect key="frame" x="0.0" y="0.0" width="383" 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"> - <rect key="frame" x="16" y="12" width="73" height="19.5"/> + <rect key="frame" x="16" y="12" width="73" height="20"/> <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"/> </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="263" y="12" width="78" height="19.5"/> + <rect key="frame" x="305" 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"/> @@ -61,20 +59,20 @@ <tableViewSection headerTitle="ОБЩИЕ НАСТРОЙКИ" footerTitle="Сбор статистики помогает нам совершенствовать приложение." id="Swo-3Q-lWx"> <cells> <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewLinkCell" id="Igk-BI-aHN" customClass="SettingsTableViewLinkCell" customModule="maps_me" customModuleProvider="target"> - <rect key="frame" x="0.0" y="134.5" width="375" height="44"/> + <rect key="frame" x="0.0" y="109.5" width="414" height="44"/> <autoresizingMask key="autoresizingMask"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Igk-BI-aHN" id="Qae-gb-v0B"> - <rect key="frame" x="0.0" y="0.0" width="341" height="43.5"/> + <rect key="frame" x="0.0" y="0.0" width="383" 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="RB1-Nr-K3T"> - <rect key="frame" x="16" y="12" width="225" height="19.5"/> + <rect key="frame" x="16" y="12" width="267" height="20"/> <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"/> </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="245" y="12" width="96" height="19.5"/> + <rect key="frame" x="287" y="12" width="96" 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"/> @@ -96,21 +94,21 @@ </connections> </tableViewCell> <tableViewCell contentMode="scaleToFill" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewSwitchCell" id="LYi-oF-eGj" customClass="SettingsTableViewSwitchCell" customModule="maps_me" customModuleProvider="target"> - <rect key="frame" x="0.0" y="178.5" width="375" height="44"/> + <rect key="frame" x="0.0" y="153.5" width="414" height="44"/> <autoresizingMask key="autoresizingMask"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="LYi-oF-eGj" id="6SA-kx-JeG"> - <rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/> + <rect key="frame" x="0.0" y="0.0" width="414" 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" minimumFontSize="13" translatesAutoresizingMaskIntoConstraints="NO" id="OM9-RZ-sca"> - <rect key="frame" x="16" y="14" width="286" height="15.5"/> + <rect key="frame" x="16" y="14" width="321" height="15.5"/> <inset key="insetFor6xAndEarlier" minX="0.0" minY="0.0" maxX="-25" maxY="0.0"/> <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"/> </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.5" width="51" height="31"/> + <rect key="frame" x="345" y="6.5" 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"/> </switch> @@ -130,21 +128,21 @@ </connections> </tableViewCell> <tableViewCell contentMode="scaleToFill" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewSwitchCell" id="0Lf-xU-P2U" customClass="SettingsTableViewSwitchCell" customModule="maps_me" customModuleProvider="target"> - <rect key="frame" x="0.0" y="222.5" width="375" height="44"/> + <rect key="frame" x="0.0" y="197.5" width="414" height="44"/> <autoresizingMask key="autoresizingMask"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="0Lf-xU-P2U" id="3Q1-iE-5pP"> - <rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/> + <rect key="frame" x="0.0" y="0.0" width="414" height="44"/> <autoresizingMask key="autoresizingMask"/> <subviews> <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="3D здания" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="13" translatesAutoresizingMaskIntoConstraints="NO" id="tU0-tQ-usy"> - <rect key="frame" x="16" y="14" width="286" height="15.5"/> + <rect key="frame" x="16" y="14" width="321" height="15.5"/> <inset key="insetFor6xAndEarlier" minX="0.0" minY="0.0" maxX="-25" maxY="0.0"/> <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"/> </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.5" width="51" height="31"/> + <rect key="frame" x="345" y="6.5" 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"/> </switch> @@ -164,21 +162,21 @@ </connections> </tableViewCell> <tableViewCell contentMode="scaleToFill" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewSwitchCell" id="eE4-OC-9uX" customClass="SettingsTableViewSwitchCell" customModule="maps_me" customModuleProvider="target"> - <rect key="frame" x="0.0" y="266.5" width="375" height="44"/> + <rect key="frame" x="0.0" y="241.5" width="414" height="44"/> <autoresizingMask key="autoresizingMask"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="eE4-OC-9uX" id="xJx-2K-AIP"> - <rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/> + <rect key="frame" x="0.0" y="0.0" width="414" 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" minimumFontSize="13" translatesAutoresizingMaskIntoConstraints="NO" id="6ZU-5V-v0J"> - <rect key="frame" x="16" y="14" width="286" height="15.5"/> + <rect key="frame" x="16" y="14" width="321" height="15.5"/> <inset key="insetFor6xAndEarlier" minX="0.0" minY="0.0" maxX="-25" maxY="0.0"/> <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"/> </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.5" width="51" height="31"/> + <rect key="frame" x="345" y="6.5" 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"/> </switch> @@ -198,21 +196,21 @@ </connections> </tableViewCell> <tableViewCell contentMode="scaleToFill" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewSwitchCell" id="hbG-yu-ut3" customClass="SettingsTableViewSwitchCell" customModule="maps_me" customModuleProvider="target"> - <rect key="frame" x="0.0" y="310.5" width="375" height="44"/> + <rect key="frame" x="0.0" y="285.5" width="414" height="44"/> <autoresizingMask key="autoresizingMask"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="hbG-yu-ut3" id="5D0-ZK-p4X"> - <rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/> + <rect key="frame" x="0.0" y="0.0" width="414" 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" minimumFontSize="13" translatesAutoresizingMaskIntoConstraints="NO" id="YUL-hz-V1C"> - <rect key="frame" x="16" y="14" width="286" height="15.5"/> + <rect key="frame" x="16" y="14" width="321" height="15.5"/> <inset key="insetFor6xAndEarlier" minX="0.0" minY="0.0" maxX="-25" maxY="0.0"/> <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"/> </label> <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" horizontalCompressionResistancePriority="751" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="gal-zH-fgo"> - <rect key="frame" x="310" y="6.5" width="51" height="31"/> + <rect key="frame" x="345" y="6.5" 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"/> </switch> @@ -232,20 +230,20 @@ </connections> </tableViewCell> <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewLinkCell" id="6NC-QX-WiF" customClass="SettingsTableViewLinkCell" customModule="maps_me" customModuleProvider="target"> - <rect key="frame" x="0.0" y="354.5" width="375" height="44"/> + <rect key="frame" x="0.0" y="329.5" width="414" height="44"/> <autoresizingMask key="autoresizingMask"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="6NC-QX-WiF" id="gGY-3t-Lik"> - <rect key="frame" x="0.0" y="0.0" width="341" height="43.5"/> + <rect key="frame" x="0.0" y="0.0" width="383" 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="wjW-GA-wVI"> - <rect key="frame" x="16" y="12" width="254" height="19.5"/> + <rect key="frame" x="16" y="12" width="296" height="20"/> <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"/> </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="274" y="12" width="67" height="19.5"/> + <rect key="frame" x="316" y="12" width="67" 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"/> @@ -267,20 +265,20 @@ </connections> </tableViewCell> <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewLinkCell" id="MN2-YK-AUo" userLabel="Power Managment Cell" customClass="SettingsTableViewLinkCell" customModule="maps_me" customModuleProvider="target"> - <rect key="frame" x="0.0" y="398.5" width="375" height="44"/> + <rect key="frame" x="0.0" y="373.5" width="414" height="44"/> <autoresizingMask key="autoresizingMask"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="MN2-YK-AUo" id="n6P-oZ-gz7"> - <rect key="frame" x="0.0" y="0.0" width="341" height="43.5"/> + <rect key="frame" x="0.0" y="0.0" width="383" 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="ihs-G4-eJW"> - <rect key="frame" x="16" y="12" width="254" height="19.5"/> + <rect key="frame" x="16" y="12" width="296" height="20"/> <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"/> </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="5Ze-dx-apc"> - <rect key="frame" x="274" y="12" width="67" height="19.5"/> + <rect key="frame" x="316" y="12" width="67" 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"/> @@ -302,20 +300,20 @@ </connections> </tableViewCell> <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewLinkCell" id="VyW-Wh-2QX" customClass="SettingsTableViewLinkCell" customModule="maps_me" customModuleProvider="target"> - <rect key="frame" x="0.0" y="442.5" width="375" height="44"/> + <rect key="frame" x="0.0" y="417.5" width="414" height="44"/> <autoresizingMask key="autoresizingMask"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="VyW-Wh-2QX" id="ihq-PO-ic8"> - <rect key="frame" x="0.0" y="0.0" width="341" height="43.5"/> + <rect key="frame" x="0.0" y="0.0" width="383" 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="3ew-eh-kVT"> - <rect key="frame" x="16" y="12" width="248" height="19.5"/> + <rect key="frame" x="16" y="12" width="290" height="20"/> <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"/> </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="268" y="12" width="73" height="19.5"/> + <rect key="frame" x="310" y="12" width="73" 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"/> @@ -337,21 +335,21 @@ </connections> </tableViewCell> <tableViewCell contentMode="scaleToFill" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewSwitchCell" id="pri-6G-9Zb" customClass="SettingsTableViewSwitchCell" customModule="maps_me" customModuleProvider="target"> - <rect key="frame" x="0.0" y="486.5" width="375" height="44"/> + <rect key="frame" x="0.0" y="461.5" width="414" height="44"/> <autoresizingMask key="autoresizingMask"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="pri-6G-9Zb" id="Zp6-d6-V6o"> - <rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/> + <rect key="frame" x="0.0" y="0.0" width="414" 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" minimumFontSize="13" translatesAutoresizingMaskIntoConstraints="NO" id="uNY-c3-bGX"> - <rect key="frame" x="16" y="14" width="286" height="15.5"/> + <rect key="frame" x="16" y="14" width="321" height="15.5"/> <inset key="insetFor6xAndEarlier" minX="0.0" minY="0.0" maxX="-25" maxY="0.0"/> <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"/> </label> <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="bAw-rB-tR1"> - <rect key="frame" x="310" y="6.5" width="51" height="31"/> + <rect key="frame" x="345" y="6.5" 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"/> </switch> @@ -371,21 +369,21 @@ </connections> </tableViewCell> <tableViewCell contentMode="scaleToFill" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewSwitchCell" id="f8Z-Jk-JIR" customClass="SettingsTableViewSwitchCell" customModule="maps_me" customModuleProvider="target"> - <rect key="frame" x="0.0" y="530.5" width="375" height="44"/> + <rect key="frame" x="0.0" y="505.5" width="414" height="44"/> <autoresizingMask key="autoresizingMask"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="f8Z-Jk-JIR" id="1QF-6L-hJp"> - <rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/> + <rect key="frame" x="0.0" y="0.0" width="414" 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" minimumFontSize="13" translatesAutoresizingMaskIntoConstraints="NO" id="NQ0-0Q-Y8K"> - <rect key="frame" x="16" y="14" width="286" height="15.5"/> + <rect key="frame" x="16" y="14" width="321" height="15.5"/> <inset key="insetFor6xAndEarlier" minX="0.0" minY="0.0" maxX="-25" maxY="0.0"/> <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"/> </label> <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="tuY-xc-X6P"> - <rect key="frame" x="310" y="6.5" width="51" height="31"/> + <rect key="frame" x="345" y="6.5" 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"/> </switch> @@ -405,21 +403,21 @@ </connections> </tableViewCell> <tableViewCell contentMode="scaleToFill" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewSwitchCell" id="P5e-67-f4k" customClass="SettingsTableViewSwitchCell" customModule="maps_me" customModuleProvider="target"> - <rect key="frame" x="0.0" y="574.5" width="375" height="44"/> + <rect key="frame" x="0.0" y="549.5" width="414" height="44"/> <autoresizingMask key="autoresizingMask"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="P5e-67-f4k" id="RlB-hW-A2l"> - <rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/> + <rect key="frame" x="0.0" y="0.0" width="414" 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" minimumFontSize="13" translatesAutoresizingMaskIntoConstraints="NO" id="Xqo-QZ-3fd"> - <rect key="frame" x="16" y="14" width="286" height="15.5"/> + <rect key="frame" x="16" y="14" width="321" height="15.5"/> <inset key="insetFor6xAndEarlier" minX="0.0" minY="0.0" maxX="-25" maxY="0.0"/> <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"/> </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.5" width="51" height="31"/> + <rect key="frame" x="345" y="6.5" 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"/> </switch> @@ -439,21 +437,21 @@ </connections> </tableViewCell> <tableViewCell contentMode="scaleToFill" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewSwitchCell" id="F1Y-qu-HAo" customClass="SettingsTableViewSwitchCell" customModule="maps_me" customModuleProvider="target"> - <rect key="frame" x="0.0" y="618.5" width="375" height="44"/> + <rect key="frame" x="0.0" y="593.5" width="414" height="44"/> <autoresizingMask key="autoresizingMask"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="F1Y-qu-HAo" id="59j-Py-CGY"> - <rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/> + <rect key="frame" x="0.0" y="0.0" width="414" 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" minimumFontSize="13" translatesAutoresizingMaskIntoConstraints="NO" id="g5e-wH-Cqs"> - <rect key="frame" x="16" y="11" width="294" height="21"/> + <rect key="frame" x="16" y="14" width="321" height="15.5"/> <inset key="insetFor6xAndEarlier" minX="0.0" minY="0.0" maxX="-25" maxY="0.0"/> <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"/> </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="318" y="6.5" width="51" height="31"/> + <rect key="frame" x="345" y="6.5" 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"/> </switch> @@ -473,21 +471,21 @@ </connections> </tableViewCell> <tableViewCell contentMode="scaleToFill" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewSwitchCell" id="NOt-bc-7ls" customClass="SettingsTableViewSwitchCell" customModule="maps_me" customModuleProvider="target"> - <rect key="frame" x="0.0" y="662.5" width="375" height="44"/> + <rect key="frame" x="0.0" y="637.5" width="414" height="44"/> <autoresizingMask key="autoresizingMask"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="NOt-bc-7ls" id="xdj-y5-zpk"> - <rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/> + <rect key="frame" x="0.0" y="0.0" width="414" 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" minimumFontSize="13" translatesAutoresizingMaskIntoConstraints="NO" id="K9e-I1-pZu"> - <rect key="frame" x="16" y="11" width="294" height="21"/> + <rect key="frame" x="16" y="14" width="321" height="15.5"/> <inset key="insetFor6xAndEarlier" minX="0.0" minY="0.0" maxX="-25" maxY="0.0"/> <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"/> </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="318" y="6.5" width="51" height="31"/> + <rect key="frame" x="345" y="6.5" 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"/> </switch> @@ -511,24 +509,20 @@ <tableViewSection headerTitle="ПОДПИСКИ" id="hpa-fI-I3o"> <cells> <tableViewCell contentMode="scaleToFill" selectionStyle="default" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewSelectableCell" id="2pB-bw-TE4" customClass="SettingsTableViewSelectableProgressCell" customModule="maps_me" customModuleProvider="target"> - <rect key="frame" x="0.0" y="790.5" width="375" height="44"/> + <rect key="frame" x="0.0" y="765.5" width="414" height="44"/> <autoresizingMask key="autoresizingMask"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="2pB-bw-TE4" id="Mjg-FQ-BbL"> - <rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/> + <rect key="frame" x="0.0" y="0.0" width="414" 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="wLQ-ju-cRP"> - <rect key="frame" x="16" y="11" width="315" height="21"/> + <rect key="frame" x="16" y="14" width="354" height="15.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> <activityIndicatorView hidden="YES" opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" hidesWhenStopped="YES" style="gray" translatesAutoresizingMaskIntoConstraints="NO" id="lK6-Ad-YkO"> - <rect key="frame" x="339" y="12" width="20" height="20"/> + <rect key="frame" x="378" y="12" width="20" height="20"/> </activityIndicatorView> </subviews> <constraints> @@ -546,20 +540,20 @@ </connections> </tableViewCell> <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewLinkCell" id="Wqu-gu-kFj" customClass="SettingsTableViewLinkCell" customModule="maps_me" customModuleProvider="target"> - <rect key="frame" x="0.0" y="834.5" width="375" height="44"/> + <rect key="frame" x="0.0" y="809.5" width="414" height="44"/> <autoresizingMask key="autoresizingMask"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Wqu-gu-kFj" id="aVC-Mw-Q04"> - <rect key="frame" x="0.0" y="0.0" width="349" height="43.5"/> + <rect key="frame" x="0.0" y="0.0" width="383" 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="k6E-9d-5e0"> - <rect key="frame" x="16" y="12" width="329" height="19.5"/> + <rect key="frame" x="16" y="12" width="363" height="20"/> <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"/> </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="BPz-mU-tll"> - <rect key="frame" x="349" y="12" width="0.0" height="19.5"/> + <rect key="frame" x="383" y="12" 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"/> @@ -585,20 +579,20 @@ <tableViewSection headerTitle="НАВИГАЦИЯ" id="E4E-hs-9xW"> <cells> <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewLinkCell" id="QNt-XC-xma" customClass="SettingsTableViewLinkCell" customModule="maps_me" customModuleProvider="target"> - <rect key="frame" x="0.0" y="926.5" width="375" height="44"/> + <rect key="frame" x="0.0" y="901.5" width="414" 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="349" height="43.5"/> + <rect key="frame" x="0.0" y="0.0" width="395" 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="q7P-cj-3tZ"> - <rect key="frame" x="16" y="12" width="205" height="19.5"/> + <rect key="frame" x="16" y="12" width="437" height="20"/> <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"/> </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="225" y="12" width="124" height="19.5"/> + <rect key="frame" x="457" y="12" width="124" 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"/> @@ -620,21 +614,21 @@ </connections> </tableViewCell> <tableViewCell contentMode="scaleToFill" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewSwitchCell" id="X5R-fv-yd7" customClass="SettingsTableViewSwitchCell" customModule="maps_me" customModuleProvider="target"> - <rect key="frame" x="0.0" y="970.5" width="375" height="44"/> + <rect key="frame" x="0.0" y="945.5" width="414" 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.5"/> + <rect key="frame" x="0.0" y="0.0" width="414" 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" minimumFontSize="13" translatesAutoresizingMaskIntoConstraints="NO" id="tmn-CU-6EB"> - <rect key="frame" x="16" y="11" width="294" height="21"/> + <rect key="frame" x="16" y="11" width="519" height="21.5"/> <inset key="insetFor6xAndEarlier" minX="0.0" minY="0.0" maxX="-25" maxY="0.0"/> <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"/> </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="318" y="6.5" width="51" height="31"/> + <rect key="frame" x="543" y="6.5" 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"/> </switch> @@ -654,21 +648,21 @@ </connections> </tableViewCell> <tableViewCell contentMode="scaleToFill" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewSwitchCell" id="veW-Fm-2Hl" customClass="SettingsTableViewSwitchCell" customModule="maps_me" customModuleProvider="target"> - <rect key="frame" x="0.0" y="1014.5" width="375" height="44"/> + <rect key="frame" x="0.0" y="989.5" width="414" 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.5"/> + <rect key="frame" x="0.0" y="0.0" width="414" 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" minimumFontSize="13" translatesAutoresizingMaskIntoConstraints="NO" id="qL3-bA-5tn"> - <rect key="frame" x="16" y="11" width="294" height="21"/> + <rect key="frame" x="16" y="11" width="519" height="21.5"/> <inset key="insetFor6xAndEarlier" minX="0.0" minY="0.0" maxX="-25" maxY="0.0"/> <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"/> </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="318" y="6.5" width="51" height="31"/> + <rect key="frame" x="543" y="6.5" 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"/> </switch> @@ -688,20 +682,20 @@ </connections> </tableViewCell> <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewLinkCell" id="nED-2n-gN6" customClass="SettingsTableViewLinkCell" customModule="maps_me" customModuleProvider="target"> - <rect key="frame" x="0.0" y="1058.5" width="375" height="44"/> + <rect key="frame" x="0.0" y="1033.5" width="414" 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="349" height="43.5"/> + <rect key="frame" x="0.0" y="0.0" width="395" 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="2v2-mU-aWi"> - <rect key="frame" x="16" y="12" width="241" height="19.5"/> + <rect key="frame" x="16" y="12" width="473" height="20"/> <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"/> </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="261" y="12" width="88" height="19.5"/> + <rect key="frame" x="493" y="12" width="88" 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"/> @@ -723,14 +717,14 @@ </connections> </tableViewCell> <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewLinkCell" id="KrE-Sc-fI1" customClass="SettingsTableViewLinkCell" customModule="maps_me" customModuleProvider="target"> - <rect key="frame" x="0.0" y="1102.5" width="375" height="44"/> + <rect key="frame" x="0.0" y="1077.5" width="414" height="44"/> <autoresizingMask key="autoresizingMask"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KrE-Sc-fI1" id="AKJ-VB-Pzr"> - <rect key="frame" x="0.0" y="0.0" width="349" height="43.5"/> + <rect key="frame" x="0.0" y="0.0" width="395" height="44"/> <autoresizingMask key="autoresizingMask"/> <subviews> <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Drivinig options" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Svw-vb-P42"> - <rect key="frame" x="16" y="12" width="329" height="19.5"/> + <rect key="frame" x="16" y="12" width="561" height="20"/> <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"/> @@ -739,7 +733,7 @@ </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="wC1-f8-Br8"> - <rect key="frame" x="349" y="12" width="0.0" height="19.5"/> + <rect key="frame" x="581" y="12" 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"/> @@ -765,20 +759,20 @@ <tableViewSection headerTitle="ИНФОРМАЦИЯ" id="i4H-WV-BaS"> <cells> <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewLinkCell" id="JTZ-K9-RVv" customClass="SettingsTableViewLinkCell" customModule="maps_me" customModuleProvider="target"> - <rect key="frame" x="0.0" y="1194.5" width="375" height="44"/> + <rect key="frame" x="0.0" y="1169.5" width="414" 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="349" height="43.5"/> + <rect key="frame" x="0.0" y="0.0" width="395" 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="7ty-Jh-0Rp"> - <rect key="frame" x="16" y="12" width="329" height="19.5"/> + <rect key="frame" x="16" y="12" width="561" height="20"/> <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"/> </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="349" y="12" width="0.0" height="19.5"/> + <rect key="frame" x="581" y="12" 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"/> @@ -800,25 +794,24 @@ </connections> </tableViewCell> <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewLinkCell" id="Kv3-pO-jV5" customClass="SettingsTableViewLinkCell" customModule="maps_me" customModuleProvider="target"> - <rect key="frame" x="0.0" y="1238.5" width="375" height="44"/> + <rect key="frame" x="0.0" y="1213.5" width="414" 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="349" height="43.5"/> + <rect key="frame" x="0.0" y="0.0" width="395" 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="cS1-Lw-pFx"> - <rect key="frame" x="16" y="12" width="329" height="19.5"/> + <rect key="frame" x="16" y="12" width="375" height="20"/> <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="styleName" value="regular17:blackPrimaryText"/> <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="349" y="12" width="0.0" height="19.5"/> + <rect key="frame" x="395" y="12" 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"/> @@ -894,27 +887,28 @@ <objects> <tableViewController id="kBJ-ZO-Mca" customClass="MWMNightModeController" sceneMemberID="viewController"> <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="static" style="grouped" separatorStyle="default" rowHeight="44" sectionHeaderHeight="18" sectionFooterHeight="18" id="fpP-Ix-QtX"> - <rect key="frame" x="0.0" y="0.0" width="375" height="667"/> + <rect key="frame" x="0.0" y="0.0" width="414" height="896"/> <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"/> <sections> <tableViewSection id="XFW-hZ-fJo"> <cells> <tableViewCell contentMode="scaleToFill" selectionStyle="default" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewSelectableCell" id="Hgm-jL-Gnn" customClass="SettingsTableViewSelectableCell" customModule="maps_me" customModuleProvider="target"> - <rect key="frame" x="0.0" y="35" width="375" height="44"/> + <rect key="frame" x="0.0" y="18" width="414" 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.5"/> + <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" ambiguous="YES" tableViewCell="Hgm-jL-Gnn" id="LeE-yP-Eoi"> + <rect key="frame" x="0.0" y="0.0" width="414" 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"> <rect key="frame" x="16" y="14" width="333" height="15.5"/> + <constraints> + <constraint firstAttribute="width" constant="333" id="QHn-fH-2P1"/> + </constraints> <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_auto"/> </userDefinedRuntimeAttributes> </label> @@ -931,20 +925,18 @@ </connections> </tableViewCell> <tableViewCell contentMode="scaleToFill" selectionStyle="default" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewSelectableCell" id="WyO-qs-a7i" customClass="SettingsTableViewSelectableCell" customModule="maps_me" customModuleProvider="target"> - <rect key="frame" x="0.0" y="79" width="375" height="44"/> + <rect key="frame" x="0.0" y="62" width="414" 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.5"/> + <rect key="frame" x="0.0" y="0.0" width="414" 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"> - <rect key="frame" x="16" y="14" width="333" height="15.5"/> + <rect key="frame" x="16" y="14" width="368" height="15.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"/> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="pref_map_style_night"/> </userDefinedRuntimeAttributes> </label> @@ -961,20 +953,18 @@ </connections> </tableViewCell> <tableViewCell contentMode="scaleToFill" selectionStyle="default" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewSelectableCell" id="HHw-BT-UeJ" customClass="SettingsTableViewSelectableCell" customModule="maps_me" customModuleProvider="target"> - <rect key="frame" x="0.0" y="123" width="375" height="44"/> + <rect key="frame" x="0.0" y="106" width="414" 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.5"/> + <rect key="frame" x="0.0" y="0.0" width="414" 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"> - <rect key="frame" x="16" y="14" width="333" height="15.5"/> + <rect key="frame" x="16" y="14" width="368" height="15.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"/> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="pref_map_style_default"/> </userDefinedRuntimeAttributes> </label> @@ -1013,28 +1003,26 @@ <objects> <tableViewController id="NP0-s9-34g" customClass="MWMRecentTrackSettingsController" sceneMemberID="viewController"> <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="static" style="grouped" separatorStyle="default" rowHeight="44" sectionHeaderHeight="18" sectionFooterHeight="18" id="Ai6-eS-WuL"> - <rect key="frame" x="0.0" y="0.0" width="375" height="667"/> + <rect key="frame" x="0.0" y="0.0" width="414" height="896"/> <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"/> <sections> <tableViewSection id="0dw-og-Sit"> <cells> <tableViewCell contentMode="scaleToFill" selectionStyle="default" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewSelectableCell" id="HL5-jQ-yNK" customClass="SettingsTableViewSelectableCell" customModule="maps_me" customModuleProvider="target"> - <rect key="frame" x="0.0" y="35" width="375" height="44"/> + <rect key="frame" x="0.0" y="18" width="414" 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.5"/> + <rect key="frame" x="0.0" y="0.0" width="414" 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"> - <rect key="frame" x="16" y="14" width="333" height="15.5"/> + <rect key="frame" x="16" y="14" width="368" height="15.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="localizedText" value="duration_disabled"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular17"/> </userDefinedRuntimeAttributes> </label> </subviews> @@ -1050,21 +1038,19 @@ </connections> </tableViewCell> <tableViewCell contentMode="scaleToFill" selectionStyle="default" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewSelectableCell" id="8Cq-dm-roX" customClass="SettingsTableViewSelectableCell" customModule="maps_me" customModuleProvider="target"> - <rect key="frame" x="0.0" y="79" width="375" height="44"/> + <rect key="frame" x="0.0" y="62" width="414" 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.5"/> + <rect key="frame" x="0.0" y="0.0" width="414" 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"> - <rect key="frame" x="16" y="14" width="333" height="15.5"/> + <rect key="frame" x="16" y="14" width="368" height="15.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="localizedText" value="duration_1_hour"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular17"/> </userDefinedRuntimeAttributes> </label> </subviews> @@ -1080,21 +1066,19 @@ </connections> </tableViewCell> <tableViewCell contentMode="scaleToFill" selectionStyle="default" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewSelectableCell" id="DIL-q2-mUp" customClass="SettingsTableViewSelectableCell" customModule="maps_me" customModuleProvider="target"> - <rect key="frame" x="0.0" y="123" width="375" height="44"/> + <rect key="frame" x="0.0" y="106" width="414" 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.5"/> + <rect key="frame" x="0.0" y="0.0" width="414" 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"> - <rect key="frame" x="16" y="14" width="333" height="15.5"/> + <rect key="frame" x="16" y="14" width="368" height="15.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="localizedText" value="duration_2_hours"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular17"/> </userDefinedRuntimeAttributes> </label> </subviews> @@ -1110,21 +1094,19 @@ </connections> </tableViewCell> <tableViewCell contentMode="scaleToFill" selectionStyle="default" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewSelectableCell" id="1Mm-WA-eyt" customClass="SettingsTableViewSelectableCell" customModule="maps_me" customModuleProvider="target"> - <rect key="frame" x="0.0" y="167" width="375" height="44"/> + <rect key="frame" x="0.0" y="150" width="414" 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.5"/> + <rect key="frame" x="0.0" y="0.0" width="414" 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"> - <rect key="frame" x="16" y="14" width="333" height="15.5"/> + <rect key="frame" x="16" y="14" width="368" height="15.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="localizedText" value="duration_6_hours"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular17"/> </userDefinedRuntimeAttributes> </label> </subviews> @@ -1140,21 +1122,19 @@ </connections> </tableViewCell> <tableViewCell contentMode="scaleToFill" selectionStyle="default" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewSelectableCell" id="JLY-Qt-y88" customClass="SettingsTableViewSelectableCell" customModule="maps_me" customModuleProvider="target"> - <rect key="frame" x="0.0" y="211" width="375" height="44"/> + <rect key="frame" x="0.0" y="194" width="414" 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.5"/> + <rect key="frame" x="0.0" y="0.0" width="414" 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"> - <rect key="frame" x="16" y="14" width="333" height="15.5"/> + <rect key="frame" x="16" y="14" width="368" height="15.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="localizedText" value="duration_12_hours"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular17"/> </userDefinedRuntimeAttributes> </label> </subviews> @@ -1170,21 +1150,19 @@ </connections> </tableViewCell> <tableViewCell contentMode="scaleToFill" selectionStyle="default" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewSelectableCell" id="mbv-1J-wSI" customClass="SettingsTableViewSelectableCell" customModule="maps_me" customModuleProvider="target"> - <rect key="frame" x="0.0" y="255" width="375" height="44"/> + <rect key="frame" x="0.0" y="238" width="414" 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.5"/> + <rect key="frame" x="0.0" y="0.0" width="414" 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"> - <rect key="frame" x="16" y="14" width="333" height="15.5"/> + <rect key="frame" x="16" y="14" width="368" height="15.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="localizedText" value="duration_1_day"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular17"/> </userDefinedRuntimeAttributes> </label> </subviews> @@ -1225,30 +1203,26 @@ <objects> <tableViewController id="XDU-iY-yV9" customClass="MWMTTSSettingsViewController" sceneMemberID="viewController"> <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="grouped" separatorStyle="default" rowHeight="44" sectionHeaderHeight="18" sectionFooterHeight="18" id="UXT-6R-4is"> - <rect key="frame" x="0.0" y="0.0" width="375" height="667"/> + <rect key="frame" x="0.0" y="0.0" width="414" height="896"/> <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="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewSwitchCell" id="hb3-Fe-677" customClass="SettingsTableViewSwitchCell" customModule="maps_me" customModuleProvider="target"> - <rect key="frame" x="0.0" y="55.5" width="375" height="44"/> + <rect key="frame" x="0.0" y="55.5" width="414" height="44"/> <autoresizingMask key="autoresizingMask"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="hb3-Fe-677" id="gQB-q8-5c8"> - <rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/> + <rect key="frame" x="0.0" y="0.0" width="414" height="44"/> <autoresizingMask key="autoresizingMask"/> <subviews> <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Voice instructions" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="13" translatesAutoresizingMaskIntoConstraints="NO" id="1JE-c4-BGG"> - <rect key="frame" x="16" y="14" width="286" height="15.5"/> + <rect key="frame" x="16" y="14" width="321" height="15.5"/> <inset key="insetFor6xAndEarlier" minX="0.0" minY="0.0" maxX="-25" maxY="0.0"/> <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> <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Y9L-MA-GCQ"> - <rect key="frame" x="310" y="6.5" width="51" height="31"/> + <rect key="frame" x="345" y="6.5" 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"/> </switch> @@ -1268,21 +1242,17 @@ </connections> </tableViewCell> <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="checkmark" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewSelectableCell" id="79I-kz-hl4" customClass="SettingsTableViewSelectableCell" customModule="maps_me" customModuleProvider="target"> - <rect key="frame" x="0.0" y="99.5" width="375" height="44"/> + <rect key="frame" x="0.0" y="99.5" width="414" height="44"/> <autoresizingMask key="autoresizingMask"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="79I-kz-hl4" id="gBB-ji-big"> - <rect key="frame" x="0.0" y="0.0" width="335" height="43.5"/> + <rect key="frame" x="0.0" y="0.0" width="370" 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="FSn-fP-n3e"> - <rect key="frame" x="16" y="14" width="301" height="15.5"/> + <rect key="frame" x="16" y="14" width="336" height="15.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> </subviews> <constraints> @@ -1297,20 +1267,20 @@ </connections> </tableViewCell> <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewLinkCell" id="lO6-zb-qb8" customClass="SettingsTableViewLinkCell" customModule="maps_me" customModuleProvider="target"> - <rect key="frame" x="0.0" y="143.5" width="375" height="44"/> + <rect key="frame" x="0.0" y="143.5" width="414" height="44"/> <autoresizingMask key="autoresizingMask"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="lO6-zb-qb8" id="35k-Nb-XSD"> - <rect key="frame" x="0.0" y="0.0" width="341" height="43.5"/> + <rect key="frame" x="0.0" y="0.0" width="383" height="44"/> <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="12" width="321" height="19.5"/> + <rect key="frame" x="16" y="12" width="363" height="20"/> <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"/> </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="341" y="12" width="0.0" height="19.5"/> + <rect key="frame" x="383" y="12" 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"/> @@ -1352,26 +1322,22 @@ <objects> <tableViewController id="13e-Bs-Dwh" customClass="MWMTTSLanguageViewController" sceneMemberID="viewController"> <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="grouped" separatorStyle="default" rowHeight="44" sectionHeaderHeight="18" sectionFooterHeight="18" id="3eG-G0-XZP"> - <rect key="frame" x="0.0" y="0.0" width="375" height="667"/> + <rect key="frame" x="0.0" y="0.0" width="414" height="896"/> <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="SettingsTableViewSelectableCell" id="6Px-TO-sMc" customClass="SettingsTableViewSelectableCell" customModule="maps_me" customModuleProvider="target"> - <rect key="frame" x="0.0" y="55.5" width="375" height="44"/> + <rect key="frame" x="0.0" y="55.5" width="414" height="44"/> <autoresizingMask key="autoresizingMask"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="6Px-TO-sMc" id="aqp-aV-B3y"> - <rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/> + <rect key="frame" x="0.0" y="0.0" width="414" 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="wBg-nH-SXL"> - <rect key="frame" x="16" y="14" width="333" height="15.5"/> + <rect key="frame" x="16" y="14" width="368" height="15.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> </subviews> <constraints> @@ -1404,27 +1370,25 @@ <objects> <tableViewController id="Ww0-88-Jrd" customClass="MWMUnitsController" sceneMemberID="viewController"> <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="static" style="grouped" separatorStyle="default" rowHeight="44" sectionHeaderHeight="18" sectionFooterHeight="18" id="PRO-Nm-3ZN"> - <rect key="frame" x="0.0" y="0.0" width="375" height="667"/> + <rect key="frame" x="0.0" y="0.0" width="414" height="896"/> <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"/> <sections> <tableViewSection id="YbY-TG-Fq9"> <cells> <tableViewCell contentMode="scaleToFill" selectionStyle="default" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewSelectableCell" id="233-Ku-OFh" customClass="SettingsTableViewSelectableCell" customModule="maps_me" customModuleProvider="target"> - <rect key="frame" x="0.0" y="35" width="375" height="44"/> + <rect key="frame" x="0.0" y="18" width="414" 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.5"/> + <rect key="frame" x="0.0" y="0.0" width="414" 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"> - <rect key="frame" x="16" y="14" width="333" height="15.5"/> + <rect key="frame" x="16" y="14" width="368" height="15.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"/> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="kilometres"/> </userDefinedRuntimeAttributes> </label> @@ -1436,22 +1400,23 @@ <constraint firstItem="m0T-TK-aex" firstAttribute="top" secondItem="Tig-SC-0oN" secondAttribute="topMargin" constant="3" id="zvL-DV-q7h"/> </constraints> </tableViewCellContentView> + <connections> + <outlet property="title" destination="m0T-TK-aex" id="TJz-l6-62M"/> + </connections> </tableViewCell> <tableViewCell contentMode="scaleToFill" selectionStyle="default" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewSelectableCell" id="XGu-p4-IVy" customClass="SettingsTableViewSelectableCell" customModule="maps_me" customModuleProvider="target"> - <rect key="frame" x="0.0" y="79" width="375" height="44"/> + <rect key="frame" x="0.0" y="62" width="414" 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.5"/> + <rect key="frame" x="0.0" y="0.0" width="414" 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"> - <rect key="frame" x="16" y="14" width="333" height="15.5"/> + <rect key="frame" x="16" y="14" width="368" height="15.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"/> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="miles"/> </userDefinedRuntimeAttributes> </label> @@ -1463,6 +1428,12 @@ <constraint firstAttribute="bottomMargin" secondItem="xrt-1n-szu" secondAttribute="bottom" constant="3.5" id="raH-6r-jMt"/> </constraints> </tableViewCellContentView> + <constraints> + <constraint firstItem="xrt-1n-szu" firstAttribute="leading" secondItem="XGu-p4-IVy" secondAttribute="leading" constant="16" id="xyG-WH-xJG"/> + </constraints> + <connections> + <outlet property="title" destination="xrt-1n-szu" id="4Uh-Ic-4b3"/> + </connections> </tableViewCell> </cells> </tableViewSection> @@ -1486,11 +1457,11 @@ <objects> <viewController id="f2i-mO-skH" customClass="MWMHelpController" sceneMemberID="viewController"> <view key="view" contentMode="scaleToFill" id="tkX-wI-s7n"> - <rect key="frame" x="0.0" y="0.0" width="375" height="667"/> + <rect key="frame" x="0.0" y="0.0" width="414" height="896"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="5Eg-lz-6TT"> - <rect key="frame" x="0.0" y="623" width="375" height="44"/> + <rect key="frame" x="0.0" y="818" width="414" height="44"/> <color key="backgroundColor" red="1" green="1" blue="1" alpha="0.80000000000000004" colorSpace="custom" customColorSpace="sRGB"/> <constraints> <constraint firstAttribute="height" constant="44" id="l2j-bd-ouL"/> @@ -1499,7 +1470,7 @@ <color key="titleColor" red="0.11764705882352941" green="0.58823529411764708" blue="0.94117647058823528" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> </state> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular17"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular17"/> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="feedback"/> </userDefinedRuntimeAttributes> <connections> @@ -1507,7 +1478,7 @@ </connections> </button> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Kpm-mR-y8b"> - <rect key="frame" x="0.0" y="622" width="375" height="1"/> + <rect key="frame" x="0.0" y="817" width="414" height="1"/> <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.12" colorSpace="custom" customColorSpace="sRGB"/> <constraints> <constraint firstAttribute="height" constant="1" id="ban-XF-pOT"/> @@ -1538,27 +1509,25 @@ <objects> <tableViewController id="WyW-ez-gUy" customClass="MWMAboutController" sceneMemberID="viewController"> <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="static" style="grouped" separatorStyle="default" rowHeight="44" sectionHeaderHeight="18" sectionFooterHeight="18" id="sUF-VC-Odx"> - <rect key="frame" x="0.0" y="0.0" width="375" height="667"/> + <rect key="frame" x="0.0" y="0.0" width="414" height="896"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/> <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="SettingsTableViewLinkCell" customModule="maps_me" customModuleProvider="target"> - <rect key="frame" x="0.0" y="35" width="375" height="44"/> + <rect key="frame" x="0.0" y="18" width="414" 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="341" height="43.5"/> + <rect key="frame" x="0.0" y="0.0" width="383" 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"> - <rect key="frame" x="16" y="14" width="307" height="15.5"/> + <rect key="frame" x="16" y="14" width="349" height="15.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"/> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="website"/> </userDefinedRuntimeAttributes> </label> @@ -1570,22 +1539,23 @@ <constraint firstAttribute="trailingMargin" secondItem="dRQ-jj-BMn" secondAttribute="trailing" constant="10" id="g79-4i-uXm"/> </constraints> </tableViewCellContentView> + <connections> + <outlet property="title" destination="dRQ-jj-BMn" id="rXq-ie-1BA"/> + </connections> </tableViewCell> <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" id="AwY-rw-AMm" customClass="SettingsTableViewLinkCell" customModule="maps_me" customModuleProvider="target"> - <rect key="frame" x="0.0" y="79" width="375" height="44"/> + <rect key="frame" x="0.0" y="62" width="414" 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="341" height="43.5"/> + <rect key="frame" x="0.0" y="0.0" width="383" 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"> - <rect key="frame" x="16" y="14" width="307" height="15.5"/> + <rect key="frame" x="16" y="14" width="349" height="15.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"/> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="like_on_facebook"/> </userDefinedRuntimeAttributes> </label> @@ -1597,22 +1567,23 @@ <constraint firstAttribute="bottomMargin" secondItem="VRr-XH-vvX" secondAttribute="bottom" constant="3.5" id="w53-vF-beO"/> </constraints> </tableViewCellContentView> + <connections> + <outlet property="title" destination="VRr-XH-vvX" id="1RC-qM-3D2"/> + </connections> </tableViewCell> <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" id="PYl-5B-hBB" customClass="SettingsTableViewLinkCell" customModule="maps_me" customModuleProvider="target"> - <rect key="frame" x="0.0" y="123" width="375" height="44"/> + <rect key="frame" x="0.0" y="106" width="414" 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="341" height="43.5"/> + <rect key="frame" x="0.0" y="0.0" width="383" 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"> - <rect key="frame" x="16" y="14" width="307" height="15.5"/> + <rect key="frame" x="16" y="14" width="349" height="15.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"/> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="follow_on_twitter"/> </userDefinedRuntimeAttributes> </label> @@ -1624,23 +1595,22 @@ <constraint firstAttribute="trailingMargin" secondItem="snB-CD-ffn" secondAttribute="trailing" constant="10" id="TRb-qk-L6W"/> </constraints> </tableViewCellContentView> + <connections> + <outlet property="title" destination="snB-CD-ffn" id="Gds-tD-RIY"/> + </connections> </tableViewCell> <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" id="8n2-Bc-3lW" customClass="SettingsTableViewLinkCell" customModule="maps_me" customModuleProvider="target"> - <rect key="frame" x="0.0" y="167" width="375" height="44"/> + <rect key="frame" x="0.0" y="150" width="414" height="44"/> <autoresizingMask key="autoresizingMask"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="8n2-Bc-3lW" id="swd-n3-rgq"> - <rect key="frame" x="0.0" y="0.0" width="341" height="43.5"/> + <rect key="frame" x="0.0" y="0.0" width="383" height="44"/> <autoresizingMask key="autoresizingMask"/> <subviews> <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="OpenStreetMap" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="LsV-5e-JVw"> - <rect key="frame" x="16" y="14" width="307" height="15.5"/> + <rect key="frame" x="16" y="14" width="349" height="15.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> </subviews> <constraints> @@ -1651,26 +1621,27 @@ </constraints> </tableViewCellContentView> <inset key="separatorInset" minX="0.0" minY="0.0" maxX="0.0" maxY="0.0"/> + <connections> + <outlet property="title" destination="LsV-5e-JVw" id="DTL-Pc-adt"/> + </connections> </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="SettingsTableViewLinkCell" customModule="maps_me" customModuleProvider="target"> - <rect key="frame" x="0.0" y="247" width="375" height="44"/> + <rect key="frame" x="0.0" y="230" width="414" 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="341" height="43.5"/> + <rect key="frame" x="0.0" y="0.0" width="383" 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"> - <rect key="frame" x="16" y="14" width="307" height="15.5"/> + <rect key="frame" x="16" y="14" width="349" height="15.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"/> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="rate_the_app"/> </userDefinedRuntimeAttributes> </label> @@ -1683,26 +1654,27 @@ </constraints> </tableViewCellContentView> <inset key="separatorInset" minX="0.0" minY="0.0" maxX="0.0" maxY="0.0"/> + <connections> + <outlet property="title" destination="Spi-mD-g8U" id="e5c-XR-WlR"/> + </connections> </tableViewCell> </cells> </tableViewSection> <tableViewSection id="riF-80-ZWx"> <cells> <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" id="DXH-GS-aHR" customClass="SettingsTableViewLinkCell" customModule="maps_me" customModuleProvider="target"> - <rect key="frame" x="0.0" y="327" width="375" height="44"/> + <rect key="frame" x="0.0" y="310" width="414" height="44"/> <autoresizingMask key="autoresizingMask"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="DXH-GS-aHR" id="hrz-tO-Flm"> - <rect key="frame" x="0.0" y="0.0" width="341" height="43.5"/> + <rect key="frame" x="0.0" y="0.0" width="383" height="44"/> <autoresizingMask key="autoresizingMask"/> <subviews> <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Ads" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Ane-Bd-4ya"> - <rect key="frame" x="16" y="14" width="307" height="15.5"/> + <rect key="frame" x="16" y="14" width="349" height="15.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"/> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="opt_out_mopub"/> </userDefinedRuntimeAttributes> </label> @@ -1716,29 +1688,26 @@ </tableViewCellContentView> <inset key="separatorInset" minX="0.0" minY="0.0" maxX="0.0" maxY="0.0"/> <connections> + <outlet property="title" destination="Ane-Bd-4ya" id="3an-fd-dcf"/> <segue destination="Vr8-QW-WhO" kind="show" id="U88-n3-d6K"/> </connections> </tableViewCell> <tableViewCell contentMode="scaleToFill" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewSwitchCell" id="6Fq-aj-irU" customClass="SettingsTableViewSwitchCell" customModule="maps_me" customModuleProvider="target"> - <rect key="frame" x="0.0" y="371" width="375" height="44"/> + <rect key="frame" x="0.0" y="354" width="414" height="44"/> <autoresizingMask key="autoresizingMask"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="6Fq-aj-irU" id="nFM-EC-CZC"> - <rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/> + <rect key="frame" x="0.0" y="0.0" width="414" height="44"/> <autoresizingMask key="autoresizingMask"/> <subviews> <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Send crash data" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="13" translatesAutoresizingMaskIntoConstraints="NO" id="vc4-e7-aiM"> - <rect key="frame" x="16" y="14" width="286" height="15.5"/> + <rect key="frame" x="16" y="14" width="321" height="15.5"/> <inset key="insetFor6xAndEarlier" minX="0.0" minY="0.0" maxX="-25" maxY="0.0"/> <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> <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="8gZ-CB-BtW"> - <rect key="frame" x="310" y="6.5" width="51" height="31"/> + <rect key="frame" x="345" y="6.5" 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"/> </switch> @@ -1762,20 +1731,18 @@ <tableViewSection id="Vce-Ld-skc"> <cells> <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" id="Phw-kU-YR4" customClass="SettingsTableViewLinkCell" customModule="maps_me" customModuleProvider="target"> - <rect key="frame" x="0.0" y="451" width="375" height="44"/> + <rect key="frame" x="0.0" y="434" width="414" height="44"/> <autoresizingMask key="autoresizingMask"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Phw-kU-YR4" id="aSD-aJ-PPx"> - <rect key="frame" x="0.0" y="0.0" width="341" height="43.5"/> + <rect key="frame" x="0.0" y="0.0" width="383" height="44"/> <autoresizingMask key="autoresizingMask"/> <subviews> <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Privacy Policy" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Inh-j5-jJX"> - <rect key="frame" x="16" y="14" width="307" height="15.5"/> + <rect key="frame" x="16" y="14" width="349" height="15.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"/> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="privacy_policy"/> </userDefinedRuntimeAttributes> </label> @@ -1788,22 +1755,23 @@ </constraints> </tableViewCellContentView> <inset key="separatorInset" minX="0.0" minY="0.0" maxX="0.0" maxY="0.0"/> + <connections> + <outlet property="title" destination="Inh-j5-jJX" id="pfY-ci-ic6"/> + </connections> </tableViewCell> <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" id="HL5-l3-1jg" customClass="SettingsTableViewLinkCell" customModule="maps_me" customModuleProvider="target"> - <rect key="frame" x="0.0" y="495" width="375" height="44"/> + <rect key="frame" x="0.0" y="478" width="414" height="44"/> <autoresizingMask key="autoresizingMask"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="HL5-l3-1jg" id="8Wj-Aa-vPE"> - <rect key="frame" x="0.0" y="0.0" width="341" height="43.5"/> + <rect key="frame" x="0.0" y="0.0" width="383" height="44"/> <autoresizingMask key="autoresizingMask"/> <subviews> <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Terms of Use" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="VN8-6g-ffS"> - <rect key="frame" x="16" y="14" width="307" height="15.5"/> + <rect key="frame" x="16" y="14" width="349" height="15.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"/> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="terms_of_use"/> </userDefinedRuntimeAttributes> </label> @@ -1816,22 +1784,23 @@ </constraints> </tableViewCellContentView> <inset key="separatorInset" minX="0.0" minY="0.0" maxX="0.0" maxY="0.0"/> + <connections> + <outlet property="title" destination="VN8-6g-ffS" id="nkz-HK-pVs"/> + </connections> </tableViewCell> <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" id="VXa-CM-OXP" customClass="SettingsTableViewLinkCell" customModule="maps_me" customModuleProvider="target"> - <rect key="frame" x="0.0" y="539" width="375" height="44"/> + <rect key="frame" x="0.0" y="522" width="414" 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="341" height="43.5"/> + <rect key="frame" x="0.0" y="0.0" width="383" 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"> - <rect key="frame" x="16" y="14" width="307" height="15.5"/> + <rect key="frame" x="16" y="14" width="349" height="15.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"/> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="copyright"/> </userDefinedRuntimeAttributes> </label> @@ -1844,6 +1813,9 @@ </constraints> </tableViewCellContentView> <inset key="separatorInset" minX="0.0" minY="0.0" maxX="0.0" maxY="0.0"/> + <connections> + <outlet property="title" destination="uhV-at-6HM" id="mr0-zp-Q3F"/> + </connections> </tableViewCell> </cells> </tableViewSection> @@ -1875,39 +1847,36 @@ <objects> <viewController id="Vr8-QW-WhO" customClass="MWMViewController" sceneMemberID="viewController"> <view key="view" contentMode="scaleToFill" id="cGc-6R-wWa"> - <rect key="frame" x="0.0" y="0.0" width="375" height="667"/> + <rect key="frame" x="0.0" y="0.0" width="414" height="842"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Your iOS mobile device may provide a “Limit Ad Tracking” or “Opt out of interest-based advertising” setting." textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="FTV-6u-1B0"> - <rect key="frame" x="20" y="40" width="335" height="61"/> + <rect key="frame" x="20" y="20" width="374" height="61"/> <fontDescription key="fontDescription" type="system" pointSize="17"/> <nil key="textColor"/> <nil key="highlightedColor"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular14"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackSecondaryText"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular14:blackSecondaryText"/> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="opt_out_help_ios_1"/> </userDefinedRuntimeAttributes> </label> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="iOS 9 or Higher" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="YRz-ke-XdF"> - <rect key="frame" x="20" y="121" width="335" height="20.5"/> + <rect key="frame" x="20" y="101" width="374" height="20.5"/> <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="17"/> <nil key="textColor"/> <nil key="highlightedColor"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="medium14"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="medium14:blackPrimaryText"/> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="opt_out_help_ios_2"/> </userDefinedRuntimeAttributes> </label> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Go to your Settings → Select Privacy → Select Advertising → Enable the “Limit Ad Tracking” setting" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="OMh-3m-tmj"> - <rect key="frame" x="20" y="141.5" width="335" height="61"/> + <rect key="frame" x="20" y="121.5" width="374" height="61"/> <fontDescription key="fontDescription" type="system" pointSize="17"/> <nil key="textColor"/> <nil key="highlightedColor"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular14"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackSecondaryText"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular14:blackSecondaryText"/> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="opt_out_help_ios_3"/> </userDefinedRuntimeAttributes> </label> @@ -1955,7 +1924,7 @@ <objects> <tableViewController id="4XX-qH-r6x" customClass="MWMMobileInternetViewController" sceneMemberID="viewController"> <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="static" style="grouped" separatorStyle="default" rowHeight="44" sectionHeaderHeight="18" sectionFooterHeight="18" id="mge-wH-6rt"> - <rect key="frame" x="0.0" y="0.0" width="375" height="667"/> + <rect key="frame" x="0.0" y="0.0" width="414" height="896"/> <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"/> <sections> @@ -1965,20 +1934,18 @@ Приложение не использует мобильный интернет в роуминге.</string> <cells> <tableViewCell contentMode="scaleToFill" selectionStyle="default" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewSelectableCell" id="gS7-2k-8yw" customClass="SettingsTableViewSelectableCell" customModule="maps_me" customModuleProvider="target"> - <rect key="frame" x="0.0" y="35" width="375" height="44"/> + <rect key="frame" x="0.0" y="18" width="414" 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.5"/> + <rect key="frame" x="0.0" y="0.0" width="414" 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"> - <rect key="frame" x="16" y="14" width="333" height="15.5"/> + <rect key="frame" x="16" y="14" width="368" height="15.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"/> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="mobile_data_option_always"/> </userDefinedRuntimeAttributes> </label> @@ -1995,20 +1962,18 @@ </connections> </tableViewCell> <tableViewCell contentMode="scaleToFill" selectionStyle="default" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewSelectableCell" id="lTE-DT-aCE" customClass="SettingsTableViewSelectableCell" customModule="maps_me" customModuleProvider="target"> - <rect key="frame" x="0.0" y="79" width="375" height="44"/> + <rect key="frame" x="0.0" y="62" width="414" 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.5"/> + <rect key="frame" x="0.0" y="0.0" width="414" 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"> - <rect key="frame" x="16" y="14" width="333" height="15.5"/> + <rect key="frame" x="16" y="14" width="368" height="15.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"/> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="mobile_data_option_ask"/> </userDefinedRuntimeAttributes> </label> @@ -2025,20 +1990,18 @@ </connections> </tableViewCell> <tableViewCell contentMode="scaleToFill" selectionStyle="default" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewSelectableCell" id="9uV-jg-h2A" customClass="SettingsTableViewSelectableCell" customModule="maps_me" customModuleProvider="target"> - <rect key="frame" x="0.0" y="123" width="375" height="44"/> + <rect key="frame" x="0.0" y="106" width="414" 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.5"/> + <rect key="frame" x="0.0" y="0.0" width="414" 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"> - <rect key="frame" x="16" y="14" width="333" height="15.5"/> + <rect key="frame" x="16" y="14" width="368" height="15.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"/> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="mobile_data_option_never"/> </userDefinedRuntimeAttributes> </label> @@ -2077,27 +2040,26 @@ <objects> <tableViewController id="vni-Mo-vH1" customClass="MWMPowerManagmentViewController" sceneMemberID="viewController"> <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="static" style="grouped" separatorStyle="default" rowHeight="44" sectionHeaderHeight="18" sectionFooterHeight="18" id="enF-2p-s0h"> - <rect key="frame" x="0.0" y="0.0" width="375" height="667"/> + <rect key="frame" x="0.0" y="0.0" width="414" height="896"/> <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"/> <sections> <tableViewSection footerTitle="Когда автоматический режим выбран, приложение может отключать энергопотребляющую функциональность при снижении уровня заряда" id="JOr-Xh-pe0"> <cells> <tableViewCell contentMode="scaleToFill" selectionStyle="default" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewSelectableCell" id="E3v-HX-t4T" customClass="SettingsTableViewSelectableCell" customModule="maps_me" customModuleProvider="target"> - <rect key="frame" x="0.0" y="35" width="375" height="44"/> + <rect key="frame" x="0.0" y="18" width="414" height="44"/> <autoresizingMask key="autoresizingMask"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="E3v-HX-t4T" id="3Lz-ko-Zz4"> - <rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/> + <rect key="frame" x="0.0" y="0.0" width="414" 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="qmx-xQ-ZWp"> - <rect key="frame" x="16" y="14" width="333" height="15.5"/> + <rect key="frame" x="16" y="14" width="368" height="15.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"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular17:blackPrimaryText"/> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="power_managment_setting_never"/> </userDefinedRuntimeAttributes> </label> @@ -2114,20 +2076,19 @@ </connections> </tableViewCell> <tableViewCell contentMode="scaleToFill" selectionStyle="default" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewSelectableCell" id="ZIh-Ok-kbn" customClass="SettingsTableViewSelectableCell" customModule="maps_me" customModuleProvider="target"> - <rect key="frame" x="0.0" y="79" width="375" height="44"/> + <rect key="frame" x="0.0" y="62" width="414" height="44"/> <autoresizingMask key="autoresizingMask"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="ZIh-Ok-kbn" id="Ev7-bM-Auy"> - <rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/> + <rect key="frame" x="0.0" y="0.0" width="414" 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="kwv-qP-M40"> - <rect key="frame" x="16" y="14" width="333" height="15.5"/> + <rect key="frame" x="16" y="14" width="368" height="15.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"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular17:blackPrimaryText"/> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="power_managment_setting_manual_max"/> </userDefinedRuntimeAttributes> </label> @@ -2144,20 +2105,19 @@ </connections> </tableViewCell> <tableViewCell contentMode="scaleToFill" selectionStyle="default" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewSelectableCell" id="L0p-Ud-RNv" customClass="SettingsTableViewSelectableCell" customModule="maps_me" customModuleProvider="target"> - <rect key="frame" x="0.0" y="123" width="375" height="44"/> + <rect key="frame" x="0.0" y="106" width="414" height="44"/> <autoresizingMask key="autoresizingMask"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="L0p-Ud-RNv" id="ZKy-q3-B0i"> - <rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/> + <rect key="frame" x="0.0" y="0.0" width="414" 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="n2d-wB-oZu"> - <rect key="frame" x="16" y="14" width="333" height="15.5"/> + <rect key="frame" x="16" y="14" width="368" height="15.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"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular17:blackPrimaryText"/> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="power_managment_setting_auto"/> </userDefinedRuntimeAttributes> </label> diff --git a/iphone/Maps/UI/Storyboard/Welcome.storyboard b/iphone/Maps/UI/Storyboard/Welcome.storyboard index 82ea76f915..101360c5da 100644 --- a/iphone/Maps/UI/Storyboard/Welcome.storyboard +++ b/iphone/Maps/UI/Storyboard/Welcome.storyboard @@ -1,9 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> - <device id="retina4_0" orientation="portrait" appearance="light"/> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15705" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> <dependencies> - <deployment identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15510"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15706"/> <capability name="Safe area layout guides" minToolsVersion="9.0"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> @@ -13,42 +11,40 @@ <objects> <viewController storyboardIdentifier="TermsOfUseViewController" id="GEP-CE-a4y" customClass="TermsOfUseViewController" customModule="maps_me" customModuleProvider="target" sceneMemberID="viewController"> <view key="view" contentMode="scaleToFill" id="0my-eF-8kL" customClass="SolidTouchView"> - <rect key="frame" x="0.0" y="0.0" width="320" height="568"/> + <rect key="frame" x="0.0" y="0.0" width="600" height="600"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> - <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="8OW-T7-BM2"> - <rect key="frame" x="20" y="20" width="280" height="528"/> + <view contentMode="scaleToFill" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="8OW-T7-BM2"> + <rect key="frame" x="20" y="64" width="560" height="778"/> <subviews> <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" verticalHuggingPriority="251" verticalCompressionResistancePriority="250" image="ic_placeholder" translatesAutoresizingMaskIntoConstraints="NO" id="NNh-bx-fiW"> - <rect key="frame" x="0.0" y="0.0" width="280" height="258.5"/> + <rect key="frame" x="0.0" y="0.0" width="480" height="480"/> <constraints> <constraint firstAttribute="width" secondItem="NNh-bx-fiW" secondAttribute="height" multiplier="1:1" priority="750" id="sgT-VJ-lNY"/> </constraints> </imageView> - <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" verticalCompressionResistancePriority="1000" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bbi-ym-j4p"> - <rect key="frame" x="0.0" y="282.5" width="280" height="53"/> + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" verticalCompressionResistancePriority="1000" ambiguous="YES" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bbi-ym-j4p"> + <rect key="frame" x="333" y="398" width="227" height="53"/> <string key="text">MAPS.ME All in one travel buddy</string> <fontDescription key="fontDescription" type="boldSystem" pointSize="22"/> <nil key="textColor"/> <nil key="highlightedColor"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="bold22"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="bold22:blackPrimaryText"/> </userDefinedRuntimeAttributes> </label> - <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" verticalCompressionResistancePriority="1000" text="To continue you must accept our Terms of Use and Privacy Policy. Please read them carefully. " textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Leo-V1-UCZ"> - <rect key="frame" x="0.0" y="351.5" width="280" height="57.5"/> + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" verticalCompressionResistancePriority="1000" ambiguous="YES" text="To continue you must accept our Terms of Use and Privacy Policy. Please read them carefully. " textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Leo-V1-UCZ"> + <rect key="frame" x="-120" y="467" width="680" height="38.5"/> <fontDescription key="fontDescription" type="system" pointSize="16"/> <nil key="textColor"/> <nil key="highlightedColor"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular17"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackSecondaryText"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular17:blackSecondaryText"/> </userDefinedRuntimeAttributes> </label> - <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Zz6-qx-Qge"> - <rect key="frame" x="0.0" y="425" width="280" height="51.5"/> + <view contentMode="scaleToFill" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Zz6-qx-Qge"> + <rect key="frame" x="0.0" y="521.5" width="374" height="51.5"/> <subviews> <view opaque="NO" contentMode="center" translatesAutoresizingMaskIntoConstraints="NO" id="60N-32-WZ3" customClass="Checkmark" customModule="maps_me" customModuleProvider="target"> <rect key="frame" x="0.0" y="0.0" width="52" height="51.5"/> @@ -65,7 +61,7 @@ All in one travel buddy</string> </connections> </view> <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" verticalCompressionResistancePriority="1000" scrollEnabled="NO" editable="NO" text="I agree to Privacy Policy" translatesAutoresizingMaskIntoConstraints="NO" id="Ai2-v2-KXg" customClass="LinkTextView" customModule="maps_me" customModuleProvider="target"> - <rect key="frame" x="52" y="8" width="228" height="35.5"/> + <rect key="frame" x="52" y="8" width="182.5" height="35.5"/> <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> <accessibility key="accessibilityConfiguration" identifier="welcome_storyboard.agree_privacy.text"/> <fontDescription key="fontDescription" name=".AppleSystemUIFont" family=".AppleSystemUIFont" pointSize="16"/> @@ -74,9 +70,7 @@ All in one travel buddy</string> <userDefinedRuntimeAttribute type="number" keyPath="textContainer.lineFragmentPadding"> <integer key="value" value="0"/> </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="rect" keyPath="textContainerInset"> - <rect key="value" x="0.0" y="0.0" width="0.0" height="0.0"/> - </userDefinedRuntimeAttribute> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="TermsOfUseLinkText"/> </userDefinedRuntimeAttributes> </textView> </subviews> @@ -92,8 +86,8 @@ All in one travel buddy</string> <constraint firstAttribute="bottom" secondItem="60N-32-WZ3" secondAttribute="bottom" id="e0w-0M-IXj"/> </constraints> </view> - <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="jbF-ri-Vws"> - <rect key="frame" x="0.0" y="476.5" width="280" height="51.5"/> + <view contentMode="scaleToFill" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="jbF-ri-Vws"> + <rect key="frame" x="0.0" y="573" width="374" height="51.5"/> <subviews> <view opaque="NO" contentMode="center" translatesAutoresizingMaskIntoConstraints="NO" id="fjg-ct-dro" customClass="Checkmark" customModule="maps_me" customModuleProvider="target"> <rect key="frame" x="0.0" y="0.0" width="52" height="51.5"/> @@ -110,7 +104,7 @@ All in one travel buddy</string> </connections> </view> <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" verticalCompressionResistancePriority="1000" scrollEnabled="NO" editable="NO" text="I agree to Terms of Use" translatesAutoresizingMaskIntoConstraints="NO" id="Zoj-oq-U2G" customClass="LinkTextView" customModule="maps_me" customModuleProvider="target"> - <rect key="frame" x="52" y="8" width="228" height="35.5"/> + <rect key="frame" x="52" y="8" width="178.5" height="35.5"/> <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> <accessibility key="accessibilityConfiguration" identifier="welcome_storyboard.agree_terms.text"/> <fontDescription key="fontDescription" name=".AppleSystemUIFont" family=".AppleSystemUIFont" pointSize="16"/> @@ -119,9 +113,7 @@ All in one travel buddy</string> <userDefinedRuntimeAttribute type="number" keyPath="textContainer.lineFragmentPadding"> <integer key="value" value="0"/> </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="rect" keyPath="textContainerInset"> - <rect key="value" x="0.0" y="0.0" width="0.0" height="0.0"/> - </userDefinedRuntimeAttribute> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="TermsOfUseLinkText"/> </userDefinedRuntimeAttributes> </textView> </subviews> @@ -228,7 +220,7 @@ All in one travel buddy</string> </constraints> <viewLayoutGuide key="safeArea" id="Rtz-aH-hl2"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Background"/> </userDefinedRuntimeAttributes> <variation key="default"> <mask key="constraints"> @@ -269,41 +261,39 @@ All in one travel buddy</string> <objects> <viewController storyboardIdentifier="WelcomeViewController" id="297-Lh-69k" customClass="WelcomeViewController" customModule="maps_me" customModuleProvider="target" sceneMemberID="viewController"> <view key="view" contentMode="scaleToFill" id="PbT-65-BE7"> - <rect key="frame" x="0.0" y="0.0" width="320" height="568"/> + <rect key="frame" x="0.0" y="0.0" width="600" height="600"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="KeI-mG-doa" userLabel="Container"> - <rect key="frame" x="0.0" y="0.0" width="320" height="568"/> + <rect key="frame" x="0.0" y="0.0" width="600" height="600"/> <subviews> - <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="8JU-24-KmH"> - <rect key="frame" x="20" y="20" width="280" height="416"/> + <view contentMode="scaleToFill" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="8JU-24-KmH"> + <rect key="frame" x="20" y="100.5" width="560" height="505.5"/> <subviews> <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" verticalCompressionResistancePriority="250" image="ic_placeholder" translatesAutoresizingMaskIntoConstraints="NO" id="28D-77-vUK"> - <rect key="frame" x="0.0" y="0.0" width="280" height="265.5"/> + <rect key="frame" x="0.0" y="0.0" width="480" height="480"/> <constraints> <constraint firstAttribute="width" secondItem="28D-77-vUK" secondAttribute="height" multiplier="1:1" priority="750" id="DeA-AF-4UT"/> </constraints> </imageView> - <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" verticalCompressionResistancePriority="1000" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="TUB-Wi-cFX"> - <rect key="frame" x="0.0" y="289.5" width="280" height="53"/> + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" verticalCompressionResistancePriority="1000" ambiguous="YES" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="TUB-Wi-cFX"> + <rect key="frame" x="333" y="398" width="227" height="53"/> <string key="text">MAPS.ME All in one travel buddy</string> <fontDescription key="fontDescription" type="boldSystem" pointSize="22"/> <nil key="textColor"/> <nil key="highlightedColor"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="bold22"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="bold22:blackPrimaryText"/> </userDefinedRuntimeAttributes> </label> - <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" verticalCompressionResistancePriority="1000" text="To continue you must accept our Terms of Use and Privacy Policy. Please read them carefully. " textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="E20-gb-nRV"> - <rect key="frame" x="0.0" y="358.5" width="280" height="57.5"/> + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" verticalCompressionResistancePriority="1000" ambiguous="YES" text="To continue you must accept our Terms of Use and Privacy Policy. Please read them carefully. " textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="E20-gb-nRV"> + <rect key="frame" x="-120" y="467" width="680" height="38.5"/> <fontDescription key="fontDescription" type="system" pointSize="16"/> <nil key="textColor"/> <nil key="highlightedColor"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular17"/> - <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackSecondaryText"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular17:blackSecondaryText"/> </userDefinedRuntimeAttributes> </label> </subviews> @@ -360,15 +350,15 @@ All in one travel buddy</string> </mask> </variation> </view> - <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="flm-sZ-NSs"> - <rect key="frame" x="0.0" y="0.0" width="320" height="20"/> + <view contentMode="scaleToFill" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="flm-sZ-NSs"> + <rect key="frame" x="0.0" y="0.0" width="600" height="100.5"/> <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> <constraints> <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="20" id="zcR-fU-Ny5"/> </constraints> </view> - <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="AkJ-r8-PHz"> - <rect key="frame" x="0.0" y="436" width="320" height="20"/> + <view contentMode="scaleToFill" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="AkJ-r8-PHz"> + <rect key="frame" x="0.0" y="606" width="600" height="100"/> <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> <constraints> <constraint firstAttribute="height" relation="lessThanOrEqual" constant="100" id="4qq-8d-PhL"/> @@ -385,7 +375,7 @@ All in one travel buddy</string> </variation> </view> <button opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="hQh-GR-Qe0" userLabel="NotNow"> - <rect key="frame" x="32" y="456" width="256" height="48"/> + <rect key="frame" x="532" y="488" width="36" height="48"/> <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/> <accessibility key="accessibilityConfiguration" identifier="welcome_storyboard.button_next2"/> <constraints> @@ -397,21 +387,14 @@ All in one travel buddy</string> <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> </state> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="textColorHighlightedName" value="white"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="semibold15"/> - <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius"> - <integer key="value" value="8"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="string" keyPath="textColorName" value="white"/> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="linkBlue"/> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundHighlightedColorName" value="linkBlueHighlighted"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="FlatNormalButton:MWMWhite:regular17"/> </userDefinedRuntimeAttributes> <connections> <action selector="onNextButton:" destination="297-Lh-69k" eventType="touchUpInside" id="LB0-Tt-YBL"/> </connections> </button> <button opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="qnh-Ec-P27" userLabel="NotNow"> - <rect key="frame" x="32" y="516" width="256" height="32"/> + <rect key="frame" x="529" y="548" width="39" height="32"/> <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/> <accessibility key="accessibilityConfiguration" identifier="welcome_storyboard.button_next2"/> <constraints> @@ -423,10 +406,8 @@ All in one travel buddy</string> <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> </state> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="textColorHighlightedName" value="blackPrimaryText"/> - <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="semibold15"/> - <userDefinedRuntimeAttribute type="string" keyPath="textColorName" value="blackSecondaryText"/> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="new_onboarding_additional_steps_later_button"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="FlatGrayTransButton"/> </userDefinedRuntimeAttributes> <connections> <action selector="onCloseButton:" destination="297-Lh-69k" eventType="touchUpInside" id="hPw-DH-xaF"/> @@ -508,7 +489,7 @@ All in one travel buddy</string> </constraints> <viewLayoutGuide key="safeArea" id="jhE-IM-4yj"/> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/> + <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Background"/> </userDefinedRuntimeAttributes> </view> <connections> diff --git a/iphone/Maps/UI/Welcome/TermsOfUse/TermsOfUseViewController.swift b/iphone/Maps/UI/Welcome/TermsOfUse/TermsOfUseViewController.swift index 9db6814d60..4b08141afe 100644 --- a/iphone/Maps/UI/Welcome/TermsOfUse/TermsOfUseViewController.swift +++ b/iphone/Maps/UI/Welcome/TermsOfUse/TermsOfUseViewController.swift @@ -29,19 +29,8 @@ class TermsOfUseViewController: MWMViewController { } } - @IBOutlet private weak var privacyPolicyCheck: Checkmark! { - didSet { - privacyPolicyCheck.offTintColor = .blackDividers() - privacyPolicyCheck.onTintColor = .linkBlue() - } - } - - @IBOutlet private weak var termsOfUseCheck: Checkmark! { - didSet { - termsOfUseCheck.offTintColor = .blackDividers() - termsOfUseCheck.onTintColor = .linkBlue() - } - } + @IBOutlet private weak var privacyPolicyCheck: Checkmark! + @IBOutlet private weak var termsOfUseCheck: Checkmark! override func viewDidLoad() { super.viewDidLoad() @@ -92,13 +81,8 @@ extension TermsOfUseViewController: ITermsOfUseView { } private func setHtmlTitle(textView: UITextView, htmlString: String) { - let attributes: [NSAttributedString.Key : Any] = [NSAttributedString.Key.font: UIFont.regular16(), - NSAttributedString.Key.foregroundColor: UIColor.blackPrimaryText()] textView.attributedText = NSAttributedString.string(withHtml: htmlString, - defaultAttributes: attributes) - textView.linkTextAttributes = [NSAttributedString.Key.font: UIFont.regular16(), - NSAttributedString.Key.foregroundColor: UIColor.linkBlue(), - NSAttributedString.Key.underlineColor: UIColor.clear] + defaultAttributes: [:]) } } diff --git a/iphone/Maps/UI/Welcome/WelcomePageController.swift b/iphone/Maps/UI/Welcome/WelcomePageController.swift index 124ab8f06d..8d15033f35 100644 --- a/iphone/Maps/UI/Welcome/WelcomePageController.swift +++ b/iphone/Maps/UI/Welcome/WelcomePageController.swift @@ -73,11 +73,11 @@ final class WelcomePageController: UIPageViewController { override func viewDidLoad() { super.viewDidLoad() - view.backgroundColor = UIColor.white() + view.styleName = "Background" iPadSpecific { let parentView = parentController.view! iPadBackgroundView = SolidTouchView(frame: parentView.bounds) - iPadBackgroundView!.backgroundColor = UIColor.fadeBackground() + iPadBackgroundView!.styleName = "FadeBackground" iPadBackgroundView!.autoresizingMask = [.flexibleWidth, .flexibleHeight] parentView.addSubview(iPadBackgroundView!) view.layer.cornerRadius = 5 |
