(#112) Play (Queue All) for albums

Author: kelsos

app/src/main/kotlin/com/kelsos/mbrc/helper/PopupActionHandler.kt

@@ -114,7 +114,8 @@ constructor(private val settings: BasicSettingsHelper,
     }
   }
 
-  fun trackSelected(menuItem: MenuItem, entry: Track) {
+  //todo album detection -> queue album tracks
+  fun trackSelected(menuItem: MenuItem, entry: Track, album: Boolean = false) {
     val type = when (menuItem.itemId) {
       R.id.popup_track_queue_next -> Queue.NEXT
       R.id.popup_track_queue_last -> Queue.LAST
@@ -123,16 +124,22 @@ constructor(private val settings: BasicSettingsHelper,
       else -> Queue.NOW
     }
 
-    queueTrack(entry, type)
+    queueTrack(entry, type, album)
   }
 
-  private fun queueTrack(entry: Track, @QueueType type: String) {
+  private fun queueTrack(entry: Track, @QueueType type: String, album: Boolean = false) {
 
     val trackSource: Single<List<String>>
     val path:String?
     if (type == Queue.ADD_ALL) {
-      trackSource = trackRepository.getAllTrackPaths()
+      if (album) {
+        trackSource = trackRepository.getAlbumTrackPaths(entry.album!!, entry.albumArtist!!)
+      } else {
+        trackSource = trackRepository.getAllTrackPaths()
+      }
+
       path = entry.src
+
     } else {
       trackSource = Single.fromCallable {
         val list = listOf(entry.src!!)
@@ -160,8 +167,8 @@ constructor(private val settings: BasicSettingsHelper,
     openProfile(genre, context)
   }
 
-  fun trackSelected(track: Track) {
-    queueTrack(track, settings.defaultAction)
+  fun trackSelected(track: Track, album: Boolean = false) {
+    queueTrack(track, settings.defaultAction, album)
   }
 
   private fun openProfile(artist: Artist, context: Context) {

app/src/main/kotlin/com/kelsos/mbrc/ui/navigation/library/album_tracks/AlbumTracksActivity.kt

@@ -91,11 +91,11 @@ class AlbumTracksActivity : FontActivity(),
   }
 
   override fun onMenuItemSelected(menuItem: MenuItem, entry: Track) {
-    actionHandler.trackSelected(menuItem, entry)
+    actionHandler.trackSelected(menuItem, entry, true)
   }
 
   override fun onItemClicked(track: Track) {
-    actionHandler.trackSelected(track)
+    actionHandler.trackSelected(track, true)
   }
 
   override fun update(cursor: FlowCursorList<Track>) {

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

@@ -3,13 +3,13 @@
   <item
       android:id="@+id/popup_track_play"
       android:title="@string/menu_play"/>
+  <item
+      android:id="@+id/popup_track_play_queue_all"
+      android:title="@string/menu_play_queue_all" />
   <item
       android:id="@+id/popup_track_queue_next"
       android:title="@string/menu_queue_next"/>
   <item
       android:id="@+id/popup_track_queue_last"
       android:title="@string/menu_queue_last"/>
-  <item
-      android:id="@+id/popup_track_play_queue_all"
-      android:title="@string/menu_play_queue_all" />
 </menu>