Refactoring package structure.

Part of #963.

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 {

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;

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

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

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 {

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

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.

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) {

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 {
 

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.

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.

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

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.

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.

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;

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;
 

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 {
 

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

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 {
 

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.