Merge pull request #553 from maskaravivek/mapView

Added support for MapView in Nearby

app/src/main/java/fr/free/nrw/commons/nearby/NearbyActivity.java

@@ -2,7 +2,6 @@ package fr.free.nrw.commons.nearby;
 
 import android.os.Bundle;
 import android.support.v4.app.FragmentTransaction;
-import android.util.Log;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
@@ -12,6 +11,7 @@ import fr.free.nrw.commons.location.LocationServiceManager;
 import fr.free.nrw.commons.theme.BaseActivity;
 
 public class NearbyActivity extends BaseActivity {
+    private boolean isMapViewActive = false;
 
     private LocationServiceManager locationManager;
 
@@ -47,21 +47,32 @@ public class NearbyActivity extends BaseActivity {
                 refreshView();
                 return true;
             case R.id.action_map:
-                Log.d("Nearby","map is clicked");
+                showMapView();
                 return true;
             default:
                 return super.onOptionsItemSelected(item);
         }
     }
 
+    private void showMapView() {
+        isMapViewActive = true;
+        getSupportFragmentManager().beginTransaction()
+                .replace(R.id.container, new NearbyMapFragment()).commit();
+    }
+
     @Override
     protected void onResume() {
         super.onResume();
     }
 
     protected void refreshView() {
-        getSupportFragmentManager().beginTransaction()
-                .replace(R.id.container, new NearbyListFragment()).commit();
+        if (isMapViewActive) {
+            getSupportFragmentManager().beginTransaction()
+                    .replace(R.id.container, new NearbyMapFragment()).commit();
+        } else {
+            getSupportFragmentManager().beginTransaction()
+                    .replace(R.id.container, new NearbyListFragment()).commit();
+        }
     }
 
     public LocationServiceManager getLocationManager() {

app/src/main/java/fr/free/nrw/commons/nearby/NearbyMapFragment.java

@@ -0,0 +1,84 @@
+package fr.free.nrw.commons.nearby;
+
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+
+import com.mapbox.mapboxsdk.Mapbox;
+import com.mapbox.mapboxsdk.maps.MapView;
+import com.mapbox.mapboxsdk.maps.MapboxMap;
+import com.mapbox.mapboxsdk.maps.OnMapReadyCallback;
+import com.mapbox.services.android.telemetry.MapboxTelemetry;
+
+import fr.free.nrw.commons.R;
+
+public class NearbyMapFragment extends android.support.v4.app.Fragment {
+    @BindView(R.id.mapview) MapView mapView;
+
+    public NearbyMapFragment() {
+
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        Mapbox.getInstance(getActivity(),
+                getString(R.string.mapbox_commons_app_token));
+        MapboxTelemetry.getInstance().setTelemetryEnabled(false);
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        View view = inflater.inflate(R.layout.fragment_nearby_map, container, false);
+        ButterKnife.bind(this, view);
+
+        mapView.onCreate(savedInstanceState);
+
+        setHasOptionsMenu(false);
+
+        mapView.getMapAsync(new OnMapReadyCallback() {
+            @Override
+            public void onMapReady(MapboxMap mapboxMap) {
+
+            }
+        });
+
+        return view;
+    }
+
+    @Override
+    public void onStart() {
+        mapView.onStart();
+        super.onStart();
+    }
+
+    @Override
+    public void onPause() {
+        mapView.onPause();
+        super.onPause();
+    }
+
+    @Override
+    public void onResume() {
+        mapView.onResume();
+        super.onResume();
+    }
+
+    @Override
+    public void onStop() {
+        mapView.onStop();
+        super.onStop();
+    }
+
+    @Override
+    public void onDestroyView() {
+        mapView.onDestroy();
+        super.onDestroyView();
+    }
+}