diff --git a/src/androidTest/java/de/dennisguse/opentracks/data/CustomContentProviderUtilsTest.java b/src/androidTest/java/de/dennisguse/opentracks/data/CustomContentProviderUtilsTest.java index f0532818b..a16977049 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/data/CustomContentProviderUtilsTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/data/CustomContentProviderUtilsTest.java @@ -66,7 +66,7 @@ import de.dennisguse.opentracks.data.models.TrackPoint; import de.dennisguse.opentracks.data.tables.MarkerColumns; import de.dennisguse.opentracks.data.tables.TrackPointsColumns; import de.dennisguse.opentracks.data.tables.TracksColumns; -import de.dennisguse.opentracks.stats.SensorStatistics; +import de.dennisguse.opentracks.data.statistics.SensorStatistics; import de.dennisguse.opentracks.util.FileUtils; /** 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 d36149770..38ea9bdb0 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/services/announcement/VoiceAnnouncementUtilsTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/services/announcement/VoiceAnnouncementUtilsTest.java @@ -37,7 +37,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.settings.UnitSystem; -import de.dennisguse.opentracks.stats.SensorStatistics; +import de.dennisguse.opentracks.data.statistics.SensorStatistics; import de.dennisguse.opentracks.ui.intervals.IntervalStatisticsUpdater; //Due to DateTimeFormatter using NBSP, these tests only work in SDK34+ diff --git a/src/androidTest/java/de/dennisguse/opentracks/stats/TrackStatisticsUpdaterTest.java b/src/androidTest/java/de/dennisguse/opentracks/stats/TrackStatisticsUpdaterTest.java index b9c9be8df..1224a96d9 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/stats/TrackStatisticsUpdaterTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/stats/TrackStatisticsUpdaterTest.java @@ -25,6 +25,7 @@ import de.dennisguse.opentracks.data.models.Speed; import de.dennisguse.opentracks.data.models.Statistics; import de.dennisguse.opentracks.data.models.Track; import de.dennisguse.opentracks.data.models.TrackPoint; +import de.dennisguse.opentracks.data.statistics.TrackStatisticsUpdater; @RunWith(AndroidJUnit4.class) public class TrackStatisticsUpdaterTest { diff --git a/src/androidTest/java/de/dennisguse/opentracks/ui/intervals/IntervalStatisticsUpdaterTest.java b/src/androidTest/java/de/dennisguse/opentracks/ui/intervals/IntervalStatisticsUpdaterTest.java index 84f38c98c..3149600b9 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/ui/intervals/IntervalStatisticsUpdaterTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/ui/intervals/IntervalStatisticsUpdaterTest.java @@ -19,7 +19,7 @@ import de.dennisguse.opentracks.data.models.Distance; import de.dennisguse.opentracks.data.models.Statistics; import de.dennisguse.opentracks.data.models.Track; import de.dennisguse.opentracks.data.models.TrackPoint; -import de.dennisguse.opentracks.stats.TrackStatisticsUpdater; +import de.dennisguse.opentracks.data.statistics.TrackStatisticsUpdater; @RunWith(JUnit4.class) public class IntervalStatisticsUpdaterTest { diff --git a/src/main/java/de/dennisguse/opentracks/chart/ChartFragment.java b/src/main/java/de/dennisguse/opentracks/chart/ChartFragment.java index ce2f75a67..1d521a57c 100644 --- a/src/main/java/de/dennisguse/opentracks/chart/ChartFragment.java +++ b/src/main/java/de/dennisguse/opentracks/chart/ChartFragment.java @@ -38,8 +38,8 @@ import de.dennisguse.opentracks.data.models.TrackPoint; import de.dennisguse.opentracks.databinding.ChartBinding; import de.dennisguse.opentracks.settings.PreferencesUtils; import de.dennisguse.opentracks.settings.UnitSystem; -import de.dennisguse.opentracks.stats.SegmentStatisticUpdater; -import de.dennisguse.opentracks.stats.TrackStatisticsUpdater; +import de.dennisguse.opentracks.data.statistics.SegmentStatisticUpdater; +import de.dennisguse.opentracks.data.statistics.TrackStatisticsUpdater; /** * A fragment to display track chart to the user. diff --git a/src/main/java/de/dennisguse/opentracks/chart/ChartValueSeries.java b/src/main/java/de/dennisguse/opentracks/chart/ChartValueSeries.java index 334870df2..4d6e73725 100644 --- a/src/main/java/de/dennisguse/opentracks/chart/ChartValueSeries.java +++ b/src/main/java/de/dennisguse/opentracks/chart/ChartValueSeries.java @@ -29,7 +29,7 @@ import androidx.core.content.ContextCompat; import java.text.NumberFormat; import de.dennisguse.opentracks.settings.UnitSystem; -import de.dennisguse.opentracks.stats.ExtremityMonitor; +import de.dennisguse.opentracks.data.statistics.ExtremityMonitor; /** * This class encapsulates the meta data for one series of the chart values. diff --git a/src/main/java/de/dennisguse/opentracks/chart/ChartView.java b/src/main/java/de/dennisguse/opentracks/chart/ChartView.java index c4c095a44..6c3e3e616 100644 --- a/src/main/java/de/dennisguse/opentracks/chart/ChartView.java +++ b/src/main/java/de/dennisguse/opentracks/chart/ChartView.java @@ -46,7 +46,7 @@ import java.util.List; import de.dennisguse.opentracks.R; import de.dennisguse.opentracks.settings.UnitSystem; -import de.dennisguse.opentracks.stats.ExtremityMonitor; +import de.dennisguse.opentracks.data.statistics.ExtremityMonitor; import de.dennisguse.opentracks.ui.util.ThemeUtils; import de.dennisguse.opentracks.util.StringUtils; diff --git a/src/main/java/de/dennisguse/opentracks/data/ContentProviderUtils.java b/src/main/java/de/dennisguse/opentracks/data/ContentProviderUtils.java index 1cf8e2c1b..7c0502f4e 100644 --- a/src/main/java/de/dennisguse/opentracks/data/ContentProviderUtils.java +++ b/src/main/java/de/dennisguse/opentracks/data/ContentProviderUtils.java @@ -54,7 +54,7 @@ import de.dennisguse.opentracks.data.models.TrackPoint; import de.dennisguse.opentracks.data.tables.MarkerColumns; import de.dennisguse.opentracks.data.tables.TrackPointsColumns; import de.dennisguse.opentracks.data.tables.TracksColumns; -import de.dennisguse.opentracks.stats.SensorStatistics; +import de.dennisguse.opentracks.data.statistics.SensorStatistics; import de.dennisguse.opentracks.ui.markers.MarkerUtils; import de.dennisguse.opentracks.util.FileUtils; diff --git a/src/main/java/de/dennisguse/opentracks/data/TrackDataHub.java b/src/main/java/de/dennisguse/opentracks/data/TrackDataHub.java index f83ac740d..6a60964da 100644 --- a/src/main/java/de/dennisguse/opentracks/data/TrackDataHub.java +++ b/src/main/java/de/dennisguse/opentracks/data/TrackDataHub.java @@ -38,7 +38,7 @@ import de.dennisguse.opentracks.data.tables.TracksColumns; import de.dennisguse.opentracks.services.RecordingStatus; import de.dennisguse.opentracks.services.TrackRecordingService; import de.dennisguse.opentracks.services.handlers.AltitudeCorrectionManager; -import de.dennisguse.opentracks.stats.TrackStatisticsUpdater; +import de.dennisguse.opentracks.data.statistics.TrackStatisticsUpdater; /** * Track data hub. diff --git a/src/main/java/de/dennisguse/opentracks/stats/ExtremityMonitor.java b/src/main/java/de/dennisguse/opentracks/data/statistics/ExtremityMonitor.java similarity index 98% rename from src/main/java/de/dennisguse/opentracks/stats/ExtremityMonitor.java rename to src/main/java/de/dennisguse/opentracks/data/statistics/ExtremityMonitor.java index e26c5fd37..ac7147034 100644 --- a/src/main/java/de/dennisguse/opentracks/stats/ExtremityMonitor.java +++ b/src/main/java/de/dennisguse/opentracks/data/statistics/ExtremityMonitor.java @@ -14,7 +14,7 @@ * the License. */ -package de.dennisguse.opentracks.stats; +package de.dennisguse.opentracks.data.statistics; import androidx.annotation.NonNull; diff --git a/src/main/java/de/dennisguse/opentracks/stats/SegmentStatisticUpdater.java b/src/main/java/de/dennisguse/opentracks/data/statistics/SegmentStatisticUpdater.java similarity index 99% rename from src/main/java/de/dennisguse/opentracks/stats/SegmentStatisticUpdater.java rename to src/main/java/de/dennisguse/opentracks/data/statistics/SegmentStatisticUpdater.java index 7cbf961a9..168d52b04 100644 --- a/src/main/java/de/dennisguse/opentracks/stats/SegmentStatisticUpdater.java +++ b/src/main/java/de/dennisguse/opentracks/data/statistics/SegmentStatisticUpdater.java @@ -14,7 +14,7 @@ * the License. */ -package de.dennisguse.opentracks.stats; +package de.dennisguse.opentracks.data.statistics; import androidx.annotation.NonNull; import androidx.annotation.VisibleForTesting; diff --git a/src/main/java/de/dennisguse/opentracks/stats/SensorStatistics.java b/src/main/java/de/dennisguse/opentracks/data/statistics/SensorStatistics.java similarity index 92% rename from src/main/java/de/dennisguse/opentracks/stats/SensorStatistics.java rename to src/main/java/de/dennisguse/opentracks/data/statistics/SensorStatistics.java index a1f432c2e..6737615a2 100644 --- a/src/main/java/de/dennisguse/opentracks/stats/SensorStatistics.java +++ b/src/main/java/de/dennisguse/opentracks/data/statistics/SensorStatistics.java @@ -1,4 +1,4 @@ -package de.dennisguse.opentracks.stats; +package de.dennisguse.opentracks.data.statistics; import de.dennisguse.opentracks.data.models.Cadence; import de.dennisguse.opentracks.data.models.HeartRate; diff --git a/src/main/java/de/dennisguse/opentracks/stats/TrackStatisticsUpdater.java b/src/main/java/de/dennisguse/opentracks/data/statistics/TrackStatisticsUpdater.java similarity index 99% rename from src/main/java/de/dennisguse/opentracks/stats/TrackStatisticsUpdater.java rename to src/main/java/de/dennisguse/opentracks/data/statistics/TrackStatisticsUpdater.java index af5a0657a..3e157e587 100644 --- a/src/main/java/de/dennisguse/opentracks/stats/TrackStatisticsUpdater.java +++ b/src/main/java/de/dennisguse/opentracks/data/statistics/TrackStatisticsUpdater.java @@ -14,7 +14,7 @@ * the License. */ -package de.dennisguse.opentracks.stats; +package de.dennisguse.opentracks.data.statistics; import androidx.annotation.NonNull; diff --git a/src/main/java/de/dennisguse/opentracks/fragments/StatisticsRecordedFragment.java b/src/main/java/de/dennisguse/opentracks/fragments/StatisticsRecordedFragment.java index 85b1f819d..df65360a7 100644 --- a/src/main/java/de/dennisguse/opentracks/fragments/StatisticsRecordedFragment.java +++ b/src/main/java/de/dennisguse/opentracks/fragments/StatisticsRecordedFragment.java @@ -39,7 +39,7 @@ import de.dennisguse.opentracks.data.models.TrackBuilder; import de.dennisguse.opentracks.databinding.StatisticsRecordedBinding; import de.dennisguse.opentracks.settings.PreferencesUtils; import de.dennisguse.opentracks.settings.UnitSystem; -import de.dennisguse.opentracks.stats.SensorStatistics; +import de.dennisguse.opentracks.data.statistics.SensorStatistics; import de.dennisguse.opentracks.util.StringUtils; /** diff --git a/src/main/java/de/dennisguse/opentracks/io/file/importer/GPXTrackImporter.java b/src/main/java/de/dennisguse/opentracks/io/file/importer/GPXTrackImporter.java index 4358e0c38..6c66673b6 100644 --- a/src/main/java/de/dennisguse/opentracks/io/file/importer/GPXTrackImporter.java +++ b/src/main/java/de/dennisguse/opentracks/io/file/importer/GPXTrackImporter.java @@ -38,7 +38,7 @@ import de.dennisguse.opentracks.data.models.Position; import de.dennisguse.opentracks.data.models.Speed; import de.dennisguse.opentracks.data.models.Track; import de.dennisguse.opentracks.data.models.TrackPoint; -import de.dennisguse.opentracks.stats.SegmentStatisticUpdater; +import de.dennisguse.opentracks.data.statistics.SegmentStatisticUpdater; import de.dennisguse.opentracks.util.StringUtils; /** diff --git a/src/main/java/de/dennisguse/opentracks/io/file/importer/TrackImporter.java b/src/main/java/de/dennisguse/opentracks/io/file/importer/TrackImporter.java index e597e53e4..69db9164a 100644 --- a/src/main/java/de/dennisguse/opentracks/io/file/importer/TrackImporter.java +++ b/src/main/java/de/dennisguse/opentracks/io/file/importer/TrackImporter.java @@ -9,7 +9,6 @@ import androidx.annotation.Nullable; import java.io.File; import java.time.Duration; -import java.time.Instant; import java.time.ZoneOffset; import java.util.ArrayList; import java.util.Collections; @@ -28,7 +27,7 @@ import de.dennisguse.opentracks.data.models.MarkerBuilder; import de.dennisguse.opentracks.data.models.Speed; import de.dennisguse.opentracks.data.models.Track; import de.dennisguse.opentracks.data.models.TrackPoint; -import de.dennisguse.opentracks.stats.TrackStatisticsUpdater; +import de.dennisguse.opentracks.data.statistics.TrackStatisticsUpdater; import de.dennisguse.opentracks.ui.markers.MarkerUtils; import de.dennisguse.opentracks.util.FileUtils; diff --git a/src/main/java/de/dennisguse/opentracks/services/TrackRecordingManager.java b/src/main/java/de/dennisguse/opentracks/services/TrackRecordingManager.java index 4e9523a6c..3efb13625 100644 --- a/src/main/java/de/dennisguse/opentracks/services/TrackRecordingManager.java +++ b/src/main/java/de/dennisguse/opentracks/services/TrackRecordingManager.java @@ -26,7 +26,7 @@ import de.dennisguse.opentracks.sensors.sensorData.SensorDataSet; import de.dennisguse.opentracks.services.handlers.AltitudeCorrectionManager; import de.dennisguse.opentracks.services.handlers.TrackPointCreator; import de.dennisguse.opentracks.settings.PreferencesUtils; -import de.dennisguse.opentracks.stats.TrackStatisticsUpdater; +import de.dennisguse.opentracks.data.statistics.TrackStatisticsUpdater; import de.dennisguse.opentracks.util.TrackNameUtils; public class TrackRecordingManager implements SharedPreferences.OnSharedPreferenceChangeListener { 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 56ac44598..af2e5b651 100644 --- a/src/main/java/de/dennisguse/opentracks/services/announcement/VoiceAnnouncementManager.java +++ b/src/main/java/de/dennisguse/opentracks/services/announcement/VoiceAnnouncementManager.java @@ -36,7 +36,7 @@ import de.dennisguse.opentracks.data.models.Statistics; import de.dennisguse.opentracks.data.models.TrackPoint; import de.dennisguse.opentracks.services.RecordingData; import de.dennisguse.opentracks.settings.PreferencesUtils; -import de.dennisguse.opentracks.stats.SensorStatistics; +import de.dennisguse.opentracks.data.statistics.SensorStatistics; import de.dennisguse.opentracks.ui.intervals.IntervalStatisticsUpdater; /** 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 667259d7b..1c17fc3e2 100644 --- a/src/main/java/de/dennisguse/opentracks/services/announcement/VoiceAnnouncementUtils.java +++ b/src/main/java/de/dennisguse/opentracks/services/announcement/VoiceAnnouncementUtils.java @@ -37,7 +37,7 @@ import de.dennisguse.opentracks.data.models.Statistics; 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.data.statistics.SensorStatistics; import de.dennisguse.opentracks.util.StringUtils; class VoiceAnnouncementUtils { diff --git a/src/main/java/de/dennisguse/opentracks/ui/intervals/IntervalStatisticsUpdater.java b/src/main/java/de/dennisguse/opentracks/ui/intervals/IntervalStatisticsUpdater.java index 3f4aafd30..6e4ea3619 100644 --- a/src/main/java/de/dennisguse/opentracks/ui/intervals/IntervalStatisticsUpdater.java +++ b/src/main/java/de/dennisguse/opentracks/ui/intervals/IntervalStatisticsUpdater.java @@ -13,7 +13,7 @@ import de.dennisguse.opentracks.data.models.HeartRate; import de.dennisguse.opentracks.data.models.Power; import de.dennisguse.opentracks.data.models.Statistics; import de.dennisguse.opentracks.data.models.TrackPoint; -import de.dennisguse.opentracks.stats.TrackStatisticsUpdater; +import de.dennisguse.opentracks.data.statistics.TrackStatisticsUpdater; public class IntervalStatisticsUpdater { private TrackStatisticsUpdater trackStatisticsUpdater;