Addressed comments

Author: helenjb

app/src/main/java/com/cornellappdev/uplift/ui/components/capacityreminder/CapacityReminderLoading.kt

@@ -53,7 +53,7 @@ fun CapacityReminderLoading() {
 
     val rotationAngle by infiniteTransition.animateFloat(
         initialValue = 0f,
-        targetValue = 360f,animationSpec = infiniteRepeatable(
+        targetValue = 360f, animationSpec = infiniteRepeatable(
             animation = tween(durationMillis = 2000, easing = LinearEasing),
             repeatMode = RepeatMode.Restart
         ),
@@ -62,8 +62,8 @@ fun CapacityReminderLoading() {
 
     val logoYOffset by infiniteTransition.animateValue(
         initialValue = 0.dp,
-        targetValue = (-20).dp,animationSpec = infiniteRepeatable(
-            animation = tween(durationMillis = 750, easing= EaseInOut),
+        targetValue = (-20).dp, animationSpec = infiniteRepeatable(
+            animation = tween(durationMillis = 750, easing = EaseInOut),
             repeatMode = RepeatMode.Reverse
         ),
         label = "logoYOffset",
@@ -72,7 +72,7 @@ fun CapacityReminderLoading() {
 
     val componentSize by infiniteTransition.animateFloat(
         initialValue = 1f,
-        targetValue = 0.97f,animationSpec = infiniteRepeatable(
+        targetValue = 0.97f, animationSpec = infiniteRepeatable(
             animation = tween(durationMillis = 750, easing = EaseInOut),
             repeatMode = RepeatMode.Reverse
         ),
@@ -81,8 +81,8 @@ fun CapacityReminderLoading() {
 
     val textOpacity by infiniteTransition.animateFloat(
         initialValue = 1f,
-        targetValue = 0.5f,animationSpec = infiniteRepeatable(
-            animation = tween(durationMillis = 750,easing = EaseInOut),
+        targetValue = 0.5f, animationSpec = infiniteRepeatable(
+            animation = tween(durationMillis = 750, easing = EaseInOut),
             repeatMode = RepeatMode.Reverse
         ),
         label = "textOpacity"
@@ -95,17 +95,18 @@ fun CapacityReminderLoading() {
         animationSpec = infiniteRepeatable(
             animation = tween(
                 durationMillis = 1500,
-                easing = { fraction ->
-                    val step = 0.25f
-                    (fraction / step).toInt() * step
-                }
+                easing = LinearEasing
             ),
             repeatMode = RepeatMode.Restart
         ),
         label = "dotCount"
     )
 
-    Box(modifier = Modifier.fillMaxSize().background(Color(0xFFD9D9D9).copy(alpha=0.5f))){
+    Box(
+        modifier = Modifier
+            .fillMaxSize()
+            .background(Color(0xFFD9D9D9).copy(alpha = 0.5f))
+    ) {
         Box(
             modifier = Modifier
                 .height((270 * componentSize).toInt().dp)

app/src/main/java/com/cornellappdev/uplift/ui/components/capacityreminder/CapacityReminderTutorial.kt

@@ -50,17 +50,19 @@ fun CapacityReminderTutorial(
     LaunchedEffect(Unit) {
         offsetY.animateTo(
             targetValue = 0f,
-            animationSpec = tween(durationMillis = 1000)
+            animationSpec = tween(durationMillis = 1500)
         )
     }
     Column(
         modifier = Modifier
             .width(300.dp)
             .clip(RoundedCornerShape(20.dp))
     ) {
-        Box(modifier = Modifier
-            .height(175.dp)
-            .clipToBounds()) {
+        Box(
+            modifier = Modifier
+                .height(175.dp)
+                .clipToBounds()
+        ) {
             Box(
                 modifier = Modifier
                     .matchParentSize()
@@ -161,21 +163,23 @@ fun CapacityReminderTutorial(
                 containerColor = PRIMARY_BLACK,
                 contentColor = Color.White,
                 modifier = Modifier.fillMaxWidth(),
-                onClick = onAccept)
+                onClick = onAccept
+            )
             Spacer(modifier = Modifier.height(8.dp))
             UpliftButton(
                 text = "Maybe later",
                 containerColor = Color.White,
                 contentColor = GRAY03,
                 modifier = Modifier.fillMaxWidth(),
                 elevation = 0.dp,
-                onClick = onDismiss)
+                onClick = onDismiss
+            )
         }
     }
 }
 
 @Preview
 @Composable
 fun CapacityReminderTutorialPreview() {
-    CapacityReminderTutorial({},{})
+    CapacityReminderTutorial({}, {})
 }

app/src/main/java/com/cornellappdev/uplift/ui/screens/gyms/HomeScreen.kt

@@ -1,6 +1,5 @@
 package com.cornellappdev.uplift.ui.screens.gyms
 
-import android.annotation.SuppressLint
 import androidx.compose.animation.Crossfade
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
@@ -33,7 +32,6 @@ import kotlinx.coroutines.delay
 /**
  * The home page of Uplift.
  */
-@SuppressLint("UnusedCrossfadeTargetStateParameter")
 @OptIn(ExperimentalPermissionsApi::class)
 @Composable
 fun HomeScreen(
@@ -68,7 +66,7 @@ fun HomeScreen(
         LocationRepository.instantiate(context)
     }
 
-    Box(modifier = Modifier.fillMaxSize()){
+    Box(modifier = Modifier.fillMaxSize()) {
         Crossfade(targetState = gymsState, label = "Main") {
             when {
                 gymsLoading -> MainLoading(loadingShimmer)
@@ -86,14 +84,17 @@ fun HomeScreen(
             }
         }
 
-        if(showTutorial) {
-            Box(modifier = Modifier.fillMaxSize().background(GRAY04.copy(alpha=0.5f))){
-                Box(modifier = Modifier.align(Alignment.Center)) {
-                    CapacityReminderTutorial(
-                        onAccept = { homeViewModel.navigateToCapacityReminders() },
-                        onDismiss = { homeViewModel.onTutorialDismissed() },
-                    )
-                }
+        if (showTutorial) {
+            Box(
+                modifier = Modifier
+                    .fillMaxSize()
+                    .background(GRAY04.copy(alpha = 0.5f)),
+                contentAlignment = Alignment.Center
+            ) {
+                CapacityReminderTutorial(
+                    onAccept = { homeViewModel.navigateToCapacityReminders() },
+                    onDismiss = { homeViewModel.onTutorialDismissed() },
+                )
             }
         }
     }

app/src/main/java/com/cornellappdev/uplift/ui/viewmodels/gyms/HomeViewModel.kt

@@ -15,7 +15,7 @@ import com.cornellappdev.uplift.util.getSystemTime
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.StateFlow
-import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.flow.firstOrNull
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.launch
@@ -106,7 +106,7 @@ class HomeViewModel @Inject constructor(
 
     fun navigateToCapacityReminders() {
         viewModelScope.launch {
-            if (!datastoreRepository.hasShownCapacityTutorial().first()) {
+            if (datastoreRepository.hasShownCapacityTutorial().firstOrNull() == false) {
                 datastoreRepository.storePreference(
                     key = PreferencesKeys.CAPACITY_REMINDERS_TUTORIAL_SHOWN,
                     value = true
@@ -122,7 +122,7 @@ class HomeViewModel @Inject constructor(
         }
         .stateIn(
             scope = viewModelScope,
-            started = SharingStarted.WhileSubscribed(5_000),
+            started = SharingStarted.Eagerly,
             initialValue = false
         )
 
@@ -133,6 +133,5 @@ class HomeViewModel @Inject constructor(
                 value = true
             )
         }
-        rootNavigationRepository.navigateUp()
     }
 }