Merge pull request LoopKit#15 from LoopKit/tidepool-merge

ps2 · web-flow · commit eda0394169ea · 2023-05-06T10:29:28.000-05:00
Tidepool Merge
diff --git a/G7SensorKitUI/G7CGMManager/G7CGMManager+UI.swift b/G7SensorKitUI/G7CGMManager/G7CGMManager+UI.swift
@@ -23,12 +23,13 @@ public struct G7DeviceStatusHighlight: DeviceStatusHighlight, Equatable {
 }
 
 extension G7CGMManager: CGMManagerUI {
+
     public static var onboardingImage: UIImage? {
         return nil
     }
 
-    public static func setupViewController(bluetoothProvider: BluetoothProvider, displayGlucoseUnitObservable: DisplayGlucoseUnitObservable, colorPalette: LoopUIColorPalette, allowDebugFeatures: Bool) -> SetupUIResult<CGMManagerViewController, CGMManagerUI> {
-
+    public static func setupViewController(bluetoothProvider: LoopKit.BluetoothProvider, displayGlucoseUnitObservable: LoopKitUI.DisplayGlucoseUnitObservable, colorPalette: LoopKitUI.LoopUIColorPalette, allowDebugFeatures: Bool, prefersToSkipUserInteraction: Bool) -> LoopKitUI.SetupUIResult<LoopKitUI.CGMManagerViewController, LoopKitUI.CGMManagerUI>
+    {
         let vc = G7UICoordinator(colorPalette: colorPalette, displayGlucoseUnitObservable: displayGlucoseUnitObservable, allowDebugFeatures: allowDebugFeatures)
         return .userInteractionRequired(vc)
     }

Original file line number	Diff line number	Diff line change
`@@ -23,12 +23,13 @@ public struct G7DeviceStatusHighlight: DeviceStatusHighlight, Equatable {`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`extension G7CGMManager: CGMManagerUI {`
	`26`	`+`
`26`	`27`	`public static var onboardingImage: UIImage? {`
`27`	`28`	`return nil`
`28`	`29`	`}`
`29`	`30`
`30`		`- public static func setupViewController(bluetoothProvider: BluetoothProvider, displayGlucoseUnitObservable: DisplayGlucoseUnitObservable, colorPalette: LoopUIColorPalette, allowDebugFeatures: Bool) -> SetupUIResult<CGMManagerViewController, CGMManagerUI> {`
`31`		`-`
	`31`	`+ public static func setupViewController(bluetoothProvider: LoopKit.BluetoothProvider, displayGlucoseUnitObservable: LoopKitUI.DisplayGlucoseUnitObservable, colorPalette: LoopKitUI.LoopUIColorPalette, allowDebugFeatures: Bool, prefersToSkipUserInteraction: Bool) -> LoopKitUI.SetupUIResult<LoopKitUI.CGMManagerViewController, LoopKitUI.CGMManagerUI>`
	`32`	`+ {`
`32`	`33`	`let vc = G7UICoordinator(colorPalette: colorPalette, displayGlucoseUnitObservable: displayGlucoseUnitObservable, allowDebugFeatures: allowDebugFeatures)`
`33`	`34`	`return .userInteractionRequired(vc)`
`34`	`35`	`}`