neoris/NewPipe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Implement "play from here" for feed fragment

Browse Source
This commit is contained in:
Stypox 2025-08-28 19:41:42 +02:00
parent 67778718e0
commit 91d5e4882c
No known key found for this signature in database
GPG Key ID: 4BDF1B40A49FDD23
2 changed files with 29 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
app/src/main/java/org/schabi/newpipe/local/feed/FeedFragment.kt
View File

@ -73,6 +73,7 @@ import org.schabi.newpipe.ktx.slideUp
import org.schabi.newpipe.local.feed.item.StreamItem
import org.schabi.newpipe.local.feed.service.FeedLoadService
import org.schabi.newpipe.local.subscription.SubscriptionManager
import org.schabi.newpipe.player.playqueue.SinglePlayQueue
import org.schabi.newpipe.ui.components.menu.LongPressAction
import org.schabi.newpipe.ui.components.menu.LongPressable
import org.schabi.newpipe.ui.components.menu.openLongPressMenuInActivity
@ -384,7 +385,7 @@ class FeedFragment : BaseStateFragment<FeedState>() {
private val listenerStreamItem = object : OnItemClickListener, OnItemLongClickListener {
override fun onItemClick(item: Item<*>, view: View) {
if (item is StreamItem && !isRefreshing) {
val stream = item.streamWithState.stream
val stream = item.stream
NavigationHelper.openVideoDetailFragment(
requireContext(),
fm,
@ -401,9 +402,31 @@ class FeedFragment : BaseStateFragment<FeedState>() {
if (item is StreamItem && !isRefreshing) {
openLongPressMenuInActivity(
requireActivity(),
LongPressable.fromStreamEntity(item.streamWithState.stream),
// TODO queueFromHere: allow playing the whole feed starting from one stream
LongPressAction.fromStreamEntity(item.streamWithState.stream, null),
LongPressable.fromStreamEntity(item.stream),
LongPressAction.fromStreamEntity(
item = item.stream,
queueFromHere = {
val items = (viewModel.stateLiveData.value as? FeedState.LoadedState)
?.items
if (items != null) {
val index = items.indexOf(item)
if (index >= 0) {
return@fromStreamEntity SinglePlayQueue(
items.map { it.stream.toStreamInfoItem() },
index
)
}
}
// when long-pressing on an item the state should be LoadedState and the
// item list should contain the long-pressed item, so the following
// statement should be unreachable, but let's return a SinglePlayQueue
// just in case
Log.w(TAG, "Could not get full list of items on long press")
return@fromStreamEntity SinglePlayQueue(item.stream.toStreamInfoItem())
},
),
)
return true
}
@ -575,7 +598,7 @@ class FeedFragment : BaseStateFragment<FeedState>() {
}
if (doCheck) {
// If the uploadDate is null or true we should highlight the item
if (item.streamWithState.stream.uploadDate?.isAfter(updateTime) != false) {
if (item.stream.uploadDate?.isAfter(updateTime) != false) {
highlightCount++
typeface = Typeface.DEFAULT_BOLD

2
app/src/main/java/org/schabi/newpipe/local/feed/item/StreamItem.kt
View File

@ -30,7 +30,7 @@ data class StreamItem(
const val UPDATE_RELATIVE_TIME = 1
}
private val stream: StreamEntity = streamWithState.stream
val stream: StreamEntity = streamWithState.stream
private val stateProgressTime: Long? = streamWithState.stateProgressMillis
/**