Skip to content

Commit 0e35b05

Browse files
kellyroach-optimizelykellyroach-optimizely
authored
OASIS-1786 Update 2 *.storyboard's for larger screen devices/simulators (#176)
Summary: Update 2 *.storyboard's for larger screen devices/simulators Test Plan: Tested on new Xcode_9_GM_seed simulators and familiar Xcode 8.3.3 simulators. Also tested on "iPad Retina (9.3)". Subscribers: thomas.zurkan, alda JIRA Issues: OASIS-1786 Differential Revision: https://phabricator.optimizely.com/D17645
1 parent 1d8e2d4 commit 0e35b05

File tree

2 files changed

+54
-72
lines changed

2 files changed

+54
-72
lines changed

‎OptimizelyDemoApp/OptimizelyTVOSDemoApp/Base.lproj/tvOSMain.storyboard

Lines changed: 33 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
<dependencies>
77
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12089"/>
88
<capability name="Constraints to layout margins" minToolsVersion="6.0"/>
9+
<capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
910
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
1011
</dependencies>
1112
<customFonts key="customFonts">
@@ -29,8 +30,8 @@
2930
<rect key="frame" x="0.0" y="0.0" width="1920" height="1080"/>
3031
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
3132
<subviews>
32-
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" image="logo" translatesAutoresizingMaskIntoConstraints="NO" id="KSO-Tl-shb">
33-
<rect key="frame" x="813" y="451" width="183" height="178"/>
33+
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="logo" translatesAutoresizingMaskIntoConstraints="NO" id="KSO-Tl-shb">
34+
<rect key="frame" x="869" y="451" width="183" height="178"/>
3435
<color key="backgroundColor" red="0.015686274509803921" green="0.16862745098039217" blue="0.25098039215686274" alpha="1" colorSpace="calibratedRGB"/>
3536
<color key="tintColor" red="0.015686274509803921" green="0.16862745098039217" blue="0.25098039215686274" alpha="1" colorSpace="calibratedRGB"/>
3637
</imageView>
@@ -61,24 +62,19 @@
6162
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" restorationIdentifier="FailureImageView" image="background_error" translatesAutoresizingMaskIntoConstraints="NO" id="QKm-lz-bUE">
6263
<rect key="frame" x="0.0" y="0.0" width="1920" height="1080"/>
6364
</imageView>
64-
<textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" editable="NO" text="Oops! Let's try this again." textAlignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="iKU-z4-P8h">
65+
<textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" fixedFrame="YES" editable="NO" text="Oops! Let's try this again." textAlignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="iKU-z4-P8h">
6566
<rect key="frame" x="569" y="489" width="782" height="102"/>
67+
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
6668
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
67-
<constraints>
68-
<constraint firstAttribute="width" constant="782" id="bI5-CS-H4t"/>
69-
</constraints>
7069
<color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
7170
<fontDescription key="fontDescription" name="ProximaNova-Regular" family="Proxima Nova" pointSize="58"/>
7271
<textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
7372
</textView>
7473
</subviews>
7574
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
7675
<constraints>
77-
<constraint firstItem="QKm-lz-bUE" firstAttribute="centerY" secondItem="iKU-z4-P8h" secondAttribute="centerY" id="3yL-zk-rie"/>
78-
<constraint firstItem="QKm-lz-bUE" firstAttribute="centerX" secondItem="iKU-z4-P8h" secondAttribute="centerX" id="6E0-WS-QAB"/>
7976
<constraint firstItem="QKm-lz-bUE" firstAttribute="bottom" secondItem="41k-LG-Ek5" secondAttribute="top" id="6Js-fh-bXY"/>
8077
<constraint firstAttribute="trailing" secondItem="QKm-lz-bUE" secondAttribute="trailing" id="VrG-ay-BI5"/>
81-
<constraint firstItem="iKU-z4-P8h" firstAttribute="top" secondItem="AdG-n6-YDN" secondAttribute="bottom" constant="489" id="d32-ke-krr"/>
8278
<constraint firstItem="QKm-lz-bUE" firstAttribute="leading" secondItem="Iok-Jh-ZED" secondAttribute="leading" id="nfJ-mj-HjR"/>
8379
<constraint firstItem="QKm-lz-bUE" firstAttribute="top" secondItem="AdG-n6-YDN" secondAttribute="bottom" id="uXm-gD-ipq"/>
8480
</constraints>
@@ -103,32 +99,24 @@
10399
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="ZDA-v7-RgX">
104100
<rect key="frame" x="0.0" y="0.0" width="1920" height="1080"/>
105101
</imageView>
106-
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="A" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="GuL-M1-dn2">
107-
<rect key="frame" x="896" y="383" width="128" height="125"/>
108-
<constraints>
109-
<constraint firstAttribute="width" constant="128" id="Lzc-I6-PDY"/>
110-
</constraints>
102+
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" verticalCompressionResistancePriority="749" fixedFrame="YES" text="A" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="GuL-M1-dn2">
103+
<rect key="frame" x="913" y="275" width="95" height="144"/>
104+
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
111105
<fontDescription key="fontDescription" name="ProximaNova-Regular" family="Proxima Nova" pointSize="144"/>
112106
<nil key="textColor"/>
113107
<nil key="highlightedColor"/>
114108
</label>
115-
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="VARIATION" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="8CQ-8i-O97">
116-
<rect key="frame" x="847" y="516" width="230" height="42"/>
117-
<constraints>
118-
<constraint firstAttribute="height" constant="42" id="Eat-xV-uzS"/>
119-
<constraint firstAttribute="width" constant="230" id="Pov-mU-c87"/>
120-
</constraints>
109+
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="VARIATION" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="8CQ-8i-O97">
110+
<rect key="frame" x="885" y="427" width="155" height="31"/>
111+
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
121112
<fontDescription key="fontDescription" name="ProximaNova-Regular" family="Proxima Nova" pointSize="31"/>
122113
<nil key="textColor"/>
123114
<nil key="highlightedColor"/>
124115
</label>
125-
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="efT-hv-nBS">
126-
<rect key="frame" x="812" y="695" width="300" height="50"/>
116+
<button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="efT-hv-nBS">
117+
<rect key="frame" x="825" y="617" width="274" height="66"/>
118+
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
127119
<color key="backgroundColor" red="1" green="0.12941176469999999" blue="0.1137254902" alpha="1" colorSpace="calibratedRGB"/>
128-
<constraints>
129-
<constraint firstAttribute="width" constant="300" id="0CQ-SX-ApD"/>
130-
<constraint firstAttribute="height" constant="50" id="3TH-hG-3Bv"/>
131-
</constraints>
132120
<fontDescription key="fontDescription" name="Roboto-Medium" family="Roboto" pointSize="22"/>
133121
<inset key="contentEdgeInsets" minX="40" minY="20" maxX="40" maxY="20"/>
134122
<state key="normal" title="TEST CONVERSION"/>
@@ -139,17 +127,10 @@
139127
</subviews>
140128
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
141129
<constraints>
142-
<constraint firstItem="ZDA-v7-RgX" firstAttribute="centerX" secondItem="GuL-M1-dn2" secondAttribute="centerX" id="60N-51-niQ"/>
143-
<constraint firstItem="8CQ-8i-O97" firstAttribute="leading" secondItem="Pxf-lJ-vhB" secondAttribute="leading" constant="847" id="7Oe-hx-mwv"/>
144-
<constraint firstItem="efT-hv-nBS" firstAttribute="top" secondItem="8CQ-8i-O97" secondAttribute="bottom" constant="137" id="9uc-kd-DXO"/>
145-
<constraint firstItem="8CQ-8i-O97" firstAttribute="top" secondItem="GuL-M1-dn2" secondAttribute="bottom" constant="8" id="J6z-KQ-sCU"/>
146-
<constraint firstItem="WeV-sX-2WA" firstAttribute="top" secondItem="efT-hv-nBS" secondAttribute="bottom" constant="335" id="KkM-74-OY9"/>
147130
<constraint firstAttribute="trailing" secondItem="ZDA-v7-RgX" secondAttribute="trailing" id="NW1-x7-RGZ"/>
148131
<constraint firstItem="ZDA-v7-RgX" firstAttribute="leading" secondItem="Pxf-lJ-vhB" secondAttribute="leading" id="TVF-sf-Um5"/>
149-
<constraint firstItem="GuL-M1-dn2" firstAttribute="centerX" secondItem="efT-hv-nBS" secondAttribute="centerX" constant="-2" id="U07-Iu-r7p"/>
150132
<constraint firstItem="ZDA-v7-RgX" firstAttribute="bottom" secondItem="WeV-sX-2WA" secondAttribute="top" id="ehV-qY-JEp"/>
151133
<constraint firstItem="ZDA-v7-RgX" firstAttribute="top" secondItem="LE4-TO-HJE" secondAttribute="bottom" id="wpf-2t-KbD"/>
152-
<constraint firstItem="GuL-M1-dn2" firstAttribute="top" secondItem="LE4-TO-HJE" secondAttribute="bottom" constant="383" id="wtP-Mb-BpQ"/>
153134
</constraints>
154135
</view>
155136
<connections>
@@ -176,44 +157,40 @@
176157
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
177158
<subviews>
178159
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" restorationIdentifier="ConversionSuccessImageView" image="background_confirmation" translatesAutoresizingMaskIntoConstraints="NO" id="GEt-Bf-Es2">
179-
<rect key="frame" x="1" y="0.0" width="1920" height="1080"/>
160+
<rect key="frame" x="20" y="0.0" width="1880" height="1080"/>
180161
</imageView>
181-
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Nce-X9-6iR">
182-
<rect key="frame" x="810" y="661" width="300" height="50"/>
183-
<color key="backgroundColor" red="1" green="0.12941176469999999" blue="0.1137254902" alpha="1" colorSpace="calibratedRGB"/>
162+
<textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" editable="NO" text="Conversion event recorded to Optimizely." textAlignment="center" selectable="NO" translatesAutoresizingMaskIntoConstraints="NO" id="CRh-TJ-NCw">
163+
<rect key="frame" x="480" y="286" width="960" height="149"/>
164+
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
184165
<constraints>
185-
<constraint firstAttribute="width" constant="300" id="tdB-ZE-fXd"/>
166+
<constraint firstAttribute="height" constant="149" id="r16-vd-lLb"/>
186167
</constraints>
168+
<color key="textColor" red="0.019607843137254902" green="0.16862745098039217" blue="0.25490196078431371" alpha="1" colorSpace="calibratedRGB"/>
169+
<fontDescription key="fontDescription" name="ProximaNova-Regular" family="Proxima Nova" pointSize="58"/>
170+
<textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
171+
</textView>
172+
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Nce-X9-6iR">
173+
<rect key="frame" x="888" y="685" width="145" height="70"/>
174+
<color key="backgroundColor" red="1" green="0.12941176469999999" blue="0.1137254902" alpha="1" colorSpace="calibratedRGB"/>
187175
<fontDescription key="fontDescription" name="Roboto-Medium" family="Roboto" pointSize="25"/>
188176
<inset key="contentEdgeInsets" minX="40" minY="20" maxX="40" maxY="20"/>
189177
<state key="normal" title="BACK"/>
190178
<connections>
191179
<segue destination="fdp-bn-DAy" kind="unwind" unwindAction="unwindToVariationActionWithUnwindSegue:" id="q5o-Tx-Eqh"/>
192180
</connections>
193181
</button>
194-
<textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" editable="NO" text="Conversion event recorded to Optimizely." textAlignment="center" selectable="NO" translatesAutoresizingMaskIntoConstraints="NO" id="CRh-TJ-NCw">
195-
<rect key="frame" x="523" y="385" width="874" height="149"/>
196-
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
197-
<constraints>
198-
<constraint firstAttribute="width" constant="874" id="BlA-6q-WcP"/>
199-
</constraints>
200-
<color key="textColor" red="0.019607843137254902" green="0.16862745098039217" blue="0.25490196078431371" alpha="1" colorSpace="calibratedRGB"/>
201-
<fontDescription key="fontDescription" name="ProximaNova-Regular" family="Proxima Nova" pointSize="58"/>
202-
<textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
203-
</textView>
204182
</subviews>
205183
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
206184
<constraints>
207185
<constraint firstItem="GEt-Bf-Es2" firstAttribute="top" secondItem="0j4-IK-nUn" secondAttribute="bottom" id="4w9-09-r3p"/>
208-
<constraint firstItem="ARR-Gc-cn2" firstAttribute="top" secondItem="CRh-TJ-NCw" secondAttribute="bottom" constant="546" id="Hih-H5-ydp"/>
209-
<constraint firstAttribute="trailingMargin" secondItem="GEt-Bf-Es2" secondAttribute="trailing" constant="-21" id="TXd-lO-gqa"/>
210-
<constraint firstItem="Nce-X9-6iR" firstAttribute="leading" secondItem="yBM-xo-e29" secondAttribute="leading" constant="810" id="UF6-TF-zcb"/>
211-
<constraint firstItem="GEt-Bf-Es2" firstAttribute="leading" secondItem="yBM-xo-e29" secondAttribute="leadingMargin" constant="-19" id="YL3-jq-NMu"/>
212-
<constraint firstItem="CRh-TJ-NCw" firstAttribute="centerX" secondItem="Nce-X9-6iR" secondAttribute="centerX" id="fHA-ay-wPc"/>
213-
<constraint firstItem="ARR-Gc-cn2" firstAttribute="top" secondItem="Nce-X9-6iR" secondAttribute="bottom" constant="369" id="iNM-Ao-bcX"/>
214-
<constraint firstItem="CRh-TJ-NCw" firstAttribute="top" secondItem="0j4-IK-nUn" secondAttribute="bottom" constant="385" id="sHZ-LL-pa4"/>
186+
<constraint firstItem="CRh-TJ-NCw" firstAttribute="width" secondItem="yBM-xo-e29" secondAttribute="width" multiplier="1/2" id="5CR-b4-gHy"/>
187+
<constraint firstItem="Nce-X9-6iR" firstAttribute="centerY" secondItem="yBM-xo-e29" secondAttribute="baseline" multiplier="2/3" id="CT8-Hk-3Gm"/>
188+
<constraint firstAttribute="trailingMargin" secondItem="GEt-Bf-Es2" secondAttribute="trailing" id="TXd-lO-gqa"/>
189+
<constraint firstItem="GEt-Bf-Es2" firstAttribute="leading" secondItem="yBM-xo-e29" secondAttribute="leadingMargin" id="YL3-jq-NMu"/>
190+
<constraint firstItem="CRh-TJ-NCw" firstAttribute="centerY" secondItem="yBM-xo-e29" secondAttribute="baseline" multiplier="1/3" id="bEy-56-N0z"/>
215191
<constraint firstItem="GEt-Bf-Es2" firstAttribute="bottom" secondItem="ARR-Gc-cn2" secondAttribute="top" id="uDT-Hk-eQH"/>
216-
<constraint firstItem="Nce-X9-6iR" firstAttribute="top" secondItem="0j4-IK-nUn" secondAttribute="bottom" constant="661" id="wnJ-ib-r0x"/>
192+
<constraint firstItem="CRh-TJ-NCw" firstAttribute="centerX" secondItem="yBM-xo-e29" secondAttribute="centerX" id="vc8-0L-dDz"/>
193+
<constraint firstItem="Nce-X9-6iR" firstAttribute="centerX" secondItem="yBM-xo-e29" secondAttribute="centerX" id="yC2-40-HQX"/>
217194
</constraints>
218195
</view>
219196
</viewController>

0 commit comments

Comments
 (0)