Skip to content

Commit e45c0d5

Browse files
authored
Merge pull request #536 from tidepool-org/cameron/LOOP-4056-HUD-contraints-cleanup
[LOOP-4056] Fixed some layout ambiguity in the StatusBarHUDView
2 parents e0e2d58 + e6e1077 commit e45c0d5

File tree

1 file changed

+8
-9
lines changed

1 file changed

+8
-9
lines changed

LoopUI/StatusBarHUDView.xib

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="21225" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
2+
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="21507" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
33
<device id="retina6_1" orientation="portrait" appearance="light"/>
44
<dependencies>
55
<deployment identifier="iOS"/>
6-
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21207"/>
6+
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21505"/>
77
<capability name="Named colors" minToolsVersion="9.0"/>
88
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
99
<capability name="System colors in document resources" minToolsVersion="11.0"/>
@@ -64,10 +64,10 @@
6464
</connections>
6565
</view>
6666
<view contentMode="scaleToFill" horizontalHuggingPriority="1000" verticalHuggingPriority="1000" horizontalCompressionResistancePriority="1000" verticalCompressionResistancePriority="1000" translatesAutoresizingMaskIntoConstraints="NO" id="9yP-s6-Jbo" customClass="GlucoseTrendHUDView" customModule="LoopUI" customModuleProvider="target">
67-
<rect key="frame" x="92" y="5" width="34" height="34"/>
67+
<rect key="frame" x="92" y="0.0" width="34" height="44"/>
6868
<subviews>
6969
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="1000" verticalHuggingPriority="1000" horizontalCompressionResistancePriority="1000" verticalCompressionResistancePriority="1000" image="questionmark.circle" catalog="system" translatesAutoresizingMaskIntoConstraints="NO" id="jE6-NJ-uRV">
70-
<rect key="frame" x="0.0" y="0.5" width="34" height="33"/>
70+
<rect key="frame" x="0.0" y="5.5" width="34" height="33"/>
7171
<color key="tintColor" systemColor="secondaryLabelColor"/>
7272
<constraints>
7373
<constraint firstAttribute="width" constant="34" id="341-TF-e1A"/>
@@ -79,7 +79,7 @@
7979
<bool key="isElement" value="YES"/>
8080
</accessibility>
8181
<constraints>
82-
<constraint firstAttribute="height" constant="34" id="3Qt-hd-5c0"/>
82+
<constraint firstAttribute="height" priority="999" constant="34" id="3Qt-hd-5c0"/>
8383
<constraint firstAttribute="width" constant="34" id="M4D-lU-OMF"/>
8484
<constraint firstItem="jE6-NJ-uRV" firstAttribute="centerX" secondItem="9yP-s6-Jbo" secondAttribute="centerX" id="c0w-Ij-1bf"/>
8585
<constraint firstItem="jE6-NJ-uRV" firstAttribute="centerY" secondItem="9yP-s6-Jbo" secondAttribute="centerY" id="sgl-aZ-cUf"/>
@@ -176,7 +176,6 @@
176176
<constraint firstItem="Y5a-VS-uto" firstAttribute="top" secondItem="tLF-hy-5Xi" secondAttribute="top" constant="10" id="6dB-mM-ayr"/>
177177
<constraint firstItem="Y5a-VS-uto" firstAttribute="centerX" secondItem="tLF-hy-5Xi" secondAttribute="centerX" id="Jfr-8E-Rj4"/>
178178
<constraint firstAttribute="width" constant="44" id="mjr-6a-sQN"/>
179-
<constraint firstAttribute="height" constant="74" id="th4-hX-rzt"/>
180179
</constraints>
181180
<connections>
182181
<outlet property="loopStateView" destination="Y5a-VS-uto" id="amk-gf-7Pl"/>
@@ -189,7 +188,7 @@
189188
<rect key="frame" x="0.0" y="10" width="142" height="44"/>
190189
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
191190
</view>
192-
<stackView opaque="NO" contentMode="scaleToFill" horizontalCompressionResistancePriority="250" distribution="fillProportionally" alignment="center" spacing="1" translatesAutoresizingMaskIntoConstraints="NO" id="L6g-Dz-wXm">
191+
<stackView opaque="NO" contentMode="scaleToFill" horizontalCompressionResistancePriority="250" alignment="center" spacing="1" translatesAutoresizingMaskIntoConstraints="NO" id="L6g-Dz-wXm">
193192
<rect key="frame" x="6" y="10" width="126" height="44"/>
194193
<subviews>
195194
<view contentMode="scaleToFill" verticalHuggingPriority="1000" horizontalCompressionResistancePriority="250" verticalCompressionResistancePriority="1000" placeholderIntrinsicWidth="68" placeholderIntrinsicHeight="44" translatesAutoresizingMaskIntoConstraints="NO" id="Xc6-TW-EU5" customClass="BasalRateHUDView" customModule="LoopUI">
@@ -198,7 +197,7 @@
198197
<view contentMode="scaleToFill" horizontalHuggingPriority="1000" verticalHuggingPriority="1000" horizontalCompressionResistancePriority="1000" verticalCompressionResistancePriority="1000" translatesAutoresizingMaskIntoConstraints="NO" id="TKp-ot-mqw" customClass="BasalStateView" customModule="LoopUI">
199198
<rect key="frame" x="13.5" y="4" width="44" height="22"/>
200199
<constraints>
201-
<constraint firstAttribute="height" constant="22" id="MQM-FC-5zC"/>
200+
<constraint firstAttribute="height" priority="999" constant="22" id="MQM-FC-5zC"/>
202201
<constraint firstAttribute="width" constant="44" id="RCZ-ka-XLC"/>
203202
</constraints>
204203
</view>
@@ -273,7 +272,7 @@
273272
<constraint firstItem="eDE-01-spK" firstAttribute="centerX" secondItem="mME-iU-5yj" secondAttribute="centerX" id="LeK-09-bY7"/>
274273
<constraint firstItem="eDE-01-spK" firstAttribute="centerY" secondItem="mME-iU-5yj" secondAttribute="centerY" id="jMb-FX-cJb"/>
275274
<constraint firstItem="G1b-Pr-JmQ" firstAttribute="centerY" secondItem="eDE-01-spK" secondAttribute="centerY" constant="-2" id="rTt-Dm-05Y"/>
276-
<constraint firstAttribute="width" constant="54" id="xX3-6f-WoP"/>
275+
<constraint firstAttribute="width" priority="999" constant="54" id="xX3-6f-WoP"/>
277276
</constraints>
278277
<connections>
279278
<outlet property="levelMaskView" destination="3a7-4p-o3K" id="8AT-IU-dsM"/>

0 commit comments

Comments
 (0)