mirror/openscale
1
0
Fork 0
mirror of https://github.com/oliexdev/openScale.git synced 2025-08-20 23:41:45 +02:00
Code Issues Releases Wiki Activity

Move measurement on graph settings to settings class

Browse Source
This commit is contained in:
Erik Johansson
2018-03-23 23:19:36 +01:00
parent 284c09bf2e
commit 1681661d4f
4 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -46,6 +46,7 @@ import com.health.openscale.gui.activities.DataEntryActivity;
import com.health.openscale.gui.views.BMRMeasurementView; import com.health.openscale.gui.views.BMRMeasurementView;
import com.health.openscale.gui.views.FloatMeasurementView; import com.health.openscale.gui.views.FloatMeasurementView;
import com.health.openscale.gui.views.MeasurementView; import com.health.openscale.gui.views.MeasurementView;
import com.health.openscale.gui.views.MeasurementViewSettings;
import com.health.openscale.gui.views.WeightMeasurementView; import com.health.openscale.gui.views.WeightMeasurementView;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
@@ -250,7 +251,7 @@ public class GraphFragment extends Fragment implements FragmentUpdateListener {
private void addFloatingActionButton(FloatMeasurementView measurementView) { private void addFloatingActionButton(FloatMeasurementView measurementView) {
FloatingActionButton actionButton = new FloatingActionButton(getContext()); FloatingActionButton actionButton = new FloatingActionButton(getContext());
actionButton.setTag("actionButton" + measurementView.getName()); actionButton.setTag(measurementView.getKey());
actionButton.setColorFilter(Color.parseColor("#000000")); actionButton.setColorFilter(Color.parseColor("#000000"));
actionButton.setImageDrawable(measurementView.getIcon()); actionButton.setImageDrawable(measurementView.getIcon());
actionButton.setClickable(true); actionButton.setClickable(true);
@@ -260,11 +261,9 @@ public class GraphFragment extends Fragment implements FragmentUpdateListener {
actionButton.setLayoutParams(lay); actionButton.setLayoutParams(lay);
actionButton.setOnClickListener(new onClickListenerDiagramLines()); actionButton.setOnClickListener(new onClickListenerDiagramLines());
if (prefs.getBoolean(String.valueOf("actionButton" + measurementView.getName()), true)) { int color = measurementView.getSettings().isInGraph()
actionButton.setBackgroundTintList(ColorStateList.valueOf(measurementView.getColor())); ? measurementView.getColor() : Color.parseColor("#d3d3d3");
} else { actionButton.setBackgroundTintList(ColorStateList.valueOf(color));
actionButton.setBackgroundTintList(ColorStateList.valueOf(Color.parseColor("#d3d3d3")));
}
floatingActionBar.addView(actionButton); floatingActionBar.addView(actionButton);
} }
@@ -386,7 +385,7 @@ public class GraphFragment extends Fragment implements FragmentUpdateListener {
if (measurementView.isVisible()) { if (measurementView.isVisible()) {
addFloatingActionButton(measurementView); addFloatingActionButton(measurementView);
if (prefs.getBoolean(String.valueOf("actionButton" + measurementView.getName()), true)) { if (measurementView.getSettings().isInGraph()) {
diagramLineList.add(diagramLine); diagramLineList.add(diagramLine);
} }
} }
@@ -588,11 +587,9 @@ public class GraphFragment extends Fragment implements FragmentUpdateListener {
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext()); SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext());
if (prefs.getBoolean(String.valueOf(actionButton.getTag()), true)) { String key = String.valueOf(actionButton.getTag());
prefs.edit().putBoolean(String.valueOf(actionButton.getTag()), false).commit(); MeasurementViewSettings settings = new MeasurementViewSettings(prefs, key);
} else { prefs.edit().putBoolean(settings.getInGraphKey(), !settings.isInGraph()).apply();
prefs.edit().putBoolean(String.valueOf(actionButton.getTag()), true).commit();
}
generateGraphs(); generateGraphs();
} }

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

