address remaining comments and unit all view models

app/src/androidTest/kotlin/edu/stanford/bdh/engagehf/health/HealthPageTest.kt

@@ -158,7 +158,7 @@ class HealthPageTest {
                         id = entryId,
                     )
                 ),
-                valueFormatter = { value, _ -> "$value" }
+                valueFormatter = { value -> "$value" }
             )
         )
     }

app/src/main/kotlin/edu/stanford/bdh/engagehf/health/HealthPage.kt

@@ -181,7 +181,7 @@ private fun InfoRow(
             onClick = onInfoAction
         ) {
             Icon(
-                Icons.Filled.Info,
+                imageVector = Icons.Filled.Info,
                 contentDescription = stringResource(R.string.info_icon_content_description),
                 tint = primary
             )
@@ -209,7 +209,7 @@ private class HealthPagePreviewProvider : PreviewParameterProvider<HealthUiState
             HealthUiState.NoData("No data available"),
             HealthUiState.Success(
                 data = HealthUiData(
-                    valueFormatter = { _, _ -> "Jan 24" },
+                    valueFormatter = { "Jan 24" },
                     infoRowData = InfoRowData(
                         selectedTimeRange = TimeRange.MONTHLY,
                         formattedValue = "70.0 kg",

app/src/main/kotlin/edu/stanford/bdh/engagehf/health/HealthRepository.kt

@@ -52,8 +52,7 @@ class HealthRepository @Inject constructor(
                                 logger.e(error) { "Error listening for latest observation in collection: ${collection.name}" }
                                 trySend(Result.failure(error))
                             } else {
-                                val documents = snapshot?.documents
-                                val records: List<T> = documents?.mapNotNull { document ->
+                                val records: List<T> = snapshot?.documents?.mapNotNull { document ->
                                     observationsDocumentMapper.map(document)
                                 } ?: emptyList()
                                 trySend(Result.success(records))
@@ -79,11 +78,6 @@ class HealthRepository @Inject constructor(
     suspend fun observeHeartRateRecords(): Flow<Result<List<HeartRateRecord>>> =
         observe(ObservationCollection.HEART_RATE)
 
-    companion object {
-        const val DEFAULT_MAX_MONTHS = 6L
-        const val DATE_TIME_FIELD = "effectiveDateTime"
-    }
-
     suspend fun saveRecord(record: Record): Result<Unit> {
         val observations = recordToObservationMapper.map(record)
         return withContext(ioDispatcher) {
@@ -99,11 +93,7 @@ class HealthRepository @Inject constructor(
                             batch.set(docRef, data)
                         }
                 }
-                batch.commit().await()
-            }.map {
-                Result.success(Unit)
-            }.getOrElse {
-                Result.failure(it)
+                batch.commit().await().let { }
             }
         }
     }
@@ -115,11 +105,7 @@ class HealthRepository @Inject constructor(
         return withContext(ioDispatcher) {
             runCatching {
                 observationCollectionProvider.getCollection(observationCollection)
-                    .document(recordId).delete().await()
-            }.map {
-                Result.success(Unit)
-            }.getOrElse {
-                Result.failure(it)
+                    .document(recordId).delete().await().let { }
             }
         }
     }
@@ -135,4 +121,9 @@ class HealthRepository @Inject constructor(
     suspend fun deleteHeartRateRecord(recordId: String): Result<Unit> {
         return deleteRecord(recordId, ObservationCollection.HEART_RATE)
     }
+
+    companion object {
+        const val DEFAULT_MAX_MONTHS = 6L
+        const val DATE_TIME_FIELD = "effectiveDateTime"
+    }
 }

app/src/main/kotlin/edu/stanford/bdh/engagehf/health/HealthUiState.kt

@@ -10,7 +10,7 @@ data class HealthUiData(
     val newestData: NewestHealthData? = null,
     val averageData: AverageHealthData? = null,
     val infoRowData: InfoRowData,
-    val valueFormatter: (Float, TimeRange) -> String,
+    val valueFormatter: (Float) -> String,
 ) {
     val selectedTimeRange = infoRowData.selectedTimeRange
 }

app/src/main/kotlin/edu/stanford/bdh/engagehf/health/HealthUiStateMapper.kt

@@ -29,13 +29,12 @@ class HealthUiStateMapper @Inject constructor(
         selectedTimeRange: TimeRange,
     ): HealthUiState {
         val engageRecords = records.map { EngageRecord.from(it) }
-        val filteredRecords = engageRecords
             .filter {
                 it.zonedDateTime.isAfter(
                     ZonedDateTime.now().minusMonths(getMaxMonths(selectedTimeRange))
                 )
             }
-        return if (filteredRecords.isEmpty()) {
+        return if (engageRecords.isEmpty()) {
             HealthUiState.NoData(message = "No data available")
         } else {
             HealthUiState.Success(
@@ -76,7 +75,7 @@ class HealthUiStateMapper @Inject constructor(
             newestData = newestData,
             averageData = getAverageData(tableData),
             infoRowData = generateHealthHeaderData(selectedTimeRange, newestData),
-            valueFormatter = ::valueFormatter
+            valueFormatter = { valueFormatter(it, selectedTimeRange) }
         )
     }
 
@@ -317,16 +316,39 @@ class HealthUiStateMapper @Inject constructor(
 
     private fun getDefaultLocale() = localeProvider.getDefaultLocale()
 
-    companion object {
-        private const val DAILY_MAX_MONTHS = 1L
-        private const val WEEKLY_MAX_MONTHS = 3L
-        private const val MONTHLY_MAX_MONTHS = 6L
+    private fun valueFormatter(value: Float, timeRange: TimeRange): String {
+        val date = when (timeRange) {
+            TimeRange.DAILY -> {
+                val actualValue = value * 10
+                val year = actualValue.toInt()
+                val dayOfYearFraction = actualValue - year
+                val dayOfYear = (dayOfYearFraction * 365).toInt() + 1
+                ZonedDateTime.of(year, 1, 1, 0, 0, 0, 0, ZoneId.systemDefault())
+                    .plusDays((dayOfYear - 1).toLong())
+            }
 
-        const val EPOCH_SECONDS_DIVISOR = 60.0f
-        const val ADAPTIVE_Y_VALUES_FRACTION = 1.05f
+            TimeRange.WEEKLY -> ZonedDateTime.ofInstant(
+                Instant.ofEpochSecond(
+                    value.toLong() * 7 * 24 * 60 * 60
+                ), ZoneId.systemDefault()
+            )
 
-        private const val MONTH_DAY_TIME_PATTERN = "MMM dd HH:mm"
-        private const val MONTH_YEAR_PATTERN = "MMM yy"
+            TimeRange.MONTHLY -> {
+                val year = value.toInt()
+                val month = ((value - year) * 12).toInt() + 1
+                ZonedDateTime.of(year, month, 1, 0, 0, 0, 0, ZoneId.systemDefault())
+            }
+        }
+        val pattern = when (timeRange) {
+            TimeRange.DAILY, TimeRange.WEEKLY -> "MMM dd"
+            TimeRange.MONTHLY -> "MMM yy"
+        }
+        return date.format(DateTimeFormatter.ofPattern(pattern))
+    }
+
+    @Suppress("MagicNumber")
+    private fun Float.roundToTwoDecimalPlaces(): Float {
+        return Math.round(this * 100) / 100.0f
     }
 
     private data class ValueUnit(val value: Double, val unit: String)
@@ -357,38 +379,15 @@ class HealthUiStateMapper @Inject constructor(
         }
     }
 
-    private fun valueFormatter(value: Float, timeRange: TimeRange): String {
-        val date = when (timeRange) {
-            TimeRange.DAILY -> {
-                val year = (value * 10).toInt()
-                val dayOfYearFraction = (value * 10) - year
-                val dayOfYear = (dayOfYearFraction * 365).toInt() + 1
-                ZonedDateTime.of(year, 1, 1, 0, 0, 0, 0, ZoneId.systemDefault())
-                    .plusDays((dayOfYear - 1).toLong())
-            }
+    companion object {
+        private const val DAILY_MAX_MONTHS = 1L
+        private const val WEEKLY_MAX_MONTHS = 3L
+        private const val MONTHLY_MAX_MONTHS = 6L
 
-            TimeRange.WEEKLY -> ZonedDateTime.ofInstant(
-                Instant.ofEpochSecond(
-                    value.toLong() * 7 * 24 * 60 * 60
-                ), ZoneId.systemDefault()
-            )
+        const val EPOCH_SECONDS_DIVISOR = 60.0f
+        const val ADAPTIVE_Y_VALUES_FRACTION = 1.05f
 
-            TimeRange.MONTHLY -> {
-                val year = value.toInt()
-                val month = ((value - year) * 12).toInt() + 1
-                ZonedDateTime.of(year, month, 1, 0, 0, 0, 0, ZoneId.systemDefault())
-            }
-        }
-        val pattern = when (timeRange) {
-            TimeRange.WEEKLY -> "MMM dd"
-            TimeRange.MONTHLY -> "MMM yy"
-            TimeRange.DAILY -> "MMM dd"
-        }
-        return date.format(DateTimeFormatter.ofPattern(pattern))
+        private const val MONTH_DAY_TIME_PATTERN = "MMM dd HH:mm"
+        private const val MONTH_YEAR_PATTERN = "MMM yy"
     }
 }
-
-@Suppress("MagicNumber")
-private fun Float.roundToTwoDecimalPlaces(): Float {
-    return Math.round(this * 100) / 100.0f
-}

app/src/main/kotlin/edu/stanford/bdh/engagehf/health/bloodpressure/bottomsheet/AddBloodPressureBottomSheet.kt

@@ -7,7 +7,6 @@ import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
 import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.Text
 import androidx.compose.material3.TextButton
@@ -17,7 +16,6 @@ import androidx.compose.runtime.getValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
 import edu.stanford.bdh.engagehf.R
 import edu.stanford.bdh.engagehf.health.components.AddDataHeader
@@ -74,7 +72,6 @@ private fun AddBloodPressureBottomSheet(
             horizontalArrangement = Arrangement.Center
         ) {
             NumberPicker(
-                modifier = Modifier.size(height = 110.dp, width = 70.dp),
                 value = uiState.systolic,
                 onValueChange = {
                     onAction(AddBloodPressureBottomSheetViewModel.Action.UpdateSystolic(it))
@@ -83,7 +80,6 @@ private fun AddBloodPressureBottomSheet(
             )
             Text(text = " / ", style = TextStyles.bodyLarge)
             NumberPicker(
-                modifier = Modifier.size(height = 110.dp, width = 70.dp),
                 value = uiState.diastolic,
                 onValueChange = {
                     onAction(AddBloodPressureBottomSheetViewModel.Action.UpdateDiastolic(it))

app/src/main/kotlin/edu/stanford/bdh/engagehf/health/bloodpressure/bottomsheet/AddBloodPressureBottomSheetUiState.kt

@@ -11,12 +11,13 @@ data class AddBloodPressureBottomSheetUiState(
     val isUpdateDateExpanded: Boolean = false,
     val isUpdateTimeExpanded: Boolean = false,
     val bodyPosition: BodyPositions = BodyPositions.BODY_POSITION_UNKNOWN,
-    val bodyPositions: List<BodyPositions> = BodyPositions.entries,
     val isBodyPositionsDialogShown: Boolean = false,
     val measurementLocation: MeasurementLocations = MeasurementLocations.MEASUREMENT_LOCATION_UNKNOWN,
-    val measurementLocations: List<MeasurementLocations> = MeasurementLocations.entries,
     val isMeasurementLocationsDialogShown: Boolean = false,
 ) {
+    val bodyPositions: List<BodyPositions> = BodyPositions.entries
+    val measurementLocations: List<MeasurementLocations> = MeasurementLocations.entries
+
     @Suppress("MagicNumber")
     val systolicRange = 0..200 // 200 is the maximum value for systolic blood pressure record
 

app/src/main/kotlin/edu/stanford/bdh/engagehf/health/bloodpressure/bottomsheet/AddBloodPressureBottomSheetUiStateMapper.kt

@@ -1,6 +1,6 @@
 package edu.stanford.bdh.engagehf.health.bloodpressure.bottomsheet
 
-import edu.stanford.spezi.core.utils.DateTimeFormatter
+import edu.stanford.bdh.engagehf.utils.DateTimeFormatter
 import java.time.LocalDate
 import java.time.LocalTime
 import javax.inject.Inject
@@ -10,14 +10,16 @@ class AddBloodPressureBottomSheetUiStateMapper @Inject constructor(
 ) {
 
     fun initialUiState(): AddBloodPressureBottomSheetUiState {
+        val localDate = LocalDate.now()
+        val localTime = LocalTime.now()
         return AddBloodPressureBottomSheetUiState(
             timePickerState = TimePickerState(
-                selectedDate = LocalDate.now(),
-                selectedTime = LocalTime.now(),
-                initialHour = LocalTime.now().hour,
-                initialMinute = LocalTime.now().minute,
-                selectedDateFormatted = dateTimeFormatter.format(LocalDate.now()),
-                selectedTimeFormatted = dateTimeFormatter.format(LocalTime.now())
+                selectedDate = localDate,
+                selectedTime = localTime,
+                initialHour = localTime.hour,
+                initialMinute = localTime.minute,
+                selectedDateFormatted = dateTimeFormatter.format(localDate),
+                selectedTimeFormatted = dateTimeFormatter.format(localTime)
             )
         )
     }

app/src/main/kotlin/edu/stanford/bdh/engagehf/health/components/HealthChart.kt

@@ -84,7 +84,7 @@ fun HealthChart(
     )
 
     val valueFormatter: (Float, ChartValues, AxisPosition.Vertical?) -> CharSequence =
-        { value, _, _ -> uiState.valueFormatter(value, uiState.selectedTimeRange) }
+        { value, _, _ -> uiState.valueFormatter(value) }
 
     val marker = remember {
         DefaultCartesianMarker(

app/src/main/kotlin/edu/stanford/bdh/engagehf/health/components/NumberPicker.kt

@@ -16,6 +16,7 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.alpha
 import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.unit.DpSize
 import androidx.compose.ui.unit.dp
 import edu.stanford.spezi.core.design.theme.Colors
 import edu.stanford.spezi.core.design.theme.Spacings
@@ -24,16 +25,18 @@ import edu.stanford.spezi.core.design.theme.TextStyles
 import edu.stanford.spezi.core.design.theme.ThemePreviews
 import kotlinx.coroutines.launch
 
+private val PICKER_SIZE = DpSize(height = 110.dp, width = 70.dp)
+
 @Composable
 fun NumberPicker(
     value: Int,
     onValueChange: (Int) -> Unit,
     range: IntRange,
-    modifier: Modifier = Modifier,
+    size: DpSize = PICKER_SIZE,
 ) {
     val lazyListState = rememberLazyListState(initialFirstVisibleItemIndex = value - 1)
 
-    Box(modifier = modifier, contentAlignment = Alignment.Center) {
+    Box(modifier = Modifier.size(size), contentAlignment = Alignment.Center) {
         LazyColumn(
             state = lazyListState,
             modifier = Modifier.fillMaxSize(),
@@ -75,7 +78,6 @@ fun NumberPickerPreview() {
             value = 5,
             onValueChange = {},
             range = 0..10,
-            modifier = Modifier.size(height = 110.dp, width = 70.dp),
         )
     }
 }

app/src/main/kotlin/edu/stanford/bdh/engagehf/health/heartrate/bottomsheet/AddHeartRateBottomSheet.kt

@@ -7,7 +7,6 @@ import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
 import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
@@ -18,7 +17,6 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
-import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
 import edu.stanford.bdh.engagehf.R
 import edu.stanford.bdh.engagehf.health.bloodpressure.bottomsheet.TimePickerState
@@ -77,7 +75,6 @@ private fun AddHeartRateBottomSheet(
             horizontalArrangement = Arrangement.Center
         ) {
             NumberPicker(
-                modifier = Modifier.size(height = 110.dp, width = 70.dp),
                 value = uiState.heartRate,
                 onValueChange = {
                     onAction(AddHeartRateBottomSheetViewModel.Action.UpdateHeartRate(it))

app/src/main/kotlin/edu/stanford/bdh/engagehf/health/heartrate/bottomsheet/AddHeartRateBottomSheetUiStateMapper.kt

@@ -1,7 +1,7 @@
 package edu.stanford.bdh.engagehf.health.heartrate.bottomsheet
 
 import edu.stanford.bdh.engagehf.health.bloodpressure.bottomsheet.TimePickerState
-import edu.stanford.spezi.core.utils.DateTimeFormatter
+import edu.stanford.bdh.engagehf.utils.DateTimeFormatter
 import java.time.LocalDate
 import java.time.LocalTime
 import javax.inject.Inject

app/src/main/kotlin/edu/stanford/bdh/engagehf/health/weight/bottomsheet/AddWeightBottomSheet.kt

@@ -7,7 +7,6 @@ import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
 import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
@@ -18,7 +17,6 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
-import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
 import edu.stanford.bdh.engagehf.R
 import edu.stanford.bdh.engagehf.health.bloodpressure.bottomsheet.TimePickerState
@@ -91,7 +89,6 @@ fun AddWeightBottomSheet(
             horizontalArrangement = Arrangement.Center
         ) {
             NumberPicker(
-                modifier = Modifier.size(height = 110.dp, width = 70.dp),
                 value = uiState.weight.toInt(),
                 onValueChange = {
                     onAction(AddWeightBottomSheetViewModel.Action.UpdateWeight(it.toDouble()))