mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-27 04:43:54 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Make marker visible even if bottom sheet is open

Browse source
This commit is contained in:
neslihanturan 2018-03-03 00:25:10 +03:00
parent 2af9a85809
commit 0cbbcad525
1 changed files with 41 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

46
app/src/main/java/fr/free/nrw/commons/nearby/NearbyMapFragment.java
View file

@ -102,6 +102,8 @@ public class NearbyMapFragment extends DaggerFragment {
private MapboxMap mapboxMap; private MapboxMap mapboxMap;
private PolygonOptions currentLocationPolygonOptions; private PolygonOptions currentLocationPolygonOptions;
private boolean isBottomListSheetExpanded;
@Inject @Named("prefs") SharedPreferences prefs; @Inject @Named("prefs") SharedPreferences prefs;
@Inject @Named("direct_nearby_upload_prefs") SharedPreferences directPrefs; @Inject @Named("direct_nearby_upload_prefs") SharedPreferences directPrefs;
@ -255,14 +257,45 @@ public class NearbyMapFragment extends DaggerFragment {
mapboxMap.addPolygon(currentLocationPolygonOptions); mapboxMap.addPolygon(currentLocationPolygonOptions);
} }
// Make camera to follow user on location change // Make camera to follow user on location change
CameraPosition position = new CameraPosition.Builder() CameraPosition position = new CameraPosition.Builder()
.target(curMapBoxLatLng) // Sets the new camera position .target(isBottomListSheetExpanded ?
.zoom(11) // Same zoom level new LatLng(curMapBoxLatLng.getLatitude()- 0.09,
.build(); curMapBoxLatLng.getLongitude())
: curMapBoxLatLng ) // Sets the new camera position
.zoom(11) // Same zoom level
.build();
mapboxMap.animateCamera(CameraUpdateFactory
.newCameraPosition(position), 1000);
}
}
private void updateMapCameraAccordingToBottomSheet(boolean isBottomListSheetExpanded) {
CameraPosition position;
this.isBottomListSheetExpanded = isBottomListSheetExpanded;
if (mapboxMap != null && curLatLng != null) {
if (isBottomListSheetExpanded) {
// Make camera to follow user on location change
position = new CameraPosition.Builder()
.target(new LatLng(curLatLng.getLatitude() - 0.09,
curLatLng.getLongitude())) // Sets the new camera target above current to make it visible when sheet is expanded
.zoom(11) // Same zoom level
.build();
} else {
// Make camera to follow user on location change
position = new CameraPosition.Builder()
.target(new LatLng(curLatLng.getLatitude(),
curLatLng.getLongitude())) // Sets the new camera target above current to make it visible when sheet is expanded
.zoom(11) // Same zoom level
.build();
}
mapboxMap.animateCamera(CameraUpdateFactory mapboxMap.animateCamera(CameraUpdateFactory
.newCameraPosition(position), 1000); .newCameraPosition(position), 1000);
} }
} }
@ -340,6 +373,9 @@ public class NearbyMapFragment extends DaggerFragment {
public void onStateChanged(@NonNull View bottomSheet, int newState) { public void onStateChanged(@NonNull View bottomSheet, int newState) {
if (newState == BottomSheetBehavior.STATE_EXPANDED){ if (newState == BottomSheetBehavior.STATE_EXPANDED){
bottomSheetDetailsBehavior.setState(BottomSheetBehavior.STATE_HIDDEN); bottomSheetDetailsBehavior.setState(BottomSheetBehavior.STATE_HIDDEN);
updateMapCameraAccordingToBottomSheet(true);
} else {
updateMapCameraAccordingToBottomSheet(false);
} }
} }