Merge pull request #1096 from OpenTracksApp/refactor#800

Refactoring package structure.

src/androidTest/java/de/dennisguse/opentracks/chart/ChartPointTest.java

@@ -10,11 +10,10 @@ import org.junit.runner.RunWith;
 
 import java.time.Duration;
 
-import de.dennisguse.opentracks.content.data.Altitude;
+import de.dennisguse.opentracks.data.models.Altitude;
-import de.dennisguse.opentracks.content.data.Distance;
+import de.dennisguse.opentracks.data.models.Distance;
-import de.dennisguse.opentracks.content.data.Speed;
+import de.dennisguse.opentracks.data.models.Speed;
-import de.dennisguse.opentracks.content.data.TrackPoint;
+import de.dennisguse.opentracks.data.models.TrackPoint;
-import de.dennisguse.opentracks.fragments.TrackStubUtils;
 import de.dennisguse.opentracks.stats.TrackStatistics;
 
 @RunWith(AndroidJUnit4.class)

src/androidTest/java/de/dennisguse/opentracks/chart/TrackStubUtils.java

@@ -14,20 +14,20 @@
  * the License.
  */
 
-package de.dennisguse.opentracks.fragments;
+package de.dennisguse.opentracks.chart;
 
 import java.time.Instant;
 
-import de.dennisguse.opentracks.content.data.Distance;
+import de.dennisguse.opentracks.data.models.Distance;
-import de.dennisguse.opentracks.content.data.Speed;
+import de.dennisguse.opentracks.data.models.Speed;
-import de.dennisguse.opentracks.content.data.TrackPoint;
+import de.dennisguse.opentracks.data.models.TrackPoint;
 
 /**
  * Commons utilities for creating stubs of track, location.
  *
  * @author Youtao Liu
  */
