diff --git a/src/androidTest/java/de/dennisguse/opentracks/chart/ChartPointTest.java b/src/androidTest/java/de/dennisguse/opentracks/chart/ChartPointTest.java index 833bc12d4..5289251b3 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/chart/ChartPointTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/chart/ChartPointTest.java @@ -10,10 +10,10 @@ import org.junit.runner.RunWith; import java.time.Duration; -import de.dennisguse.opentracks.content.data.Altitude; -import de.dennisguse.opentracks.content.data.Distance; -import de.dennisguse.opentracks.content.data.Speed; -import de.dennisguse.opentracks.content.data.TrackPoint; +import de.dennisguse.opentracks.data.models.Altitude; +import de.dennisguse.opentracks.data.models.Distance; +import de.dennisguse.opentracks.data.models.Speed; +import de.dennisguse.opentracks.data.models.TrackPoint; import de.dennisguse.opentracks.stats.TrackStatistics; @RunWith(AndroidJUnit4.class) diff --git a/src/androidTest/java/de/dennisguse/opentracks/chart/TrackStubUtils.java b/src/androidTest/java/de/dennisguse/opentracks/chart/TrackStubUtils.java index 7be84bc73..7ae4bb9d6 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/chart/TrackStubUtils.java +++ b/src/androidTest/java/de/dennisguse/opentracks/chart/TrackStubUtils.java @@ -18,9 +18,9 @@ package de.dennisguse.opentracks.chart; import java.time.Instant; -import de.dennisguse.opentracks.content.data.Distance; -import de.dennisguse.opentracks.content.data.Speed; -import de.dennisguse.opentracks.content.data.TrackPoint; +import de.dennisguse.opentracks.data.models.Distance; +import de.dennisguse.opentracks.data.models.Speed; +import de.dennisguse.opentracks.data.models.TrackPoint; /** * Commons utilities for creating stubs of track, location. diff --git a/src/androidTest/java/de/dennisguse/opentracks/content/DescriptionGeneratorTest.java b/src/androidTest/java/de/dennisguse/opentracks/content/DescriptionGeneratorTest.java index 0655de762..613f52bd7 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/content/DescriptionGeneratorTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/content/DescriptionGeneratorTest.java @@ -16,6 +16,8 @@ package de.dennisguse.opentracks.content; +import static org.junit.Assert.assertEquals; + import android.content.Context; import androidx.test.core.app.ApplicationProvider; @@ -31,14 +33,12 @@ import java.time.OffsetDateTime; import java.time.ZoneId; import de.dennisguse.opentracks.R; -import de.dennisguse.opentracks.content.data.Distance; -import de.dennisguse.opentracks.content.data.Speed; -import de.dennisguse.opentracks.content.data.Track; +import de.dennisguse.opentracks.data.models.Distance; +import de.dennisguse.opentracks.data.models.Speed; +import de.dennisguse.opentracks.data.models.Track; import de.dennisguse.opentracks.stats.TrackStatistics; import de.dennisguse.opentracks.util.StringUtils; -import static org.junit.Assert.assertEquals; - /** * Tests for {@link DescriptionGenerator}. * diff --git a/src/androidTest/java/de/dennisguse/opentracks/content/data/TestDataUtil.java b/src/androidTest/java/de/dennisguse/opentracks/content/data/TestDataUtil.java index 21c2af510..bb66cce06 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/content/data/TestDataUtil.java +++ b/src/androidTest/java/de/dennisguse/opentracks/content/data/TestDataUtil.java @@ -11,8 +11,13 @@ import java.time.Instant; import java.util.ArrayList; import java.util.List; -import de.dennisguse.opentracks.content.provider.ContentProviderUtils; -import de.dennisguse.opentracks.content.provider.TrackPointIterator; +import de.dennisguse.opentracks.data.ContentProviderUtils; +import de.dennisguse.opentracks.data.TrackPointIterator; +import de.dennisguse.opentracks.data.models.Distance; +import de.dennisguse.opentracks.data.models.Marker; +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.TrackStatistics; import de.dennisguse.opentracks.stats.TrackStatisticsUpdater; import de.dennisguse.opentracks.util.FileUtils; diff --git a/src/androidTest/java/de/dennisguse/opentracks/content/data/TestSensorDataUtil.java b/src/androidTest/java/de/dennisguse/opentracks/content/data/TestSensorDataUtil.java index c48e96576..1b56ea7d6 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/content/data/TestSensorDataUtil.java +++ b/src/androidTest/java/de/dennisguse/opentracks/content/data/TestSensorDataUtil.java @@ -5,6 +5,10 @@ import java.time.Instant; import java.util.ArrayList; import java.util.List; +import de.dennisguse.opentracks.data.models.Distance; +import de.dennisguse.opentracks.data.models.Speed; +import de.dennisguse.opentracks.data.models.TrackPoint; + public class TestSensorDataUtil { private final List trackPointList = new ArrayList<>(); diff --git a/src/androidTest/java/de/dennisguse/opentracks/content/sensor/SensorDataCyclingTest.java b/src/androidTest/java/de/dennisguse/opentracks/content/sensor/SensorDataCyclingTest.java index 6e0000199..7eba6febe 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/content/sensor/SensorDataCyclingTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/content/sensor/SensorDataCyclingTest.java @@ -11,7 +11,7 @@ import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; -import de.dennisguse.opentracks.content.data.Distance; +import de.dennisguse.opentracks.data.models.Distance; import de.dennisguse.opentracks.services.sensors.UintUtils; @RunWith(AndroidJUnit4.class) diff --git a/src/androidTest/java/de/dennisguse/opentracks/content/provider/CustomContentProviderTest.java b/src/androidTest/java/de/dennisguse/opentracks/data/CustomContentProviderTest.java similarity index 91% rename from src/androidTest/java/de/dennisguse/opentracks/content/provider/CustomContentProviderTest.java rename to src/androidTest/java/de/dennisguse/opentracks/data/CustomContentProviderTest.java index 26e4b9d1a..213cc2199 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/content/provider/CustomContentProviderTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/data/CustomContentProviderTest.java @@ -14,7 +14,10 @@ * the License. */ -package de.dennisguse.opentracks.content.provider; +package de.dennisguse.opentracks.data; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; import android.content.ContentUris; import android.content.Context; @@ -25,12 +28,9 @@ import androidx.test.core.app.ApplicationProvider; import org.junit.Before; import org.junit.Test; -import de.dennisguse.opentracks.content.data.MarkerColumns; -import de.dennisguse.opentracks.content.data.TrackPointsColumns; -import de.dennisguse.opentracks.content.data.TracksColumns; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import de.dennisguse.opentracks.data.tables.MarkerColumns; +import de.dennisguse.opentracks.data.tables.TrackPointsColumns; +import de.dennisguse.opentracks.data.tables.TracksColumns; /** * Tests {@link CustomContentProvider}. diff --git a/src/androidTest/java/de/dennisguse/opentracks/content/provider/CustomContentProviderUtilsTest.java b/src/androidTest/java/de/dennisguse/opentracks/data/CustomContentProviderUtilsTest.java similarity index 99% rename from src/androidTest/java/de/dennisguse/opentracks/content/provider/CustomContentProviderUtilsTest.java rename to src/androidTest/java/de/dennisguse/opentracks/data/CustomContentProviderUtilsTest.java index 9842c0d95..c05bdf244 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/content/provider/CustomContentProviderUtilsTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/data/CustomContentProviderUtilsTest.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package de.dennisguse.opentracks.content.provider; +package de.dennisguse.opentracks.data; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -49,16 +49,16 @@ import java.util.Random; import java.util.UUID; import java.util.stream.Collectors; -import de.dennisguse.opentracks.content.data.Distance; -import de.dennisguse.opentracks.content.data.Marker; -import de.dennisguse.opentracks.content.data.MarkerColumns; -import de.dennisguse.opentracks.content.data.Speed; import de.dennisguse.opentracks.content.data.TestDataUtil; import de.dennisguse.opentracks.content.data.TestSensorDataUtil; -import de.dennisguse.opentracks.content.data.Track; -import de.dennisguse.opentracks.content.data.TrackPoint; -import de.dennisguse.opentracks.content.data.TrackPointsColumns; -import de.dennisguse.opentracks.content.data.TracksColumns; +import de.dennisguse.opentracks.data.models.Distance; +import de.dennisguse.opentracks.data.models.Marker; +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.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.stats.TrackStatistics; import de.dennisguse.opentracks.util.FileUtils; diff --git a/src/androidTest/java/de/dennisguse/opentracks/content/provider/CustomSQLiteOpenHelperTest.java b/src/androidTest/java/de/dennisguse/opentracks/data/CustomSQLiteOpenHelperTest.java similarity index 98% rename from src/androidTest/java/de/dennisguse/opentracks/content/provider/CustomSQLiteOpenHelperTest.java rename to src/androidTest/java/de/dennisguse/opentracks/data/CustomSQLiteOpenHelperTest.java index cfab30ab6..cdfd90d5d 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/content/provider/CustomSQLiteOpenHelperTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/data/CustomSQLiteOpenHelperTest.java @@ -1,4 +1,8 @@ -package de.dennisguse.opentracks.content.provider; +package de.dennisguse.opentracks.data; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; import android.content.Context; import android.database.Cursor; @@ -20,13 +24,9 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import de.dennisguse.opentracks.content.data.MarkerColumns; -import de.dennisguse.opentracks.content.data.TrackPointsColumns; -import de.dennisguse.opentracks.content.data.TracksColumns; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import de.dennisguse.opentracks.data.tables.MarkerColumns; +import de.dennisguse.opentracks.data.tables.TrackPointsColumns; +import de.dennisguse.opentracks.data.tables.TracksColumns; @RunWith(AndroidJUnit4.class) public class CustomSQLiteOpenHelperTest { diff --git a/src/androidTest/java/de/dennisguse/opentracks/content/provider/ShareContentProviderTest.java b/src/androidTest/java/de/dennisguse/opentracks/data/ShareContentProviderTest.java similarity index 93% rename from src/androidTest/java/de/dennisguse/opentracks/content/provider/ShareContentProviderTest.java rename to src/androidTest/java/de/dennisguse/opentracks/data/ShareContentProviderTest.java index 5a4b51c8c..c5e22120c 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/content/provider/ShareContentProviderTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/data/ShareContentProviderTest.java @@ -1,4 +1,6 @@ -package de.dennisguse.opentracks.content.provider; +package de.dennisguse.opentracks.data; + +import static org.junit.Assert.assertEquals; import android.net.Uri; import android.util.Pair; @@ -8,11 +10,9 @@ import org.junit.Test; import java.util.HashSet; import java.util.Set; -import de.dennisguse.opentracks.content.data.Track; +import de.dennisguse.opentracks.data.models.Track; import de.dennisguse.opentracks.io.file.TrackFileFormat; -import static org.junit.Assert.assertEquals; - public class ShareContentProviderTest { @Test diff --git a/src/androidTest/java/de/dennisguse/opentracks/content/data/TrackSelectionTest.java b/src/androidTest/java/de/dennisguse/opentracks/data/TrackSelectionTest.java similarity index 98% rename from src/androidTest/java/de/dennisguse/opentracks/content/data/TrackSelectionTest.java rename to src/androidTest/java/de/dennisguse/opentracks/data/TrackSelectionTest.java index 6b7f2ccde..e73ca914e 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/content/data/TrackSelectionTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/data/TrackSelectionTest.java @@ -1,4 +1,4 @@ -package de.dennisguse.opentracks.content.data; +package de.dennisguse.opentracks.data; import androidx.test.ext.junit.runners.AndroidJUnit4; @@ -9,7 +9,7 @@ import org.junit.runner.RunWith; import java.time.Instant; -import de.dennisguse.opentracks.content.provider.SelectionData; +import de.dennisguse.opentracks.data.models.Track; @RunWith(AndroidJUnit4.class) public class TrackSelectionTest extends TestCase { diff --git a/src/androidTest/java/de/dennisguse/opentracks/content/provider/UUIDUtilsTest.java b/src/androidTest/java/de/dennisguse/opentracks/data/UUIDUtilsTest.java similarity index 90% rename from src/androidTest/java/de/dennisguse/opentracks/content/provider/UUIDUtilsTest.java rename to src/androidTest/java/de/dennisguse/opentracks/data/UUIDUtilsTest.java index ce6149301..440910dfc 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/content/provider/UUIDUtilsTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/data/UUIDUtilsTest.java @@ -1,4 +1,4 @@ -package de.dennisguse.opentracks.content.provider; +package de.dennisguse.opentracks.data; import static org.junit.Assert.assertEquals; diff --git a/src/androidTest/java/de/dennisguse/opentracks/content/data/TrackPointTest.java b/src/androidTest/java/de/dennisguse/opentracks/data/model/TrackPointTest.java similarity index 91% rename from src/androidTest/java/de/dennisguse/opentracks/content/data/TrackPointTest.java rename to src/androidTest/java/de/dennisguse/opentracks/data/model/TrackPointTest.java index 7f5987829..e90456f5a 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/content/data/TrackPointTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/data/model/TrackPointTest.java @@ -1,13 +1,16 @@ -package de.dennisguse.opentracks.content.data; +package de.dennisguse.opentracks.data.model; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; import org.junit.Test; import java.time.Instant; import java.time.temporal.ChronoUnit; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import de.dennisguse.opentracks.data.models.Distance; +import de.dennisguse.opentracks.data.models.TrackPoint; public class TrackPointTest { diff --git a/src/androidTest/java/de/dennisguse/opentracks/io/file/exporter/KmlTrackExporterTest.java b/src/androidTest/java/de/dennisguse/opentracks/io/file/exporter/KmlTrackExporterTest.java index ba4533995..e8c8000e9 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/io/file/exporter/KmlTrackExporterTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/io/file/exporter/KmlTrackExporterTest.java @@ -14,7 +14,7 @@ import java.io.ByteArrayOutputStream; import java.time.Instant; import java.time.ZoneOffset; -import de.dennisguse.opentracks.content.data.TrackPoint; +import de.dennisguse.opentracks.data.models.TrackPoint; import de.dennisguse.opentracks.io.file.TrackFileFormat; @RunWith(JUnit4.class) diff --git a/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/ExportImportTest.java b/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/ExportImportTest.java index 0183bd4cd..def39d969 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/ExportImportTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/ExportImportTest.java @@ -38,17 +38,17 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import de.dennisguse.opentracks.R; -import de.dennisguse.opentracks.content.data.Distance; -import de.dennisguse.opentracks.content.data.Marker; -import de.dennisguse.opentracks.content.data.Speed; import de.dennisguse.opentracks.content.data.TestDataUtil; -import de.dennisguse.opentracks.content.data.Track; -import de.dennisguse.opentracks.content.data.TrackPoint; -import de.dennisguse.opentracks.content.provider.ContentProviderUtils; import de.dennisguse.opentracks.content.sensor.SensorDataCycling; import de.dennisguse.opentracks.content.sensor.SensorDataCyclingPower; import de.dennisguse.opentracks.content.sensor.SensorDataHeartRate; import de.dennisguse.opentracks.content.sensor.SensorDataSet; +import de.dennisguse.opentracks.data.ContentProviderUtils; +import de.dennisguse.opentracks.data.models.Distance; +import de.dennisguse.opentracks.data.models.Marker; +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.io.file.TrackFileFormat; import de.dennisguse.opentracks.io.file.exporter.TrackExporter; import de.dennisguse.opentracks.services.TrackRecordingService; diff --git a/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/GPXImportTest.java b/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/GPXImportTest.java index 3466aa374..e694cf3e7 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/GPXImportTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/GPXImportTest.java @@ -1,5 +1,8 @@ package de.dennisguse.opentracks.io.file.importer; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + import android.content.Context; import androidx.test.core.app.ApplicationProvider; @@ -18,17 +21,14 @@ import java.time.Duration; import java.time.Instant; import java.util.List; -import de.dennisguse.opentracks.content.data.Distance; -import de.dennisguse.opentracks.content.data.Speed; import de.dennisguse.opentracks.content.data.TestDataUtil; -import de.dennisguse.opentracks.content.data.Track; -import de.dennisguse.opentracks.content.data.TrackPoint; -import de.dennisguse.opentracks.content.provider.ContentProviderUtils; +import de.dennisguse.opentracks.data.ContentProviderUtils; +import de.dennisguse.opentracks.data.models.Distance; +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.TrackStatistics; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; - /** * Test that legacy KML/GPX formats can still be imported. */ diff --git a/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/KMLImportTest.java b/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/KMLImportTest.java index c49a6a76e..1f2b06165 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/KMLImportTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/KMLImportTest.java @@ -1,5 +1,8 @@ package de.dennisguse.opentracks.io.file.importer; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + import android.content.Context; import androidx.test.core.app.ApplicationProvider; @@ -17,15 +20,12 @@ import java.io.InputStream; import java.time.Instant; import java.util.List; -import de.dennisguse.opentracks.content.data.Distance; -import de.dennisguse.opentracks.content.data.Speed; import de.dennisguse.opentracks.content.data.TestDataUtil; -import de.dennisguse.opentracks.content.data.Track; -import de.dennisguse.opentracks.content.data.TrackPoint; -import de.dennisguse.opentracks.content.provider.ContentProviderUtils; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import de.dennisguse.opentracks.data.ContentProviderUtils; +import de.dennisguse.opentracks.data.models.Distance; +import de.dennisguse.opentracks.data.models.Speed; +import de.dennisguse.opentracks.data.models.Track; +import de.dennisguse.opentracks.data.models.TrackPoint; /** * Test that legacy KML/GPX formats can still be imported. diff --git a/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/TrackPointAssert.java b/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/TrackPointAssert.java index cf274a162..3f0eb62f9 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/TrackPointAssert.java +++ b/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/TrackPointAssert.java @@ -4,7 +4,7 @@ import org.junit.Assert; import java.util.List; -import de.dennisguse.opentracks.content.data.TrackPoint; +import de.dennisguse.opentracks.data.models.TrackPoint; public class TrackPointAssert { diff --git a/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceNotificationManagerTest.java b/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceNotificationManagerTest.java index 5e14c577e..f5d27efbe 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceNotificationManagerTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceNotificationManagerTest.java @@ -1,5 +1,10 @@ package de.dennisguse.opentracks.services; +import static org.mockito.ArgumentMatchers.anyBoolean; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + import android.app.NotificationManager; import android.content.Context; @@ -11,16 +16,11 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; -import de.dennisguse.opentracks.content.data.Distance; -import de.dennisguse.opentracks.content.data.Speed; -import de.dennisguse.opentracks.content.data.TrackPoint; +import de.dennisguse.opentracks.data.models.Distance; +import de.dennisguse.opentracks.data.models.Speed; +import de.dennisguse.opentracks.data.models.TrackPoint; import de.dennisguse.opentracks.stats.TrackStatistics; -import static org.mockito.ArgumentMatchers.anyBoolean; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - @RunWith(MockitoJUnitRunner.class) public class TrackRecordingServiceNotificationManagerTest { diff --git a/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceTestMarker.java b/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceTestMarker.java index c235f1b45..b883b541b 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceTestMarker.java +++ b/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceTestMarker.java @@ -45,10 +45,10 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import de.dennisguse.opentracks.R; -import de.dennisguse.opentracks.content.data.Marker; -import de.dennisguse.opentracks.content.data.Track; -import de.dennisguse.opentracks.content.data.TrackPoint; -import de.dennisguse.opentracks.content.provider.ContentProviderUtils; +import de.dennisguse.opentracks.data.ContentProviderUtils; +import de.dennisguse.opentracks.data.models.Marker; +import de.dennisguse.opentracks.data.models.Track; +import de.dennisguse.opentracks.data.models.TrackPoint; import de.dennisguse.opentracks.services.handlers.TrackPointCreator; @RunWith(AndroidJUnit4.class) diff --git a/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceTestRecording.java b/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceTestRecording.java index e5b031596..48be5fbe6 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceTestRecording.java +++ b/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceTestRecording.java @@ -28,13 +28,13 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import de.dennisguse.opentracks.R; -import de.dennisguse.opentracks.content.data.Distance; -import de.dennisguse.opentracks.content.data.Speed; import de.dennisguse.opentracks.content.data.TestDataUtil; -import de.dennisguse.opentracks.content.data.Track; -import de.dennisguse.opentracks.content.data.TrackPoint; -import de.dennisguse.opentracks.content.provider.ContentProviderUtils; import de.dennisguse.opentracks.content.sensor.SensorDataRunning; +import de.dennisguse.opentracks.data.ContentProviderUtils; +import de.dennisguse.opentracks.data.models.Distance; +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.io.file.importer.TrackPointAssert; import de.dennisguse.opentracks.services.handlers.TrackPointCreator; import de.dennisguse.opentracks.services.sensors.AltitudeSumManager; diff --git a/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceTestStateMachine.java b/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceTestStateMachine.java index 2bf8fbf3f..0280d7cd9 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceTestStateMachine.java +++ b/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceTestStateMachine.java @@ -45,8 +45,8 @@ import java.util.List; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import de.dennisguse.opentracks.content.data.Track; -import de.dennisguse.opentracks.content.provider.ContentProviderUtils; +import de.dennisguse.opentracks.data.ContentProviderUtils; +import de.dennisguse.opentracks.data.models.Track; import de.dennisguse.opentracks.services.handlers.GpsStatusValue; /** diff --git a/src/androidTest/java/de/dennisguse/opentracks/services/announcement/VoiceAnnouncementManagerTest.java b/src/androidTest/java/de/dennisguse/opentracks/services/announcement/VoiceAnnouncementManagerTest.java index 31a42d57b..712eee626 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/services/announcement/VoiceAnnouncementManagerTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/services/announcement/VoiceAnnouncementManagerTest.java @@ -21,7 +21,7 @@ import java.time.Duration; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import de.dennisguse.opentracks.content.data.Distance; +import de.dennisguse.opentracks.data.models.Distance; import de.dennisguse.opentracks.services.TrackRecordingService; import de.dennisguse.opentracks.stats.TrackStatistics; 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 815068911..055e5892d 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/services/announcement/VoiceAnnouncementUtilsTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/services/announcement/VoiceAnnouncementUtilsTest.java @@ -15,12 +15,12 @@ import org.junit.runner.RunWith; import java.time.Duration; -import de.dennisguse.opentracks.content.data.Distance; -import de.dennisguse.opentracks.content.data.Speed; import de.dennisguse.opentracks.content.data.TestDataUtil; -import de.dennisguse.opentracks.content.data.Track; -import de.dennisguse.opentracks.content.provider.ContentProviderUtils; -import de.dennisguse.opentracks.content.provider.TrackPointIterator; +import de.dennisguse.opentracks.data.ContentProviderUtils; +import de.dennisguse.opentracks.data.TrackPointIterator; +import de.dennisguse.opentracks.data.models.Distance; +import de.dennisguse.opentracks.data.models.Speed; +import de.dennisguse.opentracks.data.models.Track; import de.dennisguse.opentracks.stats.TrackStatistics; import de.dennisguse.opentracks.ui.intervals.IntervalStatistics; import de.dennisguse.opentracks.util.StringUtils; diff --git a/src/androidTest/java/de/dennisguse/opentracks/services/handlers/GPSHandlerTest.java b/src/androidTest/java/de/dennisguse/opentracks/services/handlers/GPSHandlerTest.java index dd13ba5db..ecee709d2 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/services/handlers/GPSHandlerTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/services/handlers/GPSHandlerTest.java @@ -21,8 +21,8 @@ import org.mockito.junit.MockitoJUnitRunner; import java.time.Instant; -import de.dennisguse.opentracks.content.data.Distance; -import de.dennisguse.opentracks.content.data.TrackPoint; +import de.dennisguse.opentracks.data.models.Distance; +import de.dennisguse.opentracks.data.models.TrackPoint; import de.dennisguse.opentracks.settings.PreferencesUtils; @RunWith(MockitoJUnitRunner.class) diff --git a/src/androidTest/java/de/dennisguse/opentracks/services/handlers/TrackPointCreatorTest.java b/src/androidTest/java/de/dennisguse/opentracks/services/handlers/TrackPointCreatorTest.java index 3d3db731a..0768e0884 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/services/handlers/TrackPointCreatorTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/services/handlers/TrackPointCreatorTest.java @@ -12,8 +12,8 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; -import de.dennisguse.opentracks.content.data.Distance; -import de.dennisguse.opentracks.content.data.TrackPoint; +import de.dennisguse.opentracks.data.models.Distance; +import de.dennisguse.opentracks.data.models.TrackPoint; @RunWith(MockitoJUnitRunner.class) public class TrackPointCreatorTest { diff --git a/src/androidTest/java/de/dennisguse/opentracks/services/sensors/BluetoothUtilsTest.java b/src/androidTest/java/de/dennisguse/opentracks/services/sensors/BluetoothUtilsTest.java index 2b6bca0a5..6d94b446f 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/services/sensors/BluetoothUtilsTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/services/sensors/BluetoothUtilsTest.java @@ -7,10 +7,10 @@ import android.bluetooth.BluetoothGattCharacteristic; import org.junit.Test; -import de.dennisguse.opentracks.content.data.Distance; -import de.dennisguse.opentracks.content.data.Speed; import de.dennisguse.opentracks.content.sensor.SensorDataCycling; import de.dennisguse.opentracks.content.sensor.SensorDataRunning; +import de.dennisguse.opentracks.data.models.Distance; +import de.dennisguse.opentracks.data.models.Speed; public class BluetoothUtilsTest { diff --git a/src/androidTest/java/de/dennisguse/opentracks/stats/TrackStatisticsTest.java b/src/androidTest/java/de/dennisguse/opentracks/stats/TrackStatisticsTest.java index 27df9a6b0..7688f107d 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/stats/TrackStatisticsTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/stats/TrackStatisticsTest.java @@ -15,6 +15,9 @@ */ package de.dennisguse.opentracks.stats; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; + import androidx.test.ext.junit.runners.AndroidJUnit4; import org.junit.Before; @@ -24,11 +27,8 @@ import org.junit.runner.RunWith; import java.time.Duration; import java.time.Instant; -import de.dennisguse.opentracks.content.data.Distance; -import de.dennisguse.opentracks.content.data.Speed; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; +import de.dennisguse.opentracks.data.models.Distance; +import de.dennisguse.opentracks.data.models.Speed; /** * Tests for {@link TrackStatistics}. diff --git a/src/androidTest/java/de/dennisguse/opentracks/stats/TrackStatisticsUpdaterTest.java b/src/androidTest/java/de/dennisguse/opentracks/stats/TrackStatisticsUpdaterTest.java index 35fe9795c..9f97530aa 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/stats/TrackStatisticsUpdaterTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/stats/TrackStatisticsUpdaterTest.java @@ -12,12 +12,12 @@ import org.junit.runner.RunWith; import java.time.Duration; import java.time.Instant; -import de.dennisguse.opentracks.content.data.Altitude; -import de.dennisguse.opentracks.content.data.Distance; -import de.dennisguse.opentracks.content.data.Speed; import de.dennisguse.opentracks.content.data.TestDataUtil; -import de.dennisguse.opentracks.content.data.Track; -import de.dennisguse.opentracks.content.data.TrackPoint; +import de.dennisguse.opentracks.data.models.Altitude; +import de.dennisguse.opentracks.data.models.Distance; +import de.dennisguse.opentracks.data.models.Speed; +import de.dennisguse.opentracks.data.models.Track; +import de.dennisguse.opentracks.data.models.TrackPoint; @RunWith(AndroidJUnit4.class) public class TrackStatisticsUpdaterTest { diff --git a/src/androidTest/java/de/dennisguse/opentracks/ui/aggregatedStatistics/AggregatedStatisticsTest.java b/src/androidTest/java/de/dennisguse/opentracks/ui/aggregatedStatistics/AggregatedStatisticsTest.java index 5debc79cc..42a53fc2a 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/ui/aggregatedStatistics/AggregatedStatisticsTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/ui/aggregatedStatistics/AggregatedStatisticsTest.java @@ -16,9 +16,9 @@ import java.time.Instant; import java.util.List; import de.dennisguse.opentracks.R; -import de.dennisguse.opentracks.content.data.Distance; -import de.dennisguse.opentracks.content.data.Speed; -import de.dennisguse.opentracks.content.data.Track; +import de.dennisguse.opentracks.data.models.Distance; +import de.dennisguse.opentracks.data.models.Speed; +import de.dennisguse.opentracks.data.models.Track; import de.dennisguse.opentracks.stats.TrackStatistics; import de.dennisguse.opentracks.util.TrackIconUtils; diff --git a/src/androidTest/java/de/dennisguse/opentracks/ui/aggregatedStatistics/EspressoAggregatedFilterTest.java b/src/androidTest/java/de/dennisguse/opentracks/ui/aggregatedStatistics/EspressoAggregatedFilterTest.java index 92df09765..91cee8049 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/ui/aggregatedStatistics/EspressoAggregatedFilterTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/ui/aggregatedStatistics/EspressoAggregatedFilterTest.java @@ -32,9 +32,9 @@ import java.util.List; import de.dennisguse.opentracks.R; import de.dennisguse.opentracks.TrackListActivity; import de.dennisguse.opentracks.content.data.TestDataUtil; -import de.dennisguse.opentracks.content.data.Track; -import de.dennisguse.opentracks.content.data.TrackPoint; -import de.dennisguse.opentracks.content.provider.ContentProviderUtils; +import de.dennisguse.opentracks.data.ContentProviderUtils; +import de.dennisguse.opentracks.data.models.Track; +import de.dennisguse.opentracks.data.models.TrackPoint; @LargeTest @RunWith(AndroidJUnit4.class) diff --git a/src/androidTest/java/de/dennisguse/opentracks/ui/intervals/IntervalStatisticsTest.java b/src/androidTest/java/de/dennisguse/opentracks/ui/intervals/IntervalStatisticsTest.java index 7aa61ea41..c1e9e9bc6 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/ui/intervals/IntervalStatisticsTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/ui/intervals/IntervalStatisticsTest.java @@ -15,13 +15,13 @@ import org.junit.runners.JUnit4; import java.util.List; -import de.dennisguse.opentracks.content.data.Distance; import de.dennisguse.opentracks.content.data.TestDataUtil; -import de.dennisguse.opentracks.content.data.Track; -import de.dennisguse.opentracks.content.data.TrackPoint; -import de.dennisguse.opentracks.content.data.UnitConversions; -import de.dennisguse.opentracks.content.provider.ContentProviderUtils; -import de.dennisguse.opentracks.content.provider.TrackPointIterator; +import de.dennisguse.opentracks.data.ContentProviderUtils; +import de.dennisguse.opentracks.data.TrackPointIterator; +import de.dennisguse.opentracks.data.models.Distance; +import de.dennisguse.opentracks.data.models.Track; +import de.dennisguse.opentracks.data.models.TrackPoint; +import de.dennisguse.opentracks.data.models.UnitConversions; import de.dennisguse.opentracks.stats.TrackStatistics; import de.dennisguse.opentracks.stats.TrackStatisticsUpdater; diff --git a/src/androidTest/java/de/dennisguse/opentracks/util/EGM2008UtilsTest.java b/src/androidTest/java/de/dennisguse/opentracks/util/EGM2008UtilsTest.java index a64c93e31..f36b42c8a 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/util/EGM2008UtilsTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/util/EGM2008UtilsTest.java @@ -1,5 +1,8 @@ package de.dennisguse.opentracks.util; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotEquals; + import android.content.Context; import androidx.test.core.app.ApplicationProvider; @@ -16,10 +19,7 @@ import java.io.InputStreamReader; import java.nio.charset.StandardCharsets; import java.time.Instant; -import de.dennisguse.opentracks.content.data.TrackPoint; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotEquals; +import de.dennisguse.opentracks.data.models.TrackPoint; @RunWith(JUnit4.class) public class EGM2008UtilsTest { diff --git a/src/androidTest/java/de/dennisguse/opentracks/util/StringUtilsTest.java b/src/androidTest/java/de/dennisguse/opentracks/util/StringUtilsTest.java index 1e6feaf53..0dae88cb6 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/util/StringUtilsTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/util/StringUtilsTest.java @@ -45,8 +45,8 @@ import java.util.Locale; import java.util.TimeZone; import java.util.stream.Collectors; -import de.dennisguse.opentracks.content.data.Distance; -import de.dennisguse.opentracks.content.data.Speed; +import de.dennisguse.opentracks.data.models.Distance; +import de.dennisguse.opentracks.data.models.Speed; /** * Tests for {@link StringUtils}. diff --git a/src/androidTest/java/de/dennisguse/opentracks/util/TrackNameUtilsTest.java b/src/androidTest/java/de/dennisguse/opentracks/util/TrackNameUtilsTest.java index a0c8fb095..295491481 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/util/TrackNameUtilsTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/util/TrackNameUtilsTest.java @@ -26,11 +26,10 @@ import androidx.test.ext.junit.runners.AndroidJUnit4; import org.junit.Test; import org.junit.runner.RunWith; -import java.time.LocalDateTime; import java.time.OffsetDateTime; import de.dennisguse.opentracks.R; -import de.dennisguse.opentracks.content.data.Track; +import de.dennisguse.opentracks.data.models.Track; import de.dennisguse.opentracks.settings.PreferencesUtils; /** diff --git a/src/androidTest/java/de/dennisguse/opentracks/viewmodels/StatisticDataBuilderTest.java b/src/androidTest/java/de/dennisguse/opentracks/viewmodels/StatisticDataBuilderTest.java index ae66ed979..56ec4163d 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/viewmodels/StatisticDataBuilderTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/viewmodels/StatisticDataBuilderTest.java @@ -17,8 +17,8 @@ import java.time.Duration; import java.util.List; import de.dennisguse.opentracks.R; -import de.dennisguse.opentracks.content.data.Distance; -import de.dennisguse.opentracks.content.data.Track; +import de.dennisguse.opentracks.data.models.Distance; +import de.dennisguse.opentracks.data.models.Track; import de.dennisguse.opentracks.services.TrackRecordingService; import de.dennisguse.opentracks.stats.SensorStatistics; import de.dennisguse.opentracks.stats.TrackStatistics; diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml index 1384c416b..4562ad8bd 100644 --- a/src/main/AndroidManifest.xml +++ b/src/main/AndroidManifest.xml @@ -345,7 +345,7 @@ limitations under the License. diff --git a/src/main/java/de/dennisguse/opentracks/AbstractTrackDeleteActivity.java b/src/main/java/de/dennisguse/opentracks/AbstractTrackDeleteActivity.java index 8fcb7d270..ffe7ba307 100644 --- a/src/main/java/de/dennisguse/opentracks/AbstractTrackDeleteActivity.java +++ b/src/main/java/de/dennisguse/opentracks/AbstractTrackDeleteActivity.java @@ -22,7 +22,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.stream.Collectors; -import de.dennisguse.opentracks.content.data.Track; +import de.dennisguse.opentracks.data.models.Track; import de.dennisguse.opentracks.services.TrackDeleteService; import de.dennisguse.opentracks.services.TrackDeleteServiceConnection; import de.dennisguse.opentracks.ui.aggregatedStatistics.ConfirmDeleteDialogFragment; diff --git a/src/main/java/de/dennisguse/opentracks/ShowOnMapProxyActivity.java b/src/main/java/de/dennisguse/opentracks/ShowOnMapProxyActivity.java index 38cde113d..c68bf91a5 100644 --- a/src/main/java/de/dennisguse/opentracks/ShowOnMapProxyActivity.java +++ b/src/main/java/de/dennisguse/opentracks/ShowOnMapProxyActivity.java @@ -10,8 +10,8 @@ import androidx.appcompat.app.AppCompatActivity; import java.util.Set; -import de.dennisguse.opentracks.content.data.Track; -import de.dennisguse.opentracks.content.provider.ShareContentProvider; +import de.dennisguse.opentracks.data.ShareContentProvider; +import de.dennisguse.opentracks.data.models.Track; import de.dennisguse.opentracks.io.file.TrackFileFormat; import de.dennisguse.opentracks.util.IntentDashboardUtils; diff --git a/src/main/java/de/dennisguse/opentracks/TrackEditActivity.java b/src/main/java/de/dennisguse/opentracks/TrackEditActivity.java index 6fde1d563..395efe0e8 100644 --- a/src/main/java/de/dennisguse/opentracks/TrackEditActivity.java +++ b/src/main/java/de/dennisguse/opentracks/TrackEditActivity.java @@ -23,8 +23,8 @@ import android.widget.ArrayAdapter; import androidx.annotation.NonNull; -import de.dennisguse.opentracks.content.data.Track; -import de.dennisguse.opentracks.content.provider.ContentProviderUtils; +import de.dennisguse.opentracks.data.ContentProviderUtils; +import de.dennisguse.opentracks.data.models.Track; import de.dennisguse.opentracks.databinding.TrackEditBinding; import de.dennisguse.opentracks.fragments.ChooseActivityTypeDialogFragment; import de.dennisguse.opentracks.services.TrackRecordingServiceConnection; diff --git a/src/main/java/de/dennisguse/opentracks/TrackListActivity.java b/src/main/java/de/dennisguse/opentracks/TrackListActivity.java index 3d2bb4b5e..64a235bd7 100644 --- a/src/main/java/de/dennisguse/opentracks/TrackListActivity.java +++ b/src/main/java/de/dennisguse/opentracks/TrackListActivity.java @@ -54,9 +54,9 @@ import java.time.ZoneOffset; import java.util.ArrayList; import java.util.Arrays; -import de.dennisguse.opentracks.content.data.Distance; -import de.dennisguse.opentracks.content.data.Track; -import de.dennisguse.opentracks.content.data.TracksColumns; +import de.dennisguse.opentracks.data.models.Distance; +import de.dennisguse.opentracks.data.models.Track; +import de.dennisguse.opentracks.data.tables.TracksColumns; import de.dennisguse.opentracks.databinding.TrackListBinding; import de.dennisguse.opentracks.services.TrackRecordingService; import de.dennisguse.opentracks.services.TrackRecordingServiceConnection; diff --git a/src/main/java/de/dennisguse/opentracks/TrackRecordedActivity.java b/src/main/java/de/dennisguse/opentracks/TrackRecordedActivity.java index 23a7da8f6..6f2063a32 100644 --- a/src/main/java/de/dennisguse/opentracks/TrackRecordedActivity.java +++ b/src/main/java/de/dennisguse/opentracks/TrackRecordedActivity.java @@ -35,9 +35,9 @@ import com.google.android.material.tabs.TabLayoutMediator; import de.dennisguse.opentracks.chart.ChartFragment; import de.dennisguse.opentracks.chart.TrackDataHubInterface; -import de.dennisguse.opentracks.content.TrackDataHub; -import de.dennisguse.opentracks.content.data.Track; -import de.dennisguse.opentracks.content.provider.ContentProviderUtils; +import de.dennisguse.opentracks.data.ContentProviderUtils; +import de.dennisguse.opentracks.data.TrackDataHub; +import de.dennisguse.opentracks.data.models.Track; import de.dennisguse.opentracks.databinding.TrackRecordedBinding; import de.dennisguse.opentracks.fragments.StatisticsRecordedFragment; import de.dennisguse.opentracks.services.TrackDeleteService; diff --git a/src/main/java/de/dennisguse/opentracks/TrackRecordingActivity.java b/src/main/java/de/dennisguse/opentracks/TrackRecordingActivity.java index 3a95020b6..df77c6fe7 100644 --- a/src/main/java/de/dennisguse/opentracks/TrackRecordingActivity.java +++ b/src/main/java/de/dennisguse/opentracks/TrackRecordingActivity.java @@ -23,9 +23,9 @@ import java.util.List; import de.dennisguse.opentracks.chart.ChartFragment; import de.dennisguse.opentracks.chart.TrackDataHubInterface; -import de.dennisguse.opentracks.content.TrackDataHub; -import de.dennisguse.opentracks.content.data.Track; -import de.dennisguse.opentracks.content.provider.ContentProviderUtils; +import de.dennisguse.opentracks.data.ContentProviderUtils; +import de.dennisguse.opentracks.data.TrackDataHub; +import de.dennisguse.opentracks.data.models.Track; import de.dennisguse.opentracks.databinding.TrackRecordingBinding; import de.dennisguse.opentracks.fragments.ChooseActivityTypeDialogFragment; import de.dennisguse.opentracks.fragments.StatisticsRecordingFragment; diff --git a/src/main/java/de/dennisguse/opentracks/chart/ChartFragment.java b/src/main/java/de/dennisguse/opentracks/chart/ChartFragment.java index c8d0e3783..8d89f8109 100644 --- a/src/main/java/de/dennisguse/opentracks/chart/ChartFragment.java +++ b/src/main/java/de/dennisguse/opentracks/chart/ChartFragment.java @@ -31,13 +31,12 @@ import java.util.Collections; import java.util.List; import de.dennisguse.opentracks.R; -import de.dennisguse.opentracks.content.TrackDataHub; -import de.dennisguse.opentracks.content.TrackDataListener; -import de.dennisguse.opentracks.content.data.Altitude; -import de.dennisguse.opentracks.content.data.Marker; -import de.dennisguse.opentracks.content.data.Speed; -import de.dennisguse.opentracks.content.data.Track; -import de.dennisguse.opentracks.content.data.TrackPoint; +import de.dennisguse.opentracks.data.TrackDataHub; +import de.dennisguse.opentracks.data.models.Altitude; +import de.dennisguse.opentracks.data.models.Marker; +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.databinding.ChartBinding; import de.dennisguse.opentracks.settings.PreferencesUtils; import de.dennisguse.opentracks.stats.TrackStatistics; @@ -50,7 +49,7 @@ import de.dennisguse.opentracks.stats.TrackStatisticsUpdater; * @author Sandor Dornbush * @author Rodrigo Damazio */ -public class ChartFragment extends Fragment implements TrackDataListener { +public class ChartFragment extends Fragment implements TrackDataHub.Listener { private static final String KEY_CHART_VIEW_BY_DISTANCE_KEY = "chartViewByDistance"; diff --git a/src/main/java/de/dennisguse/opentracks/chart/ChartPoint.java b/src/main/java/de/dennisguse/opentracks/chart/ChartPoint.java index 931725134..a84d89f88 100644 --- a/src/main/java/de/dennisguse/opentracks/chart/ChartPoint.java +++ b/src/main/java/de/dennisguse/opentracks/chart/ChartPoint.java @@ -3,11 +3,11 @@ package de.dennisguse.opentracks.chart; import androidx.annotation.NonNull; import androidx.annotation.VisibleForTesting; -import de.dennisguse.opentracks.content.data.Altitude; -import de.dennisguse.opentracks.content.data.Distance; -import de.dennisguse.opentracks.content.data.Speed; -import de.dennisguse.opentracks.content.data.TrackPoint; -import de.dennisguse.opentracks.content.data.UnitConversions; +import de.dennisguse.opentracks.data.models.Altitude; +import de.dennisguse.opentracks.data.models.Distance; +import de.dennisguse.opentracks.data.models.Speed; +import de.dennisguse.opentracks.data.models.TrackPoint; +import de.dennisguse.opentracks.data.models.UnitConversions; import de.dennisguse.opentracks.stats.TrackStatistics; public class ChartPoint { diff --git a/src/main/java/de/dennisguse/opentracks/chart/ChartView.java b/src/main/java/de/dennisguse/opentracks/chart/ChartView.java index 7b250d050..52be3803d 100644 --- a/src/main/java/de/dennisguse/opentracks/chart/ChartView.java +++ b/src/main/java/de/dennisguse/opentracks/chart/ChartView.java @@ -45,7 +45,7 @@ import java.util.LinkedList; import java.util.List; import de.dennisguse.opentracks.R; -import de.dennisguse.opentracks.content.data.Marker; +import de.dennisguse.opentracks.data.models.Marker; import de.dennisguse.opentracks.stats.ExtremityMonitor; import de.dennisguse.opentracks.ui.markers.MarkerDetailActivity; import de.dennisguse.opentracks.ui.markers.MarkerUtils; diff --git a/src/main/java/de/dennisguse/opentracks/chart/TrackDataHubInterface.java b/src/main/java/de/dennisguse/opentracks/chart/TrackDataHubInterface.java index e1d36004d..c50c5dbfa 100644 --- a/src/main/java/de/dennisguse/opentracks/chart/TrackDataHubInterface.java +++ b/src/main/java/de/dennisguse/opentracks/chart/TrackDataHubInterface.java @@ -1,9 +1,9 @@ package de.dennisguse.opentracks.chart; -import de.dennisguse.opentracks.content.TrackDataHub; +import de.dennisguse.opentracks.data.TrackDataHub; /** - * Interface for communication between activities that use {@link de.dennisguse.opentracks.content.TrackDataHub} and their fragments that need thi data hub. + * Interface for communication between activities that use {@link TrackDataHub} and their fragments that need thi data hub. */ public interface TrackDataHubInterface { TrackDataHub getTrackDataHub(); diff --git a/src/main/java/de/dennisguse/opentracks/content/DescriptionGenerator.java b/src/main/java/de/dennisguse/opentracks/content/DescriptionGenerator.java index 98a7b2902..a65f2bb26 100644 --- a/src/main/java/de/dennisguse/opentracks/content/DescriptionGenerator.java +++ b/src/main/java/de/dennisguse/opentracks/content/DescriptionGenerator.java @@ -26,10 +26,10 @@ import java.time.OffsetDateTime; import java.time.ZoneId; import de.dennisguse.opentracks.R; -import de.dennisguse.opentracks.content.data.Distance; -import de.dennisguse.opentracks.content.data.Speed; -import de.dennisguse.opentracks.content.data.Track; -import de.dennisguse.opentracks.content.data.UnitConversions; +import de.dennisguse.opentracks.data.models.Distance; +import de.dennisguse.opentracks.data.models.Speed; +import de.dennisguse.opentracks.data.models.Track; +import de.dennisguse.opentracks.data.models.UnitConversions; import de.dennisguse.opentracks.stats.TrackStatistics; import de.dennisguse.opentracks.util.StringUtils; diff --git a/src/main/java/de/dennisguse/opentracks/content/TrackDataListener.java b/src/main/java/de/dennisguse/opentracks/content/TrackDataListener.java deleted file mode 100644 index f437fa8a3..000000000 --- a/src/main/java/de/dennisguse/opentracks/content/TrackDataListener.java +++ /dev/null @@ -1,91 +0,0 @@ -/* - * Copyright 2011 Google Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ - -package de.dennisguse.opentracks.content; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; - -import de.dennisguse.opentracks.content.data.Altitude; -import de.dennisguse.opentracks.content.data.Marker; -import de.dennisguse.opentracks.content.data.Speed; -import de.dennisguse.opentracks.content.data.Track; -import de.dennisguse.opentracks.content.data.TrackPoint; -import de.dennisguse.opentracks.stats.TrackStatistics; - -/** - * Listener for track data changes. - * - * @author Rodrigo Damazio - */ -public interface TrackDataListener { - - /** - * Called when the track or its statistics has been updated. - * - * @param track the track - */ - //TODO Could be @NonNull - void onTrackUpdated(Track track); - - /** - * Called to clear previously-sent track points. - */ - void clearTrackPoints(); - - /** - * Called when a sampled in track point is read. - * - * @param trackPoint the trackPoint - */ - default void onSampledInTrackPoint(@NonNull TrackPoint trackPoint, @NonNull TrackStatistics trackStatistics, Speed smoothedSpeed, @Nullable Altitude smoothedAltitude_m) { - } - - /** - * Called when a sampled out track point is read. - * - * @param trackPoint the trackPoint - */ - default void onSampledOutTrackPoint(@NonNull TrackPoint trackPoint, @NonNull TrackStatistics trackStatistics) { - } - - /** - * Called when finish sending new track points. - */ - default void onNewTrackPointsDone() { - } - - /** - * Called to clear previously sent markers. - */ - default void clearMarkers() { - } - - /** - * Called when a new marker is read. - * - * @param marker the marker - */ - default void onNewMarker(@NonNull Marker marker) { - } - - /** - * Called when finish sending new markers. - * This gets called after every batch of calls to {@link #clearMarkers()} and {@link #onNewMarker(Marker)}. - */ - default void onNewMarkersDone() { - } -} diff --git a/src/main/java/de/dennisguse/opentracks/content/sensor/SensorDataCycling.java b/src/main/java/de/dennisguse/opentracks/content/sensor/SensorDataCycling.java index 6cf00a61e..5ce1b3029 100644 --- a/src/main/java/de/dennisguse/opentracks/content/sensor/SensorDataCycling.java +++ b/src/main/java/de/dennisguse/opentracks/content/sensor/SensorDataCycling.java @@ -8,9 +8,9 @@ import androidx.core.util.Pair; import java.time.Duration; -import de.dennisguse.opentracks.content.data.Distance; -import de.dennisguse.opentracks.content.data.Speed; -import de.dennisguse.opentracks.content.data.UnitConversions; +import de.dennisguse.opentracks.data.models.Distance; +import de.dennisguse.opentracks.data.models.Speed; +import de.dennisguse.opentracks.data.models.UnitConversions; import de.dennisguse.opentracks.services.sensors.UintUtils; /** diff --git a/src/main/java/de/dennisguse/opentracks/content/sensor/SensorDataRunning.java b/src/main/java/de/dennisguse/opentracks/content/sensor/SensorDataRunning.java index deb76bd9f..b1fd981b6 100644 --- a/src/main/java/de/dennisguse/opentracks/content/sensor/SensorDataRunning.java +++ b/src/main/java/de/dennisguse/opentracks/content/sensor/SensorDataRunning.java @@ -4,8 +4,8 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.annotation.VisibleForTesting; -import de.dennisguse.opentracks.content.data.Distance; -import de.dennisguse.opentracks.content.data.Speed; +import de.dennisguse.opentracks.data.models.Distance; +import de.dennisguse.opentracks.data.models.Speed; /** * Provides cadence in rpm and speed in milliseconds from Bluetooth LE Running Speed and Cadence sensors. diff --git a/src/main/java/de/dennisguse/opentracks/content/sensor/SensorDataSet.java b/src/main/java/de/dennisguse/opentracks/content/sensor/SensorDataSet.java index 87651fd86..dfc7ec848 100644 --- a/src/main/java/de/dennisguse/opentracks/content/sensor/SensorDataSet.java +++ b/src/main/java/de/dennisguse/opentracks/content/sensor/SensorDataSet.java @@ -4,8 +4,8 @@ import android.util.Pair; import androidx.annotation.NonNull; -import de.dennisguse.opentracks.content.data.Speed; -import de.dennisguse.opentracks.content.data.TrackPoint; +import de.dennisguse.opentracks.data.models.Speed; +import de.dennisguse.opentracks.data.models.TrackPoint; public final class SensorDataSet { diff --git a/src/main/java/de/dennisguse/opentracks/content/provider/CachedTrackPointsIndexes.java b/src/main/java/de/dennisguse/opentracks/data/CachedTrackPointsIndexes.java similarity index 94% rename from src/main/java/de/dennisguse/opentracks/content/provider/CachedTrackPointsIndexes.java rename to src/main/java/de/dennisguse/opentracks/data/CachedTrackPointsIndexes.java index 3df40e868..63a8a6991 100644 --- a/src/main/java/de/dennisguse/opentracks/content/provider/CachedTrackPointsIndexes.java +++ b/src/main/java/de/dennisguse/opentracks/data/CachedTrackPointsIndexes.java @@ -1,8 +1,8 @@ -package de.dennisguse.opentracks.content.provider; +package de.dennisguse.opentracks.data; import android.database.Cursor; -import de.dennisguse.opentracks.content.data.TrackPointsColumns; +import de.dennisguse.opentracks.data.tables.TrackPointsColumns; /** * A cache of track points indexes. diff --git a/src/main/java/de/dennisguse/opentracks/content/provider/ContentProviderUtils.java b/src/main/java/de/dennisguse/opentracks/data/ContentProviderUtils.java similarity index 98% rename from src/main/java/de/dennisguse/opentracks/content/provider/ContentProviderUtils.java rename to src/main/java/de/dennisguse/opentracks/data/ContentProviderUtils.java index 0fafbc996..ba1940076 100644 --- a/src/main/java/de/dennisguse/opentracks/content/provider/ContentProviderUtils.java +++ b/src/main/java/de/dennisguse/opentracks/data/ContentProviderUtils.java @@ -14,7 +14,7 @@ * the License. */ -package de.dennisguse.opentracks.content.provider; +package de.dennisguse.opentracks.data; import android.content.ContentResolver; import android.content.ContentUris; @@ -40,15 +40,15 @@ import java.util.List; import java.util.UUID; import de.dennisguse.opentracks.BuildConfig; -import de.dennisguse.opentracks.content.data.Altitude; -import de.dennisguse.opentracks.content.data.Distance; -import de.dennisguse.opentracks.content.data.Marker; -import de.dennisguse.opentracks.content.data.MarkerColumns; -import de.dennisguse.opentracks.content.data.Speed; -import de.dennisguse.opentracks.content.data.Track; -import de.dennisguse.opentracks.content.data.TrackPoint; -import de.dennisguse.opentracks.content.data.TrackPointsColumns; -import de.dennisguse.opentracks.content.data.TracksColumns; +import de.dennisguse.opentracks.data.models.Altitude; +import de.dennisguse.opentracks.data.models.Distance; +import de.dennisguse.opentracks.data.models.Marker; +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.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.stats.TrackStatistics; import de.dennisguse.opentracks.util.FileUtils; diff --git a/src/main/java/de/dennisguse/opentracks/content/provider/CustomContentProvider.java b/src/main/java/de/dennisguse/opentracks/data/CustomContentProvider.java similarity index 98% rename from src/main/java/de/dennisguse/opentracks/content/provider/CustomContentProvider.java rename to src/main/java/de/dennisguse/opentracks/data/CustomContentProvider.java index 7e9542fd4..18b89e41e 100644 --- a/src/main/java/de/dennisguse/opentracks/content/provider/CustomContentProvider.java +++ b/src/main/java/de/dennisguse/opentracks/data/CustomContentProvider.java @@ -14,7 +14,7 @@ * the License. */ -package de.dennisguse.opentracks.content.provider; +package de.dennisguse.opentracks.data; import android.content.ContentProvider; import android.content.ContentUris; @@ -35,10 +35,10 @@ import androidx.annotation.VisibleForTesting; import java.util.Arrays; -import de.dennisguse.opentracks.content.data.MarkerColumns; -import de.dennisguse.opentracks.content.data.TrackPoint; -import de.dennisguse.opentracks.content.data.TrackPointsColumns; -import de.dennisguse.opentracks.content.data.TracksColumns; +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; /** * A {@link ContentProvider} that handles access to track points, tracks, and markers tables. diff --git a/src/main/java/de/dennisguse/opentracks/content/provider/CustomSQLiteOpenHelper.java b/src/main/java/de/dennisguse/opentracks/data/CustomSQLiteOpenHelper.java similarity index 98% rename from src/main/java/de/dennisguse/opentracks/content/provider/CustomSQLiteOpenHelper.java rename to src/main/java/de/dennisguse/opentracks/data/CustomSQLiteOpenHelper.java index e10e6d7af..bf4d9efd5 100644 --- a/src/main/java/de/dennisguse/opentracks/content/provider/CustomSQLiteOpenHelper.java +++ b/src/main/java/de/dennisguse/opentracks/data/CustomSQLiteOpenHelper.java @@ -1,4 +1,4 @@ -package de.dennisguse.opentracks.content.provider; +package de.dennisguse.opentracks.data; import android.content.ContentValues; import android.content.Context; @@ -15,10 +15,10 @@ import java.time.zone.ZoneRules; import java.util.UUID; import de.dennisguse.opentracks.Startup; -import de.dennisguse.opentracks.content.data.MarkerColumns; -import de.dennisguse.opentracks.content.data.Track; -import de.dennisguse.opentracks.content.data.TrackPointsColumns; -import de.dennisguse.opentracks.content.data.TracksColumns; +import de.dennisguse.opentracks.data.models.Track; +import de.dennisguse.opentracks.data.tables.MarkerColumns; +import de.dennisguse.opentracks.data.tables.TrackPointsColumns; +import de.dennisguse.opentracks.data.tables.TracksColumns; /** * Database helper for creating and upgrading the database. diff --git a/src/main/java/de/dennisguse/opentracks/content/provider/SelectionData.java b/src/main/java/de/dennisguse/opentracks/data/SelectionData.java similarity index 90% rename from src/main/java/de/dennisguse/opentracks/content/provider/SelectionData.java rename to src/main/java/de/dennisguse/opentracks/data/SelectionData.java index c185b1a99..886847b58 100644 --- a/src/main/java/de/dennisguse/opentracks/content/provider/SelectionData.java +++ b/src/main/java/de/dennisguse/opentracks/data/SelectionData.java @@ -1,4 +1,4 @@ -package de.dennisguse.opentracks.content.provider; +package de.dennisguse.opentracks.data; public class SelectionData { private final String selection; diff --git a/src/main/java/de/dennisguse/opentracks/content/provider/ShareContentProvider.java b/src/main/java/de/dennisguse/opentracks/data/ShareContentProvider.java similarity index 98% rename from src/main/java/de/dennisguse/opentracks/content/provider/ShareContentProvider.java rename to src/main/java/de/dennisguse/opentracks/data/ShareContentProvider.java index a38120234..ecfcd4daf 100644 --- a/src/main/java/de/dennisguse/opentracks/content/provider/ShareContentProvider.java +++ b/src/main/java/de/dennisguse/opentracks/data/ShareContentProvider.java @@ -1,4 +1,4 @@ -package de.dennisguse.opentracks.content.provider; +package de.dennisguse.opentracks.data; import android.content.Context; import android.content.UriMatcher; @@ -25,8 +25,8 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import de.dennisguse.opentracks.content.data.Track; -import de.dennisguse.opentracks.content.data.TracksColumns; +import de.dennisguse.opentracks.data.models.Track; +import de.dennisguse.opentracks.data.tables.TracksColumns; import de.dennisguse.opentracks.io.file.TrackFileFormat; import de.dennisguse.opentracks.io.file.exporter.TrackExporter; diff --git a/src/main/java/de/dennisguse/opentracks/content/TrackDataHub.java b/src/main/java/de/dennisguse/opentracks/data/TrackDataHub.java similarity index 78% rename from src/main/java/de/dennisguse/opentracks/content/TrackDataHub.java rename to src/main/java/de/dennisguse/opentracks/data/TrackDataHub.java index 8d88546f3..4841de598 100644 --- a/src/main/java/de/dennisguse/opentracks/content/TrackDataHub.java +++ b/src/main/java/de/dennisguse/opentracks/data/TrackDataHub.java @@ -14,7 +14,7 @@ * the License. */ -package de.dennisguse.opentracks.content; +package de.dennisguse.opentracks.data; import android.content.ContentResolver; import android.content.Context; @@ -25,28 +25,30 @@ import android.os.HandlerThread; import android.util.Log; import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import androidx.annotation.VisibleForTesting; import java.util.Collections; import java.util.HashSet; import java.util.Set; -import de.dennisguse.opentracks.content.data.Distance; -import de.dennisguse.opentracks.content.data.Marker; -import de.dennisguse.opentracks.content.data.MarkerColumns; -import de.dennisguse.opentracks.content.data.Track; -import de.dennisguse.opentracks.content.data.TrackPoint; -import de.dennisguse.opentracks.content.data.TrackPointsColumns; -import de.dennisguse.opentracks.content.data.TracksColumns; -import de.dennisguse.opentracks.content.provider.ContentProviderUtils; -import de.dennisguse.opentracks.content.provider.TrackPointIterator; +import de.dennisguse.opentracks.data.models.Altitude; +import de.dennisguse.opentracks.data.models.Distance; +import de.dennisguse.opentracks.data.models.Marker; +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.data.tables.MarkerColumns; +import de.dennisguse.opentracks.data.tables.TrackPointsColumns; +import de.dennisguse.opentracks.data.tables.TracksColumns; import de.dennisguse.opentracks.services.TrackRecordingService; import de.dennisguse.opentracks.services.handlers.EGM2008CorrectionManager; +import de.dennisguse.opentracks.stats.TrackStatistics; import de.dennisguse.opentracks.stats.TrackStatisticsUpdater; /** * Track data hub. - * Receives data from {@link de.dennisguse.opentracks.content.provider.CustomContentProvider} and distributes it to {@link TrackDataListener} after some processing. + * Receives data from {@link CustomContentProvider} and distributes it to {@link Listener} after some processing. *

* {@link TrackPoint}s are filtered/downsampled with a dynamic sampling frequency. * @@ -70,7 +72,7 @@ public class TrackDataHub { private static final String TAG = TrackDataHub.class.getSimpleName(); private final Context context; - private final Set listeners; + private final Set listeners; private final ContentProviderUtils contentProviderUtils; private final int targetNumPoints; @@ -178,11 +180,11 @@ public class TrackDataHub { } /** - * Registers a {@link TrackDataListener}. + * Registers a {@link Listener}. * * @param trackDataListener the track data listener */ - public void registerTrackDataListener(final TrackDataListener trackDataListener) { + public void registerTrackDataListener(final Listener trackDataListener) { handler.post(() -> { listeners.add(trackDataListener); if (isStarted()) { @@ -192,11 +194,11 @@ public class TrackDataHub { } /** - * Unregisters a {@link TrackDataListener}. + * Unregisters a {@link Listener}. * * @param trackDataListener the track data listener */ - public void unregisterTrackDataListener(final TrackDataListener trackDataListener) { + public void unregisterTrackDataListener(final Listener trackDataListener) { handler.post(() -> listeners.remove(trackDataListener)); } @@ -218,7 +220,7 @@ public class TrackDataHub { notifyTracksTableUpdate(listeners); - for (TrackDataListener listener : listeners) { + for (Listener listener : listeners) { listener.clearTrackPoints(); } notifyTrackPointsTableUpdate(true, listeners); @@ -230,8 +232,8 @@ public class TrackDataHub { * * @param trackDataListener the track data listener. */ - private void loadDataForListener(TrackDataListener trackDataListener) { - Set trackDataListeners = Collections.singleton(trackDataListener); + private void loadDataForListener(Listener trackDataListener) { + Set trackDataListeners = Collections.singleton(trackDataListener); //Track notifyTracksTableUpdate(trackDataListeners); @@ -253,12 +255,12 @@ public class TrackDataHub { * * @param trackDataListeners the track data listeners to notify */ - private void notifyTracksTableUpdate(Set trackDataListeners) { + private void notifyTracksTableUpdate(Set trackDataListeners) { if (trackDataListeners.isEmpty()) { return; } Track track = contentProviderUtils.getTrack(selectedTrackId); - for (TrackDataListener trackDataListener : trackDataListeners) { + for (Listener trackDataListener : trackDataListeners) { trackDataListener.onTrackUpdated(track); } } @@ -269,12 +271,12 @@ public class TrackDataHub { * * @param trackDataListeners the track data listeners to notify */ - private void notifyMarkersTableUpdate(Set trackDataListeners) { + private void notifyMarkersTableUpdate(Set trackDataListeners) { if (trackDataListeners.isEmpty()) { return; } - for (TrackDataListener trackDataListener : trackDataListeners) { + for (Listener trackDataListener : trackDataListeners) { trackDataListener.clearMarkers(); } @@ -282,14 +284,14 @@ public class TrackDataHub { if (cursor != null && cursor.moveToFirst()) { do { Marker marker = contentProviderUtils.createMarker(cursor); - for (TrackDataListener trackDataListener : trackDataListeners) { + for (Listener trackDataListener : trackDataListeners) { trackDataListener.onNewMarker(marker); } } while (cursor.moveToNext()); } } - for (TrackDataListener trackDataListener : trackDataListeners) { + for (Listener trackDataListener : trackDataListeners) { trackDataListener.onNewMarkersDone(); } } @@ -299,7 +301,7 @@ public class TrackDataHub { * * @param updateSamplingState true to update the sampling state */ - private void notifyTrackPointsTableUpdate(boolean updateSamplingState, Set listeners) { + private void notifyTrackPointsTableUpdate(boolean updateSamplingState, Set listeners) { if (listeners.isEmpty()) { return; } @@ -308,7 +310,7 @@ public class TrackDataHub { // Reload and resample the track at a lower frequency. Log.i(TAG, "Resampling track after " + numLoadedPoints + " points."); resetSamplingState(); - for (TrackDataListener listener : listeners) { + for (Listener listener : listeners) { listener.clearTrackPoints(); } } @@ -366,11 +368,11 @@ public class TrackDataHub { // Also include the last point if the selected track is not recording. if ((localNumLoadedTrackPoints % samplingFrequency == 0) || (trackPointId == lastTrackPointId && !isSelectedTrackRecording())) { - for (TrackDataListener trackDataListener : listeners) { + for (Listener trackDataListener : listeners) { trackDataListener.onSampledInTrackPoint(trackPoint, currentUpdater.getTrackStatistics(), currentUpdater.getSmoothedSpeed(), currentUpdater.getSmoothedAltitude()); } } else { - for (TrackDataListener trackDataListener : listeners) { + for (Listener trackDataListener : listeners) { trackDataListener.onSampledOutTrackPoint(trackPoint, currentUpdater.getTrackStatistics()); } } @@ -389,7 +391,7 @@ public class TrackDataHub { lastSeenTrackPointId = localLastSeenTrackPointIdId; } - listeners.stream().forEach(TrackDataListener::onNewTrackPointsDone); + listeners.stream().forEach(Listener::onNewTrackPointsDone); } @@ -415,4 +417,63 @@ public class TrackDataHub { public void setRecordingDistanceInterval(Distance recordingDistanceInterval) { this.recordingDistanceInterval = recordingDistanceInterval; } + + public interface Listener { + + /** + * Called when the track or its statistics has been updated. + * + * @param track the track + */ + //TODO Could be @NonNull + void onTrackUpdated(Track track); + + /** + * Called to clear previously-sent track points. + */ + void clearTrackPoints(); + + /** + * Called when a sampled in track point is read. + * + * @param trackPoint the trackPoint + */ + default void onSampledInTrackPoint(@NonNull TrackPoint trackPoint, @NonNull TrackStatistics trackStatistics, Speed smoothedSpeed, @Nullable Altitude smoothedAltitude_m) { + } + + /** + * Called when a sampled out track point is read. + * + * @param trackPoint the trackPoint + */ + default void onSampledOutTrackPoint(@NonNull TrackPoint trackPoint, @NonNull TrackStatistics trackStatistics) { + } + + /** + * Called when finish sending new track points. + */ + default void onNewTrackPointsDone() { + } + + /** + * Called to clear previously sent markers. + */ + default void clearMarkers() { + } + + /** + * Called when a new marker is read. + * + * @param marker the marker + */ + default void onNewMarker(@NonNull Marker marker) { + } + + /** + * Called when finish sending new markers. + * This gets called after every batch of calls to {@link #clearMarkers()} and {@link #onNewMarker(Marker)}. + */ + default void onNewMarkersDone() { + } + } } \ No newline at end of file diff --git a/src/main/java/de/dennisguse/opentracks/content/provider/TrackPointIterator.java b/src/main/java/de/dennisguse/opentracks/data/TrackPointIterator.java similarity index 91% rename from src/main/java/de/dennisguse/opentracks/content/provider/TrackPointIterator.java rename to src/main/java/de/dennisguse/opentracks/data/TrackPointIterator.java index 4d8595f31..ecd5da7cb 100644 --- a/src/main/java/de/dennisguse/opentracks/content/provider/TrackPointIterator.java +++ b/src/main/java/de/dennisguse/opentracks/data/TrackPointIterator.java @@ -1,4 +1,4 @@ -package de.dennisguse.opentracks.content.provider; +package de.dennisguse.opentracks.data; import android.database.Cursor; @@ -8,8 +8,8 @@ import androidx.annotation.VisibleForTesting; import java.util.Iterator; import java.util.NoSuchElementException; -import de.dennisguse.opentracks.content.data.Track; -import de.dennisguse.opentracks.content.data.TrackPoint; +import de.dennisguse.opentracks.data.models.Track; +import de.dennisguse.opentracks.data.models.TrackPoint; /** * A lightweight wrapper around the original {@link Cursor}. diff --git a/src/main/java/de/dennisguse/opentracks/content/data/TrackSelection.java b/src/main/java/de/dennisguse/opentracks/data/TrackSelection.java similarity index 93% rename from src/main/java/de/dennisguse/opentracks/content/data/TrackSelection.java rename to src/main/java/de/dennisguse/opentracks/data/TrackSelection.java index 381eae13c..c33f5de69 100644 --- a/src/main/java/de/dennisguse/opentracks/content/data/TrackSelection.java +++ b/src/main/java/de/dennisguse/opentracks/data/TrackSelection.java @@ -1,4 +1,4 @@ -package de.dennisguse.opentracks.content.data; +package de.dennisguse.opentracks.data; import android.text.TextUtils; @@ -8,8 +8,8 @@ import java.util.Collections; import java.util.List; import java.util.stream.Collectors; -import de.dennisguse.opentracks.content.provider.ContentProviderUtils; -import de.dennisguse.opentracks.content.provider.SelectionData; +import de.dennisguse.opentracks.data.models.Track; +import de.dennisguse.opentracks.data.tables.TracksColumns; public class TrackSelection implements ContentProviderUtils.ContentProviderSelectionInterface { private final List trackIds = new ArrayList<>(); diff --git a/src/main/java/de/dennisguse/opentracks/content/provider/UUIDUtils.java b/src/main/java/de/dennisguse/opentracks/data/UUIDUtils.java similarity index 95% rename from src/main/java/de/dennisguse/opentracks/content/provider/UUIDUtils.java rename to src/main/java/de/dennisguse/opentracks/data/UUIDUtils.java index 848df5d8d..8b6ee306c 100644 --- a/src/main/java/de/dennisguse/opentracks/content/provider/UUIDUtils.java +++ b/src/main/java/de/dennisguse/opentracks/data/UUIDUtils.java @@ -1,4 +1,4 @@ -package de.dennisguse.opentracks.content.provider; +package de.dennisguse.opentracks.data; import androidx.annotation.NonNull; diff --git a/src/main/java/de/dennisguse/opentracks/content/data/Altitude.java b/src/main/java/de/dennisguse/opentracks/data/models/Altitude.java similarity index 96% rename from src/main/java/de/dennisguse/opentracks/content/data/Altitude.java rename to src/main/java/de/dennisguse/opentracks/data/models/Altitude.java index ae1f9ed50..36c0990b2 100644 --- a/src/main/java/de/dennisguse/opentracks/content/data/Altitude.java +++ b/src/main/java/de/dennisguse/opentracks/data/models/Altitude.java @@ -1,4 +1,4 @@ -package de.dennisguse.opentracks.content.data; +package de.dennisguse.opentracks.data.models; import de.dennisguse.opentracks.R; diff --git a/src/main/java/de/dennisguse/opentracks/content/data/Distance.java b/src/main/java/de/dennisguse/opentracks/data/models/Distance.java similarity index 98% rename from src/main/java/de/dennisguse/opentracks/content/data/Distance.java rename to src/main/java/de/dennisguse/opentracks/data/models/Distance.java index 6c256e296..ae2daf4a8 100644 --- a/src/main/java/de/dennisguse/opentracks/content/data/Distance.java +++ b/src/main/java/de/dennisguse/opentracks/data/models/Distance.java @@ -1,4 +1,4 @@ -package de.dennisguse.opentracks.content.data; +package de.dennisguse.opentracks.data.models; import androidx.annotation.NonNull; diff --git a/src/main/java/de/dennisguse/opentracks/content/data/Marker.java b/src/main/java/de/dennisguse/opentracks/data/models/Marker.java similarity index 99% rename from src/main/java/de/dennisguse/opentracks/content/data/Marker.java rename to src/main/java/de/dennisguse/opentracks/data/models/Marker.java index 84fee836a..972a92fac 100644 --- a/src/main/java/de/dennisguse/opentracks/content/data/Marker.java +++ b/src/main/java/de/dennisguse/opentracks/data/models/Marker.java @@ -14,7 +14,7 @@ * the License. */ -package de.dennisguse.opentracks.content.data; +package de.dennisguse.opentracks.data.models; import android.location.Location; import android.net.Uri; diff --git a/src/main/java/de/dennisguse/opentracks/content/data/Speed.java b/src/main/java/de/dennisguse/opentracks/data/models/Speed.java similarity index 98% rename from src/main/java/de/dennisguse/opentracks/content/data/Speed.java rename to src/main/java/de/dennisguse/opentracks/data/models/Speed.java index f92b95a4f..3478b77d9 100644 --- a/src/main/java/de/dennisguse/opentracks/content/data/Speed.java +++ b/src/main/java/de/dennisguse/opentracks/data/models/Speed.java @@ -1,4 +1,4 @@ -package de.dennisguse.opentracks.content.data; +package de.dennisguse.opentracks.data.models; import androidx.annotation.NonNull; diff --git a/src/main/java/de/dennisguse/opentracks/content/data/Track.java b/src/main/java/de/dennisguse/opentracks/data/models/Track.java similarity index 99% rename from src/main/java/de/dennisguse/opentracks/content/data/Track.java rename to src/main/java/de/dennisguse/opentracks/data/models/Track.java index b8d96f06d..3885fa3cf 100644 --- a/src/main/java/de/dennisguse/opentracks/content/data/Track.java +++ b/src/main/java/de/dennisguse/opentracks/data/models/Track.java @@ -14,7 +14,7 @@ * the License. */ -package de.dennisguse.opentracks.content.data; +package de.dennisguse.opentracks.data.models; import android.os.Parcel; import android.os.Parcelable; diff --git a/src/main/java/de/dennisguse/opentracks/content/data/TrackPoint.java b/src/main/java/de/dennisguse/opentracks/data/models/TrackPoint.java similarity index 99% rename from src/main/java/de/dennisguse/opentracks/content/data/TrackPoint.java rename to src/main/java/de/dennisguse/opentracks/data/models/TrackPoint.java index a9c2fa65d..665820e54 100644 --- a/src/main/java/de/dennisguse/opentracks/content/data/TrackPoint.java +++ b/src/main/java/de/dennisguse/opentracks/data/models/TrackPoint.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package de.dennisguse.opentracks.content.data; +package de.dennisguse.opentracks.data.models; import android.location.Location; import android.os.Parcel; diff --git a/src/main/java/de/dennisguse/opentracks/content/data/UnitConversions.java b/src/main/java/de/dennisguse/opentracks/data/models/UnitConversions.java similarity index 98% rename from src/main/java/de/dennisguse/opentracks/content/data/UnitConversions.java rename to src/main/java/de/dennisguse/opentracks/data/models/UnitConversions.java index 9130fa9ea..c9355fbf7 100644 --- a/src/main/java/de/dennisguse/opentracks/content/data/UnitConversions.java +++ b/src/main/java/de/dennisguse/opentracks/data/models/UnitConversions.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package de.dennisguse.opentracks.content.data; +package de.dennisguse.opentracks.data.models; /** * Unit conversion constants. diff --git a/src/main/java/de/dennisguse/opentracks/content/data/MarkerColumns.java b/src/main/java/de/dennisguse/opentracks/data/tables/MarkerColumns.java similarity index 96% rename from src/main/java/de/dennisguse/opentracks/content/data/MarkerColumns.java rename to src/main/java/de/dennisguse/opentracks/data/tables/MarkerColumns.java index 32fac3fa0..fd472f344 100644 --- a/src/main/java/de/dennisguse/opentracks/content/data/MarkerColumns.java +++ b/src/main/java/de/dennisguse/opentracks/data/tables/MarkerColumns.java @@ -14,12 +14,12 @@ * the License. */ -package de.dennisguse.opentracks.content.data; +package de.dennisguse.opentracks.data.tables; import android.net.Uri; import android.provider.BaseColumns; -import de.dennisguse.opentracks.content.provider.ContentProviderUtils; +import de.dennisguse.opentracks.data.ContentProviderUtils; /** * Constants for markers table. diff --git a/src/main/java/de/dennisguse/opentracks/content/data/TrackPointsColumns.java b/src/main/java/de/dennisguse/opentracks/data/tables/TrackPointsColumns.java similarity index 96% rename from src/main/java/de/dennisguse/opentracks/content/data/TrackPointsColumns.java rename to src/main/java/de/dennisguse/opentracks/data/tables/TrackPointsColumns.java index 640915486..90ba11ae5 100644 --- a/src/main/java/de/dennisguse/opentracks/content/data/TrackPointsColumns.java +++ b/src/main/java/de/dennisguse/opentracks/data/tables/TrackPointsColumns.java @@ -14,12 +14,12 @@ * the License. */ -package de.dennisguse.opentracks.content.data; +package de.dennisguse.opentracks.data.tables; import android.net.Uri; import android.provider.BaseColumns; -import de.dennisguse.opentracks.content.provider.ContentProviderUtils; +import de.dennisguse.opentracks.data.ContentProviderUtils; /** * Constants for the track points table. diff --git a/src/main/java/de/dennisguse/opentracks/content/data/TracksColumns.java b/src/main/java/de/dennisguse/opentracks/data/tables/TracksColumns.java similarity index 96% rename from src/main/java/de/dennisguse/opentracks/content/data/TracksColumns.java rename to src/main/java/de/dennisguse/opentracks/data/tables/TracksColumns.java index 16d1f669d..0f9b1bbc8 100644 --- a/src/main/java/de/dennisguse/opentracks/content/data/TracksColumns.java +++ b/src/main/java/de/dennisguse/opentracks/data/tables/TracksColumns.java @@ -14,12 +14,12 @@ * the License. */ -package de.dennisguse.opentracks.content.data; +package de.dennisguse.opentracks.data.tables; import android.net.Uri; import android.provider.BaseColumns; -import de.dennisguse.opentracks.content.provider.ContentProviderUtils; +import de.dennisguse.opentracks.data.ContentProviderUtils; /** * Constants for the tracks table. diff --git a/src/main/java/de/dennisguse/opentracks/fragments/StatisticsRecordedFragment.java b/src/main/java/de/dennisguse/opentracks/fragments/StatisticsRecordedFragment.java index e117cc1fc..28236cbc5 100644 --- a/src/main/java/de/dennisguse/opentracks/fragments/StatisticsRecordedFragment.java +++ b/src/main/java/de/dennisguse/opentracks/fragments/StatisticsRecordedFragment.java @@ -36,12 +36,12 @@ import java.util.List; import de.dennisguse.opentracks.R; import de.dennisguse.opentracks.TrackRecordedActivity; import de.dennisguse.opentracks.adapters.StatisticsAdapter; -import de.dennisguse.opentracks.content.data.Track; -import de.dennisguse.opentracks.content.provider.ContentProviderUtils; +import de.dennisguse.opentracks.data.ContentProviderUtils; +import de.dennisguse.opentracks.data.models.Track; import de.dennisguse.opentracks.databinding.StatisticsRecordedBinding; +import de.dennisguse.opentracks.settings.PreferencesUtils; import de.dennisguse.opentracks.stats.SensorStatistics; import de.dennisguse.opentracks.stats.TrackStatistics; -import de.dennisguse.opentracks.settings.PreferencesUtils; import de.dennisguse.opentracks.util.StringUtils; import de.dennisguse.opentracks.util.TrackIconUtils; import de.dennisguse.opentracks.viewmodels.StatisticData; diff --git a/src/main/java/de/dennisguse/opentracks/fragments/StatisticsRecordingFragment.java b/src/main/java/de/dennisguse/opentracks/fragments/StatisticsRecordingFragment.java index 80960143f..43a65cb45 100644 --- a/src/main/java/de/dennisguse/opentracks/fragments/StatisticsRecordingFragment.java +++ b/src/main/java/de/dennisguse/opentracks/fragments/StatisticsRecordingFragment.java @@ -19,8 +19,8 @@ import java.util.List; import de.dennisguse.opentracks.R; import de.dennisguse.opentracks.adapters.StatisticsAdapter; -import de.dennisguse.opentracks.content.data.Track; -import de.dennisguse.opentracks.content.data.TrackPoint; +import de.dennisguse.opentracks.data.models.Track; +import de.dennisguse.opentracks.data.models.TrackPoint; import de.dennisguse.opentracks.databinding.StatisticsRecordingBinding; import de.dennisguse.opentracks.services.TrackRecordingService; import de.dennisguse.opentracks.services.TrackRecordingServiceConnection; diff --git a/src/main/java/de/dennisguse/opentracks/io/file/TrackFileFormat.java b/src/main/java/de/dennisguse/opentracks/io/file/TrackFileFormat.java index 43c97f044..96a0f15f3 100644 --- a/src/main/java/de/dennisguse/opentracks/io/file/TrackFileFormat.java +++ b/src/main/java/de/dennisguse/opentracks/io/file/TrackFileFormat.java @@ -6,7 +6,7 @@ import android.graphics.Bitmap; import java.util.Locale; import de.dennisguse.opentracks.R; -import de.dennisguse.opentracks.content.provider.ContentProviderUtils; +import de.dennisguse.opentracks.data.ContentProviderUtils; import de.dennisguse.opentracks.io.file.exporter.GPXTrackExporter; import de.dennisguse.opentracks.io.file.exporter.KMLTrackExporter; import de.dennisguse.opentracks.io.file.exporter.KmzTrackExporter; diff --git a/src/main/java/de/dennisguse/opentracks/io/file/exporter/ExportActivity.java b/src/main/java/de/dennisguse/opentracks/io/file/exporter/ExportActivity.java index 8b08c055c..d7599eeaf 100644 --- a/src/main/java/de/dennisguse/opentracks/io/file/exporter/ExportActivity.java +++ b/src/main/java/de/dennisguse/opentracks/io/file/exporter/ExportActivity.java @@ -33,9 +33,9 @@ import java.util.List; import java.util.concurrent.LinkedBlockingQueue; import de.dennisguse.opentracks.R; -import de.dennisguse.opentracks.content.data.Track; -import de.dennisguse.opentracks.content.data.TracksColumns; -import de.dennisguse.opentracks.content.provider.ContentProviderUtils; +import de.dennisguse.opentracks.data.ContentProviderUtils; +import de.dennisguse.opentracks.data.models.Track; +import de.dennisguse.opentracks.data.tables.TracksColumns; import de.dennisguse.opentracks.databinding.ExportActivityBinding; import de.dennisguse.opentracks.databinding.ToolbarBinding; import de.dennisguse.opentracks.io.file.ErrorListDialog; diff --git a/src/main/java/de/dennisguse/opentracks/io/file/exporter/ExportService.java b/src/main/java/de/dennisguse/opentracks/io/file/exporter/ExportService.java index 14861cfb0..68e887c9f 100644 --- a/src/main/java/de/dennisguse/opentracks/io/file/exporter/ExportService.java +++ b/src/main/java/de/dennisguse/opentracks/io/file/exporter/ExportService.java @@ -12,8 +12,8 @@ import androidx.annotation.NonNull; import androidx.core.app.JobIntentService; import androidx.documentfile.provider.DocumentFile; -import de.dennisguse.opentracks.content.data.Track; -import de.dennisguse.opentracks.content.provider.ContentProviderUtils; +import de.dennisguse.opentracks.data.ContentProviderUtils; +import de.dennisguse.opentracks.data.models.Track; import de.dennisguse.opentracks.io.file.TrackFileFormat; import de.dennisguse.opentracks.util.ExportUtils; diff --git a/src/main/java/de/dennisguse/opentracks/io/file/exporter/GPXTrackExporter.java b/src/main/java/de/dennisguse/opentracks/io/file/exporter/GPXTrackExporter.java index e3525bc90..737ac081f 100644 --- a/src/main/java/de/dennisguse/opentracks/io/file/exporter/GPXTrackExporter.java +++ b/src/main/java/de/dennisguse/opentracks/io/file/exporter/GPXTrackExporter.java @@ -32,11 +32,11 @@ import java.util.Objects; import java.util.function.Function; import java.util.stream.Stream; -import de.dennisguse.opentracks.content.data.Marker; -import de.dennisguse.opentracks.content.data.Track; -import de.dennisguse.opentracks.content.data.TrackPoint; -import de.dennisguse.opentracks.content.provider.ContentProviderUtils; -import de.dennisguse.opentracks.content.provider.TrackPointIterator; +import de.dennisguse.opentracks.data.ContentProviderUtils; +import de.dennisguse.opentracks.data.TrackPointIterator; +import de.dennisguse.opentracks.data.models.Marker; +import de.dennisguse.opentracks.data.models.Track; +import de.dennisguse.opentracks.data.models.TrackPoint; import de.dennisguse.opentracks.stats.TrackStatistics; import de.dennisguse.opentracks.util.StringUtils; diff --git a/src/main/java/de/dennisguse/opentracks/io/file/exporter/KMLTrackExporter.java b/src/main/java/de/dennisguse/opentracks/io/file/exporter/KMLTrackExporter.java index fc6f011e1..90bb43aaa 100644 --- a/src/main/java/de/dennisguse/opentracks/io/file/exporter/KMLTrackExporter.java +++ b/src/main/java/de/dennisguse/opentracks/io/file/exporter/KMLTrackExporter.java @@ -35,11 +35,11 @@ import java.util.Locale; import java.util.Objects; import de.dennisguse.opentracks.R; -import de.dennisguse.opentracks.content.data.Marker; -import de.dennisguse.opentracks.content.data.Track; -import de.dennisguse.opentracks.content.data.TrackPoint; -import de.dennisguse.opentracks.content.provider.ContentProviderUtils; -import de.dennisguse.opentracks.content.provider.TrackPointIterator; +import de.dennisguse.opentracks.data.ContentProviderUtils; +import de.dennisguse.opentracks.data.TrackPointIterator; +import de.dennisguse.opentracks.data.models.Marker; +import de.dennisguse.opentracks.data.models.Track; +import de.dennisguse.opentracks.data.models.TrackPoint; import de.dennisguse.opentracks.util.FileUtils; import de.dennisguse.opentracks.util.StringUtils; diff --git a/src/main/java/de/dennisguse/opentracks/io/file/exporter/KmzTrackExporter.java b/src/main/java/de/dennisguse/opentracks/io/file/exporter/KmzTrackExporter.java index 4d707fa18..6d0790603 100644 --- a/src/main/java/de/dennisguse/opentracks/io/file/exporter/KmzTrackExporter.java +++ b/src/main/java/de/dennisguse/opentracks/io/file/exporter/KmzTrackExporter.java @@ -31,9 +31,9 @@ import java.io.OutputStream; import java.util.zip.ZipEntry; import java.util.zip.ZipOutputStream; -import de.dennisguse.opentracks.content.data.Marker; -import de.dennisguse.opentracks.content.data.Track; -import de.dennisguse.opentracks.content.provider.ContentProviderUtils; +import de.dennisguse.opentracks.data.ContentProviderUtils; +import de.dennisguse.opentracks.data.models.Marker; +import de.dennisguse.opentracks.data.models.Track; import de.dennisguse.opentracks.util.FileUtils; /** diff --git a/src/main/java/de/dennisguse/opentracks/io/file/exporter/SharePictureTrackExporter.java b/src/main/java/de/dennisguse/opentracks/io/file/exporter/SharePictureTrackExporter.java index 10d1aaf9e..292c76859 100644 --- a/src/main/java/de/dennisguse/opentracks/io/file/exporter/SharePictureTrackExporter.java +++ b/src/main/java/de/dennisguse/opentracks/io/file/exporter/SharePictureTrackExporter.java @@ -11,10 +11,10 @@ import androidx.annotation.NonNull; import java.io.OutputStream; -import de.dennisguse.opentracks.content.data.Track; +import de.dennisguse.opentracks.data.models.Track; import de.dennisguse.opentracks.databinding.TrackSharePictureBinding; -import de.dennisguse.opentracks.stats.TrackStatistics; import de.dennisguse.opentracks.settings.PreferencesUtils; +import de.dennisguse.opentracks.stats.TrackStatistics; import de.dennisguse.opentracks.util.StringUtils; /** diff --git a/src/main/java/de/dennisguse/opentracks/io/file/exporter/TrackExporter.java b/src/main/java/de/dennisguse/opentracks/io/file/exporter/TrackExporter.java index b17592ca9..a73a93235 100644 --- a/src/main/java/de/dennisguse/opentracks/io/file/exporter/TrackExporter.java +++ b/src/main/java/de/dennisguse/opentracks/io/file/exporter/TrackExporter.java @@ -20,7 +20,7 @@ import androidx.annotation.NonNull; import java.io.OutputStream; -import de.dennisguse.opentracks.content.data.Track; +import de.dennisguse.opentracks.data.models.Track; /** * Track exporting for exporting track to an {@link OutputStream}. 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 1b7546c8e..d3b17a5fe 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 @@ -30,12 +30,12 @@ import java.util.LinkedList; import java.util.List; import java.util.Locale; -import de.dennisguse.opentracks.content.data.Altitude; -import de.dennisguse.opentracks.content.data.Distance; -import de.dennisguse.opentracks.content.data.Marker; -import de.dennisguse.opentracks.content.data.Speed; -import de.dennisguse.opentracks.content.data.Track; -import de.dennisguse.opentracks.content.data.TrackPoint; +import de.dennisguse.opentracks.data.models.Altitude; +import de.dennisguse.opentracks.data.models.Distance; +import de.dennisguse.opentracks.data.models.Marker; +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.util.StringUtils; /** diff --git a/src/main/java/de/dennisguse/opentracks/io/file/importer/ImportService.java b/src/main/java/de/dennisguse/opentracks/io/file/importer/ImportService.java index 9d8aa66d6..3f11f6b87 100644 --- a/src/main/java/de/dennisguse/opentracks/io/file/importer/ImportService.java +++ b/src/main/java/de/dennisguse/opentracks/io/file/importer/ImportService.java @@ -16,12 +16,12 @@ import java.io.IOException; import java.util.ArrayList; import de.dennisguse.opentracks.R; -import de.dennisguse.opentracks.content.data.Distance; -import de.dennisguse.opentracks.content.data.Track; -import de.dennisguse.opentracks.content.provider.ContentProviderUtils; +import de.dennisguse.opentracks.data.ContentProviderUtils; +import de.dennisguse.opentracks.data.models.Distance; +import de.dennisguse.opentracks.data.models.Track; import de.dennisguse.opentracks.io.file.TrackFileFormat; -import de.dennisguse.opentracks.util.FileUtils; import de.dennisguse.opentracks.settings.PreferencesUtils; +import de.dennisguse.opentracks.util.FileUtils; public class ImportService extends JobIntentService { diff --git a/src/main/java/de/dennisguse/opentracks/io/file/importer/ImportViewModel.java b/src/main/java/de/dennisguse/opentracks/io/file/importer/ImportViewModel.java index 0b637b37e..0ad2f806b 100644 --- a/src/main/java/de/dennisguse/opentracks/io/file/importer/ImportViewModel.java +++ b/src/main/java/de/dennisguse/opentracks/io/file/importer/ImportViewModel.java @@ -16,7 +16,7 @@ import java.util.List; import java.util.stream.Collectors; import de.dennisguse.opentracks.R; -import de.dennisguse.opentracks.content.data.Track; +import de.dennisguse.opentracks.data.models.Track; import de.dennisguse.opentracks.util.FileUtils; public class ImportViewModel extends AndroidViewModel implements ImportServiceResultReceiver.Receiver { diff --git a/src/main/java/de/dennisguse/opentracks/io/file/importer/KmlTrackImporter.java b/src/main/java/de/dennisguse/opentracks/io/file/importer/KmlTrackImporter.java index 385eedef7..3c7eb14c7 100644 --- a/src/main/java/de/dennisguse/opentracks/io/file/importer/KmlTrackImporter.java +++ b/src/main/java/de/dennisguse/opentracks/io/file/importer/KmlTrackImporter.java @@ -32,11 +32,11 @@ import java.util.ArrayList; import java.util.List; import java.util.Locale; -import de.dennisguse.opentracks.content.data.Distance; -import de.dennisguse.opentracks.content.data.Marker; -import de.dennisguse.opentracks.content.data.Speed; -import de.dennisguse.opentracks.content.data.Track; -import de.dennisguse.opentracks.content.data.TrackPoint; +import de.dennisguse.opentracks.data.models.Distance; +import de.dennisguse.opentracks.data.models.Marker; +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.io.file.exporter.KMLTrackExporter; import de.dennisguse.opentracks.util.StringUtils; diff --git a/src/main/java/de/dennisguse/opentracks/io/file/importer/KmzTrackImporter.java b/src/main/java/de/dennisguse/opentracks/io/file/importer/KmzTrackImporter.java index 50b6adb63..e8fda73a5 100644 --- a/src/main/java/de/dennisguse/opentracks/io/file/importer/KmzTrackImporter.java +++ b/src/main/java/de/dennisguse/opentracks/io/file/importer/KmzTrackImporter.java @@ -34,9 +34,9 @@ import java.util.zip.ZipEntry; import java.util.zip.ZipInputStream; import de.dennisguse.opentracks.R; -import de.dennisguse.opentracks.content.data.Marker; -import de.dennisguse.opentracks.content.data.Track; -import de.dennisguse.opentracks.content.provider.ContentProviderUtils; +import de.dennisguse.opentracks.data.ContentProviderUtils; +import de.dennisguse.opentracks.data.models.Marker; +import de.dennisguse.opentracks.data.models.Track; import de.dennisguse.opentracks.io.file.exporter.KmzTrackExporter; import de.dennisguse.opentracks.util.FileUtils; 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 fe6067d48..0916bbf3c 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 @@ -19,12 +19,12 @@ import java.util.UUID; import java.util.stream.Collectors; import de.dennisguse.opentracks.R; -import de.dennisguse.opentracks.content.data.Distance; -import de.dennisguse.opentracks.content.data.Marker; -import de.dennisguse.opentracks.content.data.Speed; -import de.dennisguse.opentracks.content.data.Track; -import de.dennisguse.opentracks.content.data.TrackPoint; -import de.dennisguse.opentracks.content.provider.ContentProviderUtils; +import de.dennisguse.opentracks.data.ContentProviderUtils; +import de.dennisguse.opentracks.data.models.Distance; +import de.dennisguse.opentracks.data.models.Marker; +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.TrackStatistics; import de.dennisguse.opentracks.stats.TrackStatisticsUpdater; import de.dennisguse.opentracks.util.FileUtils; diff --git a/src/main/java/de/dennisguse/opentracks/io/file/importer/XMLImporter.java b/src/main/java/de/dennisguse/opentracks/io/file/importer/XMLImporter.java index 76b9b46ed..594fc05cd 100644 --- a/src/main/java/de/dennisguse/opentracks/io/file/importer/XMLImporter.java +++ b/src/main/java/de/dennisguse/opentracks/io/file/importer/XMLImporter.java @@ -17,7 +17,7 @@ import java.util.List; import javax.xml.parsers.ParserConfigurationException; import javax.xml.parsers.SAXParserFactory; -import de.dennisguse.opentracks.content.data.Track; +import de.dennisguse.opentracks.data.models.Track; /** * Uses SAX2 to parse XML files. diff --git a/src/main/java/de/dennisguse/opentracks/services/TrackDeleteService.java b/src/main/java/de/dennisguse/opentracks/services/TrackDeleteService.java index ff97fde54..9f7b79f44 100644 --- a/src/main/java/de/dennisguse/opentracks/services/TrackDeleteService.java +++ b/src/main/java/de/dennisguse/opentracks/services/TrackDeleteService.java @@ -19,8 +19,8 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import de.dennisguse.opentracks.R; -import de.dennisguse.opentracks.content.data.Track; -import de.dennisguse.opentracks.content.provider.ContentProviderUtils; +import de.dennisguse.opentracks.data.ContentProviderUtils; +import de.dennisguse.opentracks.data.models.Track; public class TrackDeleteService extends Service { diff --git a/src/main/java/de/dennisguse/opentracks/services/TrackDeleteServiceConnection.java b/src/main/java/de/dennisguse/opentracks/services/TrackDeleteServiceConnection.java index 0efd27c19..b34a3be29 100644 --- a/src/main/java/de/dennisguse/opentracks/services/TrackDeleteServiceConnection.java +++ b/src/main/java/de/dennisguse/opentracks/services/TrackDeleteServiceConnection.java @@ -1,5 +1,7 @@ package de.dennisguse.opentracks.services; +import static de.dennisguse.opentracks.services.TrackDeleteService.EXTRA_TRACK_IDS; + import android.content.ComponentName; import android.content.Context; import android.content.Intent; @@ -11,9 +13,7 @@ import androidx.annotation.NonNull; import java.util.ArrayList; import de.dennisguse.opentracks.BuildConfig; -import de.dennisguse.opentracks.content.data.Track; - -import static de.dennisguse.opentracks.services.TrackDeleteService.EXTRA_TRACK_IDS; +import de.dennisguse.opentracks.data.models.Track; public class TrackDeleteServiceConnection implements ServiceConnection { diff --git a/src/main/java/de/dennisguse/opentracks/services/TrackRecordingManager.java b/src/main/java/de/dennisguse/opentracks/services/TrackRecordingManager.java index cc7b86755..063797a5c 100644 --- a/src/main/java/de/dennisguse/opentracks/services/TrackRecordingManager.java +++ b/src/main/java/de/dennisguse/opentracks/services/TrackRecordingManager.java @@ -12,12 +12,12 @@ import androidx.annotation.NonNull; import java.time.ZoneOffset; import de.dennisguse.opentracks.R; -import de.dennisguse.opentracks.content.data.Distance; -import de.dennisguse.opentracks.content.data.Marker; -import de.dennisguse.opentracks.content.data.Track; -import de.dennisguse.opentracks.content.data.TrackPoint; -import de.dennisguse.opentracks.content.provider.ContentProviderUtils; import de.dennisguse.opentracks.content.sensor.SensorDataSet; +import de.dennisguse.opentracks.data.ContentProviderUtils; +import de.dennisguse.opentracks.data.models.Distance; +import de.dennisguse.opentracks.data.models.Marker; +import de.dennisguse.opentracks.data.models.Track; +import de.dennisguse.opentracks.data.models.TrackPoint; import de.dennisguse.opentracks.services.handlers.TrackPointCreator; import de.dennisguse.opentracks.settings.PreferencesUtils; import de.dennisguse.opentracks.stats.TrackStatistics; diff --git a/src/main/java/de/dennisguse/opentracks/services/TrackRecordingService.java b/src/main/java/de/dennisguse/opentracks/services/TrackRecordingService.java index ffa0e4534..0b319114b 100644 --- a/src/main/java/de/dennisguse/opentracks/services/TrackRecordingService.java +++ b/src/main/java/de/dennisguse/opentracks/services/TrackRecordingService.java @@ -40,12 +40,12 @@ import java.util.Objects; import de.dennisguse.opentracks.R; import de.dennisguse.opentracks.TrackListActivity; import de.dennisguse.opentracks.TrackRecordingActivity; -import de.dennisguse.opentracks.content.data.Distance; -import de.dennisguse.opentracks.content.data.Marker; -import de.dennisguse.opentracks.content.data.Track; -import de.dennisguse.opentracks.content.data.TrackPoint; -import de.dennisguse.opentracks.content.provider.CustomContentProvider; import de.dennisguse.opentracks.content.sensor.SensorDataSet; +import de.dennisguse.opentracks.data.CustomContentProvider; +import de.dennisguse.opentracks.data.models.Distance; +import de.dennisguse.opentracks.data.models.Marker; +import de.dennisguse.opentracks.data.models.Track; +import de.dennisguse.opentracks.data.models.TrackPoint; import de.dennisguse.opentracks.io.file.exporter.ExportServiceResultReceiver; import de.dennisguse.opentracks.services.announcement.VoiceAnnouncementManager; import de.dennisguse.opentracks.services.handlers.EGM2008CorrectionManager; diff --git a/src/main/java/de/dennisguse/opentracks/services/TrackRecordingServiceConnection.java b/src/main/java/de/dennisguse/opentracks/services/TrackRecordingServiceConnection.java index 6cd7121db..360679482 100644 --- a/src/main/java/de/dennisguse/opentracks/services/TrackRecordingServiceConnection.java +++ b/src/main/java/de/dennisguse/opentracks/services/TrackRecordingServiceConnection.java @@ -31,7 +31,7 @@ import androidx.annotation.Nullable; import de.dennisguse.opentracks.BuildConfig; import de.dennisguse.opentracks.R; -import de.dennisguse.opentracks.content.data.Marker; +import de.dennisguse.opentracks.data.models.Marker; /** * Wrapper for the track recording service. diff --git a/src/main/java/de/dennisguse/opentracks/services/TrackRecordingServiceNotificationManager.java b/src/main/java/de/dennisguse/opentracks/services/TrackRecordingServiceNotificationManager.java index 763f60a45..4a496e087 100644 --- a/src/main/java/de/dennisguse/opentracks/services/TrackRecordingServiceNotificationManager.java +++ b/src/main/java/de/dennisguse/opentracks/services/TrackRecordingServiceNotificationManager.java @@ -11,8 +11,8 @@ import androidx.annotation.VisibleForTesting; import androidx.core.app.NotificationCompat; import de.dennisguse.opentracks.R; -import de.dennisguse.opentracks.content.data.Distance; -import de.dennisguse.opentracks.content.data.TrackPoint; +import de.dennisguse.opentracks.data.models.Distance; +import de.dennisguse.opentracks.data.models.TrackPoint; import de.dennisguse.opentracks.stats.TrackStatistics; import de.dennisguse.opentracks.util.StringUtils; diff --git a/src/main/java/de/dennisguse/opentracks/services/announcement/VoiceAnnouncement.java b/src/main/java/de/dennisguse/opentracks/services/announcement/VoiceAnnouncement.java index ce4632a67..bbf89dc73 100644 --- a/src/main/java/de/dennisguse/opentracks/services/announcement/VoiceAnnouncement.java +++ b/src/main/java/de/dennisguse/opentracks/services/announcement/VoiceAnnouncement.java @@ -29,10 +29,10 @@ import java.util.Arrays; import java.util.Locale; import de.dennisguse.opentracks.R; -import de.dennisguse.opentracks.content.data.Distance; -import de.dennisguse.opentracks.content.data.Track; -import de.dennisguse.opentracks.content.provider.ContentProviderUtils; -import de.dennisguse.opentracks.content.provider.TrackPointIterator; +import de.dennisguse.opentracks.data.ContentProviderUtils; +import de.dennisguse.opentracks.data.TrackPointIterator; +import de.dennisguse.opentracks.data.models.Distance; +import de.dennisguse.opentracks.data.models.Track; import de.dennisguse.opentracks.settings.PreferencesUtils; import de.dennisguse.opentracks.stats.TrackStatistics; import de.dennisguse.opentracks.ui.intervals.IntervalStatistics; 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 8e434108e..b24afe2a2 100644 --- a/src/main/java/de/dennisguse/opentracks/services/announcement/VoiceAnnouncementManager.java +++ b/src/main/java/de/dennisguse/opentracks/services/announcement/VoiceAnnouncementManager.java @@ -23,8 +23,8 @@ import androidx.annotation.VisibleForTesting; import java.time.Duration; -import de.dennisguse.opentracks.content.data.Distance; -import de.dennisguse.opentracks.content.data.Track; +import de.dennisguse.opentracks.data.models.Distance; +import de.dennisguse.opentracks.data.models.Track; import de.dennisguse.opentracks.services.TrackRecordingService; import de.dennisguse.opentracks.stats.TrackStatistics; 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 90f23830e..d03ee1166 100644 --- a/src/main/java/de/dennisguse/opentracks/services/announcement/VoiceAnnouncementUtils.java +++ b/src/main/java/de/dennisguse/opentracks/services/announcement/VoiceAnnouncementUtils.java @@ -7,8 +7,8 @@ import androidx.annotation.Nullable; import java.time.Duration; import de.dennisguse.opentracks.R; -import de.dennisguse.opentracks.content.data.Distance; -import de.dennisguse.opentracks.content.data.Speed; +import de.dennisguse.opentracks.data.models.Distance; +import de.dennisguse.opentracks.data.models.Speed; import de.dennisguse.opentracks.stats.TrackStatistics; import de.dennisguse.opentracks.ui.intervals.IntervalStatistics; diff --git a/src/main/java/de/dennisguse/opentracks/services/handlers/EGM2008CorrectionManager.java b/src/main/java/de/dennisguse/opentracks/services/handlers/EGM2008CorrectionManager.java index 943f03485..b5b29b9d5 100644 --- a/src/main/java/de/dennisguse/opentracks/services/handlers/EGM2008CorrectionManager.java +++ b/src/main/java/de/dennisguse/opentracks/services/handlers/EGM2008CorrectionManager.java @@ -5,8 +5,8 @@ import android.util.Log; import java.io.IOException; -import de.dennisguse.opentracks.content.data.Altitude; -import de.dennisguse.opentracks.content.data.TrackPoint; +import de.dennisguse.opentracks.data.models.Altitude; +import de.dennisguse.opentracks.data.models.TrackPoint; import de.dennisguse.opentracks.util.EGM2008Utils; public class EGM2008CorrectionManager { diff --git a/src/main/java/de/dennisguse/opentracks/services/handlers/GPSHandler.java b/src/main/java/de/dennisguse/opentracks/services/handlers/GPSHandler.java index aa954d0fb..ff6ff4725 100644 --- a/src/main/java/de/dennisguse/opentracks/services/handlers/GPSHandler.java +++ b/src/main/java/de/dennisguse/opentracks/services/handlers/GPSHandler.java @@ -13,8 +13,8 @@ import androidx.annotation.VisibleForTesting; import java.time.Duration; import de.dennisguse.opentracks.R; -import de.dennisguse.opentracks.content.data.Distance; -import de.dennisguse.opentracks.content.data.TrackPoint; +import de.dennisguse.opentracks.data.models.Distance; +import de.dennisguse.opentracks.data.models.TrackPoint; import de.dennisguse.opentracks.settings.PreferencesUtils; import de.dennisguse.opentracks.util.LocationUtils; diff --git a/src/main/java/de/dennisguse/opentracks/services/handlers/GpsStatus.java b/src/main/java/de/dennisguse/opentracks/services/handlers/GpsStatus.java index 9ceb8802a..995cc988e 100644 --- a/src/main/java/de/dennisguse/opentracks/services/handlers/GpsStatus.java +++ b/src/main/java/de/dennisguse/opentracks/services/handlers/GpsStatus.java @@ -10,8 +10,8 @@ import androidx.annotation.Nullable; import java.time.Duration; import java.time.Instant; -import de.dennisguse.opentracks.content.data.Distance; -import de.dennisguse.opentracks.content.data.TrackPoint; +import de.dennisguse.opentracks.data.models.Distance; +import de.dennisguse.opentracks.data.models.TrackPoint; import de.dennisguse.opentracks.settings.PreferencesUtils; /** diff --git a/src/main/java/de/dennisguse/opentracks/services/handlers/TrackPointCreator.java b/src/main/java/de/dennisguse/opentracks/services/handlers/TrackPointCreator.java index 2d61eccc0..2c7891196 100644 --- a/src/main/java/de/dennisguse/opentracks/services/handlers/TrackPointCreator.java +++ b/src/main/java/de/dennisguse/opentracks/services/handlers/TrackPointCreator.java @@ -12,9 +12,9 @@ import java.time.Clock; import java.time.Instant; import java.time.ZoneId; -import de.dennisguse.opentracks.content.data.Distance; -import de.dennisguse.opentracks.content.data.TrackPoint; import de.dennisguse.opentracks.content.sensor.SensorDataSet; +import de.dennisguse.opentracks.data.models.Distance; +import de.dennisguse.opentracks.data.models.TrackPoint; import de.dennisguse.opentracks.services.sensors.AltitudeSumManager; import de.dennisguse.opentracks.services.sensors.BluetoothRemoteSensorManager; diff --git a/src/main/java/de/dennisguse/opentracks/services/sensors/AltitudeSumManager.java b/src/main/java/de/dennisguse/opentracks/services/sensors/AltitudeSumManager.java index bcebce71f..d358e80b5 100644 --- a/src/main/java/de/dennisguse/opentracks/services/sensors/AltitudeSumManager.java +++ b/src/main/java/de/dennisguse/opentracks/services/sensors/AltitudeSumManager.java @@ -11,7 +11,7 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.annotation.VisibleForTesting; -import de.dennisguse.opentracks.content.data.TrackPoint; +import de.dennisguse.opentracks.data.models.TrackPoint; /** * Estimates the altitude gain and altitude loss using the device's pressure sensor (i.e., barometer). diff --git a/src/main/java/de/dennisguse/opentracks/services/sensors/BluetoothRemoteSensorManager.java b/src/main/java/de/dennisguse/opentracks/services/sensors/BluetoothRemoteSensorManager.java index d9546f884..07ce89962 100644 --- a/src/main/java/de/dennisguse/opentracks/services/sensors/BluetoothRemoteSensorManager.java +++ b/src/main/java/de/dennisguse/opentracks/services/sensors/BluetoothRemoteSensorManager.java @@ -27,12 +27,12 @@ import androidx.annotation.NonNull; import java.time.Duration; import de.dennisguse.opentracks.R; -import de.dennisguse.opentracks.content.data.Distance; -import de.dennisguse.opentracks.content.data.TrackPoint; import de.dennisguse.opentracks.content.sensor.SensorData; import de.dennisguse.opentracks.content.sensor.SensorDataCycling; import de.dennisguse.opentracks.content.sensor.SensorDataRunning; import de.dennisguse.opentracks.content.sensor.SensorDataSet; +import de.dennisguse.opentracks.data.models.Distance; +import de.dennisguse.opentracks.data.models.TrackPoint; import de.dennisguse.opentracks.settings.PreferencesUtils; /** diff --git a/src/main/java/de/dennisguse/opentracks/services/sensors/BluetoothUtils.java b/src/main/java/de/dennisguse/opentracks/services/sensors/BluetoothUtils.java index 0d19ef667..243b585de 100644 --- a/src/main/java/de/dennisguse/opentracks/services/sensors/BluetoothUtils.java +++ b/src/main/java/de/dennisguse/opentracks/services/sensors/BluetoothUtils.java @@ -28,10 +28,10 @@ import java.util.Collections; import java.util.List; import java.util.UUID; -import de.dennisguse.opentracks.content.data.Distance; -import de.dennisguse.opentracks.content.data.Speed; import de.dennisguse.opentracks.content.sensor.SensorDataCycling; import de.dennisguse.opentracks.content.sensor.SensorDataRunning; +import de.dennisguse.opentracks.data.models.Distance; +import de.dennisguse.opentracks.data.models.Speed; /** * Utilities for dealing with bluetooth devices. diff --git a/src/main/java/de/dennisguse/opentracks/settings/GpsSettingsFragment.java b/src/main/java/de/dennisguse/opentracks/settings/GpsSettingsFragment.java index dd2c6f53f..52204679d 100644 --- a/src/main/java/de/dennisguse/opentracks/settings/GpsSettingsFragment.java +++ b/src/main/java/de/dennisguse/opentracks/settings/GpsSettingsFragment.java @@ -8,7 +8,7 @@ import androidx.preference.PreferenceFragmentCompat; import java.time.Duration; import de.dennisguse.opentracks.R; -import de.dennisguse.opentracks.content.data.Distance; +import de.dennisguse.opentracks.data.models.Distance; import de.dennisguse.opentracks.util.StringUtils; public class GpsSettingsFragment extends PreferenceFragmentCompat { diff --git a/src/main/java/de/dennisguse/opentracks/settings/PreferencesUtils.java b/src/main/java/de/dennisguse/opentracks/settings/PreferencesUtils.java index 709d56f80..8e0f42844 100644 --- a/src/main/java/de/dennisguse/opentracks/settings/PreferencesUtils.java +++ b/src/main/java/de/dennisguse/opentracks/settings/PreferencesUtils.java @@ -39,9 +39,9 @@ import java.util.stream.Collectors; import java.util.stream.Stream; import de.dennisguse.opentracks.R; -import de.dennisguse.opentracks.content.data.Distance; -import de.dennisguse.opentracks.content.data.Speed; -import de.dennisguse.opentracks.content.data.UnitConversions; +import de.dennisguse.opentracks.data.models.Distance; +import de.dennisguse.opentracks.data.models.Speed; +import de.dennisguse.opentracks.data.models.UnitConversions; import de.dennisguse.opentracks.io.file.TrackFileFormat; import de.dennisguse.opentracks.ui.customRecordingLayout.CsvLayoutUtils; import de.dennisguse.opentracks.ui.customRecordingLayout.Layout; diff --git a/src/main/java/de/dennisguse/opentracks/stats/AltitudeRingBuffer.java b/src/main/java/de/dennisguse/opentracks/stats/AltitudeRingBuffer.java index 4a1300fa4..4848feb8d 100644 --- a/src/main/java/de/dennisguse/opentracks/stats/AltitudeRingBuffer.java +++ b/src/main/java/de/dennisguse/opentracks/stats/AltitudeRingBuffer.java @@ -2,7 +2,7 @@ package de.dennisguse.opentracks.stats; import androidx.annotation.Nullable; -import de.dennisguse.opentracks.content.data.Altitude; +import de.dennisguse.opentracks.data.models.Altitude; public class AltitudeRingBuffer extends RingBuffer { diff --git a/src/main/java/de/dennisguse/opentracks/stats/SpeedRingBuffer.java b/src/main/java/de/dennisguse/opentracks/stats/SpeedRingBuffer.java index bfe6c69d4..990e87cac 100644 --- a/src/main/java/de/dennisguse/opentracks/stats/SpeedRingBuffer.java +++ b/src/main/java/de/dennisguse/opentracks/stats/SpeedRingBuffer.java @@ -2,7 +2,7 @@ package de.dennisguse.opentracks.stats; import androidx.annotation.Nullable; -import de.dennisguse.opentracks.content.data.Speed; +import de.dennisguse.opentracks.data.models.Speed; public class SpeedRingBuffer extends RingBuffer { diff --git a/src/main/java/de/dennisguse/opentracks/stats/TrackStatistics.java b/src/main/java/de/dennisguse/opentracks/stats/TrackStatistics.java index 17dc6da9d..cdb7b9ae1 100644 --- a/src/main/java/de/dennisguse/opentracks/stats/TrackStatistics.java +++ b/src/main/java/de/dennisguse/opentracks/stats/TrackStatistics.java @@ -23,13 +23,14 @@ import androidx.annotation.VisibleForTesting; import java.time.Duration; import java.time.Instant; -import de.dennisguse.opentracks.content.data.Altitude; -import de.dennisguse.opentracks.content.data.Distance; -import de.dennisguse.opentracks.content.data.Speed; -import de.dennisguse.opentracks.content.data.TrackPoint; +import de.dennisguse.opentracks.data.models.Altitude; +import de.dennisguse.opentracks.data.models.Distance; +import de.dennisguse.opentracks.data.models.Speed; +import de.dennisguse.opentracks.data.models.Track; +import de.dennisguse.opentracks.data.models.TrackPoint; /** - * Statistical data about a {@link de.dennisguse.opentracks.content.data.Track}. + * Statistical data about a {@link Track}. * The data in this class should be filled out by {@link TrackStatisticsUpdater}. * * @author Rodrigo Damazio diff --git a/src/main/java/de/dennisguse/opentracks/stats/TrackStatisticsUpdater.java b/src/main/java/de/dennisguse/opentracks/stats/TrackStatisticsUpdater.java index f2ec77d57..8cf1b9dcb 100644 --- a/src/main/java/de/dennisguse/opentracks/stats/TrackStatisticsUpdater.java +++ b/src/main/java/de/dennisguse/opentracks/stats/TrackStatisticsUpdater.java @@ -24,10 +24,10 @@ import androidx.annotation.VisibleForTesting; import java.time.Duration; import java.util.List; -import de.dennisguse.opentracks.content.data.Altitude; -import de.dennisguse.opentracks.content.data.Distance; -import de.dennisguse.opentracks.content.data.Speed; -import de.dennisguse.opentracks.content.data.TrackPoint; +import de.dennisguse.opentracks.data.models.Altitude; +import de.dennisguse.opentracks.data.models.Distance; +import de.dennisguse.opentracks.data.models.Speed; +import de.dennisguse.opentracks.data.models.TrackPoint; /** * Updater for {@link TrackStatistics}. diff --git a/src/main/java/de/dennisguse/opentracks/ui/aggregatedStatistics/AggregatedStatistics.java b/src/main/java/de/dennisguse/opentracks/ui/aggregatedStatistics/AggregatedStatistics.java index eb125b39f..d40081305 100644 --- a/src/main/java/de/dennisguse/opentracks/ui/aggregatedStatistics/AggregatedStatistics.java +++ b/src/main/java/de/dennisguse/opentracks/ui/aggregatedStatistics/AggregatedStatistics.java @@ -9,7 +9,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import de.dennisguse.opentracks.content.data.Track; +import de.dennisguse.opentracks.data.models.Track; import de.dennisguse.opentracks.stats.TrackStatistics; public class AggregatedStatistics { diff --git a/src/main/java/de/dennisguse/opentracks/ui/aggregatedStatistics/AggregatedStatisticsActivity.java b/src/main/java/de/dennisguse/opentracks/ui/aggregatedStatistics/AggregatedStatisticsActivity.java index 7108e3f71..d4ba978d2 100644 --- a/src/main/java/de/dennisguse/opentracks/ui/aggregatedStatistics/AggregatedStatisticsActivity.java +++ b/src/main/java/de/dennisguse/opentracks/ui/aggregatedStatistics/AggregatedStatisticsActivity.java @@ -15,8 +15,8 @@ import java.util.List; import de.dennisguse.opentracks.AbstractActivity; import de.dennisguse.opentracks.R; -import de.dennisguse.opentracks.content.data.Track; -import de.dennisguse.opentracks.content.data.TrackSelection; +import de.dennisguse.opentracks.data.TrackSelection; +import de.dennisguse.opentracks.data.models.Track; import de.dennisguse.opentracks.databinding.AggregatedStatsBinding; public class AggregatedStatisticsActivity extends AbstractActivity implements FilterDialogFragment.FilterDialogListener { diff --git a/src/main/java/de/dennisguse/opentracks/ui/aggregatedStatistics/AggregatedStatisticsModel.java b/src/main/java/de/dennisguse/opentracks/ui/aggregatedStatistics/AggregatedStatisticsModel.java index 83316fb76..5115a00c5 100644 --- a/src/main/java/de/dennisguse/opentracks/ui/aggregatedStatistics/AggregatedStatisticsModel.java +++ b/src/main/java/de/dennisguse/opentracks/ui/aggregatedStatistics/AggregatedStatisticsModel.java @@ -10,9 +10,9 @@ import androidx.lifecycle.MutableLiveData; import java.util.List; -import de.dennisguse.opentracks.content.data.Track; -import de.dennisguse.opentracks.content.data.TrackSelection; -import de.dennisguse.opentracks.content.provider.ContentProviderUtils; +import de.dennisguse.opentracks.data.ContentProviderUtils; +import de.dennisguse.opentracks.data.TrackSelection; +import de.dennisguse.opentracks.data.models.Track; public class AggregatedStatisticsModel extends AndroidViewModel { diff --git a/src/main/java/de/dennisguse/opentracks/ui/aggregatedStatistics/ConfirmDeleteDialogFragment.java b/src/main/java/de/dennisguse/opentracks/ui/aggregatedStatistics/ConfirmDeleteDialogFragment.java index cccf9c600..a02923af0 100644 --- a/src/main/java/de/dennisguse/opentracks/ui/aggregatedStatistics/ConfirmDeleteDialogFragment.java +++ b/src/main/java/de/dennisguse/opentracks/ui/aggregatedStatistics/ConfirmDeleteDialogFragment.java @@ -25,7 +25,7 @@ import androidx.fragment.app.DialogFragment; import androidx.fragment.app.FragmentManager; import de.dennisguse.opentracks.R; -import de.dennisguse.opentracks.content.data.Track; +import de.dennisguse.opentracks.data.models.Track; import de.dennisguse.opentracks.util.DialogUtils; /** diff --git a/src/main/java/de/dennisguse/opentracks/ui/intervals/IntervalStatistics.java b/src/main/java/de/dennisguse/opentracks/ui/intervals/IntervalStatistics.java index 37891aac2..1aeee34f6 100644 --- a/src/main/java/de/dennisguse/opentracks/ui/intervals/IntervalStatistics.java +++ b/src/main/java/de/dennisguse/opentracks/ui/intervals/IntervalStatistics.java @@ -6,10 +6,10 @@ import java.time.Duration; import java.util.ArrayList; import java.util.List; -import de.dennisguse.opentracks.content.data.Distance; -import de.dennisguse.opentracks.content.data.Speed; -import de.dennisguse.opentracks.content.data.TrackPoint; -import de.dennisguse.opentracks.content.provider.TrackPointIterator; +import de.dennisguse.opentracks.data.TrackPointIterator; +import de.dennisguse.opentracks.data.models.Distance; +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.TrackStatisticsUpdater; 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 1cd38031e..556a310e9 100644 --- a/src/main/java/de/dennisguse/opentracks/ui/intervals/IntervalStatisticsAdapter.java +++ b/src/main/java/de/dennisguse/opentracks/ui/intervals/IntervalStatisticsAdapter.java @@ -12,7 +12,7 @@ import androidx.recyclerview.widget.RecyclerView; import java.util.List; import de.dennisguse.opentracks.R; -import de.dennisguse.opentracks.content.data.Distance; +import de.dennisguse.opentracks.data.models.Distance; import de.dennisguse.opentracks.util.StringUtils; public class IntervalStatisticsAdapter extends RecyclerView.Adapter { 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 87c19c75d..4b490a0c6 100644 --- a/src/main/java/de/dennisguse/opentracks/ui/intervals/IntervalStatisticsModel.java +++ b/src/main/java/de/dennisguse/opentracks/ui/intervals/IntervalStatisticsModel.java @@ -16,12 +16,12 @@ import java.util.List; import java.util.concurrent.Executor; import java.util.concurrent.Executors; -import de.dennisguse.opentracks.content.data.Distance; -import de.dennisguse.opentracks.content.data.Track; -import de.dennisguse.opentracks.content.data.TrackPoint; -import de.dennisguse.opentracks.content.data.TrackPointsColumns; -import de.dennisguse.opentracks.content.provider.ContentProviderUtils; -import de.dennisguse.opentracks.content.provider.TrackPointIterator; +import de.dennisguse.opentracks.data.ContentProviderUtils; +import de.dennisguse.opentracks.data.TrackPointIterator; +import de.dennisguse.opentracks.data.models.Distance; +import de.dennisguse.opentracks.data.models.Track; +import de.dennisguse.opentracks.data.models.TrackPoint; +import de.dennisguse.opentracks.data.tables.TrackPointsColumns; import de.dennisguse.opentracks.settings.PreferencesUtils; /** 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 58cf3b7f1..9915de750 100644 --- a/src/main/java/de/dennisguse/opentracks/ui/intervals/IntervalsFragment.java +++ b/src/main/java/de/dennisguse/opentracks/ui/intervals/IntervalsFragment.java @@ -19,8 +19,8 @@ import androidx.recyclerview.widget.LinearLayoutManager; import java.util.List; import de.dennisguse.opentracks.R; -import de.dennisguse.opentracks.content.data.Track; -import de.dennisguse.opentracks.content.provider.ContentProviderUtils; +import de.dennisguse.opentracks.data.ContentProviderUtils; +import de.dennisguse.opentracks.data.models.Track; import de.dennisguse.opentracks.databinding.IntervalListViewBinding; import de.dennisguse.opentracks.settings.PreferencesUtils; diff --git a/src/main/java/de/dennisguse/opentracks/ui/markers/DeleteMarkerDialogFragment.java b/src/main/java/de/dennisguse/opentracks/ui/markers/DeleteMarkerDialogFragment.java index d35360d66..e069b19ec 100644 --- a/src/main/java/de/dennisguse/opentracks/ui/markers/DeleteMarkerDialogFragment.java +++ b/src/main/java/de/dennisguse/opentracks/ui/markers/DeleteMarkerDialogFragment.java @@ -26,8 +26,8 @@ import androidx.fragment.app.FragmentActivity; import androidx.fragment.app.FragmentManager; import de.dennisguse.opentracks.R; -import de.dennisguse.opentracks.content.data.Marker; -import de.dennisguse.opentracks.content.provider.ContentProviderUtils; +import de.dennisguse.opentracks.data.ContentProviderUtils; +import de.dennisguse.opentracks.data.models.Marker; import de.dennisguse.opentracks.util.DialogUtils; /** diff --git a/src/main/java/de/dennisguse/opentracks/ui/markers/MarkerDetailActivity.java b/src/main/java/de/dennisguse/opentracks/ui/markers/MarkerDetailActivity.java index 3f65da11e..71c715779 100644 --- a/src/main/java/de/dennisguse/opentracks/ui/markers/MarkerDetailActivity.java +++ b/src/main/java/de/dennisguse/opentracks/ui/markers/MarkerDetailActivity.java @@ -33,8 +33,8 @@ import java.util.List; import de.dennisguse.opentracks.AbstractActivity; import de.dennisguse.opentracks.R; -import de.dennisguse.opentracks.content.data.Marker; -import de.dennisguse.opentracks.content.provider.ContentProviderUtils; +import de.dennisguse.opentracks.data.ContentProviderUtils; +import de.dennisguse.opentracks.data.models.Marker; import de.dennisguse.opentracks.databinding.MarkerDetailActivityBinding; import de.dennisguse.opentracks.ui.markers.DeleteMarkerDialogFragment.DeleteMarkerCaller; diff --git a/src/main/java/de/dennisguse/opentracks/ui/markers/MarkerDetailFragment.java b/src/main/java/de/dennisguse/opentracks/ui/markers/MarkerDetailFragment.java index 5267ee0ca..229938775 100644 --- a/src/main/java/de/dennisguse/opentracks/ui/markers/MarkerDetailFragment.java +++ b/src/main/java/de/dennisguse/opentracks/ui/markers/MarkerDetailFragment.java @@ -37,8 +37,8 @@ import androidx.fragment.app.FragmentActivity; import java.time.Duration; import de.dennisguse.opentracks.R; -import de.dennisguse.opentracks.content.data.Marker; -import de.dennisguse.opentracks.content.provider.ContentProviderUtils; +import de.dennisguse.opentracks.data.ContentProviderUtils; +import de.dennisguse.opentracks.data.models.Marker; import de.dennisguse.opentracks.databinding.MarkerDetailFragmentBinding; import de.dennisguse.opentracks.util.IntentUtils; import de.dennisguse.opentracks.util.ListItemUtils; diff --git a/src/main/java/de/dennisguse/opentracks/ui/markers/MarkerEditActivity.java b/src/main/java/de/dennisguse/opentracks/ui/markers/MarkerEditActivity.java index 0073cbde9..8765ab797 100644 --- a/src/main/java/de/dennisguse/opentracks/ui/markers/MarkerEditActivity.java +++ b/src/main/java/de/dennisguse/opentracks/ui/markers/MarkerEditActivity.java @@ -40,8 +40,8 @@ import java.io.IOException; import de.dennisguse.opentracks.AbstractActivity; import de.dennisguse.opentracks.R; -import de.dennisguse.opentracks.content.data.Marker; -import de.dennisguse.opentracks.content.data.Track; +import de.dennisguse.opentracks.data.models.Marker; +import de.dennisguse.opentracks.data.models.Track; import de.dennisguse.opentracks.databinding.MarkerEditBinding; import de.dennisguse.opentracks.util.IntentUtils; diff --git a/src/main/java/de/dennisguse/opentracks/ui/markers/MarkerEditViewModel.java b/src/main/java/de/dennisguse/opentracks/ui/markers/MarkerEditViewModel.java index b6b4d9f08..f76a98a33 100644 --- a/src/main/java/de/dennisguse/opentracks/ui/markers/MarkerEditViewModel.java +++ b/src/main/java/de/dennisguse/opentracks/ui/markers/MarkerEditViewModel.java @@ -19,9 +19,9 @@ import java.time.Instant; import java.util.NoSuchElementException; import de.dennisguse.opentracks.R; -import de.dennisguse.opentracks.content.data.Marker; -import de.dennisguse.opentracks.content.data.Track; -import de.dennisguse.opentracks.content.provider.ContentProviderUtils; +import de.dennisguse.opentracks.data.ContentProviderUtils; +import de.dennisguse.opentracks.data.models.Marker; +import de.dennisguse.opentracks.data.models.Track; import de.dennisguse.opentracks.services.TrackRecordingServiceConnection; import de.dennisguse.opentracks.util.FileUtils; diff --git a/src/main/java/de/dennisguse/opentracks/ui/markers/MarkerListActivity.java b/src/main/java/de/dennisguse/opentracks/ui/markers/MarkerListActivity.java index 52219c8b7..a25b48bd1 100644 --- a/src/main/java/de/dennisguse/opentracks/ui/markers/MarkerListActivity.java +++ b/src/main/java/de/dennisguse/opentracks/ui/markers/MarkerListActivity.java @@ -33,10 +33,10 @@ import androidx.loader.content.Loader; import de.dennisguse.opentracks.AbstractActivity; import de.dennisguse.opentracks.R; -import de.dennisguse.opentracks.content.data.Marker; -import de.dennisguse.opentracks.content.data.MarkerColumns; -import de.dennisguse.opentracks.content.data.Track; -import de.dennisguse.opentracks.content.provider.ContentProviderUtils; +import de.dennisguse.opentracks.data.ContentProviderUtils; +import de.dennisguse.opentracks.data.models.Marker; +import de.dennisguse.opentracks.data.models.Track; +import de.dennisguse.opentracks.data.tables.MarkerColumns; import de.dennisguse.opentracks.databinding.MarkerListBinding; import de.dennisguse.opentracks.services.TrackRecordingService; import de.dennisguse.opentracks.services.TrackRecordingServiceConnection; diff --git a/src/main/java/de/dennisguse/opentracks/ui/markers/MarkerResourceCursorAdapter.java b/src/main/java/de/dennisguse/opentracks/ui/markers/MarkerResourceCursorAdapter.java index ddf9c8edd..dfb63631d 100644 --- a/src/main/java/de/dennisguse/opentracks/ui/markers/MarkerResourceCursorAdapter.java +++ b/src/main/java/de/dennisguse/opentracks/ui/markers/MarkerResourceCursorAdapter.java @@ -23,9 +23,9 @@ import java.time.Instant; import java.time.OffsetDateTime; import de.dennisguse.opentracks.R; -import de.dennisguse.opentracks.content.data.MarkerColumns; -import de.dennisguse.opentracks.content.data.Track; -import de.dennisguse.opentracks.content.provider.ContentProviderUtils; +import de.dennisguse.opentracks.data.ContentProviderUtils; +import de.dennisguse.opentracks.data.models.Track; +import de.dennisguse.opentracks.data.tables.MarkerColumns; import de.dennisguse.opentracks.ui.util.ExecutorListViewService; import de.dennisguse.opentracks.ui.util.ScrollVisibleViews; import de.dennisguse.opentracks.util.ListItemUtils; diff --git a/src/main/java/de/dennisguse/opentracks/util/ExportUtils.java b/src/main/java/de/dennisguse/opentracks/util/ExportUtils.java index 23e58fc5a..58ebfd869 100644 --- a/src/main/java/de/dennisguse/opentracks/util/ExportUtils.java +++ b/src/main/java/de/dennisguse/opentracks/util/ExportUtils.java @@ -19,7 +19,7 @@ import java.util.UUID; import java.util.regex.Pattern; import de.dennisguse.opentracks.R; -import de.dennisguse.opentracks.content.data.Track; +import de.dennisguse.opentracks.data.models.Track; import de.dennisguse.opentracks.io.file.TrackFileFormat; import de.dennisguse.opentracks.io.file.exporter.ExportService; import de.dennisguse.opentracks.io.file.exporter.ExportServiceResultReceiver; diff --git a/src/main/java/de/dennisguse/opentracks/util/FileUtils.java b/src/main/java/de/dennisguse/opentracks/util/FileUtils.java index cdedc96fd..79e518b27 100644 --- a/src/main/java/de/dennisguse/opentracks/util/FileUtils.java +++ b/src/main/java/de/dennisguse/opentracks/util/FileUtils.java @@ -34,7 +34,7 @@ import java.util.ArrayList; import java.util.Date; import de.dennisguse.opentracks.BuildConfig; -import de.dennisguse.opentracks.content.data.Track; +import de.dennisguse.opentracks.data.models.Track; /** * Utilities for dealing with files. diff --git a/src/main/java/de/dennisguse/opentracks/util/IntentDashboardUtils.java b/src/main/java/de/dennisguse/opentracks/util/IntentDashboardUtils.java index 3e15b32d2..53b1a9e88 100644 --- a/src/main/java/de/dennisguse/opentracks/util/IntentDashboardUtils.java +++ b/src/main/java/de/dennisguse/opentracks/util/IntentDashboardUtils.java @@ -11,11 +11,11 @@ import java.util.ArrayList; import java.util.HashSet; import java.util.Set; -import de.dennisguse.opentracks.content.data.MarkerColumns; -import de.dennisguse.opentracks.content.data.Track; -import de.dennisguse.opentracks.content.data.TrackPointsColumns; -import de.dennisguse.opentracks.content.data.TracksColumns; -import de.dennisguse.opentracks.content.provider.ContentProviderUtils; +import de.dennisguse.opentracks.data.ContentProviderUtils; +import de.dennisguse.opentracks.data.models.Track; +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.settings.PreferencesUtils; /** diff --git a/src/main/java/de/dennisguse/opentracks/util/IntentUtils.java b/src/main/java/de/dennisguse/opentracks/util/IntentUtils.java index ba22f4cf3..541dbaf39 100644 --- a/src/main/java/de/dennisguse/opentracks/util/IntentUtils.java +++ b/src/main/java/de/dennisguse/opentracks/util/IntentUtils.java @@ -33,14 +33,13 @@ import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Arrays; import java.util.Date; -import java.util.List; import de.dennisguse.opentracks.R; import de.dennisguse.opentracks.content.DescriptionGenerator; -import de.dennisguse.opentracks.content.data.Marker; -import de.dennisguse.opentracks.content.data.Track; -import de.dennisguse.opentracks.content.provider.ContentProviderUtils; -import de.dennisguse.opentracks.content.provider.ShareContentProvider; +import de.dennisguse.opentracks.data.ContentProviderUtils; +import de.dennisguse.opentracks.data.ShareContentProvider; +import de.dennisguse.opentracks.data.models.Marker; +import de.dennisguse.opentracks.data.models.Track; import de.dennisguse.opentracks.io.file.TrackFileFormat; import de.dennisguse.opentracks.settings.PreferencesUtils; diff --git a/src/main/java/de/dennisguse/opentracks/util/StringUtils.java b/src/main/java/de/dennisguse/opentracks/util/StringUtils.java index 65aa39d24..6e49de27d 100644 --- a/src/main/java/de/dennisguse/opentracks/util/StringUtils.java +++ b/src/main/java/de/dennisguse/opentracks/util/StringUtils.java @@ -32,8 +32,8 @@ import java.time.Duration; import java.time.Instant; import java.time.LocalDate; import java.time.LocalDateTime; -import java.time.ZoneId; import java.time.OffsetDateTime; +import java.time.ZoneId; import java.time.ZoneOffset; import java.time.ZonedDateTime; import java.time.format.DateTimeFormatter; @@ -41,8 +41,8 @@ import java.time.format.FormatStyle; import java.time.temporal.TemporalAccessor; import de.dennisguse.opentracks.R; -import de.dennisguse.opentracks.content.data.Distance; -import de.dennisguse.opentracks.content.data.Speed; +import de.dennisguse.opentracks.data.models.Distance; +import de.dennisguse.opentracks.data.models.Speed; /** * Various string manipulation methods. diff --git a/src/main/java/de/dennisguse/opentracks/util/TrackNameUtils.java b/src/main/java/de/dennisguse/opentracks/util/TrackNameUtils.java index 58143a0d9..6b47bed34 100644 --- a/src/main/java/de/dennisguse/opentracks/util/TrackNameUtils.java +++ b/src/main/java/de/dennisguse/opentracks/util/TrackNameUtils.java @@ -21,7 +21,7 @@ import android.content.Context; import java.time.OffsetDateTime; import de.dennisguse.opentracks.R; -import de.dennisguse.opentracks.content.data.Track; +import de.dennisguse.opentracks.data.models.Track; import de.dennisguse.opentracks.settings.PreferencesUtils; /** diff --git a/src/main/java/de/dennisguse/opentracks/util/TrackUtils.java b/src/main/java/de/dennisguse/opentracks/util/TrackUtils.java index a6a5d6404..8d0639cbd 100644 --- a/src/main/java/de/dennisguse/opentracks/util/TrackUtils.java +++ b/src/main/java/de/dennisguse/opentracks/util/TrackUtils.java @@ -18,8 +18,8 @@ package de.dennisguse.opentracks.util; import android.content.Context; -import de.dennisguse.opentracks.content.data.Track; -import de.dennisguse.opentracks.content.provider.ContentProviderUtils; +import de.dennisguse.opentracks.data.ContentProviderUtils; +import de.dennisguse.opentracks.data.models.Track; /** * Utilities for updating track. diff --git a/src/main/java/de/dennisguse/opentracks/viewmodels/StatisticDataBuilder.java b/src/main/java/de/dennisguse/opentracks/viewmodels/StatisticDataBuilder.java index 49c64ef49..87bb30c93 100644 --- a/src/main/java/de/dennisguse/opentracks/viewmodels/StatisticDataBuilder.java +++ b/src/main/java/de/dennisguse/opentracks/viewmodels/StatisticDataBuilder.java @@ -11,9 +11,9 @@ import java.util.Objects; import java.util.stream.Collectors; import de.dennisguse.opentracks.R; -import de.dennisguse.opentracks.content.data.Speed; -import de.dennisguse.opentracks.content.data.TrackPoint; import de.dennisguse.opentracks.content.sensor.SensorDataSet; +import de.dennisguse.opentracks.data.models.Speed; +import de.dennisguse.opentracks.data.models.TrackPoint; import de.dennisguse.opentracks.services.TrackRecordingService; import de.dennisguse.opentracks.stats.SensorStatistics; import de.dennisguse.opentracks.stats.TrackStatistics;