Updated

Item list to support big screen
Fix search for playlist
Fix playlist crash

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

@@ -28,16 +28,7 @@ class LockScreenActivity : AbsMusicServiceActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         setDrawUnderStatusBar()
         super.onCreate(savedInstanceState)
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1) {
-            setShowWhenLocked(true)
-            val keyguardManager = getSystemService(Context.KEYGUARD_SERVICE) as KeyguardManager
-            keyguardManager.requestDismissKeyguard(this, null)
-        } else {
-            this.window.addFlags(
-                WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD or
-                        WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED
-            )
-        }
+        lockScreenInit()
         setContentView(R.layout.activity_lock_screen)
         hideStatusBar()
         setStatusbarColorAuto()
@@ -77,6 +68,19 @@ class LockScreenActivity : AbsMusicServiceActivity() {
         }
     }
 
+    private fun lockScreenInit() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1) {
+            setShowWhenLocked(true)
+            val keyguardManager: KeyguardManager = getSystemService(KeyguardManager::class.java)
+            keyguardManager.requestDismissKeyguard(this, null)
+        } else {
+            this.window.addFlags(
+                WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD or
+                        WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED
+            )
+        }
+    }
+
     override fun onPlayingMetaChanged() {
         super.onPlayingMetaChanged()
         updateSongs()

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

@@ -22,6 +22,7 @@ import code.name.monkey.retromusic.util.AppRater
 import code.name.monkey.retromusic.util.PreferenceUtil
 import kotlinx.coroutines.Dispatchers.IO
 import kotlinx.coroutines.launch
+import org.koin.android.ext.android.get
 
 class MainActivity : AbsSlidingMusicPanelActivity(), OnSharedPreferenceChangeListener {
     companion object {
@@ -37,6 +38,7 @@ class MainActivity : AbsSlidingMusicPanelActivity(), OnSharedPreferenceChangeLis
     override fun onCreate(savedInstanceState: Bundle?) {
         setDrawUnderStatusBar()
         super.onCreate(savedInstanceState)
+        setupNavigationController()
         if (!hasPermissions()) {
             findNavController(R.id.fragment_container).navigate(R.id.permissionFragment)
         }
@@ -49,7 +51,7 @@ class MainActivity : AbsSlidingMusicPanelActivity(), OnSharedPreferenceChangeLis
         updateTabs()
 
         //NavigationUI.setupWithNavController(getBottomNavigationView(), findNavController(R.id.fragment_container))
-        setupNavigationController()
+
     }
 
     private fun setupNavigationController() {
@@ -121,8 +123,7 @@ class MainActivity : AbsSlidingMusicPanelActivity(), OnSharedPreferenceChangeLis
                 val id = parseLongFromIntent(intent, "playlistId", "playlist")
                 if (id >= 0L) {
                     val position: Int = intent.getIntExtra("position", 0)
-                    val songs: List<Song> =
-                        PlaylistSongsLoader.getPlaylistSongList(this@MainActivity, id)
+                    val songs: List<Song> = PlaylistSongsLoader.getPlaylistSongList(get(), id)
                     MusicPlayerRemote.openQueue(songs, position, true)
                     handled = true
                 }
@@ -130,8 +131,9 @@ class MainActivity : AbsSlidingMusicPanelActivity(), OnSharedPreferenceChangeLis
                 val id = parseLongFromIntent(intent, "albumId", "album")
                 if (id >= 0L) {
                     val position: Int = intent.getIntExtra("position", 0)
+                    val songs = libraryViewModel.albumById(id).songs
                     MusicPlayerRemote.openQueue(
-                        libraryViewModel.albumById(id).songs,
+                        songs,
                         position,
                         true
                     )
@@ -141,8 +143,9 @@ class MainActivity : AbsSlidingMusicPanelActivity(), OnSharedPreferenceChangeLis
                 val id = parseLongFromIntent(intent, "artistId", "artist")
                 if (id >= 0L) {
                     val position: Int = intent.getIntExtra("position", 0)
+                    val songs: List<Song> = libraryViewModel.artistById(id).songs
                     MusicPlayerRemote.openQueue(
-                        libraryViewModel.artistById(id).songs,
+                        songs,
                         position,
                         true
                     )

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

@@ -13,7 +13,6 @@ import code.name.monkey.retromusic.adapter.song.PlayingQueueAdapter
 import code.name.monkey.retromusic.extensions.accentColor
 import code.name.monkey.retromusic.extensions.surfaceColor
 import code.name.monkey.retromusic.helper.MusicPlayerRemote
-import code.name.monkey.retromusic.util.MusicUtil
 import code.name.monkey.retromusic.util.ThemedFastScroller
 import com.h6ah4i.android.widget.advrecyclerview.animator.DraggableItemAnimator
 import com.h6ah4i.android.widget.advrecyclerview.draggable.RecyclerViewDragDropManager
@@ -21,6 +20,7 @@ import com.h6ah4i.android.widget.advrecyclerview.swipeable.RecyclerViewSwipeMana
 import com.h6ah4i.android.widget.advrecyclerview.touchguard.RecyclerViewTouchActionGuardManager
 import com.h6ah4i.android.widget.advrecyclerview.utils.WrapperAdapterUtils
 import kotlinx.android.synthetic.main.activity_playing_queue.*
+import kotlinx.android.synthetic.main.activity_playing_queue.title as NoImageTitle
 
 open class PlayingQueueActivity : AbsMusicServiceActivity() {
 
@@ -31,13 +31,6 @@ open class PlayingQueueActivity : AbsMusicServiceActivity() {
     private var playingQueueAdapter: PlayingQueueAdapter? = null
     private lateinit var linearLayoutManager: LinearLayoutManager
 
-    private fun getUpNextAndQueueTime(): String {
-        val duration = MusicPlayerRemote.getQueueDurationMillis(MusicPlayerRemote.position)
-        return MusicUtil.buildInfoString(
-            resources.getString(R.string.up_next),
-            MusicUtil.getReadableDurationString(duration)
-        )
-    }
 
     override fun onCreate(savedInstanceState: Bundle?) {
         setDrawUnderStatusBar()
@@ -54,7 +47,6 @@ open class PlayingQueueActivity : AbsMusicServiceActivity() {
         clearQueue.setOnClickListener {
             MusicPlayerRemote.clearQueue()
         }
-        checkForPadding()
     }
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
@@ -107,7 +99,8 @@ open class PlayingQueueActivity : AbsMusicServiceActivity() {
         ThemedFastScroller.create(recyclerView)
     }
 
-    private fun checkForPadding() {
+    override fun onServiceConnected() {
+        updateCurrentSong()
     }
 
     override fun onQueueChanged() {
@@ -115,7 +108,6 @@ open class PlayingQueueActivity : AbsMusicServiceActivity() {
             finish()
             return
         }
-        checkForPadding()
         updateQueue()
         updateCurrentSong()
     }
@@ -126,7 +118,9 @@ open class PlayingQueueActivity : AbsMusicServiceActivity() {
     }
 
     private fun updateCurrentSong() {
-        toolbar.subtitle = getUpNextAndQueueTime()
+        NoImageTitle.text = MusicPlayerRemote.currentSong.title
+        text.text = MusicPlayerRemote.currentSong.artistName
+        text2?.text = MusicPlayerRemote.currentSong.albumName
     }
 
     override fun onPlayingMetaChanged() {
@@ -136,7 +130,6 @@ open class PlayingQueueActivity : AbsMusicServiceActivity() {
     private fun updateQueuePosition() {
         playingQueueAdapter?.setCurrent(MusicPlayerRemote.position)
         resetToCurrentPosition()
-        toolbar.subtitle = getUpNextAndQueueTime()
     }
 
     private fun updateQueue() {
@@ -174,7 +167,6 @@ open class PlayingQueueActivity : AbsMusicServiceActivity() {
     }
 
     private fun setupToolbar() {
-        toolbar.subtitle = getUpNextAndQueueTime()
         toolbar.setBackgroundColor(surfaceColor())
         setSupportActionBar(toolbar)
         clearQueue.backgroundTintList = ColorStateList.valueOf(accentColor())