Commit f0e37858 authored by Sajal Narang's avatar Sajal Narang Committed by GitHub

Merge pull request #136 from yashkhem1/master

Toolbar now shows different titles for different fragments
parents fd00ef69 2f655a18
...@@ -5,6 +5,7 @@ import android.content.Intent; ...@@ -5,6 +5,7 @@ import android.content.Intent;
import android.net.Uri; import android.net.Uri;
import android.os.Bundle; import android.os.Bundle;
import android.support.v4.app.Fragment; import android.support.v4.app.Fragment;
import android.support.v7.widget.Toolbar;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
...@@ -41,6 +42,10 @@ public class AboutFragment extends BaseFragment { ...@@ -41,6 +42,10 @@ public class AboutFragment extends BaseFragment {
@Override @Override
public void onStart() { public void onStart() {
super.onStart(); super.onStart();
Toolbar toolbar = getActivity().findViewById(R.id.toolbar);
toolbar.setTitle("About");
/* Map CircleImageView ids to image URLs */ /* Map CircleImageView ids to image URLs */
final Map<Integer, String> team = new HashMap<Integer, String>() {{ final Map<Integer, String> team = new HashMap<Integer, String>() {{
put(R.id.varunimg, "varun.jpg"); put(R.id.varunimg, "varun.jpg");
......
...@@ -15,6 +15,7 @@ import android.provider.MediaStore; ...@@ -15,6 +15,7 @@ import android.provider.MediaStore;
import android.support.v4.app.ActivityCompat; import android.support.v4.app.ActivityCompat;
import android.support.v4.content.ContextCompat; import android.support.v4.content.ContextCompat;
import android.support.v4.widget.ImageViewCompat; import android.support.v4.widget.ImageViewCompat;
import android.support.v7.widget.Toolbar;
import android.util.Base64; import android.util.Base64;
import android.util.Log; import android.util.Log;
import android.view.LayoutInflater; import android.view.LayoutInflater;
...@@ -132,6 +133,9 @@ public class AddEventFragment extends BaseFragment { ...@@ -132,6 +133,9 @@ public class AddEventFragment extends BaseFragment {
view = inflater.inflate(R.layout.fragment_add_event, container, false); view = inflater.inflate(R.layout.fragment_add_event, container, false);
ButterKnife.bind(this, view); ButterKnife.bind(this, view);
Toolbar toolbar = getActivity().findViewById(R.id.toolbar);
toolbar.setTitle("Add Event");
eventPictureImageView = view.findViewById(R.id.ib_eventImage); eventPictureImageView = view.findViewById(R.id.ib_eventImage);
progressDialog = new ProgressDialog(getContext()); progressDialog = new ProgressDialog(getContext());
......
...@@ -10,6 +10,7 @@ import android.support.v4.app.FragmentTransaction; ...@@ -10,6 +10,7 @@ import android.support.v4.app.FragmentTransaction;
import android.support.v4.widget.SwipeRefreshLayout; import android.support.v4.widget.SwipeRefreshLayout;
import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView; import android.support.v7.widget.RecyclerView;
import android.support.v7.widget.Toolbar;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
...@@ -105,6 +106,9 @@ public class BodyFragment extends Fragment { ...@@ -105,6 +106,9 @@ public class BodyFragment extends Fragment {
updateBody(); updateBody();
} }
}); });
Toolbar toolbar = getActivity().findViewById(R.id.toolbar);
toolbar.setTitle(min_body.getBodyName());
} }
private void updateBody() { private void updateBody() {
......
...@@ -7,6 +7,7 @@ import android.support.v4.app.Fragment; ...@@ -7,6 +7,7 @@ import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentTransaction; import android.support.v4.app.FragmentTransaction;
import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView; import android.support.v7.widget.RecyclerView;
import android.support.v7.widget.Toolbar;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
...@@ -61,6 +62,10 @@ public class CalendarFragment extends BaseFragment { ...@@ -61,6 +62,10 @@ public class CalendarFragment extends BaseFragment {
view = inflater.inflate(R.layout.fragment_calendar, container, false); view = inflater.inflate(R.layout.fragment_calendar, container, false);
fab = (FloatingActionButton) view.findViewById(R.id.fab); fab = (FloatingActionButton) view.findViewById(R.id.fab);
Toolbar toolbar = getActivity().findViewById(R.id.toolbar);
toolbar.setTitle("Calendar");
final CalendarView simpleCalendarView = (CalendarView) view.findViewById(R.id.simpleCalendarView); // get the reference of CalendarView final CalendarView simpleCalendarView = (CalendarView) view.findViewById(R.id.simpleCalendarView); // get the reference of CalendarView
simpleCalendarView.setFirstDayOfWeek(1); // set Sunday as the first day of the week simpleCalendarView.setFirstDayOfWeek(1); // set Sunday as the first day of the week
......
...@@ -9,6 +9,7 @@ import android.support.v4.app.Fragment; ...@@ -9,6 +9,7 @@ import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentTransaction; import android.support.v4.app.FragmentTransaction;
import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView; import android.support.v7.widget.RecyclerView;
import android.support.v7.widget.Toolbar;
import android.util.Log; import android.util.Log;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
...@@ -82,6 +83,9 @@ public class EventFragment extends BaseFragment { ...@@ -82,6 +83,9 @@ public class EventFragment extends BaseFragment {
Log.d(TAG, "onStart: " + eventJson); Log.d(TAG, "onStart: " + eventJson);
event = new Gson().fromJson(eventJson, Event.class); event = new Gson().fromJson(eventJson, Event.class);
inflateViews(event); inflateViews(event);
Toolbar toolbar = getActivity().findViewById(R.id.toolbar);
toolbar.setTitle(event.getEventName());
} }
private void inflateViews(final Event event) { private void inflateViews(final Event event) {
......
...@@ -11,6 +11,7 @@ import android.support.v4.app.FragmentTransaction; ...@@ -11,6 +11,7 @@ import android.support.v4.app.FragmentTransaction;
import android.support.v4.widget.SwipeRefreshLayout; import android.support.v4.widget.SwipeRefreshLayout;
import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView; import android.support.v7.widget.RecyclerView;
import android.support.v7.widget.Toolbar;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
...@@ -57,6 +58,9 @@ public class FeedFragment extends BaseFragment { ...@@ -57,6 +58,9 @@ public class FeedFragment extends BaseFragment {
View view = inflater.inflate(R.layout.fragment_feed, container, false); View view = inflater.inflate(R.layout.fragment_feed, container, false);
Toolbar toolbar = getActivity().findViewById(R.id.toolbar);
toolbar.setTitle("Feed");
fab = (FloatingActionButton) view.findViewById(R.id.fab); fab = (FloatingActionButton) view.findViewById(R.id.fab);
feedSwipeRefreshLayout = view.findViewById(R.id.feed_swipe_refresh_layout); feedSwipeRefreshLayout = view.findViewById(R.id.feed_swipe_refresh_layout);
......
...@@ -16,6 +16,7 @@ import android.os.Bundle; ...@@ -16,6 +16,7 @@ import android.os.Bundle;
import android.support.design.widget.FloatingActionButton; import android.support.design.widget.FloatingActionButton;
import android.support.v4.app.ActivityCompat; import android.support.v4.app.ActivityCompat;
import android.support.v4.content.ContextCompat; import android.support.v4.content.ContextCompat;
import android.support.v7.widget.Toolbar;
import android.util.Log; import android.util.Log;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
...@@ -77,6 +78,10 @@ public class MapFragment extends BaseFragment implements OnMapReadyCallback, Loc ...@@ -77,6 +78,10 @@ public class MapFragment extends BaseFragment implements OnMapReadyCallback, Loc
@Override @Override
public void onStart() { public void onStart() {
super.onStart(); super.onStart();
Toolbar toolbar = getActivity().findViewById(R.id.toolbar);
toolbar.setTitle("Map");
locationButton = (FloatingActionButton) getActivity().findViewById(R.id.location_button); locationButton = (FloatingActionButton) getActivity().findViewById(R.id.location_button);
locationButton.setImageResource(R.drawable.ic_my_location_black_24dp); locationButton.setImageResource(R.drawable.ic_my_location_black_24dp);
locationButton.getDrawable().setColorFilter(ContextCompat.getColor(getContext(), R.color.colorPrimaryDark), PorterDuff.Mode.SRC_IN); locationButton.getDrawable().setColorFilter(ContextCompat.getColor(getContext(), R.color.colorPrimaryDark), PorterDuff.Mode.SRC_IN);
......
...@@ -8,6 +8,7 @@ import android.support.v4.app.Fragment; ...@@ -8,6 +8,7 @@ import android.support.v4.app.Fragment;
import android.support.v4.widget.SwipeRefreshLayout; import android.support.v4.widget.SwipeRefreshLayout;
import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView; import android.support.v7.widget.RecyclerView;
import android.support.v7.widget.Toolbar;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
...@@ -60,6 +61,9 @@ public class MessMenuFragment extends BaseFragment { ...@@ -60,6 +61,9 @@ public class MessMenuFragment extends BaseFragment {
public void onStart() { public void onStart() {
super.onStart(); super.onStart();
Toolbar toolbar = getActivity().findViewById(R.id.toolbar);
toolbar.setTitle("Mess Menu");
final String hostel = (String) getArguments().get(Constants.USER_HOSTEL); final String hostel = (String) getArguments().get(Constants.USER_HOSTEL);
displayMenu(hostel); displayMenu(hostel);
......
...@@ -11,6 +11,7 @@ import android.support.v4.app.FragmentTransaction; ...@@ -11,6 +11,7 @@ import android.support.v4.app.FragmentTransaction;
import android.support.v4.widget.SwipeRefreshLayout; import android.support.v4.widget.SwipeRefreshLayout;
import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView; import android.support.v7.widget.RecyclerView;
import android.support.v7.widget.Toolbar;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
...@@ -48,6 +49,9 @@ public class MyEventsFragment extends BaseFragment { ...@@ -48,6 +49,9 @@ public class MyEventsFragment extends BaseFragment {
Bundle savedInstanceState) { Bundle savedInstanceState) {
View view = inflater.inflate(R.layout.fragment_my_events, container, false); View view = inflater.inflate(R.layout.fragment_my_events, container, false);
Toolbar toolbar = getActivity().findViewById(R.id.toolbar);
toolbar.setTitle("My Events");
fab = (FloatingActionButton) view.findViewById(R.id.fab); fab = (FloatingActionButton) view.findViewById(R.id.fab);
fab.setOnClickListener(new View.OnClickListener() { fab.setOnClickListener(new View.OnClickListener() {
......
...@@ -10,6 +10,7 @@ import android.support.v4.app.Fragment; ...@@ -10,6 +10,7 @@ import android.support.v4.app.Fragment;
import android.support.v4.widget.SwipeRefreshLayout; import android.support.v4.widget.SwipeRefreshLayout;
import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView; import android.support.v7.widget.RecyclerView;
import android.support.v7.widget.Toolbar;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
...@@ -55,6 +56,9 @@ public class NewsFragment extends BaseFragment { ...@@ -55,6 +56,9 @@ public class NewsFragment extends BaseFragment {
public void onStart() { public void onStart() {
super.onStart(); super.onStart();
Toolbar toolbar = getActivity().findViewById(R.id.toolbar);
toolbar.setTitle("News");
appDatabase = AppDatabase.getAppDatabase(getContext()); appDatabase = AppDatabase.getAppDatabase(getContext());
new NewsFragment.showNewsFromDB().execute(); new NewsFragment.showNewsFromDB().execute();
......
...@@ -5,6 +5,7 @@ import android.os.Bundle; ...@@ -5,6 +5,7 @@ import android.os.Bundle;
import android.support.v4.app.Fragment; import android.support.v4.app.Fragment;
import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView; import android.support.v7.widget.RecyclerView;
import android.support.v7.widget.Toolbar;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
...@@ -43,6 +44,9 @@ public class NotificationsFragment extends BaseFragment { ...@@ -43,6 +44,9 @@ public class NotificationsFragment extends BaseFragment {
public void onStart() { public void onStart() {
super.onStart(); super.onStart();
Toolbar toolbar = getActivity().findViewById(R.id.toolbar);
toolbar.setTitle("Notifications");
Bundle bundle = getArguments(); Bundle bundle = getArguments();
String notificationsResponseJson = bundle.getString(Constants.NOTIFICATIONS_RESPONSE_JSON); String notificationsResponseJson = bundle.getString(Constants.NOTIFICATIONS_RESPONSE_JSON);
NotificationsResponse notificationsResponse = new Gson().fromJson(notificationsResponseJson, NotificationsResponse.class); NotificationsResponse notificationsResponse = new Gson().fromJson(notificationsResponseJson, NotificationsResponse.class);
......
...@@ -10,6 +10,7 @@ import android.support.v4.app.Fragment; ...@@ -10,6 +10,7 @@ import android.support.v4.app.Fragment;
import android.support.v4.widget.SwipeRefreshLayout; import android.support.v4.widget.SwipeRefreshLayout;
import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView; import android.support.v7.widget.RecyclerView;
import android.support.v7.widget.Toolbar;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
...@@ -56,6 +57,9 @@ public class PlacementBlogFragment extends BaseFragment { ...@@ -56,6 +57,9 @@ public class PlacementBlogFragment extends BaseFragment {
public void onStart() { public void onStart() {
super.onStart(); super.onStart();
Toolbar toolbar = getActivity().findViewById(R.id.toolbar);
toolbar.setTitle("Placement Blog");
appDatabase = AppDatabase.getAppDatabase(getContext()); appDatabase = AppDatabase.getAppDatabase(getContext());
new PlacementBlogFragment.showPlacementBlogFromDB().execute(); new PlacementBlogFragment.showPlacementBlogFromDB().execute();
......
...@@ -8,6 +8,7 @@ import android.support.v4.app.FragmentTransaction; ...@@ -8,6 +8,7 @@ import android.support.v4.app.FragmentTransaction;
import android.support.v4.view.ViewPager; import android.support.v4.view.ViewPager;
import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView; import android.support.v7.widget.RecyclerView;
import android.support.v7.widget.Toolbar;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
...@@ -54,6 +55,10 @@ public class ProfileFragment extends BaseFragment { ...@@ -54,6 +55,10 @@ public class ProfileFragment extends BaseFragment {
@Override @Override
public void onStart() { public void onStart() {
super.onStart(); super.onStart();
Toolbar toolbar = getActivity().findViewById(R.id.toolbar);
toolbar.setTitle("Profile");
Bundle bundle = getArguments(); Bundle bundle = getArguments();
String userID = bundle.getString(Constants.USER_ID); String userID = bundle.getString(Constants.USER_ID);
......
...@@ -4,6 +4,7 @@ import android.content.Intent; ...@@ -4,6 +4,7 @@ import android.content.Intent;
import android.net.Uri; import android.net.Uri;
import android.os.Bundle; import android.os.Bundle;
import android.support.v4.app.Fragment; import android.support.v4.app.Fragment;
import android.support.v7.widget.Toolbar;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
...@@ -20,6 +21,10 @@ public class QLinksFragment extends BaseFragment { ...@@ -20,6 +21,10 @@ public class QLinksFragment extends BaseFragment {
public void onStart(){ public void onStart(){
super.onStart(); super.onStart();
Toolbar toolbar = getActivity().findViewById(R.id.toolbar);
toolbar.setTitle("Quick Links");
TextView CMS = getActivity().findViewById(R.id.button_CMS); TextView CMS = getActivity().findViewById(R.id.button_CMS);
TextView CMSMaint = getActivity().findViewById(R.id.button_CMSMaint); TextView CMSMaint = getActivity().findViewById(R.id.button_CMSMaint);
TextView CMSNet = getActivity().findViewById(R.id.button_CMSNet); TextView CMSNet = getActivity().findViewById(R.id.button_CMSNet);
......
...@@ -7,6 +7,7 @@ import android.os.Bundle; ...@@ -7,6 +7,7 @@ import android.os.Bundle;
import android.support.v4.app.Fragment; import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentManager; import android.support.v4.app.FragmentManager;
import android.support.v4.app.FragmentTransaction; import android.support.v4.app.FragmentTransaction;
import android.support.v7.widget.Toolbar;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
...@@ -47,6 +48,9 @@ public class SettingsFragment extends Fragment { ...@@ -47,6 +48,9 @@ public class SettingsFragment extends Fragment {
@Override @Override
public void onStart() { public void onStart() {
super.onStart(); super.onStart();
Toolbar toolbar = getActivity().findViewById(R.id.toolbar);
toolbar.setTitle("Settings");
Bundle bundle = getArguments(); Bundle bundle = getArguments();
String userID = bundle.getString(Constants.USER_ID); String userID = bundle.getString(Constants.USER_ID);
......
...@@ -10,6 +10,7 @@ import android.support.v4.app.Fragment; ...@@ -10,6 +10,7 @@ import android.support.v4.app.Fragment;
import android.support.v4.widget.SwipeRefreshLayout; import android.support.v4.widget.SwipeRefreshLayout;
import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView; import android.support.v7.widget.RecyclerView;
import android.support.v7.widget.Toolbar;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
...@@ -56,6 +57,9 @@ public class TrainingBlogFragment extends BaseFragment { ...@@ -56,6 +57,9 @@ public class TrainingBlogFragment extends BaseFragment {
public void onStart() { public void onStart() {
super.onStart(); super.onStart();
Toolbar toolbar = getActivity().findViewById(R.id.toolbar);
toolbar.setTitle("Training Blog");
appDatabase = AppDatabase.getAppDatabase(getContext()); appDatabase = AppDatabase.getAppDatabase(getContext());
new TrainingBlogFragment.showTrainingBlogFromDB().execute(); new TrainingBlogFragment.showTrainingBlogFromDB().execute();
......
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