Skip to content

Commit 55766fa

Browse files
ps2ps2
authored
Persistent device logs (#1289)
* Handle device logs * Update back button on bolus screen in enter meal flow * Bump cartfile revs for LoopKit update * Update carthage revs for device drivers using new device logs
1 parent e5d788a commit 55766fa

File tree

7 files changed

+89
-65
lines changed

7 files changed

+89
-65
lines changed

‎Cartfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
github "LoopKit/LoopKit" "dev"
22
github "LoopKit/CGMBLEKit" "dev"
33
github "i-schuetz/SwiftCharts" == 0.6.5
4-
github "LoopKit/dexcom-share-client-swift" ~> 1.2
5-
github "LoopKit/G4ShareSpy" ~> 1.1
4+
github "LoopKit/dexcom-share-client-swift" "dev"
5+
github "LoopKit/G4ShareSpy" "dev"
66
github "ps2/rileylink_ios" "dev"
77
github "LoopKit/Amplitude-iOS" "decreepify"

‎Cartfile.resolved‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
github "LoopKit/Amplitude-iOS" "2137d5fd44bf630ed33e1e72d7af6d8f8612f270"
2-
github "LoopKit/CGMBLEKit" "aaa67861eeddfd6dd8b4b59e8d71cfa065fb07f8"
3-
github "LoopKit/G4ShareSpy" "v1.1"
4-
github "LoopKit/LoopKit" "2ea6be077000ad8300bd9afa556f34a101b8904b"
2+
github "LoopKit/CGMBLEKit" "94742e1137aa29e26dff3457d0ab42b56a2ed121"
3+
github "LoopKit/G4ShareSpy" "88c5a296e83ce618319ae365a7e6da76d9be126b"
4+
github "LoopKit/LoopKit" "8bc6e4b4ed4d8a7e98d8dcf539238b98c83ed3d1"
55
github "LoopKit/MKRingProgressView" "f548a5c64832be2d37d7c91b5800e284887a2a0a"
6-
github "LoopKit/dexcom-share-client-swift" "v1.2"
6+
github "LoopKit/dexcom-share-client-swift" "c37d87fcf121c44721e87c9e6d2bea94e48728cc"
77
github "i-schuetz/SwiftCharts" "0.6.5"
8-
github "ps2/rileylink_ios" "95429e28a54d3123a0944ec8f658ba1c636b6ef8"
8+
github "ps2/rileylink_ios" "7406784b44d351808e83d5af604aa15b7d82b62d"

‎Loop/Base.lproj/Main.storyboard‎

Lines changed: 21 additions & 26 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.Storyboard.XIB" version="3.0" toolsVersion="15705" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="74s-IX-WF0">
2+
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="16096" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="74s-IX-WF0">
33
<device id="retina4_7" orientation="portrait" appearance="light"/>
44
<dependencies>
55
<deployment identifier="iOS"/>
6-
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15706"/>
6+
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16086"/>
77
<capability name="Named colors" minToolsVersion="9.0"/>
88
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
99
</dependencies>
@@ -448,36 +448,36 @@
448448
<rect key="frame" x="16" y="11" width="343" height="45"/>
449449
<subviews>
450450
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="fillEqually" spacing="4" translatesAutoresizingMaskIntoConstraints="NO" id="u18-by-vQw">
451-
<rect key="frame" x="0.0" y="0.0" width="271" height="45"/>
451+
<rect key="frame" x="0.0" y="0.0" width="303" height="45"/>
452452
<subviews>
453453
<stackView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="BbA-hn-OkN">
454-
<rect key="frame" x="0.0" y="0.0" width="271" height="20.5"/>
454+
<rect key="frame" x="0.0" y="0.0" width="303" height="20.5"/>
455455
<subviews>
456456
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ufi-Kj-33k">
457-
<rect key="frame" x="0.0" y="0.0" width="227" height="20.5"/>
457+
<rect key="frame" x="0.0" y="0.0" width="259" height="20.5"/>
458458
<fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
459459
<nil key="textColor"/>
460460
<nil key="highlightedColor"/>
461461
</label>
462462
<label opaque="NO" multipleTouchEnabled="YES" contentMode="left" horizontalHuggingPriority="251" horizontalCompressionResistancePriority="751" text="Detail" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="aCb-Qs-bpu">
463-
<rect key="frame" x="227" y="0.0" width="44" height="20.5"/>
463+
<rect key="frame" x="259" y="0.0" width="44" height="20.5"/>
464464
<fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
465465
<color key="textColor" systemColor="secondaryLabelColor" red="0.23529411759999999" green="0.23529411759999999" blue="0.26274509800000001" alpha="0.59999999999999998" colorSpace="custom" customColorSpace="sRGB"/>
466466
<nil key="highlightedColor"/>
467467
</label>
468468
</subviews>
469469
</stackView>
470470
<stackView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="xqU-HU-BMs">
471-
<rect key="frame" x="0.0" y="24.5" width="271" height="20.5"/>
471+
<rect key="frame" x="0.0" y="24.5" width="303" height="20.5"/>
472472
<subviews>
473473
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Krd-Aa-ret">
474-
<rect key="frame" x="0.0" y="0.0" width="227" height="20.5"/>
474+
<rect key="frame" x="0.0" y="0.0" width="259" height="20.5"/>
475475
<fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
476476
<color key="textColor" name="carbs"/>
477477
<nil key="highlightedColor"/>
478478
</label>
479479
<label opaque="NO" multipleTouchEnabled="YES" contentMode="left" horizontalHuggingPriority="251" text="Detail" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="J7x-W5-gwo">
480-
<rect key="frame" x="227" y="0.0" width="44" height="20.5"/>
480+
<rect key="frame" x="259" y="0.0" width="44" height="20.5"/>
481481
<fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
482482
<color key="textColor" name="carbs"/>
483483
<nil key="highlightedColor"/>
@@ -487,7 +487,7 @@
487487
</subviews>
488488
</stackView>
489489
<imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="Uploading" translatesAutoresizingMaskIntoConstraints="NO" id="PHg-Vp-8VS">
490-
<rect key="frame" x="279" y="0.0" width="64" height="45"/>
490+
<rect key="frame" x="311" y="0.0" width="32" height="45"/>
491491
</imageView>
492492
</subviews>
493493
</stackView>
@@ -863,13 +863,13 @@
863863
<autoresizingMask key="autoresizingMask"/>
864864
<subviews>
865865
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="251" text="Bolus" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="5oA-6d-ZTL">
866-
<rect key="frame" x="16" y="20.5" width="194" height="21"/>
866+
<rect key="frame" x="16" y="19.5" width="194" height="21"/>
867867
<fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
868868
<nil key="textColor"/>
869869
<nil key="highlightedColor"/>
870870
</label>
871871
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="0.0" textAlignment="right" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="7LT-50-ZzK">
872-
<rect key="frame" x="218" y="10" width="120" height="34"/>
872+
<rect key="frame" x="218" y="9" width="120" height="35"/>
873873
<accessibility key="accessibilityConfiguration" label="Bolus Amount"/>
874874
<constraints>
875875
<constraint firstAttribute="width" constant="120" id="hZ2-Aq-FHT"/>
@@ -881,7 +881,7 @@
881881
</connections>
882882
</textField>
883883
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="U" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="BR0-dr-Fj2">
884-
<rect key="frame" x="346" y="20.5" width="13" height="21"/>
884+
<rect key="frame" x="346" y="19.5" width="13" height="21"/>
885885
<accessibility key="accessibilityConfiguration" label="Units"/>
886886
<fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
887887
<color key="textColor" systemColor="secondaryLabelColor" red="0.23529411759999999" green="0.23529411759999999" blue="0.26274509800000001" alpha="0.59999999999999998" colorSpace="custom" customColorSpace="sRGB"/>
@@ -908,18 +908,13 @@
908908
<outlet property="delegate" destination="WhH-Np-jCn" id="qFt-hY-ODb"/>
909909
</connections>
910910
</tableView>
911-
<navigationItem key="navigationItem" title="Bolus" id="aiu-ZA-zVa">
912-
<barButtonItem key="leftBarButtonItem" systemItem="cancel" id="S3T-x6-xdq">
913-
<connections>
914-
<segue destination="xgn-H5-ghO" kind="unwind" identifier="close" unwindAction="unwindFromBolusViewController:" id="Nq4-5L-c85"/>
915-
</connections>
916-
</barButtonItem>
917-
</navigationItem>
911+
<navigationItem key="navigationItem" title="Bolus" id="aiu-ZA-zVa"/>
918912
<simulatedNavigationBarMetrics key="simulatedTopBarMetrics" prompted="NO"/>
919913
<connections>
920914
<outlet property="bolusAmountTextField" destination="7LT-50-ZzK" id="qb4-wc-9ib"/>
921915
<outlet property="noticeLabel" destination="k0g-P7-OVN" id="Geb-fw-665"/>
922916
<outlet property="recommendedBolusAmountLabel" destination="5QS-Yf-Pua" id="0J3-We-D2X"/>
917+
<segue destination="xgn-H5-ghO" kind="unwind" identifier="close" unwindAction="unwindFromBolusViewController:" id="xRB-qt-LlE"/>
923918
</connections>
924919
</tableViewController>
925920
<placeholder placeholderIdentifier="IBFirstResponder" id="KEH-mi-7Jf" userLabel="First Responder" sceneMemberID="firstResponder"/>
@@ -1175,7 +1170,7 @@
11751170
<autoresizingMask key="autoresizingMask"/>
11761171
<subviews>
11771172
<textField opaque="NO" contentMode="scaleToFill" verticalCompressionResistancePriority="751" contentHorizontalAlignment="left" contentVerticalAlignment="center" textAlignment="right" minimumFontSize="15" translatesAutoresizingMaskIntoConstraints="NO" id="bSR-8J-y14" customClass="CustomInputTextField" customModule="LoopKitUI">
1178-
<rect key="frame" x="105" y="15" width="254" height="24"/>
1173+
<rect key="frame" x="105" y="15" width="254" height="25.5"/>
11791174
<color key="textColor" systemColor="secondaryLabelColor" red="0.23529411759999999" green="0.23529411759999999" blue="0.26274509800000001" alpha="0.59999999999999998" colorSpace="custom" customColorSpace="sRGB"/>
11801175
<fontDescription key="fontDescription" style="UICTFontTextStyleTitle3"/>
11811176
<textInputTraits key="textInputTraits" returnKeyType="next"/>
@@ -1313,6 +1308,11 @@
13131308
<point key="canvasLocation" x="2458" y="733"/>
13141309
</scene>
13151310
</scenes>
1311+
<inferredMetricsTieBreakers>
1312+
<segue reference="urz-4S-c6I"/>
1313+
<segue reference="viB-eQ-p7y"/>
1314+
<segue reference="PC7-vP-CUY"/>
1315+
</inferredMetricsTieBreakers>
13161316
<resources>
13171317
<image name="Oval Selection" width="21" height="21"/>
13181318
<image name="Pre-Meal" width="29" height="29"/>
@@ -1325,9 +1325,4 @@
13251325
<color red="0.3880000114440918" green="0.85500001907348633" blue="0.2199999988079071" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
13261326
</namedColor>
13271327
</resources>
1328-
<inferredMetricsTieBreakers>
1329-
<segue reference="urz-4S-c6I"/>
1330-
<segue reference="viB-eQ-p7y"/>
1331-
<segue reference="PC7-vP-CUY"/>
1332-
</inferredMetricsTieBreakers>
13331328
</document>

0 commit comments

Comments
 (0)