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

Disable graph year buttons when they can't be used

Browse Source
This commit is contained in:
Erik Johansson
2018-01-22 21:00:05 +01:00
parent c3f5dbf0f6
commit a53af621c0
1 changed files with 35 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -30,6 +30,7 @@ import android.view.LayoutInflater;
import android.view.MotionEvent; import android.view.MotionEvent;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.Button;
import android.widget.LinearLayout; import android.widget.LinearLayout;
import android.widget.TextView; import android.widget.TextView;
@@ -69,6 +70,8 @@ public class GraphFragment extends Fragment implements FragmentUpdateListener {
private ColumnChartView chartTop; private ColumnChartView chartTop;
private Viewport defaultTopViewport; private Viewport defaultTopViewport;
private TextView txtYear; private TextView txtYear;
private Button btnLeftYear;
private Button btnRightYear;
private FloatingActionButton diagramWeight; private FloatingActionButton diagramWeight;
private FloatingActionButton diagramFat; private FloatingActionButton diagramFat;
private FloatingActionButton diagramWater; private FloatingActionButton diagramWater;
@@ -96,6 +99,14 @@ public class GraphFragment extends Fragment implements FragmentUpdateListener {
@Override @Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState)
{ {
openScale = OpenScale.getInstance(getContext());
scaleMeasurementList = openScale.getScaleMeasurementList();
if (!scaleMeasurementList.isEmpty()) {
calYears.setTime(scaleMeasurementList.get(0).getDateTime());
calLastSelected.setTime(scaleMeasurementList.get(0).getDateTime());
}
graphView = inflater.inflate(R.layout.fragment_graph, container, false); graphView = inflater.inflate(R.layout.fragment_graph, container, false);
chartBottom = (LineChartView) graphView.findViewById(R.id.chart_bottom); chartBottom = (LineChartView) graphView.findViewById(R.id.chart_bottom);
@@ -163,7 +174,8 @@ public class GraphFragment extends Fragment implements FragmentUpdateListener {
diagramHip.setVisibility(View.GONE); diagramHip.setVisibility(View.GONE);
} }
graphView.findViewById(R.id.btnLeftYear).setOnClickListener(new View.OnClickListener() { btnLeftYear = graphView.findViewById(R.id.btnLeftYear);
btnLeftYear.setOnClickListener(new View.OnClickListener() {
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)));
@@ -171,7 +183,8 @@ public class GraphFragment extends Fragment implements FragmentUpdateListener {
} }
}); });
graphView.findViewById(R.id.btnRightYear).setOnClickListener(new View.OnClickListener() { btnRightYear = graphView.findViewById(R.id.btnRightYear);
btnRightYear.setOnClickListener(new View.OnClickListener() {
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)));
@@ -179,7 +192,6 @@ public class GraphFragment extends Fragment implements FragmentUpdateListener {
} }
}); });
openScale = OpenScale.getInstance(getContext());
openScale.registerFragment(this); openScale.registerFragment(this);
return graphView; return graphView;
@@ -476,13 +488,31 @@ public class GraphFragment extends Fragment implements FragmentUpdateListener {
} }
private void generateGraphs() { private void generateGraphs() {
final int selectedYear = calYears.get(Calendar.YEAR);
int firstYear = selectedYear;
int lastYear = selectedYear;
scaleMeasurementList = openScale.getScaleMeasurementList();
if (!scaleMeasurementList.isEmpty()) {
Calendar cal = Calendar.getInstance();
cal.setTime(scaleMeasurementList.get(scaleMeasurementList.size() - 1).getDateTime());
firstYear = cal.get(Calendar.YEAR);
cal.setTime(scaleMeasurementList.get(0).getDateTime());
lastYear = cal.get(Calendar.YEAR);
}
btnLeftYear.setEnabled(selectedYear > firstYear);
btnRightYear.setEnabled(selectedYear < lastYear);
// show monthly diagram // show monthly diagram
if (prefs.getBoolean(String.valueOf(enableMonth.getId()), true)) { if (prefs.getBoolean(String.valueOf(enableMonth.getId()), true)) {
chartTop.setVisibility(View.VISIBLE); chartTop.setVisibility(View.VISIBLE);
chartBottom.setLayoutParams(new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, 0, 0.7f)); chartBottom.setLayoutParams(new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, 0, 0.7f));
generateColumnData(); generateColumnData();
scaleMeasurementList = openScale.getScaleDataOfMonth(calYears.get(Calendar.YEAR), calLastSelected.get(Calendar.MONTH)); scaleMeasurementList = openScale.getScaleDataOfMonth(selectedYear, calLastSelected.get(Calendar.MONTH));
generateLineData(Calendar.DAY_OF_MONTH); generateLineData(Calendar.DAY_OF_MONTH);
// show only yearly diagram and hide monthly diagram // show only yearly diagram and hide monthly diagram
@@ -490,7 +520,7 @@ public class GraphFragment extends Fragment implements FragmentUpdateListener {
chartTop.setVisibility(View.GONE); chartTop.setVisibility(View.GONE);
chartBottom.setLayoutParams(new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.MATCH_PARENT)); chartBottom.setLayoutParams(new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.MATCH_PARENT));
scaleMeasurementList = openScale.getScaleDataOfYear(calYears.get(Calendar.YEAR)); scaleMeasurementList = openScale.getScaleDataOfYear(selectedYear);
generateLineData(Calendar.DAY_OF_YEAR); generateLineData(Calendar.DAY_OF_YEAR);
} }