From 8612598d948481d56b055d8abb95af2e6c5779cf Mon Sep 17 00:00:00 2001 From: Damontecres Date: Tue, 6 Jan 2026 19:42:10 -0500 Subject: [PATCH] Move trailers to button --- .../detail/discover/DiscoverMovieDetails.kt | 20 +++---------------- .../detail/discover/DiscoverSeriesDetails.kt | 20 +++---------------- .../discover/ExpandableDiscoverButtons.kt | 14 +++++++++++++ 3 files changed, 20 insertions(+), 34 deletions(-) diff --git a/app/src/main/java/com/github/damontecres/wholphin/ui/detail/discover/DiscoverMovieDetails.kt b/app/src/main/java/com/github/damontecres/wholphin/ui/detail/discover/DiscoverMovieDetails.kt index 26963141..faa92c46 100644 --- a/app/src/main/java/com/github/damontecres/wholphin/ui/detail/discover/DiscoverMovieDetails.kt +++ b/app/src/main/java/com/github/damontecres/wholphin/ui/detail/discover/DiscoverMovieDetails.kt @@ -199,8 +199,7 @@ fun DiscoverMovieDetails( private const val HEADER_ROW = 0 private const val PEOPLE_ROW = HEADER_ROW + 1 -private const val TRAILER_ROW = PEOPLE_ROW + 1 -private const val CHAPTER_ROW = TRAILER_ROW + 1 +private const val CHAPTER_ROW = PEOPLE_ROW + 1 private const val EXTRAS_ROW = CHAPTER_ROW + 1 private const val SIMILAR_ROW = EXTRAS_ROW + 1 private const val RECOMMENDED_ROW = SIMILAR_ROW + 1 @@ -288,6 +287,8 @@ fun DiscoverMovieDetailsContent( }, canRequest = userConfig.hasPermission(SeerrPermission.REQUEST), canCancel = canCancel, + trailers = trailers, + trailerOnClick = trailerOnClick, modifier = Modifier .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()) { item { diff --git a/app/src/main/java/com/github/damontecres/wholphin/ui/detail/discover/DiscoverSeriesDetails.kt b/app/src/main/java/com/github/damontecres/wholphin/ui/detail/discover/DiscoverSeriesDetails.kt index 5aaf882d..5a8d5610 100644 --- a/app/src/main/java/com/github/damontecres/wholphin/ui/detail/discover/DiscoverSeriesDetails.kt +++ b/app/src/main/java/com/github/damontecres/wholphin/ui/detail/discover/DiscoverSeriesDetails.kt @@ -185,8 +185,7 @@ fun DiscoverSeriesDetails( private const val HEADER_ROW = 0 private const val SEASONS_ROW = HEADER_ROW + 1 private const val PEOPLE_ROW = SEASONS_ROW + 1 -private const val TRAILER_ROW = PEOPLE_ROW + 1 -private const val EXTRAS_ROW = TRAILER_ROW + 1 +private const val EXTRAS_ROW = PEOPLE_ROW + 1 private const val SIMILAR_ROW = EXTRAS_ROW + 1 private const val RECOMMENDED_ROW = SIMILAR_ROW + 1 @@ -283,6 +282,8 @@ fun DiscoverSeriesDetailsContent( }, canRequest = userConfig.hasPermission(SeerrPermission.REQUEST), canCancel = canCancel, + trailers = trailers, + trailerOnClick = trailerOnClick, modifier = Modifier .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()) { item { ItemRow( diff --git a/app/src/main/java/com/github/damontecres/wholphin/ui/detail/discover/ExpandableDiscoverButtons.kt b/app/src/main/java/com/github/damontecres/wholphin/ui/detail/discover/ExpandableDiscoverButtons.kt index 4ac175c1..725acbb1 100644 --- a/app/src/main/java/com/github/damontecres/wholphin/ui/detail/discover/ExpandableDiscoverButtons.kt +++ b/app/src/main/java/com/github/damontecres/wholphin/ui/detail/discover/ExpandableDiscoverButtons.kt @@ -18,8 +18,10 @@ import androidx.compose.ui.focus.onFocusChanged import androidx.compose.ui.unit.dp import com.github.damontecres.wholphin.R 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.ExpandablePlayButton +import com.github.damontecres.wholphin.ui.components.TrailerButton import com.github.damontecres.wholphin.ui.tryRequestFocus import kotlin.time.Duration @@ -28,10 +30,12 @@ fun ExpandableDiscoverButtons( canRequest: Boolean, canCancel: Boolean, availability: SeerrAvailability, + trailers: List?, requestOnClick: () -> Unit, cancelOnClick: () -> Unit, goToOnClick: () -> Unit, moreOnClick: () -> Unit, + trailerOnClick: (Trailer) -> Unit, buttonOnFocusChanged: (FocusState) -> Unit, 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 item("more") { ExpandablePlayButton(