diff --git a/app/src/main/java/com/kabouzeid/gramophone/adapter/song/PlayingQueueAdapter.java b/app/src/main/java/com/kabouzeid/gramophone/adapter/song/PlayingQueueAdapter.java index c5240f2f..03c85527 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/adapter/song/PlayingQueueAdapter.java +++ b/app/src/main/java/com/kabouzeid/gramophone/adapter/song/PlayingQueueAdapter.java @@ -4,8 +4,11 @@ import android.support.annotation.LayoutRes; import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.support.v7.app.AppCompatActivity; +import android.view.MenuItem; import android.view.View; +import com.kabouzeid.gramophone.R; +import com.kabouzeid.gramophone.helper.MusicPlayerRemote; import com.kabouzeid.gramophone.interfaces.CabHolder; import com.kabouzeid.gramophone.model.Song; @@ -26,6 +29,11 @@ public class PlayingQueueAdapter extends SongAdapter { super(activity, dataSet, itemLayoutRes, usePalette, cabHolder); } + @Override + protected SongAdapter.ViewHolder createViewHolder(View view) { + return new ViewHolder(view); + } + @Override public void onBindViewHolder(@NonNull SongAdapter.ViewHolder holder, int position) { super.onBindViewHolder(holder, position); @@ -74,4 +82,26 @@ public class PlayingQueueAdapter extends SongAdapter { holder.paletteColorContainer.setAlpha(alpha); } } + + public class ViewHolder extends SongAdapter.ViewHolder { + + public ViewHolder(@NonNull View itemView) { + super(itemView); + } + + @Override + protected int getSongMenuRes() { + return R.menu.menu_item_playing_queue_song; + } + + @Override + protected boolean onSongMenuItemClick(MenuItem item) { + switch (item.getItemId()) { + case R.id.action_remove_from_playing_queue: + MusicPlayerRemote.removeFromQueue(getAdapterPosition()); + return true; + } + return super.onSongMenuItemClick(item); + } + } } diff --git a/app/src/main/res/menu/menu_item_playing_queue_song.xml b/app/src/main/res/menu/menu_item_playing_queue_song.xml index a9269aa5..33d7eaf7 100644 --- a/app/src/main/res/menu/menu_item_playing_queue_song.xml +++ b/app/src/main/res/menu/menu_item_playing_queue_song.xml @@ -9,7 +9,6 @@ android:id="@+id/action_remove_from_playing_queue" android:title="@string/action_remove_from_playing_queue" app:showAsAction="never" /> -