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

Cleanup: Marker stores URI to photo (instead of String).

Browse Source
This commit is contained in:
Dennis Guse
2025-02-21 22:50:24 +01:00
parent b9ed5e28e0
commit 1b33184835
17 changed files with 45 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/de/dennisguse/opentracks/ui/markers/MarkerDetailFragment.java
+1 -1
View File
@@ -235,7 +235,7 @@ public class MarkerDetailFragment extends Fragment {
boolean hasPhoto = marker.hasPhoto();
if (hasPhoto) {
handler.removeCallbacks(hideText);
viewBinding.markerDetailMarkerPhoto.setImageURI(marker.getPhotoURI());
viewBinding.markerDetailMarkerPhoto.setImageURI(marker.getPhotoUrl());
handler.postDelayed(hideText, HIDE_TEXT_DELAY.toMillis());
} else {
viewBinding.markerDetailMarkerPhoto.setImageResource(MarkerUtils.ICON_ID);
src/main/java/de/dennisguse/opentracks/ui/markers/MarkerEditActivity.java
+1 -1
View File
@@ -183,7 +183,7 @@ public class MarkerEditActivity extends AbstractActivity {
viewBinding.markerEditMarkerType.setText(marker.getCategory());
viewBinding.markerEditDescription.setText(marker.getDescription());
if (marker.hasPhoto()) {
setMarkerImageView(marker.getPhotoURI());
setMarkerImageView(marker.getPhotoUrl());
} else {
viewBinding.markerEditPhoto.setImageDrawable(null);
}
src/main/java/de/dennisguse/opentracks/ui/markers/MarkerEditViewModel.java
+9 -9
View File
@@ -41,7 +41,7 @@ public class MarkerEditViewModel extends AndroidViewModel {
Marker marker = new ContentProviderUtils(getApplication()).getMarker(markerId);
if (marker.hasPhoto()) {
photoOriginalUri = marker.getPhotoURI();
photoOriginalUri = marker.getPhotoUrl();
}
markerData.postValue(marker);
@@ -71,15 +71,15 @@ public class MarkerEditViewModel extends AndroidViewModel {
private void deletePhoto(Marker marker) {
if (marker.hasPhoto()) {
deletePhoto(marker.getPhotoURI());
deletePhoto(marker.getPhotoUrl());
}
}
public void onPhotoDelete(String name, String category, String description) {
Marker marker = getMarker();
if (marker.hasPhoto()) {
if (!marker.getPhotoURI().equals(photoOriginalUri)) {
deletePhoto(marker.getPhotoURI());
if (!marker.getPhotoUrl().equals(photoOriginalUri)) {
deletePhoto(marker.getPhotoUrl());
}
marker.setPhotoUrl(null);
marker.setName(name);
@@ -91,7 +91,7 @@ public class MarkerEditViewModel extends AndroidViewModel {
public void onNewCameraPhoto(@NonNull Uri photoUri, String name, String category, String description) {
Marker marker = getMarker();
marker.setPhotoUrl(photoUri.toString());
marker.setPhotoUrl(photoUri);
marker.setName(name);
marker.setCategory(category);
marker.setDescription(description);
@@ -107,7 +107,7 @@ public class MarkerEditViewModel extends AndroidViewModel {
FileUtils.copy(srcFd, dstFile);
Uri photoUri = FileUtils.getUriForFile(getApplication(), dstFile);
marker.setPhotoUrl(photoUri.toString());
marker.setPhotoUrl(photoUri);
marker.setName(name);
marker.setCategory(category);
marker.setDescription(description);
@@ -130,7 +130,7 @@ public class MarkerEditViewModel extends AndroidViewModel {
new ContentProviderUtils(getApplication()).updateMarker(getApplication(), marker);
}
if (photoOriginalUri != null && (!marker.hasPhoto() || !photoOriginalUri.equals(marker.getPhotoURI()))) {
if (photoOriginalUri != null && (!marker.hasPhoto() || !photoOriginalUri.equals(marker.getPhotoUrl()))) {
deletePhoto(photoOriginalUri);
}
}
@@ -143,7 +143,7 @@ public class MarkerEditViewModel extends AndroidViewModel {
String name = getApplication().getString(R.string.marker_name_format, nextMarkerNumber + 1);
String icon = getApplication().getString(R.string.marker_icon_url);
Marker marker = new Marker(name, "", "", icon, trackId, trackPoint, "");
Marker marker = new Marker(name, "", "", icon, trackId, trackPoint, null);
if (markerData == null) {
markerData = new MutableLiveData<>();
@@ -158,7 +158,7 @@ public class MarkerEditViewModel extends AndroidViewModel {
// it's new marker -> clean all photos.
deletePhoto(marker);
deletePhoto(photoOriginalUri);
} else if (photoOriginalUri == null || (marker.hasPhoto() && !marker.getPhotoURI().equals(photoOriginalUri))) {
} else if (photoOriginalUri == null || (marker.hasPhoto() && !marker.getPhotoUrl().equals(photoOriginalUri))) {
// it's an edit marker -> delete photo if it was empty or it was changed (leaving the original in that case).
deletePhoto(marker);
}
src/main/java/de/dennisguse/opentracks/ui/markers/MarkerListAdapter.java
+1 -1
View File
@@ -190,7 +190,7 @@ public class MarkerListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
viewBinding.markerListItemPhoto.setLayoutParams(params);
viewBinding.markerListItemTextGradient.setLayoutParams(params);
asyncLoadPhoto(viewBinding.markerListItemPhoto, marker.getPhotoURI(), marker.getId());
asyncLoadPhoto(viewBinding.markerListItemPhoto, marker.getPhotoUrl(), marker.getId());
}
viewBinding.markerListItemName.setText(marker.getName());