From 7bb9c0ac441ade8aae3ab66163a325ade73f85ed Mon Sep 17 00:00:00 2001
From: Melissa Velasquez <mv477@cornell.edu>
Date: Sun, 8 Mar 2026 00:53:15 -0500
Subject: [PATCH 01/11] Updated schema and User graphqls

---
 app/src/main/graphql/User.graphql | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/app/src/main/graphql/User.graphql b/app/src/main/graphql/User.graphql
index 09439e6..ebfccc9 100644
--- a/app/src/main/graphql/User.graphql
+++ b/app/src/main/graphql/User.graphql
@@ -1,14 +1,24 @@
 fragment userFields on User {
     id
     email
-    name
     netId
+    name
+    encodedImage
+    activeStreak
+    maxStreak
+    streakStart
+    workoutGoal
+    lastGoalChange
+    lastStreak
+    totalGymDays
 }
 
 fragment workoutFields on Workout {
     id
     workoutTime
     userId
+    facilityId
+    gymName
 }
 
 mutation CreateUser($email: String!, $name: String!, $netId: String!) {

From 7aeedf91f24a5986d15055d3b207107ff8053da4 Mon Sep 17 00:00:00 2001
From: Melissa Velasquez <mv477@cornell.edu>
Date: Sun, 8 Mar 2026 00:55:15 -0500
Subject: [PATCH 02/11] Updated UI to match designs

---
 .../profile/ProfileHeaderSection.kt           |  60 +++++--
 .../profile/workouts/HistorySection.kt        | 113 ++++++++++++--
 .../profile/workouts/WeeklyProgressTracker.kt |  16 +-
 .../profile/workouts/WorkoutProgressArc.kt    |  86 +++++++---
 .../profile/workouts/WorkoutSection.kt        |  41 +++++
 .../ui/screens/profile/ProfileScreen.kt       | 147 ++++++++----------
 6 files changed, 317 insertions(+), 146 deletions(-)
 create mode 100644 app/src/main/java/com/cornellappdev/uplift/ui/components/profile/workouts/WorkoutSection.kt

diff --git a/app/src/main/java/com/cornellappdev/uplift/ui/components/profile/ProfileHeaderSection.kt b/app/src/main/java/com/cornellappdev/uplift/ui/components/profile/ProfileHeaderSection.kt
index 2a156f5..2fa3f8f 100644
--- a/app/src/main/java/com/cornellappdev/uplift/ui/components/profile/ProfileHeaderSection.kt
+++ b/app/src/main/java/com/cornellappdev/uplift/ui/components/profile/ProfileHeaderSection.kt
@@ -1,14 +1,18 @@
 package com.cornellappdev.uplift.ui.components.profile
 
+import android.R.attr.fontFamily
+import android.R.attr.fontWeight
 import android.net.Uri
 import androidx.compose.foundation.BorderStroke
 import androidx.compose.foundation.clickable
 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.padding
 import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material3.Icon
 import androidx.compose.material3.Surface
@@ -19,6 +23,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.font.FontWeight
+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
@@ -34,7 +39,7 @@ fun ProfileHeaderSection(
     name: String,
     gymDays: Int,
     streaks: Int,
-    badges: Int,
+    netID: String,
     profilePictureUri: Uri?,
     onPhotoSelected: (Uri) -> Unit
 ){
@@ -48,7 +53,7 @@ fun ProfileHeaderSection(
             onPhotoSelected = onPhotoSelected,
             screenType = ScreenType.PROFILE
         )
-        ProfileHeaderInfoDisplay(name, gymDays, streaks, badges)
+        ProfileHeaderInfoDisplay(name, gymDays, streaks, netID, modifier = Modifier.weight(1f))
     }
 }
 
@@ -57,34 +62,55 @@ private fun ProfileHeaderInfoDisplay(
     name: String,
     gymDays: Int,
     streaks: Int,
-    badges: Int
+    netID: String,
+    modifier: Modifier = Modifier
 ) {
     Column(
+        modifier = modifier,
         verticalArrangement = Arrangement.spacedBy(16.dp)
     ) {
-        Text(
-            text = name,
-            fontFamily = montserratFamily,
-            fontSize = 24.sp,
-            fontWeight = FontWeight.Bold
-        )
+        Row(
+            modifier = Modifier.fillMaxWidth(),
+            verticalAlignment = Alignment.CenterVertically
+        ) {
+            Text(
+                text = name,
+                modifier = Modifier.weight(1f, fill = false),
+                fontFamily = montserratFamily,
+                fontSize = 24.sp,
+                fontWeight = FontWeight.Bold,
+                maxLines = 1,
+                overflow = TextOverflow.Ellipsis
+            )
+            if (netID.isNotBlank()){
+                Spacer(modifier = Modifier.width(8.dp))
+                Text(
+                    text = "($netID)",
+                    fontFamily = montserratFamily,
+                    fontSize = 12.sp,
+                    fontWeight = FontWeight.Light,
+                    maxLines = 1,
+                    overflow = TextOverflow.Ellipsis
+                )
+            }
+        }
         Row(
             modifier = Modifier.fillMaxWidth(),
             verticalAlignment = Alignment.CenterVertically,
-            horizontalArrangement = Arrangement.SpaceBetween
         ) {
             ProfileHeaderInfo(
                 label = "Gym Days",
                 amount = gymDays
             )
+            Spacer(modifier = Modifier.width(36.dp))
             ProfileHeaderInfo(
                 label = "Streaks",
                 amount = streaks
             )
-            ProfileHeaderInfo(
-                label = "Badges",
-                amount = badges
-            )
+//            ProfileHeaderInfo(
+//                label = "Badges",
+//                amount = badges
+//            )
         }
     }
 }
