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 910c61328..f6040b8ac 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 @@ -3,9 +3,14 @@ package fr.free.nrw.commons.nearby; import android.graphics.Color; import android.net.Uri; import android.os.Bundle; +import android.preference.PreferenceManager; +import android.support.design.widget.BottomSheetBehavior; +import android.support.design.widget.FloatingActionButton; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import android.view.animation.Animation; +import android.view.animation.AnimationUtils; import com.google.gson.Gson; import com.google.gson.GsonBuilder; @@ -32,6 +37,11 @@ public class NearbyMapFragment extends android.support.v4.app.Fragment { private MapView mapView; private List baseMarkerOptions; private fr.free.nrw.commons.location.LatLng curLatLng; + private View bottomSheetList; + private View bottomSheetDetails; + private BottomSheetBehavior bottomSheetListBehavior; + private BottomSheetBehavior bottomSheetDetailsBehavior; + public NearbyMapFragment() { } @@ -40,6 +50,7 @@ public class NearbyMapFragment extends android.support.v4.app.Fragment { public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); Bundle bundle = this.getArguments(); + initViews(); Gson gson = new GsonBuilder() .registerTypeAdapter(Uri.class, new UriDeserializer()) .create(); @@ -73,6 +84,16 @@ public class NearbyMapFragment extends android.support.v4.app.Fragment { return mapView; } + private void initViews() { + bottomSheetList = getActivity().findViewById(R.id.bottom_sheet); + bottomSheetListBehavior = BottomSheetBehavior.from(bottomSheetList); + bottomSheetDetails = getActivity().findViewById(R.id.bottom_sheet_details); + bottomSheetDetailsBehavior = BottomSheetBehavior.from(bottomSheetDetails); + bottomSheetDetailsBehavior.setState(BottomSheetBehavior.STATE_HIDDEN); + //moreInfo = getActivity().findViewById(R.id.more_info_bar); + + } + private void setupMapView(Bundle savedInstanceState) { MapboxMapOptions options = new MapboxMapOptions() .styleUrl(Style.OUTDOORS) diff --git a/app/src/main/res/layout/activity_nearby.xml b/app/src/main/res/layout/activity_nearby.xml index 7c70bb327..51037c6e4 100644 --- a/app/src/main/res/layout/activity_nearby.xml +++ b/app/src/main/res/layout/activity_nearby.xml @@ -64,6 +64,8 @@ + + diff --git a/app/src/main/res/layout/bottom_sheet_details.xml b/app/src/main/res/layout/bottom_sheet_details.xml new file mode 100644 index 000000000..708a6b24f --- /dev/null +++ b/app/src/main/res/layout/bottom_sheet_details.xml @@ -0,0 +1,157 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +