mirror of
https://github.com/tapframe/NuvioStreaming.git
synced 2026-05-18 16:01:44 +00:00
Merge branch 'cmp-rewrite' into desktop
This commit is contained in:
commit
76c49616a3
1 changed files with 0 additions and 14 deletions
|
|
@ -357,8 +357,6 @@ private fun ContinueWatchingWideCard(
|
||||||
.padding(layout.wideContentPadding),
|
.padding(layout.wideContentPadding),
|
||||||
verticalArrangement = Arrangement.SpaceBetween,
|
verticalArrangement = Arrangement.SpaceBetween,
|
||||||
) {
|
) {
|
||||||
val isEpisodeCard = item.seasonNumber != null && item.episodeNumber != null
|
|
||||||
val hasEpisodeTitle = !item.episodeTitle.isNullOrBlank()
|
|
||||||
val wideMetaLine = localizedContinueWatchingSubtitle(item)
|
val wideMetaLine = localizedContinueWatchingSubtitle(item)
|
||||||
Column(verticalArrangement = Arrangement.spacedBy(6.dp)) {
|
Column(verticalArrangement = Arrangement.spacedBy(6.dp)) {
|
||||||
Row(
|
Row(
|
||||||
|
|
@ -391,18 +389,6 @@ private fun ContinueWatchingWideCard(
|
||||||
maxLines = 1,
|
maxLines = 1,
|
||||||
overflow = TextOverflow.Ellipsis,
|
overflow = TextOverflow.Ellipsis,
|
||||||
)
|
)
|
||||||
if (hasEpisodeTitle) {
|
|
||||||
Text(
|
|
||||||
text = item.episodeTitle.orEmpty(),
|
|
||||||
style = MaterialTheme.typography.bodySmall.copy(
|
|
||||||
fontSize = layout.wideMetaSize,
|
|
||||||
fontWeight = FontWeight.Medium,
|
|
||||||
),
|
|
||||||
color = MaterialTheme.colorScheme.onSurfaceVariant,
|
|
||||||
maxLines = 1,
|
|
||||||
overflow = TextOverflow.Ellipsis,
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (item.progressFraction > 0f) {
|
if (item.progressFraction > 0f) {
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue