Merge pull request #5 from johnno1962/xcode-11-beta3

Updated for Xcode 11 Beta3
2026-01-16 05:56:40 +01:00 · 2019-07-08 23:57:05 +03:00
parent 03ac6281a1 17a2f3b196
commit 193df73366
35 changed files with 207 additions and 88 deletions
--- a/Examples.xcworkspace/contents.xcworkspacedata
+++ b/Examples.xcworkspace/contents.xcworkspacedata
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   <FileRef
+      location = "group:Other Projects/2048 Game/SwiftUI2048.xcodeproj">
+   </FileRef>
+   <FileRef
+      location = "group:Other Projects/Animating Views And Transitions/Complete/Landmarks/AnimatingViewsAndTransitions.xcodeproj">
+   </FileRef>
+   <FileRef
+      location = "group:Other Projects/Building Lists And Navigation/Complete/Landmarks/BuildingListsAndNavigation.xcodeproj">
+   </FileRef>
+   <FileRef
+      location = "group:Other Projects/Calculator/Calculator/Calculator.xcodeproj">
+   </FileRef>
+   <FileRef
+      location = "group:Other Projects/Combine using GitHub API/SwiftUI-Combine-Example.xcodeproj">
+   </FileRef>
+   <FileRef
+      location = "group:Other Projects/Composing Complex Interfaces/Complete/Landmarks/ComposingComplexInterfaces.xcodeproj">
+   </FileRef>
+   <FileRef
+      location = "group:Other Projects/Creating And Combining Views/Complete/Landmarks/CreatingAndCombiningViews.xcodeproj">
+   </FileRef>
+   <FileRef
+      location = "group:Other Projects/Currency-SwiftUI/Currency-SwiftUI.xcodeproj">
+   </FileRef>
+   <FileRef
+      location = "group:Other Projects/Drawing Paths And Shapes/Complete/Landmarks/DrawingPathsAndShapes.xcodeproj">
+   </FileRef>
+   <FileRef
+      location = "group:Other Projects/Example To-Do App/SwiftUITodo.xcodeproj">
+   </FileRef>
+   <FileRef
+      location = "group:Other Projects/Flux/SwiftUI-Flux.xcodeproj">
+   </FileRef>
+   <FileRef
+      location = "group:Other Projects/GitHub Search/GitHubSearchWithSwiftUI.xcodeproj">
+   </FileRef>
+   <FileRef
+      location = "group:Other Projects/Handling User Input/Complete/Landmarks/HandlingUserInput.xcodeproj">
+   </FileRef>
+   <FileRef
+      location = "group:Other Projects/InstaFake/Instagram-SWUI.xcodeproj">
+   </FileRef>
+   <FileRef
+      location = "group:Other Projects/Interfacing With UIKit/Complete/Landmarks/InterfacingWithUIKit.xcodeproj">
+   </FileRef>
+   <FileRef
+      location = "group:Other Projects/iPadOS Scenes/BehindTheScenes.xcodeproj">
+   </FileRef>
+   <FileRef
+      location = "group:Other Projects/Jike/SwiftUI_Jike.xcodeproj">
+   </FileRef>
+   <FileRef
+      location = "group:Other Projects/Movie/MovieSwift/MovieSwift.xcodeproj">
+   </FileRef>
+   <FileRef
+      location = "group:Other Projects/SwiftUI + Redux/SwiftUIDemo.xcodeproj">
+   </FileRef>
+   <FileRef
+      location = "group:Other Projects/Tempus RomanumIl/TempusRomanum.xcodeproj">
+   </FileRef>
+   <FileRef
+      location = "group:Other Projects/Time Travel/SwiftUITimeTravel.xcodeproj">
+   </FileRef>
+   <FileRef
+      location = "group:Other Projects/Transition and Blur/Basic Animation/SwiftUI-BasicAnimation.xcodeproj">
+   </FileRef>
+   <FileRef
+      location = "group:Other Projects/Transition and Blur/Card Animation/SwiftUI-CardAnimation.xcodeproj">
+   </FileRef>
+   <FileRef
+      location = "group:Other Projects/UINote/SwiftUINote.xcodeproj">
+   </FileRef>
+   <FileRef
+      location = "group:Other Projects/Working With UIControls/Complete/Landmarks/WorkingWithUIControls.xcodeproj">
+   </FileRef>
+   <FileRef
+      location = "group:Other Projects/WWDCPlayer/WWDCPlayer.xcodeproj">
+   </FileRef>
+</Workspace>
--- a/Projects/2048
+++ b/Projects/2048
--- a/Game/Screenshot.png
+++ b/Game/Screenshot.png
--- a/Transitions/Complete/Landmarks/Landmarks/LandmarkList.swift
+++ b/Transitions/Complete/Landmarks/Landmarks/LandmarkList.swift
@@ -19,7 +19,7 @@ struct LandmarkList: View {
                
                ForEach(userData.landmarks) { landmark in
                    if !self.userData.showFavoritesOnly || landmark.isFavorite {
-                        NavigationButton(
+                        NavigationLink(
                        destination: LandmarkDetail(landmark: landmark)) {
                            LandmarkRow(landmark: landmark)
                        }
--- a/Transitions/Complete/Landmarks/Landmarks/SceneDelegate.swift
+++ b/Transitions/Complete/Landmarks/Landmarks/SceneDelegate.swift
@@ -18,11 +18,13 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
        // This delegate does not imply the connecting scene or session are new (see `application:configurationForConnectingSceneSession` instead).

        // Use a UIHostingController as window root view controller
-        let window = UIWindow(frame: UIScreen.main.bounds)
-        window.rootViewController = UIHostingController(rootView: LandmarkList().environmentObject(UserData()))
-        self.window = window
-        window.makeKeyAndVisible()
-    }
+        if let windowScene = scene as? UIWindowScene {
+            let window = UIWindow(windowScene: windowScene)
+            window.rootViewController = UIHostingController(rootView: LandmarkList().environmentObject(UserData()))
+            self.window = window
+            window.makeKeyAndVisible()
+        }
+   }

    func sceneDidDisconnect(_ scene: UIScene) {
        // Called as the scene is being released by the system.
--- a/Navigation/Complete/Landmarks/Landmarks/LandmarkList.swift
+++ b/Navigation/Complete/Landmarks/Landmarks/LandmarkList.swift
@@ -11,7 +11,7 @@ struct LandmarkList: View {
    var body: some View {
        NavigationView {
            List(landmarkData) { landmark in
-                NavigationButton(destination: LandmarkDetail(landmark: landmark)) {
+                NavigationLink(destination: LandmarkDetail(landmark: landmark)) {
                    LandmarkRow(landmark: landmark)
                }
            }
--- a/Navigation/Complete/Landmarks/Landmarks/SceneDelegate.swift
+++ b/Navigation/Complete/Landmarks/Landmarks/SceneDelegate.swift
@@ -18,10 +18,12 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
        // This delegate does not imply the connecting scene or session are new (see `application:configurationForConnectingSceneSession` instead).

        // Use a UIHostingController as window root view controller
-        let window = UIWindow(frame: UIScreen.main.bounds)
-        window.rootViewController = UIHostingController(rootView: LandmarkList())
-        self.window = window
-        window.makeKeyAndVisible()
+        if let windowScene = scene as? UIWindowScene {
+            let window = UIWindow(windowScene: windowScene)
+            window.rootViewController = UIHostingController(rootView: LandmarkList())
+            self.window = window
+            window.makeKeyAndVisible()
+        }
    }

    func sceneDidDisconnect(_ scene: UIScene) {
--- a/Projects/Calculator/Calculator/Calculator/SceneDelegate.swift
+++ b/Projects/Calculator/Calculator/Calculator/SceneDelegate.swift
@@ -20,10 +20,12 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
    // This delegate does not imply the connecting scene or session are new (see `application:configurationForConnectingSceneSession` instead).

    // Use a UIHostingController as window root view controller
-    let window = UIWindow(frame: UIScreen.main.bounds)
-    window.rootViewController = UIHostingController(rootView: Calculator())
-    self.window = window
-    window.makeKeyAndVisible()
+    if let windowScene = scene as? UIWindowScene {
+        let window = UIWindow(windowScene: windowScene)
+        window.rootViewController = UIHostingController(rootView: Calculator())
+        self.window = window
+        window.makeKeyAndVisible()
+    }
  }

  func sceneDidDisconnect(_ scene: UIScene) {
--- a/Interfaces/Complete/Landmarks/Landmarks/CategoryRow.swift
+++ b/Interfaces/Complete/Landmarks/Landmarks/CategoryRow.swift
@@ -12,7 +12,7 @@ struct CategoryRow: View {
    var items: [Landmark]
    
    var body: some View {
-        VStack(alignment: .leading) {
+        VStack(alignment: HorizontalAlignment.leading) {
            Text(self.categoryName)
                .font(.headline)
                .padding(.leading, 15)
@@ -21,7 +21,7 @@ struct CategoryRow: View {
            ScrollView(showsHorizontalIndicator: false) {
                HStack(alignment: .top, spacing: 0) {
                    ForEach(self.items.identified(by: \.name)) { landmark in
-                        NavigationButton(
+                        NavigationLink(
                            destination: LandmarkDetail(
                                landmark: landmark
                            )
--- a/Interfaces/Complete/Landmarks/Landmarks/LandmarkList.swift
+++ b/Interfaces/Complete/Landmarks/Landmarks/LandmarkList.swift
@@ -19,7 +19,7 @@ struct LandmarkList: View {
                
                ForEach(userData.landmarks) { landmark in
                    if !self.userData.showFavoritesOnly || landmark.isFavorite {
-                        NavigationButton(
+                        NavigationLink(
                        destination: LandmarkDetail(landmark: landmark)) {
                            LandmarkRow(landmark: landmark)
                        }
--- a/Views/Complete/Landmarks/Landmarks/SceneDelegate.swift
+++ b/Views/Complete/Landmarks/Landmarks/SceneDelegate.swift
@@ -18,10 +18,12 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
        // This delegate does not imply the connecting scene or session are new (see `application:configurationForConnectingSceneSession` instead).

        // Use a UIHostingController as window root view controller
-        let window = UIWindow(frame: UIScreen.main.bounds)
-        window.rootViewController = UIHostingController(rootView: ContentView())
-        self.window = window
-        window.makeKeyAndVisible()
+        if let windowScene = scene as? UIWindowScene {
+            let window = UIWindow(windowScene: windowScene)
+            window.rootViewController = UIHostingController(rootView: ContentView())
+            self.window = window
+            window.makeKeyAndVisible()
+        }
    }

    func sceneDidDisconnect(_ scene: UIScene) {
--- a/Projects/Currency-SwiftUI/Currency-SwiftUI/ConverterView.swift
+++ b/Projects/Currency-SwiftUI/Currency-SwiftUI/ConverterView.swift
@@ -36,7 +36,7 @@ struct ConverterView : View {
        let inset = EdgeInsets(top: -8, leading: -20, bottom: -7, trailing: 5)
        let doubleValue: Double = Double(self.$baseAmount.value) ?? 1.0
        
-        return ZStack(alignment: .bottomTrailing) {
+        return ZStack(alignment: Alignment.bottomTrailing) {
            VStack(alignment: .leading){
                Text("From:").bold().color(.gray)
                HStack{
--- a/Shapes/Complete/Landmarks/Landmarks/LandmarkList.swift
+++ b/Shapes/Complete/Landmarks/Landmarks/LandmarkList.swift
@@ -19,7 +19,7 @@ struct LandmarkList: View {
                
                ForEach(userData.landmarks) { landmark in
                    if !self.userData.showFavoritesOnly || landmark.isFavorite {
-                        NavigationButton(
+                        NavigationLink(
                        destination: LandmarkDetail(landmark: landmark)) {
                            LandmarkRow(landmark: landmark)
                        }
--- a/Shapes/Complete/Landmarks/Landmarks/SceneDelegate.swift
+++ b/Shapes/Complete/Landmarks/Landmarks/SceneDelegate.swift
@@ -18,11 +18,13 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
        // This delegate does not imply the connecting scene or session are new (see `application:configurationForConnectingSceneSession` instead).

        // Use a UIHostingController as window root view controller
-        let window = UIWindow(frame: UIScreen.main.bounds)
-        window.rootViewController = UIHostingController(rootView: LandmarkList().environmentObject(UserData()))
-        self.window = window
-        window.makeKeyAndVisible()
-    }
+        if let windowScene = scene as? UIWindowScene {
+            let window = UIWindow(windowScene: windowScene)
+            window.rootViewController = UIHostingController(rootView: LandmarkList().environmentObject(UserData()))
+            self.window = window
+            window.makeKeyAndVisible()
+        }
+   }

    func sceneDidDisconnect(_ scene: UIScene) {
        // Called as the scene is being released by the system.
--- a/Projects/Flux/SwiftUI-Flux/SceneDelegate.swift
+++ b/Projects/Flux/SwiftUI-Flux/SceneDelegate.swift
@@ -5,9 +5,11 @@ final class SceneDelegate: UIResponder, UIWindowSceneDelegate {
    var window: UIWindow?

    func scene(_ scene: UIScene, willConnectTo session: UISceneSession, options connectionOptions: UIScene.ConnectionOptions) {
-        let window = UIWindow(frame: UIScreen.main.bounds)
-        window.rootViewController = UIHostingController(rootView: CounterView())
-        self.window = window
-        window.makeKeyAndVisible()
+        if let windowScene = scene as? UIWindowScene {
+            let window = UIWindow(windowScene: windowScene)
+            window.rootViewController = UIHostingController(rootView: CounterView())
+            self.window = window
+            window.makeKeyAndVisible()
+        }
    }
 }
--- a/Input/Complete/Landmarks/Landmarks/LandmarkList.swift
+++ b/Input/Complete/Landmarks/Landmarks/LandmarkList.swift
@@ -19,7 +19,7 @@ struct LandmarkList: View {
                
                ForEach(userData.landmarks) { landmark in
                    if !self.userData.showFavoritesOnly || landmark.isFavorite {
-                        NavigationButton(
+                        NavigationLink(
                        destination: LandmarkDetail(landmark: landmark)) {
                            LandmarkRow(landmark: landmark)
                        }
--- a/Input/Complete/Landmarks/Landmarks/SceneDelegate.swift
+++ b/Input/Complete/Landmarks/Landmarks/SceneDelegate.swift
@@ -18,10 +18,12 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
        // This delegate does not imply the connecting scene or session are new (see `application:configurationForConnectingSceneSession` instead).

        // Use a UIHostingController as window root view controller
-        let window = UIWindow(frame: UIScreen.main.bounds)
-        window.rootViewController = UIHostingController(rootView: LandmarkList().environmentObject(UserData()))
-        self.window = window
-        window.makeKeyAndVisible()
+        if let windowScene = scene as? UIWindowScene {
+            let window = UIWindow(windowScene: windowScene)
+            window.rootViewController = UIHostingController(rootView: LandmarkList().environmentObject(UserData()))
+            self.window = window
+            window.makeKeyAndVisible()
+        }
    }

    func sceneDidDisconnect(_ scene: UIScene) {
--- a/Projects/InstaFake/Instagram-SWUI/ContentView.swift
+++ b/Projects/InstaFake/Instagram-SWUI/ContentView.swift
@@ -19,7 +19,7 @@ struct ContentView : View {
                ForEach(instaPhotos.identified(by: \.id)) {
                    ImageCell(photo: $0)
                }
-                }.navigationBarTitle(Text("WWDC")).navigationBarItems(trailing: PresentationButton(Text("Camera"), destination: CameraView()))
+            }.navigationBarTitle("WWDC").navigationBarItems(trailing: PresentationLink("Camera", destination: CameraView()))
        }
    }
    
--- a/Projects/InstaFake/Instagram-SWUI/SceneDelegate.swift
+++ b/Projects/InstaFake/Instagram-SWUI/SceneDelegate.swift
@@ -20,11 +20,13 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
        // This delegate does not imply the connecting scene or session are new (see `application:configurationForConnectingSceneSession` instead).

        // Use a UIHostingController as window root view controller
-        let window = UIWindow(frame: UIScreen.main.bounds)
-        window.rootViewController = UIHostingController(rootView: ContentView(instaPhotos: [InstaPhoto(id: 0, username: "leavenstee", comments: ["Nice", "Cool","Lame"], likes: 100, image: "wwdc"),InstaPhoto(id: 0, username: "leavenstee", comments: ["Nice", "Cool","Lame","Nice", "Cool","Lame"], likes: 200, image: "pizza"),
-                                                                                            InstaPhoto(id: 0, username: "leavenstee", comments: ["Nice", "Cool","Lame","Nice", "Cool","Lame","Nice", "Cool","Lame","Nice", "Cool","Lame"], likes: 4440, image: "wwdc"),InstaPhoto(id: 0, username: "leavenstee", comments: ["Nice", "Cool"], likes: 20, image: "badge")]))
-        self.window = window
-        window.makeKeyAndVisible()
+        if let windowScene = scene as? UIWindowScene {
+            let window = UIWindow(windowScene: windowScene)
+            window.rootViewController = UIHostingController(rootView: ContentView(instaPhotos: [InstaPhoto(id: 0, username: "leavenstee", comments: ["Nice", "Cool","Lame"], likes: 100, image: "wwdc"),InstaPhoto(id: 0, username: "leavenstee", comments: ["Nice", "Cool","Lame","Nice", "Cool","Lame"], likes: 200, image: "pizza"),
+                                                                                                InstaPhoto(id: 0, username: "leavenstee", comments: ["Nice", "Cool","Lame","Nice", "Cool","Lame","Nice", "Cool","Lame","Nice", "Cool","Lame"], likes: 4440, image: "wwdc"),InstaPhoto(id: 0, username: "leavenstee", comments: ["Nice", "Cool"], likes: 20, image: "badge")]))
+            self.window = window
+            window.makeKeyAndVisible()
+        }
    }

    func sceneDidDisconnect(_ scene: UIScene) {
--- a/UIKit/Complete/Landmarks/Landmarks/LandmarkList.swift
+++ b/UIKit/Complete/Landmarks/Landmarks/LandmarkList.swift
@@ -19,7 +19,7 @@ struct LandmarkList: View {
                
                ForEach(userData.landmarks) { landmark in
                    if !self.userData.showFavoritesOnly || landmark.isFavorite {
-                        NavigationButton(
+                        NavigationLink(
                        destination: LandmarkDetail(landmark: landmark)) {
                            LandmarkRow(landmark: landmark)
                        }
--- a/Projects/Jike/SwiftUI_Jike/Cell/CategoryRow.swift
+++ b/Projects/Jike/SwiftUI_Jike/Cell/CategoryRow.swift
@@ -12,7 +12,7 @@ struct CategoryRow: View {
    
    var body: some View {
        VStack(alignment: .leading) {
-            ScrollView(showsHorizontalIndicator: false) {
+            ScrollView(.horizontal) {
                HStack(alignment: .top, spacing: 0) {
                    ForEach(self.items.identified(by: \.id)) { zone in
                            CategoryItem(zone: zone)
--- a/Projects/Jike/SwiftUI_Jike/SceneDelegate.swift
+++ b/Projects/Jike/SwiftUI_Jike/SceneDelegate.swift
@@ -20,10 +20,12 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
        // This delegate does not imply the connecting scene or session are new (see `application:configurationForConnectingSceneSession` instead).

        // Use a UIHostingController as window root view controller
-        let window = UIWindow(frame: UIScreen.main.bounds)
-        window.rootViewController = UIHostingController(rootView: ContentView())
-        self.window = window
-        window.makeKeyAndVisible()
+        if let windowScene = scene as? UIWindowScene {
+            let window = UIWindow(windowScene: windowScene)
+            window.rootViewController = UIHostingController(rootView: ContentView())
+            self.window = window
+            window.makeKeyAndVisible()
+        }
    }

    func sceneDidDisconnect(_ scene: UIScene) {
--- a/Projects/Movie/MovieSwift/MovieSwift/flux/state/AppState.swift
+++ b/Projects/Movie/MovieSwift/MovieSwift/flux/state/AppState.swift
@@ -21,7 +21,9 @@ final class AppState: BindableObject {
    
    func dispatch(action: Action) {
        moviesState = MoviesStateReducer().reduce(state: moviesState, action: action)
-        didChange.send(self)
+        DispatchQueue.main.async {
+            self.didChange.send(self)
+        }
    }
 }

--- a/Projects/Movie/MovieSwift/MovieSwift/launch/SceneDelegate.swift
+++ b/Projects/Movie/MovieSwift/MovieSwift/launch/SceneDelegate.swift
@@ -20,10 +20,12 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
        // This delegate does not imply the connecting scene or session are new (see `application:configurationForConnectingSceneSession` instead).

        // Use a UIHostingController as window root view controller
-        let window = UIWindow(frame: UIScreen.main.bounds)
-        window.rootViewController = UIHostingController(rootView: ContentView().environmentObject(store))
-        self.window = window
-        window.makeKeyAndVisible()
+        if let windowScene = scene as? UIWindowScene {
+            let window = UIWindow(windowScene: windowScene)
+            window.rootViewController = UIHostingController(rootView: ContentView().environmentObject(store))
+            self.window = window
+            window.makeKeyAndVisible()
+        }
    }

    func sceneDidDisconnect(_ scene: UIScene) {
--- a/Redux/SwiftUIDemo/SceneDelegate.swift
+++ b/Redux/SwiftUIDemo/SceneDelegate.swift
@@ -15,10 +15,12 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
    
    func scene(_ scene: UIScene, willConnectTo session: UISceneSession, options connectionOptions: UIScene.ConnectionOptions) {

-        let window = UIWindow(frame: UIScreen.main.bounds)
-        window.rootViewController = UIHostingController(rootView: TabbarView().environmentObject(store))
-        self.window = window
-        window.makeKeyAndVisible()
+        if let windowScene = scene as? UIWindowScene {
+            let window = UIWindow(windowScene: windowScene)
+            window.rootViewController = UIHostingController(rootView: TabbarView().environmentObject(store))
+            self.window = window
+            window.makeKeyAndVisible()
+        }
    }
 }

--- a/Redux/SwiftUIDemo/views/users/UsersListView.swift
+++ b/Redux/SwiftUIDemo/views/users/UsersListView.swift
@@ -24,7 +24,7 @@ struct UsersListView : View {
                }
                Section {
                    ForEach(state.usersState.users) {user in
-                        NavigationButton(destination: UserDetailView(userId: user.id)) {
+                        NavigationLink(destination: UserDetailView(userId: user.id)) {
                            UserRow(user: user)
                        }
                    }
--- a/RomanumIl/TempusRomanum/Home.swift
+++ b/RomanumIl/TempusRomanum/Home.swift
@@ -6,6 +6,7 @@ struct Home : View {
    var body: some View {
        VStack {
            Text("Hello World")
+            ClockView()
        }
    }
 }
--- a/RomanumIl/TempusRomanum/SceneDelegate.swift
+++ b/RomanumIl/TempusRomanum/SceneDelegate.swift
@@ -14,10 +14,12 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
        // This delegate does not imply the connecting scene or session are new (see `application:configurationForConnectingSceneSession` instead).

        // Use a UIHostingController as window root view controller
-        let window = UIWindow(frame: UIScreen.main.bounds)
-        window.rootViewController = UIHostingController(rootView: Home())
-        self.window = window
-        window.makeKeyAndVisible()
+        if let windowScene = scene as? UIWindowScene {
+            let window = UIWindow(windowScene: windowScene)
+            window.rootViewController = UIHostingController(rootView: Home())
+            self.window = window
+            window.makeKeyAndVisible()
+        }
    }

    func sceneDidDisconnect(_ scene: UIScene) {
--- a/Travel/SwiftUITimeTravel/SceneDelegate.swift
+++ b/Travel/SwiftUITimeTravel/SceneDelegate.swift
@@ -12,10 +12,12 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
        // This delegate does not imply the connecting scene or session are new (see `application:configurationForConnectingSceneSession` instead).

        // Use a UIHostingController as window root view controller
-        let window = UIWindow(frame: UIScreen.main.bounds)
-        window.rootViewController = UIHostingController(rootView: ContentView())
-        self.window = window
-        window.makeKeyAndVisible()
+        if let windowScene = scene as? UIWindowScene {
+            let window = UIWindow(windowScene: windowScene)
+            window.rootViewController = UIHostingController(rootView: ContentView())
+            self.window = window
+            window.makeKeyAndVisible()
+        }
    }

    func sceneDidDisconnect(_ scene: UIScene) {
--- a/Animation/SwiftUI-BasicAnimation/SceneDelegate.swift
+++ b/Animation/SwiftUI-BasicAnimation/SceneDelegate.swift
@@ -20,10 +20,12 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
        // This delegate does not imply the connecting scene or session are new (see `application:configurationForConnectingSceneSession` instead).

        // Use a UIHostingController as window root view controller
-        let window = UIWindow(frame: UIScreen.main.bounds)
-        window.rootViewController = UIHostingController(rootView: ContentView())
-        self.window = window
-        window.makeKeyAndVisible()
+        if let windowScene = scene as? UIWindowScene {
+            let window = UIWindow(windowScene: windowScene)
+            window.rootViewController = UIHostingController(rootView: ContentView())
+            self.window = window
+            window.makeKeyAndVisible()
+        }
    }

    func sceneDidDisconnect(_ scene: UIScene) {
--- a/Animation/SwiftUI-CardAnimation/SceneDelegate.swift
+++ b/Animation/SwiftUI-CardAnimation/SceneDelegate.swift
@@ -20,10 +20,12 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
        // This delegate does not imply the connecting scene or session are new (see `application:configurationForConnectingSceneSession` instead).

        // Use a UIHostingController as window root view controller
-        let window = UIWindow(frame: UIScreen.main.bounds)
-        window.rootViewController = UIHostingController(rootView: ContentView())
-        self.window = window
-        window.makeKeyAndVisible()
+        if let windowScene = scene as? UIWindowScene {
+            let window = UIWindow(windowScene: windowScene)
+            window.rootViewController = UIHostingController(rootView: ContentView())
+            self.window = window
+            window.makeKeyAndVisible()
+        }
    }

    func sceneDidDisconnect(_ scene: UIScene) {
--- a/Projects/UINote/SwiftUINote/SceneDelegate.swift
+++ b/Projects/UINote/SwiftUINote/SceneDelegate.swift
@@ -20,11 +20,13 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
        // This delegate does not imply the connecting scene or session are new (see `application:configurationForConnectingSceneSession` instead).

        // Use a UIHostingController as window root view controller
-        let window = UIWindow(frame: UIScreen.main.bounds)
-        window.rootViewController = UIHostingController(rootView: NoteList()
-            .environmentObject(UserData()))
-        self.window = window
-        window.makeKeyAndVisible()
+        if let windowScene = scene as? UIWindowScene {
+            let window = UIWindow(windowScene: windowScene)
+            window.rootViewController = UIHostingController(rootView: NoteList()
+                .environmentObject(UserData()))
+            self.window = window
+            window.makeKeyAndVisible()
+        }
    }

    func sceneDidDisconnect(_ scene: UIScene) {
--- a/Projects/UINote/SwiftUINote/Views/NoteList.swift
+++ b/Projects/UINote/SwiftUINote/Views/NoteList.swift
@@ -14,7 +14,7 @@ struct NoteList : View {
    var body: some View {
        NavigationView {
            List(userData.notes) { note in
-                NavigationButton(destination: NoteDetail(note: note)) {
+                NavigationLink(destination: NoteDetail(note: note)) {
                    NoteRow(note: note)
                }
            }
--- a/Projects/WWDCPlayer/WWDCPlayer/Delegates/SceneDelegate.swift
+++ b/Projects/WWDCPlayer/WWDCPlayer/Delegates/SceneDelegate.swift
@@ -20,11 +20,13 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
        // This delegate does not imply the connecting scene or session are new (see `application:configurationForConnectingSceneSession` instead).

        // Use a UIHostingController as window root view controller
-        let window = UIWindow(frame: UIScreen.main.bounds)
-        window.rootViewController = UIHostingController(rootView: MainView()
-            .environmentObject(UserData()))
-        self.window = window
-        window.makeKeyAndVisible()
+        if let windowScene = scene as? UIWindowScene {
+            let window = UIWindow(windowScene: windowScene)
+            window.rootViewController = UIHostingController(rootView: MainView()
+                .environmentObject(UserData()))
+            self.window = window
+            window.makeKeyAndVisible()
+        }
    }

    func sceneDidDisconnect(_ scene: UIScene) {
--- a/UIControls/Complete/Landmarks/Landmarks/LandmarkList.swift
+++ b/UIControls/Complete/Landmarks/Landmarks/LandmarkList.swift
@@ -19,7 +19,7 @@ struct LandmarkList: View {
                
                ForEach(userData.landmarks) { landmark in
                    if !self.userData.showFavoritesOnly || landmark.isFavorite {
-                        NavigationButton(
+                        NavigationLink(
                        destination: LandmarkDetail(landmark: landmark)) {
                            LandmarkRow(landmark: landmark)
                        }