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

Marker list: split category and description into two fields.

Browse Source
This commit is contained in:
Dennis Guse
2025-12-03 16:59:48 +01:00
parent d518507193
commit 595ad7f7b5
3 changed files with 19 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/de/dennisguse/opentracks/ui/markers/MarkerListAdapter.java
+2 -3
View File
@@ -35,7 +35,6 @@ import de.dennisguse.opentracks.ui.util.ExecutorListViewService;
import de.dennisguse.opentracks.ui.util.ListItemUtils;
import de.dennisguse.opentracks.ui.util.ThemeUtils;
import de.dennisguse.opentracks.util.IntentUtils;
import de.dennisguse.opentracks.util.StringUtils;
public class MarkerListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> implements ActionMode.Callback {
@@ -196,8 +195,8 @@ public class MarkerListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
ListItemUtils.setDateAndTime(context, viewBinding.markerListItemDate, viewBinding.markerListItemTime, marker.position().time(), timeZone);
}
String categoryDescription = StringUtils.getCategoryDescription(marker.category(), marker.description());
viewBinding.markerListItemTimeDistance.setText(categoryDescription);
viewBinding.markerListItemDescription.setText(marker.description());
viewBinding.markerListItemCategory.setText(marker.category());
setSelected(selection.get((int) getId()));
}
src/main/java/de/dennisguse/opentracks/util/StringUtils.java
-14
View File
@@ -174,20 +174,6 @@ public class StringUtils {
return new Pair<>(value, context.getString(R.string.sensor_unit_power));
}
@Deprecated //TODO use separate UI elements rather than concatenating strings.
public static String getCategoryDescription(String category, String description) {
if (category == null || category.isEmpty()) {
return description;
}
StringBuilder builder = new StringBuilder();
builder.append(category);
if (description != null && !description.isEmpty()) {
builder.append(" ").append(description);
}
return builder.toString();
}
/**
* Formats the given text as a XML CDATA element.
* This includes adding the starting and ending CDATA tags.