karol/OpenTracks
1
0
Fork 0
forked from upstream-mirrors/OpenTracks
Code Pull Requests Actions Releases 2 Activity

Cleanup: renaming Marker.category to typeLocalized.

Browse Source
This commit is contained in:
Dennis Guse
2025-12-03 17:49:14 +01:00
parent 595ad7f7b5
commit 201f2d1b27
18 changed files with 49 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/de/dennisguse/opentracks/data/ContentProviderUtils.java
+4 -4
View File
@@ -311,7 +311,7 @@ public class ContentProviderUtils {
int idIndex = cursor.getColumnIndexOrThrow(MarkerColumns._ID);
int nameIndex = cursor.getColumnIndexOrThrow(MarkerColumns.NAME);
int descriptionIndex = cursor.getColumnIndexOrThrow(MarkerColumns.DESCRIPTION);
int categoryIndex = cursor.getColumnIndexOrThrow(MarkerColumns.CATEGORY);
int typeLocalizedIndex = cursor.getColumnIndexOrThrow(MarkerColumns.TYPE_LOCALIZED);
int trackIdIndex = cursor.getColumnIndexOrThrow(MarkerColumns.TRACKID);
int longitudeIndex = cursor.getColumnIndexOrThrow(MarkerColumns.LONGITUDE);
int latitudeIndex = cursor.getColumnIndexOrThrow(MarkerColumns.LATITUDE);
@@ -367,7 +367,7 @@ public class ContentProviderUtils {
new Track.Id(cursor.getLong(trackIdIndex)),
!cursor.isNull(nameIndex) ? cursor.getString(nameIndex) : "",
!cursor.isNull(descriptionIndex) ? cursor.getString(descriptionIndex) : "",
!cursor.isNull(categoryIndex) ? cursor.getString(categoryIndex) : "",
!cursor.isNull(typeLocalizedIndex) ? cursor.getString(typeLocalizedIndex) : "",
position,
photoUrl
);
@@ -472,7 +472,7 @@ public class ContentProviderUtils {
values.put(MarkerColumns.NAME, marker.name());
values.put(MarkerColumns.DESCRIPTION, marker.description());
values.put(MarkerColumns.CATEGORY, marker.category());
values.put(MarkerColumns.TYPE_LOCALIZED, marker.typeLocalized());
values.put(MarkerColumns.LONGITUDE, (int) (marker.position().longitude() * 1E6));
values.put(MarkerColumns.LATITUDE, (int) (marker.position().latitude() * 1E6));
@@ -521,7 +521,7 @@ public class ContentProviderUtils {
} else {
selection = MarkerColumns.NAME + " LIKE ? OR " +
MarkerColumns.DESCRIPTION + " LIKE ? OR " +
MarkerColumns.CATEGORY + " LIKE ?";
MarkerColumns.TYPE_LOCALIZED + " LIKE ?";
selectionArgs = new String[]{"%" + query + "%", "%" + query + "%", "%" + query + "%"};
sortOrder = MarkerColumns.DEFAULT_SORT_ORDER + " DESC";
}
src/main/java/de/dennisguse/opentracks/data/models/Marker.java
+1 -1
View File
@@ -23,7 +23,7 @@ public record Marker(
@NonNull
String description,
@NonNull
String category,
String typeLocalized,
//Some data might not be used.
Position position,
src/main/java/de/dennisguse/opentracks/data/models/MarkerBuilder.java
+8 -8
View File
@@ -34,7 +34,7 @@ public final class MarkerBuilder {
private Marker.Id id;
private String name;
private String description;
private String category;
private String typeLocalized;
private final Track.Id trackId;
//Some data might not be used.
@@ -48,7 +48,7 @@ public final class MarkerBuilder {
this.trackId = trackId;
this.name = "";
this.description = "";
this.category = "";
this.typeLocalized = "";
this.photoUrl = null;
if (!trackPoint.hasLocation())
@@ -57,11 +57,11 @@ public final class MarkerBuilder {
this.position = trackPoint.getPosition();
}
public MarkerBuilder(@Nullable Track.Id trackId, @NonNull TrackPoint trackPoint, String name, String description, String category, Uri photoUrl) {
public MarkerBuilder(@Nullable Track.Id trackId, @NonNull TrackPoint trackPoint, String name, String description, String typeLocalized, Uri photoUrl) {
this(trackId, trackPoint);
this.name = name;
this.description = description;
this.category = category;
this.typeLocalized = typeLocalized;
this.photoUrl = photoUrl;
}
@@ -70,7 +70,7 @@ public final class MarkerBuilder {
this.trackId = marker.trackId();
this.name = marker.name();
this.description = marker.description();
this.category = marker.category();
this.typeLocalized = marker.typeLocalized();
this.position = marker.position();
this.photoUrl = marker.photoUrl();
}
@@ -102,8 +102,8 @@ public final class MarkerBuilder {
this.description = description;
}
public void setCategory(String category) {
this.category = category;
public void setTypeLocalized(String typeLocalized) {
this.typeLocalized = typeLocalized;
}
public Track.Id getTrackId() {
@@ -128,7 +128,7 @@ public final class MarkerBuilder {
trackId,
name,
description,
category,
typeLocalized,
position,
photoUrl
);
src/main/java/de/dennisguse/opentracks/data/tables/MarkerColumns.java
+2 -2
View File
@@ -38,7 +38,7 @@ public interface MarkerColumns extends BaseColumns {
// Columns
String NAME = "name"; // marker name
String DESCRIPTION = "description"; // marker description
String CATEGORY = "category"; // marker category
String TYPE_LOCALIZED = "category";
String TRACKID = "trackid"; // track id
String LONGITUDE = "longitude"; // longitude
String LATITUDE = "latitude"; // latitude
@@ -53,7 +53,7 @@ public interface MarkerColumns extends BaseColumns {
+ _ID + " INTEGER PRIMARY KEY AUTOINCREMENT, "
+ NAME + " TEXT, "
+ DESCRIPTION + " TEXT, "
+ CATEGORY + " TEXT, "
+ TYPE_LOCALIZED + " TEXT, "
+ TRACKID + " INTEGER NOT NULL, "
+ LONGITUDE + " INTEGER, "
+ LATITUDE + " INTEGER, "
src/main/java/de/dennisguse/opentracks/io/file/TrackFilenameGenerator.java
+1 -1
View File
@@ -20,7 +20,7 @@ public class TrackFilenameGenerator {
public static final String UUID_KEY = "{uuid}";
public static final String TRACKNAME_KEY = "{name}";
public static final String ACTIVITY_TYPE_KEY = "{category}";
public static final String ACTIVITY_TYPE_KEY = "{typeLocalized}";
public static final String STARTTIME_TIME_KEY = "{time}";
public static final String STARTTIME_DATE_KEY = "{date}";
src/main/java/de/dennisguse/opentracks/io/file/exporter/GPXTrackExporter.java
+1 -1
View File
@@ -256,7 +256,7 @@ public class GPXTrackExporter implements TrackExporter {
printWriter.println("<time>" + StringUtils.formatDateTimeIso8601(marker.position().time(), zoneOffset) + "</time>");
printWriter.println("<name>" + StringUtils.formatCData(marker.name()) + "</name>");
printWriter.println("<desc>" + StringUtils.formatCData(marker.description()) + "</desc>");
printWriter.println("<type>" + StringUtils.formatCData(marker.category()) + "</type>"); //TODO This is localized; may be better to export in English only. See #1608
printWriter.println("<type>" + StringUtils.formatCData(marker.typeLocalized()) + "</type>"); //TODO This is localized; may be better to export in English only. See #1608
printWriter.println("</wpt>");
}
src/main/java/de/dennisguse/opentracks/io/file/exporter/KMLTrackExporter.java
+3 -3
View File
@@ -266,10 +266,10 @@ public class KMLTrackExporter implements TrackExporter {
private void writeMarker(Marker marker, ZoneOffset zoneOffset) {
boolean existsPhoto = MarkerUtils.buildInternalPhotoFile(context, marker.trackId(), marker.photoUrl()) != null;
if (marker.photoUrl() != null && exportPhotos && existsPhoto) {
if (exportPhotos && existsPhoto) {
writePhotoOverlay(marker, zoneOffset);
} else {
writePlacemark(marker.name(), marker.category(), marker.description(), marker.position(), marker.position().time(), zoneOffset);
writePlacemark(marker.name(), marker.typeLocalized(), marker.description(), marker.position(), marker.position().time(), zoneOffset);
}
}
@@ -437,7 +437,7 @@ public class KMLTrackExporter implements TrackExporter {
printWriter.println("</Camera>");
printWriter.println("<TimeStamp><when>" + getTime(zoneOffset, marker.position().time()) + "</when></TimeStamp>");
printWriter.println("<styleUrl>#" + MARKER_STYLE + "</styleUrl>");
writeTypeLocalized(marker.category());
writeTypeLocalized(marker.typeLocalized());
if (exportPhotos) {
printWriter.println("<Icon><href>" + KMZTrackExporter.buildKmzImageFilePath(marker) + "</href></Icon>");
src/main/java/de/dennisguse/opentracks/io/file/importer/KMLTrackImporter.java
+1 -1
View File
@@ -142,7 +142,7 @@ public class KMLTrackImporter extends DefaultHandler implements XMLImporter.Trac
public void startElement(String uri, String localName, String tag, Attributes attributes) throws SAXException {
switch (tag) {
case TAG_PLACEMARK, TAG_PHOTO_OVERLAY ->
// Note that a track is contained in a Placemark, calling onMarkerStart will clear various track variables like name, category, and description.
// Note that a track is contained in a Placemark, calling onMarkerStart will clear various track variables like name, typeLocalized, and description.
onMarkerStart();
case TAG_MULTI_TRACK, TAG_KML22_MULTI_TRACK -> trackImporter.newTrack();
case TAG_TRACK, TAG_KML22_TRACK -> {
src/main/java/de/dennisguse/opentracks/settings/ActivityTypePreference.java
+2 -2
View File
@@ -101,8 +101,8 @@ public class ActivityTypePreference extends DialogPreference {
}
private void showIconSelectDialog() {
String category = PreferencesUtils.getDefaultActivityTypeLocalized();
ChooseActivityTypeDialogFragment.showDialog(getActivity().getSupportFragmentManager(), getContext(), category);
String activityTypeLocalized = PreferencesUtils.getDefaultActivityTypeLocalized();
ChooseActivityTypeDialogFragment.showDialog(getActivity().getSupportFragmentManager(), getContext(), activityTypeLocalized);
}
@Override
src/main/java/de/dennisguse/opentracks/ui/markers/MarkerDetailFragment.java
+1 -1
View File
@@ -186,7 +186,7 @@ public class MarkerDetailFragment extends Fragment {
viewBinding.markerDetailMarkerPhoto.setImageDrawable(MarkerUtils.getDefaultPhoto(getContext()));
}
viewBinding.markerDetailMarkerCategory.setText(marker.category());
viewBinding.markerDetailMarkerTypeLocalized.setText(marker.typeLocalized());
viewBinding.markerDetailMarkerDescription.setText(marker.description());
viewBinding.markerDetailMarkerLocation.setText(StringUtils.formatCoordinate(getContext(), marker.position()));
src/main/java/de/dennisguse/opentracks/ui/markers/MarkerEditActivity.java
+1 -1
View File
@@ -178,7 +178,7 @@ public class MarkerEditActivity extends AbstractActivity {
private void loadMarkerData(Marker data) {
marker = data;
viewBinding.markerEditName.setText(marker.name());
viewBinding.markerEditMarkerType.setText(marker.category());
viewBinding.markerEditMarkerType.setText(marker.typeLocalized());
viewBinding.markerEditDescription.setText(marker.description());
if (marker.photoUrl() != null) {
setMarkerImageView(marker.photoUrl());
src/main/java/de/dennisguse/opentracks/ui/markers/MarkerEditViewModel.java
+8 -8
View File
@@ -76,7 +76,7 @@ public class MarkerEditViewModel extends AndroidViewModel {
}
}
public void onPhotoDelete(String name, String category, String description) {
public void onPhotoDelete(String name, String typeLocalized, String description) {
MarkerBuilder marker = new MarkerBuilder(getMarker());
if (marker.hasPhoto()) {
if (!marker.getPhotoUrl().equals(photoOriginalUri)) {
@@ -84,22 +84,22 @@ public class MarkerEditViewModel extends AndroidViewModel {
}
marker.setPhotoUrl(null);
marker.setName(name);
marker.setCategory(category);
marker.setTypeLocalized(typeLocalized);
marker.setDescription(description);
markerData.postValue(marker.getMarker());
}
}
public void onNewCameraPhoto(@NonNull Uri photoUri, String name, String category, String description) {
public void onNewCameraPhoto(@NonNull Uri photoUri, String name, String typeLocalized, String description) {
MarkerBuilder marker = new MarkerBuilder(getMarker());
marker.setPhotoUrl(photoUri);
marker.setName(name);
marker.setCategory(category);
marker.setTypeLocalized(typeLocalized);
marker.setDescription(description);
markerData.postValue(marker.getMarker());
}
public void onNewGalleryPhoto(@NonNull Uri srcUri, String name, String category, String description) {
public void onNewGalleryPhoto(@NonNull Uri srcUri, String name, String typeLocalized, String description) {
MarkerBuilder marker = new MarkerBuilder(getMarker());
try (ParcelFileDescriptor parcelFd = getApplication().getContentResolver().openFileDescriptor(srcUri, "r")) {
@@ -110,7 +110,7 @@ public class MarkerEditViewModel extends AndroidViewModel {
Uri photoUri = FileUtils.getUriForFile(getApplication(), dstFile);
marker.setPhotoUrl(photoUri);
marker.setName(name);
marker.setCategory(category);
marker.setTypeLocalized(typeLocalized);
marker.setDescription(description);
markerData.postValue(marker.getMarker());
@@ -120,11 +120,11 @@ public class MarkerEditViewModel extends AndroidViewModel {
}
}
public void onDone(String name, String category, String description) {
public void onDone(String name, String typeLocalized, String description) {
MarkerBuilder marker = new MarkerBuilder(getMarker());
marker.setName(name);
marker.setCategory(category);
marker.setTypeLocalized(typeLocalized);
marker.setDescription(description);
if (marker.getId() == null) {
new ContentProviderUtils(getApplication()).insertMarker(marker.getMarker());
src/main/java/de/dennisguse/opentracks/ui/markers/MarkerListAdapter.java
+1 -1
View File
@@ -196,7 +196,7 @@ public class MarkerListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
}
viewBinding.markerListItemDescription.setText(marker.description());
viewBinding.markerListItemCategory.setText(marker.category());
viewBinding.markerListItemTypeLocalized.setText(marker.typeLocalized());
setSelected(selection.get((int) getId()));
}