demus/Gadgetbridge
1
0
Fork 0
mirror of https://codeberg.org/Freeyourgadget/Gadgetbridge.git synced 2026-07-31 07:44:24 +02:00
Code Issues 1 Packages Projects Releases Wiki Activity

Garmin: Display intervals on non-swimming activities

Browse Source
This commit is contained in:
José Rebelo
2026-01-07 20:50:43 +00:00
parent 1b34e6dfb6
commit e16d4f89cd
3 changed files with 61 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/workouts/entries/ActivitySummaryTableBuilder.java
+12 -4
View File
@@ -29,17 +29,25 @@ public class ActivitySummaryTableBuilder {
public void addToSummaryData(final ActivitySummaryData summaryData) {
final int numColumns = headerColumns.size();
final boolean[] anyNonNull = new boolean[numColumns];
final boolean[] anyNonNullOrZero = new boolean[numColumns];
for (final List<ActivitySummaryValue> row : rows.values()) {
for (int i = 0; i < numColumns; i++) {
anyNonNull[i] |= row.get(i) != null;
final ActivitySummaryValue cell = row.get(i);
if (cell == null || cell.value() == null) {
continue;
}
if (cell.value() instanceof Number number && number.doubleValue() != 0) {
anyNonNullOrZero[i] |= true;
} else if (cell.value() instanceof String string && !string.equals("-")) {
anyNonNullOrZero[i] |= true;
}
}
}
final List<ActivitySummaryValue> finalHeader = new ArrayList<>(numColumns);
for (int i = 0; i < numColumns; i++) {
if (anyNonNull[i]) {
if (anyNonNullOrZero[i]) {
finalHeader.add(new ActivitySummaryValue(headerColumns.get(i)));
}
}
@@ -60,7 +68,7 @@ public class ActivitySummaryTableBuilder {
final List<ActivitySummaryValue> finalRow = new ArrayList<>(numColumns);
for (int i = 0; i < numColumns; i++) {
if (anyNonNull[i]) {
if (anyNonNullOrZero[i]) {
finalRow.add(row.get(i));
}
}
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/workouts/entries/ActivitySummaryValue.java
+1 -9
View File
@@ -3,15 +3,7 @@ package nodomain.freeyourgadget.gadgetbridge.activities.workouts.entries;
import nodomain.freeyourgadget.gadgetbridge.activities.workouts.WorkoutValueFormatter;
import nodomain.freeyourgadget.gadgetbridge.model.ActivitySummaryEntries;
public class ActivitySummaryValue {
private final Object value;
private final String unit;
public ActivitySummaryValue(final Object value, final String unit) {
this.value = value;
this.unit = unit;
}
public record ActivitySummaryValue(Object value, String unit) {
public ActivitySummaryValue(final String value) {
this(value, ActivitySummaryEntries.UNIT_STRING);
}
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/garmin/GarminWorkoutParser.java
+48 -18
View File
@@ -647,33 +647,63 @@ public class GarminWorkoutParser implements ActivitySummaryParser {
tableBuilder.addToSummaryData(summaryData);
}
// FIXME: For now we only support swimming intervals
final boolean anyValidLaps = laps.stream()
.anyMatch(lap -> lap.getTotalDistance() != null && lap.getTotalDistance() != 0 && lap.getSwimStyle() != null);
.filter(lap -> (lap.getTotalTimerTime() != null && lap.getTotalTimerTime() != 0))
.count() > 1;
final boolean anySwimmingLaps = laps.stream()
.anyMatch(lap -> lap.getSwimStyle() != null);
if (anyValidLaps) {
final ActivitySummaryTableBuilder tableBuilder = new ActivitySummaryTableBuilder(GROUP_INTERVALS, "intervals_header", Arrays.asList(
"#",
"swimming_stroke",
"Distance",
"pref_header_time"
));
// Unfortunately our tables do not yet scroll horizontally, so can't always add all possible columns
final List<String> header = new ArrayList<>();
header.add("#");
if (anySwimmingLaps) {
header.add("swimming_stroke");
header.add("Distance");
} else {
header.add("Distance");
header.add(ActivityKind.isPaceActivity(activityKind) ? "Pace" : "Speed");
}
header.add("heart_rate");
header.add("pref_header_time");
final ActivitySummaryTableBuilder tableBuilder = new ActivitySummaryTableBuilder(GROUP_INTERVALS, "intervals_header", header);
int i = 1;
for (final FitLap lap : laps) {
if (lap.getTotalDistance() == null || lap.getTotalDistance() == 0) {
if (lap.getTotalTimerTime() == null || lap.getTotalTimerTime() == 0) {
continue;
}
tableBuilder.addRow(
"interval_" + i,
Arrays.asList(
new ActivitySummaryValue(i, UNIT_NONE),
new ActivitySummaryValue(lap.getSwimStyle() != null ? context.getString(lap.getSwimStyle().getNameResId()) : null, UNIT_NONE),
new ActivitySummaryValue(lap.getTotalDistance(), UNIT_METERS),
new ActivitySummaryValue(lap.getTotalTimerTime(), UNIT_SECONDS)
)
);
final List<ActivitySummaryValue> row = new ArrayList<>();
final Double speedValue;
final String speedUnit;
if (lap.getEnhancedAvgSpeed() != null) {
if (ActivityKind.isPaceActivity(activityKind)) {
speedValue = (double) Math.round((60 / (lap.getEnhancedAvgSpeed() * 3.6)) * 60);
speedUnit = UNIT_SECONDS;
} else {
speedValue = Math.round((lap.getEnhancedAvgSpeed() * 3600 / 1000) * 100.0) / 100.0;
speedUnit = UNIT_KMPH;
}
} else {
speedValue = null;
speedUnit = UNIT_NONE;
}
row.add(new ActivitySummaryValue(i, UNIT_NONE));
if (anySwimmingLaps) {
row.add(new ActivitySummaryValue(lap.getSwimStyle() != null ? context.getString(lap.getSwimStyle().getNameResId()) : null, UNIT_NONE));
row.add(new ActivitySummaryValue(lap.getTotalDistance(), UNIT_METERS));
} else {
row.add(new ActivitySummaryValue(lap.getTotalDistance(), UNIT_METERS));
row.add(new ActivitySummaryValue(speedValue, speedUnit));
}
row.add(new ActivitySummaryValue(lap.getAvgHeartRate(), UNIT_BPM));
row.add(new ActivitySummaryValue(lap.getTotalTimerTime(), UNIT_SECONDS));
tableBuilder.addRow("interval_" + i, row);
i++;
}