From f65a82c7f158b9a2f0f89d45d79411a5295e9f00 Mon Sep 17 00:00:00 2001
From: Karim Abou Zeid <karim23697@gmail.com>
Date: Tue, 19 May 2015 19:21:14 +0200
Subject: [PATCH] Switched positions of settings and about items in the
 navigation drawer.

---
 .../gramophone/adapter/NavigationDrawerItemAdapter.java     | 2 +-
 .../gramophone/ui/fragments/NavigationDrawerFragment.java   | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/kabouzeid/gramophone/adapter/NavigationDrawerItemAdapter.java b/app/src/main/java/com/kabouzeid/gramophone/adapter/NavigationDrawerItemAdapter.java
index 887cfeae..bc49146d 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/adapter/NavigationDrawerItemAdapter.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/adapter/NavigationDrawerItemAdapter.java
@@ -90,7 +90,7 @@ public class NavigationDrawerItemAdapter extends RecyclerView.Adapter<Navigation
 
         holder.title.setText(item.title);
         holder.icon.setImageResource(item.imageRes);
-        holder.divider.setVisibility(position == NavigationDrawerFragment.ABOUT_INDEX ?
+        holder.divider.setVisibility(position == NavigationDrawerFragment.SETTINGS_INDEX ?
                 View.VISIBLE : View.GONE);
 
         final boolean selected = position == currentChecked;
diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/NavigationDrawerFragment.java b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/NavigationDrawerFragment.java
index bf13b720..2bed3859 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/NavigationDrawerFragment.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/NavigationDrawerFragment.java
@@ -26,8 +26,8 @@ import java.util.ArrayList;
 public class NavigationDrawerFragment extends Fragment {
 
     public static final int NAVIGATION_DRAWER_HEADER = -1;
-    public static final int ABOUT_INDEX = 4;
-    public static final int SETTINGS_INDEX = 5;
+    public static final int ABOUT_INDEX = 5;
+    public static final int SETTINGS_INDEX = 4;
     private static final String STATE_SELECTED_POSITION = "selected_navigation_drawer_position";
 
     public View fragmentRootView;
@@ -134,8 +134,8 @@ public class NavigationDrawerFragment extends Fragment {
         navigationDrawerItems.add(new NavigationDrawerItem(getString(R.string.albums), R.drawable.ic_album_white_24dp));
         navigationDrawerItems.add(new NavigationDrawerItem(getString(R.string.artists), R.drawable.ic_person_white_24dp));
         navigationDrawerItems.add(new NavigationDrawerItem(getString(R.string.playlists), R.drawable.ic_queue_music_white_24dp));
-        navigationDrawerItems.add(new NavigationDrawerItem(getString(R.string.action_about), R.drawable.ic_help_white_24dp));
         navigationDrawerItems.add(new NavigationDrawerItem(getString(R.string.action_settings), R.drawable.ic_settings_white_24dp));
+        navigationDrawerItems.add(new NavigationDrawerItem(getString(R.string.action_about), R.drawable.ic_help_white_24dp));
 
         drawerAdapter = new NavigationDrawerItemAdapter(getActivity(), navigationDrawerItems, new NavigationDrawerItemAdapter.Callback() {
             @Override