Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
6bfa4c9
bump version for dev
ps2 May 19, 2017
bedf33f
Merge pull request #480 from LoopKit/bump-version
ps2 May 19, 2017
ba39c4a
Fixing retain cycles in charts view controllers
ps2 May 26, 2017
ff60c70
Merge pull request #486 from LoopKit/memory-leak
ps2 May 26, 2017
1d3c6f8
dose unit improvements
ps2 Jun 24, 2017
98fa43c
LoopKit 1.4.0 frameworks
ps2 Jun 24, 2017
569fc37
Merge pull request #496 from LoopKit/dose-unit-improvements
ps2 Jun 24, 2017
cf38b56
Restore last temp basal value from status extension context on launch
ps2 Jun 24, 2017
2c0e48e
Add missing file
ps2 Jun 24, 2017
49a01e9
Adding OSLog and Loggly support
ps2 Jun 24, 2017
ba0ae98
Merge pull request #497 from LoopKit/restore-temp-basal
ps2 Jun 24, 2017
394d775
Updating app icons to be uniform gray with green circle
ps2 Jun 24, 2017
c7d3f37
Merge pull request #498 from LoopKit/logging
ps2 Jun 25, 2017
76762ed
Log g5 errors, non-ok calibration states, and unknown data (#487)
ps2 Jun 25, 2017
2981af3
Fixing an issue where prediction text didn't display due to a race co…
ps2 Jun 25, 2017
bb19e33
Fixing an issue where idle timer wasn't asserted as running unless pu…
ps2 Jun 25, 2017
ac3f5e1
Updates to allow multiple share server credentials to be stored
ps2 Jun 26, 2017
feec7eb
Update to RileyLink frameworks v1.1.1
ps2 Jun 28, 2017
a0d14cb
Merge pull request #500 from LoopKit/fixing-rc-text
ps2 Jun 28, 2017
1ed0777
Merge pull request #501 from LoopKit/fix-idle-assertion
ps2 Jun 28, 2017
06a34b7
Merge pull request #499 from LoopKit/app-icons
ps2 Jun 28, 2017
7d5e1e5
Merge pull request #502 from LoopKit/rlkit-update
ps2 Jun 28, 2017
84feb95
Merge pull request #503 from LoopKit/share-server
ps2 Jun 28, 2017
c799c80
foodtype and error logging
ps2 Jun 28, 2017
c46edb9
Merge pull request #504 from LoopKit/ns-upload-foodtype
ps2 Jun 29, 2017
e583269
Update to LoopKit v1.4.1
ps2 Jun 30, 2017
aaa1b2c
Merge pull request #506 from LoopKit/loopkit-update
ps2 Jul 1, 2017
a88be08
Take2: allow NON_US share server and custom share server (#509)
dabear Jul 3, 2017
d814d88
Adding support for setting up a workspace to make framework developme…
ps2 Jul 3, 2017
3280246
Fix share server select issue
ps2 Jul 6, 2017
25133b8
Merge pull request #515 from LoopKit/share-server-select
ps2 Jul 7, 2017
202d845
Rileylink framework update (#516)
ps2 Jul 8, 2017
9355c33
Support for Swift 4 (#511)
ps2 Jul 8, 2017
7aae4eb
Revert MAIN_APP_BUNDLE_IDENTIFIER change
ps2 Jul 8, 2017
b9d7f7a
dynamic carb absorption (#507)
ps2 Jul 18, 2017
e7186cf
Upgrade to LoopKit v1.4.2
ps2 Jul 24, 2017
c869bc5
Merge pull request #527 from LoopKit/loopkit-upgrade
ps2 Jul 24, 2017
f7d1054
Managed data interval now set per cgm type (#528)
ps2 Jul 24, 2017
4a61961
Fix range for mmol (#529)
ps2 Jul 24, 2017
7b2c2d5
Use color to indicate age of carbs on board label
ps2 Jul 27, 2017
a7bf05c
Merge pull request #531 from LoopKit/clamped-carbs-on-board
ps2 Jul 27, 2017
492c8f9
bump version
ps2 Jul 27, 2017
ba2d76b
Merge pull request #534 from LoopKit/bump-version
ps2 Jul 27, 2017
60d1cc7
Update icon.
ps2 Jul 28, 2017
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
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -70,3 +70,5 @@ RemoteSettings.plist
# OS
.DS_Store

# Framework development
Loop.xcworkspace
6 changes: 3 additions & 3 deletions Cartfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
github "LoopKit/LoopKit" == 1.3.0
github "LoopKit/LoopKit" == 1.4.2
github "LoopKit/xDripG5" ~> 0.8.0
github "i-schuetz/SwiftCharts" ~> 0.6.0
github "mddub/dexcom-share-client-swift" == 0.2.1
github "mddub/dexcom-share-client-swift" == 0.4.0
github "mddub/G4ShareSpy" == 0.3.2
github "ps2/rileylink_ios" == 1.1.0
github "ps2/rileylink_ios" == 1.2.0
github "amplitude/Amplitude-iOS" ~> 3.8.5
6 changes: 3 additions & 3 deletions Cartfile.resolved
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
github "LoopKit/LoopKit" "v1.3.0"
github "LoopKit/LoopKit" "v1.4.2"
github "LoopKit/xDripG5" "v0.8.0"
github "amplitude/Amplitude-iOS" "v3.14.1"
github "i-schuetz/SwiftCharts" "0.6"
github "mddub/G4ShareSpy" "v0.3.2"
github "mddub/dexcom-share-client-swift" "v0.2.1"
github "ps2/rileylink_ios" "v1.1.0"
github "mddub/dexcom-share-client-swift" "v0.4.0"
github "ps2/rileylink_ios" "v1.2.0"
5 changes: 2 additions & 3 deletions Carthage/Build/.Amplitude-iOS.version

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 2 additions & 3 deletions Carthage/Build/.G4ShareSpy.version

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 7 additions & 7 deletions Carthage/Build/.LoopKit.version

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 3 additions & 4 deletions Carthage/Build/.SwiftCharts.version

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 2 additions & 3 deletions Carthage/Build/.dexcom-share-client-swift.version

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 5 additions & 9 deletions Carthage/Build/.rileylink_ios.version

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 2 additions & 3 deletions Carthage/Build/.xDripG5.version

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file modified Carthage/Build/iOS/Amplitude.framework/Amplitude
Binary file not shown.
Binary file modified Carthage/Build/iOS/Amplitude.framework/Info.plist
Binary file not shown.
Binary file added Carthage/Build/iOS/CarbKit.framework/Assets.car
Binary file not shown.
Binary file modified Carthage/Build/iOS/CarbKit.framework/CarbKit
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
34 changes: 31 additions & 3 deletions Carthage/Build/iOS/CarbKit.framework/Headers/CarbKit-Swift.h

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file modified Carthage/Build/iOS/CarbKit.framework/Info.plist
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified Carthage/Build/iOS/Crypto.framework/Crypto
Binary file not shown.
Binary file modified Carthage/Build/iOS/Crypto.framework/Info.plist
Binary file not shown.
Binary file modified Carthage/Build/iOS/G4ShareSpy.framework/G4ShareSpy
Binary file not shown.
Binary file modified Carthage/Build/iOS/G4ShareSpy.framework/Info.plist
Binary file not shown.
Binary file modified Carthage/Build/iOS/GlucoseKit.framework/GlucoseKit
Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file modified Carthage/Build/iOS/GlucoseKit.framework/Info.plist
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified Carthage/Build/iOS/InsulinKit.framework/Info.plist
Binary file not shown.
Binary file modified Carthage/Build/iOS/InsulinKit.framework/InsulinKit
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified Carthage/Build/iOS/LoopKit.framework/Assets.car
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified Carthage/Build/iOS/LoopKit.framework/Info.plist
Binary file not shown.
Binary file modified Carthage/Build/iOS/LoopKit.framework/LoopKit
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified Carthage/Build/iOS/LoopKit.framework/TextFieldTableViewCell.nib
Binary file not shown.
Binary file modified Carthage/Build/iOS/MinimedKit.framework/Info.plist
Binary file not shown.
Binary file modified Carthage/Build/iOS/MinimedKit.framework/MinimedKit
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified Carthage/Build/iOS/NightscoutUploadKit.framework/Info.plist
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file modified Carthage/Build/iOS/RileyLinkBLEKit.framework/Info.plist
Binary file not shown.
Binary file modified Carthage/Build/iOS/RileyLinkBLEKit.framework/RileyLinkBLEKit
Binary file not shown.
Binary file modified Carthage/Build/iOS/RileyLinkKit.framework/Info.plist
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified Carthage/Build/iOS/RileyLinkKit.framework/RileyLinkKit
Binary file not shown.
Binary file not shown.
Binary file modified Carthage/Build/iOS/ShareClient.framework/Info.plist
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified Carthage/Build/iOS/ShareClient.framework/ShareClient
Binary file not shown.
Binary file modified Carthage/Build/iOS/SwiftCharts.framework/Info.plist
Binary file not shown.
Binary file modified Carthage/Build/iOS/SwiftCharts.framework/SwiftCharts
Binary file not shown.
Binary file modified Carthage/Build/iOS/xDripG5.framework/Info.plist
Binary file not shown.
Binary file modified Carthage/Build/iOS/xDripG5.framework/xDripG5
Binary file not shown.
17 changes: 17 additions & 0 deletions Common/Extensions/WCSession+Swift4.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
//
// WCSession.swift
// Loop
//
// Copyright © 2017 LoopKit Authors. All rights reserved.
//

import WatchConnectivity


extension WCSession {
#if swift(>=4)
static func `default`() -> WCSession {
return self.default
}
#endif
}
12 changes: 8 additions & 4 deletions Common/Models/StatusExtensionContext.swift
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@ struct LoopContext {
struct NetBasalContext {
let rate: Double
let percentage: Double
let startDate: Date
let start: Date
let end: Date
}

struct SensorDisplayableContext: SensorDisplayable {
Expand Down Expand Up @@ -122,22 +123,25 @@ extension NetBasalContext: RawRepresentable {
return [
"rate": rate,
"percentage": percentage,
"startDate": startDate
"start": start,
"end": end
]
}

init?(rawValue: RawValue) {
guard
let rate = rawValue["rate"] as? Double,
let percentage = rawValue["percentage"] as? Double,
let startDate = rawValue["startDate"] as? Date
let start = rawValue["start"] as? Date,
let end = rawValue["end"] as? Date
else {
return nil
}

self.rate = rate
self.percentage = percentage
self.startDate = startDate
self.start = start
self.end = end
}
}

Expand Down
Loading