Add NightscoutAPIClient CGM service (#1540)

gestrich · bill-foreflight · web-flow · commit f98e742f739c · 2022-03-01T08:41:43.000-06:00
* Add NightscoutAPIClient CGM service to Cartfile
* Normalize CGM and sort names.

Co-authored-by: Bill Gestrich &lt;79173438+bill-foreflight@users.noreply.github.com&gt;
diff --git a/Cartfile b/Cartfile
@@ -11,3 +11,4 @@ github "LoopKit/LogglyService" "dev"
 github "LoopKit/MKRingProgressView" "appex-safe"
 github "dexman/Minizip" "master"
 github "instacart/TrueTime.swift"
+github "gestrich/NightscoutAPIClient" "dev"
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -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"
diff --git a/Loop/Views/SettingsView.swift b/Loop/Views/SettingsView.swift
@@ -222,9 +222,11 @@ extension SettingsView {
     }
     
     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())

Original file line number	Diff line number	Diff line change
`@@ -222,9 +222,11 @@ extension SettingsView {`
`222`	`222`	`}`
`223`	`223`
`224`	`224`	`private var cgmChoices: [ActionSheet.Button] {`
`225`		`- var result = viewModel.cgmManagerSettingsViewModel.availableDevices.map { availableDevice in`
`226`		`- ActionSheet.Button.default(Text(availableDevice.localizedTitle)) {`
`227`		`- self.viewModel.cgmManagerSettingsViewModel.didTapAdd(availableDevice)`
	`225`	`+ var result = viewModel.cgmManagerSettingsViewModel.availableDevices`
	`226`	`+ .sorted(by: {$0.localizedTitle < $1.localizedTitle})`
	`227`	`+ .map { availableDevice in`
	`228`	`+ ActionSheet.Button.default(Text(availableDevice.localizedTitle)) {`
	`229`	`+ self.viewModel.cgmManagerSettingsViewModel.didTapAdd(availableDevice)`
`228`	`230`	`}`
`229`	`231`	`}`
`230`	`232`	`result.append(.cancel())`