Cleanup: split ActivityType and ActivityIcon.

Part of #1608.
OpenTracksApp · Jun 27, 2023 · c47e4b3 · c47e4b3
1 parent 425ea0f
commit c47e4b3
Show file tree

Hide file tree

Showing 16 changed files with 215 additions and 115 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
@@ -96,7 +96,7 @@ public static void preSetUp() {
 
     private final ContentProviderUtils contentProviderUtils = new ContentProviderUtils(context);
 
-    private static final ActivityType TRACK_ACTIVITY_TYPE = ActivityType.MOUNTAIN_BIKE;
+    private static final ActivityType TRACK_ACTIVITY_TYPE = ActivityType.MOUNTAIN_BIKING;
     private static final String TRACK_ACTIVITY_TYPE_LOCALIZED = "the activity type";
     private static final String TRACK_DESCRIPTION = "the description";
 

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
@@ -83,7 +83,7 @@ public void gpx_with_pause_resume() throws IOException {
         assertEquals("the category", importedTrack.getActivityTypeLocalized());
         assertEquals("the description", importedTrack.getDescription());
         assertEquals("2021-01-07 22:51", importedTrack.getName());
-        assertEquals("UNKNOWN", importedTrack.getActivityType());
+        assertEquals(ActivityType.UNKNOWN, importedTrack.getActivityType());
 
         //TODO Check trackstatistics
 
@@ -137,7 +137,7 @@ public void gpx_without_speed() throws IOException {
         assertEquals("", importedTrack.getActivityTypeLocalized());
         assertEquals("", importedTrack.getDescription());
         assertEquals("20210907_213924.gpx", importedTrack.getName());
-        assertEquals("", importedTrack.getActivityType());
+        assertEquals(ActivityType.UNKNOWN, importedTrack.getActivityType());
 
         // 3. trackstatistics
         TrackStatistics trackStatistics = importedTrack.getTrackStatistics();

diff --git a/src/main/java/de/dennisguse/opentracks/TrackEditActivity.java b/src/main/java/de/dennisguse/opentracks/TrackEditActivity.java
@@ -97,7 +97,7 @@ protected void onCreate(Bundle bundle) {
         }
 
         setActivityTypeIcon(activityType);
-        viewBinding.fields.trackEditActivityTypeIcon.setOnClickListener(v -> ChooseActivityTypeDialogFragment.showDialog(getSupportFragmentManager(), viewBinding.fields.trackEditActivityType.getText().toString()));
+        viewBinding.fields.trackEditActivityTypeIcon.setOnClickListener(v -> ChooseActivityTypeDialogFragment.showDialog(getSupportFragmentManager(), this, viewBinding.fields.trackEditActivityType.getText().toString()));
 
         viewBinding.fields.trackEditDescription.setText(track.getDescription());
 
@@ -146,6 +146,6 @@ private void setActivityTypeIcon(ActivityType activityType) {
     @Override
     public void onChooseActivityTypeDone(ActivityType activityType) {
         setActivityTypeIcon(activityType);
-        viewBinding.fields.trackEditActivityType.setText(getString(activityType.getFirstLocalizedStringId()));
+        viewBinding.fields.trackEditActivityType.setText(getString(activityType.getLocalizedStringId()));
     }
 }
diff --git a/src/main/java/de/dennisguse/opentracks/TrackRecordingActivity.java b/src/main/java/de/dennisguse/opentracks/TrackRecordingActivity.java
@@ -319,7 +319,7 @@ public TrackDataHub getTrackDataHub() {
     @Override
     public void onChooseActivityTypeDone(ActivityType activityType) {
         Track track = contentProviderUtils.getTrack(trackId);
-        String activityTypeLocalized = getString(activityType.getFirstLocalizedStringId());
+        String activityTypeLocalized = getString(activityType.getLocalizedStringId());
         TrackUtils.updateTrack(this, track, null, activityTypeLocalized, null, contentProviderUtils);
     }
 

diff --git a/src/main/java/de/dennisguse/opentracks/TrackStoppedActivity.java b/src/main/java/de/dennisguse/opentracks/TrackStoppedActivity.java
@@ -65,7 +65,7 @@ protected void onCreate(Bundle savedInstanceState) {
         });
 
         setActivityTypeIcon(track.getActivityType());
-        viewBinding.trackEditActivityTypeIcon.setOnClickListener(v -> ChooseActivityTypeDialogFragment.showDialog(getSupportFragmentManager(), viewBinding.trackEditActivityType.getText().toString()));
+        viewBinding.trackEditActivityTypeIcon.setOnClickListener(v -> ChooseActivityTypeDialogFragment.showDialog(getSupportFragmentManager(), this, viewBinding.trackEditActivityType.getText().toString()));
 
         viewBinding.trackEditDescription.setText(track.getDescription());
 
@@ -74,7 +74,7 @@ protected void onCreate(Bundle savedInstanceState) {
         {
             Pair<String, String> parts = SpeedFormatter.Builder()
                     .setUnit(PreferencesUtils.getUnitSystem())
-                    .setReportSpeedOrPace(PreferencesUtils.isReportSpeed(track.getActivityTypeLocalized()))
+                    .setReportSpeedOrPace(PreferencesUtils.isReportSpeed(track))
                     .build(this)
                     .getSpeedParts(track.getTrackStatistics().getAverageMovingSpeed());
             viewBinding.speed.setText(parts.first);
@@ -132,7 +132,7 @@ private void setActivityTypeIcon(ActivityType activityType) {
     @Override
     public void onChooseActivityTypeDone(ActivityType activityType) {
         setActivityTypeIcon(activityType);
-        viewBinding.trackEditActivityType.setText(getString(activityType.getFirstLocalizedStringId()));
+        viewBinding.trackEditActivityType.setText(getString(activityType.getLocalizedStringId()));
     }
 
     private void resumeTrackAndFinish() {

diff --git a/src/main/java/de/dennisguse/opentracks/chart/ChartFragment.java b/src/main/java/de/dennisguse/opentracks/chart/ChartFragment.java
@@ -65,7 +65,7 @@ public static ChartFragment newInstance(boolean chartByDistance) {
 
     // Stats gathered from the received data
     private final List<ChartPoint> pendingPoints = new ArrayList<>();
-    private String category = "";
+    private String activityTypeLocalized = "";
 
     // Modes of operation
     private boolean chartByDistance;
@@ -87,7 +87,7 @@ public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, Strin
                 }
             }
             if (PreferencesUtils.isKey(R.string.stats_rate_key, key)) {
-                boolean reportSpeed = PreferencesUtils.isReportSpeed(category);
+                boolean reportSpeed = PreferencesUtils.isReportSpeed(activityTypeLocalized);
                 if (reportSpeed != viewBinding.chartView.getReportSpeed()) {
                     viewBinding.chartView.setReportSpeed(reportSpeed);
                     viewBinding.chartView.applyReportSpeed();
@@ -160,12 +160,12 @@ public void onDestroyView() {
     public void onTrackUpdated(Track track) {
         if (isResumed()) {
             if (track == null) {
-                category = "";
+                activityTypeLocalized = "";
                 return;
             }
 
-            category = track.getActivityTypeLocalized();
-            boolean reportSpeed = PreferencesUtils.isReportSpeed(category);
+            activityTypeLocalized = track.getActivityTypeLocalized();
+            boolean reportSpeed = PreferencesUtils.isReportSpeed(activityTypeLocalized);
             if (reportSpeed != viewBinding.chartView.getReportSpeed()) {
                 viewBinding.chartView.setReportSpeed(reportSpeed);
                 viewBinding.chartView.applyReportSpeed();

diff --git a/src/main/java/de/dennisguse/opentracks/data/models/ActivityIcon.java b/src/main/java/de/dennisguse/opentracks/data/models/ActivityIcon.java
@@ -0,0 +1,35 @@
+package de.dennisguse.opentracks.data.models;
+
+import de.dennisguse.opentracks.R;
+
+public enum ActivityIcon {
+    AIRPLANE("AIRPLANE", R.drawable.ic_activity_flight_24dp),
+    BIKE("BIKE", R.drawable.ic_activity_bike_24dp),
+    MOUNTAIN_BIKE("MOUNTAIN_BIKE", R.drawable.ic_activity_mtb_24dp),
+    MOTOR_BIKE("MOTOR_BIKE", R.drawable.ic_activity_motorbike_24dp),
+    KAYAK("KAYAK", R.drawable.ic_activity_kayaking_24dp),
+    BOAT("BOAT", R.drawable.ic_activity_boat_24dp),
+    SAILING("SAILING", R.drawable.ic_activity_sailing_24dp),
+    DRIVE("DRIVE", R.drawable.ic_activity_drive_24dp),
+    RUN("RUN", R.drawable.ic_activity_run_24dp),
+    SKI("SKI", R.drawable.ic_activity_skiing_24dp),
+    SNOW_BOARDING("SNOW_BOARDING", R.drawable.ic_activity_snowboarding_24dp),
+    UNKNOWN("UNKNOWN", R.drawable.ic_logo_24dp),
+    WALK("WALK", R.drawable.ic_activity_walk_24dp),
+    ESCOOTER("ESCOOTER", R.drawable.ic_activity_escooter_24dp),
+    INLINE_SKATING("INLINES_SKATING", R.drawable.ic_activity_inline_skating_24dp),
+    SKATE_BOARDING("SKATE_BOARDING", R.drawable.ic_activity_skateboarding_24dp),
+    CLIMBING("CLIMBING", R.drawable.ic_activity_climbing_24dp),
+    SWIMMING("SWIMMING", R.drawable.ic_activity_swimming_24dp),
+    SWIMMING_OPEN("SWIMMING_OPEN", R.drawable.ic_activity_swimming_open_24dp),
+    WORKOUT("WORKOUT", R.drawable.ic_activity_workout_24dp);
+
+    @Deprecated //TODO should be removed.
+    final String iconId;
+    final int iconDrawableId;
+
+    ActivityIcon(String iconId, int iconDrawableId) {
+        this.iconId = iconId;
+        this.iconDrawableId = iconDrawableId;
+    }
+}