Cleanup: split ActivityType and ActivityIcon.

Part of #1608.

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

src/androidTest/java/de/dennisguse/opentracks/io/file/importer/GPXTrackImporterTest.java

@@ -83,7 +83,7 @@ public class GPXTrackImporterTest {
         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 class GPXTrackImporterTest {
         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();

src/androidTest/java/de/dennisguse/opentracks/ui/aggregatedStatistics/AggregatedStatisticsTest.java

@@ -243,8 +243,8 @@ public class AggregatedStatisticsTest {
         // Check order
 
         {
-            assertEquals(biking, aggregatedStatistics.getItem(0).getActivityType());
-            assertEquals(driving, aggregatedStatistics.getItem(3).getActivityType());
+            assertEquals(biking, aggregatedStatistics.getItem(0).getActivityTypeLocalized());
+            assertEquals(driving, aggregatedStatistics.getItem(3).getActivityTypeLocalized());
         }
     }
 }