added log out options and integrated profile with firebase

yuvraj-coder1 · yuvraj-coder1 · commit 649807f3eb86 · 2024-06-18T15:02:35.000+05:30
diff --git a/app/src/main/java/com/example/eventtracker/ui/navigation/EventTrackerApp.kt b/app/src/main/java/com/example/eventtracker/ui/navigation/EventTrackerApp.kt
@@ -24,7 +24,7 @@ fun EventTrackerApp(
     navController: NavHostController,
     onBottomBarVisibilityChanged: (Boolean) -> Unit,
     homeScreenViewModel: HomeScreenViewModel,
-    signInViewModel: SignInViewModel
+    signInViewModel: SignInViewModel,
 ) {
     val scope = rememberCoroutineScope()
     NavHost(
@@ -36,7 +36,13 @@ fun EventTrackerApp(
             onBottomBarVisibilityChanged(false)
             SignInScreen(
                 viewModel = signInViewModel,
-                navigateToHome = { navController.navigate(HomeScreen) })
+                navigateToHome = {
+                    navController.navigate(HomeScreen) {
+                    popUpTo(LogInScreen) {
+                        inclusive = true
+                    }
+                    }
+                })
         }
 
         composable<HomeScreen> {
@@ -77,7 +83,10 @@ fun EventTrackerApp(
         }
         composable<ProfileScreen> {
             onBottomBarVisibilityChanged(true)
-            com.example.eventtracker.ui.profile.ProfileScreen(name = "Yash Aggarwal")
+            com.example.eventtracker.ui.profile.ProfileScreen(navigateToLogin = {
+                signInViewModel.signOut()
+                navController.navigate(LogInScreen)
+            })
         }
         composable<PostEventScreen> {
             onBottomBarVisibilityChanged(true)
diff --git a/app/src/main/java/com/example/eventtracker/ui/postNewEvent/PostNewEventScreen.kt b/app/src/main/java/com/example/eventtracker/ui/postNewEvent/PostNewEventScreen.kt
@@ -246,6 +246,23 @@ fun PostNewEventBody(
 
 }
 
+fun getMonthName(month: Int): String {
+    return when (month) {
+        1 -> "Jan"
+        2 -> "Feb"
+        3 -> "Mar"
+        4 -> "Apr"
+        5 -> "May"
+        6 -> "Jun"
+        7 -> "Jul"
+        8 -> "Aug"
+        9 -> "Sep"
+        10 -> "Oct"
+        11 -> "Nov"
+        12 -> "Dec"
+        else -> ""
+    }
+}
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
@@ -282,7 +299,7 @@ fun pickDate(): String {
         { _: DatePicker, mYear: Int, mMonth: Int, mDayOfMonth: Int ->
             //          mDate.value = "$mDayOfMonth/${mMonth+1}/$mYear"
             // year-month-day
-            mDate.value = "$mYear-${String.format("%02d", mMonth + 1)}-$mDayOfMonth"
+            mDate.value = "$mDayOfMonth ${getMonthName(mMonth + 1)} $mYear"
         }, mYear, mMonth, mDay
     )
 // correct code
diff --git a/app/src/main/java/com/example/eventtracker/ui/profile/ProfileScreen.kt b/app/src/main/java/com/example/eventtracker/ui/profile/ProfileScreen.kt
@@ -3,25 +3,33 @@ package com.example.eventtracker.ui.profile
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.gestures.Orientation
 import androidx.compose.foundation.gestures.scrollable
+import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.itemsIndexed
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.verticalScroll
+import androidx.compose.material3.Button
+import androidx.compose.material3.ButtonDefaults
 import androidx.compose.material3.CenterAlignedTopAppBar
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.collectAsState
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
+import androidx.compose.ui.focus.focusModifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.res.painterResource
@@ -30,11 +38,14 @@ import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
+import androidx.hilt.navigation.compose.hiltViewModel
 import coil.compose.AsyncImage
 import com.example.eventtracker.R
+import com.example.eventtracker.model.EventData
 
 @Composable
-fun ProfileScreen(modifier: Modifier = Modifier, name: String, email: String = "") {
+fun ProfileScreen(modifier: Modifier = Modifier,navigateToLogin: () -> Unit) {
+    val viewModel: ProfileScreenViewModel = hiltViewModel()
     Column(
         modifier = Modifier
             .verticalScroll(rememberScrollState())
@@ -49,11 +60,15 @@ fun ProfileScreen(modifier: Modifier = Modifier, name: String, email: String = "
             error = painterResource(id = R.drawable.default_profile_image),
         )
         Spacer(modifier = Modifier.height(16.dp))
-        Text(text = name, fontWeight = FontWeight.Bold, style = MaterialTheme.typography.titleLarge)
+        Text(
+            text = viewModel.userName.collectAsState().value,
+            fontWeight = FontWeight.Bold,
+            style = MaterialTheme.typography.titleLarge
+        )
 
         Spacer(modifier = Modifier.height(8.dp))
         Text(
-            text = "USN - 1DS23IS188",
+            text = "USN - ${viewModel.userUsn.collectAsState().value}",
             style = MaterialTheme.typography.bodyLarge,
             color = Color.Gray
         )
@@ -75,36 +90,57 @@ fun ProfileScreen(modifier: Modifier = Modifier, name: String, email: String = "
             fontWeight = FontWeight.Bold,
             fontSize = 20.sp
         )
-        EventList()
+        EventList(events = viewModel.userEvents.collectAsState().value)
+        Spacer(modifier = Modifier.height(16.dp))
+        Row(modifier = Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.Center) {
+            Button(
+                onClick = {
+//                    viewModel.logOut()
+                    navigateToLogin()
+                          },
+                modifier = Modifier.fillMaxWidth(0.87f),
+                shape = MaterialTheme.shapes.small,
+                colors = ButtonDefaults.buttonColors(Color.Black)
+            ) {
+                    Text(text = "Logout")
+                }
+
+        }
     }
 }
 
 @Composable
-fun EventList(modifier: Modifier = Modifier) {
-    EventItem(eventName = "Introduction to Android Development")
-    EventItem(eventName = "Introduction to Android Development")
-    EventItem(eventName = "Introduction to Android Development")
-    EventItem(eventName = "Introduction to Android Development")
-    EventItem(eventName = "Introduction to Android Development")
+fun EventList(modifier: Modifier = Modifier, events: List<EventData>) {
+    Column() {
+        events.forEachIndexed { index, event ->
+            EventItem(event = event)
+        }
+    }
+//    EventItem(eventName = "Introduction to Android Development")
+//    EventItem(eventName = "Introduction to Android Development")
+//    EventItem(eventName = "Introduction to Android Development")
+//    EventItem(eventName = "Introduction to Android Development")
+//    EventItem(eventName = "Introduction to Android Development")
 
 }
 
 @Composable
-fun EventItem(modifier: Modifier = Modifier,eventName:String) {
-    Row(modifier = modifier.padding(vertical = 16.dp).clickable { /*TODO*/ }) {
+fun EventItem(modifier: Modifier = Modifier, event: EventData) {
+    Row(modifier = modifier
+        .padding(vertical = 16.dp)
+        .clickable { /*TODO*/ }) {
         AsyncImage(
-            model = null,
+            model = event.image,
             contentDescription = "Event image",
             modifier = modifier
                 .clip(MaterialTheme.shapes.medium)
                 .height(70.dp)
-                .width(100.dp)
-            ,
+                .width(100.dp),
             error = painterResource(id = R.drawable.default_image),
             contentScale = ContentScale.Crop
         )
         Spacer(modifier = Modifier.width(16.dp))
-        Text(text = eventName , overflow = TextOverflow.Ellipsis,maxLines = 2, fontSize = 18.sp)
+        Text(text = event.name, overflow = TextOverflow.Ellipsis, maxLines = 2, fontSize = 18.sp)
     }
 }
 
@@ -114,8 +150,8 @@ fun ProfileScreenTopBar(modifier: Modifier = Modifier) {
     CenterAlignedTopAppBar(title = { Text(text = "Profile", fontWeight = FontWeight.Bold) })
 }
 
-@Preview
-@Composable
-fun ProfileScreenPreview() {
-    ProfileScreen(name = "James")
-}
+//@Preview
+//@Composable
+//fun ProfileScreenPreview() {
+//    ProfileScreen(name = "James")
+//}
diff --git a/app/src/main/java/com/example/eventtracker/ui/profile/ProfileScreenViewModel.kt b/app/src/main/java/com/example/eventtracker/ui/profile/ProfileScreenViewModel.kt
@@ -0,0 +1,62 @@
+package com.example.eventtracker.ui.profile
+
+import android.util.Log
+import androidx.lifecycle.ViewModel
+import com.example.eventtracker.model.EventData
+import com.example.eventtracker.model.UserData
+import com.google.firebase.auth.FirebaseAuth
+import com.google.firebase.firestore.FirebaseFirestore
+import com.google.firebase.firestore.ListenerRegistration
+import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.tasks.await
+import javax.inject.Inject
+
+@HiltViewModel
+class ProfileScreenViewModel @Inject constructor(
+    private val auth: FirebaseAuth,
+    private val db: FirebaseFirestore
+) : ViewModel() {
+    val currentUser = UserData()
+    private val _userName = MutableStateFlow(currentUser.name)
+    val userName = _userName.asStateFlow()
+    private val _userEmail = MutableStateFlow(currentUser.email)
+    val userEmail = _userEmail.asStateFlow()
+    private val _userUsn = MutableStateFlow(currentUser.collegeId)
+    val userUsn = _userUsn.asStateFlow()
+    private val _userEvents = MutableStateFlow(listOf<EventData>())
+    val userEvents = _userEvents.asStateFlow()
+    var eventListener: ListenerRegistration? = null
+
+    init {
+        db.collection("users")
+            .document(auth.currentUser!!.uid)
+            .get()
+            .addOnSuccessListener {
+                _userName.value = it.get("name") as String
+                _userEmail.value = it.get("email") as String
+                _userUsn.value = it.get("collegeId") as String
+            }
+        val user = auth.currentUser
+        if (user != null) {
+           eventListener = db.collection("users")
+                .document(user.uid)
+                .collection("Hosted Events")
+                .addSnapshotListener { value, error ->
+                    if (error != null) {
+                        return@addSnapshotListener
+                    }
+                    if (value != null) {
+                        val events = value.toObjects(EventData::class.java)
+                        _userEvents.value = events
+                    }
+                }
+
+        }
+    }
+    fun logOut() {
+        auth.signOut()
+        Log.d("TAG", auth.currentUser.toString())
+    }
+}
diff --git a/app/src/main/java/com/example/eventtracker/ui/signIn/SignInScreen.kt b/app/src/main/java/com/example/eventtracker/ui/signIn/SignInScreen.kt
@@ -1,5 +1,6 @@
 package com.example.eventtracker.ui.signIn
 
+import android.util.Log
 import android.widget.Toast
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.clickable
@@ -29,6 +30,7 @@ import androidx.compose.material3.Icon
 import androidx.compose.material3.OutlinedTextField
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
@@ -61,6 +63,13 @@ fun SignInScreen(
     navigateToSignUp: () -> Unit = {},
     navigateToSignIn: () -> Unit = {},
 ) {
+    LaunchedEffect(Unit) {
+        if(viewModel.checkIfLoggedIn()){
+            navigateToHome()
+            Log.d("TAG", "SignInScreen: ${viewModel.checkIfLoggedIn()}")
+        }
+    }
+
     val context = LocalContext.current
     val uiState by viewModel.uiState.collectAsState()
     SignInScreenContent(
diff --git a/app/src/main/java/com/example/eventtracker/ui/signIn/SignInViewModel.kt b/app/src/main/java/com/example/eventtracker/ui/signIn/SignInViewModel.kt
@@ -23,7 +23,7 @@ class SignInViewModel @Inject constructor(
     private val _uiState = MutableStateFlow(SignInUiState())
     val uiState:StateFlow<SignInUiState> = _uiState.asStateFlow()
     var inProcess by mutableStateOf(false)
-    var isSignedIn by mutableStateOf(false)
+
     var currentUser = auth.currentUser
     fun updateEmail(email:String){
         _uiState.value = _uiState.value.copy(email = email)
@@ -52,7 +52,7 @@ class SignInViewModel @Inject constructor(
             .addOnSuccessListener {
                 currentUser = auth.currentUser
                 inProcess = false
-                isSignedIn = true
+
                 onSuccess()
             }
             .addOnFailureListener{
@@ -95,4 +95,12 @@ class SignInViewModel @Inject constructor(
                 Log.d("Sign", "onSignUp: ${it.message}")
             }
     }
+    fun checkIfLoggedIn():Boolean {
+        return currentUser != null
+    }
+
+    fun signOut(){
+        auth.signOut()
+        currentUser = null
+    }
 }
diff --git a/app/src/main/res/drawable/default_image.jpg b/app/src/main/res/drawable/default_image.jpg
diff --git a/app/src/main/res/drawable/default_image.png b/app/src/main/res/drawable/default_image.png
diff --git a/app/src/main/res/drawable/default_profile_image.png b/app/src/main/res/drawable/default_profile_image.png
