✨ Favourite handling

Signed-off-by: Peter Friese <[email protected]>

Author: peterfriese

Examples/FriendlyFlix/app/FriendlyFlix/FriendlyFlix/Features/Details/MovieCardView.swift

@@ -23,24 +23,27 @@ import FirebaseDataConnect
 import FriendlyFlixSDK
 
 struct MovieCardView: View {
-  public var showDetails: Bool = false
-  public var movie: Movie
-
+  @Environment(\.dismiss) private var dismiss
   private var connector = DataConnect.friendlyFlixConnector
 
+  private var showDetails: Bool = false
+  private var movie: Movie
+
   public init(showDetails: Bool, movie: Movie) {
     self.showDetails = showDetails
     self.movie = movie
 
     isFavouriteRef = connector.getIfFavoritedMovieQuery.ref(movieId: movie.id)
   }
 
+  // MARK: - Favourite handling
+
   private let isFavouriteRef: QueryRefObservation<GetIfFavoritedMovieQuery.Data, GetIfFavoritedMovieQuery.Variables>
   private var isFavourite: Bool {
     isFavouriteRef.data?.favorite_movie?.movieId != nil
   }
 
-  func toggleFavourite() {
+  private func toggleFavourite() {
     Task {
       if isFavourite {
         let _ = try await connector.deleteFavoritedMovieMutation.execute(movieId: movie.id)
@@ -52,7 +55,6 @@ struct MovieCardView: View {
       }
     }
   }
-
 }
 
 extension MovieCardView {
@@ -101,17 +103,33 @@ extension MovieCardView {
         .background(.thinMaterial)
       }
     } details: {
-      Text(movie.title)
-      Button {
-        toggleFavourite()
-      } label: {
-        Label(
-          isFavourite ? "Remove from watch list" : "Add to watch list",
-          systemImage: isFavourite ? "heart.slash" :"heart"
-        )
+      MovieDetailsView(movie: movie)
+    }
+    .toolbar {
+      ToolbarItem {
+        Button {
+          toggleFavourite()
+        } label: {
+          Image(systemName: isFavourite ? "heart.fill" : "heart")
+            .font(.headline)
+            .foregroundColor(.white)
+            .frame(width: 30, height: 30)
+            .background(Color.black.opacity(0.6))
+            .clipShape(Circle())
+        }
+      }
+      ToolbarItem {
+        Button {
+          dismiss()
+        } label: {
+          Image(systemName: "xmark")
+            .font(.headline)
+            .foregroundColor(.white)
+            .frame(width: 30, height: 30)
+            .background(Color.black.opacity(0.6))
+            .clipShape(Circle())
+        }
       }
-
-//      MovieDetailsView(movie: movie)
     }
     .task {
       do {
@@ -124,6 +142,6 @@ extension MovieCardView {
   }
 }
 
-// #Preview {
-//  MovieCardView(showDetails: true, gradientConfiguration: GradienConfiguration.sample)
-// }
+ #Preview {
+   MovieCardView(showDetails: true, movie: Movie.mock)
+ }

Examples/FriendlyFlix/app/FriendlyFlix/FriendlyFlix/Features/Details/MovieDetailsView.swift

@@ -0,0 +1,44 @@
+// Copyright © 2024 Google LLC. All rights reserved.
+//
+// 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 FirebaseDataConnect
+import FriendlyFlixSDK
+import SwiftUI
+
+struct MovieDetailsView: View {
+  var movie: Movie
+
+  var body: some View {
+    VStack(alignment: .leading, spacing: 10) {
+      // description
+      VStack(alignment: .leading, spacing: 10) {
+        Text("About")
+          .font(.title2)
+          .bold()
+          .unredacted()
+
+        Text(movie.description)
+          .font(.body)
+        HStack {
+          Spacer()
+        }
+      }
+    }
+    .padding()
+  }
+}
+
+#Preview {
+  MovieDetailsView(movie: Movie.mock)
+}

Examples/FriendlyFlix/app/FriendlyFlix/FriendlyFlix/Utilities/String+Placeholder.swift

@@ -0,0 +1,21 @@
+// Copyright © 2024 Google LLC. All rights reserved.
+//
+// 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 Foundation
+
+extension String {
+  static func placeholder(length: Int) -> String {
+    String(Array(repeating: "X", count: length))
+  }
+}

Examples/FriendlyFlix/app/FriendlyFlix/FriendlyFlix/Views/CardView.swift

@@ -43,33 +43,10 @@ struct CardView<Hero: View, Title: View, Details: View>: View {
     self.details = details
   }
 
-  @ViewBuilder
-  var dismissButton: some View {
-    if showDetails {
-      HStack {
-        Spacer()
-        Button {
-          dismiss()
-        } label: {
-          Image(systemName: "xmark")
-            .font(.headline)
-            .foregroundColor(.white)
-            .frame(width: 30, height: 30)
-            .background(Color.black.opacity(0.6))
-            .clipShape(Circle())
-        }
-        .padding([.top, .trailing], 30)
-      }
-    } else {
-      EmptyView()
-    }
-  }
-
   var cardView: some View {
     VStack(spacing: 0) {
       ZStack(alignment: .topLeading) {
         hero
-        dismissButton
         heroTitle()
       }
       .clipShape(
@@ -105,6 +82,7 @@ struct CardView<Hero: View, Title: View, Details: View>: View {
           .statusBarHidden()
       }
       .ignoresSafeArea()
+
       // Start: drag down to pop back
       .background(Color(UIColor.secondarySystemBackground))
       .scrollIndicators(scaleFactor < 1 ? .hidden : .automatic, axes: .vertical)
@@ -135,30 +113,32 @@ struct CardView<Hero: View, Title: View, Details: View>: View {
 }
 
 #Preview {
-  CardView(showDetails: true) {
-    GradientView(configuration: GradienConfiguration.sample)
-      .frame(height: 450)
-  } heroTitle: {
-    VStack(alignment: .leading) {
-      Spacer()
-      Text("Here be titles")
-        .font(.title)
-      Text("And subtitles")
-        .font(.title3)
-    }
-    .foregroundColor(Color(UIColor.systemGroupedBackground))
-    .padding()
-  } details: {
-    VStack {
-      Text(
+  NavigationStack {
+    CardView(showDetails: true) {
+      GradientView(configuration: GradienConfiguration.sample)
+        .frame(height: 450)
+    } heroTitle: {
+      VStack(alignment: .leading) {
+        Spacer()
+        Text("Here be titles")
+          .font(.title)
+        Text("And subtitles")
+          .font(.title3)
+      }
+      .foregroundColor(Color(UIColor.systemGroupedBackground))
+      .padding()
+    } details: {
+      VStack {
+        Text(
         """
         Amet culpa excepteur sit ad tempor minim aute anim nisi voluptate do. Exercitation nisi adipisicing esse officia sit ullamco.
         Tempor ullamco irure proident cupidatat non Lorem ut voluptate est ad in deserunt esse velit exercitation. Tempor voluptate ex aute id.
         Fugiat in minim labore minim duis et duis eiusmod ullamco eiusmod minim deserunt voluptate.
         """
-      )
-      .font(.body)
-      .padding()
+        )
+        .font(.body)
+        .padding()
+      }
     }
   }
 }