diff --git a/android_app/app/src/main/java/com/health/openscale/gui/GraphFragment.java b/android_app/app/src/main/java/com/health/openscale/gui/GraphFragment.java index 4ee0b82e..e9261e53 100644 --- a/android_app/app/src/main/java/com/health/openscale/gui/GraphFragment.java +++ b/android_app/app/src/main/java/com/health/openscale/gui/GraphFragment.java @@ -167,26 +167,32 @@ public class GraphFragment extends Fragment implements FragmentUpdateListener { Line lineWeight = new Line(valuesWeight). setColor(ChartUtils.COLOR_VIOLET). setHasLabels(prefs.getBoolean("labelsEnable", true)). + setHasPoints(prefs.getBoolean("pointsEnable", true)). setFormatter(new SimpleLineChartValueFormatter(1)); Line lineFat = new Line(valuesFat). setColor(ChartUtils.COLOR_ORANGE). setHasLabels(prefs.getBoolean("labelsEnable", true)). + setHasPoints(prefs.getBoolean("pointsEnable", true)). setFormatter(new SimpleLineChartValueFormatter(1)); Line lineWater = new Line(valuesWater). setColor(ChartUtils.COLOR_BLUE). setHasLabels(prefs.getBoolean("labelsEnable", true)). + setHasPoints(prefs.getBoolean("pointsEnable", true)). setFormatter(new SimpleLineChartValueFormatter(1)); Line lineMuscle = new Line(valuesMuscle). setColor(ChartUtils.COLOR_GREEN). setHasLabels(prefs.getBoolean("labelsEnable", true)). + setHasPoints(prefs.getBoolean("pointsEnable", true)). setFormatter(new SimpleLineChartValueFormatter(1)); Line lineWaist = new Line(valuesWaist). setColor(Color.MAGENTA). setHasLabels(prefs.getBoolean("labelsEnable", true)). + setHasPoints(prefs.getBoolean("pointsEnable", true)). setFormatter(new SimpleLineChartValueFormatter(1)); Line lineHip = new Line(valuesHip). setColor(Color.YELLOW). setHasLabels(prefs.getBoolean("labelsEnable", true)). + setHasPoints(prefs.getBoolean("pointsEnable", true)). setFormatter(new SimpleLineChartValueFormatter(1)); diff --git a/android_app/app/src/main/java/com/health/openscale/gui/OverviewFragment.java b/android_app/app/src/main/java/com/health/openscale/gui/OverviewFragment.java index 25904503..fbbc9f8c 100644 --- a/android_app/app/src/main/java/com/health/openscale/gui/OverviewFragment.java +++ b/android_app/app/src/main/java/com/health/openscale/gui/OverviewFragment.java @@ -565,26 +565,32 @@ public class OverviewFragment extends Fragment implements FragmentUpdateListener Line lineWeight = new Line(valuesWeight). setColor(ChartUtils.COLOR_VIOLET). setHasLabels(prefs.getBoolean("labelsEnable", true)). + setHasPoints(prefs.getBoolean("pointsEnable", true)). setFormatter(new SimpleLineChartValueFormatter(1)); Line lineFat = new Line(valuesFat). setColor(ChartUtils.COLOR_ORANGE). setHasLabels(prefs.getBoolean("labelsEnable", true)). + setHasPoints(prefs.getBoolean("pointsEnable", true)). setFormatter(new SimpleLineChartValueFormatter(1)); Line lineWater = new Line(valuesWater). setColor(ChartUtils.COLOR_BLUE). setHasLabels(prefs.getBoolean("labelsEnable", true)). + setHasPoints(prefs.getBoolean("pointsEnable", true)). setFormatter(new SimpleLineChartValueFormatter(1)); Line lineMuscle = new Line(valuesMuscle). setColor(ChartUtils.COLOR_GREEN). setHasLabels(prefs.getBoolean("labelsEnable", true)). + setHasPoints(prefs.getBoolean("pointsEnable", true)). setFormatter(new SimpleLineChartValueFormatter(1)); Line lineWaist = new Line(valuesWaist). setColor(Color.MAGENTA). setHasLabels(prefs.getBoolean("labelsEnable", true)). + setHasPoints(prefs.getBoolean("pointsEnable", true)). setFormatter(new SimpleLineChartValueFormatter(1)); Line lineHip = new Line(valuesHip). setColor(Color.YELLOW). setHasLabels(prefs.getBoolean("labelsEnable", true)). + setHasPoints(prefs.getBoolean("pointsEnable", true)). setFormatter(new SimpleLineChartValueFormatter(1)); if(prefs.getBoolean("weightEnable", true)) { diff --git a/android_app/app/src/main/res/values-de/strings.xml b/android_app/app/src/main/res/values-de/strings.xml index 4c88fa11..70864eb6 100644 --- a/android_app/app/src/main/res/values-de/strings.xml +++ b/android_app/app/src/main/res/values-de/strings.xml @@ -50,7 +50,7 @@ Löschen Alles löschen Gerätename - Notiz auf den Datenpunkten + Notiz auf den Datenpunkt Exportieren Körperfettanteil Geschlecht @@ -113,4 +113,5 @@ Messwerte Löschbestätigung Wollen Sie wirklich den Datenbankeintrag löschen? + Punkt auf den Datenpunkt \ No newline at end of file diff --git a/android_app/app/src/main/res/values-ja/strings.xml b/android_app/app/src/main/res/values-ja/strings.xml index 16ad6afe..76cfcc2c 100644 --- a/android_app/app/src/main/res/values-ja/strings.xml +++ b/android_app/app/src/main/res/values-ja/strings.xml @@ -113,4 +113,5 @@ 観測 確認の削除 あなたは本当にレコードを削除しますか + 点の上にデータ点 \ No newline at end of file diff --git a/android_app/app/src/main/res/values/strings.xml b/android_app/app/src/main/res/values/strings.xml index 9d49d036..985019cc 100644 --- a/android_app/app/src/main/res/values/strings.xml +++ b/android_app/app/src/main/res/values/strings.xml @@ -115,6 +115,7 @@ Device Type Label on data point + Point on data point Delete confirmation diff --git a/android_app/app/src/main/res/xml/graph_preferences.xml b/android_app/app/src/main/res/xml/graph_preferences.xml index f4ad80bb..5fe0e708 100644 --- a/android_app/app/src/main/res/xml/graph_preferences.xml +++ b/android_app/app/src/main/res/xml/graph_preferences.xml @@ -1,4 +1,5 @@ + \ No newline at end of file