From 779681088ca0b1b02caf9dbbcce6eff563743ad2 Mon Sep 17 00:00:00 2001 From: Dennis Guse Date: Fri, 23 Jun 2023 07:49:39 +0200 Subject: [PATCH] Refactor Track.icon is now Track.activityTypeId. Part of #1608. --- .../opentracks/io/file/importer/ExportImportTest.java | 4 ++-- .../io/file/importer/GPXTrackImporterTest.java | 6 +++--- .../io/file/importer/KMLTrackImporterTest.java | 6 +++--- .../aggregatedStatistics/AggregatedStatisticsTest.java | 2 +- .../de/dennisguse/opentracks/TrackEditActivity.java | 2 +- .../de/dennisguse/opentracks/TrackStoppedActivity.java | 2 +- .../opentracks/data/ContentProviderUtils.java | 4 ++-- .../de/dennisguse/opentracks/data/models/Track.java | 10 +++++----- .../opentracks/io/file/exporter/KMLTrackExporter.java | 2 +- .../opentracks/io/file/importer/TrackImporter.java | 2 +- .../opentracks/services/TrackRecordingManager.java | 4 ++-- .../opentracks/settings/ActivityTypePreference.java | 8 ++++---- .../opentracks/settings/PreferencesUtils.java | 4 ++-- .../java/de/dennisguse/opentracks/util/TrackUtils.java | 4 ++-- 14 files changed, 30 insertions(+), 30 deletions(-) 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 968f13c93..7fb5371af 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 @@ -180,7 +180,7 @@ public class ExportImportTest { service.endCurrentTrack(); Track track = contentProviderUtils.getTrack(trackId); - track.setIcon(TRACK_ICON); + track.setActivityTypeId(TRACK_ICON); track.setActivityType(TRACK_ACTIVITY_TYPE); track.setDescription(TRACK_DESCRIPTION); contentProviderUtils.updateTrack(track); @@ -219,7 +219,7 @@ public class ExportImportTest { assertEquals(track.getActivityType(), importedTrack.getActivityType()); assertEquals(track.getDescription(), importedTrack.getDescription()); assertEquals(track.getName(), importedTrack.getName()); - assertEquals(track.getIcon(), importedTrack.getIcon()); + assertEquals(track.getActivityTypeId(), importedTrack.getActivityTypeId()); // 2. trackpoints TrackPointAssert a = new TrackPointAssert(); 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 c63bb4c49..88c2d6dbe 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 @@ -82,7 +82,7 @@ public class GPXTrackImporterTest { assertEquals("the category", importedTrack.getActivityType()); assertEquals("the description", importedTrack.getDescription()); assertEquals("2021-01-07 22:51", importedTrack.getName()); - assertEquals("UNKNOWN", importedTrack.getIcon()); + assertEquals("UNKNOWN", importedTrack.getActivityTypeId()); //TODO Check trackstatistics @@ -136,7 +136,7 @@ public class GPXTrackImporterTest { assertEquals("", importedTrack.getActivityType()); assertEquals("", importedTrack.getDescription()); assertEquals("20210907_213924.gpx", importedTrack.getName()); - assertEquals("", importedTrack.getIcon()); + assertEquals("", importedTrack.getActivityTypeId()); // 3. trackstatistics TrackStatistics trackStatistics = importedTrack.getTrackStatistics(); @@ -184,7 +184,7 @@ public class GPXTrackImporterTest { assertEquals("", importedTrack.getActivityType()); assertEquals("", importedTrack.getDescription()); assertEquals("20210907_213924.gpx", importedTrack.getName()); - assertEquals("", importedTrack.getIcon()); + assertEquals("", importedTrack.getActivityTypeId()); // 3. trackstatistics TrackStatistics trackStatistics = importedTrack.getTrackStatistics(); 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 b7acb8f92..ec57d405f 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 @@ -73,7 +73,7 @@ public class KMLTrackImporterTest { assertEquals("", importedTrack.getActivityType()); assertEquals("", importedTrack.getDescription()); assertEquals("", importedTrack.getName()); - assertEquals("", importedTrack.getIcon()); + assertEquals("", importedTrack.getActivityTypeId()); // 2. markers assertEquals(0, contentProviderUtils.getMarkers(importTrackId).size()); @@ -122,7 +122,7 @@ public class KMLTrackImporterTest { assertEquals("", importedTrack.getActivityType()); assertEquals("", importedTrack.getDescription()); assertEquals("", importedTrack.getName()); - assertEquals("", importedTrack.getIcon()); + assertEquals("", importedTrack.getActivityTypeId()); // 2. markers assertEquals(0, contentProviderUtils.getMarkers(importTrackId).size()); @@ -162,7 +162,7 @@ public class KMLTrackImporterTest { assertEquals("unknown", importedTrack.getActivityType()); assertEquals("Test Track", importedTrack.getDescription()); assertEquals("2020-11-28 18:06", importedTrack.getName()); - assertEquals("UNKNOWN", importedTrack.getIcon()); + assertEquals("UNKNOWN", importedTrack.getActivityTypeId()); // 2. markers assertEquals(0, contentProviderUtils.getMarkers(importTrackId).size()); 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 28a0360c2..6c4eeee7d 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/ui/aggregatedStatistics/AggregatedStatisticsTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/ui/aggregatedStatistics/AggregatedStatisticsTest.java @@ -40,7 +40,7 @@ public class AggregatedStatisticsTest { statistics.setMinAltitude(1200.0); // Resulting min altitude Track track = new Track(); - track.setIcon(ActivityType.findByLocalizedString(context, category) + track.setActivityTypeId(ActivityType.findByLocalizedString(context, category) .getId()); track.setActivityType(category); track.setTrackStatistics(statistics); diff --git a/src/main/java/de/dennisguse/opentracks/TrackEditActivity.java b/src/main/java/de/dennisguse/opentracks/TrackEditActivity.java index 54a4eedd6..80f555571 100644 --- a/src/main/java/de/dennisguse/opentracks/TrackEditActivity.java +++ b/src/main/java/de/dennisguse/opentracks/TrackEditActivity.java @@ -95,7 +95,7 @@ public class TrackEditActivity extends AbstractActivity implements ChooseActivit iconValue = bundle.getString(ICON_VALUE_KEY); } if (iconValue == null) { - iconValue = track.getIcon(); + iconValue = track.getActivityTypeId(); } setActivityTypeIcon(iconValue); diff --git a/src/main/java/de/dennisguse/opentracks/TrackStoppedActivity.java b/src/main/java/de/dennisguse/opentracks/TrackStoppedActivity.java index e6c163e30..339c03fcb 100644 --- a/src/main/java/de/dennisguse/opentracks/TrackStoppedActivity.java +++ b/src/main/java/de/dennisguse/opentracks/TrackStoppedActivity.java @@ -66,7 +66,7 @@ public class TrackStoppedActivity extends AbstractTrackDeleteActivity implements } }); - String iconValue = track.getIcon(); + String iconValue = track.getActivityTypeId(); setActivityTypeIcon(iconValue); viewBinding.trackEditActivityTypeIcon.setOnClickListener(v -> ChooseActivityTypeDialogFragment.showDialog(getSupportFragmentManager(), viewBinding.trackEditActivityType.getText().toString())); diff --git a/src/main/java/de/dennisguse/opentracks/data/ContentProviderUtils.java b/src/main/java/de/dennisguse/opentracks/data/ContentProviderUtils.java index 0dce5ca9b..881876327 100644 --- a/src/main/java/de/dennisguse/opentracks/data/ContentProviderUtils.java +++ b/src/main/java/de/dennisguse/opentracks/data/ContentProviderUtils.java @@ -163,7 +163,7 @@ public class ContentProviderUtils { trackStatistics.setTotalAltitudeLoss(cursor.getFloat(altitudeLossIndex)); } if (!cursor.isNull(iconIndex)) { - track.setIcon(cursor.getString(iconIndex)); + track.setActivityTypeId(cursor.getString(iconIndex)); } return track; } @@ -308,7 +308,7 @@ public class ContentProviderUtils { values.put(TracksColumns.MAX_ALTITUDE, trackStatistics.getMaxAltitude()); values.put(TracksColumns.ALTITUDE_GAIN, trackStatistics.getTotalAltitudeGain()); values.put(TracksColumns.ALTITUDE_LOSS, trackStatistics.getTotalAltitudeLoss()); - values.put(TracksColumns.ICON, track.getIcon()); + values.put(TracksColumns.ICON, track.getActivityTypeId()); return values; } 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 b1bae70a6..48c56364e 100644 --- a/src/main/java/de/dennisguse/opentracks/data/models/Track.java +++ b/src/main/java/de/dennisguse/opentracks/data/models/Track.java @@ -46,7 +46,7 @@ public class Track { private String description = ""; private String activityType = ""; - private String icon = ""; + private String activityTypeId = ""; private final ZoneOffset zoneOffset; @@ -105,12 +105,12 @@ public class Track { this.activityType = activityType; } - public String getIcon() { - return icon; + public String getActivityTypeId() { + return activityTypeId; } - public void setIcon(String icon) { - this.icon = icon; + public void setActivityTypeId(String activityTypeId) { + this.activityTypeId = activityTypeId; } public ZoneOffset getZoneOffset() { 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 dc3938672..7532bcc26 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 @@ -307,7 +307,7 @@ public class KMLTrackExporter implements TrackExporter { printWriter.println("" + StringUtils.formatCData(track.getName()) + ""); printWriter.println("" + StringUtils.formatCData(track.getDescription()) + ""); - printWriter.println("" + StringUtils.formatCData(track.getIcon()) + ""); + printWriter.println("" + StringUtils.formatCData(track.getActivityTypeId()) + ""); printWriter.println("" + track.getUuid() + ""); printWriter.println("#" + TRACK_STYLE + ""); diff --git a/src/main/java/de/dennisguse/opentracks/io/file/importer/TrackImporter.java b/src/main/java/de/dennisguse/opentracks/io/file/importer/TrackImporter.java index ba2e8d922..5b057dc95 100644 --- a/src/main/java/de/dennisguse/opentracks/io/file/importer/TrackImporter.java +++ b/src/main/java/de/dennisguse/opentracks/io/file/importer/TrackImporter.java @@ -112,7 +112,7 @@ public class TrackImporter { } } - track.setIcon(icon != null ? icon : ""); + track.setActivityTypeId(icon != null ? icon : ""); } void finish() { diff --git a/src/main/java/de/dennisguse/opentracks/services/TrackRecordingManager.java b/src/main/java/de/dennisguse/opentracks/services/TrackRecordingManager.java index 52e13e8e9..c725ce46a 100644 --- a/src/main/java/de/dennisguse/opentracks/services/TrackRecordingManager.java +++ b/src/main/java/de/dennisguse/opentracks/services/TrackRecordingManager.java @@ -72,9 +72,9 @@ class TrackRecordingManager implements SharedPreferences.OnSharedPreferenceChang onNewTrackPoint(segmentStartTrackPoint); - String category = PreferencesUtils.getDefaultActivity(); + String category = PreferencesUtils.getDefaultActivityTypeLocalized(); track.setActivityType(category); - track.setIcon(ActivityType.findByLocalizedString(context, category) + track.setActivityTypeId(ActivityType.findByLocalizedString(context, category) .getId()); track.setTrackStatistics(trackStatisticsUpdater.getTrackStatistics()); //TODO Pass TrackPoint diff --git a/src/main/java/de/dennisguse/opentracks/settings/ActivityTypePreference.java b/src/main/java/de/dennisguse/opentracks/settings/ActivityTypePreference.java index 2aaa3679e..2a97e02fa 100644 --- a/src/main/java/de/dennisguse/opentracks/settings/ActivityTypePreference.java +++ b/src/main/java/de/dennisguse/opentracks/settings/ActivityTypePreference.java @@ -46,7 +46,7 @@ public class ActivityTypePreference extends DialogPreference { setDialogIcon(null); setPersistent(true); - SummaryProvider summaryProvider = preference -> PreferencesUtils.getDefaultActivity(); + SummaryProvider summaryProvider = preference -> PreferencesUtils.getDefaultActivityTypeLocalized(); setSummaryProvider(summaryProvider); } @@ -77,7 +77,7 @@ public class ActivityTypePreference extends DialogPreference { final Context context = getActivity(); textView = view.findViewById(R.id.activity_type_preference_text_view); - String category = PreferencesUtils.getDefaultActivity(); + String category = PreferencesUtils.getDefaultActivityTypeLocalized(); textView.setText(category); ArrayAdapter adapter = new ArrayAdapter<>(context, android.R.layout.simple_dropdown_item_1line, ActivityType.getLocalizedStrings(context)); textView.setAdapter(adapter); @@ -104,7 +104,7 @@ public class ActivityTypePreference extends DialogPreference { } private void showIconSelectDialog() { - String category = PreferencesUtils.getDefaultActivity(); + String category = PreferencesUtils.getDefaultActivityTypeLocalized(); ChooseActivityTypeDialogFragment.showDialog(getActivity().getSupportFragmentManager(), category); } @@ -113,7 +113,7 @@ public class ActivityTypePreference extends DialogPreference { if (positiveResult) { String newDefaultActivity = textView.getText().toString(); if (getPreference().callChangeListener(newDefaultActivity)) { - PreferencesUtils.setDefaultActivity(newDefaultActivity); + PreferencesUtils.setDefaultActivityLocalized(newDefaultActivity); HackUtils.invalidatePreference(getPreference()); } } diff --git a/src/main/java/de/dennisguse/opentracks/settings/PreferencesUtils.java b/src/main/java/de/dennisguse/opentracks/settings/PreferencesUtils.java index 0174b24d5..4ab1146c1 100644 --- a/src/main/java/de/dennisguse/opentracks/settings/PreferencesUtils.java +++ b/src/main/java/de/dennisguse/opentracks/settings/PreferencesUtils.java @@ -90,11 +90,11 @@ public class PreferencesUtils { sharedPreferences.unregisterOnSharedPreferenceChangeListener(changeListener); } - public static String getDefaultActivity() { + public static String getDefaultActivityTypeLocalized() { return getString(R.string.default_activity_key, resources.getString(R.string.default_activity_default)); } - public static void setDefaultActivity(String newDefaultActivity) { + public static void setDefaultActivityLocalized(String newDefaultActivity) { setString(R.string.default_activity_key, newDefaultActivity); } diff --git a/src/main/java/de/dennisguse/opentracks/util/TrackUtils.java b/src/main/java/de/dennisguse/opentracks/util/TrackUtils.java index 5847773eb..ea1230032 100644 --- a/src/main/java/de/dennisguse/opentracks/util/TrackUtils.java +++ b/src/main/java/de/dennisguse/opentracks/util/TrackUtils.java @@ -49,9 +49,9 @@ public class TrackUtils { update = true; } if (iconValue != null) { - track.setIcon(iconValue); + track.setActivityTypeId(iconValue); } else if (activityType != null) { - track.setIcon(ActivityType.findByLocalizedString(context, activityType) + track.setActivityTypeId(ActivityType.findByLocalizedString(context, activityType) .getId()); } if (description != null) {