🔀 Merge branch 'peterfriese/samples/movietracker-new-ui/connect-dataconnect' into peterfriese/samples/movietracker-new-ui/main

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

Author: peterfriese

Examples/FriendlyFlix/app/FriendlyFlix/FriendlyFlix.xcodeproj/project.pbxproj

@@ -7,7 +7,9 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		8854EC512CC6AC2700A09F27 /* FirebaseAuth in Frameworks */ = {isa = PBXBuildFile; productRef = 8854EC502CC6AC2700A09F27 /* FirebaseAuth */; };
+		88896F392CCA5AD80089A19C /* NukeUI in Frameworks */ = {isa = PBXBuildFile; productRef = 88896F382CCA5AD80089A19C /* NukeUI */; };
+		88BA433B2CC937E10063E309 /* FirebaseDataConnect in Frameworks */ = {isa = PBXBuildFile; productRef = 88BA433A2CC937E10063E309 /* FirebaseDataConnect */; };
+		88BA43402CC938250063E309 /* FriendlyFlixSDK in Frameworks */ = {isa = PBXBuildFile; productRef = 88BA433F2CC938250063E309 /* FriendlyFlixSDK */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
@@ -27,7 +29,9 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				8854EC512CC6AC2700A09F27 /* FirebaseAuth in Frameworks */,
+				88896F392CCA5AD80089A19C /* NukeUI in Frameworks */,
+				88BA433B2CC937E10063E309 /* FirebaseDataConnect in Frameworks */,
+				88BA43402CC938250063E309 /* FriendlyFlixSDK in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -70,7 +74,9 @@
 			);
 			name = FriendlyFlix;
 			packageProductDependencies = (
-				8854EC502CC6AC2700A09F27 /* FirebaseAuth */,
+				88BA433A2CC937E10063E309 /* FirebaseDataConnect */,
+				88BA433F2CC938250063E309 /* FriendlyFlixSDK */,
+				88896F382CCA5AD80089A19C /* NukeUI */,
 			);
 			productName = FriendlyFlix;
 			productReference = 88A9E6342CA834C600B3C4EF /* FriendlyFlix.app */;
@@ -101,7 +107,9 @@
 			mainGroup = 88A9E62B2CA834C600B3C4EF;
 			minimizedProjectReferenceProxies = 1;
 			packageReferences = (
-				8854EC4F2CC6AC2700A09F27 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */,
+				88BA43392CC937E10063E309 /* XCRemoteSwiftPackageReference "data-connect-ios-sdk" */,
+				88BA433E2CC938250063E309 /* XCLocalSwiftPackageReference "../FriendlyFlixSDK" */,
+				88896F372CCA5AD80089A19C /* XCRemoteSwiftPackageReference "Nuke" */,
 			);
 			preferredProjectObjectVersion = 77;
 			productRefGroup = 88A9E6352CA834C600B3C4EF /* Products */;
@@ -334,22 +342,46 @@
 		};
 /* End XCConfigurationList section */
 
+/* Begin XCLocalSwiftPackageReference section */
+		88BA433E2CC938250063E309 /* XCLocalSwiftPackageReference "../FriendlyFlixSDK" */ = {
+			isa = XCLocalSwiftPackageReference;
+			relativePath = ../FriendlyFlixSDK;
+		};
+/* End XCLocalSwiftPackageReference section */
+
 /* Begin XCRemoteSwiftPackageReference section */
-		8854EC4F2CC6AC2700A09F27 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */ = {
+		88896F372CCA5AD80089A19C /* XCRemoteSwiftPackageReference "Nuke" */ = {
 			isa = XCRemoteSwiftPackageReference;
-			repositoryURL = "https://github.com/firebase/firebase-ios-sdk.git";
+			repositoryURL = "https://github.com/kean/Nuke?tab=readme-ov-file";
 			requirement = {
 				kind = upToNextMajorVersion;
-				minimumVersion = 11.0.0;
+				minimumVersion = 12.8.0;
+			};
+		};
+		88BA43392CC937E10063E309 /* XCRemoteSwiftPackageReference "data-connect-ios-sdk" */ = {
+			isa = XCRemoteSwiftPackageReference;
+			repositoryURL = "https://github.com/firebase/data-connect-ios-sdk";
+			requirement = {
+				branch = main;
+				kind = branch;
 			};
 		};
 /* End XCRemoteSwiftPackageReference section */
 
 /* Begin XCSwiftPackageProductDependency section */
-		8854EC502CC6AC2700A09F27 /* FirebaseAuth */ = {
+		88896F382CCA5AD80089A19C /* NukeUI */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = 88896F372CCA5AD80089A19C /* XCRemoteSwiftPackageReference "Nuke" */;
+			productName = NukeUI;
+		};
+		88BA433A2CC937E10063E309 /* FirebaseDataConnect */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = 88BA43392CC937E10063E309 /* XCRemoteSwiftPackageReference "data-connect-ios-sdk" */;
+			productName = FirebaseDataConnect;
+		};
+		88BA433F2CC938250063E309 /* FriendlyFlixSDK */ = {
 			isa = XCSwiftPackageProductDependency;
-			package = 8854EC4F2CC6AC2700A09F27 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */;
-			productName = FirebaseAuth;
+			productName = FriendlyFlixSDK;
 		};
 /* End XCSwiftPackageProductDependency section */
 	};

Examples/FriendlyFlix/app/FriendlyFlix/FriendlyFlix/App/FriendlyFlixApp.swift

@@ -18,6 +18,9 @@
 
 import SwiftUI
 import Firebase
