From e099c72cc9fd0aa2584c59b479c81b4d8ab87859 Mon Sep 17 00:00:00 2001
From: neslihanturan <tur.neslihan@gmail.com>
Date: Mon, 25 Dec 2017 23:49:07 +0300
Subject: [PATCH] Easy bug fix due to focus

---
 .../fr/free/nrw/commons/nearby/NearbyMapFragment.java     | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

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 de65f80c6..6813661d3 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
@@ -208,6 +208,9 @@ public class NearbyMapFragment extends android.support.v4.app.Fragment {
                     } else if (slideOffset == 0){
                         transparentView.setClickable(false);
                     }
+                } else {
+                    // Not to allow user swipe down, she should press back instead
+                    //bottomSheetDetailsBehavior.setState(BottomSheetBehavior.STATE_COLLAPSED);
                 }
             }
         });
@@ -325,10 +328,13 @@ public class NearbyMapFragment extends android.support.v4.app.Fragment {
                 moreInfo.setVisibility(View.VISIBLE);
                 break;
             case (BottomSheetBehavior.STATE_HIDDEN):
+                transparentView.setClickable(false);
+                transparentView.setAlpha(0);
+                if (!fabList.isShown()) fabList.show();
                 closeFabs(isFabOpen);
                 hideFAB();
+                this.getView().requestFocus();
                 moreInfo.setVisibility(View.GONE);
-                this.getView().clearFocus();
                 break;
         }