From dbd64a8075454065eece8471cf1c049d2cdcba52 Mon Sep 17 00:00:00 2001 From: Dennis Guse Date: Thu, 15 Jun 2023 18:45:11 +0200 Subject: [PATCH] Cleanup: rename category to activityType. --- .../opentracks/data/TrackSelectionTest.java | 18 +++++------ .../io/file/importer/ExportImportTest.java | 8 ++--- .../file/importer/GPXTrackImporterTest.java | 6 ++-- .../file/importer/KMLTrackImporterTest.java | 6 ++-- .../share/DescriptionGeneratorTest.java | 4 +-- .../AggregatedStatisticsTest.java | 6 ++-- .../EspressoAggregatedFilterTest.java | 2 +- .../opentracks/TrackEditActivity.java | 2 +- .../opentracks/TrackListActivity.java | 10 +++--- .../opentracks/TrackRecordingActivity.java | 4 +-- .../opentracks/TrackStoppedActivity.java | 4 +-- .../opentracks/chart/ChartFragment.java | 2 +- .../opentracks/data/ContentProviderUtils.java | 6 ++-- .../opentracks/data/TrackSelection.java | 8 ++--- .../opentracks/data/models/Track.java | 10 +++--- .../opentracks/data/tables/TracksColumns.java | 4 +-- .../fragments/StatisticsRecordedFragment.java | 6 ++-- .../io/file/TrackFilenameGenerator.java | 6 ++-- .../io/file/exporter/GPXTrackExporter.java | 2 +- .../io/file/exporter/KMLTrackExporter.java | 32 +++++++------------ .../io/file/importer/GpxTrackImporter.java | 12 +++---- .../io/file/importer/KmlTrackImporter.java | 18 +++++------ .../io/file/importer/TrackImporter.java | 8 ++--- .../opentracks/services/RecordingData.java | 4 +-- .../services/TrackRecordingManager.java | 2 +- .../announcement/VoiceAnnouncement.java | 2 +- .../share/DescriptionGenerator.java | 2 +- .../AggregatedStatistics.java | 24 +++++++------- .../AggregatedStatisticsActivity.java | 4 +-- .../AggregatedStatisticsAdapter.java | 12 +++---- .../ui/intervals/IntervalsFragment.java | 2 +- .../opentracks/util/TrackUtils.java | 14 ++++---- 32 files changed, 120 insertions(+), 130 deletions(-) diff --git a/src/androidTest/java/de/dennisguse/opentracks/data/TrackSelectionTest.java b/src/androidTest/java/de/dennisguse/opentracks/data/TrackSelectionTest.java index b710b1a8c..8724e9c69 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/data/TrackSelectionTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/data/TrackSelectionTest.java @@ -67,7 +67,7 @@ public class TrackSelectionTest extends TestCase { @Test public void testFilterBuildSelection_onlyOneCategory() { // given - TrackSelection filter = new TrackSelection().addCategory("running"); + TrackSelection filter = new TrackSelection().addActivityType("running"); // when SelectionData selection = filter.buildSelection(); @@ -82,10 +82,10 @@ public class TrackSelectionTest extends TestCase { public void testFilterBuildSelection_severalCategories() { // given TrackSelection filter = new TrackSelection() - .addCategory("running") - .addCategory("road biking") - .addCategory("mountain biking") - .addCategory("trail walking"); + .addActivityType("running") + .addActivityType("road biking") + .addActivityType("mountain biking") + .addActivityType("trail walking"); // when SelectionData selection = filter.buildSelection(); @@ -136,8 +136,8 @@ public class TrackSelectionTest extends TestCase { .addTrackId(trackId1) .addTrackId(trackId2) .addTrackId(trackId3) - .addCategory("running") - .addCategory("road biking"); + .addActivityType("running") + .addActivityType("road biking"); // when SelectionData selection = filter.buildSelection(); @@ -188,8 +188,8 @@ public class TrackSelectionTest extends TestCase { long oneDay = 24 * 60 * 60 * 1000; TrackSelection filter = new TrackSelection() - .addCategory("running") - .addCategory("road biking") + .addActivityType("running") + .addActivityType("road biking") .addDateRange(instant, instant.plusMillis(oneDay)); // when diff --git a/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/ExportImportTest.java b/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/ExportImportTest.java index c80d5129c..968f13c93 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/ExportImportTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/ExportImportTest.java @@ -96,7 +96,7 @@ public class ExportImportTest { private final ContentProviderUtils contentProviderUtils = new ContentProviderUtils(context); private static final String TRACK_ICON = "the track icon"; - private static final String TRACK_CATEGORY = "the category"; + private static final String TRACK_ACTIVITY_TYPE = "the activity type"; private static final String TRACK_DESCRIPTION = "the description"; private File tmpFile; @@ -181,7 +181,7 @@ public class ExportImportTest { Track track = contentProviderUtils.getTrack(trackId); track.setIcon(TRACK_ICON); - track.setCategory(TRACK_CATEGORY); + track.setActivityType(TRACK_ACTIVITY_TYPE); track.setDescription(TRACK_DESCRIPTION); contentProviderUtils.updateTrack(track); @@ -216,7 +216,7 @@ public class ExportImportTest { // 1. track Track importedTrack = contentProviderUtils.getTrack(importTrackId); assertNotNull(importedTrack); - assertEquals(track.getCategory(), importedTrack.getCategory()); + assertEquals(track.getActivityType(), importedTrack.getActivityType()); assertEquals(track.getDescription(), importedTrack.getDescription()); assertEquals(track.getName(), importedTrack.getName()); assertEquals(track.getIcon(), importedTrack.getIcon()); @@ -323,7 +323,7 @@ public class ExportImportTest { // 1. track Track importedTrack = contentProviderUtils.getTrack(importTrackId); assertNotNull(importedTrack); - assertEquals(track.getCategory(), importedTrack.getCategory()); + assertEquals(track.getActivityType(), importedTrack.getActivityType()); assertEquals(track.getDescription(), importedTrack.getDescription()); assertEquals(track.getName(), importedTrack.getName()); diff --git a/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/GPXTrackImporterTest.java b/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/GPXTrackImporterTest.java index 256e9ecfa..c63bb4c49 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/GPXTrackImporterTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/GPXTrackImporterTest.java @@ -79,7 +79,7 @@ public class GPXTrackImporterTest { // 2. track Track importedTrack = contentProviderUtils.getTrack(importTrackId); assertNotNull(importedTrack); - assertEquals("the category", importedTrack.getCategory()); + assertEquals("the category", importedTrack.getActivityType()); assertEquals("the description", importedTrack.getDescription()); assertEquals("2021-01-07 22:51", importedTrack.getName()); assertEquals("UNKNOWN", importedTrack.getIcon()); @@ -133,7 +133,7 @@ public class GPXTrackImporterTest { // 2. track Track importedTrack = contentProviderUtils.getTrack(importTrackId); assertNotNull(importedTrack); - assertEquals("", importedTrack.getCategory()); + assertEquals("", importedTrack.getActivityType()); assertEquals("", importedTrack.getDescription()); assertEquals("20210907_213924.gpx", importedTrack.getName()); assertEquals("", importedTrack.getIcon()); @@ -181,7 +181,7 @@ public class GPXTrackImporterTest { // 2. track Track importedTrack = contentProviderUtils.getTrack(importTrackId); assertNotNull(importedTrack); - assertEquals("", importedTrack.getCategory()); + assertEquals("", importedTrack.getActivityType()); assertEquals("", importedTrack.getDescription()); assertEquals("20210907_213924.gpx", importedTrack.getName()); assertEquals("", importedTrack.getIcon()); diff --git a/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/KMLTrackImporterTest.java b/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/KMLTrackImporterTest.java index f60cfd221..b7acb8f92 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/KMLTrackImporterTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/KMLTrackImporterTest.java @@ -70,7 +70,7 @@ public class KMLTrackImporterTest { // 1. track Track importedTrack = contentProviderUtils.getTrack(importTrackId); assertNotNull(importedTrack); - assertEquals("", importedTrack.getCategory()); + assertEquals("", importedTrack.getActivityType()); assertEquals("", importedTrack.getDescription()); assertEquals("", importedTrack.getName()); assertEquals("", importedTrack.getIcon()); @@ -119,7 +119,7 @@ public class KMLTrackImporterTest { // 1. track Track importedTrack = contentProviderUtils.getTrack(importTrackId); assertNotNull(importedTrack); - assertEquals("", importedTrack.getCategory()); + assertEquals("", importedTrack.getActivityType()); assertEquals("", importedTrack.getDescription()); assertEquals("", importedTrack.getName()); assertEquals("", importedTrack.getIcon()); @@ -159,7 +159,7 @@ public class KMLTrackImporterTest { // 1. track Track importedTrack = contentProviderUtils.getTrack(importTrackId); assertNotNull(importedTrack); - assertEquals("unknown", importedTrack.getCategory()); + assertEquals("unknown", importedTrack.getActivityType()); assertEquals("Test Track", importedTrack.getDescription()); assertEquals("2020-11-28 18:06", importedTrack.getName()); assertEquals("UNKNOWN", importedTrack.getIcon()); diff --git a/src/androidTest/java/de/dennisguse/opentracks/share/DescriptionGeneratorTest.java b/src/androidTest/java/de/dennisguse/opentracks/share/DescriptionGeneratorTest.java index 16a1a59a8..142d49221 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/share/DescriptionGeneratorTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/share/DescriptionGeneratorTest.java @@ -80,7 +80,7 @@ public class DescriptionGeneratorTest { stats.setTotalAltitudeLoss(6000f); stats.setStartTime(START_TIME); track.setTrackStatistics(stats); - track.setCategory("hiking"); + track.setActivityType("hiking"); String expected = //"Created by" "OpenTracks (Debug)

" + "Name: -
" @@ -118,7 +118,7 @@ public class DescriptionGeneratorTest { stats.setTotalAltitudeLoss(6000f); stats.setStartTime(START_TIME); track.setTrackStatistics(stats); - track.setCategory("hiking"); + track.setActivityType("hiking"); String expected = //"Created by" "OpenTracks (Debug)

" + "Name: -
" diff --git a/src/androidTest/java/de/dennisguse/opentracks/ui/aggregatedStatistics/AggregatedStatisticsTest.java b/src/androidTest/java/de/dennisguse/opentracks/ui/aggregatedStatistics/AggregatedStatisticsTest.java index 42a53fc2a..7d65cf6a2 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/ui/aggregatedStatistics/AggregatedStatisticsTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/ui/aggregatedStatistics/AggregatedStatisticsTest.java @@ -41,7 +41,7 @@ public class AggregatedStatisticsTest { Track track = new Track(); track.setIcon(TrackIconUtils.getIconValue(context, category)); - track.setCategory(category); + track.setActivityType(category); track.setTrackStatistics(statistics); return track; } @@ -243,8 +243,8 @@ public class AggregatedStatisticsTest { // Check order { - assertEquals(biking, aggregatedStatistics.getItem(0).getCategory()); - assertEquals(driving, aggregatedStatistics.getItem(3).getCategory()); + assertEquals(biking, aggregatedStatistics.getItem(0).getActivityType()); + assertEquals(driving, aggregatedStatistics.getItem(3).getActivityType()); } } } diff --git a/src/androidTest/java/de/dennisguse/opentracks/ui/aggregatedStatistics/EspressoAggregatedFilterTest.java b/src/androidTest/java/de/dennisguse/opentracks/ui/aggregatedStatistics/EspressoAggregatedFilterTest.java index ce12e3be8..4e98d08c1 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/ui/aggregatedStatistics/EspressoAggregatedFilterTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/ui/aggregatedStatistics/EspressoAggregatedFilterTest.java @@ -51,7 +51,7 @@ public class EspressoAggregatedFilterTest { @Before public void setUp() { Pair> pair = TestDataUtil.createTrack(new Track.Id(System.currentTimeMillis()), 20); - pair.first.setCategory(CATEGORY); + pair.first.setActivityType(CATEGORY); TestDataUtil.insertTrackWithLocations(new ContentProviderUtils(ApplicationProvider.getApplicationContext()), pair.first, pair.second); } diff --git a/src/main/java/de/dennisguse/opentracks/TrackEditActivity.java b/src/main/java/de/dennisguse/opentracks/TrackEditActivity.java index 6ea2453b9..18ae5fea5 100644 --- a/src/main/java/de/dennisguse/opentracks/TrackEditActivity.java +++ b/src/main/java/de/dennisguse/opentracks/TrackEditActivity.java @@ -74,7 +74,7 @@ public class TrackEditActivity extends AbstractActivity implements ChooseActivit viewBinding.fields.trackEditName.setText(track.getName()); - viewBinding.fields.trackEditActivityType.setText(track.getCategory()); + viewBinding.fields.trackEditActivityType.setText(track.getActivityType()); ArrayAdapter adapter = new ArrayAdapter<>(this, android.R.layout.simple_dropdown_item_1line, ActivityType.getLocalizedStrings(this)); viewBinding.fields.trackEditActivityType.setAdapter(adapter); diff --git a/src/main/java/de/dennisguse/opentracks/TrackListActivity.java b/src/main/java/de/dennisguse/opentracks/TrackListActivity.java index a619f02b8..6297ce09b 100644 --- a/src/main/java/de/dennisguse/opentracks/TrackListActivity.java +++ b/src/main/java/de/dennisguse/opentracks/TrackListActivity.java @@ -193,7 +193,7 @@ public class TrackListActivity extends AbstractTrackDeleteActivity implements Co int totalDistanceIndex = cursor.getColumnIndexOrThrow(TracksColumns.TOTALDISTANCE); int startTimeIndex = cursor.getColumnIndexOrThrow(TracksColumns.STARTTIME); int startTimeOffsetIndex = cursor.getColumnIndexOrThrow(TracksColumns.STARTTIME_OFFSET); - int categoryIndex = cursor.getColumnIndexOrThrow(TracksColumns.CATEGORY); + int activityTypeIndex = cursor.getColumnIndexOrThrow(TracksColumns.ACTIVITY_TYPE); int descriptionIndex = cursor.getColumnIndexOrThrow(TracksColumns.DESCRIPTION); int markerCountIndex = cursor.getColumnIndexOrThrow(TracksColumns.MARKER_COUNT); @@ -209,13 +209,13 @@ public class TrackListActivity extends AbstractTrackDeleteActivity implements Co int markerCount = cursor.getInt(markerCountIndex); long startTime = cursor.getLong(startTimeIndex); int startTimeOffset = cursor.getInt(startTimeOffsetIndex); - String category = icon != null && !icon.equals("") ? null : cursor.getString(categoryIndex); + String activityType = icon != null && !icon.equals("") ? null : cursor.getString(activityTypeIndex); String description = cursor.getString(descriptionIndex); ListItemUtils.setListItem(TrackListActivity.this, view, isRecording, iconId, R.string.image_track, name, totalTime, totalDistance, markerCount, OffsetDateTime.ofInstant(Instant.ofEpochMilli(startTime), ZoneOffset.ofTotalSeconds(startTimeOffset)), - category, description, false); + activityType, description, false); } }; viewBinding.trackList.setAdapter(resourceCursorAdapter); @@ -552,7 +552,7 @@ public class TrackListActivity extends AbstractTrackDeleteActivity implements Co @Override public Loader onCreateLoader(int arg0, Bundle arg1) { final String[] PROJECTION = new String[]{TracksColumns._ID, TracksColumns.NAME, - TracksColumns.DESCRIPTION, TracksColumns.CATEGORY, TracksColumns.STARTTIME, TracksColumns.STARTTIME_OFFSET, + TracksColumns.DESCRIPTION, TracksColumns.ACTIVITY_TYPE, TracksColumns.STARTTIME, TracksColumns.STARTTIME_OFFSET, TracksColumns.TOTALDISTANCE, TracksColumns.TOTALTIME, TracksColumns.ICON, TracksColumns.MARKER_COUNT}; final String sortOrder = TracksColumns.STARTTIME + " DESC"; @@ -562,7 +562,7 @@ public class TrackListActivity extends AbstractTrackDeleteActivity implements Co } else { final String SEARCH_QUERY = TracksColumns.NAME + " LIKE ? OR " + TracksColumns.DESCRIPTION + " LIKE ? OR " + - TracksColumns.CATEGORY + " LIKE ?"; + TracksColumns.ACTIVITY_TYPE + " LIKE ?"; final String[] selectionArgs = new String[]{"%" + searchQuery + "%", "%" + searchQuery + "%", "%" + searchQuery + "%"}; return new CursorLoader(TrackListActivity.this, TracksColumns.CONTENT_URI, PROJECTION, SEARCH_QUERY, selectionArgs, sortOrder); } diff --git a/src/main/java/de/dennisguse/opentracks/TrackRecordingActivity.java b/src/main/java/de/dennisguse/opentracks/TrackRecordingActivity.java index 769cfd7d0..4e387c5d7 100644 --- a/src/main/java/de/dennisguse/opentracks/TrackRecordingActivity.java +++ b/src/main/java/de/dennisguse/opentracks/TrackRecordingActivity.java @@ -319,8 +319,8 @@ public class TrackRecordingActivity extends AbstractActivity implements ChooseAc @Override public void onChooseActivityTypeDone(String iconValue) { Track track = contentProviderUtils.getTrack(trackId); - String category = getString(TrackIconUtils.getIconActivityType(iconValue)); - TrackUtils.updateTrack(this, track, null, category, null, contentProviderUtils); + String activityType = getString(TrackIconUtils.getIconActivityType(iconValue)); + TrackUtils.updateTrack(this, track, null, activityType, null, contentProviderUtils); } private class CustomFragmentPagerAdapter extends FragmentStateAdapter { diff --git a/src/main/java/de/dennisguse/opentracks/TrackStoppedActivity.java b/src/main/java/de/dennisguse/opentracks/TrackStoppedActivity.java index b4403ce30..977f03f2e 100644 --- a/src/main/java/de/dennisguse/opentracks/TrackStoppedActivity.java +++ b/src/main/java/de/dennisguse/opentracks/TrackStoppedActivity.java @@ -50,7 +50,7 @@ public class TrackStoppedActivity extends AbstractTrackDeleteActivity implements viewBinding.trackEditName.setText(track.getName()); - viewBinding.trackEditActivityType.setText(track.getCategory()); + viewBinding.trackEditActivityType.setText(track.getActivityType()); ArrayAdapter adapter = new ArrayAdapter<>(this, android.R.layout.simple_dropdown_item_1line, ActivityType.getLocalizedStrings(this)); viewBinding.trackEditActivityType.setAdapter(adapter); @@ -74,7 +74,7 @@ public class TrackStoppedActivity extends AbstractTrackDeleteActivity implements { Pair parts = SpeedFormatter.Builder() .setUnit(PreferencesUtils.getUnitSystem()) - .setReportSpeedOrPace(PreferencesUtils.isReportSpeed(track.getCategory())) + .setReportSpeedOrPace(PreferencesUtils.isReportSpeed(track.getActivityType())) .build(this) .getSpeedParts(track.getTrackStatistics().getAverageMovingSpeed()); viewBinding.speed.setText(parts.first); diff --git a/src/main/java/de/dennisguse/opentracks/chart/ChartFragment.java b/src/main/java/de/dennisguse/opentracks/chart/ChartFragment.java index a9dc3b4a1..727cd3681 100644 --- a/src/main/java/de/dennisguse/opentracks/chart/ChartFragment.java +++ b/src/main/java/de/dennisguse/opentracks/chart/ChartFragment.java @@ -164,7 +164,7 @@ public class ChartFragment extends Fragment implements TrackDataHub.Listener { return; } - category = track.getCategory(); + category = track.getActivityType(); boolean reportSpeed = PreferencesUtils.isReportSpeed(category); if (reportSpeed != viewBinding.chartView.getReportSpeed()) { viewBinding.chartView.setReportSpeed(reportSpeed); diff --git a/src/main/java/de/dennisguse/opentracks/data/ContentProviderUtils.java b/src/main/java/de/dennisguse/opentracks/data/ContentProviderUtils.java index be696ee9b..ae12513ce 100644 --- a/src/main/java/de/dennisguse/opentracks/data/ContentProviderUtils.java +++ b/src/main/java/de/dennisguse/opentracks/data/ContentProviderUtils.java @@ -100,7 +100,7 @@ public class ContentProviderUtils { int uuidIndex = cursor.getColumnIndexOrThrow(TracksColumns.UUID); int nameIndex = cursor.getColumnIndexOrThrow(TracksColumns.NAME); int descriptionIndex = cursor.getColumnIndexOrThrow(TracksColumns.DESCRIPTION); - int categoryIndex = cursor.getColumnIndexOrThrow(TracksColumns.CATEGORY); + int categoryIndex = cursor.getColumnIndexOrThrow(TracksColumns.ACTIVITY_TYPE); int startTimeIndex = cursor.getColumnIndexOrThrow(TracksColumns.STARTTIME); int startTimeOffsetIndex = cursor.getColumnIndexOrThrow(TracksColumns.STARTTIME_OFFSET); int stopTimeIndex = cursor.getColumnIndexOrThrow(TracksColumns.STOPTIME); @@ -129,7 +129,7 @@ public class ContentProviderUtils { track.setDescription(cursor.getString(descriptionIndex)); } if (!cursor.isNull(categoryIndex)) { - track.setCategory(cursor.getString(categoryIndex)); + track.setActivityType(cursor.getString(categoryIndex)); } if (!cursor.isNull(startTimeIndex)) { @@ -290,7 +290,7 @@ public class ContentProviderUtils { values.put(TracksColumns.UUID, UUIDUtils.toBytes(track.getUuid())); values.put(TracksColumns.NAME, track.getName()); values.put(TracksColumns.DESCRIPTION, track.getDescription()); - values.put(TracksColumns.CATEGORY, track.getCategory()); + values.put(TracksColumns.ACTIVITY_TYPE, track.getActivityType()); values.put(TracksColumns.STARTTIME_OFFSET, track.getZoneOffset().getTotalSeconds()); if (trackStatistics.getStartTime() != null) { values.put(TracksColumns.STARTTIME, trackStatistics.getStartTime().toEpochMilli()); diff --git a/src/main/java/de/dennisguse/opentracks/data/TrackSelection.java b/src/main/java/de/dennisguse/opentracks/data/TrackSelection.java index c33f5de69..712cb6282 100644 --- a/src/main/java/de/dennisguse/opentracks/data/TrackSelection.java +++ b/src/main/java/de/dennisguse/opentracks/data/TrackSelection.java @@ -30,9 +30,9 @@ public class TrackSelection implements ContentProviderUtils.ContentProviderSelec return this; } - public TrackSelection addCategory(String category) { - if (!this.categories.contains(category)) { - this.categories.add(category); + public TrackSelection addActivityType(String activityType) { + if (!this.categories.contains(activityType)) { + this.categories.add(activityType); } return this; } @@ -53,7 +53,7 @@ public class TrackSelection implements ContentProviderUtils.ContentProviderSelec } if (!categories.isEmpty()) { selection += selection.isEmpty() ? "" : " AND "; - selection += String.format(TracksColumns.CATEGORY + " IN (%s)", TextUtils.join(",", Collections.nCopies(categories.size(), "?"))); + selection += String.format(TracksColumns.ACTIVITY_TYPE + " IN (%s)", TextUtils.join(",", Collections.nCopies(categories.size(), "?"))); } if (from != null && to != null) { selection += selection.isEmpty() ? "" : " AND "; diff --git a/src/main/java/de/dennisguse/opentracks/data/models/Track.java b/src/main/java/de/dennisguse/opentracks/data/models/Track.java index 3885fa3cf..b1bae70a6 100644 --- a/src/main/java/de/dennisguse/opentracks/data/models/Track.java +++ b/src/main/java/de/dennisguse/opentracks/data/models/Track.java @@ -44,7 +44,7 @@ public class Track { private String name = ""; private String description = ""; - private String category = ""; + private String activityType = ""; private String icon = ""; @@ -97,12 +97,12 @@ public class Track { this.description = description; } - public String getCategory() { - return category; + public String getActivityType() { + return activityType; } - public void setCategory(String category) { - this.category = category; + public void setActivityType(String activityType) { + this.activityType = activityType; } public String getIcon() { diff --git a/src/main/java/de/dennisguse/opentracks/data/tables/TracksColumns.java b/src/main/java/de/dennisguse/opentracks/data/tables/TracksColumns.java index 0f9b1bbc8..ac5347957 100644 --- a/src/main/java/de/dennisguse/opentracks/data/tables/TracksColumns.java +++ b/src/main/java/de/dennisguse/opentracks/data/tables/TracksColumns.java @@ -39,7 +39,7 @@ public interface TracksColumns extends BaseColumns { String UUID = "uuid"; // identifier to make tracks globally unique (prevent re-import) String NAME = "name"; // track name String DESCRIPTION = "description"; // track description - String CATEGORY = "category"; // track activity type + String ACTIVITY_TYPE = "category"; // track activity type String STARTTIME = "starttime"; // track start time String STARTTIME_OFFSET = "starttime_offset"; // in plus/minus in seconds String STOPTIME = "stoptime"; // track stop time @@ -63,7 +63,7 @@ public interface TracksColumns extends BaseColumns { + _ID + " INTEGER PRIMARY KEY AUTOINCREMENT, " + NAME + " TEXT, " + DESCRIPTION + " TEXT, " - + CATEGORY + " TEXT, " + + ACTIVITY_TYPE + " TEXT, " + STARTTIME + " INTEGER, " + STOPTIME + " INTEGER, " + NUMPOINTS + " INTEGER, " diff --git a/src/main/java/de/dennisguse/opentracks/fragments/StatisticsRecordedFragment.java b/src/main/java/de/dennisguse/opentracks/fragments/StatisticsRecordedFragment.java index 350cf7732..a054f45f2 100644 --- a/src/main/java/de/dennisguse/opentracks/fragments/StatisticsRecordedFragment.java +++ b/src/main/java/de/dennisguse/opentracks/fragments/StatisticsRecordedFragment.java @@ -89,7 +89,7 @@ public class StatisticsRecordedFragment extends Fragment { if (PreferencesUtils.isKey(R.string.stats_rate_key, key) && track != null) { updateUInecessary = true; - preferenceReportSpeed = PreferencesUtils.isReportSpeed(track.getCategory()); + preferenceReportSpeed = PreferencesUtils.isReportSpeed(track.getActivityType()); } if (key != null && updateUInecessary && isResumed()) { @@ -155,7 +155,7 @@ public class StatisticsRecordedFragment extends Fragment { sensorStatistics = contentProviderUtils.getSensorStats(trackId); - boolean prefsChanged = this.track == null || (!this.track.getCategory().equals(track.getCategory())); + boolean prefsChanged = this.track == null || (!this.track.getActivityType().equals(track.getActivityType())); this.track = track; if (prefsChanged) { sharedPreferenceChangeListener.onSharedPreferenceChanged(null, getString(R.string.stats_rate_key)); @@ -191,7 +191,7 @@ public class StatisticsRecordedFragment extends Fragment { // Set activity type { - String trackIconValue = TrackIconUtils.getIconValue(getContext(), track.getCategory()); + String trackIconValue = TrackIconUtils.getIconValue(getContext(), track.getActivityType()); viewBinding.statsActivityTypeIcon.setImageDrawable(ContextCompat.getDrawable(getContext(), TrackIconUtils.getIconDrawable(trackIconValue))); } diff --git a/src/main/java/de/dennisguse/opentracks/io/file/TrackFilenameGenerator.java b/src/main/java/de/dennisguse/opentracks/io/file/TrackFilenameGenerator.java index 2f80c1fe1..1257d47ad 100644 --- a/src/main/java/de/dennisguse/opentracks/io/file/TrackFilenameGenerator.java +++ b/src/main/java/de/dennisguse/opentracks/io/file/TrackFilenameGenerator.java @@ -20,12 +20,12 @@ public class TrackFilenameGenerator { public static final String UUID_KEY = "{uuid}"; public static final String TRACKNAME_KEY = "{name}"; - public static final String CATEGORY_KEY = "{category}"; + public static final String ACTIVITY_TYPE_KEY = "{category}"; public static final String STARTTIME_TIME_KEY = "{time}"; public static final String STARTTIME_DATE_KEY = "{date}"; public static String getAllOptions() { - return Stream.of(UUID_KEY, TRACKNAME_KEY, CATEGORY_KEY, STARTTIME_TIME_KEY, STARTTIME_DATE_KEY) + return Stream.of(UUID_KEY, TRACKNAME_KEY, ACTIVITY_TYPE_KEY, STARTTIME_TIME_KEY, STARTTIME_DATE_KEY) .collect(Collectors.joining(", ")); } @@ -44,7 +44,7 @@ public class TrackFilenameGenerator { values.put(UUID_KEY, track.getUuid().toString().substring(0, 8)); values.put(TRACKNAME_KEY, track.getName()); - values.put(CATEGORY_KEY, track.getCategory()); + values.put(ACTIVITY_TYPE_KEY, track.getActivityType()); values.put(STARTTIME_TIME_KEY, track.getStartTime().toLocalTime().toString()); values.put(STARTTIME_DATE_KEY, track.getStartTime().toLocalDate().toString()); diff --git a/src/main/java/de/dennisguse/opentracks/io/file/exporter/GPXTrackExporter.java b/src/main/java/de/dennisguse/opentracks/io/file/exporter/GPXTrackExporter.java index 34e1acfd9..f1d466e5a 100644 --- a/src/main/java/de/dennisguse/opentracks/io/file/exporter/GPXTrackExporter.java +++ b/src/main/java/de/dennisguse/opentracks/io/file/exporter/GPXTrackExporter.java @@ -268,7 +268,7 @@ public class GPXTrackExporter implements TrackExporter { printWriter.println(""); printWriter.println("" + StringUtils.formatCData(track.getName()) + ""); printWriter.println("" + StringUtils.formatCData(track.getDescription()) + ""); - printWriter.println("" + StringUtils.formatCData(track.getCategory()) + ""); + printWriter.println("" + StringUtils.formatCData(track.getActivityType()) + ""); printWriter.println(""); printWriter.println("c0c0c0"); diff --git a/src/main/java/de/dennisguse/opentracks/io/file/exporter/KMLTrackExporter.java b/src/main/java/de/dennisguse/opentracks/io/file/exporter/KMLTrackExporter.java index 702914eb8..0380508a6 100644 --- a/src/main/java/de/dennisguse/opentracks/io/file/exporter/KMLTrackExporter.java +++ b/src/main/java/de/dennisguse/opentracks/io/file/exporter/KMLTrackExporter.java @@ -59,7 +59,7 @@ public class KMLTrackExporter implements TrackExporter { private static final String TRACK_STYLE = "track"; private static final String SCHEMA_ID = "schema"; - public static final String EXTENDED_DATA_TYPE_CATEGORY = "type"; + public static final String EXTENDED_DATA_TYPE_ACTIVITYTYPE = "type"; public static final String EXTENDED_DATA_TYPE_SPEED = "speed"; public static final String EXTENDED_DATA_TYPE_DISTANCE = "distance"; @@ -311,7 +311,7 @@ public class KMLTrackExporter implements TrackExporter { printWriter.println("" + track.getUuid() + ""); printWriter.println("#" + TRACK_STYLE + ""); - writeCategory(track.getCategory()); + writeActivityType(track.getActivityType()); printWriter.println(""); printWriter.println("absolute"); printWriter.println("1"); @@ -426,19 +426,19 @@ public class KMLTrackExporter implements TrackExporter { /** * Writes a placemark. * - * @param name the name - * @param category the category - * @param description the description - * @param location the location + * @param name the name + * @param activityType the activityType + * @param description the description + * @param location the location */ - private void writePlacemark(String name, String category, String description, Location location, ZoneOffset zoneOffset) { + private void writePlacemark(String name, String activityType, String description, Location location, ZoneOffset zoneOffset) { if (location != null) { printWriter.println(""); printWriter.println("" + StringUtils.formatCData(name) + ""); printWriter.println("" + StringUtils.formatCData(description) + ""); printWriter.println("" + getTime(zoneOffset, location) + ""); printWriter.println("#" + KMLTrackExporter.MARKER_STYLE + ""); - writeCategory(category); + writeActivityType(activityType); printWriter.println(""); printWriter.println("" + getCoordinates(location, ",") + ""); printWriter.println(""); @@ -459,7 +459,7 @@ public class KMLTrackExporter implements TrackExporter { printWriter.println(""); printWriter.println("" + getTime(zoneOffset, marker.getLocation()) + ""); printWriter.println("#" + MARKER_STYLE + ""); - writeCategory(marker.getCategory()); + writeActivityType(marker.getCategory()); if (exportPhotos) { printWriter.println("" + KmzTrackExporter.buildKmzImageFilePath(marker) + ""); @@ -514,23 +514,15 @@ public class KMLTrackExporter implements TrackExporter { return result; } - /** - * Writes the category. - * - * @param category the category - */ - private void writeCategory(String category) { - if (category == null || category.equals("")) { + private void writeActivityType(String actiivtyType) { + if (actiivtyType == null || actiivtyType.equals("")) { return; } printWriter.println(""); - printWriter.println("" + StringUtils.formatCData(category) + ""); + printWriter.println("" + StringUtils.formatCData(actiivtyType) + ""); printWriter.println(""); } - /** - * Writes the track style. - */ private void writeTrackStyle() { printWriter.println("