Adjust capacity indicator

Author: 04jono

app/src/main/java/com/cornellappdev/transit/ui/components/home/GymCapacityIndicator.kt

@@ -24,10 +24,9 @@ import com.cornellappdev.transit.ui.theme.AccentClosed
 import com.cornellappdev.transit.ui.theme.AccentOpen
 import com.cornellappdev.transit.ui.theme.AccentOrange
 import com.cornellappdev.transit.ui.theme.Gray02
-import com.cornellappdev.transit.ui.theme.Gray04
 import com.cornellappdev.transit.ui.theme.PrimaryText
 import com.cornellappdev.transit.ui.theme.robotoFamily
-import com.cornellappdev.transit.util.LIMITED_CAPACITY_THRESHOLD
+import com.cornellappdev.transit.util.HIGH_CAPACITY_THRESHOLD
 import com.cornellappdev.transit.util.colorInterp
 
 // Source: Uplift Android
@@ -39,17 +38,14 @@ import com.cornellappdev.transit.util.colorInterp
  *                  and whose second element is the max capacity.
  * @param label     The name of the gym placed under this indicator. Can be null to indicate no
  *                  label.
- * @param closed    If this gym is closed.
  */
 @Composable
 fun GymCapacityIndicator(
-    capacity: UpliftCapacity?,
+    capacity: UpliftCapacity,
     label: String?,
-    closed: Boolean,
 ) {
-    val grayedOut = closed || capacity == null
 
-    val fraction = if (!grayedOut) capacity!!.percent.toFloat() else 0f
+    val fraction = capacity.percent.toFloat()
     val animatedFraction = remember { Animatable(0f) }
 
     // When the composable launches, animate the fraction to the capacity fraction.
@@ -63,22 +59,21 @@ fun GymCapacityIndicator(
     // Choose a color. If between 0 & 0.5, tween between open and orange. If between 0.5 and 1,
     // tween between orange and closed.
     val color =
-        if (fraction > LIMITED_CAPACITY_THRESHOLD)
+        if (fraction > HIGH_CAPACITY_THRESHOLD)
             colorInterp(
-                (fraction - LIMITED_CAPACITY_THRESHOLD) / (1 - LIMITED_CAPACITY_THRESHOLD),
+                (fraction - HIGH_CAPACITY_THRESHOLD) / (1 - HIGH_CAPACITY_THRESHOLD),
                 AccentOrange,
                 AccentClosed
             )
         else
             colorInterp(
-                fraction / LIMITED_CAPACITY_THRESHOLD,
+                fraction / HIGH_CAPACITY_THRESHOLD,
                 AccentOpen,
                 AccentClosed
             )
 
     val size = 54.dp
-    val percentFontSize =
-        12.sp * (if (closed || capacity != null) 1f else .9f)
+    val percentFontSize = 12.sp
     val labelColor = PrimaryText
     val labelFontWeight = FontWeight(600)
     val labelPadding = 12.dp
@@ -99,12 +94,11 @@ fun GymCapacityIndicator(
                 strokeCap = StrokeCap.Round
             )
             Text(
-                text = if (closed) "CLOSED"
-                else capacity?.percentString() ?: "NO DATA",
+                text = capacity.percentString(),
                 fontFamily = robotoFamily,
                 fontSize = percentFontSize,
                 fontWeight = FontWeight(700),
-                color = if (grayedOut) Gray02 else PrimaryText,
+                color = PrimaryText,
                 modifier = Modifier.align(Alignment.Center),
                 textAlign = TextAlign.Center,
             )

app/src/main/java/com/cornellappdev/transit/ui/components/home/GymDetailsContent.kt

@@ -15,7 +15,6 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.buildAnnotatedString
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
 import com.cornellappdev.transit.R
@@ -30,13 +29,18 @@ import com.cornellappdev.transit.ui.viewmodels.HomeViewModel
 import com.cornellappdev.transit.util.getAboutContent
 import com.cornellappdev.transit.util.getGymLocationString
 
+/**
+ * Displays the full detail view for an individual gym within the ecosystem bottom sheet.
+ */
 @Composable
 fun GymDetailsContent(
     homeViewModel: HomeViewModel = hiltViewModel(),
     gym: UpliftGym,
     isFavorite: Boolean,
     onFavoriteClick: () -> Unit,
 ) {
+    val isOpen = homeViewModel.getOpenStatus(gym.operatingHours()).isOpen
+
     Column(
         modifier = Modifier
             .fillMaxWidth()
@@ -60,11 +64,12 @@ fun GymDetailsContent(
                 gym.operatingHours()
             ),
             widget = {
-                GymCapacityIndicator(
-                    capacity = gym.upliftCapacity,
-                    label = null,
-                    closed = false
-                )
+                if (gym.upliftCapacity != null && isOpen) {
+                    GymCapacityIndicator(
+                        capacity = gym.upliftCapacity,
+                        label = null,
+                    )
+                }
             },
         )
 

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

@@ -21,12 +21,15 @@ import com.cornellappdev.transit.models.ecosystem.EateryRepository
 import com.cornellappdev.transit.models.ecosystem.GymRepository
 import com.cornellappdev.transit.models.ecosystem.UpliftCapacity
 import com.cornellappdev.transit.networking.ApiResponse
+import com.cornellappdev.transit.ui.theme.AccentClosed
+import com.cornellappdev.transit.ui.theme.AccentOpen
 import com.cornellappdev.transit.ui.theme.AccentOrange
 import com.cornellappdev.transit.ui.theme.LateRed
 import com.cornellappdev.transit.ui.theme.LiveGreen
 import com.cornellappdev.transit.ui.theme.SecondaryText
 import com.cornellappdev.transit.ui.theme.robotoFamily
-import com.cornellappdev.transit.util.LIMITED_CAPACITY_THRESHOLD
+import com.cornellappdev.transit.util.HIGH_CAPACITY_THRESHOLD
+import com.cornellappdev.transit.util.MEDIUM_CAPACITY_THRESHOLD
 import com.cornellappdev.transit.util.TimeUtils.toPascalCaseString
 import com.google.android.gms.maps.model.LatLng
 import dagger.hilt.android.lifecycle.HiltViewModel
@@ -358,7 +361,7 @@ class HomeViewModel @Inject constructor(
      *
      * @param operatingHours A list of pairs mapping the first value day string to second value list of hours open
      */
-    private fun getOpenStatus(
+    fun getOpenStatus(
         operatingHours: List<DayOperatingHours>,
         currentDateTime: LocalDateTime = LocalDateTime.now()
     ): OpenStatus {
@@ -466,13 +469,21 @@ class HomeViewModel @Inject constructor(
             return AnnotatedString("")
         }
 
+        val color = if (capacity.percent <= MEDIUM_CAPACITY_THRESHOLD) {
+            AccentOpen
+        } else if (capacity.percent >= HIGH_CAPACITY_THRESHOLD) {
+            AccentClosed
+        } else {
+            AccentOrange
+        }
+
         return buildAnnotatedString {
             withStyle(
                 style = SpanStyle(
                     fontSize = 14.sp,
                     fontFamily = robotoFamily,
                     fontWeight = FontWeight(600),
-                    color = if (capacity.percent <= LIMITED_CAPACITY_THRESHOLD) LiveGreen else AccentOrange,
+                    color = color,
                 )
             ) {
                 append("${capacity.percentString()} full")

app/src/main/java/com/cornellappdev/transit/util/TransitConstants.kt

@@ -6,6 +6,10 @@ const val ECOSYSTEM_FLAG = BuildConfig.ECOSYSTEM_FLAG
 
 const val BOTTOM_SHEET_MAX_HEIGHT_PERCENT = 90
 
-const val LIMITED_CAPACITY_THRESHOLD = 0.65f
+/** When the capacity turns to orange */
+const val MEDIUM_CAPACITY_THRESHOLD = 0.35f
+
+/** When the capacity turns to red */
+const val HIGH_CAPACITY_THRESHOLD = 0.65f
 
 const val NOTIFICATIONS_ENABLED = false