From 7af0a711dac7b18b995c01b2406eccdab3d5c4e3 Mon Sep 17 00:00:00 2001 From: John Holdsworth Date: Sun, 28 Jul 2019 12:10:01 +0100 Subject: [PATCH] Remove deprecation warnings for Xcode beta4 --- .../2048 Game/SwiftUI2048/Views/BlockView.swift | 2 +- .../2048 Game/SwiftUI2048/Views/GameView.swift | 2 +- .../Complete/Landmarks/Landmarks/LandmarkList.swift | 2 +- .../Complete/Landmarks/Landmarks/LandmarkList.swift | 2 +- .../Calculator/Calculator/Calculator/Calculator.swift | 6 +++--- .../SwiftUI-Combine-Example/SearchUserBar.swift | 2 +- .../Complete/Landmarks/Landmarks/CategoryRow.swift | 4 ++-- .../Complete/Landmarks/Landmarks/HikeDetail.swift | 4 ++-- .../Complete/Landmarks/Landmarks/Home.swift | 2 +- .../Complete/Landmarks/Landmarks/LandmarkList.swift | 2 +- .../Currency-SwiftUI/ConverterView.swift | 11 ++++++----- .../Currency-SwiftUI/CurrencyItemView.swift | 7 ++++--- .../Currency-SwiftUI/Currency-SwiftUI/UserData.swift | 4 ++-- .../Complete/Landmarks/Landmarks/LandmarkList.swift | 2 +- .../SwiftUITodo/UserDefaultsValue.swift | 4 ++-- .../Complete/Landmarks/Landmarks/LandmarkList.swift | 2 +- .../InstaFake/Instagram-SWUI/ContentView.swift | 2 +- .../Complete/Landmarks/Landmarks/CategoryRow.swift | 4 ++-- .../Complete/Landmarks/Landmarks/HikeDetail.swift | 4 ++-- .../Complete/Landmarks/Landmarks/Home.swift | 2 +- .../Complete/Landmarks/Landmarks/LandmarkList.swift | 2 +- Other Projects/Jike/SwiftUI_Jike/ActivityView.swift | 2 +- .../Jike/SwiftUI_Jike/Cell/ActivityCell.swift | 2 +- .../Jike/SwiftUI_Jike/Cell/CategoryRow.swift | 2 +- Other Projects/Jike/SwiftUI_Jike/Cell/ChatCell.swift | 2 +- Other Projects/Jike/SwiftUI_Jike/Cell/HomeCell.swift | 4 ++-- Other Projects/Jike/SwiftUI_Jike/Cell/ZoneCell.swift | 2 +- Other Projects/Jike/SwiftUI_Jike/HomeView.swift | 2 +- .../SwiftUIDemo/views/users/component/Badge.swift | 2 +- .../SwiftUIDemo/views/users/rows/UserRow.swift | 2 +- .../SwiftUI-BasicAnimation/ContentView.swift | 4 ++-- .../SwiftUI-CardAnimation/ContentView.swift | 6 +++--- .../UINote/SwiftUINote/Views/NoteList.swift | 2 +- Other Projects/WWDCPlayer/WWDCPlayer/VideoRow.swift | 4 ++-- .../Complete/Landmarks/Landmarks/CategoryRow.swift | 4 ++-- .../Complete/Landmarks/Landmarks/HikeDetail.swift | 4 ++-- .../Complete/Landmarks/Landmarks/Home.swift | 2 +- .../Complete/Landmarks/Landmarks/LandmarkList.swift | 2 +- .../Landmarks/Landmarks/Profiles/ProfileEditor.swift | 2 +- .../iPadOS Scenes/BehindTheScenes/SceneDelegate.swift | 2 +- 40 files changed, 63 insertions(+), 61 deletions(-) diff --git a/Other Projects/2048 Game/SwiftUI2048/Views/BlockView.swift b/Other Projects/2048 Game/SwiftUI2048/Views/BlockView.swift index 27ad7f3..3ea6dd1 100755 --- a/Other Projects/2048 Game/SwiftUI2048/Views/BlockView.swift +++ b/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()) diff --git a/Other Projects/2048 Game/SwiftUI2048/Views/GameView.swift b/Other Projects/2048 Game/SwiftUI2048/Views/GameView.swift index 851bd80..a98113e 100755 --- a/Other Projects/2048 Game/SwiftUI2048/Views/GameView.swift +++ b/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) { diff --git a/Other Projects/Animating Views And Transitions/Complete/Landmarks/Landmarks/LandmarkList.swift b/Other Projects/Animating Views And Transitions/Complete/Landmarks/Landmarks/LandmarkList.swift index c6c21b6..665a08e 100755 --- a/Other Projects/Animating Views And Transitions/Complete/Landmarks/Landmarks/LandmarkList.swift +++ b/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) diff --git a/Other Projects/Building Lists And Navigation/Complete/Landmarks/Landmarks/LandmarkList.swift b/Other Projects/Building Lists And Navigation/Complete/Landmarks/Landmarks/LandmarkList.swift index 687e142..35592d5 100755 --- a/Other Projects/Building Lists And Navigation/Complete/Landmarks/Landmarks/LandmarkList.swift +++ b/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) diff --git a/Other Projects/Calculator/Calculator/Calculator/Calculator.swift b/Other Projects/Calculator/Calculator/Calculator/Calculator.swift index 1e3dbd2..fb35a67 100755 --- a/Other Projects/Calculator/Calculator/Calculator/Calculator.swift +++ b/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 { diff --git a/Other Projects/Combine using GitHub API/SwiftUI-Combine-Example/SearchUserBar.swift b/Other Projects/Combine using GitHub API/SwiftUI-Combine-Example/SearchUserBar.swift index 73f327b..855e652 100755 --- a/Other Projects/Combine using GitHub API/SwiftUI-Combine-Example/SearchUserBar.swift +++ b/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) diff --git a/Other Projects/Composing Complex Interfaces/Complete/Landmarks/Landmarks/CategoryRow.swift b/Other Projects/Composing Complex Interfaces/Complete/Landmarks/Landmarks/CategoryRow.swift index a180af6..e3d5760 100755 --- a/Other Projects/Composing Complex Interfaces/Complete/Landmarks/Landmarks/CategoryRow.swift +++ b/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) diff --git a/Other Projects/Composing Complex Interfaces/Complete/Landmarks/Landmarks/HikeDetail.swift b/Other Projects/Composing Complex Interfaces/Complete/Landmarks/Landmarks/HikeDetail.swift index 3406a6d..1d63904 100755 --- a/Other Projects/Composing Complex Interfaces/Complete/Landmarks/Landmarks/HikeDetail.swift +++ b/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) diff --git a/Other Projects/Composing Complex Interfaces/Complete/Landmarks/Landmarks/Home.swift b/Other Projects/Composing Complex Interfaces/Complete/Landmarks/Landmarks/Home.swift index 262dfb8..f6f3112 100755 --- a/Other Projects/Composing Complex Interfaces/Complete/Landmarks/Landmarks/Home.swift +++ b/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()) diff --git a/Other Projects/Composing Complex Interfaces/Complete/Landmarks/Landmarks/LandmarkList.swift b/Other Projects/Composing Complex Interfaces/Complete/Landmarks/Landmarks/LandmarkList.swift index 6410d57..be4b764 100755 --- a/Other Projects/Composing Complex Interfaces/Complete/Landmarks/Landmarks/LandmarkList.swift +++ b/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) diff --git a/Other Projects/Currency-SwiftUI/Currency-SwiftUI/ConverterView.swift b/Other Projects/Currency-SwiftUI/Currency-SwiftUI/ConverterView.swift index c8b7c9e..1a5e351 100644 --- a/Other Projects/Currency-SwiftUI/Currency-SwiftUI/ConverterView.swift +++ b/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)) { diff --git a/Other Projects/Currency-SwiftUI/Currency-SwiftUI/CurrencyItemView.swift b/Other Projects/Currency-SwiftUI/Currency-SwiftUI/CurrencyItemView.swift index 7dd5b0d..9b68d98 100644 --- a/Other Projects/Currency-SwiftUI/Currency-SwiftUI/CurrencyItemView.swift +++ b/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) } } } diff --git a/Other Projects/Currency-SwiftUI/Currency-SwiftUI/UserData.swift b/Other Projects/Currency-SwiftUI/Currency-SwiftUI/UserData.swift index 4504e19..3236cbc 100644 --- a/Other Projects/Currency-SwiftUI/Currency-SwiftUI/UserData.swift +++ b/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 { 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) } diff --git a/Other Projects/Drawing Paths And Shapes/Complete/Landmarks/Landmarks/LandmarkList.swift b/Other Projects/Drawing Paths And Shapes/Complete/Landmarks/Landmarks/LandmarkList.swift index c6c21b6..665a08e 100755 --- a/Other Projects/Drawing Paths And Shapes/Complete/Landmarks/Landmarks/LandmarkList.swift +++ b/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) diff --git a/Other Projects/Example To-Do App/SwiftUITodo/UserDefaultsValue.swift b/Other Projects/Example To-Do App/SwiftUITodo/UserDefaultsValue.swift index 73be39c..94e29c8 100755 --- a/Other Projects/Example To-Do App/SwiftUITodo/UserDefaultsValue.swift +++ b/Other Projects/Example To-Do App/SwiftUITodo/UserDefaultsValue.swift @@ -8,13 +8,13 @@ import Foundation -@propertyDelegate +@propertyWrapper struct UserDefaultValue { 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) } diff --git a/Other Projects/Handling User Input/Complete/Landmarks/Landmarks/LandmarkList.swift b/Other Projects/Handling User Input/Complete/Landmarks/Landmarks/LandmarkList.swift index c6c21b6..665a08e 100755 --- a/Other Projects/Handling User Input/Complete/Landmarks/Landmarks/LandmarkList.swift +++ b/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) diff --git a/Other Projects/InstaFake/Instagram-SWUI/ContentView.swift b/Other Projects/InstaFake/Instagram-SWUI/ContentView.swift index 4054262..5a422de 100755 --- a/Other Projects/InstaFake/Instagram-SWUI/ContentView.swift +++ b/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())) diff --git a/Other Projects/Interfacing With UIKit/Complete/Landmarks/Landmarks/CategoryRow.swift b/Other Projects/Interfacing With UIKit/Complete/Landmarks/Landmarks/CategoryRow.swift index a180af6..e3d5760 100755 --- a/Other Projects/Interfacing With UIKit/Complete/Landmarks/Landmarks/CategoryRow.swift +++ b/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) diff --git a/Other Projects/Interfacing With UIKit/Complete/Landmarks/Landmarks/HikeDetail.swift b/Other Projects/Interfacing With UIKit/Complete/Landmarks/Landmarks/HikeDetail.swift index 3406a6d..1d63904 100755 --- a/Other Projects/Interfacing With UIKit/Complete/Landmarks/Landmarks/HikeDetail.swift +++ b/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) diff --git a/Other Projects/Interfacing With UIKit/Complete/Landmarks/Landmarks/Home.swift b/Other Projects/Interfacing With UIKit/Complete/Landmarks/Landmarks/Home.swift index 91508c8..3072860 100755 --- a/Other Projects/Interfacing With UIKit/Complete/Landmarks/Landmarks/Home.swift +++ b/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()) diff --git a/Other Projects/Interfacing With UIKit/Complete/Landmarks/Landmarks/LandmarkList.swift b/Other Projects/Interfacing With UIKit/Complete/Landmarks/Landmarks/LandmarkList.swift index 6410d57..be4b764 100755 --- a/Other Projects/Interfacing With UIKit/Complete/Landmarks/Landmarks/LandmarkList.swift +++ b/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) diff --git a/Other Projects/Jike/SwiftUI_Jike/ActivityView.swift b/Other Projects/Jike/SwiftUI_Jike/ActivityView.swift index 3d06b75..5392d2d 100755 --- a/Other Projects/Jike/SwiftUI_Jike/ActivityView.swift +++ b/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{ diff --git a/Other Projects/Jike/SwiftUI_Jike/Cell/ActivityCell.swift b/Other Projects/Jike/SwiftUI_Jike/Cell/ActivityCell.swift index 764cd6d..d88c536 100755 --- a/Other Projects/Jike/SwiftUI_Jike/Cell/ActivityCell.swift +++ b/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) diff --git a/Other Projects/Jike/SwiftUI_Jike/Cell/CategoryRow.swift b/Other Projects/Jike/SwiftUI_Jike/Cell/CategoryRow.swift index d533148..c0c16fd 100755 --- a/Other Projects/Jike/SwiftUI_Jike/Cell/CategoryRow.swift +++ b/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) } } diff --git a/Other Projects/Jike/SwiftUI_Jike/Cell/ChatCell.swift b/Other Projects/Jike/SwiftUI_Jike/Cell/ChatCell.swift index 9270d4a..378f175 100755 --- a/Other Projects/Jike/SwiftUI_Jike/Cell/ChatCell.swift +++ b/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() diff --git a/Other Projects/Jike/SwiftUI_Jike/Cell/HomeCell.swift b/Other Projects/Jike/SwiftUI_Jike/Cell/HomeCell.swift index 3ca170b..04d552f 100755 --- a/Other Projects/Jike/SwiftUI_Jike/Cell/HomeCell.swift +++ b/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() } diff --git a/Other Projects/Jike/SwiftUI_Jike/Cell/ZoneCell.swift b/Other Projects/Jike/SwiftUI_Jike/Cell/ZoneCell.swift index 699ebd7..9db68a3 100755 --- a/Other Projects/Jike/SwiftUI_Jike/Cell/ZoneCell.swift +++ b/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) } diff --git a/Other Projects/Jike/SwiftUI_Jike/HomeView.swift b/Other Projects/Jike/SwiftUI_Jike/HomeView.swift index 172cd6c..0b16d25 100755 --- a/Other Projects/Jike/SwiftUI_Jike/HomeView.swift +++ b/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( diff --git a/Other Projects/SwiftUI + Redux/SwiftUIDemo/views/users/component/Badge.swift b/Other Projects/SwiftUI + Redux/SwiftUIDemo/views/users/component/Badge.swift index f900edf..4c53e5a 100755 --- a/Other Projects/SwiftUI + Redux/SwiftUIDemo/views/users/component/Badge.swift +++ b/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) diff --git a/Other Projects/SwiftUI + Redux/SwiftUIDemo/views/users/rows/UserRow.swift b/Other Projects/SwiftUI + Redux/SwiftUIDemo/views/users/rows/UserRow.swift index ec1af61..62d8c81 100755 --- a/Other Projects/SwiftUI + Redux/SwiftUIDemo/views/users/rows/UserRow.swift +++ b/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) } } diff --git a/Other Projects/Transition and Blur/Basic Animation/SwiftUI-BasicAnimation/ContentView.swift b/Other Projects/Transition and Blur/Basic Animation/SwiftUI-BasicAnimation/ContentView.swift index db9c97b..911087d 100644 --- a/Other Projects/Transition and Blur/Basic Animation/SwiftUI-BasicAnimation/ContentView.swift +++ b/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)) diff --git a/Other Projects/Transition and Blur/Card Animation/SwiftUI-CardAnimation/ContentView.swift b/Other Projects/Transition and Blur/Card Animation/SwiftUI-CardAnimation/ContentView.swift index cadf6e7..7cbbbb4 100644 --- a/Other Projects/Transition and Blur/Card Animation/SwiftUI-CardAnimation/ContentView.swift +++ b/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) diff --git a/Other Projects/UINote/SwiftUINote/Views/NoteList.swift b/Other Projects/UINote/SwiftUINote/Views/NoteList.swift index 54c12c6..9a6beb3 100755 --- a/Other Projects/UINote/SwiftUINote/Views/NoteList.swift +++ b/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)) diff --git a/Other Projects/WWDCPlayer/WWDCPlayer/VideoRow.swift b/Other Projects/WWDCPlayer/WWDCPlayer/VideoRow.swift index 50eeb50..cf3b72f 100755 --- a/Other Projects/WWDCPlayer/WWDCPlayer/VideoRow.swift +++ b/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) } } diff --git a/Other Projects/Working With UIControls/Complete/Landmarks/Landmarks/CategoryRow.swift b/Other Projects/Working With UIControls/Complete/Landmarks/Landmarks/CategoryRow.swift index a180af6..e3d5760 100755 --- a/Other Projects/Working With UIControls/Complete/Landmarks/Landmarks/CategoryRow.swift +++ b/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) diff --git a/Other Projects/Working With UIControls/Complete/Landmarks/Landmarks/HikeDetail.swift b/Other Projects/Working With UIControls/Complete/Landmarks/Landmarks/HikeDetail.swift index 3406a6d..1d63904 100755 --- a/Other Projects/Working With UIControls/Complete/Landmarks/Landmarks/HikeDetail.swift +++ b/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) diff --git a/Other Projects/Working With UIControls/Complete/Landmarks/Landmarks/Home.swift b/Other Projects/Working With UIControls/Complete/Landmarks/Landmarks/Home.swift index 570a4f0..4306d0d 100755 --- a/Other Projects/Working With UIControls/Complete/Landmarks/Landmarks/Home.swift +++ b/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()) diff --git a/Other Projects/Working With UIControls/Complete/Landmarks/Landmarks/LandmarkList.swift b/Other Projects/Working With UIControls/Complete/Landmarks/Landmarks/LandmarkList.swift index c6c21b6..665a08e 100755 --- a/Other Projects/Working With UIControls/Complete/Landmarks/Landmarks/LandmarkList.swift +++ b/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) diff --git a/Other Projects/Working With UIControls/Complete/Landmarks/Landmarks/Profiles/ProfileEditor.swift b/Other Projects/Working With UIControls/Complete/Landmarks/Landmarks/Profiles/ProfileEditor.swift index ca4cdda..4f5e2c7 100755 --- a/Other Projects/Working With UIControls/Complete/Landmarks/Landmarks/Profiles/ProfileEditor.swift +++ b/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) } } diff --git a/Other Projects/iPadOS Scenes/BehindTheScenes/SceneDelegate.swift b/Other Projects/iPadOS Scenes/BehindTheScenes/SceneDelegate.swift index 3148a60..f86f739 100755 --- a/Other Projects/iPadOS Scenes/BehindTheScenes/SceneDelegate.swift +++ b/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) {