Package structure: moved custom recording layout.

Part of #963.
2022-01-15 21:28:50 +01:00
parent d49386259a
commit cf993b73d7
23 changed files with 36 additions and 40 deletions
@@ -14,7 +14,7 @@ import java.util.ArrayList;
 import java.util.List;

 import de.dennisguse.opentracks.R;
-import de.dennisguse.opentracks.content.data.CustomLayoutFieldType;
+import de.dennisguse.opentracks.ui.customRecordingLayout.CustomLayoutFieldType;
 import de.dennisguse.opentracks.viewmodels.StatisticData;

 public class StatisticsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
@@ -19,13 +19,13 @@ import java.util.List;

 import de.dennisguse.opentracks.R;
 import de.dennisguse.opentracks.adapters.StatisticsAdapter;
-import de.dennisguse.opentracks.content.data.Layout;
 import de.dennisguse.opentracks.content.data.Track;
 import de.dennisguse.opentracks.content.data.TrackPoint;
 import de.dennisguse.opentracks.databinding.StatisticsRecordingBinding;
 import de.dennisguse.opentracks.services.TrackRecordingService;
 import de.dennisguse.opentracks.services.TrackRecordingServiceConnection;
 import de.dennisguse.opentracks.settings.PreferencesUtils;
+import de.dennisguse.opentracks.ui.customRecordingLayout.Layout;
 import de.dennisguse.opentracks.viewmodels.StatisticData;
 import de.dennisguse.opentracks.viewmodels.StatisticsDataModel;

@@ -5,7 +5,7 @@ import java.util.Collections;
 import java.util.stream.Collectors;

 import de.dennisguse.opentracks.R;
