Skip to content

Persistent device logs #1289

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Apr 1, 2020
Merged

Persistent device logs #1289

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
29ebb0f
Handle device logs
ps2 Mar 29, 2020
550be9a
Update back button on bolus screen in enter meal flow
ps2 Mar 29, 2020
0ad5633
Bump cartfile revs for LoopKit update
ps2 Mar 29, 2020
37eac2c
Update carthage revs for device drivers using new device logs
ps2 Mar 29, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Cartfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
github "LoopKit/LoopKit" "dev"
github "LoopKit/CGMBLEKit" "dev"
github "i-schuetz/SwiftCharts" == 0.6.5
github "LoopKit/dexcom-share-client-swift" ~> 1.2
github "LoopKit/G4ShareSpy" ~> 1.1
github "LoopKit/dexcom-share-client-swift" "dev"
github "LoopKit/G4ShareSpy" "dev"
github "ps2/rileylink_ios" "dev"
github "LoopKit/Amplitude-iOS" "decreepify"
10 changes: 5 additions & 5 deletions Cartfile.resolved
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
github "LoopKit/Amplitude-iOS" "2137d5fd44bf630ed33e1e72d7af6d8f8612f270"
github "LoopKit/CGMBLEKit" "aaa67861eeddfd6dd8b4b59e8d71cfa065fb07f8"
github "LoopKit/G4ShareSpy" "v1.1"
github "LoopKit/LoopKit" "2ea6be077000ad8300bd9afa556f34a101b8904b"
github "LoopKit/CGMBLEKit" "94742e1137aa29e26dff3457d0ab42b56a2ed121"
github "LoopKit/G4ShareSpy" "88c5a296e83ce618319ae365a7e6da76d9be126b"
github "LoopKit/LoopKit" "8bc6e4b4ed4d8a7e98d8dcf539238b98c83ed3d1"
github "LoopKit/MKRingProgressView" "f548a5c64832be2d37d7c91b5800e284887a2a0a"
github "LoopKit/dexcom-share-client-swift" "v1.2"
github "LoopKit/dexcom-share-client-swift" "c37d87fcf121c44721e87c9e6d2bea94e48728cc"
github "i-schuetz/SwiftCharts" "0.6.5"
github "ps2/rileylink_ios" "95429e28a54d3123a0944ec8f658ba1c636b6ef8"
github "ps2/rileylink_ios" "7406784b44d351808e83d5af604aa15b7d82b62d"
47 changes: 21 additions & 26 deletions Loop/Base.lproj/Main.storyboard
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<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">
<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">
<device id="retina4_7" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15706"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16086"/>
<capability name="Named colors" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
Expand Down Expand Up @@ -448,36 +448,36 @@
<rect key="frame" x="16" y="11" width="343" height="45"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="fillEqually" spacing="4" translatesAutoresizingMaskIntoConstraints="NO" id="u18-by-vQw">
<rect key="frame" x="0.0" y="0.0" width="271" height="45"/>
<rect key="frame" x="0.0" y="0.0" width="303" height="45"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="BbA-hn-OkN">
<rect key="frame" x="0.0" y="0.0" width="271" height="20.5"/>
<rect key="frame" x="0.0" y="0.0" width="303" height="20.5"/>
<subviews>
<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">
<rect key="frame" x="0.0" y="0.0" width="227" height="20.5"/>
<rect key="frame" x="0.0" y="0.0" width="259" height="20.5"/>
<fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<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">
<rect key="frame" x="227" y="0.0" width="44" height="20.5"/>
<rect key="frame" x="259" y="0.0" width="44" height="20.5"/>
<fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
<color key="textColor" systemColor="secondaryLabelColor" red="0.23529411759999999" green="0.23529411759999999" blue="0.26274509800000001" alpha="0.59999999999999998" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
</subviews>
</stackView>
<stackView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="xqU-HU-BMs">
<rect key="frame" x="0.0" y="24.5" width="271" height="20.5"/>
<rect key="frame" x="0.0" y="24.5" width="303" height="20.5"/>
<subviews>
<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">
<rect key="frame" x="0.0" y="0.0" width="227" height="20.5"/>
<rect key="frame" x="0.0" y="0.0" width="259" height="20.5"/>
<fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
<color key="textColor" name="carbs"/>
<nil key="highlightedColor"/>
</label>
<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">
<rect key="frame" x="227" y="0.0" width="44" height="20.5"/>
<rect key="frame" x="259" y="0.0" width="44" height="20.5"/>
<fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
<color key="textColor" name="carbs"/>
<nil key="highlightedColor"/>
Expand All @@ -487,7 +487,7 @@
</subviews>
</stackView>
<imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="Uploading" translatesAutoresizingMaskIntoConstraints="NO" id="PHg-Vp-8VS">
<rect key="frame" x="279" y="0.0" width="64" height="45"/>
<rect key="frame" x="311" y="0.0" width="32" height="45"/>
</imageView>
</subviews>
</stackView>
Expand Down Expand Up @@ -863,13 +863,13 @@
<autoresizingMask key="autoresizingMask"/>
<subviews>
<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">
<rect key="frame" x="16" y="20.5" width="194" height="21"/>
<rect key="frame" x="16" y="19.5" width="194" height="21"/>
<fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="0.0" textAlignment="right" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="7LT-50-ZzK">
<rect key="frame" x="218" y="10" width="120" height="34"/>
<rect key="frame" x="218" y="9" width="120" height="35"/>
<accessibility key="accessibilityConfiguration" label="Bolus Amount"/>
<constraints>
<constraint firstAttribute="width" constant="120" id="hZ2-Aq-FHT"/>
Expand All @@ -881,7 +881,7 @@
</connections>
</textField>
<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">
<rect key="frame" x="346" y="20.5" width="13" height="21"/>
<rect key="frame" x="346" y="19.5" width="13" height="21"/>
<accessibility key="accessibilityConfiguration" label="Units"/>
<fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
<color key="textColor" systemColor="secondaryLabelColor" red="0.23529411759999999" green="0.23529411759999999" blue="0.26274509800000001" alpha="0.59999999999999998" colorSpace="custom" customColorSpace="sRGB"/>
Expand All @@ -908,18 +908,13 @@
<outlet property="delegate" destination="WhH-Np-jCn" id="qFt-hY-ODb"/>
</connections>
</tableView>
<navigationItem key="navigationItem" title="Bolus" id="aiu-ZA-zVa">
<barButtonItem key="leftBarButtonItem" systemItem="cancel" id="S3T-x6-xdq">
<connections>
<segue destination="xgn-H5-ghO" kind="unwind" identifier="close" unwindAction="unwindFromBolusViewController:" id="Nq4-5L-c85"/>
</connections>
</barButtonItem>
</navigationItem>
<navigationItem key="navigationItem" title="Bolus" id="aiu-ZA-zVa"/>
<simulatedNavigationBarMetrics key="simulatedTopBarMetrics" prompted="NO"/>
<connections>
<outlet property="bolusAmountTextField" destination="7LT-50-ZzK" id="qb4-wc-9ib"/>
<outlet property="noticeLabel" destination="k0g-P7-OVN" id="Geb-fw-665"/>
<outlet property="recommendedBolusAmountLabel" destination="5QS-Yf-Pua" id="0J3-We-D2X"/>
<segue destination="xgn-H5-ghO" kind="unwind" identifier="close" unwindAction="unwindFromBolusViewController:" id="xRB-qt-LlE"/>
</connections>
</tableViewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="KEH-mi-7Jf" userLabel="First Responder" sceneMemberID="firstResponder"/>
Expand Down Expand Up @@ -1175,7 +1170,7 @@
<autoresizingMask key="autoresizingMask"/>
<subviews>
<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">
<rect key="frame" x="105" y="15" width="254" height="24"/>
<rect key="frame" x="105" y="15" width="254" height="25.5"/>
<color key="textColor" systemColor="secondaryLabelColor" red="0.23529411759999999" green="0.23529411759999999" blue="0.26274509800000001" alpha="0.59999999999999998" colorSpace="custom" customColorSpace="sRGB"/>
<fontDescription key="fontDescription" style="UICTFontTextStyleTitle3"/>
<textInputTraits key="textInputTraits" returnKeyType="next"/>
Expand Down Expand Up @@ -1313,6 +1308,11 @@
<point key="canvasLocation" x="2458" y="733"/>
</scene>
</scenes>
<inferredMetricsTieBreakers>
<segue reference="urz-4S-c6I"/>
<segue reference="viB-eQ-p7y"/>
<segue reference="PC7-vP-CUY"/>
</inferredMetricsTieBreakers>
<resources>
<image name="Oval Selection" width="21" height="21"/>
<image name="Pre-Meal" width="29" height="29"/>
Expand All @@ -1325,9 +1325,4 @@
<color red="0.3880000114440918" green="0.85500001907348633" blue="0.2199999988079071" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
</resources>
<inferredMetricsTieBreakers>
<segue reference="urz-4S-c6I"/>
<segue reference="viB-eQ-p7y"/>
<segue reference="PC7-vP-CUY"/>
</inferredMetricsTieBreakers>
</document>
Loading