[ios] Updated place page cells ui layout.

3 files changed, 75 insertions, 59 deletions

diff --git a/iphone/Maps/Classes/MWMPlacePageButtonCell.xib b/iphone/Maps/Classes/MWMPlacePageButtonCell.xib
index 5f3cb4f0f6..cab546b21c 100644
--- a/iphone/Maps/Classes/MWMPlacePageButtonCell.xib
+++ b/iphone/Maps/Classes/MWMPlacePageButtonCell.xib
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="9060" systemVersion="15B42" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="9531" systemVersion="15C50" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9051"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9529"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
@@ -11,22 +11,21 @@
             <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="44"/>
+                <rect key="frame" x="0.0" y="0.0" width="320" height="43.5"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="jmU-dJ-aRH">
                         <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
-                        <animations/>
                         <fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="17"/>
                         <inset key="contentEdgeInsets" minX="16" minY="0.0" maxX="9" maxY="0.0"/>
-                        <state key="normal" title="Edit Place">
+                        <state key="normal" title="Login">
                             <color key="titleColor" red="0.1176470588" green="0.58823529409999997" blue="0.94117647059999998" alpha="1" colorSpace="calibratedRGB"/>
                             <color key="titleShadowColor" red="0.49803921568627452" green="0.49803921568627452" blue="0.49803921568627452" alpha="1" colorSpace="calibratedRGB"/>
                         </state>
                         <userDefinedRuntimeAttributes>
                             <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular17"/>
                             <userDefinedRuntimeAttribute type="string" keyPath="textColorName" value="linkBlue"/>
-                            <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="edit_place"/>
+                            <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="login"/>
                         </userDefinedRuntimeAttributes>
                         <connections>
                             <action selector="editPlaceButtonTouchUpIndide" destination="KGk-i7-Jjw" eventType="touchUpInside" id="ZyS-5r-oKK"/>
@@ -34,14 +33,12 @@
                     </button>
                     <imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="ic_arrow_gray" translatesAutoresizingMaskIntoConstraints="NO" id="nmV-hA-8Mm" userLabel="Gray Arrow">
                         <rect key="frame" x="284" y="8" width="28" height="28"/>
-                        <animations/>
                         <constraints>
                             <constraint firstAttribute="height" constant="28" id="MiH-Ce-WSz"/>
                             <constraint firstAttribute="width" constant="28" id="WBw-9f-vKj"/>
                         </constraints>
                     </imageView>
                 </subviews>
-                <animations/>
                 <constraints>
                     <constraint firstItem="nmV-hA-8Mm" firstAttribute="centerY" secondItem="jmU-dJ-aRH" secondAttribute="centerY" id="8XG-2F-zJl"/>
                     <constraint firstItem="jmU-dJ-aRH" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" id="NxH-y9-BLI"/>
@@ -51,7 +48,6 @@
                     <constraint firstItem="jmU-dJ-aRH" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" id="yES-81-JAM"/>
                 </constraints>
             </tableViewCellContentView>
-            <animations/>
         </tableViewCell>
     </objects>
     <resources>
diff --git a/iphone/Maps/Classes/PlacePageInfoCell.xib b/iphone/Maps/Classes/PlacePageInfoCell.xib
index 82de9bfffc..71981bda83 100644
--- a/iphone/Maps/Classes/PlacePageInfoCell.xib
+++ b/iphone/Maps/Classes/PlacePageInfoCell.xib
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="9531" systemVersion="15A284" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="9531" systemVersion="15C50" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
         <deployment identifier="iOS"/>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9529"/>
@@ -14,36 +14,43 @@
                 <rect key="frame" x="0.0" y="0.0" width="320" height="43.5"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
