👽️ Update chapter 15 for iOS 16

peterfriese · peterfriese · commit 50e63881f11d · 2022-10-02T12:56:25.000+02:00
diff --git a/Chapter 15 - Using async await in SwiftUI/WordBrowser/WordBrowser.xcodeproj/project.pbxproj b/Chapter 15 - Using async await in SwiftUI/WordBrowser/WordBrowser.xcodeproj/project.pbxproj
@@ -337,15 +337,15 @@
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_ASSET_PATHS = "\"WordBrowser/Preview Content\"";
-				DEVELOPMENT_TEAM = YGAZHQXHH4;
+				DEVELOPMENT_TEAM = "";
 				ENABLE_PREVIEWS = YES;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES;
 				INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
 				INFOPLIST_KEY_UILaunchScreen_Generation = YES;
 				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
 				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
-				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 16.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -367,15 +367,15 @@
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_ASSET_PATHS = "\"WordBrowser/Preview Content\"";
-				DEVELOPMENT_TEAM = YGAZHQXHH4;
+				DEVELOPMENT_TEAM = "";
 				ENABLE_PREVIEWS = YES;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES;
 				INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
 				INFOPLIST_KEY_UILaunchScreen_Generation = YES;
 				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
 				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
-				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 16.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
diff --git a/Chapter 15 - Using async await in SwiftUI/WordBrowser/WordBrowser/Views/AddWordView.swift b/Chapter 15 - Using async await in SwiftUI/WordBrowser/WordBrowser/Views/AddWordView.swift
@@ -42,7 +42,7 @@ struct AddWordView: View {
 
 struct AddWordView_Previews: PreviewProvider {
   static var previews: some View {
-    NavigationView {
+    NavigationStack {
       AddWordView { word in
         print(word)
       }
diff --git a/Chapter 15 - Using async await in SwiftUI/WordBrowser/WordBrowser/Views/LibraryView.swift b/Chapter 15 - Using async await in SwiftUI/WordBrowser/WordBrowser/Views/LibraryView.swift
@@ -23,6 +23,11 @@ import Combine
 //
 // To resolve this issue, we only mark the functions that actually make changes to published properties
 // using @MainActor.
+//
+// Change for Swift 5.7 / Xcode 14: This has been fixed, and it's now possible to initialise an ObservableObject
+// that is marked as @MainActor like this:
+//   @StateObject var viewModel = WordDetailsViewModel()
+//
 class LibraryViewModel: ObservableObject {
   @Published var searchText = ""
   @Published var randomWord = "partially"
@@ -70,6 +75,7 @@ class LibraryViewModel: ObservableObject {
         throw WordsAPIError.invalidServerResponse
       }
       let word = try JSONDecoder().decode(Word.self, from: data)
+      print("\(#function) is on main thread: \(Thread.isMainThread)")
       return word
     }
     catch {
@@ -103,7 +109,9 @@ struct LibraryView: View {
     .searchable(text: $viewModel.searchText)
     .autocapitalization(.none)
     .refreshable {
+      print("\(#function) is on main thread BEFORE await: \(Thread.isMainThread)")
       await viewModel.refresh()
+      print("\(#function) is on main thread AFTER await: \(Thread.isMainThread)")
     }
     .listStyle(.insetGrouped)
     .navigationTitle("Library")
@@ -115,7 +123,7 @@ struct LibraryView: View {
       }
     }
     .sheet(isPresented: $isAddNewWordDialogPresented) {
-      NavigationView {
+      NavigationStack {
         AddWordView { newWord in
           viewModel.addFavourite(newWord)
         }
@@ -166,7 +174,7 @@ struct LibraryRowView: View {
 
 struct LibraryView_Previews: PreviewProvider {
   static var previews: some View {
-    NavigationView {
+    NavigationStack {
       LibraryView()
     }
   }
diff --git a/Chapter 15 - Using async await in SwiftUI/WordBrowser/WordBrowser/Views/WordDetailsView.swift b/Chapter 15 - Using async await in SwiftUI/WordBrowser/WordBrowser/Views/WordDetailsView.swift
@@ -106,7 +106,7 @@ struct WordDetailsView: View {
 
 struct WordDetailsView_Previews: PreviewProvider {
   static var previews: some View {
-    NavigationView {
+    NavigationStack {
       WordDetailsView(word: "Swift")
     }
   }
diff --git a/Chapter 15 - Using async await in SwiftUI/WordBrowser/WordBrowser/Views/WordSearchView.swift b/Chapter 15 - Using async await in SwiftUI/WordBrowser/WordBrowser/Views/WordSearchView.swift
@@ -101,7 +101,7 @@ struct WordSearchView: View {
 
 struct WordSearchView_Previews: PreviewProvider {
   static var previews: some View {
-    NavigationView {
+    NavigationStack {
       WordSearchView()
     }
   }
diff --git a/Chapter 15 - Using async await in SwiftUI/WordBrowser/WordBrowser/WordBrowserApp.swift b/Chapter 15 - Using async await in SwiftUI/WordBrowser/WordBrowser/WordBrowserApp.swift
@@ -11,7 +11,7 @@ import SwiftUI
 struct WordBrowserApp: App {
   var body: some Scene {
     WindowGroup {
-      NavigationView {
+      NavigationStack {
         LibraryView()
       }
     }

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ struct AddWordView: View {`
`42`	`42`
`43`	`43`	`struct AddWordView_Previews: PreviewProvider {`
`44`	`44`	`static var previews: some View {`
`45`		`- NavigationView {`
	`45`	`+ NavigationStack {`
`46`	`46`	`AddWordView { word in`
`47`	`47`	`print(word)`
`48`	`48`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,11 @@ import Combine`
`23`	`23`	`//`
`24`	`24`	`// To resolve this issue, we only mark the functions that actually make changes to published properties`
`25`	`25`	`// using @MainActor.`
	`26`	`+//`
	`27`	`+// Change for Swift 5.7 / Xcode 14: This has been fixed, and it's now possible to initialise an ObservableObject`
	`28`	`+// that is marked as @MainActor like this:`
	`29`	`+// @StateObject var viewModel = WordDetailsViewModel()`
	`30`	`+//`
`26`	`31`	`class LibraryViewModel: ObservableObject {`
`27`	`32`	`@Published var searchText = ""`
`28`	`33`	`@Published var randomWord = "partially"`
`@@ -70,6 +75,7 @@ class LibraryViewModel: ObservableObject {`
`70`	`75`	`throw WordsAPIError.invalidServerResponse`
`71`	`76`	`}`
`72`	`77`	`let word = try JSONDecoder().decode(Word.self, from: data)`
	`78`	`+ print("\(#function) is on main thread: \(Thread.isMainThread)")`
`73`	`79`	`return word`
`74`	`80`	`}`
`75`	`81`	`catch {`
`@@ -103,7 +109,9 @@ struct LibraryView: View {`
`103`	`109`	`.searchable(text: $viewModel.searchText)`
`104`	`110`	`.autocapitalization(.none)`
`105`	`111`	`.refreshable {`
	`112`	`+ print("\(#function) is on main thread BEFORE await: \(Thread.isMainThread)")`
`106`	`113`	`await viewModel.refresh()`
	`114`	`+ print("\(#function) is on main thread AFTER await: \(Thread.isMainThread)")`
`107`	`115`	`}`
`108`	`116`	`.listStyle(.insetGrouped)`
`109`	`117`	`.navigationTitle("Library")`
`@@ -115,7 +123,7 @@ struct LibraryView: View {`
`115`	`123`	`}`
`116`	`124`	`}`
`117`	`125`	`.sheet(isPresented: $isAddNewWordDialogPresented) {`
`118`		`- NavigationView {`
	`126`	`+ NavigationStack {`
`119`	`127`	`AddWordView { newWord in`
`120`	`128`	`viewModel.addFavourite(newWord)`
`121`	`129`	`}`
`@@ -166,7 +174,7 @@ struct LibraryRowView: View {`
`166`	`174`
`167`	`175`	`struct LibraryView_Previews: PreviewProvider {`
`168`	`176`	`static var previews: some View {`
`169`		`- NavigationView {`
	`177`	`+ NavigationStack {`
`170`	`178`	`LibraryView()`
`171`	`179`	`}`
`172`	`180`	`}`
Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ struct WordDetailsView: View {`
`106`	`106`
`107`	`107`	`struct WordDetailsView_Previews: PreviewProvider {`
`108`	`108`	`static var previews: some View {`
`109`		`- NavigationView {`
	`109`	`+ NavigationStack {`
`110`	`110`	`WordDetailsView(word: "Swift")`
`111`	`111`	`}`
`112`	`112`	`}`
Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,7 @@ struct WordSearchView: View {`
`101`	`101`
`102`	`102`	`struct WordSearchView_Previews: PreviewProvider {`
`103`	`103`	`static var previews: some View {`
`104`		`- NavigationView {`
	`104`	`+ NavigationStack {`
`105`	`105`	`WordSearchView()`
`106`	`106`	`}`
`107`	`107`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ import SwiftUI`
`11`	`11`	`struct WordBrowserApp: App {`
`12`	`12`	`var body: some Scene {`
`13`	`13`	`WindowGroup {`
`14`		`- NavigationView {`
	`14`	`+ NavigationStack {`
`15`	`15`	`LibraryView()`
`16`	`16`	`}`
`17`	`17`	`}`