diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyActivity.java b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyActivity.java
index 7aecee337..45990c4cd 100644
--- a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyActivity.java
+++ b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyActivity.java
@@ -8,6 +8,8 @@ import android.os.Build;
import android.os.Bundle;
import android.preference.PreferenceManager;
import android.support.annotation.NonNull;
+import android.support.design.widget.BottomSheetBehavior;
+import android.support.design.widget.FloatingActionButton;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentTransaction;
import android.support.v4.widget.SwipeRefreshLayout;
@@ -16,6 +18,7 @@ import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
import android.view.View;
+import android.widget.LinearLayout;
import android.widget.ProgressBar;
import android.widget.Toast;
@@ -50,6 +53,11 @@ public class NearbyActivity extends NavigationBaseActivity implements LocationUp
@BindView(R.id.progressBar)
ProgressBar progressBar;
+ @BindView(R.id.bottom_sheet)
+ LinearLayout bottomSheet;
+ @BindView(R.id.fab_list)
+ FloatingActionButton fabList;
+
@Inject
LocationServiceManager locationManager;
@Inject
@@ -61,6 +69,8 @@ public class NearbyActivity extends NavigationBaseActivity implements LocationUp
private NearbyActivityMode viewMode;
private Disposable placesDisposable;
private boolean lockNearbyView; //Determines if the nearby places needs to be refreshed
+ private BottomSheetBehavior bottomSheetBehavior;
+
@BindView(R.id.swipe_container) SwipeRefreshLayout swipeLayout;
@Override
protected void onCreate(Bundle savedInstanceState) {
@@ -69,6 +79,10 @@ public class NearbyActivity extends NavigationBaseActivity implements LocationUp
setContentView(R.layout.activity_nearby);
ButterKnife.bind(this);
bundle = new Bundle();
+
+ initBottomSheetBehaviour();
+ initFabList();
+
initDrawer();
initViewState();
swipeLayout.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
@@ -88,6 +102,35 @@ public class NearbyActivity extends NavigationBaseActivity implements LocationUp
}
}
+ private void initBottomSheetBehaviour() {
+ bottomSheet.getLayoutParams().height = getWindowManager()
+ .getDefaultDisplay().getHeight() / 16 * 9;
+ bottomSheetBehavior = BottomSheetBehavior.from(bottomSheet);
+ // TODO initProperBottomSheetBehavior();
+ bottomSheetBehavior.setBottomSheetCallback(new BottomSheetBehavior.BottomSheetCallback() {
+
+ @Override
+ public void onStateChanged(View bottomSheet, int newState) {
+ // TODO prepareViewsForSheetPosition(newState);
+ }
+
+ @Override
+ public void onSlide(View bottomSheet, float slideOffset) {
+
+ }
+ });
+ }
+
+ private void initFabList() {
+ fabList.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View view) {
+ //nearbyMapFragment.bottomSheetDetailsBehavior.setState(BottomSheetBehavior.STATE_HIDDEN);
+ bottomSheetBehavior.setState(BottomSheetBehavior.STATE_EXPANDED);
+ }
+ });
+ }
+
@Override
public boolean onCreateOptionsMenu(Menu menu) {
MenuInflater inflater = getMenuInflater();
diff --git a/app/src/main/res/layout/activity_nearby.xml b/app/src/main/res/layout/activity_nearby.xml
index f2c41da5f..f26d7d7fd 100644
--- a/app/src/main/res/layout/activity_nearby.xml
+++ b/app/src/main/res/layout/activity_nearby.xml
@@ -4,16 +4,21 @@
android:id="@+id/drawer_layout"
android:layout_width="match_parent"
android:layout_height="match_parent">
-
-
-
-
+
+ android:layout_height="match_parent">
+
+
+
+
+
+
-