Merge pull request #6 from Divyadarshee/master

Edit Navigation Drawer items

.idea/misc.xml

@@ -24,7 +24,7 @@
       </value>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" project-jdk-name="JDK" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">

.idea/modules.xml

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

.idea/vcs.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file

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

@@ -80,17 +80,23 @@ public class MainActivity extends AppCompatActivity
         // Handle navigation view item clicks here.
         int id = item.getItemId();
 
-        if (id == R.id.nav_camera) {
+        if (id == R.id.nav_feed) {
             // Handle the camera action
-        } else if (id == R.id.nav_gallery) {
+        } else if (id == R.id.nav_my_events) {
 
-        } else if (id == R.id.nav_slideshow) {
+        } else if (id == R.id.nav_pt_cell) {
 
-        } else if (id == R.id.nav_manage) {
+        } else if (id == R.id.nav_mess_menu) {
 
-        } else if (id == R.id.nav_share) {
+        } else if (id == R.id.nav_gc_rankings) {
 
-        } else if (id == R.id.nav_send) {
+        } else if (id == R.id.nav_calendar) {
+
+        }else if (id == R.id.nav_cms) {
+
+        }else if (id == R.id.nav_timetable) {
+
+        }else if (id == R.id.nav_map) {
 
         }
 

app/src/main/res/menu/activity_main_drawer.xml

@@ -2,23 +2,35 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools" tools:showIn="navigation_view">
 
+    //TODO Update icons
     <group android:checkableBehavior="single">
-        <item android:id="@+id/nav_camera" android:icon="@drawable/ic_menu_camera"
-            android:title="Import" />
-        <item android:id="@+id/nav_gallery" android:icon="@drawable/ic_menu_gallery"
-            android:title="Gallery" />
-        <item android:id="@+id/nav_slideshow" android:icon="@drawable/ic_menu_slideshow"
-            android:title="Slideshow" />
-        <item android:id="@+id/nav_manage" android:icon="@drawable/ic_menu_manage"
-            android:title="Tools" />
+        <item android:id="@+id/nav_feed" android:icon="@drawable/ic_feed"
+            android:title="Feed" />
+        <item android:id="@+id/nav_my_events" android:icon="@drawable/ic_event"
+            android:title="My Events" />
+        <item android:id="@+id/nav_pt_cell" android:icon="@drawable/ic_pt"
+            android:title="PT Cell" />
+
+        <item android:id="@+id/nav_mess_menu" android:icon="@drawable/ic_mess_menu"
+            android:title="Mess Menu" />
+        <item android:id="@+id/nav_gc_rankings" android:icon="@drawable/ic_poll"
+            android:title="GC Rankings" />
+        <item android:id="@+id/nav_calendar" android:icon="@drawable/ic_calendar"
+            android:title="Calendar" />
+        <item android:id="@+id/nav_timetable" android:icon="@drawable/ic_timetable"
+            android:title="Timetable" />
+        <item android:id="@+id/nav_cms" android:icon="@drawable/ic_contacts"
+            android:title="CMS" />
+        <item android:id="@+id/nav_map" android:icon="@drawable/ic_map"
+            android:title="Map" />
     </group>
 
     <item android:title="Communicate">
         <menu>
-            <item android:id="@+id/nav_share" android:icon="@drawable/ic_menu_share"
-                android:title="Share" />
-            <item android:id="@+id/nav_send" android:icon="@drawable/ic_menu_send"
-                android:title="Send" />
+            <item android:id="@+id/nav_contacts" android:icon="@drawable/ic_phone"
+                android:title="Contacts" />
+            <item android:id="@+id/nav_about" android:icon="@drawable/ic_about"
+                android:title="About" />
         </menu>
     </item>
 

build.gradle

@@ -7,7 +7,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.0-alpha1'
+        classpath 'com.android.tools.build:gradle:3.0.0-alpha2'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files