Skip to content

Commit 718af9c

Browse files
committed
Enable ECW, ICW, protein, and BCM measurement types
1 parent e7c2962 commit 718af9c

2 files changed

Lines changed: 6 additions & 4 deletions

File tree

android_app/app/src/main/java/com/health/openscale/OpenScaleApp.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,10 +72,10 @@ fun getDefaultMeasurementTypes(): List<MeasurementType> {
7272
MeasurementType(key = MeasurementTypeKey.HEART_RATE, inputType = InputFieldType.INT, unit = UnitType.BPM, color = 0xFFE91E63.toInt(), icon = MeasurementTypeIcon.IC_M_HEART_RATE, isEnabled = true),
7373
MeasurementType(key = MeasurementTypeKey.IMPEDANCE, unit = UnitType.OHM, color = 0xFF607D8B.toInt(), icon = MeasurementTypeIcon.IC_DEFAULT, isEnabled = false, isInternal = true),
7474
MeasurementType(key = MeasurementTypeKey.IMPEDANCE_LOW, unit = UnitType.OHM, color = 0xFF455A64.toInt(), icon = MeasurementTypeIcon.IC_DEFAULT, isEnabled = false, isInternal = true),
75-
MeasurementType(key = MeasurementTypeKey.ECW, unit = UnitType.PERCENT, color = 0xFF4FC3F7.toInt(), icon = MeasurementTypeIcon.IC_M_WATER_DROP, isEnabled = false),
76-
MeasurementType(key = MeasurementTypeKey.ICW, unit = UnitType.PERCENT, color = 0xFF0288D1.toInt(), icon = MeasurementTypeIcon.IC_M_BUBBLE_CHART, isEnabled = false),
77-
MeasurementType(key = MeasurementTypeKey.PROTEIN, unit = UnitType.PERCENT, color = 0xFF9CCC65.toInt(), icon = MeasurementTypeIcon.IC_M_PROTEIN, isEnabled = false),
78-
MeasurementType(key = MeasurementTypeKey.BCM, unit = UnitType.KG, color = 0xFF558B2F.toInt(), icon = MeasurementTypeIcon.IC_M_HIVE, isEnabled = false),
75+
MeasurementType(key = MeasurementTypeKey.ECW, unit = UnitType.PERCENT, color = 0xFF4FC3F7.toInt(), icon = MeasurementTypeIcon.IC_M_SCATTER_PLOT, isEnabled = true),
76+
MeasurementType(key = MeasurementTypeKey.ICW, unit = UnitType.PERCENT, color = 0xFF0288D1.toInt(), icon = MeasurementTypeIcon.IC_M_BUBBLE_CHART, isEnabled = true),
77+
MeasurementType(key = MeasurementTypeKey.PROTEIN, unit = UnitType.PERCENT, color = 0xFF9CCC65.toInt(), icon = MeasurementTypeIcon.IC_M_PROTEIN, isEnabled = true),
78+
MeasurementType(key = MeasurementTypeKey.BCM, unit = UnitType.KG, color = 0xFF558B2F.toInt(), icon = MeasurementTypeIcon.IC_M_HIVE, isEnabled = true),
7979
MeasurementType(key = MeasurementTypeKey.CALORIES, unit = UnitType.KCAL, color = 0xFF4CAF50.toInt(), icon = MeasurementTypeIcon.IC_CALORIES, isEnabled = true),
8080
MeasurementType(key = MeasurementTypeKey.COMMENT, inputType = InputFieldType.TEXT, unit = UnitType.NONE, color = 0xFFE0E0E0.toInt(), icon = MeasurementTypeIcon.IC_COMMENT, isPinned = true, isEnabled = true),
8181
MeasurementType(key = MeasurementTypeKey.DATE, inputType = InputFieldType.DATE, unit = UnitType.NONE, color = 0xFF9E9E9E.toInt(), icon = MeasurementTypeIcon.IC_DATE, isEnabled = true),

android_app/app/src/main/java/com/health/openscale/core/data/Enums.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ import androidx.compose.material.icons.filled.PieChart
6363
import androidx.compose.material.icons.filled.QuestionMark
6464
import androidx.compose.material.icons.filled.RadioButtonUnchecked
6565
import androidx.compose.material.icons.filled.RemoveCircleOutline
66+
import androidx.compose.material.icons.filled.ScatterPlot
6667
import androidx.compose.material.icons.filled.Schedule
6768
import androidx.compose.material.icons.filled.SentimentSatisfied
6869
import androidx.compose.material.icons.filled.SentimentSatisfiedAlt
@@ -380,6 +381,7 @@ enum class MeasurementTypeIcon(val resource: IconResource) {
380381
IC_M_LABEL(IconResource.VectorResource(Icons.AutoMirrored.Filled.Label)),
381382
IC_M_PERSON(IconResource.VectorResource(Icons.Filled.Person)),
382383
IC_M_WATER_DROP(IconResource.VectorResource(Icons.Filled.WaterDrop)),
384+
IC_M_SCATTER_PLOT(IconResource.VectorResource(Icons.Filled.ScatterPlot)),
383385
IC_M_BUBBLE_CHART(IconResource.VectorResource(Icons.Filled.BubbleChart)),
384386
IC_M_HIVE(IconResource.VectorResource(Icons.Filled.Hive));
385387
}

0 commit comments

Comments
 (0)