diff --git a/src/androidTest/java/de/dennisguse/opentracks/content/sensor/SensorDataCyclingTest.java b/src/androidTest/java/de/dennisguse/opentracks/content/sensor/SensorDataCyclingTest.java index 003630fc4..6e0000199 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/content/sensor/SensorDataCyclingTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/content/sensor/SensorDataCyclingTest.java @@ -1,5 +1,10 @@ package de.dennisguse.opentracks.content.sensor; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotEquals; +import static org.junit.Assert.assertNull; + import androidx.test.ext.junit.runners.AndroidJUnit4; import org.junit.Ignore; @@ -7,12 +12,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import de.dennisguse.opentracks.content.data.Distance; -import de.dennisguse.opentracks.util.UintUtils; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotEquals; -import static org.junit.Assert.assertNull; +import de.dennisguse.opentracks.services.sensors.UintUtils; @RunWith(AndroidJUnit4.class) public class SensorDataCyclingTest { diff --git a/src/androidTest/java/de/dennisguse/opentracks/util/BluetoothUtilsTest.java b/src/androidTest/java/de/dennisguse/opentracks/services/sensors/BluetoothUtilsTest.java similarity index 98% rename from src/androidTest/java/de/dennisguse/opentracks/util/BluetoothUtilsTest.java rename to src/androidTest/java/de/dennisguse/opentracks/services/sensors/BluetoothUtilsTest.java index 7b94c6311..2b6bca0a5 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/util/BluetoothUtilsTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/services/sensors/BluetoothUtilsTest.java @@ -1,4 +1,4 @@ -package de.dennisguse.opentracks.util; +package de.dennisguse.opentracks.services.sensors; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; diff --git a/src/androidTest/java/de/dennisguse/opentracks/util/PressureSensorUtilsTest.java b/src/androidTest/java/de/dennisguse/opentracks/services/sensors/PressureSensorUtilsTest.java similarity index 99% rename from src/androidTest/java/de/dennisguse/opentracks/util/PressureSensorUtilsTest.java rename to src/androidTest/java/de/dennisguse/opentracks/services/sensors/PressureSensorUtilsTest.java index 572b1fb63..0b4eb7061 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/util/PressureSensorUtilsTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/services/sensors/PressureSensorUtilsTest.java @@ -1,10 +1,10 @@ -package de.dennisguse.opentracks.util; - -import org.junit.Test; +package de.dennisguse.opentracks.services.sensors; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; +import org.junit.Test; + public class PressureSensorUtilsTest { // real data at 500Hz stationary diff --git a/src/androidTest/java/de/dennisguse/opentracks/util/UintUtilsTest.java b/src/androidTest/java/de/dennisguse/opentracks/services/sensors/UintUtilsTest.java similarity index 92% rename from src/androidTest/java/de/dennisguse/opentracks/util/UintUtilsTest.java rename to src/androidTest/java/de/dennisguse/opentracks/services/sensors/UintUtilsTest.java index 68c7c47c9..bf5b423a6 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/util/UintUtilsTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/services/sensors/UintUtilsTest.java @@ -1,9 +1,9 @@ -package de.dennisguse.opentracks.util; - -import org.junit.Test; +package de.dennisguse.opentracks.services.sensors; import static org.junit.Assert.assertEquals; +import org.junit.Test; + public class UintUtilsTest { @Test diff --git a/src/androidTest/java/de/dennisguse/opentracks/viewmodels/IntervalStatisticsTest.java b/src/androidTest/java/de/dennisguse/opentracks/viewmodels/IntervalStatisticsTest.java index 48952af37..2a40fc99f 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/viewmodels/IntervalStatisticsTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/viewmodels/IntervalStatisticsTest.java @@ -1,5 +1,8 @@ package de.dennisguse.opentracks.viewmodels; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + import android.content.Context; import android.util.Pair; @@ -16,14 +19,11 @@ import de.dennisguse.opentracks.content.data.Distance; import de.dennisguse.opentracks.content.data.TestDataUtil; import de.dennisguse.opentracks.content.data.Track; import de.dennisguse.opentracks.content.data.TrackPoint; +import de.dennisguse.opentracks.content.data.UnitConversions; import de.dennisguse.opentracks.content.provider.ContentProviderUtils; import de.dennisguse.opentracks.content.provider.TrackPointIterator; import de.dennisguse.opentracks.stats.TrackStatistics; import de.dennisguse.opentracks.stats.TrackStatisticsUpdater; -import de.dennisguse.opentracks.util.UnitConversions; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; @RunWith(JUnit4.class) public class IntervalStatisticsTest { diff --git a/src/main/java/de/dennisguse/opentracks/chart/ChartPoint.java b/src/main/java/de/dennisguse/opentracks/chart/ChartPoint.java index 1bc69167b..931725134 100644 --- a/src/main/java/de/dennisguse/opentracks/chart/ChartPoint.java +++ b/src/main/java/de/dennisguse/opentracks/chart/ChartPoint.java @@ -7,8 +7,8 @@ import de.dennisguse.opentracks.content.data.Altitude; import de.dennisguse.opentracks.content.data.Distance; import de.dennisguse.opentracks.content.data.Speed; import de.dennisguse.opentracks.content.data.TrackPoint; +import de.dennisguse.opentracks.content.data.UnitConversions; import de.dennisguse.opentracks.stats.TrackStatistics; -import de.dennisguse.opentracks.util.UnitConversions; public class ChartPoint { //X-axis diff --git a/src/main/java/de/dennisguse/opentracks/content/DescriptionGenerator.java b/src/main/java/de/dennisguse/opentracks/content/DescriptionGenerator.java index a946d18a2..98a7b2902 100644 --- a/src/main/java/de/dennisguse/opentracks/content/DescriptionGenerator.java +++ b/src/main/java/de/dennisguse/opentracks/content/DescriptionGenerator.java @@ -29,9 +29,9 @@ import de.dennisguse.opentracks.R; import de.dennisguse.opentracks.content.data.Distance; import de.dennisguse.opentracks.content.data.Speed; import de.dennisguse.opentracks.content.data.Track; +import de.dennisguse.opentracks.content.data.UnitConversions; import de.dennisguse.opentracks.stats.TrackStatistics; import de.dennisguse.opentracks.util.StringUtils; -import de.dennisguse.opentracks.util.UnitConversions; /** * Generates descriptions for tracks and markers. diff --git a/src/main/java/de/dennisguse/opentracks/content/data/Distance.java b/src/main/java/de/dennisguse/opentracks/content/data/Distance.java index 08cec6bbd..6c256e296 100644 --- a/src/main/java/de/dennisguse/opentracks/content/data/Distance.java +++ b/src/main/java/de/dennisguse/opentracks/content/data/Distance.java @@ -4,8 +4,6 @@ import androidx.annotation.NonNull; import java.util.Objects; -import de.dennisguse.opentracks.util.UnitConversions; - public class Distance { public static Distance of(double distance_m) { diff --git a/src/main/java/de/dennisguse/opentracks/content/data/Speed.java b/src/main/java/de/dennisguse/opentracks/content/data/Speed.java index 0ac26d5a5..f92b95a4f 100644 --- a/src/main/java/de/dennisguse/opentracks/content/data/Speed.java +++ b/src/main/java/de/dennisguse/opentracks/content/data/Speed.java @@ -6,7 +6,6 @@ import java.time.Duration; import java.util.Objects; import de.dennisguse.opentracks.settings.PreferencesUtils; -import de.dennisguse.opentracks.util.UnitConversions; public class Speed { diff --git a/src/main/java/de/dennisguse/opentracks/util/UnitConversions.java b/src/main/java/de/dennisguse/opentracks/content/data/UnitConversions.java similarity index 98% rename from src/main/java/de/dennisguse/opentracks/util/UnitConversions.java rename to src/main/java/de/dennisguse/opentracks/content/data/UnitConversions.java index 427e72d92..9130fa9ea 100644 --- a/src/main/java/de/dennisguse/opentracks/util/UnitConversions.java +++ b/src/main/java/de/dennisguse/opentracks/content/data/UnitConversions.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package de.dennisguse.opentracks.util; +package de.dennisguse.opentracks.content.data; /** * Unit conversion constants. diff --git a/src/main/java/de/dennisguse/opentracks/content/sensor/SensorDataCycling.java b/src/main/java/de/dennisguse/opentracks/content/sensor/SensorDataCycling.java index aa0c338bc..6cf00a61e 100644 --- a/src/main/java/de/dennisguse/opentracks/content/sensor/SensorDataCycling.java +++ b/src/main/java/de/dennisguse/opentracks/content/sensor/SensorDataCycling.java @@ -10,8 +10,8 @@ import java.time.Duration; import de.dennisguse.opentracks.content.data.Distance; import de.dennisguse.opentracks.content.data.Speed; -import de.dennisguse.opentracks.util.UintUtils; -import de.dennisguse.opentracks.util.UnitConversions; +import de.dennisguse.opentracks.content.data.UnitConversions; +import de.dennisguse.opentracks.services.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/services/sensors/AltitudeSumManager.java b/src/main/java/de/dennisguse/opentracks/services/sensors/AltitudeSumManager.java index f67e852ab..bcebce71f 100644 --- a/src/main/java/de/dennisguse/opentracks/services/sensors/AltitudeSumManager.java +++ b/src/main/java/de/dennisguse/opentracks/services/sensors/AltitudeSumManager.java @@ -12,7 +12,6 @@ import androidx.annotation.Nullable; import androidx.annotation.VisibleForTesting; import de.dennisguse.opentracks.content.data.TrackPoint; -import de.dennisguse.opentracks.util.PressureSensorUtils; /** * Estimates the altitude gain and altitude loss using the device's pressure sensor (i.e., barometer). diff --git a/src/main/java/de/dennisguse/opentracks/services/sensors/BluetoothConnectionManager.java b/src/main/java/de/dennisguse/opentracks/services/sensors/BluetoothConnectionManager.java index 835e67914..750e2e8e8 100644 --- a/src/main/java/de/dennisguse/opentracks/services/sensors/BluetoothConnectionManager.java +++ b/src/main/java/de/dennisguse/opentracks/services/sensors/BluetoothConnectionManager.java @@ -35,7 +35,6 @@ 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.util.BluetoothUtils; /** * 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/services/sensors/BluetoothRemoteSensorManager.java index ba5696174..d9546f884 100644 --- a/src/main/java/de/dennisguse/opentracks/services/sensors/BluetoothRemoteSensorManager.java +++ b/src/main/java/de/dennisguse/opentracks/services/sensors/BluetoothRemoteSensorManager.java @@ -34,7 +34,6 @@ 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.settings.PreferencesUtils; -import de.dennisguse.opentracks.util.BluetoothUtils; /** * Bluetooth LE sensor manager: manages connections to Bluetooth LE sensors. diff --git a/src/main/java/de/dennisguse/opentracks/util/BluetoothUtils.java b/src/main/java/de/dennisguse/opentracks/services/sensors/BluetoothUtils.java similarity index 99% rename from src/main/java/de/dennisguse/opentracks/util/BluetoothUtils.java rename to src/main/java/de/dennisguse/opentracks/services/sensors/BluetoothUtils.java index 6d7e4418e..0d19ef667 100644 --- a/src/main/java/de/dennisguse/opentracks/util/BluetoothUtils.java +++ b/src/main/java/de/dennisguse/opentracks/services/sensors/BluetoothUtils.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package de.dennisguse.opentracks.util; +package de.dennisguse.opentracks.services.sensors; import android.bluetooth.BluetoothAdapter; import android.bluetooth.BluetoothGattCharacteristic; diff --git a/src/main/java/de/dennisguse/opentracks/util/PressureSensorUtils.java b/src/main/java/de/dennisguse/opentracks/services/sensors/PressureSensorUtils.java similarity index 98% rename from src/main/java/de/dennisguse/opentracks/util/PressureSensorUtils.java rename to src/main/java/de/dennisguse/opentracks/services/sensors/PressureSensorUtils.java index e6e5351da..6a27e6d35 100644 --- a/src/main/java/de/dennisguse/opentracks/util/PressureSensorUtils.java +++ b/src/main/java/de/dennisguse/opentracks/services/sensors/PressureSensorUtils.java @@ -1,4 +1,4 @@ -package de.dennisguse.opentracks.util; +package de.dennisguse.opentracks.services.sensors; import android.hardware.SensorManager; diff --git a/src/main/java/de/dennisguse/opentracks/util/UintUtils.java b/src/main/java/de/dennisguse/opentracks/services/sensors/UintUtils.java similarity index 93% rename from src/main/java/de/dennisguse/opentracks/util/UintUtils.java rename to src/main/java/de/dennisguse/opentracks/services/sensors/UintUtils.java index 6d9c321eb..783fec029 100644 --- a/src/main/java/de/dennisguse/opentracks/util/UintUtils.java +++ b/src/main/java/de/dennisguse/opentracks/services/sensors/UintUtils.java @@ -1,4 +1,4 @@ -package de.dennisguse.opentracks.util; +package de.dennisguse.opentracks.services.sensors; public class UintUtils { diff --git a/src/main/java/de/dennisguse/opentracks/settings/PreferencesUtils.java b/src/main/java/de/dennisguse/opentracks/settings/PreferencesUtils.java index 6532fcd5d..f5932d679 100644 --- a/src/main/java/de/dennisguse/opentracks/settings/PreferencesUtils.java +++ b/src/main/java/de/dennisguse/opentracks/settings/PreferencesUtils.java @@ -42,10 +42,10 @@ import de.dennisguse.opentracks.R; import de.dennisguse.opentracks.content.data.Distance; import de.dennisguse.opentracks.content.data.Layout; import de.dennisguse.opentracks.content.data.Speed; +import de.dennisguse.opentracks.content.data.UnitConversions; import de.dennisguse.opentracks.io.file.TrackFileFormat; import de.dennisguse.opentracks.util.CsvLayoutUtils; import de.dennisguse.opentracks.util.TrackIconUtils; -import de.dennisguse.opentracks.util.UnitConversions; /** * Utilities to access preferences stored in {@link SharedPreferences}. diff --git a/src/main/java/de/dennisguse/opentracks/settings/SensorsSettingsFragment.java b/src/main/java/de/dennisguse/opentracks/settings/SensorsSettingsFragment.java index 3925fc37f..e974eb435 100644 --- a/src/main/java/de/dennisguse/opentracks/settings/SensorsSettingsFragment.java +++ b/src/main/java/de/dennisguse/opentracks/settings/SensorsSettingsFragment.java @@ -9,12 +9,12 @@ import androidx.preference.Preference; import androidx.preference.PreferenceFragmentCompat; import de.dennisguse.opentracks.R; +import de.dennisguse.opentracks.services.sensors.BluetoothUtils; import de.dennisguse.opentracks.settings.bluetooth.BluetoothLeCyclingCadenceAndSpeedPreference; import de.dennisguse.opentracks.settings.bluetooth.BluetoothLeCyclingPowerPreference; import de.dennisguse.opentracks.settings.bluetooth.BluetoothLeHeartRatePreference; import de.dennisguse.opentracks.settings.bluetooth.BluetoothLeRunningSpeedAndCadencePreference; import de.dennisguse.opentracks.settings.bluetooth.BluetoothLeSensorPreference; -import de.dennisguse.opentracks.util.BluetoothUtils; public class SensorsSettingsFragment extends PreferenceFragmentCompat { 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 3c52d8355..b4024c00d 100644 --- a/src/main/java/de/dennisguse/opentracks/settings/bluetooth/BluetoothLeSensorPreference.java +++ b/src/main/java/de/dennisguse/opentracks/settings/bluetooth/BluetoothLeSensorPreference.java @@ -33,8 +33,8 @@ 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.settings.PreferencesUtils; -import de.dennisguse.opentracks.util.BluetoothUtils; /** * Preference to select a discoverable Bluetooth LE device.