State dependency explicitly in all measurement views

android_app/app/src/main/java/com/health/openscale/gui/views/BMIMeasurementView.java

@@ -25,7 +25,8 @@ import com.health.openscale.core.evaluation.EvaluationResult;
 import com.health.openscale.core.evaluation.EvaluationSheet;
 
 public class BMIMeasurementView extends FloatMeasurementView {
-    public static String KEY = "bmi";
+    public static final String KEY = "bmi";
+    private static final String[] DEPENDENCY = {WeightMeasurementView.KEY};
 
     public BMIMeasurementView(Context context) {
         super(context, context.getResources().getString(R.string.label_bmi), ContextCompat.getDrawable(context, R.drawable.ic_bmi));
@@ -38,7 +39,7 @@ public class BMIMeasurementView extends FloatMeasurementView {
 
     @Override
     public String[] getDependencyKeys() {
-        return new String[] {WeightMeasurementView.KEY};
+        return DEPENDENCY;
     }
 
     @Override

android_app/app/src/main/java/com/health/openscale/gui/views/BMRMeasurementView.java

@@ -27,7 +27,8 @@ import com.health.openscale.core.evaluation.EvaluationSheet;
 import java.util.Locale;
 
 public class BMRMeasurementView extends FloatMeasurementView {
-    public static String KEY = "bmr";
+    public static final String KEY = "bmr";
+    private static final String[] DEPENDENCY = {WeightMeasurementView.KEY};
 
     public BMRMeasurementView(Context context) {
         super(context, context.getResources().getString(R.string.label_bmr), ContextCompat.getDrawable(context, R.drawable.ic_bmr));
@@ -40,7 +41,7 @@ public class BMRMeasurementView extends FloatMeasurementView {
 
     @Override
     public String[] getDependencyKeys() {
-        return new String[] {WeightMeasurementView.KEY};
+        return DEPENDENCY;
     }
 
     @Override

android_app/app/src/main/java/com/health/openscale/gui/views/BoneMeasurementView.java

@@ -25,7 +25,8 @@ import com.health.openscale.core.evaluation.EvaluationResult;
 import com.health.openscale.core.evaluation.EvaluationSheet;
 
 public class BoneMeasurementView extends FloatMeasurementView {
-    public static String KEY = "bone";
+    public static final String KEY = "bone";
+    private static final String[] DEPENDENCY = {};
 
     public BoneMeasurementView(Context context) {
         super(context, context.getResources().getString(R.string.label_bone), ContextCompat.getDrawable(context, R.drawable.ic_bone));
@@ -36,6 +37,11 @@ public class BoneMeasurementView extends FloatMeasurementView {
         return KEY;
     }
 
+    @Override
+    public String[] getDependencyKeys() {
+        return DEPENDENCY;
+    }
+
     @Override
     protected float getMeasurementValue(ScaleMeasurement measurement) {
         return measurement.getBone();

android_app/app/src/main/java/com/health/openscale/gui/views/CommentMeasurementView.java

@@ -26,7 +26,8 @@ import com.health.openscale.R;
 import com.health.openscale.core.datatypes.ScaleMeasurement;
 
 public class CommentMeasurementView extends MeasurementView {
-    public static String KEY = "comment";
+    public static final String KEY = "comment";
+    private static final String[] DEPENDENCY = {};
 
     private String comment;
 
@@ -39,6 +40,11 @@ public class CommentMeasurementView extends MeasurementView {
         return KEY;
     }
 
+    @Override
+    public String[] getDependencyKeys() {
+        return DEPENDENCY;
+    }
+
     private void setValue(String newComment, boolean callListener) {
         if (!newComment.equals(comment)) {
             comment = newComment;

android_app/app/src/main/java/com/health/openscale/gui/views/DateMeasurementView.java

@@ -29,7 +29,8 @@ import java.util.Calendar;
 import java.util.Date;
 
 public class DateMeasurementView extends MeasurementView {
-    public static String KEY = "date";
+    public static final String KEY = "date";
+    private static final String[] DEPENDENCY = {};
 
     private static DateFormat dateFormat = DateFormat.getDateInstance();
     private Date date;
@@ -43,6 +44,11 @@ public class DateMeasurementView extends MeasurementView {
         return KEY;
     }
 
+    @Override
+    public String[] getDependencyKeys() {
+        return DEPENDENCY;
+    }
+
     private void setValue(Date newDate, boolean callListener) {
         if (!newDate.equals(date)) {
             date = newDate;

android_app/app/src/main/java/com/health/openscale/gui/views/FatMeasurementView.java

@@ -26,7 +26,8 @@ import com.health.openscale.core.evaluation.EvaluationResult;
 import com.health.openscale.core.evaluation.EvaluationSheet;
 
 public class FatMeasurementView extends FloatMeasurementView {
-    public static String KEY = "fat";
+    public static final String KEY = "fat";
+    private static final String[] DEPENDENCY = {WeightMeasurementView.KEY};
 
     private boolean estimateFatEnable;
     private boolean percentageEnable;
@@ -40,6 +41,11 @@ public class FatMeasurementView extends FloatMeasurementView {
         return KEY;
     }
 
+    @Override
+    public String[] getDependencyKeys() {
+        return DEPENDENCY;
+    }
+
     @Override
     public void updatePreferences(SharedPreferences preferences) {
         super.updatePreferences(preferences);

android_app/app/src/main/java/com/health/openscale/gui/views/HipMeasurementView.java

@@ -25,7 +25,8 @@ import com.health.openscale.core.evaluation.EvaluationResult;
 import com.health.openscale.core.evaluation.EvaluationSheet;
 
 public class HipMeasurementView extends FloatMeasurementView {
-    public static String KEY = "hip";
+    public static final String KEY = "hip";
+    private static final String[] DEPENDENCY = {};
 
     public HipMeasurementView(Context context) {
         super(context, context.getResources().getString(R.string.label_hip), ContextCompat.getDrawable(context, R.drawable.ic_hip));
@@ -36,6 +37,11 @@ public class HipMeasurementView extends FloatMeasurementView {
         return KEY;
     }
 
+    @Override
+    public String[] getDependencyKeys() {
+        return DEPENDENCY;
+    }
+
     @Override
     protected float getMeasurementValue(ScaleMeasurement measurement) {
         return measurement.getHip();

android_app/app/src/main/java/com/health/openscale/gui/views/LBWMeasurementView.java

@@ -26,7 +26,8 @@ import com.health.openscale.core.evaluation.EvaluationResult;
 import com.health.openscale.core.evaluation.EvaluationSheet;
 
 public class LBWMeasurementView extends FloatMeasurementView {
-    public static String KEY = "lbw";
+    public static final String KEY = "lbw";
+    private static final String[] DEPENDENCY = {};
 
     private boolean estimateLBWEnable;
 
@@ -39,6 +40,11 @@ public class LBWMeasurementView extends FloatMeasurementView {
         return KEY;
     }
 
+    @Override
+    public String[] getDependencyKeys() {
+        return DEPENDENCY;
+    }
+
     @Override
     public void updatePreferences(SharedPreferences preferences) {
         super.updatePreferences(preferences);

android_app/app/src/main/java/com/health/openscale/gui/views/MeasurementView.java

@@ -245,7 +245,7 @@ public abstract class MeasurementView extends TableLayout {
     }
 
     public abstract String getKey();
-    public String[] getDependencyKeys() { return new String[]{}; }
+    public abstract String[] getDependencyKeys();
 
     public static String getPreferenceKey(String key, String suffix) {
         return key + suffix;

android_app/app/src/main/java/com/health/openscale/gui/views/MuscleMeasurementView.java

@@ -26,7 +26,8 @@ import com.health.openscale.core.evaluation.EvaluationResult;
 import com.health.openscale.core.evaluation.EvaluationSheet;
 
 public class MuscleMeasurementView extends FloatMeasurementView {
-    public static String KEY = "muscle";
+    public static final String KEY = "muscle";
+    private static final String[] DEPENDENCY = {WeightMeasurementView.KEY};
 
     private boolean percentageEnable;
 
@@ -39,6 +40,11 @@ public class MuscleMeasurementView extends FloatMeasurementView {
         return KEY;
     }
 
+    @Override
+    public String[] getDependencyKeys() {
+        return DEPENDENCY;
+    }
+
     @Override
     public void updatePreferences(SharedPreferences preferences) {
         super.updatePreferences(preferences);

android_app/app/src/main/java/com/health/openscale/gui/views/TimeMeasurementView.java

@@ -29,7 +29,8 @@ import java.util.Calendar;
 import java.util.Date;
 
 public class TimeMeasurementView extends MeasurementView {
-    public static String KEY = "time";
+    public static final String KEY = "time";
+    private static final String[] DEPENDENCY = {};
 
     private DateFormat timeFormat;
     private Date time;
@@ -44,6 +45,11 @@ public class TimeMeasurementView extends MeasurementView {
         return KEY;
     }
 
+    @Override
+    public String[] getDependencyKeys() {
+        return DEPENDENCY;
+    }
+
     private void setValue(Date newTime, boolean callListener) {
         if (!newTime.equals(time)) {
             time = newTime;

android_app/app/src/main/java/com/health/openscale/gui/views/WHRMeasurementView.java

@@ -25,7 +25,8 @@ import com.health.openscale.core.evaluation.EvaluationResult;
 import com.health.openscale.core.evaluation.EvaluationSheet;
 
 public class WHRMeasurementView extends FloatMeasurementView {
-    public static String KEY = "whr";
+    public static final String KEY = "whr";
+    private static final String[] DEPENDENCY = {HipMeasurementView.KEY, WaistMeasurementView.KEY};
 
     public WHRMeasurementView(Context context) {
         super(context, context.getResources().getString(R.string.label_whr), ContextCompat.getDrawable(context, R.drawable.ic_whr));
@@ -38,7 +39,7 @@ public class WHRMeasurementView extends FloatMeasurementView {
 
     @Override
     public String[] getDependencyKeys() {
-        return new String[] {HipMeasurementView.KEY, WaistMeasurementView.KEY};
+        return DEPENDENCY;
     }
 
     @Override

android_app/app/src/main/java/com/health/openscale/gui/views/WHtRMeasurementView.java

@@ -25,7 +25,8 @@ import com.health.openscale.core.evaluation.EvaluationResult;
 import com.health.openscale.core.evaluation.EvaluationSheet;
 
 public class WHtRMeasurementView extends FloatMeasurementView {
-    public static String KEY = "whtr";
+    public static final String KEY = "whtr";
+    private static final String[] DEPENDENCY = {WaistMeasurementView.KEY};
 
     public WHtRMeasurementView(Context context) {
         super(context, context.getResources().getString(R.string.label_whtr), ContextCompat.getDrawable(context, R.drawable.ic_whtr));
@@ -38,7 +39,7 @@ public class WHtRMeasurementView extends FloatMeasurementView {
 
     @Override
     public String[] getDependencyKeys() {
-        return new String[] {WaistMeasurementView.KEY};
+        return DEPENDENCY;
     }
 
     @Override

android_app/app/src/main/java/com/health/openscale/gui/views/WaistMeasurementView.java

@@ -25,7 +25,8 @@ import com.health.openscale.core.evaluation.EvaluationResult;
 import com.health.openscale.core.evaluation.EvaluationSheet;
 
 public class WaistMeasurementView extends FloatMeasurementView {
-    public static String KEY = "waist";
+    public static final String KEY = "waist";
+    private static final String[] DEPENDENCY = {};
 
     public WaistMeasurementView(Context context) {
         super(context, context.getResources().getString(R.string.label_waist), ContextCompat.getDrawable(context, R.drawable.ic_waist));
@@ -36,6 +37,11 @@ public class WaistMeasurementView extends FloatMeasurementView {
         return KEY;
     }
 
+    @Override
+    public String[] getDependencyKeys() {
+        return DEPENDENCY;
+    }
+
     @Override
     protected float getMeasurementValue(ScaleMeasurement measurement) {
         return measurement.getWaist();

android_app/app/src/main/java/com/health/openscale/gui/views/WaterMeasurementView.java

@@ -26,7 +26,8 @@ import com.health.openscale.core.evaluation.EvaluationResult;
 import com.health.openscale.core.evaluation.EvaluationSheet;
 
 public class WaterMeasurementView extends FloatMeasurementView {
-    public static String KEY = "water";
+    public static final String KEY = "water";
+    private static final String[] DEPENDENCY = {WeightMeasurementView.KEY};
 
     private boolean estimateWaterEnable;
     private boolean percentageEnable;
@@ -40,6 +41,11 @@ public class WaterMeasurementView extends FloatMeasurementView {
         return KEY;
     }
 
+    @Override
+    public String[] getDependencyKeys() {
+        return DEPENDENCY;
+    }
+
     @Override
     public void updatePreferences(SharedPreferences preferences) {
         super.updatePreferences(preferences);

android_app/app/src/main/java/com/health/openscale/gui/views/WeightMeasurementView.java

@@ -26,7 +26,8 @@ import com.health.openscale.core.evaluation.EvaluationSheet;
 import com.health.openscale.core.utils.Converters;
 
 public class WeightMeasurementView extends FloatMeasurementView {
-    public static String KEY = "weight";
+    public static final String KEY = "weight";
+    private static final String[] DEPENDENCY = {};
 
     public WeightMeasurementView(Context context) {
         super(context, context.getResources().getString(R.string.label_weight), ContextCompat.getDrawable(context, R.drawable.ic_weight));
@@ -37,6 +38,11 @@ public class WeightMeasurementView extends FloatMeasurementView {
         return KEY;
     }
 
+    @Override
+    public String[] getDependencyKeys() {
+        return DEPENDENCY;
+    }
+
     @Override
     protected float getMeasurementValue(ScaleMeasurement measurement) {
         return measurement.getConvertedWeight(getScaleUser().getScaleUnit());