mirror of
https://github.com/tapframe/NuvioStreaming.git
synced 2026-07-26 22:42:17 +00:00
Merge 0c27ce0abb into f1e4f88bc3
This commit is contained in:
commit
20ec0df21e
3 changed files with 8 additions and 4 deletions
|
|
@ -281,7 +281,7 @@ private fun NuvioShelfSectionHeader(
|
|||
if (showAccent) {
|
||||
Box(
|
||||
modifier = Modifier
|
||||
.padding(top = NuvioTokens.Space.s6)
|
||||
.padding(top = NuvioTokens.Space.s2)
|
||||
.width(NuvioTokens.Space.s64 - NuvioTokens.Space.s4)
|
||||
.height(NuvioTokens.Space.s4)
|
||||
.background(
|
||||
|
|
|
|||
|
|
@ -28,6 +28,7 @@ import androidx.compose.ui.unit.sp
|
|||
import androidx.lifecycle.compose.collectAsStateWithLifecycle
|
||||
import com.nuvio.app.core.ui.NuvioCardDepthSurface
|
||||
import com.nuvio.app.core.ui.NuvioShelfSection
|
||||
import com.nuvio.app.core.ui.NuvioViewAllPillSize
|
||||
import com.nuvio.app.core.ui.PosterLandscapeAspectRatio
|
||||
import com.nuvio.app.core.ui.landscapePosterWidth
|
||||
import com.nuvio.app.core.ui.nuvioCardDepth
|
||||
|
|
@ -89,6 +90,7 @@ private fun HomeCollectionRowSectionContent(
|
|||
headerHorizontalPadding = sectionPadding,
|
||||
rowContentPadding = PaddingValues(horizontal = sectionPadding),
|
||||
showHeaderAccent = !homeCatalogSettings.hideCatalogUnderline,
|
||||
viewAllPillSize = NuvioViewAllPillSize.Compact,
|
||||
key = { folder -> "collection_${collection.id}_folder_${folder.id}" },
|
||||
) { folder ->
|
||||
CollectionFolderCard(
|
||||
|
|
|
|||
|
|
@ -55,6 +55,7 @@ import com.nuvio.app.core.ui.NuvioProgressBar
|
|||
import com.nuvio.app.core.ui.nuvioCardDepth
|
||||
import com.nuvio.app.core.ui.NuvioShelfSection
|
||||
import com.nuvio.app.core.ui.NuvioTokens
|
||||
import com.nuvio.app.core.ui.NuvioViewAllPillSize
|
||||
import com.nuvio.app.core.ui.PosterLandscapeAspectRatio
|
||||
import com.nuvio.app.core.ui.landscapePosterHeightForWidth
|
||||
import com.nuvio.app.core.ui.landscapePosterWidth
|
||||
|
|
@ -307,6 +308,7 @@ private fun HomeContinueWatchingSectionContent(
|
|||
rowContentPadding = PaddingValues(horizontal = sectionPadding),
|
||||
itemSpacing = layout.itemGap,
|
||||
showHeaderAccent = !homeCatalogSettings.hideCatalogUnderline,
|
||||
viewAllPillSize = NuvioViewAllPillSize.Compact,
|
||||
key = { entry -> entry.videoId },
|
||||
animatePlacement = true,
|
||||
state = listState,
|
||||
|
|
@ -1039,9 +1041,9 @@ private fun ContinueWatchingPosterCard(
|
|||
),
|
||||
) {
|
||||
val shouldBlurArtwork = blurNextUp &&
|
||||
useEpisodeThumbnails &&
|
||||
item.isNextUp &&
|
||||
imageUrl == firstNonBlank(item.episodeThumbnail)
|
||||
useEpisodeThumbnails &&
|
||||
item.isNextUp &&
|
||||
imageUrl == firstNonBlank(item.episodeThumbnail)
|
||||
if (imageUrl != null) {
|
||||
AsyncImage(
|
||||
model = cloudLibraryDisplayArtworkUrl(imageUrl),
|
||||
|
|
|
|||
Loading…
Reference in a new issue