Adding DetailView SwiftUI to firestore sample

racheldosh · racheldosh · commit 1d9490abacc6 · 2021-03-31T15:34:54.000-07:00
diff --git a/firestore/FirestoreExample.xcodeproj/project.pbxproj b/firestore/FirestoreExample.xcodeproj/project.pbxproj
@@ -31,8 +31,12 @@
 		8E4C637825EEF4CA001678A1 /* RestaurantListViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8E4C637725EEF4CA001678A1 /* RestaurantListViewModel.swift */; };
 		8E4C63B225F05E76001678A1 /* StarsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8E4C63B125F05E76001678A1 /* StarsView.swift */; };
 		8E4C63D825F6D641001678A1 /* Firestore+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8E4C63D725F6D641001678A1 /* Firestore+Extension.swift */; };
-		8E4C63DE25F6D879001678A1 /* ImageThumbnailView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8E4C63DD25F6D879001678A1 /* ImageThumbnailView.swift */; };
 		8E4C63E425F6D8C8001678A1 /* PriceView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8E4C63E325F6D8C8001678A1 /* PriceView.swift */; };
+		8E919E71260D3945007C62C4 /* RestaurantViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8E919E70260D3945007C62C4 /* RestaurantViewModel.swift */; };
+		8E919E77260D394C007C62C4 /* Review.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8E919E76260D394C007C62C4 /* Review.swift */; };
+		8E919E7F260D3956007C62C4 /* RestaurantImageView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8E919E7C260D3956007C62C4 /* RestaurantImageView.swift */; };
+		8E919E80260D3956007C62C4 /* RestaurantDetailView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8E919E7D260D3956007C62C4 /* RestaurantDetailView.swift */; };
+		8E919E81260D3956007C62C4 /* ReviewView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8E919E7E260D3956007C62C4 /* ReviewView.swift */; };
 		DE8564AE23AFBF8000611383 /* FirestoreUITest.m in Sources */ = {isa = PBXBuildFile; fileRef = DE8564AD23AFBF8000611383 /* FirestoreUITest.m */; };
 		DE8564B423AFBFA700611383 /* FIREGSignInHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = DE8564B123AFBFA700611383 /* FIREGSignInHelper.m */; };
 		DE8564B523AFBFA700611383 /* FIREGHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = DE8564B223AFBFA700611383 /* FIREGHelper.m */; };
@@ -88,8 +92,12 @@
 		8E4C637725EEF4CA001678A1 /* RestaurantListViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RestaurantListViewModel.swift; sourceTree = "<group>"; };
 		8E4C63B125F05E76001678A1 /* StarsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StarsView.swift; sourceTree = "<group>"; };
 		8E4C63D725F6D641001678A1 /* Firestore+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Firestore+Extension.swift"; sourceTree = "<group>"; };
-		8E4C63DD25F6D879001678A1 /* ImageThumbnailView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImageThumbnailView.swift; sourceTree = "<group>"; };
 		8E4C63E325F6D8C8001678A1 /* PriceView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PriceView.swift; sourceTree = "<group>"; };
+		8E919E70260D3945007C62C4 /* RestaurantViewModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RestaurantViewModel.swift; sourceTree = "<group>"; };
+		8E919E76260D394C007C62C4 /* Review.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Review.swift; sourceTree = "<group>"; };
+		8E919E7C260D3956007C62C4 /* RestaurantImageView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RestaurantImageView.swift; sourceTree = "<group>"; };
+		8E919E7D260D3956007C62C4 /* RestaurantDetailView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RestaurantDetailView.swift; sourceTree = "<group>"; };
+		8E919E7E260D3956007C62C4 /* ReviewView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ReviewView.swift; sourceTree = "<group>"; };
 		DE8564AC23AFBF8000611383 /* FirestoreExampleUITests-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "FirestoreExampleUITests-Bridging-Header.h"; sourceTree = "<group>"; };
 		DE8564AD23AFBF8000611383 /* FirestoreUITest.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FirestoreUITest.m; sourceTree = "<group>"; };
 		DE8564B023AFBFA700611383 /* FIREGHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FIREGHelper.h; sourceTree = "<group>"; };
@@ -230,9 +238,11 @@
 			isa = PBXGroup;
 			children = (
 				8E4C62D225E9CFE0001678A1 /* RestaurantListView.swift */,
