From 05e98307be89b2a04a57287750deca50f265cd22 Mon Sep 17 00:00:00 2001
From: Ashish Kumar <ashishkumar468@gmail.com>
Date: Tue, 4 Feb 2020 14:35:29 +0530
Subject: [PATCH] Fixes #3303 (#3322)

* Fixes #3303
* Refactor Nearby to alig lifecycle methods

* Pass updated place list to listfragment

* Added default zoom rate to mapbox

* Removed NearbyListFragmet and added the ui login to handle the same in NearbyParentFragment

* More code refactor
* Make BottomSheetList hideable
* onFragmentHide, hide the bottom sheets

* BigFix, Fragmet visibility, register/un-register camera move based on fragments lifecycke

* More code refactor
* Let the ExecutorUtil have non-ui thread
* Add Location Marker on non-ui thread (the non-ui stuffs)

* BugFixes
* Removed configchanges "orientation" from MainActivity in Manifest (That was messing with the fragment lifecycle)
* Some null checks
* Initialise lastknown location in onMapReady

* UI Fixes
* Adjusted UI to support dark and no-dark themes both (in nearby)
* Do not update map on Location Slightly changed

* Fix failing test case, let TestCommonsApplication extend Application instead of CommonsApplication

* start map view when nearby is visible

* start the map when NearbyFragmet is visible

* More bugfixes
* Added DUMMY view for NearbyPresenter's onDetach State
* Added a wrapper frame layout parent for MapView to preven it from drawing above other views

