Cleanup: renaming Marker.category to typeLocalized.

src/androidTest/java/de/dennisguse/opentracks/content/data/TestDataUtil.java

@@ -91,9 +91,9 @@ public class TestDataUtil {
         );
 
         List<Marker> markers = List.of(
-                new Marker(null, trackId, "Marker 1", "Marker description 1", "Marker category 3", trackPoints.get(1).getPosition(),null),
-                new Marker(null, trackId, "Marker 2", "Marker description 2", "Marker category 3", trackPoints.get(4).getPosition(), null),
-                new Marker(null, trackId, "Marker 3", "Marker description 3", "Marker category 3", trackPoints.get(5).getPosition(), null)
+                new Marker(null, trackId, "Marker 1", "Marker description 1", "Marker typeLocalized 3", trackPoints.get(1).getPosition(), null),
+                new Marker(null, trackId, "Marker 2", "Marker description 2", "Marker typeLocalized 3", trackPoints.get(4).getPosition(), null),
+                new Marker(null, trackId, "Marker 3", "Marker description 3", "Marker typeLocalized 3", trackPoints.get(5).getPosition(), null)
         );
 
         return new TrackData(track, trackPoints, markers);
@@ -162,7 +162,7 @@ public class TestDataUtil {
                 trackId,
                 "Marker name",
                 description,
-                "Marker category",
+                "Marker typeLocalized",
                 trackPoint.getPosition(),
                 photoUri);
     }

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

@@ -157,7 +157,7 @@ public class ExportImportTest {
                         trackId,
                         "Marker 1",
                         "Marker 1 desc",
-                        "Marker 1 category",
+                        "Marker 1 typeLocalized",
                         service.getLastStoredTrackPointWithLocation().getPosition(),
                         null
                 ));
@@ -180,7 +180,7 @@ public class ExportImportTest {
                         trackId,
                         "Marker 2",
                         "Marker 2 desc",
-                        "Marker 2 category",
+                        "Marker 2 typeLocalized",
                         service.getLastStoredTrackPointWithLocation().getPosition(),
                         null
                 ));
@@ -555,7 +555,7 @@ public class ExportImportTest {
         for (int i = 0; i < markers.size(); i++) {
             Marker marker = markers.get(i);
             Marker importMarker = importedMarkers.get(i);
-            assertEquals(marker.category(), importMarker.category());
+            assertEquals(marker.typeLocalized(), importMarker.typeLocalized());
             assertEquals(marker.description(), importMarker.description());
             assertEquals(marker.name(), importMarker.name());
             assertNull(importMarker.photoUrl());

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

@@ -41,7 +41,7 @@ import de.dennisguse.opentracks.data.models.TrackPoint;
 @RunWith(AndroidJUnit4.class)
 public class EspressoAggregatedFilterTest {
 
-    private final String CATEGORY = "category";
+    private final String ACTIVITY_TYPE_LOCALIZED = "activityTypeLocalized";
 
     @Rule
     public ActivityScenarioRule<TrackListActivity> mActivityTestRule = new ActivityScenarioRule<>(TrackListActivity.class);
@@ -53,7 +53,7 @@ public class EspressoAggregatedFilterTest {
     public void setUp() {
         Pair<Track, List<TrackPoint>> pair = TestDataUtil.createTrack(new Track.Id(System.currentTimeMillis()), 20);
         TrackBuilder trackBuilder = new TrackBuilder(pair.first);
-        trackBuilder.setActivityTypeLocalized(CATEGORY);
+        trackBuilder.setActivityTypeLocalized(ACTIVITY_TYPE_LOCALIZED);
         TestDataUtil.insertTrackWithLocations(new ContentProviderUtils(ApplicationProvider.getApplicationContext()), trackBuilder.getTrack(), pair.second);
     }
 
@@ -69,9 +69,9 @@ public class EspressoAggregatedFilterTest {
         onView(withId(R.id.bottom_app_bar)).check(matches(hasDescendant(withId(R.id.aggregated_statistics_filter))));
         onView(withId(R.id.aggregated_statistics_filter)).perform(click());
 
-        // check there's a checkbox with CATEGORY text
+        // check there's a checkbox with ACTIVITY_TYPE_LOCALIZED text
         ViewInteraction checkBox = onView(
-                allOf(withId(R.id.filter_dialog_check_button), withText(CATEGORY),
+                allOf(withId(R.id.filter_dialog_check_button), withText(ACTIVITY_TYPE_LOCALIZED),
                         withParent(allOf(withId(R.id.filter_items),
                                 withParent(IsInstanceOf.instanceOf(android.view.ViewGroup.class)))),
                         isDisplayed()));