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

add dynamically graph and slice diagram for the overview fragment

Browse Source
This commit is contained in:
OliE
2018-02-18 08:00:31 +01:00
parent 5c4c8096ab
commit 51ba977eb4
15 changed files with 123 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -49,6 +49,7 @@ import com.health.openscale.gui.views.FatMeasurementView;
import com.health.openscale.gui.views.FloatMeasurementView;
import com.health.openscale.gui.views.HipMeasurementView;
import com.health.openscale.gui.views.LBWMeasurementView;
import com.health.openscale.gui.views.MeasurementView;
import com.health.openscale.gui.views.MuscleMeasurementView;
import com.health.openscale.gui.views.WHRMeasurementView;
import com.health.openscale.gui.views.WHtRMeasurementView;
@@ -93,7 +94,7 @@ public class GraphFragment extends Fragment implements FragmentUpdateListener {
private PopupMenu popup;
private SharedPreferences prefs;
private ArrayList<FloatMeasurementView> measurementViews;
private ArrayList<MeasurementView> measurementViews;
private int textColor;
@@ -329,31 +330,39 @@ public class GraphFragment extends Fragment implements FragmentUpdateListener {
floatingActionBar.removeAllViews();
for (FloatMeasurementView measurementView : measurementViews) {
measurementView.updatePreferences(prefs);
Stack<PointValue> valuesStack = new Stack<PointValue>();
for (MeasurementView view : measurementViews) {
if (view instanceof FloatMeasurementView) {
FloatMeasurementView measurementView = (FloatMeasurementView) view;
for (ScaleMeasurement measurement : scaleMeasurementList) {
measurementView.loadFrom(measurement, null);
calDB.setTime(measurement.getDateTime());
if (addPointValue(valuesStack, calDB.get(field), measurementView.getValue())) {
pointIndexScaleMeasurementList.add(measurement); // if new point was added, add this point to pointIndexScaleDataList to get the correct point index after selecting an point
if (measurementView.getName().equals(getString(R.string.label_bmr))) {
continue;
}
}
Line diagramLine = new Line(valuesStack).
setColor(measurementView.getColor()).
setHasLabels(prefs.getBoolean("labelsEnable", true)).
setHasPoints(prefs.getBoolean("pointsEnable", true)).
setFormatter(new SimpleLineChartValueFormatter(1));
measurementView.updatePreferences(prefs);
Stack<PointValue> valuesStack = new Stack<PointValue>();
if (measurementView.isVisible()) {
addFloatingActionButton(measurementView);
for (ScaleMeasurement measurement : scaleMeasurementList) {
measurementView.loadFrom(measurement, null);
if (prefs.getBoolean(String.valueOf("actionButton" + measurementView.getName()), true)) {
diagramLineList.add(diagramLine);
calDB.setTime(measurement.getDateTime());
if (addPointValue(valuesStack, calDB.get(field), measurementView.getValue())) {
pointIndexScaleMeasurementList.add(measurement); // if new point was added, add this point to pointIndexScaleDataList to get the correct point index after selecting an point
}
}
Line diagramLine = new Line(valuesStack).
setColor(measurementView.getColor()).
setHasLabels(prefs.getBoolean("labelsEnable", true)).
setHasPoints(prefs.getBoolean("pointsEnable", true)).
setFormatter(new SimpleLineChartValueFormatter(1));
if (measurementView.isVisible()) {
addFloatingActionButton(measurementView);
if (prefs.getBoolean(String.valueOf("actionButton" + measurementView.getName()), true)) {
diagramLineList.add(diagramLine);
}
}
}
}

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

@@ -42,6 +42,7 @@ import com.health.openscale.gui.views.BMIMeasurementView;
import com.health.openscale.gui.views.BMRMeasurementView;
import com.health.openscale.gui.views.BoneMeasurementView;
import com.health.openscale.gui.views.FatMeasurementView;
import com.health.openscale.gui.views.FloatMeasurementView;
import com.health.openscale.gui.views.HipMeasurementView;
import com.health.openscale.gui.views.LBWMeasurementView;
import com.health.openscale.gui.views.MeasurementView;
@@ -56,6 +57,7 @@ import java.text.DateFormat;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.List;
import java.util.Stack;
import lecho.lib.hellocharts.formatter.SimpleLineChartValueFormatter;
import lecho.lib.hellocharts.listener.LineChartOnValueSelectListener;
@@ -67,7 +69,6 @@ import lecho.lib.hellocharts.model.LineChartData;
import lecho.lib.hellocharts.model.PieChartData;
import lecho.lib.hellocharts.model.PointValue;
import lecho.lib.hellocharts.model.SliceValue;
import lecho.lib.hellocharts.util.ChartUtils;
import lecho.lib.hellocharts.view.LineChartView;
import lecho.lib.hellocharts.view.PieChartView;
@@ -81,7 +82,7 @@ public class OverviewFragment extends Fragment implements FragmentUpdateListener
private TableLayout tableOverviewLayout;
private ArrayList<MeasurementView> overviewMeasurements;
private ArrayList<MeasurementView> measurementViews;
private PieChartView pieChartLast;
private LineChartView lineChartLast;
@@ -119,22 +120,22 @@ public class OverviewFragment extends Fragment implements FragmentUpdateListener
tableOverviewLayout = (TableLayout)overviewView.findViewById(R.id.tableLayoutMeasurements);
overviewMeasurements = new ArrayList<>();
measurementViews = new ArrayList<>();
overviewMeasurements.add(new WeightMeasurementView(context));
overviewMeasurements.add(new BMIMeasurementView(context));
overviewMeasurements.add(new WaterMeasurementView(context));
overviewMeasurements.add(new MuscleMeasurementView(context));
overviewMeasurements.add(new LBWMeasurementView(context));
overviewMeasurements.add(new FatMeasurementView(context));
overviewMeasurements.add(new BoneMeasurementView(context));
overviewMeasurements.add(new WaistMeasurementView(context));
overviewMeasurements.add(new WHtRMeasurementView(context));
overviewMeasurements.add(new HipMeasurementView(context));
overviewMeasurements.add(new WHRMeasurementView(context));
overviewMeasurements.add(new BMRMeasurementView(context));
measurementViews.add(new WeightMeasurementView(context));
measurementViews.add(new BMIMeasurementView(context));
measurementViews.add(new WaterMeasurementView(context));
measurementViews.add(new MuscleMeasurementView(context));
measurementViews.add(new LBWMeasurementView(context));
measurementViews.add(new FatMeasurementView(context));
measurementViews.add(new BoneMeasurementView(context));
measurementViews.add(new WaistMeasurementView(context));
measurementViews.add(new WHtRMeasurementView(context));
measurementViews.add(new HipMeasurementView(context));
measurementViews.add(new WHRMeasurementView(context));
measurementViews.add(new BMRMeasurementView(context));
for (MeasurementView measurement : overviewMeasurements) {
for (MeasurementView measurement : measurementViews) {
tableOverviewLayout.addView(measurement);
}
@@ -189,7 +190,7 @@ public class OverviewFragment extends Fragment implements FragmentUpdateListener
ScaleMeasurement[] tupleScaleData = OpenScale.getInstance(context).getTupleScaleData(lastScaleMeasurement.getId());
ScaleMeasurement prevScaleMeasurement = tupleScaleData[0];
for (MeasurementView measurement : overviewMeasurements) {
for (MeasurementView measurement : measurementViews) {
measurement.updatePreferences(prefs);
measurement.loadFrom(lastScaleMeasurement, prevScaleMeasurement);
}
@@ -225,17 +226,6 @@ public class OverviewFragment extends Fragment implements FragmentUpdateListener
private void updateLastLineChart(List<ScaleMeasurement> scaleMeasurementList) {
List<AxisValue> axisValues = new ArrayList<AxisValue>();
List<PointValue> valuesWeight = new ArrayList<PointValue>();
List<PointValue> valuesFat = new ArrayList<PointValue>();
List<PointValue> valuesWater = new ArrayList<PointValue>();
List<PointValue> valuesMuscle = new ArrayList<PointValue>();
List<PointValue> valuesLBW = new ArrayList<PointValue>();
List<PointValue> valuesWaist = new ArrayList<PointValue>();
List<PointValue> valuesHip = new ArrayList<PointValue>();
List<PointValue> valuesBone = new ArrayList<PointValue>();
List<Line> lines = new ArrayList<Line>();
int max_i = 7;
@@ -243,112 +233,54 @@ public class OverviewFragment extends Fragment implements FragmentUpdateListener
max_i = scaleMeasurementList.size();
}
List<Line> diagramLineList = new ArrayList<>();
List<AxisValue> axisValues = new ArrayList<>();
final Calendar now = Calendar.getInstance();
Calendar histCalendar = Calendar.getInstance();
scaleMeasurementLastDays = new ArrayList<ScaleMeasurement>();
for (MeasurementView view : measurementViews) {
if (view instanceof FloatMeasurementView) {
FloatMeasurementView measurementView = (FloatMeasurementView) view;
for (int i=0; i<max_i; i++) {
ScaleMeasurement histData = scaleMeasurementList.get(max_i - i - 1);
if (measurementView.getName().equals(getString(R.string.label_bmr))) {
continue;
}
scaleMeasurementLastDays.add(histData);
measurementView.updatePreferences(prefs);
valuesWeight.add(new PointValue(i, histData.getConvertedWeight(currentScaleUser.getScaleUnit())));
if (histData.getFat() != 0.0f)
valuesFat.add(new PointValue(i, histData.getFat()));
if (histData.getWater() != 0.0f)
valuesWater.add(new PointValue(i, histData.getWater()));
if (histData.getMuscle() != 0.0f)
valuesMuscle.add(new PointValue(i, histData.getMuscle()));
if (histData.getLbw() != 0.0f)
valuesLBW.add(new PointValue(i, histData.getLbw()));
if (histData.getWaist() != 0.0f)
valuesWaist.add(new PointValue(i, histData.getWaist()));
if (histData.getHip() != 0.0f)
valuesHip.add(new PointValue(i, histData.getHip()));
if (histData.getBone() != 0.0f)
valuesBone.add(new PointValue(i, histData.getBone()));
Stack<PointValue> valuesStack = new Stack<PointValue>();
histCalendar.setTime(histData.getDateTime());
int days = DateTimeHelpers.daysBetween(now, histCalendar);
String label = getResources().getQuantityString(R.plurals.label_days, Math.abs(days), days);
axisValues.add(new AxisValue(i, label.toCharArray()));
scaleMeasurementLastDays = new ArrayList<>();
for (int i=0; i<max_i; i++) {
ScaleMeasurement measurement = scaleMeasurementList.get(max_i - i - 1);
measurementView.loadFrom(measurement, null);
scaleMeasurementLastDays.add(measurement);
if (measurementView.getValue() != 0.0f) {
valuesStack.push(new PointValue(i, measurementView.getValue()));
}
histCalendar.setTime(measurement.getDateTime());
int days = DateTimeHelpers.daysBetween(now, histCalendar);
String label = getResources().getQuantityString(R.plurals.label_days, Math.abs(days), days);
axisValues.add(new AxisValue(i, label.toCharArray()));
}
Line lineaDiagram = new Line(valuesStack).
setColor(measurementView.getColor()).
setHasLabels(prefs.getBoolean("labelsEnable", true)).
setHasPoints(prefs.getBoolean("pointsEnable", true)).
setFormatter(new SimpleLineChartValueFormatter(1));
if (measurementView.isVisible()) {
diagramLineList.add(lineaDiagram);
}
}
}
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 lineLBW = new Line(valuesLBW).
setColor(Color.parseColor("#cc0099")).
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));
Line lineBone = new Line(valuesBone).
setColor(Color.parseColor("#00cc9e")).
setHasLabels(prefs.getBoolean("labelsEnable", true)).
setHasPoints(prefs.getBoolean("pointsEnable", true)).
setFormatter(new SimpleLineChartValueFormatter(1));
if (prefs.getBoolean("weightEnable", true)) {
lines.add(lineWeight);
}
if (prefs.getBoolean("fatEnable", true)) {
lines.add(lineFat);
}
if (prefs.getBoolean("waterEnable", true)) {
lines.add(lineWater);
}
if (prefs.getBoolean("muscleEnable", true)) {
lines.add(lineMuscle);
}
if (prefs.getBoolean("lbwEnable", false)) {
lines.add(lineLBW);
}
if (prefs.getBoolean("waistEnable", false)) {
lines.add(lineWaist);
}
if (prefs.getBoolean("hipEnable", false)) {
lines.add(lineHip);
}
if (prefs.getBoolean("boneEnable", false)) {
lines.add(lineBone);
}
LineChartData lineData = new LineChartData(lines);
LineChartData lineData = new LineChartData(diagramLineList);
lineData.setAxisXBottom(new Axis(axisValues).
setHasLines(true).
setTextColor(txtTitleLastMeasurement.getCurrentTextColor())
@@ -367,28 +299,23 @@ public class OverviewFragment extends Fragment implements FragmentUpdateListener
}
private void updateLastPieChart() {
List<SliceValue> arcValuesLast = new ArrayList<>();
List<SliceValue> arcValuesLast = new ArrayList<SliceValue>();
for (MeasurementView view : measurementViews) {
if (view instanceof FloatMeasurementView) {
FloatMeasurementView measurementView = (FloatMeasurementView) view;
if (lastScaleMeasurement.getFat() == 0) {
arcValuesLast.add(new SliceValue(1, ChartUtils.COLOR_ORANGE));
}
else {
arcValuesLast.add(new SliceValue(lastScaleMeasurement.getFat(), ChartUtils.COLOR_ORANGE));
}
if (measurementView.getName().equals(getString(R.string.label_bmr))) {
continue;
}
if (lastScaleMeasurement.getWater() == 0) {
arcValuesLast.add(new SliceValue(1, ChartUtils.COLOR_BLUE));
}
else {
arcValuesLast.add(new SliceValue(lastScaleMeasurement.getWater(), ChartUtils.COLOR_BLUE));
}
measurementView.updatePreferences(prefs);
measurementView.loadFrom(lastScaleMeasurement, null);
if (lastScaleMeasurement.getMuscle() == 0) {
arcValuesLast.add(new SliceValue(1, ChartUtils.COLOR_GREEN));
}
else {
arcValuesLast.add(new SliceValue(lastScaleMeasurement.getMuscle(), ChartUtils.COLOR_GREEN));
if (measurementView.getValue() != 0) {
arcValuesLast.add(new SliceValue(measurementView.getValue(), measurementView.getColor()));
}
}
}
final Converters.WeightUnit unit = currentScaleUser.getScaleUnit();
@@ -423,16 +350,16 @@ public class OverviewFragment extends Fragment implements FragmentUpdateListener
String date_time = DateFormat.getDateTimeInstance(DateFormat.FULL, DateFormat.SHORT).format(lastScaleMeasurement.getDateTime());
switch (i) {
case 0:
Toast.makeText(getActivity(), getResources().getString(R.string.info_your_fat) + " " + lastScaleMeasurement.getFat() + "% " + getResources().getString(R.string.info_on_date) + " " + date_time, Toast.LENGTH_SHORT).show();
break;
case 1:
Toast.makeText(getActivity(), getResources().getString(R.string.info_your_water) + " " + lastScaleMeasurement.getWater() + "% " + getResources().getString(R.string.info_on_date) + " " + date_time, Toast.LENGTH_SHORT).show();
break;
case 2:
Toast.makeText(getActivity(), getResources().getString(R.string.info_your_muscle) + " " + lastScaleMeasurement.getMuscle() + "% " + getResources().getString(R.string.info_on_date) + " " + date_time, Toast.LENGTH_SHORT).show();
break;
for (MeasurementView view : measurementViews) {
if (view instanceof FloatMeasurementView) {
FloatMeasurementView measurementView = (FloatMeasurementView) view;
measurementView.loadFrom(lastScaleMeasurement, null);
if (measurementView.getColor() == arcValue.getColor()) {
Toast.makeText(getActivity(), measurementView.getName() + " " + measurementView.getValueAsString() + measurementView.getUnit() + " " + getResources().getString(R.string.info_on_date) + " " + date_time, Toast.LENGTH_SHORT).show();
}
}
}
}

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

@@ -52,7 +52,7 @@ public class BMIMeasurementView extends FloatMeasurementView {
}
@Override
protected String getUnit() {
public String getUnit() {
return "";
}

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

@@ -59,7 +59,7 @@ public class BMRMeasurementView extends FloatMeasurementView {
}
@Override
protected String getUnit() {
public String getUnit() {
return "kCal";
}

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

@@ -47,7 +47,7 @@ public class BoneMeasurementView extends FloatMeasurementView {
}
@Override
protected String getUnit() {
public String getUnit() {
return "kg";
}

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

@@ -61,7 +61,7 @@ public class FatMeasurementView extends FloatMeasurementView {
}
@Override
protected String getUnit() {
public String getUnit() {
if (percentageEnable) {
return "%";
}

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

@@ -210,7 +210,7 @@ public abstract class FloatMeasurementView extends MeasurementView {
protected abstract float getMeasurementValue(ScaleMeasurement measurement);
protected abstract void setMeasurementValue(float value, ScaleMeasurement measurement);
protected abstract String getUnit();
public abstract String getUnit();
protected abstract float getMaxValue();
public abstract int getColor();

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

@@ -47,7 +47,7 @@ public class HipMeasurementView extends FloatMeasurementView {
}
@Override
protected String getUnit() {
public String getUnit() {
return "cm";
}

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

@@ -50,7 +50,7 @@ public class LBWMeasurementView extends FloatMeasurementView {
}
@Override
protected String getUnit() {
public String getUnit() {
return "kg";
}

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

@@ -59,7 +59,7 @@ public class MuscleMeasurementView extends FloatMeasurementView {
}
@Override
protected String getUnit() {
public String getUnit() {
if (percentageEnable) {
return "%";
}

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

@@ -53,7 +53,7 @@ public class WHRMeasurementView extends FloatMeasurementView {
}
@Override
protected String getUnit() {
public String getUnit() {
return "";
}

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

@@ -52,7 +52,7 @@ public class WHtRMeasurementView extends FloatMeasurementView {
}
@Override
protected String getUnit() {
public String getUnit() {
return "";
}

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

@@ -47,7 +47,7 @@ public class WaistMeasurementView extends FloatMeasurementView {
}
@Override
protected String getUnit() {
public String getUnit() {
return "cm";
}

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

@@ -61,7 +61,7 @@ public class WaterMeasurementView extends FloatMeasurementView {
}
@Override
protected String getUnit() {
public String getUnit() {
if (percentageEnable) {
return "%";
}

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

@@ -49,7 +49,7 @@ public class WeightMeasurementView extends FloatMeasurementView {
}
@Override
protected String getUnit() {
public String getUnit() {
return getScaleUser().getScaleUnit().toString();
}