1
0
mirror of https://github.com/oliexdev/openScale.git synced 2025-08-30 19:49:59 +02:00

changed some colors to material design colors

This commit is contained in:
OliE
2018-02-18 13:27:28 +01:00
parent ac00944504
commit 9bb88e03d7
12 changed files with 16 additions and 20 deletions

View File

@@ -63,7 +63,7 @@ public class BMIMeasurementView extends FloatMeasurementView {
@Override @Override
public int getColor() { public int getColor() {
return Color.parseColor("#26A69A"); return Color.parseColor("#EC407A");
} }
@Override @Override

View File

@@ -70,7 +70,7 @@ public class BMRMeasurementView extends FloatMeasurementView {
@Override @Override
public int getColor() { public int getColor() {
return Color.parseColor("#FF8A65"); return Color.parseColor("#26A69A");
} }
@Override @Override

View File

@@ -58,7 +58,7 @@ public class BoneMeasurementView extends FloatMeasurementView {
@Override @Override
public int getColor() { public int getColor() {
return Color.parseColor("#33ff9d"); return Color.parseColor("#4FC3F7");
} }
@Override @Override

View File

@@ -17,6 +17,7 @@ package com.health.openscale.gui.views;
import android.content.Context; import android.content.Context;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.graphics.Color;
import android.support.v4.content.ContextCompat; import android.support.v4.content.ContextCompat;
import com.health.openscale.R; 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.EvaluationResult;
import com.health.openscale.core.evaluation.EvaluationSheet; import com.health.openscale.core.evaluation.EvaluationSheet;
import lecho.lib.hellocharts.util.ChartUtils;
public class FatMeasurementView extends FloatMeasurementView { public class FatMeasurementView extends FloatMeasurementView {
private boolean estimateFatEnable; private boolean estimateFatEnable;
@@ -80,7 +79,7 @@ public class FatMeasurementView extends FloatMeasurementView {
@Override @Override
public int getColor() { public int getColor() {
return ChartUtils.COLOR_ORANGE; return Color.parseColor("#FFBB33");
} }
@Override @Override

View File

@@ -58,7 +58,7 @@ public class HipMeasurementView extends FloatMeasurementView {
@Override @Override
public int getColor() { public int getColor() {
return Color.YELLOW; return Color.parseColor("#FFEE58");
} }
@Override @Override

View File

@@ -61,7 +61,7 @@ public class LBWMeasurementView extends FloatMeasurementView {
@Override @Override
public int getColor() { public int getColor() {
return Color.parseColor("#cc0099"); return Color.parseColor("#5C6BC0");
} }
@Override @Override

View File

@@ -17,6 +17,7 @@ package com.health.openscale.gui.views;
import android.content.Context; import android.content.Context;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.graphics.Color;
import android.support.v4.content.ContextCompat; import android.support.v4.content.ContextCompat;
import com.health.openscale.R; 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.EvaluationResult;
import com.health.openscale.core.evaluation.EvaluationSheet; import com.health.openscale.core.evaluation.EvaluationSheet;
import lecho.lib.hellocharts.util.ChartUtils;
public class MuscleMeasurementView extends FloatMeasurementView { public class MuscleMeasurementView extends FloatMeasurementView {
private boolean percentageEnable; private boolean percentageEnable;
@@ -78,7 +77,7 @@ public class MuscleMeasurementView extends FloatMeasurementView {
@Override @Override
public int getColor() { public int getColor() {
return ChartUtils.COLOR_GREEN; return Color.parseColor("#99CC00");
} }
@Override @Override

View File

@@ -64,7 +64,7 @@ public class WHRMeasurementView extends FloatMeasurementView {
@Override @Override
public int getColor() { public int getColor() {
return Color.parseColor("#C0CA33"); return Color.parseColor("#FFA726");
} }
@Override @Override

View File

@@ -63,7 +63,7 @@ public class WHtRMeasurementView extends FloatMeasurementView {
@Override @Override
public int getColor() { public int getColor() {
return Color.parseColor("#A1887F"); return Color.parseColor("#9CCC65");
} }
@Override @Override

View File

@@ -58,7 +58,7 @@ public class WaistMeasurementView extends FloatMeasurementView {
@Override @Override
public int getColor() { public int getColor() {
return Color.MAGENTA; return Color.parseColor("#FF7043");
} }
@Override @Override

View File

@@ -17,6 +17,7 @@ package com.health.openscale.gui.views;
import android.content.Context; import android.content.Context;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.graphics.Color;
import android.support.v4.content.ContextCompat; import android.support.v4.content.ContextCompat;
import com.health.openscale.R; 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.EvaluationResult;
import com.health.openscale.core.evaluation.EvaluationSheet; import com.health.openscale.core.evaluation.EvaluationSheet;
import lecho.lib.hellocharts.util.ChartUtils;
public class WaterMeasurementView extends FloatMeasurementView { public class WaterMeasurementView extends FloatMeasurementView {
private boolean estimateWaterEnable; private boolean estimateWaterEnable;
@@ -80,7 +79,7 @@ public class WaterMeasurementView extends FloatMeasurementView {
@Override @Override
public int getColor() { public int getColor() {
return ChartUtils.COLOR_BLUE; return Color.parseColor("#33B5E5");
} }
@Override @Override

View File

@@ -17,6 +17,7 @@ package com.health.openscale.gui.views;
import android.content.Context; import android.content.Context;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.graphics.Color;
import android.support.v4.content.ContextCompat; import android.support.v4.content.ContextCompat;
import com.health.openscale.R; 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.evaluation.EvaluationSheet;
import com.health.openscale.core.utils.Converters; import com.health.openscale.core.utils.Converters;
import lecho.lib.hellocharts.util.ChartUtils;
public class WeightMeasurementView extends FloatMeasurementView { public class WeightMeasurementView extends FloatMeasurementView {
public WeightMeasurementView(Context context) { public WeightMeasurementView(Context context) {
@@ -60,7 +59,7 @@ public class WeightMeasurementView extends FloatMeasurementView {
@Override @Override
public int getColor() { public int getColor() {
return ChartUtils.COLOR_VIOLET; return Color.parseColor("#AA66CC");
} }
@Override @Override