mirror/openscale
1
0
Fork 0
mirror of https://github.com/oliexdev/openScale.git synced 2025-08-11 19:24:06 +02:00
Code Issues Releases Wiki Activity

add an option to hide or show the points of the diagram

Browse Source
This commit is contained in:
OliE
2017-03-04 14:36:25 +01:00
parent d35bcca8d6
commit b7486f66c0
6 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
android_app/app/src/main/java/com/health/openscale/gui/GraphFragment.java
View File

@@ -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));

6
android_app/app/src/main/java/com/health/openscale/gui/OverviewFragment.java
View File

@@ -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)) {

3
android_app/app/src/main/res/values-de/strings.xml
View File

@@ -50,7 +50,7 @@
<string name="label_delete">Löschen</string>
<string name="label_delete_all">Alles löschen</string>
<string name="label_device_name">Gerätename</string>
<string name="label_enable_labels">Notiz auf den Datenpunkten</string>
<string name="label_enable_labels">Notiz auf den Datenpunkt</string>
<string name="label_export">Exportieren</string>
<string name="label_fat">Körperfettanteil</string>
<string name="label_gender">Geschlecht</string>
@@ -113,4 +113,5 @@
<string name="title_measurements">Messwerte</string>
<string name="label_delete_confirmation">Löschbestätigung</string>
<string name="question_really_delete">Wollen Sie wirklich den Datenbankeintrag löschen?</string>
<string name="label_enable_points">Punkt auf den Datenpunkt</string>
</resources>

1
android_app/app/src/main/res/values-ja/strings.xml
View File

@@ -113,4 +113,5 @@
<string name="title_measurements">観測</string>
<string name="label_delete_confirmation">確認の削除</string>
<string name="question_really_delete">あなたは本当にレコードを削除しますか</string>
<string name="label_enable_points">点の上にデータ点</string>
</resources>

1
android_app/app/src/main/res/values/strings.xml
View File

@@ -115,6 +115,7 @@
<string name="label_device_type">Device Type</string>
<string name="label_enable_labels">Label on data point</string>
<string name="label_enable_points">Point on data point</string>
<string name="label_delete_confirmation">Delete confirmation</string>

1
android_app/app/src/main/res/xml/graph_preferences.xml
View File

@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
<CheckBoxPreference android:title="@string/label_enable_labels" android:summaryOn="@string/info_is_visible" android:summaryOff="@string/info_is_not_visible" android:key="labelsEnable" android:defaultValue="true"/>
<CheckBoxPreference android:title="@string/label_enable_points" android:summaryOn="@string/info_is_visible" android:summaryOff="@string/info_is_not_visible" android:key="pointsEnable" android:defaultValue="true"/>
</PreferenceScreen>