-public class TrackStubUtils {
+class TrackStubUtils {
 
     public static final double INITIAL_ALTITUDE = 22;
     public static final long INITIAL_TIME = 1000L;

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.data.ContentProviderUtils;
-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.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;

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<TrackPoint> trackPointList = new ArrayList<>();

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.data.tables.MarkerColumns;
-import de.dennisguse.opentracks.content.data.TrackPointsColumns;
+import de.dennisguse.opentracks.data.tables.TrackPointsColumns;
-import de.dennisguse.opentracks.content.data.TracksColumns;
+import de.dennisguse.opentracks.data.tables.TracksColumns;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
 
 /**
  * Tests {@link CustomContentProvider}.

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.data.models.Distance;
-import de.dennisguse.opentracks.content.data.TrackPoint;
+import de.dennisguse.opentracks.data.models.Marker;
-import de.dennisguse.opentracks.content.data.TrackPointsColumns;
+import de.dennisguse.opentracks.data.models.Speed;
-import de.dennisguse.opentracks.content.data.TracksColumns;
+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;

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.data.tables.MarkerColumns;
-import de.dennisguse.opentracks.content.data.TrackPointsColumns;
+import de.dennisguse.opentracks.data.tables.TrackPointsColumns;
-import de.dennisguse.opentracks.content.data.TracksColumns;
+import de.dennisguse.opentracks.data.tables.TracksColumns;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
 
 @RunWith(AndroidJUnit4.class)
 public class CustomSQLiteOpenHelperTest {

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

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 {

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;
 

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 de.dennisguse.opentracks.data.models.Distance;
-import static org.junit.Assert.assertFalse;
+import de.dennisguse.opentracks.data.models.TrackPoint;
-import static org.junit.Assert.assertTrue;
 
 public class TrackPointTest {
 

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)

src/androidTest/java/de/dennisguse/opentracks/io/file/importer/ExportImportTest.java

@@ -38,24 +38,24 @@ 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.data.ContentProviderUtils;
-import de.dennisguse.opentracks.content.data.TrackPoint;
+import de.dennisguse.opentracks.data.models.Distance;
-import de.dennisguse.opentracks.content.provider.ContentProviderUtils;
+import de.dennisguse.opentracks.data.models.Marker;
-import de.dennisguse.opentracks.content.sensor.SensorDataCycling;
+import de.dennisguse.opentracks.data.models.Speed;
-import de.dennisguse.opentracks.content.sensor.SensorDataCyclingPower;
+import de.dennisguse.opentracks.data.models.Track;
-import de.dennisguse.opentracks.content.sensor.SensorDataHeartRate;
+import de.dennisguse.opentracks.data.models.TrackPoint;
-import de.dennisguse.opentracks.content.sensor.SensorDataSet;
 import de.dennisguse.opentracks.io.file.TrackFileFormat;
 import de.dennisguse.opentracks.io.file.exporter.TrackExporter;
+import de.dennisguse.opentracks.sensors.AltitudeSumManager;
+import de.dennisguse.opentracks.sensors.BluetoothRemoteSensorManager;
+import de.dennisguse.opentracks.sensors.sensorData.SensorDataCycling;
+import de.dennisguse.opentracks.sensors.sensorData.SensorDataCyclingPower;
+import de.dennisguse.opentracks.sensors.sensorData.SensorDataHeartRate;
+import de.dennisguse.opentracks.sensors.sensorData.SensorDataSet;
 import de.dennisguse.opentracks.services.TrackRecordingService;
 import de.dennisguse.opentracks.services.TrackRecordingServiceTestUtils;
 import de.dennisguse.opentracks.services.handlers.TrackPointCreator;
-import de.dennisguse.opentracks.services.sensors.AltitudeSumManager;
-import de.dennisguse.opentracks.services.sensors.BluetoothRemoteSensorManager;
 import de.dennisguse.opentracks.stats.TrackStatistics;
 
 /**

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.data.ContentProviderUtils;
-import de.dennisguse.opentracks.content.data.TrackPoint;
+import de.dennisguse.opentracks.data.models.Distance;
-import de.dennisguse.opentracks.content.provider.ContentProviderUtils;
+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.
  */

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.data.ContentProviderUtils;
-import de.dennisguse.opentracks.content.data.TrackPoint;
+import de.dennisguse.opentracks.data.models.Distance;
-import de.dennisguse.opentracks.content.provider.ContentProviderUtils;
+import de.dennisguse.opentracks.data.models.Speed;
-
+import de.dennisguse.opentracks.data.models.Track;
-import static org.junit.Assert.assertEquals;
+import de.dennisguse.opentracks.data.models.TrackPoint;
-import static org.junit.Assert.assertNotNull;
 
 /**
  * Test that legacy KML/GPX formats can still be imported.

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 {
 

src/androidTest/java/de/dennisguse/opentracks/sensors/AltitudeSumManagerTest.java

@@ -1,4 +1,4 @@
-package de.dennisguse.opentracks.services.sensors;
+package de.dennisguse.opentracks.sensors;
 
 import org.junit.Assert;
 import org.junit.Before;

src/androidTest/java/de/dennisguse/opentracks/sensors/BluetoothUtilsTest.java

@@ -1,4 +1,4 @@
-package de.dennisguse.opentracks.services.sensors;
+package de.dennisguse.opentracks.sensors;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
@@ -7,10 +7,10 @@ import android.bluetooth.BluetoothGattCharacteristic;
 
 import org.junit.Test;
 
-import de.dennisguse.opentracks.content.data.Distance;
+import de.dennisguse.opentracks.data.models.Distance;
-import de.dennisguse.opentracks.content.data.Speed;
+import de.dennisguse.opentracks.data.models.Speed;
-import de.dennisguse.opentracks.content.sensor.SensorDataCycling;
+import de.dennisguse.opentracks.sensors.sensorData.SensorDataCycling;
-import de.dennisguse.opentracks.content.sensor.SensorDataRunning;
+import de.dennisguse.opentracks.sensors.sensorData.SensorDataRunning;
 
 public class BluetoothUtilsTest {
 

src/androidTest/java/de/dennisguse/opentracks/sensors/PressureSensorUtilsTest.java

@@ -1,4 +1,4 @@
-package de.dennisguse.opentracks.services.sensors;
+package de.dennisguse.opentracks.sensors;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;

src/androidTest/java/de/dennisguse/opentracks/sensors/UintUtilsTest.java

@@ -1,4 +1,4 @@
-package de.dennisguse.opentracks.services.sensors;
+package de.dennisguse.opentracks.sensors;
 
 import static org.junit.Assert.assertEquals;
 

src/androidTest/java/de/dennisguse/opentracks/sensors/sensorData/SensorDataCyclingTest.java

@@ -1,4 +1,4 @@
-package de.dennisguse.opentracks.content.sensor;
+package de.dennisguse.opentracks.sensors.sensorData;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -11,8 +11,8 @@ 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;
+import de.dennisguse.opentracks.sensors.UintUtils;
 
 @RunWith(AndroidJUnit4.class)
 public class SensorDataCyclingTest {

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.data.models.Distance;
-import de.dennisguse.opentracks.content.data.Speed;
+import de.dennisguse.opentracks.data.models.Speed;
-import de.dennisguse.opentracks.content.data.TrackPoint;
+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 {
 

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.data.ContentProviderUtils;
-import de.dennisguse.opentracks.content.data.Track;
+import de.dennisguse.opentracks.data.models.Marker;
-import de.dennisguse.opentracks.content.data.TrackPoint;
+import de.dennisguse.opentracks.data.models.Track;
-import de.dennisguse.opentracks.content.provider.ContentProviderUtils;
+import de.dennisguse.opentracks.data.models.TrackPoint;
 import de.dennisguse.opentracks.services.handlers.TrackPointCreator;
 
 @RunWith(AndroidJUnit4.class)

src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceTestRecording.java

@@ -28,17 +28,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.Speed;
 import de.dennisguse.opentracks.content.data.TestDataUtil;
-import de.dennisguse.opentracks.content.data.Track;
+import de.dennisguse.opentracks.data.ContentProviderUtils;
-import de.dennisguse.opentracks.content.data.TrackPoint;
+import de.dennisguse.opentracks.data.models.Distance;
-import de.dennisguse.opentracks.content.provider.ContentProviderUtils;
+import de.dennisguse.opentracks.data.models.Speed;
-import de.dennisguse.opentracks.content.sensor.SensorDataRunning;
+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.sensors.AltitudeSumManager;
+import de.dennisguse.opentracks.sensors.BluetoothRemoteSensorManager;
+import de.dennisguse.opentracks.sensors.sensorData.SensorDataRunning;
 import de.dennisguse.opentracks.services.handlers.TrackPointCreator;
-import de.dennisguse.opentracks.services.sensors.AltitudeSumManager;
-import de.dennisguse.opentracks.services.sensors.BluetoothRemoteSensorManager;
 import de.dennisguse.opentracks.settings.PreferencesUtils;
 import de.dennisguse.opentracks.stats.TrackStatistics;
 

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.data.ContentProviderUtils;
-import de.dennisguse.opentracks.content.provider.ContentProviderUtils;
+import de.dennisguse.opentracks.data.models.Track;
 import de.dennisguse.opentracks.services.handlers.GpsStatusValue;
 
 /**

src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceTestUtils.java

@@ -9,8 +9,8 @@ import androidx.test.rule.ServiceTestRule;
 import java.time.Clock;
 import java.util.concurrent.TimeoutException;
 
+import de.dennisguse.opentracks.sensors.BluetoothRemoteSensorManager;
 import de.dennisguse.opentracks.services.handlers.TrackPointCreator;
-import de.dennisguse.opentracks.services.sensors.BluetoothRemoteSensorManager;
 import de.dennisguse.opentracks.settings.PreferencesUtils;
 
 public class TrackRecordingServiceTestUtils {

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;
 

src/androidTest/java/de/dennisguse/opentracks/services/announcement/VoiceAnnouncementUtilsTest.java

@@ -15,15 +15,15 @@ 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.data.ContentProviderUtils;
-import de.dennisguse.opentracks.content.provider.ContentProviderUtils;
+import de.dennisguse.opentracks.data.TrackPointIterator;
-import de.dennisguse.opentracks.content.provider.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;
-import de.dennisguse.opentracks.viewmodels.IntervalStatistics;
 
 @RunWith(AndroidJUnit4.class)
 public class VoiceAnnouncementUtilsTest {

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.data.models.Distance;
-import de.dennisguse.opentracks.content.data.TrackPoint;
+import de.dennisguse.opentracks.data.models.TrackPoint;
 import de.dennisguse.opentracks.settings.PreferencesUtils;
 
 @RunWith(MockitoJUnitRunner.class)

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.data.models.Distance;
-import de.dennisguse.opentracks.content.data.TrackPoint;
+import de.dennisguse.opentracks.data.models.TrackPoint;
 
 @RunWith(MockitoJUnitRunner.class)
 public class TrackPointCreatorTest {

src/androidTest/java/de/dennisguse/opentracks/settings/PreferencesOpenHelperTest.java

@@ -17,7 +17,7 @@ import org.junit.runner.RunWith;
 import java.util.List;
 
 import de.dennisguse.opentracks.R;
-import de.dennisguse.opentracks.content.data.Layout;
+import de.dennisguse.opentracks.ui.customRecordingLayout.Layout;
 
 @RunWith(AndroidJUnit4.class)
 public class PreferencesOpenHelperTest {

src/androidTest/java/de/dennisguse/opentracks/settings/PreferencesUtilsTest.java

@@ -20,9 +20,9 @@ import java.util.ArrayList;
 import java.util.List;
 
 import de.dennisguse.opentracks.R;
-import de.dennisguse.opentracks.content.data.DataField;
-import de.dennisguse.opentracks.content.data.Layout;
 import de.dennisguse.opentracks.io.file.TrackFileFormat;
+import de.dennisguse.opentracks.ui.customRecordingLayout.DataField;
+import de.dennisguse.opentracks.ui.customRecordingLayout.Layout;
 
 @RunWith(AndroidJUnit4.class)
 public class PreferencesUtilsTest {

src/androidTest/java/de/dennisguse/opentracks/share/DescriptionGeneratorTest.java

@@ -14,7 +14,9 @@
  * the License.
  */
 
-package de.dennisguse.opentracks.content;
+package de.dennisguse.opentracks.share;
+
+import static org.junit.Assert.assertEquals;
 
 import android.content.Context;
 
@@ -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.data.models.Distance;
-import de.dennisguse.opentracks.content.data.Speed;
+import de.dennisguse.opentracks.data.models.Speed;
-import de.dennisguse.opentracks.content.data.Track;
+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}.
  *
@@ -82,18 +82,18 @@ public class DescriptionGeneratorTest {
                         + "Description: -<br>"
                         + "Total distance: 20.00 km (12.4 mi)<br>"
                         + "Total time: 10:00<br>"
-                + "Moving time: 05:00<br>"
+                        + "Moving time: 05:00<br>"
-                + "Average speed: 120.00 km/h (74.6 mi/h)<br>"
+                        + "Average speed: 120.00 km/h (74.6 mi/h)<br>"
-                + "Average moving speed: 240.00 km/h (149.1 mi/h)<br>"
+                        + "Average moving speed: 240.00 km/h (149.1 mi/h)<br>"
-                + "Max speed: 360.00 km/h (223.7 mi/h)<br>"
+                        + "Max speed: 360.00 km/h (223.7 mi/h)<br>"
-                + "Average pace: 0:30 min/km (0:48 min/mi)<br>"
+                        + "Average pace: 0:30 min/km (0:48 min/mi)<br>"
-                + "Average moving pace: 0:15 min/km (0:24 min/mi)<br>"
+                        + "Average moving pace: 0:15 min/km (0:24 min/mi)<br>"
-                + "Fastest pace: 0:10 min/km (0:16 min/mi)<br>"
+                        + "Fastest pace: 0:10 min/km (0:16 min/mi)<br>"
-                + "Max elevation: 550 m (1804 ft)<br>"
+                        + "Max elevation: 550 m (1804 ft)<br>"
-                + "Min elevation: -500 m (-1640 ft)<br>"
+                        + "Min elevation: -500 m (-1640 ft)<br>"
-                + "Elevation gain: 6000 m (19685 ft)<br>"
+                        + "Elevation gain: 6000 m (19685 ft)<br>"
-                + "Elevation loss: 6000 m (19685 ft)<br>"
+                        + "Elevation loss: 6000 m (19685 ft)<br>"
-                + "Recorded: " + StringUtils.formatDateTime(OffsetDateTime.ofInstant(START_TIME, ZoneId.systemDefault())) + "<br>";
+                        + "Recorded: " + StringUtils.formatDateTime(OffsetDateTime.ofInstant(START_TIME, ZoneId.systemDefault())) + "<br>";
 
         assertEquals(expected, descriptionGenerator.generateTrackDescription(track, true));
     }

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.data.models.Distance;
-import de.dennisguse.opentracks.content.data.Speed;
+import de.dennisguse.opentracks.data.models.Speed;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
 
 /**
  * Tests for {@link TrackStatistics}.

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.data.models.Altitude;
-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.Track;
+import de.dennisguse.opentracks.data.models.TrackPoint;
 
 @RunWith(AndroidJUnit4.class)
 public class TrackStatisticsUpdaterTest {

src/androidTest/java/de/dennisguse/opentracks/ui/aggregatedStatistics/AggregatedStatisticsTest.java

@@ -1,4 +1,7 @@
-package de.dennisguse.opentracks.viewmodels;
+package de.dennisguse.opentracks.ui.aggregatedStatistics;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
 
 import android.content.Context;
 
@@ -13,15 +16,12 @@ import java.time.Instant;
 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.content.data.Speed;
+import de.dennisguse.opentracks.data.models.Speed;
-import de.dennisguse.opentracks.content.data.Track;
+import de.dennisguse.opentracks.data.models.Track;
 import de.dennisguse.opentracks.stats.TrackStatistics;
 import de.dennisguse.opentracks.util.TrackIconUtils;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
 @RunWith(JUnit4.class)
 public class AggregatedStatisticsTest {
 

src/androidTest/java/de/dennisguse/opentracks/ui/aggregatedStatistics/EspressoAggregatedFilterTest.java

@@ -1,4 +1,4 @@
-package de.dennisguse.opentracks;
+package de.dennisguse.opentracks.ui.aggregatedStatistics;
 
 import static androidx.test.espresso.Espresso.onView;
 import static androidx.test.espresso.action.ViewActions.click;
@@ -15,6 +15,7 @@ import android.view.View;
 
 import androidx.test.core.app.ApplicationProvider;
 import androidx.test.espresso.ViewInteraction;
+import androidx.test.espresso.matcher.ViewMatchers;
 import androidx.test.ext.junit.rules.ActivityScenarioRule;
 import androidx.test.filters.LargeTest;
 import androidx.test.rule.GrantPermissionRule;
@@ -28,10 +29,12 @@ import org.junit.runner.RunWith;
 
 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.data.ContentProviderUtils;
-import de.dennisguse.opentracks.content.data.TrackPoint;
+import de.dennisguse.opentracks.data.models.Track;
-import de.dennisguse.opentracks.content.provider.ContentProviderUtils;
+import de.dennisguse.opentracks.data.models.TrackPoint;
 
 @LargeTest
 @RunWith(AndroidJUnit4.class)
@@ -55,7 +58,7 @@ public class EspressoAggregatedFilterTest {
     @Test
     public void espressoAggregatedFilterTest() {
         // open AggregatedStatisticsActivity through toolbar's menu item
-        onView(withId(R.id.toolbar)).check(matches(isDisplayed()));
+        onView(ViewMatchers.withId(R.id.toolbar)).check(matches(isDisplayed()));
         onView(withId(R.id.toolbar)).check(matches(hasDescendant(withId(R.id.track_list_aggregated_stats))));
         onView(withId(R.id.track_list_aggregated_stats)).perform(click());
 

src/androidTest/java/de/dennisguse/opentracks/ui/customRecordingLayout/CsvLayoutUtilsTest.java

@@ -1,4 +1,4 @@
-package de.dennisguse.opentracks.util;
+package de.dennisguse.opentracks.ui.customRecordingLayout;
 
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 

src/androidTest/java/de/dennisguse/opentracks/ui/customRecordingLayout/EspressoCustomLayoutTest.java

@@ -1,4 +1,4 @@
-package de.dennisguse.opentracks;
+package de.dennisguse.opentracks.ui.customRecordingLayout;
 
 
 import static androidx.test.espresso.Espresso.onView;
@@ -20,6 +20,7 @@ import androidx.test.espresso.ViewAction;
 import androidx.test.espresso.ViewAssertion;
 import androidx.test.espresso.ViewInteraction;
 import androidx.test.espresso.action.MotionEvents;
+import androidx.test.espresso.matcher.ViewMatchers;
 import androidx.test.ext.junit.rules.ActivityScenarioRule;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.LargeTest;
@@ -32,8 +33,8 @@ import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import de.dennisguse.opentracks.content.data.DataField;
+import de.dennisguse.opentracks.R;
-import de.dennisguse.opentracks.content.data.Layout;
+import de.dennisguse.opentracks.TrackListActivity;
 import de.dennisguse.opentracks.settings.PreferencesUtils;
 
 @LargeTest
@@ -49,7 +50,7 @@ public class EspressoCustomLayoutTest {
     @Test
     public void customLayoutTest() {
         // TrackListActivity: start recording
-        ViewInteraction trackControllerRecordButton = onView(withId(R.id.controller_record));
+        ViewInteraction trackControllerRecordButton = onView(ViewMatchers.withId(R.id.controller_record));
         trackControllerRecordButton.perform(click());
 
         // Get custom layout preferences and check all data fields are showed.

src/androidTest/java/de/dennisguse/opentracks/ui/customRecordingLayout/LayoutTest.java

@@ -1,4 +1,4 @@
-package de.dennisguse.opentracks.content.data;
+package de.dennisguse.opentracks.ui.customRecordingLayout;
 
 import android.content.Context;
 import android.content.res.Resources;

src/androidTest/java/de/dennisguse/opentracks/ui/intervals/IntervalStatisticsTest.java

@@ -1,4 +1,4 @@
-package de.dennisguse.opentracks.viewmodels;
+package de.dennisguse.opentracks.ui.intervals;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
@@ -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.data.ContentProviderUtils;
-import de.dennisguse.opentracks.content.data.TrackPoint;
+import de.dennisguse.opentracks.data.TrackPointIterator;
-import de.dennisguse.opentracks.content.data.UnitConversions;
+import de.dennisguse.opentracks.data.models.Distance;
-import de.dennisguse.opentracks.content.provider.ContentProviderUtils;
+import de.dennisguse.opentracks.data.models.Track;
-import de.dennisguse.opentracks.content.provider.TrackPointIterator;
+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;
 

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 de.dennisguse.opentracks.data.models.TrackPoint;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
 
 @RunWith(JUnit4.class)
 public class EGM2008UtilsTest {

src/androidTest/java/de/dennisguse/opentracks/util/StatisticsUtilsTest.java

@@ -11,8 +11,8 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 
 import de.dennisguse.opentracks.R;
-import de.dennisguse.opentracks.content.data.DataField;
+import de.dennisguse.opentracks.ui.customRecordingLayout.DataField;
-import de.dennisguse.opentracks.content.data.Layout;
+import de.dennisguse.opentracks.ui.customRecordingLayout.Layout;
 
 @RunWith(AndroidJUnit4.class)
 public class StatisticsUtilsTest extends TestCase {

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.data.models.Distance;
-import de.dennisguse.opentracks.content.data.Speed;
+import de.dennisguse.opentracks.data.models.Speed;
 
 /**
  * Tests for {@link StringUtils}.

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;
 
 /**

src/androidTest/java/de/dennisguse/opentracks/viewmodels/StatisticDataBuilderTest.java

@@ -1,5 +1,7 @@
 package de.dennisguse.opentracks.viewmodels;
 
+import static org.mockito.Mockito.when;
+
 import android.content.Context;
 
 import androidx.test.core.app.ApplicationProvider;
@@ -15,14 +17,12 @@ import java.time.Duration;
 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.content.data.Layout;
+import de.dennisguse.opentracks.data.models.Track;
-import de.dennisguse.opentracks.content.data.Track;
 import de.dennisguse.opentracks.services.TrackRecordingService;
 import de.dennisguse.opentracks.stats.SensorStatistics;
 import de.dennisguse.opentracks.stats.TrackStatistics;
-
+import de.dennisguse.opentracks.ui.customRecordingLayout.Layout;
-import static org.mockito.Mockito.when;
 
 @RunWith(MockitoJUnitRunner.class)
 public class StatisticDataBuilderTest extends TestCase {

src/main/AndroidManifest.xml

@@ -267,7 +267,7 @@ limitations under the License.
         </activity>
 
         <activity
-            android:name=".MarkerDetailActivity"
+            android:name=".ui.markers.MarkerDetailActivity"
             android:exported="true">
             <intent-filter>
                 <action android:name="de.dennisguse.opentracks.MarkerDetails" />
@@ -275,10 +275,10 @@ limitations under the License.
             </intent-filter>
         </activity>
 
-        <activity android:name=".MarkerEditActivity" />
+        <activity android:name=".ui.markers.MarkerEditActivity" />
 
         <activity
-            android:name=".MarkerListActivity"
+            android:name=".ui.markers.MarkerListActivity"
             android:exported="true"
             android:label="@string/menu_markers"
             android:launchMode="singleTop">
@@ -316,7 +316,7 @@ limitations under the License.
 
         <activity android:name=".TrackEditActivity" />
 
-        <activity android:name=".AggregatedStatisticsActivity" />
+        <activity android:name=".ui.aggregatedStatistics.AggregatedStatisticsActivity" />
 
         <activity android:name=".io.file.importer.DirectoryChooserActivity$ExportDirectoryChooserActivity" />
         <activity android:name=".io.file.importer.DirectoryChooserActivity$DefaultTrackExportDirectoryChooserActivity" />
@@ -328,7 +328,7 @@ limitations under the License.
         <activity android:name=".settings.SettingsCustomLayoutEditActivity" />
 
         <activity
-            android:name=".ShowOnMapProxyActivity$KML"
+            android:name=".share.ShowOnMapProxyActivity$KML"
             android:exported="true">
             <intent-filter android:label="@string/open_track_as_KML">
                 <action android:name="Intent.OpenTracks-Dashboard" />
@@ -336,7 +336,7 @@ limitations under the License.
             </intent-filter>
         </activity>
         <activity
-            android:name=".ShowOnMapProxyActivity$GPX"
+            android:name=".share.ShowOnMapProxyActivity$GPX"
             android:exported="true">
             <intent-filter android:label="@string/open_track_as_GPX">
                 <action android:name="Intent.OpenTracks-Dashboard" />
@@ -345,7 +345,7 @@ limitations under the License.
         </activity>
 
         <provider
-            android:name=".content.provider.ShareContentProvider"
+            android:name=".data.ShareContentProvider"
             android:authorities="${applicationId}.content"
             android:exported="false"
             android:grantUriPermissions="true" />

src/main/java/de/dennisguse/opentracks/AboutActivity.java

@@ -6,8 +6,8 @@ import android.view.View;
 import androidx.annotation.Nullable;
 
 import de.dennisguse.opentracks.databinding.AboutBinding;
+import de.dennisguse.opentracks.ui.util.ViewUtils;
 import de.dennisguse.opentracks.util.SystemUtils;
-import de.dennisguse.opentracks.util.ViewUtils;
 
 public class AboutActivity extends AbstractActivity {
 

src/main/java/de/dennisguse/opentracks/AbstractTrackDeleteActivity.java

@@ -22,11 +22,11 @@ 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.fragments.ConfirmDeleteDialogFragment;
-import de.dennisguse.opentracks.fragments.ConfirmDeleteDialogFragment.ConfirmDeleteCaller;
 import de.dennisguse.opentracks.services.TrackDeleteService;
 import de.dennisguse.opentracks.services.TrackDeleteServiceConnection;
+import de.dennisguse.opentracks.ui.aggregatedStatistics.ConfirmDeleteDialogFragment;
+import de.dennisguse.opentracks.ui.aggregatedStatistics.ConfirmDeleteDialogFragment.ConfirmDeleteCaller;
 
 /**
  * An abstract class for the following common tasks across

src/main/java/de/dennisguse/opentracks/ContextualActionModeCallback.java

@@ -1,46 +0,0 @@
-/*
- * Copyright 2012 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;
-
-import android.view.Menu;
-
-/**
- * Callback when items in the contextual action mode are selected.
- *
- * @author Jimmy Shih
- */
-public interface ContextualActionModeCallback {
-
-    /**
-     * Invoked to prepare the menu for the selected items.
-     *
-     * @param menu          the menu
-     * @param positions     the selected items' positions
-     * @param ids           the selected items' ids, if available
-     * @param showSelectAll true to show select all
-     */
-    void onPrepare(Menu menu, int[] positions, long[] ids, boolean showSelectAll);
-
-    /**
-     * Invoked when items are selected.
-     *
-     * @param itemId    the context menu item id
-     * @param positions the selected items' positions
-     * @param ids       the selected items' ids, if available
-     */
-    boolean onClick(int itemId, int[] positions, long[] ids);
-}

src/main/java/de/dennisguse/opentracks/ControllerFragment.java

@@ -35,7 +35,7 @@ import androidx.fragment.app.Fragment;
 import de.dennisguse.opentracks.databinding.ControllerFragmentBinding;
 import de.dennisguse.opentracks.services.TrackRecordingService;
 import de.dennisguse.opentracks.services.TrackRecordingServiceConnection;
-import de.dennisguse.opentracks.util.ActivityUtils;
+import de.dennisguse.opentracks.ui.util.ActivityUtils;
 import de.dennisguse.opentracks.util.StringUtils;
 
 /**

src/main/java/de/dennisguse/opentracks/HelpActivity.java

@@ -6,7 +6,7 @@ import android.view.View;
 import androidx.annotation.Nullable;
 
 import de.dennisguse.opentracks.databinding.HelpBinding;
-import de.dennisguse.opentracks.util.ViewUtils;
+import de.dennisguse.opentracks.ui.util.ViewUtils;
 
 public class HelpActivity extends AbstractActivity {
 

src/main/java/de/dennisguse/opentracks/TrackActivityDataHubInterface.java

@@ -1,10 +0,0 @@
-package de.dennisguse.opentracks;
-
-import de.dennisguse.opentracks.content.TrackDataHub;
-
-/**
- * Interface for communication between activities that use {@link de.dennisguse.opentracks.content.TrackDataHub} and their fragments that need thi data hub.
- */
-public interface TrackActivityDataHubInterface {
-    TrackDataHub getTrackDataHub();
-}

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.data.ContentProviderUtils;
-import de.dennisguse.opentracks.content.provider.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;

src/main/java/de/dennisguse/opentracks/TrackListActivity.java

@@ -54,20 +54,23 @@ import java.time.ZoneOffset;
 import java.util.ArrayList;
 import java.util.Arrays;
 
-import de.dennisguse.opentracks.content.data.Distance;
+import de.dennisguse.opentracks.data.models.Distance;
-import de.dennisguse.opentracks.content.data.Track;
+import de.dennisguse.opentracks.data.models.Track;
-import de.dennisguse.opentracks.content.data.TracksColumns;
+import de.dennisguse.opentracks.data.tables.TracksColumns;
 import de.dennisguse.opentracks.databinding.TrackListBinding;
-import de.dennisguse.opentracks.fragments.ConfirmDeleteDialogFragment;
 import de.dennisguse.opentracks.services.TrackRecordingService;
 import de.dennisguse.opentracks.services.TrackRecordingServiceConnection;
 import de.dennisguse.opentracks.services.handlers.GpsStatusValue;
 import de.dennisguse.opentracks.settings.PreferencesUtils;
 import de.dennisguse.opentracks.settings.SettingsActivity;
-import de.dennisguse.opentracks.util.ActivityUtils;
+import de.dennisguse.opentracks.share.ShareUtils;
+import de.dennisguse.opentracks.ui.aggregatedStatistics.AggregatedStatisticsActivity;
+import de.dennisguse.opentracks.ui.aggregatedStatistics.ConfirmDeleteDialogFragment;
+import de.dennisguse.opentracks.ui.markers.MarkerListActivity;
+import de.dennisguse.opentracks.ui.util.ActivityUtils;
+import de.dennisguse.opentracks.ui.util.ListItemUtils;
 import de.dennisguse.opentracks.util.IntentDashboardUtils;
 import de.dennisguse.opentracks.util.IntentUtils;
-import de.dennisguse.opentracks.util.ListItemUtils;
 import de.dennisguse.opentracks.util.StringUtils;
 import de.dennisguse.opentracks.util.TrackIconUtils;
 
@@ -95,7 +98,7 @@ public class TrackListActivity extends AbstractTrackDeleteActivity implements Co
     private TrackRecordingService.RecordingStatus recordingStatus = TrackRecordingService.STATUS_DEFAULT;
 
     // Callback when an item is selected in the contextual action mode
-    private final ContextualActionModeCallback contextualActionModeCallback = new ContextualActionModeCallback() {
+    private final ActivityUtils.ContextualActionModeCallback contextualActionModeCallback = new ActivityUtils.ContextualActionModeCallback() {
 
         @Override
         public void onPrepare(Menu menu, int[] positions, long[] trackIds, boolean showSelectAll) {
@@ -447,7 +450,7 @@ public class TrackListActivity extends AbstractTrackDeleteActivity implements Co
         }
 
         if (itemId == R.id.list_context_menu_share) {
-            Intent intent = IntentUtils.newShareFileIntent(this, trackIds);
+            Intent intent = ShareUtils.newShareFileIntent(this, trackIds);
             intent = Intent.createChooser(intent, null);
             startActivity(intent);
             return true;

src/main/java/de/dennisguse/opentracks/TrackRecordedActivity.java

@@ -34,18 +34,21 @@ import androidx.viewpager2.adapter.FragmentStateAdapter;
 import com.google.android.material.tabs.TabLayoutMediator;
 
 import de.dennisguse.opentracks.chart.ChartFragment;
-import de.dennisguse.opentracks.content.TrackDataHub;
+import de.dennisguse.opentracks.chart.TrackDataHubInterface;
-import de.dennisguse.opentracks.content.data.Track;
+import de.dennisguse.opentracks.data.ContentProviderUtils;
-import de.dennisguse.opentracks.content.provider.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.ConfirmDeleteDialogFragment;
-import de.dennisguse.opentracks.fragments.IntervalsFragment;
 import de.dennisguse.opentracks.fragments.StatisticsRecordedFragment;
 import de.dennisguse.opentracks.services.TrackDeleteService;
 import de.dennisguse.opentracks.services.TrackRecordingService;
 import de.dennisguse.opentracks.services.TrackRecordingServiceConnection;
 import de.dennisguse.opentracks.settings.PreferencesUtils;
 import de.dennisguse.opentracks.settings.SettingsActivity;
+import de.dennisguse.opentracks.share.ShareUtils;
+import de.dennisguse.opentracks.ui.aggregatedStatistics.ConfirmDeleteDialogFragment;
+import de.dennisguse.opentracks.ui.intervals.IntervalsFragment;
+import de.dennisguse.opentracks.ui.markers.MarkerListActivity;
 import de.dennisguse.opentracks.util.IntentDashboardUtils;
 import de.dennisguse.opentracks.util.IntentUtils;
 
@@ -56,7 +59,7 @@ import de.dennisguse.opentracks.util.IntentUtils;
  * @author Rodrigo Damazio
  */
 //TODO Should not use TrackRecordingServiceConnection; only used to determine if there is NO current recording, to enable resume functionality.
-public class TrackRecordedActivity extends AbstractTrackDeleteActivity implements ConfirmDeleteDialogFragment.ConfirmDeleteCaller, TrackActivityDataHubInterface {
+public class TrackRecordedActivity extends AbstractTrackDeleteActivity implements ConfirmDeleteDialogFragment.ConfirmDeleteCaller, TrackDataHubInterface {
 
     private static final String TAG = TrackRecordedActivity.class.getSimpleName();
 
@@ -180,7 +183,7 @@ public class TrackRecordedActivity extends AbstractTrackDeleteActivity implement
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         if (item.getItemId() == R.id.track_detail_share) {
-            Intent intent = Intent.createChooser(IntentUtils.newShareFileIntent(this, trackId), null);
+            Intent intent = Intent.createChooser(ShareUtils.newShareFileIntent(this, trackId), null);
             startActivity(intent);
             return true;
         }

src/main/java/de/dennisguse/opentracks/TrackRecordingActivity.java

@@ -22,17 +22,20 @@ import com.google.android.material.tabs.TabLayoutMediator;
 import java.util.List;
 
 import de.dennisguse.opentracks.chart.ChartFragment;
-import de.dennisguse.opentracks.content.TrackDataHub;
+import de.dennisguse.opentracks.chart.TrackDataHubInterface;
-import de.dennisguse.opentracks.content.data.Track;
+import de.dennisguse.opentracks.data.ContentProviderUtils;
-import de.dennisguse.opentracks.content.provider.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.IntervalsFragment;
 import de.dennisguse.opentracks.fragments.StatisticsRecordingFragment;
 import de.dennisguse.opentracks.services.TrackRecordingService;
 import de.dennisguse.opentracks.services.TrackRecordingServiceConnection;
 import de.dennisguse.opentracks.settings.PreferencesUtils;
 import de.dennisguse.opentracks.settings.SettingsActivity;
+import de.dennisguse.opentracks.ui.intervals.IntervalsFragment;
+import de.dennisguse.opentracks.ui.markers.MarkerEditActivity;
+import de.dennisguse.opentracks.ui.markers.MarkerListActivity;
 import de.dennisguse.opentracks.util.IntentDashboardUtils;
 import de.dennisguse.opentracks.util.IntentUtils;
 import de.dennisguse.opentracks.util.TrackIconUtils;
@@ -46,7 +49,7 @@ import de.dennisguse.opentracks.util.TrackUtils;
  */
 //NOTE: This activity does NOT react to preference changes of R.string.recording_track_id_key.
 //This mode of communication should be removed anyhow.
-public class TrackRecordingActivity extends AbstractActivity implements ChooseActivityTypeDialogFragment.ChooseActivityTypeCaller, TrackActivityDataHubInterface, ControllerFragment.Callback {
+public class TrackRecordingActivity extends AbstractActivity implements ChooseActivityTypeDialogFragment.ChooseActivityTypeCaller, TrackDataHubInterface, ControllerFragment.Callback {
 
     public static final String EXTRA_TRACK_ID = "track_id";
 

src/main/java/de/dennisguse/opentracks/adapters/StatisticsAdapter.java

@@ -14,7 +14,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import de.dennisguse.opentracks.R;
-import de.dennisguse.opentracks.content.data.CustomLayoutFieldType;
+import de.dennisguse.opentracks.ui.customRecordingLayout.CustomLayoutFieldType;
 import de.dennisguse.opentracks.viewmodels.StatisticData;
 
 public class StatisticsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {

src/main/java/de/dennisguse/opentracks/chart/ChartFragment.java

@@ -31,14 +31,12 @@ import java.util.Collections;
 import java.util.List;
 
 import de.dennisguse.opentracks.R;
-import de.dennisguse.opentracks.TrackActivityDataHubInterface;
+import de.dennisguse.opentracks.data.TrackDataHub;
-import de.dennisguse.opentracks.content.TrackDataHub;
+import de.dennisguse.opentracks.data.models.Altitude;
-import de.dennisguse.opentracks.content.TrackDataListener;
+import de.dennisguse.opentracks.data.models.Marker;
-import de.dennisguse.opentracks.content.data.Altitude;
+import de.dennisguse.opentracks.data.models.Speed;
-import de.dennisguse.opentracks.content.data.Marker;
+import de.dennisguse.opentracks.data.models.Track;
-import de.dennisguse.opentracks.content.data.Speed;
+import de.dennisguse.opentracks.data.models.TrackPoint;
-import de.dennisguse.opentracks.content.data.Track;
-import de.dennisguse.opentracks.content.data.TrackPoint;
 import de.dennisguse.opentracks.databinding.ChartBinding;
 import de.dennisguse.opentracks.settings.PreferencesUtils;
 import de.dennisguse.opentracks.stats.TrackStatistics;
@@ -51,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";
 
@@ -242,7 +240,7 @@ public class ChartFragment extends Fragment implements TrackDataListener {
      * Needs to be synchronized because trackDataHub can be accessed by multiple threads.
      */
     private synchronized void resumeTrackDataHub() {
-        trackDataHub = ((TrackActivityDataHubInterface) getActivity()).getTrackDataHub();
+        trackDataHub = ((TrackDataHubInterface) getActivity()).getTrackDataHub();
         trackDataHub.registerTrackDataListener(this);
     }
 

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.data.models.Altitude;
-import de.dennisguse.opentracks.content.data.Distance;
+import de.dennisguse.opentracks.data.models.Distance;
-import de.dennisguse.opentracks.content.data.Speed;
+import de.dennisguse.opentracks.data.models.Speed;
-import de.dennisguse.opentracks.content.data.TrackPoint;
+import de.dennisguse.opentracks.data.models.TrackPoint;
-import de.dennisguse.opentracks.content.data.UnitConversions;
+import de.dennisguse.opentracks.data.models.UnitConversions;
 import de.dennisguse.opentracks.stats.TrackStatistics;
 
 public class ChartPoint {

src/main/java/de/dennisguse/opentracks/chart/ChartView.java

@@ -44,14 +44,14 @@ import java.util.ArrayList;
 import java.util.LinkedList;
 import java.util.List;
 
-import de.dennisguse.opentracks.MarkerDetailActivity;
 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;
+import de.dennisguse.opentracks.ui.util.ThemeUtils;
 import de.dennisguse.opentracks.util.IntentUtils;
-import de.dennisguse.opentracks.util.MarkerUtils;
 import de.dennisguse.opentracks.util.StringUtils;
-import de.dennisguse.opentracks.util.ThemeUtils;
 
 /**
  * Visualization of the chart.

src/main/java/de/dennisguse/opentracks/chart/TrackDataHubInterface.java

@@ -0,0 +1,10 @@
+package de.dennisguse.opentracks.chart;
+
+import de.dennisguse.opentracks.data.TrackDataHub;
+
+/**
+ * Interface for communication between activities that use {@link TrackDataHub} and their fragments that need thi data hub.
+ */
+public interface TrackDataHubInterface {
+    TrackDataHub getTrackDataHub();
+}

src/main/java/de/dennisguse/opentracks/content/TrackDataListener.java

@@ -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() {
-    }
-}

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.

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.data.models.Altitude;
-import de.dennisguse.opentracks.content.data.Distance;
+import de.dennisguse.opentracks.data.models.Distance;
-import de.dennisguse.opentracks.content.data.Marker;
+import de.dennisguse.opentracks.data.models.Marker;
-import de.dennisguse.opentracks.content.data.MarkerColumns;
+import de.dennisguse.opentracks.data.models.Speed;
-import de.dennisguse.opentracks.content.data.Speed;
+import de.dennisguse.opentracks.data.models.Track;
-import de.dennisguse.opentracks.content.data.Track;
+import de.dennisguse.opentracks.data.models.TrackPoint;
-import de.dennisguse.opentracks.content.data.TrackPoint;
+import de.dennisguse.opentracks.data.tables.MarkerColumns;
-import de.dennisguse.opentracks.content.data.TrackPointsColumns;
+import de.dennisguse.opentracks.data.tables.TrackPointsColumns;
-import de.dennisguse.opentracks.content.data.TracksColumns;
+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;

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.data.models.TrackPoint;
-import de.dennisguse.opentracks.content.data.TrackPoint;
+import de.dennisguse.opentracks.data.tables.MarkerColumns;
-import de.dennisguse.opentracks.content.data.TrackPointsColumns;
+import de.dennisguse.opentracks.data.tables.TrackPointsColumns;
-import de.dennisguse.opentracks.content.data.TracksColumns;
+import de.dennisguse.opentracks.data.tables.TracksColumns;
 
 /**
  * A {@link ContentProvider} that handles access to track points, tracks, and markers tables.

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.data.models.Track;
-import de.dennisguse.opentracks.content.data.Track;
+import de.dennisguse.opentracks.data.tables.MarkerColumns;
-import de.dennisguse.opentracks.content.data.TrackPointsColumns;
+import de.dennisguse.opentracks.data.tables.TrackPointsColumns;
-import de.dennisguse.opentracks.content.data.TracksColumns;
+import de.dennisguse.opentracks.data.tables.TracksColumns;
 
 /**
  * Database helper for creating and upgrading the database.

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;

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.data.models.Track;
-import de.dennisguse.opentracks.content.data.TracksColumns;
+import de.dennisguse.opentracks.data.tables.TracksColumns;
 import de.dennisguse.opentracks.io.file.TrackFileFormat;
 import de.dennisguse.opentracks.io.file.exporter.TrackExporter;
 

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.data.models.Altitude;
-import de.dennisguse.opentracks.content.data.Marker;
+import de.dennisguse.opentracks.data.models.Distance;
-import de.dennisguse.opentracks.content.data.MarkerColumns;
+import de.dennisguse.opentracks.data.models.Marker;
-import de.dennisguse.opentracks.content.data.Track;
+import de.dennisguse.opentracks.data.models.Speed;
-import de.dennisguse.opentracks.content.data.TrackPoint;
+import de.dennisguse.opentracks.data.models.Track;
-import de.dennisguse.opentracks.content.data.TrackPointsColumns;
+import de.dennisguse.opentracks.data.models.TrackPoint;
-import de.dennisguse.opentracks.content.data.TracksColumns;
+import de.dennisguse.opentracks.data.tables.MarkerColumns;
-import de.dennisguse.opentracks.content.provider.ContentProviderUtils;
+import de.dennisguse.opentracks.data.tables.TrackPointsColumns;
-import de.dennisguse.opentracks.content.provider.TrackPointIterator;
+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.
  * <p>
  * {@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<TrackDataListener> listeners;
+    private final Set<Listener> 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) {
+    private void loadDataForListener(Listener trackDataListener) {
-        Set<TrackDataListener> trackDataListeners = Collections.singleton(trackDataListener);
+        Set<Listener> 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<TrackDataListener> trackDataListeners) {
+    private void notifyTracksTableUpdate(Set<Listener> 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<TrackDataListener> trackDataListeners) {
+    private void notifyMarkersTableUpdate(Set<Listener> 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<TrackDataListener> listeners) {
+    private void notifyTrackPointsTableUpdate(boolean updateSamplingState, Set<Listener> 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() {
+        }
+    }
 }

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.data.models.Track;
-import de.dennisguse.opentracks.content.data.TrackPoint;
+import de.dennisguse.opentracks.data.models.TrackPoint;
 
 /**
  * A lightweight wrapper around the original {@link Cursor}.

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.data.models.Track;
-import de.dennisguse.opentracks.content.provider.SelectionData;
+import de.dennisguse.opentracks.data.tables.TracksColumns;
 
 public class TrackSelection implements ContentProviderUtils.ContentProviderSelectionInterface {
     private final List<Track.Id> trackIds = new ArrayList<>();

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;
 

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;
 

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;
 

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;

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;
 

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;

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;

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.

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.

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.

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.

src/main/java/de/dennisguse/opentracks/fragments/ChooseActivityTypeImageAdapter.java

@@ -27,7 +27,7 @@ import androidx.core.content.ContextCompat;
 import java.util.List;
 
 import de.dennisguse.opentracks.R;
-import de.dennisguse.opentracks.util.ResourceUtils;
+import de.dennisguse.opentracks.ui.util.ResourceUtils;
 
 /**
  * Image adapter for choosing an activity type.

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.data.ContentProviderUtils;
-import de.dennisguse.opentracks.content.provider.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;

src/main/java/de/dennisguse/opentracks/fragments/StatisticsRecordingFragment.java

@@ -19,13 +19,13 @@ import java.util.List;
 
 import de.dennisguse.opentracks.R;
 import de.dennisguse.opentracks.adapters.StatisticsAdapter;
-import de.dennisguse.opentracks.content.data.Layout;
+import de.dennisguse.opentracks.data.models.Track;
-import de.dennisguse.opentracks.content.data.Track;
+import de.dennisguse.opentracks.data.models.TrackPoint;
-import de.dennisguse.opentracks.content.data.TrackPoint;
 import de.dennisguse.opentracks.databinding.StatisticsRecordingBinding;
 import de.dennisguse.opentracks.services.TrackRecordingService;
 import de.dennisguse.opentracks.services.TrackRecordingServiceConnection;
 import de.dennisguse.opentracks.settings.PreferencesUtils;
+import de.dennisguse.opentracks.ui.customRecordingLayout.Layout;
 import de.dennisguse.opentracks.viewmodels.StatisticData;
 import de.dennisguse.opentracks.viewmodels.StatisticsDataModel;
 

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;

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.data.ContentProviderUtils;
-import de.dennisguse.opentracks.content.data.TracksColumns;
+import de.dennisguse.opentracks.data.models.Track;
-import de.dennisguse.opentracks.content.provider.ContentProviderUtils;
+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;

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.data.ContentProviderUtils;
-import de.dennisguse.opentracks.content.provider.ContentProviderUtils;
+import de.dennisguse.opentracks.data.models.Track;
 import de.dennisguse.opentracks.io.file.TrackFileFormat;
 import de.dennisguse.opentracks.util.ExportUtils;
 

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.data.ContentProviderUtils;
-import de.dennisguse.opentracks.content.data.Track;
+import de.dennisguse.opentracks.data.TrackPointIterator;
-import de.dennisguse.opentracks.content.data.TrackPoint;
+import de.dennisguse.opentracks.data.models.Marker;
-import de.dennisguse.opentracks.content.provider.ContentProviderUtils;
+import de.dennisguse.opentracks.data.models.Track;
-import de.dennisguse.opentracks.content.provider.TrackPointIterator;
+import de.dennisguse.opentracks.data.models.TrackPoint;
 import de.dennisguse.opentracks.stats.TrackStatistics;
 import de.dennisguse.opentracks.util.StringUtils;
 

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.data.ContentProviderUtils;
-import de.dennisguse.opentracks.content.data.Track;
+import de.dennisguse.opentracks.data.TrackPointIterator;
-import de.dennisguse.opentracks.content.data.TrackPoint;
+import de.dennisguse.opentracks.data.models.Marker;
-import de.dennisguse.opentracks.content.provider.ContentProviderUtils;
+import de.dennisguse.opentracks.data.models.Track;
-import de.dennisguse.opentracks.content.provider.TrackPointIterator;
+import de.dennisguse.opentracks.data.models.TrackPoint;
 import de.dennisguse.opentracks.util.FileUtils;
 import de.dennisguse.opentracks.util.StringUtils;
 

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.data.ContentProviderUtils;
-import de.dennisguse.opentracks.content.data.Track;
+import de.dennisguse.opentracks.data.models.Marker;
-import de.dennisguse.opentracks.content.provider.ContentProviderUtils;
+import de.dennisguse.opentracks.data.models.Track;
 import de.dennisguse.opentracks.util.FileUtils;
 
 /**

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;
 
 /**

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}.

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.data.models.Altitude;
-import de.dennisguse.opentracks.content.data.Distance;
+import de.dennisguse.opentracks.data.models.Distance;
-import de.dennisguse.opentracks.content.data.Marker;
+import de.dennisguse.opentracks.data.models.Marker;
-import de.dennisguse.opentracks.content.data.Speed;
+import de.dennisguse.opentracks.data.models.Speed;
-import de.dennisguse.opentracks.content.data.Track;
+import de.dennisguse.opentracks.data.models.Track;
-import de.dennisguse.opentracks.content.data.TrackPoint;
+import de.dennisguse.opentracks.data.models.TrackPoint;
 import de.dennisguse.opentracks.util.StringUtils;
 
 /**

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.data.ContentProviderUtils;
-import de.dennisguse.opentracks.content.data.Track;
+import de.dennisguse.opentracks.data.models.Distance;
-import de.dennisguse.opentracks.content.provider.ContentProviderUtils;
+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 {
 

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 {

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.data.models.Distance;
-import de.dennisguse.opentracks.content.data.Marker;
+import de.dennisguse.opentracks.data.models.Marker;
-import de.dennisguse.opentracks.content.data.Speed;
+import de.dennisguse.opentracks.data.models.Speed;
-import de.dennisguse.opentracks.content.data.Track;
+import de.dennisguse.opentracks.data.models.Track;
-import de.dennisguse.opentracks.content.data.TrackPoint;
+import de.dennisguse.opentracks.data.models.TrackPoint;
 import de.dennisguse.opentracks.io.file.exporter.KMLTrackExporter;
 import de.dennisguse.opentracks.util.StringUtils;
 

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.data.ContentProviderUtils;
-import de.dennisguse.opentracks.content.data.Track;
+import de.dennisguse.opentracks.data.models.Marker;
-import de.dennisguse.opentracks.content.provider.ContentProviderUtils;
+import de.dennisguse.opentracks.data.models.Track;
 import de.dennisguse.opentracks.io.file.exporter.KmzTrackExporter;
 import de.dennisguse.opentracks.util.FileUtils;
 

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.data.ContentProviderUtils;
-import de.dennisguse.opentracks.content.data.Marker;
+import de.dennisguse.opentracks.data.models.Distance;
-import de.dennisguse.opentracks.content.data.Speed;
+import de.dennisguse.opentracks.data.models.Marker;
-import de.dennisguse.opentracks.content.data.Track;
+import de.dennisguse.opentracks.data.models.Speed;
-import de.dennisguse.opentracks.content.data.TrackPoint;
+import de.dennisguse.opentracks.data.models.Track;
-import de.dennisguse.opentracks.content.provider.ContentProviderUtils;
+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;