Skip to content

Commit 0c3eb09

Browse files
nhammingnhamming
authored
nate/fix/LOOP-1655/narrow-display (#249)
* Adjustment to status bar to support narrow displays * using 5/8 and 3/8 for pump pill distribution * updates from discussing with design * stop IB from complaining * moved screen width check to specific view * clean up * use view bounds instead of screen size for narrow display check
1 parent b4f0432 commit 0c3eb09

File tree

6 files changed

+66
-29
lines changed

6 files changed

+66
-29
lines changed

‎Loop Status Extension/StatusViewController.swift‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,11 @@ class StatusViewController: UIViewController, NCWidgetProviding {
2626
hudView.pumpStatusHUD.tintColor = .insulinTintColor
2727
hudView.backgroundColor = .clear
2828

29+
if view.bounds.width < 375 {
30+
// need to adjust for narrow display
31+
hudView.adjustViewsForNarrowDisplay = true
32+
}
33+
2934
// given the reduced width of the widget, allow for tighter spacing
3035
hudView.containerView.spacing = 6.0
3136
}

‎Loop/View Controllers/StatusTableViewController.swift‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1327,6 +1327,10 @@ final class StatusTableViewController: LoopChartsTableViewController {
13271327
hudView.cgmStatusHUD.tintColor = .label
13281328
hudView.pumpStatusHUD.stateColors = .pumpStatus
13291329
hudView.pumpStatusHUD.tintColor = .insulinTintColor
1330+
if view.bounds.width < 375 {
1331+
// need to adjust for narrow display
1332+
hudView.adjustViewsForNarrowDisplay = true
1333+
}
13301334

13311335
refreshContext.update(with: .status)
13321336
self.log.debug("[reloadData] after hudView loaded")

‎LoopUI/StatusBarHUDView.xib‎

Lines changed: 25 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16097" 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="16097.2" 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
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
@@ -31,7 +31,7 @@
3131
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="SoP-1x-VMa" customClass="GlucoseValueHUDView" customModule="LoopUI" customModuleProvider="target">
3232
<rect key="frame" x="0.0" y="0.0" width="92" height="44"/>
3333
<subviews>
34-
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="252" text="399" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bni-3H-QVi">
34+
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="252" text="399" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="15" translatesAutoresizingMaskIntoConstraints="NO" id="bni-3H-QVi">
3535
<rect key="frame" x="0.0" y="-2" width="92" height="36"/>
3636
<fontDescription key="fontDescription" type="system" weight="heavy" pointSize="30"/>
3737
<nil key="textColor"/>
@@ -106,7 +106,7 @@
106106
<constraint firstItem="1CX-eC-9a3" firstAttribute="leading" secondItem="MLJ-z5-oVV" secondAttribute="leading" constant="26" id="4yz-Zx-Eni"/>
107107
<constraint firstItem="KzR-4q-Npx" firstAttribute="top" secondItem="MLJ-z5-oVV" secondAttribute="top" constant="10" id="Aoa-Yp-Y0v"/>
108108
<constraint firstItem="KzR-4q-Npx" firstAttribute="leading" secondItem="BMR-SB-Ayc" secondAttribute="leading" constant="10" id="Cin-hu-S8N"/>
109-
<constraint firstAttribute="width" relation="greaterThanOrEqual" constant="149.5" id="Nl5-qI-g5J"/>
109+
<constraint firstAttribute="width" relation="greaterThanOrEqual" constant="150" id="Nl5-qI-g5J"/>
110110
<constraint firstAttribute="trailing" secondItem="BMR-SB-Ayc" secondAttribute="trailing" id="VJX-X2-64n"/>
111111
<constraint firstAttribute="trailing" secondItem="KzR-4q-Npx" secondAttribute="trailing" constant="6" id="YfI-gU-2nA"/>
112112
<constraint firstAttribute="bottom" secondItem="BMR-SB-Ayc" secondAttribute="bottom" constant="20" id="gZy-K7-Xnv"/>
@@ -162,21 +162,21 @@
162162
<rect key="frame" x="0.0" y="10" width="142" height="44"/>
163163
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
164164
</view>
165-
<stackView opaque="NO" contentMode="scaleToFill" alignment="center" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="L6g-Dz-wXm">
166-
<rect key="frame" x="6" y="10" width="126" height="44"/>
165+
<stackView opaque="NO" contentMode="scaleToFill" horizontalCompressionResistancePriority="250" distribution="fillProportionally" alignment="center" spacing="1" translatesAutoresizingMaskIntoConstraints="NO" id="L6g-Dz-wXm">
166+
<rect key="frame" x="10" y="10" width="122" height="44"/>
167167
<subviews>
168-
<view contentMode="scaleToFill" verticalHuggingPriority="1000" horizontalCompressionResistancePriority="250" verticalCompressionResistancePriority="1000" translatesAutoresizingMaskIntoConstraints="NO" id="Xc6-TW-EU5" customClass="BasalRateHUDView" customModule="LoopUI">
169-
<rect key="frame" x="0.0" y="0.0" width="70" height="44"/>
168+
<view contentMode="scaleToFill" verticalHuggingPriority="1000" horizontalCompressionResistancePriority="250" verticalCompressionResistancePriority="1000" placeholderIntrinsicWidth="68" placeholderIntrinsicHeight="44" translatesAutoresizingMaskIntoConstraints="NO" id="Xc6-TW-EU5" customClass="BasalRateHUDView" customModule="LoopUI">
169+
<rect key="frame" x="0.0" y="0.0" width="67" height="44"/>
170170
<subviews>
171171
<view contentMode="scaleToFill" horizontalHuggingPriority="1000" verticalHuggingPriority="1000" horizontalCompressionResistancePriority="1000" verticalCompressionResistancePriority="1000" translatesAutoresizingMaskIntoConstraints="NO" id="TKp-ot-mqw" customClass="BasalStateView" customModule="LoopUI">
172-
<rect key="frame" x="13" y="4" width="44" height="22"/>
172+
<rect key="frame" x="11.5" y="4" width="44" height="22"/>
173173
<constraints>
174174
<constraint firstAttribute="height" constant="22" id="MQM-FC-5zC"/>
175175
<constraint firstAttribute="width" constant="44" id="RCZ-ka-XLC"/>
176176
</constraints>
177177
</view>
178178
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="-0.85 U" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsLetterSpacingToFitWidth="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="yoL-F7-Mou">
179-
<rect key="frame" x="0.0" y="27" width="70" height="13.5"/>
179+
<rect key="frame" x="0.0" y="27" width="67" height="13.5"/>
180180
<fontDescription key="fontDescription" style="UICTFontTextStyleCaption2"/>
181181
<color key="textColor" systemColor="secondaryLabelColor" red="0.23529411759999999" green="0.23529411759999999" blue="0.26274509800000001" alpha="0.59999999999999998" colorSpace="custom" customColorSpace="sRGB"/>
182182
<nil key="highlightedColor"/>
@@ -198,14 +198,14 @@
198198
<outlet property="basalStateView" destination="TKp-ot-mqw" id="vLE-F3-FtD"/>
199199
</connections>
200200
</view>
201-
<view contentMode="scaleToFill" horizontalHuggingPriority="1000" verticalHuggingPriority="1000" horizontalCompressionResistancePriority="1000" verticalCompressionResistancePriority="1000" translatesAutoresizingMaskIntoConstraints="NO" id="mME-iU-5yj" customClass="LevelHUDView" customModule="LoopKitUI">
202-
<rect key="frame" x="78" y="0.0" width="48" height="44"/>
201+
<view contentMode="scaleToFill" verticalHuggingPriority="1000" horizontalCompressionResistancePriority="250" verticalCompressionResistancePriority="1000" placeholderIntrinsicWidth="52.5" placeholderIntrinsicHeight="44" translatesAutoresizingMaskIntoConstraints="NO" id="mME-iU-5yj" customClass="LevelHUDView" customModule="LoopKitUI">
202+
<rect key="frame" x="68" y="0.0" width="54" height="44"/>
203203
<subviews>
204204
<view clipsSubviews="YES" contentMode="scaleToFill" horizontalHuggingPriority="1000" verticalHuggingPriority="1000" translatesAutoresizingMaskIntoConstraints="NO" id="eDE-01-spK">
205-
<rect key="frame" x="6" y="5" width="36" height="34"/>
205+
<rect key="frame" x="13" y="5" width="28" height="34"/>
206206
<subviews>
207207
<view contentMode="scaleAspectFit" horizontalHuggingPriority="1000" verticalHuggingPriority="1000" translatesAutoresizingMaskIntoConstraints="NO" id="3a7-4p-o3K" customClass="LevelMaskView" customModule="LoopKitUI">
208-
<rect key="frame" x="7" y="5" width="22" height="29"/>
208+
<rect key="frame" x="3" y="5" width="22" height="29"/>
209209
<constraints>
210210
<constraint firstAttribute="height" constant="29" id="Xay-a6-7pz"/>
211211
</constraints>
@@ -214,26 +214,25 @@
214214
</userDefinedRuntimeAttributes>
215215
</view>
216216
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="1000" verticalHuggingPriority="1000" image="reservoir" translatesAutoresizingMaskIntoConstraints="NO" id="PVP-qS-cd0">
217-
<rect key="frame" x="7" y="0.0" width="22" height="34"/>
217+
<rect key="frame" x="3" y="0.0" width="22" height="34"/>
218218
<constraints>
219219
<constraint firstAttribute="height" constant="34" id="JqP-T8-SrS"/>
220220
<constraint firstAttribute="width" constant="22" id="nrI-eC-dZS"/>
221221
</constraints>
222222
</imageView>
223223
</subviews>
224224
<constraints>
225-
<constraint firstAttribute="bottom" secondItem="3a7-4p-o3K" secondAttribute="bottom" id="9Yi-tE-IPK"/>
226-
<constraint firstItem="3a7-4p-o3K" firstAttribute="top" secondItem="eDE-01-spK" secondAttribute="top" constant="5" id="JUp-2W-HXN"/>
227-
<constraint firstItem="PVP-qS-cd0" firstAttribute="leading" secondItem="eDE-01-spK" secondAttribute="leading" constant="7" id="VuL-YG-jTp"/>
228-
<constraint firstAttribute="bottom" secondItem="PVP-qS-cd0" secondAttribute="bottom" id="f31-vj-HNM"/>
225+
<constraint firstItem="PVP-qS-cd0" firstAttribute="centerX" secondItem="eDE-01-spK" secondAttribute="centerX" id="b6L-cf-pFO"/>
226+
<constraint firstAttribute="height" constant="34" id="gpO-F8-Y7G"/>
229227
<constraint firstItem="3a7-4p-o3K" firstAttribute="width" secondItem="PVP-qS-cd0" secondAttribute="width" id="he6-w9-mqi"/>
230-
<constraint firstItem="PVP-qS-cd0" firstAttribute="top" secondItem="eDE-01-spK" secondAttribute="top" id="llw-vE-K9V"/>
231-
<constraint firstAttribute="trailing" secondItem="PVP-qS-cd0" secondAttribute="trailing" constant="7" id="qNt-Hz-BJX"/>
228+
<constraint firstItem="PVP-qS-cd0" firstAttribute="centerY" secondItem="eDE-01-spK" secondAttribute="centerY" id="qGC-ec-Mnp"/>
229+
<constraint firstItem="3a7-4p-o3K" firstAttribute="top" secondItem="PVP-qS-cd0" secondAttribute="top" constant="5" id="sXl-HB-TEC"/>
232230
<constraint firstItem="3a7-4p-o3K" firstAttribute="centerX" secondItem="PVP-qS-cd0" secondAttribute="centerX" id="vf8-zs-xHt"/>
231+
<constraint firstAttribute="width" constant="28" id="yBH-K8-Xl7"/>
233232
</constraints>
234233
</view>
235234
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="44U" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="8" adjustsLetterSpacingToFitWidth="YES" translatesAutoresizingMaskIntoConstraints="NO" id="G1b-Pr-JmQ">
236-
<rect key="frame" x="14" y="14.5" width="20.5" height="11"/>
235+
<rect key="frame" x="17" y="14.5" width="20.5" height="11"/>
237236
<fontDescription key="fontDescription" type="system" weight="heavy" pointSize="9"/>
238237
<color key="textColor" systemColor="systemBlueColor" red="0.0" green="0.47843137250000001" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
239238
<nil key="highlightedColor"/>
@@ -243,20 +242,19 @@
243242
<bool key="isElement" value="YES"/>
244243
</accessibility>
245244
<constraints>
246-
<constraint firstAttribute="bottom" secondItem="eDE-01-spK" secondAttribute="bottom" constant="5" id="7H4-wm-m4D"/>
247-
<constraint firstItem="eDE-01-spK" firstAttribute="top" secondItem="mME-iU-5yj" secondAttribute="top" constant="5" id="BGT-VH-S73"/>
248245
<constraint firstItem="G1b-Pr-JmQ" firstAttribute="centerX" secondItem="eDE-01-spK" secondAttribute="centerX" id="Bc9-29-79O"/>
249-
<constraint firstAttribute="trailing" secondItem="eDE-01-spK" secondAttribute="trailing" constant="6" id="Dyr-fu-loH"/>
250-
<constraint firstItem="eDE-01-spK" firstAttribute="leading" secondItem="mME-iU-5yj" secondAttribute="leading" constant="6" id="Jtz-9u-n9h"/>
246+
<constraint firstItem="eDE-01-spK" firstAttribute="centerX" secondItem="mME-iU-5yj" secondAttribute="centerX" id="LeK-09-bY7"/>
247+
<constraint firstItem="eDE-01-spK" firstAttribute="centerY" secondItem="mME-iU-5yj" secondAttribute="centerY" id="jMb-FX-cJb"/>
251248
<constraint firstItem="G1b-Pr-JmQ" firstAttribute="centerY" secondItem="eDE-01-spK" secondAttribute="centerY" constant="-2" id="rTt-Dm-05Y"/>
252-
<constraint firstAttribute="width" constant="48" id="xX3-6f-WoP"/>
249+
<constraint firstAttribute="width" constant="54" id="xX3-6f-WoP"/>
253250
</constraints>
254251
<connections>
255252
<outlet property="levelMaskView" destination="3a7-4p-o3K" id="8AT-IU-dsM"/>
256253
</connections>
257254
</view>
258255
</subviews>
259256
<constraints>
257+
<constraint firstItem="Xc6-TW-EU5" firstAttribute="width" secondItem="L6g-Dz-wXm" secondAttribute="width" multiplier="0.55" id="7h0-fg-Ue5"/>
260258
<constraint firstItem="Xc6-TW-EU5" firstAttribute="top" secondItem="L6g-Dz-wXm" secondAttribute="top" id="Tbc-1M-OSJ"/>
261259
<constraint firstAttribute="bottom" secondItem="Xc6-TW-EU5" secondAttribute="bottom" id="wSE-dR-cio"/>
262260
</constraints>
@@ -281,7 +279,7 @@
281279
<constraint firstItem="Ao2-HQ-nCe" firstAttribute="leading" secondItem="GcS-Ho-amr" secondAttribute="leading" id="Z3p-FG-XGi"/>
282280
<constraint firstAttribute="trailing" secondItem="Ao2-HQ-nCe" secondAttribute="trailing" constant="8" id="bJa-dD-BoX"/>
283281
<constraint firstAttribute="bottom" secondItem="L6g-Dz-wXm" secondAttribute="bottom" constant="20" id="lc5-dm-Pux"/>
284-
<constraint firstItem="L6g-Dz-wXm" firstAttribute="leading" secondItem="GcS-Ho-amr" secondAttribute="leading" constant="6" id="lp7-2x-ROj"/>
282+
<constraint firstItem="L6g-Dz-wXm" firstAttribute="leading" secondItem="GcS-Ho-amr" secondAttribute="leading" constant="10" id="lp7-2x-ROj"/>
285283
<constraint firstItem="L6g-Dz-wXm" firstAttribute="trailing" secondItem="Ao2-HQ-nCe" secondAttribute="trailing" constant="-10" id="qLY-aq-n8a"/>
286284
</constraints>
287285
<connections>

0 commit comments

Comments
 (0)