Merge pull request #10 from Divyadarshee/master, close #8

Add fragments to entries of nav-drawer

.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

@@ -3,11 +3,8 @@
   <component name="ProjectModuleManager">
     <modules>
       <module fileurl="file://$PROJECT_DIR$/IITB-App.iml" filepath="$PROJECT_DIR$/IITB-App.iml" />
-      <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://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" />
-      <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
     </modules>
   </component>
 </project>
\ No newline at end of file

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

@@ -18,6 +18,17 @@ import android.view.View;
 
 import in.ac.iitb.gymkhana.iitbapp.fragments.CalendarFragment;
 import in.ac.iitb.gymkhana.iitbapp.fragments.MapFragment;
+import in.ac.iitb.gymkhana.iitbapp.fragments.FeedFragment;
+import in.ac.iitb.gymkhana.iitbapp.fragments.PTCellFragment;
+import in.ac.iitb.gymkhana.iitbapp.fragments.MyEventsFragment;
+import in.ac.iitb.gymkhana.iitbapp.fragments.MessMenuFragment;
+import in.ac.iitb.gymkhana.iitbapp.fragments.GCRankingsFragment;
+import in.ac.iitb.gymkhana.iitbapp.fragments.CMSFragment;
+import in.ac.iitb.gymkhana.iitbapp.fragments.ContactsFragment;
+import in.ac.iitb.gymkhana.iitbapp.fragments.AboutFragment;
+import in.ac.iitb.gymkhana.iitbapp.fragments.TimetableFragment;
+
+
 
 public class MainActivity extends AppCompatActivity
         implements NavigationView.OnNavigationItemSelectedListener {
@@ -87,30 +98,39 @@ public class MainActivity extends AppCompatActivity
         int id = item.getItemId();
 
         if (id == R.id.nav_feed) {
-            // Handle the camera action
+            FeedFragment feedFragment = new FeedFragment();
+            updateFragment(feedFragment);
         } else if (id == R.id.nav_my_events) {
-
+            MyEventsFragment myeventsFragment = new MyEventsFragment();
+            updateFragment(myeventsFragment);
         } else if (id == R.id.nav_pt_cell) {
-
+            PTCellFragment ptcellFragment = new PTCellFragment();
+            updateFragment(ptcellFragment);
         } else if (id == R.id.nav_mess_menu) {
-
+            MessMenuFragment messmenuFragment = new MessMenuFragment();
+            updateFragment(messmenuFragment);
         } else if (id == R.id.nav_gc_rankings) {
-
+            GCRankingsFragment gcrankingsFragment = new GCRankingsFragment();
+            updateFragment(gcrankingsFragment);
         } else if (id == R.id.nav_calendar) {
             CalendarFragment calendarFragment = new CalendarFragment();
             updateFragment(calendarFragment);
         } else if (id == R.id.nav_cms) {
-
+            CMSFragment cmsFragment = new CMSFragment();
+            updateFragment(cmsFragment);
         } else if (id == R.id.nav_timetable) {
-
+            TimetableFragment timetableFragment = new TimetableFragment();
+            updateFragment(timetableFragment);
         } else if (id == R.id.nav_map) {
             MapFragment mapFragment = new MapFragment();
             updateFragment(mapFragment);
 
         } else if (id == R.id.nav_contacts) {
-
+            ContactsFragment contactsFragment = new ContactsFragment();
+            updateFragment(contactsFragment);
         } else if (id == R.id.nav_about) {
-
+            AboutFragment aboutFragment = new AboutFragment();
+            updateFragment(aboutFragment);
         }
 
         DrawerLayout drawer = (DrawerLayout) findViewById(R.id.drawer_layout);

app/src/main/java/in/ac/iitb/gymkhana/iitbapp/fragments/AboutFragment.java

+package in.ac.iitb.gymkhana.iitbapp.fragments;
+
+
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import in.ac.iitb.gymkhana.iitbapp.R;
+
+/**
+ * A simple {@link Fragment} subclass.
+ */
+public class AboutFragment extends Fragment {
+
+
+    public AboutFragment() {
+        // Required empty public constructor
+    }
+
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        // Inflate the layout for this fragment
+        return inflater.inflate(R.layout.fragment_about, container, false);
+    }
+
+}

app/src/main/java/in/ac/iitb/gymkhana/iitbapp/fragments/CMSFragment.java

+package in.ac.iitb.gymkhana.iitbapp.fragments;
+
+
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import in.ac.iitb.gymkhana.iitbapp.R;
+
+/**
+ * A simple {@link Fragment} subclass.
+ */
+public class CMSFragment extends Fragment {
+
+
+    public CMSFragment() {
+        // Required empty public constructor
+    }
+
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        // Inflate the layout for this fragment
+        return inflater.inflate(R.layout.fragment_cms, container, false);
+    }
+
+}

app/src/main/java/in/ac/iitb/gymkhana/iitbapp/fragments/ContactsFragment.java

+package in.ac.iitb.gymkhana.iitbapp.fragments;
+
+
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import in.ac.iitb.gymkhana.iitbapp.R;
+
+/**
+ * A simple {@link Fragment} subclass.
+ */
+public class ContactsFragment extends Fragment {
+
+
+    public ContactsFragment() {
+        // Required empty public constructor
+    }
+
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        // Inflate the layout for this fragment
+        return inflater.inflate(R.layout.fragment_contacts, container, false);
+    }
+
+}

app/src/main/java/in/ac/iitb/gymkhana/iitbapp/fragments/FeedFragment.java