+				8E919E7D260D3956007C62C4 /* RestaurantDetailView.swift */,
+				8E919E7C260D3956007C62C4 /* RestaurantImageView.swift */,
+				8E919E7E260D3956007C62C4 /* ReviewView.swift */,
 				8E4C62E625E9D191001678A1 /* RestaurantItemView.swift */,
 				8E4C63B125F05E76001678A1 /* StarsView.swift */,
-				8E4C63DD25F6D879001678A1 /* ImageThumbnailView.swift */,
 				8E4C63E325F6D8C8001678A1 /* PriceView.swift */,
 			);
 			path = Views;
@@ -242,6 +252,7 @@
 			isa = PBXGroup;
 			children = (
 				8E4C634825EDB793001678A1 /* Restaurant.swift */,
+				8E919E76260D394C007C62C4 /* Review.swift */,
 			);
 			path = Model;
 			sourceTree = "<group>";
@@ -250,6 +261,7 @@
 			isa = PBXGroup;
 			children = (
 				8E4C637725EEF4CA001678A1 /* RestaurantListViewModel.swift */,
+				8E919E70260D3945007C62C4 /* RestaurantViewModel.swift */,
 			);
 			path = ViewModels;
 			sourceTree = "<group>";
@@ -473,11 +485,15 @@
 				8E1E43B125F961EF00BC64D3 /* Restaurant+Extension.swift in Sources */,
 				8E4C62D325E9CFE0001678A1 /* RestaurantListView.swift in Sources */,
 				8E4C634925EDB793001678A1 /* Restaurant.swift in Sources */,
+				8E919E80260D3956007C62C4 /* RestaurantDetailView.swift in Sources */,
 				8E4C637825EEF4CA001678A1 /* RestaurantListViewModel.swift in Sources */,
 				8E4C62D125E9CFE0001678A1 /* FirestoreSwiftUIExampleApp.swift in Sources */,
+				8E919E81260D3956007C62C4 /* ReviewView.swift in Sources */,
 				8E4C63B225F05E76001678A1 /* StarsView.swift in Sources */,
+				8E919E77260D394C007C62C4 /* Review.swift in Sources */,
+				8E919E7F260D3956007C62C4 /* RestaurantImageView.swift in Sources */,
 				8E4C63E425F6D8C8001678A1 /* PriceView.swift in Sources */,
-				8E4C63DE25F6D879001678A1 /* ImageThumbnailView.swift in Sources */,
+				8E919E71260D3945007C62C4 /* RestaurantViewModel.swift in Sources */,
 				8E4C62E725E9D191001678A1 /* RestaurantItemView.swift in Sources */,
 				8E4C63D825F6D641001678A1 /* Firestore+Extension.swift in Sources */,
 			);
diff --git a/firestore/FirestoreSwiftUIExample/Model/Restaurant.swift b/firestore/FirestoreSwiftUIExample/Model/Restaurant.swift
@@ -22,6 +22,7 @@ import FirebaseFirestoreSwift
 
 struct Restaurant: Identifiable, Codable {
   var id: String = UUID().uuidString
+  var reference: DocumentReference?
 
   var name: String
   var category: String // Could become an enum
@@ -32,6 +33,7 @@ struct Restaurant: Identifiable, Codable {
   var photo: URL
 
   enum CodingKeys: String, CodingKey {
+    case reference
     case name
     case category
     case city
@@ -41,19 +43,3 @@ struct Restaurant: Identifiable, Codable {
     case photo
   }
 }
-
-struct Review: Codable {
-  var rating: Int // Can also be enum
-  var userID: String
-  var username: String
-  var text: String
-  var date: Timestamp
-
-  enum CodingKeys: String, CodingKey {
-    case rating
-    case userID = "userId"
-    case username = "userName"
-    case text
-    case date
-  }
-}
diff --git a/firestore/FirestoreSwiftUIExample/Model/Review.swift b/firestore/FirestoreSwiftUIExample/Model/Review.swift
@@ -0,0 +1,39 @@
+//
+//  Review.swift
+//  FirestoreSwiftUIExample
+//
+//  Copyright (c) 2021 Google Inc.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//  http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+import Firebase
+import FirebaseFirestoreSwift
+
+struct Review: Identifiable, Codable {
+  var id: String = UUID().uuidString
+
+  var rating: Int // Can also be enum
+  var userID: String
+  var username: String
+  var text: String
+  var date: Timestamp
+
+  enum CodingKeys: String, CodingKey {
+    case rating
+    case userID = "userId"
+    case username = "userName"
+    case text
+    case date
+  }
+}
diff --git a/firestore/FirestoreSwiftUIExample/ViewModels/RestaurantListViewModel.swift b/firestore/FirestoreSwiftUIExample/ViewModels/RestaurantListViewModel.swift
@@ -47,12 +47,15 @@ class RestaurantListViewModel: ObservableObject {
         guard let self = self else { return }
         self.restaurants = documents.compactMap { document in
           do {
-            return try document.data(as: Restaurant.self)
+            var restaurant = try document.data(as: Restaurant.self)
+            restaurant?.reference = document.reference
+            return restaurant
           } catch let error {
             print(error)
             return nil
           }
         }
+
       }
     }
   }