@@ -228,7 +228,7 @@ public class OverviewFragment extends Fragment implements FragmentUpdateListener
for (MeasurementView view : measurementViews) { for (MeasurementView view : measurementViews) {
if (!view.isVisible() if (!view.isVisible()
|| !view.getSettings().isOnOverviewGraph() || !view.getSettings().isInOverviewGraph()
|| !(view instanceof FloatMeasurementView)) { || !(view instanceof FloatMeasurementView)) {
continue; continue;
} }

2
android_app/app/src/main/java/com/health/openscale/gui/views/FloatMeasurementView.java
View File

@@ -430,7 +430,7 @@ public abstract class FloatMeasurementView extends MeasurementView {
overview.setKey(settings.getInOverviewGraphKey()); overview.setKey(settings.getInOverviewGraphKey());
overview.setTitle(R.string.label_include_in_overview_graph); overview.setTitle(R.string.label_include_in_overview_graph);
overview.setPersistent(true); overview.setPersistent(true);
overview.setDefaultValue(settings.isOnOverviewGraph()); overview.setDefaultValue(settings.isInOverviewGraph());
screen.addPreference(overview); screen.addPreference(overview);
if (canConvertPercentageToAbsoluteWeight()) { if (canConvertPercentageToAbsoluteWeight()) {

11
android_app/app/src/main/java/com/health/openscale/gui/views/MeasurementViewSettings.java
View File

@@ -28,6 +28,7 @@ public class MeasurementViewSettings {
private static final String PREFERENCE_SUFFIX_ENABLE = "Enable"; private static final String PREFERENCE_SUFFIX_ENABLE = "Enable";
private static final String PREFERENCE_SUFFIX_IN_OVERVIEW_GRAPH = "InOverviewGraph"; private static final String PREFERENCE_SUFFIX_IN_OVERVIEW_GRAPH = "InOverviewGraph";
private static final String PREFERENCE_SUFFIX_IN_GRAPH = "InGraph";
private static final String PREFERENCE_SUFFIX_PERCENTAGE_ENABLE = "PercentageEnable"; private static final String PREFERENCE_SUFFIX_PERCENTAGE_ENABLE = "PercentageEnable";
private static final String PREFERENCE_SUFFIX_ESTIMATE_ENABLE = "EstimateEnable"; private static final String PREFERENCE_SUFFIX_ESTIMATE_ENABLE = "EstimateEnable";
private static final String PREFERENCE_SUFFIX_ESTIMATE_FORMULA = "EstimateFormula"; private static final String PREFERENCE_SUFFIX_ESTIMATE_FORMULA = "EstimateFormula";
@@ -103,7 +104,7 @@ public class MeasurementViewSettings {
return getPreferenceKey(PREFERENCE_SUFFIX_IN_OVERVIEW_GRAPH); return getPreferenceKey(PREFERENCE_SUFFIX_IN_OVERVIEW_GRAPH);
} }
public boolean isOnOverviewGraph() { public boolean isInOverviewGraph() {
boolean defaultValue; boolean defaultValue;
switch (key) { switch (key) {
case BMRMeasurementView.KEY: case BMRMeasurementView.KEY:
@@ -116,6 +117,14 @@ public class MeasurementViewSettings {
return preferences.getBoolean(getInOverviewGraphKey(), defaultValue); return preferences.getBoolean(getInOverviewGraphKey(), defaultValue);
} }
public String getInGraphKey() {
return getPreferenceKey(PREFERENCE_SUFFIX_IN_GRAPH);
}
public boolean isInGraph() {
return preferences.getBoolean(getInGraphKey(), true);
}
public String getPercentageEnabledKey() { public String getPercentageEnabledKey() {
return getPreferenceKey(PREFERENCE_SUFFIX_PERCENTAGE_ENABLE); return getPreferenceKey(PREFERENCE_SUFFIX_PERCENTAGE_ENABLE);
} }