+import FirebaseAuth
+import FirebaseDataConnect
+import FriendlyFlixSDK
 
 @main
 struct FriendlyFlixApp: App {
@@ -31,15 +34,26 @@ struct FriendlyFlixApp: App {
 #endif
   }
 
-  init () {
+  var authenticationService: AuthenticationService?
+
+  init() {
     loadRocketSimConnect()
     FirebaseApp.configure()
+
+    authenticationService = AuthenticationService()
+    authenticationService?.onSignUp { user in
+      print("User signed in \(user.displayName ?? "(no fullname)") with email \(user.email ?? "(no email)")")
+      let userName = String(user.email?.split(separator: "@").first ?? "(unknown)")
+      Task {
+        try await DataConnect.friendlyFlixConnector.upsertUserMutation.execute(username: userName)
+      }
+    }
   }
 
   var body: some Scene {
     WindowGroup {
       RootView()
-        .environment(AuthenticationService())
+        .environment(authenticationService)
     }
   }
 }

Examples/FriendlyFlix/app/FriendlyFlix/FriendlyFlix/Features/Authentication/AccountScreen.swift

@@ -57,12 +57,6 @@ extension AccountScreen {
           }
         }
 
-        Section {
-          Button(role: .destructive, action: {}) {
-            Text("Clear viewing history")
-          }
-        }
-
         Section {
           Button(action: signOut) {
             Text("Sign out")
@@ -84,4 +78,5 @@ extension AccountScreen {
 
 #Preview {
   AccountScreen()
+    .environment(AuthenticationService())
 }

Examples/FriendlyFlix/app/FriendlyFlix/FriendlyFlix/Features/Authentication/AuthenticationScreen.swift

@@ -90,12 +90,7 @@ struct AuthenticationScreen: View {
 extension AuthenticationScreen {
   var body: some View {
     VStack {
-//      Image("login")
-//        .resizable()
-//        .aspectRatio(contentMode: .fit)
-//        .frame(minHeight: 300, maxHeight: 400)
-//      Text(viewModel.flow == .login ? "Log in" : "Sign up")
-      Text("Welcome")
+      Text("Welcome to FriendlyFlix")
         .font(.largeTitle)
         .fontWeight(.bold)
         .frame(maxWidth: .infinity, alignment: .leading)
@@ -170,29 +165,6 @@ extension AuthenticationScreen {
       .frame(maxWidth: .infinity)
       .buttonStyle(.borderedProminent)
 
-      HStack {
-        VStack { Divider() }
-        Text("or")
-        VStack { Divider() }
-      }
-
-      if flow == .login {
-        SignInWithAppleButton(.signIn) { request in
-        } onCompletion: { result in
-        }
-        .signInWithAppleButtonStyle(colorScheme == .light ? .black : .white)
-        .frame(maxWidth: .infinity, minHeight: 50, maxHeight: 50)
-        .cornerRadius(8)
-      }
-      else {
-        SignInWithAppleButton(.signUp) { request in
-        } onCompletion: { result in
-        }
-        .signInWithAppleButtonStyle(colorScheme == .light ? .black : .white)
-        .frame(maxWidth: .infinity, minHeight: 50, maxHeight: 50)
-        .cornerRadius(8)
-      }
-
       HStack {
         Text(flow == .login ? "Don't have an account yet?" : "Already have an account?")
         Button(action: {

Examples/FriendlyFlix/app/FriendlyFlix/FriendlyFlix/Features/Authentication/AuthenticationService.swift

@@ -44,13 +44,23 @@ class AuthenticationService {
     }
   }
 
+  private var onSignUp: ((User) -> Void)?
+  public func onSignUp(_ action: @escaping (User) -> Void) {
+    onSignUp = action
+  }
+
   func signInWithEmailPassword(email: String, password: String) async throws {
     try await Auth.auth().signIn(withEmail: email, password: password)
     authenticationState = .authenticated
   }
 
   func signUpWithEmailPassword(email: String, password: String) async throws {
     try await Auth.auth().createUser(withEmail: email, password: password)
+
+    if let onSignUp, let user = Auth.auth().currentUser {
+      onSignUp(user)
+    }
+    
     authenticationState = .authenticated
   }
 

Examples/FriendlyFlix/app/FriendlyFlix/FriendlyFlix/Features/Authentication/AuthenticationToolbarButton.swift

@@ -19,20 +19,22 @@
 import SwiftUI
 
 struct AuthenticationToolbarButton: View {
-  @Environment(AuthenticationService.self) var viewModel
+  @Environment(AuthenticationService.self) var authenticationService
 
-  var body: some View {
-    Button(action: onButtonTapped) {
-      Image(systemName: viewModel.authenticationState == .unauthenticated ? "person.circle" : "person.circle.fill")
+  private func onButtonTapped() {
+    if authenticationService.authenticationState == .unauthenticated {
+      authenticationService.presentingAuthenticationDialog.toggle()
+    }
+    else {
+      authenticationService.presentingAccountDialog.toggle()
     }
   }
+}
 
-  func onButtonTapped() {
-    if viewModel.authenticationState == .unauthenticated {
-      viewModel.presentingAuthenticationDialog.toggle()
-    }
-    else {
-      viewModel.presentingAccountDialog.toggle()
+extension AuthenticationToolbarButton {
+  var body: some View {
+    Button(action: onButtonTapped) {
+      Image(systemName: authenticationService.authenticationState == .unauthenticated ? "person.circle" : "person.circle.fill")
     }
   }
 }