Merge pull request #7278 from Bnyro/master

chore: small code cleanups related to playing queue
This commit is contained in:
Bnyro 2025-04-02 17:32:23 +02:00 committed by GitHub
commit 7b0d4caf31
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 4 additions and 10 deletions

View File

@ -1,29 +1,23 @@
package com.github.libretube.ui.adapters
import android.annotation.SuppressLint
import android.content.Context
import android.view.LayoutInflater
import android.view.ViewGroup
import androidx.core.os.bundleOf
import androidx.core.view.isGone
import androidx.core.view.isVisible
import androidx.core.view.updateLayoutParams
import androidx.recyclerview.widget.GridLayoutManager
import androidx.recyclerview.widget.ListAdapter
import androidx.recyclerview.widget.RecyclerView.LayoutManager
import com.github.libretube.api.obj.StreamItem
import com.github.libretube.constants.IntentData
import com.github.libretube.constants.PreferenceKeys
import com.github.libretube.databinding.AllCaughtUpRowBinding
import com.github.libretube.databinding.TrendingRowBinding
import com.github.libretube.databinding.VideoRowBinding
import com.github.libretube.db.DatabaseHolder
import com.github.libretube.extensions.ceilHalf
import com.github.libretube.extensions.dpToPx
import com.github.libretube.extensions.toID
import com.github.libretube.helpers.ImageHelper
import com.github.libretube.helpers.NavigationHelper
import com.github.libretube.helpers.PreferenceHelper
import com.github.libretube.ui.adapters.callbacks.DiffUtilItemCallback
import com.github.libretube.ui.base.BaseActivity
import com.github.libretube.ui.extensions.setFormattedDuration

View File

@ -214,7 +214,7 @@ class PlaylistFragment : DynamicLayoutManagerFragment(R.layout.fragment_playlist
NavigationHelper.navigateVideo(
requireContext(),
sortedStreams.first().url,
playlistId,
playlistId = playlistId,
keepQueue = true
)
}

View File

@ -302,8 +302,7 @@ class SubscriptionsFragment : DynamicLayoutManagerFragment(R.layout.fragment_sub
if (streams.isEmpty()) return
PlayingQueue.clear()
PlayingQueue.add(*streams.toTypedArray())
PlayingQueue.setStreams(streams)
NavigationHelper.navigateVideo(
requireContext(),

View File

@ -107,7 +107,8 @@ object PlayingQueue {
fun getStreams() = queue.toList()
fun setStreams(streams: List<StreamItem>) = synchronized(queue) {
queue.clear()
clear()
queue.addAll(streams)
}