From 5053c41bec901882c9895efcca002a671f9b3cb1 Mon Sep 17 00:00:00 2001 From: Dennis Guse Date: Sat, 15 Jan 2022 20:09:27 +0100 Subject: [PATCH] Package structure: moved intervals. Part of #963. --- .../services/announcement/VoiceAnnouncementUtilsTest.java | 2 +- .../{viewmodels => ui/intervals}/IntervalStatisticsTest.java | 2 +- .../java/de/dennisguse/opentracks/TrackRecordedActivity.java | 2 +- .../de/dennisguse/opentracks/TrackRecordingActivity.java | 2 +- .../opentracks/services/announcement/VoiceAnnouncement.java | 2 +- .../services/announcement/VoiceAnnouncementUtils.java | 2 +- .../{viewmodels => ui/intervals}/IntervalStatistics.java | 2 +- .../intervals}/IntervalStatisticsAdapter.java | 3 +-- .../intervals}/IntervalStatisticsModel.java | 2 +- .../{fragments => ui/intervals}/IntervalsFragment.java | 5 +---- 10 files changed, 10 insertions(+), 14 deletions(-) rename src/androidTest/java/de/dennisguse/opentracks/{viewmodels => ui/intervals}/IntervalStatisticsTest.java (99%) rename src/main/java/de/dennisguse/opentracks/{viewmodels => ui/intervals}/IntervalStatistics.java (99%) rename src/main/java/de/dennisguse/opentracks/{adapters => ui/intervals}/IntervalStatisticsAdapter.java (97%) rename src/main/java/de/dennisguse/opentracks/{viewmodels => ui/intervals}/IntervalStatisticsModel.java (99%) rename src/main/java/de/dennisguse/opentracks/{fragments => ui/intervals}/IntervalsFragment.java (96%) diff --git a/src/androidTest/java/de/dennisguse/opentracks/services/announcement/VoiceAnnouncementUtilsTest.java b/src/androidTest/java/de/dennisguse/opentracks/services/announcement/VoiceAnnouncementUtilsTest.java index e20840090..815068911 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/services/announcement/VoiceAnnouncementUtilsTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/services/announcement/VoiceAnnouncementUtilsTest.java @@ -22,8 +22,8 @@ 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.ui.intervals.IntervalStatistics; import de.dennisguse.opentracks.util.StringUtils; -import de.dennisguse.opentracks.viewmodels.IntervalStatistics; @RunWith(AndroidJUnit4.class) public class VoiceAnnouncementUtilsTest { diff --git a/src/androidTest/java/de/dennisguse/opentracks/viewmodels/IntervalStatisticsTest.java b/src/androidTest/java/de/dennisguse/opentracks/ui/intervals/IntervalStatisticsTest.java similarity index 99% rename from src/androidTest/java/de/dennisguse/opentracks/viewmodels/IntervalStatisticsTest.java rename to src/androidTest/java/de/dennisguse/opentracks/ui/intervals/IntervalStatisticsTest.java index 2a40fc99f..7aa61ea41 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/viewmodels/IntervalStatisticsTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/ui/intervals/IntervalStatisticsTest.java @@ -1,4 +1,4 @@ -package de.dennisguse.opentracks.viewmodels; +package de.dennisguse.opentracks.ui.intervals; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/src/main/java/de/dennisguse/opentracks/TrackRecordedActivity.java b/src/main/java/de/dennisguse/opentracks/TrackRecordedActivity.java index c3c09acb5..049c90615 100644 --- a/src/main/java/de/dennisguse/opentracks/TrackRecordedActivity.java +++ b/src/main/java/de/dennisguse/opentracks/TrackRecordedActivity.java @@ -39,13 +39,13 @@ 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.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.ui.intervals.IntervalsFragment; import de.dennisguse.opentracks.util.IntentDashboardUtils; import de.dennisguse.opentracks.util.IntentUtils; diff --git a/src/main/java/de/dennisguse/opentracks/TrackRecordingActivity.java b/src/main/java/de/dennisguse/opentracks/TrackRecordingActivity.java index 7dfbdf3b7..ca98e483c 100644 --- a/src/main/java/de/dennisguse/opentracks/TrackRecordingActivity.java +++ b/src/main/java/de/dennisguse/opentracks/TrackRecordingActivity.java @@ -27,12 +27,12 @@ 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.ChooseActivityTypeDialogFragment; -import de.dennisguse.opentracks.fragments.IntervalsFragment; import de.dennisguse.opentracks.fragments.StatisticsRecordingFragment; 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.ui.intervals.IntervalsFragment; import de.dennisguse.opentracks.util.IntentDashboardUtils; import de.dennisguse.opentracks.util.IntentUtils; import de.dennisguse.opentracks.util.TrackIconUtils; diff --git a/src/main/java/de/dennisguse/opentracks/services/announcement/VoiceAnnouncement.java b/src/main/java/de/dennisguse/opentracks/services/announcement/VoiceAnnouncement.java index f0b559020..ce4632a67 100644 --- a/src/main/java/de/dennisguse/opentracks/services/announcement/VoiceAnnouncement.java +++ b/src/main/java/de/dennisguse/opentracks/services/announcement/VoiceAnnouncement.java @@ -35,7 +35,7 @@ import de.dennisguse.opentracks.content.provider.ContentProviderUtils; import de.dennisguse.opentracks.content.provider.TrackPointIterator; import de.dennisguse.opentracks.settings.PreferencesUtils; import de.dennisguse.opentracks.stats.TrackStatistics; -import de.dennisguse.opentracks.viewmodels.IntervalStatistics; +import de.dennisguse.opentracks.ui.intervals.IntervalStatistics; /** * This class will announce the user's {@link TrackStatistics}. diff --git a/src/main/java/de/dennisguse/opentracks/services/announcement/VoiceAnnouncementUtils.java b/src/main/java/de/dennisguse/opentracks/services/announcement/VoiceAnnouncementUtils.java index e2049b183..90f23830e 100644 --- a/src/main/java/de/dennisguse/opentracks/services/announcement/VoiceAnnouncementUtils.java +++ b/src/main/java/de/dennisguse/opentracks/services/announcement/VoiceAnnouncementUtils.java @@ -10,7 +10,7 @@ import de.dennisguse.opentracks.R; import de.dennisguse.opentracks.content.data.Distance; import de.dennisguse.opentracks.content.data.Speed; import de.dennisguse.opentracks.stats.TrackStatistics; -import de.dennisguse.opentracks.viewmodels.IntervalStatistics; +import de.dennisguse.opentracks.ui.intervals.IntervalStatistics; class VoiceAnnouncementUtils { diff --git a/src/main/java/de/dennisguse/opentracks/viewmodels/IntervalStatistics.java b/src/main/java/de/dennisguse/opentracks/ui/intervals/IntervalStatistics.java similarity index 99% rename from src/main/java/de/dennisguse/opentracks/viewmodels/IntervalStatistics.java rename to src/main/java/de/dennisguse/opentracks/ui/intervals/IntervalStatistics.java index 7fc2cec91..37891aac2 100644 --- a/src/main/java/de/dennisguse/opentracks/viewmodels/IntervalStatistics.java +++ b/src/main/java/de/dennisguse/opentracks/ui/intervals/IntervalStatistics.java @@ -1,4 +1,4 @@ -package de.dennisguse.opentracks.viewmodels; +package de.dennisguse.opentracks.ui.intervals; import androidx.annotation.Nullable; diff --git a/src/main/java/de/dennisguse/opentracks/adapters/IntervalStatisticsAdapter.java b/src/main/java/de/dennisguse/opentracks/ui/intervals/IntervalStatisticsAdapter.java similarity index 97% rename from src/main/java/de/dennisguse/opentracks/adapters/IntervalStatisticsAdapter.java rename to src/main/java/de/dennisguse/opentracks/ui/intervals/IntervalStatisticsAdapter.java index df247ab38..1cd38031e 100644 --- a/src/main/java/de/dennisguse/opentracks/adapters/IntervalStatisticsAdapter.java +++ b/src/main/java/de/dennisguse/opentracks/ui/intervals/IntervalStatisticsAdapter.java @@ -1,4 +1,4 @@ -package de.dennisguse.opentracks.adapters; +package de.dennisguse.opentracks.ui.intervals; import android.content.Context; import android.view.LayoutInflater; @@ -14,7 +14,6 @@ import java.util.List; import de.dennisguse.opentracks.R; import de.dennisguse.opentracks.content.data.Distance; import de.dennisguse.opentracks.util.StringUtils; -import de.dennisguse.opentracks.viewmodels.IntervalStatistics; public class IntervalStatisticsAdapter extends RecyclerView.Adapter { diff --git a/src/main/java/de/dennisguse/opentracks/viewmodels/IntervalStatisticsModel.java b/src/main/java/de/dennisguse/opentracks/ui/intervals/IntervalStatisticsModel.java similarity index 99% rename from src/main/java/de/dennisguse/opentracks/viewmodels/IntervalStatisticsModel.java rename to src/main/java/de/dennisguse/opentracks/ui/intervals/IntervalStatisticsModel.java index 6b86b3f03..87c19c75d 100644 --- a/src/main/java/de/dennisguse/opentracks/viewmodels/IntervalStatisticsModel.java +++ b/src/main/java/de/dennisguse/opentracks/ui/intervals/IntervalStatisticsModel.java @@ -1,4 +1,4 @@ -package de.dennisguse.opentracks.viewmodels; +package de.dennisguse.opentracks.ui.intervals; import android.app.Application; import android.content.ContentResolver; diff --git a/src/main/java/de/dennisguse/opentracks/fragments/IntervalsFragment.java b/src/main/java/de/dennisguse/opentracks/ui/intervals/IntervalsFragment.java similarity index 96% rename from src/main/java/de/dennisguse/opentracks/fragments/IntervalsFragment.java rename to src/main/java/de/dennisguse/opentracks/ui/intervals/IntervalsFragment.java index d2831f3fa..58cf3b7f1 100644 --- a/src/main/java/de/dennisguse/opentracks/fragments/IntervalsFragment.java +++ b/src/main/java/de/dennisguse/opentracks/ui/intervals/IntervalsFragment.java @@ -1,4 +1,4 @@ -package de.dennisguse.opentracks.fragments; +package de.dennisguse.opentracks.ui.intervals; import android.content.SharedPreferences; import android.os.Bundle; @@ -19,13 +19,10 @@ import androidx.recyclerview.widget.LinearLayoutManager; import java.util.List; import de.dennisguse.opentracks.R; -import de.dennisguse.opentracks.adapters.IntervalStatisticsAdapter; import de.dennisguse.opentracks.content.data.Track; import de.dennisguse.opentracks.content.provider.ContentProviderUtils; import de.dennisguse.opentracks.databinding.IntervalListViewBinding; import de.dennisguse.opentracks.settings.PreferencesUtils; -import de.dennisguse.opentracks.viewmodels.IntervalStatistics; -import de.dennisguse.opentracks.viewmodels.IntervalStatisticsModel; /** * A fragment to display the intervals from recorded track.