diff --git a/app/src/main/java/org/communiquons/android/comunic/client/ui/activities/MainActivity.java b/app/src/main/java/org/communiquons/android/comunic/client/ui/activities/MainActivity.java index f713319..f12e108 100644 --- a/app/src/main/java/org/communiquons/android/comunic/client/ui/activities/MainActivity.java +++ b/app/src/main/java/org/communiquons/android/comunic/client/ui/activities/MainActivity.java @@ -296,16 +296,6 @@ public class MainActivity extends AppCompatActivity implements return true; } - - /** - * Set the currently selected item in the drawer - * - * @param item The ID of the item - */ - public void setSelectedNavigationItem(int item) { - - } - /** * Toggle drawer state */ diff --git a/app/src/main/java/org/communiquons/android/comunic/client/ui/fragments/ConversationFragment.java b/app/src/main/java/org/communiquons/android/comunic/client/ui/fragments/ConversationFragment.java index 60888c1..3891d9d 100644 --- a/app/src/main/java/org/communiquons/android/comunic/client/ui/fragments/ConversationFragment.java +++ b/app/src/main/java/org/communiquons/android/comunic/client/ui/fragments/ConversationFragment.java @@ -301,10 +301,6 @@ public class ConversationFragment extends Fragment //Update conversation title getActivity().setTitle(R.string.fragment_conversation_title); - //Update the bottom navigation menu - ((MainActivity) getActivity()) - .setSelectedNavigationItem(R.id.action_conversations); - //Check for conversation information if(conversationInfo == null){ diff --git a/app/src/main/java/org/communiquons/android/comunic/client/ui/fragments/ConversationsListFragment.java b/app/src/main/java/org/communiquons/android/comunic/client/ui/fragments/ConversationsListFragment.java index 1aa2292..e6ee028 100644 --- a/app/src/main/java/org/communiquons/android/comunic/client/ui/fragments/ConversationsListFragment.java +++ b/app/src/main/java/org/communiquons/android/comunic/client/ui/fragments/ConversationsListFragment.java @@ -153,10 +153,6 @@ public class ConversationsListFragment extends Fragment implements AdapterView.O //Update activity title getActivity().setTitle(R.string.fragment_conversationslist_title); - - //Update the bottom navigation menu - ((MainActivity) getActivity()) - .setSelectedNavigationItem(R.id.action_conversations); } /** diff --git a/app/src/main/java/org/communiquons/android/comunic/client/ui/fragments/FriendsListFragment.java b/app/src/main/java/org/communiquons/android/comunic/client/ui/fragments/FriendsListFragment.java index 3591c76..8beb3bb 100644 --- a/app/src/main/java/org/communiquons/android/comunic/client/ui/fragments/FriendsListFragment.java +++ b/app/src/main/java/org/communiquons/android/comunic/client/ui/fragments/FriendsListFragment.java @@ -167,11 +167,6 @@ public class FriendsListFragment extends Fragment //Update the title of the application getActivity().setTitle(R.string.fragment_friendslist_title); - //Update the bottom navigation menu - ((MainActivity) getActivity()) - //.setSelectedNavigationItem(R.id.main_bottom_navigation_friends_list); - .setSelectedNavigationItem(R.id.action_latest_posts); - //Refresh the friends list refresh_friend_list(); } diff --git a/app/src/main/java/org/communiquons/android/comunic/client/ui/fragments/LatestPostsFragment.java b/app/src/main/java/org/communiquons/android/comunic/client/ui/fragments/LatestPostsFragment.java index 326b671..ef1b4e0 100644 --- a/app/src/main/java/org/communiquons/android/comunic/client/ui/fragments/LatestPostsFragment.java +++ b/app/src/main/java/org/communiquons/android/comunic/client/ui/fragments/LatestPostsFragment.java @@ -110,10 +110,6 @@ public class LatestPostsFragment extends Fragment //Update dock and activity title getActivity().setTitle(R.string.fragment_latestposts_title); - //Update the bottom navigation menu - ((MainActivity) getActivity()) - .setSelectedNavigationItem(R.id.action_latest_posts); - //Refresh the list of posts of the user refresh_posts_list(); } diff --git a/app/src/main/java/org/communiquons/android/comunic/client/ui/fragments/NotificationsFragment.java b/app/src/main/java/org/communiquons/android/comunic/client/ui/fragments/NotificationsFragment.java index 3aa0344..5948792 100644 --- a/app/src/main/java/org/communiquons/android/comunic/client/ui/fragments/NotificationsFragment.java +++ b/app/src/main/java/org/communiquons/android/comunic/client/ui/fragments/NotificationsFragment.java @@ -138,10 +138,6 @@ public class NotificationsFragment extends Fragment implements View.OnCreateCont //Update the title of the application getActivity().setTitle(R.string.fragment_notifications_title); - //Update the bottom navigation menu - ((MainActivity) getActivity()) - .setSelectedNavigationItem(R.id.action_notifications); - //Get user page opener mUserPageOpener = (onOpenUsersPageListener) getActivity(); diff --git a/app/src/main/java/org/communiquons/android/comunic/client/ui/fragments/UpdateConversationFragment.java b/app/src/main/java/org/communiquons/android/comunic/client/ui/fragments/UpdateConversationFragment.java index 6b5a05b..6e29647 100644 --- a/app/src/main/java/org/communiquons/android/comunic/client/ui/fragments/UpdateConversationFragment.java +++ b/app/src/main/java/org/communiquons/android/comunic/client/ui/fragments/UpdateConversationFragment.java @@ -230,10 +230,6 @@ public class UpdateConversationFragment extends Fragment { public void onResume() { super.onResume(); - //Update title and dock - ((MainActivity) getActivity()).setSelectedNavigationItem( - R.id.action_conversations); - //Set the adapted title if(current_action == ACTION_CREATE_CONVERSATION) getActivity().setTitle(R.string.fragment_update_conversation_title_create); diff --git a/app/src/main/java/org/communiquons/android/comunic/client/ui/fragments/UserAccessDeniedFragment.java b/app/src/main/java/org/communiquons/android/comunic/client/ui/fragments/UserAccessDeniedFragment.java index cd33204..3d3324b 100644 --- a/app/src/main/java/org/communiquons/android/comunic/client/ui/fragments/UserAccessDeniedFragment.java +++ b/app/src/main/java/org/communiquons/android/comunic/client/ui/fragments/UserAccessDeniedFragment.java @@ -151,10 +151,6 @@ public class UserAccessDeniedFragment extends Fragment implements View.OnClickLi public void onResume() { super.onResume(); - //Update activity dock - ((MainActivity) getActivity()) - .setSelectedNavigationItem(R.id.action_latest_posts); - //Check if it is required to fetch user information if(mUserInfo == null){ getUserInfo(); diff --git a/app/src/main/java/org/communiquons/android/comunic/client/ui/fragments/UserPageFragment.java b/app/src/main/java/org/communiquons/android/comunic/client/ui/fragments/UserPageFragment.java index a0596e5..a9ed99f 100644 --- a/app/src/main/java/org/communiquons/android/comunic/client/ui/fragments/UserPageFragment.java +++ b/app/src/main/java/org/communiquons/android/comunic/client/ui/fragments/UserPageFragment.java @@ -175,10 +175,6 @@ public class UserPageFragment extends Fragment { //Set activity title getActivity().setTitle(userInfo.getDisplayFullName()); - //Update activity menu dock - ((MainActivity) getActivity()).setSelectedNavigationItem( - R.id.action_latest_posts); - //Initialize view pager FragmentPagerBaseAdapter adapter = new FragmentPagerBaseAdapter(getChildFragmentManager());