diff options
author | Ilya Grechuhin <i.grechuhin@gmail.com> | 2016-12-06 12:05:13 +0300 |
---|---|---|
committer | Ilya Grechuhin <i.grechuhin@gmail.com> | 2016-12-06 12:05:13 +0300 |
commit | b8bf7854654c8d9334688561a822ee2b2fbd6403 (patch) | |
tree | a505f147dbb1c15276de284b21f1c460a95f835a /iphone/Maps | |
parent | 3b5ba553f57d0777930cbbc8962368783796076e (diff) |
[shadow] [ios] Fixed shadows.
Diffstat (limited to 'iphone/Maps')
13 files changed, 261 insertions, 142 deletions
diff --git a/iphone/Maps/Classes/CustomAlert/DefaultAlert/MWMDefaultAlert.xib b/iphone/Maps/Classes/CustomAlert/DefaultAlert/MWMDefaultAlert.xib index 9afe8cbc8c..c87a6eb9b6 100644 --- a/iphone/Maps/Classes/CustomAlert/DefaultAlert/MWMDefaultAlert.xib +++ b/iphone/Maps/Classes/CustomAlert/DefaultAlert/MWMDefaultAlert.xib @@ -1,14 +1,17 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="10116" systemVersion="15E65" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES"> +<?xml version="1.0" encoding="UTF-8"?> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11542" systemVersion="16B2555" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" colorMatched="YES"> + <device id="retina4_7" orientation="portrait"> + <adaptation id="fullscreen"/> + </device> <dependencies> <deployment version="2048" identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11524"/> + <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> <customFonts key="customFonts"> - <mutableArray key="HelveticaNeue.ttc"> + <array key="HelveticaNeue.ttc"> <string>HelveticaNeue-Medium</string> - <string>HelveticaNeue-Medium</string> - </mutableArray> + </array> </customFonts> <objects> <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/> @@ -27,7 +30,7 @@ <constraint firstAttribute="width" constant="240" id="9rm-Av-9eY"/> </constraints> <fontDescription key="fontDescription" name="HelveticaNeue-Medium" family="Helvetica Neue" pointSize="18"/> - <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/> + <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"/> @@ -41,7 +44,7 @@ <constraint firstAttribute="width" constant="240" id="wbf-hD-V6a"/> </constraints> <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="calibratedRGB"/> + <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"/> @@ -50,7 +53,7 @@ </label> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="f8D-qe-39W" userLabel="hDivider"> <rect key="frame" x="0.0" y="94" width="280" height="1"/> - <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.12" colorSpace="calibratedRGB"/> + <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> @@ -66,8 +69,8 @@ </constraints> <fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="17"/> <state key="normal" title="left"> - <color key="titleColor" red="0.090196078430000007" green="0.61960784310000006" blue="0.30196078430000001" alpha="1" colorSpace="calibratedRGB"/> - <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/> + <color key="titleColor" red="0.090196078430000007" green="0.61960784310000006" blue="0.30196078430000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> + <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> </state> <state key="highlighted" backgroundImage="dialog_btn_press"/> <userDefinedRuntimeAttributes> @@ -81,7 +84,7 @@ </button> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="5H4-oD-Dex" userLabel="vDivider"> <rect key="frame" x="139" y="94" width="1" height="44"/> - <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.12" colorSpace="calibratedRGB"/> + <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.12" colorSpace="custom" customColorSpace="sRGB"/> <constraints> <constraint firstAttribute="height" constant="44" id="8r3-72-asP"/> <constraint firstAttribute="width" constant="1" id="ORs-aP-K10"/> @@ -98,8 +101,8 @@ </constraints> <fontDescription key="fontDescription" name="HelveticaNeue-Medium" family="Helvetica Neue" pointSize="17"/> <state key="normal" title="right"> - <color key="titleColor" red="0.090196078430000007" green="0.61960784310000006" blue="0.30196078430000001" alpha="1" colorSpace="calibratedRGB"/> - <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/> + <color key="titleColor" red="0.090196078430000007" green="0.61960784310000006" blue="0.30196078430000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> + <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> </state> <state key="highlighted" backgroundImage="dialog_btn_press"/> <userDefinedRuntimeAttributes> @@ -112,7 +115,7 @@ </connections> </button> </subviews> - <color key="backgroundColor" red="1" green="1" blue="1" alpha="0.88" colorSpace="calibratedRGB"/> + <color key="backgroundColor" red="1" green="1" blue="1" alpha="0.88" colorSpace="custom" customColorSpace="sRGB"/> <constraints> <constraint firstItem="Grl-z5-2cE" firstAttribute="top" secondItem="zso-DD-6SG" secondAttribute="top" constant="20" id="5iy-IL-Non"/> <constraint firstAttribute="bottom" secondItem="RSB-i6-pEP" secondAttribute="bottom" id="7PX-qC-iuH"/> @@ -136,7 +139,7 @@ <size key="value" width="0.0" height="3"/> </userDefinedRuntimeAttribute> <userDefinedRuntimeAttribute type="color" keyPath="layer.shadowUIColor"> - <color key="value" red="0.89625308388157898" green="0.0" blue="0.0" alpha="0.22" colorSpace="calibratedRGB"/> + <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"/> @@ -144,11 +147,14 @@ <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"/> </userDefinedRuntimeAttributes> </view> </subviews> - <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> + <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/> <constraints> <constraint firstAttribute="centerY" secondItem="zso-DD-6SG" secondAttribute="centerY" id="2Yk-mx-NtS"/> <constraint firstAttribute="centerX" secondItem="zso-DD-6SG" secondAttribute="centerX" id="rvU-lH-fCc"/> @@ -167,4 +173,9 @@ <resources> <image name="dialog_btn_press" width="280" height="44"/> </resources> + <simulatedMetricsContainer key="defaultSimulatedMetrics"> + <simulatedStatusBarMetrics key="statusBar"/> + <simulatedOrientationMetrics key="orientation"/> + <simulatedScreenMetrics key="destination" type="retina4_7.fullscreen"/> + </simulatedMetricsContainer> </document> diff --git a/iphone/Maps/Classes/CustomAlert/DownloadTransitMapsAlert/MWMDownloadTransitMapAlert.xib b/iphone/Maps/Classes/CustomAlert/DownloadTransitMapsAlert/MWMDownloadTransitMapAlert.xib index 7784353a48..224339bc7d 100644 --- a/iphone/Maps/Classes/CustomAlert/DownloadTransitMapsAlert/MWMDownloadTransitMapAlert.xib +++ b/iphone/Maps/Classes/CustomAlert/DownloadTransitMapsAlert/MWMDownloadTransitMapAlert.xib @@ -1,14 +1,17 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="10116" systemVersion="15E65" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES"> +<?xml version="1.0" encoding="UTF-8"?> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11542" systemVersion="16B2555" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" colorMatched="YES"> + <device id="retina4_7" orientation="portrait"> + <adaptation id="fullscreen"/> + </device> <dependencies> <deployment version="2048" identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11524"/> + <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> <customFonts key="customFonts"> - <mutableArray key="HelveticaNeue.ttc"> + <array key="HelveticaNeue.ttc"> <string>HelveticaNeue-Medium</string> - <string>HelveticaNeue-Medium</string> - </mutableArray> + </array> </customFonts> <objects> <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/> @@ -27,7 +30,7 @@ <constraint firstAttribute="width" constant="240" id="cHd-lJ-pXe"/> </constraints> <fontDescription key="fontDescription" name="HelveticaNeue-Medium" family="Helvetica Neue" pointSize="18"/> - <color key="textColor" red="0.12941176470588234" green="0.12941176470588234" blue="0.12941176470588234" alpha="1" colorSpace="calibratedRGB"/> + <color key="textColor" red="0.12941176470588234" green="0.12941176470588234" blue="0.12941176470588234" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <nil key="highlightedColor"/> <size key="shadowOffset" width="0.0" height="0.0"/> <userDefinedRuntimeAttributes> @@ -38,7 +41,7 @@ </label> <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="bco-zh-ekL"> <rect key="frame" x="122" y="65" width="36" height="36"/> - <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> + <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/> <constraints> <constraint firstAttribute="height" constant="36" id="0Pg-8w-QZa"/> <constraint firstAttribute="width" constant="36" id="cjU-dH-SAG"/> @@ -61,13 +64,13 @@ </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"> <rect key="frame" x="0.0" y="98" width="280" height="88"/> - <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> + <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/> <constraints> <constraint firstAttribute="height" constant="88" id="92H-Th-Xgt"/> </constraints> - <color key="separatorColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> - <color key="sectionIndexBackgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> - <color key="sectionIndexTrackingBackgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> + <color key="separatorColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/> + <color key="sectionIndexBackgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/> + <color key="sectionIndexTrackingBackgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/> <connections> <outlet property="dataSource" destination="jqI-GQ-yDh" id="8mP-kY-rEz"/> <outlet property="delegate" destination="jqI-GQ-yDh" id="9Fy-MW-IYa"/> @@ -92,8 +95,8 @@ </constraints> <fontDescription key="fontDescription" name="HelveticaNeue-Medium" family="Helvetica Neue" pointSize="17"/> <state key="normal" title="right"> - <color key="titleColor" red="0.090196078430000007" green="0.61960784310000006" blue="0.30196078430000001" alpha="1" colorSpace="calibratedRGB"/> - <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/> + <color key="titleColor" red="0.090196078430000007" green="0.61960784310000006" blue="0.30196078430000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> + <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> </state> <state key="highlighted" backgroundImage="dialog_btn_press"/> <userDefinedRuntimeAttributes> @@ -113,8 +116,8 @@ </constraints> <fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="17"/> <state key="normal" title="left"> - <color key="titleColor" red="0.090196078430000007" green="0.61960784310000006" blue="0.30196078430000001" alpha="1" colorSpace="calibratedRGB"/> - <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/> + <color key="titleColor" red="0.090196078430000007" green="0.61960784310000006" blue="0.30196078430000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> + <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> </state> <state key="highlighted" backgroundImage="dialog_btn_press"/> <userDefinedRuntimeAttributes> @@ -128,7 +131,7 @@ </button> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Jjh-VP-emP" userLabel="vDivider"> <rect key="frame" x="139" y="186" width="1" height="44"/> - <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.12" colorSpace="calibratedRGB"/> + <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="8kQ-Yd-0D3"/> <constraint firstAttribute="height" constant="44" id="vYd-td-NOl"/> @@ -138,7 +141,7 @@ </userDefinedRuntimeAttributes> </view> </subviews> - <color key="backgroundColor" white="1" alpha="0.88" colorSpace="calibratedWhite"/> + <color key="backgroundColor" red="1" green="1" blue="1" alpha="0.88" colorSpace="custom" customColorSpace="sRGB"/> <constraints> <constraint firstItem="dhS-fg-rNl" firstAttribute="top" secondItem="1lL-cj-2oS" secondAttribute="bottom" priority="500" id="2aT-au-ilL"/> <constraint firstAttribute="bottom" secondItem="dhS-fg-rNl" secondAttribute="bottom" id="2bS-ac-iDr"/> @@ -168,7 +171,7 @@ <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="calibratedRGB"/> + <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"/> @@ -176,11 +179,14 @@ <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"/> </userDefinedRuntimeAttributes> </view> </subviews> - <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> + <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/> <constraints> <constraint firstAttribute="centerY" secondItem="Hay-Qx-kVw" secondAttribute="centerY" id="5Z9-NF-BEW"/> <constraint firstAttribute="centerX" secondItem="Hay-Qx-kVw" secondAttribute="centerX" id="e0c-Aj-Anh"/> @@ -204,4 +210,9 @@ <resources> <image name="dialog_btn_press" width="280" height="44"/> </resources> + <simulatedMetricsContainer key="defaultSimulatedMetrics"> + <simulatedStatusBarMetrics key="statusBar"/> + <simulatedOrientationMetrics key="orientation"/> + <simulatedScreenMetrics key="destination" type="retina4_7.fullscreen"/> + </simulatedMetricsContainer> </document> diff --git a/iphone/Maps/Classes/CustomAlert/FacebookAlert/MWMFacebookAlert.xib b/iphone/Maps/Classes/CustomAlert/FacebookAlert/MWMFacebookAlert.xib index 4b26afc87f..88385560a9 100644 --- a/iphone/Maps/Classes/CustomAlert/FacebookAlert/MWMFacebookAlert.xib +++ b/iphone/Maps/Classes/CustomAlert/FacebookAlert/MWMFacebookAlert.xib @@ -1,14 +1,17 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="10116" systemVersion="15E65" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES"> +<?xml version="1.0" encoding="UTF-8"?> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11542" systemVersion="16B2555" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" colorMatched="YES"> + <device id="retina4_7" orientation="portrait"> + <adaptation id="fullscreen"/> + </device> <dependencies> <deployment version="2048" identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11524"/> + <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> <customFonts key="customFonts"> - <mutableArray key="HelveticaNeue.ttc"> + <array key="HelveticaNeue.ttc"> <string>HelveticaNeue-Medium</string> - <string>HelveticaNeue-Medium</string> - </mutableArray> + </array> </customFonts> <objects> <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/> @@ -27,7 +30,7 @@ <constraint firstAttribute="width" constant="240" id="E62-zt-CmQ"/> </constraints> <fontDescription key="fontDescription" name="HelveticaNeue-Medium" family="Helvetica Neue" pointSize="18"/> - <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/> + <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="localizedText" value="rating_do_like_maps"/> @@ -42,7 +45,7 @@ <constraint firstAttribute="width" constant="240" id="jJb-tA-140"/> </constraints> <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="calibratedRGB"/> + <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="share_on_facebook_text"/> @@ -52,7 +55,7 @@ </label> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="27o-Pr-5r5" userLabel="hDivider"> <rect key="frame" x="0.0" y="93" width="280" height="1"/> - <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.12" colorSpace="calibratedRGB"/> + <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="ItN-PG-PAr"/> </constraints> @@ -68,8 +71,8 @@ </constraints> <fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="17"/> <state key="normal" title="left"> - <color key="titleColor" red="0.090196078430000007" green="0.61960784310000006" blue="0.30196078430000001" alpha="1" colorSpace="calibratedRGB"/> - <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/> + <color key="titleColor" red="0.090196078430000007" green="0.61960784310000006" blue="0.30196078430000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> + <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> </state> <state key="highlighted" backgroundImage="dialog_btn_press"/> <userDefinedRuntimeAttributes> @@ -89,8 +92,8 @@ </constraints> <fontDescription key="fontDescription" name="HelveticaNeue-Medium" family="Helvetica Neue" pointSize="17"/> <state key="normal" title="right"> - <color key="titleColor" red="0.090196078430000007" green="0.61960784310000006" blue="0.30196078430000001" alpha="1" colorSpace="calibratedRGB"/> - <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/> + <color key="titleColor" red="0.090196078430000007" green="0.61960784310000006" blue="0.30196078430000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> + <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> </state> <state key="highlighted" backgroundImage="dialog_btn_press"/> <userDefinedRuntimeAttributes> @@ -104,7 +107,7 @@ </button> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="RGP-EG-eOe" userLabel="vDivider"> <rect key="frame" x="139" y="93" width="1" height="44"/> - <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.12" colorSpace="calibratedRGB"/> + <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="1TF-2b-jo4"/> <constraint firstAttribute="height" constant="44" id="2ZE-1w-Yd9"/> @@ -114,7 +117,7 @@ </userDefinedRuntimeAttributes> </view> </subviews> - <color key="backgroundColor" white="1" alpha="0.88" colorSpace="calibratedWhite"/> + <color key="backgroundColor" red="1" green="1" blue="1" alpha="0.88" colorSpace="custom" customColorSpace="sRGB"/> <constraints> <constraint firstAttribute="bottom" secondItem="RGP-EG-eOe" secondAttribute="bottom" constant="1" id="2L1-qn-SL5"/> <constraint firstAttribute="bottom" secondItem="Wp2-fW-sfI" secondAttribute="bottom" id="2cC-jr-6fM"/> @@ -143,11 +146,14 @@ <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"/> </userDefinedRuntimeAttributes> </view> </subviews> - <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> + <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/> <constraints> <constraint firstAttribute="centerY" secondItem="z0H-Rd-9cG" secondAttribute="centerY" id="EwN-vC-oZ1"/> <constraint firstAttribute="centerX" secondItem="z0H-Rd-9cG" secondAttribute="centerX" id="fQG-1v-223"/> @@ -158,4 +164,9 @@ <resources> <image name="dialog_btn_press" width="280" height="44"/> </resources> + <simulatedMetricsContainer key="defaultSimulatedMetrics"> + <simulatedStatusBarMetrics key="statusBar"/> + <simulatedOrientationMetrics key="orientation"/> + <simulatedScreenMetrics key="destination" type="retina4_7.fullscreen"/> + </simulatedMetricsContainer> </document> diff --git a/iphone/Maps/Classes/CustomAlert/MWMPlaceDoesntExistAlert.xib b/iphone/Maps/Classes/CustomAlert/MWMPlaceDoesntExistAlert.xib index d9cc47e0eb..a0a816160f 100644 --- a/iphone/Maps/Classes/CustomAlert/MWMPlaceDoesntExistAlert.xib +++ b/iphone/Maps/Classes/CustomAlert/MWMPlaceDoesntExistAlert.xib @@ -1,14 +1,17 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="10116" systemVersion="15E65" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES"> +<?xml version="1.0" encoding="UTF-8"?> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11542" systemVersion="16B2555" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" colorMatched="YES"> + <device id="retina4_7" orientation="portrait"> + <adaptation id="fullscreen"/> + </device> <dependencies> <deployment version="2048" identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11524"/> + <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> <customFonts key="customFonts"> - <mutableArray key="HelveticaNeue.ttc"> + <array key="HelveticaNeue.ttc"> <string>HelveticaNeue-Medium</string> - <string>HelveticaNeue-Medium</string> - </mutableArray> + </array> </customFonts> <objects> <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/> @@ -27,7 +30,7 @@ <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="22" id="JWn-Ze-jrX"/> </constraints> <fontDescription key="fontDescription" name="HelveticaNeue-Medium" family="Helvetica Neue" pointSize="18"/> - <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/> + <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"/> @@ -42,7 +45,7 @@ <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="20" id="VWx-20-JCg"/> </constraints> <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="calibratedRGB"/> + <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"/> @@ -55,7 +58,7 @@ <subviews> <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="0f8-vD-nJT"> <rect key="frame" x="4" y="0.0" width="240" height="24"/> - <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> + <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="uql-Jo-4VK"/> </constraints> @@ -71,7 +74,7 @@ </userDefinedRuntimeAttributes> </textField> </subviews> - <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> + <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <constraints> <constraint firstItem="0f8-vD-nJT" firstAttribute="centerX" secondItem="npf-dH-f50" secondAttribute="centerX" id="Pm7-RK-HAq"/> <constraint firstItem="0f8-vD-nJT" firstAttribute="centerY" secondItem="npf-dH-f50" secondAttribute="centerY" id="T6e-qA-hJ1"/> @@ -81,7 +84,7 @@ </constraints> <userDefinedRuntimeAttributes> <userDefinedRuntimeAttribute type="color" keyPath="layer.borderUIColor"> - <color key="value" red="0.0" green="0.0" blue="0.0" alpha="0.12" colorSpace="calibratedRGB"/> + <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"/> @@ -91,7 +94,7 @@ </view> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="kEx-DM-ynC" userLabel="hDivider"> <rect key="frame" x="0.0" y="122" width="280" height="1"/> - <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.12" colorSpace="calibratedRGB"/> + <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="JKX-3f-YE4"/> </constraints> @@ -107,8 +110,8 @@ </constraints> <fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="17"/> <state key="normal" title="left"> - <color key="titleColor" red="0.090196078430000007" green="0.61960784310000006" blue="0.30196078430000001" alpha="1" colorSpace="calibratedRGB"/> - <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/> + <color key="titleColor" red="0.090196078430000007" green="0.61960784310000006" blue="0.30196078430000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> + <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> </state> <state key="highlighted" backgroundImage="dialog_btn_press"/> <userDefinedRuntimeAttributes> @@ -128,8 +131,8 @@ </constraints> <fontDescription key="fontDescription" name="HelveticaNeue-Medium" family="Helvetica Neue" pointSize="17"/> <state key="normal" title="right"> - <color key="titleColor" red="0.090196078430000007" green="0.61960784310000006" blue="0.30196078430000001" alpha="1" colorSpace="calibratedRGB"/> - <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/> + <color key="titleColor" red="0.090196078430000007" green="0.61960784310000006" blue="0.30196078430000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> + <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> </state> <state key="highlighted" backgroundImage="dialog_btn_press"/> <userDefinedRuntimeAttributes> @@ -143,7 +146,7 @@ </button> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Tyn-yU-dk3" userLabel="vDivider"> <rect key="frame" x="139" y="122" width="1" height="44"/> - <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.12" colorSpace="calibratedRGB"/> + <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="Bva-2f-zNE"/> <constraint firstAttribute="height" constant="44" id="jEO-cN-3PZ"/> @@ -153,7 +156,7 @@ </userDefinedRuntimeAttributes> </view> </subviews> - <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> + <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/> <constraints> <constraint firstAttribute="trailing" secondItem="MkK-sG-n6m" secondAttribute="trailing" id="21Y-zv-8JR"/> <constraint firstItem="NwN-e5-YQR" firstAttribute="top" secondItem="XjH-qf-m6h" secondAttribute="top" constant="20" id="6pQ-wv-c4Z"/> @@ -178,7 +181,7 @@ <size key="value" width="0.0" height="3"/> </userDefinedRuntimeAttribute> <userDefinedRuntimeAttribute type="color" keyPath="layer.shadowUIColor"> - <color key="value" red="0.89625308390000002" green="0.0" blue="0.0" alpha="0.22" colorSpace="calibratedRGB"/> + <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"/> @@ -186,11 +189,14 @@ <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"/> </userDefinedRuntimeAttributes> </view> </subviews> - <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> + <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/> <constraints> <constraint firstItem="XjH-qf-m6h" firstAttribute="centerX" secondItem="bh1-8l-voy" secondAttribute="centerX" id="Ez4-IC-X2C"/> <constraint firstItem="XjH-qf-m6h" firstAttribute="centerY" secondItem="bh1-8l-voy" secondAttribute="centerY" id="ihl-fu-ac9"/> @@ -205,4 +211,9 @@ <resources> <image name="dialog_btn_press" width="280" height="44"/> </resources> + <simulatedMetricsContainer key="defaultSimulatedMetrics"> + <simulatedStatusBarMetrics key="statusBar"/> + <simulatedOrientationMetrics key="orientation"/> + <simulatedScreenMetrics key="destination" type="retina4_7.fullscreen"/> + </simulatedMetricsContainer> </document> diff --git a/iphone/Maps/Classes/CustomAlert/MobileInternetAlert/MWMMobileInternetAlert.xib b/iphone/Maps/Classes/CustomAlert/MobileInternetAlert/MWMMobileInternetAlert.xib index bd2c6e5720..530ee93eea 100644 --- a/iphone/Maps/Classes/CustomAlert/MobileInternetAlert/MWMMobileInternetAlert.xib +++ b/iphone/Maps/Classes/CustomAlert/MobileInternetAlert/MWMMobileInternetAlert.xib @@ -168,7 +168,7 @@ <size key="value" width="0.0" height="3"/> </userDefinedRuntimeAttribute> <userDefinedRuntimeAttribute type="color" keyPath="layer.shadowUIColor"> - <color key="value" red="0.89625308390000002" green="0.0" blue="0.0" alpha="0.22" colorSpace="custom" customColorSpace="sRGB"/> + <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"/> @@ -176,6 +176,9 @@ <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"/> </userDefinedRuntimeAttributes> </view> diff --git a/iphone/Maps/Classes/CustomAlert/RateAlert/MWMRateAlert.xib b/iphone/Maps/Classes/CustomAlert/RateAlert/MWMRateAlert.xib index 0d8be32cd1..2913d35c44 100644 --- a/iphone/Maps/Classes/CustomAlert/RateAlert/MWMRateAlert.xib +++ b/iphone/Maps/Classes/CustomAlert/RateAlert/MWMRateAlert.xib @@ -1,13 +1,17 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="10116" systemVersion="15D21" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES"> +<?xml version="1.0" encoding="UTF-8"?> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11542" systemVersion="16B2555" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" colorMatched="YES"> + <device id="retina4_7" orientation="portrait"> + <adaptation id="fullscreen"/> + </device> <dependencies> <deployment version="2048" identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11524"/> + <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> <customFonts key="customFonts"> - <mutableArray key="HelveticaNeue.ttc"> + <array key="HelveticaNeue.ttc"> <string>HelveticaNeue-Medium</string> - </mutableArray> + </array> </customFonts> <objects> <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/> @@ -21,15 +25,15 @@ <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"/> - <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> + <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="7d0-Ox-KVv"/> <constraint firstAttribute="height" constant="40" id="rAh-AS-UMC"/> </constraints> <fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="17"/> <state key="normal" image="ic_cancel"> - <color key="titleColor" red="0.01176470588" green="0.47843137250000001" blue="1" alpha="1" colorSpace="calibratedRGB"/> - <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/> + <color key="titleColor" red="0.01176470588" green="0.47843137250000001" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> + <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"/> @@ -45,7 +49,7 @@ <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="22" id="w6i-mI-DNF"/> </constraints> <fontDescription key="fontDescription" name="HelveticaNeue-Medium" family="Helvetica Neue" pointSize="18"/> - <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/> + <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"/> @@ -60,7 +64,7 @@ <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="16" id="v4x-De-gsX"/> </constraints> <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="calibratedRGB"/> + <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"/> @@ -73,8 +77,9 @@ <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"/> + <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <state key="normal" image="ic_rate_star_off"> - <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/> + <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> </state> <state key="selected" image="ic_rate_star_on"/> <state key="highlighted" image="ic_rate_star_pressed"/> @@ -87,8 +92,9 @@ </button> <button opaque="NO" tag="2" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="VHf-Kq-sRr"> <rect key="frame" x="48" y="0.0" width="48" height="48"/> + <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <state key="normal" image="ic_rate_star_off"> - <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/> + <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> </state> <state key="selected" image="ic_rate_star_on"/> <state key="highlighted" image="ic_rate_star_pressed"/> @@ -101,8 +107,9 @@ </button> <button opaque="NO" tag="3" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="gM3-vi-PTK"> <rect key="frame" x="96" y="0.0" width="48" height="48"/> + <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <state key="normal" image="ic_rate_star_off"> - <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/> + <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> </state> <state key="selected" image="ic_rate_star_on"/> <state key="highlighted" image="ic_rate_star_pressed"/> @@ -115,8 +122,9 @@ </button> <button opaque="NO" tag="4" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="p68-lV-IVJ"> <rect key="frame" x="144" y="0.0" width="48" height="48"/> + <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <state key="normal" image="ic_rate_star_off"> - <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/> + <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> </state> <state key="selected" image="ic_rate_star_on"/> <state key="highlighted" image="ic_rate_star_pressed"/> @@ -129,8 +137,9 @@ </button> <button opaque="NO" tag="5" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Nh7-Fc-Xxp"> <rect key="frame" x="192" y="0.0" width="48" height="48"/> + <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <state key="normal" image="ic_rate_star_off"> - <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/> + <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> </state> <state key="selected" image="ic_rate_star_on"/> <state key="highlighted" image="ic_rate_star_pressed"/> @@ -143,8 +152,9 @@ </button> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="1" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="xMo-h5-ZhH"> <rect key="frame" x="0.0" y="48" width="48" height="11"/> + <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <fontDescription key="fontDescription" type="system" pointSize="10"/> - <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.54000000000000004" colorSpace="calibratedRGB"/> + <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"/> @@ -153,8 +163,9 @@ </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"> <rect key="frame" x="48" y="48" width="48" height="11"/> + <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <fontDescription key="fontDescription" type="system" pointSize="10"/> - <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.54000000000000004" colorSpace="calibratedRGB"/> + <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"/> @@ -163,8 +174,9 @@ </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"> <rect key="frame" x="96" y="48" width="48" height="11"/> + <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <fontDescription key="fontDescription" type="system" pointSize="10"/> - <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.54000000000000004" colorSpace="calibratedRGB"/> + <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"/> @@ -173,8 +185,9 @@ </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"> <rect key="frame" x="144" y="48" width="48" height="11"/> + <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <fontDescription key="fontDescription" type="system" pointSize="10"/> - <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.54000000000000004" colorSpace="calibratedRGB"/> + <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"/> @@ -183,8 +196,9 @@ </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"> <rect key="frame" x="192" y="48" width="48" height="11"/> + <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <fontDescription key="fontDescription" type="system" pointSize="10"/> - <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.54000000000000004" colorSpace="calibratedRGB"/> + <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"/> @@ -192,7 +206,7 @@ </userDefinedRuntimeAttributes> </label> </subviews> - <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> + <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/> <constraints> <constraint firstAttribute="height" constant="59" id="2C4-0p-zGE"/> <constraint firstAttribute="width" constant="240" id="4Ar-TF-nEe"/> @@ -200,15 +214,15 @@ </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"/> - <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> + <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"/> <constraint firstAttribute="width" constant="240" id="wTo-pg-6DX"/> </constraints> <fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="17"/> <state key="normal" title="Leave a Review"> - <color key="titleColor" red="0.01176470588" green="0.47843137250000001" blue="1" alpha="1" colorSpace="calibratedRGB"/> - <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/> + <color key="titleColor" red="0.01176470588" green="0.47843137250000001" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> + <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> </state> <state key="disabled" title="Оценить"/> <userDefinedRuntimeAttributes> @@ -231,7 +245,7 @@ </connections> </button> </subviews> - <color key="backgroundColor" red="0.84705882349999995" green="0.84705882349999995" blue="0.84705882349999995" alpha="1" colorSpace="calibratedRGB"/> + <color key="backgroundColor" red="0.84705882349999995" green="0.84705882349999995" blue="0.84705882349999995" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <constraints> <constraint firstAttribute="centerX" secondItem="aP7-fq-KaH" secondAttribute="centerX" id="GI2-sL-76K"/> <constraint firstAttribute="centerX" secondItem="pFt-mm-wUl" secondAttribute="centerX" id="Hq8-IR-S13"/> @@ -256,11 +270,17 @@ <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"/> </userDefinedRuntimeAttributes> </view> </subviews> - <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> + <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/> <constraints> <constraint firstAttribute="centerX" secondItem="ecm-mK-5iV" secondAttribute="centerX" id="LYH-qW-kdN"/> <constraint firstAttribute="centerY" secondItem="ecm-mK-5iV" secondAttribute="centerY" constant="0.5" id="un4-ij-LG6"/> @@ -284,4 +304,9 @@ <image name="ic_rate_star_on" width="29" height="29"/> <image name="ic_rate_star_pressed" width="29" height="29"/> </resources> + <simulatedMetricsContainer key="defaultSimulatedMetrics"> + <simulatedStatusBarMetrics key="statusBar"/> + <simulatedOrientationMetrics key="orientation"/> + <simulatedScreenMetrics key="destination" type="retina4_7.fullscreen"/> + </simulatedMetricsContainer> </document> diff --git a/iphone/Maps/Classes/CustomAlert/RoutingDisclaimerAlert/MWMRoutingDisclaimerAlert.xib b/iphone/Maps/Classes/CustomAlert/RoutingDisclaimerAlert/MWMRoutingDisclaimerAlert.xib index 894395b16b..cc7a891e97 100644 --- a/iphone/Maps/Classes/CustomAlert/RoutingDisclaimerAlert/MWMRoutingDisclaimerAlert.xib +++ b/iphone/Maps/Classes/CustomAlert/RoutingDisclaimerAlert/MWMRoutingDisclaimerAlert.xib @@ -1,15 +1,17 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="10117" systemVersion="15G1004" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES"> +<?xml version="1.0" encoding="UTF-8"?> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11542" systemVersion="16B2555" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" colorMatched="YES"> + <device id="retina4_7" orientation="portrait"> + <adaptation id="fullscreen"/> + </device> <dependencies> <deployment version="2048" identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11524"/> + <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> <customFonts key="customFonts"> - <mutableArray key="HelveticaNeue.ttc"> + <array key="HelveticaNeue.ttc"> <string>HelveticaNeue-Medium</string> - <string>HelveticaNeue-Medium</string> - <string>HelveticaNeue-Medium</string> - </mutableArray> + </array> </customFonts> <objects> <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/> @@ -28,7 +30,7 @@ <constraint firstAttribute="width" constant="240" id="wsn-Cq-kJT"/> </constraints> <fontDescription key="fontDescription" name="HelveticaNeue-Medium" family="Helvetica Neue" pointSize="18"/> - <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/> + <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="localizedText" value="dialog_routing_disclaimer_title"/> @@ -38,7 +40,7 @@ </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"/> - <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> + <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"/> <constraint firstAttribute="height" constant="20" id="XLp-um-S4A"/> @@ -46,7 +48,7 @@ <attributedString key="attributedText"> <fragment content="Message"> <attributes> - <color key="NSColor" red="0.0" green="0.0" blue="0.0" alpha="0.54000000000000004" colorSpace="calibratedRGB"/> + <color key="NSColor" red="0.0" green="0.0" blue="0.0" alpha="0.54000000000000004" colorSpace="custom" customColorSpace="sRGB"/> <font key="NSFont" size="14" name="HelveticaNeue"/> <paragraphStyle key="NSParagraphStyle" alignment="left" lineBreakMode="wordWrapping" baseWritingDirection="natural"/> </attributes> @@ -60,7 +62,7 @@ </textView> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="XIL-q9-MMp" userLabel="hDivider"> <rect key="frame" x="0.0" y="92" width="280" height="1"/> - <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.12" colorSpace="calibratedRGB"/> + <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> @@ -75,8 +77,8 @@ </constraints> <fontDescription key="fontDescription" name="HelveticaNeue-Medium" family="Helvetica Neue" pointSize="17"/> <state key="normal" title="right"> - <color key="titleColor" red="0.090196078430000007" green="0.61960784310000006" blue="0.30196078430000001" alpha="1" colorSpace="calibratedRGB"/> - <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/> + <color key="titleColor" red="0.090196078430000007" green="0.61960784310000006" blue="0.30196078430000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> + <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> </state> <state key="highlighted" backgroundImage="dialog_btn_press"/> <userDefinedRuntimeAttributes> @@ -92,8 +94,8 @@ <rect key="frame" x="0.0" y="93" width="140" height="44"/> <fontDescription key="fontDescription" name="HelveticaNeue-Medium" family="Helvetica Neue" pointSize="17"/> <state key="normal" title="left"> - <color key="titleColor" red="0.090196078430000007" green="0.61960784310000006" blue="0.30196078430000001" alpha="1" colorSpace="calibratedRGB"/> - <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/> + <color key="titleColor" red="0.090196078430000007" green="0.61960784310000006" blue="0.30196078430000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> + <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> </state> <state key="highlighted" backgroundImage="dialog_btn_press"/> <userDefinedRuntimeAttributes> @@ -107,7 +109,7 @@ </button> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="930-J1-9o0" userLabel="vDivider"> <rect key="frame" x="140" y="93" width="1" height="44"/> - <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.12" colorSpace="calibratedRGB"/> + <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> @@ -116,7 +118,7 @@ </userDefinedRuntimeAttributes> </view> </subviews> - <color key="backgroundColor" white="1" alpha="0.88" colorSpace="calibratedWhite"/> + <color key="backgroundColor" red="1" green="1" blue="1" alpha="0.88" colorSpace="custom" customColorSpace="sRGB"/> <constraints> <constraint firstItem="lbr-Xd-hLF" firstAttribute="top" secondItem="S3s-j7-v6E" secondAttribute="bottom" constant="11" id="20T-2E-mmf"/> <constraint firstAttribute="width" secondItem="XIL-q9-MMp" secondAttribute="width" id="3m7-Ha-HlN"/> @@ -148,11 +150,17 @@ <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"/> </userDefinedRuntimeAttributes> </view> </subviews> - <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> + <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/> <constraints> <constraint firstAttribute="centerY" secondItem="Ogu-AE-Ohh" secondAttribute="centerY" id="Kg9-hX-fvu"/> <constraint firstAttribute="centerX" secondItem="Ogu-AE-Ohh" secondAttribute="centerX" id="dkW-i0-CZ2"/> @@ -167,4 +175,9 @@ <resources> <image name="dialog_btn_press" width="280" height="44"/> </resources> + <simulatedMetricsContainer key="defaultSimulatedMetrics"> + <simulatedStatusBarMetrics key="statusBar"/> + <simulatedOrientationMetrics key="orientation"/> + <simulatedScreenMetrics key="destination" type="retina4_7.fullscreen"/> + </simulatedMetricsContainer> </document> diff --git a/iphone/Maps/Classes/CustomAlert/SearchAlert/MWMSearchNoResultsAlert.xib b/iphone/Maps/Classes/CustomAlert/SearchAlert/MWMSearchNoResultsAlert.xib index b03b11a0fb..25b2c3974f 100644 --- a/iphone/Maps/Classes/CustomAlert/SearchAlert/MWMSearchNoResultsAlert.xib +++ b/iphone/Maps/Classes/CustomAlert/SearchAlert/MWMSearchNoResultsAlert.xib @@ -168,15 +168,18 @@ <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.89625308390000002" 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="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"/> </userDefinedRuntimeAttributes> </view> diff --git a/iphone/Maps/Classes/CustomAlert/Toast/MWMToast.xib b/iphone/Maps/Classes/CustomAlert/Toast/MWMToast.xib index fef4632081..95ae389b3b 100644 --- a/iphone/Maps/Classes/CustomAlert/Toast/MWMToast.xib +++ b/iphone/Maps/Classes/CustomAlert/Toast/MWMToast.xib @@ -16,10 +16,10 @@ </connections> </placeholder> <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/> - <visualEffectView opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" id="SVu-ra-Hl5"> + <visualEffectView opaque="NO" contentMode="scaleToFill" id="SVu-ra-Hl5"> <rect key="frame" x="0.0" y="0.0" width="240" height="64"/> <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/> - <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" id="0Xo-JU-ane"> + <view key="contentView" opaque="NO" multipleTouchEnabled="YES" contentMode="center" id="0Xo-JU-ane"> <rect key="frame" x="0.0" y="0.0" width="240" height="64"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> @@ -41,6 +41,18 @@ <constraint firstItem="mPe-i4-dRq" firstAttribute="top" secondItem="0Xo-JU-ane" secondAttribute="top" constant="32" id="fID-cb-97V"/> </constraints> <userDefinedRuntimeAttributes> + <userDefinedRuntimeAttribute type="size" keyPath="layer.shadowOffset"> + <size key="value" width="0.0" height="4"/> + </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.shadowRadius"> + <integer key="value" value="4"/> + </userDefinedRuntimeAttribute> + <userDefinedRuntimeAttribute type="number" keyPath="layer.shadowOpacity"> + <integer key="value" value="1"/> + </userDefinedRuntimeAttribute> <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="toastBackground"/> </userDefinedRuntimeAttributes> </view> diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/Search/MWMSearchManager.mm b/iphone/Maps/Classes/CustomViews/MapViewControls/Search/MWMSearchManager.mm index 271b635111..006ee2ba45 100644 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/Search/MWMSearchManager.mm +++ b/iphone/Maps/Classes/CustomViews/MapViewControls/Search/MWMSearchManager.mm @@ -489,9 +489,9 @@ typedef NS_ENUM(NSUInteger, MWMSearchManagerActionBarState) { { if (searchBarView.superview == parentView) return; - [parentView addSubview:searchBarView]; - [parentView addSubview:actionBarView]; [parentView addSubview:contentView]; + [parentView addSubview:actionBarView]; + [parentView addSubview:searchBarView]; [self layoutTopViews]; CGRect searchAndStatusBarFrame = self.searchBarView.frame; searchAndStatusBarFrame.size.height += statusBarHeight(); @@ -500,16 +500,16 @@ typedef NS_ENUM(NSUInteger, MWMSearchManagerActionBarState) { [UIView animateWithDuration:kDefaultAnimationDuration animations:^{ CGFloat const alpha = hidden ? 0 : 1; - searchBarView.alpha = alpha; - actionBarView.alpha = alpha; contentView.alpha = alpha; + actionBarView.alpha = alpha; + searchBarView.alpha = alpha; } completion:^(BOOL finished) { if (!hidden) return; - [searchBarView removeFromSuperview]; - [actionBarView removeFromSuperview]; [contentView removeFromSuperview]; + [actionBarView removeFromSuperview]; + [searchBarView removeFromSuperview]; }]; } diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/Search/MWMSearchView.xib b/iphone/Maps/Classes/CustomViews/MapViewControls/Search/MWMSearchView.xib index 38d8522e5c..7fd109fab1 100644 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/Search/MWMSearchView.xib +++ b/iphone/Maps/Classes/CustomViews/MapViewControls/Search/MWMSearchView.xib @@ -277,6 +277,18 @@ <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/> <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="0.0"/> + </userDefinedRuntimeAttribute> </userDefinedRuntimeAttributes> <point key="canvasLocation" x="236" y="-58"/> </view> diff --git a/iphone/Maps/Classes/Widgets/MWMMapDownloadDialog.xib b/iphone/Maps/Classes/Widgets/MWMMapDownloadDialog.xib index c47ffcb281..07b47df29e 100644 --- a/iphone/Maps/Classes/Widgets/MWMMapDownloadDialog.xib +++ b/iphone/Maps/Classes/Widgets/MWMMapDownloadDialog.xib @@ -1,13 +1,17 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="10116" systemVersion="15E65" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES"> +<?xml version="1.0" encoding="UTF-8"?> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11542" systemVersion="16B2555" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES"> + <device id="retina4_7" orientation="portrait"> + <adaptation id="fullscreen"/> + </device> <dependencies> <deployment version="2304" identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11524"/> + <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> <customFonts key="customFonts"> - <mutableArray key="HelveticaNeue.ttc"> + <array key="HelveticaNeue.ttc"> <string>HelveticaNeue-Medium</string> - </mutableArray> + </array> </customFonts> <objects> <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/> @@ -19,7 +23,7 @@ <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" verticalCompressionResistancePriority="751" text="Россия" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="GQf-xO-gh1"> <rect key="frame" x="10" y="20" width="180" height="26"/> <fontDescription key="fontDescription" type="system" pointSize="17"/> - <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.54000000000000004" colorSpace="calibratedRGB"/> + <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"/> @@ -29,7 +33,7 @@ <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"> <rect key="frame" x="10" y="48" width="180" height="47"/> <fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="20"/> - <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/> + <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"/> @@ -39,7 +43,7 @@ <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"> <rect key="frame" x="10" y="103" width="180" height="17"/> <fontDescription key="fontDescription" name="HelveticaNeue-Medium" family="Helvetica Neue" pointSize="14"/> - <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.54000000000000004" colorSpace="calibratedRGB"/> + <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"/> @@ -48,14 +52,14 @@ </label> <button opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="iyV-Rb-bea"> <rect key="frame" x="20" y="132" width="160" height="44"/> - <color key="backgroundColor" red="0.1176470588" green="0.58823529409999997" blue="0.94117647059999998" alpha="1" colorSpace="calibratedRGB"/> + <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="i64-mO-Txs"/> <constraint firstAttribute="width" constant="160" id="tIM-Zn-N9S"/> </constraints> <fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="16"/> <state key="normal" title="Скачать карту"> - <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/> + <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"/> @@ -73,14 +77,14 @@ </button> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="usc-Cm-gmg" userLabel="ProgressViewWrapper"> <rect key="frame" x="84" y="138" width="32" height="32"/> - <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> + <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/> <constraints> <constraint firstAttribute="width" constant="32" id="LiD-Zk-ocz"/> <constraint firstAttribute="height" constant="32" id="jrx-nU-VSG"/> </constraints> </view> </subviews> - <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> + <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <constraints> <constraint firstItem="GQf-xO-gh1" firstAttribute="top" secondItem="I6H-BQ-1TG" secondAttribute="top" priority="500" constant="20" id="1zT-cE-XI3"/> <constraint firstItem="usc-Cm-gmg" firstAttribute="centerX" secondItem="iyV-Rb-bea" secondAttribute="centerX" id="7DI-KV-B8S"/> @@ -108,7 +112,7 @@ <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="calibratedRGB"/> + <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"/> diff --git a/iphone/Maps/Mapsme.storyboard b/iphone/Maps/Mapsme.storyboard index c3f0e2b027..8a98bc16b4 100644 --- a/iphone/Maps/Mapsme.storyboard +++ b/iphone/Maps/Mapsme.storyboard @@ -1303,6 +1303,9 @@ <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"/> </userDefinedRuntimeAttributes> </view> |