* More bugfixes (Fixes #3287)
* Gray out the un-selected markers from the nearby filter list

* BugFix, search this area should search the nearby places for the current camera position

* More BugFixes
* Handle null primitives with proxy
* Current location marker flow via permission flow

* onCameraMove should have null-check on NearbyController.latestSearchLocation instead of currentLocation

* Search for places around last focus location

* Handle location updates
* If the user is browsing the map, donot update the map with current location
---
 app/build.gradle                              |   3 +-
 app/src/main/AndroidManifest.xml              |   2 +-
 .../free/nrw/commons/CommonsApplication.java  |   2 +
 .../commons/contributions/MainActivity.java   |  17 +-
 .../nrw/commons/di/FragmentBuilderModule.java |   8 -
 .../nrw/commons/nearby/CheckBoxTriStates.java |  14 +-
 .../commons/nearby/NearbyAdapterFactory.java  |   4 -
 ...NearbyFilterSearchRecyclerViewAdapter.java |  25 +-
 .../nrw/commons/nearby/PlaceRenderer.java     |   7 +-
 .../nearby/contract/NearbyMapContract.java    |  36 -
 .../NearbyParentFragmentContract.java         |  51 +-
 .../nearby/fragments/NearbyListFragment.java  | 104 ---
 .../nearby/fragments/NearbyMapFragment.java   | 596 ------------
 .../fragments/NearbyParentFragment.java       | 874 +++++++++++++-----
 .../NearbyParentFragmentPresenter.java        | 278 +++---
 .../free/nrw/commons/utils/ExecutorUtils.java |   9 +
 app/src/main/res/layout-v21/drawer_view.xml   |  10 +
 .../main/res/layout/bottom_sheet_details.xml  |   2 +-
 .../main/res/layout/bottom_sheet_nearby.xml   |  57 +-
 app/src/main/res/layout/drawer_view.xml       |   1 +
 .../main/res/layout/fragment_nearby_list.xml  |   1 +
 .../res/layout/fragment_nearby_parent.xml     |  24 +-
 .../res/layout/nearby_search_list_item.xml    |  11 +-
 .../layout/nearby_search_list_item_dark.xml   |  19 +
 app/src/main/res/values/strings.xml           |   2 +-
 25 files changed, 909 insertions(+), 1248 deletions(-)
 delete mode 100644 app/src/main/java/fr/free/nrw/commons/nearby/contract/NearbyMapContract.java
 create mode 100644 app/src/main/res/layout-v21/drawer_view.xml
 create mode 100644 app/src/main/res/layout/nearby_search_list_item_dark.xml

diff --git a/app/build.gradle b/app/build.gradle
index 36280e48a0..c2e618c177 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -36,7 +36,7 @@ dependencies {
     implementation 'fr.avianey.com.viewpagerindicator:library:2.4.1.1@aar'
     implementation 'com.github.chrisbanes:PhotoView:2.0.0'
     implementation 'com.github.pedrovgs:renderers:3.3.3'
-    implementation 'com.mapbox.mapboxsdk:mapbox-android-sdk:7.2.0'
+    implementation 'com.mapbox.mapboxsdk:mapbox-android-sdk:8.6.1'
     implementation 'com.mapbox.mapboxsdk:mapbox-android-plugin-localization-v7:0.7.0'
     implementation 'com.github.deano2390:MaterialShowcaseView:1.2.0'
     implementation 'com.dinuscxj:circleprogressbar:1.1.1'
@@ -102,6 +102,7 @@ dependencies {
 
     //swipe_layout
     implementation 'com.daimajia.swipelayout:library:1.2.0@aar'
+    implementation 'com.squareup.retrofit2:retrofit:2.7.1'
 }
 
 android {
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index ad88b720cf..458db48be3 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -78,7 +78,7 @@
             android:name=".contributions.MainActivity"
             android:icon="@mipmap/ic_launcher"
             android:label="@string/app_name"
-            android:configChanges="orientation|screenSize|keyboard" />
+            android:configChanges="screenSize|keyboard" />
         <activity
             android:name=".settings.SettingsActivity"
             android:label="@string/title_activity_settings" />
diff --git a/app/src/main/java/fr/free/nrw/commons/CommonsApplication.java b/app/src/main/java/fr/free/nrw/commons/CommonsApplication.java
index 2efc433001..c0bc11ba92 100644
--- a/app/src/main/java/fr/free/nrw/commons/CommonsApplication.java
+++ b/app/src/main/java/fr/free/nrw/commons/CommonsApplication.java
@@ -19,6 +19,7 @@
 import com.facebook.imagepipeline.producers.FetchState;
 import com.facebook.imagepipeline.producers.NetworkFetcher;
 import com.facebook.imagepipeline.producers.ProducerContext;
+import com.mapbox.mapboxsdk.Mapbox;
 import com.squareup.leakcanary.LeakCanary;
 import com.squareup.leakcanary.RefWatcher;
 
@@ -134,6 +135,7 @@ public void onCreate() {
 
         INSTANCE = this;
         ACRA.init(this);
+        Mapbox.getInstance(this, getString(R.string.mapbox_commons_app_token));
 
         ApplicationlessInjection
                 .getInstance(this)
diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/MainActivity.java b/app/src/main/java/fr/free/nrw/commons/contributions/MainActivity.java
index 67e67fbf3b..1d1e560d38 100644
--- a/app/src/main/java/fr/free/nrw/commons/contributions/MainActivity.java
+++ b/app/src/main/java/fr/free/nrw/commons/contributions/MainActivity.java
@@ -35,7 +35,6 @@
 import fr.free.nrw.commons.location.LocationServiceManager;
 import fr.free.nrw.commons.nearby.NearbyNotificationCardView;
 import fr.free.nrw.commons.nearby.fragments.NearbyParentFragment;
-import fr.free.nrw.commons.nearby.presenter.NearbyParentFragmentPresenter;
 import fr.free.nrw.commons.notification.Notification;
 import fr.free.nrw.commons.notification.NotificationActivity;
 import fr.free.nrw.commons.notification.NotificationController;
@@ -78,6 +77,7 @@ public class MainActivity extends NavigationBaseActivity implements FragmentMana
 
     private MenuItem notificationsMenuItem;
     private TextView notificationCount;
+    private NearbyParentFragment nearbyParentFragment;
 
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -188,8 +188,6 @@ public void onPageSelected(int position) {
                         tabLayout.getTabAt(NEARBY_TAB_POSITION).select();
                         isContributionsFragmentVisible = false;
                         updateMenuItem();
-                        // Do all permission and GPS related tasks on tab selected, not on create
-                        NearbyParentFragmentPresenter.getInstance().onTabSelected();
                         break;
                     default:
                         tabLayout.getTabAt(CONTRIBUTIONS_TAB_POSITION).select();
@@ -265,7 +263,9 @@ public void onBackPressed() {
             }
         } else if (getSupportFragmentManager().findFragmentByTag(nearbyFragmentTag) != null && !isContributionsFragmentVisible) {
             // Means that nearby fragment is visible (not contributions fragment)
-            NearbyParentFragmentPresenter.getInstance().backButtonClicked();
+            if (null != nearbyParentFragment) {
+                nearbyParentFragment.backButtonClicked();
+            }
         } else {
             super.onBackPressed();
         }
@@ -380,12 +380,13 @@ public Fragment getItem(int position) {
                     }
 
                 case 1:
-                    NearbyParentFragment retainedNearbyFragment = getNearbyFragment(1);
-                    if (retainedNearbyFragment != null) {
-                        return retainedNearbyFragment;
+                    nearbyParentFragment = getNearbyFragment(1);
+                    if (nearbyParentFragment != null) {
+                        return nearbyParentFragment;
                     } else {
                         // If we reach here, retainedNearbyFragment is null
-                        return new NearbyParentFragment();
+                        nearbyParentFragment=new NearbyParentFragment();
+                        return nearbyParentFragment;
                     }
                 default:
                     return null;
diff --git a/app/src/main/java/fr/free/nrw/commons/di/FragmentBuilderModule.java b/app/src/main/java/fr/free/nrw/commons/di/FragmentBuilderModule.java
index 15b8e6026c..e2be74d0f4 100644
--- a/app/src/main/java/fr/free/nrw/commons/di/FragmentBuilderModule.java
+++ b/app/src/main/java/fr/free/nrw/commons/di/FragmentBuilderModule.java
@@ -13,8 +13,6 @@
 import fr.free.nrw.commons.explore.recentsearches.RecentSearchesFragment;
 import fr.free.nrw.commons.media.MediaDetailFragment;
 import fr.free.nrw.commons.media.MediaDetailPagerFragment;
-import fr.free.nrw.commons.nearby.fragments.NearbyListFragment;
-import fr.free.nrw.commons.nearby.fragments.NearbyMapFragment;
 import fr.free.nrw.commons.nearby.fragments.NearbyParentFragment;
 import fr.free.nrw.commons.review.ReviewImageFragment;
 import fr.free.nrw.commons.settings.SettingsFragment;
@@ -40,9 +38,6 @@ public abstract class FragmentBuilderModule {
     @ContributesAndroidInjector
     abstract MediaDetailPagerFragment bindMediaDetailPagerFragment();
 
-    @ContributesAndroidInjector
-    abstract NearbyListFragment bindNearbyListFragment();
-
     @ContributesAndroidInjector
     abstract SettingsFragment bindSettingsFragment();
 
@@ -64,9 +59,6 @@ public abstract class FragmentBuilderModule {
     @ContributesAndroidInjector
     abstract ContributionsFragment bindContributionsFragment();
 
-    @ContributesAndroidInjector
-    abstract NearbyMapFragment bindNearbyMapFragment();
-
     @ContributesAndroidInjector
     abstract NearbyParentFragment bindNearbyParentFragment();
 
diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/CheckBoxTriStates.java b/app/src/main/java/fr/free/nrw/commons/nearby/CheckBoxTriStates.java
index d95c1dd163..e8fc70873d 100644
--- a/app/src/main/java/fr/free/nrw/commons/nearby/CheckBoxTriStates.java
+++ b/app/src/main/java/fr/free/nrw/commons/nearby/CheckBoxTriStates.java
@@ -9,6 +9,8 @@
 import androidx.annotation.Nullable;
 import androidx.appcompat.widget.AppCompatCheckBox;
 
+import java.util.List;
+
 import fr.free.nrw.commons.R;
 import fr.free.nrw.commons.nearby.presenter.NearbyParentFragmentPresenter;
 
@@ -25,6 +27,16 @@ public class CheckBoxTriStates extends AppCompatCheckBox {
 
     private int state;
 
+    private Callback callback;
+
+    public interface Callback{
+        void filterByMarkerType(@Nullable List<Label> selectedLabels, int state, boolean b, boolean b1);
+    }
+
+    public void setCallback(Callback callback) {
+        this.callback = callback;
+    }
+
     /**
      * This is the listener set to the super class which is going to be evoke each
      * time the check state has changed.
@@ -87,7 +99,7 @@ public void setState(int state) {
             }
 
             if (NearbyController.currentLocation != null) {
-                NearbyParentFragmentPresenter.getInstance().filterByMarkerType(null, state, false, true);
+                callback.filterByMarkerType(null, state, false, true);
             }
             updateBtn();
         }
diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyAdapterFactory.java b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyAdapterFactory.java
index 97f6164fca..2dc2e4e404 100644
--- a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyAdapterFactory.java
+++ b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyAdapterFactory.java
@@ -17,10 +17,6 @@ public class NearbyAdapterFactory {
     private Fragment fragment;
     private ContributionController controller;
 
-    NearbyAdapterFactory(){
-
-    }
-
     public NearbyAdapterFactory(Fragment fragment, ContributionController controller) {
         this.fragment = fragment;
         this.controller = controller;
diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyFilterSearchRecyclerViewAdapter.java b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyFilterSearchRecyclerViewAdapter.java
index 9352fdd8aa..efe89db950 100644
--- a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyFilterSearchRecyclerViewAdapter.java
+++ b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyFilterSearchRecyclerViewAdapter.java
@@ -27,20 +27,24 @@ public class NearbyFilterSearchRecyclerViewAdapter
 
     private final LayoutInflater inflater;
     private Context context;
-    private RecyclerView recyclerView;
     private ArrayList<Label> labels;
     private ArrayList<Label> displayedLabels;
     public ArrayList<Label> selectedLabels = new ArrayList<>();
 
     private int state;
 
+    private Callback callback;
+
     RecyclerView.SmoothScroller smoothScroller;
 
+    public void setCallback(Callback callback) {
+        this.callback = callback;
+    }
+
     public NearbyFilterSearchRecyclerViewAdapter(Context context, ArrayList<Label> labels, RecyclerView recyclerView) {
         this.context = context;
         this.labels = labels;
         this.displayedLabels = labels;
-        this.recyclerView = recyclerView;
         smoothScroller = new
                 LinearSmoothScroller(context) {
                     @Override protected int getVerticalSnapPreference() {
@@ -66,7 +70,7 @@ public RecyclerViewHolder(View view) {
     @NonNull
     @Override
     public RecyclerViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-        View itemView = inflater.inflate(R.layout.nearby_search_list_item, parent, false);
+        View itemView = inflater.inflate(callback.isDarkTheme()?R.layout.nearby_search_list_item_dark:R.layout.nearby_search_list_item, parent, false);
         return new RecyclerViewHolder(itemView);
     }
 
@@ -76,9 +80,9 @@ public void onBindViewHolder(@NonNull RecyclerViewHolder holder, int position) {
         holder.placeTypeIcon.setImageResource(label.getIcon());
         holder.placeTypeLabel.setText(label.toString());
 
-        holder.placeTypeLayout.setBackgroundColor(label.isSelected() ? ContextCompat.getColor(context, R.color.divider_grey) : Color.WHITE);
+        holder.placeTypeLayout.setBackgroundColor(label.isSelected() ? ContextCompat.getColor(context, R.color.divider_grey) : callback.isDarkTheme()?Color.BLACK:Color.WHITE);
         holder.placeTypeLayout.setOnClickListener(view -> {
-            NearbyParentFragmentPresenter.getInstance().setCheckboxUnknown();
+            callback.setCheckboxUnknown();
             if (label.isSelected()) {
                 selectedLabels.remove(label);
             } else {
@@ -86,7 +90,7 @@ public void onBindViewHolder(@NonNull RecyclerViewHolder holder, int position) {
             }
             label.setSelected(!label.isSelected());
             holder.placeTypeLayout.setBackgroundColor(label.isSelected() ? ContextCompat.getColor(context, R.color.divider_grey) : Color.WHITE);
-            NearbyParentFragmentPresenter.getInstance().filterByMarkerType(selectedLabels, 0, false, false);
+            callback.filterByMarkerType(selectedLabels, 0, false, false);
         });
     }
 
@@ -161,8 +165,13 @@ public void setRecyclerViewAdapterAllSelected() {
         notifyDataSetChanged();
     }
 
-    public void setRecyclerViewAdapterNeutral() {
-        state = CheckBoxTriStates.UNKNOWN;
+    public interface  Callback{
+
+        void setCheckboxUnknown();
+
+        void filterByMarkerType(ArrayList<Label> selectedLabels, int i, boolean b, boolean b1);
+
+        boolean isDarkTheme();
     }
 
 }
diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/PlaceRenderer.java b/app/src/main/java/fr/free/nrw/commons/nearby/PlaceRenderer.java
index 19773b6d16..e8f2cf9740 100644
--- a/app/src/main/java/fr/free/nrw/commons/nearby/PlaceRenderer.java
+++ b/app/src/main/java/fr/free/nrw/commons/nearby/PlaceRenderer.java
@@ -34,11 +34,9 @@
 import fr.free.nrw.commons.contributions.ContributionController;
 import fr.free.nrw.commons.di.ApplicationlessInjection;
 import fr.free.nrw.commons.kvstore.JsonKvStore;
-import fr.free.nrw.commons.nearby.fragments.NearbyMapFragment;
 import fr.free.nrw.commons.nearby.fragments.NearbyParentFragment;
 import timber.log.Timber;
 
-import static fr.free.nrw.commons.nearby.fragments.NearbyParentFragment.TAG_RETAINED_MAP_FRAGMENT;
 import static fr.free.nrw.commons.theme.NavigationBaseActivity.startActivityWithFlags;
 import static fr.free.nrw.commons.wikidata.WikidataConstants.PLACE_OBJECT;
 
@@ -121,7 +119,7 @@ protected void hookListeners(View view) {
                 }
             }
             if (onBookmarkClick == null) {
-                ((NearbyParentFragment) fragment.getParentFragment()).centerMapToPlace(place);
+                ((NearbyParentFragment) fragment).centerMapToPlace(place);
             }
         };
         view.setOnClickListener(listener);
@@ -194,8 +192,7 @@ protected void hookListeners(View view) {
                     onBookmarkClick.onClick();
                 }
                 else {
-                    ((NearbyMapFragment)(fragment.getParentFragment()).getChildFragmentManager().
-                            findFragmentByTag(TAG_RETAINED_MAP_FRAGMENT)).
+                    ((NearbyParentFragment) (fragment.getParentFragment())).
                             updateMarker(isBookmarked, place, null);
                 }
             }
diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/contract/NearbyMapContract.java b/app/src/main/java/fr/free/nrw/commons/nearby/contract/NearbyMapContract.java
deleted file mode 100644
index 94a93b5d06..0000000000
--- a/app/src/main/java/fr/free/nrw/commons/nearby/contract/NearbyMapContract.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package fr.free.nrw.commons.nearby.contract;
-
-import com.mapbox.mapboxsdk.annotations.Marker;
-import com.mapbox.mapboxsdk.maps.MapboxMap;
-
-import java.util.List;
-
-import fr.free.nrw.commons.location.LatLng;
-import fr.free.nrw.commons.nearby.Label;
-import fr.free.nrw.commons.nearby.NearbyBaseMarker;
-import fr.free.nrw.commons.nearby.Place;
-import fr.free.nrw.commons.nearby.presenter.NearbyParentFragmentPresenter;
-
-/**
- * This interface defines specific View and UserActions for map
- * part of the nearby.
- */
-public interface NearbyMapContract {
-
-    interface View{
-        void updateMapMarkers(LatLng latLng, List<Place> placeList, Marker selectedMarker, NearbyParentFragmentPresenter nearbyParentFragmentPresenter);
-        void updateMapToTrackPosition(LatLng curLatLng);
-        void addCurrentLocationMarker(LatLng curLatLng);
-        void addNearbyMarkersToMapBoxMap(List<NearbyBaseMarker> baseMarkerOptions, Marker marker, NearbyParentFragmentPresenter nearbyParentFragmentPresenter);
-        LatLng getCameraTarget();
-        MapboxMap getMapboxMap();
-        void viewsAreAssignedToPresenter(NearbyParentFragmentContract.ViewsAreReadyCallback viewsAreReadyCallback);
-        void addOnCameraMoveListener(MapboxMap.OnCameraMoveListener onCameraMoveListener);
-        void centerMapToPlace(Place place, boolean isPortraitMode);
-        void removeCurrentLocationMarker();
-        List<NearbyBaseMarker> getBaseMarkerOptions();
-        void filterMarkersByLabels(List<Label> labelList, boolean displayExists, boolean displayNeeds, boolean filterForPlaceState, boolean filterForAllNoneType);
-        void filterOutAllMarkers();
-        void displayAllMarkers();
-    }
-}
diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/contract/NearbyParentFragmentContract.java b/app/src/main/java/fr/free/nrw/commons/nearby/contract/NearbyParentFragmentContract.java
index 873e2e2ea3..fb857dee7a 100644
--- a/app/src/main/java/fr/free/nrw/commons/nearby/contract/NearbyParentFragmentContract.java
+++ b/app/src/main/java/fr/free/nrw/commons/nearby/contract/NearbyParentFragmentContract.java
@@ -1,5 +1,7 @@
 package fr.free.nrw.commons.nearby.contract;
 
+import android.content.Context;
+
 import com.mapbox.mapboxsdk.annotations.Marker;
 import com.mapbox.mapboxsdk.maps.MapboxMap;
 
@@ -9,16 +11,16 @@
 import fr.free.nrw.commons.location.LatLng;
 import fr.free.nrw.commons.location.LocationServiceManager;
 import fr.free.nrw.commons.nearby.Label;
+import fr.free.nrw.commons.nearby.NearbyBaseMarker;
 import fr.free.nrw.commons.nearby.Place;
+import fr.free.nrw.commons.nearby.presenter.NearbyParentFragmentPresenter;
 
 public interface NearbyParentFragmentContract {
 
     interface View {
-        void registerLocationUpdates(LocationServiceManager locationServiceManager);
         boolean isNetworkConnectionEstablished();
-        void addNetworkBroadcastReceiver();
         void listOptionMenuItemClicked();
-        void  populatePlaces(LatLng curlatLng, LatLng searchLatLng);
+        void populatePlaces(LatLng curlatLng);
         boolean isListBottomSheetExpanded();
         void checkPermissionsAndPerformAction(Runnable runnable);
         void displayLoginSkippedWarning();
@@ -29,7 +31,7 @@ interface View {
         void hideBottomSheet();
         void hideBottomDetailsSheet();
         void displayBottomSheetWithInfo(Marker marker);
-        void addOnCameraMoveListener(MapboxMap.OnCameraMoveListener onCameraMoveListener);
+        void addOnCameraMoveListener();
         void addSearchThisAreaButtonAction();
         void setSearchThisAreaButtonVisibility(boolean isVisible);
         void setProgressBarVisibility(boolean isVisible);
@@ -44,6 +46,29 @@ interface View {
         void setFilterState();
         void disableFABRecenter();
         void enableFABRecenter();
+        void addCurrentLocationMarker(LatLng curLatLng);
+
+        void updateMapToTrackPosition(LatLng curLatLng);
+
+        Context getContext();
+
+        void updateMapMarkers(List<NearbyBaseMarker> nearbyBaseMarkers, Marker selectedMarker);
+
+        void filterOutAllMarkers();
+
+        void displayAllMarkers();
+
+        void filterMarkersByLabels(List<Label> selectedLabels, boolean existsSelected, boolean needPhotoSelected, boolean filterForPlaceState, boolean filterForAllNoneType);
+
+        LatLng getCameraTarget();
+
+        void centerMapToPlace(Place placeToCenter);
+
+        void updateListFragment(List<Place> placeList);
+
+        LatLng getLastLocation();
+
+        com.mapbox.mapboxsdk.geometry.LatLng getLastFocusLocation();
     }
 
     interface NearbyListView {
@@ -51,19 +76,21 @@ interface NearbyListView {
     }
 
     interface UserActions {
-        void onTabSelected();
-        void checkForPermission();
-        void updateMapAndList(LocationServiceManager.LocationChangeType locationChangeType, LatLng cameraTarget);
+        void updateMapAndList(LocationServiceManager.LocationChangeType locationChangeType);
         void lockUnlockNearby(boolean isNearbyLocked);
+
+        void attachView(View view);
+
+        void detachView();
+
         void setActionListeners(JsonKvStore applicationKvStore);
         void backButtonClicked();
-        MapboxMap.OnCameraMoveListener onCameraMove(MapboxMap mapboxMap);
+        void onCameraMove(com.mapbox.mapboxsdk.geometry.LatLng latLng);
         void filterByMarkerType(List<Label> selectedLabels, int state, boolean filterForPlaceState, boolean filterForAllNoneType);
+
+        void updateMapMarkersToController(List<NearbyBaseMarker> nearbyBaseMarkers);
+
         void searchViewGainedFocus();
         void setCheckboxUnknown();
     }
-    
-    interface ViewsAreReadyCallback {
-        void nearbyFragmentsAreReady();
-    }
 }
diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/fragments/NearbyListFragment.java b/app/src/main/java/fr/free/nrw/commons/nearby/fragments/NearbyListFragment.java
index 99c6bb73c6..e69de29bb2 100644
--- a/app/src/main/java/fr/free/nrw/commons/nearby/fragments/NearbyListFragment.java
+++ b/app/src/main/java/fr/free/nrw/commons/nearby/fragments/NearbyListFragment.java
@@ -1,104 +0,0 @@
-package fr.free.nrw.commons.nearby.fragments;
-
-import android.content.Context;
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-
-import com.google.gson.Gson;
-import com.google.gson.reflect.TypeToken;
-import com.pedrogomez.renderers.RVRendererAdapter;
-
-import java.lang.reflect.Type;
-import java.util.Collections;
-import java.util.List;
-
-import javax.inject.Inject;
-
-import fr.free.nrw.commons.R;
-import fr.free.nrw.commons.contributions.ContributionController;
-import fr.free.nrw.commons.di.CommonsDaggerSupportFragment;
-import fr.free.nrw.commons.location.LatLng;
-import fr.free.nrw.commons.nearby.NearbyAdapterFactory;
-import fr.free.nrw.commons.nearby.NearbyController;
-import fr.free.nrw.commons.nearby.Place;
-import fr.free.nrw.commons.nearby.contract.NearbyParentFragmentContract;
-import timber.log.Timber;
-
-public class NearbyListFragment extends CommonsDaggerSupportFragment implements NearbyParentFragmentContract.NearbyListView {
-
-    private static final Type LIST_TYPE = new TypeToken<List<Place>>() {
-    }.getType();
-    private static final Type CUR_LAT_LNG_TYPE = new TypeToken<LatLng>() {
-    }.getType();
-
-    private NearbyAdapterFactory adapterFactory;
-    private RecyclerView recyclerView;
-
-    @Inject ContributionController controller;
-    @Inject Gson gson;
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setRetainInstance(true);
-    }
-
-    @Override
-    public void onAttach(Context context) {
-        super.onAttach(context);
-    }
-
-    @Override
-    public View onCreateView(LayoutInflater inflater,
-                             ViewGroup container,
-                             Bundle savedInstanceState) {
-        Timber.d("NearbyListFragment created");
-        View view = inflater.inflate(R.layout.fragment_nearby_list, container, false);
-        recyclerView = view.findViewById(R.id.listView);
-        recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
-        adapterFactory = new NearbyAdapterFactory(this, controller);
-        return view;
-    }
-
-    @Override
-    public void onViewCreated(View view, Bundle savedInstanceState) {
-        // Check that this is the first time view is created,
-        // to avoid double list when screen orientation changed
-        Bundle bundle = this.getArguments();
-        recyclerView.setAdapter(adapterFactory.create(getPlaceListFromBundle(bundle)));
-    }
-
-    /**
-     * When user moved too much, we need to update nearby list too. This operation is made by passing
-     * a bundle from NearbyFragment to NearbyListFragment and NearbyMapFragment. This method extracts
-     * place list from bundle to a list variable.
-     * @param bundle Bundle passed from NearbyFragment on users significant moving
-     * @return List of new nearby places
-     */
-    private List<Place> getPlaceListFromBundle(Bundle bundle) {
-        List<Place> placeList = Collections.emptyList();
-
-        if (bundle != null) {
-            String gsonPlaceList = bundle.getString("PlaceList", "[]");
-            placeList = gson.fromJson(gsonPlaceList, LIST_TYPE);
-
-            String gsonLatLng = bundle.getString("CurLatLng");
-            LatLng curLatLng = gson.fromJson(gsonLatLng, CUR_LAT_LNG_TYPE);
-
-            placeList = NearbyController.loadAttractionsFromLocationToPlaces(curLatLng, placeList);
-        }
-
-        return placeList;
-    }
-
-    @Override
-    public void updateListFragment(List<Place> placeList) {
-        Timber.d("Update list fragment");
-        adapterFactory.updateAdapterData(placeList, (RVRendererAdapter<Place>) recyclerView.getAdapter());
-    }
-}
diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/fragments/NearbyMapFragment.java b/app/src/main/java/fr/free/nrw/commons/nearby/fragments/NearbyMapFragment.java
index 3280a80cb4..e69de29bb2 100644
--- a/app/src/main/java/fr/free/nrw/commons/nearby/fragments/NearbyMapFragment.java
+++ b/app/src/main/java/fr/free/nrw/commons/nearby/fragments/NearbyMapFragment.java
@@ -1,596 +0,0 @@
-package fr.free.nrw.commons.nearby.fragments;
-
-import android.content.Context;
-import android.graphics.Bitmap;
-import android.os.Bundle;
-import android.util.AttributeSet;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.vectordrawable.graphics.drawable.VectorDrawableCompat;
-
-import com.mapbox.mapboxsdk.annotations.Icon;
-import com.mapbox.mapboxsdk.annotations.IconFactory;
-import com.mapbox.mapboxsdk.annotations.Marker;
-import com.mapbox.mapboxsdk.annotations.MarkerOptions;
-import com.mapbox.mapboxsdk.annotations.Polygon;
-import com.mapbox.mapboxsdk.annotations.PolygonOptions;
-import com.mapbox.mapboxsdk.camera.CameraPosition;
-import com.mapbox.mapboxsdk.camera.CameraUpdateFactory;
-import com.mapbox.mapboxsdk.maps.MapFragment;
-import com.mapbox.mapboxsdk.maps.MapView;
-import com.mapbox.mapboxsdk.maps.MapboxMap;
-import com.mapbox.mapboxsdk.maps.MapboxMapOptions;
-import com.mapbox.mapboxsdk.maps.OnMapReadyCallback;
-import com.mapbox.mapboxsdk.utils.MapFragmentUtils;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-
-import javax.inject.Inject;
-
-import fr.free.nrw.commons.R;
-import fr.free.nrw.commons.bookmarks.locations.BookmarkLocationsDao;
-import fr.free.nrw.commons.di.CommonsDaggerSupportFragment;
-import fr.free.nrw.commons.location.LatLng;
-import fr.free.nrw.commons.nearby.Label;
-import fr.free.nrw.commons.nearby.MarkerPlaceGroup;
-import fr.free.nrw.commons.nearby.NearbyBaseMarker;
-import fr.free.nrw.commons.nearby.NearbyController;
-import fr.free.nrw.commons.nearby.NearbyMarker;
-import fr.free.nrw.commons.nearby.Place;
-import fr.free.nrw.commons.nearby.contract.NearbyMapContract;
-import fr.free.nrw.commons.nearby.contract.NearbyParentFragmentContract;
-import fr.free.nrw.commons.nearby.presenter.NearbyParentFragmentPresenter;
-import fr.free.nrw.commons.utils.LocationUtils;
-import fr.free.nrw.commons.utils.UiUtils;
-import timber.log.Timber;
-
-import static fr.free.nrw.commons.utils.LengthUtils.formatDistanceBetween;
-
-/**
- * Support Fragment wrapper around a map view.
- * <p>
- * A Map component in an app. This fragment is the simplest way to place a map in an application.
- * It's a wrapper around a view of a map to automatically handle the necessary life cycle needs.
- * Being a fragment, this component can be added to an activity's layout or can dynamically be added
- * using a FragmentManager.
- * </p>
- * <p>
- * To get a reference to the MapView, use {@link #getMapAsync(OnMapReadyCallback)}}
- * </p>
- *
- * @see #getMapAsync(OnMapReadyCallback)
- */
-public class NearbyMapFragment extends CommonsDaggerSupportFragment
-        implements OnMapReadyCallback, NearbyMapContract.View{
-
-    @Inject
-    BookmarkLocationsDao bookmarkLocationDao;
-
-    private final List<OnMapReadyCallback> mapReadyCallbackList = new ArrayList<>();
-    private MapFragment.OnMapViewReadyCallback mapViewReadyCallback;
-    private MapboxMap mapboxMap;
-    private MapView map;
-    private Marker currentLocationMarker;
-    private Polygon currentLocationPolygon;
-    private List<NearbyBaseMarker> customBaseMarkerOptions;
-
-    private final double CAMERA_TARGET_SHIFT_FACTOR_PORTRAIT = 0.005;
-    private final double CAMERA_TARGET_SHIFT_FACTOR_LANDSCAPE = 0.004;
-    private static final double ZOOM_LEVEL = 14f;
-
-    /**
-     * Creates a MapFragment instance
-     *
-     * @param mapboxMapOptions The configuration options to be used.
-     * @return MapFragment created.
-     */
-    @NonNull
-    public static NearbyMapFragment newInstance(@Nullable MapboxMapOptions mapboxMapOptions) {
-        NearbyMapFragment mapFragment = new NearbyMapFragment();
-        mapFragment.setArguments(MapFragmentUtils.createFragmentArgs(mapboxMapOptions));
-        return mapFragment;
-    }
-
-    /**
-     * Called when the context attaches to this fragment.
-     *
-     * @param context the context attaching
-     */
-    @Override
-    public void onAttach(Context context) {
-        super.onAttach(context);
-        if (context instanceof MapFragment.OnMapViewReadyCallback) {
-            mapViewReadyCallback = (MapFragment.OnMapViewReadyCallback) context;
-        }
-    }
-
-    /**
-     * Called when this fragment is inflated, parses XML tag attributes.
-     *
-     * @param context            The context inflating this fragment.
-     * @param attrs              The XML tag attributes.
-     * @param savedInstanceState The saved instance state for the map fragment.
-     */
-    @Override
-    public void onInflate(@NonNull Context context, AttributeSet attrs, Bundle savedInstanceState) {
-        super.onInflate(context, attrs, savedInstanceState);
-        setArguments(MapFragmentUtils.createFragmentArgs(MapboxMapOptions.createFromAttributes(context, attrs)));
-    }
-
-    /**
-     * Creates the fragment view hierarchy.
-     *
-     * @param inflater           Inflater used to inflate content.
-     * @param container          The parent layout for the map fragment.
-     * @param savedInstanceState The saved instance state for the map fragment.
-     * @return The view created
-     */
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        super.onCreateView(inflater, container, savedInstanceState);
-        Context context = inflater.getContext();
-        map = new MapView(context, MapFragmentUtils.resolveArgs(context, getArguments()));
-        return map;
-    }
-
-    /**
-     * Called when the fragment view hierarchy is created.
-     *
-     * @param view               The content view of the fragment
-     * @param savedInstanceState THe saved instance state of the framgnt
-     */
-    @Override
-    public void onViewCreated(View view, Bundle savedInstanceState) {
-        super.onViewCreated(view, savedInstanceState);
-        map.onCreate(savedInstanceState);
-        map.getMapAsync(this);
-
-        // notify listeners about MapView creation
-        if (mapViewReadyCallback != null) {
-            mapViewReadyCallback.onMapViewReady(map);
-        }
-    }
-
-    @Override
-    public void onMapReady(@NonNull MapboxMap mapboxMap) {
-        this.mapboxMap = mapboxMap;
-        for (OnMapReadyCallback onMapReadyCallback : mapReadyCallbackList) {
-            onMapReadyCallback.onMapReady(mapboxMap);
-        }
-    }
-
-    /**
-     * Called when the fragment is visible for the users.
-     */
-    @Override
-    public void onStart() {
-        super.onStart();
-        map.onStart();
-    }
-
-    /**
-     * Called when the fragment is ready to be interacted with.
-     */
-    @Override
-    public void onResume() {
-        super.onResume();
-        map.onResume();
-    }
-
-    /**
-     * Called when the fragment is pausing.
-     */
-    @Override
-    public void onPause() {
-        super.onPause();
-        map.onPause();
-    }
-
-    /**
-     * Called when the fragment state needs to be saved.
-     *
-     * @param outState The saved state
-     */
-    @Override
-    public void onSaveInstanceState(@NonNull Bundle outState) {
-        super.onSaveInstanceState(outState);
-        if (map != null) {
-            map.onSaveInstanceState(outState);
-        }
-    }
-
-    /**
-     * Called when the fragment is no longer visible for the user.
-     */
-    @Override
-    public void onStop() {
-        super.onStop();
-        map.onStop();
-    }
-
-    /**
-     * Called when the fragment receives onLowMemory call from the hosting Activity.
-     */
-    @Override
-    public void onLowMemory() {
-        super.onLowMemory();
-        if (map != null) {
-            map.onLowMemory();
-        }
-    }
-
-    /**
-     * Called when the fragment is view hierarchy is being destroyed.
-     */
-    @Override
-    public void onDestroyView() {
-        super.onDestroyView();
-        map.onDestroy();
-    }
-
-    /**
-     * Called when the fragment is destroyed.
-     */
-    @Override
-    public void onDestroy() {
-        super.onDestroy();
-        mapReadyCallbackList.clear();
-    }
-
-    /**
-     * Sets a callback object which will be triggered when the MapboxMap instance is ready to be used.
-     *
-     * @param onMapReadyCallback The callback to be invoked.
-     */
-    public void getMapAsync(@NonNull final OnMapReadyCallback onMapReadyCallback) {
-        if (mapboxMap == null) {
-            mapReadyCallbackList.add(onMapReadyCallback);
-        } else {
-            onMapReadyCallback.onMapReady(mapboxMap);
-        }
-    }
-
-    /**
-     * Clears map, adds nearby markers to map
-     * @param latLng current location
-     * @param placeList all places will be displayed on the map
-     * @param selectedMarker clicked marker by user
-     * @param nearbyParentFragmentPresenter presenter
-     */
-    @Override
-    public void updateMapMarkers(LatLng latLng, List<Place> placeList
-                                                , Marker selectedMarker
-                                                , NearbyParentFragmentPresenter nearbyParentFragmentPresenter) {
-        Timber.d("Updates map markers");
-        customBaseMarkerOptions =  NearbyController
-                .loadAttractionsFromLocationToBaseMarkerOptions(latLng, // Curlatlang will be used to calculate distances
-                        placeList,
-                        getActivity(),
-                        bookmarkLocationDao.getAllBookmarksLocations());
-        mapboxMap.clear();
-        addNearbyMarkersToMapBoxMap(customBaseMarkerOptions, selectedMarker, nearbyParentFragmentPresenter);
-        // Re-enable mapbox gestures on custom location markers load
-        mapboxMap.getUiSettings().setAllGesturesEnabled(true);
-    }
-
-    /**
-     * Makes map camera follow users location with animation
-     * @param curLatLng current location of user
-     */
-    @Override
-    public void updateMapToTrackPosition(LatLng curLatLng) {
-        Timber.d("Updates map camera to track user position");
-        CameraPosition cameraPosition = new CameraPosition.Builder().target
-                (LocationUtils.commonsLatLngToMapBoxLatLng(curLatLng)).build();
-        mapboxMap.setCameraPosition(cameraPosition);
-        mapboxMap.animateCamera(CameraUpdateFactory
-                .newCameraPosition(cameraPosition), 1000);
-    }
-
-    /**
-     * Adds a marker for the user's current position. Adds a
-     * circle which uses the accuracy * 2, to draw a circle
-     * which represents the user's position with an accuracy
-     * of 95%.
-     *
-     * Should be called only on creation of mapboxMap, there
-     * is other method to update markers location with users
-     * move.
-     * @param curLatLng current location
-     */
-    @Override
-    public void addCurrentLocationMarker(LatLng curLatLng) {
-        if (null != curLatLng) {
-            removeCurrentLocationMarker();
-            Timber.d("Adds current location marker");
-
-            Icon icon = IconFactory.getInstance(getContext())
-                    .fromResource(R.drawable.current_location_marker);
-
-            MarkerOptions currentLocationMarkerOptions = new MarkerOptions()
-                    .position(new com.mapbox.mapboxsdk.geometry.LatLng(curLatLng.getLatitude(),
-                            curLatLng.getLongitude()));
-            currentLocationMarkerOptions.setIcon(icon); // Set custom icon
-            currentLocationMarker = mapboxMap.addMarker(currentLocationMarkerOptions);
-
-            List<com.mapbox.mapboxsdk.geometry.LatLng> circle = UiUtils
-                    .createCircleArray(curLatLng.getLatitude(), curLatLng.getLongitude(),
-                            curLatLng.getAccuracy() * 2, 100);
-
-            PolygonOptions currentLocationPolygonOptions = new PolygonOptions()
-                    .addAll(circle)
-                    .strokeColor(getResources().getColor(R.color.current_marker_stroke))
-                    .fillColor(getResources().getColor(R.color.current_marker_fill));
-            currentLocationPolygon = mapboxMap.addPolygon(currentLocationPolygonOptions);
-        } else {
-            Timber.d("not adding current location marker..current location is null");
-        }
-    }
-
-    @Override
-    public void removeCurrentLocationMarker() {
-        if (currentLocationMarker != null) {
-            mapboxMap.removeMarker(currentLocationMarker);
-            mapboxMap.removePolygon(currentLocationPolygon);
-        }
-    }
-
-    /**
-     * Filters markers based on selectedLabels and chips
-     * @param selectedLabels label list that user clicked
-     * @param displayExists chip for displaying only existing places
-     * @param displayNeedsPhoto chip for displaying only places need photos
-     * @param filterForPlaceState true if we filter places for place state
-     * @param filterForAllNoneType true if we filter places with all none button
-     */
-    @Override
-    public void filterMarkersByLabels(List<Label> selectedLabels,
-                                      boolean displayExists,
-                                      boolean displayNeedsPhoto,
-                                      boolean filterForPlaceState,
-                                      boolean filterForAllNoneType) {
-
-        if (selectedLabels.size() == 0 && filterForPlaceState) { // If nothing is selected, display all
-            greyOutAllMarkers();
-            for (MarkerPlaceGroup markerPlaceGroup : NearbyController.markerLabelList) {
-                if (displayExists && displayNeedsPhoto) {
-                    // Exists and needs photo
-                    if (markerPlaceGroup.getPlace().destroyed.trim().isEmpty() && markerPlaceGroup.getPlace().pic.trim().isEmpty()) {
-                        updateMarker(markerPlaceGroup.getIsBookmarked(), markerPlaceGroup.getPlace(), NearbyController.currentLocation);
-                    }
-                } else if (displayExists && !displayNeedsPhoto) {
-                    // Exists and all included needs and doesn't needs photo
-                    if (markerPlaceGroup.getPlace().destroyed.trim().isEmpty()) {
-                        updateMarker(markerPlaceGroup.getIsBookmarked(), markerPlaceGroup.getPlace(), NearbyController.currentLocation);
-                    }
-                } else if (!displayExists && displayNeedsPhoto) {
-                    // All and only needs photo
-                    if (markerPlaceGroup.getPlace().pic.trim().isEmpty()) {
-                        updateMarker(markerPlaceGroup.getIsBookmarked(), markerPlaceGroup.getPlace(), NearbyController.currentLocation);
-                    }
-                } else if (!displayExists && !displayNeedsPhoto) {
-                    // all
-                    updateMarker(markerPlaceGroup.getIsBookmarked(), markerPlaceGroup.getPlace(), NearbyController.currentLocation);
-                }
-
-                //updateMarker(markerPlaceGroup.getIsBookmarked(), markerPlaceGroup.getPlace(), NearbyController.currentLocation);
-            }
-        } else {
-            // First greyed out all markers
-            greyOutAllMarkers();
-            for (MarkerPlaceGroup markerPlaceGroup : NearbyController.markerLabelList) {
-                for (Label label : selectedLabels) {
-                    if (markerPlaceGroup.getPlace().getLabel().toString().equals(label.toString())) {
-
-                        if (displayExists && displayNeedsPhoto) {
-                            // Exists and needs photo
-                            if (markerPlaceGroup.getPlace().destroyed.trim().isEmpty() && markerPlaceGroup.getPlace().pic.trim().isEmpty()) {
-                                updateMarker(markerPlaceGroup.getIsBookmarked(), markerPlaceGroup.getPlace(), NearbyController.currentLocation);
-                            }
-                        } else if (displayExists && !displayNeedsPhoto) {
-                            // Exists and all included needs and doesn't needs photo
-                            if (markerPlaceGroup.getPlace().destroyed.trim().isEmpty()) {
-                                updateMarker(markerPlaceGroup.getIsBookmarked(), markerPlaceGroup.getPlace(), NearbyController.currentLocation);
-                            }
-                        } else if (!displayExists && displayNeedsPhoto) {
-                            // All and only needs photo
-                            if (markerPlaceGroup.getPlace().pic.trim().isEmpty()) {
-                                updateMarker(markerPlaceGroup.getIsBookmarked(), markerPlaceGroup.getPlace(), NearbyController.currentLocation);
-                            }
-                        } else if (!displayExists && !displayNeedsPhoto) {
-                            // all
-                            updateMarker(markerPlaceGroup.getIsBookmarked(), markerPlaceGroup.getPlace(), NearbyController.currentLocation);
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * Greys out all markers
-     */
-    @Override
-    public void filterOutAllMarkers() {
-        greyOutAllMarkers();
-    }
-
-    /**
-     * Displays all markers
-     */
-    @Override
-    public void displayAllMarkers() {
-        for (MarkerPlaceGroup markerPlaceGroup : NearbyController.markerLabelList) {
-            updateMarker(markerPlaceGroup.getIsBookmarked(), markerPlaceGroup.getPlace(), NearbyController.currentLocation);
-        }
-    }
-
-    @Override
-    public List<NearbyBaseMarker> getBaseMarkerOptions() {
-        return customBaseMarkerOptions;
-    }
-
-    /**
-     * Adds markers to map
-     * @param baseMarkerList is markers will be added
-     * @param selectedMarker is selected marker by user
-     * @param nearbyParentFragmentPresenter presenter
-     */
-    @Override
-    public void addNearbyMarkersToMapBoxMap(@Nullable List<NearbyBaseMarker> baseMarkerList
-                                                        , Marker selectedMarker
-                                                        , NearbyParentFragmentPresenter nearbyParentFragmentPresenter) {
-        List<Marker> markers = mapboxMap.addMarkers(baseMarkerList);
-        NearbyController.markerExistsMap = new HashMap<Boolean, Marker>();
-        NearbyController.markerNeedPicMap = new HashMap<Boolean, Marker>();
-
-        NearbyController.markerLabelList.clear();
-
-        for (int i = 0; i < baseMarkerList.size(); i++) {
-
-            NearbyBaseMarker nearbyBaseMarker = baseMarkerList.get(i);
-            NearbyController.markerLabelList.add(
-                    new MarkerPlaceGroup(markers.get(i), bookmarkLocationDao.findBookmarkLocation(baseMarkerList.get(i).getPlace()), nearbyBaseMarker.getPlace()));
-            //TODO: fix bookmark location
-            NearbyController.markerExistsMap.put((baseMarkerList.get(i).getPlace().hasWikidataLink()), markers.get(i));
-            NearbyController.markerNeedPicMap.put(((baseMarkerList.get(i).getPlace().pic == null) ? true : false), markers.get(i));
-        }
-
-        map.getMapAsync(mapboxMap -> {
-            mapboxMap.addMarkers(baseMarkerList);
-            setMapMarkerActions(selectedMarker, nearbyParentFragmentPresenter);
-        });
-    }
-
-    @Override
-    public LatLng getCameraTarget() {
-        return LocationUtils
-                .mapBoxLatLngToCommonsLatLng(mapboxMap.getCameraPosition().target);
-    }
-
-    @Override
-    public MapboxMap getMapboxMap() {
-        return mapboxMap;
-    }
-
-    @Override
-    public void viewsAreAssignedToPresenter(NearbyParentFragmentContract.ViewsAreReadyCallback viewsAreReadyCallback) {
-
-    }
-
-    @Override
-    public void addOnCameraMoveListener(MapboxMap.OnCameraMoveListener onCameraMoveListener) {
-
-    }
-
-    void setMapMarkerActions(Marker selected, NearbyParentFragmentPresenter nearbyParentFragmentPresenter) {
-        getMapboxMap().setOnInfoWindowCloseListener(marker -> {
-            if (marker == selected) {
-                nearbyParentFragmentPresenter.markerUnselected();
-            }
-        });
-
-        getMapboxMap().setOnMarkerClickListener(marker -> {
-
-            if (marker instanceof NearbyMarker) {
-                nearbyParentFragmentPresenter.markerSelected(marker);
-            }
-            return false;
-        });
-    }
-
-    /**
-     * Sets marker icon according to marker status. Sets title and distance.
-     * @param isBookmarked true if place is bookmarked
-     * @param place
-     * @param curLatLng current location
-     */
-    public void updateMarker(boolean isBookmarked, Place place, @Nullable LatLng curLatLng) {
-
-        VectorDrawableCompat vectorDrawable;
-        if (isBookmarked) {
-            vectorDrawable = VectorDrawableCompat.create(
-                    getContext().getResources(), R.drawable.ic_custom_bookmark_marker, getContext().getTheme()
-            );
-        } else if (!place.pic.trim().isEmpty()) {
-            vectorDrawable = VectorDrawableCompat.create( // Means place has picture
-                    getContext().getResources(), R.drawable.ic_custom_map_marker_green, getContext().getTheme()
-            );
-        } else if (!place.destroyed.trim().isEmpty()) { // Means place is destroyed
-            vectorDrawable = VectorDrawableCompat.create( // Means place has picture
-                    getContext().getResources(), R.drawable.ic_custom_map_marker_grey, getContext().getTheme()
-            );
-        } else {
-            vectorDrawable = VectorDrawableCompat.create(
-                    getContext().getResources(), R.drawable.ic_custom_map_marker, getContext().getTheme()
-            );
-        }
-        for (Marker marker : mapboxMap.getMarkers()) {
-            if (marker.getTitle() != null && marker.getTitle().equals(place.getName())) {
-
-                Bitmap icon = UiUtils.getBitmap(vectorDrawable);
-                if (curLatLng != null) {
-                    String distance = formatDistanceBetween(curLatLng, place.location);
-                    place.setDistance(distance);
-                }
-
-                NearbyBaseMarker nearbyBaseMarker = new NearbyBaseMarker();
-                nearbyBaseMarker.title(place.name);
-                nearbyBaseMarker.position(
-                        new com.mapbox.mapboxsdk.geometry.LatLng(
-                                place.location.getLatitude(),
-                                place.location.getLongitude()));
-                nearbyBaseMarker.place(place);
-                nearbyBaseMarker.icon(IconFactory.getInstance(getContext())
-                        .fromBitmap(icon));
-                marker.setIcon(IconFactory.getInstance(getContext()).fromBitmap(icon));
-            }
-        }
-    }
-
-    /**
-     * Greys out all markers except current location marker
-     */
-    public void greyOutAllMarkers() {
-        VectorDrawableCompat vectorDrawable;
-            vectorDrawable = VectorDrawableCompat.create(
-                    getContext().getResources(), R.drawable.ic_custom_greyed_out_marker, getContext().getTheme());
-        Bitmap icon = UiUtils.getBitmap(vectorDrawable);
-        for (Marker marker : mapboxMap.getMarkers()) {
-            if (currentLocationMarker.getTitle() != marker.getTitle()) {
-                marker.setIcon(IconFactory.getInstance(getContext()).fromBitmap(icon));
-            }
-        }
-        addCurrentLocationMarker(NearbyController.currentLocation);
-    }
-
-    /**
-     * Centers the map in nearby fragment to a given place
-     * @param place is new center of the map
-     */
-    @Override
-    public void centerMapToPlace(Place place, boolean isPortraitMode) {
-        Timber.d("Map is centered to place");
-        double cameraShift;
-        if (isPortraitMode) {
-            cameraShift = CAMERA_TARGET_SHIFT_FACTOR_PORTRAIT;
-        } else {
-            cameraShift = CAMERA_TARGET_SHIFT_FACTOR_LANDSCAPE;
-        }
-        CameraPosition position = new CameraPosition.Builder()
-                .target(LocationUtils.commonsLatLngToMapBoxLatLng(
-                        new LatLng(place.location.getLatitude()-cameraShift,
-                                place.getLocation().getLongitude(),
-                                0))) // Sets the new camera position
-                .zoom(ZOOM_LEVEL) // Same zoom level
-                .build();
-        mapboxMap.animateCamera(CameraUpdateFactory.newCameraPosition(position), 1000);
-    }
-}
-
diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/fragments/NearbyParentFragment.java b/app/src/main/java/fr/free/nrw/commons/nearby/fragments/NearbyParentFragment.java
index 0b98799e23..c7ad69aea4 100644
--- a/app/src/main/java/fr/free/nrw/commons/nearby/fragments/NearbyParentFragment.java
+++ b/app/src/main/java/fr/free/nrw/commons/nearby/fragments/NearbyParentFragment.java
@@ -7,7 +7,9 @@
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.res.Configuration;
+import android.graphics.Bitmap;
 import android.os.Bundle;
+import android.text.TextUtils;
 import android.util.Log;
 import android.view.Gravity;
 import android.view.LayoutInflater;
@@ -16,21 +18,20 @@
 import android.view.animation.Animation;
 import android.view.animation.AnimationUtils;
 import android.widget.Button;
-import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.ProgressBar;
+import android.widget.RelativeLayout;
 import android.widget.SearchView;
 import android.widget.TextView;
 import android.widget.Toast;
 
 import androidx.annotation.NonNull;
-import androidx.constraintlayout.widget.ConstraintLayout;
-import androidx.fragment.app.FragmentManager;
-import androidx.fragment.app.FragmentTransaction;
+import androidx.annotation.Nullable;
 import androidx.recyclerview.widget.DividerItemDecoration;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
+import androidx.vectordrawable.graphics.drawable.VectorDrawableCompat;
 
 import com.google.android.material.bottomsheet.BottomSheetBehavior;
 import com.google.android.material.chip.Chip;
@@ -39,16 +40,23 @@
 import com.google.android.material.snackbar.Snackbar;
 import com.jakewharton.rxbinding2.view.RxView;
 import com.jakewharton.rxbinding2.widget.RxSearchView;
-import com.mapbox.mapboxsdk.Mapbox;
+import com.mapbox.mapboxsdk.annotations.Icon;
+import com.mapbox.mapboxsdk.annotations.IconFactory;
 import com.mapbox.mapboxsdk.annotations.Marker;
+import com.mapbox.mapboxsdk.annotations.MarkerOptions;
+import com.mapbox.mapboxsdk.annotations.Polygon;
+import com.mapbox.mapboxsdk.annotations.PolygonOptions;
 import com.mapbox.mapboxsdk.camera.CameraPosition;
 import com.mapbox.mapboxsdk.camera.CameraUpdateFactory;
 import com.mapbox.mapboxsdk.geometry.LatLng;
+import com.mapbox.mapboxsdk.maps.MapView;
 import com.mapbox.mapboxsdk.maps.MapboxMap;
-import com.mapbox.mapboxsdk.maps.MapboxMapOptions;
 import com.mapbox.mapboxsdk.maps.Style;
+import com.mapbox.mapboxsdk.maps.UiSettings;
+import com.pedrogomez.renderers.RVRendererAdapter;
 
 import java.util.ArrayList;
+import java.util.List;
 import java.util.concurrent.TimeUnit;
 
 import javax.inject.Inject;
@@ -66,7 +74,12 @@
 import fr.free.nrw.commons.di.CommonsDaggerSupportFragment;
 import fr.free.nrw.commons.kvstore.JsonKvStore;
 import fr.free.nrw.commons.location.LocationServiceManager;
+import fr.free.nrw.commons.location.LocationUpdateListener;
 import fr.free.nrw.commons.nearby.CheckBoxTriStates;
+import fr.free.nrw.commons.nearby.Label;
+import fr.free.nrw.commons.nearby.MarkerPlaceGroup;
+import fr.free.nrw.commons.nearby.NearbyAdapterFactory;
+import fr.free.nrw.commons.nearby.NearbyBaseMarker;
 import fr.free.nrw.commons.nearby.NearbyController;
 import fr.free.nrw.commons.nearby.NearbyFilterSearchRecyclerViewAdapter;
 import fr.free.nrw.commons.nearby.NearbyFilterState;
@@ -74,11 +87,13 @@
 import fr.free.nrw.commons.nearby.Place;
 import fr.free.nrw.commons.nearby.contract.NearbyParentFragmentContract;
 import fr.free.nrw.commons.nearby.presenter.NearbyParentFragmentPresenter;
-import fr.free.nrw.commons.utils.FragmentUtils;
+import fr.free.nrw.commons.utils.ExecutorUtils;
 import fr.free.nrw.commons.utils.LayoutUtils;
+import fr.free.nrw.commons.utils.LocationUtils;
 import fr.free.nrw.commons.utils.NearbyFABUtils;
 import fr.free.nrw.commons.utils.NetworkUtils;
 import fr.free.nrw.commons.utils.PermissionUtils;
+import fr.free.nrw.commons.utils.UiUtils;
 import fr.free.nrw.commons.utils.ViewUtil;
 import fr.free.nrw.commons.wikidata.WikidataEditListener;
 import io.reactivex.Observable;
@@ -88,16 +103,18 @@
 
 import static fr.free.nrw.commons.contributions.MainActivity.CONTRIBUTIONS_TAB_POSITION;
 import static fr.free.nrw.commons.location.LocationServiceManager.LocationChangeType.LOCATION_SIGNIFICANTLY_CHANGED;
+import static fr.free.nrw.commons.location.LocationServiceManager.LocationChangeType.LOCATION_SLIGHTLY_CHANGED;
 import static fr.free.nrw.commons.location.LocationServiceManager.LocationChangeType.MAP_UPDATED;
 import static fr.free.nrw.commons.nearby.Label.TEXT_TO_DESCRIPTION;
+import static fr.free.nrw.commons.utils.LengthUtils.formatDistanceBetween;
 import static fr.free.nrw.commons.wikidata.WikidataConstants.PLACE_OBJECT;
 
 
 public class NearbyParentFragment extends CommonsDaggerSupportFragment
         implements NearbyParentFragmentContract.View,
-        WikidataEditListener.WikidataP18EditListener {
+        WikidataEditListener.WikidataP18EditListener, LocationUpdateListener {
 
-    @BindView(R.id.bottom_sheet) View bottomSheetList;
+    @BindView(R.id.bottom_sheet) RelativeLayout rlBottomSheet;
     @BindView(R.id.bottom_sheet_details) View bottomSheetDetails;
     @BindView(R.id.transparentView) View transparentView;
     @BindView(R.id.directionsButtonText) TextView directionsButtonText;
@@ -120,9 +137,6 @@ public class NearbyParentFragment extends CommonsDaggerSupportFragment
     @BindView(R.id.icon) ImageView icon;
     @BindView(R.id.search_this_area_button) Button searchThisAreaButton;
     @BindView(R.id.map_progress_bar) ProgressBar progressBar;
-    @BindView(R.id.container_sheet) FrameLayout frameLayout;
-    @BindView(R.id.loading_nearby_list) ConstraintLayout loadingNearbyLayout;
-
     @BindView(R.id.choice_chip_exists) Chip chipExists;
     @BindView(R.id.choice_chip_needs_photo) Chip chipNeedsPhoto;
     @BindView(R.id.choice_chip_group) ChipGroup choiceChipGroup;
@@ -130,6 +144,10 @@ public class NearbyParentFragment extends CommonsDaggerSupportFragment
     @BindView(R.id.search_list_view) RecyclerView recyclerView;
     @BindView(R.id.nearby_filter_list) View nearbyFilterList;
     @BindView(R.id.checkbox_tri_states) CheckBoxTriStates checkBoxTriStates;
+    @BindView(R.id.map_view)
+    MapView mapView;
+    @BindView(R.id.rv_nearby_list)
+    RecyclerView rvNearbyList;
 
     @Inject LocationServiceManager locationManager;
     @Inject NearbyController nearbyController;
@@ -147,13 +165,13 @@ public class NearbyParentFragment extends CommonsDaggerSupportFragment
     private Animation fab_open;
     private Animation rotate_forward;
 
-    private static final double ZOOM_LEVEL = 14f;
+    private static final float ZOOM_LEVEL = 14f;
     private final String NETWORK_INTENT_ACTION = "android.net.conn.CONNECTIVITY_CHANGE";
     private BroadcastReceiver broadcastReceiver;
     private boolean isNetworkErrorOccurred = false;
     private Snackbar snackbar;
     private View view;
-    private NearbyParentFragmentPresenter nearbyParentFragmentPresenter;
+    private NearbyParentFragmentPresenter presenter;
     private boolean isDarkTheme;
     private boolean isFABsExpanded;
     private Marker selectedMarker;
@@ -162,29 +180,183 @@ public class NearbyParentFragment extends CommonsDaggerSupportFragment
     private final double CAMERA_TARGET_SHIFT_FACTOR_PORTRAIT = 0.005;
     private final double CAMERA_TARGET_SHIFT_FACTOR_LANDSCAPE = 0.004;
 
-    private NearbyMapFragment nearbyMapFragment;
-    private NearbyListFragment nearbyListFragment;
+    private boolean isMapBoxReady=false;
+    private MapboxMap mapBox;
+    IntentFilter intentFilter = new IntentFilter(NETWORK_INTENT_ACTION);
+    private Marker currentLocationMarker;
+    private Polygon currentLocationPolygon;
+    private Place lastPlaceToCenter;
+    private fr.free.nrw.commons.location.LatLng lastKnownLocation;
+    private fr.free.nrw.commons.location.LatLng currentLocation=null;
+    private NearbyController.NearbyPlacesInfo nearbyPlacesInfo;
+    private NearbyAdapterFactory adapterFactory;
+    private boolean isVisibleToUser;
+    private MapboxMap.OnCameraMoveListener cameraMoveListener;
+    private fr.free.nrw.commons.location.LatLng lastFocusLocation;
 
-    public static final String TAG_RETAINED_MAP_FRAGMENT = NearbyMapFragment.class.getSimpleName();
-    private static final String TAG_RETAINED_LIST_FRAGMENT = NearbyListFragment.class.getSimpleName();
 
     @Override
     public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
         view = inflater.inflate(R.layout.fragment_nearby_parent, container, false);
         ButterKnife.bind(this, view);
+        initNetworkBroadCastReceiver();
+        presenter=new NearbyParentFragmentPresenter(bookmarkLocationDao);
         // Inflate the layout for this fragment
         return view;
 
     }
 
+    @Override
+    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        isDarkTheme = applicationKvStore.getBoolean("theme", false);
+        cameraMoveListener= () -> presenter.onCameraMove(mapBox.getCameraPosition().target);
+        addCheckBoxCallback();
+        presenter.attachView(this);
+        initRvNearbyList();
+        initThemePreferences();
+        mapView.onCreate(savedInstanceState);
+        mapView.getMapAsync(mapBoxMap -> {
+            this.mapBox=mapBoxMap;
+            initViews();
+            presenter.setActionListeners(applicationKvStore);
+            initNearbyFilter();
+            mapBoxMap.setStyle(isDarkTheme?Style.DARK:Style.OUTDOORS, style -> {
+                UiSettings uiSettings = mapBoxMap.getUiSettings();
+                uiSettings.setCompassGravity(Gravity.BOTTOM | Gravity.LEFT);
+                uiSettings.setCompassMargins(12, 0, 0, 24);
+                uiSettings.setLogoEnabled(false);
+                uiSettings.setAttributionEnabled(false);
+                uiSettings.setRotateGesturesEnabled(false);
+                NearbyParentFragment.this.isMapBoxReady=true;
+                performMapReadyActions();
+                CameraPosition cameraPosition = new CameraPosition.Builder()
+                        .target(new LatLng(51.50550, -0.07520))
+                        .zoom(ZOOM_LEVEL)
+                        .build();
+                mapBoxMap.setCameraPosition(cameraPosition);
+            });
+
+        });
+    }
+
+    /**
+     * Initialise background based on theme, this should be doe ideally via styles, that would need another refactor
+     */
+    private void initThemePreferences() {
+        if(isDarkTheme){
+            rvNearbyList.setBackgroundColor(getContext().getResources().getColor(R.color.contributionListDarkBackground));
+            checkBoxTriStates.setTextColor(getContext().getResources().getColor(android.R.color.white));
+            checkBoxTriStates.setTextColor(getContext().getResources().getColor(android.R.color.white));
+            nearbyFilterList.setBackgroundColor(getContext().getResources().getColor(R.color.contributionListDarkBackground));
+        }else{
+            rvNearbyList.setBackgroundColor(getContext().getResources().getColor(android.R.color.white));
+            checkBoxTriStates.setTextColor(getContext().getResources().getColor(R.color.contributionListDarkBackground));
+            nearbyFilterList.setBackgroundColor(getContext().getResources().getColor(android.R.color.white));
+            nearbyFilterList.setBackgroundColor(getContext().getResources().getColor(android.R.color.white));
+        }
+    }
+
+    private void initRvNearbyList() {
+        rvNearbyList.setLayoutManager(new LinearLayoutManager(getContext()));
+        adapterFactory = new NearbyAdapterFactory(this, controller);
+        rvNearbyList.setAdapter(adapterFactory.create(null));
+    }
+
+    private void addCheckBoxCallback() {
+        checkBoxTriStates.setCallback((o, state, b, b1) -> presenter.filterByMarkerType(o,state,b,b1));
+    }
+
+    private void performMapReadyActions() {
+        if (isVisible() && isVisibleToUser && isMapBoxReady) {
+            checkPermissionsAndPerformAction(() -> {
+                this.lastKnownLocation = locationManager.getLastLocation();
+                fr.free.nrw.commons.location.LatLng target=lastFocusLocation;
+                if(null==lastFocusLocation){
+                    target=lastKnownLocation;
+                }
+                if (lastKnownLocation != null) {
+                    CameraPosition position = new CameraPosition.Builder()
+                            .target(LocationUtils.commonsLatLngToMapBoxLatLng(target)) // Sets the new camera position
+                            .zoom(ZOOM_LEVEL) // Same zoom level
+                            .build();
+                    mapBox.moveCamera(CameraUpdateFactory.newCameraPosition(position));
+                } else {
+                    Toast.makeText(getContext(), getString(R.string.nearby_location_not_available), Toast.LENGTH_LONG).show();
+                }
+                presenter.onMapReady();
+                registerUnregisterLocationListener(false);
+                addOnCameraMoveListener();
+            });
+        }
+    }
+
     @Override
     public void onResume() {
         super.onResume();
-        nearbyMapFragment = getNearbyMapFragment();
-        nearbyListFragment = getListFragment();
+        mapView.onResume();
+        presenter.attachView(this);
+        registerNetworkReceiver();
+        if (isResumed() && isVisibleToUser) {
+            startTheMap();
+        }
+    }
+
+    private void registerNetworkReceiver() {
+        if (getActivity() != null)
+            getActivity().registerReceiver(broadcastReceiver, intentFilter);
+    }
+
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        mapView.onPause();
+        compositeDisposable.clear();
+        presenter.detachView();
+        registerUnregisterLocationListener(true);
+        try {
+            if (broadcastReceiver != null && getActivity()!=null) {
+                getContext().unregisterReceiver(broadcastReceiver);
+            }
+
+            if (locationManager != null && presenter != null) {
+                locationManager.removeLocationListener(presenter);
+                locationManager.unregisterLocationManager();
+            }
+            if (null != mapBox) {
+                mapBox.removeOnCameraMoveListener(cameraMoveListener);
+            }
+        }catch (Exception e){
+            Timber.e(e);
+            //Broadcast receivers should always be unregistered inside catch, you never know if they were already registered or not
+        }
+    }
+
+    @Override
+    public void onStop() {
+        super.onStop();
+        mapView.onStop();
+    }
+
+    @Override
+    public void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+        mapView.onSaveInstanceState(outState);
     }
 
+    @Override
+    public void onLowMemory() {
+        super.onLowMemory();
+        mapView.onLowMemory();
+    }
+
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+        mapView.onDestroy();
+    }
 
     private void initViews() {
         Timber.d("init views called");
@@ -199,10 +371,11 @@ private void initViews() {
      * Creates bottom sheet behaviours from bottom sheets, sets initial states and visibility
      */
     private void initBottomSheets() {
-        bottomSheetListBehavior = BottomSheetBehavior.from(bottomSheetList);
+        bottomSheetListBehavior = BottomSheetBehavior.from(rlBottomSheet);
         bottomSheetDetailsBehavior = BottomSheetBehavior.from(bottomSheetDetails);
         bottomSheetDetailsBehavior.setState(BottomSheetBehavior.STATE_HIDDEN);
         bottomSheetDetails.setVisibility(View.VISIBLE);
+        bottomSheetListBehavior.setState(BottomSheetBehavior.STATE_HIDDEN);
     }
 
     public void initNearbyFilter() {
@@ -210,7 +383,7 @@ public void initNearbyFilter() {
 
         searchView.setOnQueryTextFocusChangeListener((v, hasFocus) -> {
             if (hasFocus) {
-                nearbyParentFragmentPresenter.searchViewGainedFocus();
+                presenter.searchViewGainedFocus();
                 nearbyFilterList.setVisibility(View.VISIBLE);
             } else {
                 nearbyFilterList.setVisibility(View.GONE);
@@ -226,6 +399,22 @@ public void initNearbyFilter() {
         recyclerView.setLayoutManager(linearLayoutManager);
 
         nearbyFilterSearchRecyclerViewAdapter = new NearbyFilterSearchRecyclerViewAdapter(getContext(),new ArrayList<>(TEXT_TO_DESCRIPTION.values()), recyclerView);
+        nearbyFilterSearchRecyclerViewAdapter.setCallback(new NearbyFilterSearchRecyclerViewAdapter.Callback() {
+            @Override
+            public void setCheckboxUnknown() {
+                presenter.setCheckboxUnknown();
+            }
+
+            @Override
+            public void filterByMarkerType(ArrayList<Label> selectedLabels, int i, boolean b, boolean b1) {
+                presenter.filterByMarkerType(selectedLabels,i,b,b1);
+            }
+
+            @Override
+            public boolean isDarkTheme() {
+                return isDarkTheme;
+            }
+        });
         nearbyFilterList.getLayoutParams().width = (int) LayoutUtils.getScreenWidth(getActivity(), 0.75);
         recyclerView.setAdapter(nearbyFilterSearchRecyclerViewAdapter);
         LayoutUtils.setLayoutHeightAllignedToWidth(1, nearbyFilterList);
@@ -256,24 +445,22 @@ public void setFilterState() {
         Log.d("deneme5","setfilterState");
         chipNeedsPhoto.setChecked(NearbyFilterState.getInstance().isNeedPhotoSelected());
         chipExists.setChecked(NearbyFilterState.getInstance().isExistsSelected());
-
         if (NearbyController.currentLocation != null) {
-            NearbyParentFragmentPresenter.getInstance().filterByMarkerType(nearbyFilterSearchRecyclerViewAdapter.selectedLabels, checkBoxTriStates.getState(), true, false);
+            presenter.filterByMarkerType(nearbyFilterSearchRecyclerViewAdapter.selectedLabels, checkBoxTriStates.getState(), true, false);
         }
 
     }
 
     private void initFilterChips() {
-
         chipNeedsPhoto.setOnCheckedChangeListener((buttonView, isChecked) -> {
             if (NearbyController.currentLocation != null) {
                 checkBoxTriStates.setState(CheckBoxTriStates.UNKNOWN);
                 if (isChecked) {
-                    NearbyFilterState.getInstance().setNeedPhotoSelected(true);
-                    NearbyParentFragmentPresenter.getInstance().filterByMarkerType(nearbyFilterSearchRecyclerViewAdapter.selectedLabels, checkBoxTriStates.getState(), true, false);
+                    NearbyFilterState.setNeedPhotoSelected(true);
+                    presenter.filterByMarkerType(nearbyFilterSearchRecyclerViewAdapter.selectedLabels, checkBoxTriStates.getState(), true, false);
                 } else {
-                    NearbyFilterState.getInstance().setNeedPhotoSelected(false);
-                    NearbyParentFragmentPresenter.getInstance().filterByMarkerType(nearbyFilterSearchRecyclerViewAdapter.selectedLabels, checkBoxTriStates.getState(), true, false);
+                    NearbyFilterState.setNeedPhotoSelected(false);
+                    presenter.filterByMarkerType(nearbyFilterSearchRecyclerViewAdapter.selectedLabels, checkBoxTriStates.getState(), true, false);
                 }
             } else {
                 chipNeedsPhoto.setChecked(!isChecked);
@@ -285,11 +472,11 @@ private void initFilterChips() {
             if (NearbyController.currentLocation != null) {
                 checkBoxTriStates.setState(CheckBoxTriStates.UNKNOWN);
                 if (isChecked) {
-                    NearbyFilterState.getInstance().setExistsSelected(true);
-                    NearbyParentFragmentPresenter.getInstance().filterByMarkerType(nearbyFilterSearchRecyclerViewAdapter.selectedLabels, checkBoxTriStates.getState(), true, false);
+                    NearbyFilterState.setExistsSelected(true);
+                    presenter.filterByMarkerType(nearbyFilterSearchRecyclerViewAdapter.selectedLabels, checkBoxTriStates.getState(), true, false);
                 } else {
-                    NearbyFilterState.getInstance().setExistsSelected(false);
-                    NearbyParentFragmentPresenter.getInstance().filterByMarkerType(nearbyFilterSearchRecyclerViewAdapter.selectedLabels, checkBoxTriStates.getState(), true, false);
+                    NearbyFilterState.setExistsSelected(false);
+                    presenter.filterByMarkerType(nearbyFilterSearchRecyclerViewAdapter.selectedLabels, checkBoxTriStates.getState(), true, false);
                 }
             } else {
                 chipExists.setChecked(!isChecked);
@@ -322,10 +509,10 @@ public void onSlide(@NonNull View bottomSheet, float slideOffset) {
             }
         });
 
-        bottomSheetList.getLayoutParams().height = getActivity().getWindowManager()
+        rlBottomSheet.getLayoutParams().height = getActivity().getWindowManager()
                 .getDefaultDisplay().getHeight() / 16 * 9;
-        bottomSheetListBehavior = BottomSheetBehavior.from(bottomSheetList);
-
+        bottomSheetListBehavior = BottomSheetBehavior.from(rlBottomSheet);
+        bottomSheetListBehavior.setState(BottomSheetBehavior.STATE_COLLAPSED);
         bottomSheetListBehavior.setBottomSheetCallback(new BottomSheetBehavior
                 .BottomSheetCallback() {
             @Override
@@ -373,6 +560,7 @@ private void addActionToTitle() {
         title.setOnClickListener(view -> {
             Utils.copy("place", title.getText().toString(), getContext());
             Toast.makeText(getContext(), "Text copied to clipboard", Toast.LENGTH_SHORT).show();
+            bottomSheetListBehavior.setState(BottomSheetBehavior.STATE_HIDDEN);
             if (bottomSheetDetailsBehavior.getState() == BottomSheetBehavior.STATE_COLLAPSED) {
                 bottomSheetDetailsBehavior.setState(BottomSheetBehavior.STATE_EXPANDED);
             } else {
@@ -382,139 +570,47 @@ private void addActionToTitle() {
     }
 
     /**
-     * Returns the list fragment added to child fragment manager previously, if exists.
+     * Centers the map in nearby fragment to a given place
+     * @param place is new center of the map
      */
-    private NearbyListFragment getListFragment() {
-        NearbyListFragment existingFragment = (NearbyListFragment) getChildFragmentManager()
-                .findFragmentByTag(TAG_RETAINED_LIST_FRAGMENT);
-        if (existingFragment == null) {
-            existingFragment = setListFragment();
-        }
-        return existingFragment;
-    }
-
-    /**
-     * Returns the map fragment added to child fragment manager previously, if exists.
-     */
-    private NearbyMapFragment getNearbyMapFragment() {
-        NearbyMapFragment existingFragment = (NearbyMapFragment) getChildFragmentManager()
-                .findFragmentByTag(TAG_RETAINED_MAP_FRAGMENT);
-        if (existingFragment == null) {
-            existingFragment = setMapFragment();
-        }
-        return existingFragment;
-    }
-
-    /**
-     * Creates the map fragment and prepares map
-     * @return the map fragment created
-     */
-    private NearbyMapFragment setMapFragment() {
-        // Mapbox access token is configured here. This needs to be called either in your application
-        // object or in the same activity which contains the mapview.
-        Mapbox.getInstance(getActivity(), getString(R.string.mapbox_commons_app_token));
-        NearbyMapFragment mapFragment;
-
-        // Create fragment
-        FragmentTransaction transaction = getChildFragmentManager().beginTransaction();
-
-        // Build mapboxMap
-        isDarkTheme = applicationKvStore.getBoolean("theme", false);
-        MapboxMapOptions options = new MapboxMapOptions()
-                .compassGravity(Gravity.BOTTOM | Gravity.LEFT)
-                .compassMargins(new int[]{12, 0, 0, 24})
-                .logoEnabled(false)
-                .attributionEnabled(false)
-                .camera(new CameraPosition.Builder()
-                        .zoom(ZOOM_LEVEL)
-                        .target(new com.mapbox.mapboxsdk.geometry.LatLng(-52.6885, -70.1395))
-                        .build());
-
-        // Create map fragment
-        mapFragment = NearbyMapFragment.newInstance(options);
-
-        // Add map fragment to parent container
-        getChildFragmentManager().executePendingTransactions();
-        transaction.add(R.id.container, mapFragment, TAG_RETAINED_MAP_FRAGMENT);
-        transaction.commit();
-
-        mapFragment.getMapAsync(mapboxMap ->
-                mapboxMap.setStyle(
-                        NearbyParentFragment.this.isDarkTheme ? Style.DARK : Style.OUTDOORS, style -> {
-                            NearbyParentFragment.this.childMapFragmentAttached();
-                            // Map is set up and the style has loaded. Now you can add data or make other map adjustments
-                        }));
-        return mapFragment;
-    }
-
-    /**
-     * Creates the list fragment and put it into container
-     * @return the list fragment created
-     */
-    private NearbyListFragment setListFragment() {
-        NearbyListFragment nearbyListFragment;
-        loadingNearbyLayout.setVisibility(View.GONE);
-        frameLayout.setVisibility(View.VISIBLE);
-        FragmentTransaction fragmentTransaction = getChildFragmentManager().beginTransaction();
-        nearbyListFragment = new NearbyListFragment();
-        nearbyListFragment.setArguments(null);
-        fragmentTransaction.replace(R.id.container_sheet, nearbyListFragment, TAG_RETAINED_LIST_FRAGMENT);
-        fragmentTransaction.commitAllowingStateLoss();
-        return nearbyListFragment;
-    }
-
-    private void removeListFragment() {
-        if (nearbyListFragment != null) {
-            FragmentManager fm = getChildFragmentManager();
-            fm.beginTransaction().remove(nearbyListFragment).commit();
-            nearbyListFragment = null;
-        }
-    }
-
-    private void removeMapFragment() {
-        if (nearbyMapFragment != null) {
-            FragmentManager fm = getChildFragmentManager();
-            fm.beginTransaction().remove(nearbyMapFragment).commit();
-            nearbyMapFragment = null;
+    public void centerMapToPlace(Place place) {
+        Timber.d("Map is centered to place");
+        double cameraShift;
+        if(null!=place){
+            lastPlaceToCenter=place;
         }
-    }
 
-    /**
-     * Calls presenter to center map to any place
-     * @param place the place we want to center map
-     */
-    public void centerMapToPlace(Place place) {
-        if (nearbyMapFragment != null) {
-            nearbyParentFragmentPresenter.centerMapToPlace(place,
-                    getActivity().getResources().getConfiguration().orientation ==
-                            Configuration.ORIENTATION_PORTRAIT);
+        if (null != lastPlaceToCenter) {
+            Configuration configuration = getActivity().getResources().getConfiguration();
+            if (configuration.orientation == Configuration.ORIENTATION_PORTRAIT) {
+                cameraShift = CAMERA_TARGET_SHIFT_FACTOR_PORTRAIT;
+            } else {
+                cameraShift = CAMERA_TARGET_SHIFT_FACTOR_LANDSCAPE;
+            }
+            CameraPosition position = new CameraPosition.Builder()
+                    .target(LocationUtils.commonsLatLngToMapBoxLatLng(
+                            new fr.free.nrw.commons.location.LatLng(lastPlaceToCenter.location.getLatitude() - cameraShift,
+                                    lastPlaceToCenter.getLocation().getLongitude(),
+                                    0))) // Sets the new camera position
+                    .zoom(ZOOM_LEVEL) // Same zoom level
+                    .build();
+            mapBox.animateCamera(CameraUpdateFactory.newCameraPosition(position), 1000);
         }
     }
 
-
-    /**
-     * Thanks to this method we make sure NearbyMapFragment is ready and attached. So that we can
-     * prevent NPE caused by null child fragment. This method is called from child fragment when
-     * it is attached.
-     */
-    private void childMapFragmentAttached() {
-        Timber.d("Child map fragment attached");
-        nearbyParentFragmentPresenter = NearbyParentFragmentPresenter.getInstance
-                (nearbyListFragment,this, nearbyMapFragment, locationManager);
-        nearbyParentFragmentPresenter.nearbyFragmentsAreReady();
-        initViews();
-        nearbyParentFragmentPresenter.setActionListeners(applicationKvStore);
-        initNearbyFilter();
+    @Override
+    public void updateListFragment(List<Place> placeList) {
+        adapterFactory.updateAdapterData(placeList, (RVRendererAdapter<Place>) rvNearbyList.getAdapter());
     }
 
     @Override
-    public void addOnCameraMoveListener(MapboxMap.OnCameraMoveListener onCameraMoveListener) {
-        nearbyMapFragment.getMapboxMap().addOnCameraMoveListener(onCameraMoveListener);
+    public fr.free.nrw.commons.location.LatLng getLastLocation() {
+        return lastKnownLocation;
     }
 
     @Override
-    public void registerLocationUpdates(LocationServiceManager locationManager) {
-        locationManager.registerLocationManager();
+    public LatLng getLastFocusLocation() {
+        return lastFocusLocation==null?null:LocationUtils.commonsLatLngToMapBoxLatLng(lastFocusLocation);
     }
 
     @Override
@@ -525,25 +621,14 @@ public boolean isNetworkConnectionEstablished() {
     /**
      * Adds network broadcast receiver to recognize connection established
      */
-    @Override
-    public void addNetworkBroadcastReceiver() {
-        if (!FragmentUtils.isFragmentUIActive(this)) {
-            return;
-        }
-
-        if (broadcastReceiver != null) {
-            return;
-        }
-
-        IntentFilter intentFilter = new IntentFilter(NETWORK_INTENT_ACTION);
-
+    private void initNetworkBroadCastReceiver() {
         broadcastReceiver = new BroadcastReceiver() {
             @Override
             public void onReceive(Context context, Intent intent) {
                 if (getActivity() != null) {
                     if (NetworkUtils.isInternetConnectionEstablished(getActivity())) {
                         if (isNetworkErrorOccurred) {
-                            nearbyParentFragmentPresenter.updateMapAndList(LOCATION_SIGNIFICANTLY_CHANGED, null);
+                            presenter.updateMapAndList(LOCATION_SIGNIFICANTLY_CHANGED);
                             isNetworkErrorOccurred = false;
                         }
 
@@ -564,8 +649,6 @@ public void onReceive(Context context, Intent intent) {
                 }
             }
         };
-
-        getActivity().registerReceiver(broadcastReceiver, intentFilter);
     }
 
     /**
@@ -573,20 +656,23 @@ public void onReceive(Context context, Intent intent) {
      */
     @Override
     public void listOptionMenuItemClicked() {
+        bottomSheetDetailsBehavior.setState(BottomSheetBehavior.STATE_HIDDEN);
         if(bottomSheetListBehavior.getState()== BottomSheetBehavior.STATE_COLLAPSED || bottomSheetListBehavior.getState()==BottomSheetBehavior.STATE_HIDDEN){
-            bottomSheetDetailsBehavior.setState(BottomSheetBehavior.STATE_HIDDEN);
             bottomSheetListBehavior.setState(BottomSheetBehavior.STATE_EXPANDED);
         }else if(bottomSheetListBehavior.getState()==BottomSheetBehavior.STATE_EXPANDED){
-            bottomSheetListBehavior.setState(BottomSheetBehavior.STATE_COLLAPSED);
+            bottomSheetListBehavior.setState(BottomSheetBehavior.STATE_HIDDEN);
         }
     }
 
     @Override
-    public void populatePlaces(fr.free.nrw.commons.location.LatLng curlatLng, fr.free.nrw.commons.location.LatLng searchLatLng) {
-        if (curlatLng.equals(searchLatLng)) { // Means we are checking around current location
-            populatePlacesForCurrentLocation(curlatLng, searchLatLng);
+    public void populatePlaces(fr.free.nrw.commons.location.LatLng curlatLng) {
+        if (lastKnownLocation == null) {
+            lastKnownLocation = currentLocation;
+        }
+        if (curlatLng.equals(lastFocusLocation)|| lastFocusLocation==null) { // Means we are checking around current location
+            populatePlacesForCurrentLocation(lastKnownLocation, curlatLng);
         } else {
-            populatePlacesForAnotherLocation(curlatLng, searchLatLng);
+            populatePlacesForAnotherLocation(lastKnownLocation, curlatLng);
         }
     }
 
@@ -596,13 +682,15 @@ private void populatePlacesForCurrentLocation(fr.free.nrw.commons.location.LatLn
                 .loadAttractionsFromLocation(curlatLng, searchLatLng, false, true))
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(this::updateMapMarkers,
+                .subscribe(nearbyPlacesInfo -> {
+                            updateMapMarkers(nearbyPlacesInfo, true);
+                            lastFocusLocation=searchLatLng;
+                        },
                         throwable -> {
                             Timber.d(throwable);
-                            // TODO: find out why NPE occurs here
-                            // showErrorMessage(getString(R.string.error_fetching_nearby_places));
+                            showErrorMessage(getString(R.string.error_fetching_nearby_places)+throwable.getLocalizedMessage());
                             setProgressBarVisibility(false);
-                            nearbyParentFragmentPresenter.lockUnlockNearby(false);
+                            presenter.lockUnlockNearby(false);
                             setFilterState();
                         }));
     }
@@ -613,13 +701,15 @@ private void populatePlacesForAnotherLocation(fr.free.nrw.commons.location.LatLn
                 .loadAttractionsFromLocation(curlatLng, searchLatLng, false, false))
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(this::updateMapMarkersForCustomLocation,
+                .subscribe(nearbyPlacesInfo -> {
+                            updateMapMarkers(nearbyPlacesInfo, false);
+                            lastFocusLocation=searchLatLng;
+                        },
                         throwable -> {
                             Timber.d(throwable);
-                            // TODO: find out why NPE occurs here
-                            // showErrorMessage(getString(R.string.error_fetching_nearby_places));
+                            showErrorMessage(getString(R.string.error_fetching_nearby_places)+throwable.getLocalizedMessage());
                             setProgressBarVisibility(false);
-                            nearbyParentFragmentPresenter.lockUnlockNearby(false);
+                            presenter.lockUnlockNearby(false);
                         }));
     }
 
@@ -628,18 +718,9 @@ private void populatePlacesForAnotherLocation(fr.free.nrw.commons.location.LatLn
      * location where you are.
      * @param nearbyPlacesInfo This variable has place list information and distances.
      */
-    private void updateMapMarkers(NearbyController.NearbyPlacesInfo nearbyPlacesInfo) {
-        nearbyParentFragmentPresenter.updateMapMarkers(nearbyPlacesInfo, selectedMarker);
-        setFilterState();
-    }
-
-    /**
-     * Populates places for custom location, should be used for finding nearby places around a
-     * location where you are not at.
-     * @param nearbyPlacesInfo This variable has place list information and distances.
-     */
-    private void updateMapMarkersForCustomLocation(NearbyController.NearbyPlacesInfo nearbyPlacesInfo) {
-        nearbyParentFragmentPresenter.updateMapMarkersForCustomLocation(nearbyPlacesInfo, selectedMarker);
+    private void updateMapMarkers(NearbyController.NearbyPlacesInfo nearbyPlacesInfo,boolean shouldUpdateSelectedMarker) {
+        this.nearbyPlacesInfo=nearbyPlacesInfo;
+        presenter.updateMapMarkers(nearbyPlacesInfo, selectedMarker,shouldUpdateSelectedMarker);
         setFilterState();
     }
 
@@ -665,7 +746,7 @@ public void setBottomSheetDetailsSmaller() {
 
     @Override
     public void addSearchThisAreaButtonAction() {
-        searchThisAreaButton.setOnClickListener(nearbyParentFragmentPresenter.onSearchThisAreaClicked());
+        searchThisAreaButton.setOnClickListener(presenter.onSearchThisAreaClicked());
     }
 
     @Override
@@ -805,6 +886,54 @@ public void displayLoginSkippedWarning() {
         }
     }
 
+    private void handleLocationUpdate(fr.free.nrw.commons.location.LatLng latLng, LocationServiceManager.LocationChangeType locationChangeType){
+        setMapBoxPosition(latLng);
+        this.lastKnownLocation=latLng;
+        NearbyController.currentLocation=lastKnownLocation;
+        presenter.updateMapAndList(locationChangeType);
+    }
+
+    private boolean isUserBrowsing() {
+        boolean isUserBrowsing = !presenter.areLocationsClose(getCameraTarget(), lastKnownLocation);
+        return isUserBrowsing;
+    }
+
+    @Override
+    public void onLocationChangedSignificantly(fr.free.nrw.commons.location.LatLng latLng) {
+        Timber.d("Location significantly changed");
+        if (isMapBoxReady && latLng != null &&!isUserBrowsing()) {
+            handleLocationUpdate(latLng,LOCATION_SIGNIFICANTLY_CHANGED);
+        }
+    }
+
+    @Override
+    public void onLocationChangedSlightly(fr.free.nrw.commons.location.LatLng latLng) {
+        Timber.d("Location significantly changed");
+        if (isMapBoxReady && latLng != null &&!isUserBrowsing()) {//If the map has never ever shown the current location, lets do it know
+            handleLocationUpdate(latLng,LOCATION_SLIGHTLY_CHANGED);
+        }
+    }
+
+    @Override
+    public void onLocationChangedMedium(fr.free.nrw.commons.location.LatLng latLng) {
+        Timber.d("Location changed medium");
+        if (isMapBoxReady && latLng != null && !isUserBrowsing()) {//If the map has never ever shown the current location, lets do it know
+            handleLocationUpdate(latLng, LOCATION_SIGNIFICANTLY_CHANGED);
+        }
+    }
+
+    void setMapBoxPosition(fr.free.nrw.commons.location.LatLng latLng){
+        CameraPosition position = new CameraPosition.Builder()
+                .target(LocationUtils.commonsLatLngToMapBoxLatLng(latLng)) // Sets the new camera position
+                .zoom(ZOOM_LEVEL) // Same zoom level
+                .build();
+        mapBox.moveCamera(CameraUpdateFactory.newCameraPosition(position));
+    }
+
+    public void backButtonClicked() {
+        presenter.backButtonClicked();
+    }
+
     /**
      * onLogoutComplete is called after shared preferences and data stored in local database are cleared.
      */
@@ -840,12 +969,275 @@ public void enableFABRecenter() {
         fabRecenter.setEnabled(true);
     }
 
+    /**
+     * Adds a marker for the user's current position. Adds a
+     * circle which uses the accuracy * 2, to draw a circle
+     * which represents the user's position with an accuracy
+     * of 95%.
+     *
+     * Should be called only on creation of mapboxMap, there
+     * is other method to update markers location with users
+     * move.
+     * @param curLatLng current location
+     */
+    @Override
+    public void addCurrentLocationMarker(fr.free.nrw.commons.location.LatLng curLatLng) {
+        if (null != curLatLng) {
+            ExecutorUtils.get().submit(() -> {
+                mapView.post(() -> removeCurrentLocationMarker());
+                Timber.d("Adds current location marker");
+
+                Icon icon = IconFactory.getInstance(getContext())
+                        .fromResource(R.drawable.current_location_marker);
+
+                MarkerOptions currentLocationMarkerOptions = new MarkerOptions()
+                        .position(new LatLng(curLatLng.getLatitude(),
+                                curLatLng.getLongitude()));
+                currentLocationMarkerOptions.setIcon(icon); // Set custom icon
+                mapView.post(() -> currentLocationMarker = mapBox.addMarker(currentLocationMarkerOptions));
+
+
+                List<LatLng> circle = UiUtils
+                        .createCircleArray(curLatLng.getLatitude(), curLatLng.getLongitude(),
+                                curLatLng.getAccuracy() * 2, 100);
+
+                PolygonOptions currentLocationPolygonOptions = new PolygonOptions()
+                        .addAll(circle)
+                        .strokeColor(getResources().getColor(R.color.current_marker_stroke))
+                        .fillColor(getResources().getColor(R.color.current_marker_fill));
+                mapView.post(() -> currentLocationPolygon = mapBox.addPolygon(currentLocationPolygonOptions));
+
+            });
+        } else {
+            Timber.d("not adding current location marker..current location is null");
+        }
+    }
+
+    private void removeCurrentLocationMarker() {
+        if (currentLocationMarker != null && mapBox!=null) {
+            mapBox.removeMarker(currentLocationMarker);
+            mapBox.removePolygon(currentLocationPolygon);
+        }
+    }
+
+
+    /**
+     * Makes map camera follow users location with animation
+     * @param curLatLng current location of user
+     */
+    @Override
+    public void updateMapToTrackPosition(fr.free.nrw.commons.location.LatLng curLatLng) {
+        Timber.d("Updates map camera to track user position");
+        CameraPosition cameraPosition = new CameraPosition.Builder().target
+                (LocationUtils.commonsLatLngToMapBoxLatLng(curLatLng)).build();
+        if(null!=mapBox) {
+            mapBox.setCameraPosition(cameraPosition);
+            mapBox.animateCamera(CameraUpdateFactory
+                    .newCameraPosition(cameraPosition), 1000);
+        }
+    }
+
+    @Override
+    public void updateMapMarkers(List<NearbyBaseMarker> nearbyBaseMarkers, Marker selectedMarker) {
+        if(mapBox!=null && isMapBoxReady){
+            mapBox.clear();
+            addNearbyMarkersToMapBoxMap(nearbyBaseMarkers, selectedMarker);
+            presenter.updateMapMarkersToController(nearbyBaseMarkers);
+            // Re-enable mapbox gestures on custom location markers load
+            mapBox.getUiSettings().setAllGesturesEnabled(true);
+        }
+    }
+
+    @Override
+    public void filterOutAllMarkers() {
+        greyOutAllMarkers();
+    }
+
+    /**
+     * Displays all markers
+     */
+    @Override
+    public void displayAllMarkers() {
+        for (MarkerPlaceGroup markerPlaceGroup : NearbyController.markerLabelList) {
+            updateMarker(markerPlaceGroup.getIsBookmarked(), markerPlaceGroup.getPlace(), NearbyController.currentLocation);
+        }
+    }
+
+    /**
+     * Filters markers based on selectedLabels and chips
+     * @param selectedLabels label list that user clicked
+     * @param displayExists chip for displaying only existing places
+     * @param displayNeedsPhoto chip for displaying only places need photos
+     * @param filterForPlaceState true if we filter places for place state
+     * @param filterForAllNoneType true if we filter places with all none button
+     */
+    @Override
+    public void filterMarkersByLabels(List<Label> selectedLabels, boolean displayExists,
+                                      boolean displayNeedsPhoto,
+                                      boolean filterForPlaceState,
+                                      boolean filterForAllNoneType) {
+        if (selectedLabels.size() == 0 && filterForPlaceState) { // If nothing is selected, display all
+            greyOutAllMarkers();
+            for (MarkerPlaceGroup markerPlaceGroup : NearbyController.markerLabelList) {
+                if (displayExists && displayNeedsPhoto) {
+                    // Exists and needs photo
+                    if (markerPlaceGroup.getPlace().destroyed.trim().isEmpty() && markerPlaceGroup.getPlace().pic.trim().isEmpty()) {
+                        updateMarker(markerPlaceGroup.getIsBookmarked(), markerPlaceGroup.getPlace(), NearbyController.currentLocation);
+                    }
+                } else if (displayExists && !displayNeedsPhoto) {
+                    // Exists and all included needs and doesn't needs photo
+                    if (markerPlaceGroup.getPlace().destroyed.trim().isEmpty()) {
+                        updateMarker(markerPlaceGroup.getIsBookmarked(), markerPlaceGroup.getPlace(), NearbyController.currentLocation);
+                    }
+                } else if (!displayExists && displayNeedsPhoto) {
+                    // All and only needs photo
+                    if (markerPlaceGroup.getPlace().pic.trim().isEmpty()) {
+                        updateMarker(markerPlaceGroup.getIsBookmarked(), markerPlaceGroup.getPlace(), NearbyController.currentLocation);
+                    }
+                } else if (!displayExists && !displayNeedsPhoto) {
+                    // all
+                    updateMarker(markerPlaceGroup.getIsBookmarked(), markerPlaceGroup.getPlace(), NearbyController.currentLocation);
+                }
+
+            }
+        } else {
+            // First greyed out all markers
+            greyOutAllMarkers();
+            for (MarkerPlaceGroup markerPlaceGroup : NearbyController.markerLabelList) {
+                for (Label label : selectedLabels) {
+                    if (markerPlaceGroup.getPlace().getLabel().toString().equals(label.toString())) {
+
+                        if (displayExists && displayNeedsPhoto) {
+                            // Exists and needs photo
+                            if (markerPlaceGroup.getPlace().destroyed.trim().isEmpty() && markerPlaceGroup.getPlace().pic.trim().isEmpty()) {
+                                updateMarker(markerPlaceGroup.getIsBookmarked(), markerPlaceGroup.getPlace(), NearbyController.currentLocation);
+                            }
+                        } else if (displayExists && !displayNeedsPhoto) {
+                            // Exists and all included needs and doesn't needs photo
+                            if (markerPlaceGroup.getPlace().destroyed.trim().isEmpty()) {
+                                updateMarker(markerPlaceGroup.getIsBookmarked(), markerPlaceGroup.getPlace(), NearbyController.currentLocation);
+                            }
+                        } else if (!displayExists && displayNeedsPhoto) {
+                            // All and only needs photo
+                            if (markerPlaceGroup.getPlace().pic.trim().isEmpty()) {
+                                updateMarker(markerPlaceGroup.getIsBookmarked(), markerPlaceGroup.getPlace(), NearbyController.currentLocation);
+                            }
+                        } else if (!displayExists && !displayNeedsPhoto) {
+                            // all
+                            updateMarker(markerPlaceGroup.getIsBookmarked(), markerPlaceGroup.getPlace(), NearbyController.currentLocation);
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    @Override
+    public fr.free.nrw.commons.location.LatLng getCameraTarget() {
+        return mapBox==null?null:LocationUtils.mapBoxLatLngToCommonsLatLng(mapBox.getCameraPosition().target);
+    }
+
+    /**
+     * Sets marker icon according to marker status. Sets title and distance.
+     * @param isBookmarked true if place is bookmarked
+     * @param place
+     * @param curLatLng current location
+     */
+    public void updateMarker(boolean isBookmarked, Place place, @Nullable fr.free.nrw.commons.location.LatLng curLatLng) {
+        VectorDrawableCompat vectorDrawable;
+        if (isBookmarked) {
+            vectorDrawable = VectorDrawableCompat.create(
+                    getContext().getResources(), R.drawable.ic_custom_bookmark_marker, getContext().getTheme()
+            );
+        } else if (!place.pic.trim().isEmpty()) {
+            vectorDrawable = VectorDrawableCompat.create( // Means place has picture
+                    getContext().getResources(), R.drawable.ic_custom_map_marker_green, getContext().getTheme()
+            );
+        } else if (!place.destroyed.trim().isEmpty()) { // Means place is destroyed
+            vectorDrawable = VectorDrawableCompat.create( // Means place has picture
+                    getContext().getResources(), R.drawable.ic_custom_map_marker_grey, getContext().getTheme()
+            );
+        } else {
+            vectorDrawable = VectorDrawableCompat.create(
+                    getContext().getResources(), R.drawable.ic_custom_map_marker, getContext().getTheme()
+            );
+        }
+        for (Marker marker : mapBox.getMarkers()) {
+            if (marker.getTitle() != null && marker.getTitle().equals(place.getName())) {
+
+                Bitmap icon = UiUtils.getBitmap(vectorDrawable);
+                if (curLatLng != null) {
+                    String distance = formatDistanceBetween(curLatLng, place.location);
+                    place.setDistance(distance);
+                }
+
+                NearbyBaseMarker nearbyBaseMarker = new NearbyBaseMarker();
+                nearbyBaseMarker.title(place.name);
+                nearbyBaseMarker.position(
+                        new com.mapbox.mapboxsdk.geometry.LatLng(
+                                place.location.getLatitude(),
+                                place.location.getLongitude()));
+                nearbyBaseMarker.place(place);
+                nearbyBaseMarker.icon(IconFactory.getInstance(getContext())
+                        .fromBitmap(icon));
+                marker.setIcon(IconFactory.getInstance(getContext()).fromBitmap(icon));
+            }
+        }
+    }
+
+    /**
+     * Greys out all markers except current location marker
+     */
+    private void greyOutAllMarkers() {
+        if(currentLocationMarker==null){
+            return;
+        }
+        VectorDrawableCompat vectorDrawable;
+        vectorDrawable = VectorDrawableCompat.create(
+                getContext().getResources(), R.drawable.ic_custom_greyed_out_marker, getContext().getTheme());
+        Bitmap icon = UiUtils.getBitmap(vectorDrawable);
+        for (Marker marker : mapBox.getMarkers()) {
+            if (!marker.equals(currentLocationMarker)) {
+                marker.setIcon(IconFactory.getInstance(getContext()).fromBitmap(icon));
+            }
+        }
+        addCurrentLocationMarker(NearbyController.currentLocation);
+    }
+
+    private void addNearbyMarkersToMapBoxMap(List<NearbyBaseMarker> nearbyBaseMarkers, Marker selectedMarker) {
+        if (isMapBoxReady && mapBox != null) {
+            mapBox.addMarkers(nearbyBaseMarkers);
+            setMapMarkerActions(selectedMarker);
+            presenter.updateMapMarkersToController(nearbyBaseMarkers);
+        }
+    }
+
+    private void setMapMarkerActions(Marker selectedMarker) {
+        if (mapBox != null) {
+            mapBox.setOnInfoWindowCloseListener(marker -> {
+                if (marker == selectedMarker) {
+                    presenter.markerUnselected();
+                }
+            });
+
+            mapBox.setOnMarkerClickListener(marker -> {
+                if (marker instanceof NearbyMarker) {
+                    presenter.markerSelected(marker);
+                }
+                return false;
+            });
+        }
+    }
+
     @Override
     public void recenterMap(fr.free.nrw.commons.location.LatLng curLatLng) {
-        nearbyMapFragment.addCurrentLocationMarker(curLatLng);
+        if (curLatLng == null) {
+            return;
+        }
+        addCurrentLocationMarker(curLatLng);
         CameraPosition position;
 
-        if (ViewUtil.isPortrait(getActivity())){
+        if (ViewUtil.isPortrait(getActivity())) {
             position = new CameraPosition.Builder()
                     .target(isListBottomSheetExpanded() ?
                             new LatLng(curLatLng.getLatitude() - CAMERA_TARGET_SHIFT_FACTOR_PORTRAIT,
@@ -853,9 +1245,9 @@ public void recenterMap(fr.free.nrw.commons.location.LatLng curLatLng) {
                             : new LatLng(curLatLng.getLatitude(), curLatLng.getLongitude(), 0)) // Sets the new camera position
                     .zoom(isListBottomSheetExpanded() ?
                             ZOOM_LEVEL
-                            : nearbyMapFragment.getMapboxMap().getCameraPosition().zoom) // Same zoom level
+                            : mapBox.getCameraPosition().zoom) // Same zoom level
                     .build();
-        }else {
+        } else {
             position = new CameraPosition.Builder()
                     .target(isListBottomSheetExpanded() ?
                             new LatLng(curLatLng.getLatitude() - CAMERA_TARGET_SHIFT_FACTOR_LANDSCAPE,
@@ -863,11 +1255,11 @@ public void recenterMap(fr.free.nrw.commons.location.LatLng curLatLng) {
                             : new LatLng(curLatLng.getLatitude(), curLatLng.getLongitude(), 0)) // Sets the new camera position
                     .zoom(isListBottomSheetExpanded() ?
                             ZOOM_LEVEL
-                            : nearbyMapFragment.getMapboxMap().getCameraPosition().zoom) // Same zoom level
+                            : mapBox.getCameraPosition().zoom) // Same zoom level
                     .build();
         }
 
-        nearbyMapFragment.getMapboxMap().animateCamera(CameraUpdateFactory.newCameraPosition(position), 1000);
+        mapBox.animateCamera(CameraUpdateFactory.newCameraPosition(position), 1000);
     }
 
     @Override
@@ -890,6 +1282,11 @@ public void displayBottomSheetWithInfo(Marker marker) {
         bottomSheetDetailsBehavior.setState(BottomSheetBehavior.STATE_COLLAPSED);
     }
 
+    @Override
+    public void addOnCameraMoveListener() {
+        mapBox.addOnCameraMoveListener(cameraMoveListener);
+    }
+
     /**
      * If nearby details bottom sheet state is collapsed: show fab plus
      * If nearby details bottom sheet state is expanded: show fab plus
@@ -908,7 +1305,9 @@ public void prepareViewsForSheetPosition(int bottomSheetState) {
                 this.getView().requestFocus();
                 break;
             case (BottomSheetBehavior.STATE_HIDDEN):
-                nearbyMapFragment.getMapboxMap().deselectMarkers();
+                if (null != mapBox) {
+                    mapBox.deselectMarkers();
+                }
                 transparentView.setClickable(false);
                 transparentView.setAlpha(0);
                 collapseFABs(isFABsExpanded);
@@ -932,7 +1331,7 @@ private void passInfoToSheet(Place place) {
         bookmarkButton.setOnClickListener(view -> {
             boolean isBookmarked = bookmarkLocationDao.updateBookmarkLocation(this.selectedPlace);
             updateBookmarkButtonImage(this.selectedPlace);
-            nearbyMapFragment.updateMarker(isBookmarked, this.selectedPlace, locationManager.getLastLocation());
+            updateMarker(isBookmarked, this.selectedPlace, locationManager.getLastLocation());
         });
 
         wikipediaButton.setVisibility(place.hasWikipediaLink()?View.VISIBLE:View.GONE);
@@ -999,37 +1398,52 @@ public void onDestroy() {
     }
 
     @Override
-    public void onPause() {
-        super.onPause();
-        // this means that this activity will not be recreated now, user is leaving it
-        // or the activity is otherwise finishing
-        if(getActivity().isFinishing()) {
-            // we will not need this fragment anymore, this may also be a good place to signal
-            // to the retained fragment object to perform its own cleanup.
-            removeMapFragment();
-            removeListFragment();
-
-        }
-        if (broadcastReceiver != null) {
-            getActivity().unregisterReceiver(broadcastReceiver);
-            broadcastReceiver = null;
+    public void onWikidataEditSuccessful() {
+        if (mapBox != null && presenter != null && locationManager != null) {
+            presenter.updateMapAndList(MAP_UPDATED);
         }
+    }
+
+    private void showErrorMessage(String message) {
+        ViewUtil.showLongToast(getActivity(), message);
+    }
 
-        if (locationManager != null && nearbyParentFragmentPresenter != null) {
-            locationManager.removeLocationListener(nearbyParentFragmentPresenter);
-            locationManager.unregisterLocationManager();
+    public void registerUnregisterLocationListener(boolean removeLocationListener) {
+        try {
+            if (removeLocationListener) {
+                locationManager.unregisterLocationManager();
+                locationManager.removeLocationListener(this);
+                Timber.d("Location service manager unregistered and removed");
+            } else {
+                locationManager.addLocationListener(this);
+                locationManager.registerLocationManager();
+                Timber.d("Location service manager added and registered");
+            }
+        }catch (Exception e){
+            Timber.e(e);
+            //Broadcasts are tricky, should be catchedonR
         }
     }
 
     @Override
-    public void onWikidataEditSuccessful() {
-        if (nearbyMapFragment != null && nearbyParentFragmentPresenter != null && locationManager != null) {
-            nearbyParentFragmentPresenter.updateMapAndList(MAP_UPDATED, locationManager.getLastLocation());
+    public void setUserVisibleHint(boolean isVisibleToUser) {
+        super.setUserVisibleHint(isVisibleToUser);
+        this.isVisibleToUser=isVisibleToUser;
+        if (isResumed() && isVisibleToUser) {
+            startTheMap();
+        } else {
+            if (null != bottomSheetListBehavior) {
+                bottomSheetListBehavior.setState(BottomSheetBehavior.STATE_HIDDEN);
+            }
+
+            if (null != bottomSheetDetailsBehavior) {
+                bottomSheetDetailsBehavior.setState(BottomSheetBehavior.STATE_HIDDEN);
+            }
         }
     }
 
-    private void showErrorMessage(String message) {
-        ViewUtil.showLongToast(getActivity(), message);
+    private void startTheMap() {
+        mapView.onStart();
+        performMapReadyActions();
     }
-
 }
diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/presenter/NearbyParentFragmentPresenter.java b/app/src/main/java/fr/free/nrw/commons/nearby/presenter/NearbyParentFragmentPresenter.java
index f13ef3635b..44c8a549a7 100644
--- a/app/src/main/java/fr/free/nrw/commons/nearby/presenter/NearbyParentFragmentPresenter.java
+++ b/app/src/main/java/fr/free/nrw/commons/nearby/presenter/NearbyParentFragmentPresenter.java
@@ -3,21 +3,27 @@
 import android.view.View;
 
 import com.mapbox.mapboxsdk.annotations.Marker;
-import com.mapbox.mapboxsdk.maps.MapboxMap;
 
+import java.lang.reflect.Proxy;
+import java.util.HashMap;
 import java.util.List;
 
+import javax.inject.Inject;
+
+import fr.free.nrw.commons.bookmarks.locations.BookmarkLocationsDao;
 import fr.free.nrw.commons.kvstore.JsonKvStore;
 import fr.free.nrw.commons.location.LatLng;
 import fr.free.nrw.commons.location.LocationServiceManager;
 import fr.free.nrw.commons.location.LocationUpdateListener;
 import fr.free.nrw.commons.nearby.CheckBoxTriStates;
 import fr.free.nrw.commons.nearby.Label;
+import fr.free.nrw.commons.nearby.MarkerPlaceGroup;
+import fr.free.nrw.commons.nearby.NearbyBaseMarker;
 import fr.free.nrw.commons.nearby.NearbyController;
 import fr.free.nrw.commons.nearby.NearbyFilterState;
 import fr.free.nrw.commons.nearby.Place;
-import fr.free.nrw.commons.nearby.contract.NearbyMapContract;
 import fr.free.nrw.commons.nearby.contract.NearbyParentFragmentContract;
+import fr.free.nrw.commons.upload.UploadContract;
 import fr.free.nrw.commons.utils.LocationUtils;
 import fr.free.nrw.commons.wikidata.WikidataEditListener;
 import timber.log.Timber;
@@ -32,118 +38,58 @@
 
 public class NearbyParentFragmentPresenter
         implements NearbyParentFragmentContract.UserActions,
-                    WikidataEditListener.WikidataP18EditListener,
-                    LocationUpdateListener,
-                    NearbyParentFragmentContract.ViewsAreReadyCallback{
-
+        WikidataEditListener.WikidataP18EditListener,
+        LocationUpdateListener {
 
-    private NearbyParentFragmentContract.View nearbyParentFragmentView;
-    private NearbyMapContract.View nearbyMapFragmentView;
-    private NearbyParentFragmentContract.NearbyListView nearbyListFragmentView;
     private boolean isNearbyLocked;
     private LatLng curLatLng;
 
-    private boolean nearbyViewsAreReady;
-    private boolean onTabSelected;
-    private boolean mapInitialized;
-
-    private Place placeToCenter;
-    private boolean isPortraitMode;
     private boolean placesLoadedOnce;
 
-    private LocationServiceManager locationServiceManager;
-
-    public static NearbyParentFragmentPresenter presenterInstance;
+    BookmarkLocationsDao bookmarkLocationDao;
+
+    private static final NearbyParentFragmentContract.View DUMMY = (NearbyParentFragmentContract.View) Proxy.newProxyInstance(
+            NearbyParentFragmentContract.View.class.getClassLoader(),
+            new Class[]{NearbyParentFragmentContract.View.class}, (proxy, method, args) -> {
+                if (method.getName().equals("onMyEvent")) {
+                    return null;
+                } else if (String.class == method.getReturnType()) {
+                    return "";
+                } else if (Integer.class == method.getReturnType()) {
+                    return Integer.valueOf(0);
+                } else if (int.class == method.getReturnType()) {
+                    return 0;
+                } else if (Boolean.class == method.getReturnType()) {
+                    return Boolean.FALSE;
+                } else if (boolean.class == method.getReturnType()) {
+                    return false;
+                } else {
+                    return null;
+                }
+            }
+    );
+    private NearbyParentFragmentContract.View nearbyParentFragmentView = DUMMY;
 
-    private NearbyParentFragmentPresenter(NearbyParentFragmentContract.NearbyListView nearbyListFragmentView,
-                                         NearbyParentFragmentContract.View nearbyParentFragmentView,
-                                         NearbyMapContract.View nearbyMapFragmentView,
-                                         LocationServiceManager locationServiceManager) {
-        this.nearbyListFragmentView = nearbyListFragmentView;
-        this.nearbyParentFragmentView = nearbyParentFragmentView;
-        this.nearbyMapFragmentView = nearbyMapFragmentView;
-        this.nearbyMapFragmentView.viewsAreAssignedToPresenter(this);
-        this.locationServiceManager = locationServiceManager;
-    }
 
-    // static method to create instance of Singleton class
-    public static NearbyParentFragmentPresenter getInstance(NearbyParentFragmentContract.NearbyListView nearbyListFragmentView,
-                                                            NearbyParentFragmentContract.View nearbyParentFragmentView,
-                                                            NearbyMapContract.View nearbyMapFragmentView,
-                                                            LocationServiceManager locationServiceManager) {
-        if (presenterInstance == null) {
-            presenterInstance = new NearbyParentFragmentPresenter(nearbyListFragmentView,
-                    nearbyParentFragmentView,
-                    nearbyMapFragmentView,
-                    locationServiceManager);
-        }
-        return presenterInstance;
+    public NearbyParentFragmentPresenter(BookmarkLocationsDao bookmarkLocationDao){
+        this.bookmarkLocationDao=bookmarkLocationDao;
     }
 
-    // We call this method when we are sure presenterInstance is not null
-    public static NearbyParentFragmentPresenter getInstance() {
-        return presenterInstance;
-    }
-
-    /**
-     * Note: To initialize nearby operations both views should be ready and tab is selected.
-     * Initializes nearby operations if nearby views are ready
-     */
     @Override
-    public void onTabSelected() {
-        Timber.d("Nearby tab selected");
-        onTabSelected = true;
-        // The condition for initialize operations is both having views ready and tab is selected
-        if (nearbyViewsAreReady && !mapInitialized) {
-            checkForPermission();
-        }
+    public void attachView(NearbyParentFragmentContract.View view){
+        this.nearbyParentFragmentView=view;
     }
 
-    /**
-     * -To initialize nearby operations both views should be ready and tab is selected.
-     * Initializes nearby operations if tab selected, otherwise just sets nearby views are ready
-     */
     @Override
-    public void nearbyFragmentsAreReady() {
-        Timber.d("Nearby fragments are ready to be used by presenter");
-        nearbyViewsAreReady = true;
-        // The condition for initialize operations is both having views ready and tab is selected
-        if (onTabSelected) {
-            checkForPermission();
-        }
-    }
-
-    /**
-     * Initializes nearby operations by following these steps:
-     * -Checks for permission and perform if given
-     */
-    @Override
-    public void checkForPermission() {
-        Timber.d("checking for permission");
-        nearbyParentFragmentView.checkPermissionsAndPerformAction(this::performNearbyOperationsIfPermissionGiven);
-    }
-
-    /**
-     * - Adds search this area button action
-     * - Adds camera move action listener
-     * - Initializes nearby operations, registers listeners, broadcast receivers etc.
-     */
-    public void performNearbyOperationsIfPermissionGiven() {
-        Timber.d("Permission is given, performing actions");
-        this.nearbyParentFragmentView.addSearchThisAreaButtonAction();
-        this.nearbyParentFragmentView.addOnCameraMoveListener(onCameraMove(getMapboxMap()));
-        initializeMapOperations();
+    public void detachView(){
+        this.nearbyParentFragmentView=DUMMY;
     }
 
     public void initializeMapOperations() {
         lockUnlockNearby(false);
-        registerUnregisterLocationListener(false);
-        nearbyParentFragmentView.addNetworkBroadcastReceiver();
-        updateMapAndList(LOCATION_SIGNIFICANTLY_CHANGED, null);
+        updateMapAndList(LOCATION_SIGNIFICANTLY_CHANGED);
         this.nearbyParentFragmentView.addSearchThisAreaButtonAction();
-        this.nearbyMapFragmentView.addOnCameraMoveListener(onCameraMove(getMapboxMap()));
         nearbyParentFragmentView.setCheckBoxAction();
-        mapInitialized = true;
     }
 
     /**
@@ -204,34 +150,13 @@ public void lockUnlockNearby(boolean isNearbyLocked) {
         }
     }
 
-    public void registerUnregisterLocationListener(boolean removeLocationListener) {
-        if (removeLocationListener) {
-            locationServiceManager.unregisterLocationManager();
-            locationServiceManager.removeLocationListener(this);
-            Timber.d("Location service manager unregistered and removed");
-        } else {
-            locationServiceManager.addLocationListener(this);
-            nearbyParentFragmentView.registerLocationUpdates(locationServiceManager);
-            Timber.d("Location service manager added and registered");
-        }
-    }
-
-    public LatLng getCameraTarget() {
-        return nearbyMapFragmentView.getCameraTarget();
-    }
-    public MapboxMap getMapboxMap() {
-        return nearbyMapFragmentView.getMapboxMap();
-    }
-
     /**
      * This method should be the single point to update Map and List. Triggered by location
      * changes
      * @param locationChangeType defines if location changed significantly or slightly
-     * @param cameraTarget will be used for search this area mode, when searching around
-     *                    user's camera target
      */
     @Override
-    public void updateMapAndList(LocationServiceManager.LocationChangeType locationChangeType, LatLng cameraTarget) {
+    public void updateMapAndList(LocationServiceManager.LocationChangeType locationChangeType) {
         Timber.d("Presenter updates map and list");
         if (isNearbyLocked) {
             Timber.d("Nearby is locked, so updateMapAndList returns");
@@ -243,7 +168,7 @@ public void updateMapAndList(LocationServiceManager.LocationChangeType locationC
             return;
         }
 
-        LatLng lastLocation = locationServiceManager.getLastLocation();
+        LatLng lastLocation = nearbyParentFragmentView.getLastLocation();
         curLatLng = lastLocation;
 
         if (curLatLng == null) {
@@ -260,14 +185,13 @@ public void updateMapAndList(LocationServiceManager.LocationChangeType locationC
             Timber.d("LOCATION_SIGNIFICANTLY_CHANGED");
             lockUnlockNearby(true);
             nearbyParentFragmentView.setProgressBarVisibility(true);
-            nearbyParentFragmentView.populatePlaces(lastLocation, lastLocation);
+            nearbyParentFragmentView.populatePlaces(lastLocation);
 
         } else if (locationChangeType.equals(SEARCH_CUSTOM_AREA)) {
             Timber.d("SEARCH_CUSTOM_AREA");
             lockUnlockNearby(true);
             nearbyParentFragmentView.setProgressBarVisibility(true);
-            nearbyParentFragmentView.populatePlaces(lastLocation, cameraTarget);
-
+            nearbyParentFragmentView.populatePlaces(nearbyParentFragmentView.getCameraTarget());
         } else { // Means location changed slightly, ie user is walking or driving.
             Timber.d("Means location changed slightly");
             if (!nearbyParentFragmentView.isSearchThisAreaButtonVisible()) { // Do not track users position if the user is checking around
@@ -281,28 +205,23 @@ public void updateMapAndList(LocationServiceManager.LocationChangeType locationC
      * location where you are not at.
      * @param nearbyPlacesInfo This variable has placeToCenter list information and distances.
      */
-    public void updateMapMarkers(NearbyController.NearbyPlacesInfo nearbyPlacesInfo, Marker selectedMarker) {
-        nearbyMapFragmentView.updateMapMarkers(nearbyPlacesInfo.curLatLng, nearbyPlacesInfo.placeList, selectedMarker, this);
-        nearbyMapFragmentView.addCurrentLocationMarker(nearbyPlacesInfo.curLatLng);
-        nearbyMapFragmentView.updateMapToTrackPosition(nearbyPlacesInfo.curLatLng);
-        lockUnlockNearby(false); // So that new location updates wont come
-        nearbyParentFragmentView.setProgressBarVisibility(false);
-        nearbyListFragmentView.updateListFragment(nearbyPlacesInfo.placeList);
-        handleCenteringTaskIfAny();
-    }
-
-    /**
-     * Populates places for custom location, should be used for finding nearby places around a
-     * location where you are not at.
-     * @param nearbyPlacesInfo This variable has placeToCenter list information and distances.
-     */
-    public void updateMapMarkersForCustomLocation(NearbyController.NearbyPlacesInfo nearbyPlacesInfo, Marker selectedMarker) {
-        nearbyMapFragmentView.updateMapMarkers(nearbyPlacesInfo.curLatLng, nearbyPlacesInfo.placeList, selectedMarker, this);
-        nearbyMapFragmentView.addCurrentLocationMarker(nearbyPlacesInfo.curLatLng);
-        lockUnlockNearby(false); // So that new location updates wont come
-        nearbyParentFragmentView.setProgressBarVisibility(false);
-        nearbyListFragmentView.updateListFragment(nearbyPlacesInfo.placeList);
-        handleCenteringTaskIfAny();
+    public void updateMapMarkers(NearbyController.NearbyPlacesInfo nearbyPlacesInfo, Marker selectedMarker, boolean shouldTrackPosition) {
+        if(null!=nearbyParentFragmentView) {
+            List<NearbyBaseMarker> nearbyBaseMarkers = NearbyController
+                    .loadAttractionsFromLocationToBaseMarkerOptions(nearbyPlacesInfo.curLatLng, // Curlatlang will be used to calculate distances
+                            nearbyPlacesInfo.placeList,
+                            nearbyParentFragmentView.getContext(),
+                            bookmarkLocationDao.getAllBookmarksLocations());
+            nearbyParentFragmentView.updateMapMarkers(nearbyBaseMarkers, selectedMarker);
+            nearbyParentFragmentView.addCurrentLocationMarker(nearbyPlacesInfo.curLatLng);
+            if(shouldTrackPosition){
+                nearbyParentFragmentView.updateMapToTrackPosition(nearbyPlacesInfo.curLatLng);
+            }
+            lockUnlockNearby(false); // So that new location updates wont come
+            nearbyParentFragmentView.setProgressBarVisibility(false);
+            nearbyParentFragmentView.updateListFragment(nearbyPlacesInfo.placeList);
+            handleCenteringTaskIfAny();
+        }
     }
 
     /**
@@ -312,25 +231,25 @@ public void updateMapMarkersForCustomLocation(NearbyController.NearbyPlacesInfo
     private void handleCenteringTaskIfAny() {
         if (!placesLoadedOnce) {
             placesLoadedOnce = true;
-            nearbyMapFragmentView.centerMapToPlace(placeToCenter, isPortraitMode);
+            nearbyParentFragmentView.centerMapToPlace(null);
         }
     }
 
     @Override
     public void onWikidataEditSuccessful() {
-        updateMapAndList(MAP_UPDATED, null);
+        updateMapAndList(MAP_UPDATED);
     }
 
     @Override
     public void onLocationChangedSignificantly(LatLng latLng) {
         Timber.d("Location significantly changed");
-        updateMapAndList(LOCATION_SIGNIFICANTLY_CHANGED, null);
+        updateMapAndList(LOCATION_SIGNIFICANTLY_CHANGED);
     }
 
     @Override
     public void onLocationChangedSlightly(LatLng latLng) {
         Timber.d("Location significantly changed");
-        updateMapAndList(LOCATION_SLIGHTLY_CHANGED, null);
+        updateMapAndList(LOCATION_SLIGHTLY_CHANGED);
     }
 
     @Override
@@ -339,11 +258,10 @@ public void onLocationChangedMedium(LatLng latLng) {
     }
 
     @Override
-    public MapboxMap.OnCameraMoveListener onCameraMove(MapboxMap mapboxMap) {
-        return () -> {
+    public void onCameraMove(com.mapbox.mapboxsdk.geometry.LatLng latLng) {
             // If our nearby markers are calculated at least once
-            if (NearbyController.currentLocation != null) {
-               double distance = mapboxMap.getCameraPosition().target.distanceTo
+            if (NearbyController.latestSearchLocation != null) {
+               double distance =latLng.distanceTo
                         (LocationUtils.commonsLatLngToMapBoxLatLng(NearbyController.latestSearchLocation));
                 if (nearbyParentFragmentView.isNetworkConnectionEstablished()) {
                     if (distance > NearbyController.latestSearchRadius) {
@@ -355,7 +273,6 @@ public MapboxMap.OnCameraMoveListener onCameraMove(MapboxMap mapboxMap) {
             } else {
                 nearbyParentFragmentView.setSearchThisAreaButtonVisibility(false);
             }
-        };
     }
 
     @Override
@@ -366,19 +283,34 @@ public void filterByMarkerType(List<Label> selectedLabels, int state, boolean fi
                     // Do nothing
                     break;
                 case UNCHECKED:
-                    nearbyMapFragmentView.filterOutAllMarkers();
+                    nearbyParentFragmentView.filterOutAllMarkers();
                     nearbyParentFragmentView.setRecyclerViewAdapterItemsGreyedOut();
                     break;
                 case CHECKED:
-                    nearbyMapFragmentView.displayAllMarkers();
+                    nearbyParentFragmentView.displayAllMarkers();
                     nearbyParentFragmentView.setRecyclerViewAdapterAllSelected();
                     break;
             }
         } else {
-            nearbyMapFragmentView.filterMarkersByLabels(selectedLabels,
+            nearbyParentFragmentView.filterMarkersByLabels(selectedLabels,
                     NearbyFilterState.getInstance().isExistsSelected(),
                     NearbyFilterState.getInstance().isNeedPhotoSelected(),
-                    filterForPlaceState, filterForAllNoneType);
+                    filterForPlaceState, false);
+        }
+    }
+
+    @Override
+    public void updateMapMarkersToController(List<NearbyBaseMarker> nearbyBaseMarkers) {
+        NearbyController.markerExistsMap = new HashMap<>();
+        NearbyController.markerNeedPicMap = new HashMap<>();
+        NearbyController.markerLabelList.clear();
+        for (int i = 0; i < nearbyBaseMarkers.size(); i++) {
+            NearbyBaseMarker nearbyBaseMarker = nearbyBaseMarkers.get(i);
+            NearbyController.markerLabelList.add(
+                    new MarkerPlaceGroup(nearbyBaseMarkers.get(i).getMarker(), bookmarkLocationDao.findBookmarkLocation(nearbyBaseMarkers.get(i).getPlace()), nearbyBaseMarker.getPlace()));
+            //TODO: fix bookmark location
+            NearbyController.markerExistsMap.put((nearbyBaseMarkers.get(i).getPlace().hasWikidataLink()), nearbyBaseMarkers.get(i).getMarker());
+            NearbyController.markerNeedPicMap.put(((nearbyBaseMarkers.get(i).getPlace().pic == null) ? true : false), nearbyBaseMarkers.get(i).getMarker());
         }
     }
 
@@ -403,11 +335,9 @@ public View.OnClickListener onSearchThisAreaClicked() {
             nearbyParentFragmentView.setSearchThisAreaButtonVisibility(false);
 
             if (searchCloseToCurrentLocation()){
-                updateMapAndList(LOCATION_SIGNIFICANTLY_CHANGED,
-                        null);
+                updateMapAndList(LOCATION_SIGNIFICANTLY_CHANGED);
             } else {
-                updateMapAndList(SEARCH_CUSTOM_AREA,
-                        getCameraTarget());
+                updateMapAndList(SEARCH_CUSTOM_AREA);
             }
         };
     }
@@ -418,9 +348,11 @@ public View.OnClickListener onSearchThisAreaClicked() {
      * @return Returns true if search this area button is used around our current location
      */
     public boolean searchCloseToCurrentLocation() {
-        double distance = LocationUtils.commonsLatLngToMapBoxLatLng(getCameraTarget())
-                .distanceTo(new com.mapbox.mapboxsdk.geometry.LatLng(NearbyController.currentLocation.getLatitude()
-                        , NearbyController.currentLocation.getLongitude()));
+        if (null == nearbyParentFragmentView.getLastFocusLocation()) {
+            return true;
+        }
+        double distance = LocationUtils.commonsLatLngToMapBoxLatLng(nearbyParentFragmentView.getCameraTarget())
+                .distanceTo(nearbyParentFragmentView.getLastFocusLocation());
         if (distance > NearbyController.currentLocationSearchRadius * 3 / 4) {
             return false;
         } else {
@@ -428,16 +360,20 @@ public boolean searchCloseToCurrentLocation() {
         }
     }
 
-    /**
-     * Centers the map in nearby fragment to a given placeToCenter
-     * @param place is new center of the map
-     */
-    public void centerMapToPlace(Place place, boolean isPortraitMode) {
-        if (placesLoadedOnce) {
-            nearbyMapFragmentView.centerMapToPlace(place, isPortraitMode);
+    public void onMapReady() {
+        if(null!=nearbyParentFragmentView) {
+            nearbyParentFragmentView.addSearchThisAreaButtonAction();
+            initializeMapOperations();
+        }
+    }
+
+    public boolean areLocationsClose(LatLng cameraTarget, LatLng lastKnownLocation) {
+        double distance = LocationUtils.commonsLatLngToMapBoxLatLng(cameraTarget)
+                .distanceTo(LocationUtils.commonsLatLngToMapBoxLatLng(lastKnownLocation));
+        if (distance > NearbyController.currentLocationSearchRadius * 3 / 4) {
+            return false;
         } else {
-            this.isPortraitMode = isPortraitMode;
-            this.placeToCenter = place;
+            return true;
         }
     }
 }
diff --git a/app/src/main/java/fr/free/nrw/commons/utils/ExecutorUtils.java b/app/src/main/java/fr/free/nrw/commons/utils/ExecutorUtils.java
index 57ed86eebb..889b31f2d1 100644
--- a/app/src/main/java/fr/free/nrw/commons/utils/ExecutorUtils.java
+++ b/app/src/main/java/fr/free/nrw/commons/utils/ExecutorUtils.java
@@ -4,6 +4,8 @@
 import android.os.Looper;
 
 import java.util.concurrent.Executor;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 
 public class ExecutorUtils {
 
@@ -19,4 +21,11 @@ public static Executor uiExecutor() {
         return uiExecutor;
     }
 
+
+    private static final ExecutorService executor = Executors.newFixedThreadPool(3);
+
+    public static ExecutorService get() {
+        return executor;
+    }
+
 }
diff --git a/app/src/main/res/layout-v21/drawer_view.xml b/app/src/main/res/layout-v21/drawer_view.xml
new file mode 100644
index 0000000000..1850f9a8ed
--- /dev/null
+++ b/app/src/main/res/layout-v21/drawer_view.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.google.android.material.navigation.NavigationView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/navigation_view"
+    android:layout_width="wrap_content"
+    android:layout_height="match_parent"
+    android:layout_gravity="start"
+    android:elevation="2dp"
+    app:headerLayout="@layout/drawer_header"
+    app:menu="@menu/drawer" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/bottom_sheet_details.xml b/app/src/main/res/layout/bottom_sheet_details.xml
index a0fc99ca3c..2a95ded813 100644
--- a/app/src/main/res/layout/bottom_sheet_details.xml
+++ b/app/src/main/res/layout/bottom_sheet_details.xml
@@ -8,7 +8,7 @@
     app:layout_behavior="@string/bottom_sheet_behavior"
     app:behavior_peekHeight="72dp"
     app:behavior_hideable="true"
-    android:visibility="gone"
+    android:visibility="visible"
 
     >
 
diff --git a/app/src/main/res/layout/bottom_sheet_nearby.xml b/app/src/main/res/layout/bottom_sheet_nearby.xml
index 05f38da50f..0e407db84d 100644
--- a/app/src/main/res/layout/bottom_sheet_nearby.xml
+++ b/app/src/main/res/layout/bottom_sheet_nearby.xml
@@ -1,51 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="480dp"
-    android:id="@+id/bottom_sheet"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/bottom_sheet"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
     android:orientation="vertical"
-    android:background="?attr/mainBackground"
-    app:layout_behavior="@string/bottom_sheet_behavior"
-    app:behavior_peekHeight="0dp"
     app:behavior_hideable="true"
-    >
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/loading_nearby_list"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:visibility="visible">
-
-    <ProgressBar
-        android:id="@+id/progress_bar"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"
-        />
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        android:layout_marginTop="10dp"
-        android:textSize="20sp"
-        app:layout_constraintTop_toBottomOf="@+id/progress_bar"
-        android:text="Loading..."
-        />
-    </androidx.constraintlayout.widget.ConstraintLayout>
+    android:visibility="visible"
+    app:layout_behavior="@string/bottom_sheet_behavior"
+    android:background="@android:color/white">
 
-    <FrameLayout
-        android:id="@+id/container_sheet"
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/rv_nearby_list"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:focusableInTouchMode="true"
-        android:layout_marginLeft="16dp"
-        android:layout_marginRight="16dp"
-        android:layout_marginBottom="8dp"
-        android:layout_marginTop="8dp"
-        android:visibility="gone" />
-
-</LinearLayout>
+        android:layout_height="match_parent" />
+</RelativeLayout>
diff --git a/app/src/main/res/layout/drawer_view.xml b/app/src/main/res/layout/drawer_view.xml
index f560e55d0e..1850f9a8ed 100644
--- a/app/src/main/res/layout/drawer_view.xml
+++ b/app/src/main/res/layout/drawer_view.xml
@@ -5,5 +5,6 @@
     android:layout_width="wrap_content"
     android:layout_height="match_parent"
     android:layout_gravity="start"
+    android:elevation="2dp"
     app:headerLayout="@layout/drawer_header"
     app:menu="@menu/drawer" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_nearby_list.xml b/app/src/main/res/layout/fragment_nearby_list.xml
index 432666f670..bc716e959a 100644
--- a/app/src/main/res/layout/fragment_nearby_list.xml
+++ b/app/src/main/res/layout/fragment_nearby_list.xml
@@ -2,6 +2,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
+    android:visibility="gone"
     >
 
     <androidx.recyclerview.widget.RecyclerView
diff --git a/app/src/main/res/layout/fragment_nearby_parent.xml b/app/src/main/res/layout/fragment_nearby_parent.xml
index 3838c661e5..9ad4791cdf 100644
--- a/app/src/main/res/layout/fragment_nearby_parent.xml
+++ b/app/src/main/res/layout/fragment_nearby_parent.xml
@@ -10,11 +10,6 @@
         android:layout_height="match_parent"
         android:background="@color/status_bar_blue"
         android:id="@+id/map_layout">
-        
-        <View
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:focusableInTouchMode="true"/>
 
         <include
             layout="@layout/nearby_filter_all_items"
@@ -27,11 +22,25 @@
             android:layout_width="160dp"
             android:layout_alignParentEnd="true"/>
 
+
+        <!--  I have done this intentionally, the mapview because of some elevation or something,
+        sometimes hangs over the drawer layout and sometimes draws its onPaused state over the contributions, this seems to be the probable fix  -->
         <FrameLayout
-            android:id="@+id/container"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_below="@id/nearby_filter"/>
+            android:layout_below="@id/nearby_filter">
+
+            <com.mapbox.mapboxsdk.maps.MapView
+                android:id="@+id/map_view"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" />
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:background="@android:color/transparent" />
+
+        </FrameLayout>
 
 
         <Button
@@ -54,7 +63,6 @@
             android:id="@+id/transparentView"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_below="@id/toolbar"
             android:layout_alignParentLeft="true"
             android:background="#aa969696"
             android:visibility="gone"
diff --git a/app/src/main/res/layout/nearby_search_list_item.xml b/app/src/main/res/layout/nearby_search_list_item.xml
index 12ad221c49..62a79c1859 100644
--- a/app/src/main/res/layout/nearby_search_list_item.xml
+++ b/app/src/main/res/layout/nearby_search_list_item.xml
@@ -1,21 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/search_list_item"
-    android:orientation="horizontal"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginHorizontal="25dp"
-    >
+    android:orientation="horizontal"
+    android:padding="4dp">
 
     <ImageView
         android:id="@+id/place_icon"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content">
-    </ImageView>
+        android:layout_height="wrap_content" />
 
     <TextView
         android:id="@+id/place_text"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-    </TextView>
+        android:layout_height="wrap_content"></TextView>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/nearby_search_list_item_dark.xml b/app/src/main/res/layout/nearby_search_list_item_dark.xml
new file mode 100644
index 0000000000..e89074b7c7
--- /dev/null
+++ b/app/src/main/res/layout/nearby_search_list_item_dark.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/search_list_item"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:padding="4dp"
+    android:orientation="horizontal">
+
+    <ImageView
+        android:id="@+id/place_icon"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
+
+    <TextView
+        android:id="@+id/place_text"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:textColor="@color/white"></TextView>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f06dcdfd1d..a2e5fa94c8 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -277,7 +277,7 @@
   <string name="wikicode_copied">The wikitext was copied to the clipboard</string>
 
   <string name="nearby_location_has_not_changed">Location has not changed.</string>
-  <string name="nearby_location_not_available">Location not available.</string>
+  <string name="nearby_location_not_available">Nearby might not work properly, Location not available.</string>
   <string name="location_permission_rationale_nearby">Permission required to display a list of nearby places</string>
   <string name="get_directions">Get directions</string>
   <string name="read_article">Read article</string>