Remove classic player

app/src/main/java/code/name/monkey/retromusic/activities/base/AbsSlidingMusicPanelActivity.kt

@@ -19,7 +19,6 @@ import code.name.monkey.retromusic.fragments.player.adaptive.AdaptiveFragment
 import code.name.monkey.retromusic.fragments.player.blur.BlurPlayerFragment
 import code.name.monkey.retromusic.fragments.player.card.CardFragment
 import code.name.monkey.retromusic.fragments.player.cardblur.CardBlurFragment
-import code.name.monkey.retromusic.fragments.player.classic.ClassicPlayerFragment
 import code.name.monkey.retromusic.fragments.player.color.ColorFragment
 import code.name.monkey.retromusic.fragments.player.fit.FitFragment
 import code.name.monkey.retromusic.fragments.player.flat.FlatPlayerFragment
@@ -177,14 +176,14 @@ abstract class AbsSlidingMusicPanelActivity : AbsMusicServiceActivity(), AbsPlay
                             params.height = ViewGroup.LayoutParams.MATCH_PARENT
                             slidingPanel.layoutParams = params
                         }
-                        /* when (panelState) {
-                             SlidingUpPanelLayout.PanelState.EXPANDED -> {
-                                 onPanelSlide(slidingLayout, 1f)
-                                 onPanelExpanded()
-                             }
-                             SlidingUpPanelLayout.PanelState.COLLAPSED -> onPanelCollapsed()
-                             else -> playerFragment!!.onHide()
-                         }*/
+                        when (panelState) {
+                            BottomSheetBehavior.STATE_EXPANDED -> {
+                                //  onPanelSlide(slidingLayout, 1f)
+                                onPanelExpanded()
+                            }
+                            BottomSheetBehavior.STATE_COLLAPSED -> onPanelCollapsed()
+                            else -> playerFragment!!.onHide()
+                        }
                     }
                 })
     }
@@ -237,7 +236,6 @@ abstract class AbsSlidingMusicPanelActivity : AbsMusicServiceActivity(), AbsPlay
             MATERIAL -> MaterialFragment()
             COLOR -> ColorFragment()
             TINY -> TinyPlayerFragment()
-            CLASSIC -> ClassicPlayerFragment()
             PEAK -> PeakPlayerFragment()
             else -> PlayerFragment()
         } // must implement AbsPlayerFragment
