Upgrade "SwiftUI Essentials"

WillieWangWei · WillieWangWei · commit a16efce9c905 · 2019-10-11T22:01:00.000+08:00
diff --git a/App-Design-and-Layout/AppDelegate.swift b/App-Design-and-Layout/AppDelegate.swift
@@ -2,7 +2,7 @@
 //  AppDelegate.swift
 //  App-Design-and-Layout
 //
-//  Created by 王炜 on 2019/6/9.
+//  Created by Willie on 2019/6/9.
 //
 
 import UIKit
diff --git a/App-Design-and-Layout/CategoryRow.swift b/App-Design-and-Layout/CategoryRow.swift
@@ -2,7 +2,7 @@
 //  CategoryRow.swift
 //  App-Design-and-Layout
 //
-//  Created by 王炜 on 2019/6/9.
+//  Created by Willie on 2019/6/9.
 //
 
 import SwiftUI
diff --git a/App-Design-and-Layout/ContentView.swift b/App-Design-and-Layout/ContentView.swift
@@ -2,7 +2,7 @@
 //  ContentView.swift
 //  App-Design-and-Layout
 //
-//  Created by 王炜 on 2019/6/9.
+//  Created by Willie on 2019/6/9.
 //
 
 import SwiftUI
diff --git a/App-Design-and-Layout/HikeBadge.swift b/App-Design-and-Layout/HikeBadge.swift
@@ -2,7 +2,7 @@
 //  HikeBadge.swift
 //  App-Design-and-Layout
 //
-//  Created by 王炜 on 2019/6/9.
+//  Created by Willie on 2019/6/9.
 //
 
 import SwiftUI
diff --git a/App-Design-and-Layout/Home.swift b/App-Design-and-Layout/Home.swift
@@ -2,7 +2,7 @@
 //  Home.swift
 //  App-Design-and-Layout
 //
-//  Created by 王炜 on 2019/6/9.
+//  Created by Willie on 2019/6/9.
 //
 
 import SwiftUI
diff --git a/App-Design-and-Layout/Profile/ProfileEditor.swift b/App-Design-and-Layout/Profile/ProfileEditor.swift
@@ -2,7 +2,7 @@
 //  ProfileEditor.swift
 //  App-Design-and-Layout
 //
-//  Created by 王炜 on 2019/6/9.
+//  Created by Willie on 2019/6/9.
 //
 
 import SwiftUI
diff --git a/App-Design-and-Layout/Profile/ProfileHost.swift b/App-Design-and-Layout/Profile/ProfileHost.swift
@@ -2,7 +2,7 @@
 //  ProfileHost.swift
 //  App-Design-and-Layout
 //
-//  Created by 王炜 on 2019/6/9.
+//  Created by Willie on 2019/6/9.
 //
 
 import SwiftUI
diff --git a/App-Design-and-Layout/Profile/ProfileSummary.swift b/App-Design-and-Layout/Profile/ProfileSummary.swift
@@ -2,7 +2,7 @@
 //  ProfileSummary.swift
 //  App-Design-and-Layout
 //
-//  Created by 王炜 on 2019/6/9.
+//  Created by Willie on 2019/6/9.
 //
 
 import SwiftUI
diff --git a/App-Design-and-Layout/SceneDelegate.swift b/App-Design-and-Layout/SceneDelegate.swift
@@ -2,7 +2,7 @@
 //  SceneDelegate.swift
 //  App-Design-and-Layout
 //
-//  Created by 王炜 on 2019/6/9.
+//  Created by Willie on 2019/6/9.
 //
 
 import UIKit
diff --git a/Drawing-and-Animation/AppDelegate.swift b/Drawing-and-Animation/AppDelegate.swift
@@ -2,7 +2,7 @@
 //  AppDelegate.swift
 //  Drawing-and-Animation
 //
-//  Created by 王炜 on 2019/6/8.
+//  Created by Willie on 2019/6/8.
 //  Copyright © 2019 Willie. All rights reserved.
 //
 
diff --git a/Drawing-and-Animation/ContentView.swift b/Drawing-and-Animation/ContentView.swift
@@ -2,7 +2,7 @@
 //  ContentView.swift
 //  SwiftUI-Tutorials
 //
-//  Created by 王炜 on 2019/6/8.
+//  Created by Willie on 2019/6/8.
 //  Copyright © 2019 Willie. All rights reserved.
 //
 
diff --git a/Drawing-and-Animation/SceneDelegate.swift b/Drawing-and-Animation/SceneDelegate.swift
@@ -2,7 +2,7 @@
 //  SceneDelegate.swift
 //  Drawing-and-Animation
 //
-//  Created by 王炜 on 2019/6/8.
+//  Created by Willie on 2019/6/8.
 //  Copyright © 2019 Willie. All rights reserved.
 //
 
diff --git a/Drawing-and-Animation/Supporting Views/Badge.swift b/Drawing-and-Animation/Supporting Views/Badge.swift
@@ -2,7 +2,7 @@
 //  Badge.swift
 //  Drawing-and-Animation
 //
-//  Created by 王炜 on 2019/6/8.
+//  Created by Willie on 2019/6/8.
 //  Copyright © 2019 Willie. All rights reserved.
 //
 
diff --git a/Drawing-and-Animation/Supporting Views/BadgeBackground.swift.swift b/Drawing-and-Animation/Supporting Views/BadgeBackground.swift.swift
@@ -2,7 +2,7 @@
 //  BadgeBackground.swift.swift
 //  Drawing-and-Animation
 //
-//  Created by 王炜 on 2019/6/8.
+//  Created by Willie on 2019/6/8.
 //  Copyright © 2019 Willie. All rights reserved.
 //
 
diff --git a/Drawing-and-Animation/Supporting Views/BadgeSymbol.swift b/Drawing-and-Animation/Supporting Views/BadgeSymbol.swift
@@ -2,7 +2,7 @@
 //  BadgeSymbol.swift
 //  Drawing-and-Animation
 //
-//  Created by 王炜 on 2019/6/8.
+//  Created by Willie on 2019/6/8.
 //  Copyright © 2019 Willie. All rights reserved.
 //
 
diff --git a/Drawing-and-Animation/Supporting Views/RotatedBadgeSymbol.swift b/Drawing-and-Animation/Supporting Views/RotatedBadgeSymbol.swift
@@ -2,7 +2,7 @@
 //  RotatedBadgeSymbol.swift
 //  Drawing-and-Animation
 //
-//  Created by 王炜 on 2019/6/8.
+//  Created by Willie on 2019/6/8.
 //  Copyright © 2019 Willie. All rights reserved.
 //
 
diff --git a/Framework-Integration/AppDelegate.swift b/Framework-Integration/AppDelegate.swift
@@ -2,7 +2,7 @@
 //  AppDelegate.swift
 //  Framework-Integration
 //
-//  Created by 王炜 on 2019/6/9.
+//  Created by Willie on 2019/6/9.
 //
 
 import UIKit
diff --git a/Framework-Integration/ContentView.swift b/Framework-Integration/ContentView.swift
@@ -2,7 +2,7 @@
 //  ContentView.swift
 //  Framework-Integration
 //
-//  Created by 王炜 on 2019/6/9.
+//  Created by Willie on 2019/6/9.
 //
 
 import SwiftUI
diff --git a/Framework-Integration/PageControl.swift b/Framework-Integration/PageControl.swift
@@ -2,7 +2,7 @@
 //  PageControl.swift
 //  Framework-Integration
 //
-//  Created by 王炜 on 2019/6/9.
+//  Created by Willie on 2019/6/9.
 //
 
 import SwiftUI
diff --git a/Framework-Integration/PageView.swift b/Framework-Integration/PageView.swift
@@ -2,7 +2,7 @@
 //  PageView.swift
 //  Framework-Integration
 //
-//  Created by 王炜 on 2019/6/9.
+//  Created by Willie on 2019/6/9.
 //
 
 import SwiftUI
diff --git a/Framework-Integration/PageViewController.swift b/Framework-Integration/PageViewController.swift
@@ -2,7 +2,7 @@
 //  PageViewController.swift
 //  Framework-Integration
 //
-//  Created by 王炜 on 2019/6/9.
+//  Created by Willie on 2019/6/9.
 //
 
 import SwiftUI
diff --git a/Framework-Integration/SceneDelegate.swift b/Framework-Integration/SceneDelegate.swift
@@ -2,7 +2,7 @@
 //  SceneDelegate.swift
 //  Framework-Integration
 //
-//  Created by 王炜 on 2019/6/9.
+//  Created by Willie on 2019/6/9.
 //
 
 import UIKit
