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

Distinguish between isDraggable and isCaption

Browse Source
This commit is contained in:
Stypox 2025-12-30 18:48:34 +01:00
parent f2a1a638db
commit 35401e7ab4
No known key found for this signature in database
GPG Key ID: 4BDF1B40A49FDD23
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/src/main/java/org/schabi/newpipe/ui/components/menu/LongPressMenuEditor.kt
View File

@ -204,7 +204,7 @@ fun LongPressMenuEditor(modifier: Modifier = Modifier) {
} else {
var i = rawItem.index
// make sure it is not possible to move items in between a *Caption and a HeaderBox
if (!items[i].isDraggable) i += 1
if (items[i].isCaption) i += 1
if (i < items.size && items[i] == ItemInList.HeaderBox) i += 1
if (rawItem.index in (prevDragMarkerIndex + 1)..<i) i -= 1
i
@ -467,18 +467,22 @@ fun autoScrollSpeedFromTouchPos(
)
}
sealed class ItemInList(val isDraggable: Boolean, open val columnSpan: Int? = 1) {
sealed class ItemInList(
val isDraggable: Boolean = false,
val isCaption: Boolean = false,
open val columnSpan: Int? = 1,
) {
// decoration items (i.e. text subheaders)
object EnabledCaption : ItemInList(isDraggable = false, columnSpan = null /* i.e. all line */)
object HiddenCaption : ItemInList(isDraggable = false, columnSpan = null /* i.e. all line */)
object EnabledCaption : ItemInList(isCaption = true, columnSpan = null /* i.e. all line */)
object HiddenCaption : ItemInList(isCaption = true, columnSpan = null /* i.e. all line */)
// actual draggable actions (+ a header)
object HeaderBox : ItemInList(isDraggable = true, columnSpan = 2)
data class Action(val type: LongPressAction.Type) : ItemInList(isDraggable = true)
// markers
object NoneMarker : ItemInList(isDraggable = false)
data class DragMarker(override val columnSpan: Int?) : ItemInList(isDraggable = false)
object NoneMarker : ItemInList()
data class DragMarker(override val columnSpan: Int?) : ItemInList()
fun stableUniqueKey(): Int {
return when (this) {