-                    <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" id="xwC-DR-6Il">
-                        <rect key="frame" x="10" y="9" width="28" height="28"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMaxY="YES"/>
-                        <userDefinedRuntimeAttributes>
-                            <userDefinedRuntimeAttribute type="string" keyPath="coloring" value="MWMBlack"/>
-                        </userDefinedRuntimeAttributes>
+                    <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="xwC-DR-6Il">
+                        <rect key="frame" x="16" y="8" width="28" height="28"/>
+                        <constraints>
+                            <constraint firstAttribute="width" constant="28" id="AMa-Gi-b6E"/>
+                            <constraint firstAttribute="height" constant="28" id="uby-vR-CyI"/>
+                        </constraints>
                     </imageView>
-                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="viE-zJ-wsl" customClass="CopyLabel">
-                        <rect key="frame" x="60" y="14" width="244" height="18"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="228" translatesAutoresizingMaskIntoConstraints="NO" id="viE-zJ-wsl" customClass="CopyLabel">
+                        <rect key="frame" x="60" y="12" width="228" height="20"/>
                         <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                         <gestureRecognizers/>
-                        <fontDescription key="fontDescription" type="system" weight="light" pointSize="16"/>
+                        <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="calibratedRGB"/>
                         <nil key="highlightedColor"/>
                         <userDefinedRuntimeAttributes>
-                            <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/>
+                            <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular17"/>
                         </userDefinedRuntimeAttributes>
                     </label>
-                    <view contentMode="scaleToFill" id="CNm-TR-GPW">
-                        <rect key="frame" x="60" y="43" width="260" height="1"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
+                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="CNm-TR-GPW" userLabel="Separator">
+                        <rect key="frame" x="60" y="42" width="260" height="1"/>
                         <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.12" colorSpace="calibratedRGB"/>
+                        <constraints>
+                            <constraint firstAttribute="height" constant="1" id="fPa-eO-g5X"/>
+                        </constraints>
                         <userDefinedRuntimeAttributes>
                             <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="blackDividers"/>
                         </userDefinedRuntimeAttributes>
                     </view>
-                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="vu9-VL-9jn">
-                        <rect key="frame" x="0.0" y="0.0" width="320" height="43"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                    <imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="ic_placepage_change" translatesAutoresizingMaskIntoConstraints="NO" id="RZw-oW-agi" userLabel="Toggle Image">
+                        <rect key="frame" x="288" y="10" width="24" height="24"/>
+                        <constraints>
+                            <constraint firstAttribute="width" constant="24" id="SvS-KS-WGv"/>
+                            <constraint firstAttribute="height" constant="24" id="eIX-hT-2T8"/>
+                        </constraints>
+                    </imageView>
+                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="vu9-VL-9jn">
+                        <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
                         <state key="normal">
                             <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
                         </state>
@@ -53,20 +60,34 @@
                     </button>
                 </subviews>
                 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
