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

Move trailers to button

Browse source
This commit is contained in:
Damontecres 2026-01-06 19:42:10 -05:00
parent 5b3ff068de
commit 8612598d94
No known key found for this signature in database
3 changed files with 20 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

20
app/src/main/java/com/github/damontecres/wholphin/ui/detail/discover/DiscoverMovieDetails.kt
View file

@ -199,8 +199,7 @@ fun DiscoverMovieDetails(
private const val HEADER_ROW = 0 private const val HEADER_ROW = 0
private const val PEOPLE_ROW = HEADER_ROW + 1 private const val PEOPLE_ROW = HEADER_ROW + 1
private const val TRAILER_ROW = PEOPLE_ROW + 1 private const val CHAPTER_ROW = PEOPLE_ROW + 1
private const val CHAPTER_ROW = TRAILER_ROW + 1
private const val EXTRAS_ROW = CHAPTER_ROW + 1 private const val EXTRAS_ROW = CHAPTER_ROW + 1
private const val SIMILAR_ROW = EXTRAS_ROW + 1 private const val SIMILAR_ROW = EXTRAS_ROW + 1
private const val RECOMMENDED_ROW = SIMILAR_ROW + 1 private const val RECOMMENDED_ROW = SIMILAR_ROW + 1
@ -288,6 +287,8 @@ fun DiscoverMovieDetailsContent(
}, },
canRequest = userConfig.hasPermission(SeerrPermission.REQUEST), canRequest = userConfig.hasPermission(SeerrPermission.REQUEST),
canCancel = canCancel, canCancel = canCancel,
trailers = trailers,
trailerOnClick = trailerOnClick,
modifier = modifier =
Modifier Modifier
.fillMaxWidth() .fillMaxWidth()
@ -317,21 +318,6 @@ fun DiscoverMovieDetailsContent(
) )
} }
} }
if (trailers.isNotEmpty()) {
item {
TrailerRow(
trailers = trailers,
onClickTrailer = {
position = TRAILER_ROW
trailerOnClick.invoke(it)
},
modifier =
Modifier
.fillMaxWidth()
.focusRequester(focusRequesters[TRAILER_ROW]),
)
}
}
if (similar.isNotEmpty()) { if (similar.isNotEmpty()) {
item { item {

20
app/src/main/java/com/github/damontecres/wholphin/ui/detail/discover/DiscoverSeriesDetails.kt
View file

@ -185,8 +185,7 @@ fun DiscoverSeriesDetails(
private const val HEADER_ROW = 0 private const val HEADER_ROW = 0
private const val SEASONS_ROW = HEADER_ROW + 1 private const val SEASONS_ROW = HEADER_ROW + 1
private const val PEOPLE_ROW = SEASONS_ROW + 1 private const val PEOPLE_ROW = SEASONS_ROW + 1
private const val TRAILER_ROW = PEOPLE_ROW + 1 private const val EXTRAS_ROW = PEOPLE_ROW + 1
private const val EXTRAS_ROW = TRAILER_ROW + 1
private const val SIMILAR_ROW = EXTRAS_ROW + 1 private const val SIMILAR_ROW = EXTRAS_ROW + 1
private const val RECOMMENDED_ROW = SIMILAR_ROW + 1 private const val RECOMMENDED_ROW = SIMILAR_ROW + 1
@ -283,6 +282,8 @@ fun DiscoverSeriesDetailsContent(
}, },
canRequest = userConfig.hasPermission(SeerrPermission.REQUEST), canRequest = userConfig.hasPermission(SeerrPermission.REQUEST),
canCancel = canCancel, canCancel = canCancel,
trailers = trailers,
trailerOnClick = trailerOnClick,
modifier = modifier =
Modifier Modifier
.fillMaxWidth() .fillMaxWidth()
@ -340,21 +341,6 @@ fun DiscoverSeriesDetailsContent(
) )
} }
} }
if (trailers.isNotEmpty()) {
item {
TrailerRow(
trailers = trailers,
onClickTrailer = {
position = TRAILER_ROW
trailerOnClick.invoke(it)
},
modifier =
Modifier
.fillMaxWidth()
.focusRequester(focusRequesters[TRAILER_ROW]),
)
}
}
if (similar.isNotEmpty()) { if (similar.isNotEmpty()) {
item { item {
ItemRow( ItemRow(

14
app/src/main/java/com/github/damontecres/wholphin/ui/detail/discover/ExpandableDiscoverButtons.kt
View file

@ -18,8 +18,10 @@ import androidx.compose.ui.focus.onFocusChanged
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import com.github.damontecres.wholphin.R import com.github.damontecres.wholphin.R
import com.github.damontecres.wholphin.data.model.SeerrAvailability import com.github.damontecres.wholphin.data.model.SeerrAvailability
import com.github.damontecres.wholphin.data.model.Trailer
import com.github.damontecres.wholphin.ui.components.ExpandableFaButton import com.github.damontecres.wholphin.ui.components.ExpandableFaButton
import com.github.damontecres.wholphin.ui.components.ExpandablePlayButton import com.github.damontecres.wholphin.ui.components.ExpandablePlayButton
import com.github.damontecres.wholphin.ui.components.TrailerButton
import com.github.damontecres.wholphin.ui.tryRequestFocus import com.github.damontecres.wholphin.ui.tryRequestFocus
import kotlin.time.Duration import kotlin.time.Duration
@ -28,10 +30,12 @@ fun ExpandableDiscoverButtons(
canRequest: Boolean, canRequest: Boolean,
canCancel: Boolean, canCancel: Boolean,
availability: SeerrAvailability, availability: SeerrAvailability,
trailers: List<Trailer>?,
requestOnClick: () -> Unit, requestOnClick: () -> Unit,
cancelOnClick: () -> Unit, cancelOnClick: () -> Unit,
goToOnClick: () -> Unit, goToOnClick: () -> Unit,
moreOnClick: () -> Unit, moreOnClick: () -> Unit,
trailerOnClick: (Trailer) -> Unit,
buttonOnFocusChanged: (FocusState) -> Unit, buttonOnFocusChanged: (FocusState) -> Unit,
modifier: Modifier = Modifier, modifier: Modifier = Modifier,
) { ) {
@ -125,6 +129,16 @@ fun ExpandableDiscoverButtons(
} }
} }
if (trailers != null) {
item("trailers") {
TrailerButton(
trailers = trailers,
trailerOnClick = trailerOnClick,
modifier = Modifier.onFocusChanged(buttonOnFocusChanged),
)
}
}
// More button // More button
item("more") { item("more") {
ExpandablePlayButton( ExpandablePlayButton(