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

Cleanup: use Position instead of Android's location.

Browse Source
This commit is contained in:
Dennis Guse
2025-12-02 07:54:22 +01:00
parent 1191f2e1e2
commit 9ba152c469
6 changed files with 17 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/de/dennisguse/opentracks/ui/markers/MarkerEditActivity.java
+8 -12
View File
@@ -37,7 +37,6 @@ import androidx.activity.result.ActivityResultLauncher;
import androidx.activity.result.PickVisualMediaRequest;
import androidx.activity.result.contract.ActivityResultContracts;
import androidx.annotation.NonNull;
import androidx.lifecycle.LiveData;
import androidx.lifecycle.ViewModelProvider;
import java.io.FileDescriptor;
@@ -61,13 +60,14 @@ public class MarkerEditActivity extends AbstractActivity {
public static final String EXTRA_TRACK_ID = "track_id";
public static final String EXTRA_MARKER_ID = "marker_id";
//TODO Check if we can send a position instead.
public static final String EXTRA_LOCATION = "location";
private static final String CAMERA_PHOTO_URI_KEY = "camera_photo_uri_key";
private static final String TAG = MarkerEditActivity.class.getSimpleName();
private Track.Id trackId;
private Location location;
private Position position;
private Marker.Id markerId;
private Marker marker;
@@ -97,7 +97,7 @@ public class MarkerEditActivity extends AbstractActivity {
super.onCreate(savedInstanceState);
trackId = getIntent().getParcelableExtra(EXTRA_TRACK_ID);
location = getIntent().getParcelableExtra(EXTRA_LOCATION);
Location location = getIntent().getParcelableExtra(EXTRA_LOCATION);
markerId = getIntent().getParcelableExtra(EXTRA_MARKER_ID);
if ((trackId == null || location == null) && markerId == null) {
throw new IllegalStateException("TrackId and Location must be provided or an existing markerId");
@@ -139,8 +139,7 @@ public class MarkerEditActivity extends AbstractActivity {
new ActivityResultContracts.StartActivityForResult(),
result -> {
switch (result.getResultCode()) {
case RESULT_CANCELED ->
Toast.makeText(this, R.string.marker_add_photo_canceled, Toast.LENGTH_LONG).show();
case RESULT_CANCELED -> Toast.makeText(this, R.string.marker_add_photo_canceled, Toast.LENGTH_LONG).show();
case RESULT_OK -> viewModel.onNewCameraPhoto(cameraPhotoUri,
viewBinding.markerEditName.getText().toString(),
viewBinding.markerEditMarkerType.getText().toString(),
@@ -162,7 +161,9 @@ public class MarkerEditActivity extends AbstractActivity {
});
if (isNewMarker) {
createNewMarker().observe(this, this::loadMarkerData);
TrackPoint trackPoint = new TrackPoint(TrackPoint.Type.TRACKPOINT, Position.of(location, Instant.now()));
viewModel.createNewMarker(trackId, trackPoint)
.observe(this, this::loadMarkerData);
} else {
loadMarkerData(markerId);
}
@@ -170,11 +171,6 @@ public class MarkerEditActivity extends AbstractActivity {
setSupportActionBar(viewBinding.bottomAppBarLayout.bottomAppBar);
}
private LiveData<Marker> createNewMarker() {
TrackPoint trackPoint = new TrackPoint(TrackPoint.Type.TRACKPOINT, Position.of(location, Instant.now()));
return viewModel.createNewMarker(trackId, trackPoint);
}
private void loadMarkerData(Marker.Id markerId) {
viewModel.getMarkerData(markerId).observe(this, this::loadMarkerData);
}
@@ -198,7 +194,7 @@ public class MarkerEditActivity extends AbstractActivity {
super.onDestroy();
trackId = null;
location = null;
position = null;
markerId = null;
viewBinding = null;
viewModel = null;