From 26ccbf8afd65841f69eed1aab18c6898b0885f86 Mon Sep 17 00:00:00 2001
From: Erik Johansson <erik@ejohansson.se>
Date: Mon, 14 May 2018 22:17:58 +0200
Subject: [PATCH] Don't override and use setNameView to set name

as it makes name contain the delta value as well (as setNameView is
called to set name + delta).
---
 .../openscale/gui/views/Caliper1MeasurementView.java |  2 +-
 .../openscale/gui/views/Caliper2MeasurementView.java |  2 +-
 .../openscale/gui/views/Caliper3MeasurementView.java |  2 +-
 .../openscale/gui/views/FloatMeasurementView.java    | 12 +++++-------
 4 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/android_app/app/src/main/java/com/health/openscale/gui/views/Caliper1MeasurementView.java b/android_app/app/src/main/java/com/health/openscale/gui/views/Caliper1MeasurementView.java
index 4cfc6990..53795410 100644
--- a/android_app/app/src/main/java/com/health/openscale/gui/views/Caliper1MeasurementView.java
+++ b/android_app/app/src/main/java/com/health/openscale/gui/views/Caliper1MeasurementView.java
@@ -31,7 +31,7 @@ public class Caliper1MeasurementView extends FloatMeasurementView {
         super(context, R.string.label_caliper1_female, R.drawable.ic_caliper1);
 
         if (getScaleUser().getGender().isMale()) {
-            setNameView(getResources().getText(R.string.label_caliper1_male));
+            setName(R.string.label_caliper1_male);
         }
     }
 
diff --git a/android_app/app/src/main/java/com/health/openscale/gui/views/Caliper2MeasurementView.java b/android_app/app/src/main/java/com/health/openscale/gui/views/Caliper2MeasurementView.java
index 479b9f9f..6871adbe 100644
--- a/android_app/app/src/main/java/com/health/openscale/gui/views/Caliper2MeasurementView.java
+++ b/android_app/app/src/main/java/com/health/openscale/gui/views/Caliper2MeasurementView.java
@@ -31,7 +31,7 @@ public class Caliper2MeasurementView extends FloatMeasurementView {
         super(context, R.string.label_caliper2_female, R.drawable.ic_caliper2);
 
         if (getScaleUser().getGender().isMale()) {
-            setNameView(getResources().getText(R.string.label_caliper2_male));
+            setName(R.string.label_caliper2_male);
         }
     }
 
diff --git a/android_app/app/src/main/java/com/health/openscale/gui/views/Caliper3MeasurementView.java b/android_app/app/src/main/java/com/health/openscale/gui/views/Caliper3MeasurementView.java
index a6919389..9d60b1b8 100644
--- a/android_app/app/src/main/java/com/health/openscale/gui/views/Caliper3MeasurementView.java
+++ b/android_app/app/src/main/java/com/health/openscale/gui/views/Caliper3MeasurementView.java
@@ -31,7 +31,7 @@ public class Caliper3MeasurementView extends FloatMeasurementView {
         super(context, R.string.label_caliper3_female, R.drawable.ic_caliper3);
 
         if (getScaleUser().getGender().isMale()) {
-            setNameView(getResources().getText(R.string.label_caliper3_male));
+            setName(R.string.label_caliper3_male);
         }
     }
 
diff --git a/android_app/app/src/main/java/com/health/openscale/gui/views/FloatMeasurementView.java b/android_app/app/src/main/java/com/health/openscale/gui/views/FloatMeasurementView.java
index 86ff51af..a9eee082 100644
--- a/android_app/app/src/main/java/com/health/openscale/gui/views/FloatMeasurementView.java
+++ b/android_app/app/src/main/java/com/health/openscale/gui/views/FloatMeasurementView.java
@@ -413,6 +413,11 @@ public abstract class FloatMeasurementView extends MeasurementView {
         return nameText;
     }
 
+    protected void setName(int textId) {
+        nameText = getResources().getString(textId);
+        setNameView(nameText);
+    }
+
     @Override
     public void appendDiffValue(SpannableStringBuilder text, boolean newLine) {
         if (previousValue < 0.0f) {
@@ -474,13 +479,6 @@ public abstract class FloatMeasurementView extends MeasurementView {
         }
     }
 
-    @Override
-    protected void setNameView(CharSequence text) {
-        super.setNameView(text);
-
-        nameText = text.toString();
-    }
-
     @Override
     public void setExpand(boolean state) {
         final boolean show = state && isVisible() && evaluationResult != null;