Adressed some coderabbit comments

Author: melissavelasquezz

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")

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
     }
 

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(

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"
     }
 }