upstream-mirrors/OpenTracks
1
0
Fork 1
mirror of https://codeberg.org/OpenTracksApp/OpenTracks.git synced 2026-10-02 17:43:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Package structure: moved sensors.

Browse Source 
Part of #963.
This commit is contained in:
Dennis Guse
2022-01-15 22:02:29 +01:00
parent 0645628d7e
commit 88c4e1a109
26 changed files with 51 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/androidTest/java/de/dennisguse/opentracks/io/file/importer/ExportImportTest.java
+6 -6
View File
@@ -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;
/**
src/androidTest/java/de/dennisguse/opentracks/services/sensors/AltitudeSumManagerTest.java → src/androidTest/java/de/dennisguse/opentracks/sensors/AltitudeSumManagerTest.java
+1 -1
View File
@@ -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/services/sensors/BluetoothUtilsTest.java → src/androidTest/java/de/dennisguse/opentracks/sensors/BluetoothUtilsTest.java
+3 -3
View File
@@ -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 {
src/androidTest/java/de/dennisguse/opentracks/services/sensors/PressureSensorUtilsTest.java → src/androidTest/java/de/dennisguse/opentracks/sensors/PressureSensorUtilsTest.java
+1 -1
View File
@@ -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/services/sensors/UintUtilsTest.java → src/androidTest/java/de/dennisguse/opentracks/sensors/UintUtilsTest.java
+1 -1
View File
@@ -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/content/sensor/SensorDataCyclingTest.java → src/androidTest/java/de/dennisguse/opentracks/sensors/sensorData/SensorDataCyclingTest.java
+2 -2
View File
@@ -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 {
src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceTestRecording.java
+3 -3
View File
@@ -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;
src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceTestUtils.java
+1 -1
View File
@@ -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/main/java/de/dennisguse/opentracks/services/sensors/AltitudeSumManager.java → src/main/java/de/dennisguse/opentracks/sensors/AltitudeSumManager.java
+1 -1
View File
@@ -1,4 +1,4 @@
package de.dennisguse.opentracks.services.sensors;
package de.dennisguse.opentracks.sensors;
import android.content.Context;
import android.hardware.Sensor;
src/main/java/de/dennisguse/opentracks/services/sensors/BluetoothConnectionManager.java → src/main/java/de/dennisguse/opentracks/sensors/BluetoothConnectionManager.java
+6 -6
View File
@@ -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.
src/main/java/de/dennisguse/opentracks/services/sensors/BluetoothRemoteSensorManager.java → src/main/java/de/dennisguse/opentracks/sensors/BluetoothRemoteSensorManager.java
+5 -5
View File
@@ -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;
/**
src/main/java/de/dennisguse/opentracks/services/sensors/BluetoothUtils.java → src/main/java/de/dennisguse/opentracks/sensors/BluetoothUtils.java
+3 -3
View File
@@ -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.
src/main/java/de/dennisguse/opentracks/services/sensors/PressureSensorUtils.java → src/main/java/de/dennisguse/opentracks/sensors/PressureSensorUtils.java
+1 -1
View File
@@ -1,4 +1,4 @@
package de.dennisguse.opentracks.services.sensors;
package de.dennisguse.opentracks.sensors;
import android.hardware.SensorManager;
src/main/java/de/dennisguse/opentracks/services/sensors/UintUtils.java → src/main/java/de/dennisguse/opentracks/sensors/UintUtils.java
+1 -1
View File
@@ -1,4 +1,4 @@
package de.dennisguse.opentracks.services.sensors;
package de.dennisguse.opentracks.sensors;
public class UintUtils {
src/main/java/de/dennisguse/opentracks/content/sensor/SensorData.java → src/main/java/de/dennisguse/opentracks/sensors/sensorData/SensorData.java
+2 -2
View File
@@ -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<T> {
src/main/java/de/dennisguse/opentracks/content/sensor/SensorDataCycling.java → src/main/java/de/dennisguse/opentracks/sensors/sensorData/SensorDataCycling.java
+2 -2
View File
@@ -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.
src/main/java/de/dennisguse/opentracks/content/sensor/SensorDataCyclingPower.java → src/main/java/de/dennisguse/opentracks/sensors/sensorData/SensorDataCyclingPower.java
+1 -1
View File
@@ -1,4 +1,4 @@
package de.dennisguse.opentracks.content.sensor;
package de.dennisguse.opentracks.sensors.sensorData;
import androidx.annotation.NonNull;
src/main/java/de/dennisguse/opentracks/content/sensor/SensorDataHeartRate.java → src/main/java/de/dennisguse/opentracks/sensors/sensorData/SensorDataHeartRate.java
+1 -1
View File
@@ -1,4 +1,4 @@
package de.dennisguse.opentracks.content.sensor;
package de.dennisguse.opentracks.sensors.sensorData;
import androidx.annotation.NonNull;
src/main/java/de/dennisguse/opentracks/content/sensor/SensorDataRunning.java → src/main/java/de/dennisguse/opentracks/sensors/sensorData/SensorDataRunning.java
+1 -1
View File
@@ -1,4 +1,4 @@
package de.dennisguse.opentracks.content.sensor;
package de.dennisguse.opentracks.sensors.sensorData;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
src/main/java/de/dennisguse/opentracks/content/sensor/SensorDataSet.java → src/main/java/de/dennisguse/opentracks/sensors/sensorData/SensorDataSet.java
+1 -1
View File
@@ -1,4 +1,4 @@
package de.dennisguse.opentracks.content.sensor;
package de.dennisguse.opentracks.sensors.sensorData;
import android.util.Pair;
src/main/java/de/dennisguse/opentracks/services/TrackRecordingManager.java
+1 -1
View File
@@ -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;
src/main/java/de/dennisguse/opentracks/services/TrackRecordingService.java
+1 -1
View File
@@ -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;
src/main/java/de/dennisguse/opentracks/services/handlers/TrackPointCreator.java
+3 -3
View File
@@ -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).
src/main/java/de/dennisguse/opentracks/settings/SensorsSettingsFragment.java
+1 -1
View File
@@ -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;
src/main/java/de/dennisguse/opentracks/settings/bluetooth/BluetoothLeSensorPreference.java
+1 -1
View File
@@ -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;
/**
src/main/java/de/dennisguse/opentracks/viewmodels/StatisticDataBuilder.java
+1 -1
View File
@@ -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;