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

Build LongPressAction lists using builder pattern

Browse Source
This commit is contained in:
Stypox 2026-02-09 13:42:56 +01:00
parent 08300951ed
commit 9c558d97e9
No known key found for this signature in database
GPG Key ID: 4BDF1B40A49FDD23
3 changed files with 291 additions and 307 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
app/src/androidTest/java/org/schabi/newpipe/ui/components/menu/LongPressMenuTest.kt
View File

@ -100,7 +100,7 @@ class LongPressMenuTest {
*/
private fun setLongPressMenu(
longPressable: LongPressable = getLongPressable(),
longPressActions: List<LongPressAction> = LongPressAction.Type.entries.map { it.buildAction { } },
longPressActions: List<LongPressAction> = LongPressAction.Type.entries.map { LongPressAction(it) { } },
onDismissRequest: () -> Unit = {},
isHeaderEnabled: Boolean = true,
actionArrangement: List<LongPressAction.Type> = LongPressAction.Type.entries
@ -171,7 +171,7 @@ class LongPressMenuTest {
setLongPressMenu(
onDismissRequest = { dismissedCount += 1 },
longPressable = getLongPressable(uploader = "UpLoAdEr"),
longPressActions = listOf(ShowChannelDetails.buildAction { pressedCount += 1 }),
longPressActions = listOf(LongPressAction(ShowChannelDetails) { pressedCount += 1 }),
actionArrangement = listOf()
)
@ -196,7 +196,7 @@ class LongPressMenuTest {
setLongPressMenu(
onDismissRequest = { dismissedCount += 1 },
longPressable = getLongPressable(uploader = null),
longPressActions = listOf(ShowChannelDetails.buildAction { pressedCount += 1 }),
longPressActions = listOf(LongPressAction(ShowChannelDetails) { pressedCount += 1 }),
actionArrangement = listOf()
)
@ -227,7 +227,7 @@ class LongPressMenuTest {
fun testShowChannelDetails4() {
setLongPressMenu(
longPressable = getLongPressable(uploader = "UpLoAdEr"),
longPressActions = listOf(ShowChannelDetails.buildAction {}),
longPressActions = listOf(LongPressAction(ShowChannelDetails) {}),
actionArrangement = listOf(ShowChannelDetails)
)
// a ShowChannelDetails button is already present among the actions,
@ -444,7 +444,7 @@ class LongPressMenuTest {
expectedShownActions: List<LongPressAction.Type>
) {
setLongPressMenu(
longPressActions = availableActions.map { it.buildAction {} },
longPressActions = availableActions.map { LongPressAction(it) {} },
// whether the header is enabled or not shouldn't influence the result, so enable it
// at random (but still deterministically)
isHeaderEnabled = ((expectedShownActions + availableActions).sumOf { it.id } % 2) == 0,
@ -603,8 +603,8 @@ class LongPressMenuTest {
fun testEnabledDisabledActions() {
setLongPressMenu(
longPressActions = listOf(
ShowDetails.buildAction(enabled = { true }) {},
Enqueue.buildAction(enabled = { false }) {}
LongPressAction(ShowDetails, enabled = { true }) {},
LongPressAction(Enqueue, enabled = { false }) {}
)
)
composeRule.onNodeWithText(ShowDetails.label)
@ -620,7 +620,7 @@ class LongPressMenuTest {
var dismissedCount = 0
setLongPressMenu(
onDismissRequest = { dismissedCount += 1 },
longPressActions = listOf(PlayWithKodi.buildAction { pressedCount += 1 })
longPressActions = listOf(LongPressAction(PlayWithKodi) { pressedCount += 1 })
)
composeRule.onNodeWithText(PlayWithKodi.label)
@ -634,7 +634,7 @@ class LongPressMenuTest {
var dismissedCount = 0
setLongPressMenu(
onDismissRequest = { dismissedCount += 1 },
longPressActions = listOf(BackgroundShuffled.buildAction { delay(500) })
longPressActions = listOf(LongPressAction(BackgroundShuffled) { delay(500) })
)
// test that the loading circle appears while the action is being performed; note that there
@ -659,7 +659,7 @@ class LongPressMenuTest {
setLongPressMenu(
onDismissRequest = { dismissedCount += 1 },
longPressActions = listOf(
BackgroundShuffled.buildAction { throw Throwable("Whatever") }
LongPressAction(BackgroundShuffled) { throw Throwable("Whatever") }
)
)

576
app/src/main/java/org/schabi/newpipe/ui/components/menu/LongPressAction.kt
View File

File diff suppressed because it is too large Load Diff

2
app/src/main/java/org/schabi/newpipe/ui/components/menu/LongPressMenu.kt
View File

@ -757,7 +757,7 @@ private fun LongPressMenuPreview(
onUploaderClick = {},
actions = LongPressAction.Type.entries
// disable Enqueue actions just to show it off
.map { t -> t.buildAction({ t != EnqueueNext }) { } },
.map { t -> LongPressAction(t, { t != EnqueueNext }) {} },
runActionAndDismiss = {}
)
}