diff --git a/firestore/FirestoreSwiftUIExample/ViewModels/RestaurantViewModel.swift b/firestore/FirestoreSwiftUIExample/ViewModels/RestaurantViewModel.swift
@@ -0,0 +1,68 @@
+//
+//  RestaurantViewModel.swift
+//  FirestoreSwiftUIExample
+//
+//  Copyright (c) 2021 Google Inc.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//  http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+import Firebase
+import Combine
+
+class RestaurantViewModel: ObservableObject {
+  var restaurant: Restaurant
+
+  @Published var reviews = [Review]()
+  private var db = Firestore.firestore()
+  private var listener: ListenerRegistration?
+
+  init(restaurant : Restaurant) {
+    self.restaurant = restaurant
+  }
+
+  deinit {
+    unsubscribe()
+  }
+
+  func unsubscribe() {
+    if listener != nil {
+      listener?.remove()
+      listener = nil
+    }
+  }
+
+  func subscribe() {
+    if listener == nil {
+
+      listener = restaurant.reference!.collection("ratings").addSnapshotListener { [weak self] (querySnapshot, error) in
+        guard let documents = querySnapshot?.documents else {
+          print("Error fetching documents: \(error!)")
+          return
+        }
+
+        guard let self = self else { return }
+        self.reviews = documents.compactMap { document in
+          do {
+            return try document.data(as: Review.self)
+          } catch let error {
+            print(error)
+            return nil
+          }
+        }
+
+        print(self.reviews)
+      }
+    }
+  }
+}
diff --git a/firestore/FirestoreSwiftUIExample/Views/PriceView.swift b/firestore/FirestoreSwiftUIExample/Views/PriceView.swift
@@ -21,11 +21,12 @@ import SwiftUI
 
 struct PriceView: View {
   var price: Int
+  var color: Color
 
   var body: some View {
     Text(priceString(from: price))
       .font(.footnote)
-      .foregroundColor(Color.gray)
+      .foregroundColor(color)
       .multilineTextAlignment(.trailing)
   }
 
diff --git a/firestore/FirestoreSwiftUIExample/Views/RestaurantDetailView.swift b/firestore/FirestoreSwiftUIExample/Views/RestaurantDetailView.swift
@@ -0,0 +1,92 @@
+//
+//  RestaurantDetailView.swift
+//  FirestoreSwiftUIExample
+//
+//  Copyright (c) 2021 Google Inc.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//  http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+import SwiftUI
+import SDWebImageSwiftUI
+
+struct RestaurantDetailView: View {
+  @ObservedObject var viewModel: RestaurantViewModel
+  
+  var body: some View {
+    let restaurant = viewModel.restaurant
+    
+    VStack {
+      VStack {
+        Spacer()
+          .frame(height: 100)
+        VStack(alignment: .leading) {
+          HStack {
+            Text(restaurant.name)
+              .font(.title2)
+              .bold()
+              .frame(alignment: .leading)
+            Spacer()
+            PriceView(price: restaurant.price, color: Color.white)
+          }
+          StarsView(
+            rating: Int(restaurant.averageRating.rounded()),
+            color: Color.white,
+            outlineColor: Color.white)
+          HStack {
+            Text(restaurant.category)
+            Text("•")
+            Text(restaurant.city)
+          }
+          .font(.subheadline)
+        }
+        .padding()
+        .foregroundColor(Color.white)
+        .background(TransparentRectangleView())
+      }
+      .background(RestaurantImageView(imageURL: restaurant.photo, isThumbnail: false))
+      List(viewModel.reviews) { review in
+        ReviewView(review: review)
+      }
+    }
+    .navigationBarTitle(restaurant.name, displayMode: .inline)
+    .toolbar {
+      Button("Add") {
+        print("add")
+      }
+    }
+    .onAppear() {
+      viewModel.subscribe()
+    }
+    .onDisappear() {
+      viewModel.unsubscribe()
+    }
+  }
+}
+
+struct TransparentRectangleView: View {
+  var body: some View {
+    Rectangle()
+      .foregroundColor(Color.black)
+      .opacity(0.4)
+  }
+}
+
+struct RestaurantDetailView_Previews: PreviewProvider {
+  static var previews: some View {
+    let restaurant = Restaurant(name: "Pizza Place", category: "Pizza", city: "Austin", price: 2,
+                                ratingCount: 1, averageRating: 4,
+                                photo: Restaurant.imageURL(forName: "Pizza Place"))
+    RestaurantDetailView(viewModel: RestaurantViewModel(restaurant: restaurant))
+  }
+}
diff --git a/firestore/FirestoreSwiftUIExample/Views/RestaurantImageView.swift b/firestore/FirestoreSwiftUIExample/Views/RestaurantImageView.swift
@@ -20,14 +20,20 @@
 import SwiftUI
 import SDWebImageSwiftUI
 
-struct ImageThumbnailView: View {
+struct RestaurantImageView: View {
   var imageURL: URL
+  var isThumbnail: Bool
 
   var body: some View {
-    WebImage(url: imageURL)
-      .resizable()
-      .placeholder(Image(systemName: "photo"))
-      .aspectRatio(1, contentMode: .fill)
-      .frame(width: 100, height: 100, alignment: .leading)
+    if (isThumbnail) {
+      WebImage(url: imageURL)
+        .resizable()
+        .aspectRatio(1, contentMode: .fill)
+        .frame(width: 100, height: 100, alignment: .leading)
+    } else {
+      WebImage(url: imageURL)
+        .resizable()
+        .aspectRatio(contentMode: .fill)
+    }
   }
 }
diff --git a/firestore/FirestoreSwiftUIExample/Views/RestaurantItemView.swift b/firestore/FirestoreSwiftUIExample/Views/RestaurantItemView.swift
diff --git a/firestore/FirestoreSwiftUIExample/Views/RestaurantListView.swift b/firestore/FirestoreSwiftUIExample/Views/RestaurantListView.swift
diff --git a/firestore/FirestoreSwiftUIExample/Views/ReviewView.swift b/firestore/FirestoreSwiftUIExample/Views/ReviewView.swift
diff --git a/firestore/FirestoreSwiftUIExample/Views/StarsView.swift b/firestore/FirestoreSwiftUIExample/Views/StarsView.swift

Original file line number	Diff line number	Diff line change
`@@ -47,12 +47,15 @@ class RestaurantListViewModel: ObservableObject {`
`47`	`47`	`guard let self = self else { return }`
`48`	`48`	`self.restaurants = documents.compactMap { document in`
`49`	`49`	`do {`
`50`		`- return try document.data(as: Restaurant.self)`
	`50`	`+ var restaurant = try document.data(as: Restaurant.self)`
	`51`	`+ restaurant?.reference = document.reference`
	`52`	`+ return restaurant`
`51`	`53`	`} catch let error {`
`52`	`54`	`print(error)`
`53`	`55`	`return nil`
`54`	`56`	`}`
`55`	`57`	`}`
	`58`	`+`
`56`	`59`	`}`
`57`	`60`	`}`
`58`	`61`	`}`