@@ -115,11 +141,11 @@ private fun ProfileHeaderInfo(label: String, amount: Int) {
 @Composable
 private fun ProfileHeaderSectionPreview() {
     ProfileHeaderSection(
-        name = "John Doe",
+        name = "Melissa Velasquez",
         gymDays = 100,
         streaks = 15,
-        badges = 3,
         profilePictureUri = null,
-        onPhotoSelected = {}
+        onPhotoSelected = {},
+        netID = "mv477"
     )
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/cornellappdev/uplift/ui/components/profile/workouts/HistorySection.kt b/app/src/main/java/com/cornellappdev/uplift/ui/components/profile/workouts/HistorySection.kt
index 2a61434..e97b7d1 100644
--- a/app/src/main/java/com/cornellappdev/uplift/ui/components/profile/workouts/HistorySection.kt
+++ b/app/src/main/java/com/cornellappdev/uplift/ui/components/profile/workouts/HistorySection.kt
@@ -1,42 +1,74 @@
 package com.cornellappdev.uplift.ui.components.profile.workouts
 
+import androidx.compose.foundation.Image
 import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material.Icon
 import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.focus.focusModifier
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
+import com.cornellappdev.uplift.R
 import com.cornellappdev.uplift.ui.components.profile.SectionTitleText
 import com.cornellappdev.uplift.util.GRAY01
 import com.cornellappdev.uplift.util.montserratFamily
+import com.cornellappdev.uplift.util.timeAgoString
+import java.util.Calendar
 
 data class HistoryItem(
     val gymName: String,
     val time: String,
-    val dayOfWeek: String,
     val date: String,
+    val timestamp: Long
 )
 
 @Composable
 fun HistorySection(
     historyItems: List<HistoryItem>,
-    onClick : () -> Unit
+    onClick : () -> Unit,
+    modifier: Modifier = Modifier
 ) {
     Column(
-        modifier = Modifier.fillMaxWidth(),
-        verticalArrangement = Arrangement.spacedBy(12.dp)
+        modifier = modifier.fillMaxWidth(),
+        verticalArrangement = Arrangement.Center
     ) {
-        SectionTitleText("My History", onClick)
-        HistoryList(historyItems)
+        SectionTitleText("My Workout History", onClick)
+        Spacer(modifier = Modifier.height(12.dp))
+        if (historyItems.isNotEmpty()) {
+            Column(
+                modifier = Modifier
+                    .fillMaxSize()
+                    .verticalScroll(rememberScrollState())
+            ) {
+                HistoryList(historyItems)
+            }
+        } else {
+            Box(
+                modifier = Modifier.fillMaxSize(),
+                contentAlignment = Alignment.Center
+            ) {
+                EmptyHistorySection()
+            }
+        }
     }
 
 
@@ -60,26 +92,72 @@ private fun HistoryItemRow(
 ) {
     val gymName = historyItem.gymName
     val time = historyItem.time
-    val dayOfWeek = historyItem.dayOfWeek
     val date = historyItem.date
+    val calendar = Calendar.getInstance().apply {
+        timeInMillis = historyItem.timestamp
+    }
+    val ago = calendar.timeAgoString()
+
     Row(
         modifier = Modifier
             .fillMaxWidth()
             .padding(vertical = 12.dp),
         horizontalArrangement = Arrangement.SpaceBetween
     ) {
+        Column(){
+            Text(
+                text = gymName,
+                fontFamily = montserratFamily,
+                fontSize = 14.sp,
+                fontWeight = FontWeight.Medium,
+                color = Color.Black
+            )
+            Text(
+                text = "$date · $time",
+                fontFamily = montserratFamily,
+                fontSize = 12.sp,
+                fontWeight = FontWeight.Light,
+                color = Color.Gray
+            )
+        }
         Text(
-            text = gymName,
+            text = ago,
             fontFamily = montserratFamily,
-            fontSize = 14.sp,
+            fontSize = 12.sp,
             fontWeight = FontWeight.Medium,
             color = Color.Black
         )
+    }
+}
+
+@Composable
+private fun EmptyHistorySection(){
+    Column(
+        modifier = Modifier.fillMaxSize(),
+        verticalArrangement = Arrangement.Center,
+        horizontalAlignment = Alignment.CenterHorizontally
+    ) {
+        Image(
+            painter = painterResource(id = R.drawable.ic_bag),
+            contentDescription = null,
+            modifier = Modifier
+                .width(64.99967.dp)
+                .height(50.8181.dp)
+
+        )
+        Spacer(modifier = Modifier.height(12.dp))
+        Text(
+            text = "No workouts yet.",
+            fontFamily = montserratFamily,
+            fontSize = 14.sp,
+            fontWeight = FontWeight.Bold,
+            color = Color.Black
+        )
         Text(
-            text = "$time · $dayOfWeek $date",
+            text = "Head to a gym and check in!",
             fontFamily = montserratFamily,
-            fontSize = 12.sp,
-            fontWeight = FontWeight.Light,
+            fontSize = 14.sp,
+            fontWeight = FontWeight.Medium,
             color = Color.Black
         )
     }
@@ -88,12 +166,13 @@ private fun HistoryItemRow(
 @Preview(showBackground = true)
 @Composable
 private fun HistorySectionPreview() {
+    val now = System.currentTimeMillis()
     val historyItems = listOf(
-        HistoryItem("Morrison", "11:00 PM", "Fri", "March 29, 2024"),
-        HistoryItem("Noyes", "1:00 PM","Fri", "March 29, 2024"),
-        HistoryItem("Teagle Up", "2:00 PM", "Fri", "March 29, 2024"),
-        HistoryItem("Teagle Down", "12:00 PM", "Fri", "March 29, 2024"),
-        HistoryItem("Helen Newman", "10:00 AM", "Fri", "March 29, 2024"),
+        HistoryItem("Morrison", "11:00 PM",  "March 29, 2024", now - (1 * 24 * 60 * 60 * 1000) ),
+        HistoryItem("Noyes", "1:00 PM", "March 29, 2024", now - (3 * 24 * 60 * 60 * 1000)),
+        HistoryItem("Teagle Up", "2:00 PM",  "March 29, 2024", now - (7 * 24 * 60 * 60 * 1000)),
+        HistoryItem("Teagle Down", "12:00 PM",  "March 29, 2024", now - (15 * 24 * 60 * 60 * 1000)),
+        HistoryItem("Helen Newman", "10:00 AM",  "March 29, 2024", now),
     )
     Column(
         modifier = Modifier
diff --git a/app/src/main/java/com/cornellappdev/uplift/ui/components/profile/workouts/WeeklyProgressTracker.kt b/app/src/main/java/com/cornellappdev/uplift/ui/components/profile/workouts/WeeklyProgressTracker.kt
index 28e1081..5cdf733 100644
--- a/app/src/main/java/com/cornellappdev/uplift/ui/components/profile/workouts/WeeklyProgressTracker.kt
+++ b/app/src/main/java/com/cornellappdev/uplift/ui/components/profile/workouts/WeeklyProgressTracker.kt
@@ -48,15 +48,23 @@ fun WeeklyProgressTracker(
     completedDays: List<Boolean>
 ) {
     val daysOfWeek = listOf("M", "T", "W", "Th", "F", "Sa", "Su")
-    val paddedCompletedDays = if (completedDays.size < daysOfWeek.size) {
-        completedDays + List(daysOfWeek.size - completedDays.size) { false }
-    } else {
-        completedDays
+
+    if (daysOfMonth.size < daysOfWeek.size) {
+        return
     }
+
+    val paddedCompletedDays =
+        if (completedDays.size < daysOfWeek.size) {
+            completedDays + List(daysOfWeek.size - completedDays.size) { false }
+        } else {
+            completedDays
+        }
+
     val lastCompletedIndex = paddedCompletedDays.indexOfLast { it }
 
     Box(modifier = Modifier.fillMaxWidth()) {
         ConnectingLines(daysOfWeek, lastCompletedIndex)
+
         DayProgressCirclesRow(
             dayProgressList = daysOfWeek.mapIndexed { index, dayOfWeek ->
                 DayProgress(
diff --git a/app/src/main/java/com/cornellappdev/uplift/ui/components/profile/workouts/WorkoutProgressArc.kt b/app/src/main/java/com/cornellappdev/uplift/ui/components/profile/workouts/WorkoutProgressArc.kt
index be32012..a870c28 100644
--- a/app/src/main/java/com/cornellappdev/uplift/ui/components/profile/workouts/WorkoutProgressArc.kt
+++ b/app/src/main/java/com/cornellappdev/uplift/ui/components/profile/workouts/WorkoutProgressArc.kt
@@ -52,9 +52,16 @@ fun WorkoutProgressArc(
     workoutsCompleted: Int,
     workoutGoal: Int,
 ) {
-    // Calculate progress percentage
-    val progress = (workoutsCompleted.toFloat() / workoutGoal.toFloat()).coerceIn(0f, 1f)
+    val isZero = workoutsCompleted <= 0 || workoutGoal <= 0
+    val isComplete = workoutGoal > 0 && workoutsCompleted >= workoutGoal
 
+    // Calculate progress percentage
+    val progress = when {
+        workoutGoal <= 0 -> 0f
+        workoutsCompleted <= 0 -> 0f
+        else -> (workoutsCompleted.toFloat() / workoutGoal.toFloat())
+            .coerceIn(0f, 1f)
+    }
     // Setup animation
     val animatedProgress = remember { Animatable(0f) }
 
@@ -74,16 +81,16 @@ fun WorkoutProgressArc(
             .height(132.dp)
     ) {
         // Draw the progress arc
-        ProgressArc(animatedProgress, workoutsCompleted, workoutGoal)
-        WorkoutFractionTextSection(workoutsCompleted, workoutGoal)
+        ProgressArc(animatedProgress, isZero, isComplete)
+        WorkoutFractionTextSection(workoutsCompleted, workoutGoal, isComplete)
     }
 }
 
 @Composable
 private fun ProgressArc(
     animatedProgress: Animatable<Float, AnimationVector1D>,
-    workoutsCompleted: Int,
-    workoutGoal: Int
+    isZero: Boolean,
+    isComplete: Boolean
 ) {
     val startAngle = 180f;
     val maxSweepAngle = 180f;
@@ -112,16 +119,29 @@ private fun ProgressArc(
 
         // Progress arc
         val progressAngle = maxSweepAngle * animatedProgress.value
-        drawProgressArc(
-            workoutsCompleted,
-            workoutGoal,
-            gradientBrush,
-            startAngle,
-            progressAngle,
-            topLeft,
-            arcSize,
-            strokeWidth
-        )
+        if (progressAngle > 0f) {
+            if (isComplete) {
+                drawArc(
+                    brush = gradientBrush,
+                    startAngle = startAngle,
+                    sweepAngle = progressAngle,
+                    useCenter = false,
+                    topLeft = topLeft,
+                    size = arcSize,
+                    style = Stroke(width = strokeWidth, cap = StrokeCap.Round)
+                )
+            } else {
+                drawArc(
+                    color = PRIMARY_YELLOW,
+                    startAngle = startAngle,
+                    sweepAngle = progressAngle,
+                    useCenter = false,
+                    topLeft = topLeft,
+                    size = arcSize,
+                    style = Stroke(width = strokeWidth, cap = StrokeCap.Round)
+                )
+            }
+        }
 
         // Progress arc circle
         val angle = Math.toRadians((startAngle + progressAngle).toDouble())
@@ -134,7 +154,29 @@ private fun ProgressArc(
         val y = arcCenterY + (radius * sin(angle)).toFloat()
 
         // Outer circle
-        drawArcSliderOuterCircle(workoutsCompleted, workoutGoal, gradientBrush, dotRadius, x, y)
+        when {
+            isComplete -> {
+                drawCircle(
+                    brush = gradientBrush,
+                    radius = dotRadius,
+                    center = Offset(x, y)
+                )
+            }
+            isZero -> {
+                drawCircle(
+                    color = GRAY03,
+                    radius = dotRadius,
+                    center = Offset(x, y)
+                )
+            }
+            else -> {
+                drawCircle(
+                    color = PRIMARY_YELLOW,
+                    radius = dotRadius,
+                    center = Offset(x, y)
+                )
+            }
+        }
 
         // Inner circle
         drawCircle(
@@ -215,7 +257,7 @@ private fun DrawScope.drawArcSliderOuterCircle(
 }
 
 @Composable
-private fun WorkoutFractionTextSection(workoutsCompleted: Int, workoutGoal: Int) {
+private fun WorkoutFractionTextSection(workoutsCompleted: Int, workoutGoal: Int, isComplete: Boolean) {
     Column(
         horizontalAlignment = Alignment.CenterHorizontally,
         verticalArrangement = Arrangement.spacedBy(12.dp),
@@ -225,7 +267,7 @@ private fun WorkoutFractionTextSection(workoutsCompleted: Int, workoutGoal: Int)
             verticalAlignment = Alignment.Bottom,
             horizontalArrangement = Arrangement.spacedBy(8.dp)
         ) {
-            WorkoutsCompletedText(workoutsCompleted, workoutGoal)
+            WorkoutsCompletedText(workoutsCompleted, isComplete)
 
             Text(
                 text = "/ $workoutGoal",
@@ -237,7 +279,7 @@ private fun WorkoutFractionTextSection(workoutsCompleted: Int, workoutGoal: Int)
             )
         }
         Text(
-            text = "Workouts this week",
+            text = "Days this week",
             fontSize = 14.sp,
             color = GRAY04,
             fontFamily = montserratFamily
@@ -246,8 +288,8 @@ private fun WorkoutFractionTextSection(workoutsCompleted: Int, workoutGoal: Int)
 }
 
 @Composable
-private fun WorkoutsCompletedText(workoutsCompleted: Int, workoutGoal: Int) {
-    if (workoutsCompleted == workoutGoal) {
+private fun WorkoutsCompletedText(workoutsCompleted: Int, isComplete: Boolean) {
+    if (isComplete) {
         Text(
             text = "$workoutsCompleted",
             fontSize = 64.sp,
diff --git a/app/src/main/java/com/cornellappdev/uplift/ui/components/profile/workouts/WorkoutSection.kt b/app/src/main/java/com/cornellappdev/uplift/ui/components/profile/workouts/WorkoutSection.kt
new file mode 100644
index 0000000..43854b8
--- /dev/null
+++ b/app/src/main/java/com/cornellappdev/uplift/ui/components/profile/workouts/WorkoutSection.kt
@@ -0,0 +1,41 @@
+package com.cornellappdev.uplift.ui.components.profile.workouts
+
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.height
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.dp
+
+@Composable
+private fun WorkoutsSectionContent(
+    workoutsCompleted: Int,
+    workoutGoal: Int,
+    daysOfMonth: List<Int>,
+    completedDays: List<Boolean>,
+    reminderItems: List<ReminderItem>,
+    historyItems: List<HistoryItem>,
+    navigateToGoalsSection: () -> Unit,
+    navigateToRemindersSection: () -> Unit,
+    navigateToHistorySection: () -> Unit
+) {
+    Column(
+        modifier = Modifier.fillMaxSize()
+    ) {
+        GoalsSection(
+            workoutsCompleted = workoutsCompleted,
+            workoutGoal = workoutGoal,
+            daysOfMonth = daysOfMonth,
+            completedDays = completedDays,
+            onClick = navigateToGoalsSection,
+        )
+        Spacer(modifier = Modifier.height(24.dp))
+
+        HistorySection(
+            historyItems = historyItems,
+            onClick = navigateToHistorySection,
+            modifier = Modifier.weight(1f)
+        )
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/cornellappdev/uplift/ui/screens/profile/ProfileScreen.kt b/app/src/main/java/com/cornellappdev/uplift/ui/screens/profile/ProfileScreen.kt
index 695c299..86ec401 100644
--- a/app/src/main/java/com/cornellappdev/uplift/ui/screens/profile/ProfileScreen.kt
+++ b/app/src/main/java/com/cornellappdev/uplift/ui/screens/profile/ProfileScreen.kt
@@ -1,10 +1,15 @@
 package com.cornellappdev.uplift.ui.screens.profile
 
+import android.R.attr.name
 import android.annotation.SuppressLint
+import android.net.Uri
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.windowInsetsEndWidth
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material3.ExperimentalMaterial3Api
@@ -15,6 +20,8 @@ import androidx.compose.material3.Text
 import androidx.compose.material3.TopAppBar
 import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableIntStateOf
 import androidx.compose.runtime.remember
@@ -27,7 +34,11 @@ import androidx.compose.ui.text.font.FontWeight
 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 androidx.lifecycle.viewmodel.compose.viewModel
 import com.cornellappdev.uplift.R
+import com.cornellappdev.uplift.data.repositories.ProfileRepository
+import com.cornellappdev.uplift.data.repositories.UserInfoRepository
 import com.cornellappdev.uplift.ui.components.general.UpliftTabRow
 import com.cornellappdev.uplift.ui.components.profile.workouts.GoalsSection
 import com.cornellappdev.uplift.ui.components.profile.workouts.HistoryItem
@@ -35,96 +46,63 @@ import com.cornellappdev.uplift.ui.components.profile.workouts.HistorySection
 import com.cornellappdev.uplift.ui.components.profile.workouts.MyRemindersSection
 import com.cornellappdev.uplift.ui.components.profile.ProfileHeaderSection
 import com.cornellappdev.uplift.ui.components.profile.workouts.ReminderItem
+import com.cornellappdev.uplift.ui.viewmodels.profile.ProfileViewModel
 import com.cornellappdev.uplift.util.GRAY01
 import com.cornellappdev.uplift.util.montserratFamily
 
 @SuppressLint("UnusedMaterial3ScaffoldPaddingParameter")
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
-fun ProfileScreen() {
-    /* TODO: Replace with call to viewmodel */
-    val name = "John Doe"
-    /* TODO: Replace with call to viewmodel */
-    val gymDays = 132
-    /* TODO: Replace with call to viewmodel */
-    val streaks = 14
-    /* TODO: Replace with call to viewmodel */
-    val badges = 6
-    /* TODO: Replace with call to viewmodel */
-    val profilePicture = null
-    /* TODO: Replace with call to viewmodel */
-    val workoutsCompleted = 3
-    /* TODO: Replace with call to viewmodel */
-    val workoutGoal = 5
-    /* TODO: Replace with call to viewmodel */
-    val daysOfMonth = (25..31).toList()
-    /* TODO: Replace with call to viewmodel */
-    val completedDays = listOf(false, true, true, false, true, false, false)
-    /* TODO: Replace with call to viewmodel */
-    val reminderItems = listOf(
-        ReminderItem("Mon", "8:00 AM", "9:00 AM", true),
-        ReminderItem("Tue", "8:00 AM", "12:00 PM", false),
-        ReminderItem("Wed", "8:00 AM", "9:00 AM", true),
-        ReminderItem("Thu", "8:00 AM", "9:00 AM", false),
-        ReminderItem("Fri", "11:30 AM", "12:00 PM", true),
-    )
-    /* TODO: Replace with call to viewmodel */
-    val historyItems = listOf(
-        HistoryItem("Morrison", "11:00 PM", "Fri", "March 29, 2024"),
-        HistoryItem("Noyes", "1:00 PM", "Fri", "March 29, 2024"),
-        HistoryItem("Teagle Up", "2:00 PM", "Fri", "March 29, 2024"),
-        HistoryItem("Teagle Down", "12:00 PM", "Fri", "March 29, 2024"),
-        HistoryItem("Helen Newman", "10:00 AM", "Fri", "March 29, 2024"),
-    )
+fun ProfileScreen(
+    viewModel: ProfileViewModel = hiltViewModel(),
+    toSettings:() -> Unit,
+    toGoals:() -> Unit,
+    toHistory:() -> Unit
+) {
+//    var tabIndex by remember { mutableIntStateOf(0) }
+//    val tabs = listOf("WORKOUTS", "ACHIEVEMENTS")
 
-    var tabIndex by remember { mutableIntStateOf(0) }
-    val tabs = listOf("WORKOUTS", "ACHIEVEMENTS")
+    val uiState by viewModel.uiStateFlow.collectAsState()
 
-    val scrollState = rememberScrollState()
+    LaunchedEffect(Unit) {
+        viewModel.reload()
+    }
 
     Scaffold(
         containerColor = Color.White,
         topBar = {
-            /* TODO: Replace {} with viewmodel nav call */
-            ProfileScreenTopBar(navigateToSettings = {})
+            ProfileScreenTopBar(navigateToSettings = toSettings)
         }
     ) { innerPadding ->
         Column(
-            verticalArrangement = Arrangement.spacedBy(24.dp),
+            verticalArrangement = Arrangement.spacedBy(12.dp),
             modifier = Modifier
                 .fillMaxSize()
-                .verticalScroll(scrollState)
                 .padding(
                     top = innerPadding.calculateTopPadding() + 24.dp,
                     start = 16.dp,
                     end = 16.dp,
                 )
         ) {
-            /* TODO: Replace {} with viewmodel function call */
             ProfileHeaderSection(
-                name = name,
-                gymDays = gymDays,
-                streaks = streaks,
-                badges = badges,
-                profilePictureUri = profilePicture,
-                onPhotoSelected = {}
+                name = uiState.name,
+                gymDays = uiState.totalGymDays,
+                streaks = uiState.activeStreak,
+                profilePictureUri = uiState.profileImage?.let { Uri.parse(it) },
+                onPhotoSelected = {},
+                netID = uiState.netId
+            )
+            WorkoutsSectionContent(
+                workoutsCompleted = uiState.workoutsCompleted,
+                workoutGoal = uiState.workoutGoal,
+                daysOfMonth = uiState.daysOfMonth,
+                completedDays = uiState.completedDays,
+                reminderItems= emptyList(), //implement
+                historyItems = uiState.historyItems,
+                navigateToGoalsSection = toGoals,
+                navigateToRemindersSection = { /* TODO: Replace {} with viewmodel nav call */ },
+                navigateToHistorySection = toHistory
             )
-            UpliftTabRow(tabIndex, tabs, onTabChange = { tabIndex = it })
-            when (tabIndex) {
-                0 -> WorkoutsSectionContent(
-                    workoutsCompleted,
-                    workoutGoal,
-                    daysOfMonth,
-                    completedDays,
-                    reminderItems,
-                    historyItems,
-                    navigateToGoalsSection = { /* TODO: Replace {} with viewmodel nav call */ },
-                    navigateToRemindersSection = { /* TODO: Replace {} with viewmodel nav call */ },
-                    navigateToHistorySection = { /* TODO: Replace {} with viewmodel nav call */ }
-                )
-
-                1 -> AchievementsSectionContent()
-            }
 
         }
     }
@@ -142,21 +120,24 @@ private fun WorkoutsSectionContent(
     navigateToRemindersSection: () -> Unit,
     navigateToHistorySection: () -> Unit
 ) {
-    GoalsSection(
-        workoutsCompleted = workoutsCompleted,
-        workoutGoal = workoutGoal,
-        daysOfMonth = daysOfMonth,
-        completedDays = completedDays,
-        onClick = navigateToGoalsSection,
-    )
-    MyRemindersSection(
-        reminderItems,
-        onClickHeader = navigateToRemindersSection,
-    )
-    HistorySection(
-        historyItems = historyItems,
-        onClick = navigateToHistorySection,
-    )
+    Column(
+        modifier = Modifier.fillMaxSize()
+    ) {
+        GoalsSection(
+            workoutsCompleted = workoutsCompleted,
+            workoutGoal = workoutGoal,
+            daysOfMonth = daysOfMonth,
+            completedDays = completedDays,
+            onClick = navigateToGoalsSection,
+        )
+        Spacer(modifier = Modifier.height(24.dp))
+
+        HistorySection(
+            historyItems = historyItems,
+            onClick = navigateToHistorySection,
+            modifier = Modifier.weight(1f)
+        )
+    }
 }
 
 //TODO: Implement AchievementsSection
@@ -196,9 +177,3 @@ private fun ProfileScreenTopBar(
         }
     )
 }
-
-@Preview(showBackground = true)
-@Composable
-private fun ProfileScreenPreview() {
-    ProfileScreen()
-}
\ No newline at end of file

From 200d3976011b3229007f39c4791940fe2daecc0c Mon Sep 17 00:00:00 2001
From: Melissa Velasquez <mv477@cornell.edu>
Date: Sun, 8 Mar 2026 00:56:17 -0500
Subject: [PATCH 03/11] Implemented ProfileRepo and updated User model and repo

# Conflicts:
#	app/src/main/java/com/cornellappdev/uplift/data/repositories/UserInfoRepository.kt
---
 .../uplift/data/models/UserInfo.kt            |   8 ++
 .../data/repositories/ProfileRepository.kt    | 129 ++++++++++++++++++
 .../data/repositories/UserInfoRepository.kt   |  25 ++++
 3 files changed, 162 insertions(+)
 create mode 100644 app/src/main/java/com/cornellappdev/uplift/data/repositories/ProfileRepository.kt

diff --git a/app/src/main/java/com/cornellappdev/uplift/data/models/UserInfo.kt b/app/src/main/java/com/cornellappdev/uplift/data/models/UserInfo.kt
index d10aa9e..ca678b7 100644
--- a/app/src/main/java/com/cornellappdev/uplift/data/models/UserInfo.kt
+++ b/app/src/main/java/com/cornellappdev/uplift/data/models/UserInfo.kt
@@ -1,10 +1,18 @@
 package com.cornellappdev.uplift.data.models
+import com.cornellappdev.uplift.type.DateTime
 import kotlinx.serialization.Serializable
 
+
 @Serializable
 data class UserInfo(
     val id: String,
     val email: String,
     val name: String,
     val netId: String,
+    val encodedImage: String?,
+    val activeStreak: Int?,
+    val maxStreak: Int?,
+    val streakStart: String?,
+    val workoutGoal: Int?,
+    val totalGymDays: Int
 )
\ No newline at end of file
diff --git a/app/src/main/java/com/cornellappdev/uplift/data/repositories/ProfileRepository.kt b/app/src/main/java/com/cornellappdev/uplift/data/repositories/ProfileRepository.kt
new file mode 100644
index 0000000..1471ed3
--- /dev/null
+++ b/app/src/main/java/com/cornellappdev/uplift/data/repositories/ProfileRepository.kt
@@ -0,0 +1,129 @@
+package com.cornellappdev.uplift.data.repositories
+
+import android.util.Log
+import com.apollographql.apollo.ApolloClient
+import com.cornellappdev.uplift.GetUserByNetIdQuery
+import com.cornellappdev.uplift.GetWeeklyWorkoutDaysQuery
+import com.cornellappdev.uplift.GetWorkoutsByIdQuery
+import com.cornellappdev.uplift.SetWorkoutGoalsMutation
+import java.time.Instant
+import javax.inject.Inject
+import javax.inject.Singleton
+
+data class ProfileData(
+    val name: String,
+    val netId: String,
+    val encodedImage: String?,
+    val totalGymDays: Int,
+    val activeStreak: Int,
+    val maxStreak: Int,
+    val streakStart: String?,
+    val workoutGoal: Int,
+    val workouts: List<WorkoutDomain>,
+    val weeklyWorkoutDays: List<String>
+)
+
+data class WorkoutDomain(
+    val gymName: String,
+    val timestamp: Long
+)
+
+@Singleton
+class ProfileRepository @Inject constructor(
+    private val userInfoRepository: UserInfoRepository,
+    private val apolloClient: ApolloClient
+) {
+    suspend fun getProfile(): Result<ProfileData> {
+        return try{
+            val netId = userInfoRepository.getNetIdFromDataStore()
+                ?: return Result.failure(Exception("NetId missing"))
+
+            val userResponse = apolloClient.query(
+                GetUserByNetIdQuery(netId)
+            ).execute()
+
+            if (userResponse.hasErrors()) {
+                Log.e("ProfileRepo", "User query errors: ${userResponse.errors}")
+                return Result.failure(IllegalStateException("User query failed"))
+            }
+
+            val user = userResponse.data?.getUserByNetId?.firstOrNull()?.userFields
+                ?: return Result.failure(IllegalStateException("User not found"))
+
+            val userId = user.id.toIntOrNull()
+                ?: return Result.failure(IllegalStateException("Invalid user ID: ${user.id}"))
+
+            val workoutResponse = apolloClient
+                .query(GetWorkoutsByIdQuery(userId))
+                .execute()
+
+            if (workoutResponse.hasErrors()) {
+                Log.e("ProfileRepo", "Workout query errors: ${workoutResponse.errors}")
+            }
+
+            val workouts = if (workoutResponse.hasErrors()) {
+                emptyList()
+            } else {
+                workoutResponse.data?.getWorkoutsById?.filterNotNull() ?: emptyList()
+            }
+
+            val workoutDomain = workouts.map {
+                WorkoutDomain(
+                    gymName = it.workoutFields.gymName,
+                    timestamp = Instant.parse(it.workoutFields.workoutTime.toString()).toEpochMilli()
+                )
+            }
+
+            val weeklyResponse = apolloClient.query(GetWeeklyWorkoutDaysQuery(userId)).execute()
+            if (weeklyResponse.hasErrors()) {
+                Log.e("ProfileRepo", "Weekly query errors=${weeklyResponse.errors}")
+            }
+
+            val weeklyDays = if (weeklyResponse.hasErrors()) {
+                emptyList()
+            } else {
+                weeklyResponse.data?.getWeeklyWorkoutDays?.filterNotNull() ?: emptyList()
+            }
+
+            Result.success(
+                ProfileData(
+                    name = user.name,
+                    netId = user.netId,
+                    encodedImage = user.encodedImage,
+                    totalGymDays = user.totalGymDays,
+                    activeStreak = user.activeStreak ?: 0,
+                    maxStreak = user.maxStreak ?: 0,
+                    streakStart = user.streakStart?.toString(),
+                    workoutGoal = user.workoutGoal ?: 0,
+                    workouts = workoutDomain,
+                    weeklyWorkoutDays = weeklyDays
+                )
+            )
+        } catch (e: Exception) {
+        Log.e("ProfileRepo", "Failed to load profile", e)
+            Result.failure(e)
+        }
+    }
+
+    suspend fun setWorkoutGoal(userId: Int, goal: Int): Result<Unit> {
+        return try {
+            val response = apolloClient
+                .mutation(
+                    SetWorkoutGoalsMutation(
+                        id = userId,
+                        workoutGoal = goal
+                    )
+                )
+                .execute()
+
+            if (response.hasErrors()) {
+                Result.failure(Exception("Goal update failed"))
+            } else {
+                Result.success(Unit)
+            }
+
+        } catch (e: Exception) {
+            Result.failure(e)
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/cornellappdev/uplift/data/repositories/UserInfoRepository.kt b/app/src/main/java/com/cornellappdev/uplift/data/repositories/UserInfoRepository.kt
index b674864..bfebf9d 100644
--- a/app/src/main/java/com/cornellappdev/uplift/data/repositories/UserInfoRepository.kt
+++ b/app/src/main/java/com/cornellappdev/uplift/data/repositories/UserInfoRepository.kt
@@ -14,6 +14,7 @@ import com.cornellappdev.uplift.SetWorkoutGoalsMutation
 import kotlinx.coroutines.flow.map;
 import kotlinx.coroutines.flow.firstOrNull
 import com.cornellappdev.uplift.data.models.UserInfo
+import com.cornellappdev.uplift.type.DayOfWeekEnum
 import com.google.firebase.auth.FirebaseAuth
 import com.google.firebase.auth.FirebaseUser
 import com.google.firebase.auth.GoogleAuthProvider
@@ -107,6 +108,24 @@ class UserInfoRepository @Inject constructor(
         }
     }
 
+    suspend fun syncUserToDataStore(netId: String): Boolean {
+        return try {
+            val user = getUserByNetId(netId) ?: return false
+
+            storeId(user.id)
+            storeNetId(user.netId)
+            storeUsername(user.name)
+            storeEmail(user.email)
+            storeSkip(false)
+
+            Log.d("UserInfoRepositoryImpl", "Synced existing user to DataStore: ${user.id}")
+            true
+        } catch (e: Exception) {
+            Log.e("UserInfoRepositoryImpl", "Error syncing user to DataStore", e)
+            false
+        }
+    }
+
     suspend fun getUserByNetId(netId: String): UserInfo? {
         try {
             val response = apolloClient.query(
@@ -120,6 +139,12 @@ class UserInfoRepository @Inject constructor(
                 name = user.name,
                 email = user.email ?: "",
                 netId = user.netId,
+                encodedImage = user.encodedImage,
+                activeStreak = user.activeStreak,
+                maxStreak = user.maxStreak,
+                workoutGoal = user.workoutGoal,
+                streakStart = user.streakStart?.toString(),
+                totalGymDays = user.totalGymDays
             )
         } catch (e: Exception) {
             Log.e("UserInfoRepositoryImpl", "Error getting user by netId: $e")

From fc3d451b1f86c736b08e929c9dc6647a7fb82fbc Mon Sep 17 00:00:00 2001
From: Melissa Velasquez <mv477@cornell.edu>
Date: Sun, 8 Mar 2026 00:58:17 -0500
Subject: [PATCH 04/11] Implemented Profile VM, updates Login VM and network

# Conflicts:
#	app/src/main/java/com/cornellappdev/uplift/ui/MainNavigationWrapper.kt
---
 .../uplift/ui/MainNavigationWrapper.kt        |  14 +-
 .../viewmodels/onboarding/LoginViewModel.kt   |  14 +-
 .../ui/viewmodels/profile/ProfileViewModel.kt | 135 ++++++++++++++++++
 .../cornellappdev/uplift/util/Functions.kt    |  35 +++++
 app/src/main/res/drawable/ic_bag.png          | Bin 0 -> 2564 bytes
 5 files changed, 192 insertions(+), 6 deletions(-)
 create mode 100644 app/src/main/java/com/cornellappdev/uplift/ui/viewmodels/profile/ProfileViewModel.kt
 create mode 100644 app/src/main/res/drawable/ic_bag.png

diff --git a/app/src/main/java/com/cornellappdev/uplift/ui/MainNavigationWrapper.kt b/app/src/main/java/com/cornellappdev/uplift/ui/MainNavigationWrapper.kt
index 5373026..f4cab50 100644
--- a/app/src/main/java/com/cornellappdev/uplift/ui/MainNavigationWrapper.kt
+++ b/app/src/main/java/com/cornellappdev/uplift/ui/MainNavigationWrapper.kt
@@ -55,6 +55,7 @@ import com.cornellappdev.uplift.ui.viewmodels.nav.RootNavigationViewModel
 import com.cornellappdev.uplift.ui.viewmodels.profile.CheckInViewModel
 import com.cornellappdev.uplift.util.ONBOARDING_FLAG
 import com.cornellappdev.uplift.ui.viewmodels.profile.ConfettiViewModel
+import com.cornellappdev.uplift.ui.viewmodels.profile.ProfileViewModel
 import com.cornellappdev.uplift.util.CHECK_IN_FLAG
 import com.cornellappdev.uplift.util.PRIMARY_BLACK
 import com.cornellappdev.uplift.util.PRIMARY_YELLOW
@@ -77,14 +78,23 @@ fun MainNavigationWrapper(
     classDetailViewModel: ClassDetailViewModel = hiltViewModel(),
     rootNavigationViewModel: RootNavigationViewModel = hiltViewModel(),
 
-    ) {
+) {
 
+    val confettiViewModel: ConfettiViewModel = hiltViewModel()
+    val checkInViewModel: CheckInViewModel = hiltViewModel()
     val rootNavigationUiState = rootNavigationViewModel.collectUiStateValue()
     val startDestination = rootNavigationUiState.startDestination
 
     val navController = rememberNavController()
     val systemUiController: SystemUiController = rememberSystemUiController()
 
+    val checkInUiState = checkInViewModel.collectUiStateValue()
+    val confettiUiState = confettiViewModel.collectUiStateValue()
+
+    val profileViewModel: ProfileViewModel = hiltViewModel()
+
+
+
     val yourShimmerTheme = defaultShimmerTheme.copy(
         shaderColors = listOf(
             Color.Unspecified.copy(alpha = 1f),
@@ -244,7 +254,7 @@ fun MainNavigationWrapper(
                     CapacityReminderScreen()
                 }
                 composable<UpliftRootRoute.Profile> {
-                    ProfileScreen()
+                    ProfileScreen(profileViewModel, {}, {}, {})
                 }
                 composable<UpliftRootRoute.Reminders> {
                     MainReminderScreen()
diff --git a/app/src/main/java/com/cornellappdev/uplift/ui/viewmodels/onboarding/LoginViewModel.kt b/app/src/main/java/com/cornellappdev/uplift/ui/viewmodels/onboarding/LoginViewModel.kt
index aa0b3dc..bcb7bab 100644
--- a/app/src/main/java/com/cornellappdev/uplift/ui/viewmodels/onboarding/LoginViewModel.kt
+++ b/app/src/main/java/com/cornellappdev/uplift/ui/viewmodels/onboarding/LoginViewModel.kt
@@ -42,14 +42,20 @@ class LoginViewModel @Inject constructor(
                 return@launch
             }
             when {
-                userInfoRepository.hasUser(netId) -> rootNavigationRepository.navigate(
-                    UpliftRootRoute.Home
-                )
+                userInfoRepository.hasUser(netId) -> {
+                    val synced = userInfoRepository.syncUserToDataStore(netId)
+                    if (synced) {
+                        rootNavigationRepository.navigate(UpliftRootRoute.Home)
+                    } else {
+                        Log.e("Error", "Failed to sync existing user")
+                        userInfoRepository.signOut()
+                    }
+                }
 
                 userInfoRepository.hasFirebaseUser() -> rootNavigationRepository.navigate(
                     UpliftRootRoute.ProfileCreation
                 )
-                //TODO: Handle error
+
                 else -> {
                     Log.e("Error", "Unexpected credential")
                     userInfoRepository.signOut()
diff --git a/app/src/main/java/com/cornellappdev/uplift/ui/viewmodels/profile/ProfileViewModel.kt b/app/src/main/java/com/cornellappdev/uplift/ui/viewmodels/profile/ProfileViewModel.kt
new file mode 100644
index 0000000..8d24118
--- /dev/null
+++ b/app/src/main/java/com/cornellappdev/uplift/ui/viewmodels/profile/ProfileViewModel.kt
@@ -0,0 +1,135 @@
+package com.cornellappdev.uplift.ui.viewmodels.profile
+
+import android.util.Log
+import androidx.lifecycle.viewModelScope
+import com.cornellappdev.uplift.data.repositories.ProfileRepository
+import com.cornellappdev.uplift.data.repositories.UpliftApiRepository
+import com.cornellappdev.uplift.data.repositories.UserInfoRepository
+import com.cornellappdev.uplift.ui.components.profile.workouts.HistoryItem
+import com.cornellappdev.uplift.ui.viewmodels.UpliftViewModel
+import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.launch
+import okhttp3.internal.format
+import java.time.DayOfWeek
+import java.time.Instant
+import java.time.LocalDate
+import java.time.ZoneId
+import java.time.format.DateTimeFormatter
+import java.util.Locale
+import javax.inject.Inject
+
+data class ProfileUiState(
+    val loading: Boolean = false,
+    val error: Boolean = false,
+    val name: String = "",
+    val netId: String = "",
+    val profileImage: String? = null,
+    val totalGymDays: Int = 0,
+    val activeStreak: Int = 0,
+    val maxStreak: Int = 0,
+    val streakStart: String? = null,
+    val workoutGoal: Int = 0,
+    val historyItems: List<HistoryItem> = emptyList(),
+    val daysOfMonth: List<Int> = emptyList(),
+    val completedDays: List<Boolean> = emptyList(),
+    val workoutsCompleted: Int = 0
+)
+
+@HiltViewModel
+class ProfileViewModel @Inject constructor(
+    private val profileRepository: ProfileRepository,
+    private val userInfoRepository: UserInfoRepository,
+) : UpliftViewModel<ProfileUiState>(ProfileUiState()) {
+
+    private var loadingJob: Job? = null
+
+    fun reload() {
+        if (loadingJob?.isActive == true) return
+        loadingJob = loadProfile()
+
+    }
+
+
+    private fun loadProfile(): Job = viewModelScope.launch {
+        applyMutation { copy(loading = true, error = false) }
+
+        val result = profileRepository.getProfile()
+
+        if (result.isSuccess) {
+            val profile = result.getOrNull()!!
+
+            val historyItems = profile.workouts.map {
+                HistoryItem(
+                    gymName = it.gymName,
+                    time = formatTime.format(
+                        Instant.ofEpochMilli(it.timestamp)
+                    ),
+                    date = formatDate.format(
+                        Instant.ofEpochMilli(it.timestamp)
+                    ),
+                    timestamp = it.timestamp
+                )
+            }
+
+            val now = LocalDate.now()
+            val startOfWeek = now.with(DayOfWeek.MONDAY)
+
+            val weekDates = (0..6).map {
+                startOfWeek.plusDays(it.toLong())
+            }
+
+            val daysOfMonth = weekDates.map { it.dayOfMonth }
+
+            val completedDays = weekDates.map { date ->
+                profile.weeklyWorkoutDays.contains(date.toString())
+            }
+
+            val workoutsCompleted = profile.weeklyWorkoutDays.size
+
+            applyMutation {
+                copy(
+                    loading = false,
+                    name = profile.name,
+                    netId = profile.netId,
+                    profileImage = profile.encodedImage,
+                    totalGymDays = profile.totalGymDays,
+                    activeStreak = profile.activeStreak,
+                    maxStreak = profile.maxStreak,
+                    streakStart = profile.streakStart,
+                    workoutGoal = profile.workoutGoal,
+                    historyItems = historyItems,
+                    daysOfMonth = daysOfMonth,
+                    completedDays = completedDays,
+                    workoutsCompleted = workoutsCompleted
+                )
+            }
+        } else {
+            Log.e("profile VM", "Failed to load profile", result.exceptionOrNull())
+            applyMutation { copy(loading = false, error = true) }
+        }
+
+    }
+
+
+    fun updateWorkoutGoal(goal: Int) = viewModelScope.launch {
+        val userId = userInfoRepository.getUserIdFromDataStore()?.toIntOrNull() ?: return@launch
+        val result = profileRepository.setWorkoutGoal(userId, goal)
+
+        if (result.isSuccess) {
+            reload()
+        } else {
+            Log.e("profile VM", "Failed to update workout goal", result.exceptionOrNull())
+        }
+    }
+
+    private val formatTime = DateTimeFormatter
+        .ofPattern("h:mm a")
+        .withLocale(Locale.US)
+        .withZone(ZoneId.systemDefault())
+
+    private val formatDate = DateTimeFormatter
+        .ofPattern("MMMM d, yyyy • h:mm a")
+        .withLocale(Locale.US)
+        .withZone(ZoneId.systemDefault())
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/cornellappdev/uplift/util/Functions.kt b/app/src/main/java/com/cornellappdev/uplift/util/Functions.kt
index d3cf75a..0988bc5 100644
--- a/app/src/main/java/com/cornellappdev/uplift/util/Functions.kt
+++ b/app/src/main/java/com/cornellappdev/uplift/util/Functions.kt
@@ -183,3 +183,38 @@ val startTimeComparator = { class1: UpliftClass, class2: UpliftClass ->
         class1.time.end.compareTo(class2.time.end)
     }
 }
+
+/**
+ * Returns a relative time string such as:
+ * "1 day ago", "2 weeks ago", "1 month ago", "1 year ago"
+ */
+fun Calendar.timeAgoString(): String {
+    val now = Calendar.getInstance()
+
+    val diffMillis = now.timeInMillis - this.timeInMillis
+    if (diffMillis < 0) return "Today"
+
+    val diffDays = diffMillis / (1000 * 60 * 60 * 24)
+
+    val diffWeeks = diffDays / 7
+    val diffMonths = diffDays / 30
+    val diffYears = diffDays / 365
+
+    return when {
+        diffDays < 1 -> "Today"
+
+        diffDays == 1L -> "1 day ago"
+        diffDays in 2..6 -> "$diffDays days ago"
+
+        diffWeeks == 1L -> "1 week ago"
+        diffWeeks in 2..4 -> "$diffWeeks weeks ago"
+
+        diffMonths == 1L -> "1 month ago"
+        diffMonths in 2..11 -> "$diffMonths months ago"
+
+        diffYears == 1L -> "1 year ago"
+        diffYears > 1L -> "$diffYears years ago"
+
+        else -> "Today"
+    }
+}
diff --git a/app/src/main/res/drawable/ic_bag.png b/app/src/main/res/drawable/ic_bag.png
new file mode 100644
index 0000000000000000000000000000000000000000..41b1efe9c23f3c93f1ef8a6a07c9a6c3d9de8921
GIT binary patch
literal 2564
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
aedvEA2;ig&CBxnT0000<MNUMnLSTZf1<ASq

literal 0
HcmV?d00001


From 79e36f95c0cec83445b269ae83b443be910398cf Mon Sep 17 00:00:00 2001
From: Melissa Velasquez <mv477@cornell.edu>
Date: Sun, 8 Mar 2026 00:59:04 -0500
Subject: [PATCH 05/11] tested logworkout call for profile page testing, WIP

---
 .../uplift/data/repositories/CheckInRepository.kt      | 10 +++++++++-
 .../uplift/ui/viewmodels/profile/CheckInViewModel.kt   |  7 ++++++-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/cornellappdev/uplift/data/repositories/CheckInRepository.kt b/app/src/main/java/com/cornellappdev/uplift/data/repositories/CheckInRepository.kt
index d0384d1..1e8b165 100644
--- a/app/src/main/java/com/cornellappdev/uplift/data/repositories/CheckInRepository.kt
+++ b/app/src/main/java/com/cornellappdev/uplift/data/repositories/CheckInRepository.kt
@@ -150,7 +150,14 @@ class CheckInRepository @Inject constructor(
      * Logs a completed workout to the backend. Returns true if the mutation succeeded, false otherwise.
      */
     suspend fun logWorkoutFromCheckIn(gymId: Int): Boolean {
-        val userId = userInfoRepository.getUserIdFromDataStore()?.toIntOrNull() ?: return false
+        val userIdString = userInfoRepository.getUserIdFromDataStore()
+        val userId = userIdString?.toIntOrNull()
+
+        if (userId == null) {
+            Log.e("CheckInRepository", "Missing or invalid userId in DataStore: $userIdString")
+            return false
+        }
+
         val time = Instant.now().toString()
 
         return try {
@@ -161,6 +168,7 @@ class CheckInRepository @Inject constructor(
             val ok = response.data?.logWorkout?.workoutFields != null && !response.hasErrors()
             if (!ok) {
                 Log.e("CheckInRepository", "LogWorkout errors=${response.errors}")
+                Log.e("CheckInRepository", "LogWorkout response data=${response.data}")
             }
             ok
         } catch (t: Throwable){
diff --git a/app/src/main/java/com/cornellappdev/uplift/ui/viewmodels/profile/CheckInViewModel.kt b/app/src/main/java/com/cornellappdev/uplift/ui/viewmodels/profile/CheckInViewModel.kt
index 09c0516..0a17dac 100644
--- a/app/src/main/java/com/cornellappdev/uplift/ui/viewmodels/profile/CheckInViewModel.kt
+++ b/app/src/main/java/com/cornellappdev/uplift/ui/viewmodels/profile/CheckInViewModel.kt
@@ -150,7 +150,12 @@ class CheckInViewModel @Inject constructor(
                 )
             }
             confettiRepository.showConfetti(ConfettiViewModel.ConfettiUiState())
-            checkInRepository.logWorkoutFromCheckIn(gymIdInt)
+            val logged = checkInRepository.logWorkoutFromCheckIn(gymIdInt)
+            if (logged) {
+                Log.d(tag, "Workout successfully logged to backend")
+            } else {
+                Log.e(tag, "Workout failed to log to backend")
+            }
         } catch (e: Exception) {
             Log.e(tag, "Error checking in", e)
         }

From 07f6cab0301e5af51c9d210c94194f34508935ab Mon Sep 17 00:00:00 2001
From: Melissa Velasquez <mv477@cornell.edu>
Date: Mon, 9 Mar 2026 14:56:49 -0400
Subject: [PATCH 06/11] Rebased and Addressed Copilot Comments

---
 .../uplift/data/models/UserInfo.kt            |  1 -
 .../data/repositories/CheckInRepository.kt    |  1 -
 .../data/repositories/ProfileRepository.kt    |  4 +-
 .../data/repositories/UserInfoRepository.kt   |  1 -
 .../uplift/ui/MainNavigationWrapper.kt        | 13 +-----
 .../profile/ProfileHeaderSection.kt           | 19 ++-------
 .../profile/workouts/HistorySection.kt        |  3 --
 .../profile/workouts/WorkoutSection.kt        | 41 -------------------
 .../ui/screens/profile/ProfileScreen.kt       | 15 +------
 .../ui/viewmodels/profile/ProfileViewModel.kt |  4 +-
 10 files changed, 9 insertions(+), 93 deletions(-)
 delete mode 100644 app/src/main/java/com/cornellappdev/uplift/ui/components/profile/workouts/WorkoutSection.kt

diff --git a/app/src/main/java/com/cornellappdev/uplift/data/models/UserInfo.kt b/app/src/main/java/com/cornellappdev/uplift/data/models/UserInfo.kt
index ca678b7..c472092 100644
--- a/app/src/main/java/com/cornellappdev/uplift/data/models/UserInfo.kt
+++ b/app/src/main/java/com/cornellappdev/uplift/data/models/UserInfo.kt
@@ -1,5 +1,4 @@
 package com.cornellappdev.uplift.data.models
-import com.cornellappdev.uplift.type.DateTime
 import kotlinx.serialization.Serializable
 
 
diff --git a/app/src/main/java/com/cornellappdev/uplift/data/repositories/CheckInRepository.kt b/app/src/main/java/com/cornellappdev/uplift/data/repositories/CheckInRepository.kt
index 1e8b165..52e380d 100644
--- a/app/src/main/java/com/cornellappdev/uplift/data/repositories/CheckInRepository.kt
+++ b/app/src/main/java/com/cornellappdev/uplift/data/repositories/CheckInRepository.kt
@@ -168,7 +168,6 @@ class CheckInRepository @Inject constructor(
             val ok = response.data?.logWorkout?.workoutFields != null && !response.hasErrors()
             if (!ok) {
                 Log.e("CheckInRepository", "LogWorkout errors=${response.errors}")
-                Log.e("CheckInRepository", "LogWorkout response data=${response.data}")
             }
             ok
         } catch (t: Throwable){
diff --git a/app/src/main/java/com/cornellappdev/uplift/data/repositories/ProfileRepository.kt b/app/src/main/java/com/cornellappdev/uplift/data/repositories/ProfileRepository.kt
index 1471ed3..0e5818c 100644
--- a/app/src/main/java/com/cornellappdev/uplift/data/repositories/ProfileRepository.kt
+++ b/app/src/main/java/com/cornellappdev/uplift/data/repositories/ProfileRepository.kt
@@ -91,8 +91,8 @@ class ProfileRepository @Inject constructor(
                     netId = user.netId,
                     encodedImage = user.encodedImage,
                     totalGymDays = user.totalGymDays,
-                    activeStreak = user.activeStreak ?: 0,
-                    maxStreak = user.maxStreak ?: 0,
+                    activeStreak = user.activeStreak,
+                    maxStreak = user.maxStreak,
                     streakStart = user.streakStart?.toString(),
                     workoutGoal = user.workoutGoal ?: 0,
                     workouts = workoutDomain,
diff --git a/app/src/main/java/com/cornellappdev/uplift/data/repositories/UserInfoRepository.kt b/app/src/main/java/com/cornellappdev/uplift/data/repositories/UserInfoRepository.kt
index bfebf9d..345feb4 100644
--- a/app/src/main/java/com/cornellappdev/uplift/data/repositories/UserInfoRepository.kt
+++ b/app/src/main/java/com/cornellappdev/uplift/data/repositories/UserInfoRepository.kt
@@ -14,7 +14,6 @@ import com.cornellappdev.uplift.SetWorkoutGoalsMutation
 import kotlinx.coroutines.flow.map;
 import kotlinx.coroutines.flow.firstOrNull
 import com.cornellappdev.uplift.data.models.UserInfo
-import com.cornellappdev.uplift.type.DayOfWeekEnum
 import com.google.firebase.auth.FirebaseAuth
 import com.google.firebase.auth.FirebaseUser
 import com.google.firebase.auth.GoogleAuthProvider
diff --git a/app/src/main/java/com/cornellappdev/uplift/ui/MainNavigationWrapper.kt b/app/src/main/java/com/cornellappdev/uplift/ui/MainNavigationWrapper.kt
index f4cab50..d99ae49 100644
--- a/app/src/main/java/com/cornellappdev/uplift/ui/MainNavigationWrapper.kt
+++ b/app/src/main/java/com/cornellappdev/uplift/ui/MainNavigationWrapper.kt
@@ -53,9 +53,7 @@ import com.cornellappdev.uplift.ui.viewmodels.classes.ClassDetailViewModel
 import com.cornellappdev.uplift.ui.viewmodels.gyms.GymDetailViewModel
 import com.cornellappdev.uplift.ui.viewmodels.nav.RootNavigationViewModel
 import com.cornellappdev.uplift.ui.viewmodels.profile.CheckInViewModel
-import com.cornellappdev.uplift.util.ONBOARDING_FLAG
 import com.cornellappdev.uplift.ui.viewmodels.profile.ConfettiViewModel
-import com.cornellappdev.uplift.ui.viewmodels.profile.ProfileViewModel
 import com.cornellappdev.uplift.util.CHECK_IN_FLAG
 import com.cornellappdev.uplift.util.PRIMARY_BLACK
 import com.cornellappdev.uplift.util.PRIMARY_YELLOW
@@ -88,13 +86,6 @@ fun MainNavigationWrapper(
     val navController = rememberNavController()
     val systemUiController: SystemUiController = rememberSystemUiController()
 
-    val checkInUiState = checkInViewModel.collectUiStateValue()
-    val confettiUiState = confettiViewModel.collectUiStateValue()
-
-    val profileViewModel: ProfileViewModel = hiltViewModel()
-
-
-
     val yourShimmerTheme = defaultShimmerTheme.copy(
         shaderColors = listOf(
             Color.Unspecified.copy(alpha = 1f),
@@ -107,7 +98,7 @@ fun MainNavigationWrapper(
     val items = listOfNotNull(
         BottomNavScreens.Home,
         BottomNavScreens.Classes,
-        BottomNavScreens.Profile.takeIf { ONBOARDING_FLAG }
+        BottomNavScreens.Profile
     )
 
     systemUiController.setStatusBarColor(PRIMARY_YELLOW)
@@ -254,7 +245,7 @@ fun MainNavigationWrapper(
                     CapacityReminderScreen()
                 }
                 composable<UpliftRootRoute.Profile> {
-                    ProfileScreen(profileViewModel, {}, {}, {})
+                    ProfileScreen(toSettings = {}, toGoals = {}, toHistory = {})
                 }
                 composable<UpliftRootRoute.Reminders> {
                     MainReminderScreen()
diff --git a/app/src/main/java/com/cornellappdev/uplift/ui/components/profile/ProfileHeaderSection.kt b/app/src/main/java/com/cornellappdev/uplift/ui/components/profile/ProfileHeaderSection.kt
index 2fa3f8f..9f2b801 100644
--- a/app/src/main/java/com/cornellappdev/uplift/ui/components/profile/ProfileHeaderSection.kt
+++ b/app/src/main/java/com/cornellappdev/uplift/ui/components/profile/ProfileHeaderSection.kt
@@ -1,36 +1,23 @@
 package com.cornellappdev.uplift.ui.components.profile
 
-import android.R.attr.fontFamily
-import android.R.attr.fontWeight
 import android.net.Uri
-import androidx.compose.foundation.BorderStroke
-import androidx.compose.foundation.clickable
 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.padding
-import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material3.Icon
-import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.font.FontWeight
 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 com.cornellappdev.uplift.R
 import com.cornellappdev.uplift.ui.components.onboarding.PhotoPicker
 import com.cornellappdev.uplift.ui.components.onboarding.ScreenType
-import com.cornellappdev.uplift.util.GRAY01
 import com.cornellappdev.uplift.util.GRAY04
 import com.cornellappdev.uplift.util.montserratFamily
 
@@ -39,7 +26,7 @@ fun ProfileHeaderSection(
     name: String,
     gymDays: Int,
     streaks: Int,
-    netID: String,
+    netId: String,
     profilePictureUri: Uri?,
     onPhotoSelected: (Uri) -> Unit
 ){
@@ -53,7 +40,7 @@ fun ProfileHeaderSection(
             onPhotoSelected = onPhotoSelected,
             screenType = ScreenType.PROFILE
         )
-        ProfileHeaderInfoDisplay(name, gymDays, streaks, netID, modifier = Modifier.weight(1f))
+        ProfileHeaderInfoDisplay(name, gymDays, streaks, netId, modifier = Modifier.weight(1f))
     }
 }
 
@@ -146,6 +133,6 @@ private fun ProfileHeaderSectionPreview() {
         streaks = 15,
         profilePictureUri = null,
         onPhotoSelected = {},
-        netID = "mv477"
+        netId = "mv477"
     )
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/cornellappdev/uplift/ui/components/profile/workouts/HistorySection.kt b/app/src/main/java/com/cornellappdev/uplift/ui/components/profile/workouts/HistorySection.kt
index e97b7d1..067480b 100644
--- a/app/src/main/java/com/cornellappdev/uplift/ui/components/profile/workouts/HistorySection.kt
+++ b/app/src/main/java/com/cornellappdev/uplift/ui/components/profile/workouts/HistorySection.kt
@@ -13,15 +13,12 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
-import androidx.compose.material.Icon
 import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.focus.focusModifier
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.tooling.preview.Preview
diff --git a/app/src/main/java/com/cornellappdev/uplift/ui/components/profile/workouts/WorkoutSection.kt b/app/src/main/java/com/cornellappdev/uplift/ui/components/profile/workouts/WorkoutSection.kt
deleted file mode 100644
index 43854b8..0000000
--- a/app/src/main/java/com/cornellappdev/uplift/ui/components/profile/workouts/WorkoutSection.kt
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.cornellappdev.uplift.ui.components.profile.workouts
-
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.height
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.unit.dp
-
-@Composable
-private fun WorkoutsSectionContent(
-    workoutsCompleted: Int,
-    workoutGoal: Int,
-    daysOfMonth: List<Int>,
-    completedDays: List<Boolean>,
-    reminderItems: List<ReminderItem>,
-    historyItems: List<HistoryItem>,
-    navigateToGoalsSection: () -> Unit,
-    navigateToRemindersSection: () -> Unit,
-    navigateToHistorySection: () -> Unit
-) {
-    Column(
-        modifier = Modifier.fillMaxSize()
-    ) {
-        GoalsSection(
-            workoutsCompleted = workoutsCompleted,
-            workoutGoal = workoutGoal,
-            daysOfMonth = daysOfMonth,
-            completedDays = completedDays,
-            onClick = navigateToGoalsSection,
-        )
-        Spacer(modifier = Modifier.height(24.dp))
-
-        HistorySection(
-            historyItems = historyItems,
-            onClick = navigateToHistorySection,
-            modifier = Modifier.weight(1f)
-        )
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/cornellappdev/uplift/ui/screens/profile/ProfileScreen.kt b/app/src/main/java/com/cornellappdev/uplift/ui/screens/profile/ProfileScreen.kt
index 86ec401..156f980 100644
--- a/app/src/main/java/com/cornellappdev/uplift/ui/screens/profile/ProfileScreen.kt
+++ b/app/src/main/java/com/cornellappdev/uplift/ui/screens/profile/ProfileScreen.kt
@@ -1,6 +1,5 @@
 package com.cornellappdev.uplift.ui.screens.profile
 
-import android.R.attr.name
 import android.annotation.SuppressLint
 import android.net.Uri
 import androidx.compose.foundation.layout.Arrangement
@@ -9,9 +8,6 @@ import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.windowInsetsEndWidth
-import androidx.compose.foundation.rememberScrollState
-import androidx.compose.foundation.verticalScroll
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
@@ -23,27 +19,18 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableIntStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.shadow
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.font.FontWeight
-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 androidx.lifecycle.viewmodel.compose.viewModel
 import com.cornellappdev.uplift.R
-import com.cornellappdev.uplift.data.repositories.ProfileRepository
-import com.cornellappdev.uplift.data.repositories.UserInfoRepository
-import com.cornellappdev.uplift.ui.components.general.UpliftTabRow
 import com.cornellappdev.uplift.ui.components.profile.workouts.GoalsSection
 import com.cornellappdev.uplift.ui.components.profile.workouts.HistoryItem
 import com.cornellappdev.uplift.ui.components.profile.workouts.HistorySection
-import com.cornellappdev.uplift.ui.components.profile.workouts.MyRemindersSection
 import com.cornellappdev.uplift.ui.components.profile.ProfileHeaderSection
 import com.cornellappdev.uplift.ui.components.profile.workouts.ReminderItem
 import com.cornellappdev.uplift.ui.viewmodels.profile.ProfileViewModel
@@ -90,7 +77,7 @@ fun ProfileScreen(
                 streaks = uiState.activeStreak,
                 profilePictureUri = uiState.profileImage?.let { Uri.parse(it) },
                 onPhotoSelected = {},
-                netID = uiState.netId
+                netId = uiState.netId
             )
             WorkoutsSectionContent(
                 workoutsCompleted = uiState.workoutsCompleted,
diff --git a/app/src/main/java/com/cornellappdev/uplift/ui/viewmodels/profile/ProfileViewModel.kt b/app/src/main/java/com/cornellappdev/uplift/ui/viewmodels/profile/ProfileViewModel.kt
index 8d24118..72451fa 100644
--- a/app/src/main/java/com/cornellappdev/uplift/ui/viewmodels/profile/ProfileViewModel.kt
+++ b/app/src/main/java/com/cornellappdev/uplift/ui/viewmodels/profile/ProfileViewModel.kt
@@ -3,14 +3,12 @@ package com.cornellappdev.uplift.ui.viewmodels.profile
 import android.util.Log
 import androidx.lifecycle.viewModelScope
 import com.cornellappdev.uplift.data.repositories.ProfileRepository
-import com.cornellappdev.uplift.data.repositories.UpliftApiRepository
 import com.cornellappdev.uplift.data.repositories.UserInfoRepository
 import com.cornellappdev.uplift.ui.components.profile.workouts.HistoryItem
 import com.cornellappdev.uplift.ui.viewmodels.UpliftViewModel
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
-import okhttp3.internal.format
 import java.time.DayOfWeek
 import java.time.Instant
 import java.time.LocalDate
@@ -129,7 +127,7 @@ class ProfileViewModel @Inject constructor(
         .withZone(ZoneId.systemDefault())
 
     private val formatDate = DateTimeFormatter
-        .ofPattern("MMMM d, yyyy • h:mm a")
+        .ofPattern("MMMM d, yyyy")
         .withLocale(Locale.US)
         .withZone(ZoneId.systemDefault())
 }
\ No newline at end of file

From 2af071e3703a3ead76133a1a70ce61ed9a45242c Mon Sep 17 00:00:00 2001
From: Melissa Velasquez <mv477@cornell.edu>
Date: Thu, 12 Mar 2026 19:02:16 -0400
Subject: [PATCH 07/11] Adressing Comments

---
 app/src/main/graphql/schema.graphqls          |  13 +-
 .../uplift/data/models/ProfileData.kt         |  17 ++
 .../uplift/data/models/WorkoutDomain.kt       |   6 +
 .../data/repositories/ProfileRepository.kt    | 151 ++++++++----------
 .../uplift/ui/MainNavigationWrapper.kt        |   5 +-
 .../profile/workouts/HistorySection.kt        |   2 +-
 .../ui/screens/profile/ProfileScreen.kt       |  54 +++++--
 .../ui/viewmodels/profile/ProfileViewModel.kt | 127 ++++++++-------
 .../cornellappdev/uplift/util/Functions.kt    |   6 +-
 app/src/main/res/drawable/ic_bag.png          | Bin 2564 -> 0 bytes
 app/src/main/res/drawable/ic_dufflebag.xml    |  41 +++++
 11 files changed, 255 insertions(+), 167 deletions(-)
 create mode 100644 app/src/main/java/com/cornellappdev/uplift/data/models/ProfileData.kt
 create mode 100644 app/src/main/java/com/cornellappdev/uplift/data/models/WorkoutDomain.kt
 delete mode 100644 app/src/main/res/drawable/ic_bag.png
 create mode 100644 app/src/main/res/drawable/ic_dufflebag.xml

diff --git a/app/src/main/graphql/schema.graphqls b/app/src/main/graphql/schema.graphqls
index 2b3e050..6d88007 100644
--- a/app/src/main/graphql/schema.graphqls
+++ b/app/src/main/graphql/schema.graphqls
@@ -378,9 +378,11 @@ type User {
   totalGymDays: Int!
 
   """
-  The start date of the most recent active streak, up until the current date.
+  The start datetime of the most recent active streak (midnight of the day in local timezone), up until the current date.
   """
-  streakStart: Date
+  streakStart: DateTime
+
+  workoutHistory: [Workout]
 }
 
 type Giveaway {
@@ -421,13 +423,6 @@ type Friendship {
   friend: User
 }
 
-"""
-The `Date` scalar type represents a Date
-value as specified by
-[iso8601](https://en.wikipedia.org/wiki/ISO_8601).
-"""
-scalar Date
-
 type Workout {
   id: ID!
 
diff --git a/app/src/main/java/com/cornellappdev/uplift/data/models/ProfileData.kt b/app/src/main/java/com/cornellappdev/uplift/data/models/ProfileData.kt
new file mode 100644
index 0000000..b9d5a90
--- /dev/null
+++ b/app/src/main/java/com/cornellappdev/uplift/data/models/ProfileData.kt
@@ -0,0 +1,17 @@
+package com.cornellappdev.uplift.data.models
+
+import android.net.Uri
+
+
+data class ProfileData(
+    val name: String,
+    val netId: String,
+    val encodedImage: String?,
+    val totalGymDays: Int,
+    val activeStreak: Int,
+    val maxStreak: Int,
+    val streakStart: String?,
+    val workoutGoal: Int,
+    val workouts: List<WorkoutDomain>,
+    val weeklyWorkoutDays: List<String>
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/cornellappdev/uplift/data/models/WorkoutDomain.kt b/app/src/main/java/com/cornellappdev/uplift/data/models/WorkoutDomain.kt
new file mode 100644
index 0000000..5de644c
--- /dev/null
+++ b/app/src/main/java/com/cornellappdev/uplift/data/models/WorkoutDomain.kt
@@ -0,0 +1,6 @@
+package com.cornellappdev.uplift.data.models
+
+data class WorkoutDomain(
+    val gymName: String,
+    val timestamp: Long
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/cornellappdev/uplift/data/repositories/ProfileRepository.kt b/app/src/main/java/com/cornellappdev/uplift/data/repositories/ProfileRepository.kt
index 0e5818c..0d15d82 100644
--- a/app/src/main/java/com/cornellappdev/uplift/data/repositories/ProfileRepository.kt
+++ b/app/src/main/java/com/cornellappdev/uplift/data/repositories/ProfileRepository.kt
@@ -6,124 +6,105 @@ import com.cornellappdev.uplift.GetUserByNetIdQuery
 import com.cornellappdev.uplift.GetWeeklyWorkoutDaysQuery
 import com.cornellappdev.uplift.GetWorkoutsByIdQuery
 import com.cornellappdev.uplift.SetWorkoutGoalsMutation
+import com.cornellappdev.uplift.data.models.ProfileData
+import com.cornellappdev.uplift.data.models.WorkoutDomain
+import kotlinx.coroutines.async
+import kotlinx.coroutines.coroutineScope
 import java.time.Instant
 import javax.inject.Inject
 import javax.inject.Singleton
 
-data class ProfileData(
-    val name: String,
-    val netId: String,
-    val encodedImage: String?,
-    val totalGymDays: Int,
-    val activeStreak: Int,
-    val maxStreak: Int,
-    val streakStart: String?,
-    val workoutGoal: Int,
-    val workouts: List<WorkoutDomain>,
-    val weeklyWorkoutDays: List<String>
-)
-
-data class WorkoutDomain(
-    val gymName: String,
-    val timestamp: Long
-)
 
 @Singleton
 class ProfileRepository @Inject constructor(
     private val userInfoRepository: UserInfoRepository,
     private val apolloClient: ApolloClient
 ) {
-    suspend fun getProfile(): Result<ProfileData> {
-        return try{
-            val netId = userInfoRepository.getNetIdFromDataStore()
-                ?: return Result.failure(Exception("NetId missing"))
-
-            val userResponse = apolloClient.query(
-                GetUserByNetIdQuery(netId)
-            ).execute()
-
-            if (userResponse.hasErrors()) {
-                Log.e("ProfileRepo", "User query errors: ${userResponse.errors}")
-                return Result.failure(IllegalStateException("User query failed"))
-            }
+    suspend fun getProfile(): Result<ProfileData> = runCatching {
+        val netId = userInfoRepository.getNetIdFromDataStore()
+            ?: throw IllegalStateException("NetId missing")
+
+        val userResponse = apolloClient.query(
+            GetUserByNetIdQuery(netId)
+        ).execute()
+
+        if (userResponse.hasErrors()) {
+            Log.e("ProfileRepo", "User query errors: ${userResponse.errors}")
+            throw IllegalStateException("User query failed")
+        }
 
-            val user = userResponse.data?.getUserByNetId?.firstOrNull()?.userFields
-                ?: return Result.failure(IllegalStateException("User not found"))
+        val user = userResponse.data?.getUserByNetId?.firstOrNull()?.userFields
+            ?: throw IllegalStateException("User not found")
 
-            val userId = user.id.toIntOrNull()
-                ?: return Result.failure(IllegalStateException("Invalid user ID: ${user.id}"))
+        val userId = user.id.toIntOrNull()
+            ?: throw IllegalStateException("Invalid user ID: ${user.id}")
 
-            val workoutResponse = apolloClient
-                .query(GetWorkoutsByIdQuery(userId))
-                .execute()
+        coroutineScope {
+            val workoutDeferred = async {
+                apolloClient.query(GetWorkoutsByIdQuery(userId)).execute()
+            }
+            val weeklyDeferred = async {
+                apolloClient.query(GetWeeklyWorkoutDaysQuery(userId)).execute()
+            }
 
+            val workoutResponse = workoutDeferred.await()
             if (workoutResponse.hasErrors()) {
                 Log.e("ProfileRepo", "Workout query errors: ${workoutResponse.errors}")
+                throw IllegalStateException("Workout query failed")
             }
 
-            val workouts = if (workoutResponse.hasErrors()) {
-                emptyList()
-            } else {
-                workoutResponse.data?.getWorkoutsById?.filterNotNull() ?: emptyList()
-            }
+            val workouts = workoutResponse.data?.getWorkoutsById?.filterNotNull().orEmpty()
 
             val workoutDomain = workouts.map {
                 WorkoutDomain(
                     gymName = it.workoutFields.gymName,
-                    timestamp = Instant.parse(it.workoutFields.workoutTime.toString()).toEpochMilli()
+                    timestamp = Instant.parse(it.workoutFields.workoutTime.toString())
+                        .toEpochMilli()
                 )
             }
 
-            val weeklyResponse = apolloClient.query(GetWeeklyWorkoutDaysQuery(userId)).execute()
+            val weeklyResponse = weeklyDeferred.await()
             if (weeklyResponse.hasErrors()) {
-                Log.e("ProfileRepo", "Weekly query errors=${weeklyResponse.errors}")
-            }
-
-            val weeklyDays = if (weeklyResponse.hasErrors()) {
-                emptyList()
-            } else {
-                weeklyResponse.data?.getWeeklyWorkoutDays?.filterNotNull() ?: emptyList()
+                Log.e("ProfileRepo", "Weekly query errors: ${weeklyResponse.errors}")
+                throw IllegalStateException("Weekly workout days query failed")
             }
 
-            Result.success(
-                ProfileData(
-                    name = user.name,
-                    netId = user.netId,
-                    encodedImage = user.encodedImage,
-                    totalGymDays = user.totalGymDays,
-                    activeStreak = user.activeStreak,
-                    maxStreak = user.maxStreak,
-                    streakStart = user.streakStart?.toString(),
-                    workoutGoal = user.workoutGoal ?: 0,
-                    workouts = workoutDomain,
-                    weeklyWorkoutDays = weeklyDays
-                )
+            val weeklyDays = weeklyResponse.data?.getWeeklyWorkoutDays?.filterNotNull().orEmpty()
+
+            ProfileData(
+                name = user.name,
+                netId = user.netId,
+                encodedImage = user.encodedImage,
+                totalGymDays = user.totalGymDays,
+                activeStreak = user.activeStreak,
+                maxStreak = user.maxStreak,
+                streakStart = user.streakStart?.toString(),
+                workoutGoal = user.workoutGoal ?: 0,
+                workouts = workoutDomain,
+                weeklyWorkoutDays = weeklyDays
             )
-        } catch (e: Exception) {
-        Log.e("ProfileRepo", "Failed to load profile", e)
-            Result.failure(e)
         }
+    }.onFailure { e ->
+        Log.e("ProfileRepo", "Failed to load profile", e)
     }
 
-    suspend fun setWorkoutGoal(userId: Int, goal: Int): Result<Unit> {
-        return try {
-            val response = apolloClient
-                .mutation(
-                    SetWorkoutGoalsMutation(
-                        id = userId,
-                        workoutGoal = goal
-                    )
-                )
-                .execute()
+    suspend fun setWorkoutGoal(goal: Int): Result<Unit> = runCatching {
+        val userId = userInfoRepository.getUserIdFromDataStore()?.toIntOrNull()
+            ?: throw IllegalStateException("Missing user ID")
 
-            if (response.hasErrors()) {
-                Result.failure(Exception("Goal update failed"))
-            } else {
-                Result.success(Unit)
-            }
+        val response = apolloClient
+            .mutation(
+                SetWorkoutGoalsMutation(
+                    id = userId,
+                    workoutGoal = goal
+                )
+            )
+            .execute()
 
-        } catch (e: Exception) {
-            Result.failure(e)
+        if (response.hasErrors()) {
+            throw IllegalStateException("Goal update failed")
         }
+    }.onFailure { e ->
+        Log.e("ProfileRepo", "Failed to update workout goal", e)
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/cornellappdev/uplift/ui/MainNavigationWrapper.kt b/app/src/main/java/com/cornellappdev/uplift/ui/MainNavigationWrapper.kt
index d99ae49..90a133e 100644
--- a/app/src/main/java/com/cornellappdev/uplift/ui/MainNavigationWrapper.kt
+++ b/app/src/main/java/com/cornellappdev/uplift/ui/MainNavigationWrapper.kt
@@ -77,9 +77,6 @@ fun MainNavigationWrapper(
     rootNavigationViewModel: RootNavigationViewModel = hiltViewModel(),
 
 ) {
-
-    val confettiViewModel: ConfettiViewModel = hiltViewModel()
-    val checkInViewModel: CheckInViewModel = hiltViewModel()
     val rootNavigationUiState = rootNavigationViewModel.collectUiStateValue()
     val startDestination = rootNavigationUiState.startDestination
 
@@ -245,7 +242,7 @@ fun MainNavigationWrapper(
                     CapacityReminderScreen()
                 }
                 composable<UpliftRootRoute.Profile> {
-                    ProfileScreen(toSettings = {}, toGoals = {}, toHistory = {})
+                    ProfileScreen()
                 }
                 composable<UpliftRootRoute.Reminders> {
                     MainReminderScreen()
diff --git a/app/src/main/java/com/cornellappdev/uplift/ui/components/profile/workouts/HistorySection.kt b/app/src/main/java/com/cornellappdev/uplift/ui/components/profile/workouts/HistorySection.kt
index 067480b..63b2505 100644
--- a/app/src/main/java/com/cornellappdev/uplift/ui/components/profile/workouts/HistorySection.kt
+++ b/app/src/main/java/com/cornellappdev/uplift/ui/components/profile/workouts/HistorySection.kt
@@ -135,7 +135,7 @@ private fun EmptyHistorySection(){
         horizontalAlignment = Alignment.CenterHorizontally
     ) {
         Image(
-            painter = painterResource(id = R.drawable.ic_bag),
+            painter = painterResource(id = R.drawable.ic_dufflebag),
             contentDescription = null,
             modifier = Modifier
                 .width(64.99967.dp)
diff --git a/app/src/main/java/com/cornellappdev/uplift/ui/screens/profile/ProfileScreen.kt b/app/src/main/java/com/cornellappdev/uplift/ui/screens/profile/ProfileScreen.kt
index 156f980..a3b0918 100644
--- a/app/src/main/java/com/cornellappdev/uplift/ui/screens/profile/ProfileScreen.kt
+++ b/app/src/main/java/com/cornellappdev/uplift/ui/screens/profile/ProfileScreen.kt
@@ -24,15 +24,18 @@ import androidx.compose.ui.draw.shadow
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.font.FontWeight
+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 androidx.lifecycle.viewmodel.compose.viewModel
 import com.cornellappdev.uplift.R
 import com.cornellappdev.uplift.ui.components.profile.workouts.GoalsSection
 import com.cornellappdev.uplift.ui.components.profile.workouts.HistoryItem
 import com.cornellappdev.uplift.ui.components.profile.workouts.HistorySection
 import com.cornellappdev.uplift.ui.components.profile.ProfileHeaderSection
 import com.cornellappdev.uplift.ui.components.profile.workouts.ReminderItem
+import com.cornellappdev.uplift.ui.viewmodels.profile.ProfileUiState
 import com.cornellappdev.uplift.ui.viewmodels.profile.ProfileViewModel
 import com.cornellappdev.uplift.util.GRAY01
 import com.cornellappdev.uplift.util.montserratFamily
@@ -41,20 +44,21 @@ import com.cornellappdev.uplift.util.montserratFamily
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun ProfileScreen(
-    viewModel: ProfileViewModel = hiltViewModel(),
-    toSettings:() -> Unit,
-    toGoals:() -> Unit,
-    toHistory:() -> Unit
+    viewModel: ProfileViewModel = hiltViewModel()
 ) {
-//    var tabIndex by remember { mutableIntStateOf(0) }
-//    val tabs = listOf("WORKOUTS", "ACHIEVEMENTS")
-
     val uiState by viewModel.uiStateFlow.collectAsState()
 
-    LaunchedEffect(Unit) {
-        viewModel.reload()
-    }
+    ProfileScreenContent(uiState,viewModel::toSettings,viewModel::toGoals, viewModel::toHistory)
+
+}
 
+@Composable
+private fun ProfileScreenContent(
+    uiState: ProfileUiState,
+    toSettings: () -> Unit,
+    toGoals: () -> Unit,
+    toHistory: () -> Unit
+) {
     Scaffold(
         containerColor = Color.White,
         topBar = {
@@ -75,7 +79,7 @@ fun ProfileScreen(
                 name = uiState.name,
                 gymDays = uiState.totalGymDays,
                 streaks = uiState.activeStreak,
-                profilePictureUri = uiState.profileImage?.let { Uri.parse(it) },
+                profilePictureUri = uiState.profileImage,
                 onPhotoSelected = {},
                 netId = uiState.netId
             )
@@ -164,3 +168,31 @@ private fun ProfileScreenTopBar(
         }
     )
 }
+
+@Preview
+@Composable
+private fun ProfileScreenContentPreview() {
+    ProfileScreenContent(
+        uiState = ProfileUiState(
+            name = "Melissa Velasquez",
+            netId = "mv477",
+            totalGymDays = 42,
+            activeStreak = 5,
+            workoutGoal = 4,
+            historyItems = listOf(
+                HistoryItem(
+                    gymName = "Teagle",
+                    time = "10:00 AM",
+                    date = "March 29, 2024",
+                    timestamp = 0L
+                )
+            ),
+            daysOfMonth = listOf(10, 11, 12, 13, 14, 15, 16),
+            completedDays = listOf(true, false, true, false, true, false, false),
+            workoutsCompleted = 3
+        ),
+        {},
+        {},
+        {}
+    )
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/cornellappdev/uplift/ui/viewmodels/profile/ProfileViewModel.kt b/app/src/main/java/com/cornellappdev/uplift/ui/viewmodels/profile/ProfileViewModel.kt
index 72451fa..9b1b3bf 100644
--- a/app/src/main/java/com/cornellappdev/uplift/ui/viewmodels/profile/ProfileViewModel.kt
+++ b/app/src/main/java/com/cornellappdev/uplift/ui/viewmodels/profile/ProfileViewModel.kt
@@ -1,10 +1,14 @@
 package com.cornellappdev.uplift.ui.viewmodels.profile
 
+import android.net.Uri
 import android.util.Log
 import androidx.lifecycle.viewModelScope
+import coil.util.CoilUtils.result
 import com.cornellappdev.uplift.data.repositories.ProfileRepository
 import com.cornellappdev.uplift.data.repositories.UserInfoRepository
+import com.cornellappdev.uplift.ui.UpliftRootRoute
 import com.cornellappdev.uplift.ui.components.profile.workouts.HistoryItem
+import com.cornellappdev.uplift.ui.nav.RootNavigationRepository
 import com.cornellappdev.uplift.ui.viewmodels.UpliftViewModel
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.Job
@@ -22,7 +26,7 @@ data class ProfileUiState(
     val error: Boolean = false,
     val name: String = "",
     val netId: String = "",
-    val profileImage: String? = null,
+    val profileImage: Uri? = null,
     val totalGymDays: Int = 0,
     val activeStreak: Int = 0,
     val maxStreak: Int = 0,
@@ -37,11 +41,15 @@ data class ProfileUiState(
 @HiltViewModel
 class ProfileViewModel @Inject constructor(
     private val profileRepository: ProfileRepository,
-    private val userInfoRepository: UserInfoRepository,
+    private val rootNavigationRepository: RootNavigationRepository,
 ) : UpliftViewModel<ProfileUiState>(ProfileUiState()) {
 
     private var loadingJob: Job? = null
 
+    init {
+        reload()
+    }
+
     fun reload() {
         if (loadingJob?.isActive == true) return
         loadingJob = loadProfile()
@@ -54,65 +62,62 @@ class ProfileViewModel @Inject constructor(
 
         val result = profileRepository.getProfile()
 
-        if (result.isSuccess) {
-            val profile = result.getOrNull()!!
-
-            val historyItems = profile.workouts.map {
-                HistoryItem(
-                    gymName = it.gymName,
-                    time = formatTime.format(
-                        Instant.ofEpochMilli(it.timestamp)
-                    ),
-                    date = formatDate.format(
-                        Instant.ofEpochMilli(it.timestamp)
-                    ),
-                    timestamp = it.timestamp
-                )
-            }
-
-            val now = LocalDate.now()
-            val startOfWeek = now.with(DayOfWeek.MONDAY)
-
-            val weekDates = (0..6).map {
-                startOfWeek.plusDays(it.toLong())
-            }
-
-            val daysOfMonth = weekDates.map { it.dayOfMonth }
-
-            val completedDays = weekDates.map { date ->
-                profile.weeklyWorkoutDays.contains(date.toString())
-            }
-
-            val workoutsCompleted = profile.weeklyWorkoutDays.size
-
-            applyMutation {
-                copy(
-                    loading = false,
-                    name = profile.name,
-                    netId = profile.netId,
-                    profileImage = profile.encodedImage,
-                    totalGymDays = profile.totalGymDays,
-                    activeStreak = profile.activeStreak,
-                    maxStreak = profile.maxStreak,
-                    streakStart = profile.streakStart,
-                    workoutGoal = profile.workoutGoal,
-                    historyItems = historyItems,
-                    daysOfMonth = daysOfMonth,
-                    completedDays = completedDays,
-                    workoutsCompleted = workoutsCompleted
-                )
-            }
-        } else {
+        val profile = result.getOrNull()
+        if (profile == null) {
             Log.e("profile VM", "Failed to load profile", result.exceptionOrNull())
             applyMutation { copy(loading = false, error = true) }
+            return@launch
+        }
+        val historyItems = profile.workouts.map {
+            HistoryItem(
+                gymName = it.gymName,
+                time = formatTime.format(
+                    Instant.ofEpochMilli(it.timestamp)
+                ),
+                date = formatDate.format(
+                    Instant.ofEpochMilli(it.timestamp)
+                ),
+                timestamp = it.timestamp
+            )
         }
 
-    }
+        val now = LocalDate.now()
+        val startOfWeek = now.with(DayOfWeek.MONDAY)
+
+        val weekDates = (0..6).map {
+            startOfWeek.plusDays(it.toLong())
+        }
+
+        val daysOfMonth = weekDates.map { it.dayOfMonth }
+
+        val completedDays = weekDates.map { date ->
+            profile.weeklyWorkoutDays.contains(date.toString())
+        }
 
+        val workoutsCompleted = profile.weeklyWorkoutDays.size
+
+        applyMutation {
+            copy(
+                loading = false,
+                name = profile.name,
+                netId = profile.netId,
+                profileImage = profile.encodedImage?.let(Uri::parse),
+                totalGymDays = profile.totalGymDays,
+                activeStreak = profile.activeStreak,
+                maxStreak = profile.maxStreak,
+                streakStart = profile.streakStart,
+                workoutGoal = profile.workoutGoal,
+                historyItems = historyItems,
+                daysOfMonth = daysOfMonth,
+                completedDays = completedDays,
+                workoutsCompleted = workoutsCompleted
+            )
+
+        }
+    }
 
     fun updateWorkoutGoal(goal: Int) = viewModelScope.launch {
-        val userId = userInfoRepository.getUserIdFromDataStore()?.toIntOrNull() ?: return@launch
-        val result = profileRepository.setWorkoutGoal(userId, goal)
+        val result = profileRepository.setWorkoutGoal(goal)
 
         if (result.isSuccess) {
             reload()
@@ -121,6 +126,20 @@ class ProfileViewModel @Inject constructor(
         }
     }
 
+    fun toSettings() {
+        rootNavigationRepository.navigate(UpliftRootRoute.Settings)
+    }
+
+    fun toGoals() {
+        // replace with the actual route once goals exists
+    }
+
+    fun toHistory() {
+        // replace with the actual route once history exists
+    }
+
+
+
     private val formatTime = DateTimeFormatter
         .ofPattern("h:mm a")
         .withLocale(Locale.US)
diff --git a/app/src/main/java/com/cornellappdev/uplift/util/Functions.kt b/app/src/main/java/com/cornellappdev/uplift/util/Functions.kt
index 0988bc5..516c1da 100644
--- a/app/src/main/java/com/cornellappdev/uplift/util/Functions.kt
+++ b/app/src/main/java/com/cornellappdev/uplift/util/Functions.kt
@@ -204,13 +204,13 @@ fun Calendar.timeAgoString(): String {
         diffDays < 1 -> "Today"
 
         diffDays == 1L -> "1 day ago"
-        diffDays in 2..6 -> "$diffDays days ago"
+        diffDays in 2L..6L -> "$diffDays days ago"
 
         diffWeeks == 1L -> "1 week ago"
-        diffWeeks in 2..4 -> "$diffWeeks weeks ago"
+        diffWeeks in 2L..4L -> "$diffWeeks weeks ago"
 
         diffMonths == 1L -> "1 month ago"
-        diffMonths in 2..11 -> "$diffMonths months ago"
+        diffMonths in 2L..11L -> "$diffMonths months ago"
 
         diffYears == 1L -> "1 year ago"
         diffYears > 1L -> "$diffYears years ago"
diff --git a/app/src/main/res/drawable/ic_bag.png b/app/src/main/res/drawable/ic_bag.png
deleted file mode 100644
index 41b1efe9c23f3c93f1ef8a6a07c9a6c3d9de8921..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2564
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
aedvEA2;ig&CBxnT0000<MNUMnLSTZf1<ASq

diff --git a/app/src/main/res/drawable/ic_dufflebag.xml b/app/src/main/res/drawable/ic_dufflebag.xml
new file mode 100644
index 0000000..7110040
--- /dev/null
+++ b/app/src/main/res/drawable/ic_dufflebag.xml
@@ -0,0 +1,41 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="65dp"
+    android:height="51dp"
+    android:viewportWidth="65"
+    android:viewportHeight="51">
+  <path
+      android:pathData="M59.932,50.181H5.053C2.348,50.181 0.265,47.788 0.662,45.111L2.107,35.127C3.212,27.48 9.771,21.802 17.491,21.802H47.508C55.243,21.802 61.788,27.48 62.893,35.127L64.338,45.111C64.72,47.774 62.638,50.181 59.932,50.181Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M50.838,50.734C43.301,50.734 5.082,50.691 4.473,50.691C3.339,50.691 2.433,49.771 2.433,48.638C2.433,47.505 3.354,46.598 4.487,46.598C4.487,46.598 4.487,46.598 4.501,46.598C4.728,46.598 55.569,46.697 59.337,46.598C59.861,46.584 60.215,46.471 60.4,46.258C60.754,45.862 60.74,45.026 60.725,44.913C60.725,44.871 60.017,39.362 59.181,34.674C58.516,30.936 56.405,29.52 56.306,29.449C55.342,28.854 55.045,27.608 55.64,26.645C56.235,25.682 57.51,25.385 58.473,25.979C58.629,26.078 62.213,28.316 63.219,33.952C64.069,38.739 64.791,44.347 64.805,44.403C64.834,44.687 65.089,47.122 63.516,48.935C62.85,49.714 61.604,50.648 59.451,50.691C58.119,50.719 54.748,50.734 50.838,50.734Z"
+      android:fillColor="#D1DBC6"/>
+  <path
+      android:pathData="M47.509,21.178C55.484,21.178 62.368,27.126 63.502,35.028L64.947,45.013C65.16,46.471 64.72,47.93 63.771,49.049C62.794,50.153 61.406,50.79 59.932,50.79H5.054C3.581,50.79 2.193,50.153 1.229,49.049C0.266,47.944 -0.159,46.471 0.054,45.013L1.498,35.028C2.631,27.14 9.516,21.179 17.491,21.178H47.509ZM17.476,22.411C10.111,22.411 3.75,27.905 2.702,35.198L1.257,45.182C1.101,46.287 1.427,47.392 2.149,48.227C2.872,49.063 3.934,49.544 5.039,49.544H59.932C61.037,49.544 62.1,49.063 62.822,48.227C63.544,47.392 63.87,46.273 63.715,45.182L62.269,35.198C61.221,27.905 54.86,22.411 47.494,22.411H17.476Z"
+      android:fillColor="#434244"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M46.517,22.17C45.512,18.261 44.01,14.48 42.013,10.94L38.669,4.992L38.117,4.015C36.955,2.032 34.944,0.8 32.677,0.673C32.536,0.659 32.394,0.659 32.252,0.659C32.097,0.659 31.955,0.659 31.799,0.673C29.532,0.814 27.521,2.032 26.359,4.015L25.807,4.992L22.464,10.94C20.466,14.48 18.965,18.261 17.959,22.17C16.982,25.951 16.486,29.874 16.486,33.811V50.195H21.826V34.66C21.826,26.517 23.951,18.516 27.988,11.45L29.915,8.093L31.331,5.658C31.558,5.261 31.912,5.162 32.153,5.148C32.181,5.148 32.21,5.148 32.238,5.148C32.252,5.148 32.281,5.148 32.309,5.148C32.536,5.162 32.89,5.275 33.117,5.658L34.533,8.093L36.46,11.45C40.497,18.516 42.622,26.517 42.622,34.66V50.195H47.962V33.796C47.991,29.86 47.495,25.951 46.517,22.17Z"
+      android:fillColor="#F8E71C"/>
+  <path
+      android:pathData="M31.757,0.021C32.068,-0.007 32.394,-0.007 32.72,0.021C35.17,0.163 37.38,1.536 38.627,3.675L42.522,10.614C44.534,14.197 46.064,18.035 47.084,22C48.076,25.852 48.571,29.817 48.571,33.797V50.804H42.041V34.66C42.041,26.645 39.93,18.729 35.949,11.762L34.023,8.405L32.606,5.983C32.564,5.898 32.465,5.785 32.267,5.771H32.21C32.012,5.785 31.927,5.898 31.87,5.983L30.453,8.419L28.526,11.775C24.546,18.743 22.436,26.659 22.436,34.674V50.818H15.862V33.797C15.862,29.817 16.358,25.852 17.364,22C18.384,18.035 19.914,14.197 21.926,10.614L25.821,3.675C27.068,1.522 29.292,0.163 31.757,0.021ZM32.648,1.254C32.351,1.225 32.11,1.225 31.855,1.254C29.759,1.381 27.96,2.486 26.897,4.299L23.016,11.223C21.061,14.707 19.559,18.445 18.567,22.311C17.604,26.064 17.108,29.931 17.108,33.797V49.572H21.23V34.66C21.23,26.432 23.398,18.303 27.478,11.152L29.404,7.796L30.821,5.36C31.105,4.879 31.558,4.595 32.11,4.539C32.181,4.525 32.28,4.525 32.394,4.539C32.932,4.595 33.386,4.879 33.669,5.36L35.085,7.796L37.012,11.167C41.106,18.318 43.259,26.447 43.259,34.674V49.572H47.381V33.797C47.381,29.931 46.885,26.064 45.922,22.311C44.93,18.445 43.443,14.721 41.474,11.223L37.578,4.284C36.53,2.485 34.731,1.381 32.648,1.254Z"
+      android:fillColor="#434244"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M37.352,29.477H27.648V37.634C27.648,40.311 29.815,42.492 32.507,42.492C35.184,42.492 37.366,40.325 37.366,37.634V29.477H37.352Z"
+      android:fillColor="#F8E71C"/>
+  <path
+      android:pathData="M37.961,37.648C37.961,40.651 35.51,43.114 32.493,43.114C29.476,43.114 27.025,40.665 27.025,37.648V28.868H37.961V37.648ZM28.257,37.648C28.257,39.985 30.156,41.883 32.493,41.883C34.83,41.883 36.728,39.985 36.728,37.648V30.101H28.257V37.648Z"
+      android:fillColor="#434244"/>
+  <path
+      android:pathData="M15.281,31.007H22.874V38.201H15.281V31.007Z"
+      android:fillColor="#F8E71C"/>
+  <path
+      android:pathData="M23.498,38.809H14.672V30.383H23.498V38.809ZM15.89,37.578H22.265V31.616H15.89V37.578Z"
+      android:fillColor="#434244"/>
+  <path
+      android:pathData="M41.503,31.007H49.096V38.201H41.503V31.007Z"
+      android:fillColor="#F8E71C"/>
+  <path
+      android:pathData="M49.719,38.809H40.893V30.383H49.719V38.809ZM42.126,37.578H48.5V31.616H42.126V37.578Z"
+      android:fillColor="#434244"/>
+</vector>

From 80817e77c44876572f8c50f59ade179f3e2b7052 Mon Sep 17 00:00:00 2001
From: Melissa Velasquez <mv477@cornell.edu>
Date: Thu, 12 Mar 2026 20:10:19 -0400
Subject: [PATCH 08/11] Rebased and Addressed comments

---
 app/build.gradle                              |  8 +--
 .../data/repositories/UserInfoRepository.kt   | 52 +++++---------
 .../profile/workouts/HistorySection.kt        | 44 ++++++------
 .../profile/workouts/WorkoutProgressArc.kt    | 72 +------------------
 .../ui/screens/profile/ProfileScreen.kt       | 17 ++---
 .../ui/viewmodels/profile/ProfileViewModel.kt | 25 ++++---
 6 files changed, 63 insertions(+), 155 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 2604ce3..fdc87cd 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -48,8 +48,8 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
             buildConfigField("String", "GOOGLE_AUTH_CLIENT_ID", secretsProperties["GOOGLE_AUTH_CLIENT_ID"])
             buildConfigField("String", "BACKEND_URL", secretsProperties['PROD_ENDPOINT'])
-            buildConfigField("boolean", "ONBOARDING_FLAG", "false")
-            buildConfigField("boolean", "CHECK_IN_FLAG", "false")
+            buildConfigField("boolean", "ONBOARDING_FLAG", "true")
+            buildConfigField("boolean", "CHECK_IN_FLAG", "true")
         }
         debug {
             buildConfigField("String", "BACKEND_URL", secretsProperties['DEV_ENDPOINT'])
@@ -58,8 +58,8 @@ android {
                     "GOOGLE_AUTH_CLIENT_ID", secretsProperties["GOOGLE_AUTH_CLIENT_ID"]
             )
             signingConfig signingConfigs.debug
-            buildConfigField("boolean", "ONBOARDING_FLAG", "false")
-            buildConfigField("boolean", "CHECK_IN_FLAG", "false")
+            buildConfigField("boolean", "ONBOARDING_FLAG", "true")
+            buildConfigField("boolean", "CHECK_IN_FLAG", "true")
         }
     }
     compileOptions {
diff --git a/app/src/main/java/com/cornellappdev/uplift/data/repositories/UserInfoRepository.kt b/app/src/main/java/com/cornellappdev/uplift/data/repositories/UserInfoRepository.kt
index 345feb4..a02838c 100644
--- a/app/src/main/java/com/cornellappdev/uplift/data/repositories/UserInfoRepository.kt
+++ b/app/src/main/java/com/cornellappdev/uplift/data/repositories/UserInfoRepository.kt
@@ -64,7 +64,14 @@ class UserInfoRepository @Inject constructor(
             else {
                 Log.d("UserInfoRepository", "Skipping goal upload")
             }
-            storeUserFields(id, name, netId, email, skip, goal)
+            storeUserFields(
+                id = userFields.id,
+                username = userFields.name,
+                netId = userFields.netId,
+                email = userFields.email ?: email,
+                skip = skip,
+                goal = goal
+            )
             Log.d("UserInfoRepositoryImpl", "User created successfully")
             return true
         } catch (e: Exception) {
@@ -111,11 +118,14 @@ class UserInfoRepository @Inject constructor(
         return try {
             val user = getUserByNetId(netId) ?: return false
 
-            storeId(user.id)
-            storeNetId(user.netId)
-            storeUsername(user.name)
-            storeEmail(user.email)
-            storeSkip(false)
+            storeUserFields(
+                id = user.id,
+                username = user.name,
+                netId = user.netId,
+                email = user.email,
+                skip = false,
+                goal = user.workoutGoal ?: 0
+            )
 
             Log.d("UserInfoRepositoryImpl", "Synced existing user to DataStore: ${user.id}")
             true
@@ -172,36 +182,6 @@ class UserInfoRepository @Inject constructor(
         firebaseAuth.signOut()
     }
 
-    private suspend fun storeId(id: String) {
-        dataStore.edit { preferences ->
-            preferences[PreferencesKeys.ID] = id
-        }
-    }
-
-    private suspend fun storeUsername(username: String) {
-        dataStore.edit { preferences ->
-            preferences[PreferencesKeys.USERNAME] = username
-        }
-    }
-
-    private suspend fun storeNetId(netId: String) {
-        dataStore.edit { preferences ->
-            preferences[PreferencesKeys.NETID] = netId
-        }
-    }
-
-    private suspend fun storeEmail(email: String) {
-        dataStore.edit { preferences ->
-            preferences[PreferencesKeys.EMAIL] = email
-        }
-    }
-
-    private suspend fun storeGoal(goal: Int) {
-        dataStore.edit { preferences ->
-            preferences[PreferencesKeys.GOAL] = goal
-        }
-    }
-
     suspend fun storeSkip(skip: Boolean) {
         dataStore.edit { preferences ->
             preferences[PreferencesKeys.SKIP] = skip
diff --git a/app/src/main/java/com/cornellappdev/uplift/ui/components/profile/workouts/HistorySection.kt b/app/src/main/java/com/cornellappdev/uplift/ui/components/profile/workouts/HistorySection.kt
index 63b2505..03d4552 100644
--- a/app/src/main/java/com/cornellappdev/uplift/ui/components/profile/workouts/HistorySection.kt
+++ b/app/src/main/java/com/cornellappdev/uplift/ui/components/profile/workouts/HistorySection.kt
@@ -18,6 +18,7 @@ import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.focus.focusModifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.font.FontWeight
@@ -35,7 +36,8 @@ data class HistoryItem(
     val gymName: String,
     val time: String,
     val date: String,
-    val timestamp: Long
+    val timestamp: Long,
+    val ago: String
 )
 
 @Composable
@@ -51,20 +53,14 @@ fun HistorySection(
         SectionTitleText("My Workout History", onClick)
         Spacer(modifier = Modifier.height(12.dp))
         if (historyItems.isNotEmpty()) {
-            Column(
+            HistoryList(
+                historyItems = historyItems,
                 modifier = Modifier
                     .fillMaxSize()
                     .verticalScroll(rememberScrollState())
-            ) {
-                HistoryList(historyItems)
-            }
+            )
         } else {
-            Box(
-                modifier = Modifier.fillMaxSize(),
-                contentAlignment = Alignment.Center
-            ) {
-                EmptyHistorySection()
-            }
+            EmptyHistorySection()
         }
     }
 
@@ -72,8 +68,11 @@ fun HistorySection(
 }
 
 @Composable
-private fun HistoryList(historyItems: List<HistoryItem>) {
-    Column {
+private fun HistoryList(
+    historyItems: List<HistoryItem>,
+    modifier: Modifier = Modifier
+) {
+    Column(modifier = modifier) {
         historyItems.take(5).forEachIndexed { index, historyItem ->
             HistoryItemRow(historyItem = historyItem)
             if (index != historyItems.size - 1) {
@@ -90,10 +89,7 @@ private fun HistoryItemRow(
     val gymName = historyItem.gymName
     val time = historyItem.time
     val date = historyItem.date
-    val calendar = Calendar.getInstance().apply {
-        timeInMillis = historyItem.timestamp
-    }
-    val ago = calendar.timeAgoString()
+    val ago = historyItem.ago
 
     Row(
         modifier = Modifier
@@ -138,8 +134,8 @@ private fun EmptyHistorySection(){
             painter = painterResource(id = R.drawable.ic_dufflebag),
             contentDescription = null,
             modifier = Modifier
-                .width(64.99967.dp)
-                .height(50.8181.dp)
+                .width(65.dp)
+                .height(51.dp)
 
         )
         Spacer(modifier = Modifier.height(12.dp))
@@ -165,11 +161,11 @@ private fun EmptyHistorySection(){
 private fun HistorySectionPreview() {
     val now = System.currentTimeMillis()
     val historyItems = listOf(
-        HistoryItem("Morrison", "11:00 PM",  "March 29, 2024", now - (1 * 24 * 60 * 60 * 1000) ),
-        HistoryItem("Noyes", "1:00 PM", "March 29, 2024", now - (3 * 24 * 60 * 60 * 1000)),
-        HistoryItem("Teagle Up", "2:00 PM",  "March 29, 2024", now - (7 * 24 * 60 * 60 * 1000)),
-        HistoryItem("Teagle Down", "12:00 PM",  "March 29, 2024", now - (15 * 24 * 60 * 60 * 1000)),
-        HistoryItem("Helen Newman", "10:00 AM",  "March 29, 2024", now),
+        HistoryItem("Morrison", "11:00 PM",  "March 29, 2024", now - (1 * 24 * 60 * 60 * 1000), "1 day ago"),
+        HistoryItem("Noyes", "1:00 PM", "March 29, 2024", now - (3 * 24 * 60 * 60 * 1000), "2 days ago"),
+        HistoryItem("Teagle Up", "2:00 PM",  "March 29, 2024", now - (7 * 24 * 60 * 60 * 1000), "1 day ago"),
+        HistoryItem("Teagle Down", "12:00 PM",  "March 29, 2024", now - (15 * 24 * 60 * 60 * 1000), "1 day ago"),
+        HistoryItem("Helen Newman", "10:00 AM",  "March 29, 2024", now, "Today"),
     )
     Column(
         modifier = Modifier
diff --git a/app/src/main/java/com/cornellappdev/uplift/ui/components/profile/workouts/WorkoutProgressArc.kt b/app/src/main/java/com/cornellappdev/uplift/ui/components/profile/workouts/WorkoutProgressArc.kt
index a870c28..3f2c701 100644
--- a/app/src/main/java/com/cornellappdev/uplift/ui/components/profile/workouts/WorkoutProgressArc.kt
+++ b/app/src/main/java/com/cornellappdev/uplift/ui/components/profile/workouts/WorkoutProgressArc.kt
@@ -24,7 +24,6 @@ import androidx.compose.ui.geometry.Size
 import androidx.compose.ui.graphics.Brush
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.StrokeCap
-import androidx.compose.ui.graphics.drawscope.DrawScope
 import androidx.compose.ui.graphics.drawscope.Stroke
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.font.FontWeight
@@ -53,7 +52,7 @@ fun WorkoutProgressArc(
     workoutGoal: Int,
 ) {
     val isZero = workoutsCompleted <= 0 || workoutGoal <= 0
-    val isComplete = workoutGoal > 0 && workoutsCompleted >= workoutGoal
+    val isComplete = workoutGoal in 1..workoutsCompleted
 
     // Calculate progress percentage
     val progress = when {
@@ -187,75 +186,6 @@ private fun ProgressArc(
     }
 }
 
-private fun DrawScope.drawProgressArc(
-    workoutsCompleted: Int,
-    workoutGoal: Int,
-    gradientBrush: Brush,
-    startAngle: Float,
-    progressAngle: Float,
-    topLeft: Offset,
-    arcSize: Size,
-    strokeWidth: Float
-) {
-    if (workoutsCompleted == workoutGoal) {
-        drawArc(
-            brush = gradientBrush,
-            startAngle = startAngle,
-            sweepAngle = progressAngle,
-            useCenter = false,
-            topLeft = topLeft,
-            size = arcSize,
-            style = Stroke(width = strokeWidth, cap = StrokeCap.Round)
-        )
-    } else {
-        drawArc(
-            color = PRIMARY_YELLOW,
-            startAngle = startAngle,
-            sweepAngle = progressAngle,
-            useCenter = false,
-            topLeft = topLeft,
-            size = arcSize,
-            style = Stroke(width = strokeWidth, cap = StrokeCap.Round)
-        )
-    }
-}
-
-
-private fun DrawScope.drawArcSliderOuterCircle(
-    workoutsCompleted: Int,
-    workoutGoal: Int,
-    gradientBrush: Brush,
-    dotRadius: Float,
-    x: Float,
-    y: Float
-) {
-    when (workoutsCompleted) {
-        workoutGoal -> {
-            drawCircle(
-                brush = gradientBrush,
-                radius = dotRadius,
-                center = Offset(x, y)
-            )
-        }
-
-        0 -> {
-            drawCircle(
-                color = GRAY03,
-                radius = dotRadius,
-                center = Offset(x, y)
-            )
-        }
-
-        else -> {
-            drawCircle(
-                color = PRIMARY_YELLOW,
-                radius = dotRadius,
-                center = Offset(x, y)
-            )
-        }
-    }
-}
-
 @Composable
 private fun WorkoutFractionTextSection(workoutsCompleted: Int, workoutGoal: Int, isComplete: Boolean) {
     Column(
diff --git a/app/src/main/java/com/cornellappdev/uplift/ui/screens/profile/ProfileScreen.kt b/app/src/main/java/com/cornellappdev/uplift/ui/screens/profile/ProfileScreen.kt
index a3b0918..c6a10e1 100644
--- a/app/src/main/java/com/cornellappdev/uplift/ui/screens/profile/ProfileScreen.kt
+++ b/app/src/main/java/com/cornellappdev/uplift/ui/screens/profile/ProfileScreen.kt
@@ -176,20 +176,13 @@ private fun ProfileScreenContentPreview() {
         uiState = ProfileUiState(
             name = "Melissa Velasquez",
             netId = "mv477",
-            totalGymDays = 42,
-            activeStreak = 5,
+            totalGymDays = 0,
+            activeStreak = 0,
             workoutGoal = 4,
-            historyItems = listOf(
-                HistoryItem(
-                    gymName = "Teagle",
-                    time = "10:00 AM",
-                    date = "March 29, 2024",
-                    timestamp = 0L
-                )
-            ),
+            historyItems = emptyList(),
             daysOfMonth = listOf(10, 11, 12, 13, 14, 15, 16),
-            completedDays = listOf(true, false, true, false, true, false, false),
-            workoutsCompleted = 3
+            completedDays = listOf(false, false, false, false, false, false, false),
+            workoutsCompleted = 0
         ),
         {},
         {},
diff --git a/app/src/main/java/com/cornellappdev/uplift/ui/viewmodels/profile/ProfileViewModel.kt b/app/src/main/java/com/cornellappdev/uplift/ui/viewmodels/profile/ProfileViewModel.kt
index 9b1b3bf..6fb6d76 100644
--- a/app/src/main/java/com/cornellappdev/uplift/ui/viewmodels/profile/ProfileViewModel.kt
+++ b/app/src/main/java/com/cornellappdev/uplift/ui/viewmodels/profile/ProfileViewModel.kt
@@ -10,6 +10,7 @@ import com.cornellappdev.uplift.ui.UpliftRootRoute
 import com.cornellappdev.uplift.ui.components.profile.workouts.HistoryItem
 import com.cornellappdev.uplift.ui.nav.RootNavigationRepository
 import com.cornellappdev.uplift.ui.viewmodels.UpliftViewModel
+import com.cornellappdev.uplift.util.timeAgoString
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
@@ -69,15 +70,17 @@ class ProfileViewModel @Inject constructor(
             return@launch
         }
         val historyItems = profile.workouts.map {
+            val workoutInstant = Instant.ofEpochMilli(it.timestamp)
+            val calendar = java.util.Calendar.getInstance().apply {
+                timeInMillis = it.timestamp
+            }
             HistoryItem(
                 gymName = it.gymName,
-                time = formatTime.format(
-                    Instant.ofEpochMilli(it.timestamp)
-                ),
-                date = formatDate.format(
-                    Instant.ofEpochMilli(it.timestamp)
-                ),
-                timestamp = it.timestamp
+                time = formatTime.format(workoutInstant),
+                date = formatDate.format(workoutInstant),
+                timestamp = it.timestamp,
+                dayOfWeek = formatDayOfWeek.format(workoutInstant),
+                ago = calendar.timeAgoString()
             )
         }
 
@@ -149,4 +152,10 @@ class ProfileViewModel @Inject constructor(
         .ofPattern("MMMM d, yyyy")
         .withLocale(Locale.US)
         .withZone(ZoneId.systemDefault())
-}
\ No newline at end of file
+
+    private val formatDayOfWeek = DateTimeFormatter
+        .ofPattern("EEE")
+        .withLocale(Locale.US)
+        .withZone(ZoneId.systemDefault())
+}
+

From 97786c85799190e9fdc1e691742256d5fb481154 Mon Sep 17 00:00:00 2001
From: Melissa Velasquez <mv477@cornell.edu>
Date: Wed, 18 Mar 2026 11:56:10 -0400
Subject: [PATCH 09/11] Refactored to new backend schema

---
 app/src/main/graphql/User.graphql             | 11 ++-
 .../data/repositories/ProfileRepository.kt    | 76 +++++++------------
 .../ui/viewmodels/profile/ProfileViewModel.kt |  1 -
 3 files changed, 36 insertions(+), 52 deletions(-)

diff --git a/app/src/main/graphql/User.graphql b/app/src/main/graphql/User.graphql
index ebfccc9..ec6f3b0 100644
--- a/app/src/main/graphql/User.graphql
+++ b/app/src/main/graphql/User.graphql
@@ -11,6 +11,9 @@ fragment userFields on User {
     lastGoalChange
     lastStreak
     totalGymDays
+    workoutHistory {
+        ...workoutFields
+    }
 }
 
 fragment workoutFields on Workout {
@@ -43,14 +46,14 @@ query getUserByNetId($netId: String!) {
     }
 }
 
-mutation SetWorkoutGoals($id: Int!, $workoutGoal: Int!) {
-    setWorkoutGoals(userId: $id, workoutGoal: $workoutGoal) {
+mutation SetWorkoutGoals($userId: Int!, $workoutGoal: Int!) {
+    setWorkoutGoals(userId: $userId, workoutGoal: $workoutGoal) {
         ...userFields
     }
 }
 
-mutation LogWorkout($facilityId: Int!, $workoutTime: DateTime!, $id: Int!) {
-    logWorkout(facilityId: $facilityId, userId: $id, workoutTime: $workoutTime) {
+mutation LogWorkout($facilityId: Int!, $workoutTime: DateTime!, $userId: Int!) {
+    logWorkout(facilityId: $facilityId, userId: $userId, workoutTime: $workoutTime) {
         ...workoutFields
     }
 }
diff --git a/app/src/main/java/com/cornellappdev/uplift/data/repositories/ProfileRepository.kt b/app/src/main/java/com/cornellappdev/uplift/data/repositories/ProfileRepository.kt
index 0d15d82..52250f1 100644
--- a/app/src/main/java/com/cornellappdev/uplift/data/repositories/ProfileRepository.kt
+++ b/app/src/main/java/com/cornellappdev/uplift/data/repositories/ProfileRepository.kt
@@ -4,12 +4,9 @@ import android.util.Log
 import com.apollographql.apollo.ApolloClient
 import com.cornellappdev.uplift.GetUserByNetIdQuery
 import com.cornellappdev.uplift.GetWeeklyWorkoutDaysQuery
-import com.cornellappdev.uplift.GetWorkoutsByIdQuery
 import com.cornellappdev.uplift.SetWorkoutGoalsMutation
 import com.cornellappdev.uplift.data.models.ProfileData
 import com.cornellappdev.uplift.data.models.WorkoutDomain
-import kotlinx.coroutines.async
-import kotlinx.coroutines.coroutineScope
 import java.time.Instant
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -39,51 +36,36 @@ class ProfileRepository @Inject constructor(
         val userId = user.id.toIntOrNull()
             ?: throw IllegalStateException("Invalid user ID: ${user.id}")
 
-        coroutineScope {
-            val workoutDeferred = async {
-                apolloClient.query(GetWorkoutsByIdQuery(userId)).execute()
-            }
-            val weeklyDeferred = async {
-                apolloClient.query(GetWeeklyWorkoutDaysQuery(userId)).execute()
-            }
-
-            val workoutResponse = workoutDeferred.await()
-            if (workoutResponse.hasErrors()) {
-                Log.e("ProfileRepo", "Workout query errors: ${workoutResponse.errors}")
-                throw IllegalStateException("Workout query failed")
-            }
-
-            val workouts = workoutResponse.data?.getWorkoutsById?.filterNotNull().orEmpty()
-
-            val workoutDomain = workouts.map {
-                WorkoutDomain(
-                    gymName = it.workoutFields.gymName,
-                    timestamp = Instant.parse(it.workoutFields.workoutTime.toString())
-                        .toEpochMilli()
-                )
-            }
-
-            val weeklyResponse = weeklyDeferred.await()
-            if (weeklyResponse.hasErrors()) {
-                Log.e("ProfileRepo", "Weekly query errors: ${weeklyResponse.errors}")
-                throw IllegalStateException("Weekly workout days query failed")
-            }
-
-            val weeklyDays = weeklyResponse.data?.getWeeklyWorkoutDays?.filterNotNull().orEmpty()
-
-            ProfileData(
-                name = user.name,
-                netId = user.netId,
-                encodedImage = user.encodedImage,
-                totalGymDays = user.totalGymDays,
-                activeStreak = user.activeStreak,
-                maxStreak = user.maxStreak,
-                streakStart = user.streakStart?.toString(),
-                workoutGoal = user.workoutGoal ?: 0,
-                workouts = workoutDomain,
-                weeklyWorkoutDays = weeklyDays
+        val weeklyResponse = apolloClient.query(GetWeeklyWorkoutDaysQuery(userId)).execute()
+
+        if (weeklyResponse.hasErrors()) {
+            throw IllegalStateException("Weekly workout days query failed: ${weeklyResponse.errors}")
+        }
+
+        val workouts = user.workoutHistory?.filterNotNull().orEmpty()
+
+        val workoutDomain = workouts.map {
+            WorkoutDomain(
+                gymName = it.workoutFields.gymName,
+                timestamp = Instant.parse(it.workoutFields.workoutTime.toString())
+                    .toEpochMilli()
             )
         }
+
+        val weeklyDays = weeklyResponse.data?.getWeeklyWorkoutDays?.filterNotNull().orEmpty()
+
+        ProfileData(
+            name = user.name,
+            netId = user.netId,
+            encodedImage = user.encodedImage,
+            totalGymDays = user.totalGymDays,
+            activeStreak = user.activeStreak,
+            maxStreak = user.maxStreak,
+            streakStart = user.streakStart?.toString(),
+            workoutGoal = user.workoutGoal ?: 0,
+            workouts = workoutDomain,
+            weeklyWorkoutDays = weeklyDays
+        )
     }.onFailure { e ->
         Log.e("ProfileRepo", "Failed to load profile", e)
     }
@@ -95,7 +77,7 @@ class ProfileRepository @Inject constructor(
         val response = apolloClient
             .mutation(
                 SetWorkoutGoalsMutation(
-                    id = userId,
+                    userId = userId,
                     workoutGoal = goal
                 )
             )
diff --git a/app/src/main/java/com/cornellappdev/uplift/ui/viewmodels/profile/ProfileViewModel.kt b/app/src/main/java/com/cornellappdev/uplift/ui/viewmodels/profile/ProfileViewModel.kt
index 6fb6d76..bd907d0 100644
--- a/app/src/main/java/com/cornellappdev/uplift/ui/viewmodels/profile/ProfileViewModel.kt
+++ b/app/src/main/java/com/cornellappdev/uplift/ui/viewmodels/profile/ProfileViewModel.kt
@@ -79,7 +79,6 @@ class ProfileViewModel @Inject constructor(
                 time = formatTime.format(workoutInstant),
                 date = formatDate.format(workoutInstant),
                 timestamp = it.timestamp,
-                dayOfWeek = formatDayOfWeek.format(workoutInstant),
                 ago = calendar.timeAgoString()
             )
         }

From b95621c382d196bc8ec85181eac5f17521565f13 Mon Sep 17 00:00:00 2001
From: Melissa Velasquez <mv477@cornell.edu>
Date: Wed, 18 Mar 2026 11:57:44 -0400
Subject: [PATCH 10/11] Added token logic for existing users

---
 .../data/repositories/AuthInterceptor.kt      |  1 +
 .../data/repositories/CheckInRepository.kt    |  8 ++++-
 .../data/repositories/UserInfoRepository.kt   | 30 ++++++++++++++++++-
 .../ui/screens/profile/ProfileScreen.kt       | 16 +++++++---
 4 files changed, 49 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/com/cornellappdev/uplift/data/repositories/AuthInterceptor.kt b/app/src/main/java/com/cornellappdev/uplift/data/repositories/AuthInterceptor.kt
index cbdbdff..a0bd4ad 100644
--- a/app/src/main/java/com/cornellappdev/uplift/data/repositories/AuthInterceptor.kt
+++ b/app/src/main/java/com/cornellappdev/uplift/data/repositories/AuthInterceptor.kt
@@ -11,6 +11,7 @@ class AuthInterceptor @Inject constructor(
 ) : Interceptor {
     override fun intercept(chain: Interceptor.Chain): Response {
         val token = tokenManager.getAccessToken()
+        android.util.Log.d("AuthInterceptor", "token present = ${token != null}")
         val request = chain.request().newBuilder().apply {
             if (token != null) {
                 addHeader("Authorization", "Bearer $token")
diff --git a/app/src/main/java/com/cornellappdev/uplift/data/repositories/CheckInRepository.kt b/app/src/main/java/com/cornellappdev/uplift/data/repositories/CheckInRepository.kt
index 52e380d..eb31236 100644
--- a/app/src/main/java/com/cornellappdev/uplift/data/repositories/CheckInRepository.kt
+++ b/app/src/main/java/com/cornellappdev/uplift/data/repositories/CheckInRepository.kt
@@ -162,7 +162,13 @@ class CheckInRepository @Inject constructor(
 
         return try {
             val response = apolloClient
-                .mutation(LogWorkoutMutation(facilityId = gymId, workoutTime = time, id = userId ))
+                .mutation(
+                    LogWorkoutMutation(
+                        facilityId = gymId,
+                        workoutTime = time,
+                        userId = userId
+                    )
+                )
                 .execute()
 
             val ok = response.data?.logWorkout?.workoutFields != null && !response.hasErrors()
diff --git a/app/src/main/java/com/cornellappdev/uplift/data/repositories/UserInfoRepository.kt b/app/src/main/java/com/cornellappdev/uplift/data/repositories/UserInfoRepository.kt
index a02838c..cc81153 100644
--- a/app/src/main/java/com/cornellappdev/uplift/data/repositories/UserInfoRepository.kt
+++ b/app/src/main/java/com/cornellappdev/uplift/data/repositories/UserInfoRepository.kt
@@ -87,7 +87,7 @@ class UserInfoRepository @Inject constructor(
         }
         val goalResponse = apolloClient.mutation(
             SetWorkoutGoalsMutation(
-                id = id,
+                userId = id,
                 workoutGoal = goal
             )
         )
@@ -114,8 +114,36 @@ class UserInfoRepository @Inject constructor(
         }
     }
 
+    suspend fun loginAndStoreTokens(netId: String): Boolean {
+        return try {
+            val loginResponse = apolloClient.mutation(
+                LoginUserMutation(netId = netId)
+            ).execute()
+
+            val loginData = loginResponse.data?.loginUser
+            if (loginResponse.hasErrors() ||
+                loginData?.accessToken == null ||
+                loginData.refreshToken == null
+            ) {
+                Log.e("UserInfoRepository", "Login failed: ${loginResponse.errors}")
+                return false
+            }
+
+            tokenManager.saveTokens(
+                loginData.accessToken,
+                loginData.refreshToken
+            )
+            Log.d("UserInfoRepository", "Saved backend tokens successfully")
+            true
+        } catch (e: Exception) {
+            Log.e("UserInfoRepository", "Error logging in user", e)
+            false
+        }
+    }
+
     suspend fun syncUserToDataStore(netId: String): Boolean {
         return try {
+            if (!loginAndStoreTokens(netId)) return false
             val user = getUserByNetId(netId) ?: return false
 
             storeUserFields(
diff --git a/app/src/main/java/com/cornellappdev/uplift/ui/screens/profile/ProfileScreen.kt b/app/src/main/java/com/cornellappdev/uplift/ui/screens/profile/ProfileScreen.kt
index c6a10e1..30fc4e0 100644
--- a/app/src/main/java/com/cornellappdev/uplift/ui/screens/profile/ProfileScreen.kt
+++ b/app/src/main/java/com/cornellappdev/uplift/ui/screens/profile/ProfileScreen.kt
@@ -172,17 +172,25 @@ private fun ProfileScreenTopBar(
 @Preview
 @Composable
 private fun ProfileScreenContentPreview() {
+    val now = System.currentTimeMillis()
+    val historyItems = listOf(
+        HistoryItem("Morrison", "11:00 PM",  "March 29, 2024", now - (1 * 24 * 60 * 60 * 1000), "1 day ago"),
+        HistoryItem("Noyes", "1:00 PM", "March 29, 2024", now - (3 * 24 * 60 * 60 * 1000), "2 days ago"),
+        HistoryItem("Teagle Up", "2:00 PM",  "March 29, 2024", now - (7 * 24 * 60 * 60 * 1000), "1 day ago"),
+        HistoryItem("Teagle Down", "12:00 PM",  "March 29, 2024", now - (15 * 24 * 60 * 60 * 1000), "1 day ago"),
+        HistoryItem("Helen Newman", "10:00 AM",  "March 29, 2024", now, "Today"),
+    )
     ProfileScreenContent(
         uiState = ProfileUiState(
             name = "Melissa Velasquez",
             netId = "mv477",
-            totalGymDays = 0,
+            totalGymDays = 1,
             activeStreak = 0,
             workoutGoal = 4,
-            historyItems = emptyList(),
+            historyItems = historyItems,
             daysOfMonth = listOf(10, 11, 12, 13, 14, 15, 16),
-            completedDays = listOf(false, false, false, false, false, false, false),
-            workoutsCompleted = 0
+            completedDays = listOf(true, false, false, false, false, false, false),
+            workoutsCompleted = 1
         ),
         {},
         {},

From 422ef3e6b88ba2f0b2335c8a8f3e0f07e3348216 Mon Sep 17 00:00:00 2001
From: Melissa Velasquez <mv477@cornell.edu>
Date: Thu, 19 Mar 2026 11:52:47 -0400
Subject: [PATCH 11/11] Adressed some coderabbit comments

---
 .../data/repositories/DatastoreRepository.kt      |  2 +-
 .../data/repositories/UserInfoRepository.kt       | 15 ++++++++-------
 .../uplift/ui/screens/profile/ProfileScreen.kt    |  4 ----
 .../com/cornellappdev/uplift/util/Functions.kt    |  6 ++----
 4 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/app/src/main/java/com/cornellappdev/uplift/data/repositories/DatastoreRepository.kt b/app/src/main/java/com/cornellappdev/uplift/data/repositories/DatastoreRepository.kt
index 49c11e9..f9c3428 100644
--- a/app/src/main/java/com/cornellappdev/uplift/data/repositories/DatastoreRepository.kt
+++ b/app/src/main/java/com/cornellappdev/uplift/data/repositories/DatastoreRepository.kt
@@ -26,7 +26,7 @@ object PreferencesKeys {
     val NETID = stringPreferencesKey("netId")
     val EMAIL = stringPreferencesKey("email")
     val GOAL = intPreferencesKey("workoutGoal")
-    val SKIP = booleanPreferencesKey("skip")
+    val GOAL_SETTING_SKIPPED = booleanPreferencesKey("goalSkip")
     val FCM_TOKEN = stringPreferencesKey("fcmToken")
     val DECLINED_NOTIFICATION_PERMISSION =
         booleanPreferencesKey("declinedNotificationPermission")
diff --git a/app/src/main/java/com/cornellappdev/uplift/data/repositories/UserInfoRepository.kt b/app/src/main/java/com/cornellappdev/uplift/data/repositories/UserInfoRepository.kt
index cc81153..10c510a 100644
--- a/app/src/main/java/com/cornellappdev/uplift/data/repositories/UserInfoRepository.kt
+++ b/app/src/main/java/com/cornellappdev/uplift/data/repositories/UserInfoRepository.kt
@@ -14,6 +14,7 @@ import com.cornellappdev.uplift.SetWorkoutGoalsMutation
 import kotlinx.coroutines.flow.map;
 import kotlinx.coroutines.flow.firstOrNull
 import com.cornellappdev.uplift.data.models.UserInfo
+import com.google.common.collect.Iterables.skip
 import com.google.firebase.auth.FirebaseAuth
 import com.google.firebase.auth.FirebaseUser
 import com.google.firebase.auth.GoogleAuthProvider
@@ -69,7 +70,7 @@ class UserInfoRepository @Inject constructor(
                 username = userFields.name,
                 netId = userFields.netId,
                 email = userFields.email ?: email,
-                skip = skip,
+                goalSkip = skip,
                 goal = goal
             )
             Log.d("UserInfoRepositoryImpl", "User created successfully")
@@ -101,14 +102,14 @@ class UserInfoRepository @Inject constructor(
     }
 
 
-    suspend fun storeUserFields(id: String, username: String, netId: String, email: String, skip: Boolean, goal: Int) {
+    suspend fun storeUserFields(id: String, username: String, netId: String, email: String, goalSkip: Boolean, goal: Int) {
         dataStore.edit { preferences ->
             preferences[PreferencesKeys.ID] = id
             preferences[PreferencesKeys.NETID] = netId
             preferences[PreferencesKeys.USERNAME] = username
             preferences[PreferencesKeys.EMAIL] = email
-            preferences[PreferencesKeys.SKIP] = skip
-            if (!skip) {
+            preferences[PreferencesKeys.GOAL_SETTING_SKIPPED] = goalSkip
+            if (!goalSkip) {
                 preferences[PreferencesKeys.GOAL] = goal
             }
         }
@@ -151,7 +152,7 @@ class UserInfoRepository @Inject constructor(
                 username = user.name,
                 netId = user.netId,
                 email = user.email,
-                skip = false,
+                goalSkip = user.workoutGoal == null,
                 goal = user.workoutGoal ?: 0
             )
 
@@ -212,14 +213,14 @@ class UserInfoRepository @Inject constructor(
 
     suspend fun storeSkip(skip: Boolean) {
         dataStore.edit { preferences ->
-            preferences[PreferencesKeys.SKIP] = skip
+            preferences[PreferencesKeys.GOAL_SETTING_SKIPPED] = skip
         }
     }
 
 
     suspend fun getSkipFromDataStore(): Boolean {
         return dataStore.data.map { preferences ->
-            preferences[PreferencesKeys.SKIP]
+            preferences[PreferencesKeys.GOAL_SETTING_SKIPPED]
         }.firstOrNull() ?: false
     }
 
diff --git a/app/src/main/java/com/cornellappdev/uplift/ui/screens/profile/ProfileScreen.kt b/app/src/main/java/com/cornellappdev/uplift/ui/screens/profile/ProfileScreen.kt
index 30fc4e0..b5b28d0 100644
--- a/app/src/main/java/com/cornellappdev/uplift/ui/screens/profile/ProfileScreen.kt
+++ b/app/src/main/java/com/cornellappdev/uplift/ui/screens/profile/ProfileScreen.kt
@@ -88,10 +88,8 @@ private fun ProfileScreenContent(
                 workoutGoal = uiState.workoutGoal,
                 daysOfMonth = uiState.daysOfMonth,
                 completedDays = uiState.completedDays,
-                reminderItems= emptyList(), //implement
                 historyItems = uiState.historyItems,
                 navigateToGoalsSection = toGoals,
-                navigateToRemindersSection = { /* TODO: Replace {} with viewmodel nav call */ },
                 navigateToHistorySection = toHistory
             )
 
@@ -105,10 +103,8 @@ private fun WorkoutsSectionContent(
     workoutGoal: Int,
     daysOfMonth: List<Int>,
     completedDays: List<Boolean>,
-    reminderItems: List<ReminderItem>,
     historyItems: List<HistoryItem>,
     navigateToGoalsSection: () -> Unit,
-    navigateToRemindersSection: () -> Unit,
     navigateToHistorySection: () -> Unit
 ) {
     Column(
diff --git a/app/src/main/java/com/cornellappdev/uplift/util/Functions.kt b/app/src/main/java/com/cornellappdev/uplift/util/Functions.kt
index 516c1da..be4ffc2 100644
--- a/app/src/main/java/com/cornellappdev/uplift/util/Functions.kt
+++ b/app/src/main/java/com/cornellappdev/uplift/util/Functions.kt
@@ -210,11 +210,9 @@ fun Calendar.timeAgoString(): String {
         diffWeeks in 2L..4L -> "$diffWeeks weeks ago"
 
         diffMonths == 1L -> "1 month ago"
-        diffMonths in 2L..11L -> "$diffMonths months ago"
+        diffMonths in 2L..12L -> "$diffMonths months ago"
 
         diffYears == 1L -> "1 year ago"
-        diffYears > 1L -> "$diffYears years ago"
-
-        else -> "Today"
+        else  ->  "$diffYears years ago"
     }
 }