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

diagram labels don't disappear anymore after fragment changes second improvement

Browse Source
This commit is contained in:
OliE
2015-01-04 17:35:28 +01:00
parent f9d2c6fa6b
commit e034e52bf5
1 changed files with 1 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -66,8 +66,6 @@ public class GraphFragment extends Fragment implements FragmentUpdateListener {
private Calendar calYears; private Calendar calYears;
private Calendar calLastSelected; private Calendar calLastSelected;
private SelectedValue valueLastSelected;
private ArrayList<ScaleData> scaleDataList; private ArrayList<ScaleData> scaleDataList;
private enum lines {WEIGHT, FAT, WATER, MUSCLE} private enum lines {WEIGHT, FAT, WATER, MUSCLE}
@@ -76,7 +74,6 @@ public class GraphFragment extends Fragment implements FragmentUpdateListener {
public GraphFragment() { public GraphFragment() {
calYears = Calendar.getInstance(); calYears = Calendar.getInstance();
calLastSelected = Calendar.getInstance(); calLastSelected = Calendar.getInstance();
valueLastSelected = null;
} }
@Override @Override
@@ -97,7 +94,6 @@ public class GraphFragment extends Fragment implements FragmentUpdateListener {
public void onClick(View view) { public void onClick(View view) {
calYears.roll(Calendar.YEAR, false); calYears.roll(Calendar.YEAR, false);
txtYear.setText(Integer.toString(calYears.get(Calendar.YEAR))); txtYear.setText(Integer.toString(calYears.get(Calendar.YEAR)));
valueLastSelected = null;
updateOnView(null); updateOnView(null);
} }
}); });
@@ -106,7 +102,6 @@ public class GraphFragment extends Fragment implements FragmentUpdateListener {
public void onClick(View view) { public void onClick(View view) {
calYears.roll(Calendar.YEAR, true); calYears.roll(Calendar.YEAR, true);
txtYear.setText(Integer.toString(calYears.get(Calendar.YEAR))); txtYear.setText(Integer.toString(calYears.get(Calendar.YEAR)));
valueLastSelected = null;
updateOnView(null); updateOnView(null);
} }
}); });
@@ -268,10 +263,8 @@ public class GraphFragment extends Fragment implements FragmentUpdateListener {
chartBottom.setColumnChartData(columnData); chartBottom.setColumnChartData(columnData);
chartBottom.setValueSelectionEnabled(true); chartBottom.setValueSelectionEnabled(true);
chartBottom.setZoomEnabled(false); chartBottom.setZoomEnabled(false);
chartBottom.selectValue(new SelectedValue(calLastSelected.get(Calendar.MONTH), 0, 0));
if (valueLastSelected != null) {
chartBottom.selectValue(valueLastSelected);
}
generateLineData(calLastSelected); generateLineData(calLastSelected);
} }
@@ -284,7 +277,6 @@ public class GraphFragment extends Fragment implements FragmentUpdateListener {
cal.add(Calendar.MONTH, selectedLine); cal.add(Calendar.MONTH, selectedLine);
calLastSelected = cal; calLastSelected = cal;
valueLastSelected = new SelectedValue(selectedLine, selectedValue, 0);
generateLineData(cal); generateLineData(cal);
} }