From 01ed276c7ce90616d855fb1c7aab541c1635e71e Mon Sep 17 00:00:00 2001
From: Erik Johansson <erik@ejohansson.se>
Date: Thu, 19 Apr 2018 22:02:45 +0200
Subject: [PATCH] Convert LBM to scale unit

---
 .../health/openscale/gui/views/LBMMeasurementView.java   | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/android_app/app/src/main/java/com/health/openscale/gui/views/LBMMeasurementView.java b/android_app/app/src/main/java/com/health/openscale/gui/views/LBMMeasurementView.java
index f3b7f696..058f0d66 100644
--- a/android_app/app/src/main/java/com/health/openscale/gui/views/LBMMeasurementView.java
+++ b/android_app/app/src/main/java/com/health/openscale/gui/views/LBMMeasurementView.java
@@ -25,6 +25,7 @@ import com.health.openscale.core.bodymetric.EstimatedLBMMetric;
 import com.health.openscale.core.datatypes.ScaleMeasurement;
 import com.health.openscale.core.evaluation.EvaluationResult;
 import com.health.openscale.core.evaluation.EvaluationSheet;
+import com.health.openscale.core.utils.Converters;
 
 public class LBMMeasurementView extends FloatMeasurementView {
     // Don't change key value, it may be stored persistent in preferences
@@ -41,22 +42,22 @@ public class LBMMeasurementView extends FloatMeasurementView {
 
     @Override
     protected float getMeasurementValue(ScaleMeasurement measurement) {
-        return measurement.getLbm();
+        return Converters.fromKilogram(measurement.getLbm(), getScaleUser().getScaleUnit());
     }
 
     @Override
     protected void setMeasurementValue(float value, ScaleMeasurement measurement) {
-        measurement.setLbm(value);
+        measurement.setLbm(Converters.toKilogram(value, getScaleUser().getScaleUnit()));
     }
 
     @Override
     public String getUnit() {
-        return "kg";
+        return getScaleUser().getScaleUnit().toString();
     }
 
     @Override
     protected float getMaxValue() {
-        return 300;
+        return Converters.fromKilogram(300, getScaleUser().getScaleUnit());
     }
 
     @Override