From 4348dd65aaec061cda3572dc0cb80a40512c7835 Mon Sep 17 00:00:00 2001 From: neslihanturan Date: Mon, 11 Dec 2017 14:22:37 +0300 Subject: [PATCH] Add map marker listener --- .../nrw/commons/nearby/NearbyMapFragment.java | 30 ++++++++++++++++--- 1 file changed, 26 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyMapFragment.java b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyMapFragment.java index a9e842d08..f8aeb6054 100644 --- a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyMapFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyMapFragment.java @@ -48,7 +48,6 @@ public class NearbyMapFragment extends android.support.v4.app.Fragment { private FloatingActionButton fabCamera; private FloatingActionButton fabGallery; private View transparentView; - private int currBottomSheetState; private boolean isFabOpen=false; private Animation rotate_backward; private Animation fab_close; @@ -137,7 +136,8 @@ public class NearbyMapFragment extends android.support.v4.app.Fragment { } }); - bottomSheetDetailsBehavior.setBottomSheetCallback(new BottomSheetBehavior.BottomSheetCallback() { + bottomSheetDetailsBehavior.setBottomSheetCallback(new BottomSheetBehavior + .BottomSheetCallback() { @Override public void onStateChanged(@NonNull View bottomSheet, int newState) { prepareViewsForSheetPosition(newState); @@ -150,6 +150,21 @@ public class NearbyMapFragment extends android.support.v4.app.Fragment { } } }); + + bottomSheetListBehavior.setBottomSheetCallback(new BottomSheetBehavior + .BottomSheetCallback() { + @Override + public void onStateChanged(@NonNull View bottomSheet, int newState) { + if (newState == BottomSheetBehavior.STATE_EXPANDED){ + bottomSheetDetailsBehavior.setState(BottomSheetBehavior.STATE_HIDDEN); + } + } + + @Override + public void onSlide(@NonNull View bottomSheet, float slideOffset) { + + } + }); } private void setupMapView(Bundle savedInstanceState) { @@ -170,7 +185,10 @@ public class NearbyMapFragment extends android.support.v4.app.Fragment { if (marker instanceof NearbyMarker) { NearbyMarker nearbyMarker = (NearbyMarker) marker; Place place = nearbyMarker.getNearbyBaseMarker().getPlace(); - NearbyInfoDialog.showYourself(getActivity(), place); + passInfoToSheet(place); + bottomSheetListBehavior.setState(BottomSheetBehavior.STATE_HIDDEN); + bottomSheetDetailsBehavior.setState(BottomSheetBehavior.STATE_COLLAPSED); + //NearbyInfoDialog.showYourself(getActivity(), place); } return false; }); @@ -257,7 +275,11 @@ public class NearbyMapFragment extends android.support.v4.app.Fragment { fabPlus.hide(); //moreInfo.setVisibility(View.GONE); } - currBottomSheetState = bottomSheetState; + //currBottomSheetState = bottomSheetState; + } + + private void passInfoToSheet(Place place) { + } private void animateFAB(boolean isFabOpen) {