Upgrade "Drawing-and-Animation"

Author: WillieWangWei

Drawing-and-Animation/AppDelegate.swift

@@ -11,8 +11,6 @@ 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
@@ -23,7 +21,6 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     }
 
     // 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.
@@ -36,6 +33,4 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         // Use this method to release any resources that were specific to the discarded scenes, as they will not return.
     }
 
-
 }
-

Drawing-and-Animation/ContentView.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)
@@ -40,10 +40,8 @@ struct HikeDetail: View {
     }
 }
 
-#if DEBUG
 struct HikeDetail_Previews: PreviewProvider {
     static var previews: some View {
         HikeDetail(hike: hikeData[0])
     }
 }
-#endif

Drawing-and-Animation/HikeDetail.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
             .combined(with: .opacity)
         return .asymmetric(insertion: insertion, removal: removal)
     }
@@ -33,7 +33,7 @@ struct HikeView: View {
                 }
 
                 Spacer()
-                
+
                 Button(action: {
                     withAnimation {
                         self.showDetail.toggle()
@@ -46,7 +46,7 @@ struct HikeView: View {
                         .padding()
                 }
             }
-            
+
             if showDetail {
                 HikeDetail(hike: hike)
                     .transition(transition)
@@ -55,7 +55,6 @@ struct HikeView: View {
     }
 }
 
-#if DEBUG
 struct HikeView_Previews: PreviewProvider {
     static var previews: some View {
         VStack {
@@ -65,4 +64,3 @@ struct HikeView_Previews: PreviewProvider {
         }
     }
 }
-#endif

Drawing-and-Animation/HikeView.swift

@@ -0,0 +1,69 @@
+//
+//  LandmarkDetail.swift
+//  Drawing-and-Animation
+//
+//  Created by Willie on 2019/10/11.
+//
+
+import SwiftUI
+
+struct LandmarkDetail: View {
+    @EnvironmentObject var userData: UserData
+    var landmark: Landmark
+    
+    var landmarkIndex: Int {
+        userData.landmarks.firstIndex(where: { $0.id == landmark.id })!
+    }
+    
+    var body: some View {
+        VStack {
+            MapView(coordinate: landmark.locationCoordinate)
+                .edgesIgnoringSafeArea(.top)
+                .frame(height: 300)
+            
+            CircleImage(image: landmark.image)
+                .offset(x: 0, y: -130)
+                .padding(.bottom, -130)
+            
+            VStack(alignment: .leading) {
+                HStack {
+                    Text(verbatim: landmark.name)
+                        .font(.title)
+                    
+                    Button(action: {
+                        self.userData.landmarks[self.landmarkIndex]
+                            .isFavorite.toggle()
+                    }) {
+                        if self.userData.landmarks[self.landmarkIndex]
+                            .isFavorite {
+                            Image(systemName: "star.fill")
+                                .foregroundColor(Color.yellow)
+                        } else {
+                            Image(systemName: "star")
+                                .foregroundColor(Color.gray)
+                        }
+                    }
+                }
+                
+                HStack(alignment: .top) {
+                    Text(verbatim: landmark.park)
+                        .font(.subheadline)
+                    Spacer()
+                    Text(verbatim: landmark.state)
+                        .font(.subheadline)
+                }
+            }
+            .padding()
+            
+            Spacer()
+        }
+    }
+}
+
+struct LandmarkDetail_Preview: PreviewProvider {
+    static var previews: some View {
+        let userData = UserData()
+        return LandmarkDetail(landmark: userData.landmarks[0])
+            .environmentObject(userData)
+    }
+}

Drawing-and-Animation/LandmarkDetail.swift

@@ -0,0 +1,45 @@
+//
+//  LandmarkList.swift
+//  Drawing-and-Animation
+//
+//  Created by Willie on 2019/10/11.
+//
+
+import SwiftUI
+
+struct LandmarkList: View {
+    @EnvironmentObject private var userData: UserData
+    
+    var body: some View {
+        NavigationView {
+            List {
+                Toggle(isOn: $userData.showFavoritesOnly) {
+                    Text("Show Favorites Only")
+                }
+                
+                ForEach(userData.landmarks) { landmark in
+                    if !self.userData.showFavoritesOnly || landmark.isFavorite {
+                        NavigationLink(
+                            destination: LandmarkDetail(landmark: landmark)
+                                .environmentObject(self.userData)
+                        ) {
+                            LandmarkRow(landmark: landmark)
+                        }
+                    }
+                }
+            }
+            .navigationBarTitle(Text("Landmarks"))
+        }
+    }
+}
+
+struct LandmarksList_Previews: PreviewProvider {
+    static var previews: some View {
+        ForEach(["iPhone SE", "iPhone XS Max"], id: \.self) { deviceName in
+            LandmarkList()
+                .previewDevice(PreviewDevice(rawValue: deviceName))
+                .previewDisplayName(deviceName)
+        }
+        .environmentObject(UserData())
+    }
+}

Drawing-and-Animation/LandmarkList.swift

@@ -0,0 +1,38 @@
+//
+//  LandmarkRow.swift
+//  Drawing-and-Animation
+//
+//  Created by Willie on 2019/10/11.
+//
+
+import SwiftUI
+
+struct LandmarkRow: View {
+    var landmark: Landmark
+
+    var body: some View {
+        HStack {
+            landmark.image
+                .resizable()
+                .frame(width: 50, height: 50)
+            Text(verbatim: landmark.name)
+            Spacer()
+
+            if landmark.isFavorite {
+                Image(systemName: "star.fill")
+                    .imageScale(.medium)
+                    .foregroundColor(.yellow)
+            }
+        }
+    }
+}
+
+struct LandmarkRow_Previews: PreviewProvider {
+    static var previews: some View {
+        Group {
+            LandmarkRow(landmark: landmarkData[0])
+            LandmarkRow(landmark: landmarkData[1])
+        }
+        .previewLayout(.fixed(width: 300, height: 70))
+    }
+}

Drawing-and-Animation/LandmarkRow.swift

@@ -10,6 +10,7 @@ import CoreLocation
 import UIKit
 import SwiftUI
 
+let landmarkData: [Landmark] = load("landmarkData.json")
 let hikeData: [Hike] = load("hikeData.json")
 
 func load<T: Decodable>(_ filename: String, as type: T.Type = T.self) -> T {
@@ -35,60 +36,35 @@ func load<T: Decodable>(_ filename: String, as type: T.Type = T.self) -> T {
 }
 
 final class ImageStore {
-    fileprivate typealias _ImageDictionary = [String: [Int: CGImage]]
+    typealias _ImageDictionary = [String: CGImage]
     fileprivate var images: _ImageDictionary = [:]
 
-    fileprivate static var originalSize = 250
     fileprivate static var scale = 2
 
     static var shared = ImageStore()
 
-    func image(name: String, size: Int) -> Image {
-        let index = _guaranteeInitialImage(name: name)
+    func image(name: String) -> Image {
+        let index = _guaranteeImage(name: name)
 
-        let sizedImage = images.values[index][size]
-            ?? _sizeImage(images.values[index][ImageStore.originalSize]!, to: size * ImageStore.scale)
-        images.values[index][size] = sizedImage
-        
-        return Image(sizedImage, scale: Length(ImageStore.scale), label: Text(verbatim: name))
+        return Image(images.values[index], scale: CGFloat(ImageStore.scale), label: Text(verbatim: name))
     }
 
-    fileprivate func _guaranteeInitialImage(name: String) -> _ImageDictionary.Index {
-        if let index = images.index(forKey: name) { return index }
-        
+    static func loadImage(name: String) -> CGImage {
         guard
             let url = Bundle.main.url(forResource: name, withExtension: "jpg"),
             let imageSource = CGImageSourceCreateWithURL(url as NSURL, nil),
             let image = CGImageSourceCreateImageAtIndex(imageSource, 0, nil)
         else {
             fatalError("Couldn't load image \(name).jpg from main bundle.")
         }
-        
-        images[name] = [ImageStore.originalSize: image]
-        return images.index(forKey: name)!
+        return image
     }
 
-    fileprivate func _sizeImage(_ image: CGImage, to size: Int) -> CGImage {
-        guard
-            let colorSpace = image.colorSpace,
-            let context = CGContext(
-                data: nil,
-                width: size, height: size,
-                bitsPerComponent: image.bitsPerComponent,
-                bytesPerRow: image.bytesPerRow,
-                space: colorSpace,
-                bitmapInfo: image.bitmapInfo.rawValue)
-            else {
-                fatalError("Couldn't create graphics context.")
-        }
-        context.interpolationQuality = .high
-        context.draw(image, in: CGRect(x: 0, y: 0, width: size, height: size))
+    fileprivate func _guaranteeImage(name: String) -> _ImageDictionary.Index {
+        if let index = images.index(forKey: name) { return index }
 
-        if let sizedImage = context.makeImage() {
-            return sizedImage
-        } else {
-            fatalError("Couldn't resize image.")
-        }
+        images[name] = ImageStore.loadImage(name: name)
+        return images.index(forKey: name)!
     }
 }
 

Drawing-and-Animation/Models/Data.swift

@@ -0,0 +1,44 @@
+//
+//  Landmark.swift
+//  Drawing-and-Animation
+//
+//  Created by Willie on 2019/10/11.
+//
+
+import SwiftUI
+import CoreLocation
+
+struct Landmark: Hashable, Codable, Identifiable {
+    var id: Int
+    var name: String
+    fileprivate var imageName: String
+    fileprivate var coordinates: Coordinates
+    var state: String
+    var park: String
+    var category: Category
+    var isFavorite: Bool
+
+    var locationCoordinate: CLLocationCoordinate2D {
+        CLLocationCoordinate2D(
+            latitude: coordinates.latitude,
+            longitude: coordinates.longitude)
+    }
+
+    enum Category: String, CaseIterable, Codable, Hashable {
+        case featured = "Featured"
+        case lakes = "Lakes"
+        case rivers = "Rivers"
+        case mountains = "Mountains"
+    }
+}
+
+extension Landmark {
+    var image: Image {
+        ImageStore.shared.image(name: imageName)
+    }
+}
+
+struct Coordinates: Hashable, Codable {
+    var latitude: Double
+    var longitude: Double
+}