Package structure: moved UI utils

Part of #963.
2022-01-15 22:32:32 +01:00
parent 7caf33fb66
commit 7484ab03ce
23 changed files with 23 additions and 24 deletions
@@ -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 {

@@ -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;

 /**
@@ -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 {

@@ -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;

@@ -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.
@@ -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.
@@ -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;

 /**
@@ -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 {

@@ -1,4 +1,4 @@
-package de.dennisguse.opentracks.util;
+package de.dennisguse.opentracks.settings;

 import androidx.annotation.NonNull;
 import androidx.preference.Preference;
@@ -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 {

@@ -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.
@@ -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.
@@ -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;

 /**
@@ -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;

 /**
@@ -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 {

@@ -1,4 +1,4 @@
-package de.dennisguse.opentracks.util;
+package de.dennisguse.opentracks.ui.util;

 import static android.content.Context.VIBRATOR_SERVICE;

@@ -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;
@@ -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.
@@ -1,4 +1,4 @@
-package de.dennisguse.opentracks.util;
+package de.dennisguse.opentracks.ui.util;

 import android.content.Context;
 import android.graphics.Canvas;
@@ -1,4 +1,4 @@
-package de.dennisguse.opentracks.util;
+package de.dennisguse.opentracks.ui.util;

 import android.content.Context;

@@ -1,4 +1,4 @@
-package de.dennisguse.opentracks.util;
+package de.dennisguse.opentracks.ui.util;

 import android.content.Context;
 import android.content.res.Resources;
@@ -1,4 +1,4 @@
-package de.dennisguse.opentracks.util;
+package de.dennisguse.opentracks.ui.util;

 import android.text.method.LinkMovementMethod;
 import android.view.View;
@@ -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;
        }