-                <userDefinedRuntimeAttributes>
-                    <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/>
-                </userDefinedRuntimeAttributes>
+                <constraints>
+                    <constraint firstItem="xwC-DR-6Il" firstAttribute="leading" secondItem="KHz-zH-ymS" secondAttribute="leading" constant="16" id="4B0-o5-ixn"/>
+                    <constraint firstAttribute="trailing" secondItem="vu9-VL-9jn" secondAttribute="trailing" id="8ig-bw-zGd"/>
+                    <constraint firstAttribute="bottom" secondItem="CNm-TR-GPW" secondAttribute="bottom" id="9fe-9S-IXI"/>
+                    <constraint firstItem="xwC-DR-6Il" firstAttribute="centerY" secondItem="KHz-zH-ymS" secondAttribute="centerY" id="CYL-hn-gD1"/>
+                    <constraint firstAttribute="bottom" secondItem="vu9-VL-9jn" secondAttribute="bottom" id="GwU-YF-i08"/>
+                    <constraint firstItem="viE-zJ-wsl" firstAttribute="leading" secondItem="KHz-zH-ymS" secondAttribute="leading" constant="60" id="OiU-eg-c9z"/>
+                    <constraint firstItem="viE-zJ-wsl" firstAttribute="centerY" secondItem="KHz-zH-ymS" secondAttribute="centerY" id="Xmo-J0-JuP"/>
+                    <constraint firstItem="CNm-TR-GPW" firstAttribute="leading" secondItem="KHz-zH-ymS" secondAttribute="leading" constant="60" id="YBm-HI-8QY"/>
+                    <constraint firstItem="RZw-oW-agi" firstAttribute="leading" secondItem="viE-zJ-wsl" secondAttribute="trailing" id="b4Y-Av-Oa4"/>
+                    <constraint firstItem="vu9-VL-9jn" firstAttribute="leading" secondItem="KHz-zH-ymS" secondAttribute="leading" id="bwh-x8-HDj"/>
+                    <constraint firstItem="RZw-oW-agi" firstAttribute="centerY" secondItem="KHz-zH-ymS" secondAttribute="centerY" id="ftp-Ze-2yH"/>
+                    <constraint firstItem="vu9-VL-9jn" firstAttribute="top" secondItem="KHz-zH-ymS" secondAttribute="top" id="hAZ-rE-oQa"/>
+                    <constraint firstAttribute="trailing" secondItem="CNm-TR-GPW" secondAttribute="trailing" id="j04-QC-yoJ"/>
+                    <constraint firstAttribute="trailing" secondItem="RZw-oW-agi" secondAttribute="trailing" constant="8" id="q5W-GA-34D"/>
+                </constraints>
             </tableViewCellContentView>
             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
-            <userDefinedRuntimeAttributes>
-                <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/>
-            </userDefinedRuntimeAttributes>
+            <gestureRecognizers/>
             <connections>
                 <outlet property="icon" destination="xwC-DR-6Il" id="vcm-nJ-D7N"/>
                 <outlet property="textContainer" destination="viE-zJ-wsl" id="0bz-b0-s3h"/>
-                <outlet property="upperButton" destination="vu9-VL-9jn" id="mrL-f3-DXh"/>
+                <outlet property="upperButton" destination="vu9-VL-9jn" id="MPi-9Q-hFZ"/>
             </connections>
             <point key="canvasLocation" x="120" y="300"/>
         </tableViewCell>
     </objects>
+    <resources>
+        <image name="ic_placepage_change" width="24" height="24"/>
+    </resources>
 </document>
diff --git a/iphone/Maps/Classes/PlacePageLinkCell.xib b/iphone/Maps/Classes/PlacePageLinkCell.xib
index 4bbe36e9c2..b29526f32c 100644
--- a/iphone/Maps/Classes/PlacePageLinkCell.xib
+++ b/iphone/Maps/Classes/PlacePageLinkCell.xib
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="9531" systemVersion="15A284" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="9531" systemVersion="15C50" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
         <deployment identifier="iOS"/>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9529"/>
@@ -14,48 +14,47 @@
                 <rect key="frame" x="0.0" y="0.0" width="320" height="43.5"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
-                    <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" id="DT5-2i-vCG">
+                    <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="DT5-2i-vCG">
                         <rect key="frame" x="16" y="8" width="28" height="28"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMaxY="YES"/>
-                        <userDefinedRuntimeAttributes>
-                            <userDefinedRuntimeAttribute type="string" keyPath="coloring" value="MWMBlue"/>
-                        </userDefinedRuntimeAttributes>
+                        <constraints>
+                            <constraint firstAttribute="width" constant="28" id="vLS-Ha-Cbl"/>
+                            <constraint firstAttribute="height" constant="28" id="vvn-a9-Lfo"/>
+                        </constraints>
                     </imageView>
-                    <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" scrollEnabled="NO" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" editable="NO" id="T5l-Sb-Hfo">
-                        <rect key="frame" x="60" y="4" width="244" height="35"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                    <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" scrollEnabled="NO" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" editable="NO" translatesAutoresizingMaskIntoConstraints="NO" id="T5l-Sb-Hfo">
+                        <rect key="frame" x="60" y="0.0" width="228" height="42"/>
                         <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
