diff options
author | Ilya Grechuhin <i.grechuhin@gmail.com> | 2017-10-30 12:31:43 +0300 |
---|---|---|
committer | Roman Kuznetsov <r.kuznetsow@gmail.com> | 2017-10-30 12:43:25 +0300 |
commit | 9c9464a3b58949f9f0360423f92672d0d03073fc (patch) | |
tree | ffd27b7086aad0c9451b490c517bc39f0d896d61 | |
parent | fd61ec2e9d9272bd04e2ade4114a5f69223a9e33 (diff) |
[MAPSME-5882] [ios] Fixed authorization layout for iPad.beta-1088
-rw-r--r-- | iphone/Maps/UI/Authorization/AuthorizationViewController.swift | 15 | ||||
-rw-r--r-- | iphone/Maps/UI/Authorization/AuthorizationViewController.xib | 5 |
2 files changed, 19 insertions, 1 deletions
diff --git a/iphone/Maps/UI/Authorization/AuthorizationViewController.swift b/iphone/Maps/UI/Authorization/AuthorizationViewController.swift index 5a075ea57f..8e281b371e 100644 --- a/iphone/Maps/UI/Authorization/AuthorizationViewController.swift +++ b/iphone/Maps/UI/Authorization/AuthorizationViewController.swift @@ -20,6 +20,16 @@ final class AuthorizationViewController: MWMViewController { } } + @IBOutlet private weak var tapView: UIView! { + didSet { + iPadSpecific { + tapView?.removeFromSuperview() + } + } + } + + @IBOutlet private weak var contentView: UIView! + @IBOutlet private weak var titleLabel: UILabel! { didSet { titleLabel.font = UIFont.bold22() @@ -117,6 +127,11 @@ final class AuthorizationViewController: MWMViewController { fbImage?.frame = CGRect(x: 16, y: 8, width: 24, height: 24) } + override func viewDidLayoutSubviews() { + super.viewDidLayoutSubviews() + preferredContentSize = contentView.size + } + @IBAction func onCancel() { Statistics.logEvent(kStatUGCReviewAuthDeclined) dismiss(animated: true, completion: { diff --git a/iphone/Maps/UI/Authorization/AuthorizationViewController.xib b/iphone/Maps/UI/Authorization/AuthorizationViewController.xib index ad31ea8e41..bb2bbaa0da 100644 --- a/iphone/Maps/UI/Authorization/AuthorizationViewController.xib +++ b/iphone/Maps/UI/Authorization/AuthorizationViewController.xib @@ -5,15 +5,17 @@ </device> <dependencies> <deployment identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13173"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13174"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> <objects> <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="MWMAuthorizationViewController"> <connections> + <outlet property="contentView" destination="mb9-vK-FLE" id="NNo-Na-BYT"/> <outlet property="facebookButtonHolder" destination="iK0-TH-4mm" id="FRM-L8-FLN"/> <outlet property="googleButton" destination="8iU-Se-s8N" id="rSq-jz-U5t"/> <outlet property="separator" destination="hWD-aE-jYh" id="myS-1z-Saw"/> + <outlet property="tapView" destination="5kf-Pd-KAZ" id="QD3-Pa-zgR"/> <outlet property="textLabel" destination="0EA-1u-hvB" id="oDy-2V-Lrx"/> <outlet property="titleLabel" destination="LFT-Lb-6jj" id="uQG-BI-EAe"/> <outlet property="view" destination="iN0-l3-epB" id="6le-MR-NDK"/> @@ -108,6 +110,7 @@ <constraint firstAttribute="trailing" secondItem="5kf-Pd-KAZ" secondAttribute="trailing" id="MP9-cM-ON8"/> <constraint firstItem="mb9-vK-FLE" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="S7z-xe-BcP"/> <constraint firstItem="5kf-Pd-KAZ" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="V7Y-js-5JA"/> + <constraint firstItem="mb9-vK-FLE" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" priority="250" id="VDg-qx-Y61"/> <constraint firstAttribute="trailing" secondItem="mb9-vK-FLE" secondAttribute="trailing" id="cjh-uT-fAL"/> <constraint firstItem="5kf-Pd-KAZ" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="mhC-Cp-zLW"/> <constraint firstItem="mb9-vK-FLE" firstAttribute="top" secondItem="5kf-Pd-KAZ" secondAttribute="bottom" id="pkl-0y-Ozq"/> |