Commit 92af05f3 authored by Sajal Narang's avatar Sajal Narang Committed by GitHub

Merge branch 'master' into patch1

parents 55868978 8f48523b
......@@ -65,7 +65,6 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
}
setContentView(R.layout.activity_main);
session = new SessionManager(getApplicationContext());
session.checkLogin();
Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
setSupportActionBar(toolbar);
......@@ -345,4 +344,6 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
return false;
return true;
}
}
......@@ -34,7 +34,7 @@ public class QLinksFragment extends BaseFragment {
TextView Intern = getActivity().findViewById(R.id.button_Internship);
TextView Placement = getActivity().findViewById(R.id.button_Placement);
TextView Library = getActivity().findViewById(R.id.button_Library);
TextView AcadCal = getActivity().findViewById(R.id.button_Acad_calender);
TextView AcadCal = getActivity().findViewById(R.id.button_Acad_calendar);
TextView AcadTime = getActivity().findViewById(R.id.button_Acad_timetable);
TextView Holidays = getActivity().findViewById(R.id.button_Holidays);
TextView Circulars = getActivity().findViewById(R.id.button_Circulars);
......
......@@ -96,16 +96,16 @@
<TextView
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:text=" Calender"
android:text=" Calendar"
android:textSize="25sp"
android:layout_marginTop="14dp"
android:fontFamily="sans-serif-light" />
<TextView
android:id="@+id/button_Acad_calender"
android:id="@+id/button_Acad_calendar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Academic Calender"
android:text="Academic Calendar"
android:textSize="@dimen/quick_links_size" />
<TextView
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment