Implement until the section Composing Complex Interfaces.

eajang · eajang · commit 14320ba9e1fd · 2019-10-05T18:44:26.000+02:00
diff --git a/Landmarks.xcodeproj/project.pbxproj b/Landmarks.xcodeproj/project.pbxproj
@@ -7,6 +7,8 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		F23D7BE72348E09B004C05C4 /* Home.swift in Sources */ = {isa = PBXBuildFile; fileRef = F23D7BE62348E09B004C05C4 /* Home.swift */; };
+		F23D7BE92348E591004C05C4 /* CategoryRow.swift in Sources */ = {isa = PBXBuildFile; fileRef = F23D7BE82348E591004C05C4 /* CategoryRow.swift */; };
 		F29B7DDE233F564D0025D62A /* RotatedBadgeSymbol.swift in Sources */ = {isa = PBXBuildFile; fileRef = F29B7DDD233F564D0025D62A /* RotatedBadgeSymbol.swift */; };
 		F29B7E0B233F80EB0025D62A /* HikeView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F29B7E0A233F80EB0025D62A /* HikeView.swift */; };
 		F29B7E0D233F821F0025D62A /* Hike.swift in Sources */ = {isa = PBXBuildFile; fileRef = F29B7E0C233F821F0025D62A /* Hike.swift */; };
@@ -64,6 +66,8 @@
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
+		F23D7BE62348E09B004C05C4 /* Home.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Home.swift; sourceTree = "<group>"; };
+		F23D7BE82348E591004C05C4 /* CategoryRow.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CategoryRow.swift; sourceTree = "<group>"; };
 		F29B7DDD233F564D0025D62A /* RotatedBadgeSymbol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RotatedBadgeSymbol.swift; sourceTree = "<group>"; };
 		F29B7E0A233F80EB0025D62A /* HikeView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HikeView.swift; sourceTree = "<group>"; };
 		F29B7E0C233F821F0025D62A /* Hike.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Hike.swift; sourceTree = "<group>"; };
@@ -168,6 +172,7 @@
 		F29B7E35233F85F60025D62A /* Supporting Views */ = {
 			isa = PBXGroup;
 			children = (
+				F23D7BE82348E591004C05C4 /* CategoryRow.swift */,
 				F29B7E09233F7F880025D62A /* Badge */,
 				F2BCE68A233A541E00D23078 /* LandmarkRow.swift */,
 				F2BCE683233A479E00D23078 /* MapView.swift */,
@@ -212,6 +217,7 @@
 				F2BCE690233A57FD00D23078 /* LandmarkList.swift */,
 				F29B7E0A233F80EB0025D62A /* HikeView.swift */,
 				F29B7E3A233F8A5D0025D62A /* HikeDetail.swift */,
+				F23D7BE62348E09B004C05C4 /* Home.swift */,
 			);
 			path = Landmarks;
 			sourceTree = "<group>";
@@ -380,6 +386,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				F23D7BE92348E591004C05C4 /* CategoryRow.swift in Sources */,
 				F29B7E0D233F821F0025D62A /* Hike.swift in Sources */,
 				F29B7E37233F87100025D62A /* HikeGraph.swift in Sources */,
 				F2C8B1A5233BB0460041D0BF /* HexagonParameters.swift in Sources */,
@@ -393,6 +400,7 @@
 				F2C8B1A9233BB8850041D0BF /* BadgeSymbol.swift in Sources */,
 				F29B7DDE233F564D0025D62A /* RotatedBadgeSymbol.swift in Sources */,
 				F2BCE656233A2FA600D23078 /* LandmarkDetail.swift in Sources */,
+				F23D7BE72348E09B004C05C4 /* Home.swift in Sources */,
 				F2C8B1A7233BB6DC0041D0BF /* BadgeBackground.swift in Sources */,
 				F2BCE68B233A541E00D23078 /* LandmarkRow.swift in Sources */,
 				F2BCE688233A4EE700D23078 /* Landmark.swift in Sources */,
diff --git a/Landmarks/Home.swift b/Landmarks/Home.swift
@@ -0,0 +1,71 @@
+//
+//  Home.swift
+//  Landmarks
+//
+//  Created by Eunae Jang on 05/10/2019.
+//  Copyright © 2019 Eunae Jang. All rights reserved.
+//
+
+import SwiftUI
+
+struct CategoryHome: View {
+    var categories: [String: [Landmark]] {
+        Dictionary(
+            grouping: landmarkData,
+            by: { $0.category.rawValue }
+        )
+    }
+    
+    var featured: [Landmark] {
+        landmarkData.filter { $0.isFeatured }
+    }
+    
+    @State var showingProfile = false
+    
+    var profileButton: some View {
+        Button(action: { self.showingProfile.toggle() }) {
+            Image(systemName: "person.crop.circle")
+                .imageScale(.large)
+                .accessibility(label: Text("User Profile"))
+                .padding()
+        }
+    }
+    
+    var body: some View {
+        NavigationView {
+            List {
+                FeaturedLandmarks(landmarks: featured)
+                    .scaledToFill()
+                    .frame(height: 200)
+                    .clipped()
+                    .listRowInsets(EdgeInsets())
+                ForEach(categories.keys.sorted(), id: \.self) { key in
+                    CategoryRow(categoryName: key, items: self.categories[key]!)
+                }
+                .listRowInsets(EdgeInsets())
+                
+                NavigationLink(destination: LandmarkList()) {
+                    Text("See All")
+                }
+            }
+            .navigationBarTitle(Text("Featured"))
+            .navigationBarItems(trailing: profileButton)
+            .sheet(isPresented: $showingProfile) {
+                Text("User Profile")
+            }
+        }
+    }
+}
+
+struct FeaturedLandmarks: View {
+    var landmarks: [Landmark]
+    var body: some View {
+        landmarks[0].image.resizable()
+    }
+}
+
+struct CategoryHome_Previews: PreviewProvider {
+    static var previews: some View {
+        CategoryHome()
+    }
+}
diff --git a/Landmarks/LandmarkList.swift b/Landmarks/LandmarkList.swift
@@ -12,28 +12,28 @@ struct LandmarkList: View {
     @EnvironmentObject var userData: UserData
     
     var body: some View {
-        NavigationView {
-            List {
-                Toggle(isOn: $userData.showFavoritesOnly) {
-                    Text("Favorites only")
-                }
-                ForEach(userData.landmarks) { landmark in
-                    if !self.userData.showFavoritesOnly || landmark.isFavorite {
-                            NavigationLink(destination: LandmarkDetail(landmark: landmark)) {
-                            LandmarkRow(landmark: landmark)
-                        }
+        List {
+            Toggle(isOn: $userData.showFavoritesOnly) {
+                Text("Favorites only")
+            }
+            ForEach(userData.landmarks) { landmark in
+                if !self.userData.showFavoritesOnly || landmark.isFavorite {
+                        NavigationLink(destination: LandmarkDetail(landmark: landmark)) {
+                        LandmarkRow(landmark: landmark)
                     }
                 }
             }
-        .navigationBarTitle(Text("Landmarks"))
         }
+        .navigationBarTitle(Text("Landmarks"))
     }
 }
 
 struct LandmarkList_Previews: PreviewProvider {
     static var previews: some View {
-        LandmarkList()
-            .environmentObject(UserData())
+        NavigationView {
+            LandmarkList()
+                .environmentObject(UserData())
+        }
     }
 }
 
diff --git a/Landmarks/Models/Landmark.swift b/Landmarks/Models/Landmark.swift
@@ -18,6 +18,7 @@ struct Landmark: Hashable, Codable, Identifiable {
     var park: String
     var category: Category
     var isFavorite: Bool
+    var isFeatured: Bool
     
     var locationCoordinate: CLLocationCoordinate2D {
         CLLocationCoordinate2D(
diff --git a/Landmarks/SceneDelegate.swift b/Landmarks/SceneDelegate.swift
@@ -23,7 +23,7 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
         if let windowScene = scene as? UIWindowScene {
             let window = UIWindow(windowScene: windowScene)
             window.rootViewController = UIHostingController(
-                rootView: LandmarkList().environmentObject(UserData())
+                rootView: CategoryHome().environmentObject(UserData())
             )
             self.window = window
             window.makeKeyAndVisible()
diff --git a/Landmarks/Supporting Views/CategoryRow.swift b/Landmarks/Supporting Views/CategoryRow.swift
@@ -0,0 +1,64 @@
+//
+//  CategoryRow.swift
+//  Landmarks
+//
+//  Created by Eunae Jang on 05/10/2019.
+//  Copyright © 2019 Eunae Jang. All rights reserved.
+//
+
+import SwiftUI
+
+struct CategoryRow: View {
+    var categoryName: String
+    var items: [Landmark]
+    
+    var body: some View {
+        VStack(alignment: .leading) {
+            Text(self.categoryName)
+                .font(.headline)
+                .padding(.leading, 15)
+                .padding(.top, 5)
+            
+            ScrollView(.horizontal, showsIndicators: false) {
+                HStack(alignment: .top, spacing: 0) {
+                    ForEach(self.items) { landmark in
+                        NavigationLink(
+                            destination: LandmarkDetail(
+                                landmark: landmark
+                            )
+                        ) {
+                            CategoryItem(landmark: landmark)
+                        }
+                    }
+                }
+            }
+            .frame(height: 185)
+        }
+    }
+}
+
+struct CategoryItem: View {
+    var landmark: Landmark
+    var body: some View {
+        VStack(alignment: .leading) {
+            landmark.image
+                .renderingMode(.original)
+                .resizable()
+                .frame(width: 155, height: 155)
+                .cornerRadius(5)
+            Text(landmark.name)
+                .foregroundColor(.primary)
+                .font(.caption)
+        }
+        .padding(.leading, 15)
+    }
+}
+
+struct CategoryRow_Previews: PreviewProvider {
+    static var previews: some View {
+        CategoryRow(
+            categoryName: landmarkData[0].category.rawValue,
+            items: Array(landmarkData.prefix(4))
+        )
+    }
+}
diff --git a/screenshot01.gif b/screenshot01.gif

Original file line number	Diff line number	Diff line change
`@@ -12,28 +12,28 @@ struct LandmarkList: View {`
`12`	`12`	`@EnvironmentObject var userData: UserData`
`13`	`13`
`14`	`14`	`var body: some View {`
`15`		`- NavigationView {`
`16`		`- List {`
`17`		`- Toggle(isOn: $userData.showFavoritesOnly) {`
`18`		`- Text("Favorites only")`
`19`		`- }`
`20`		`- ForEach(userData.landmarks) { landmark in`
`21`		`- if !self.userData.showFavoritesOnly \|\| landmark.isFavorite {`
`22`		`- NavigationLink(destination: LandmarkDetail(landmark: landmark)) {`
`23`		`- LandmarkRow(landmark: landmark)`
`24`		`- }`
	`15`	`+ List {`
	`16`	`+ Toggle(isOn: $userData.showFavoritesOnly) {`
	`17`	`+ Text("Favorites only")`
	`18`	`+ }`
	`19`	`+ ForEach(userData.landmarks) { landmark in`
	`20`	`+ if !self.userData.showFavoritesOnly \|\| landmark.isFavorite {`
	`21`	`+ NavigationLink(destination: LandmarkDetail(landmark: landmark)) {`
	`22`	`+ LandmarkRow(landmark: landmark)`
`25`	`23`	`}`
`26`	`24`	`}`
`27`	`25`	`}`
`28`		`- .navigationBarTitle(Text("Landmarks"))`
`29`	`26`	`}`
	`27`	`+ .navigationBarTitle(Text("Landmarks"))`
`30`	`28`	`}`
`31`	`29`	`}`
`32`	`30`
`33`	`31`	`struct LandmarkList_Previews: PreviewProvider {`
`34`	`32`	`static var previews: some View {`
`35`		`- LandmarkList()`
`36`		`- .environmentObject(UserData())`
	`33`	`+ NavigationView {`
	`34`	`+ LandmarkList()`
	`35`	`+ .environmentObject(UserData())`
	`36`	`+ }`
`37`	`37`	`}`
`38`	`38`	`}`
`39`	`39`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {`
`23`	`23`	`if let windowScene = scene as? UIWindowScene {`
`24`	`24`	`let window = UIWindow(windowScene: windowScene)`
`25`	`25`	`window.rootViewController = UIHostingController(`
`26`		`- rootView: LandmarkList().environmentObject(UserData())`
	`26`	`+ rootView: CategoryHome().environmentObject(UserData())`
`27`	`27`	`)`
`28`	`28`	`self.window = window`
`29`	`29`	`window.makeKeyAndVisible()`