diff --git a/Cartfile b/Cartfile index a4c58f95bf..7297cae631 100644 --- a/Cartfile +++ b/Cartfile @@ -3,5 +3,5 @@ github "loudnate/xDripG5" ~> 0.7.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.2 +github "ps2/rileylink_ios" ~> 0.12.3 github "amplitude/Amplitude-iOS" ~> 3.8.5 diff --git a/Cartfile.resolved b/Cartfile.resolved index 183f0f3bf6..47057d27e5 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -3,5 +3,5 @@ github "mddub/G4ShareSpy" "v0.3.0" github "loudnate/LoopKit" "v0.8.0" github "i-schuetz/SwiftCharts" "0.5" github "mddub/dexcom-share-client-swift" "v0.2.0" -github "ps2/rileylink_ios" "v0.12.2" +github "ps2/rileylink_ios" "v0.12.3" github "loudnate/xDripG5" "v0.7.0" diff --git a/Carthage/Build/iOS/Crypto.framework/Crypto b/Carthage/Build/iOS/Crypto.framework/Crypto index 57c5e405fc..c11ace80b4 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 2828a8cf16..795171099a 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/MinimedKit.framework/Info.plist b/Carthage/Build/iOS/MinimedKit.framework/Info.plist index bd5fa5c751..75b345dfc4 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 a22b6e3f18..3fbf4cf451 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/MinimedKit.framework/Modules/MinimedKit.swiftmodule/arm.swiftmodule b/Carthage/Build/iOS/MinimedKit.framework/Modules/MinimedKit.swiftmodule/arm.swiftmodule index 8b2439db3c..252917f3f6 100644 Binary files a/Carthage/Build/iOS/MinimedKit.framework/Modules/MinimedKit.swiftmodule/arm.swiftmodule and b/Carthage/Build/iOS/MinimedKit.framework/Modules/MinimedKit.swiftmodule/arm.swiftmodule differ diff --git a/Carthage/Build/iOS/MinimedKit.framework/Modules/MinimedKit.swiftmodule/arm64.swiftmodule b/Carthage/Build/iOS/MinimedKit.framework/Modules/MinimedKit.swiftmodule/arm64.swiftmodule index 43e1687307..3a110a1453 100644 Binary files a/Carthage/Build/iOS/MinimedKit.framework/Modules/MinimedKit.swiftmodule/arm64.swiftmodule and b/Carthage/Build/iOS/MinimedKit.framework/Modules/MinimedKit.swiftmodule/arm64.swiftmodule differ diff --git a/Carthage/Build/iOS/MinimedKit.framework/Modules/MinimedKit.swiftmodule/i386.swiftmodule b/Carthage/Build/iOS/MinimedKit.framework/Modules/MinimedKit.swiftmodule/i386.swiftmodule index 220a411eb1..e781162f51 100644 Binary files a/Carthage/Build/iOS/MinimedKit.framework/Modules/MinimedKit.swiftmodule/i386.swiftmodule and b/Carthage/Build/iOS/MinimedKit.framework/Modules/MinimedKit.swiftmodule/i386.swiftmodule differ diff --git a/Carthage/Build/iOS/MinimedKit.framework/Modules/MinimedKit.swiftmodule/x86_64.swiftmodule b/Carthage/Build/iOS/MinimedKit.framework/Modules/MinimedKit.swiftmodule/x86_64.swiftmodule index 9c6c62d6d8..dd3d76fcf0 100644 Binary files a/Carthage/Build/iOS/MinimedKit.framework/Modules/MinimedKit.swiftmodule/x86_64.swiftmodule and b/Carthage/Build/iOS/MinimedKit.framework/Modules/MinimedKit.swiftmodule/x86_64.swiftmodule differ diff --git a/Carthage/Build/iOS/NightscoutUploadKit.framework/Info.plist b/Carthage/Build/iOS/NightscoutUploadKit.framework/Info.plist index db24e50d38..6e63e627bd 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/Modules/NightscoutUploadKit.swiftmodule/arm.swiftmodule b/Carthage/Build/iOS/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/arm.swiftmodule index 34ac08fe47..c287aa837d 100644 Binary files a/Carthage/Build/iOS/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/arm.swiftmodule and b/Carthage/Build/iOS/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/arm.swiftmodule differ diff --git a/Carthage/Build/iOS/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/arm64.swiftmodule b/Carthage/Build/iOS/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/arm64.swiftmodule index 697cbe4114..177889fa77 100644 Binary files a/Carthage/Build/iOS/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/arm64.swiftmodule and b/Carthage/Build/iOS/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/arm64.swiftmodule differ diff --git a/Carthage/Build/iOS/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/i386.swiftmodule b/Carthage/Build/iOS/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/i386.swiftmodule index 76ace30aee..0653dd1ba4 100644 Binary files a/Carthage/Build/iOS/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/i386.swiftmodule and b/Carthage/Build/iOS/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/i386.swiftmodule differ diff --git a/Carthage/Build/iOS/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/x86_64.swiftmodule b/Carthage/Build/iOS/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/x86_64.swiftmodule index 298de9ee81..1088102d8c 100644 Binary files a/Carthage/Build/iOS/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/x86_64.swiftmodule and b/Carthage/Build/iOS/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/x86_64.swiftmodule differ diff --git a/Carthage/Build/iOS/NightscoutUploadKit.framework/NightscoutUploadKit b/Carthage/Build/iOS/NightscoutUploadKit.framework/NightscoutUploadKit index 7203f67b6b..658c152b4a 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/Headers/RileyLinkBLEDevice.h b/Carthage/Build/iOS/RileyLinkBLEKit.framework/Headers/RileyLinkBLEDevice.h index 41cd909758..a21b9471f6 100644 --- a/Carthage/Build/iOS/RileyLinkBLEKit.framework/Headers/RileyLinkBLEDevice.h +++ b/Carthage/Build/iOS/RileyLinkBLEKit.framework/Headers/RileyLinkBLEDevice.h @@ -76,6 +76,8 @@ typedef NS_ENUM(NSUInteger, SubgRfspyVersionState) { @property (nonatomic, readonly) SubgRfspyVersionState firmwareState; +@property (nonatomic, readonly, nullable) NSString *bleFirmwareVersion; + @property (nonatomic, readonly, nullable) NSDate *lastIdle; @property (nonatomic) BOOL timerTickEnabled; diff --git a/Carthage/Build/iOS/RileyLinkBLEKit.framework/Headers/RileyLinkBLEManager.h b/Carthage/Build/iOS/RileyLinkBLEKit.framework/Headers/RileyLinkBLEManager.h index 0451eda3ed..e7d2d4601c 100644 --- a/Carthage/Build/iOS/RileyLinkBLEKit.framework/Headers/RileyLinkBLEManager.h +++ b/Carthage/Build/iOS/RileyLinkBLEKit.framework/Headers/RileyLinkBLEManager.h @@ -20,11 +20,12 @@ #define RILEYLINK_EVENT_RSSI_CHANGED @"RILEYLINK_EVENT_RSSI_CHANGED" #define RILEYLINK_EVENT_NAME_CHANGED @"RILEYLINK_EVENT_NAME_CHANGED" -#define RILEYLINK_SERVICE_UUID @"0235733b-99c5-4197-b856-69219c2a3845" -#define RILEYLINK_DATA_UUID @"c842e849-5028-42e2-867c-016adada9155" -#define RILEYLINK_RESPONSE_COUNT_UUID @"6e6c7910-b89e-43a5-a0fe-50c5e2b81f4a" -#define RILEYLINK_CUSTOM_NAME_UUID @"d93b2af0-1e28-11e4-8c21-0800200c9a66" -#define RILEYLINK_TIMER_TICK_UUID @"6e6c7910-b89e-43a5-78af-50c5e2b86f7e" +#define RILEYLINK_SERVICE_UUID @"0235733b-99c5-4197-b856-69219c2a3845" +#define RILEYLINK_DATA_UUID @"c842e849-5028-42e2-867c-016adada9155" +#define RILEYLINK_RESPONSE_COUNT_UUID @"6e6c7910-b89e-43a5-a0fe-50c5e2b81f4a" +#define RILEYLINK_CUSTOM_NAME_UUID @"d93b2af0-1e28-11e4-8c21-0800200c9a66" +#define RILEYLINK_TIMER_TICK_UUID @"6e6c7910-b89e-43a5-78af-50c5e2b86f7e" +#define RILEYLINK_FIRMWARE_VERSION_UUID @"30d99dc9-7c91-4295-a051-0a104d238cf2" @interface RileyLinkBLEManager : NSObject diff --git a/Carthage/Build/iOS/RileyLinkBLEKit.framework/Info.plist b/Carthage/Build/iOS/RileyLinkBLEKit.framework/Info.plist index 6a9899c6b4..6c547b4c3e 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 05fb3f13d8..9e6bfbcdd1 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 9323b1a019..17f64a3324 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 022a9614d7..b8884c17c4 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 41a8b24449..9918d42530 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 52ee0a5f41..b386d6c601 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 ce219c5a64..6311c3fea0 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 3c09caa0ca..b4b02983b5 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 e708c96400..0acb4dc2ae 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 54a4469bcc..8b4b8f79c0 100644 Binary files a/Carthage/Build/iOS/RileyLinkKit.framework/TextFieldTableViewCell.nib and b/Carthage/Build/iOS/RileyLinkKit.framework/TextFieldTableViewCell.nib differ diff --git a/Loop.xcodeproj/project.pbxproj b/Loop.xcodeproj/project.pbxproj index a425921ece..803e6148e0 100644 --- a/Loop.xcodeproj/project.pbxproj +++ b/Loop.xcodeproj/project.pbxproj @@ -70,6 +70,7 @@ 437CEECA1CD84DB7003C8C80 /* BatteryLevelHUDView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 437CEEC91CD84DB7003C8C80 /* BatteryLevelHUDView.swift */; }; 437CEEE41CDE5C0A003C8C80 /* UIImage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 437CEEE31CDE5C0A003C8C80 /* UIImage.swift */; }; 437D9BA31D7BC977007245E8 /* PredictionTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 437D9BA21D7BC977007245E8 /* PredictionTableViewController.swift */; }; + 43880F951D9CD54A009061A8 /* ChartPointsScatterDownTrianglesLayer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43880F941D9CD54A009061A8 /* ChartPointsScatterDownTrianglesLayer.swift */; }; 438849EA1D297CB6003B3F23 /* NightscoutService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 438849E91D297CB6003B3F23 /* NightscoutService.swift */; }; 438849EC1D29EC34003B3F23 /* AmplitudeService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 438849EB1D29EC34003B3F23 /* AmplitudeService.swift */; }; 438849EE1D2A1EBB003B3F23 /* MLabService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 438849ED1D2A1EBB003B3F23 /* MLabService.swift */; }; @@ -141,6 +142,7 @@ 43F5173D1D713DB0000FA422 /* RadioSelectionTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43F5173C1D713DB0000FA422 /* RadioSelectionTableViewController.swift */; }; 43F5C2C91B929C09003EB13D /* HealthKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 43F5C2C81B929C09003EB13D /* HealthKit.framework */; }; 43F5C2DB1B92A5E1003EB13D /* SettingsTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43F5C2DA1B92A5E1003EB13D /* SettingsTableViewController.swift */; }; + 43F64DD91D9C92C900D24DC6 /* TitleSubtitleTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43F64DD81D9C92C900D24DC6 /* TitleSubtitleTableViewCell.swift */; }; 43F78D261C8FC000002152D1 /* DoseMath.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43F78D251C8FC000002152D1 /* DoseMath.swift */; }; 43F78D4C1C914197002152D1 /* CarbKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 43F78D481C914197002152D1 /* CarbKit.framework */; }; 43F78D4D1C914197002152D1 /* GlucoseKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 43F78D491C914197002152D1 /* GlucoseKit.framework */; }; @@ -297,6 +299,7 @@ 437CEEE31CDE5C0A003C8C80 /* UIImage.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UIImage.swift; sourceTree = ""; }; 437D9BA11D7B5203007245E8 /* Loop.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Loop.xcconfig; sourceTree = ""; }; 437D9BA21D7BC977007245E8 /* PredictionTableViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PredictionTableViewController.swift; sourceTree = ""; }; + 43880F941D9CD54A009061A8 /* ChartPointsScatterDownTrianglesLayer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ChartPointsScatterDownTrianglesLayer.swift; sourceTree = ""; }; 438849E91D297CB6003B3F23 /* NightscoutService.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NightscoutService.swift; sourceTree = ""; }; 438849EB1D29EC34003B3F23 /* AmplitudeService.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AmplitudeService.swift; sourceTree = ""; }; 438849ED1D2A1EBB003B3F23 /* MLabService.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MLabService.swift; sourceTree = ""; }; @@ -370,6 +373,7 @@ 43F5C2D41B92A4A6003EB13D /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 43F5C2D61B92A4DC003EB13D /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 43F5C2DA1B92A5E1003EB13D /* SettingsTableViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = SettingsTableViewController.swift; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.swift; }; + 43F64DD81D9C92C900D24DC6 /* TitleSubtitleTableViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TitleSubtitleTableViewCell.swift; sourceTree = ""; }; 43F78D251C8FC000002152D1 /* DoseMath.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DoseMath.swift; sourceTree = ""; }; 43F78D481C914197002152D1 /* CarbKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CarbKit.framework; path = Carthage/Build/iOS/CarbKit.framework; sourceTree = ""; }; 43F78D491C914197002152D1 /* GlucoseKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GlucoseKit.framework; path = Carthage/Build/iOS/GlucoseKit.framework; sourceTree = ""; }; @@ -466,23 +470,18 @@ 43757D131C06F26C00910CB9 /* Models */ = { isa = PBXGroup; children = ( + 43880F961D9D8052009061A8 /* ServiceAuthentication */, 43DE92601C555C26001FFDE1 /* AbsorptionTimeType+CarbKit.swift */, - 438849EB1D29EC34003B3F23 /* AmplitudeService.swift */, 4331E0791C85650D00FBE832 /* ChartAxisValueDoubleLog.swift */, 43F41C321D3A17AA00C11ED6 /* ChartAxisValueDoubleUnit.swift */, 43E397A21D56B9E40028E321 /* Glucose.swift */, 4D5B7A4A1D457CCA00796CA9 /* GlucoseG4.swift */, 436FACED1D0BA636004E2427 /* InsulinDataSource.swift */, 436A0DA41D236A2A00104B24 /* LoopError.swift */, - 438849ED1D2A1EBB003B3F23 /* MLabService.swift */, 430DA58F1D4B0E4C0097D1CA /* MySentryPumpStatusMessageBody.swift */, - 438849E91D297CB6003B3F23 /* NightscoutService.swift */, 438D42F81D7C88BC003244B0 /* PredictionInputEffect.swift */, 43EA28611D517E42001BC233 /* SensorDisplayable.swift */, - 437CCADF1D285C7B0075D2C3 /* ServiceAuthentication.swift */, - 434F54601D28859B002A9274 /* ServiceCredential.swift */, 43C418B41CE0575200405B6A /* ShareGlucose+GlucoseKit.swift */, - 434F545E1D288345002A9274 /* ShareService.swift */, 4328E0311CFC068900E199AA /* WatchContext+LoopKit.swift */, ); path = Models; @@ -532,6 +531,19 @@ path = Loop; sourceTree = ""; }; + 43880F961D9D8052009061A8 /* ServiceAuthentication */ = { + isa = PBXGroup; + children = ( + 438849EB1D29EC34003B3F23 /* AmplitudeService.swift */, + 438849ED1D2A1EBB003B3F23 /* MLabService.swift */, + 438849E91D297CB6003B3F23 /* NightscoutService.swift */, + 437CCADF1D285C7B0075D2C3 /* ServiceAuthentication.swift */, + 434F54601D28859B002A9274 /* ServiceCredential.swift */, + 434F545E1D288345002A9274 /* ShareService.swift */, + ); + path = ServiceAuthentication; + sourceTree = ""; + }; 43A943731B926B7B0051FA24 /* WatchApp */ = { isa = PBXGroup; children = ( @@ -660,6 +672,7 @@ 437CCADB1D284B830075D2C3 /* ButtonTableViewCell.swift */, 434F54581D28805E002A9274 /* ButtonTableViewCell.xib */, 4313EDDF1D8A6BF90060FA79 /* ChartContentView.swift */, + 43880F941D9CD54A009061A8 /* ChartPointsScatterDownTrianglesLayer.swift */, 43F41C341D3B623800C11ED6 /* ChartPointsTouchHighlightLayerViewCache.swift */, 4346D1E61C77F5FE00ABAFE3 /* ChartTableViewCell.swift */, 4337615E1D52F487004A3647 /* GlucoseHUDView.swift */, @@ -670,6 +683,7 @@ 438D42FA1D7D11A4003244B0 /* PredictionInputEffectTableViewCell.swift */, 437CEEC71CD84CBB003C8C80 /* ReservoirVolumeHUDView.swift */, 43A5676A1C96155700334FAC /* SwitchTableViewCell.swift */, + 43F64DD81D9C92C900D24DC6 /* TitleSubtitleTableViewCell.swift */, 434F54621D28DD80002A9274 /* ValidatingIndicatorView.swift */, ); path = Views; @@ -1019,6 +1033,7 @@ 43E344A41B9E1B1C00C85C07 /* NSUserDefaults.swift in Sources */, 43649A631C7A347F00523D7F /* CollectionType.swift in Sources */, 437CEEBE1CD6E0CB003C8C80 /* LoopCompletionHUDView.swift in Sources */, + 43F64DD91D9C92C900D24DC6 /* TitleSubtitleTableViewCell.swift in Sources */, 43EA28621D517E42001BC233 /* SensorDisplayable.swift in Sources */, 435400321C9F745500D5819C /* BolusSuggestionUserInfo.swift in Sources */, 43E3449F1B9D68E900C85C07 /* StatusTableViewController.swift in Sources */, @@ -1074,6 +1089,7 @@ 4337615F1D52F487004A3647 /* GlucoseHUDView.swift in Sources */, 438849EE1D2A1EBB003B3F23 /* MLabService.swift in Sources */, 438D42FB1D7D11A4003244B0 /* PredictionInputEffectTableViewCell.swift in Sources */, + 43880F951D9CD54A009061A8 /* ChartPointsScatterDownTrianglesLayer.swift in Sources */, 43F4EF1D1BA2A57600526CE1 /* DiagnosticLogger.swift in Sources */, 432E73CB1D24B3D6009AD15D /* RemoteDataManager.swift in Sources */, 438DADC81CDE8F8B007697A5 /* LoopStateView.swift in Sources */, diff --git a/Loop/AppDelegate.swift b/Loop/AppDelegate.swift index 45b1404ba5..c0610119a1 100644 --- a/Loop/AppDelegate.swift +++ b/Loop/AppDelegate.swift @@ -15,6 +15,8 @@ final class AppDelegate: UIResponder, UIApplicationDelegate { var window: UIWindow? + private(set) lazy var dataManager = DeviceDataManager() + func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool { window?.tintColor = UIColor.tintColor @@ -22,6 +24,11 @@ final class AppDelegate: UIResponder, UIApplicationDelegate { AnalyticsManager.sharedManager.application(application, didFinishLaunchingWithOptions: launchOptions) + if let navVC = window?.rootViewController as? UINavigationController, + let statusVC = navVC.viewControllers.first as? StatusTableViewController { + statusVC.dataManager = dataManager + } + return true } @@ -42,7 +49,7 @@ final class AppDelegate: UIResponder, UIApplicationDelegate { func applicationDidBecomeActive(_ application: UIApplication) { // Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface. - DeviceDataManager.sharedManager.transmitter?.resumeScanning() + dataManager.transmitter?.resumeScanning() } func applicationWillTerminate(_ application: UIApplication) { @@ -73,9 +80,9 @@ final class AppDelegate: UIResponder, UIApplicationDelegate { { AnalyticsManager.sharedManager.didRetryBolus() - DeviceDataManager.sharedManager.enactBolus(units) { (error) in + dataManager.enactBolus(units) { (error) in if error != nil { - NotificationManager.sendBolusFailureNotificationForAmount(units, atDate: startDate) + NotificationManager.sendBolusFailureNotificationForAmount(units, atStartDate: startDate) } completionHandler() diff --git a/Loop/Assets.xcassets/AppIcon.appiconset/29@2x-1.png b/Loop/Assets.xcassets/AppIcon.appiconset/29@2x-1.png deleted file mode 100644 index 3fc4c0d779..0000000000 Binary files a/Loop/Assets.xcassets/AppIcon.appiconset/29@2x-1.png and /dev/null differ diff --git a/Loop/Assets.xcassets/AppIcon.appiconset/29@2x.png b/Loop/Assets.xcassets/AppIcon.appiconset/29@2x.png deleted file mode 100644 index f3754790dd..0000000000 Binary files a/Loop/Assets.xcassets/AppIcon.appiconset/29@2x.png and /dev/null differ diff --git a/Loop/Assets.xcassets/AppIcon.appiconset/29@3x.png b/Loop/Assets.xcassets/AppIcon.appiconset/29@3x.png deleted file mode 100644 index 3f89cfae4d..0000000000 Binary files a/Loop/Assets.xcassets/AppIcon.appiconset/29@3x.png and /dev/null differ diff --git a/Loop/Assets.xcassets/AppIcon.appiconset/40@1x.png b/Loop/Assets.xcassets/AppIcon.appiconset/40@1x.png deleted file mode 100644 index fda39d98e6..0000000000 Binary files a/Loop/Assets.xcassets/AppIcon.appiconset/40@1x.png and /dev/null differ diff --git a/Loop/Assets.xcassets/AppIcon.appiconset/40@2x-1.png b/Loop/Assets.xcassets/AppIcon.appiconset/40@2x-1.png deleted file mode 100644 index 183904a85d..0000000000 Binary files a/Loop/Assets.xcassets/AppIcon.appiconset/40@2x-1.png and /dev/null differ diff --git a/Loop/Assets.xcassets/AppIcon.appiconset/40@2x.png b/Loop/Assets.xcassets/AppIcon.appiconset/40@2x.png deleted file mode 100644 index 2be00105b1..0000000000 Binary files a/Loop/Assets.xcassets/AppIcon.appiconset/40@2x.png and /dev/null differ diff --git a/Loop/Assets.xcassets/AppIcon.appiconset/40@3x.png b/Loop/Assets.xcassets/AppIcon.appiconset/40@3x.png deleted file mode 100644 index 6595aa8340..0000000000 Binary files a/Loop/Assets.xcassets/AppIcon.appiconset/40@3x.png and /dev/null differ diff --git a/Loop/Assets.xcassets/AppIcon.appiconset/60@2x.png b/Loop/Assets.xcassets/AppIcon.appiconset/60@2x.png deleted file mode 100644 index 6595aa8340..0000000000 Binary files a/Loop/Assets.xcassets/AppIcon.appiconset/60@2x.png and /dev/null differ diff --git a/Loop/Assets.xcassets/AppIcon.appiconset/60@3x.png b/Loop/Assets.xcassets/AppIcon.appiconset/60@3x.png deleted file mode 100644 index 1705ee0480..0000000000 Binary files a/Loop/Assets.xcassets/AppIcon.appiconset/60@3x.png and /dev/null differ diff --git a/Loop/Assets.xcassets/AppIcon.appiconset/76@1x.png b/Loop/Assets.xcassets/AppIcon.appiconset/76@1x.png deleted file mode 100644 index cd15c53269..0000000000 Binary files a/Loop/Assets.xcassets/AppIcon.appiconset/76@1x.png and /dev/null differ diff --git a/Loop/Assets.xcassets/AppIcon.appiconset/76@2x.png b/Loop/Assets.xcassets/AppIcon.appiconset/76@2x.png deleted file mode 100644 index a982384b47..0000000000 Binary files a/Loop/Assets.xcassets/AppIcon.appiconset/76@2x.png and /dev/null differ diff --git a/Loop/Assets.xcassets/AppIcon.appiconset/83.5@2x.png b/Loop/Assets.xcassets/AppIcon.appiconset/83.5@2x.png deleted file mode 100644 index 0f623c3134..0000000000 Binary files a/Loop/Assets.xcassets/AppIcon.appiconset/83.5@2x.png and /dev/null differ diff --git a/Loop/Assets.xcassets/AppIcon.appiconset/Contents.json b/Loop/Assets.xcassets/AppIcon.appiconset/Contents.json index d69bb9f635..ec38b33a9d 100644 --- a/Loop/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/Loop/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -1,100 +1,105 @@ { "images" : [ { - "idiom" : "iphone", "size" : "20x20", + "idiom" : "iphone", + "filename" : "Icon-20@2x.png", "scale" : "2x" }, { - "idiom" : "iphone", "size" : "20x20", + "idiom" : "iphone", + "filename" : "Icon-20@3x.png", "scale" : "3x" }, { "size" : "29x29", "idiom" : "iphone", - "filename" : "29@2x.png", + "filename" : "Icon-29@2x.png", "scale" : "2x" }, { "size" : "29x29", "idiom" : "iphone", - "filename" : "29@3x.png", + "filename" : "Icon-29@3x.png", "scale" : "3x" }, { "size" : "40x40", "idiom" : "iphone", - "filename" : "40@2x.png", + "filename" : "Icon-40@2x.png", "scale" : "2x" }, { "size" : "40x40", "idiom" : "iphone", - "filename" : "40@3x.png", + "filename" : "Icon-40@3x.png", "scale" : "3x" }, { "size" : "60x60", "idiom" : "iphone", - "filename" : "60@2x.png", + "filename" : "Icon-60@2x.png", "scale" : "2x" }, { "size" : "60x60", "idiom" : "iphone", - "filename" : "60@3x.png", + "filename" : "Icon-60@3x.png", "scale" : "3x" }, { - "idiom" : "ipad", "size" : "20x20", + "idiom" : "ipad", + "filename" : "Icon-20.png", "scale" : "1x" }, { - "idiom" : "ipad", "size" : "20x20", + "idiom" : "ipad", + "filename" : "Icon-20@2x-1.png", "scale" : "2x" }, { - "idiom" : "ipad", "size" : "29x29", + "idiom" : "ipad", + "filename" : "Icon-29.png", "scale" : "1x" }, { "size" : "29x29", "idiom" : "ipad", - "filename" : "29@2x-1.png", + "filename" : "Icon-29@2x-1.png", "scale" : "2x" }, { "size" : "40x40", "idiom" : "ipad", - "filename" : "40@1x.png", + "filename" : "Icon-40.png", "scale" : "1x" }, { "size" : "40x40", "idiom" : "ipad", - "filename" : "40@2x-1.png", + "filename" : "Icon-40@2x-1.png", "scale" : "2x" }, { "size" : "76x76", "idiom" : "ipad", - "filename" : "76@1x.png", + "filename" : "Icon-76.png", "scale" : "1x" }, { "size" : "76x76", "idiom" : "ipad", - "filename" : "76@2x.png", + "filename" : "Icon-76@2x.png", "scale" : "2x" }, { "size" : "83.5x83.5", "idiom" : "ipad", - "filename" : "83.5@2x.png", + "filename" : "Icon-83.5@2x.png", "scale" : "2x" } ], diff --git a/Loop/Assets.xcassets/AppIcon.appiconset/Icon-20.png b/Loop/Assets.xcassets/AppIcon.appiconset/Icon-20.png new file mode 100644 index 0000000000..f2da6f6d70 Binary files /dev/null and b/Loop/Assets.xcassets/AppIcon.appiconset/Icon-20.png differ diff --git a/Loop/Assets.xcassets/AppIcon.appiconset/Icon-20@2x-1.png b/Loop/Assets.xcassets/AppIcon.appiconset/Icon-20@2x-1.png new file mode 100644 index 0000000000..7bf573b324 Binary files /dev/null and b/Loop/Assets.xcassets/AppIcon.appiconset/Icon-20@2x-1.png differ diff --git a/Loop/Assets.xcassets/AppIcon.appiconset/Icon-20@2x.png b/Loop/Assets.xcassets/AppIcon.appiconset/Icon-20@2x.png new file mode 100644 index 0000000000..7bf573b324 Binary files /dev/null and b/Loop/Assets.xcassets/AppIcon.appiconset/Icon-20@2x.png differ diff --git a/Loop/Assets.xcassets/AppIcon.appiconset/Icon-20@3x.png b/Loop/Assets.xcassets/AppIcon.appiconset/Icon-20@3x.png new file mode 100644 index 0000000000..e6454a2e21 Binary files /dev/null and b/Loop/Assets.xcassets/AppIcon.appiconset/Icon-20@3x.png differ diff --git a/Loop/Assets.xcassets/AppIcon.appiconset/Icon-29.png b/Loop/Assets.xcassets/AppIcon.appiconset/Icon-29.png new file mode 100644 index 0000000000..804594487c Binary files /dev/null and b/Loop/Assets.xcassets/AppIcon.appiconset/Icon-29.png differ diff --git a/Loop/Assets.xcassets/AppIcon.appiconset/Icon-29@2x-1.png b/Loop/Assets.xcassets/AppIcon.appiconset/Icon-29@2x-1.png new file mode 100644 index 0000000000..0be6ed649f Binary files /dev/null and b/Loop/Assets.xcassets/AppIcon.appiconset/Icon-29@2x-1.png differ diff --git a/Loop/Assets.xcassets/AppIcon.appiconset/Icon-29@2x.png b/Loop/Assets.xcassets/AppIcon.appiconset/Icon-29@2x.png new file mode 100644 index 0000000000..0be6ed649f Binary files /dev/null and b/Loop/Assets.xcassets/AppIcon.appiconset/Icon-29@2x.png differ diff --git a/Loop/Assets.xcassets/AppIcon.appiconset/Icon-29@3x.png b/Loop/Assets.xcassets/AppIcon.appiconset/Icon-29@3x.png new file mode 100644 index 0000000000..7390ffa97a Binary files /dev/null and b/Loop/Assets.xcassets/AppIcon.appiconset/Icon-29@3x.png differ diff --git a/Loop/Assets.xcassets/AppIcon.appiconset/Icon-40.png b/Loop/Assets.xcassets/AppIcon.appiconset/Icon-40.png new file mode 100644 index 0000000000..294f7ba752 Binary files /dev/null and b/Loop/Assets.xcassets/AppIcon.appiconset/Icon-40.png differ diff --git a/Loop/Assets.xcassets/AppIcon.appiconset/Icon-40@2x-1.png b/Loop/Assets.xcassets/AppIcon.appiconset/Icon-40@2x-1.png new file mode 100644 index 0000000000..1df0f29b6a Binary files /dev/null and b/Loop/Assets.xcassets/AppIcon.appiconset/Icon-40@2x-1.png differ diff --git a/Loop/Assets.xcassets/AppIcon.appiconset/Icon-40@2x.png b/Loop/Assets.xcassets/AppIcon.appiconset/Icon-40@2x.png new file mode 100644 index 0000000000..1df0f29b6a Binary files /dev/null and b/Loop/Assets.xcassets/AppIcon.appiconset/Icon-40@2x.png differ diff --git a/Loop/Assets.xcassets/AppIcon.appiconset/Icon-40@3x.png b/Loop/Assets.xcassets/AppIcon.appiconset/Icon-40@3x.png new file mode 100644 index 0000000000..b4e9fbb066 Binary files /dev/null and b/Loop/Assets.xcassets/AppIcon.appiconset/Icon-40@3x.png differ diff --git a/Loop/Assets.xcassets/AppIcon.appiconset/Icon-60@2x.png b/Loop/Assets.xcassets/AppIcon.appiconset/Icon-60@2x.png new file mode 100644 index 0000000000..cf2432256f Binary files /dev/null and b/Loop/Assets.xcassets/AppIcon.appiconset/Icon-60@2x.png differ diff --git a/Loop/Assets.xcassets/AppIcon.appiconset/Icon-60@3x.png b/Loop/Assets.xcassets/AppIcon.appiconset/Icon-60@3x.png new file mode 100644 index 0000000000..b6e68e9df7 Binary files /dev/null and b/Loop/Assets.xcassets/AppIcon.appiconset/Icon-60@3x.png differ diff --git a/Loop/Assets.xcassets/AppIcon.appiconset/Icon-76.png b/Loop/Assets.xcassets/AppIcon.appiconset/Icon-76.png new file mode 100644 index 0000000000..ff0d7ee4a1 Binary files /dev/null and b/Loop/Assets.xcassets/AppIcon.appiconset/Icon-76.png differ diff --git a/Loop/Assets.xcassets/AppIcon.appiconset/Icon-76@2x.png b/Loop/Assets.xcassets/AppIcon.appiconset/Icon-76@2x.png new file mode 100644 index 0000000000..2e05d19a84 Binary files /dev/null and b/Loop/Assets.xcassets/AppIcon.appiconset/Icon-76@2x.png differ diff --git a/Loop/Assets.xcassets/AppIcon.appiconset/Icon-83.5@2x.png b/Loop/Assets.xcassets/AppIcon.appiconset/Icon-83.5@2x.png new file mode 100644 index 0000000000..dbba465aed Binary files /dev/null and b/Loop/Assets.xcassets/AppIcon.appiconset/Icon-83.5@2x.png differ diff --git a/Loop/Base.lproj/Main.storyboard b/Loop/Base.lproj/Main.storyboard index f8dea28abc..58ad1c7ec0 100644 --- a/Loop/Base.lproj/Main.storyboard +++ b/Loop/Base.lproj/Main.storyboard @@ -1,5 +1,5 @@ - - + + @@ -13,15 +13,15 @@ - + - + - + - + - + - + @@ -434,7 +441,7 @@ - + @@ -483,7 +490,7 @@ - + @@ -511,50 +518,85 @@ - - + + - + - + + + + + + + + + + + + + + + + + + + + - - + + - + + + - + + + + + + + @@ -603,24 +645,24 @@ - + - + - + - + + + + + - + - + + @@ -676,6 +724,7 @@ - + - +