Remove classic player

app/src/main/assets/contributors.json

@@ -18,10 +18,10 @@
     "profile_image": "https://i.imgur.com/pfvN7d9.png"
   },
   {
-    "name": "ᴍɪʟɪɴᴅ ɢᴏᴇʟ | ᴘʟ2",
+    "name": "Milind Goel",
     "summary": "Github & Telegram maintainer",
     "link": "https://t.me/MilindGoel15",
-    "profile_image": "https://i.imgur.com/ZIdLHYx.jpg"
+    "profile_image": "https://i.imgur.com/Bz4De21_d.jpg"
   },
   {
     "name": "Abilas Sathiya",

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) {
+                        when (panelState) {
-                             SlidingUpPanelLayout.PanelState.EXPANDED -> {
+                            BottomSheetBehavior.STATE_EXPANDED -> {
-                                 onPanelSlide(slidingLayout, 1f)
+                                //  onPanelSlide(slidingLayout, 1f)
-                                 onPanelExpanded()
+                                onPanelExpanded()
-                             }
+                            }
-                             SlidingUpPanelLayout.PanelState.COLLAPSED -> onPanelCollapsed()
+                            BottomSheetBehavior.STATE_COLLAPSED -> onPanelCollapsed()
-                             else -> playerFragment!!.onHide()
+                            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 == FIT || currentNowPlayingScreen == BLUR || currentNowPlayingScreen == BLUR_CARD) {
-                    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
+    private const val TYPE_FIRST = 1
-    const val TYPE_MIDDLE = 2
+    private const val TYPE_MIDDLE = 2
-    const val TYPE_LAST = 3
+    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) {
+        return when (position) {
-            TYPE_FIRST
+            0 -> TYPE_FIRST
-        } else if (position == itemCount - 1) {
+            itemCount - 1 -> TYPE_LAST
-            TYPE_LAST
+            else -> TYPE_MIDDLE
-        } 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,

app/src/main/res/layout/abs_playlists.xml

@@ -5,8 +5,6 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
-    android:paddingStart="@dimen/horizontal_padding_home"
-    android:paddingEnd="@dimen/horizontal_padding_home"
     android:paddingBottom="12dp">
 
 

app/src/main/res/layout/activity_lyrics.xml

@@ -1,17 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
 
-    <androidx.viewpager.widget.ViewPager
-        android:id="@+id/viewPager"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior" />
-
-
     <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/appBarLayout"
         android:layout_width="match_parent"
@@ -26,10 +20,11 @@
             app:contentInsetStart="0dp"
             app:contentInsetStartWithNavigation="0dp"
             app:layout_scrollFlags="scroll|enterAlways"
-            app:subtitleTextAppearance="@style/TextAppearance.MaterialComponents.Caption"
             app:titleMargin="0dp"
             app:titleMarginStart="0dp"
-            app:titleTextAppearance="@style/TextAppearance.MaterialComponents.Subtitle1" />
+            app:titleTextAppearance="@style/ToolbarTextAppearanceNormal"
+            tools:subtitle="@tools:sample/full_names"
+            tools:title="@tools:sample/full_names" />
 
         <com.google.android.material.tabs.TabLayout
             android:id="@+id/tabs"
@@ -49,6 +44,13 @@
         </com.google.android.material.tabs.TabLayout>
     </com.google.android.material.appbar.AppBarLayout>
 
+
+    <androidx.viewpager.widget.ViewPager
+        android:id="@+id/viewPager"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior" />
+
     <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
         android:id="@+id/fab"
         android:layout_width="wrap_content"

app/src/main/res/layout/dialog_file_details.xml

@@ -13,6 +13,7 @@
         android:paddingStart="16dp"
         android:paddingEnd="16dp"
         android:textAppearance="@style/TextViewNormal"
+        android:textColor="?colorOnPrimary"
         android:textSize="16sp" />
 
     <com.google.android.material.textview.MaterialTextView
@@ -23,6 +24,7 @@
         android:paddingTop="16dp"
         android:paddingEnd="16dp"
         android:textAppearance="@style/TextViewNormal"
+        android:textColor="?colorOnPrimary"
         android:textSize="16sp" />
 
     <com.google.android.material.textview.MaterialTextView
@@ -33,6 +35,7 @@
         android:paddingTop="16dp"
         android:paddingEnd="16dp"
         android:textAppearance="@style/TextViewNormal"
+        android:textColor="?colorOnPrimary"
         android:textSize="16sp" />
 
     <com.google.android.material.textview.MaterialTextView
@@ -43,6 +46,7 @@
         android:paddingTop="16dp"
         android:paddingEnd="16dp"
         android:textAppearance="@style/TextViewNormal"
+        android:textColor="?colorOnPrimary"
         android:textSize="16sp" />
 
     <com.google.android.material.textview.MaterialTextView
@@ -53,6 +57,7 @@
         android:paddingTop="16dp"
         android:paddingEnd="16dp"
         android:textAppearance="@style/TextViewNormal"
+        android:textColor="?colorOnPrimary"
         android:textSize="16sp" />
 
     <com.google.android.material.textview.MaterialTextView
@@ -63,6 +68,7 @@
         android:paddingTop="16dp"
         android:paddingEnd="16dp"
         android:textAppearance="@style/TextViewNormal"
+        android:textColor="?colorOnPrimary"
         android:textSize="16sp" />
 
     <com.google.android.material.textview.MaterialTextView
@@ -74,6 +80,7 @@
         android:paddingEnd="16dp"
         android:paddingBottom="16dp"
         android:textAppearance="@style/TextViewNormal"
+        android:textColor="?colorOnPrimary"
         android:textSize="16sp" />
 
 </LinearLayout>

app/src/main/res/layout/fragment_mini_player.xml

@@ -19,8 +19,6 @@
 
 
         <androidx.appcompat.widget.AppCompatImageView
-            app:tint="?colorOnSurface"
-            tools:tint="?colorOnSurface"
             android:id="@+id/miniPlayerImage"
             android:layout_width="24dp"
             android:layout_height="24dp"
@@ -28,7 +26,9 @@
             android:layout_margin="16dp"
             android:scaleType="centerCrop"
             app:srcCompat="@drawable/ic_keyboard_arrow_up_24dp"
-            tools:ignore="ContentDescription" />
+            app:tint="?colorOnSecondary"
+            tools:ignore="ContentDescription"
+            tools:tint="?colorOnSurface" />
 
         <com.google.android.material.textview.MaterialTextView
             android:id="@+id/miniPlayerTitle"
@@ -56,7 +56,7 @@
             android:background="?roundSelector"
             android:padding="6dp"
             app:srcCompat="@drawable/ic_skip_previous_white_24dp"
-            app:tint="?colorOnSurface" />
+            app:tint="?colorOnSecondary" />
 
         <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/miniPlayerPlayPauseButton"
@@ -67,7 +67,7 @@
             android:padding="6dp"
             android:scaleType="center"
             app:srcCompat="@drawable/ic_pause_white_24dp"
-            app:tint="?colorOnSurface"
+            app:tint="?colorOnSecondary"
             tools:ignore="ContentDescription" />
 
         <androidx.appcompat.widget.AppCompatImageView
@@ -78,8 +78,8 @@
             android:background="?roundSelector"
             android:padding="6dp"
             app:srcCompat="@drawable/ic_skip_next_white_24dp"
-            app:tint="?colorOnSurface"
+            app:tint="?colorOnSecondary"
-            tools:tint="?colorOnSurface" />
+            tools:tint="?colorOnSecondary" />
 
 
         <androidx.appcompat.widget.AppCompatImageView
@@ -90,8 +90,8 @@
             android:background="?roundSelector"
             android:padding="6dp"
             app:srcCompat="@drawable/ic_playlist_play_white_24dp"
-            app:tint="?colorOnSurface"
+            app:tint="?colorOnSecondary"
-            tools:tint="?colorOnSurface" />
+            tools:tint="?colorOnSecondary" />
 
     </LinearLayout>
 

app/src/main/res/layout/fragment_peak_player.xml

@@ -17,6 +17,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:clickable="true"
+    android:focusable="true"
     android:orientation="vertical">
 
     <FrameLayout

app/src/main/res/layout/pager_item.xml

@@ -11,8 +11,8 @@
         android:id="@+id/imageContainer"
         android:layout_width="match_parent"
         android:layout_height="172dp"
-        app:cardCornerRadius="12dp"
+        android:layout_margin="8dp"
-        app:cardUseCompatPadding="true">
+        app:cardCornerRadius="12dp">
 
         <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/image"
@@ -38,7 +38,7 @@
         android:layout_height="match_parent"
         android:ellipsize="end"
         android:maxLines="1"
-        android:paddingStart="8dp"
+        android:paddingStart="16dp"
         android:paddingTop="6dp"
         android:paddingEnd="8dp"
         android:paddingBottom="4dp"
@@ -53,7 +53,7 @@
         android:layout_height="match_parent"
         android:ellipsize="end"
         android:maxLines="1"
-        android:paddingStart="8dp"
+        android:paddingStart="16dp"
         android:paddingEnd="8dp"
         android:textAppearance="@style/TextViewSubtitle1"
         android:textStyle="bold"

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

@@ -67,8 +67,4 @@
         android:id="@+id/action_delete_from_device"
         android:orderInCategory="13"
         android:title="@string/action_delete_from_device" />
-    <item
-        android:id="@+id/action_settings"
-        android:orderInCategory="13"
-        android:title="@string/action_settings" />
 </menu>