From 35fb6bb27de315a4793337bced02849d5d9c4384 Mon Sep 17 00:00:00 2001
From: Danny Baumann <dannybaumann@web.de>
Date: Sat, 17 Aug 2013 14:13:58 +0200
Subject: [PATCH] Improve context menus

- Add a 'play next' item to song context menu
- Replace 'add to queue' by 'remove from queue' item in queue context
  menu

Change-Id: I7ce2af040fdf823b025237518bf4ccc063812777
---
 src/com/andrew/apollo/ui/fragments/QueueFragment.java   | 17 ++++++++---------
 src/com/andrew/apollo/ui/fragments/SongFragment.java    |  9 +++++++++
 .../apollo/ui/fragments/profile/AlbumSongFragment.java  |  9 +++++++++
 .../apollo/ui/fragments/profile/ArtistSongFragment.java |  9 +++++++++
 .../apollo/ui/fragments/profile/FavoriteFragment.java   |  9 +++++++++
 .../apollo/ui/fragments/profile/GenreSongFragment.java  |  9 +++++++++
 .../apollo/ui/fragments/profile/LastAddedFragment.java  |  9 +++++++++
 .../ui/fragments/profile/PlaylistSongFragment.java      |  9 +++++++++
 8 files changed, 71 insertions(+), 9 deletions(-)

diff --git a/src/com/andrew/apollo/ui/fragments/QueueFragment.java b/src/com/andrew/apollo/ui/fragments/QueueFragment.java
index 3cfa9b4..3103cd4 100644
--- a/src/com/andrew/apollo/ui/fragments/QueueFragment.java
+++ b/src/com/andrew/apollo/ui/fragments/QueueFragment.java
@@ -206,15 +206,15 @@ public class QueueFragment extends Fragment implements LoaderCallbacks<List<Song
         menu.add(GROUP_ID, FragmentMenuItems.PLAY_NEXT, Menu.NONE,
                 getString(R.string.context_menu_play_next));
 
-        // Add the song to the queue
-        menu.add(GROUP_ID, FragmentMenuItems.ADD_TO_QUEUE, Menu.NONE,
-                getString(R.string.add_to_queue));
-
         // Add the song to a playlist
         final SubMenu subMenu = menu.addSubMenu(GROUP_ID, FragmentMenuItems.ADD_TO_PLAYLIST,
                 Menu.NONE, R.string.add_to_playlist);
         MusicUtils.makePlaylistMenu(getActivity(), GROUP_ID, subMenu, true);
 
+        // Remove the song from the queue
+        menu.add(GROUP_ID, FragmentMenuItems.REMOVE_FROM_QUEUE, Menu.NONE,
+                getString(R.string.remove_from_queue));
+
         // View more content by the song artist
         menu.add(GROUP_ID, FragmentMenuItems.MORE_BY_ARTIST, Menu.NONE,
                 getString(R.string.context_menu_more_by_artist));
@@ -244,12 +244,11 @@ public class QueueFragment extends Fragment implements LoaderCallbacks<List<Song
                     MusicUtils.playNext(new long[] {
                         mSelectedId
                     });
-                    getLoaderManager().restartLoader(LOADER, null, this);
+                    refreshQueue();
                     return true;
-                case FragmentMenuItems.ADD_TO_QUEUE:
-                    MusicUtils.addToQueue(getActivity(), new long[] {
-                        mSelectedId
-                    });
+                case FragmentMenuItems.REMOVE_FROM_QUEUE:
+                    MusicUtils.removeTrack(mSelectedId);
+                    refreshQueue();
                     return true;
                 case FragmentMenuItems.ADD_TO_FAVORITES:
                     FavoritesStore.getInstance(getActivity()).addSongId(
diff --git a/src/com/andrew/apollo/ui/fragments/SongFragment.java b/src/com/andrew/apollo/ui/fragments/SongFragment.java
index fdcca16..75974a2 100644
--- a/src/com/andrew/apollo/ui/fragments/SongFragment.java
+++ b/src/com/andrew/apollo/ui/fragments/SongFragment.java
@@ -187,6 +187,10 @@ public class SongFragment extends Fragment implements LoaderCallbacks<List<Song>
         menu.add(GROUP_ID, FragmentMenuItems.PLAY_SELECTION, Menu.NONE,
                 getString(R.string.context_menu_play_selection));
 
+        // Play next
+        menu.add(GROUP_ID, FragmentMenuItems.PLAY_NEXT, Menu.NONE,
+                getString(R.string.context_menu_play_next));
+
         // Add the song to the queue
         menu.add(GROUP_ID, FragmentMenuItems.ADD_TO_QUEUE, Menu.NONE,
                 getString(R.string.add_to_queue));
@@ -218,6 +222,11 @@ public class SongFragment extends Fragment implements LoaderCallbacks<List<Song>
                         mSelectedId
                     }, 0, false);
                     return true;
+                case FragmentMenuItems.PLAY_NEXT:
+                    MusicUtils.playNext(new long[] {
+                        mSelectedId
+                    });
+                    return true;
                 case FragmentMenuItems.ADD_TO_QUEUE:
                     MusicUtils.addToQueue(getActivity(), new long[] {
                         mSelectedId
diff --git a/src/com/andrew/apollo/ui/fragments/profile/AlbumSongFragment.java b/src/com/andrew/apollo/ui/fragments/profile/AlbumSongFragment.java
index f560aa0..68762ab 100644
--- a/src/com/andrew/apollo/ui/fragments/profile/AlbumSongFragment.java
+++ b/src/com/andrew/apollo/ui/fragments/profile/AlbumSongFragment.java
@@ -197,6 +197,10 @@ public class AlbumSongFragment extends Fragment implements LoaderCallbacks<List<
         menu.add(GROUP_ID, FragmentMenuItems.PLAY_SELECTION, Menu.NONE,
                 getString(R.string.context_menu_play_selection));
 
+        // Play the song
+        menu.add(GROUP_ID, FragmentMenuItems.PLAY_NEXT, Menu.NONE,
+                getString(R.string.context_menu_play_next));
+
         // Add the song to the queue
         menu.add(GROUP_ID, FragmentMenuItems.ADD_TO_QUEUE, Menu.NONE,
                 getString(R.string.add_to_queue));
@@ -224,6 +228,11 @@ public class AlbumSongFragment extends Fragment implements LoaderCallbacks<List<
                         mSelectedId
                     }, 0, false);
                     return true;
+                case FragmentMenuItems.PLAY_NEXT:
+                    MusicUtils.playNext(new long[] {
+                        mSelectedId
+                    });
+                    return true;
                 case FragmentMenuItems.ADD_TO_QUEUE:
                     MusicUtils.addToQueue(getActivity(), new long[] {
                         mSelectedId
diff --git a/src/com/andrew/apollo/ui/fragments/profile/ArtistSongFragment.java b/src/com/andrew/apollo/ui/fragments/profile/ArtistSongFragment.java
index 6104af0..b0176a2 100644
--- a/src/com/andrew/apollo/ui/fragments/profile/ArtistSongFragment.java
+++ b/src/com/andrew/apollo/ui/fragments/profile/ArtistSongFragment.java
@@ -197,6 +197,10 @@ public class ArtistSongFragment extends Fragment implements LoaderCallbacks<List
         menu.add(GROUP_ID, FragmentMenuItems.PLAY_SELECTION, Menu.NONE,
                 getString(R.string.context_menu_play_selection));
 
+        // Play next
+        menu.add(GROUP_ID, FragmentMenuItems.PLAY_NEXT, Menu.NONE,
+                getString(R.string.context_menu_play_next));
+
         // Add the song to the queue
         menu.add(GROUP_ID, FragmentMenuItems.ADD_TO_QUEUE, Menu.NONE,
                 getString(R.string.add_to_queue));
@@ -224,6 +228,11 @@ public class ArtistSongFragment extends Fragment implements LoaderCallbacks<List
                         mSelectedId
                     }, 0, false);
                     return true;
+                case FragmentMenuItems.PLAY_NEXT:
+                    MusicUtils.playNext(new long[] {
+                        mSelectedId
+                    });
+                    return true;
                 case FragmentMenuItems.ADD_TO_QUEUE:
                     MusicUtils.addToQueue(getActivity(), new long[] {
                         mSelectedId
diff --git a/src/com/andrew/apollo/ui/fragments/profile/FavoriteFragment.java b/src/com/andrew/apollo/ui/fragments/profile/FavoriteFragment.java
index dab4411..9eb569d 100644
--- a/src/com/andrew/apollo/ui/fragments/profile/FavoriteFragment.java
+++ b/src/com/andrew/apollo/ui/fragments/profile/FavoriteFragment.java
@@ -190,6 +190,10 @@ public class FavoriteFragment extends Fragment implements LoaderCallbacks<List<S
         menu.add(GROUP_ID, FragmentMenuItems.PLAY_SELECTION, Menu.NONE,
                 getString(R.string.context_menu_play_selection));
 
+        // Play next
+        menu.add(GROUP_ID, FragmentMenuItems.PLAY_NEXT, Menu.NONE,
+                getString(R.string.context_menu_play_next));
+
         // Add the song to the queue
         menu.add(GROUP_ID, FragmentMenuItems.ADD_TO_QUEUE, Menu.NONE,
                 getString(R.string.add_to_queue));
@@ -225,6 +229,11 @@ public class FavoriteFragment extends Fragment implements LoaderCallbacks<List<S
                         mSelectedId
                     }, 0, false);
                     return true;
+                case FragmentMenuItems.PLAY_NEXT:
+                    MusicUtils.playNext(new long[] {
+                        mSelectedId
+                    });
+                    return true;
                 case FragmentMenuItems.ADD_TO_QUEUE:
                     MusicUtils.addToQueue(getActivity(), new long[] {
                         mSelectedId
diff --git a/src/com/andrew/apollo/ui/fragments/profile/GenreSongFragment.java b/src/com/andrew/apollo/ui/fragments/profile/GenreSongFragment.java
index 460bea7..cd3d5a1 100644
--- a/src/com/andrew/apollo/ui/fragments/profile/GenreSongFragment.java
+++ b/src/com/andrew/apollo/ui/fragments/profile/GenreSongFragment.java
@@ -198,6 +198,10 @@ public class GenreSongFragment extends Fragment implements LoaderCallbacks<List<
         menu.add(GROUP_ID, FragmentMenuItems.PLAY_SELECTION, Menu.NONE,
                 getString(R.string.context_menu_play_selection));
 
+        // Play the song
+        menu.add(GROUP_ID, FragmentMenuItems.PLAY_NEXT, Menu.NONE,
+                getString(R.string.context_menu_play_next));
+
         // Add the song to the queue
         menu.add(GROUP_ID, FragmentMenuItems.ADD_TO_QUEUE, Menu.NONE,
                 getString(R.string.add_to_queue));
@@ -229,6 +233,11 @@ public class GenreSongFragment extends Fragment implements LoaderCallbacks<List<
                         mSelectedId
                     }, 0, false);
                     return true;
+                case FragmentMenuItems.PLAY_NEXT:
+                    MusicUtils.playNext(new long[] {
+                        mSelectedId
+                    });
+                    return true;
                 case FragmentMenuItems.ADD_TO_QUEUE:
                     MusicUtils.addToQueue(getActivity(), new long[] {
                         mSelectedId
diff --git a/src/com/andrew/apollo/ui/fragments/profile/LastAddedFragment.java b/src/com/andrew/apollo/ui/fragments/profile/LastAddedFragment.java
index 7b17f20..7302822 100644
--- a/src/com/andrew/apollo/ui/fragments/profile/LastAddedFragment.java
+++ b/src/com/andrew/apollo/ui/fragments/profile/LastAddedFragment.java
@@ -192,6 +192,10 @@ public class LastAddedFragment extends Fragment implements LoaderCallbacks<List<
         menu.add(GROUP_ID, FragmentMenuItems.PLAY_SELECTION, Menu.NONE,
                 getString(R.string.context_menu_play_selection));
 
+        // Play next
+        menu.add(GROUP_ID, FragmentMenuItems.PLAY_NEXT, Menu.NONE,
+                getString(R.string.context_menu_play_next));
+
         // Add the song to the queue
         menu.add(GROUP_ID, FragmentMenuItems.ADD_TO_QUEUE, Menu.NONE,
                 getString(R.string.add_to_queue));
@@ -223,6 +227,11 @@ public class LastAddedFragment extends Fragment implements LoaderCallbacks<List<
                         mSelectedId
                     }, 0, false);
                     return true;
+                case FragmentMenuItems.PLAY_NEXT:
+                    MusicUtils.playNext(new long[] {
+                        mSelectedId
+                    });
+                    return true;
                 case FragmentMenuItems.ADD_TO_QUEUE:
                     MusicUtils.addToQueue(getActivity(), new long[] {
                         mSelectedId
diff --git a/src/com/andrew/apollo/ui/fragments/profile/PlaylistSongFragment.java b/src/com/andrew/apollo/ui/fragments/profile/PlaylistSongFragment.java
index 6f296c5..6ac8886 100644
--- a/src/com/andrew/apollo/ui/fragments/profile/PlaylistSongFragment.java
+++ b/src/com/andrew/apollo/ui/fragments/profile/PlaylistSongFragment.java
@@ -215,6 +215,10 @@ public class PlaylistSongFragment extends Fragment implements LoaderCallbacks<Li
         menu.add(GROUP_ID, FragmentMenuItems.PLAY_SELECTION, Menu.NONE,
                 getString(R.string.context_menu_play_selection));
 
+        // Play next
+        menu.add(GROUP_ID, FragmentMenuItems.PLAY_NEXT, Menu.NONE,
+                getString(R.string.context_menu_play_next));
+
         // Add the song to the queue
         menu.add(GROUP_ID, FragmentMenuItems.ADD_TO_QUEUE, Menu.NONE,
                 getString(R.string.add_to_queue));
@@ -246,6 +250,11 @@ public class PlaylistSongFragment extends Fragment implements LoaderCallbacks<Li
                         mSelectedId
                     }, 0, false);
                     return true;
+                case FragmentMenuItems.PLAY_NEXT:
+                    MusicUtils.playNext(new long[] {
+                        mSelectedId
+                    });
+                    return true;
                 case FragmentMenuItems.ADD_TO_QUEUE:
                     MusicUtils.addToQueue(getActivity(), new long[] {
                         mSelectedId
-- 
2.11.0