Creepso/NuvioStreaming
1
0
Fork 0
mirror of https://github.com/tapframe/NuvioStreaming.git synced 2026-07-26 22:42:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix Android dominant color extraction

Browse source
This commit is contained in:
tapframe 2026-07-01 15:35:15 +05:30
parent ef9aece790
commit 3ca3953fe3
6 changed files with 64 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
composeApp/src/androidMain/kotlin/com/nuvio/app/features/details/components/BackdropPaletteImage.android.kt Normal file
View file

@ -0,0 +1,9 @@
package com.nuvio.app.features.details.components
import androidx.compose.ui.graphics.ImageBitmap
import androidx.compose.ui.graphics.asImageBitmap
import coil3.request.SuccessResult
import coil3.toBitmap
internal actual fun loadedBackdropImageBitmap(result: SuccessResult): ImageBitmap? =
runCatching { result.image.toBitmap().asImageBitmap() }.getOrNull()

35
composeApp/src/commonMain/kotlin/com/nuvio/app/features/details/MetaDetailsScreen.kt
View file

@ -52,6 +52,7 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.blur
import androidx.compose.ui.graphics.Brush
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.ImageBitmap
import androidx.compose.ui.graphics.graphicsLayer
import androidx.compose.ui.graphics.painter.Painter
import androidx.compose.ui.layout.ContentScale
@ -113,6 +114,7 @@ import com.nuvio.app.features.watchprogress.buildPlaybackVideoId
import com.nuvio.app.features.watchprogress.ContinueWatchingPreferencesRepository
import com.nuvio.app.features.watching.application.WatchingActions
import com.nuvio.app.features.watching.application.WatchingState
import com.kmpalette.rememberDominantColorState
import com.kmpalette.extensions.painter.rememberPainterDominantColorState
import kotlinx.coroutines.delay
import kotlinx.coroutines.launch
@ -772,18 +774,38 @@ fun MetaDetailsScreen(
var dominantBackdropPainter by remember(meta.id, backdropUrl) {
mutableStateOf<Painter?>(null)
}
val dominantColorState = rememberPainterDominantColorState(
var dominantBackdropImageBitmap by remember(meta.id, backdropUrl) {
mutableStateOf<ImageBitmap?>(null)
}
val dominantImageBitmapColorState = rememberDominantColorState(
defaultColor = colorScheme.background,
defaultOnColor = colorScheme.onBackground,
)
LaunchedEffect(dominantColorEnabled, dominantBackdropPainter) {
val dominantPainterColorState = rememberPainterDominantColorState(
defaultColor = colorScheme.background,
defaultOnColor = colorScheme.onBackground,
)
LaunchedEffect(dominantColorEnabled, dominantBackdropImageBitmap, dominantBackdropPainter) {
val imageBitmap = dominantBackdropImageBitmap
val painter = dominantBackdropPainter
if (dominantColorEnabled && painter != null) {
runCatching { dominantColorState.updateFrom(painter) }
if (dominantColorEnabled) {
when {
imageBitmap != null -> runCatching {
dominantImageBitmapColorState.updateFrom(imageBitmap)
}
painter != null -> runCatching {
dominantPainterColorState.updateFrom(painter)
}
}
}
}
val extractedDominantColor = if (dominantBackdropImageBitmap != null) {
dominantImageBitmapColorState.color
} else {
dominantPainterColorState.color
}
val dominantBackdropTargetColor = if (dominantColorEnabled) {
dominantBackdropBlendColor(dominantColorState.color, colorScheme.background)
dominantBackdropBlendColor(extractedDominantColor, colorScheme.background)
} else {
colorScheme.background
}
@ -841,8 +863,9 @@ fun MetaDetailsScreen(
heroTrailerPlayWhenReady = heroTrailerPlayWhenReady,
heroTrailerMuted = heroTrailerMuted,
heroGradientColor = dominantBackdropColor.takeIf { dominantColorEnabled },
onBackdropLoaded = { painter ->
onBackdropLoaded = { painter, imageBitmap ->
dominantBackdropPainter = painter
dominantBackdropImageBitmap = imageBitmap
},
onHeroTrailerMuteToggle = {
HeroTrailerAudioState.toggleMuted()

6
composeApp/src/commonMain/kotlin/com/nuvio/app/features/details/components/BackdropPaletteImage.kt Normal file
View file

@ -0,0 +1,6 @@
package com.nuvio.app.features.details.components
import androidx.compose.ui.graphics.ImageBitmap
import coil3.request.SuccessResult
internal expect fun loadedBackdropImageBitmap(result: SuccessResult): ImageBitmap?

10
composeApp/src/commonMain/kotlin/com/nuvio/app/features/details/components/DetailHero.kt
View file

@ -39,6 +39,7 @@ import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Brush
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.ImageBitmap
import androidx.compose.ui.layout.ContentScale
import androidx.compose.ui.layout.onSizeChanged
import androidx.compose.ui.graphics.painter.Painter
@ -64,7 +65,7 @@ fun DetailHero(
heroTrailerPlayWhenReady: Boolean = false,
heroTrailerMuted: Boolean = true,
heroGradientColor: Color? = null,
onBackdropLoaded: (Painter) -> Unit = {},
onBackdropLoaded: (Painter, ImageBitmap?) -> Unit = { _, _ -> },
onHeroTrailerMuteToggle: () -> Unit = {},
onHeroTrailerReady: () -> Unit = {},
onHeroTrailerEnded: () -> Unit = {},
@ -118,7 +119,12 @@ fun DetailHero(
},
alignment = if (isTablet) Alignment.TopCenter else Alignment.Center,
contentScale = ContentScale.Crop,
onSuccess = { state -> onBackdropLoaded(state.painter) },
onSuccess = { state ->
onBackdropLoaded(
state.painter,
loadedBackdropImageBitmap(state.result),
)
},
)
} else {
Box(

6
composeApp/src/desktopMain/kotlin/com/nuvio/app/features/details/components/BackdropPaletteImage.desktop.kt Normal file
View file

@ -0,0 +1,6 @@
package com.nuvio.app.features.details.components
import androidx.compose.ui.graphics.ImageBitmap
import coil3.request.SuccessResult
internal actual fun loadedBackdropImageBitmap(result: SuccessResult): ImageBitmap? = null

6
composeApp/src/iosMain/kotlin/com/nuvio/app/features/details/components/BackdropPaletteImage.ios.kt Normal file
View file

@ -0,0 +1,6 @@
package com.nuvio.app.features.details.components
import androidx.compose.ui.graphics.ImageBitmap
import coil3.request.SuccessResult
internal actual fun loadedBackdropImageBitmap(result: SuccessResult): ImageBitmap? = null