mirrors/NewPipe
1
0
Fork 0
mirror of https://github.com/TeamNewPipe/NewPipe synced 2025-01-24 07:56:57 +00:00
Code Issues Releases Wiki Activity

Show dropdown menu on long click, make some adjustments

Browse Source
This commit is contained in:
Isira Seneviratne 2024-07-09 05:34:28 +05:30
parent 5e33b69316
commit bbdff4b093
6 changed files with 206 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
app/src/main/java/org/schabi/newpipe/compose/stream/StreamCardItem.kt
View File

@ -1,8 +1,10 @@
package org.schabi.newpipe.compose.stream
import android.content.res.Configuration
import androidx.compose.foundation.clickable
import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.combinedClickable
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.fillMaxWidth
@ -20,16 +22,27 @@ import androidx.compose.ui.unit.dp
import org.schabi.newpipe.compose.theme.AppTheme
import org.schabi.newpipe.extractor.stream.StreamInfoItem
@OptIn(ExperimentalFoundationApi::class)
@Composable
fun StreamCardItem(stream: StreamInfoItem, onClick: (StreamInfoItem) -> Unit) {
fun StreamCardItem(
stream: StreamInfoItem,
isSelected: Boolean = false,
onClick: (StreamInfoItem) -> Unit = {},
onLongClick: (StreamInfoItem) -> Unit = {},
onDismissPopup: () -> Unit = {}
) {
Box {
Column(
modifier = Modifier
.clickable(onClick = { onClick(stream) })
.combinedClickable(
onLongClick = { onLongClick(stream) },
onClick = { onClick(stream) }
)
.padding(top = 12.dp, start = 2.dp, end = 2.dp)
) {
StreamThumbnail(
stream = stream,
modifier = Modifier.fillMaxWidth(),
stream = stream,
contentScale = ContentScale.FillWidth
)
@ -54,6 +67,11 @@ fun StreamCardItem(stream: StreamInfoItem, onClick: (StreamInfoItem) -> Unit) {
}
}
}
if (isSelected) {
StreamMenu(onDismissPopup)
}
}
}
@Preview(name = "Light mode", uiMode = Configuration.UI_MODE_NIGHT_NO)
@ -64,7 +82,7 @@ private fun StreamCardItemPreview(
) {
AppTheme {
Surface(color = MaterialTheme.colorScheme.background) {
StreamCardItem(stream) {}
StreamCardItem(stream)
}
}
}

31
app/src/main/java/org/schabi/newpipe/compose/stream/StreamGridItem.kt
View File

@ -1,7 +1,9 @@
package org.schabi.newpipe.compose.stream
import android.content.res.Configuration
import androidx.compose.foundation.clickable
import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.combinedClickable
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
@ -17,14 +19,28 @@ import androidx.compose.ui.unit.dp
import org.schabi.newpipe.compose.theme.AppTheme
import org.schabi.newpipe.extractor.stream.StreamInfoItem
@OptIn(ExperimentalFoundationApi::class)
@Composable
fun StreamGridItem(stream: StreamInfoItem, onClick: (StreamInfoItem) -> Unit) {
fun StreamGridItem(
stream: StreamInfoItem,
isSelected: Boolean = false,
onClick: (StreamInfoItem) -> Unit = {},
onLongClick: (StreamInfoItem) -> Unit = {},
onDismissPopup: () -> Unit = {}
) {
Box {
Column(
modifier = Modifier
.clickable(onClick = { onClick(stream) })
.combinedClickable(
onLongClick = { onLongClick(stream) },
onClick = { onClick(stream) }
)
.padding(12.dp)
) {
StreamThumbnail(stream = stream, modifier = Modifier.size(width = 246.dp, height = 138.dp))
StreamThumbnail(
modifier = Modifier.size(width = 246.dp, height = 138.dp),
stream = stream
)
Text(
text = stream.name,
@ -40,6 +56,11 @@ fun StreamGridItem(stream: StreamInfoItem, onClick: (StreamInfoItem) -> Unit) {
style = MaterialTheme.typography.bodySmall
)
}
if (isSelected) {
StreamMenu(onDismissPopup)
}
}
}
@Preview(name = "Light mode", uiMode = Configuration.UI_MODE_NIGHT_NO)
@ -50,7 +71,7 @@ private fun StreamGridItemPreview(
) {
AppTheme {
Surface(color = MaterialTheme.colorScheme.background) {
StreamGridItem(stream, onClick = {})
StreamGridItem(stream)
}
}
}

30
app/src/main/java/org/schabi/newpipe/compose/stream/StreamList.kt
View File

@ -8,7 +8,10 @@ import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
import androidx.compose.foundation.lazy.grid.rememberLazyGridState
import androidx.compose.foundation.lazy.rememberLazyListState
import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.unit.dp
import androidx.fragment.app.FragmentActivity
@ -36,7 +39,20 @@ fun StreamList(
)
}
}
// TODO: Handle long-click by showing a dropdown menu instead of a dialog.
// Handle long clicks
// TODO: Adjust the menu display depending on where it was triggered
var selectedStream by remember { mutableStateOf<StreamInfoItem?>(null) }
val onLongClick = remember {
{ stream: StreamInfoItem ->
selectedStream = stream
}
}
val onDismissPopup = remember {
{
selectedStream = null
}
}
if (mode == ItemViewMode.GRID) {
val gridState = rememberLazyGridState()
@ -46,7 +62,11 @@ fun StreamList(
gridHeader()
items(streams.itemCount) {
StreamGridItem(streams[it]!!, onClick)
val stream = streams[it]!!
StreamGridItem(
stream, selectedStream == stream, onClick, onLongClick,
onDismissPopup
)
}
}
}
@ -60,10 +80,12 @@ fun StreamList(
items(streams.itemCount) {
val stream = streams[it]!!
val isSelected = selectedStream == stream
if (mode == ItemViewMode.CARD) {
StreamCardItem(stream, onClick)
StreamCardItem(stream, isSelected, onClick, onLongClick, onDismissPopup)
} else {
StreamListItem(stream, onClick)
StreamListItem(stream, isSelected, onClick, onLongClick, onDismissPopup)
}
}
}

