kavin/LibreTube
1
0
Fork 0
mirror of https://github.com/libre-tube/LibreTube.git synced 2025-04-27 23:40:33 +05:30
Code Issues Projects Releases Wiki Activity

Merge pull request #2787 from Bnyro/master

Browse Source 
Fix queue starts wrong video after reordering
This commit is contained in:
Bnyro 2023-01-21 11:20:04 +01:00 committed by GitHub
commit 2acd53515c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/src/main/java/com/github/libretube/ui/adapters/PlayingQueueAdapter.kt
View File

@ -7,6 +7,7 @@ import android.view.LayoutInflater
import android.view.ViewGroup import android.view.ViewGroup
import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView
import com.github.libretube.databinding.QueueRowBinding import com.github.libretube.databinding.QueueRowBinding
import com.github.libretube.extensions.toID
import com.github.libretube.ui.viewholders.PlayingQueueViewHolder import com.github.libretube.ui.viewholders.PlayingQueueViewHolder
import com.github.libretube.util.ImageHelper import com.github.libretube.util.ImageHelper
import com.github.libretube.util.PlayingQueue import com.github.libretube.util.PlayingQueue
@ -46,10 +47,16 @@ class PlayingQueueAdapter : RecyclerView.Adapter<PlayingQueueViewHolder>() {
) )
root.setOnClickListener { root.setOnClickListener {
val oldIndex = PlayingQueue.currentIndex() val oldPosition = PlayingQueue.currentIndex()
PlayingQueue.onQueueItemSelected(position) // get the new position from the queue to work properly after reordering the queue
notifyItemChanged(oldIndex) val newPosition = PlayingQueue.getStreams().indexOfFirst {
notifyItemChanged(position) it.url?.toID() == streamItem.url?.toID()
}.takeIf { it >= 0 } ?: return@setOnClickListener
// select the new item in the queue and update the selected item in the UI
PlayingQueue.onQueueItemSelected(newPosition)
notifyItemChanged(oldPosition)
notifyItemChanged(newPosition)
} }
} }
} }