From 3222a0c4976e72e4538a29464bdf73665eb6e7a6 Mon Sep 17 00:00:00 2001 From: Dennis Guse Date: Wed, 29 Oct 2025 08:43:30 +0100 Subject: [PATCH] Rename IntervalStatistics to IntervalStatisticsUpdater. --- .../VoiceAnnouncementUtilsTest.java | 28 +++++++++---------- ...ava => IntervalStatisticsUpdaterTest.java} | 14 +++++----- .../VoiceAnnouncementManager.java | 10 +++---- .../announcement/VoiceAnnouncementUtils.java | 4 +-- .../intervals/IntervalStatisticsAdapter.java | 6 ++-- .../ui/intervals/IntervalStatisticsModel.java | 10 +++---- ...cs.java => IntervalStatisticsUpdater.java} | 4 +-- .../ui/intervals/IntervalsFragment.java | 2 +- 8 files changed, 39 insertions(+), 39 deletions(-) rename src/androidTest/java/de/dennisguse/opentracks/ui/intervals/{IntervalStatisticsTest.java => IntervalStatisticsUpdaterTest.java} (92%) rename src/main/java/de/dennisguse/opentracks/ui/intervals/{IntervalStatistics.java => IntervalStatisticsUpdater.java} (98%) diff --git a/src/androidTest/java/de/dennisguse/opentracks/services/announcement/VoiceAnnouncementUtilsTest.java b/src/androidTest/java/de/dennisguse/opentracks/services/announcement/VoiceAnnouncementUtilsTest.java index 7eead65b6..a4b5c8bbe 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/services/announcement/VoiceAnnouncementUtilsTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/services/announcement/VoiceAnnouncementUtilsTest.java @@ -33,9 +33,9 @@ import de.dennisguse.opentracks.data.models.Track; import de.dennisguse.opentracks.sensors.sensorData.SensorDataSet; import de.dennisguse.opentracks.settings.PreferencesUtils; import de.dennisguse.opentracks.settings.UnitSystem; -import de.dennisguse.opentracks.stats.SensorStatistics; import de.dennisguse.opentracks.stats.SegmentStatisticUpdater; -import de.dennisguse.opentracks.ui.intervals.IntervalStatistics; +import de.dennisguse.opentracks.stats.SensorStatistics; +import de.dennisguse.opentracks.ui.intervals.IntervalStatisticsUpdater; @RunWith(AndroidJUnit4.class) public class VoiceAnnouncementUtilsTest { @@ -163,10 +163,10 @@ public class VoiceAnnouncementUtilsTest { Pair trackWithStats = TestDataUtil.buildTrackWithTrackPoints(contentProviderUtils, numberOfPoints); Track.Id trackId = trackWithStats.first; SegmentStatisticUpdater stats = trackWithStats.second; - IntervalStatistics.Interval lastInterval; + IntervalStatisticsUpdater.Interval lastInterval; try (TrackPointIterator trackPointIterator = contentProviderUtils.getTrackPointLocationIterator(trackId, null)) { assertEquals(numberOfPoints, trackPointIterator.getCount()); - IntervalStatistics intervalStatistics = new IntervalStatistics(Distance.of(1000)); + IntervalStatisticsUpdater intervalStatistics = new IntervalStatisticsUpdater(Distance.of(1000)); intervalStatistics.addTrackPoints(trackPointIterator); lastInterval = intervalStatistics.getIntervalList().get(intervalStatistics.getIntervalList().size() - 1); } @@ -214,10 +214,10 @@ public class VoiceAnnouncementUtilsTest { Pair trackWithStats = TestDataUtil.buildTrackWithTrackPoints(contentProviderUtils, numberOfPoints); Track.Id trackId = trackWithStats.first; SegmentStatisticUpdater stats = trackWithStats.second; - IntervalStatistics.Interval lastInterval; + IntervalStatisticsUpdater.Interval lastInterval; try (TrackPointIterator trackPointIterator = contentProviderUtils.getTrackPointLocationIterator(trackId, null)) { assertEquals(numberOfPoints, trackPointIterator.getCount()); - IntervalStatistics intervalStatistics = new IntervalStatistics(Distance.of(1000)); + IntervalStatisticsUpdater intervalStatistics = new IntervalStatisticsUpdater(Distance.of(1000)); intervalStatistics.addTrackPoints(trackPointIterator); lastInterval = intervalStatistics.getIntervalList().get(intervalStatistics.getIntervalList().size() - 1); } @@ -328,10 +328,10 @@ public class VoiceAnnouncementUtilsTest { Pair trackWithStats = TestDataUtil.buildTrackWithTrackPoints(contentProviderUtils, numberOfPoints); Track.Id trackId = trackWithStats.first; SegmentStatisticUpdater stats = trackWithStats.second; - IntervalStatistics.Interval lastInterval; + IntervalStatisticsUpdater.Interval lastInterval; try (TrackPointIterator trackPointIterator = contentProviderUtils.getTrackPointLocationIterator(trackId, null)) { assertEquals(numberOfPoints, trackPointIterator.getCount()); - IntervalStatistics intervalStatistics = new IntervalStatistics(Distance.of(1000)); + IntervalStatisticsUpdater intervalStatistics = new IntervalStatisticsUpdater(Distance.of(1000)); intervalStatistics.addTrackPoints(trackPointIterator); lastInterval = intervalStatistics.getIntervalList().get(intervalStatistics.getIntervalList().size() - 1); } @@ -379,10 +379,10 @@ public class VoiceAnnouncementUtilsTest { Pair trackWithStats = TestDataUtil.buildTrackWithTrackPoints(contentProviderUtils, numberOfPoints); Track.Id trackId = trackWithStats.first; SegmentStatisticUpdater stats = trackWithStats.second; - IntervalStatistics.Interval lastInterval; + IntervalStatisticsUpdater.Interval lastInterval; try (TrackPointIterator trackPointIterator = contentProviderUtils.getTrackPointLocationIterator(trackId, null)) { assertEquals(numberOfPoints, trackPointIterator.getCount()); - IntervalStatistics intervalStatistics = new IntervalStatistics(Distance.of(1000)); + IntervalStatisticsUpdater intervalStatistics = new IntervalStatisticsUpdater(Distance.of(1000)); intervalStatistics.addTrackPoints(trackPointIterator); lastInterval = intervalStatistics.getIntervalList().get(intervalStatistics.getIntervalList().size() - 1); } @@ -409,10 +409,10 @@ public class VoiceAnnouncementUtilsTest { Pair trackWithStats = TestDataUtil.buildTrackWithTrackPoints(contentProviderUtils, numberOfPoints); Track.Id trackId = trackWithStats.first; SegmentStatisticUpdater stats = trackWithStats.second; - IntervalStatistics.Interval lastInterval; + IntervalStatisticsUpdater.Interval lastInterval; try (TrackPointIterator trackPointIterator = contentProviderUtils.getTrackPointLocationIterator(trackId, null)) { assertEquals(numberOfPoints, trackPointIterator.getCount()); - IntervalStatistics intervalStatistics = new IntervalStatistics(Distance.of(1000)); + IntervalStatisticsUpdater intervalStatistics = new IntervalStatisticsUpdater(Distance.of(1000)); intervalStatistics.addTrackPoints(trackPointIterator); lastInterval = intervalStatistics.getIntervalList().get(intervalStatistics.getIntervalList().size() - 1); } @@ -447,10 +447,10 @@ public class VoiceAnnouncementUtilsTest { Pair trackWithStats = TestDataUtil.buildTrackWithTrackPoints(contentProviderUtils, numberOfPoints); Track.Id trackId = trackWithStats.first; SegmentStatisticUpdater stats = trackWithStats.second; - IntervalStatistics.Interval lastInterval; + IntervalStatisticsUpdater.Interval lastInterval; try (TrackPointIterator trackPointIterator = contentProviderUtils.getTrackPointLocationIterator(trackId, null)) { assertEquals(numberOfPoints, trackPointIterator.getCount()); - IntervalStatistics intervalStatistics = new IntervalStatistics(Distance.of(1000)); + IntervalStatisticsUpdater intervalStatistics = new IntervalStatisticsUpdater(Distance.of(1000)); intervalStatistics.addTrackPoints(trackPointIterator); lastInterval = intervalStatistics.getIntervalList().get(intervalStatistics.getIntervalList().size() - 1); } diff --git a/src/androidTest/java/de/dennisguse/opentracks/ui/intervals/IntervalStatisticsTest.java b/src/androidTest/java/de/dennisguse/opentracks/ui/intervals/IntervalStatisticsUpdaterTest.java similarity index 92% rename from src/androidTest/java/de/dennisguse/opentracks/ui/intervals/IntervalStatisticsTest.java rename to src/androidTest/java/de/dennisguse/opentracks/ui/intervals/IntervalStatisticsUpdaterTest.java index 5a263c61c..d9949a823 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/ui/intervals/IntervalStatisticsTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/ui/intervals/IntervalStatisticsUpdaterTest.java @@ -25,9 +25,9 @@ import de.dennisguse.opentracks.stats.SegmentStatisticUpdater; import de.dennisguse.opentracks.stats.TrackStatisticsUpdater; @RunWith(JUnit4.class) -public class IntervalStatisticsTest { +public class IntervalStatisticsUpdaterTest { - private static final String TAG = IntervalStatisticsTest.class.getSimpleName(); + private static final String TAG = IntervalStatisticsUpdaterTest.class.getSimpleName(); private final Context context = ApplicationProvider.getApplicationContext(); private ContentProviderUtils contentProviderUtils; @@ -148,19 +148,19 @@ public class IntervalStatisticsTest { } private void whenAndThen(Pair trackWithStats, int numberOfPoints, float distanceInterval) { - IntervalStatistics intervalStatistics = new IntervalStatistics(Distance.of(distanceInterval)); + IntervalStatisticsUpdater intervalStatistics = new IntervalStatisticsUpdater(Distance.of(distanceInterval)); Track.Id trackId = trackWithStats.first; SegmentStatisticUpdater trackStatistics = trackWithStats.second; try (TrackPointIterator trackPointIterator = contentProviderUtils.getTrackPointLocationIterator(trackId, null)) { assertEquals(trackPointIterator.getCount(), numberOfPoints); intervalStatistics.addTrackPoints(trackPointIterator); } - List intervalList = intervalStatistics.getIntervalList(); + List intervalList = intervalStatistics.getIntervalList(); Distance totalDistance = Distance.of(0); float totalTime = 0L; Float totalGain = null; Float totalLoss = null; - for (IntervalStatistics.Interval i : intervalList) { + for (IntervalStatisticsUpdater.Interval i : intervalList) { totalDistance = totalDistance.plus(i.getDistance()); totalTime += i.getDistance().toM() / i.getSpeed().toMPS(); @@ -184,12 +184,12 @@ public class IntervalStatisticsTest { if (totalGain != null) { assertEquals(totalGain, numberOfPoints * TestDataUtil.ALTITUDE_GAIN, 0.1); } else { - assertTrue(intervalStatistics.getIntervalList().stream().noneMatch(IntervalStatistics.Interval::hasGain)); + assertTrue(intervalStatistics.getIntervalList().stream().noneMatch(IntervalStatisticsUpdater.Interval::hasGain)); } if (totalLoss != null) { assertEquals(totalLoss, numberOfPoints * TestDataUtil.ALTITUDE_LOSS, 0.1); } else { - assertTrue(intervalStatistics.getIntervalList().stream().noneMatch(IntervalStatistics.Interval::hasLoss)); + assertTrue(intervalStatistics.getIntervalList().stream().noneMatch(IntervalStatisticsUpdater.Interval::hasLoss)); } for (int i = 0; i < intervalList.size() - 1; i++) { diff --git a/src/main/java/de/dennisguse/opentracks/services/announcement/VoiceAnnouncementManager.java b/src/main/java/de/dennisguse/opentracks/services/announcement/VoiceAnnouncementManager.java index 0382bdee5..99bd7e64b 100644 --- a/src/main/java/de/dennisguse/opentracks/services/announcement/VoiceAnnouncementManager.java +++ b/src/main/java/de/dennisguse/opentracks/services/announcement/VoiceAnnouncementManager.java @@ -38,7 +38,7 @@ import de.dennisguse.opentracks.data.models.TrackPoint; import de.dennisguse.opentracks.sensors.sensorData.SensorDataSet; import de.dennisguse.opentracks.settings.PreferencesUtils; import de.dennisguse.opentracks.stats.SensorStatistics; -import de.dennisguse.opentracks.ui.intervals.IntervalStatistics; +import de.dennisguse.opentracks.ui.intervals.IntervalStatisticsUpdater; /** * Execute a periodic task on a time or distance schedule. @@ -69,14 +69,14 @@ public class VoiceAnnouncementManager implements SharedPreferences.OnSharedPrefe private final ContentProviderUtils contentProviderUtils; private TrackPoint.Id startTrackPointId = null; - private IntervalStatistics intervalStatistics; + private IntervalStatisticsUpdater intervalStatistics; private Distance intervalDistance; public VoiceAnnouncementManager(@NonNull Context context) { this.context = context; contentProviderUtils = new ContentProviderUtils(context); intervalDistance = PreferencesUtils.getVoiceAnnouncementDistance(); - intervalStatistics = new IntervalStatistics(intervalDistance); + intervalStatistics = new IntervalStatisticsUpdater(intervalDistance); } public void start(@Nullable Statistics trackStatistics) { @@ -144,14 +144,14 @@ public class VoiceAnnouncementManager implements SharedPreferences.OnSharedPrefe private Spannable createAnnouncement(Track track, SensorDataSet sensorDataSet) { Distance currentIntervalDistance = PreferencesUtils.getVoiceAnnouncementDistance(); if (currentIntervalDistance != intervalDistance) { - intervalStatistics = new IntervalStatistics(currentIntervalDistance); + intervalStatistics = new IntervalStatisticsUpdater(currentIntervalDistance); intervalDistance = currentIntervalDistance; startTrackPointId = null; } TrackPointIterator trackPointIterator = new TrackPointIterator(contentProviderUtils, track.getId(), startTrackPointId); startTrackPointId = intervalStatistics.addTrackPoints(trackPointIterator); - IntervalStatistics.Interval lastInterval = intervalStatistics.getLastInterval(); + IntervalStatisticsUpdater.Interval lastInterval = intervalStatistics.getLastInterval(); SensorStatistics sensorStatistics = null; if (track.getId() != null) { sensorStatistics = contentProviderUtils.getSensorStats(track.getId()); diff --git a/src/main/java/de/dennisguse/opentracks/services/announcement/VoiceAnnouncementUtils.java b/src/main/java/de/dennisguse/opentracks/services/announcement/VoiceAnnouncementUtils.java index 7cb22c33b..7df5e430a 100644 --- a/src/main/java/de/dennisguse/opentracks/services/announcement/VoiceAnnouncementUtils.java +++ b/src/main/java/de/dennisguse/opentracks/services/announcement/VoiceAnnouncementUtils.java @@ -38,7 +38,7 @@ import de.dennisguse.opentracks.data.models.Track; import de.dennisguse.opentracks.sensors.sensorData.SensorDataSet; import de.dennisguse.opentracks.settings.UnitSystem; import de.dennisguse.opentracks.stats.SensorStatistics; -import de.dennisguse.opentracks.ui.intervals.IntervalStatistics; +import de.dennisguse.opentracks.ui.intervals.IntervalStatisticsUpdater; import de.dennisguse.opentracks.util.StringUtils; class VoiceAnnouncementUtils { @@ -51,7 +51,7 @@ class VoiceAnnouncementUtils { .append(context.getString(R.string.voiceIdle)); } - static Spannable createStatistics(Context context, Track track, SensorDataSet sensorDataSet, UnitSystem unitSystem, boolean isReportSpeed, @Nullable IntervalStatistics.Interval currentInterval, @Nullable SensorStatistics sensorStatistics) { + static Spannable createStatistics(Context context, Track track, SensorDataSet sensorDataSet, UnitSystem unitSystem, boolean isReportSpeed, @Nullable IntervalStatisticsUpdater.Interval currentInterval, @Nullable SensorStatistics sensorStatistics) { Statistics trackStatistics = track.getStatistics(); SpannableStringBuilder builder = new SpannableStringBuilder(); diff --git a/src/main/java/de/dennisguse/opentracks/ui/intervals/IntervalStatisticsAdapter.java b/src/main/java/de/dennisguse/opentracks/ui/intervals/IntervalStatisticsAdapter.java index 8de4d8ae1..1c495a681 100644 --- a/src/main/java/de/dennisguse/opentracks/ui/intervals/IntervalStatisticsAdapter.java +++ b/src/main/java/de/dennisguse/opentracks/ui/intervals/IntervalStatisticsAdapter.java @@ -18,7 +18,7 @@ import de.dennisguse.opentracks.util.StringUtils; public class IntervalStatisticsAdapter extends RecyclerView.Adapter { - private List intervalList; + private List intervalList; private final Context context; private final StackMode stackMode; private UnitSystem unitSystem; @@ -43,7 +43,7 @@ public class IntervalStatisticsAdapter extends RecyclerView.Adapter swapData(List data, UnitSystem unitSystem, boolean isReportSpeed) { + public List swapData(List data, UnitSystem unitSystem, boolean isReportSpeed) { this.unitSystem = unitSystem; this.isReportSpeed = isReportSpeed; intervalList = data; diff --git a/src/main/java/de/dennisguse/opentracks/ui/intervals/IntervalStatisticsModel.java b/src/main/java/de/dennisguse/opentracks/ui/intervals/IntervalStatisticsModel.java index 2bd1c892e..5c1d32395 100644 --- a/src/main/java/de/dennisguse/opentracks/ui/intervals/IntervalStatisticsModel.java +++ b/src/main/java/de/dennisguse/opentracks/ui/intervals/IntervalStatisticsModel.java @@ -32,8 +32,8 @@ public class IntervalStatisticsModel extends AndroidViewModel { private static final String TAG = IntervalStatisticsModel.class.getSimpleName(); - private MutableLiveData> intervalsLiveData; - private IntervalStatistics intervalStatistics; + private MutableLiveData> intervalsLiveData; + private IntervalStatisticsUpdater intervalStatistics; private Distance distanceInterval; private final ContentResolver contentResolver; private ContentObserver trackPointsTableObserver; @@ -65,7 +65,7 @@ public class IntervalStatisticsModel extends AndroidViewModel { handler = null; } - public MutableLiveData> getIntervalStats(Track.Id trackId, UnitSystem unitSystem, @Nullable IntervalOption interval) { + public MutableLiveData> getIntervalStats(Track.Id trackId, UnitSystem unitSystem, @Nullable IntervalOption interval) { if (intervalsLiveData == null) { if (interval == null) { interval = IntervalOption.OPTION_1; @@ -73,7 +73,7 @@ public class IntervalStatisticsModel extends AndroidViewModel { intervalsLiveData = new MutableLiveData<>(); distanceInterval = interval.getDistance(unitSystem); - intervalStatistics = new IntervalStatistics(distanceInterval); + intervalStatistics = new IntervalStatisticsUpdater(distanceInterval); loadIntervalStatistics(trackId); } @@ -112,7 +112,7 @@ public class IntervalStatisticsModel extends AndroidViewModel { lastTrackPointId = null; distanceInterval = interval.getDistance(unitSystem); - intervalStatistics = new IntervalStatistics(distanceInterval); + intervalStatistics = new IntervalStatisticsUpdater(distanceInterval); loadIntervalStatistics(trackId); } diff --git a/src/main/java/de/dennisguse/opentracks/ui/intervals/IntervalStatistics.java b/src/main/java/de/dennisguse/opentracks/ui/intervals/IntervalStatisticsUpdater.java similarity index 98% rename from src/main/java/de/dennisguse/opentracks/ui/intervals/IntervalStatistics.java rename to src/main/java/de/dennisguse/opentracks/ui/intervals/IntervalStatisticsUpdater.java index 99469b1e0..8295afa0f 100644 --- a/src/main/java/de/dennisguse/opentracks/ui/intervals/IntervalStatistics.java +++ b/src/main/java/de/dennisguse/opentracks/ui/intervals/IntervalStatisticsUpdater.java @@ -15,7 +15,7 @@ import de.dennisguse.opentracks.data.models.TrackPoint; import de.dennisguse.opentracks.stats.SegmentStatisticUpdater; import de.dennisguse.opentracks.stats.TrackStatisticsUpdater; -public class IntervalStatistics { +public class IntervalStatisticsUpdater { private TrackStatisticsUpdater trackStatisticsUpdater = new TrackStatisticsUpdater(); private final List intervalList; private final Distance distanceInterval; @@ -24,7 +24,7 @@ public class IntervalStatistics { /** * @param distanceInterval distance of every interval. */ - public IntervalStatistics(Distance distanceInterval) { + public IntervalStatisticsUpdater(Distance distanceInterval) { this.distanceInterval = distanceInterval; interval = new Interval(); diff --git a/src/main/java/de/dennisguse/opentracks/ui/intervals/IntervalsFragment.java b/src/main/java/de/dennisguse/opentracks/ui/intervals/IntervalsFragment.java index 7c814210e..c2281f67b 100644 --- a/src/main/java/de/dennisguse/opentracks/ui/intervals/IntervalsFragment.java +++ b/src/main/java/de/dennisguse/opentracks/ui/intervals/IntervalsFragment.java @@ -192,7 +192,7 @@ public class IntervalsFragment extends Fragment { } viewBinding.intervalRate.setText(isReportSpeed ? getString(R.string.stats_speed) : getString(R.string.stats_pace)); - LiveData> liveData = viewModel.getIntervalStats(trackId, unitSystem, selectedInterval); + LiveData> liveData = viewModel.getIntervalStats(trackId, unitSystem, selectedInterval); liveData.observe(getActivity(), intervalList -> adapter.swapData(intervalList, unitSystem, isReportSpeed)); setIntervalsDropdownText();