From a9f1381daebfc23b01d6a5959789eb8260034825 Mon Sep 17 00:00:00 2001 From: Dennis Guse Date: Wed, 12 Jan 2022 22:33:00 +0100 Subject: [PATCH] Refactoring package structure. Part of #963. --- .../VoiceAnnouncementManagerTest.java | 6 ++--- .../VoiceAnnouncementUtilsTest.java} | 25 +++++++++---------- .../PreferencesUtilsTest.java | 19 +++++++------- .../opentracks/AbstractActivity.java | 3 ++- .../opentracks/TrackRecordedActivity.java | 4 +-- .../opentracks/TrackRecordingActivity.java | 2 +- .../{fragments => chart}/ChartFragment.java | 3 +-- .../services/TrackRecordingService.java | 2 +- .../VoiceAnnouncement.java | 6 ++--- .../VoiceAnnouncementManager.java | 2 +- .../VoiceAnnouncementUtils.java} | 6 ++--- .../{ => bluetooth}/BluetoothLeAdapter.java | 2 +- .../BluetoothLeSensorPreference.java | 1 - 13 files changed, 39 insertions(+), 42 deletions(-) rename src/androidTest/java/de/dennisguse/opentracks/services/{tasks => announcement}/VoiceAnnouncementManagerTest.java (98%) rename src/androidTest/java/de/dennisguse/opentracks/services/{tasks/AnnouncementUtilsTest.java => announcement/VoiceAnnouncementUtilsTest.java} (91%) rename src/androidTest/java/de/dennisguse/opentracks/{util => settings}/PreferencesUtilsTest.java (99%) rename src/main/java/de/dennisguse/opentracks/{fragments => chart}/ChartFragment.java (99%) rename src/main/java/de/dennisguse/opentracks/services/{tasks => announcement}/VoiceAnnouncement.java (97%) rename src/main/java/de/dennisguse/opentracks/services/{tasks => announcement}/VoiceAnnouncementManager.java (98%) rename src/main/java/de/dennisguse/opentracks/services/{tasks/AnnouncementUtils.java => announcement/VoiceAnnouncementUtils.java} (96%) rename src/main/java/de/dennisguse/opentracks/settings/{ => bluetooth}/BluetoothLeAdapter.java (98%) diff --git a/src/androidTest/java/de/dennisguse/opentracks/services/tasks/VoiceAnnouncementManagerTest.java b/src/androidTest/java/de/dennisguse/opentracks/services/announcement/VoiceAnnouncementManagerTest.java similarity index 98% rename from src/androidTest/java/de/dennisguse/opentracks/services/tasks/VoiceAnnouncementManagerTest.java rename to src/androidTest/java/de/dennisguse/opentracks/services/announcement/VoiceAnnouncementManagerTest.java index 06d1898f4..31a42d57b 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/services/tasks/VoiceAnnouncementManagerTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/services/announcement/VoiceAnnouncementManagerTest.java @@ -1,4 +1,6 @@ -package de.dennisguse.opentracks.services.tasks; +package de.dennisguse.opentracks.services.announcement; + +import static org.junit.Assert.assertEquals; import android.content.Context; import android.content.Intent; @@ -23,8 +25,6 @@ import de.dennisguse.opentracks.content.data.Distance; import de.dennisguse.opentracks.services.TrackRecordingService; import de.dennisguse.opentracks.stats.TrackStatistics; -import static org.junit.Assert.assertEquals; - @RunWith(AndroidJUnit4.class) public class VoiceAnnouncementManagerTest { diff --git a/src/androidTest/java/de/dennisguse/opentracks/services/tasks/AnnouncementUtilsTest.java b/src/androidTest/java/de/dennisguse/opentracks/services/announcement/VoiceAnnouncementUtilsTest.java similarity index 91% rename from src/androidTest/java/de/dennisguse/opentracks/services/tasks/AnnouncementUtilsTest.java rename to src/androidTest/java/de/dennisguse/opentracks/services/announcement/VoiceAnnouncementUtilsTest.java index b490cc83d..e20840090 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/services/tasks/AnnouncementUtilsTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/services/announcement/VoiceAnnouncementUtilsTest.java @@ -1,4 +1,6 @@ -package de.dennisguse.opentracks.services.tasks; +package de.dennisguse.opentracks.services.announcement; + +import static org.junit.Assert.assertEquals; import android.content.Context; import android.util.Pair; @@ -19,15 +21,12 @@ import de.dennisguse.opentracks.content.data.TestDataUtil; import de.dennisguse.opentracks.content.data.Track; import de.dennisguse.opentracks.content.provider.ContentProviderUtils; import de.dennisguse.opentracks.content.provider.TrackPointIterator; -import de.dennisguse.opentracks.services.tasks.AnnouncementUtils; import de.dennisguse.opentracks.stats.TrackStatistics; import de.dennisguse.opentracks.util.StringUtils; import de.dennisguse.opentracks.viewmodels.IntervalStatistics; -import static org.junit.Assert.assertEquals; - @RunWith(AndroidJUnit4.class) -public class AnnouncementUtilsTest { +public class VoiceAnnouncementUtilsTest { private final Context context = ApplicationProvider.getApplicationContext(); private ContentProviderUtils contentProviderUtils; @@ -47,7 +46,7 @@ public class AnnouncementUtilsTest { stats.setTotalAltitudeGain(6000f); // when - String announcement = AnnouncementUtils.getAnnouncement(context, stats, true, true, null); + String announcement = VoiceAnnouncementUtils.getAnnouncement(context, stats, true, true, null); // then assertEquals("total distance 20.00 kilometers in 1 hour 5 minutes 10 seconds at 18.4 kilometers per hour", announcement); @@ -68,7 +67,7 @@ public class AnnouncementUtilsTest { } // when - String announcement = AnnouncementUtils.getAnnouncement(context, stats, true, true, lastInterval); + String announcement = VoiceAnnouncementUtils.getAnnouncement(context, stats, true, true, lastInterval); // then Assert.assertEquals( @@ -92,7 +91,7 @@ public class AnnouncementUtilsTest { stats.setTotalAltitudeGain(6000f); // when - String announcement = AnnouncementUtils.getAnnouncement(context, stats, true, false, null); + String announcement = VoiceAnnouncementUtils.getAnnouncement(context, stats, true, false, null); // then assertEquals("total distance 20.00 kilometers in 1 hour 5 minutes 10 seconds at 3 minutes 15 seconds per kilometer", announcement); @@ -113,7 +112,7 @@ public class AnnouncementUtilsTest { } // when - String announcement = AnnouncementUtils.getAnnouncement(context, stats, true, false, lastInterval); + String announcement = VoiceAnnouncementUtils.getAnnouncement(context, stats, true, false, lastInterval); // then assertEquals( @@ -137,7 +136,7 @@ public class AnnouncementUtilsTest { stats.setTotalAltitudeGain(6000f); // when - String announcement = AnnouncementUtils.getAnnouncement(context, stats, false, true, null); + String announcement = VoiceAnnouncementUtils.getAnnouncement(context, stats, false, true, null); // then assertEquals("total distance 12.43 miles in 1 hour 5 minutes 10 seconds at 11.4 miles per hour", announcement); @@ -158,7 +157,7 @@ public class AnnouncementUtilsTest { } // when - String announcement = AnnouncementUtils.getAnnouncement(context, stats, false, true, lastInterval); + String announcement = VoiceAnnouncementUtils.getAnnouncement(context, stats, false, true, lastInterval); // then assertEquals( @@ -182,7 +181,7 @@ public class AnnouncementUtilsTest { stats.setTotalAltitudeGain(6000f); // when - String announcement = AnnouncementUtils.getAnnouncement(context, stats, false, false, null); + String announcement = VoiceAnnouncementUtils.getAnnouncement(context, stats, false, false, null); // then assertEquals("total distance 12.43 miles in 1 hour 5 minutes 10 seconds at 5 minutes 15 seconds per mile", announcement); @@ -203,7 +202,7 @@ public class AnnouncementUtilsTest { } // when - String announcement = AnnouncementUtils.getAnnouncement(context, stats, false, false, lastInterval); + String announcement = VoiceAnnouncementUtils.getAnnouncement(context, stats, false, false, lastInterval); // then //assertEquals("total distance 12.43 miles in 1 hour 5 minutes 10 seconds at 5 minutes 15 seconds per mile Lap time of 1 minute 53 seconds per mile", announcement); diff --git a/src/androidTest/java/de/dennisguse/opentracks/util/PreferencesUtilsTest.java b/src/androidTest/java/de/dennisguse/opentracks/settings/PreferencesUtilsTest.java similarity index 99% rename from src/androidTest/java/de/dennisguse/opentracks/util/PreferencesUtilsTest.java rename to src/androidTest/java/de/dennisguse/opentracks/settings/PreferencesUtilsTest.java index cdfebe233..256deae3b 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/util/PreferencesUtilsTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/settings/PreferencesUtilsTest.java @@ -1,4 +1,9 @@ -package de.dennisguse.opentracks.util; +package de.dennisguse.opentracks.settings; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; import android.content.Context; import android.content.SharedPreferences; @@ -11,19 +16,13 @@ import androidx.test.ext.junit.runners.AndroidJUnit4; import org.junit.Test; import org.junit.runner.RunWith; +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.settings.PreferencesUtils; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; - -import java.util.ArrayList; -import java.util.List; @RunWith(AndroidJUnit4.class) public class PreferencesUtilsTest { diff --git a/src/main/java/de/dennisguse/opentracks/AbstractActivity.java b/src/main/java/de/dennisguse/opentracks/AbstractActivity.java index 1f264bd79..1ba048d19 100644 --- a/src/main/java/de/dennisguse/opentracks/AbstractActivity.java +++ b/src/main/java/de/dennisguse/opentracks/AbstractActivity.java @@ -22,7 +22,8 @@ import android.view.View; import androidx.annotation.Nullable; import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.widget.Toolbar; -import de.dennisguse.opentracks.services.tasks.VoiceAnnouncement; + +import de.dennisguse.opentracks.services.announcement.VoiceAnnouncement; /** * @author Jimmy Shih diff --git a/src/main/java/de/dennisguse/opentracks/TrackRecordedActivity.java b/src/main/java/de/dennisguse/opentracks/TrackRecordedActivity.java index 515410011..5ae970351 100644 --- a/src/main/java/de/dennisguse/opentracks/TrackRecordedActivity.java +++ b/src/main/java/de/dennisguse/opentracks/TrackRecordedActivity.java @@ -33,21 +33,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.content.data.Track; import de.dennisguse.opentracks.content.provider.ContentProviderUtils; import de.dennisguse.opentracks.databinding.TrackRecordedBinding; -import de.dennisguse.opentracks.fragments.ChartFragment; 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.util.IntentDashboardUtils; import de.dennisguse.opentracks.util.IntentUtils; -import de.dennisguse.opentracks.settings.PreferencesUtils; /** * An activity to show the track detail, record a new track or resumes an existing one. diff --git a/src/main/java/de/dennisguse/opentracks/TrackRecordingActivity.java b/src/main/java/de/dennisguse/opentracks/TrackRecordingActivity.java index 03f565cba..9191da0b3 100644 --- a/src/main/java/de/dennisguse/opentracks/TrackRecordingActivity.java +++ b/src/main/java/de/dennisguse/opentracks/TrackRecordingActivity.java @@ -21,11 +21,11 @@ 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.content.data.Track; import de.dennisguse.opentracks.content.provider.ContentProviderUtils; import de.dennisguse.opentracks.databinding.TrackRecordingBinding; -import de.dennisguse.opentracks.fragments.ChartFragment; import de.dennisguse.opentracks.fragments.ChooseActivityTypeDialogFragment; import de.dennisguse.opentracks.fragments.IntervalsFragment; import de.dennisguse.opentracks.fragments.StatisticsRecordingFragment; diff --git a/src/main/java/de/dennisguse/opentracks/fragments/ChartFragment.java b/src/main/java/de/dennisguse/opentracks/chart/ChartFragment.java similarity index 99% rename from src/main/java/de/dennisguse/opentracks/fragments/ChartFragment.java rename to src/main/java/de/dennisguse/opentracks/chart/ChartFragment.java index 95f68cd93..39036fc6f 100644 --- a/src/main/java/de/dennisguse/opentracks/fragments/ChartFragment.java +++ b/src/main/java/de/dennisguse/opentracks/chart/ChartFragment.java @@ -14,7 +14,7 @@ * the License. */ -package de.dennisguse.opentracks.fragments; +package de.dennisguse.opentracks.chart; import android.app.Activity; import android.content.SharedPreferences; @@ -32,7 +32,6 @@ import java.util.List; import de.dennisguse.opentracks.R; import de.dennisguse.opentracks.TrackActivityDataHubInterface; -import de.dennisguse.opentracks.chart.ChartPoint; import de.dennisguse.opentracks.content.TrackDataHub; import de.dennisguse.opentracks.content.TrackDataListener; import de.dennisguse.opentracks.content.data.Altitude; diff --git a/src/main/java/de/dennisguse/opentracks/services/TrackRecordingService.java b/src/main/java/de/dennisguse/opentracks/services/TrackRecordingService.java index 6bb136e79..ffa0e4534 100644 --- a/src/main/java/de/dennisguse/opentracks/services/TrackRecordingService.java +++ b/src/main/java/de/dennisguse/opentracks/services/TrackRecordingService.java @@ -47,10 +47,10 @@ import de.dennisguse.opentracks.content.data.TrackPoint; import de.dennisguse.opentracks.content.provider.CustomContentProvider; import de.dennisguse.opentracks.content.sensor.SensorDataSet; import de.dennisguse.opentracks.io.file.exporter.ExportServiceResultReceiver; +import de.dennisguse.opentracks.services.announcement.VoiceAnnouncementManager; import de.dennisguse.opentracks.services.handlers.EGM2008CorrectionManager; import de.dennisguse.opentracks.services.handlers.GpsStatusValue; import de.dennisguse.opentracks.services.handlers.TrackPointCreator; -import de.dennisguse.opentracks.services.tasks.VoiceAnnouncementManager; import de.dennisguse.opentracks.settings.PreferencesUtils; import de.dennisguse.opentracks.settings.SettingsActivity; import de.dennisguse.opentracks.stats.TrackStatistics; diff --git a/src/main/java/de/dennisguse/opentracks/services/tasks/VoiceAnnouncement.java b/src/main/java/de/dennisguse/opentracks/services/announcement/VoiceAnnouncement.java similarity index 97% rename from src/main/java/de/dennisguse/opentracks/services/tasks/VoiceAnnouncement.java rename to src/main/java/de/dennisguse/opentracks/services/announcement/VoiceAnnouncement.java index 2a655b194..f0b559020 100644 --- a/src/main/java/de/dennisguse/opentracks/services/tasks/VoiceAnnouncement.java +++ b/src/main/java/de/dennisguse/opentracks/services/announcement/VoiceAnnouncement.java @@ -14,7 +14,7 @@ * the License. */ -package de.dennisguse.opentracks.services.tasks; +package de.dennisguse.opentracks.services.announcement; import android.content.Context; import android.media.AudioManager; @@ -33,8 +33,8 @@ import de.dennisguse.opentracks.content.data.Distance; import de.dennisguse.opentracks.content.data.Track; import de.dennisguse.opentracks.content.provider.ContentProviderUtils; import de.dennisguse.opentracks.content.provider.TrackPointIterator; -import de.dennisguse.opentracks.stats.TrackStatistics; import de.dennisguse.opentracks.settings.PreferencesUtils; +import de.dennisguse.opentracks.stats.TrackStatistics; import de.dennisguse.opentracks.viewmodels.IntervalStatistics; /** @@ -165,7 +165,7 @@ public class VoiceAnnouncement { intervalStatistics.addTrackPoints(trackPointIterator); IntervalStatistics.Interval lastInterval = intervalStatistics.getLastInterval(); - String announcement = AnnouncementUtils.getAnnouncement(context, track.getTrackStatistics(), isMetricUnits, isReportSpeed, lastInterval); + String announcement = VoiceAnnouncementUtils.getAnnouncement(context, track.getTrackStatistics(), isMetricUnits, isReportSpeed, lastInterval); // We don't care about the utterance id. It is supplied here to force onUtteranceCompleted to be called. tts.speak(announcement, TextToSpeech.QUEUE_FLUSH, null, "not used"); diff --git a/src/main/java/de/dennisguse/opentracks/services/tasks/VoiceAnnouncementManager.java b/src/main/java/de/dennisguse/opentracks/services/announcement/VoiceAnnouncementManager.java similarity index 98% rename from src/main/java/de/dennisguse/opentracks/services/tasks/VoiceAnnouncementManager.java rename to src/main/java/de/dennisguse/opentracks/services/announcement/VoiceAnnouncementManager.java index f8cc63fa4..8e434108e 100644 --- a/src/main/java/de/dennisguse/opentracks/services/tasks/VoiceAnnouncementManager.java +++ b/src/main/java/de/dennisguse/opentracks/services/announcement/VoiceAnnouncementManager.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package de.dennisguse.opentracks.services.tasks; +package de.dennisguse.opentracks.services.announcement; import android.util.Log; diff --git a/src/main/java/de/dennisguse/opentracks/services/tasks/AnnouncementUtils.java b/src/main/java/de/dennisguse/opentracks/services/announcement/VoiceAnnouncementUtils.java similarity index 96% rename from src/main/java/de/dennisguse/opentracks/services/tasks/AnnouncementUtils.java rename to src/main/java/de/dennisguse/opentracks/services/announcement/VoiceAnnouncementUtils.java index 14204418d..e2049b183 100644 --- a/src/main/java/de/dennisguse/opentracks/services/tasks/AnnouncementUtils.java +++ b/src/main/java/de/dennisguse/opentracks/services/announcement/VoiceAnnouncementUtils.java @@ -1,4 +1,4 @@ -package de.dennisguse.opentracks.services.tasks; +package de.dennisguse.opentracks.services.announcement; import android.content.Context; @@ -12,9 +12,9 @@ import de.dennisguse.opentracks.content.data.Speed; import de.dennisguse.opentracks.stats.TrackStatistics; import de.dennisguse.opentracks.viewmodels.IntervalStatistics; -class AnnouncementUtils { +class VoiceAnnouncementUtils { - private AnnouncementUtils() { + private VoiceAnnouncementUtils() { } static String getAnnouncement(Context context, TrackStatistics trackStatistics, boolean isMetricUnits, boolean isReportSpeed, @Nullable IntervalStatistics.Interval currentInterval) { diff --git a/src/main/java/de/dennisguse/opentracks/settings/BluetoothLeAdapter.java b/src/main/java/de/dennisguse/opentracks/settings/bluetooth/BluetoothLeAdapter.java similarity index 98% rename from src/main/java/de/dennisguse/opentracks/settings/BluetoothLeAdapter.java rename to src/main/java/de/dennisguse/opentracks/settings/bluetooth/BluetoothLeAdapter.java index 670c81162..d9088f10d 100644 --- a/src/main/java/de/dennisguse/opentracks/settings/BluetoothLeAdapter.java +++ b/src/main/java/de/dennisguse/opentracks/settings/bluetooth/BluetoothLeAdapter.java @@ -1,4 +1,4 @@ -package de.dennisguse.opentracks.settings; +package de.dennisguse.opentracks.settings.bluetooth; import android.bluetooth.BluetoothDevice; import android.view.LayoutInflater; 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 4d571c3cb..3c52d8355 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,6 @@ import java.util.UUID; import java.util.stream.Collectors; import de.dennisguse.opentracks.R; -import de.dennisguse.opentracks.settings.BluetoothLeAdapter; import de.dennisguse.opentracks.settings.PreferencesUtils; import de.dennisguse.opentracks.util.BluetoothUtils;