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

increase month selector minimum height, see issue #299

Browse Source
This commit is contained in:
OliE
2018-08-05 16:44:27 +02:00
parent 610a7601c6
commit e15ce4eba3
1 changed files with 26 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -465,6 +465,31 @@ public class GraphFragment extends Fragment implements FragmentUpdateListener {
{ {
int[] numOfMonth = openScale.getCountsOfMonth(calYears.get(Calendar.YEAR)); int[] numOfMonth = openScale.getCountsOfMonth(calYears.get(Calendar.YEAR));
float[] normNumOfMonth = new float[12];
int max = 0;
int min = Integer.MAX_VALUE;
for (int i=0; i<12; i++) {
if (numOfMonth[i] > max) {
max = numOfMonth[i];
}
if (numOfMonth[i] < min) {
min = numOfMonth[i];
}
}
final float heightOffset = 0.2f; // increase month selector minimum height
for (int i=0; i<12; i++) {
normNumOfMonth[i] = (numOfMonth[i] - min) / (float)(max - min); // normalize data to [0..1]
if (normNumOfMonth[i] != 1.0f && normNumOfMonth[i] != 0.0f) {
normNumOfMonth[i] += heightOffset;
}
}
Calendar calMonths = Calendar.getInstance(); Calendar calMonths = Calendar.getInstance();
calMonths.set(Calendar.MONTH, Calendar.JANUARY); calMonths.set(Calendar.MONTH, Calendar.JANUARY);
@@ -478,7 +503,7 @@ public class GraphFragment extends Fragment implements FragmentUpdateListener {
axisValues.add(new AxisValue(i, month_name.toCharArray())); axisValues.add(new AxisValue(i, month_name.toCharArray()));
List<SubcolumnValue> values = new ArrayList<>(); List<SubcolumnValue> values = new ArrayList<>();
values.add(new SubcolumnValue(numOfMonth[i], ChartUtils.COLORS[i % ChartUtils.COLORS.length])); values.add(new SubcolumnValue(normNumOfMonth[i], ChartUtils.COLORS[i % ChartUtils.COLORS.length]).setLabel(Integer.toString(numOfMonth[i])));
columns.add(new Column(values).setHasLabelsOnlyForSelected(true)); columns.add(new Column(values).setHasLabelsOnlyForSelected(true));