diff --git a/WatchClock WatchKit Extension/ContentView.swift b/WatchClock WatchKit Extension/ContentView.swift index b3f3762..9d04ef4 100644 --- a/WatchClock WatchKit Extension/ContentView.swift +++ b/WatchClock WatchKit Extension/ContentView.swift @@ -20,7 +20,7 @@ import SwiftUI struct ContentView: View { - @EnvironmentObject var clockModel: WatchClock + @EnvironmentObject var clockModel: ClockModel var body: some View { GeometryReader { geometry in @@ -36,7 +36,7 @@ struct ContentView: View { struct ContentView_Previews: PreviewProvider { static var previews: some View { - let model = WatchClock() + let model = ClockModel() Group { ContentView().previewDevice("Apple Watch Series 5 - 40mm").environmentObject(model) ContentView().previewDevice("Apple Watch Series 7 - 45mm").environmentObject(model) diff --git a/WatchClock WatchKit Extension/WatchClockApp.swift b/WatchClock WatchKit Extension/WatchClockApp.swift index e656273..d5a32c0 100644 --- a/WatchClock WatchKit Extension/WatchClockApp.swift +++ b/WatchClock WatchKit Extension/WatchClockApp.swift @@ -22,28 +22,29 @@ import SwiftUI @main struct WatchClockApp: App { @Environment(\.scenePhase) private var scenePhase - let clockModel = WatchClock() + let clockModel = ClockModel() @SceneBuilder var body: some Scene { WindowGroup { NavigationView { - ContentView().environmentObject(clockModel).onChange(of: scenePhase) { phase in - switch phase { - case .active: - clockModel.moveToForeground() - break - case .inactive: - break - case .background: - clockModel.moveToBackground() - break - @unknown default: - fatalError("WatchClock has entered an unknown state.") - } - } + ContentView().environmentObject(clockModel) +// .onChange(of: scenePhase) { phase in +// switch phase { +// case .active: +// clockModel.moveToForeground() +// break +// case .inactive: +// break +// case .background: +// clockModel.moveToBackground() +// break +// @unknown default: +// fatalError("WatchClock has entered an unknown state.") +// } +// } } } - WKNotificationScene(controller: NotificationController.self, category: "myCategory") +// WKNotificationScene(controller: NotificationController.self, category: "myCategory") } }