diff --git a/SwiftUI-Essentials/AppDelegate.swift b/SwiftUI-Essentials/AppDelegate.swift
@@ -2,40 +2,36 @@
 //  AppDelegate.swift
 //  SwiftUI-Tutorials
 //
-//  Created by 王炜 on 2019/6/6.
+//  Created by Willie on 2019/6/6.
 //  Copyright © 2019 Willie. All rights reserved.
 //
 
 import UIKit
 
 @UIApplicationMain
 class AppDelegate: UIResponder, UIApplicationDelegate {
-
-
-
+    
     func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
         // Override point for customization after application launch.
         return true
     }
-
+    
     func applicationWillTerminate(_ application: UIApplication) {
         // Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:.
     }
-
+    
     // MARK: UISceneSession Lifecycle
-
     func application(_ application: UIApplication, configurationForConnecting connectingSceneSession: UISceneSession, options: UIScene.ConnectionOptions) -> UISceneConfiguration {
         // Called when a new scene session is being created.
         // Use this method to select a configuration to create the new scene with.
         return UISceneConfiguration(name: "Default Configuration", sessionRole: connectingSceneSession.role)
     }
-
+    
     func application(_ application: UIApplication, didDiscardSceneSessions sceneSessions: Set<UISceneSession>) {
         // Called when the user discards a scene session.
         // If any sessions were discarded while the application was not running, this will be called shortly after application:didFinishLaunchingWithOptions.
         // Use this method to release any resources that were specific to the discarded scenes, as they will not return.
     }
-
-
+    
 }
 
diff --git a/SwiftUI-Essentials/LandmarkDetail.swift b/SwiftUI-Essentials/LandmarkDetail.swift
@@ -2,7 +2,7 @@
 //  LandmarkDetail.swift
 //  SwiftUI-Essentials
 //
-//  Created by 王炜 on 2019/6/4.
+//  Created by Willie on 2019/6/4.
 //  Copyright © 2019 Willie. All rights reserved.
 //
 
@@ -22,7 +22,7 @@ struct LandmarkDetail: View {
                 .edgesIgnoringSafeArea(.top)
                 .frame(height: 300)
             
-            CircleImage(image: landmark.image(forSize: 250))
+            CircleImage(image: landmark.image)
                 .offset(x: 0, y: -130)
                 .padding(.bottom, -130)
             
@@ -53,21 +53,18 @@ struct LandmarkDetail: View {
                     Text(verbatim: landmark.state)
                         .font(.subheadline)
                 }
-                }
-                .padding()
+            }
+            .padding()
             
             Spacer()
         }
     }
 }
 
-#if DEBUG
 struct LandmarkDetail_Preview: PreviewProvider {
     static var previews: some View {
         let userData = UserData()
         return LandmarkDetail(landmark: userData.landmarks[0])
             .environmentObject(userData)
     }
 }
-#endif
-
diff --git a/SwiftUI-Essentials/LandmarkList.swift b/SwiftUI-Essentials/LandmarkList.swift
@@ -2,7 +2,7 @@
 //  LandmarkList.swift
 //  SwiftUI-Tutorials
 //
-//  Created by 王炜 on 2019/6/7.
+//  Created by Willie on 2019/6/7.
 //  Copyright © 2019 Willie. All rights reserved.
 //
 
@@ -20,27 +20,27 @@ struct LandmarkList: View {
                 
                 ForEach(userData.landmarks) { landmark in
                     if !self.userData.showFavoritesOnly || landmark.isFavorite {
-                        NavigationButton(
-                        destination: LandmarkDetail(landmark: landmark)) {
+                        NavigationLink(
+                            destination: LandmarkDetail(landmark: landmark)
+                                .environmentObject(self.userData)
+                        ) {
                             LandmarkRow(landmark: landmark)
                         }
                     }
                 }
-                }
-                .navigationBarTitle(Text("Landmarks"), displayMode: .large)
+            }
+            .navigationBarTitle(Text("Landmarks"))
         }
     }
 }
 
-#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)
-            }
-            .environmentObject(UserData())
+        }
+        .environmentObject(UserData())
     }
 }
-#endif
diff --git a/SwiftUI-Essentials/LandmarkRow.swift b/SwiftUI-Essentials/LandmarkRow.swift
@@ -2,21 +2,23 @@
 //  LandmarkRow.swift
 //  SwiftUI-Tutorials
 //
