diff --git a/android_app/app/src/main/java/com/health/openscale/gui/views/BMIMeasurementView.java b/android_app/app/src/main/java/com/health/openscale/gui/views/BMIMeasurementView.java index e7ebaeda..d6b0e264 100644 --- a/android_app/app/src/main/java/com/health/openscale/gui/views/BMIMeasurementView.java +++ b/android_app/app/src/main/java/com/health/openscale/gui/views/BMIMeasurementView.java @@ -63,7 +63,7 @@ public class BMIMeasurementView extends FloatMeasurementView { @Override public int getColor() { - return Color.parseColor("#26A69A"); + return Color.parseColor("#EC407A"); } @Override diff --git a/android_app/app/src/main/java/com/health/openscale/gui/views/BMRMeasurementView.java b/android_app/app/src/main/java/com/health/openscale/gui/views/BMRMeasurementView.java index a54dfee3..9ca1ee3f 100644 --- a/android_app/app/src/main/java/com/health/openscale/gui/views/BMRMeasurementView.java +++ b/android_app/app/src/main/java/com/health/openscale/gui/views/BMRMeasurementView.java @@ -70,7 +70,7 @@ public class BMRMeasurementView extends FloatMeasurementView { @Override public int getColor() { - return Color.parseColor("#FF8A65"); + return Color.parseColor("#26A69A"); } @Override diff --git a/android_app/app/src/main/java/com/health/openscale/gui/views/BoneMeasurementView.java b/android_app/app/src/main/java/com/health/openscale/gui/views/BoneMeasurementView.java index f22e16eb..ea3383a9 100644 --- a/android_app/app/src/main/java/com/health/openscale/gui/views/BoneMeasurementView.java +++ b/android_app/app/src/main/java/com/health/openscale/gui/views/BoneMeasurementView.java @@ -58,7 +58,7 @@ public class BoneMeasurementView extends FloatMeasurementView { @Override public int getColor() { - return Color.parseColor("#33ff9d"); + return Color.parseColor("#4FC3F7"); } @Override diff --git a/android_app/app/src/main/java/com/health/openscale/gui/views/FatMeasurementView.java b/android_app/app/src/main/java/com/health/openscale/gui/views/FatMeasurementView.java index dd758c70..696225c0 100644 --- a/android_app/app/src/main/java/com/health/openscale/gui/views/FatMeasurementView.java +++ b/android_app/app/src/main/java/com/health/openscale/gui/views/FatMeasurementView.java @@ -17,6 +17,7 @@ package com.health.openscale.gui.views; import android.content.Context; import android.content.SharedPreferences; +import android.graphics.Color; import android.support.v4.content.ContextCompat; import com.health.openscale.R; @@ -24,8 +25,6 @@ import com.health.openscale.core.datatypes.ScaleMeasurement; import com.health.openscale.core.evaluation.EvaluationResult; import com.health.openscale.core.evaluation.EvaluationSheet; -import lecho.lib.hellocharts.util.ChartUtils; - public class FatMeasurementView extends FloatMeasurementView { private boolean estimateFatEnable; @@ -80,7 +79,7 @@ public class FatMeasurementView extends FloatMeasurementView { @Override public int getColor() { - return ChartUtils.COLOR_ORANGE; + return Color.parseColor("#FFBB33"); } @Override diff --git a/android_app/app/src/main/java/com/health/openscale/gui/views/HipMeasurementView.java b/android_app/app/src/main/java/com/health/openscale/gui/views/HipMeasurementView.java index 89636d02..87547b04 100644 --- a/android_app/app/src/main/java/com/health/openscale/gui/views/HipMeasurementView.java +++ b/android_app/app/src/main/java/com/health/openscale/gui/views/HipMeasurementView.java @@ -58,7 +58,7 @@ public class HipMeasurementView extends FloatMeasurementView { @Override public int getColor() { - return Color.YELLOW; + return Color.parseColor("#FFEE58"); } @Override diff --git a/android_app/app/src/main/java/com/health/openscale/gui/views/LBWMeasurementView.java b/android_app/app/src/main/java/com/health/openscale/gui/views/LBWMeasurementView.java index f5513b75..8507cddd 100644 --- a/android_app/app/src/main/java/com/health/openscale/gui/views/LBWMeasurementView.java +++ b/android_app/app/src/main/java/com/health/openscale/gui/views/LBWMeasurementView.java @@ -61,7 +61,7 @@ public class LBWMeasurementView extends FloatMeasurementView { @Override public int getColor() { - return Color.parseColor("#cc0099"); + return Color.parseColor("#5C6BC0"); } @Override diff --git a/android_app/app/src/main/java/com/health/openscale/gui/views/MuscleMeasurementView.java b/android_app/app/src/main/java/com/health/openscale/gui/views/MuscleMeasurementView.java index 29f0ef2b..bf0a0edd 100644 --- a/android_app/app/src/main/java/com/health/openscale/gui/views/MuscleMeasurementView.java +++ b/android_app/app/src/main/java/com/health/openscale/gui/views/MuscleMeasurementView.java @@ -17,6 +17,7 @@ package com.health.openscale.gui.views; import android.content.Context; import android.content.SharedPreferences; +import android.graphics.Color; import android.support.v4.content.ContextCompat; import com.health.openscale.R; @@ -24,8 +25,6 @@ import com.health.openscale.core.datatypes.ScaleMeasurement; import com.health.openscale.core.evaluation.EvaluationResult; import com.health.openscale.core.evaluation.EvaluationSheet; -import lecho.lib.hellocharts.util.ChartUtils; - public class MuscleMeasurementView extends FloatMeasurementView { private boolean percentageEnable; @@ -78,7 +77,7 @@ public class MuscleMeasurementView extends FloatMeasurementView { @Override public int getColor() { - return ChartUtils.COLOR_GREEN; + return Color.parseColor("#99CC00"); } @Override diff --git a/android_app/app/src/main/java/com/health/openscale/gui/views/WHRMeasurementView.java b/android_app/app/src/main/java/com/health/openscale/gui/views/WHRMeasurementView.java index 831882ff..7e01aee9 100644 --- a/android_app/app/src/main/java/com/health/openscale/gui/views/WHRMeasurementView.java +++ b/android_app/app/src/main/java/com/health/openscale/gui/views/WHRMeasurementView.java @@ -64,7 +64,7 @@ public class WHRMeasurementView extends FloatMeasurementView { @Override public int getColor() { - return Color.parseColor("#C0CA33"); + return Color.parseColor("#FFA726"); } @Override diff --git a/android_app/app/src/main/java/com/health/openscale/gui/views/WHtRMeasurementView.java b/android_app/app/src/main/java/com/health/openscale/gui/views/WHtRMeasurementView.java index a082a49f..8eed0e42 100644 --- a/android_app/app/src/main/java/com/health/openscale/gui/views/WHtRMeasurementView.java +++ b/android_app/app/src/main/java/com/health/openscale/gui/views/WHtRMeasurementView.java @@ -63,7 +63,7 @@ public class WHtRMeasurementView extends FloatMeasurementView { @Override public int getColor() { - return Color.parseColor("#A1887F"); + return Color.parseColor("#9CCC65"); } @Override diff --git a/android_app/app/src/main/java/com/health/openscale/gui/views/WaistMeasurementView.java b/android_app/app/src/main/java/com/health/openscale/gui/views/WaistMeasurementView.java index 2c332a89..c30bfb04 100644 --- a/android_app/app/src/main/java/com/health/openscale/gui/views/WaistMeasurementView.java +++ b/android_app/app/src/main/java/com/health/openscale/gui/views/WaistMeasurementView.java @@ -58,7 +58,7 @@ public class WaistMeasurementView extends FloatMeasurementView { @Override public int getColor() { - return Color.MAGENTA; + return Color.parseColor("#FF7043"); } @Override diff --git a/android_app/app/src/main/java/com/health/openscale/gui/views/WaterMeasurementView.java b/android_app/app/src/main/java/com/health/openscale/gui/views/WaterMeasurementView.java index fea5a73f..ca967067 100644 --- a/android_app/app/src/main/java/com/health/openscale/gui/views/WaterMeasurementView.java +++ b/android_app/app/src/main/java/com/health/openscale/gui/views/WaterMeasurementView.java @@ -17,6 +17,7 @@ package com.health.openscale.gui.views; import android.content.Context; import android.content.SharedPreferences; +import android.graphics.Color; import android.support.v4.content.ContextCompat; import com.health.openscale.R; @@ -24,8 +25,6 @@ import com.health.openscale.core.datatypes.ScaleMeasurement; import com.health.openscale.core.evaluation.EvaluationResult; import com.health.openscale.core.evaluation.EvaluationSheet; -import lecho.lib.hellocharts.util.ChartUtils; - public class WaterMeasurementView extends FloatMeasurementView { private boolean estimateWaterEnable; @@ -80,7 +79,7 @@ public class WaterMeasurementView extends FloatMeasurementView { @Override public int getColor() { - return ChartUtils.COLOR_BLUE; + return Color.parseColor("#33B5E5"); } @Override diff --git a/android_app/app/src/main/java/com/health/openscale/gui/views/WeightMeasurementView.java b/android_app/app/src/main/java/com/health/openscale/gui/views/WeightMeasurementView.java index ee904256..0f710e2a 100644 --- a/android_app/app/src/main/java/com/health/openscale/gui/views/WeightMeasurementView.java +++ b/android_app/app/src/main/java/com/health/openscale/gui/views/WeightMeasurementView.java @@ -17,6 +17,7 @@ package com.health.openscale.gui.views; import android.content.Context; import android.content.SharedPreferences; +import android.graphics.Color; import android.support.v4.content.ContextCompat; import com.health.openscale.R; @@ -25,8 +26,6 @@ import com.health.openscale.core.evaluation.EvaluationResult; import com.health.openscale.core.evaluation.EvaluationSheet; import com.health.openscale.core.utils.Converters; -import lecho.lib.hellocharts.util.ChartUtils; - public class WeightMeasurementView extends FloatMeasurementView { public WeightMeasurementView(Context context) { @@ -60,7 +59,7 @@ public class WeightMeasurementView extends FloatMeasurementView { @Override public int getColor() { - return ChartUtils.COLOR_VIOLET; + return Color.parseColor("#AA66CC"); } @Override