31
app/src/main/java/org/schabi/newpipe/compose/stream/StreamListItem.kt
View File

@ -1,8 +1,10 @@
package org.schabi.newpipe.compose.stream
import android.content.res.Configuration
import androidx.compose.foundation.clickable
import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.combinedClickable
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.fillMaxWidth
@ -21,17 +23,31 @@ import androidx.compose.ui.unit.dp
import org.schabi.newpipe.compose.theme.AppTheme
import org.schabi.newpipe.extractor.stream.StreamInfoItem
@OptIn(ExperimentalFoundationApi::class)
@Composable
fun StreamListItem(stream: StreamInfoItem, onClick: (StreamInfoItem) -> Unit) {
fun StreamListItem(
stream: StreamInfoItem,
isSelected: Boolean = false,
onClick: (StreamInfoItem) -> Unit = {},
onLongClick: (StreamInfoItem) -> Unit = {},
onDismissPopup: () -> Unit = {}
) {
Box {
Row(
modifier = Modifier
.clickable(onClick = { onClick(stream) })
.combinedClickable(
onLongClick = { onLongClick(stream) },
onClick = { onClick(stream) }
)
.fillMaxWidth()
.padding(12.dp),
horizontalArrangement = Arrangement.spacedBy(4.dp),
verticalAlignment = Alignment.CenterVertically
) {
StreamThumbnail(stream = stream, modifier = Modifier.size(width = 98.dp, height = 55.dp))
StreamThumbnail(
modifier = Modifier.size(width = 98.dp, height = 55.dp),
stream = stream
)
Column {
Text(
@ -49,6 +65,11 @@ fun StreamListItem(stream: StreamInfoItem, onClick: (StreamInfoItem) -> Unit) {
)
}
}
if (isSelected) {
StreamMenu(onDismissPopup)
}
}
}
@Preview(name = "Light mode", uiMode = Configuration.UI_MODE_NIGHT_NO)
@ -59,7 +80,7 @@ private fun StreamListItemPreview(
) {
AppTheme {
Surface(color = MaterialTheme.colorScheme.background) {
StreamListItem(stream, onClick = {})
StreamListItem(stream)
}
}
}

46
app/src/main/java/org/schabi/newpipe/compose/stream/StreamMenu.kt Normal file
View File

@ -0,0 +1,46 @@
package org.schabi.newpipe.compose.stream
import androidx.compose.material3.DropdownMenu
import androidx.compose.material3.DropdownMenuItem
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.res.stringResource
import org.schabi.newpipe.R
@Composable
fun StreamMenu(onDismissRequest: () -> Unit) {
DropdownMenu(expanded = true, onDismissRequest = onDismissRequest) {
DropdownMenuItem(
text = { Text(text = stringResource(R.string.start_here_on_background)) },
onClick = onDismissRequest
)
DropdownMenuItem(
text = { Text(text = stringResource(R.string.start_here_on_popup)) },
onClick = onDismissRequest
)
DropdownMenuItem(
text = { Text(text = stringResource(R.string.download)) },
onClick = onDismissRequest
)
DropdownMenuItem(
text = { Text(text = stringResource(R.string.add_to_playlist)) },
onClick = onDismissRequest
)
DropdownMenuItem(
text = { Text(text = stringResource(R.string.share)) },
onClick = onDismissRequest
)
DropdownMenuItem(
text = { Text(text = stringResource(R.string.open_in_browser)) },
onClick = onDismissRequest
)
DropdownMenuItem(
text = { Text(text = stringResource(R.string.mark_as_watched)) },
onClick = onDismissRequest
)
DropdownMenuItem(
text = { Text(text = stringResource(R.string.show_channel_details)) },
onClick = onDismissRequest
)
}
}

4
app/src/main/java/org/schabi/newpipe/compose/stream/StreamThumbnail.kt
View File

@ -20,9 +20,9 @@ import org.schabi.newpipe.util.image.ImageStrategy
@Composable
fun StreamThumbnail(
stream: StreamInfoItem,
modifier: Modifier = Modifier,
contentScale: ContentScale = ContentScale.Fit,
stream: StreamInfoItem,
contentScale: ContentScale = ContentScale.Fit
) {
Box(modifier = modifier, contentAlignment = Alignment.BottomEnd) {
AsyncImage(