Merge pull request #21 from TartejBrothers/changes

Final Build
TartejBrothers · Jan 28, 2024 · c9537aa · c9537aa
2 parents fbf24b6 + 968c436
commit c9537aa
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 2 deletions.
diff --git a/Dose Deck/ContentView.swift b/Dose Deck/ContentView.swift
@@ -7,14 +7,16 @@ struct ContentView: View {
     @State private var password = ""
     @Binding var userIsLogged: Bool
     @StateObject private var datamanager = DataManager()
+
+    let userIdKey = "UserId"
 
     init(userIsLogged: Binding<Bool>) {
         _userIsLogged = userIsLogged
     }
 
     var body: some View {
         if userIsLogged {
-            ListView(userIsLogged: $userIsLogged)
+            ListView(userIsLogged: $userIsLogged, userId: userIdKey)
                 .environmentObject(datamanager)
         } else {
             ZStack {
@@ -101,6 +103,7 @@ struct ContentView: View {
                 }
                 .onAppear {
                     requestNotificationPermission()
+                    loadUserIdFromUserDefaults()
 
                     Auth.auth().addStateDidChangeListener { auth, user in
                         if user != nil {
@@ -130,6 +133,7 @@ struct ContentView: View {
                 datamanager.showAlert(title: "Error", message: "Invalid email or password.")
             } else {
                 if let userId = Auth.auth().currentUser?.uid {
+                    saveUserIdToUserDefaults(userId)
                     datamanager.setUserId(userId)
                 }
                 userIsLogged = true
@@ -144,12 +148,27 @@ struct ContentView: View {
                 datamanager.showAlert(title: "Error", message: "Unable to create an account. Please try again.")
             } else {
                 if let userId = Auth.auth().currentUser?.uid {
+                    saveUserIdToUserDefaults(userId)
                     datamanager.setUserId(userId)
                 }
                 userIsLogged = true
             }
         }
     }
+
+    func saveUserIdToUserDefaults(_ userId: String) {
+        UserDefaults.standard.set(userId, forKey: userIdKey)
+    }
+
+    func getUserId() -> String? {
+        return UserDefaults.standard.string(forKey: userIdKey)
+    }
+
+    func loadUserIdFromUserDefaults() {
+        if let userId = getUserId() {
+            datamanager.setUserId(userId)
+        }
+    }
 }
 
 struct ContentView_Previews: PreviewProvider {

diff --git a/Dose Deck/ListView.swift b/Dose Deck/ListView.swift
@@ -5,6 +5,7 @@ import UserNotifications
 struct ListView: View {
     @EnvironmentObject var datamanager: DataManager
     @Binding var userIsLogged: Bool
+    let userId: String
     @State private var showPopup = false
     @State private var dataLoaded = false
 
@@ -129,8 +130,11 @@ struct ListView: View {
 
 struct ListView_Previews: PreviewProvider {
     static var previews: some View {
-        ListView(userIsLogged: .constant(true))
+        let userIdForPreview = "UserID"
+
+        return ListView(userIsLogged: .constant(true), userId: userIdForPreview)
             .preferredColorScheme(.dark)
             .environmentObject(DataManager())
     }
 }
+