-                        <inset key="contentInset" minX="-4" minY="2" maxX="0.0" maxY="0.0"/>
                         <string key="text">Lorem ipsum dolor sit er elit lamet, consectetaur cillium adipisicing pecu, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Nam liber te conscient to factor tum poen legum odioque civiuda.</string>
                         <fontDescription key="fontDescription" type="system" weight="light" pointSize="16"/>
                         <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
                         <dataDetectorType key="dataDetectorTypes" phoneNumber="YES" link="YES"/>
-                        <userDefinedRuntimeAttributes>
-                            <userDefinedRuntimeAttribute type="string" keyPath="tintColorName" value="linkBlue"/>
-                        </userDefinedRuntimeAttributes>
                         <connections>
                             <outlet property="delegate" destination="DKh-ne-anv" id="KQo-Mn-gqx"/>
                         </connections>
                     </textView>
-                    <view contentMode="scaleToFill" id="ZSw-Rd-B64">
-                        <rect key="frame" x="60" y="43" width="260" height="1"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
+                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ZSw-Rd-B64" userLabel="Separator">
+                        <rect key="frame" x="60" y="42" width="260" height="1"/>
                         <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.12" colorSpace="calibratedRGB"/>
-                        <userDefinedRuntimeAttributes>
-                            <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="blackDividers"/>
-                        </userDefinedRuntimeAttributes>
+                        <constraints>
+                            <constraint firstAttribute="height" constant="1" id="hIQ-vD-PeI"/>
+                        </constraints>
                     </view>
                 </subviews>
                 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
-                <userDefinedRuntimeAttributes>
-                    <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/>
-                </userDefinedRuntimeAttributes>
+                <constraints>
+                    <constraint firstItem="ZSw-Rd-B64" firstAttribute="top" secondItem="T5l-Sb-Hfo" secondAttribute="bottom" id="9BA-P2-SVl"/>
+                    <constraint firstItem="T5l-Sb-Hfo" firstAttribute="leading" secondItem="M4j-cz-kSo" secondAttribute="leading" constant="60" id="9CI-ss-zAr"/>
+                    <constraint firstItem="DT5-2i-vCG" firstAttribute="centerY" secondItem="M4j-cz-kSo" secondAttribute="centerY" id="MX4-xc-kFl"/>
+                    <constraint firstItem="T5l-Sb-Hfo" firstAttribute="top" secondItem="M4j-cz-kSo" secondAttribute="top" id="Vw0-bf-uUe"/>
+                    <constraint firstAttribute="bottom" secondItem="ZSw-Rd-B64" secondAttribute="bottom" id="bJ8-qw-Eah"/>
+                    <constraint firstItem="ZSw-Rd-B64" firstAttribute="leading" secondItem="M4j-cz-kSo" secondAttribute="leading" constant="60" id="d7O-pD-dIE"/>
+                    <constraint firstItem="DT5-2i-vCG" firstAttribute="leading" secondItem="M4j-cz-kSo" secondAttribute="leading" constant="16" id="gle-Hg-xi1"/>
+                    <constraint firstAttribute="trailing" secondItem="ZSw-Rd-B64" secondAttribute="trailing" id="n1d-lY-EC3"/>
+                    <constraint firstAttribute="trailing" secondItem="T5l-Sb-Hfo" secondAttribute="trailing" constant="32" id="ot9-cN-XF3"/>
+                </constraints>
             </tableViewCellContentView>
             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
             <inset key="separatorInset" minX="48" minY="0.0" maxX="0.0" maxY="0.0"/>
-            <userDefinedRuntimeAttributes>
-                <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/>
-            </userDefinedRuntimeAttributes>
             <connections>
                 <outlet property="icon" destination="DT5-2i-vCG" id="Qu6-7I-lP5"/>
                 <outlet property="textContainer" destination="T5l-Sb-Hfo" id="K2l-dM-fky"/>