diff --git a/src/main/java/de/dennisguse/opentracks/AboutActivity.java b/src/main/java/de/dennisguse/opentracks/AboutActivity.java index 5264bba4e..ec8439763 100644 --- a/src/main/java/de/dennisguse/opentracks/AboutActivity.java +++ b/src/main/java/de/dennisguse/opentracks/AboutActivity.java @@ -6,8 +6,8 @@ import android.view.View; import androidx.annotation.Nullable; import de.dennisguse.opentracks.databinding.AboutBinding; +import de.dennisguse.opentracks.ui.util.ViewUtils; import de.dennisguse.opentracks.util.SystemUtils; -import de.dennisguse.opentracks.util.ViewUtils; public class AboutActivity extends AbstractActivity { diff --git a/src/main/java/de/dennisguse/opentracks/ControllerFragment.java b/src/main/java/de/dennisguse/opentracks/ControllerFragment.java index 7a819618d..f1e58c093 100644 --- a/src/main/java/de/dennisguse/opentracks/ControllerFragment.java +++ b/src/main/java/de/dennisguse/opentracks/ControllerFragment.java @@ -35,7 +35,7 @@ import androidx.fragment.app.Fragment; import de.dennisguse.opentracks.databinding.ControllerFragmentBinding; import de.dennisguse.opentracks.services.TrackRecordingService; import de.dennisguse.opentracks.services.TrackRecordingServiceConnection; -import de.dennisguse.opentracks.util.ActivityUtils; +import de.dennisguse.opentracks.ui.util.ActivityUtils; import de.dennisguse.opentracks.util.StringUtils; /** diff --git a/src/main/java/de/dennisguse/opentracks/HelpActivity.java b/src/main/java/de/dennisguse/opentracks/HelpActivity.java index c5c2402d6..5710f7b21 100644 --- a/src/main/java/de/dennisguse/opentracks/HelpActivity.java +++ b/src/main/java/de/dennisguse/opentracks/HelpActivity.java @@ -6,7 +6,7 @@ import android.view.View; import androidx.annotation.Nullable; import de.dennisguse.opentracks.databinding.HelpBinding; -import de.dennisguse.opentracks.util.ViewUtils; +import de.dennisguse.opentracks.ui.util.ViewUtils; public class HelpActivity extends AbstractActivity { diff --git a/src/main/java/de/dennisguse/opentracks/TrackListActivity.java b/src/main/java/de/dennisguse/opentracks/TrackListActivity.java index 21d1d721c..d6376792d 100644 --- a/src/main/java/de/dennisguse/opentracks/TrackListActivity.java +++ b/src/main/java/de/dennisguse/opentracks/TrackListActivity.java @@ -67,10 +67,10 @@ import de.dennisguse.opentracks.share.ShareUtils; import de.dennisguse.opentracks.ui.aggregatedStatistics.AggregatedStatisticsActivity; import de.dennisguse.opentracks.ui.aggregatedStatistics.ConfirmDeleteDialogFragment; import de.dennisguse.opentracks.ui.markers.MarkerListActivity; -import de.dennisguse.opentracks.util.ActivityUtils; +import de.dennisguse.opentracks.ui.util.ActivityUtils; +import de.dennisguse.opentracks.ui.util.ListItemUtils; import de.dennisguse.opentracks.util.IntentDashboardUtils; import de.dennisguse.opentracks.util.IntentUtils; -import de.dennisguse.opentracks.util.ListItemUtils; import de.dennisguse.opentracks.util.StringUtils; import de.dennisguse.opentracks.util.TrackIconUtils; diff --git a/src/main/java/de/dennisguse/opentracks/chart/ChartView.java b/src/main/java/de/dennisguse/opentracks/chart/ChartView.java index 52be3803d..48ca46274 100644 --- a/src/main/java/de/dennisguse/opentracks/chart/ChartView.java +++ b/src/main/java/de/dennisguse/opentracks/chart/ChartView.java @@ -49,9 +49,9 @@ import de.dennisguse.opentracks.data.models.Marker; import de.dennisguse.opentracks.stats.ExtremityMonitor; import de.dennisguse.opentracks.ui.markers.MarkerDetailActivity; import de.dennisguse.opentracks.ui.markers.MarkerUtils; +import de.dennisguse.opentracks.ui.util.ThemeUtils; import de.dennisguse.opentracks.util.IntentUtils; import de.dennisguse.opentracks.util.StringUtils; -import de.dennisguse.opentracks.util.ThemeUtils; /** * Visualization of the chart. diff --git a/src/main/java/de/dennisguse/opentracks/fragments/ChooseActivityTypeImageAdapter.java b/src/main/java/de/dennisguse/opentracks/fragments/ChooseActivityTypeImageAdapter.java index c56dbcd46..2203d7f54 100644 --- a/src/main/java/de/dennisguse/opentracks/fragments/ChooseActivityTypeImageAdapter.java +++ b/src/main/java/de/dennisguse/opentracks/fragments/ChooseActivityTypeImageAdapter.java @@ -27,7 +27,7 @@ import androidx.core.content.ContextCompat; import java.util.List; import de.dennisguse.opentracks.R; -import de.dennisguse.opentracks.util.ResourceUtils; +import de.dennisguse.opentracks.ui.util.ResourceUtils; /** * Image adapter for choosing an activity type. diff --git a/src/main/java/de/dennisguse/opentracks/settings/ActivityTypePreference.java b/src/main/java/de/dennisguse/opentracks/settings/ActivityTypePreference.java index e0ab8da76..50ff9b772 100644 --- a/src/main/java/de/dennisguse/opentracks/settings/ActivityTypePreference.java +++ b/src/main/java/de/dennisguse/opentracks/settings/ActivityTypePreference.java @@ -29,7 +29,6 @@ import androidx.preference.PreferenceDialogFragmentCompat; import de.dennisguse.opentracks.R; import de.dennisguse.opentracks.fragments.ChooseActivityTypeDialogFragment; -import de.dennisguse.opentracks.util.HackUtils; import de.dennisguse.opentracks.util.TrackIconUtils; /** diff --git a/src/main/java/de/dennisguse/opentracks/settings/DefaultsSettingsFragment.java b/src/main/java/de/dennisguse/opentracks/settings/DefaultsSettingsFragment.java index ab2e405bb..bdbfd7a56 100644 --- a/src/main/java/de/dennisguse/opentracks/settings/DefaultsSettingsFragment.java +++ b/src/main/java/de/dennisguse/opentracks/settings/DefaultsSettingsFragment.java @@ -10,7 +10,6 @@ import androidx.preference.PreferenceFragmentCompat; import de.dennisguse.opentracks.R; import de.dennisguse.opentracks.fragments.ChooseActivityTypeDialogFragment; -import de.dennisguse.opentracks.util.HackUtils; public class DefaultsSettingsFragment extends PreferenceFragmentCompat implements ChooseActivityTypeDialogFragment.ChooseActivityTypeCaller { diff --git a/src/main/java/de/dennisguse/opentracks/util/HackUtils.java b/src/main/java/de/dennisguse/opentracks/settings/HackUtils.java similarity index 94% rename from src/main/java/de/dennisguse/opentracks/util/HackUtils.java rename to src/main/java/de/dennisguse/opentracks/settings/HackUtils.java index aafa12de5..1d23c6d0c 100644 --- a/src/main/java/de/dennisguse/opentracks/util/HackUtils.java +++ b/src/main/java/de/dennisguse/opentracks/settings/HackUtils.java @@ -1,4 +1,4 @@ -package de.dennisguse.opentracks.util; +package de.dennisguse.opentracks.settings; import androidx.annotation.NonNull; import androidx.preference.Preference; diff --git a/src/main/java/de/dennisguse/opentracks/settings/SettingsCustomLayoutListActivity.java b/src/main/java/de/dennisguse/opentracks/settings/SettingsCustomLayoutListActivity.java index 4cbf8eb8d..905cfe30a 100644 --- a/src/main/java/de/dennisguse/opentracks/settings/SettingsCustomLayoutListActivity.java +++ b/src/main/java/de/dennisguse/opentracks/settings/SettingsCustomLayoutListActivity.java @@ -25,7 +25,7 @@ import de.dennisguse.opentracks.R; import de.dennisguse.opentracks.databinding.ActivitySettingsCustomLayoutListBinding; import de.dennisguse.opentracks.ui.customRecordingLayout.Layout; import de.dennisguse.opentracks.ui.customRecordingLayout.SettingsCustomLayoutListAdapter; -import de.dennisguse.opentracks.util.RecyclerViewSwipeDeleteCallback; +import de.dennisguse.opentracks.ui.util.RecyclerViewSwipeDeleteCallback; public class SettingsCustomLayoutListActivity extends AbstractActivity implements SettingsCustomLayoutListAdapter.SettingsCustomLayoutProfileClickListener { diff --git a/src/main/java/de/dennisguse/opentracks/ui/aggregatedStatistics/ConfirmDeleteDialogFragment.java b/src/main/java/de/dennisguse/opentracks/ui/aggregatedStatistics/ConfirmDeleteDialogFragment.java index a02923af0..7034c0d8a 100644 --- a/src/main/java/de/dennisguse/opentracks/ui/aggregatedStatistics/ConfirmDeleteDialogFragment.java +++ b/src/main/java/de/dennisguse/opentracks/ui/aggregatedStatistics/ConfirmDeleteDialogFragment.java @@ -26,7 +26,7 @@ import androidx.fragment.app.FragmentManager; import de.dennisguse.opentracks.R; import de.dennisguse.opentracks.data.models.Track; -import de.dennisguse.opentracks.util.DialogUtils; +import de.dennisguse.opentracks.ui.util.DialogUtils; /** * A DialogFragment to confirm delete. diff --git a/src/main/java/de/dennisguse/opentracks/ui/markers/DeleteMarkerDialogFragment.java b/src/main/java/de/dennisguse/opentracks/ui/markers/DeleteMarkerDialogFragment.java index e069b19ec..6ef11d122 100644 --- a/src/main/java/de/dennisguse/opentracks/ui/markers/DeleteMarkerDialogFragment.java +++ b/src/main/java/de/dennisguse/opentracks/ui/markers/DeleteMarkerDialogFragment.java @@ -28,7 +28,7 @@ import androidx.fragment.app.FragmentManager; import de.dennisguse.opentracks.R; import de.dennisguse.opentracks.data.ContentProviderUtils; import de.dennisguse.opentracks.data.models.Marker; -import de.dennisguse.opentracks.util.DialogUtils; +import de.dennisguse.opentracks.ui.util.DialogUtils; /** * A DialogFragment to delete marker. diff --git a/src/main/java/de/dennisguse/opentracks/ui/markers/MarkerDetailFragment.java b/src/main/java/de/dennisguse/opentracks/ui/markers/MarkerDetailFragment.java index 66d99cfed..9467aa9d5 100644 --- a/src/main/java/de/dennisguse/opentracks/ui/markers/MarkerDetailFragment.java +++ b/src/main/java/de/dennisguse/opentracks/ui/markers/MarkerDetailFragment.java @@ -41,8 +41,8 @@ import de.dennisguse.opentracks.data.ContentProviderUtils; import de.dennisguse.opentracks.data.models.Marker; import de.dennisguse.opentracks.databinding.MarkerDetailFragmentBinding; import de.dennisguse.opentracks.share.ShareUtils; +import de.dennisguse.opentracks.ui.util.ListItemUtils; import de.dennisguse.opentracks.util.IntentUtils; -import de.dennisguse.opentracks.util.ListItemUtils; import de.dennisguse.opentracks.util.StringUtils; /** diff --git a/src/main/java/de/dennisguse/opentracks/ui/markers/MarkerListActivity.java b/src/main/java/de/dennisguse/opentracks/ui/markers/MarkerListActivity.java index 9bc131321..671c0d95e 100644 --- a/src/main/java/de/dennisguse/opentracks/ui/markers/MarkerListActivity.java +++ b/src/main/java/de/dennisguse/opentracks/ui/markers/MarkerListActivity.java @@ -42,8 +42,8 @@ import de.dennisguse.opentracks.services.TrackRecordingService; import de.dennisguse.opentracks.services.TrackRecordingServiceConnection; import de.dennisguse.opentracks.share.ShareUtils; import de.dennisguse.opentracks.ui.markers.DeleteMarkerDialogFragment.DeleteMarkerCaller; +import de.dennisguse.opentracks.ui.util.ActivityUtils; import de.dennisguse.opentracks.ui.util.ScrollVisibleViews; -import de.dennisguse.opentracks.util.ActivityUtils; import de.dennisguse.opentracks.util.IntentUtils; /** diff --git a/src/main/java/de/dennisguse/opentracks/ui/markers/MarkerResourceCursorAdapter.java b/src/main/java/de/dennisguse/opentracks/ui/markers/MarkerResourceCursorAdapter.java index dfb63631d..05cfe57db 100644 --- a/src/main/java/de/dennisguse/opentracks/ui/markers/MarkerResourceCursorAdapter.java +++ b/src/main/java/de/dennisguse/opentracks/ui/markers/MarkerResourceCursorAdapter.java @@ -27,8 +27,8 @@ import de.dennisguse.opentracks.data.ContentProviderUtils; import de.dennisguse.opentracks.data.models.Track; import de.dennisguse.opentracks.data.tables.MarkerColumns; import de.dennisguse.opentracks.ui.util.ExecutorListViewService; +import de.dennisguse.opentracks.ui.util.ListItemUtils; import de.dennisguse.opentracks.ui.util.ScrollVisibleViews; -import de.dennisguse.opentracks.util.ListItemUtils; public class MarkerResourceCursorAdapter extends ResourceCursorAdapter implements ScrollVisibleViews.VisibleViewsListener { diff --git a/src/main/java/de/dennisguse/opentracks/util/ActivityUtils.java b/src/main/java/de/dennisguse/opentracks/ui/util/ActivityUtils.java similarity index 99% rename from src/main/java/de/dennisguse/opentracks/util/ActivityUtils.java rename to src/main/java/de/dennisguse/opentracks/ui/util/ActivityUtils.java index 1a0349201..8a33b49ee 100644 --- a/src/main/java/de/dennisguse/opentracks/util/ActivityUtils.java +++ b/src/main/java/de/dennisguse/opentracks/ui/util/ActivityUtils.java @@ -1,4 +1,4 @@ -package de.dennisguse.opentracks.util; +package de.dennisguse.opentracks.ui.util; import static android.content.Context.VIBRATOR_SERVICE; diff --git a/src/main/java/de/dennisguse/opentracks/util/DialogUtils.java b/src/main/java/de/dennisguse/opentracks/ui/util/DialogUtils.java similarity index 97% rename from src/main/java/de/dennisguse/opentracks/util/DialogUtils.java rename to src/main/java/de/dennisguse/opentracks/ui/util/DialogUtils.java index 7098296b0..00aba615f 100644 --- a/src/main/java/de/dennisguse/opentracks/util/DialogUtils.java +++ b/src/main/java/de/dennisguse/opentracks/ui/util/DialogUtils.java @@ -14,7 +14,7 @@ * the License. */ -package de.dennisguse.opentracks.util; +package de.dennisguse.opentracks.ui.util; import android.app.Dialog; import android.content.Context; diff --git a/src/main/java/de/dennisguse/opentracks/util/ListItemUtils.java b/src/main/java/de/dennisguse/opentracks/ui/util/ListItemUtils.java similarity index 98% rename from src/main/java/de/dennisguse/opentracks/util/ListItemUtils.java rename to src/main/java/de/dennisguse/opentracks/ui/util/ListItemUtils.java index 0b15d0b55..489792045 100644 --- a/src/main/java/de/dennisguse/opentracks/util/ListItemUtils.java +++ b/src/main/java/de/dennisguse/opentracks/ui/util/ListItemUtils.java @@ -14,7 +14,7 @@ * the License. */ -package de.dennisguse.opentracks.util; +package de.dennisguse.opentracks.ui.util; import android.content.Context; import android.view.Gravity; @@ -28,6 +28,7 @@ import java.time.OffsetDateTime; import java.time.format.DateTimeFormatter; import de.dennisguse.opentracks.R; +import de.dennisguse.opentracks.util.StringUtils; /** * Utilities to display a list item. diff --git a/src/main/java/de/dennisguse/opentracks/util/RecyclerViewSwipeDeleteCallback.java b/src/main/java/de/dennisguse/opentracks/ui/util/RecyclerViewSwipeDeleteCallback.java similarity index 98% rename from src/main/java/de/dennisguse/opentracks/util/RecyclerViewSwipeDeleteCallback.java rename to src/main/java/de/dennisguse/opentracks/ui/util/RecyclerViewSwipeDeleteCallback.java index 62064aef2..2b4ad348b 100644 --- a/src/main/java/de/dennisguse/opentracks/util/RecyclerViewSwipeDeleteCallback.java +++ b/src/main/java/de/dennisguse/opentracks/ui/util/RecyclerViewSwipeDeleteCallback.java @@ -1,4 +1,4 @@ -package de.dennisguse.opentracks.util; +package de.dennisguse.opentracks.ui.util; import android.content.Context; import android.graphics.Canvas; diff --git a/src/main/java/de/dennisguse/opentracks/util/ResourceUtils.java b/src/main/java/de/dennisguse/opentracks/ui/util/ResourceUtils.java similarity index 89% rename from src/main/java/de/dennisguse/opentracks/util/ResourceUtils.java rename to src/main/java/de/dennisguse/opentracks/ui/util/ResourceUtils.java index a2ecdbb73..14da64fdf 100644 --- a/src/main/java/de/dennisguse/opentracks/util/ResourceUtils.java +++ b/src/main/java/de/dennisguse/opentracks/ui/util/ResourceUtils.java @@ -1,4 +1,4 @@ -package de.dennisguse.opentracks.util; +package de.dennisguse.opentracks.ui.util; import android.content.Context; diff --git a/src/main/java/de/dennisguse/opentracks/util/ThemeUtils.java b/src/main/java/de/dennisguse/opentracks/ui/util/ThemeUtils.java similarity index 97% rename from src/main/java/de/dennisguse/opentracks/util/ThemeUtils.java rename to src/main/java/de/dennisguse/opentracks/ui/util/ThemeUtils.java index 7bb9524c7..c45efb606 100644 --- a/src/main/java/de/dennisguse/opentracks/util/ThemeUtils.java +++ b/src/main/java/de/dennisguse/opentracks/ui/util/ThemeUtils.java @@ -1,4 +1,4 @@ -package de.dennisguse.opentracks.util; +package de.dennisguse.opentracks.ui.util; import android.content.Context; import android.content.res.Resources; diff --git a/src/main/java/de/dennisguse/opentracks/util/ViewUtils.java b/src/main/java/de/dennisguse/opentracks/ui/util/ViewUtils.java similarity index 95% rename from src/main/java/de/dennisguse/opentracks/util/ViewUtils.java rename to src/main/java/de/dennisguse/opentracks/ui/util/ViewUtils.java index 76ff8f343..70580716f 100644 --- a/src/main/java/de/dennisguse/opentracks/util/ViewUtils.java +++ b/src/main/java/de/dennisguse/opentracks/ui/util/ViewUtils.java @@ -1,4 +1,4 @@ -package de.dennisguse.opentracks.util; +package de.dennisguse.opentracks.ui.util; import android.text.method.LinkMovementMethod; import android.view.View; diff --git a/src/main/java/de/dennisguse/opentracks/util/StringUtils.java b/src/main/java/de/dennisguse/opentracks/util/StringUtils.java index 6e49de27d..25592ec01 100644 --- a/src/main/java/de/dennisguse/opentracks/util/StringUtils.java +++ b/src/main/java/de/dennisguse/opentracks/util/StringUtils.java @@ -290,7 +290,7 @@ public class StringUtils { * @param category the category * @param description the description */ - static String getCategoryDescription(String category, String description) { + public static String getCategoryDescription(String category, String description) { if (category == null || category.length() == 0) { return description; }