Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ import com.github.damontecres.wholphin.ui.enableMarquee
import com.github.damontecres.wholphin.ui.formatDuration
import com.github.damontecres.wholphin.ui.ifElse
import com.github.damontecres.wholphin.ui.launchIO
import com.github.damontecres.wholphin.ui.main.HomePageHeader
import com.github.damontecres.wholphin.ui.rememberInt
import com.github.damontecres.wholphin.ui.roundMinutes
import com.github.damontecres.wholphin.ui.tryRequestFocus
Expand Down Expand Up @@ -128,17 +129,28 @@ fun CollectionFolderViewScope.CollectionFolderList(
else -> 48.dp
},
)
if (viewOptions.cinematic) {
// Large details for the focused item, shown over the backdrop
HomePageHeader(
item = focusedItem,
showLogo = true,
modifier =
Modifier
.padding(start = HeaderUtils.startPadding, top = topPadding)
.height(HeaderUtils.height),
)
}
Row(
horizontalArrangement = Arrangement.spacedBy(8.dp),
modifier =
Modifier
.padding(top = topPadding, bottom = 16.dp)
.padding(top = if (viewOptions.cinematic) 0.dp else topPadding, bottom = 16.dp)
.onFocusChanged {
contentHashFocus = it.hasFocus
},
) {
AnimatedVisibility(
visible = viewOptions.showDetails,
visible = viewOptions.showDetails && !viewOptions.cinematic,
enter = fadeIn() + expandHorizontally(expandFrom = Alignment.Start),
exit = fadeOut() + shrinkHorizontally(shrinkTowards = Alignment.Start),
) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,7 @@ data class ViewOptions(
val showTitles: Boolean = true,
val type: ViewOptionsType = ViewOptionsType.GRID,
val extras: ViewOptionsExtras = ViewOptionsExtras.None,
val cinematic: Boolean = false,
) {
companion object {
val ViewOptionsColumns =
Expand Down Expand Up @@ -213,6 +214,15 @@ data class ViewOptions(
getter = { it.showBackdrop },
setter = { vo, value -> vo.copy(showBackdrop = value) },
)
val ViewOptionsCinematic =
AppSwitchPreference<ViewOptions>(
title = R.string.cinematic_view,
defaultValue = false,
getter = { it.cinematic },
// Cinematic uses the backdrop, so turn it on too
setter = { vo, value -> vo.copy(cinematic = value, showBackdrop = value || vo.showBackdrop) },
summary = R.string.cinematic_view_summary,
)
val ViewOptionsShowTitles =
AppSwitchPreference<ViewOptions>(
title = R.string.show_titles,
Expand Down Expand Up @@ -311,6 +321,7 @@ data class ViewOptions(
private val LIST_OPTIONS =
listOf(
ViewOptionsTypePref,
ViewOptionsCinematic,
ViewOptionsDetailHeader,
ViewOptionsBackdrop,
ViewOptionsSpacing,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,13 @@ import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.aspectRatio
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.wrapContentSize
import androidx.compose.foundation.layout.wrapContentWidth
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.runtime.Composable
import androidx.compose.runtime.collectAsState
import androidx.compose.runtime.getValue
Expand All @@ -19,7 +22,9 @@ import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
import androidx.compose.ui.focus.FocusDirection
import androidx.compose.ui.layout.ContentScale
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.platform.LocalFocusManager
import androidx.compose.ui.platform.LocalResources
Expand All @@ -33,6 +38,7 @@ import androidx.lifecycle.viewModelScope
import androidx.tv.material3.LocalTextStyle
import androidx.tv.material3.MaterialTheme
import androidx.tv.material3.Text
import coil3.compose.AsyncImage
import com.github.damontecres.wholphin.R
import com.github.damontecres.wholphin.data.ServerRepository
import com.github.damontecres.wholphin.data.model.BaseItem
Expand All @@ -41,7 +47,9 @@ import com.github.damontecres.wholphin.preferences.UserPreferences
import com.github.damontecres.wholphin.services.MediaManagementService
import com.github.damontecres.wholphin.services.MusicService
import com.github.damontecres.wholphin.services.NavigationManager
import com.github.damontecres.wholphin.ui.AspectRatio
import com.github.damontecres.wholphin.ui.FontAwesome
import com.github.damontecres.wholphin.ui.LocalImageUrlService
import com.github.damontecres.wholphin.ui.cards.FavoriteIndicator
import com.github.damontecres.wholphin.ui.cards.WatchedIcon
import com.github.damontecres.wholphin.ui.collectLatestIn
Expand Down Expand Up @@ -98,6 +106,7 @@ import org.jellyfin.sdk.api.client.ApiClient
import org.jellyfin.sdk.api.client.exception.InvalidStatusException
import org.jellyfin.sdk.api.client.extensions.playlistApi
import org.jellyfin.sdk.model.api.BaseItemKind
import org.jellyfin.sdk.model.api.ImageType
import org.jellyfin.sdk.model.api.ItemSortBy
import org.jellyfin.sdk.model.api.MediaType
import org.jellyfin.sdk.model.api.SortOrder
Expand Down Expand Up @@ -650,6 +659,9 @@ fun CollectionFolderViewScope.PlaylistItem(
text = indexText,
)
}
if (viewOptions.cinematic && !dense) {
PlaylistItemThumbnail(item)
}
if (item?.type == BaseItemKind.AUDIO) {
MusicQueueMarker(
isPlaying = isPlaying,
Expand Down Expand Up @@ -703,6 +715,32 @@ fun CollectionFolderViewScope.PlaylistItem(
}
}

/**
* Small image shown at the start of a playlist row in cinematic mode
*/
@Composable
private fun PlaylistItemThumbnail(
item: BaseItem?,
modifier: Modifier = Modifier,
) {
val isAudio = item?.type == BaseItemKind.AUDIO
val imageUrlService = LocalImageUrlService.current
val imageUrl =
remember(item) {
imageUrlService.getItemImageUrl(item, if (isAudio) ImageType.PRIMARY else ImageType.THUMB)
}
AsyncImage(
model = imageUrl,
contentDescription = null,
contentScale = ContentScale.Crop,
modifier =
modifier
.height(48.dp)
.aspectRatio(if (isAudio) AspectRatio.SQUARE.ratio else AspectRatio.WIDE.ratio)
.clip(RoundedCornerShape(4.dp)),
)
}

@Composable
fun ConfirmMediaTypeDialog(
onConfirm: (MediaType) -> Unit,
Expand Down
2 changes: 2 additions & 0 deletions app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -432,6 +432,8 @@
<string name="spacing">Spacing</string>
<string name="aspect_ratio">Aspect Ratio</string>
<string name="show_details">Show details</string>
<string name="cinematic_view">Cinematic</string>
<string name="cinematic_view_summary">Large artwork and details for the focused item above the list</string>
<string name="image_type">Image type</string>
<string name="cast_and_crew"><![CDATA[Cast & Crew]]></string>
<string name="guest_stars">Guest stars</string>
Expand Down