Skip to content

Commit cd0d2cf

Browse files
Bharat Medirattaps2
Bharat Mediratta
authored and
ps2
committed
Project and margin cleanups (#427)
1 parent 2f9a042 commit cd0d2cf

File tree

11 files changed

+133
-126
lines changed

11 files changed

+133
-126
lines changed

‎Loop Status Extension/Base.lproj/MainInterface.storyboard‎

Lines changed: 31 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2-
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11762" systemVersion="15G1217" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="64E-I5-5c4">
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="12118" systemVersion="16E195" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="64E-I5-5c4">
33
<device id="retina4_7" orientation="portrait">
44
<adaptation id="fullscreen"/>
55
</device>
66
<dependencies>
77
<deployment identifier="iOS"/>
8-
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11757"/>
8+
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12086"/>
99
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
1010
</dependencies>
1111
<scenes>
@@ -18,37 +18,51 @@
1818
<viewControllerLayoutGuide type="bottom" id="Vi1-50-EGe"/>
1919
</layoutGuides>
2020
<view key="view" contentMode="scaleToFill" id="Vhu-kB-paW">
21-
<rect key="frame" x="0.0" y="0.0" width="375" height="200"/>
21+
<rect key="frame" x="0.0" y="0.0" width="375" height="220"/>
2222
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
2323
<subviews>
2424
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="QEK-eF-fK6">
25-
<rect key="frame" x="8" y="8" width="359" height="184"/>
25+
<rect key="frame" x="8" y="0.0" width="359" height="220"/>
2626
<subviews>
2727
<stackView opaque="NO" contentMode="scaleToFill" distribution="fillEqually" translatesAutoresizingMaskIntoConstraints="NO" id="d8d-rW-z8J" customClass="HUDView" customModule="LoopUI">
2828
<rect key="frame" x="0.0" y="0.0" width="359" height="70"/>
2929
<constraints>
30-
<constraint firstAttribute="height" constant="70" id="Pes-zW-tY0"/>
30+
<constraint firstAttribute="height" constant="70" id="CMw-Lk-A0P"/>
3131
</constraints>
3232
</stackView>
33-
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Eventually 92 mg/dL" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="9iF-xY-Bh4">
34-
<rect key="frame" x="0.0" y="70" width="359" height="24"/>
33+
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="3n2-yC-jGi">
34+
<rect key="frame" x="0.0" y="70" width="359" height="40"/>
35+
<subviews>
36+
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" layoutMarginsFollowReadableWidth="YES" text="Eventually 92 mg/dL" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="9iF-xY-Bh4">
37+
<rect key="frame" x="8" y="0.0" width="343" height="40"/>
38+
<constraints>
39+
<constraint firstAttribute="height" relation="greaterThanOrEqual" constant="40" id="aVA-Mg-CvQ"/>
40+
</constraints>
41+
<fontDescription key="fontDescription" type="boldSystem" pointSize="15"/>
42+
<nil key="textColor"/>
43+
<nil key="highlightedColor"/>
44+
</label>
45+
</subviews>
3546
<constraints>
36-
<constraint firstAttribute="height" constant="24" id="EgB-lz-6eX"/>
47+
<constraint firstItem="9iF-xY-Bh4" firstAttribute="top" secondItem="3n2-yC-jGi" secondAttribute="top" id="HSD-ba-SBR"/>
48+
<constraint firstAttribute="bottom" secondItem="9iF-xY-Bh4" secondAttribute="bottom" id="LtS-Ct-5Wl"/>
49+
<constraint firstItem="9iF-xY-Bh4" firstAttribute="leading" secondItem="3n2-yC-jGi" secondAttribute="leading" constant="8" id="cIA-WI-DT4"/>
50+
<constraint firstAttribute="trailing" secondItem="9iF-xY-Bh4" secondAttribute="trailing" constant="8" id="x9b-EB-fji"/>
3751
</constraints>
38-
<fontDescription key="fontDescription" type="boldSystem" pointSize="15"/>
39-
<nil key="textColor"/>
40-
<nil key="highlightedColor"/>
41-
</label>
52+
</view>
4253
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="GVu-hk-PBg" customClass="ChartContentView" customModule="LoopUI">
43-
<rect key="frame" x="0.0" y="94" width="359" height="90"/>
54+
<rect key="frame" x="0.0" y="110" width="359" height="110"/>
4455
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
56+
<constraints>
57+
<constraint firstAttribute="height" relation="greaterThanOrEqual" constant="100" id="rLK-f9-lLl"/>
58+
</constraints>
4559
</view>
4660
</subviews>
4761
</stackView>
4862
</subviews>
4963
<constraints>
50-
<constraint firstItem="Vi1-50-EGe" firstAttribute="top" secondItem="QEK-eF-fK6" secondAttribute="bottom" constant="8" id="8CP-lo-FxM"/>
51-
<constraint firstItem="QEK-eF-fK6" firstAttribute="top" secondItem="RlU-UG-7QV" secondAttribute="bottom" constant="8" id="Rna-hO-xkd"/>
64+
<constraint firstItem="Vi1-50-EGe" firstAttribute="top" secondItem="QEK-eF-fK6" secondAttribute="bottom" id="8CP-lo-FxM"/>
65+
<constraint firstItem="QEK-eF-fK6" firstAttribute="top" secondItem="RlU-UG-7QV" secondAttribute="bottom" id="Rna-hO-xkd"/>
5266
<constraint firstItem="QEK-eF-fK6" firstAttribute="leading" secondItem="Vhu-kB-paW" secondAttribute="leading" constant="8" id="hDE-a8-dTa"/>
5367
<constraint firstAttribute="trailing" secondItem="QEK-eF-fK6" secondAttribute="trailing" constant="8" id="rIV-pZ-0Ap"/>
5468
</constraints>
@@ -58,7 +72,7 @@
5872
<nil key="simulatedTopBarMetrics"/>
5973
<nil key="simulatedBottomBarMetrics"/>
6074
<freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
61-
<size key="freeformSize" width="375" height="200"/>
75+
<size key="freeformSize" width="375" height="220"/>
6276
<connections>
6377
<outlet property="glucoseChartContentView" destination="GVu-hk-PBg" id="gfZ-nx-P6V"/>
6478
<outlet property="hudView" destination="d8d-rW-z8J" id="7Cp-BW-Kpc"/>

‎Loop Status Extension/StatusViewController.swift‎

Lines changed: 29 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,25 @@ class StatusViewController: UIViewController, NCWidgetProviding {
2929
@IBOutlet weak var glucoseChartContentView: ChartContentView!
3030

3131
private lazy var charts: StatusChartsManager = {
32-
let charts = StatusChartsManager(colors: ChartColorPalette(axisLine: .axisLineColor, axisLabel: .axisLabelColor, grid: .gridColor, glucoseTint: .glucoseTintColor, doseTint: .doseTintColor))
32+
let charts = StatusChartsManager(
33+
colors: ChartColorPalette(
34+
axisLine: .axisLineColor,
35+
axisLabel: .axisLabelColor,
36+
grid: .gridColor,
37+
glucoseTint: .glucoseTintColor,
38+
doseTint: .doseTintColor
39+
),
40+
settings: {
41+
var settings = ChartSettings()
42+
settings.top = 4
43+
settings.bottom = 8
44+
settings.trailing = 8
45+
settings.axisTitleLabelsToLabelsSpacing = 0
46+
settings.labelsToAxisSpacingX = 6
47+
settings.labelsWidthY = 30
48+
return settings
49+
}()
50+
)
3351

3452
charts.glucoseDisplayRange = (
3553
min: HKQuantity(unit: HKUnit.milligramsPerDeciliterUnit(), doubleValue: 100),
@@ -75,7 +93,7 @@ class StatusViewController: UIViewController, NCWidgetProviding {
7593

7694
override func viewDidLoad() {
7795
super.viewDidLoad()
78-
subtitleLabel.alpha = 0
96+
subtitleLabel.isHidden = true
7997
subtitleLabel.textColor = .subtitleLabelColor
8098

8199
let tapGestureRecognizer = UITapGestureRecognizer(target: self, action: #selector(openLoopApp(_:)))
@@ -97,7 +115,7 @@ class StatusViewController: UIViewController, NCWidgetProviding {
97115
}
98116

99117
self.extensionContext?.widgetLargestAvailableDisplayMode = NCWidgetDisplayMode.expanded
100-
glucoseChartContentView.alpha = self.extensionContext?.widgetActiveDisplayMode == NCWidgetDisplayMode.compact ? 0 : 1
118+
glucoseChartContentView.isHidden = self.extensionContext?.widgetActiveDisplayMode != .expanded
101119
}
102120

103121
deinit {
@@ -107,10 +125,11 @@ class StatusViewController: UIViewController, NCWidgetProviding {
107125
}
108126

109127
func widgetActiveDisplayModeDidChange(_ activeDisplayMode: NCWidgetDisplayMode, withMaximumSize maxSize: CGSize) {
110-
if (activeDisplayMode == NCWidgetDisplayMode.compact) {
111-
self.preferredContentSize = maxSize
112-
} else {
113-
self.preferredContentSize = CGSize(width: maxSize.width, height: 210)
128+
switch activeDisplayMode {
129+
case .compact:
130+
preferredContentSize = maxSize
131+
case .expanded:
132+
preferredContentSize = CGSize(width: maxSize.width, height: 210)
114133
}
115134
}
116135

@@ -119,11 +138,7 @@ class StatusViewController: UIViewController, NCWidgetProviding {
119138

120139
coordinator.animate(alongsideTransition: {
121140
(UIViewControllerTransitionCoordinatorContext) -> Void in
122-
if self.extensionContext?.widgetActiveDisplayMode == .compact {
123-
self.glucoseChartContentView.alpha = 0
124-
} else {
125-
self.glucoseChartContentView.alpha = 1
126-
}
141+
self.glucoseChartContentView.isHidden = self.extensionContext?.widgetActiveDisplayMode != .expanded
127142
})
128143
}
129144

@@ -178,7 +193,7 @@ class StatusViewController: UIViewController, NCWidgetProviding {
178193
loopCompletionHUD.lastLoopCompleted = loop.lastCompleted
179194
}
180195

181-
subtitleLabel.alpha = 0
196+
subtitleLabel.isHidden = true
182197

183198
let dateFormatter: DateFormatter = {
184199
let dateFormatter = DateFormatter()
@@ -225,7 +240,7 @@ class StatusViewController: UIViewController, NCWidgetProviding {
225240
eventualGlucoseNumberString,
226241
eventualGlucose.unit.glucoseUnitDisplayString
227242
)
228-
subtitleLabel.alpha = 1
243+
subtitleLabel.isHidden = false
229244
}
230245
}
231246
}

‎Loop Status Extension/UIColor+Widget.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import LoopUI
1212
extension UIColor {
1313
@nonobjc static let axisLabelColor = subtitleLabelColor
1414

15-
@nonobjc static let axisLineColor = subtitleLabelColor
15+
@nonobjc static let axisLineColor = UIColor.clear
1616

1717
@nonobjc static let doseTintColor = UIColor(red: 255 / 255, green: 109 / 255, blue: 0, alpha: 1)
1818

0 commit comments

Comments
 (0)