MarcoBuster/Gadgetbridge
1
0
Fork 0
mirror of https://codeberg.org/Freeyourgadget/Gadgetbridge synced 2024-12-27 19:15:50 +01:00
Code Releases Wiki Activity

Fix awake sleep color in charts

Browse Source
This commit is contained in:
José Rebelo 2024-09-18 08:45:55 +01:00
parent 05570a3cae
commit 922c8db76f
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/AbstractActivityChartFragment.java
View File

@ -181,13 +181,13 @@ public abstract class AbstractActivityChartFragment<D extends ChartsData> extend
public DefaultChartsData<LineData> refresh(GBDevice gbDevice, List<? extends ActivitySample> samples) { public DefaultChartsData<LineData> refresh(GBDevice gbDevice, List<? extends ActivitySample> samples) {
TimestampTranslation tsTranslation = new TimestampTranslation(); TimestampTranslation tsTranslation = new TimestampTranslation();
LOG.info("" + getTitle() + ": number of samples:" + samples.size()); LOG.info("{}: number of samples: {}", getTitle(), samples.size());
LineData lineData; LineData lineData;
if (samples.size() == 0) { if (samples.isEmpty()) {
lineData = new LineData(); lineData = new LineData();
ValueFormatter xValueFormatter = new SampleXLabelFormatter(tsTranslation); ValueFormatter xValueFormatter = new SampleXLabelFormatter(tsTranslation);
return new DefaultChartsData(lineData, xValueFormatter); return new DefaultChartsData<>(lineData, xValueFormatter);
} }
ActivityKind last_type = ActivityKind.UNKNOWN; ActivityKind last_type = ActivityKind.UNKNOWN;
@ -260,10 +260,10 @@ public abstract class AbstractActivityChartFragment<D extends ChartsData> extend
} }
if (supportsAwakeSleep(gbDevice)) { if (supportsAwakeSleep(gbDevice)) {
lineDataSets.add(createDataSet( lineDataSets.add(createDataSet(
entries.get(getIndexOfActivity(ActivityKind.AWAKE_SLEEP)), akActivity.color, "Awake Sleep" entries.get(getIndexOfActivity(ActivityKind.AWAKE_SLEEP)), akAwakeSleep.color, "Awake Sleep"
)); ));
} }
if (hr && heartrateEntries.size() > 0) { if (hr && !heartrateEntries.isEmpty()) {
LineDataSet heartrateSet = createHeartrateSet(heartrateEntries, "Heart Rate"); LineDataSet heartrateSet = createHeartrateSet(heartrateEntries, "Heart Rate");
lineDataSets.add(heartrateSet); lineDataSets.add(heartrateSet);
} }
@ -271,7 +271,7 @@ public abstract class AbstractActivityChartFragment<D extends ChartsData> extend
lineData = new LineData(lineDataSets); lineData = new LineData(lineDataSets);
ValueFormatter xValueFormatter = new SampleXLabelFormatter(tsTranslation); ValueFormatter xValueFormatter = new SampleXLabelFormatter(tsTranslation);
return new DefaultChartsData(lineData, xValueFormatter); return new DefaultChartsData<>(lineData, xValueFormatter);
} }
protected int getIndexOfActivity(ActivityKind kind) { protected int getIndexOfActivity(ActivityKind kind) {