Skip to content

Add NightscoutAPIClient CGM service #1540

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 2 commits into from
Mar 1, 2022
Merged

Add NightscoutAPIClient CGM service #1540

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2116ed0
Add NightscoutAPIClient CGM service
bill-foreflight Aug 27, 2021
d7ee4ce
Normalize CGM and sort names.
gestrich Feb 13, 2022
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
1 change: 1 addition & 0 deletions Cartfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,4 @@ github "LoopKit/LogglyService" "dev"
github "LoopKit/MKRingProgressView" "appex-safe"
github "dexman/Minizip" "master"
github "instacart/TrueTime.swift"
Copy link
Contributor Author

@gestrich gestrich Feb 20, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pete - These Cartfile values in this PR and my other PRs probably will need your attention before merge. I'm never quite sure how to manage the files during the development cycle as they become quite cumbersome to keep up-to-date with the current versions (i.e. Each time I update a submodule, these are out-of-date). And it gets really tricky when you think that a bunch of submodules rely on LoopKit, all which need to be in sync with the same resolved version.

Do we even rely on these Cartfile versions or maybe these should not be updated until just before you merge?

Copy link
Contributor Author

@gestrich gestrich Feb 20, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And maybe I see my answer here. Looks like NightscoutService is way out of day. So I suppose we are not updating these.

Copy link
Collaborator

@ps2 ps2 Feb 28, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Correct. Carthage is being dropped in favor of Workspace builds.

github "gestrich/NightscoutAPIClient" "dev"
1 change: 1 addition & 0 deletions Cartfile.resolved
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,4 @@ github "i-schuetz/SwiftCharts" "0.6.5"
github "instacart/TrueTime.swift" "5.1.0"
github "ps2/NightscoutService" "f54ae00a3c362ccbcbac403b86bc6cd7320c9058"
github "ps2/rileylink_ios" "0badcaca8c42a0a6cc430302a04133412cbbef58"
github "gestrich/NightscoutAPIClient" "2a9dd24772db59c4aa528d1fb33e2c37a320fb13"
8 changes: 5 additions & 3 deletions Loop/Views/SettingsView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,9 +222,11 @@ extension SettingsView {
}

Copy link
Contributor Author

@gestrich gestrich Feb 20, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sort CGM device list by name. They seemed to be in random order from what I could tell.

private var cgmChoices: [ActionSheet.Button] {
var result = viewModel.cgmManagerSettingsViewModel.availableDevices.map { availableDevice in
ActionSheet.Button.default(Text(availableDevice.localizedTitle)) {
self.viewModel.cgmManagerSettingsViewModel.didTapAdd(availableDevice)
var result = viewModel.cgmManagerSettingsViewModel.availableDevices
.sorted(by: {$0.localizedTitle < $1.localizedTitle})
.map { availableDevice in
ActionSheet.Button.default(Text(availableDevice.localizedTitle)) {
self.viewModel.cgmManagerSettingsViewModel.didTapAdd(availableDevice)
}
}
result.append(.cancel())
Expand Down