@@ -304,8 +302,7 @@ abstract class AbsSlidingMusicPanelActivity : AbsMusicServiceActivity(), AbsPlay
                 super.setLightNavigationBar(true)
                 super.setLightStatusbar(isColorLight)
             } else if (currentNowPlayingScreen == FULL || currentNowPlayingScreen == CARD ||
-                    currentNowPlayingScreen == FIT || currentNowPlayingScreen == CLASSIC ||
-                    currentNowPlayingScreen == BLUR || currentNowPlayingScreen == BLUR_CARD) {
+                    currentNowPlayingScreen == FIT || currentNowPlayingScreen == BLUR || currentNowPlayingScreen == BLUR_CARD) {
                 super.setLightStatusbar(false)
                 super.setLightNavigationBar(true)
             } else if (currentNowPlayingScreen == COLOR || currentNowPlayingScreen == TINY) {
@@ -354,7 +351,7 @@ abstract class AbsSlidingMusicPanelActivity : AbsMusicServiceActivity(), AbsPlay
         val currentTabs = PreferenceUtil.getInstance(this).libraryCategoryInfos
         for (tab in currentTabs) {
             if (tab.visible) {
-                val menu = tab.category;
+                val menu = tab.category
                 bottomNavigationView.menu.add(0, menu.id, 0, menu.stringRes)
                         .setIcon(menu.icon)
             }

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

@@ -10,7 +10,6 @@ import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentManager
 import code.name.monkey.retromusic.activities.LyricsActivity
 import code.name.monkey.retromusic.fragments.AlbumCoverStyle
-import code.name.monkey.retromusic.fragments.NowPlayingScreen
 import code.name.monkey.retromusic.glide.RetroMusicColoredTarget
 import code.name.monkey.retromusic.glide.SongGlideRequest
 import code.name.monkey.retromusic.misc.CustomFragmentStatePagerAdapter
@@ -90,7 +89,6 @@ class AlbumCoverPagerAdapter(fm: FragmentManager, private val dataSet: ArrayList
 
         override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
             val finalLayout = when {
-                PreferenceUtil.getInstance(activity).nowPlayingScreen == NowPlayingScreen.CLASSIC -> code.name.monkey.retromusic.R.layout.fragment_album_full_cover
                 PreferenceUtil.getInstance(activity).carouselEffect() -> code.name.monkey.retromusic.R.layout.fragment_album_carousel_cover
                 else -> layout
             }

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

@@ -40,7 +40,7 @@ open class SongAdapter @JvmOverloads constructor(
         usePalette: Boolean,
         cabHolder: CabHolder?,
         showSectionName: Boolean = true
-) : AbsMultiSelectAdapter<SongAdapter.ViewHolder, Song>(activity, cabHolder, code.name.monkey.retromusic.R.menu.menu_media_selection), MaterialCab.Callback, FastScrollRecyclerView.SectionedAdapter {
+) : AbsMultiSelectAdapter<SongAdapter.ViewHolder, Song>(activity, cabHolder, R.menu.menu_media_selection), MaterialCab.Callback, FastScrollRecyclerView.SectionedAdapter {
     var dataSet: ArrayList<Song>
 
     protected var usePalette = false

app/src/main/java/code/name/monkey/retromusic/fragments/NowPlayingScreen.kt

@@ -22,7 +22,6 @@ enum class NowPlayingScreen constructor(@param:StringRes @field:StringRes
     PLAIN(R.string.plain, R.drawable.np_plain, 3),
     TINY(R.string.tiny, R.drawable.np_tiny, 7),
     SIMPLE(R.string.simple, R.drawable.np_simple, 8),
-    CLASSIC(R.string.classic, R.drawable.np_classic, 13),
     PEAK(R.string.peak, R.drawable.np_slide, 14)
 
 }

app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsPlayerFragment.kt

@@ -128,10 +128,6 @@ abstract class AbsPlayerFragment : AbsMusicServiceFragment(),
                 ringtoneManager.setRingtone(song)
                 return true
             }
-            R.id.action_settings -> {
-                NavigationUtil.goToSettings(requireActivity())
-                return true
-            }
             R.id.action_go_to_genre -> {
                 val retriever = MediaMetadataRetriever()
                 val trackUri = ContentUris.withAppendedId(MediaStore.Audio.Media.EXTERNAL_CONTENT_URI, song.id.toLong())

app/src/main/java/code/name/monkey/retromusic/helper/HorizontalAdapterHelper.kt

@@ -23,9 +23,9 @@ object HorizontalAdapterHelper {
 
     const val LAYOUT_RES = R.layout.item_image
 
-    const val TYPE_FIRST = 1
-    const val TYPE_MIDDLE = 2
-    const val TYPE_LAST = 3
+    private const val TYPE_FIRST = 1
+    private const val TYPE_MIDDLE = 2
+    private const val TYPE_LAST = 3
 
     fun applyMarginToLayoutParams(context: Context,
                                   layoutParams: ViewGroup.MarginLayoutParams, viewType: Int) {
@@ -39,12 +39,10 @@ object HorizontalAdapterHelper {
     }
 
     fun getItemViewtype(position: Int, itemCount: Int): Int {
-        return if (position == 0) {
-            TYPE_FIRST
-        } else if (position == itemCount - 1) {
-            TYPE_LAST
-        } else {
-            TYPE_MIDDLE
+        return when (position) {
+            0 -> TYPE_FIRST
+            itemCount - 1 -> TYPE_LAST
+            else -> TYPE_MIDDLE
         }
     }
 }

app/src/main/java/code/name/monkey/retromusic/loaders/SongLoader.kt

@@ -18,8 +18,8 @@ import android.content.Context
 import android.database.Cursor
 import android.provider.MediaStore
 import android.provider.MediaStore.Audio.AudioColumns
-import code.name.monkey.retromusic.Constants.baseProjection
 import code.name.monkey.retromusic.Constants.BASE_SELECTION
+import code.name.monkey.retromusic.Constants.baseProjection
 import code.name.monkey.retromusic.helper.ShuffleHelper
 import code.name.monkey.retromusic.model.Song
 import code.name.monkey.retromusic.providers.BlacklistStore
@@ -171,6 +171,7 @@ object SongLoader {
                 albumName ?: "", artistId, artistName, composer ?: "")
     }
 
+
     @JvmOverloads
     fun makeSongCursor(
             context: Context,