diff --git a/Cartfile b/Cartfile index 3df034bcf5..fd41f64d6c 100644 --- a/Cartfile +++ b/Cartfile @@ -1,7 +1,7 @@ -github "LoopKit/LoopKit" ~> 1.0 +github "LoopKit/LoopKit" ~> 1.0.1 github "LoopKit/xDripG5" ~> 0.8.0 github "i-schuetz/SwiftCharts" ~> 0.5.0 github "mddub/dexcom-share-client-swift" ~> 0.2.0 github "mddub/G4ShareSpy" ~> 0.3.0 -github "ps2/rileylink_ios" ~> 0.12.4 +github "ps2/rileylink_ios" ~> 0.12.5 github "amplitude/Amplitude-iOS" ~> 3.8.5 diff --git a/Cartfile.resolved b/Cartfile.resolved index 7a9e1ed990..5a1100c1a7 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1,7 +1,7 @@ github "amplitude/Amplitude-iOS" "v3.8.5" github "mddub/G4ShareSpy" "v0.3.0" -github "LoopKit/LoopKit" "v1.0" +github "LoopKit/LoopKit" "v1.0.1" github "i-schuetz/SwiftCharts" "0.5" github "mddub/dexcom-share-client-swift" "v0.2.0" -github "ps2/rileylink_ios" "v0.12.4" +github "ps2/rileylink_ios" "v0.12.5" github "LoopKit/xDripG5" "v0.8.0" diff --git a/Carthage/Build/iOS/CarbKit.framework/CarbKit b/Carthage/Build/iOS/CarbKit.framework/CarbKit index 6d5f2b2403..a01778ea28 100755 Binary files a/Carthage/Build/iOS/CarbKit.framework/CarbKit and b/Carthage/Build/iOS/CarbKit.framework/CarbKit differ diff --git a/Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/CarbEntryEditViewController.nib b/Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/CarbEntryEditViewController.nib index 36cd1f5419..30396dbc47 100644 Binary files a/Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/CarbEntryEditViewController.nib and b/Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/CarbEntryEditViewController.nib differ diff --git a/Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/LyL-9U-twn-view-9Ci-XW-6nA.nib b/Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/LyL-9U-twn-view-9Ci-XW-6nA.nib index 8339510294..ac3e8c93f9 100644 Binary files a/Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/LyL-9U-twn-view-9Ci-XW-6nA.nib and b/Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/LyL-9U-twn-view-9Ci-XW-6nA.nib differ diff --git a/Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/UINavigationController-wgu-gT-TgV.nib b/Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/UINavigationController-wgu-gT-TgV.nib index 2d1359d292..bcf8f59fdf 100644 Binary files a/Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/UINavigationController-wgu-gT-TgV.nib and b/Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/UINavigationController-wgu-gT-TgV.nib differ diff --git a/Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/UITableViewController-rUL-yg-cFX.nib b/Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/UITableViewController-rUL-yg-cFX.nib index 8921eea59a..6b33b543af 100644 Binary files a/Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/UITableViewController-rUL-yg-cFX.nib and b/Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/UITableViewController-rUL-yg-cFX.nib differ diff --git a/Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/rUL-yg-cFX-view-b1s-8o-0Wp.nib b/Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/rUL-yg-cFX-view-b1s-8o-0Wp.nib index 083a2d6c9b..25740ca7c4 100644 Binary files a/Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/rUL-yg-cFX-view-b1s-8o-0Wp.nib and b/Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/rUL-yg-cFX-view-b1s-8o-0Wp.nib differ diff --git a/Carthage/Build/iOS/CarbKit.framework/Info.plist b/Carthage/Build/iOS/CarbKit.framework/Info.plist index 1844064a2c..3372ab39b6 100644 Binary files a/Carthage/Build/iOS/CarbKit.framework/Info.plist and b/Carthage/Build/iOS/CarbKit.framework/Info.plist differ diff --git a/Carthage/Build/iOS/Crypto.framework/Crypto b/Carthage/Build/iOS/Crypto.framework/Crypto index 515409dc94..d778499cb2 100755 Binary files a/Carthage/Build/iOS/Crypto.framework/Crypto and b/Carthage/Build/iOS/Crypto.framework/Crypto differ diff --git a/Carthage/Build/iOS/Crypto.framework/Info.plist b/Carthage/Build/iOS/Crypto.framework/Info.plist index 0c4c2d2b1b..5c24074118 100644 Binary files a/Carthage/Build/iOS/Crypto.framework/Info.plist and b/Carthage/Build/iOS/Crypto.framework/Info.plist differ diff --git a/Carthage/Build/iOS/GlucoseKit.framework/GlucoseKit b/Carthage/Build/iOS/GlucoseKit.framework/GlucoseKit index a90502a447..0628458bc2 100755 Binary files a/Carthage/Build/iOS/GlucoseKit.framework/GlucoseKit and b/Carthage/Build/iOS/GlucoseKit.framework/GlucoseKit differ diff --git a/Carthage/Build/iOS/GlucoseKit.framework/Info.plist b/Carthage/Build/iOS/GlucoseKit.framework/Info.plist index 671eb761a5..ad227307c0 100644 Binary files a/Carthage/Build/iOS/GlucoseKit.framework/Info.plist and b/Carthage/Build/iOS/GlucoseKit.framework/Info.plist differ diff --git a/Carthage/Build/iOS/InsulinKit.framework/Base.lproj/InsulinKit.storyboardc/UITableViewController-jGX-GA-nlH.nib b/Carthage/Build/iOS/InsulinKit.framework/Base.lproj/InsulinKit.storyboardc/UITableViewController-jGX-GA-nlH.nib index 1f21b1f15e..a443134e2a 100644 Binary files a/Carthage/Build/iOS/InsulinKit.framework/Base.lproj/InsulinKit.storyboardc/UITableViewController-jGX-GA-nlH.nib and b/Carthage/Build/iOS/InsulinKit.framework/Base.lproj/InsulinKit.storyboardc/UITableViewController-jGX-GA-nlH.nib differ diff --git a/Carthage/Build/iOS/InsulinKit.framework/Base.lproj/InsulinKit.storyboardc/jGX-GA-nlH-view-ccM-3y-LQM.nib b/Carthage/Build/iOS/InsulinKit.framework/Base.lproj/InsulinKit.storyboardc/jGX-GA-nlH-view-ccM-3y-LQM.nib index e64f446cec..7aea1587b6 100644 Binary files a/Carthage/Build/iOS/InsulinKit.framework/Base.lproj/InsulinKit.storyboardc/jGX-GA-nlH-view-ccM-3y-LQM.nib and b/Carthage/Build/iOS/InsulinKit.framework/Base.lproj/InsulinKit.storyboardc/jGX-GA-nlH-view-ccM-3y-LQM.nib differ diff --git a/Carthage/Build/iOS/InsulinKit.framework/Info.plist b/Carthage/Build/iOS/InsulinKit.framework/Info.plist index 9d011adb87..52e881f3da 100644 Binary files a/Carthage/Build/iOS/InsulinKit.framework/Info.plist and b/Carthage/Build/iOS/InsulinKit.framework/Info.plist differ diff --git a/Carthage/Build/iOS/InsulinKit.framework/InsulinKit b/Carthage/Build/iOS/InsulinKit.framework/InsulinKit index 93158889c1..1afae61903 100755 Binary files a/Carthage/Build/iOS/InsulinKit.framework/InsulinKit and b/Carthage/Build/iOS/InsulinKit.framework/InsulinKit differ diff --git a/Carthage/Build/iOS/LoopKit.framework/Assets.car b/Carthage/Build/iOS/LoopKit.framework/Assets.car index fa60658660..57d5e706d6 100644 Binary files a/Carthage/Build/iOS/LoopKit.framework/Assets.car and b/Carthage/Build/iOS/LoopKit.framework/Assets.car differ diff --git a/Carthage/Build/iOS/LoopKit.framework/GlucoseRangeOverrideTableViewCell.nib b/Carthage/Build/iOS/LoopKit.framework/GlucoseRangeOverrideTableViewCell.nib index e129d5aee3..eeac037b37 100644 Binary files a/Carthage/Build/iOS/LoopKit.framework/GlucoseRangeOverrideTableViewCell.nib and b/Carthage/Build/iOS/LoopKit.framework/GlucoseRangeOverrideTableViewCell.nib differ diff --git a/Carthage/Build/iOS/LoopKit.framework/GlucoseRangeTableViewCell.nib b/Carthage/Build/iOS/LoopKit.framework/GlucoseRangeTableViewCell.nib index 4b74b36941..f48070dc76 100644 Binary files a/Carthage/Build/iOS/LoopKit.framework/GlucoseRangeTableViewCell.nib and b/Carthage/Build/iOS/LoopKit.framework/GlucoseRangeTableViewCell.nib differ diff --git a/Carthage/Build/iOS/LoopKit.framework/Info.plist b/Carthage/Build/iOS/LoopKit.framework/Info.plist index b4a65224f0..9b9327b7d7 100644 Binary files a/Carthage/Build/iOS/LoopKit.framework/Info.plist and b/Carthage/Build/iOS/LoopKit.framework/Info.plist differ diff --git a/Carthage/Build/iOS/LoopKit.framework/LoopKit b/Carthage/Build/iOS/LoopKit.framework/LoopKit index ef92f1586d..b0abe7f8fc 100755 Binary files a/Carthage/Build/iOS/LoopKit.framework/LoopKit and b/Carthage/Build/iOS/LoopKit.framework/LoopKit differ diff --git a/Carthage/Build/iOS/LoopKit.framework/Modules/LoopKit.swiftmodule/arm.swiftmodule b/Carthage/Build/iOS/LoopKit.framework/Modules/LoopKit.swiftmodule/arm.swiftmodule index 4a4c21de17..9645d5cee2 100644 Binary files a/Carthage/Build/iOS/LoopKit.framework/Modules/LoopKit.swiftmodule/arm.swiftmodule and b/Carthage/Build/iOS/LoopKit.framework/Modules/LoopKit.swiftmodule/arm.swiftmodule differ diff --git a/Carthage/Build/iOS/LoopKit.framework/Modules/LoopKit.swiftmodule/arm64.swiftmodule b/Carthage/Build/iOS/LoopKit.framework/Modules/LoopKit.swiftmodule/arm64.swiftmodule index eddd242b3e..8063921429 100644 Binary files a/Carthage/Build/iOS/LoopKit.framework/Modules/LoopKit.swiftmodule/arm64.swiftmodule and b/Carthage/Build/iOS/LoopKit.framework/Modules/LoopKit.swiftmodule/arm64.swiftmodule differ diff --git a/Carthage/Build/iOS/LoopKit.framework/Modules/LoopKit.swiftmodule/i386.swiftmodule b/Carthage/Build/iOS/LoopKit.framework/Modules/LoopKit.swiftmodule/i386.swiftmodule index 1515401b43..57de2d9585 100644 Binary files a/Carthage/Build/iOS/LoopKit.framework/Modules/LoopKit.swiftmodule/i386.swiftmodule and b/Carthage/Build/iOS/LoopKit.framework/Modules/LoopKit.swiftmodule/i386.swiftmodule differ diff --git a/Carthage/Build/iOS/LoopKit.framework/Modules/LoopKit.swiftmodule/x86_64.swiftmodule b/Carthage/Build/iOS/LoopKit.framework/Modules/LoopKit.swiftmodule/x86_64.swiftmodule index e1e04d798a..acffdbbdcc 100644 Binary files a/Carthage/Build/iOS/LoopKit.framework/Modules/LoopKit.swiftmodule/x86_64.swiftmodule and b/Carthage/Build/iOS/LoopKit.framework/Modules/LoopKit.swiftmodule/x86_64.swiftmodule differ diff --git a/Carthage/Build/iOS/LoopKit.framework/RepeatingScheduleValueTableViewCell.nib b/Carthage/Build/iOS/LoopKit.framework/RepeatingScheduleValueTableViewCell.nib index 07bbbd149b..b0c1883ef0 100644 Binary files a/Carthage/Build/iOS/LoopKit.framework/RepeatingScheduleValueTableViewCell.nib and b/Carthage/Build/iOS/LoopKit.framework/RepeatingScheduleValueTableViewCell.nib differ diff --git a/Carthage/Build/iOS/LoopKit.framework/TextFieldTableViewCell.nib b/Carthage/Build/iOS/LoopKit.framework/TextFieldTableViewCell.nib index 459ca6de54..0620113989 100644 Binary files a/Carthage/Build/iOS/LoopKit.framework/TextFieldTableViewCell.nib and b/Carthage/Build/iOS/LoopKit.framework/TextFieldTableViewCell.nib differ diff --git a/Carthage/Build/iOS/MinimedKit.framework/Info.plist b/Carthage/Build/iOS/MinimedKit.framework/Info.plist index bb9aeeda03..e0b16025b2 100644 Binary files a/Carthage/Build/iOS/MinimedKit.framework/Info.plist and b/Carthage/Build/iOS/MinimedKit.framework/Info.plist differ diff --git a/Carthage/Build/iOS/MinimedKit.framework/MinimedKit b/Carthage/Build/iOS/MinimedKit.framework/MinimedKit index 4a2e3d55aa..61990300b6 100755 Binary files a/Carthage/Build/iOS/MinimedKit.framework/MinimedKit and b/Carthage/Build/iOS/MinimedKit.framework/MinimedKit differ diff --git a/Carthage/Build/iOS/NightscoutUploadKit.framework/Info.plist b/Carthage/Build/iOS/NightscoutUploadKit.framework/Info.plist index 0dfc06fa6a..d1dcf50e01 100644 Binary files a/Carthage/Build/iOS/NightscoutUploadKit.framework/Info.plist and b/Carthage/Build/iOS/NightscoutUploadKit.framework/Info.plist differ diff --git a/Carthage/Build/iOS/NightscoutUploadKit.framework/NightscoutUploadKit b/Carthage/Build/iOS/NightscoutUploadKit.framework/NightscoutUploadKit index 44e074013c..99736a221c 100755 Binary files a/Carthage/Build/iOS/NightscoutUploadKit.framework/NightscoutUploadKit and b/Carthage/Build/iOS/NightscoutUploadKit.framework/NightscoutUploadKit differ diff --git a/Carthage/Build/iOS/RileyLinkBLEKit.framework/Info.plist b/Carthage/Build/iOS/RileyLinkBLEKit.framework/Info.plist index 2b0bae0ff4..9cd3f65a4a 100644 Binary files a/Carthage/Build/iOS/RileyLinkBLEKit.framework/Info.plist and b/Carthage/Build/iOS/RileyLinkBLEKit.framework/Info.plist differ diff --git a/Carthage/Build/iOS/RileyLinkBLEKit.framework/RileyLinkBLEKit b/Carthage/Build/iOS/RileyLinkBLEKit.framework/RileyLinkBLEKit index 31852f8bf0..e5a9289b4f 100755 Binary files a/Carthage/Build/iOS/RileyLinkBLEKit.framework/RileyLinkBLEKit and b/Carthage/Build/iOS/RileyLinkBLEKit.framework/RileyLinkBLEKit differ diff --git a/Carthage/Build/iOS/RileyLinkKit.framework/Info.plist b/Carthage/Build/iOS/RileyLinkKit.framework/Info.plist index 079fc4b21f..6338520853 100644 Binary files a/Carthage/Build/iOS/RileyLinkKit.framework/Info.plist and b/Carthage/Build/iOS/RileyLinkKit.framework/Info.plist differ diff --git a/Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/arm.swiftmodule b/Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/arm.swiftmodule index 4433eaad97..6f63d2d8a5 100644 Binary files a/Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/arm.swiftmodule and b/Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/arm.swiftmodule differ diff --git a/Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/arm64.swiftmodule b/Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/arm64.swiftmodule index 9337d5aefa..318c6d54a8 100644 Binary files a/Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/arm64.swiftmodule and b/Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/arm64.swiftmodule differ diff --git a/Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/i386.swiftmodule b/Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/i386.swiftmodule index 6685d7fbdb..96c0d74330 100644 Binary files a/Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/i386.swiftmodule and b/Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/i386.swiftmodule differ diff --git a/Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/x86_64.swiftmodule b/Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/x86_64.swiftmodule index b595496e69..19391a40e5 100644 Binary files a/Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/x86_64.swiftmodule and b/Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/x86_64.swiftmodule differ diff --git a/Carthage/Build/iOS/RileyLinkKit.framework/RileyLinkDeviceTableViewCell.nib b/Carthage/Build/iOS/RileyLinkKit.framework/RileyLinkDeviceTableViewCell.nib index 0d1a4a97ca..6734779794 100644 Binary files a/Carthage/Build/iOS/RileyLinkKit.framework/RileyLinkDeviceTableViewCell.nib and b/Carthage/Build/iOS/RileyLinkKit.framework/RileyLinkDeviceTableViewCell.nib differ diff --git a/Carthage/Build/iOS/RileyLinkKit.framework/RileyLinkKit b/Carthage/Build/iOS/RileyLinkKit.framework/RileyLinkKit index fccb0ed451..54f670502f 100755 Binary files a/Carthage/Build/iOS/RileyLinkKit.framework/RileyLinkKit and b/Carthage/Build/iOS/RileyLinkKit.framework/RileyLinkKit differ diff --git a/Carthage/Build/iOS/RileyLinkKit.framework/TextFieldTableViewCell.nib b/Carthage/Build/iOS/RileyLinkKit.framework/TextFieldTableViewCell.nib index 62a57e4bc2..1c37bc4821 100644 Binary files a/Carthage/Build/iOS/RileyLinkKit.framework/TextFieldTableViewCell.nib and b/Carthage/Build/iOS/RileyLinkKit.framework/TextFieldTableViewCell.nib differ diff --git a/Documentation/Screenshots/Phone Bolus.png b/Documentation/Screenshots/Phone Bolus.png old mode 100755 new mode 100644 index c42a0f66be..6a3d49af7f Binary files a/Documentation/Screenshots/Phone Bolus.png and b/Documentation/Screenshots/Phone Bolus.png differ diff --git a/Documentation/Screenshots/Phone Graphs.png b/Documentation/Screenshots/Phone Graphs.png old mode 100644 new mode 100755 index dc84c5b13c..ead32d57a9 Binary files a/Documentation/Screenshots/Phone Graphs.png and b/Documentation/Screenshots/Phone Graphs.png differ diff --git a/Documentation/Screenshots/Phone Notification Bolus Failure.png b/Documentation/Screenshots/Phone Notification Bolus Failure.png old mode 100755 new mode 100644 index 8f51a6585d..20bb82f02c Binary files a/Documentation/Screenshots/Phone Notification Bolus Failure.png and b/Documentation/Screenshots/Phone Notification Bolus Failure.png differ diff --git a/DoseMathTests/Info.plist b/DoseMathTests/Info.plist index 1b43d10edc..ba72822e87 100644 --- a/DoseMathTests/Info.plist +++ b/DoseMathTests/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType BNDL CFBundleShortVersionString - 1.0rc1 + 1.0 CFBundleSignature ???? CFBundleVersion diff --git a/Loop.xcodeproj/project.pbxproj b/Loop.xcodeproj/project.pbxproj index a98efa4269..56d7356253 100644 --- a/Loop.xcodeproj/project.pbxproj +++ b/Loop.xcodeproj/project.pbxproj @@ -1226,7 +1226,7 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = "iPhone Developer: loudnate@gmail.com (XZN842LDLT)"; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 26; + CURRENT_PROJECT_VERSION = 27; DEBUG_INFORMATION_FORMAT = dwarf; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; @@ -1278,7 +1278,7 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = "iPhone Developer: loudnate@gmail.com (XZN842LDLT)"; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 26; + CURRENT_PROJECT_VERSION = 27; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; diff --git a/Loop/Info.plist b/Loop/Info.plist index 382a20f5e8..e58f7fbbcc 100644 --- a/Loop/Info.plist +++ b/Loop/Info.plist @@ -19,7 +19,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.0rc1 + 1.0 CFBundleSignature ???? CFBundleVersion diff --git a/Loop/Managers/DeviceDataManager.swift b/Loop/Managers/DeviceDataManager.swift index dbaa66f920..98ea0db579 100644 --- a/Loop/Managers/DeviceDataManager.swift +++ b/Loop/Managers/DeviceDataManager.swift @@ -118,6 +118,10 @@ final class DeviceDataManager: CarbStoreDelegate, DoseStoreDelegate, Transmitter } } + /// Controls the management of the RileyLink timer tick, which is a reliably-changing BLE + /// characteristic which can cause the app to wake. For most users, the G5 Transmitter and + /// G4 Receiver are reliable as hearbeats, but users who find their resources extremely constrained + /// due to greedy apps or older devices may choose to always enable the timer by always setting `true` private func enableRileyLinkHeartbeatIfNeeded() { if transmitter != nil { rileyLinkManager.timerTickEnabled = false diff --git a/Loop/View Controllers/SettingsTableViewController.swift b/Loop/View Controllers/SettingsTableViewController.swift index db90f39cc2..fba78127e0 100644 --- a/Loop/View Controllers/SettingsTableViewController.swift +++ b/Loop/View Controllers/SettingsTableViewController.swift @@ -246,8 +246,11 @@ final class SettingsTableViewController: UITableViewController, DailyValueSchedu if let insulinActionDuration = dataManager.insulinActionDuration { let formatter = DateComponentsFormatter() + formatter.unitsStyle = .abbreviated + // Seems to have no effect. + // http://stackoverflow.com/questions/32522965/what-am-i-doing-wrong-with-allowsfractionalunits-on-nsdatecomponentsformatter formatter.allowsFractionalUnits = true - formatter.allowedUnits = [.hour] + // formatter.allowedUnits = [.hour] configCell.detailTextLabel?.text = formatter.string(from: insulinActionDuration) } else { diff --git a/Loop/View Controllers/StatusTableViewController.swift b/Loop/View Controllers/StatusTableViewController.swift index 786718da69..6eae7be5f4 100644 --- a/Loop/View Controllers/StatusTableViewController.swift +++ b/Loop/View Controllers/StatusTableViewController.swift @@ -782,9 +782,9 @@ final class StatusTableViewController: UITableViewController, UIGestureRecognize // MARK: - HUDs - @IBOutlet var loopCompletionHUD: LoopCompletionHUDView! + @IBOutlet weak var loopCompletionHUD: LoopCompletionHUDView! - @IBOutlet var glucoseHUD: GlucoseHUDView! { + @IBOutlet weak var glucoseHUD: GlucoseHUDView! { didSet { let tapGestureRecognizer = UITapGestureRecognizer(target: self, action: #selector(openCGMApp(_:))) glucoseHUD.addGestureRecognizer(tapGestureRecognizer) @@ -811,9 +811,9 @@ final class StatusTableViewController: UITableViewController, UIGestureRecognize } } - @IBOutlet var basalRateHUD: BasalRateHUDView! + @IBOutlet weak var basalRateHUD: BasalRateHUDView! - @IBOutlet var reservoirVolumeHUD: ReservoirVolumeHUDView! + @IBOutlet weak var reservoirVolumeHUD: ReservoirVolumeHUDView! - @IBOutlet var batteryLevelHUD: BatteryLevelHUDView! + @IBOutlet weak var batteryLevelHUD: BatteryLevelHUDView! } diff --git a/Loop/Views/AuthenticationTableViewCell.xib b/Loop/Views/AuthenticationTableViewCell.xib index 8114146a9c..767707a222 100644 --- a/Loop/Views/AuthenticationTableViewCell.xib +++ b/Loop/Views/AuthenticationTableViewCell.xib @@ -1,9 +1,10 @@ - - + + - + + @@ -12,20 +13,18 @@ - + - diff --git a/Loop/Views/BasalRateHUDView.swift b/Loop/Views/BasalRateHUDView.swift index 23fa1ded48..b11945e34c 100644 --- a/Loop/Views/BasalRateHUDView.swift +++ b/Loop/Views/BasalRateHUDView.swift @@ -11,9 +11,9 @@ import UIKit final class BasalRateHUDView: HUDView { - @IBOutlet private var basalStateView: BasalStateView! + @IBOutlet private weak var basalStateView: BasalStateView! - @IBOutlet private var basalRateLabel: UILabel! { + @IBOutlet private weak var basalRateLabel: UILabel! { didSet { basalRateLabel?.text = String(format: basalRateFormatString, "–") basalRateLabel?.textColor = .doseTintColor diff --git a/Loop/Views/BatteryLevelHUDView.swift b/Loop/Views/BatteryLevelHUDView.swift index c90863fa0d..a4f1fbee6b 100644 --- a/Loop/Views/BatteryLevelHUDView.swift +++ b/Loop/Views/BatteryLevelHUDView.swift @@ -11,7 +11,7 @@ import UIKit final class BatteryLevelHUDView: HUDView { - @IBOutlet private var levelMaskView: LevelMaskView! + @IBOutlet private weak var levelMaskView: LevelMaskView! override func awakeFromNib() { super.awakeFromNib() diff --git a/Loop/Views/ChartTableViewCell.swift b/Loop/Views/ChartTableViewCell.swift index fe0a60d6f8..295c8ca202 100644 --- a/Loop/Views/ChartTableViewCell.swift +++ b/Loop/Views/ChartTableViewCell.swift @@ -11,11 +11,11 @@ import UIKit final class ChartTableViewCell: UITableViewCell { - @IBOutlet var chartContentView: ChartContentView! + @IBOutlet weak var chartContentView: ChartContentView! - @IBOutlet var titleLabel: UILabel? + @IBOutlet weak var titleLabel: UILabel? - @IBOutlet var subtitleLabel: UILabel? + @IBOutlet weak var subtitleLabel: UILabel? override func prepareForReuse() { super.prepareForReuse() diff --git a/Loop/Views/GlucoseHUDView.swift b/Loop/Views/GlucoseHUDView.swift index ce3c8e539f..e058783140 100644 --- a/Loop/Views/GlucoseHUDView.swift +++ b/Loop/Views/GlucoseHUDView.swift @@ -13,21 +13,21 @@ import HealthKit final class GlucoseHUDView: HUDView { - @IBOutlet private var unitLabel: UILabel! { + @IBOutlet private weak var unitLabel: UILabel! { didSet { unitLabel.text = "–" unitLabel.textColor = .glucoseTintColor } } - @IBOutlet private var glucoseLabel: UILabel! { + @IBOutlet private weak var glucoseLabel: UILabel! { didSet { glucoseLabel.text = "–" glucoseLabel.textColor = .glucoseTintColor } } - @IBOutlet private var alertLabel: UILabel! { + @IBOutlet private weak var alertLabel: UILabel! { didSet { alertLabel.alpha = 0 alertLabel.backgroundColor = UIColor.agingColor diff --git a/Loop/Views/HUDView.swift b/Loop/Views/HUDView.swift index 4e33235fa7..1c741cf980 100644 --- a/Loop/Views/HUDView.swift +++ b/Loop/Views/HUDView.swift @@ -10,7 +10,7 @@ import UIKit class HUDView: UIView { - @IBOutlet var caption: UILabel! { + @IBOutlet weak var caption: UILabel! { didSet { caption?.text = "—" } diff --git a/Loop/Views/LoopCompletionHUDView.swift b/Loop/Views/LoopCompletionHUDView.swift index dc2b3edb89..1fc73dd6d6 100644 --- a/Loop/Views/LoopCompletionHUDView.swift +++ b/Loop/Views/LoopCompletionHUDView.swift @@ -10,7 +10,7 @@ import UIKit final class LoopCompletionHUDView: HUDView { - @IBOutlet private var loopStateView: LoopStateView! + @IBOutlet private weak var loopStateView: LoopStateView! override func awakeFromNib() { super.awakeFromNib() diff --git a/Loop/Views/ReservoirVolumeHUDView.swift b/Loop/Views/ReservoirVolumeHUDView.swift index 8504b987d6..d825af2507 100644 --- a/Loop/Views/ReservoirVolumeHUDView.swift +++ b/Loop/Views/ReservoirVolumeHUDView.swift @@ -10,9 +10,9 @@ import UIKit final class ReservoirVolumeHUDView: HUDView { - @IBOutlet private var levelMaskView: LevelMaskView! + @IBOutlet private weak var levelMaskView: LevelMaskView! - @IBOutlet private var volumeLabel: UILabel! + @IBOutlet private weak var volumeLabel: UILabel! override func awakeFromNib() { super.awakeFromNib() diff --git a/Loop/Views/SwitchTableViewCell.swift b/Loop/Views/SwitchTableViewCell.swift index 9d45a292bb..0e39d762cc 100644 --- a/Loop/Views/SwitchTableViewCell.swift +++ b/Loop/Views/SwitchTableViewCell.swift @@ -15,7 +15,7 @@ final class SwitchTableViewCell: UITableViewCell { @IBOutlet weak var subtitleLabel: UILabel? - @IBOutlet var `switch`: UISwitch? + @IBOutlet weak var `switch`: UISwitch? override func layoutSubviews() { super.layoutSubviews() diff --git a/LoopTests/Info.plist b/LoopTests/Info.plist index 1b43d10edc..ba72822e87 100644 --- a/LoopTests/Info.plist +++ b/LoopTests/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType BNDL CFBundleShortVersionString - 1.0rc1 + 1.0 CFBundleSignature ???? CFBundleVersion diff --git a/WatchApp Extension/Controllers/AddCarbsInterfaceController.swift b/WatchApp Extension/Controllers/AddCarbsInterfaceController.swift index f4c84a9157..1ac3c89faa 100644 --- a/WatchApp Extension/Controllers/AddCarbsInterfaceController.swift +++ b/WatchApp Extension/Controllers/AddCarbsInterfaceController.swift @@ -45,13 +45,13 @@ final class AddCarbsInterfaceController: WKInterfaceController, IdentifiableClas } } - @IBOutlet var valueLabel: WKInterfaceLabel! + @IBOutlet weak var valueLabel: WKInterfaceLabel! - @IBOutlet var absorptionButtonA: WKInterfaceButton! + @IBOutlet weak var absorptionButtonA: WKInterfaceButton! - @IBOutlet var absorptionButtonB: WKInterfaceButton! + @IBOutlet weak var absorptionButtonB: WKInterfaceButton! - @IBOutlet var absorptionButtonC: WKInterfaceButton! + @IBOutlet weak var absorptionButtonC: WKInterfaceButton! override func awake(withContext context: Any?) { super.awake(withContext: context) diff --git a/WatchApp Extension/Controllers/BolusInterfaceController.swift b/WatchApp Extension/Controllers/BolusInterfaceController.swift index 34931d463d..0dfd6a2444 100644 --- a/WatchApp Extension/Controllers/BolusInterfaceController.swift +++ b/WatchApp Extension/Controllers/BolusInterfaceController.swift @@ -73,10 +73,10 @@ final class BolusInterfaceController: WKInterfaceController, IdentifiableClass { private var maxPickerValue = 0 /// 1.25 - @IBOutlet var valueLabel: WKInterfaceLabel! + @IBOutlet weak var valueLabel: WKInterfaceLabel! /// REC: 2.25 U - @IBOutlet var recommendedValueLabel: WKInterfaceLabel! + @IBOutlet weak var recommendedValueLabel: WKInterfaceLabel! override func awake(withContext context: Any?) { super.awake(withContext: context) diff --git a/WatchApp Extension/Controllers/StatusInterfaceController.swift b/WatchApp Extension/Controllers/StatusInterfaceController.swift index a5771c4bc6..2da4b29324 100644 --- a/WatchApp Extension/Controllers/StatusInterfaceController.swift +++ b/WatchApp Extension/Controllers/StatusInterfaceController.swift @@ -12,12 +12,12 @@ import Foundation final class StatusInterfaceController: WKInterfaceController, ContextUpdatable { - @IBOutlet var graphImage: WKInterfaceImage! - @IBOutlet var loopHUDImage: WKInterfaceImage! - @IBOutlet var loopTimer: WKInterfaceTimer! - @IBOutlet var glucoseLabel: WKInterfaceLabel! - @IBOutlet var eventualGlucoseLabel: WKInterfaceLabel! - @IBOutlet var statusLabel: WKInterfaceLabel! + @IBOutlet weak var graphImage: WKInterfaceImage! + @IBOutlet weak var loopHUDImage: WKInterfaceImage! + @IBOutlet weak var loopTimer: WKInterfaceTimer! + @IBOutlet weak var glucoseLabel: WKInterfaceLabel! + @IBOutlet weak var eventualGlucoseLabel: WKInterfaceLabel! + @IBOutlet weak var statusLabel: WKInterfaceLabel! private var lastContext: WatchContext? diff --git a/WatchApp Extension/Info.plist b/WatchApp Extension/Info.plist index 87372e745f..3c3e6ebe08 100644 --- a/WatchApp Extension/Info.plist +++ b/WatchApp Extension/Info.plist @@ -17,7 +17,7 @@ CFBundlePackageType XPC! CFBundleShortVersionString - 1.0rc1 + 1.0 CFBundleSignature ???? CFBundleVersion diff --git a/WatchApp/Info.plist b/WatchApp/Info.plist index e095c4757e..b5e144acf2 100644 --- a/WatchApp/Info.plist +++ b/WatchApp/Info.plist @@ -17,7 +17,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.0rc1 + 1.0 CFBundleSignature ???? CFBundleVersion