Merge branch 'master' into createEventApi

.idea/modules.xml

@@ -2,7 +2,9 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/IITB-App.iml" filepath="$PROJECT_DIR$/IITB-App.iml" />
+
+      <module fileurl="file://$PROJECT_DIR$/IITBApp.iml" filepath="$PROJECT_DIR$/IITBApp.iml" />
+
       <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
     </modules>
   </component>

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);
 

app/src/main/res/layout/fragment_calendar.xml

@@ -18,8 +18,6 @@
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:focusedMonthDateColor="#000000"
-        android:maxDate="01/01/2019"
-        android:minDate="01/01/2017"
         android:unfocusedMonthDateColor="#FFFFFF" />
 
     <View