Merge tidepool/main

Pete Schwambnexport · Pete Schwambnexport · commit 6fa9c60e08b3 · 2023-09-08T15:41:18.000-05:00
diff --git a/G7SensorKitUI/G7CGMManager/G7UICoordinator.swift b/G7SensorKitUI/G7CGMManager/G7UICoordinator.swift
@@ -54,7 +54,7 @@ class G7UICoordinator: UINavigationController, CGMManagerOnboarding, CompletionN
                     }
                 }
             )
-            let hostingController = DismissibleHostingController(rootView: rootView, colorPalette: colorPalette)
+            let hostingController = DismissibleHostingController(content: rootView, colorPalette: colorPalette)
             hostingController.navigationItem.largeTitleDisplayMode = .never
             hostingController.title = nil
             return hostingController
@@ -77,7 +77,7 @@ class G7UICoordinator: UINavigationController, CGMManagerOnboarding, CompletionN
                 },
                 viewModel: G7SettingsViewModel(cgmManager: cgmManager!, displayGlucosePreference: displayGlucosePreference)
             )
-            let hostingController = DismissibleHostingController(rootView: view, colorPalette: colorPalette)
+            let hostingController = DismissibleHostingController(content: view, colorPalette: colorPalette)
             return hostingController
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ class G7UICoordinator: UINavigationController, CGMManagerOnboarding, CompletionN`
`54`	`54`	`}`
`55`	`55`	`}`
`56`	`56`	`)`
`57`		`- let hostingController = DismissibleHostingController(rootView: rootView, colorPalette: colorPalette)`
	`57`	`+ let hostingController = DismissibleHostingController(content: rootView, colorPalette: colorPalette)`
`58`	`58`	`hostingController.navigationItem.largeTitleDisplayMode = .never`
`59`	`59`	`hostingController.title = nil`
`60`	`60`	`return hostingController`
`@@ -77,7 +77,7 @@ class G7UICoordinator: UINavigationController, CGMManagerOnboarding, CompletionN`
`77`	`77`	`},`
`78`	`78`	`viewModel: G7SettingsViewModel(cgmManager: cgmManager!, displayGlucosePreference: displayGlucosePreference)`
`79`	`79`	`)`
`80`		`- let hostingController = DismissibleHostingController(rootView: view, colorPalette: colorPalette)`
	`80`	`+ let hostingController = DismissibleHostingController(content: view, colorPalette: colorPalette)`
`81`	`81`	`return hostingController`
`82`	`82`	`}`
`83`	`83`	`}`