karol/OpenTracks
1
0
Fork 0
forked from upstream-mirrors/OpenTracks
Code Pull Requests Actions Releases 2 Activity

Cleanup: rename TrackStatistics to SegmentStatisticsUpdater.

Browse Source
This commit is contained in:
Dennis Guse
2025-10-26 19:26:56 +01:00
parent 5746a41905
commit fba08fe8dd
32 changed files with 162 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/de/dennisguse/opentracks/ui/aggregatedStatistics/AggregatedStatistics.java
+5 -5
View File
@@ -9,7 +9,7 @@ import java.util.List;
import java.util.Map;
import de.dennisguse.opentracks.data.models.Track;
import de.dennisguse.opentracks.stats.TrackStatistics;
import de.dennisguse.opentracks.stats.SegmentStatisticUpdater;
public class AggregatedStatistics {
@@ -55,10 +55,10 @@ public class AggregatedStatistics {
public static class AggregatedStatistic {
private final String activityTypeLocalized;
private final TrackStatistics trackStatistics;
private final SegmentStatisticUpdater trackStatistics;
private int countTracks = 1;
public AggregatedStatistic(String activityTypeLocalized, TrackStatistics trackStatistics) {
public AggregatedStatistic(String activityTypeLocalized, SegmentStatisticUpdater trackStatistics) {
this.activityTypeLocalized = activityTypeLocalized;
this.trackStatistics = trackStatistics;
}
@@ -67,7 +67,7 @@ public class AggregatedStatistics {
return activityTypeLocalized;
}
public TrackStatistics getTrackStatistics() {
public SegmentStatisticUpdater getTrackStatistics() {
return trackStatistics;
}
@@ -75,7 +75,7 @@ public class AggregatedStatistics {
return countTracks;
}
void add(TrackStatistics statistics) {
void add(SegmentStatisticUpdater statistics) {
trackStatistics.merge(statistics);
countTracks++;
}
src/main/java/de/dennisguse/opentracks/ui/customRecordingLayout/SettingsCustomLayoutEditAdapter.java
+2 -2
View File
@@ -27,7 +27,7 @@ import de.dennisguse.opentracks.data.models.TrackPoint;
import de.dennisguse.opentracks.databinding.CustomStatsItemBinding;
import de.dennisguse.opentracks.services.RecordingData;
import de.dennisguse.opentracks.settings.UnitSystem;
import de.dennisguse.opentracks.stats.TrackStatistics;
import de.dennisguse.opentracks.stats.SegmentStatisticUpdater;
import de.dennisguse.opentracks.viewmodels.Mapping;
import de.dennisguse.opentracks.viewmodels.StatisticViewHolder;
@@ -38,7 +38,7 @@ public class SettingsCustomLayoutEditAdapter extends RecyclerView.Adapter<Recycl
private static final RecordingData demoData;
static {
TrackStatistics trackStatistics = new TrackStatistics();
SegmentStatisticUpdater trackStatistics = new SegmentStatisticUpdater();
trackStatistics.setStartTime(Instant.ofEpochMilli(0));
trackStatistics.setMovingTime(Duration.ofMinutes(0));
trackStatistics.setTotalTime(Duration.ofMinutes(0));
src/main/java/de/dennisguse/opentracks/ui/intervals/IntervalStatistics.java
+3 -3
View File
@@ -12,7 +12,7 @@ import de.dennisguse.opentracks.data.models.HeartRate;
import de.dennisguse.opentracks.data.models.Power;
import de.dennisguse.opentracks.data.models.Speed;
import de.dennisguse.opentracks.data.models.TrackPoint;
import de.dennisguse.opentracks.stats.TrackStatistics;
import de.dennisguse.opentracks.stats.SegmentStatisticUpdater;
import de.dennisguse.opentracks.stats.TrackStatisticsUpdater;
public class IntervalStatistics {
@@ -172,7 +172,7 @@ public class IntervalStatistics {
return avgPower;
}
private void add(TrackStatistics trackStatistics, @Nullable TrackPoint lastTrackPoint) {
private void add(SegmentStatisticUpdater trackStatistics, @Nullable TrackPoint lastTrackPoint) {
distance = distance.plus(trackStatistics.getTotalDistance());
time = time.plus(trackStatistics.getTotalTime());
gain_m = trackStatistics.hasTotalAltitudeGain() ? trackStatistics.getTotalAltitudeGain() : gain_m;
@@ -190,7 +190,7 @@ public class IntervalStatistics {
}
}
private void set(TrackStatistics trackStatistics) {
private void set(SegmentStatisticUpdater trackStatistics) {
distance = trackStatistics.getTotalDistance();
time = trackStatistics.getTotalTime();
gain_m = trackStatistics.hasTotalAltitudeGain() ? trackStatistics.getTotalAltitudeGain() : gain_m;