Merge(Added LoginActivity)

.idea/modules.xml

@@ -4,6 +4,7 @@
     <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://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="" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
   </component>
 </project>
\ No newline at end of file

app/build.gradle

@@ -29,5 +29,6 @@ dependencies {
     compile 'net.openid:appauth:0.2.0'
     testCompile 'junit:junit:4.12'
     compile 'com.android.support:design:25.3.1'
-    compile 'com.android.support.constraint:constraint-layout:1.0.0-beta4'
+    compile 'com.android.support.constraint:constraint-layout:1.0.2'
+    compile 'com.android.support:support-v4:25.3.1'
 }

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

@@ -2,9 +2,11 @@ package in.ac.iitb.gymkhana.iitbapp;
 
 import android.os.Bundle;
 import android.support.design.widget.FloatingActionButton;
-import android.support.design.widget.Snackbar;
-import android.view.View;
 import android.support.design.widget.NavigationView;
+import android.support.design.widget.Snackbar;
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentManager;
+import android.support.v4.app.FragmentTransaction;
 import android.support.v4.view.GravityCompat;
 import android.support.v4.widget.DrawerLayout;
 import android.support.v7.app.ActionBarDrawerToggle;
@@ -12,6 +14,9 @@ import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
 import android.view.Menu;
 import android.view.MenuItem;
+import android.view.View;
+
+import in.ac.iitb.gymkhana.iitbapp.fragments.CalendarFragment;
 
 public class MainActivity extends AppCompatActivity
         implements NavigationView.OnNavigationItemSelectedListener {
@@ -80,17 +85,28 @@ 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_pt_cell) {
 
-        } else if (id == R.id.nav_slideshow) {
+        } else if (id == R.id.nav_mess_menu) {
 
-        } else if (id == R.id.nav_manage) {
+        } else if (id == R.id.nav_gc_rankings) {
 
-        } else if (id == R.id.nav_share) {
+        } else if (id == R.id.nav_calendar) {
+            CalendarFragment calendarFragment = new CalendarFragment();
+            updateFragment(calendarFragment);
+        } else if (id == R.id.nav_cms) {
 
-        } else if (id == R.id.nav_send) {
+        } else if (id == R.id.nav_timetable) {
+
+        } else if (id == R.id.nav_map) {
+
+        } else if (id == R.id.nav_contacts) {
+
+        } else if (id == R.id.nav_about) {
 
         }
 
@@ -98,4 +114,11 @@ public class MainActivity extends AppCompatActivity
         drawer.closeDrawer(GravityCompat.START);
         return true;
     }
+
+    private void updateFragment(Fragment fragment) {
+        FragmentManager manager = getSupportFragmentManager();
+        FragmentTransaction transaction = manager.beginTransaction();
+        transaction.replace(R.id.constraintlayout_for_fragment, fragment, fragment.getTag());
+        transaction.commit();
+    }
 }

app/src/main/java/in/ac/iitb/gymkhana/iitbapp/fragments/CalendarFragment.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 CalendarFragment extends Fragment {
+
+
+    public CalendarFragment() {
+        // 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_calendar, container, false);
+    }
+
+}

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

 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
     android:layout_height="match_parent"
-    app:layout_behavior="@string/appbar_scrolling_view_behavior" tools:context="in.ac.iitb.gymkhana.iitbapp.MainActivity"
-    tools:showIn="@layout/app_bar_main">
-
-    <TextView android:layout_width="wrap_content" android:layout_height="wrap_content"
-        android:text="Hello World!" app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-</android.support.constraint.ConstraintLayout>
+    android:id="@+id/constraintlayout_for_fragment"
+    app:layout_behavior="@string/appbar_scrolling_view_behavior"
+    tools:context="in.ac.iitb.gymkhana.iitbapp.MainActivity"
+    tools:showIn="@layout/app_bar_main" />

app/src/main/res/layout/fragment_calendar.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.CalendarFragment">
+
+    <!-- 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/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>
 

app/src/main/res/values/strings.xml

@@ -5,4 +5,7 @@
     <string name="navigation_drawer_close">Close navigation drawer</string>
 
     <string name="action_settings">Settings</string>
+
+    <!-- TODO: Remove or change this placeholder text -->
+    <string name="hello_blank_fragment">Hello blank fragment</string>
 </resources>

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