diff --git a/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/ExportImportTest.java b/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/ExportImportTest.java index def39d969..38c6ab066 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/ExportImportTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/ExportImportTest.java @@ -39,10 +39,6 @@ import java.util.concurrent.TimeoutException; import de.dennisguse.opentracks.R; import de.dennisguse.opentracks.content.data.TestDataUtil; -import de.dennisguse.opentracks.content.sensor.SensorDataCycling; -import de.dennisguse.opentracks.content.sensor.SensorDataCyclingPower; -import de.dennisguse.opentracks.content.sensor.SensorDataHeartRate; -import de.dennisguse.opentracks.content.sensor.SensorDataSet; import de.dennisguse.opentracks.data.ContentProviderUtils; import de.dennisguse.opentracks.data.models.Distance; import de.dennisguse.opentracks.data.models.Marker; @@ -51,11 +47,15 @@ import de.dennisguse.opentracks.data.models.Track; import de.dennisguse.opentracks.data.models.TrackPoint; import de.dennisguse.opentracks.io.file.TrackFileFormat; import de.dennisguse.opentracks.io.file.exporter.TrackExporter; +import de.dennisguse.opentracks.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; /** diff --git a/src/androidTest/java/de/dennisguse/opentracks/services/sensors/AltitudeSumManagerTest.java b/src/androidTest/java/de/dennisguse/opentracks/sensors/AltitudeSumManagerTest.java similarity index 96% rename from src/androidTest/java/de/dennisguse/opentracks/services/sensors/AltitudeSumManagerTest.java rename to src/androidTest/java/de/dennisguse/opentracks/sensors/AltitudeSumManagerTest.java index 4a4febec7..c194f7db7 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/services/sensors/AltitudeSumManagerTest.java +++ b/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; diff --git a/src/androidTest/java/de/dennisguse/opentracks/services/sensors/BluetoothUtilsTest.java b/src/androidTest/java/de/dennisguse/opentracks/sensors/BluetoothUtilsTest.java similarity index 95% rename from src/androidTest/java/de/dennisguse/opentracks/services/sensors/BluetoothUtilsTest.java rename to src/androidTest/java/de/dennisguse/opentracks/sensors/BluetoothUtilsTest.java index 6d94b446f..fa8ec1ed5 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/services/sensors/BluetoothUtilsTest.java +++ b/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.sensor.SensorDataCycling; -import de.dennisguse.opentracks.content.sensor.SensorDataRunning; import de.dennisguse.opentracks.data.models.Distance; import de.dennisguse.opentracks.data.models.Speed; +import de.dennisguse.opentracks.sensors.sensorData.SensorDataCycling; +import de.dennisguse.opentracks.sensors.sensorData.SensorDataRunning; public class BluetoothUtilsTest { diff --git a/src/androidTest/java/de/dennisguse/opentracks/services/sensors/PressureSensorUtilsTest.java b/src/androidTest/java/de/dennisguse/opentracks/sensors/PressureSensorUtilsTest.java similarity index 99% rename from src/androidTest/java/de/dennisguse/opentracks/services/sensors/PressureSensorUtilsTest.java rename to src/androidTest/java/de/dennisguse/opentracks/sensors/PressureSensorUtilsTest.java index 0b4eb7061..feae236d7 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/services/sensors/PressureSensorUtilsTest.java +++ b/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; diff --git a/src/androidTest/java/de/dennisguse/opentracks/services/sensors/UintUtilsTest.java b/src/androidTest/java/de/dennisguse/opentracks/sensors/UintUtilsTest.java similarity index 92% rename from src/androidTest/java/de/dennisguse/opentracks/services/sensors/UintUtilsTest.java rename to src/androidTest/java/de/dennisguse/opentracks/sensors/UintUtilsTest.java index bf5b423a6..1ce0f6be6 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/services/sensors/UintUtilsTest.java +++ b/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; diff --git a/src/androidTest/java/de/dennisguse/opentracks/content/sensor/SensorDataCyclingTest.java b/src/androidTest/java/de/dennisguse/opentracks/sensors/sensorData/SensorDataCyclingTest.java similarity index 98% rename from src/androidTest/java/de/dennisguse/opentracks/content/sensor/SensorDataCyclingTest.java rename to src/androidTest/java/de/dennisguse/opentracks/sensors/sensorData/SensorDataCyclingTest.java index 7eba6febe..3fcde407f 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/content/sensor/SensorDataCyclingTest.java +++ b/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; @@ -12,7 +12,7 @@ import org.junit.Test; import org.junit.runner.RunWith; 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 { diff --git a/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceTestRecording.java b/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceTestRecording.java index 48be5fbe6..a71233cab 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceTestRecording.java +++ b/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceTestRecording.java @@ -29,16 +29,16 @@ import java.util.concurrent.TimeoutException; import de.dennisguse.opentracks.R; import de.dennisguse.opentracks.content.data.TestDataUtil; -import de.dennisguse.opentracks.content.sensor.SensorDataRunning; import de.dennisguse.opentracks.data.ContentProviderUtils; import de.dennisguse.opentracks.data.models.Distance; import de.dennisguse.opentracks.data.models.Speed; import de.dennisguse.opentracks.data.models.Track; import de.dennisguse.opentracks.data.models.TrackPoint; import de.dennisguse.opentracks.io.file.importer.TrackPointAssert; +import de.dennisguse.opentracks.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; diff --git a/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceTestUtils.java b/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceTestUtils.java index 2be87e865..3200da220 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceTestUtils.java +++ b/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 { diff --git a/src/main/java/de/dennisguse/opentracks/services/sensors/AltitudeSumManager.java b/src/main/java/de/dennisguse/opentracks/sensors/AltitudeSumManager.java similarity index 98% rename from src/main/java/de/dennisguse/opentracks/services/sensors/AltitudeSumManager.java rename to src/main/java/de/dennisguse/opentracks/sensors/AltitudeSumManager.java index d358e80b5..d8d6d1ec5 100644 --- a/src/main/java/de/dennisguse/opentracks/services/sensors/AltitudeSumManager.java +++ b/src/main/java/de/dennisguse/opentracks/sensors/AltitudeSumManager.java @@ -1,4 +1,4 @@ -package de.dennisguse.opentracks.services.sensors; +package de.dennisguse.opentracks.sensors; import android.content.Context; import android.hardware.Sensor; diff --git a/src/main/java/de/dennisguse/opentracks/services/sensors/BluetoothConnectionManager.java b/src/main/java/de/dennisguse/opentracks/sensors/BluetoothConnectionManager.java similarity index 96% rename from src/main/java/de/dennisguse/opentracks/services/sensors/BluetoothConnectionManager.java rename to src/main/java/de/dennisguse/opentracks/sensors/BluetoothConnectionManager.java index 750e2e8e8..3a7969b52 100644 --- a/src/main/java/de/dennisguse/opentracks/services/sensors/BluetoothConnectionManager.java +++ b/src/main/java/de/dennisguse/opentracks/sensors/BluetoothConnectionManager.java @@ -14,7 +14,7 @@ * the License. */ -package de.dennisguse.opentracks.services.sensors; +package de.dennisguse.opentracks.sensors; import android.bluetooth.BluetoothDevice; import android.bluetooth.BluetoothGatt; @@ -30,11 +30,11 @@ import androidx.annotation.NonNull; import java.util.UUID; -import de.dennisguse.opentracks.content.sensor.SensorData; -import de.dennisguse.opentracks.content.sensor.SensorDataCycling; -import de.dennisguse.opentracks.content.sensor.SensorDataCyclingPower; -import de.dennisguse.opentracks.content.sensor.SensorDataHeartRate; -import de.dennisguse.opentracks.content.sensor.SensorDataRunning; +import de.dennisguse.opentracks.sensors.sensorData.SensorData; +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.SensorDataRunning; /** * Manages connection to a Bluetooth LE sensor and subscribes for onChange-notifications. diff --git a/src/main/java/de/dennisguse/opentracks/services/sensors/BluetoothRemoteSensorManager.java b/src/main/java/de/dennisguse/opentracks/sensors/BluetoothRemoteSensorManager.java similarity index 96% rename from src/main/java/de/dennisguse/opentracks/services/sensors/BluetoothRemoteSensorManager.java rename to src/main/java/de/dennisguse/opentracks/sensors/BluetoothRemoteSensorManager.java index 07ce89962..7d67eb7a5 100644 --- a/src/main/java/de/dennisguse/opentracks/services/sensors/BluetoothRemoteSensorManager.java +++ b/src/main/java/de/dennisguse/opentracks/sensors/BluetoothRemoteSensorManager.java @@ -14,7 +14,7 @@ * the License. */ -package de.dennisguse.opentracks.services.sensors; +package de.dennisguse.opentracks.sensors; import android.bluetooth.BluetoothAdapter; import android.bluetooth.BluetoothDevice; @@ -27,12 +27,12 @@ import androidx.annotation.NonNull; import java.time.Duration; import de.dennisguse.opentracks.R; -import de.dennisguse.opentracks.content.sensor.SensorData; -import de.dennisguse.opentracks.content.sensor.SensorDataCycling; -import de.dennisguse.opentracks.content.sensor.SensorDataRunning; -import de.dennisguse.opentracks.content.sensor.SensorDataSet; import de.dennisguse.opentracks.data.models.Distance; import de.dennisguse.opentracks.data.models.TrackPoint; +import de.dennisguse.opentracks.sensors.sensorData.SensorData; +import de.dennisguse.opentracks.sensors.sensorData.SensorDataCycling; +import de.dennisguse.opentracks.sensors.sensorData.SensorDataRunning; +import de.dennisguse.opentracks.sensors.sensorData.SensorDataSet; import de.dennisguse.opentracks.settings.PreferencesUtils; /** diff --git a/src/main/java/de/dennisguse/opentracks/services/sensors/BluetoothUtils.java b/src/main/java/de/dennisguse/opentracks/sensors/BluetoothUtils.java similarity index 97% rename from src/main/java/de/dennisguse/opentracks/services/sensors/BluetoothUtils.java rename to src/main/java/de/dennisguse/opentracks/sensors/BluetoothUtils.java index 243b585de..5d13270c1 100644 --- a/src/main/java/de/dennisguse/opentracks/services/sensors/BluetoothUtils.java +++ b/src/main/java/de/dennisguse/opentracks/sensors/BluetoothUtils.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package de.dennisguse.opentracks.services.sensors; +package de.dennisguse.opentracks.sensors; import android.bluetooth.BluetoothAdapter; import android.bluetooth.BluetoothGattCharacteristic; @@ -28,10 +28,10 @@ import java.util.Collections; import java.util.List; import java.util.UUID; -import de.dennisguse.opentracks.content.sensor.SensorDataCycling; -import de.dennisguse.opentracks.content.sensor.SensorDataRunning; import de.dennisguse.opentracks.data.models.Distance; import de.dennisguse.opentracks.data.models.Speed; +import de.dennisguse.opentracks.sensors.sensorData.SensorDataCycling; +import de.dennisguse.opentracks.sensors.sensorData.SensorDataRunning; /** * Utilities for dealing with bluetooth devices. diff --git a/src/main/java/de/dennisguse/opentracks/services/sensors/PressureSensorUtils.java b/src/main/java/de/dennisguse/opentracks/sensors/PressureSensorUtils.java similarity index 98% rename from src/main/java/de/dennisguse/opentracks/services/sensors/PressureSensorUtils.java rename to src/main/java/de/dennisguse/opentracks/sensors/PressureSensorUtils.java index 6a27e6d35..ed447a6f6 100644 --- a/src/main/java/de/dennisguse/opentracks/services/sensors/PressureSensorUtils.java +++ b/src/main/java/de/dennisguse/opentracks/sensors/PressureSensorUtils.java @@ -1,4 +1,4 @@ -package de.dennisguse.opentracks.services.sensors; +package de.dennisguse.opentracks.sensors; import android.hardware.SensorManager; diff --git a/src/main/java/de/dennisguse/opentracks/services/sensors/UintUtils.java b/src/main/java/de/dennisguse/opentracks/sensors/UintUtils.java similarity index 93% rename from src/main/java/de/dennisguse/opentracks/services/sensors/UintUtils.java rename to src/main/java/de/dennisguse/opentracks/sensors/UintUtils.java index 783fec029..c4610cd22 100644 --- a/src/main/java/de/dennisguse/opentracks/services/sensors/UintUtils.java +++ b/src/main/java/de/dennisguse/opentracks/sensors/UintUtils.java @@ -1,4 +1,4 @@ -package de.dennisguse.opentracks.services.sensors; +package de.dennisguse.opentracks.sensors; public class UintUtils { diff --git a/src/main/java/de/dennisguse/opentracks/content/sensor/SensorData.java b/src/main/java/de/dennisguse/opentracks/sensors/sensorData/SensorData.java similarity index 93% rename from src/main/java/de/dennisguse/opentracks/content/sensor/SensorData.java rename to src/main/java/de/dennisguse/opentracks/sensors/sensorData/SensorData.java index 9dc2674b1..62b4b02fa 100644 --- a/src/main/java/de/dennisguse/opentracks/content/sensor/SensorData.java +++ b/src/main/java/de/dennisguse/opentracks/sensors/sensorData/SensorData.java @@ -1,4 +1,4 @@ -package de.dennisguse.opentracks.content.sensor; +package de.dennisguse.opentracks.sensors.sensorData; import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -6,7 +6,7 @@ import androidx.annotation.VisibleForTesting; import java.time.Instant; -import de.dennisguse.opentracks.services.sensors.BluetoothRemoteSensorManager; +import de.dennisguse.opentracks.sensors.BluetoothRemoteSensorManager; public abstract class SensorData { diff --git a/src/main/java/de/dennisguse/opentracks/content/sensor/SensorDataCycling.java b/src/main/java/de/dennisguse/opentracks/sensors/sensorData/SensorDataCycling.java similarity index 98% rename from src/main/java/de/dennisguse/opentracks/content/sensor/SensorDataCycling.java rename to src/main/java/de/dennisguse/opentracks/sensors/sensorData/SensorDataCycling.java index 5ce1b3029..c94ef5bca 100644 --- a/src/main/java/de/dennisguse/opentracks/content/sensor/SensorDataCycling.java +++ b/src/main/java/de/dennisguse/opentracks/sensors/sensorData/SensorDataCycling.java @@ -1,4 +1,4 @@ -package de.dennisguse.opentracks.content.sensor; +package de.dennisguse.opentracks.sensors.sensorData; import android.util.Log; @@ -11,7 +11,7 @@ import java.time.Duration; import de.dennisguse.opentracks.data.models.Distance; import de.dennisguse.opentracks.data.models.Speed; import de.dennisguse.opentracks.data.models.UnitConversions; -import de.dennisguse.opentracks.services.sensors.UintUtils; +import de.dennisguse.opentracks.sensors.UintUtils; /** * Provides cadence in rpm and speed in milliseconds from Bluetooth LE Cycling Cadence and Speed sensors. diff --git a/src/main/java/de/dennisguse/opentracks/content/sensor/SensorDataCyclingPower.java b/src/main/java/de/dennisguse/opentracks/sensors/sensorData/SensorDataCyclingPower.java similarity index 91% rename from src/main/java/de/dennisguse/opentracks/content/sensor/SensorDataCyclingPower.java rename to src/main/java/de/dennisguse/opentracks/sensors/sensorData/SensorDataCyclingPower.java index 637c7a39b..fba7255b8 100644 --- a/src/main/java/de/dennisguse/opentracks/content/sensor/SensorDataCyclingPower.java +++ b/src/main/java/de/dennisguse/opentracks/sensors/sensorData/SensorDataCyclingPower.java @@ -1,4 +1,4 @@ -package de.dennisguse.opentracks.content.sensor; +package de.dennisguse.opentracks.sensors.sensorData; import androidx.annotation.NonNull; diff --git a/src/main/java/de/dennisguse/opentracks/content/sensor/SensorDataHeartRate.java b/src/main/java/de/dennisguse/opentracks/sensors/sensorData/SensorDataHeartRate.java similarity index 91% rename from src/main/java/de/dennisguse/opentracks/content/sensor/SensorDataHeartRate.java rename to src/main/java/de/dennisguse/opentracks/sensors/sensorData/SensorDataHeartRate.java index 8682c6ae2..ce6347ed2 100644 --- a/src/main/java/de/dennisguse/opentracks/content/sensor/SensorDataHeartRate.java +++ b/src/main/java/de/dennisguse/opentracks/sensors/sensorData/SensorDataHeartRate.java @@ -1,4 +1,4 @@ -package de.dennisguse.opentracks.content.sensor; +package de.dennisguse.opentracks.sensors.sensorData; import androidx.annotation.NonNull; diff --git a/src/main/java/de/dennisguse/opentracks/content/sensor/SensorDataRunning.java b/src/main/java/de/dennisguse/opentracks/sensors/sensorData/SensorDataRunning.java similarity index 98% rename from src/main/java/de/dennisguse/opentracks/content/sensor/SensorDataRunning.java rename to src/main/java/de/dennisguse/opentracks/sensors/sensorData/SensorDataRunning.java index b1fd981b6..61fa80b43 100644 --- a/src/main/java/de/dennisguse/opentracks/content/sensor/SensorDataRunning.java +++ b/src/main/java/de/dennisguse/opentracks/sensors/sensorData/SensorDataRunning.java @@ -1,4 +1,4 @@ -package de.dennisguse.opentracks.content.sensor; +package de.dennisguse.opentracks.sensors.sensorData; import androidx.annotation.NonNull; import androidx.annotation.Nullable; diff --git a/src/main/java/de/dennisguse/opentracks/content/sensor/SensorDataSet.java b/src/main/java/de/dennisguse/opentracks/sensors/sensorData/SensorDataSet.java similarity index 99% rename from src/main/java/de/dennisguse/opentracks/content/sensor/SensorDataSet.java rename to src/main/java/de/dennisguse/opentracks/sensors/sensorData/SensorDataSet.java index dfc7ec848..c4764c2f5 100644 --- a/src/main/java/de/dennisguse/opentracks/content/sensor/SensorDataSet.java +++ b/src/main/java/de/dennisguse/opentracks/sensors/sensorData/SensorDataSet.java @@ -1,4 +1,4 @@ -package de.dennisguse.opentracks.content.sensor; +package de.dennisguse.opentracks.sensors.sensorData; import android.util.Pair; diff --git a/src/main/java/de/dennisguse/opentracks/services/TrackRecordingManager.java b/src/main/java/de/dennisguse/opentracks/services/TrackRecordingManager.java index 063797a5c..435e6e95d 100644 --- a/src/main/java/de/dennisguse/opentracks/services/TrackRecordingManager.java +++ b/src/main/java/de/dennisguse/opentracks/services/TrackRecordingManager.java @@ -12,12 +12,12 @@ import androidx.annotation.NonNull; import java.time.ZoneOffset; import de.dennisguse.opentracks.R; -import de.dennisguse.opentracks.content.sensor.SensorDataSet; import de.dennisguse.opentracks.data.ContentProviderUtils; import de.dennisguse.opentracks.data.models.Distance; import de.dennisguse.opentracks.data.models.Marker; import de.dennisguse.opentracks.data.models.Track; import de.dennisguse.opentracks.data.models.TrackPoint; +import de.dennisguse.opentracks.sensors.sensorData.SensorDataSet; import de.dennisguse.opentracks.services.handlers.TrackPointCreator; import de.dennisguse.opentracks.settings.PreferencesUtils; import de.dennisguse.opentracks.stats.TrackStatistics; diff --git a/src/main/java/de/dennisguse/opentracks/services/TrackRecordingService.java b/src/main/java/de/dennisguse/opentracks/services/TrackRecordingService.java index 0b319114b..26c616551 100644 --- a/src/main/java/de/dennisguse/opentracks/services/TrackRecordingService.java +++ b/src/main/java/de/dennisguse/opentracks/services/TrackRecordingService.java @@ -40,13 +40,13 @@ import java.util.Objects; import de.dennisguse.opentracks.R; import de.dennisguse.opentracks.TrackListActivity; import de.dennisguse.opentracks.TrackRecordingActivity; -import de.dennisguse.opentracks.content.sensor.SensorDataSet; import de.dennisguse.opentracks.data.CustomContentProvider; import de.dennisguse.opentracks.data.models.Distance; import de.dennisguse.opentracks.data.models.Marker; import de.dennisguse.opentracks.data.models.Track; import de.dennisguse.opentracks.data.models.TrackPoint; import de.dennisguse.opentracks.io.file.exporter.ExportServiceResultReceiver; +import de.dennisguse.opentracks.sensors.sensorData.SensorDataSet; import de.dennisguse.opentracks.services.announcement.VoiceAnnouncementManager; import de.dennisguse.opentracks.services.handlers.EGM2008CorrectionManager; import de.dennisguse.opentracks.services.handlers.GpsStatusValue; diff --git a/src/main/java/de/dennisguse/opentracks/services/handlers/TrackPointCreator.java b/src/main/java/de/dennisguse/opentracks/services/handlers/TrackPointCreator.java index 2c7891196..5d75b7f68 100644 --- a/src/main/java/de/dennisguse/opentracks/services/handlers/TrackPointCreator.java +++ b/src/main/java/de/dennisguse/opentracks/services/handlers/TrackPointCreator.java @@ -12,11 +12,11 @@ import java.time.Clock; import java.time.Instant; import java.time.ZoneId; -import de.dennisguse.opentracks.content.sensor.SensorDataSet; import de.dennisguse.opentracks.data.models.Distance; import de.dennisguse.opentracks.data.models.TrackPoint; -import de.dennisguse.opentracks.services.sensors.AltitudeSumManager; -import de.dennisguse.opentracks.services.sensors.BluetoothRemoteSensorManager; +import de.dennisguse.opentracks.sensors.AltitudeSumManager; +import de.dennisguse.opentracks.sensors.BluetoothRemoteSensorManager; +import de.dennisguse.opentracks.sensors.sensorData.SensorDataSet; /** * Creates TrackPoints while recording by fusing data from different sensors (e.g., GNSS, barometer, BLE sensors). diff --git a/src/main/java/de/dennisguse/opentracks/settings/SensorsSettingsFragment.java b/src/main/java/de/dennisguse/opentracks/settings/SensorsSettingsFragment.java index e974eb435..af6cb580e 100644 --- a/src/main/java/de/dennisguse/opentracks/settings/SensorsSettingsFragment.java +++ b/src/main/java/de/dennisguse/opentracks/settings/SensorsSettingsFragment.java @@ -9,7 +9,7 @@ import androidx.preference.Preference; import androidx.preference.PreferenceFragmentCompat; import de.dennisguse.opentracks.R; -import de.dennisguse.opentracks.services.sensors.BluetoothUtils; +import de.dennisguse.opentracks.sensors.BluetoothUtils; import de.dennisguse.opentracks.settings.bluetooth.BluetoothLeCyclingCadenceAndSpeedPreference; import de.dennisguse.opentracks.settings.bluetooth.BluetoothLeCyclingPowerPreference; import de.dennisguse.opentracks.settings.bluetooth.BluetoothLeHeartRatePreference; diff --git a/src/main/java/de/dennisguse/opentracks/settings/bluetooth/BluetoothLeSensorPreference.java b/src/main/java/de/dennisguse/opentracks/settings/bluetooth/BluetoothLeSensorPreference.java index b4024c00d..03936b230 100644 --- a/src/main/java/de/dennisguse/opentracks/settings/bluetooth/BluetoothLeSensorPreference.java +++ b/src/main/java/de/dennisguse/opentracks/settings/bluetooth/BluetoothLeSensorPreference.java @@ -33,7 +33,7 @@ import java.util.UUID; import java.util.stream.Collectors; import de.dennisguse.opentracks.R; -import de.dennisguse.opentracks.services.sensors.BluetoothUtils; +import de.dennisguse.opentracks.sensors.BluetoothUtils; import de.dennisguse.opentracks.settings.PreferencesUtils; /** diff --git a/src/main/java/de/dennisguse/opentracks/viewmodels/StatisticDataBuilder.java b/src/main/java/de/dennisguse/opentracks/viewmodels/StatisticDataBuilder.java index 87bb30c93..c7de147a3 100644 --- a/src/main/java/de/dennisguse/opentracks/viewmodels/StatisticDataBuilder.java +++ b/src/main/java/de/dennisguse/opentracks/viewmodels/StatisticDataBuilder.java @@ -11,9 +11,9 @@ import java.util.Objects; import java.util.stream.Collectors; import de.dennisguse.opentracks.R; -import de.dennisguse.opentracks.content.sensor.SensorDataSet; import de.dennisguse.opentracks.data.models.Speed; import de.dennisguse.opentracks.data.models.TrackPoint; +import de.dennisguse.opentracks.sensors.sensorData.SensorDataSet; import de.dennisguse.opentracks.services.TrackRecordingService; import de.dennisguse.opentracks.stats.SensorStatistics; import de.dennisguse.opentracks.stats.TrackStatistics;