+package in.ac.iitb.gymkhana.iitbapp.fragments;
+
+
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import in.ac.iitb.gymkhana.iitbapp.R;
+
+/**
+ * A simple {@link Fragment} subclass.
+ */
+public class FeedFragment extends Fragment {
+
+
+    public FeedFragment() {
+        // Required empty public constructor
+    }
+
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        // Inflate the layout for this fragment
+        return inflater.inflate(R.layout.fragment_feed, container, false);
+    }
+
+}

app/src/main/java/in/ac/iitb/gymkhana/iitbapp/fragments/GCRankingsFragment.java

+package in.ac.iitb.gymkhana.iitbapp.fragments;
+
+
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import in.ac.iitb.gymkhana.iitbapp.R;
+
+/**
+ * A simple {@link Fragment} subclass.
+ */
+public class GCRankingsFragment extends Fragment {
+
+
+    public GCRankingsFragment() {
+        // Required empty public constructor
+    }
+
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        // Inflate the layout for this fragment
+        return inflater.inflate(R.layout.fragment_gc_rankings, container, false);
+    }
+
+}

app/src/main/java/in/ac/iitb/gymkhana/iitbapp/fragments/MessMenuFragment.java

+package in.ac.iitb.gymkhana.iitbapp.fragments;
+
+
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import in.ac.iitb.gymkhana.iitbapp.R;
+
+/**
+ * A simple {@link Fragment} subclass.
+ */
+public class MessMenuFragment extends Fragment {
+
+
+    public MessMenuFragment() {
+        // Required empty public constructor
+    }
+
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        // Inflate the layout for this fragment
+        return inflater.inflate(R.layout.fragment_mess_menu, container, false);
+    }
+
+}

app/src/main/java/in/ac/iitb/gymkhana/iitbapp/fragments/MyEventsFragment.java

+package in.ac.iitb.gymkhana.iitbapp.fragments;
+
+
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import in.ac.iitb.gymkhana.iitbapp.R;
+
+/**
+ * A simple {@link Fragment} subclass.
+ */
+public class MyEventsFragment extends Fragment {
+
+
+    public MyEventsFragment() {
+        // Required empty public constructor
+    }
+
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        // Inflate the layout for this fragment
+        return inflater.inflate(R.layout.fragment_my_events, container, false);
+    }
+
+}

app/src/main/java/in/ac/iitb/gymkhana/iitbapp/fragments/PTCellFragment.java

+package in.ac.iitb.gymkhana.iitbapp.fragments;
+
+
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import in.ac.iitb.gymkhana.iitbapp.R;
+
+/**
+ * A simple {@link Fragment} subclass.
+ */
+public class PTCellFragment extends Fragment {
+
+
+    public PTCellFragment() {
+        // Required empty public constructor
+    }
+
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        // Inflate the layout for this fragment
+        return inflater.inflate(R.layout.fragment_pt_cell, container, false);
+    }
+
+}

app/src/main/java/in/ac/iitb/gymkhana/iitbapp/fragments/TimetableFragment.java

+package in.ac.iitb.gymkhana.iitbapp.fragments;
+
+
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import in.ac.iitb.gymkhana.iitbapp.R;
+
+/**
+ * A simple {@link Fragment} subclass.
+ */
+public class TimetableFragment extends Fragment {
+
+
+    public TimetableFragment() {
+        // Required empty public constructor
+    }
+
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        // Inflate the layout for this fragment
+        return inflater.inflate(R.layout.fragment_timetable, container, false);
+    }
+
+}

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

+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context="in.ac.iitb.gymkhana.iitbapp.fragments.AboutFragment">
+
+    <!-- TODO: Update blank fragment layout -->
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:text="@string/hello_blank_fragment" />
+
+</FrameLayout>

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

+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context="in.ac.iitb.gymkhana.iitbapp.fragments.CMSFragment">
+
+    <!-- TODO: Update blank fragment layout -->
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:text="@string/hello_blank_fragment" />
+
+</FrameLayout>

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

+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context="in.ac.iitb.gymkhana.iitbapp.fragments.ContactsFragment">
+
+    <!-- TODO: Update blank fragment layout -->
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:text="@string/hello_blank_fragment" />
+
+</FrameLayout>

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

+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context="in.ac.iitb.gymkhana.iitbapp.fragments.FeedFragment">
+
+    <!-- TODO: Update blank fragment layout -->
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:text="@string/hello_blank_fragment" />
+
+</FrameLayout>

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

+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context="in.ac.iitb.gymkhana.iitbapp.fragments.GCRankingsFragment">
+
+    <!-- TODO: Update blank fragment layout -->
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:text="@string/hello_blank_fragment" />
+
+</FrameLayout>

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

+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context="in.ac.iitb.gymkhana.iitbapp.fragments.MessMenuFragment">
+
+    <!-- TODO: Update blank fragment layout -->
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:text="@string/hello_blank_fragment" />
+
+</FrameLayout>

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

+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context="in.ac.iitb.gymkhana.iitbapp.fragments.MyEventsFragment">
+
+    <!-- TODO: Update blank fragment layout -->
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:text="@string/hello_blank_fragment" />
+
+</FrameLayout>

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

+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context="in.ac.iitb.gymkhana.iitbapp.fragments.PTCellFragment">
+
+    <!-- TODO: Update blank fragment layout -->
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:text="@string/hello_blank_fragment" />
+
+</FrameLayout>

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

+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context="in.ac.iitb.gymkhana.iitbapp.fragments.TimetableFragment">
+
+    <!-- TODO: Update blank fragment layout -->
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:text="@string/hello_blank_fragment" />
+
+</FrameLayout>