-import de.dennisguse.opentracks.util.CsvLayoutUtils;
+import de.dennisguse.opentracks.ui.customRecordingLayout.CsvLayoutUtils;

 class PreferencesOpenHelper {

@@ -40,11 +40,11 @@ import java.util.stream.Stream;

 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.ui.customRecordingLayout.CsvLayoutUtils;
+import de.dennisguse.opentracks.ui.customRecordingLayout.Layout;
 import de.dennisguse.opentracks.util.TrackIconUtils;

 /**
@@ -18,10 +18,10 @@ import java.util.stream.IntStream;

 import de.dennisguse.opentracks.AbstractActivity;
 import de.dennisguse.opentracks.R;
-import de.dennisguse.opentracks.adapters.SettingsCustomLayoutEditAdapter;
-import de.dennisguse.opentracks.content.data.Layout;
-import de.dennisguse.opentracks.content.data.DataField;
 import de.dennisguse.opentracks.databinding.ActivitySettingsCustomLayoutBinding;
+import de.dennisguse.opentracks.ui.customRecordingLayout.DataField;
+import de.dennisguse.opentracks.ui.customRecordingLayout.Layout;
+import de.dennisguse.opentracks.ui.customRecordingLayout.SettingsCustomLayoutEditAdapter;
 import de.dennisguse.opentracks.util.StatisticsUtils;

 public class SettingsCustomLayoutEditActivity extends AbstractActivity implements SettingsCustomLayoutEditAdapter.SettingsCustomLayoutItemClickListener {
@@ -22,9 +22,9 @@ import com.google.android.material.textfield.TextInputLayout;

 import de.dennisguse.opentracks.AbstractActivity;
 import de.dennisguse.opentracks.R;
-import de.dennisguse.opentracks.adapters.SettingsCustomLayoutListAdapter;
-import de.dennisguse.opentracks.content.data.Layout;
 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;

 public class SettingsCustomLayoutListActivity extends AbstractActivity implements SettingsCustomLayoutListAdapter.SettingsCustomLayoutProfileClickListener {
@@ -1,4 +1,4 @@
-package de.dennisguse.opentracks.util;
+package de.dennisguse.opentracks.ui.customRecordingLayout;

 import androidx.annotation.Nullable;

@@ -1,4 +1,4 @@
-package de.dennisguse.opentracks.content.data;
+package de.dennisguse.opentracks.ui.customRecordingLayout;

 public enum CustomLayoutFieldType {
    GENERIC(1),
@@ -1,4 +1,4 @@
-package de.dennisguse.opentracks.content.data;
+package de.dennisguse.opentracks.ui.customRecordingLayout;

 import android.content.Context;
 import android.content.res.Resources;
@@ -6,7 +6,6 @@ import android.os.Parcel;
 import android.os.Parcelable;

 import de.dennisguse.opentracks.R;
-import de.dennisguse.opentracks.util.CsvLayoutUtils;

 public class DataField implements Parcelable {
    public static final String YES_VALUE = "1";
@@ -1,4 +1,4 @@
-package de.dennisguse.opentracks.content.data;
+package de.dennisguse.opentracks.ui.customRecordingLayout;

 import android.content.res.Resources;
 import android.os.Parcel;
@@ -13,7 +13,6 @@ import java.util.stream.Collectors;

 import de.dennisguse.opentracks.R;
 import de.dennisguse.opentracks.settings.PreferencesUtils;
-import de.dennisguse.opentracks.util.CsvLayoutUtils;

 public class Layout implements Parcelable {
    private static final String TAG = Layout.class.getSimpleName();
@@ -1,4 +1,4 @@
-package de.dennisguse.opentracks.adapters;
+package de.dennisguse.opentracks.ui.customRecordingLayout;

 import android.content.Context;
 import android.view.LayoutInflater;
@@ -14,8 +14,6 @@ import androidx.recyclerview.widget.RecyclerView;
 import java.util.Optional;

 import de.dennisguse.opentracks.R;
-import de.dennisguse.opentracks.content.data.DataField;
-import de.dennisguse.opentracks.content.data.Layout;
 import de.dennisguse.opentracks.util.StatisticsUtils;

 public class SettingsCustomLayoutEditAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
@@ -1,4 +1,4 @@
-package de.dennisguse.opentracks.adapters;
+package de.dennisguse.opentracks.ui.customRecordingLayout;

 import android.content.Context;
 import android.view.LayoutInflater;
@@ -13,7 +13,6 @@ import java.util.List;
 import java.util.Optional;

 import de.dennisguse.opentracks.R;
-import de.dennisguse.opentracks.content.data.Layout;
 import de.dennisguse.opentracks.settings.PreferencesUtils;

 public class SettingsCustomLayoutListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
@@ -7,8 +7,8 @@ import androidx.annotation.NonNull;
 import java.util.stream.Collectors;

 import de.dennisguse.opentracks.R;
-import de.dennisguse.opentracks.content.data.Layout;
 import de.dennisguse.opentracks.settings.PreferencesUtils;
+import de.dennisguse.opentracks.ui.customRecordingLayout.Layout;

 public class StatisticsUtils {

@@ -4,7 +4,7 @@ import android.util.Pair;

 import androidx.annotation.NonNull;

-import de.dennisguse.opentracks.content.data.DataField;
+import de.dennisguse.opentracks.ui.customRecordingLayout.DataField;

 public class StatisticData {
    private final DataField dataField;
@@ -11,14 +11,14 @@ import java.util.Objects;
 import java.util.stream.Collectors;

 import de.dennisguse.opentracks.R;
-import de.dennisguse.opentracks.content.data.DataField;
-import de.dennisguse.opentracks.content.data.Layout;
 import de.dennisguse.opentracks.content.data.Speed;
 import de.dennisguse.opentracks.content.data.TrackPoint;
 import de.dennisguse.opentracks.content.sensor.SensorDataSet;
 import de.dennisguse.opentracks.services.TrackRecordingService;
 import de.dennisguse.opentracks.stats.SensorStatistics;
 import de.dennisguse.opentracks.stats.TrackStatistics;
+import de.dennisguse.opentracks.ui.customRecordingLayout.DataField;
+import de.dennisguse.opentracks.ui.customRecordingLayout.Layout;
 import de.dennisguse.opentracks.util.StringUtils;

 public class StatisticDataBuilder {
@@ -8,8 +8,8 @@ import androidx.lifecycle.MutableLiveData;

 import java.util.List;

-import de.dennisguse.opentracks.content.data.Layout;
 import de.dennisguse.opentracks.services.TrackRecordingService;
+import de.dennisguse.opentracks.ui.customRecordingLayout.Layout;

 public class StatisticsDataModel extends AndroidViewModel {