Updated code

Added Fragment options
Renamed Interfaces
Rolled back to previous implementaion for Now playing to handle backpress

app/src/main/java/code/name/monkey/retromusic/adapter/SearchAdapter.kt

@@ -25,7 +25,7 @@ class SearchAdapter(
     private var dataSet: List<Any>
 ) : RecyclerView.Adapter<SearchAdapter.ViewHolder>() {
 
-    fun swapDataSet(dataSet: MutableList<Any>) {
+    fun swapDataSet(dataSet: List<Any>) {
         this.dataSet = dataSet
         notifyDataSetChanged()
     }

app/src/main/java/code/name/monkey/retromusic/adapter/SongFileAdapter.kt

@@ -26,8 +26,8 @@ import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.adapter.base.AbsMultiSelectAdapter
 import code.name.monkey.retromusic.adapter.base.MediaEntryViewHolder
 import code.name.monkey.retromusic.glide.audiocover.AudioFileCover
-import code.name.monkey.retromusic.interfaces.CabHolder
-import code.name.monkey.retromusic.interfaces.Callbacks
+import code.name.monkey.retromusic.interfaces.ICabHolder
+import code.name.monkey.retromusic.interfaces.ICallbacks
 import code.name.monkey.retromusic.util.MusicUtil
 import code.name.monkey.retromusic.util.RetroUtil
 import com.bumptech.glide.Glide
@@ -43,10 +43,10 @@ class SongFileAdapter(
     private val activity: AppCompatActivity,
     private var dataSet: List<File>,
     private val itemLayoutRes: Int,
-    private val callbacks: Callbacks?,
-    cabHolder: CabHolder?
+    private val ICallbacks: ICallbacks?,
+    ICabHolder: ICabHolder?
 ) : AbsMultiSelectAdapter<SongFileAdapter.ViewHolder, File>(
-    activity, cabHolder, R.menu.menu_media_selection
+    activity, ICabHolder, R.menu.menu_media_selection
 ), PopupTextProvider {
 
     init {
@@ -136,8 +136,8 @@ class SongFileAdapter(
     }
 
     override fun onMultipleItemAction(menuItem: MenuItem, selection: List<File>) {
-        if (callbacks == null) return
-        callbacks.onMultipleItemAction(menuItem, selection as ArrayList<File>)
+        if (ICallbacks == null) return
+        ICallbacks.onMultipleItemAction(menuItem, selection as ArrayList<File>)
     }
 
     override fun getPopupText(position: Int): String {
@@ -152,11 +152,11 @@ class SongFileAdapter(
     inner class ViewHolder(itemView: View) : MediaEntryViewHolder(itemView) {
 
         init {
-            if (menu != null && callbacks != null) {
+            if (menu != null && ICallbacks != null) {
                 menu?.setOnClickListener { v ->
                     val position = layoutPosition
                     if (isPositionInRange(position)) {
-                        callbacks.onFileMenuClicked(dataSet[position], v)
+                        ICallbacks.onFileMenuClicked(dataSet[position], v)
                     }
                 }
             }
@@ -171,7 +171,7 @@ class SongFileAdapter(
                 if (isInQuickSelectMode) {
                     toggleChecked(position)
                 } else {
-                    callbacks?.onFileSelected(dataSet[position])
+                    ICallbacks?.onFileSelected(dataSet[position])
                 }
             }
         }

app/src/main/java/code/name/monkey/retromusic/adapter/album/AlbumAdapter.kt

@@ -16,7 +16,7 @@ import code.name.monkey.retromusic.glide.RetroMusicColoredTarget
 import code.name.monkey.retromusic.helper.MusicPlayerRemote
 import code.name.monkey.retromusic.helper.SortOrder
 import code.name.monkey.retromusic.helper.menu.SongsMenuHelper
-import code.name.monkey.retromusic.interfaces.CabHolder
+import code.name.monkey.retromusic.interfaces.ICabHolder
 import code.name.monkey.retromusic.model.Album
 import code.name.monkey.retromusic.model.Song
 import code.name.monkey.retromusic.util.MusicUtil
@@ -29,11 +29,11 @@ open class AlbumAdapter(
     protected val activity: FragmentActivity,
     var dataSet: List<Album>,
     protected var itemLayoutRes: Int,
-    cabHolder: CabHolder?,
+    ICabHolder: ICabHolder?,
     private val albumClickListener: AlbumClickListener?
 ) : AbsMultiSelectAdapter<AlbumAdapter.ViewHolder, Album>(
     activity,
-    cabHolder,
+    ICabHolder,
     R.menu.menu_media_selection
 ), PopupTextProvider {
 

app/src/main/java/code/name/monkey/retromusic/adapter/album/HorizontalAlbumAdapter.kt

@@ -7,7 +7,7 @@ import code.name.monkey.retromusic.fragments.albums.AlbumClickListener
 import code.name.monkey.retromusic.glide.AlbumGlideRequest
 import code.name.monkey.retromusic.glide.RetroMusicColoredTarget
 import code.name.monkey.retromusic.helper.HorizontalAdapterHelper
-import code.name.monkey.retromusic.interfaces.CabHolder
+import code.name.monkey.retromusic.interfaces.ICabHolder
 import code.name.monkey.retromusic.model.Album
 import code.name.monkey.retromusic.util.MusicUtil
 import code.name.monkey.retromusic.util.color.MediaNotificationProcessor
@@ -16,10 +16,10 @@ import com.bumptech.glide.Glide
 class HorizontalAlbumAdapter(
     activity: FragmentActivity,
     dataSet: List<Album>,
-    cabHolder: CabHolder?,
+    ICabHolder: ICabHolder?,
     albumClickListener: AlbumClickListener
 ) : AlbumAdapter(
-    activity, dataSet, HorizontalAdapterHelper.LAYOUT_RES, cabHolder, albumClickListener
+    activity, dataSet, HorizontalAdapterHelper.LAYOUT_RES, ICabHolder, albumClickListener
 ) {
 
     override fun createViewHolder(view: View, viewType: Int): ViewHolder {

app/src/main/java/code/name/monkey/retromusic/adapter/artist/ArtistAdapter.kt

@@ -16,7 +16,7 @@ import code.name.monkey.retromusic.fragments.artists.ArtistClickListener
 import code.name.monkey.retromusic.glide.ArtistGlideRequest
 import code.name.monkey.retromusic.glide.RetroMusicColoredTarget
 import code.name.monkey.retromusic.helper.menu.SongsMenuHelper
-import code.name.monkey.retromusic.interfaces.CabHolder
+import code.name.monkey.retromusic.interfaces.ICabHolder
 import code.name.monkey.retromusic.model.Artist
 import code.name.monkey.retromusic.model.Song
 import code.name.monkey.retromusic.util.MusicUtil
@@ -29,10 +29,10 @@ class ArtistAdapter(
     val activity: FragmentActivity,
     var dataSet: List<Artist>,
     var itemLayoutRes: Int,
-    cabHolder: CabHolder?,
+    ICabHolder: ICabHolder?,
     private val artistClickListener: ArtistClickListener
 ) : AbsMultiSelectAdapter<ArtistAdapter.ViewHolder, Artist>(
-    activity, cabHolder, R.menu.menu_media_selection
+    activity, ICabHolder, R.menu.menu_media_selection
 ), PopupTextProvider {
 
     init {

app/src/main/java/code/name/monkey/retromusic/adapter/base/AbsMultiSelectAdapter.java

@@ -15,21 +15,21 @@ import java.util.ArrayList;
 import java.util.List;
 
 import code.name.monkey.retromusic.R;
-import code.name.monkey.retromusic.interfaces.CabHolder;
+import code.name.monkey.retromusic.interfaces.ICabHolder;
 
 
 public abstract class AbsMultiSelectAdapter<V extends RecyclerView.ViewHolder, I> extends RecyclerView.Adapter<V>
         implements MaterialCab.Callback {
 
     @Nullable
-    private final CabHolder cabHolder;
+    private final ICabHolder ICabHolder;
     private final Context context;
     private MaterialCab cab;
     private List<I> checked;
     private int menuRes;
 
-    public AbsMultiSelectAdapter(@NonNull Context context, @Nullable CabHolder cabHolder, @MenuRes int menuRes) {
-        this.cabHolder = cabHolder;
+    public AbsMultiSelectAdapter(@NonNull Context context, @Nullable ICabHolder ICabHolder, @MenuRes int menuRes) {
+        this.ICabHolder = ICabHolder;
         checked = new ArrayList<>();
         this.menuRes = menuRes;
         this.context = context;
@@ -59,7 +59,7 @@ public abstract class AbsMultiSelectAdapter<V extends RecyclerView.ViewHolder, I
     }
 
     protected void checkAll() {
-        if (cabHolder != null) {
+        if (ICabHolder != null) {
             checked.clear();
             for (int i = 0; i < getItemCount(); i++) {
                 I identifier = getIdentifier(i);
@@ -94,7 +94,7 @@ public abstract class AbsMultiSelectAdapter<V extends RecyclerView.ViewHolder, I
     }
 
     protected boolean toggleChecked(final int position) {
-        if (cabHolder != null) {
+        if (ICabHolder != null) {
             I identifier = getIdentifier(position);
             if (identifier == null) {
                 return false;
@@ -117,9 +117,9 @@ public abstract class AbsMultiSelectAdapter<V extends RecyclerView.ViewHolder, I
     }
 
     private void updateCab() {
-        if (cabHolder != null) {
+        if (ICabHolder != null) {
             if (cab == null || !cab.isActive()) {
-                cab = cabHolder.openCab(menuRes, this);
+                cab = ICabHolder.openCab(menuRes, this);
             }
             final int size = checked.size();
             if (size <= 0) {

app/src/main/java/code/name/monkey/retromusic/adapter/playlist/PlaylistAdapter.kt

@@ -27,7 +27,7 @@ import code.name.monkey.retromusic.extensions.hide
 import code.name.monkey.retromusic.extensions.show
 import code.name.monkey.retromusic.helper.menu.PlaylistMenuHelper
 import code.name.monkey.retromusic.helper.menu.SongsMenuHelper
-import code.name.monkey.retromusic.interfaces.CabHolder
+import code.name.monkey.retromusic.interfaces.ICabHolder
 import code.name.monkey.retromusic.model.Playlist
 import code.name.monkey.retromusic.model.Song
 import code.name.monkey.retromusic.repository.PlaylistSongsLoader
@@ -39,10 +39,10 @@ class PlaylistAdapter(
     private val activity: FragmentActivity,
     var dataSet: List<PlaylistWithSongs>,
     private var itemLayoutRes: Int,
-    cabHolder: CabHolder?
+    ICabHolder: ICabHolder?
 ) : AbsMultiSelectAdapter<PlaylistAdapter.ViewHolder, PlaylistWithSongs>(
     activity,
-    cabHolder,
+    ICabHolder,
     R.menu.menu_playlists_selection
 ) {
 

app/src/main/java/code/name/monkey/retromusic/adapter/song/AbsOffsetSongAdapter.kt

@@ -7,15 +7,15 @@ import androidx.annotation.LayoutRes
 import androidx.appcompat.app.AppCompatActivity
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.helper.MusicPlayerRemote
-import code.name.monkey.retromusic.interfaces.CabHolder
+import code.name.monkey.retromusic.interfaces.ICabHolder
 import code.name.monkey.retromusic.model.Song
 
 abstract class AbsOffsetSongAdapter(
     activity: AppCompatActivity,
     dataSet: MutableList<Song>,
     @LayoutRes itemLayoutRes: Int,
-    cabHolder: CabHolder?
-) : SongAdapter(activity, dataSet, itemLayoutRes, cabHolder) {
+    ICabHolder: ICabHolder?
+) : SongAdapter(activity, dataSet, itemLayoutRes, ICabHolder) {
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): SongAdapter.ViewHolder {
         if (viewType == OFFSET_ITEM) {

app/src/main/java/code/name/monkey/retromusic/adapter/song/OrderablePlaylistSongAdapter.kt

@@ -9,7 +9,7 @@ import code.name.monkey.retromusic.db.PlaylistEntity
 import code.name.monkey.retromusic.db.toSongEntity
 import code.name.monkey.retromusic.db.toSongs
 import code.name.monkey.retromusic.dialogs.RemoveSongFromPlaylistDialog
-import code.name.monkey.retromusic.interfaces.CabHolder
+import code.name.monkey.retromusic.interfaces.ICabHolder
 import code.name.monkey.retromusic.model.PlaylistSong
 import code.name.monkey.retromusic.model.Song
 import code.name.monkey.retromusic.util.ViewUtil
@@ -23,13 +23,13 @@ class OrderablePlaylistSongAdapter(
     activity: FragmentActivity,
     dataSet: ArrayList<Song>,
     itemLayoutRes: Int,
-    cabHolder: CabHolder?,
+    ICabHolder: ICabHolder?,
     private val onMoveItemListener: OnMoveItemListener?
 ) : SongAdapter(
     activity,
     dataSet,
     itemLayoutRes,
-    cabHolder
+    ICabHolder
 ), DraggableItemAdapter<OrderablePlaylistSongAdapter.ViewHolder> {
 
     init {

app/src/main/java/code/name/monkey/retromusic/adapter/song/PlaylistSongAdapter.kt

@@ -8,7 +8,7 @@ import androidx.navigation.findNavController
 import code.name.monkey.retromusic.EXTRA_ALBUM_ID
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.helper.MusicPlayerRemote
-import code.name.monkey.retromusic.interfaces.CabHolder
+import code.name.monkey.retromusic.interfaces.ICabHolder
 import code.name.monkey.retromusic.model.Song
 import com.google.android.material.button.MaterialButton
 
@@ -16,8 +16,8 @@ open class PlaylistSongAdapter(
     activity: AppCompatActivity,
     dataSet: MutableList<Song>,
     itemLayoutRes: Int,
-    cabHolder: CabHolder?
-) : AbsOffsetSongAdapter(activity, dataSet, itemLayoutRes, cabHolder) {
+    ICabHolder: ICabHolder?
+) : AbsOffsetSongAdapter(activity, dataSet, itemLayoutRes, ICabHolder) {
 
     init {
         this.setMultiSelectMenuRes(R.menu.menu_cannot_delete_single_songs_playlist_songs_selection)

app/src/main/java/code/name/monkey/retromusic/adapter/song/ShuffleButtonSongAdapter.kt

@@ -4,7 +4,7 @@ import android.view.View
 import androidx.appcompat.app.AppCompatActivity
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.helper.MusicPlayerRemote
-import code.name.monkey.retromusic.interfaces.CabHolder
+import code.name.monkey.retromusic.interfaces.ICabHolder
 import code.name.monkey.retromusic.model.Song
 import com.google.android.material.button.MaterialButton
 
@@ -12,8 +12,8 @@ class ShuffleButtonSongAdapter(
     activity: AppCompatActivity,
     dataSet: MutableList<Song>,
     itemLayoutRes: Int,
-    cabHolder: CabHolder?
-) : AbsOffsetSongAdapter(activity, dataSet, itemLayoutRes, cabHolder) {
+    ICabHolder: ICabHolder?
+) : AbsOffsetSongAdapter(activity, dataSet, itemLayoutRes, ICabHolder) {
 
     override fun createViewHolder(view: View): SongAdapter.ViewHolder {
         return ViewHolder(view)

app/src/main/java/code/name/monkey/retromusic/adapter/song/SimpleSongAdapter.kt

@@ -3,7 +3,7 @@ package code.name.monkey.retromusic.adapter.song
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.fragment.app.FragmentActivity
-import code.name.monkey.retromusic.interfaces.CabHolder
+import code.name.monkey.retromusic.interfaces.ICabHolder
 import code.name.monkey.retromusic.model.Song
 import code.name.monkey.retromusic.util.MusicUtil
 import java.util.*
@@ -12,8 +12,8 @@ class SimpleSongAdapter(
     context: FragmentActivity,
     songs: ArrayList<Song>,
     layoutRes: Int,
-    cabHolder: CabHolder?
-) : SongAdapter(context, songs, layoutRes, cabHolder) {
+    ICabHolder: ICabHolder?
+) : SongAdapter(context, songs, layoutRes, ICabHolder) {
 
     override fun swapDataSet(dataSet: List<Song>) {
         this.dataSet = dataSet.toMutableList()

app/src/main/java/code/name/monkey/retromusic/adapter/song/SongAdapter.kt

@@ -21,7 +21,7 @@ import code.name.monkey.retromusic.helper.MusicPlayerRemote
 import code.name.monkey.retromusic.helper.SortOrder
 import code.name.monkey.retromusic.helper.menu.SongMenuHelper
 import code.name.monkey.retromusic.helper.menu.SongsMenuHelper
-import code.name.monkey.retromusic.interfaces.CabHolder
+import code.name.monkey.retromusic.interfaces.ICabHolder
 import code.name.monkey.retromusic.model.Song
 import code.name.monkey.retromusic.util.MusicUtil
 import code.name.monkey.retromusic.util.PreferenceUtil
@@ -38,11 +38,11 @@ open class SongAdapter(
     protected val activity: FragmentActivity,
     var dataSet: MutableList<Song>,
     protected var itemLayoutRes: Int,
-    cabHolder: CabHolder?,
+    ICabHolder: ICabHolder?,
     showSectionName: Boolean = true
 ) : AbsMultiSelectAdapter<SongAdapter.ViewHolder, Song>(
     activity,
-    cabHolder,
+    ICabHolder,
     R.menu.menu_media_selection
 ), MaterialCab.Callback, PopupTextProvider {