From 697ac276b4459e475aee9275b818f7f884e892a5 Mon Sep 17 00:00:00 2001 From: oliexdev Date: Wed, 17 Jun 2020 11:18:28 +0200 Subject: [PATCH] color table arrows depending towards the evaluation results, see issue #538 --- .../gui/measurement/FloatMeasurementView.java | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/android_app/app/src/main/java/com/health/openscale/gui/measurement/FloatMeasurementView.java b/android_app/app/src/main/java/com/health/openscale/gui/measurement/FloatMeasurementView.java index 4ee8da18..3aed5cdf 100644 --- a/android_app/app/src/main/java/com/health/openscale/gui/measurement/FloatMeasurementView.java +++ b/android_app/app/src/main/java/com/health/openscale/gui/measurement/FloatMeasurementView.java @@ -453,6 +453,25 @@ public abstract class FloatMeasurementView extends MeasurementView { } } + final float evalValue = maybeConvertToOriginalValue(value); + + EvaluationSheet evalSheet = new EvaluationSheet(getScaleUser(), dateTime); + evaluationResult = evaluateSheet(evalSheet, evalValue); + + if (evaluationResult != null) { + switch (evaluationResult.eval_state) { + case LOW: + color = (diff > 0.0f) ? Color.GREEN : Color.RED; + break; + case HIGH: + color = (diff < 0.0f) ? Color.GREEN : Color.RED; + break; + case NORMAL: + color = Color.GREEN; + break; + } + } + if (newLine) { text.append('\n'); }