From c8b1ebb7feb7193d97b123f3d9d6d1b91a9003e3 Mon Sep 17 00:00:00 2001
From: neslihanturan <tur.neslihan@gmail.com>
Date: Wed, 12 Jun 2019 15:58:54 +0300
Subject: [PATCH] Add a view to nearby map ragment and insert map view as an
 item inside it

---
 .../mvp/fragments/NearbyMapFragment.java      | 25 ++++++++++++++++---
 .../NearbyParentFragmentPresenter.java        |  1 +
 .../main/res/layout/fragment_nearby_map.xml   | 12 +++++++++
 3 files changed, 34 insertions(+), 4 deletions(-)
 create mode 100644 app/src/main/res/layout/fragment_nearby_map.xml

diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/mvp/fragments/NearbyMapFragment.java b/app/src/main/java/fr/free/nrw/commons/nearby/mvp/fragments/NearbyMapFragment.java
index b34fa1a1f..9e669c39c 100644
--- a/app/src/main/java/fr/free/nrw/commons/nearby/mvp/fragments/NearbyMapFragment.java
+++ b/app/src/main/java/fr/free/nrw/commons/nearby/mvp/fragments/NearbyMapFragment.java
@@ -28,6 +28,7 @@ import com.mapbox.mapboxsdk.constants.Style;
 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.plugins.localization.LocalizationPlugin;
 
 import java.util.List;
@@ -98,10 +99,11 @@ public class NearbyMapFragment extends CommonsDaggerSupportFragment implements N
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
         Timber.d("onCreateView called");
+        View view = inflater.inflate(R.layout.fragment_nearby_map, container, false);
         setHasOptionsMenu(false);
         initViews();
-        this.mapView = setupMapView(savedInstanceState);
-        return mapView;
+        // this.mapView = setupMapView(savedInstanceState);
+        return view;
     }
 
     @Override
@@ -165,7 +167,22 @@ public class NearbyMapFragment extends CommonsDaggerSupportFragment implements N
                         .zoom(ZOOM_LEVEL)
                         .build());
 
-        if (!getParentFragment().getActivity().isFinishing()) {
+        MapView mapView = getView().findViewById(R.id.mapView);
+        mapView.onCreate(savedInstanceState);
+        mapView.getMapAsync(new OnMapReadyCallback() {
+                                @Override
+                                public void onMapReady(MapboxMap mapboxMap) {
+                                    NearbyMapFragment.this.mapboxMap = mapboxMap;
+                                    viewsAreReadyCallback.nearbyMapViewReady();
+                                }
+                            }
+        );
+
+        return mapView;
+
+
+
+        /*if (!getParentFragment().getActivity().isFinishing()) {
             MapView mapView = new MapView(getParentFragment().getActivity(), options);
             // create map
             mapView.onCreate(savedInstanceState);
@@ -185,7 +202,7 @@ public class NearbyMapFragment extends CommonsDaggerSupportFragment implements N
             });
             return mapView;
         }
-        return null;
+        return null;*/
     }
 
     @Override
diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/mvp/presenter/NearbyParentFragmentPresenter.java b/app/src/main/java/fr/free/nrw/commons/nearby/mvp/presenter/NearbyParentFragmentPresenter.java
index 69d2505b7..8a19d693d 100644
--- a/app/src/main/java/fr/free/nrw/commons/nearby/mvp/presenter/NearbyParentFragmentPresenter.java
+++ b/app/src/main/java/fr/free/nrw/commons/nearby/mvp/presenter/NearbyParentFragmentPresenter.java
@@ -118,6 +118,7 @@ public class NearbyParentFragmentPresenter
         //nearbyParentFragmentView.checkGps(locationServiceManager);
         // We will know when we went offline and online again
         nearbyParentFragmentView.addNetworkBroadcastReceiver();
+        nearbyMapFragmentView.setupMapView(null);
     }
 
     /**
diff --git a/app/src/main/res/layout/fragment_nearby_map.xml b/app/src/main/res/layout/fragment_nearby_map.xml
new file mode 100644
index 000000000..6ebf0b422
--- /dev/null
+++ b/app/src/main/res/layout/fragment_nearby_map.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical" android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <com.mapbox.mapboxsdk.maps.MapView
+        android:id="@+id/mapView"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        />
+
+</LinearLayout>
\ No newline at end of file