-//  Created by 王炜 on 2019/6/7.
+//  Created by Willie on 2019/6/7.
 //  Copyright © 2019 Willie. All rights reserved.
 //
 
 import SwiftUI
 
 struct LandmarkRow: View {
     var landmark: Landmark
-    
+
     var body: some View {
         HStack {
-            landmark.image(forSize: 50)
+            landmark.image
+                .resizable()
+                .frame(width: 50, height: 50)
             Text(verbatim: landmark.name)
             Spacer()
-            
+
             if landmark.isFavorite {
                 Image(systemName: "star.fill")
                     .imageScale(.medium)
@@ -26,14 +28,12 @@ struct LandmarkRow: View {
     }
 }
 
-#if DEBUG
 struct LandmarkRow_Previews: PreviewProvider {
     static var previews: some View {
         Group {
             LandmarkRow(landmark: landmarkData[0])
             LandmarkRow(landmark: landmarkData[1])
-            }
-            .previewLayout(.fixed(width: 300, height: 70))
+        }
+        .previewLayout(.fixed(width: 300, height: 70))
     }
 }
-#endif
diff --git a/SwiftUI-Essentials/Models/Data.swift b/SwiftUI-Essentials/Models/Data.swift
diff --git a/SwiftUI-Essentials/Models/Landmark.swift b/SwiftUI-Essentials/Models/Landmark.swift
diff --git a/SwiftUI-Essentials/Models/UserData.swift b/SwiftUI-Essentials/Models/UserData.swift
diff --git a/SwiftUI-Essentials/SceneDelegate.swift b/SwiftUI-Essentials/SceneDelegate.swift
diff --git a/SwiftUI-Essentials/Supporting Views/CircleImage.swift b/SwiftUI-Essentials/Supporting Views/CircleImage.swift
diff --git a/SwiftUI-Essentials/Supporting Views/MapView.swift b/SwiftUI-Essentials/Supporting Views/MapView.swift

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`// LandmarkList.swift`
`3`	`3`	`// SwiftUI-Tutorials`
`4`	`4`	`//`
`5`		`-// Created by 王炜 on 2019/6/7.`
	`5`	`+// Created by Willie on 2019/6/7.`
`6`	`6`	`// Copyright © 2019 Willie. All rights reserved.`
`7`	`7`	`//`
`8`	`8`
`@@ -20,27 +20,27 @@ struct LandmarkList: View {`
`20`	`20`
`21`	`21`	`ForEach(userData.landmarks) { landmark in`
`22`	`22`	`if !self.userData.showFavoritesOnly \|\| landmark.isFavorite {`
`23`		`- NavigationButton(`
`24`		`- destination: LandmarkDetail(landmark: landmark)) {`
	`23`	`+ NavigationLink(`
	`24`	`+ destination: LandmarkDetail(landmark: landmark)`
	`25`	`+ .environmentObject(self.userData)`
	`26`	`+ ) {`
`25`	`27`	`LandmarkRow(landmark: landmark)`
`26`	`28`	`}`
`27`	`29`	`}`
`28`	`30`	`}`
`29`		`- }`
`30`		`- .navigationBarTitle(Text("Landmarks"), displayMode: .large)`
	`31`	`+ }`
	`32`	`+ .navigationBarTitle(Text("Landmarks"))`
`31`	`33`	`}`
`32`	`34`	`}`
`33`	`35`	`}`
`34`	`36`
`35`		`-#if DEBUG`
`36`	`37`	`struct LandmarksList_Previews: PreviewProvider {`
`37`	`38`	`static var previews: some View {`
`38`		`- ForEach(["iPhone SE", "iPhone XS Max"].identified(by: \.self)) { deviceName in`
	`39`	`+ ForEach(["iPhone SE", "iPhone XS Max"], id: \.self) { deviceName in`
`39`	`40`	`LandmarkList()`
`40`	`41`	`.previewDevice(PreviewDevice(rawValue: deviceName))`
`41`	`42`	`.previewDisplayName(deviceName)`
`42`		`- }`
`43`		`- .environmentObject(UserData())`
	`43`	`+ }`
	`44`	`+ .environmentObject(UserData())`
`44`	`45`	`}`
`45`	`46`	`}`
`46`		`-#endif`