justinzeus/Wholphin
1
0
Fork 0
mirror of https://github.com/JustinZeus/Wholphin.git synced 2026-07-08 15:50:16 +02:00
Code Issues Projects Packages Wiki Activity Actions

Merge branch 'main' into fea/live-tv

Browse source
This commit is contained in:
Damontecres 2025-10-22 18:12:24 -04:00
commit a0e184ab28
No known key found for this signature in database
4 changed files with 27 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/com/github/damontecres/wholphin/ui/components/Dialogs.kt
View file

@ -87,6 +87,7 @@ data class DialogItem(
constructor( constructor(
@StringRes text: Int, @StringRes text: Int,
@StringRes iconStringRes: Int, @StringRes iconStringRes: Int,
iconColor: Color = Color.Unspecified,
onClick: () -> Unit, onClick: () -> Unit,
) : this( ) : this(
headlineContent = { headlineContent = {
@ -98,6 +99,7 @@ data class DialogItem(
Text( Text(
text = stringResource(id = iconStringRes), text = stringResource(id = iconStringRes),
fontFamily = FontAwesome, fontFamily = FontAwesome,
color = iconColor,
) )
}, },
onClick = onClick, onClick = onClick,

11
app/src/main/java/com/github/damontecres/wholphin/ui/detail/DetailUtils.kt
View file

@ -35,8 +35,10 @@ fun buildMoreDialogItems(
series: BaseItem?, series: BaseItem?,
sourceId: UUID?, sourceId: UUID?,
watched: Boolean, watched: Boolean,
favorite: Boolean,
navigateTo: (Destination) -> Unit, navigateTo: (Destination) -> Unit,
onClickWatch: (Boolean) -> Unit, onClickWatch: (Boolean) -> Unit,
onClickFavorite: (Boolean) -> Unit,
onChooseVersion: () -> Unit, onChooseVersion: () -> Unit,
onChooseTracks: (MediaStreamType) -> Unit, onChooseTracks: (MediaStreamType) -> Unit,
): List<DialogItem> = ): List<DialogItem> =
@ -64,6 +66,15 @@ fun buildMoreDialogItems(
onClickWatch.invoke(!watched) onClickWatch.invoke(!watched)
}, },
) )
add(
DialogItem(
text = if (favorite) R.string.remove_favorite else R.string.add_favorite,
iconStringRes = R.string.fa_heart,
iconColor = if (favorite) Color.Red else Color.Unspecified,
) {
onClickFavorite.invoke(!favorite)
},
)
series?.let { series?.let {
add( add(
DialogItem( DialogItem(

2
app/src/main/java/com/github/damontecres/wholphin/ui/detail/movie/MovieDetails.kt
View file

@ -313,10 +313,12 @@ fun MovieDetails(
buildMoreDialogItems( buildMoreDialogItems(
item = movie, item = movie,
watched = movie.data.userData?.played ?: false, watched = movie.data.userData?.played ?: false,
favorite = movie.data.userData?.isFavorite ?: false,
series = null, series = null,
sourceId = chosenStreams?.sourceId, sourceId = chosenStreams?.sourceId,
navigateTo = viewModel.navigationManager::navigateTo, navigateTo = viewModel.navigationManager::navigateTo,
onClickWatch = viewModel::setWatched, onClickWatch = viewModel::setWatched,
onClickFavorite = viewModel::setFavorite,
onChooseVersion = { onChooseVersion = {
chooseVersion = chooseVersion =
chooseVersionParams(movie.data.mediaSources!!) { idx -> chooseVersionParams(movie.data.mediaSources!!) { idx ->

12
app/src/main/java/com/github/damontecres/wholphin/ui/detail/series/SeriesOverview.kt
View file

@ -160,6 +160,7 @@ fun SeriesOverview(
buildMoreDialogItems( buildMoreDialogItems(
ep, ep,
watched = ep.data.userData?.played ?: false, watched = ep.data.userData?.played ?: false,
favorite = ep.data.userData?.isFavorite ?: false,
series = series, series = series,
sourceId = chosenStreams?.sourceId, sourceId = chosenStreams?.sourceId,
navigateTo = viewModel::navigateTo, navigateTo = viewModel::navigateTo,
@ -174,6 +175,17 @@ fun SeriesOverview(
) )
} }
}, },
onClickFavorite = { favorite ->
episodeList
?.getOrNull(position.episodeRowIndex)
?.let {
viewModel.setFavorite(
it.id,
favorite,
position.episodeRowIndex,
)
}
},
onChooseVersion = { onChooseVersion = {
chooseVersion = chooseVersion =
chooseVersionParams(ep.data.mediaSources!!) { idx -> chooseVersionParams(ep.data.mediaSources!!) { idx ->