From 49823d3bc8c07c4030c6d68a4d9df72d24b90baa Mon Sep 17 00:00:00 2001 From: oliexdev Date: Sun, 24 Feb 2019 08:29:38 +0100 Subject: [PATCH] commented out linear regression line --- .../openscale/gui/preferences/GraphPreferences.java | 8 +++----- .../health/openscale/gui/views/ChartMeasurementView.java | 2 +- android_app/app/src/main/res/xml/graph_preferences.xml | 2 ++ 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/android_app/app/src/main/java/com/health/openscale/gui/preferences/GraphPreferences.java b/android_app/app/src/main/java/com/health/openscale/gui/preferences/GraphPreferences.java index ceec1614..e043147c 100644 --- a/android_app/app/src/main/java/com/health/openscale/gui/preferences/GraphPreferences.java +++ b/android_app/app/src/main/java/com/health/openscale/gui/preferences/GraphPreferences.java @@ -18,10 +18,7 @@ package com.health.openscale.gui.preferences; import android.content.SharedPreferences; import android.content.SharedPreferences.OnSharedPreferenceChangeListener; import android.os.Bundle; -import android.preference.EditTextPreference; -import android.preference.Preference; import android.preference.PreferenceFragment; -import android.text.method.DigitsKeyListener; import com.health.openscale.R; import com.health.openscale.core.OpenScale; @@ -36,7 +33,8 @@ public class GraphPreferences extends PreferenceFragment implements OnSharedPref addPreferencesFromResource(R.xml.graph_preferences); - EditTextPreference regressionLineOrder = + // TODO replaced it with sliding average + /*EditTextPreference regressionLineOrder = (EditTextPreference) findPreference(PREFERENCE_KEY_REGRESSION_LINE_ORDER); regressionLineOrder.getEditText().setKeyListener(new DigitsKeyListener()); regressionLineOrder.getEditText().setSelectAllOnFocus(true); @@ -47,7 +45,7 @@ public class GraphPreferences extends PreferenceFragment implements OnSharedPref preference.setSummary((String) newValue); return true; } - }); + });*/ } @Override diff --git a/android_app/app/src/main/java/com/health/openscale/gui/views/ChartMeasurementView.java b/android_app/app/src/main/java/com/health/openscale/gui/views/ChartMeasurementView.java index d13a642c..f1c9cccf 100644 --- a/android_app/app/src/main/java/com/health/openscale/gui/views/ChartMeasurementView.java +++ b/android_app/app/src/main/java/com/health/openscale/gui/views/ChartMeasurementView.java @@ -457,7 +457,7 @@ public class ChartMeasurementView extends LineChart { } addGoalLine(lineDataSets); - addRegressionLine(lineDataSets); + // addRegressionLine(lineDataSets); TODO replaced it with an sliding average LineData data = new LineData(lineDataSets); setData(data); 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 ea95801a..5953f105 100644 --- a/android_app/app/src/main/res/xml/graph_preferences.xml +++ b/android_app/app/src/main/res/xml/graph_preferences.xml @@ -30,6 +30,7 @@ android:summaryOff="@string/info_is_not_visible" android:summaryOn="@string/info_is_visible" android:title="@string/label_goal_line" /> +