Merge pull request #15 from johnno1962/xcode-11-beta4

Xcode 11 beta4

Other Projects/2048 Game/SwiftUI2048/AppDelegate.swift

@@ -38,14 +38,14 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         gameLogic.newGame()
     }
     
-    override func buildCommands(with builder: UICommandBuilder) {
+    override func buildMenu(with builder: UIMenuBuilder) {
         builder.remove(menu: .edit)
         builder.remove(menu: .format)
         builder.remove(menu: .view)
         
         builder.replaceChildren(ofMenu: .file) { oldChildren in
             var newChildren = oldChildren
-            let newGameItem = UIMutableKeyCommand(input: "N",
+            let newGameItem = UIKeyCommand(input: "N",
                                                   modifierFlags: .command,
                                                   action: #selector(newGame(_:)))
             newGameItem.title = "New Game"

Other Projects/2048 Game/SwiftUI2048/Models/GameLogic.swift

@@ -21,7 +21,7 @@ final class GameLogic : BindableObject {
     
     typealias BlockMatrixType = BlockMatrix<IdentifiedBlock>
     
-    let didChange = PassthroughSubject<GameLogic, Never>()
+    let willChange = PassthroughSubject<GameLogic, Never>()
     
     fileprivate var _blockMatrix: BlockMatrixType!
     var blockMatrix: BlockMatrixType {
@@ -42,12 +42,12 @@ final class GameLogic : BindableObject {
         _blockMatrix = BlockMatrixType()
         generateNewBlocks()
         
-        didChange.send(self)
+        willChange.send(self)
     }
     
     func move(_ direction: Direction) {
         defer {
-            didChange.send(self)
+            willChange.send(self)
         }
         
         var moved = false
@@ -136,7 +136,7 @@ final class GameLogic : BindableObject {
         
         // Don't forget to sync data.
         defer {
-            didChange.send(self)
+            willChange.send(self)
         }
         
         // Place the first block.

Other Projects/2048 Game/SwiftUI2048/Views/BlockView.swift

@@ -86,7 +86,7 @@ struct BlockView : View {
             
             Text(numberText)
                 .font(Font.system(size: fontSize).bold())
-                .color(colorPair.1)
+                .foregroundColor(colorPair.1)
                 .id(numberText)
                 .transition(AnyTransition.scale(scale: 0.5, anchor: .center).combined(with: .opacity))
                 .animation(.fluidSpring())

Other Projects/2048 Game/SwiftUI2048/Views/GameView.swift

@@ -94,7 +94,7 @@ struct GameView : View {
                 ZStack(alignment: layoutTraits.containerAlignment) {
                     Text("2048")
                         .font(Font.system(size: 48).weight(.black))
-                        .color(Color(red:0.47, green:0.43, blue:0.40, opacity:1.00))
+                        .foregroundColor(Color(red:0.47, green:0.43, blue:0.40, opacity:1.00))
                         .offset(layoutTraits.bannerOffset)
                     
                     ZStack(alignment: .top) {

Other Projects/Animating Views And Transitions/Complete/Landmarks/Landmarks/HikeView.swift

@@ -14,7 +14,7 @@ struct HikeView: View {
     var transition: AnyTransition {
         let insertion = AnyTransition.move(edge: .trailing)
             .combined(with: .opacity)
-        let removal = AnyTransition.scale()
+        let removal = AnyTransition.scale(scale: 0.0)
             .combined(with: .opacity)
         return .asymmetric(insertion: insertion, removal: removal)
     }

Other Projects/Animating Views And Transitions/Complete/Landmarks/Landmarks/LandmarkList.swift

@@ -35,7 +35,7 @@ struct LandmarkList: View {
 #if DEBUG
 struct LandmarksList_Previews: PreviewProvider {
     static var previews: some View {
-        ForEach(["iPhone SE", "iPhone XS Max"].identified(by: \.self)) { deviceName in
+        ForEach(["iPhone SE", "iPhone XS Max"], id: \.self) { deviceName in
             LandmarkList()
                 .previewDevice(PreviewDevice(rawValue: deviceName))
                 .previewDisplayName(deviceName)

Other Projects/Animating Views And Transitions/Complete/Landmarks/Landmarks/Models/UserData.swift

@@ -9,17 +9,17 @@ import Combine
 import SwiftUI
 
 final class UserData: BindableObject {
-    let didChange = PassthroughSubject<UserData, Never>()
+    let willChange = PassthroughSubject<UserData, Never>()
     
     var showFavoritesOnly = false {
         didSet {
-            didChange.send(self)
+            willChange.send(self)
         }
     }
 
     var landmarks = landmarkData {
         didSet {
-            didChange.send(self)
+            willChange.send(self)
         }
     }
 }

Other Projects/Building Lists And Navigation/Complete/Landmarks/Landmarks/LandmarkList.swift

@@ -23,7 +23,7 @@ struct LandmarkList: View {
 #if DEBUG
 struct LandmarkList_Previews: PreviewProvider {
     static var previews: some View {
-        ForEach(["iPhone SE", "iPhone XS Max"].identified(by: \.self)) { deviceName in
+        ForEach(["iPhone SE", "iPhone XS Max"], id: \.self) { deviceName in
             LandmarkList()
                 .previewDevice(PreviewDevice(rawValue: deviceName))
                 .previewDisplayName(deviceName)

Other Projects/Calculator/Calculator/Calculator/Calculator.swift

@@ -33,13 +33,13 @@ struct Calculator: View {
         .padding(margin)
       
       VStack(alignment: .center, spacing: margin) {
-        ForEach(data.identified(by: \.description)) { items in
+        ForEach(data, id: \.description) { items in
           HStack(alignment: .center, spacing: margin) {
-            ForEach(items.identified(by: \.description)) { item in
+            ForEach(items, id: \.description) { item in
               Text(item)
                 .font(.title)
                 .bold()
-                .color(Color.blue)
+                .foregroundColor(Color.blue)
                 .frame(minWidth: 0, maxWidth: .infinity, minHeight: 0, maxHeight: .infinity)
                 .background(Color(red: 234 / 255.0, green: 240 / 255.0, blue: 241 / 255.0))
                 .tapAction {

Other Projects/Combine using GitHub API/SwiftUI-Combine-Example/FoundationExtensions.swift

@@ -40,7 +40,7 @@ extension Publisher {
 extension Publisher {
 
     static func empty() -> AnyPublisher<Output, Failure> {
-        return Publishers.Empty()
+        return Empty()
             .eraseToAnyPublisher()
     }
 
@@ -51,7 +51,7 @@ extension Publisher {
     }
 
     static func fail(_ error: Failure) -> AnyPublisher<Output, Failure> {
-        return Publishers.Fail(error: error)
+        return Fail(error: error)
             .eraseToAnyPublisher()
     }
 }

Other Projects/Combine using GitHub API/SwiftUI-Combine-Example/SearchUserBar.swift

@@ -10,7 +10,7 @@ struct SearchUserBar: View {
                 TextField(
                     $text,
                     placeholder: Text("Search User")
-                        .color(Color.gray)
+                        .foregroundColor(Color.gray)
                     )
                     .padding([.leading, .trailing], 8)
                     .frame(height: 32)

Other Projects/Combine using GitHub API/SwiftUI-Combine-Example/SearchUserViewModel.swift

@@ -2,17 +2,17 @@ import SwiftUI
 import Combine
 
 final class SearchUserViewModel: BindableObject {
-    var didChange = PassthroughSubject<SearchUserViewModel, Never>()
+    var willChange = PassthroughSubject<SearchUserViewModel, Never>()
 
     private(set) var users = [User]() {
         didSet {
-            didChange.send(self)
+            willChange.send(self)
         }
     }
 
     private(set) var userImages = [User: UIImage]() {
         didSet {
-            didChange.send(self)
+            willChange.send(self)
         }
     }
 

Other Projects/Composing Complex Interfaces/Complete/Landmarks/Landmarks/CategoryRow.swift

@@ -20,7 +20,7 @@ struct CategoryRow: View {
             
             ScrollView(.horizontal) {
                 HStack(alignment: .top, spacing: 0) {
-                    ForEach(self.items.identified(by: \.name)) { landmark in
+                    ForEach(self.items, id: \.name) { landmark in
                         NavigationLink(
                             destination: LandmarkDetail(
                                 landmark: landmark
@@ -45,7 +45,7 @@ struct CategoryItem: View {
                 .renderingMode(.original)
                 .cornerRadius(5)
             Text(landmark.name)
-                .color(.primary)
+                .foregroundColor(.primary)
                 .font(.caption)
         }
         .padding(.leading, 15)

Other Projects/Composing Complex Interfaces/Complete/Landmarks/Landmarks/HikeDetail.swift

@@ -23,13 +23,13 @@ struct HikeDetail: View {
                 .frame(height: 200, alignment: .center)
             
             HStack(spacing: 25) {
-                ForEach(buttons.identified(by: \.0)) { value in
+                ForEach(buttons, id: \.0) { value in
                     Button(action: {
                         self.dataToShow = value.1
                     }) {
                         Text(verbatim: value.0)
                             .font(.system(size: 15))
-                            .color(value.1 == self.dataToShow
+                            .foregroundColor(value.1 == self.dataToShow
                                 ? Color.gray
                                 : Color.accentColor)
                             .animation(nil)

Other Projects/Composing Complex Interfaces/Complete/Landmarks/Landmarks/HikeView.swift

@@ -14,7 +14,7 @@ struct HikeView: View {
     var transition: AnyTransition {
         let insertion = AnyTransition.move(edge: .trailing)
             .combined(with: .opacity)
-        let removal = AnyTransition.scale()
+        let removal = AnyTransition.scale(scale: 0.0)
             .combined(with: .opacity)
         return .asymmetric(insertion: insertion, removal: removal)
     }

Other Projects/Composing Complex Interfaces/Complete/Landmarks/Landmarks/Home.swift

@@ -28,7 +28,7 @@ struct CategoryHome: View {
                     .clipped()
                     .listRowInsets(EdgeInsets())
                 
-                ForEach(categories.keys.sorted().identified(by: \.self)) { key in
+                ForEach(categories.keys.sorted(), id: \.self) { key in
                     CategoryRow(categoryName: key, items: self.categories[key]!)
                 }
                 .listRowInsets(EdgeInsets())

Other Projects/Composing Complex Interfaces/Complete/Landmarks/Landmarks/LandmarkList.swift

@@ -35,7 +35,7 @@ struct LandmarkList: View {
 #if DEBUG
 struct LandmarksList_Previews: PreviewProvider {
     static var previews: some View {
-        ForEach(["iPhone SE", "iPhone XS Max"].identified(by: \.self)) { deviceName in
+        ForEach(["iPhone SE", "iPhone XS Max"], id: \.self) { deviceName in
             LandmarkList()
                 .previewDevice(PreviewDevice(rawValue: deviceName))
                 .previewDisplayName(deviceName)

Other Projects/Composing Complex Interfaces/Complete/Landmarks/Landmarks/Models/UserData.swift

@@ -9,17 +9,17 @@ import Combine
 import SwiftUI
 
 final class UserData: BindableObject {
-    let didChange = PassthroughSubject<UserData, Never>()
+    let willChange = PassthroughSubject<UserData, Never>()
     
     var showFavoritesOnly = false {
         didSet {
-            didChange.send(self)
+            willChange.send(self)
         }
     }
 
     var landmarks = landmarkData {
         didSet {
-            didChange.send(self)
+            willChange.send(self)
         }
     }
 }

Other Projects/Currency-SwiftUI/Currency-SwiftUI/ConverterView.swift

@@ -39,14 +39,14 @@ struct ConverterView : View {
         return ZStack(alignment: Alignment.bottomTrailing) {
             NavigationView {
             VStack(alignment: .leading){
-                Text("From:").bold().color(.gray)
+                Text("From:").bold().foregroundColor(.gray)
                 HStack{
                     // Flag
                     Text("\(userData.baseCurrency.flag)").padding(5)
                     // Code and name
                     VStack(alignment: .leading){
-                        Text(userData.baseCurrency.code).color(.white)
-                        Text(userData.baseCurrency.name).color(.white)
+                        Text(userData.baseCurrency.code).foregroundColor(.white)
+                        Text(userData.baseCurrency.name).foregroundColor(.white)
                     }
                     Spacer()
                     // Amount and conversion
@@ -60,7 +60,7 @@ struct ConverterView : View {
                                 .padding(inset)
                         )
                 }.background(Color.blue).cornerRadius(5)
-                Text("To:").bold().color(.gray)
+                Text("To:").bold().foregroundColor(.gray)
                 List {
                     // TODO: should filter out BaseCurrency from list
                     ForEach(userData.userCurrency) { currency in
@@ -79,7 +79,8 @@ struct ConverterView : View {
                         }
                     })
                 HStack {
-                Text("Last updated: \(self.lastUpdated)").color(.gray).bold()
+                    Text("Last updated: \(self.lastUpdated)")
+                        .foregroundColor(.gray).bold()
                 Spacer()
 
             NavigationLink(destination: AddCurrencyView().environmentObject(self.userData)) {

Other Projects/Currency-SwiftUI/Currency-SwiftUI/CurrencyItemView.swift

@@ -49,7 +49,7 @@ struct CurrencyItemView: View {
                     Text(currency.flag).font(.title)
                     VStack(alignment: .leading){
                         Text(currency.code)
-                        Text(currency.name).color(.gray)
+                        Text(currency.name).foregroundColor(.gray)
                     }
                 }
             }
@@ -61,14 +61,15 @@ struct CurrencyItemView: View {
                     // Code and name
                     VStack(alignment: .leading){
                         Text(currency.code).font(.headline)
-                        Text(currency.name).font(.footnote).color(.gray)
+                        Text(currency.name).font(.footnote).foregroundColor(.gray)
                     }
                     Spacer()
                     // Amount and conversion
                     VStack(alignment: .trailing){
                         Text("\(totalAmount)")
                         // Would be 1 this currency = xxx base currency
-                        Text("1 \(currency.code) = \(converstionRate) \(userData.baseCurrency.code)").color(.gray)
+                        Text("1 \(currency.code) = \(converstionRate) \(userData.baseCurrency.code)")
+                            .foregroundColor(.gray)
                     }
                 }
             }

Other Projects/Currency-SwiftUI/Currency-SwiftUI/UserData.swift

@@ -32,13 +32,13 @@ private let defaultCurrencies: [Currency] = [
     Currency(name: "Canadian dollar", rate: 1.0, symbol: "CA", code: "CAD")
 ]
 
-@propertyDelegate
+@propertyWrapper
 struct UserDefaultValue<Value: Codable> {
     
     let key: String
     let defaultValue: Value
     
-    var value: Value {
+    var wrappedValue: Value {
         get {
             let data = UserDefaults.standard.data(forKey: key)
             let value = data.flatMap { try? JSONDecoder().decode(Value.self, from: $0) }
@@ -52,26 +52,26 @@ struct UserDefaultValue<Value: Codable> {
 }
 
 final class UserData: BindableObject {
-    let didChange = PassthroughSubject<UserData, Never>()
+    let willChange = PassthroughSubject<UserData, Never>()
     
     @UserDefaultValue(key: "allCurrencies", defaultValue: defaultCurrencies)
     var allCurrencies: [Currency] {
         didSet {
-            didChange.send(self)
+            willChange.send(self)
         }
     }
     
     @UserDefaultValue(key: "baseCurrency", defaultValue: defaultCurrencies[0])
     var baseCurrency: Currency {
         didSet {
-            didChange.send(self)
+            willChange.send(self)
         }
     }
     
     @UserDefaultValue(key: "userCurrency", defaultValue: defaultCurrencies)
     var userCurrency: [Currency] {
         didSet {
-            didChange.send(self)
+            willChange.send(self)
         }
     }
 }

Other Projects/Drawing Paths And Shapes/Complete/Landmarks/Landmarks/LandmarkList.swift

@@ -35,7 +35,7 @@ struct LandmarkList: View {
 #if DEBUG
 struct LandmarksList_Previews: PreviewProvider {
     static var previews: some View {
-        ForEach(["iPhone SE", "iPhone XS Max"].identified(by: \.self)) { deviceName in
+        ForEach(["iPhone SE", "iPhone XS Max"], id: \.self) { deviceName in
             LandmarkList()
                 .previewDevice(PreviewDevice(rawValue: deviceName))
                 .previewDisplayName(deviceName)

Other Projects/Drawing Paths And Shapes/Complete/Landmarks/Landmarks/Models/UserData.swift

@@ -9,17 +9,17 @@ import Combine
 import SwiftUI
 
 final class UserData: BindableObject {
-    let didChange = PassthroughSubject<UserData, Never>()
+    let willChange = PassthroughSubject<UserData, Never>()
     
     var showFavoritesOnly = false {
         didSet {
-            didChange.send(self)
+            willChange.send(self)
         }
     }
 
     var landmarks = landmarkData {
         didSet {
-            didChange.send(self)
+            willChange.send(self)
         }
     }
 }

Other Projects/Example To-Do App/SwiftUITodo/UserData.swift

@@ -15,12 +15,12 @@ private let defaultTasks: [Task] = [
 ]
 
 final class UserData: BindableObject {
-  let didChange = PassthroughSubject<UserData, Never>()
+  let willChange = PassthroughSubject<UserData, Never>()
 
   @UserDefaultValue(key: "Tasks", defaultValue: defaultTasks)
   var tasks: [Task] {
     didSet {
-      didChange.send(self)
+      willChange.send(self)
     }
   }
 }

Other Projects/Example To-Do App/SwiftUITodo/UserDefaultsValue.swift

@@ -8,13 +8,13 @@
 
 import Foundation
 
-@propertyDelegate
+@propertyWrapper
 struct UserDefaultValue<Value: Codable> {
 
     let key: String
     let defaultValue: Value
 
-    var value: Value {
+    var wrappedValue: Value {
         get {
             let data = UserDefaults.standard.data(forKey: key)
             let value = data.flatMap { try? JSONDecoder().decode(Value.self, from: $0) }

Other Projects/Flux/SwiftUI-Flux/Store.swift

@@ -4,7 +4,7 @@ import Combine
 final class Store<State, Action>: BindableObject {
     typealias Reducer = (State, Action) -> State
 
-    let didChange = PassthroughSubject<State, Never>()
+    let willChange = PassthroughSubject<State, Never>()
 
     var state: State {
         lock.lock()
@@ -29,6 +29,6 @@ final class Store<State, Action>: BindableObject {
 
         lock.unlock()
 
-        didChange.send(newState)
+        willChange.send(newState)
     }
 }

Other Projects/GitHub Search/GitHubSearchWithSwiftUI/Extension/Publisher.Extension.swift

@@ -19,7 +19,7 @@ extension Publisher {
 extension Publisher {
 
     static func empty() -> AnyPublisher<Output, Failure> {
-        return Publishers.Empty()
+        return Empty()
             .eraseToAnyPublisher()
     }
 
@@ -30,7 +30,7 @@ extension Publisher {
     }
 
     static func fail(_ error: Failure) -> AnyPublisher<Output, Failure> {
-        return Publishers.Fail(error: error)
+        return Fail(error: error)
             .eraseToAnyPublisher()
     }
 }

Other Projects/GitHub Search/GitHubSearchWithSwiftUI/View/RepositoryListViewModel.swift

@@ -13,7 +13,7 @@ import SwiftUI
 final class RepositoryListViewModel: BindableObject {
     typealias SearchRepositories = (String) -> AnyPublisher<Result<[Repository], ErrorResponse>, Never>
 
-    let didChange: AnyPublisher<RepositoryListViewModel, Never>
+    let willChange: AnyPublisher<RepositoryListViewModel, Never>
     private let _didChange = PassthroughSubject<RepositoryListViewModel, Never>()
 
     private let _searchWithQuery = PassthroughSubject<String, Never>()
@@ -34,7 +34,7 @@ final class RepositoryListViewModel: BindableObject {
     init<S: Scheduler>(searchRepositories: @escaping SearchRepositories = RepositoryAPI.search,
                        mainScheduler: S) {
 
-        self.didChange = _didChange.eraseToAnyPublisher()
+        self.willChange = _didChange.eraseToAnyPublisher()
 
         let response = _searchWithQuery
             .filter { !$0.isEmpty }

Other Projects/Handling User Input/Complete/Landmarks/Landmarks/LandmarkList.swift

@@ -35,7 +35,7 @@ struct LandmarkList: View {
 #if DEBUG
 struct LandmarksList_Previews: PreviewProvider {
     static var previews: some View {
-        ForEach(["iPhone SE", "iPhone XS Max"].identified(by: \.self)) { deviceName in
+        ForEach(["iPhone SE", "iPhone XS Max"], id: \.self) { deviceName in
             LandmarkList()
                 .previewDevice(PreviewDevice(rawValue: deviceName))
                 .previewDisplayName(deviceName)

Other Projects/Handling User Input/Complete/Landmarks/Landmarks/Models/UserData.swift

@@ -9,17 +9,17 @@ import Combine
 import SwiftUI
 
 final class UserData: BindableObject {
-    let didChange = PassthroughSubject<UserData, Never>()
+    let willChange = PassthroughSubject<UserData, Never>()
     
     var showFavoritesOnly = false {
         didSet {
-            didChange.send(self)
+            willChange.send(self)
         }
     }
 
     var landmarks = landmarkData {
         didSet {
-            didChange.send(self)
+            willChange.send(self)
         }
     }
 }

Other Projects/InstaFake/Instagram-SWUI/ContentView.swift

@@ -16,7 +16,7 @@ struct ContentView : View {
     var body: some View {
         NavigationView {
             List {
-                ForEach(instaPhotos.identified(by: \.id)) {
+                ForEach(instaPhotos, id: \.id) {
                     ImageCell(photo: $0)
                 }
             }.navigationBarTitle("WWDC").navigationBarItems(trailing: PresentationLink("Camera", destination: CameraView()))

Other Projects/Interfacing With UIKit/Complete/Landmarks/Landmarks/CategoryRow.swift

@@ -20,7 +20,7 @@ struct CategoryRow: View {
             
             ScrollView(.horizontal) {
                 HStack(alignment: .top, spacing: 0) {
-                    ForEach(self.items.identified(by: \.name)) { landmark in
+                    ForEach(self.items, id: \.name) { landmark in
                         NavigationLink(
                             destination: LandmarkDetail(
                                 landmark: landmark
@@ -45,7 +45,7 @@ struct CategoryItem: View {
                 .renderingMode(.original)
                 .cornerRadius(5)
             Text(landmark.name)
-                .color(.primary)
+                .foregroundColor(.primary)
                 .font(.caption)
         }
         .padding(.leading, 15)

Other Projects/Interfacing With UIKit/Complete/Landmarks/Landmarks/HikeDetail.swift

@@ -23,13 +23,13 @@ struct HikeDetail: View {
                 .frame(height: 200, alignment: .center)
             
             HStack(spacing: 25) {
-                ForEach(buttons.identified(by: \.0)) { value in
+                ForEach(buttons, id: \.0) { value in
                     Button(action: {
                         self.dataToShow = value.1
                     }) {
                         Text(verbatim: value.0)
                             .font(.system(size: 15))
-                            .color(value.1 == self.dataToShow
+                            .foregroundColor(value.1 == self.dataToShow
                                 ? Color.gray
                                 : Color.accentColor)
                             .animation(nil)

Other Projects/Interfacing With UIKit/Complete/Landmarks/Landmarks/HikeView.swift

@@ -14,7 +14,7 @@ struct HikeView: View {
     var transition: AnyTransition {
         let insertion = AnyTransition.move(edge: .trailing)
             .combined(with: .opacity)
-        let removal = AnyTransition.scale()
+        let removal = AnyTransition.scale(scale: 0.0)
             .combined(with: .opacity)
         return .asymmetric(insertion: insertion, removal: removal)
     }

Other Projects/Interfacing With UIKit/Complete/Landmarks/Landmarks/Home.swift

@@ -28,7 +28,7 @@ struct CategoryHome: View {
                     .clipped()
                     .listRowInsets(EdgeInsets())
                 
-                ForEach(categories.keys.sorted().identified(by: \.self)) { key in
+                ForEach(categories.keys.sorted(), id: \.self) { key in
                     CategoryRow(categoryName: key, items: self.categories[key]!)
                 }
                 .listRowInsets(EdgeInsets())

Other Projects/Interfacing With UIKit/Complete/Landmarks/Landmarks/LandmarkList.swift

@@ -35,7 +35,7 @@ struct LandmarkList: View {
 #if DEBUG
 struct LandmarksList_Previews: PreviewProvider {
     static var previews: some View {
-        ForEach(["iPhone SE", "iPhone XS Max"].identified(by: \.self)) { deviceName in
+        ForEach(["iPhone SE", "iPhone XS Max"], id: \.self) { deviceName in
             LandmarkList()
                 .previewDevice(PreviewDevice(rawValue: deviceName))
                 .previewDisplayName(deviceName)

Other Projects/Interfacing With UIKit/Complete/Landmarks/Landmarks/Models/UserData.swift

@@ -9,17 +9,17 @@ import Combine
 import SwiftUI
 
 final class UserData: BindableObject {
-    let didChange = PassthroughSubject<UserData, Never>()
+    let willChange = PassthroughSubject<UserData, Never>()
     
     var showFavoritesOnly = false {
         didSet {
-            didChange.send(self)
+            willChange.send(self)
         }
     }
 
     var landmarks = landmarkData {
         didSet {
-            didChange.send(self)
+            willChange.send(self)
         }
     }
 }

Other Projects/Jike/SwiftUI_Jike/ActivityView.swift

@@ -31,7 +31,7 @@ struct ActivityView : View {
                 CircleImage(imgName: "subIcon")
                 .padding(.leading, 10)
                 Text("发布动态...")
-                    .color(Color.gray)
+                    .foregroundColor(Color.gray)
                 Spacer()
             }
             HStack{

Other Projects/Jike/SwiftUI_Jike/Cell/ActivityCell.swift

@@ -32,7 +32,7 @@ struct ActivityCell : View {
                     }
                     Text(timeStamp)
                     .font(Font.system(size: 12))
-                    .color(Color.gray)
+                    .foregroundColor(Color.gray)
                     .padding(.bottom, 2)
                     
                     Text(content)

Other Projects/Jike/SwiftUI_Jike/Cell/CategoryRow.swift

@@ -14,7 +14,7 @@ struct CategoryRow: View {
         VStack(alignment: .leading) {
             ScrollView(.horizontal) {
                 HStack(alignment: .top, spacing: 0) {
-                    ForEach(self.items.identified(by: \.id)) { zone in
+                    ForEach(self.items, id: \.id) { zone in
                             CategoryItem(zone: zone)
                     }
                 }

Other Projects/Jike/SwiftUI_Jike/Cell/ChatCell.swift

@@ -20,7 +20,7 @@ struct ChatCell : View {
                     .bold()
                     .padding(.top, 4)
                     Text(subTitle)
-                    .color(Color.gray)
+                    .foregroundColor(Color.gray)
                     .padding(.bottom, 8)
                 }
                 Spacer()

Other Projects/Jike/SwiftUI_Jike/Cell/HomeCell.swift

@@ -32,7 +32,7 @@ struct HomeCell : View {
                             .bold()
                         Text(timeStamp)
                             .font(Font.system(size: 12))
-                            .color(Color.gray)
+                            .foregroundColor(Color.gray)
                             .padding(.top, 8)
                     }
                     Spacer()
@@ -57,7 +57,7 @@ struct HomeCell : View {
                         .bold()
                     Text("发布")
                         .font(Font.system(size: 13))
-                        .color(Color.gray)
+                        .foregroundColor(Color.gray)
                     Spacer()
                 }
                 

Other Projects/Jike/SwiftUI_Jike/Cell/ZoneCell.swift

@@ -16,7 +16,7 @@ struct ZoneCell : View {
             Image(imgName)
             Text(title)
             .font(Font.system(size: 10))
-            .color(Color.gray)
+            .foregroundColor(Color.gray)
             .frame(alignment: .center)
         }
         

Other Projects/Jike/SwiftUI_Jike/HomeView.swift

@@ -25,7 +25,7 @@ struct HomeView : View {
                         .padding(EdgeInsets(top: 5, leading: 5, bottom: 5, trailing: 5))
                         Text("优衣库KAWS遭疯抢")
                         .font(Font.system(size: 14))
-                        .color(Color.gray)
+                        .foregroundColor(Color.gray)
                         Spacer()
                         }
                         .background(

Other Projects/Movie/MovieSwift/MovieSwift/flux/state/AppState.swift

@@ -11,7 +11,7 @@ import SwiftUI
 import Combine
 
 final class AppState: BindableObject {
-    var didChange = PassthroughSubject<AppState, Never>()
+    var willChange = PassthroughSubject<AppState, Never>()
     
     var moviesState: MoviesState
     
@@ -22,7 +22,7 @@ final class AppState: BindableObject {
     func dispatch(action: Action) {
         moviesState = MoviesStateReducer().reduce(state: moviesState, action: action)
         DispatchQueue.main.async {
-            self.didChange.send(self)
+            self.willChange.send(self)
         }
     }
 }

Other Projects/SwiftUI + Redux/SwiftUIDemo/flux/states/AppState.swift

@@ -11,7 +11,7 @@ import SwiftUI
 import Combine
 
 final class AppState: BindableObject {
-    var didChange = PassthroughSubject<AppState, Never>()
+    var willChange = PassthroughSubject<AppState, Never>()
     
     var usersState: UsersState
     
@@ -21,7 +21,7 @@ final class AppState: BindableObject {
     
     func dispatch(action: Action) {
         usersState = UserStateReducer().reduce(state: usersState, action: action)
-        didChange.send(self)
+        willChange.send(self)
     }
 }
 

Other Projects/SwiftUI + Redux/SwiftUIDemo/views/users/component/Badge.swift

@@ -21,7 +21,7 @@ struct Badge : View {
     
     var body: some View {
         Text(text)
-            .color(.white)
+            .foregroundColor(.white)
             .padding()
             .background(color)
             .cornerRadius(8)

Other Projects/SwiftUI + Redux/SwiftUIDemo/views/users/rows/UserRow.swift

@@ -19,7 +19,7 @@ struct UserRow : View {
                 VStack {
                     Text(user.name)
                     Text(user.username)
-                        .color(.secondary)
+                        .foregroundColor(.secondary)
                         .lineLimit(0)
                 }
             }

Other Projects/Time Travel/SwiftUITimeTravel/TimeTravelView/Store.swift

@@ -6,7 +6,7 @@ public final class Store<StateType>: BindableObject where StateType: StateMachin
     private let initialState: StateType
     private var subsequentStates: [StateType] = []
 
-    public let didChange = PassthroughSubject<Void, Never>()
+    public let willChange = PassthroughSubject<Void, Never>()
     
     public init(state: StateType) {
         initialState = state
@@ -23,7 +23,7 @@ public final class Store<StateType>: BindableObject where StateType: StateMachin
     var currentStateIndex: Int = 0 {
         didSet {
             withAnimation {
-                didChange.send(())
+                willChange.send(())
             }
         }
     }

Other Projects/Transition and Blur/Basic Animation/SwiftUI-BasicAnimation/ContentView.swift

@@ -17,7 +17,7 @@ struct ContentView: View {
             Text("Learning SwiftUI")
                 .font(.largeTitle)
                 .fontWeight(.semibold)
-                .color(.black)
+                .foregroundColor(.black)
                 .padding(4)
                 .animation(.basic(duration: 0.3, curve: .easeOut))
             
@@ -33,7 +33,7 @@ struct ContentView: View {
             Text("A course focused on UI")
                 .font(.subheadline)
                 .fontWeight(.regular)
-                .color(.gray)
+                .foregroundColor(.gray)
                 .padding(4)
                 .animation(.basic(duration: 0.4, curve: .easeIn))
             

Other Projects/Transition and Blur/Card Animation/SwiftUI-CardAnimation/ContentView.swift

@@ -19,19 +19,19 @@ struct ContentView : View {
         }) {
             VStack() {
                 Text("Learn SwiftUI")
-                    .color(.white)
+                    .foregroundColor(.white)
                     .fontWeight(.bold)
                     .font(.largeTitle)
                     .padding(.top, show ? 100 : 20)
                 
                 Text("A course on UI and animations")
-                    .color(Color(hue: 0.567, saturation: 0.158, brightness: 0.943))
+                    .foregroundColor(Color(hue: 0.567, saturation: 0.158, brightness: 0.943))
                     .lineLimit(-1)
                 
                 Spacer()
                 
                 Text("Card Animation")
-                    .color(Color(hue: 0.498, saturation: 0.609, brightness: 1.0))
+                    .foregroundColor(Color(hue: 0.498, saturation: 0.609, brightness: 1.0))
                     .fontWeight(.bold)
                     .font(.title)
                     .padding(.bottom, show ? 100 : 20)

Other Projects/UINote/SwiftUINote/Models/UserData.swift

@@ -10,11 +10,11 @@ import SwiftUI
 import Combine
 
 final class UserData: BindableObject {
-    let didChange = PassthroughSubject<UserData, Never>()
+    let willChange = PassthroughSubject<UserData, Never>()
     
     var notes = NoteData.shared.notes {
         didSet {
-            didChange.send(self)
+            willChange.send(self)
             NoteData.shared.notes = notes
         }
     }

Other Projects/UINote/SwiftUINote/Views/NoteList.swift

@@ -33,7 +33,7 @@ struct NoteList : View {
 #if DEBUG
 struct NoteList_Previews : PreviewProvider {
     static var previews: some View {
-        ForEach(["iPhone SE", "iPhone XS Max"].identified(by: \.self)) { deviceName in
+        ForEach(["iPhone SE", "iPhone XS Max"], id: \.self) { deviceName in
             NoteList()
                 .environmentObject(UserData())
                 .previewDevice(PreviewDevice(rawValue: deviceName))

Other Projects/WWDCPlayer/WWDCPlayer/Model/UserData.swift

@@ -9,23 +9,23 @@ import SwiftUI
 import Combine
 
 final class UserData: BindableObject  {
-    let didChange = PassthroughSubject<UserData, Never>()
+    let willChange = PassthroughSubject<UserData, Never>()
     
     var showFavoriteOnly = false {
         didSet {
-            didChange.send(self)
+            willChange.send(self)
         }
     }
     
     var videos = videoList {
         didSet {
-            didChange.send(self)
+            willChange.send(self)
         }
     }
     
     var currentVideo = videoList[0] {
         didSet {
-            didChange.send(self)
+            willChange.send(self)
         }
     }
 }

Other Projects/WWDCPlayer/WWDCPlayer/VideoRow.swift

@@ -71,7 +71,7 @@ struct TitleText: View {
     let text: String
     var body: some View {
         return Text(text)
-            .color(.primary)
+            .foregroundColor(.primary)
             .bold()
     }
 }
@@ -81,6 +81,6 @@ struct DescriptionText : View {
     var body: some View {
         return Text(text)
             .font(.footnote).fontWeight(.semibold)
-            .color(.secondary)
+            .foregroundColor(.secondary)
     }
 }

Other Projects/Working With UIControls/Complete/Landmarks/Landmarks/CategoryRow.swift

@@ -20,7 +20,7 @@ struct CategoryRow: View {
             
             ScrollView(.horizontal) {
                 HStack(alignment: .top, spacing: 0) {
-                    ForEach(self.items.identified(by: \.name)) { landmark in
+                    ForEach(self.items, id: \.name) { landmark in
                         NavigationLink(
                             destination: LandmarkDetail(
                                 landmark: landmark
@@ -45,7 +45,7 @@ struct CategoryItem: View {
                 .renderingMode(.original)
                 .cornerRadius(5)
             Text(landmark.name)
-                .color(.primary)
+                .foregroundColor(.primary)
                 .font(.caption)
         }
         .padding(.leading, 15)

Other Projects/Working With UIControls/Complete/Landmarks/Landmarks/HikeDetail.swift

@@ -23,13 +23,13 @@ struct HikeDetail: View {
                 .frame(height: 200, alignment: .center)
             
             HStack(spacing: 25) {
-                ForEach(buttons.identified(by: \.0)) { value in
+                ForEach(buttons, id: \.0) { value in
                     Button(action: {
                         self.dataToShow = value.1
                     }) {
                         Text(verbatim: value.0)
                             .font(.system(size: 15))
-                            .color(value.1 == self.dataToShow
+                            .foregroundColor(value.1 == self.dataToShow
                                 ? Color.gray
                                 : Color.accentColor)
                             .animation(nil)

Other Projects/Working With UIControls/Complete/Landmarks/Landmarks/HikeView.swift

@@ -14,7 +14,7 @@ struct HikeView: View {
     var transition: AnyTransition {
         let insertion = AnyTransition.move(edge: .trailing)
             .combined(with: .opacity)
-        let removal = AnyTransition.scale()
+        let removal = AnyTransition.scale(scale: 0.0)
             .combined(with: .opacity)
         return .asymmetric(insertion: insertion, removal: removal)
     }

Other Projects/Working With UIControls/Complete/Landmarks/Landmarks/Home.swift

@@ -28,7 +28,7 @@ struct CategoryHome: View {
                     .clipped()
                     .listRowInsets(EdgeInsets())
                 
-                ForEach(categories.keys.sorted().identified(by: \.self)) { key in
+                ForEach(categories.keys.sorted(), id: \.self) { key in
                     CategoryRow(categoryName: key, items: self.categories[key]!)
                 }
                 .listRowInsets(EdgeInsets())

Other Projects/Working With UIControls/Complete/Landmarks/Landmarks/LandmarkList.swift

@@ -35,7 +35,7 @@ struct LandmarkList: View {
 #if DEBUG
 struct LandmarksList_Previews: PreviewProvider {
     static var previews: some View {
-        ForEach(["iPhone SE", "iPhone XS Max"].identified(by: \.self)) { deviceName in
+        ForEach(["iPhone SE", "iPhone XS Max"], id: \.self) { deviceName in
             LandmarkList()
                 .previewDevice(PreviewDevice(rawValue: deviceName))
                 .previewDisplayName(deviceName)

Other Projects/Working With UIControls/Complete/Landmarks/Landmarks/Models/UserData.swift

@@ -9,17 +9,18 @@ import Combine
 import SwiftUI
 
 final class UserData: BindableObject {
-    let didChange = PassthroughSubject<UserData, Never>()
+
+    let willChange = PassthroughSubject<UserData, Never>()
     
     var showFavoritesOnly = false {
         didSet {
-            didChange.send(self)
+            willChange.send(self)
         }
     }
 
     var landmarks = landmarkData {
         didSet {
-            didChange.send(self)
+            willChange.send(self)
         }
     }
 }

Other Projects/Working With UIControls/Complete/Landmarks/Landmarks/Profiles/ProfileEditor.swift

@@ -26,7 +26,7 @@ struct ProfileEditor: View {
                 Text("Seasonal Photo").bold()
                 
                 SegmentedControl(selection: $profile.seasonalPhoto) {
-                    ForEach(Profile.Season.allCases.identified(by: \.self)) { season in
+                    ForEach(Profile.Season.allCases, id: \.self) { season in
                         Text(season.rawValue).tag(season)
                     }
                 }

Other Projects/iPadOS Scenes/BehindTheScenes/SceneDelegate.swift

@@ -54,7 +54,7 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
     }
 
     func scene(_ scene: UIScene, continue userActivity: NSUserActivity) {
-        print("Continuing \(userActivity.userInfo?["count"])")
+        print("Continuing \(String(describing: userActivity.userInfo?["count"]))")
     }
 
     func scene(_ scene: UIScene, didUpdate userActivity: NSUserActivity) {