mirror/openscale
1
0
Fork 0
mirror of https://github.com/oliexdev/openScale.git synced 2025-08-19 23:12:12 +02:00
Code Issues Releases Wiki Activity

enabled evaluation of fat caliper measurement and enabled percent option

Browse Source
This commit is contained in:
OliE
2018-05-13 15:26:03 +02:00
parent d20a824f51
commit d8c052a63b
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
android_app/app/src/main/java/com/health/openscale/gui/views/FatCaliperMeasurementView.java
View File

@@ -41,6 +41,11 @@ public class FatCaliperMeasurementView extends FloatMeasurementView {
return false;
}
@Override
protected boolean supportsPercentageToAbsoluteWeightConversion() {
return true;
}
@Override
protected float getMeasurementValue(ScaleMeasurement measurement) {
return measurement.getFatCaliper(getScaleUser());
@@ -53,12 +58,16 @@ public class FatCaliperMeasurementView extends FloatMeasurementView {
@Override
public String getUnit() {
if (shouldConvertPercentageToAbsoluteWeight()) {
return getScaleUser().getScaleUnit().toString();
}
return "%";
}
@Override
protected float getMaxValue() {
return 80;
return maybeConvertPercentageToAbsoluteWeight(80);
}
@Override
@@ -68,6 +77,6 @@ public class FatCaliperMeasurementView extends FloatMeasurementView {
@Override
protected EvaluationResult evaluateSheet(EvaluationSheet evalSheet, float value) {
return null;
return evalSheet.evaluateBodyFat(value);
}
}