Merge pull request #39 from LoopKit/tidepool-sync

ps2 · web-flow · commit 792c0b5d61a0 · 2023-05-06T10:23:22.000-05:00
Tidepool Sync
diff --git a/ShareClient.xcodeproj/xcshareddata/xcschemes/Shared-watchOS.xcscheme b/ShareClient.xcodeproj/xcshareddata/xcschemes/Shared-watchOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1330"
+   LastUpgradeVersion = "1430"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/ShareClient.xcodeproj/xcshareddata/xcschemes/Shared.xcscheme b/ShareClient.xcodeproj/xcshareddata/xcschemes/Shared.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1330"
+   LastUpgradeVersion = "1430"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/ShareClientUI/ShareClientManager+UI.swift b/ShareClientUI/ShareClientManager+UI.swift
@@ -16,7 +16,7 @@ extension ShareClientManager: CGMManagerUI {
         return nil
     }
     
-    public static func setupViewController(bluetoothProvider: BluetoothProvider, displayGlucoseUnitObservable: DisplayGlucoseUnitObservable, colorPalette: LoopUIColorPalette, allowDebugFeatures: Bool) -> SetupUIResult<CGMManagerViewController, CGMManagerUI> {
+    public static func setupViewController(bluetoothProvider: BluetoothProvider, displayGlucoseUnitObservable: DisplayGlucoseUnitObservable, colorPalette: LoopUIColorPalette, allowDebugFeatures: Bool, prefersToSkipUserInteraction: Bool = false) -> SetupUIResult<CGMManagerViewController, CGMManagerUI> {
         return .userInteractionRequired(ShareClientSetupViewController())
     }
 

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ extension ShareClientManager: CGMManagerUI {`
`16`	`16`	`return nil`
`17`	`17`	`}`
`18`	`18`
`19`		`- public static func setupViewController(bluetoothProvider: BluetoothProvider, displayGlucoseUnitObservable: DisplayGlucoseUnitObservable, colorPalette: LoopUIColorPalette, allowDebugFeatures: Bool) -> SetupUIResult<CGMManagerViewController, CGMManagerUI> {`
	`19`	`+ public static func setupViewController(bluetoothProvider: BluetoothProvider, displayGlucoseUnitObservable: DisplayGlucoseUnitObservable, colorPalette: LoopUIColorPalette, allowDebugFeatures: Bool, prefersToSkipUserInteraction: Bool = false) -> SetupUIResult<CGMManagerViewController, CGMManagerUI> {`
`20`	`20`	`return .userInteractionRequired(ShareClientSetupViewController())`
`21`	`21`	`}`
`22`	`22`