Moved friends bottom menu item to activity menu.

app/src/main/java/org/communiquons/android/comunic/client/ui/activities/MainActivity.java

@@ -105,7 +105,7 @@ public class MainActivity extends AppCompatActivity
         //Initialize DatabaseHelper
         dbHelper = DatabaseHelper.getInstance(this);
 
-        //Intialize conversation list helper
+        //Initialize conversation list helper
         conversationsListHelper = new ConversationsListHelper(this, dbHelper);
 
         //If it is the first time the application is launched, start the user friends tab
@@ -155,6 +155,12 @@ public class MainActivity extends AppCompatActivity
         //Get action id
         int id = item.getItemId();
 
+        //To display the list of friends
+        if(id == R.id.action_friends_list){
+            openFriendsFragment();
+            return true;
+        }
+
         //Check for logout request
         if(id == R.id.action_logout){
             confirmUserLogout();
@@ -178,9 +184,9 @@ public class MainActivity extends AppCompatActivity
                 switch (item.getItemId()) {
 
                     //If the user clicked to show the friends list
-                    case R.id.main_bottom_navigation_friends_list:
+                    /*case R.id.main_bottom_navigation_friends_list:
                         openFriendsFragment();
-                        return true;
+                        return true;*/
 
                     //If the user chose to show information about him
                     case R.id.main_bottom_navigation_me_view:

app/src/main/java/org/communiquons/android/comunic/client/ui/fragments/FriendsListFragment.java

@@ -148,7 +148,8 @@ public class FriendsListFragment extends Fragment
 
         //Update the bottom navigation menu
         ((MainActivity) getActivity())
-                .setSelectedNavigationItem(R.id.main_bottom_navigation_friends_list);
+                //.setSelectedNavigationItem(R.id.main_bottom_navigation_friends_list);
+                .setSelectedNavigationItem(R.id.main_bottom_navigation_me_view);
 
         //Refresh the friends list
         refresh_friend_list();

app/src/main/res/menu/main_bottom_navigation.xml

@@ -1,10 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
+
     <item
+        android:id="@+id/main_bottom_navigation_notif"
+        android:title="@string/navigation_bottom_notif_item"
+        android:icon="@drawable/ic_notif"/>
+
+    <!--<item
         android:id="@+id/main_bottom_navigation_friends_list"
         android:title="@string/navigation_bottom_friends_item"
         android:icon="@drawable/ic_menu_allfriends"
-        />
+        />-->
 
     <!--<item
         android:id="@+id/main_bottom_navigation_users_view"

app/src/main/res/menu/main_menu.xml

@@ -2,6 +2,12 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
+    <!-- Display friends list -->
+    <item
+        android:id="@+id/action_friends_list"
+        android:title="@string/main_menu_friends_list" />
+
+    <!-- Sign out -->
     <item
         android:id="@+id/action_logout"
         android:title="@string/main_menu_logout"

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

@@ -124,4 +124,6 @@
     <string name="btn_show_create_form_description">Show / Hide create post form.</string>
     <string name="err_post_content_too_short">The content of the post is too short!</string>
     <string name="err_submit_post">An error occurred while trying to create the post!</string>
+    <string name="navigation_bottom_notif_item">Notifications</string>
+    <string name="main_menu_friends_list">Friends list</string>
 </resources>