diff --git a/app/src/googleplay/java/org/tasks/location/GoogleMapFragment.java b/app/src/googleplay/java/org/tasks/location/GoogleMapFragment.java index 7381496d0..deec4e8b3 100644 --- a/app/src/googleplay/java/org/tasks/location/GoogleMapFragment.java +++ b/app/src/googleplay/java/org/tasks/location/GoogleMapFragment.java @@ -102,6 +102,11 @@ public class GoogleMapFragment implements MapFragment, OnMapReadyCallback, OnMar callbacks.onMapReady(this); } + @Override + public int getMarkerId() { + return R.id.google_marker; + } + @Override public boolean onMarkerClick(Marker marker) { callbacks.onPlaceSelected((Place) marker.getTag()); diff --git a/app/src/main/java/org/tasks/location/LocationPickerActivity.java b/app/src/main/java/org/tasks/location/LocationPickerActivity.java index 97ac0483e..248971891 100644 --- a/app/src/main/java/org/tasks/location/LocationPickerActivity.java +++ b/app/src/main/java/org/tasks/location/LocationPickerActivity.java @@ -242,6 +242,8 @@ public class LocationPickerActivity extends InjectingAppCompatActivity appBarLayout.post(() -> expandToolbar(false)); } + findViewById(map.getMarkerId()).setVisibility(View.VISIBLE); + recentsAdapter.setHasStableIds(true); recyclerView.setLayoutManager(new LinearLayoutManager(this)); recyclerView.setAdapter(search.isActionViewExpanded() ? searchAdapter : recentsAdapter); diff --git a/app/src/main/java/org/tasks/location/MapFragment.java b/app/src/main/java/org/tasks/location/MapFragment.java index 57f66b470..c558e9988 100644 --- a/app/src/main/java/org/tasks/location/MapFragment.java +++ b/app/src/main/java/org/tasks/location/MapFragment.java @@ -16,6 +16,8 @@ public interface MapFragment { void showMyLocation(); + int getMarkerId(); + interface MapFragmentCallback { void onMapReady(MapFragment mapFragment); diff --git a/app/src/main/java/org/tasks/location/MapboxMapFragment.java b/app/src/main/java/org/tasks/location/MapboxMapFragment.java index 77d8fb3da..434bc4f2e 100644 --- a/app/src/main/java/org/tasks/location/MapboxMapFragment.java +++ b/app/src/main/java/org/tasks/location/MapboxMapFragment.java @@ -111,6 +111,11 @@ public class MapboxMapFragment implements MapFragment, OnMapReadyCallback, OnMar map.setStyle(dark ? Style.DARK : Style.MAPBOX_STREETS, style -> callbacks.onMapReady(this)); } + @Override + public int getMarkerId() { + return R.id.mapbox_marker; + } + @Override public boolean onMarkerClick(@NonNull Marker marker) { Place place = markers.get(marker); diff --git a/app/src/main/res/layout/activity_location_picker.xml b/app/src/main/res/layout/activity_location_picker.xml index 9fce512a1..66b4e7a51 100644 --- a/app/src/main/res/layout/activity_location_picker.xml +++ b/app/src/main/res/layout/activity_location_picker.xml @@ -42,11 +42,25 @@ app:layout_constraintTop_toTopOf="parent"/> + +