Merge pull request #35 from OwaisChunawala/master, fix #34

Fix map not loading bug

app/src/main/java/in/ac/iitb/gymkhana/iitbapp/MainActivity.java

@@ -179,11 +179,14 @@ public class MainActivity extends AppCompatActivity
                 updateFragment(timetableFragment);
                 break;
             case R.id.nav_map:
+                MapFragment mapFragment = new MapFragment();
                 if (ContextCompat.checkSelfPermission(MainActivity.this,
                         Manifest.permission.ACCESS_FINE_LOCATION)
                         == PackageManager.PERMISSION_GRANTED) {
-                } else
+                    updateFragment(mapFragment);
+                } else{
                     ActivityCompat.requestPermissions(this, new String[]{Manifest.permission.ACCESS_FINE_LOCATION}, 0);
+                }
                 break;
 
             case R.id.nav_contacts:

app/src/main/java/in/ac/iitb/gymkhana/iitbapp/fragment/MapFragment.java

@@ -35,7 +35,7 @@ public class MapFragment extends Fragment implements OnMapReadyCallback {
     @Override
     public void onMapReady(GoogleMap gMap) {
         googleMap = gMap;
-        googleMap.setMyLocationEnabled(true);
+//        googleMap.setMyLocationEnabled(true);
         googleMap.getUiSettings().setMyLocationButtonEnabled(false);
         googleMap.getUiSettings().setZoomGesturesEnabled(true);