From ac48ab11b2ef0b0de2ca762fd56b122b2e6e3c86 Mon Sep 17 00:00:00 2001
From: tapframe <85391825+tapframe@users.noreply.github.com>
Date: Sat, 16 May 2026 19:43:15 +0530
Subject: [PATCH 01/10] fix: trakt duplicating same timestamp history
---
.../watchprogress/WatchProgressRepository.kt | 8 ++++--
.../watchprogress/WatchProgressRules.kt | 5 ++++
.../watchprogress/WatchProgressRulesTest.kt | 28 +++++++++++++++++++
iosApp/Configuration/Version.xcconfig | 2 +-
4 files changed, 40 insertions(+), 3 deletions(-)
diff --git a/composeApp/src/commonMain/kotlin/com/nuvio/app/features/watchprogress/WatchProgressRepository.kt b/composeApp/src/commonMain/kotlin/com/nuvio/app/features/watchprogress/WatchProgressRepository.kt
index 239910571..ebdb27d5e 100644
--- a/composeApp/src/commonMain/kotlin/com/nuvio/app/features/watchprogress/WatchProgressRepository.kt
+++ b/composeApp/src/commonMain/kotlin/com/nuvio/app/features/watchprogress/WatchProgressRepository.kt
@@ -382,8 +382,10 @@ object WatchProgressRepository {
ContinueWatchingPreferencesRepository.removeDismissedNextUpKeysForContent(entry.parentMetaId)
}
+ val useTraktProgress = shouldUseTraktProgress()
+
entriesByVideoId[session.videoId] = entry
- if (shouldUseTraktProgress()) {
+ if (useTraktProgress) {
TraktProgressRepository.applyOptimisticProgress(entry)
}
publish()
@@ -392,7 +394,9 @@ object WatchProgressRepository {
resolveRemoteMetadata()
}
pushScrobbleToServer(entry)
- WatchingActions.onProgressEntryUpdated(entry)
+ if (shouldCascadeCompletedProgressToWatchedHistory(entry, useTraktProgress)) {
+ WatchingActions.onProgressEntryUpdated(entry)
+ }
}
private fun pushScrobbleToServer(entry: WatchProgressEntry) {
diff --git a/composeApp/src/commonMain/kotlin/com/nuvio/app/features/watchprogress/WatchProgressRules.kt b/composeApp/src/commonMain/kotlin/com/nuvio/app/features/watchprogress/WatchProgressRules.kt
index 302beece3..bd0027063 100644
--- a/composeApp/src/commonMain/kotlin/com/nuvio/app/features/watchprogress/WatchProgressRules.kt
+++ b/composeApp/src/commonMain/kotlin/com/nuvio/app/features/watchprogress/WatchProgressRules.kt
@@ -99,6 +99,11 @@ internal fun WatchProgressEntry.shouldUseAsCompletedSeedForContinueWatching(): B
return explicitPercent >= WatchProgressTraktPlaybackNextUpSeedPercentThreshold
}
+internal fun shouldCascadeCompletedProgressToWatchedHistory(
+ entry: WatchProgressEntry,
+ isUsingTraktProgress: Boolean,
+): Boolean = !isUsingTraktProgress && entry.normalizedCompletion().isCompleted
+
internal fun String?.isSeriesTypeForContinueWatching(): Boolean =
equals("series", ignoreCase = true) || equals("tv", ignoreCase = true)
diff --git a/composeApp/src/commonTest/kotlin/com/nuvio/app/features/watchprogress/WatchProgressRulesTest.kt b/composeApp/src/commonTest/kotlin/com/nuvio/app/features/watchprogress/WatchProgressRulesTest.kt
index bed674ef8..b6112ba84 100644
--- a/composeApp/src/commonTest/kotlin/com/nuvio/app/features/watchprogress/WatchProgressRulesTest.kt
+++ b/composeApp/src/commonTest/kotlin/com/nuvio/app/features/watchprogress/WatchProgressRulesTest.kt
@@ -173,6 +173,34 @@ class WatchProgressRulesTest {
assertFalse(history.shouldTreatAsInProgressForContinueWatching())
}
+ @Test
+ fun `completed progress does not cascade to watched history while Trakt progress is active`() {
+ val completed = entry(
+ videoId = "movie-complete",
+ isCompleted = true,
+ )
+ val inProgress = completed.copy(isCompleted = false)
+
+ assertFalse(
+ shouldCascadeCompletedProgressToWatchedHistory(
+ entry = completed,
+ isUsingTraktProgress = true,
+ ),
+ )
+ assertTrue(
+ shouldCascadeCompletedProgressToWatchedHistory(
+ entry = completed,
+ isUsingTraktProgress = false,
+ ),
+ )
+ assertFalse(
+ shouldCascadeCompletedProgressToWatchedHistory(
+ entry = inProgress,
+ isUsingTraktProgress = false,
+ ),
+ )
+ }
+
@Test
fun `codec normalizes completed entries inferred from percent`() {
val payload = WatchProgressCodec.encodeEntries(
diff --git a/iosApp/Configuration/Version.xcconfig b/iosApp/Configuration/Version.xcconfig
index ffa7639f2..11aa4529b 100644
--- a/iosApp/Configuration/Version.xcconfig
+++ b/iosApp/Configuration/Version.xcconfig
@@ -1,3 +1,3 @@
CURRENT_PROJECT_VERSION=62
-MARKETING_VERSION=0.1.20
+MARKETING_VERSION=0.1.0
From 1df74ea0fe94a1f1d6495989c14127811037385a Mon Sep 17 00:00:00 2001
From: tapframe <85391825+tapframe@users.noreply.github.com>
Date: Sat, 16 May 2026 20:16:48 +0530
Subject: [PATCH 02/10] faet: parental guilde overlay
---
.../composeResources/values/strings.xml | 8 +
.../features/player/ParentalGuideOverlay.kt | 141 ++++++++++
.../player/ParentalGuideRepository.kt | 175 ++++++++++++
.../app/features/player/PlayerControls.kt | 249 ++++++++++--------
.../nuvio/app/features/player/PlayerScreen.kt | 68 ++++-
.../player/ParentalGuideRepositoryTest.kt | 68 +++++
6 files changed, 600 insertions(+), 109 deletions(-)
create mode 100644 composeApp/src/commonMain/kotlin/com/nuvio/app/features/player/ParentalGuideOverlay.kt
create mode 100644 composeApp/src/commonMain/kotlin/com/nuvio/app/features/player/ParentalGuideRepository.kt
create mode 100644 composeApp/src/commonTest/kotlin/com/nuvio/app/features/player/ParentalGuideRepositoryTest.kt
diff --git a/composeApp/src/commonMain/composeResources/values/strings.xml b/composeApp/src/commonMain/composeResources/values/strings.xml
index 3c21777b4..14b541294 100644
--- a/composeApp/src/commonMain/composeResources/values/strings.xml
+++ b/composeApp/src/commonMain/composeResources/values/strings.xml
@@ -1312,6 +1312,14 @@
A new episode is out now
%1$s is out now
Episode Releases
+ Alcohol/Drugs
+ Frightening
+ Nudity
+ Profanity
+ Mild
+ Moderate
+ Severe
+ Violence
Creator
Director
Writer
diff --git a/composeApp/src/commonMain/kotlin/com/nuvio/app/features/player/ParentalGuideOverlay.kt b/composeApp/src/commonMain/kotlin/com/nuvio/app/features/player/ParentalGuideOverlay.kt
new file mode 100644
index 000000000..9cf5fb6a7
--- /dev/null
+++ b/composeApp/src/commonMain/kotlin/com/nuvio/app/features/player/ParentalGuideOverlay.kt
@@ -0,0 +1,141 @@
+package com.nuvio.app.features.player
+
+import androidx.compose.animation.core.Animatable
+import androidx.compose.animation.core.FastOutSlowInEasing
+import androidx.compose.animation.core.tween
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+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.alpha
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import kotlinx.coroutines.delay
+
+private val ParentalGuideRowHeight = 18.dp
+private val ParentalGuideRowGap = 2.dp
+
+@Composable
+internal fun ParentalGuideOverlay(
+ warnings: List,
+ isVisible: Boolean,
+ onAnimationComplete: () -> Unit,
+ modifier: Modifier = Modifier,
+ contentPadding: PaddingValues = PaddingValues(start = 32.dp, top = 24.dp),
+) {
+ if (warnings.isEmpty()) return
+
+ val count = warnings.size
+ val totalLineHeight = (ParentalGuideRowHeight.value * count) +
+ (ParentalGuideRowGap.value * (count - 1))
+
+ val containerAlpha = remember { Animatable(0f) }
+ val lineHeightFraction = remember { Animatable(0f) }
+ val itemAlphas = remember(count) { List(count) { Animatable(0f) } }
+ var animating by remember { mutableStateOf(false) }
+
+ LaunchedEffect(isVisible) {
+ if (isVisible && !animating) {
+ animating = true
+
+ containerAlpha.animateTo(1f, tween(300))
+ lineHeightFraction.animateTo(1f, tween(400, easing = FastOutSlowInEasing))
+
+ for (i in 0 until count) {
+ delay(80)
+ itemAlphas[i].animateTo(1f, tween(200))
+ }
+
+ delay(5000)
+
+ for (i in (count - 1) downTo 0) {
+ delay(60)
+ itemAlphas[i].animateTo(0f, tween(150))
+ }
+
+ delay(100)
+ lineHeightFraction.animateTo(0f, tween(300, easing = FastOutSlowInEasing))
+
+ delay(200)
+ containerAlpha.animateTo(0f, tween(200))
+
+ animating = false
+ onAnimationComplete()
+ } else if (!isVisible && animating) {
+ for (i in (count - 1) downTo 0) {
+ itemAlphas[i].snapTo(0f)
+ }
+ lineHeightFraction.snapTo(0f)
+ containerAlpha.snapTo(0f)
+ animating = false
+ onAnimationComplete()
+ }
+ }
+
+ if (containerAlpha.value <= 0f) return
+
+ Row(
+ modifier = modifier
+ .alpha(containerAlpha.value)
+ .padding(contentPadding),
+ verticalAlignment = Alignment.Top,
+ ) {
+ Box(
+ modifier = Modifier
+ .width(3.dp)
+ .height((totalLineHeight * lineHeightFraction.value).dp)
+ .clip(RoundedCornerShape(1.dp))
+ .background(MaterialTheme.colorScheme.primary),
+ )
+
+ Column(
+ modifier = Modifier.padding(start = 10.dp),
+ verticalArrangement = Arrangement.spacedBy(ParentalGuideRowGap),
+ ) {
+ warnings.forEachIndexed { index, warning ->
+ Row(
+ modifier = Modifier
+ .height(ParentalGuideRowHeight)
+ .alpha(itemAlphas.getOrNull(index)?.value ?: 0f),
+ verticalAlignment = Alignment.CenterVertically,
+ ) {
+ Text(
+ text = warning.label,
+ fontSize = 11.sp,
+ color = Color.White.copy(alpha = 0.85f),
+ fontWeight = FontWeight.SemiBold,
+ )
+ Text(
+ text = " · ",
+ fontSize = 11.sp,
+ color = Color.White.copy(alpha = 0.4f),
+ )
+ Text(
+ text = warning.severity,
+ fontSize = 11.sp,
+ color = Color.White.copy(alpha = 0.5f),
+ )
+ }
+ }
+ }
+ }
+}
diff --git a/composeApp/src/commonMain/kotlin/com/nuvio/app/features/player/ParentalGuideRepository.kt b/composeApp/src/commonMain/kotlin/com/nuvio/app/features/player/ParentalGuideRepository.kt
new file mode 100644
index 000000000..06fe2fb5a
--- /dev/null
+++ b/composeApp/src/commonMain/kotlin/com/nuvio/app/features/player/ParentalGuideRepository.kt
@@ -0,0 +1,175 @@
+package com.nuvio.app.features.player
+
+import co.touchlab.kermit.Logger
+import com.nuvio.app.features.addons.httpRequestRaw
+import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.sync.withLock
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.json.Json
+
+private const val PARENTAL_GUIDE_BASE_URL = "https://api.imdbapi.dev"
+private val imdbIdPattern = Regex("tt\\d+")
+
+data class ParentalGuideResult(
+ val nudity: String? = null,
+ val violence: String? = null,
+ val profanity: String? = null,
+ val alcohol: String? = null,
+ val frightening: String? = null,
+)
+
+data class ParentalWarning(
+ val label: String,
+ val severity: String,
+)
+
+internal data class ParentalGuideLabels(
+ val nudity: String,
+ val violence: String,
+ val profanity: String,
+ val alcohol: String,
+ val frightening: String,
+ val severe: String,
+ val moderate: String,
+ val mild: String,
+)
+
+internal object ParentalGuideRepository {
+ private val log = Logger.withTag("ParentalGuide")
+ private val json = Json { ignoreUnknownKeys = true }
+ private val cache = mutableMapOf()
+ private val cacheMutex = Mutex()
+
+ suspend fun getParentalGuide(imdbId: String): ParentalGuideResult? {
+ val normalizedImdbId = extractParentalGuideImdbId(imdbId) ?: return null
+
+ cacheMutex.withLock {
+ if (cache.containsKey(normalizedImdbId)) {
+ return cache[normalizedImdbId]
+ }
+ }
+
+ val result = runCatching {
+ val response = httpRequestRaw(
+ method = "GET",
+ url = "$PARENTAL_GUIDE_BASE_URL/titles/$normalizedImdbId/parentsGuide",
+ headers = mapOf("Accept" to "application/json"),
+ body = "",
+ )
+ if (response.status !in 200..299 || response.body.isBlank()) {
+ return@runCatching null
+ }
+ val body = json.decodeFromString(response.body)
+ val categories = body.parentsGuide
+ if (categories.isEmpty()) null else mapParentalGuideCategoriesToResult(categories)
+ }.onFailure { error ->
+ log.w(error) { "Failed to fetch parental guide for $normalizedImdbId" }
+ }.getOrNull()
+
+ cacheMutex.withLock {
+ cache[normalizedImdbId] = result
+ }
+ return result
+ }
+}
+
+internal fun mapParentalGuideCategoriesToResult(
+ categories: List,
+): ParentalGuideResult {
+ val categoryMap = categories.associateBy { it.category.uppercase() }
+
+ return ParentalGuideResult(
+ nudity = resolveParentalGuideSeverity(categoryMap["SEXUAL_CONTENT"]),
+ violence = resolveParentalGuideSeverity(categoryMap["VIOLENCE"]),
+ profanity = resolveParentalGuideSeverity(categoryMap["PROFANITY"]),
+ alcohol = resolveParentalGuideSeverity(categoryMap["ALCOHOL_DRUGS"]),
+ frightening = resolveParentalGuideSeverity(categoryMap["FRIGHTENING_INTENSE_SCENES"]),
+ )
+}
+
+internal fun resolveParentalGuideSeverity(category: ImdbApiParentsGuideCategory?): String? {
+ val breakdowns = category?.severityBreakdowns ?: return null
+ val dominant = breakdowns
+ .filter { it.severityLevel.lowercase() != "none" }
+ .maxByOrNull { it.voteCount }
+ val noneVotes = breakdowns
+ .firstOrNull { it.severityLevel.lowercase() == "none" }
+ ?.voteCount ?: 0
+
+ if (dominant == null || dominant.voteCount <= noneVotes) return null
+ return dominant.severityLevel.lowercase()
+}
+
+internal fun buildParentalWarnings(
+ guide: ParentalGuideResult,
+ labels: ParentalGuideLabels,
+): List {
+ val severityOrder = mapOf(
+ "severe" to 0,
+ "moderate" to 1,
+ "mild" to 2,
+ )
+
+ return listOfNotNull(
+ guide.nudity?.let { "nudity" to it },
+ guide.violence?.let { "violence" to it },
+ guide.profanity?.let { "profanity" to it },
+ guide.alcohol?.let { "alcohol" to it },
+ guide.frightening?.let { "frightening" to it },
+ )
+ .sortedBy { severityOrder[it.second.lowercase()] ?: 3 }
+ .map { (category, severity) ->
+ ParentalWarning(
+ label = when (category) {
+ "nudity" -> labels.nudity
+ "violence" -> labels.violence
+ "profanity" -> labels.profanity
+ "alcohol" -> labels.alcohol
+ "frightening" -> labels.frightening
+ else -> category
+ },
+ severity = when (severity.lowercase()) {
+ "severe" -> labels.severe
+ "moderate" -> labels.moderate
+ "mild" -> labels.mild
+ else -> severity
+ },
+ )
+ }
+ .take(5)
+}
+
+internal fun extractParentalGuideImdbId(value: String?): String? =
+ value
+ ?.let { imdbIdPattern.find(it)?.value }
+ ?.takeIf { it.startsWith("tt") }
+
+internal fun extractParentalGuideTmdbId(value: String?): Int? {
+ val normalized = value?.trim()?.takeIf(String::isNotBlank) ?: return null
+ if (normalized.all(Char::isDigit)) return normalized.toIntOrNull()
+ if (normalized.startsWith("tmdb:", ignoreCase = true)) {
+ return normalized.substringAfter(':').substringBefore(':').toIntOrNull()
+ }
+
+ val tokens = normalized.split(':', '/', '|')
+ val tmdbIndex = tokens.indexOfFirst { it.equals("tmdb", ignoreCase = true) }
+ return tokens.getOrNull(tmdbIndex + 1)?.toIntOrNull()
+}
+
+@Serializable
+internal data class ImdbApiParentsGuideResponse(
+ @SerialName("parentsGuide") val parentsGuide: List = emptyList(),
+)
+
+@Serializable
+internal data class ImdbApiParentsGuideCategory(
+ @SerialName("category") val category: String = "",
+ @SerialName("severityBreakdowns") val severityBreakdowns: List? = null,
+)
+
+@Serializable
+internal data class ImdbApiSeverityBreakdown(
+ @SerialName("severityLevel") val severityLevel: String = "",
+ @SerialName("voteCount") val voteCount: Int = 0,
+)
diff --git a/composeApp/src/commonMain/kotlin/com/nuvio/app/features/player/PlayerControls.kt b/composeApp/src/commonMain/kotlin/com/nuvio/app/features/player/PlayerControls.kt
index 13f975ed5..540ed57b2 100644
--- a/composeApp/src/commonMain/kotlin/com/nuvio/app/features/player/PlayerControls.kt
+++ b/composeApp/src/commonMain/kotlin/com/nuvio/app/features/player/PlayerControls.kt
@@ -1,11 +1,14 @@
package com.nuvio.app.features.player
+import androidx.compose.animation.core.animateFloatAsState
+import androidx.compose.animation.core.tween
import androidx.compose.foundation.background
import androidx.compose.foundation.border
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.WindowInsets
@@ -37,6 +40,7 @@ import androidx.compose.material3.SliderDefaults
import androidx.compose.material3.Surface
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
@@ -69,6 +73,7 @@ internal fun PlayerControlsShell(
metrics: PlayerLayoutMetrics,
resizeMode: PlayerResizeMode,
isLocked: Boolean,
+ showPlaybackControls: Boolean = true,
onLockToggle: () -> Unit,
onBack: () -> Unit,
onTogglePlayback: () -> Unit,
@@ -81,6 +86,9 @@ internal fun PlayerControlsShell(
onSourcesClick: (() -> Unit)? = null,
onEpisodesClick: (() -> Unit)? = null,
onSubmitIntroClick: (() -> Unit)? = null,
+ parentalWarnings: List = emptyList(),
+ showParentalGuide: Boolean = false,
+ onParentalGuideAnimationComplete: () -> Unit = {},
onScrubChange: (Long) -> Unit,
onScrubFinished: (Long) -> Unit,
horizontalSafePadding: androidx.compose.ui.unit.Dp,
@@ -131,7 +139,11 @@ internal fun PlayerControlsShell(
episodeTitle = episodeTitle,
metrics = metrics,
isLocked = isLocked,
+ showActions = showPlaybackControls,
onSubmitIntroClick = onSubmitIntroClick,
+ parentalWarnings = parentalWarnings,
+ showParentalGuide = showParentalGuide,
+ onParentalGuideAnimationComplete = onParentalGuideAnimationComplete,
onLockToggle = onLockToggle,
onBack = onBack,
modifier = Modifier
@@ -145,36 +157,40 @@ internal fun PlayerControlsShell(
),
)
- CenterControls(
- snapshot = playbackSnapshot,
- metrics = metrics,
- onSeekBack = onSeekBack,
- onSeekForward = onSeekForward,
- onTogglePlayback = onTogglePlayback,
- modifier = Modifier
- .align(Alignment.Center)
- .padding(bottom = metrics.centerLift),
- )
+ if (showPlaybackControls) {
+ CenterControls(
+ snapshot = playbackSnapshot,
+ metrics = metrics,
+ onSeekBack = onSeekBack,
+ onSeekForward = onSeekForward,
+ onTogglePlayback = onTogglePlayback,
+ modifier = Modifier
+ .align(Alignment.Center)
+ .padding(bottom = metrics.centerLift),
+ )
+ }
- ProgressControls(
- playbackSnapshot = playbackSnapshot,
- displayedPositionMs = displayedPositionMs,
- metrics = metrics,
- resizeMode = resizeMode,
- onScrubChange = onScrubChange,
- onScrubFinished = onScrubFinished,
- onResizeModeClick = onResizeModeClick,
- onSpeedClick = onSpeedClick,
- onSubtitleClick = onSubtitleClick,
- onAudioClick = onAudioClick,
- onSourcesClick = onSourcesClick,
- onEpisodesClick = onEpisodesClick,
- modifier = Modifier
- .align(Alignment.BottomCenter)
- .fillMaxWidth()
- .padding(horizontal = metrics.horizontalPadding)
- .padding(bottom = metrics.sliderBottomOffset),
- )
+ if (showPlaybackControls) {
+ ProgressControls(
+ playbackSnapshot = playbackSnapshot,
+ displayedPositionMs = displayedPositionMs,
+ metrics = metrics,
+ resizeMode = resizeMode,
+ onScrubChange = onScrubChange,
+ onScrubFinished = onScrubFinished,
+ onResizeModeClick = onResizeModeClick,
+ onSpeedClick = onSpeedClick,
+ onSubtitleClick = onSubtitleClick,
+ onAudioClick = onAudioClick,
+ onSourcesClick = onSourcesClick,
+ onEpisodesClick = onEpisodesClick,
+ modifier = Modifier
+ .align(Alignment.BottomCenter)
+ .fillMaxWidth()
+ .padding(horizontal = metrics.horizontalPadding)
+ .padding(bottom = metrics.sliderBottomOffset),
+ )
+ }
}
}
}
@@ -189,110 +205,131 @@ private fun PlayerHeader(
episodeTitle: String?,
metrics: PlayerLayoutMetrics,
isLocked: Boolean,
+ showActions: Boolean,
onSubmitIntroClick: (() -> Unit)?,
+ parentalWarnings: List,
+ showParentalGuide: Boolean,
+ onParentalGuideAnimationComplete: () -> Unit,
onLockToggle: () -> Unit,
onBack: () -> Unit,
modifier: Modifier = Modifier,
) {
val typeScale = MaterialTheme.nuvioTypeScale
+ val metadataAlpha by animateFloatAsState(
+ targetValue = if (!showParentalGuide && showActions) 1f else 0f,
+ animationSpec = tween(durationMillis = if (!showParentalGuide && showActions) 260 else 160),
+ label = "playerHeaderMetadataAlpha",
+ )
Column(modifier = modifier) {
Row(
modifier = Modifier.fillMaxWidth(),
horizontalArrangement = Arrangement.SpaceBetween,
verticalAlignment = Alignment.Top,
) {
- Column(
+ Box(
modifier = Modifier.weight(1f),
- verticalArrangement = Arrangement.spacedBy(6.dp),
) {
- Text(
- text = title,
- style = typeScale.titleLg.copy(
- fontSize = metrics.titleSize,
- lineHeight = metrics.titleSize * 1.16f,
- fontWeight = FontWeight.Bold,
- ),
- color = Color.White,
- maxLines = 2,
- overflow = TextOverflow.Ellipsis,
- )
- if (seasonNumber != null && episodeNumber != null && !episodeTitle.isNullOrBlank()) {
- Text(
- text = stringResource(
- Res.string.compose_player_episode_title_format,
- seasonNumber,
- episodeNumber,
- episodeTitle,
- ),
- style = typeScale.bodyMd.copy(
- fontSize = metrics.episodeInfoSize,
- lineHeight = metrics.episodeInfoSize * 1.3f,
- ),
- color = Color.White.copy(alpha = 0.9f),
- maxLines = 1,
- overflow = TextOverflow.Ellipsis,
- )
- }
- Row(
- horizontalArrangement = Arrangement.spacedBy(8.dp),
- verticalAlignment = Alignment.CenterVertically,
+ Column(
+ modifier = Modifier.graphicsLayer { alpha = metadataAlpha },
+ verticalArrangement = Arrangement.spacedBy(6.dp),
) {
Text(
- text = streamTitle,
- style = typeScale.labelSm.copy(
- fontSize = metrics.metadataSize,
- lineHeight = metrics.metadataSize * 1.25f,
+ text = title,
+ style = typeScale.titleLg.copy(
+ fontSize = metrics.titleSize,
+ lineHeight = metrics.titleSize * 1.16f,
+ fontWeight = FontWeight.Bold,
),
- color = Color.White.copy(alpha = 0.7f),
- maxLines = 1,
- overflow = TextOverflow.Ellipsis,
- )
- Text(
- text = providerName,
- style = typeScale.labelSm.copy(
- fontSize = metrics.metadataSize,
- lineHeight = metrics.metadataSize * 1.25f,
- fontStyle = FontStyle.Italic,
- ),
- color = Color.White.copy(alpha = 0.7f),
- maxLines = 1,
+ color = Color.White,
+ maxLines = 2,
overflow = TextOverflow.Ellipsis,
)
+ if (seasonNumber != null && episodeNumber != null && !episodeTitle.isNullOrBlank()) {
+ Text(
+ text = stringResource(
+ Res.string.compose_player_episode_title_format,
+ seasonNumber,
+ episodeNumber,
+ episodeTitle,
+ ),
+ style = typeScale.bodyMd.copy(
+ fontSize = metrics.episodeInfoSize,
+ lineHeight = metrics.episodeInfoSize * 1.3f,
+ ),
+ color = Color.White.copy(alpha = 0.9f),
+ maxLines = 1,
+ overflow = TextOverflow.Ellipsis,
+ )
+ }
+ Row(
+ horizontalArrangement = Arrangement.spacedBy(8.dp),
+ verticalAlignment = Alignment.CenterVertically,
+ ) {
+ Text(
+ text = streamTitle,
+ style = typeScale.labelSm.copy(
+ fontSize = metrics.metadataSize,
+ lineHeight = metrics.metadataSize * 1.25f,
+ ),
+ color = Color.White.copy(alpha = 0.7f),
+ maxLines = 1,
+ overflow = TextOverflow.Ellipsis,
+ )
+ Text(
+ text = providerName,
+ style = typeScale.labelSm.copy(
+ fontSize = metrics.metadataSize,
+ lineHeight = metrics.metadataSize * 1.25f,
+ fontStyle = FontStyle.Italic,
+ ),
+ color = Color.White.copy(alpha = 0.7f),
+ maxLines = 1,
+ overflow = TextOverflow.Ellipsis,
+ )
+ }
}
+ ParentalGuideOverlay(
+ warnings = parentalWarnings,
+ isVisible = showParentalGuide,
+ onAnimationComplete = onParentalGuideAnimationComplete,
+ contentPadding = PaddingValues(0.dp),
+ )
}
- Row(
- horizontalArrangement = Arrangement.spacedBy(10.dp),
- verticalAlignment = Alignment.CenterVertically,
- ) {
- if (onSubmitIntroClick != null) {
+ if (showActions) {
+ Row(
+ horizontalArrangement = Arrangement.spacedBy(10.dp),
+ verticalAlignment = Alignment.CenterVertically,
+ ) {
+ if (onSubmitIntroClick != null) {
+ PlayerHeaderIconButton(
+ icon = Icons.Rounded.Flag,
+ contentDescription = "Submit Intro",
+ buttonSize = metrics.headerIconSize + 16.dp,
+ iconSize = metrics.headerIconSize,
+ onClick = onSubmitIntroClick,
+ )
+ }
PlayerHeaderIconButton(
- icon = Icons.Rounded.Flag,
- contentDescription = "Submit Intro",
+ icon = if (isLocked) Icons.Rounded.LockOpen else Icons.Rounded.Lock,
+ contentDescription = if (isLocked) {
+ stringResource(Res.string.compose_player_unlock_controls)
+ } else {
+ stringResource(Res.string.compose_player_lock_controls)
+ },
buttonSize = metrics.headerIconSize + 16.dp,
iconSize = metrics.headerIconSize,
- onClick = onSubmitIntroClick,
+ onClick = onLockToggle,
+ )
+ NuvioBackButton(
+ onClick = onBack,
+ containerColor = Color.Black.copy(alpha = 0.35f),
+ contentColor = Color.White,
+ buttonSize = metrics.headerIconSize + 16.dp,
+ iconSize = metrics.headerIconSize,
+ contentDescription = stringResource(Res.string.compose_player_close),
)
}
- PlayerHeaderIconButton(
- icon = if (isLocked) Icons.Rounded.LockOpen else Icons.Rounded.Lock,
- contentDescription = if (isLocked) {
- stringResource(Res.string.compose_player_unlock_controls)
- } else {
- stringResource(Res.string.compose_player_lock_controls)
- },
- buttonSize = metrics.headerIconSize + 16.dp,
- iconSize = metrics.headerIconSize,
- onClick = onLockToggle,
- )
- NuvioBackButton(
- onClick = onBack,
- containerColor = Color.Black.copy(alpha = 0.35f),
- contentColor = Color.White,
- buttonSize = metrics.headerIconSize + 16.dp,
- iconSize = metrics.headerIconSize,
- contentDescription = stringResource(Res.string.compose_player_close),
- )
}
}
}
diff --git a/composeApp/src/commonMain/kotlin/com/nuvio/app/features/player/PlayerScreen.kt b/composeApp/src/commonMain/kotlin/com/nuvio/app/features/player/PlayerScreen.kt
index 279aae9f1..fa29d9db0 100644
--- a/composeApp/src/commonMain/kotlin/com/nuvio/app/features/player/PlayerScreen.kt
+++ b/composeApp/src/commonMain/kotlin/com/nuvio/app/features/player/PlayerScreen.kt
@@ -61,6 +61,7 @@ import com.nuvio.app.features.streams.StreamAutoPlaySelector
import com.nuvio.app.features.streams.StreamItem
import com.nuvio.app.features.streams.StreamLinkCacheRepository
import com.nuvio.app.features.streams.StreamsUiState
+import com.nuvio.app.features.tmdb.TmdbService
import com.nuvio.app.features.trakt.TraktScrobbleRepository
import com.nuvio.app.features.watched.WatchedRepository
import com.nuvio.app.features.watchprogress.WatchProgressClock
@@ -181,6 +182,16 @@ fun PlayerScreen(
val downloadedLabel = stringResource(Res.string.compose_player_downloaded)
val airsPrefix = stringResource(Res.string.compose_player_airs_prefix)
val tbaLabel = stringResource(Res.string.compose_player_tba)
+ val parentalGuideLabels = ParentalGuideLabels(
+ nudity = stringResource(Res.string.parental_nudity),
+ violence = stringResource(Res.string.parental_violence),
+ profanity = stringResource(Res.string.parental_profanity),
+ alcohol = stringResource(Res.string.parental_alcohol),
+ frightening = stringResource(Res.string.parental_frightening),
+ severe = stringResource(Res.string.parental_severity_severe),
+ moderate = stringResource(Res.string.parental_severity_moderate),
+ mild = stringResource(Res.string.parental_severity_mild),
+ )
val gestureController = rememberPlayerGestureController()
var controlsVisible by rememberSaveable { mutableStateOf(true) }
var playerControlsLocked by rememberSaveable { mutableStateOf(false) }
@@ -282,6 +293,12 @@ fun PlayerScreen(
var activeSkipInterval by remember { mutableStateOf(null) }
var skipIntervalDismissed by remember { mutableStateOf(false) }
+ // Parental guide overlay state
+ var parentalWarnings by remember { mutableStateOf>(emptyList()) }
+ var showParentalGuide by remember { mutableStateOf(false) }
+ var parentalGuideHasShown by remember { mutableStateOf(false) }
+ var playbackStartedForParentalGuide by remember { mutableStateOf(false) }
+
// Next episode state
var nextEpisodeInfo by remember { mutableStateOf(null) }
var showNextEpisodeCard by remember { mutableStateOf(false) }
@@ -418,6 +435,25 @@ fun PlayerScreen(
}
}
+ fun tryShowParentalGuide() {
+ if (!parentalGuideHasShown && parentalWarnings.isNotEmpty() && !playbackStartedForParentalGuide) {
+ playbackStartedForParentalGuide = true
+ controlsVisible = true
+ showParentalGuide = true
+ parentalGuideHasShown = true
+ }
+ }
+
+ suspend fun resolveParentalGuideImdbId(): String? {
+ val candidates = listOf(parentMetaId, activeVideoId)
+ candidates.firstNotNullOfOrNull(::extractParentalGuideImdbId)?.let { return it }
+ val tmdbId = candidates.firstNotNullOfOrNull(::extractParentalGuideTmdbId) ?: return null
+ return TmdbService.tmdbToImdb(
+ tmdbId = tmdbId,
+ mediaType = contentType ?: parentMetaType,
+ )
+ }
+
fun flushWatchProgress() {
emitStopScrobbleForCurrentProgress()
WatchProgressRepository.flushPlaybackProgress(
@@ -1289,8 +1325,8 @@ fun PlayerScreen(
initialSeekApplied = true
}
- LaunchedEffect(controlsVisible, playbackSnapshot.isPlaying, playbackSnapshot.isLoading, errorMessage) {
- if (!controlsVisible || !playbackSnapshot.isPlaying || playbackSnapshot.isLoading || errorMessage != null) {
+ LaunchedEffect(controlsVisible, playbackSnapshot.isPlaying, playbackSnapshot.isLoading, showParentalGuide, errorMessage) {
+ if (!controlsVisible || !playbackSnapshot.isPlaying || playbackSnapshot.isLoading || showParentalGuide || errorMessage != null) {
return@LaunchedEffect
}
delay(3500)
@@ -1354,6 +1390,28 @@ fun PlayerScreen(
)
}
+ // Fetch parental guide when the playable item changes.
+ LaunchedEffect(activeVideoId, activeSeasonNumber, activeEpisodeNumber, parentMetaId, parentMetaType) {
+ parentalWarnings = emptyList()
+ showParentalGuide = false
+ parentalGuideHasShown = false
+ playbackStartedForParentalGuide = false
+
+ val imdbId = resolveParentalGuideImdbId() ?: return@LaunchedEffect
+ val guide = ParentalGuideRepository.getParentalGuide(imdbId) ?: return@LaunchedEffect
+ parentalWarnings = buildParentalWarnings(guide, parentalGuideLabels)
+
+ if (playbackSnapshot.isPlaying) {
+ tryShowParentalGuide()
+ }
+ }
+
+ LaunchedEffect(playbackSnapshot.isPlaying, parentalWarnings) {
+ if (playbackSnapshot.isPlaying) {
+ tryShowParentalGuide()
+ }
+ }
+
// Fetch skip intervals when episode changes
LaunchedEffect(activeVideoId, activeSeasonNumber, activeEpisodeNumber) {
skipIntervals = emptyList()
@@ -1692,7 +1750,7 @@ fun PlayerScreen(
}
AnimatedVisibility(
- visible = controlsVisible && !playerControlsLocked,
+ visible = (controlsVisible || showParentalGuide) && !playerControlsLocked,
enter = fadeIn(),
exit = fadeOut(),
) {
@@ -1708,6 +1766,7 @@ fun PlayerScreen(
metrics = metrics,
resizeMode = resizeMode,
isLocked = playerControlsLocked,
+ showPlaybackControls = controlsVisible,
onLockToggle = {
if (playerControlsLocked) {
unlockPlayerControls()
@@ -1732,6 +1791,9 @@ fun PlayerScreen(
onSourcesClick = if (activeVideoId != null) { { openSourcesPanel() } } else null,
onEpisodesClick = if (isSeries) { { openEpisodesPanel() } } else null,
onSubmitIntroClick = if (isSeries && playerSettingsUiState.introSubmitEnabled && playerSettingsUiState.introDbApiKey.isNotBlank()) { { showSubmitIntroModal = true } } else null,
+ parentalWarnings = parentalWarnings,
+ showParentalGuide = showParentalGuide,
+ onParentalGuideAnimationComplete = { showParentalGuide = false },
onScrubChange = { positionMs -> scrubbingPositionMs = positionMs },
onScrubFinished = { positionMs ->
scrubbingPositionMs = null
diff --git a/composeApp/src/commonTest/kotlin/com/nuvio/app/features/player/ParentalGuideRepositoryTest.kt b/composeApp/src/commonTest/kotlin/com/nuvio/app/features/player/ParentalGuideRepositoryTest.kt
new file mode 100644
index 000000000..e247a54d3
--- /dev/null
+++ b/composeApp/src/commonTest/kotlin/com/nuvio/app/features/player/ParentalGuideRepositoryTest.kt
@@ -0,0 +1,68 @@
+package com.nuvio.app.features.player
+
+import kotlin.test.Test
+import kotlin.test.assertEquals
+import kotlin.test.assertNull
+
+class ParentalGuideRepositoryTest {
+
+ @Test
+ fun `dominant severity ignores none when none has more votes`() {
+ val category = ImdbApiParentsGuideCategory(
+ category = "VIOLENCE",
+ severityBreakdowns = listOf(
+ ImdbApiSeverityBreakdown("none", 12),
+ ImdbApiSeverityBreakdown("mild", 7),
+ ImdbApiSeverityBreakdown("moderate", 3),
+ ),
+ )
+
+ assertNull(resolveParentalGuideSeverity(category))
+ }
+
+ @Test
+ fun `dominant severity chooses highest voted non-none severity`() {
+ val category = ImdbApiParentsGuideCategory(
+ category = "VIOLENCE",
+ severityBreakdowns = listOf(
+ ImdbApiSeverityBreakdown("none", 2),
+ ImdbApiSeverityBreakdown("mild", 5),
+ ImdbApiSeverityBreakdown("severe", 9),
+ ),
+ )
+
+ assertEquals("severe", resolveParentalGuideSeverity(category))
+ }
+
+ @Test
+ fun `warnings are sorted by severity and localized`() {
+ val warnings = buildParentalWarnings(
+ guide = ParentalGuideResult(
+ nudity = "mild",
+ violence = "severe",
+ profanity = "moderate",
+ ),
+ labels = ParentalGuideLabels(
+ nudity = "Nudity",
+ violence = "Violence",
+ profanity = "Profanity",
+ alcohol = "Alcohol/Drugs",
+ frightening = "Frightening",
+ severe = "Severe",
+ moderate = "Moderate",
+ mild = "Mild",
+ ),
+ )
+
+ assertEquals(listOf("Violence", "Profanity", "Nudity"), warnings.map { it.label })
+ assertEquals(listOf("Severe", "Moderate", "Mild"), warnings.map { it.severity })
+ }
+
+ @Test
+ fun `ids are extracted from common player id shapes`() {
+ assertEquals("tt15398776", extractParentalGuideImdbId("tt15398776:1:2"))
+ assertEquals("tt15398776", extractParentalGuideImdbId("series:tt15398776:1:2"))
+ assertEquals(12345, extractParentalGuideTmdbId("tmdb:12345"))
+ assertEquals(12345, extractParentalGuideTmdbId("series:tmdb:12345"))
+ }
+}
From da217c96b7bf376187f1fdd267ce6ecd50edbee6 Mon Sep 17 00:00:00 2001
From: tapframe <85391825+tapframe@users.noreply.github.com>
Date: Sat, 16 May 2026 21:15:00 +0530
Subject: [PATCH 03/10] feat: add experimental notice for debrid support in
settings
---
.../src/commonMain/composeResources/values/strings.xml | 3 ++-
.../com/nuvio/app/features/settings/DebridSettingsPage.kt | 6 ++++++
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/composeApp/src/commonMain/composeResources/values/strings.xml b/composeApp/src/commonMain/composeResources/values/strings.xml
index 14b541294..955e47cd9 100644
--- a/composeApp/src/commonMain/composeResources/values/strings.xml
+++ b/composeApp/src/commonMain/composeResources/values/strings.xml
@@ -588,8 +588,9 @@
Integrations
Metadata enrichment controls
External ratings providers
- Cloud account sources
+ Experimental cloud account sources
Debrid
+ Debrid support is experimental and may be kept, changed, or removed later.
Enable sources
Show playable results from connected accounts.
Add an API key first.
diff --git a/composeApp/src/commonMain/kotlin/com/nuvio/app/features/settings/DebridSettingsPage.kt b/composeApp/src/commonMain/kotlin/com/nuvio/app/features/settings/DebridSettingsPage.kt
index e08805036..a618b8edb 100644
--- a/composeApp/src/commonMain/kotlin/com/nuvio/app/features/settings/DebridSettingsPage.kt
+++ b/composeApp/src/commonMain/kotlin/com/nuvio/app/features/settings/DebridSettingsPage.kt
@@ -47,6 +47,7 @@ import nuvio.composeapp.generated.resources.settings_debrid_description_template
import nuvio.composeapp.generated.resources.settings_debrid_description_template_description
import nuvio.composeapp.generated.resources.settings_debrid_enable
import nuvio.composeapp.generated.resources.settings_debrid_enable_description
+import nuvio.composeapp.generated.resources.settings_debrid_experimental_notice
import nuvio.composeapp.generated.resources.settings_debrid_prepare_count_many
import nuvio.composeapp.generated.resources.settings_debrid_prepare_count_one
import nuvio.composeapp.generated.resources.settings_debrid_prepare_instant_playback
@@ -73,6 +74,11 @@ internal fun LazyListScope.debridSettingsContent(
isTablet = isTablet,
) {
SettingsGroup(isTablet = isTablet) {
+ DebridInfoRow(
+ isTablet = isTablet,
+ text = stringResource(Res.string.settings_debrid_experimental_notice),
+ )
+ SettingsGroupDivider(isTablet = isTablet)
SettingsSwitchRow(
title = stringResource(Res.string.settings_debrid_enable),
description = stringResource(Res.string.settings_debrid_enable_description),
From bcf1e65903bcbdedc3b0f793ce405ed9a05611d5 Mon Sep 17 00:00:00 2001
From: tapframe <85391825+tapframe@users.noreply.github.com>
Date: Sat, 16 May 2026 21:19:35 +0530
Subject: [PATCH 04/10] fix: android not registering hold to change profile
---
.../features/profiles/ProfileSwitcherTab.kt | 20 +++++++++++++++----
1 file changed, 16 insertions(+), 4 deletions(-)
diff --git a/composeApp/src/commonMain/kotlin/com/nuvio/app/features/profiles/ProfileSwitcherTab.kt b/composeApp/src/commonMain/kotlin/com/nuvio/app/features/profiles/ProfileSwitcherTab.kt
index 3678398e5..a399c8220 100644
--- a/composeApp/src/commonMain/kotlin/com/nuvio/app/features/profiles/ProfileSwitcherTab.kt
+++ b/composeApp/src/commonMain/kotlin/com/nuvio/app/features/profiles/ProfileSwitcherTab.kt
@@ -56,7 +56,6 @@ import androidx.compose.ui.hapticfeedback.HapticFeedbackType
import androidx.compose.ui.input.pointer.pointerInput
import androidx.compose.ui.layout.LayoutCoordinates
import androidx.compose.ui.layout.ContentScale
-import androidx.compose.ui.layout.boundsInWindow
import androidx.compose.ui.layout.onGloballyPositioned
import androidx.compose.ui.platform.LocalDensity
import androidx.compose.ui.platform.LocalHapticFeedback
@@ -76,6 +75,8 @@ import kotlinx.coroutines.launch
import nuvio.composeapp.generated.resources.*
import org.jetbrains.compose.resources.getString
import org.jetbrains.compose.resources.stringResource
+import kotlin.math.max
+import kotlin.math.min
@Composable
fun ProfileSwitcherTab(
@@ -124,9 +125,9 @@ fun ProfileSwitcherTab(
fun updateDragTarget(localPosition: Offset) {
val trigger = triggerCoordinates ?: return
- val windowPosition = trigger.localToWindow(localPosition)
+ val screenPosition = trigger.localToScreen(localPosition)
val nextTargetProfileIndex = profileBubbleBounds.entries
- .firstOrNull { (_, bounds) -> bounds.contains(windowPosition) }
+ .firstOrNull { (_, bounds) -> bounds.contains(screenPosition) }
?.key
if (nextTargetProfileIndex != null && nextTargetProfileIndex != dragTargetProfileIndex) {
performProfileHoverHaptic()
@@ -450,7 +451,7 @@ private fun PopupProfileBubble(
horizontalAlignment = Alignment.CenterHorizontally,
modifier = Modifier
.onGloballyPositioned { coordinates ->
- onBoundsChanged(coordinates.boundsInWindow())
+ onBoundsChanged(coordinates.boundsOnScreen())
}
.graphicsLayer {
alpha = itemAlpha.value
@@ -565,6 +566,17 @@ private fun PopupProfileBubble(
}
}
+private fun LayoutCoordinates.boundsOnScreen(): Rect {
+ val topLeft = localToScreen(Offset.Zero)
+ val bottomRight = localToScreen(Offset(size.width.toFloat(), size.height.toFloat()))
+ return Rect(
+ left = min(topLeft.x, bottomRight.x),
+ top = min(topLeft.y, bottomRight.y),
+ right = max(topLeft.x, bottomRight.x),
+ bottom = max(topLeft.y, bottomRight.y),
+ )
+}
+
/**
* Compact inline PIN entry shown inside the popup when a PIN-protected
* profile is tapped.
From 3c61e0d39e1ffd6a540104fe60d3bba226dad194 Mon Sep 17 00:00:00 2001
From: tapframe <85391825+tapframe@users.noreply.github.com>
Date: Sat, 16 May 2026 21:29:07 +0530
Subject: [PATCH 05/10] fix: decoder fallback handling in ExoPlayer to try app
decoders if a decoder failure occurs
---
.../features/player/PlayerEngine.android.kt | 51 +++++++++++++++++--
1 file changed, 48 insertions(+), 3 deletions(-)
diff --git a/composeApp/src/androidMain/kotlin/com/nuvio/app/features/player/PlayerEngine.android.kt b/composeApp/src/androidMain/kotlin/com/nuvio/app/features/player/PlayerEngine.android.kt
index ebdcfd924..62ebd5213 100644
--- a/composeApp/src/androidMain/kotlin/com/nuvio/app/features/player/PlayerEngine.android.kt
+++ b/composeApp/src/androidMain/kotlin/com/nuvio/app/features/player/PlayerEngine.android.kt
@@ -98,10 +98,28 @@ actual fun PlatformPlayerSurface(
val libassRenderType = runCatching {
LibassRenderType.valueOf(playerSettings.libassRenderType)
}.getOrDefault(LibassRenderType.CUES)
-
- val exoPlayer = remember(sourceUrl, sourceAudioUrl, sanitizedSourceHeaders, sanitizedSourceResponseHeaders) {
+ val playerSourceKey = listOf(
+ sourceUrl,
+ sourceAudioUrl.orEmpty(),
+ sanitizedSourceHeaders,
+ sanitizedSourceResponseHeaders,
+ useYoutubeChunkedPlayback,
+ )
+ var decoderPriorityOverride by remember(playerSourceKey) { mutableStateOf(null) }
+ var fallbackStartPositionMs by remember(playerSourceKey) { mutableStateOf(null) }
+ val effectiveDecoderPriority = decoderPriorityOverride ?: playerSettings.decoderPriority
+
+ val exoPlayer = remember(
+ sourceUrl,
+ sourceAudioUrl,
+ sanitizedSourceHeaders,
+ sanitizedSourceResponseHeaders,
+ useYoutubeChunkedPlayback,
+ effectiveDecoderPriority,
+ ) {
val renderersFactory = DefaultRenderersFactory(context)
- .setExtensionRendererMode(playerSettings.decoderPriority)
+ .setExtensionRendererMode(effectiveDecoderPriority)
+ .setEnableDecoderFallback(true)
.setMapDV7ToHevc(playerSettings.mapDV7ToHevc)
val trackSelector = DefaultTrackSelector(context).apply {
@@ -169,6 +187,7 @@ actual fun PlatformPlayerSurface(
} else {
setMediaItem(MediaItem.fromUri(sourceUrl))
}
+ fallbackStartPositionMs?.let { seekTo(it.coerceAtLeast(0L)) }
prepare()
this.playWhenReady = playWhenReady
}
@@ -191,6 +210,21 @@ actual fun PlatformPlayerSurface(
val listener = object : Player.Listener {
override fun onPlayerError(error: PlaybackException) {
syncPlayerViewKeepScreenOn()
+ if (
+ playerSettings.decoderPriority == DefaultRenderersFactory.EXTENSION_RENDERER_MODE_ON &&
+ effectiveDecoderPriority != DefaultRenderersFactory.EXTENSION_RENDERER_MODE_PREFER &&
+ error.isDecoderFailure()
+ ) {
+ Log.w(
+ TAG,
+ "Decoder failure (${error.errorCodeName}); retrying with app decoders",
+ error,
+ )
+ fallbackStartPositionMs = exoPlayer.currentPosition.coerceAtLeast(0L)
+ decoderPriorityOverride = DefaultRenderersFactory.EXTENSION_RENDERER_MODE_PREFER
+ latestOnError.value(null)
+ return
+ }
latestOnError.value(error.localizedMessage ?: runBlocking { getString(Res.string.player_unable_to_play_stream) })
}
@@ -204,6 +238,7 @@ actual fun PlatformPlayerSurface(
}
Log.d(TAG, "onPlaybackStateChanged: $stateName")
if (playbackState == Player.STATE_READY) {
+ fallbackStartPositionMs = null
latestOnError.value(null)
exoPlayer.logCurrentTracks("STATE_READY")
}
@@ -484,6 +519,16 @@ private fun ExoPlayer.shouldKeepPlayerScreenOn(): Boolean =
playWhenReady &&
playbackState in setOf(Player.STATE_BUFFERING, Player.STATE_READY)
+private fun PlaybackException.isDecoderFailure(): Boolean =
+ errorCode in setOf(
+ PlaybackException.ERROR_CODE_DECODER_INIT_FAILED,
+ PlaybackException.ERROR_CODE_DECODER_QUERY_FAILED,
+ PlaybackException.ERROR_CODE_DECODING_FAILED,
+ PlaybackException.ERROR_CODE_DECODING_FORMAT_EXCEEDS_CAPABILITIES,
+ PlaybackException.ERROR_CODE_DECODING_FORMAT_UNSUPPORTED,
+ PlaybackException.ERROR_CODE_DECODING_RESOURCES_RECLAIMED,
+ )
+
private fun PlayerResizeMode.toExoResizeMode(): Int =
when (this) {
PlayerResizeMode.Fit -> AspectRatioFrameLayout.RESIZE_MODE_FIT
From 59bfb3f26b1be911c7af927ade59b1edab8a9eba Mon Sep 17 00:00:00 2001
From: tapframe <85391825+tapframe@users.noreply.github.com>
Date: Sat, 16 May 2026 21:59:07 +0530
Subject: [PATCH 06/10] feat: add scroll to top functionality across root
screens
---
.../commonMain/kotlin/com/nuvio/app/App.kt | 71 +++++++++++++------
.../com/nuvio/app/core/ui/NativeTabBridge.kt | 12 ++--
.../com/nuvio/app/features/home/HomeScreen.kt | 9 +++
.../app/features/library/LibraryScreen.kt | 12 ++++
.../nuvio/app/features/search/SearchScreen.kt | 9 +++
.../app/features/settings/SettingsScreen.kt | 35 ++++++++-
6 files changed, 119 insertions(+), 29 deletions(-)
diff --git a/composeApp/src/commonMain/kotlin/com/nuvio/app/App.kt b/composeApp/src/commonMain/kotlin/com/nuvio/app/App.kt
index ae2f3728c..30e9ef751 100644
--- a/composeApp/src/commonMain/kotlin/com/nuvio/app/App.kt
+++ b/composeApp/src/commonMain/kotlin/com/nuvio/app/App.kt
@@ -181,6 +181,8 @@ import com.nuvio.app.features.watchprogress.WatchProgressRepository
import com.nuvio.app.features.watchprogress.nextUpDismissKey
import com.nuvio.app.features.watching.application.WatchingActions
import com.nuvio.app.features.watching.application.WatchingState
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.MutableSharedFlow
import kotlinx.coroutines.flow.collectLatest
import kotlinx.coroutines.launch
import kotlinx.serialization.Serializable
@@ -544,8 +546,11 @@ private fun MainAppContent(
val coroutineScope = rememberCoroutineScope()
var selectedTab by rememberSaveable { mutableStateOf(AppScreenTab.Home) }
var searchFocusRequestCount by remember { mutableStateOf(0) }
+ val homeScrollToTopRequests = remember { MutableSharedFlow(extraBufferCapacity = 1) }
+ val searchScrollToTopRequests = remember { MutableSharedFlow(extraBufferCapacity = 1) }
+ val libraryScrollToTopRequests = remember { MutableSharedFlow(extraBufferCapacity = 1) }
+ val settingsRootActionRequests = remember { MutableSharedFlow(extraBufferCapacity = 1) }
val currentBackStackEntry by navController.currentBackStackEntryAsState()
- val nativeRequestedTab by remember { NativeTabBridge.requestedTab }.collectAsStateWithLifecycle()
val liquidGlassNativeTabBarEnabled by remember {
ThemeSettingsRepository.liquidGlassNativeTabBarEnabled
}.collectAsStateWithLifecycle()
@@ -602,9 +607,28 @@ private fun MainAppContent(
.sorted()
}
- LaunchedEffect(nativeRequestedTab) {
- if (liquidGlassNativeTabBarSupported && liquidGlassNativeTabBarEnabled) {
- selectedTab = nativeRequestedTab.toAppScreenTab()
+ fun handleRootTabClick(tab: AppScreenTab) {
+ if (selectedTab != tab) {
+ selectedTab = tab
+ return
+ }
+
+ when (tab) {
+ AppScreenTab.Home -> homeScrollToTopRequests.tryEmit(Unit)
+ AppScreenTab.Search -> {
+ searchFocusRequestCount++
+ searchScrollToTopRequests.tryEmit(Unit)
+ }
+ AppScreenTab.Library -> libraryScrollToTopRequests.tryEmit(Unit)
+ AppScreenTab.Settings -> settingsRootActionRequests.tryEmit(Unit)
+ }
+ }
+
+ LaunchedEffect(liquidGlassNativeTabBarSupported, liquidGlassNativeTabBarEnabled) {
+ NativeTabBridge.requestedTabs.collectLatest { requestedTab ->
+ if (liquidGlassNativeTabBarSupported && liquidGlassNativeTabBarEnabled) {
+ handleRootTabClick(requestedTab.toAppScreenTab())
+ }
}
}
@@ -1059,35 +1083,29 @@ private fun MainAppContent(
NuvioNavigationBar {
NavItem(
selected = selectedTab == AppScreenTab.Home,
- onClick = { selectedTab = AppScreenTab.Home },
+ onClick = { handleRootTabClick(AppScreenTab.Home) },
icon = Icons.Filled.Home,
contentDescription = stringResource(Res.string.compose_nav_home),
)
NavItem(
selected = selectedTab == AppScreenTab.Search,
- onClick = {
- if (selectedTab == AppScreenTab.Search) {
- searchFocusRequestCount++
- } else {
- selectedTab = AppScreenTab.Search
- }
- },
+ onClick = { handleRootTabClick(AppScreenTab.Search) },
icon = Res.drawable.sidebar_search,
contentDescription = stringResource(Res.string.compose_nav_search),
)
NavItem(
selected = selectedTab == AppScreenTab.Library,
- onClick = { selectedTab = AppScreenTab.Library },
+ onClick = { handleRootTabClick(AppScreenTab.Library) },
icon = Res.drawable.sidebar_library,
contentDescription = stringResource(Res.string.compose_nav_library),
)
NavItem(
selected = selectedTab == AppScreenTab.Settings,
- onClick = { selectedTab = AppScreenTab.Settings },
+ onClick = { handleRootTabClick(AppScreenTab.Settings) },
) {
ProfileSwitcherTab(
selected = selectedTab == AppScreenTab.Settings,
- onClick = { selectedTab = AppScreenTab.Settings },
+ onClick = { handleRootTabClick(AppScreenTab.Settings) },
onProfileSelected = onProfileSelected,
onAddProfileRequested = onSwitchProfile,
)
@@ -1106,6 +1124,11 @@ private fun MainAppContent(
.padding(innerPadding),
selectedTab = selectedTab,
searchFocusRequestCount = searchFocusRequestCount,
+ rootActionsEnabled = tabsRouteActive,
+ homeScrollToTopRequests = homeScrollToTopRequests,
+ searchScrollToTopRequests = searchScrollToTopRequests,
+ libraryScrollToTopRequests = libraryScrollToTopRequests,
+ settingsRootActionRequests = settingsRootActionRequests,
animateHomeCollectionGifs = tabsRouteActive,
onCatalogClick = onCatalogClick,
onPosterClick = { meta ->
@@ -1160,13 +1183,7 @@ private fun MainAppContent(
if (isTabletLayout && !useNativeBottomTabs) {
TabletFloatingTopBar(
selectedTab = selectedTab,
- onTabSelected = { tab ->
- if (tab == AppScreenTab.Search && selectedTab == AppScreenTab.Search) {
- searchFocusRequestCount++
- } else {
- selectedTab = tab
- }
- },
+ onTabSelected = ::handleRootTabClick,
onProfileSelected = onProfileSelected,
onAddProfileRequested = onSwitchProfile,
)
@@ -2196,6 +2213,11 @@ private fun AppTabHost(
selectedTab: AppScreenTab,
modifier: Modifier = Modifier,
searchFocusRequestCount: Int = 0,
+ rootActionsEnabled: Boolean = true,
+ homeScrollToTopRequests: Flow,
+ searchScrollToTopRequests: Flow,
+ libraryScrollToTopRequests: Flow,
+ settingsRootActionRequests: Flow,
animateHomeCollectionGifs: Boolean = true,
onCatalogClick: ((HomeCatalogSection) -> Unit)? = null,
onPosterClick: ((MetaPreview) -> Unit)? = null,
@@ -2228,6 +2250,7 @@ private fun AppTabHost(
HomeScreen(
modifier = Modifier.fillMaxSize(),
animateCollectionGifs = animateHomeCollectionGifs,
+ scrollToTopRequests = homeScrollToTopRequests,
onCatalogClick = onCatalogClick,
onPosterClick = onPosterClick,
onPosterLongClick = onPosterLongClick,
@@ -2244,12 +2267,14 @@ private fun AppTabHost(
onPosterClick = onPosterClick,
onPosterLongClick = onPosterLongClick,
searchFocusRequestCount = searchFocusRequestCount,
+ scrollToTopRequests = searchScrollToTopRequests,
)
}
AppScreenTab.Library -> {
LibraryScreen(
modifier = Modifier.fillMaxSize(),
+ scrollToTopRequests = libraryScrollToTopRequests,
onPosterClick = onLibraryPosterClick,
onSectionViewAllClick = onLibrarySectionViewAllClick,
)
@@ -2258,6 +2283,8 @@ private fun AppTabHost(
AppScreenTab.Settings -> {
SettingsScreen(
modifier = Modifier.fillMaxSize(),
+ rootActionRequests = settingsRootActionRequests,
+ rootActionsEnabled = rootActionsEnabled,
onSwitchProfile = onSwitchProfile,
onHomescreenClick = onHomescreenSettingsClick,
onMetaScreenClick = onMetaScreenSettingsClick,
diff --git a/composeApp/src/commonMain/kotlin/com/nuvio/app/core/ui/NativeTabBridge.kt b/composeApp/src/commonMain/kotlin/com/nuvio/app/core/ui/NativeTabBridge.kt
index d7422533a..aa426d022 100644
--- a/composeApp/src/commonMain/kotlin/com/nuvio/app/core/ui/NativeTabBridge.kt
+++ b/composeApp/src/commonMain/kotlin/com/nuvio/app/core/ui/NativeTabBridge.kt
@@ -1,8 +1,8 @@
package com.nuvio.app.core.ui
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.StateFlow
-import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.SharedFlow
+import kotlinx.coroutines.flow.asSharedFlow
internal enum class NativeNavigationTab {
Home,
@@ -18,11 +18,11 @@ internal enum class NativeNavigationTab {
}
internal object NativeTabBridge {
- private val _requestedTab = MutableStateFlow(NativeNavigationTab.Home)
- val requestedTab: StateFlow = _requestedTab.asStateFlow()
+ private val _requestedTabs = MutableSharedFlow(extraBufferCapacity = 1)
+ val requestedTabs: SharedFlow = _requestedTabs.asSharedFlow()
fun requestTab(tabName: String) {
- _requestedTab.value = NativeNavigationTab.fromName(tabName)
+ _requestedTabs.tryEmit(NativeNavigationTab.fromName(tabName))
}
fun publishSelectedTab(tab: NativeNavigationTab) {
diff --git a/composeApp/src/commonMain/kotlin/com/nuvio/app/features/home/HomeScreen.kt b/composeApp/src/commonMain/kotlin/com/nuvio/app/features/home/HomeScreen.kt
index c3c1a2a67..aa4be057a 100644
--- a/composeApp/src/commonMain/kotlin/com/nuvio/app/features/home/HomeScreen.kt
+++ b/composeApp/src/commonMain/kotlin/com/nuvio/app/features/home/HomeScreen.kt
@@ -60,6 +60,8 @@ import com.nuvio.app.features.home.components.HomeCollectionRowSection
import com.nuvio.app.features.watchprogress.ContinueWatchingSectionStyle
import kotlinx.coroutines.async
import kotlinx.coroutines.awaitAll
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.emptyFlow
import kotlinx.coroutines.sync.Semaphore
import kotlinx.coroutines.sync.withPermit
import com.nuvio.app.features.home.components.ContinueWatchingLayout
@@ -72,6 +74,7 @@ import org.jetbrains.compose.resources.stringResource
fun HomeScreen(
modifier: Modifier = Modifier,
animateCollectionGifs: Boolean = true,
+ scrollToTopRequests: Flow = emptyFlow(),
onCatalogClick: ((HomeCatalogSection) -> Unit)? = null,
onPosterClick: ((MetaPreview) -> Unit)? = null,
onPosterLongClick: ((MetaPreview) -> Unit)? = null,
@@ -107,6 +110,12 @@ fun HomeScreen(
}.collectAsStateWithLifecycle()
var observedOfflineState by remember { mutableStateOf(false) }
+ LaunchedEffect(scrollToTopRequests) {
+ scrollToTopRequests.collect {
+ homeListState.animateScrollToItem(0)
+ }
+ }
+
LaunchedEffect(networkStatusUiState.condition) {
when (networkStatusUiState.condition) {
NetworkCondition.NoInternet,
diff --git a/composeApp/src/commonMain/kotlin/com/nuvio/app/features/library/LibraryScreen.kt b/composeApp/src/commonMain/kotlin/com/nuvio/app/features/library/LibraryScreen.kt
index 4a8f78c30..abc078a9b 100644
--- a/composeApp/src/commonMain/kotlin/com/nuvio/app/features/library/LibraryScreen.kt
+++ b/composeApp/src/commonMain/kotlin/com/nuvio/app/features/library/LibraryScreen.kt
@@ -8,6 +8,7 @@ import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.lazy.LazyListScope
import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.lazy.rememberLazyListState
import androidx.compose.material3.MaterialTheme
import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
@@ -32,6 +33,8 @@ import com.nuvio.app.features.home.components.HomeEmptyStateCard
import com.nuvio.app.features.home.components.HomePosterCard
import com.nuvio.app.features.home.components.HomeSkeletonRow
import com.nuvio.app.features.profiles.ProfileRepository
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.emptyFlow
import kotlinx.coroutines.launch
import nuvio.composeapp.generated.resources.*
import org.jetbrains.compose.resources.getString
@@ -46,6 +49,7 @@ private data class LibraryRemovalTarget(
@Composable
fun LibraryScreen(
modifier: Modifier = Modifier,
+ scrollToTopRequests: Flow = emptyFlow(),
onPosterClick: ((LibraryItem) -> Unit)? = null,
onSectionViewAllClick: ((LibrarySection) -> Unit)? = null,
) {
@@ -57,6 +61,7 @@ fun LibraryScreen(
var pendingRemovalTarget by remember { mutableStateOf(null) }
var observedOfflineState by remember { mutableStateOf(false) }
val coroutineScope = rememberCoroutineScope()
+ val listState = rememberLazyListState()
val isTraktSource = uiState.sourceMode == LibrarySourceMode.TRAKT
val retryLibraryLoad: () -> Unit = {
NetworkStatusRepository.requestRefresh(force = true)
@@ -89,9 +94,16 @@ fun LibraryScreen(
}
}
+ LaunchedEffect(scrollToTopRequests) {
+ scrollToTopRequests.collect {
+ listState.animateScrollToItem(0)
+ }
+ }
+
NuvioScreen(
modifier = modifier,
horizontalPadding = 0.dp,
+ listState = listState,
) {
stickyHeader {
androidx.compose.foundation.layout.Column(
diff --git a/composeApp/src/commonMain/kotlin/com/nuvio/app/features/search/SearchScreen.kt b/composeApp/src/commonMain/kotlin/com/nuvio/app/features/search/SearchScreen.kt
index 3d5cc814d..3720ce523 100644
--- a/composeApp/src/commonMain/kotlin/com/nuvio/app/features/search/SearchScreen.kt
+++ b/composeApp/src/commonMain/kotlin/com/nuvio/app/features/search/SearchScreen.kt
@@ -57,7 +57,9 @@ import com.nuvio.app.features.home.components.homeSectionHorizontalPaddingForWid
import com.nuvio.app.features.home.components.HomeSkeletonRow
import com.nuvio.app.features.watched.WatchedRepository
import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.flow.emptyFlow
import kotlinx.coroutines.flow.filter
import kotlinx.coroutines.flow.map
import nuvio.composeapp.generated.resources.Res
@@ -83,6 +85,7 @@ fun SearchScreen(
onPosterClick: ((MetaPreview) -> Unit)? = null,
onPosterLongClick: ((MetaPreview) -> Unit)? = null,
searchFocusRequestCount: Int = 0,
+ scrollToTopRequests: Flow = emptyFlow(),
) {
val focusRequester = remember { FocusRequester() }
@@ -115,6 +118,12 @@ fun SearchScreen(
}
}
+ LaunchedEffect(scrollToTopRequests) {
+ scrollToTopRequests.collect {
+ listState.animateScrollToItem(0)
+ }
+ }
+
val addonRefreshKey = remember(addonsUiState.addons) {
addonsUiState.addons.mapNotNull { addon ->
val manifest = addon.manifest ?: return@mapNotNull null
diff --git a/composeApp/src/commonMain/kotlin/com/nuvio/app/features/settings/SettingsScreen.kt b/composeApp/src/commonMain/kotlin/com/nuvio/app/features/settings/SettingsScreen.kt
index 519dc8d56..214422080 100644
--- a/composeApp/src/commonMain/kotlin/com/nuvio/app/features/settings/SettingsScreen.kt
+++ b/composeApp/src/commonMain/kotlin/com/nuvio/app/features/settings/SettingsScreen.kt
@@ -80,6 +80,9 @@ import com.nuvio.app.features.watchprogress.ContinueWatchingPreferencesUiState
import nuvio.composeapp.generated.resources.Res
import nuvio.composeapp.generated.resources.compose_settings_page_root
import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.emptyFlow
import kotlinx.coroutines.launch
import org.jetbrains.compose.resources.stringResource
@@ -90,6 +93,8 @@ private const val SettingsSearchRevealHapticDelayMillis = 90L
@Composable
fun SettingsScreen(
modifier: Modifier = Modifier,
+ rootActionRequests: Flow = emptyFlow(),
+ rootActionsEnabled: Boolean = true,
onSwitchProfile: (() -> Unit)? = null,
onHomescreenClick: () -> Unit = {},
onMetaScreenClick: () -> Unit = {},
@@ -200,17 +205,31 @@ fun SettingsScreen(
}
var currentPage by rememberSaveable { mutableStateOf(SettingsPage.Root.name) }
+ val scrollToTopRequests = remember { MutableSharedFlow(extraBufferCapacity = 1) }
val page = remember(currentPage) { SettingsPage.valueOf(currentPage) }
val previousPage = page.previousPage()
+ LaunchedEffect(rootActionRequests, rootActionsEnabled, page) {
+ rootActionRequests.collect {
+ if (!rootActionsEnabled) return@collect
+ val pageToOpen = page.previousPage()
+ if (pageToOpen != null) {
+ currentPage = pageToOpen.name
+ } else {
+ scrollToTopRequests.tryEmit(Unit)
+ }
+ }
+ }
+
PlatformBackHandler(
- enabled = previousPage != null,
+ enabled = rootActionsEnabled && previousPage != null,
onBack = { previousPage?.let { currentPage = it.name } },
)
if (maxWidth >= 768.dp) {
TabletSettingsScreen(
page = page,
+ scrollToTopRequests = scrollToTopRequests,
onPageChange = { currentPage = it.name },
showLoadingOverlay = playerSettingsUiState.showLoadingOverlay,
holdToSpeedEnabled = playerSettingsUiState.holdToSpeedEnabled,
@@ -259,6 +278,7 @@ fun SettingsScreen(
} else {
MobileSettingsScreen(
page = page,
+ scrollToTopRequests = scrollToTopRequests,
onPageChange = { currentPage = it.name },
showLoadingOverlay = playerSettingsUiState.showLoadingOverlay,
holdToSpeedEnabled = playerSettingsUiState.holdToSpeedEnabled,
@@ -317,6 +337,7 @@ fun SettingsScreen(
@Composable
private fun MobileSettingsScreen(
page: SettingsPage,
+ scrollToTopRequests: Flow,
onPageChange: (SettingsPage) -> Unit,
showLoadingOverlay: Boolean,
holdToSpeedEnabled: Boolean,
@@ -427,6 +448,12 @@ private fun MobileSettingsScreen(
}
}
+ LaunchedEffect(scrollToTopRequests) {
+ scrollToTopRequests.collect {
+ listState.animateScrollToItem(0)
+ }
+ }
+
NuvioScreen(
modifier = Modifier.nestedScroll(rootSearchRevealConnection),
listState = listState,
@@ -624,6 +651,7 @@ private fun rememberSettingsRootSearchRevealConnection(
@Composable
private fun TabletSettingsScreen(
page: SettingsPage,
+ scrollToTopRequests: Flow,
onPageChange: (SettingsPage) -> Unit,
showLoadingOverlay: Boolean,
holdToSpeedEnabled: Boolean,
@@ -773,6 +801,11 @@ private fun TabletSettingsScreen(
rootSearchRevealAnimating = false
}
}
+ LaunchedEffect(scrollToTopRequests) {
+ scrollToTopRequests.collect {
+ listState.animateScrollToItem(0)
+ }
+ }
LazyColumn(
state = listState,
modifier = Modifier
From 247a4f4122ddf53a870ac1cd0a9129747aba0e95 Mon Sep 17 00:00:00 2001
From: tapframe <85391825+tapframe@users.noreply.github.com>
Date: Sat, 16 May 2026 22:06:16 +0530
Subject: [PATCH 07/10] ref: block touch registering in shared headers
---
.../com/nuvio/app/core/ui/NuvioComponents.kt | 14 ++++++++++++++
.../nuvio/app/features/library/LibraryScreen.kt | 2 ++
.../com/nuvio/app/features/search/SearchScreen.kt | 12 +++---------
.../app/features/settings/SettingsComponents.kt | 5 ++++-
4 files changed, 23 insertions(+), 10 deletions(-)
diff --git a/composeApp/src/commonMain/kotlin/com/nuvio/app/core/ui/NuvioComponents.kt b/composeApp/src/commonMain/kotlin/com/nuvio/app/core/ui/NuvioComponents.kt
index 365b1a843..347fdedfe 100644
--- a/composeApp/src/commonMain/kotlin/com/nuvio/app/core/ui/NuvioComponents.kt
+++ b/composeApp/src/commonMain/kotlin/com/nuvio/app/core/ui/NuvioComponents.kt
@@ -58,6 +58,8 @@ import androidx.compose.ui.draw.clip
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.Shape
import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.input.pointer.PointerEventPass
+import androidx.compose.ui.input.pointer.pointerInput
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.text.style.TextOverflow
@@ -98,6 +100,17 @@ fun NuvioScreen(
)
}
+internal fun Modifier.nuvioBlockPointerPassthrough(): Modifier =
+ pointerInput(Unit) {
+ awaitPointerEventScope {
+ while (true) {
+ awaitPointerEvent(PointerEventPass.Final).changes.forEach { change ->
+ change.consume()
+ }
+ }
+ }
+ }
+
@Composable
fun NuvioSurfaceCard(
modifier: Modifier = Modifier,
@@ -132,6 +145,7 @@ fun NuvioScreenHeader(
Row(
modifier = modifier
.fillMaxWidth()
+ .nuvioBlockPointerPassthrough()
.background(MaterialTheme.colorScheme.background)
.padding(top = resolvedTopPadding, bottom = 4.dp),
horizontalArrangement = Arrangement.SpaceBetween,
diff --git a/composeApp/src/commonMain/kotlin/com/nuvio/app/features/library/LibraryScreen.kt b/composeApp/src/commonMain/kotlin/com/nuvio/app/features/library/LibraryScreen.kt
index abc078a9b..7febd8ea6 100644
--- a/composeApp/src/commonMain/kotlin/com/nuvio/app/features/library/LibraryScreen.kt
+++ b/composeApp/src/commonMain/kotlin/com/nuvio/app/features/library/LibraryScreen.kt
@@ -29,6 +29,7 @@ import com.nuvio.app.core.ui.NuvioStatusModal
import com.nuvio.app.core.ui.NuvioToastController
import com.nuvio.app.core.ui.NuvioViewAllPillSize
import com.nuvio.app.core.ui.NuvioShelfSection
+import com.nuvio.app.core.ui.nuvioBlockPointerPassthrough
import com.nuvio.app.features.home.components.HomeEmptyStateCard
import com.nuvio.app.features.home.components.HomePosterCard
import com.nuvio.app.features.home.components.HomeSkeletonRow
@@ -109,6 +110,7 @@ fun LibraryScreen(
androidx.compose.foundation.layout.Column(
modifier = Modifier
.fillMaxWidth()
+ .nuvioBlockPointerPassthrough()
.background(MaterialTheme.colorScheme.background),
) {
NuvioScreenHeader(
diff --git a/composeApp/src/commonMain/kotlin/com/nuvio/app/features/search/SearchScreen.kt b/composeApp/src/commonMain/kotlin/com/nuvio/app/features/search/SearchScreen.kt
index 3720ce523..adcaa7e64 100644
--- a/composeApp/src/commonMain/kotlin/com/nuvio/app/features/search/SearchScreen.kt
+++ b/composeApp/src/commonMain/kotlin/com/nuvio/app/features/search/SearchScreen.kt
@@ -35,7 +35,6 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.Alignment
import androidx.compose.ui.focus.FocusRequester
import androidx.compose.ui.focus.focusRequester
-import androidx.compose.ui.input.pointer.pointerInput
import androidx.compose.ui.unit.Dp
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.style.TextOverflow
@@ -47,6 +46,7 @@ import com.nuvio.app.core.ui.NuvioInputField
import com.nuvio.app.core.ui.NuvioScreen
import com.nuvio.app.core.ui.NuvioNetworkOfflineCard
import com.nuvio.app.core.ui.NuvioScreenHeader
+import com.nuvio.app.core.ui.nuvioBlockPointerPassthrough
import com.nuvio.app.core.ui.withDuplicateSafeLazyKeys
import com.nuvio.app.features.addons.AddonRepository
import com.nuvio.app.features.home.HomeCatalogSettingsRepository
@@ -241,14 +241,8 @@ fun SearchScreen(
androidx.compose.foundation.layout.Column(
modifier = Modifier
.fillMaxWidth()
- .background(MaterialTheme.colorScheme.background)
- .pointerInput(Unit) {
- awaitPointerEventScope {
- while (true) {
- awaitPointerEvent()
- }
- }
- },
+ .nuvioBlockPointerPassthrough()
+ .background(MaterialTheme.colorScheme.background),
) {
NuvioScreenHeader(
title = headerTitle,
diff --git a/composeApp/src/commonMain/kotlin/com/nuvio/app/features/settings/SettingsComponents.kt b/composeApp/src/commonMain/kotlin/com/nuvio/app/features/settings/SettingsComponents.kt
index c8e2e4183..b526a0584 100644
--- a/composeApp/src/commonMain/kotlin/com/nuvio/app/features/settings/SettingsComponents.kt
+++ b/composeApp/src/commonMain/kotlin/com/nuvio/app/features/settings/SettingsComponents.kt
@@ -48,6 +48,7 @@ import androidx.compose.ui.unit.dp
import com.nuvio.app.core.ui.NuvioActionLabel
import com.nuvio.app.core.ui.NuvioBackButton
import com.nuvio.app.core.ui.NuvioSectionLabel
+import com.nuvio.app.core.ui.nuvioBlockPointerPassthrough
import com.nuvio.app.features.home.HomeCatalogSettingsItem
import nuvio.composeapp.generated.resources.Res
import nuvio.composeapp.generated.resources.settings_homescreen_collection_with_addon
@@ -113,7 +114,9 @@ internal fun TabletPageHeader(
onBack: () -> Unit,
) {
Row(
- modifier = Modifier.fillMaxWidth(),
+ modifier = Modifier
+ .fillMaxWidth()
+ .nuvioBlockPointerPassthrough(),
verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.spacedBy(12.dp),
) {
From 7a5c531a24dafcb69deb779dd579288b82c95325 Mon Sep 17 00:00:00 2001
From: tapframe <85391825+tapframe@users.noreply.github.com>
Date: Sun, 17 May 2026 19:19:38 +0530
Subject: [PATCH 08/10] fix: hiding of controls while scrubbing is active
fixes #1100
---
.../nuvio/app/features/player/PlayerScreen.kt | 27 ++++++++++++++++---
1 file changed, 24 insertions(+), 3 deletions(-)
diff --git a/composeApp/src/commonMain/kotlin/com/nuvio/app/features/player/PlayerScreen.kt b/composeApp/src/commonMain/kotlin/com/nuvio/app/features/player/PlayerScreen.kt
index fa29d9db0..34ac6e924 100644
--- a/composeApp/src/commonMain/kotlin/com/nuvio/app/features/player/PlayerScreen.kt
+++ b/composeApp/src/commonMain/kotlin/com/nuvio/app/features/player/PlayerScreen.kt
@@ -228,6 +228,7 @@ fun PlayerScreen(
val keepScreenAwake = errorMessage == null &&
(playbackSnapshot.isPlaying || (shouldPlay && playbackSnapshot.isLoading))
EnterImmersivePlayerMode(keepScreenAwake = keepScreenAwake)
+ var isScrubbingTimeline by remember { mutableStateOf(false) }
var scrubbingPositionMs by remember { mutableStateOf(null) }
var pausedOverlayVisible by remember { mutableStateOf(false) }
var gestureFeedback by remember { mutableStateOf(null) }
@@ -600,6 +601,7 @@ fun PlayerScreen(
controlsVisible = false
lockedOverlayVisible = false
pausedOverlayVisible = false
+ isScrubbingTimeline = false
scrubbingPositionMs = null
gestureMessageJob?.cancel()
gestureFeedback = null
@@ -1228,6 +1230,7 @@ fun PlayerScreen(
playerController = null
playerControllerSourceUrl = null
playbackSnapshot = PlayerPlaybackSnapshot()
+ isScrubbingTimeline = false
scrubbingPositionMs = null
liveGestureFeedback = null
renderedGestureFeedback = null
@@ -1325,8 +1328,22 @@ fun PlayerScreen(
initialSeekApplied = true
}
- LaunchedEffect(controlsVisible, playbackSnapshot.isPlaying, playbackSnapshot.isLoading, showParentalGuide, errorMessage) {
- if (!controlsVisible || !playbackSnapshot.isPlaying || playbackSnapshot.isLoading || showParentalGuide || errorMessage != null) {
+ LaunchedEffect(
+ controlsVisible,
+ isScrubbingTimeline,
+ playbackSnapshot.isPlaying,
+ playbackSnapshot.isLoading,
+ showParentalGuide,
+ errorMessage,
+ ) {
+ if (
+ !controlsVisible ||
+ isScrubbingTimeline ||
+ !playbackSnapshot.isPlaying ||
+ playbackSnapshot.isLoading ||
+ showParentalGuide ||
+ errorMessage != null
+ ) {
return@LaunchedEffect
}
delay(3500)
@@ -1794,8 +1811,12 @@ fun PlayerScreen(
parentalWarnings = parentalWarnings,
showParentalGuide = showParentalGuide,
onParentalGuideAnimationComplete = { showParentalGuide = false },
- onScrubChange = { positionMs -> scrubbingPositionMs = positionMs },
+ onScrubChange = { positionMs ->
+ isScrubbingTimeline = true
+ scrubbingPositionMs = positionMs
+ },
onScrubFinished = { positionMs ->
+ isScrubbingTimeline = false
scrubbingPositionMs = null
playerController?.seekTo(positionMs)
},
From f8eb52c29945485d7e1c88806ac6b9f23e3156fa Mon Sep 17 00:00:00 2001
From: tapframe <85391825+tapframe@users.noreply.github.com>
Date: Sun, 17 May 2026 19:34:02 +0530
Subject: [PATCH 09/10] feat: remaining places to use bottomsheetmodal
---
.../commonMain/kotlin/com/nuvio/app/App.kt | 111 +++++++++++++-----
.../app/features/catalog/CatalogScreen.kt | 5 +-
.../app/features/library/LibraryScreen.kt | 63 +---------
3 files changed, 91 insertions(+), 88 deletions(-)
diff --git a/composeApp/src/commonMain/kotlin/com/nuvio/app/App.kt b/composeApp/src/commonMain/kotlin/com/nuvio/app/App.kt
index 30e9ef751..4058c118a 100644
--- a/composeApp/src/commonMain/kotlin/com/nuvio/app/App.kt
+++ b/composeApp/src/commonMain/kotlin/com/nuvio/app/App.kt
@@ -126,6 +126,7 @@ import com.nuvio.app.features.library.LibrarySection
import com.nuvio.app.features.library.LibrarySourceMode
import com.nuvio.app.features.library.LibraryScreen
import com.nuvio.app.features.library.toLibraryItem
+import com.nuvio.app.features.library.toMetaPreview
import com.nuvio.app.features.notifications.EpisodeReleaseNotificationsRepository
import com.nuvio.app.features.player.PlayerLaunch
import com.nuvio.app.features.player.PlayerLaunchStore
@@ -276,6 +277,12 @@ data class CatalogRoute(
val genre: String? = null,
)
+private data class PosterActionTarget(
+ val preview: MetaPreview,
+ val libraryItem: LibraryItem? = null,
+ val libraryListKey: String? = null,
+)
+
enum class AppScreenTab {
Home,
Search,
@@ -556,7 +563,7 @@ private fun MainAppContent(
}.collectAsStateWithLifecycle()
val liquidGlassNativeTabBarSupported = remember { isLiquidGlassNativeTabBarSupported() }
var showExitConfirmation by rememberSaveable { mutableStateOf(false) }
- var selectedPosterForActions by remember { mutableStateOf(null) }
+ var selectedPosterActionTarget by remember { mutableStateOf(null) }
var selectedContinueWatchingForActions by remember { mutableStateOf(null) }
var showLibraryListPicker by remember { mutableStateOf(false) }
var pickerItem by remember { mutableStateOf(null) }
@@ -1136,11 +1143,19 @@ private fun MainAppContent(
},
onPosterLongClick = { meta ->
hapticFeedback.performHapticFeedback(HapticFeedbackType.LongPress)
- selectedPosterForActions = meta
+ selectedPosterActionTarget = PosterActionTarget(preview = meta)
},
onLibraryPosterClick = { item ->
navController.navigate(DetailRoute(type = item.type, id = item.id))
},
+ onLibraryPosterLongClick = { item, section ->
+ hapticFeedback.performHapticFeedback(HapticFeedbackType.LongPress)
+ selectedPosterActionTarget = PosterActionTarget(
+ preview = item.toMetaPreview(),
+ libraryItem = item,
+ libraryListKey = section.type,
+ )
+ },
onLibrarySectionViewAllClick = onLibrarySectionViewAllClick,
onContinueWatchingClick = onContinueWatchingClick,
onContinueWatchingLongPress = onContinueWatchingLongPress,
@@ -1832,6 +1847,18 @@ private fun MainAppContent(
onPosterClick = { meta ->
navController.navigate(DetailRoute(type = meta.type, id = meta.id))
},
+ onPosterLongClick = { meta ->
+ hapticFeedback.performHapticFeedback(HapticFeedbackType.LongPress)
+ selectedPosterActionTarget = if (route.manifestUrl == INTERNAL_LIBRARY_MANIFEST_URL) {
+ PosterActionTarget(
+ preview = meta,
+ libraryItem = meta.toLibraryItem(savedAtEpochMs = 0L),
+ libraryListKey = route.catalogId,
+ )
+ } else {
+ PosterActionTarget(preview = meta)
+ }
+ },
modifier = Modifier.fillMaxSize(),
)
}
@@ -1997,48 +2024,74 @@ private fun MainAppContent(
}
NuvioPosterActionSheet(
- item = selectedPosterForActions,
- isSaved = selectedPosterForActions?.let { preview ->
+ item = selectedPosterActionTarget?.preview,
+ isSaved = selectedPosterActionTarget?.preview?.let { preview ->
LibraryRepository.isSaved(preview.id, preview.type)
} == true,
- isWatched = selectedPosterForActions?.let { preview ->
+ isWatched = selectedPosterActionTarget?.preview?.let { preview ->
WatchingState.isPosterWatched(
watchedKeys = watchedUiState.watchedKeys,
item = preview,
)
} == true,
- onDismiss = { selectedPosterForActions = null },
+ onDismiss = { selectedPosterActionTarget = null },
onToggleLibrary = {
- selectedPosterForActions?.let { preview ->
- val libraryItem = preview.toLibraryItem(savedAtEpochMs = 0L)
- if (!isTraktLibrarySource) {
- LibraryRepository.toggleSaved(libraryItem)
+ selectedPosterActionTarget?.let { target ->
+ val preview = target.preview
+ val libraryItem = target.libraryItem ?: preview.toLibraryItem(savedAtEpochMs = 0L)
+ if (target.libraryItem != null) {
+ if (isTraktLibrarySource) {
+ coroutineScope.launch {
+ runCatching {
+ val listKey = target.libraryListKey
+ if (listKey.isNullOrBlank()) {
+ val currentMembership = LibraryRepository.getMembershipSnapshot(libraryItem)
+ LibraryRepository.applyMembershipChanges(
+ item = libraryItem,
+ desiredMembership = currentMembership.mapValues { false },
+ )
+ } else {
+ LibraryRepository.removeFromList(libraryItem, listKey)
+ }
+ }.onFailure { error ->
+ NuvioToastController.show(
+ error.message ?: getString(Res.string.trakt_lists_update_failed),
+ )
+ }
+ }
+ } else {
+ LibraryRepository.remove(libraryItem.id)
+ }
} else {
- pickerItem = libraryItem
- pickerTitle = preview.name
- pickerTabs = LibraryRepository.libraryListTabs()
- pickerMembership = pickerTabs.associate { it.key to false }
- pickerPending = true
- pickerError = null
- showLibraryListPicker = true
- coroutineScope.launch {
- runCatching {
- val snapshot = LibraryRepository.getMembershipSnapshot(libraryItem)
- val tabs = LibraryRepository.libraryListTabs()
- pickerTabs = tabs
- pickerMembership = tabs.associate { tab ->
- tab.key to (snapshot[tab.key] == true)
+ if (!isTraktLibrarySource) {
+ LibraryRepository.toggleSaved(libraryItem)
+ } else {
+ pickerItem = libraryItem
+ pickerTitle = preview.name
+ pickerTabs = LibraryRepository.libraryListTabs()
+ pickerMembership = pickerTabs.associate { it.key to false }
+ pickerPending = true
+ pickerError = null
+ showLibraryListPicker = true
+ coroutineScope.launch {
+ runCatching {
+ val snapshot = LibraryRepository.getMembershipSnapshot(libraryItem)
+ val tabs = LibraryRepository.libraryListTabs()
+ pickerTabs = tabs
+ pickerMembership = tabs.associate { tab ->
+ tab.key to (snapshot[tab.key] == true)
+ }
+ }.onFailure { error ->
+ pickerError = error.message ?: getString(Res.string.trakt_lists_load_failed)
}
- }.onFailure { error ->
- pickerError = error.message ?: getString(Res.string.trakt_lists_load_failed)
+ pickerPending = false
}
- pickerPending = false
}
}
}
},
onToggleWatched = {
- selectedPosterForActions?.let { preview ->
+ selectedPosterActionTarget?.preview?.let { preview ->
coroutineScope.launch {
WatchingActions.togglePosterWatched(preview)
}
@@ -2223,6 +2276,7 @@ private fun AppTabHost(
onPosterClick: ((MetaPreview) -> Unit)? = null,
onPosterLongClick: ((MetaPreview) -> Unit)? = null,
onLibraryPosterClick: ((LibraryItem) -> Unit)? = null,
+ onLibraryPosterLongClick: ((LibraryItem, LibrarySection) -> Unit)? = null,
onLibrarySectionViewAllClick: ((LibrarySection) -> Unit)? = null,
onContinueWatchingClick: ((ContinueWatchingItem) -> Unit)? = null,
onContinueWatchingLongPress: ((ContinueWatchingItem) -> Unit)? = null,
@@ -2276,6 +2330,7 @@ private fun AppTabHost(
modifier = Modifier.fillMaxSize(),
scrollToTopRequests = libraryScrollToTopRequests,
onPosterClick = onLibraryPosterClick,
+ onPosterLongClick = onLibraryPosterLongClick,
onSectionViewAllClick = onLibrarySectionViewAllClick,
)
}
diff --git a/composeApp/src/commonMain/kotlin/com/nuvio/app/features/catalog/CatalogScreen.kt b/composeApp/src/commonMain/kotlin/com/nuvio/app/features/catalog/CatalogScreen.kt
index f58cd2dfb..c611b1613 100644
--- a/composeApp/src/commonMain/kotlin/com/nuvio/app/features/catalog/CatalogScreen.kt
+++ b/composeApp/src/commonMain/kotlin/com/nuvio/app/features/catalog/CatalogScreen.kt
@@ -72,6 +72,7 @@ fun CatalogScreen(
genre: String? = null,
onBack: () -> Unit,
onPosterClick: ((MetaPreview) -> Unit)? = null,
+ onPosterLongClick: ((MetaPreview) -> Unit)? = null,
modifier: Modifier = Modifier,
) {
val uiState by CatalogRepository.uiState.collectAsStateWithLifecycle()
@@ -187,6 +188,7 @@ fun CatalogScreen(
cornerRadiusDp = posterCardStyle.cornerRadiusDp,
hideLabels = posterCardStyle.hideLabelsEnabled,
onClick = onPosterClick?.let { { it(item) } },
+ onLongClick = onPosterLongClick?.let { { it(item) } },
)
}
if (uiState.isLoading) {
@@ -257,6 +259,7 @@ private fun CatalogPosterTile(
cornerRadiusDp: Int,
hideLabels: Boolean,
onClick: (() -> Unit)? = null,
+ onLongClick: (() -> Unit)? = null,
) {
Column(
verticalArrangement = Arrangement.spacedBy(8.dp),
@@ -267,7 +270,7 @@ private fun CatalogPosterTile(
.aspectRatio(item.posterShape.catalogAspectRatio())
.clip(RoundedCornerShape(cornerRadiusDp.dp))
.background(MaterialTheme.colorScheme.surface)
- .posterCardClickable(onClick = onClick, onLongClick = null),
+ .posterCardClickable(onClick = onClick, onLongClick = onLongClick),
) {
if (item.poster != null) {
AsyncImage(
diff --git a/composeApp/src/commonMain/kotlin/com/nuvio/app/features/library/LibraryScreen.kt b/composeApp/src/commonMain/kotlin/com/nuvio/app/features/library/LibraryScreen.kt
index 7febd8ea6..dc75e1011 100644
--- a/composeApp/src/commonMain/kotlin/com/nuvio/app/features/library/LibraryScreen.kt
+++ b/composeApp/src/commonMain/kotlin/com/nuvio/app/features/library/LibraryScreen.kt
@@ -25,8 +25,6 @@ import com.nuvio.app.core.network.NetworkStatusRepository
import com.nuvio.app.core.ui.NuvioScreen
import com.nuvio.app.core.ui.NuvioNetworkOfflineCard
import com.nuvio.app.core.ui.NuvioScreenHeader
-import com.nuvio.app.core.ui.NuvioStatusModal
-import com.nuvio.app.core.ui.NuvioToastController
import com.nuvio.app.core.ui.NuvioViewAllPillSize
import com.nuvio.app.core.ui.NuvioShelfSection
import com.nuvio.app.core.ui.nuvioBlockPointerPassthrough
@@ -38,20 +36,14 @@ import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.emptyFlow
import kotlinx.coroutines.launch
import nuvio.composeapp.generated.resources.*
-import org.jetbrains.compose.resources.getString
import org.jetbrains.compose.resources.stringResource
-private data class LibraryRemovalTarget(
- val item: LibraryItem,
- val listKey: String? = null,
- val listTitle: String? = null,
-)
-
@Composable
fun LibraryScreen(
modifier: Modifier = Modifier,
scrollToTopRequests: Flow = emptyFlow(),
onPosterClick: ((LibraryItem) -> Unit)? = null,
+ onPosterLongClick: ((LibraryItem, LibrarySection) -> Unit)? = null,
onSectionViewAllClick: ((LibrarySection) -> Unit)? = null,
) {
val uiState by remember {
@@ -59,7 +51,6 @@ fun LibraryScreen(
LibraryRepository.uiState
}.collectAsStateWithLifecycle()
val networkStatusUiState by NetworkStatusRepository.uiState.collectAsStateWithLifecycle()
- var pendingRemovalTarget by remember { mutableStateOf(null) }
var observedOfflineState by remember { mutableStateOf(false) }
val coroutineScope = rememberCoroutineScope()
val listState = rememberLazyListState()
@@ -187,64 +178,18 @@ fun LibraryScreen(
sections = uiState.sections,
onPosterClick = onPosterClick,
onSectionViewAllClick = onSectionViewAllClick,
- onPosterLongClick = { item, section ->
- pendingRemovalTarget = if (isTraktSource) {
- LibraryRemovalTarget(
- item = item,
- listKey = section.type,
- listTitle = section.displayTitle,
- )
- } else {
- LibraryRemovalTarget(item = item)
- }
- },
+ onPosterLongClick = onPosterLongClick,
)
}
}
}
-
- NuvioStatusModal(
- title = stringResource(Res.string.library_remove_title),
- message = pendingRemovalTarget?.let { target ->
- val listTitle = target.listTitle
- if (listTitle.isNullOrBlank()) {
- stringResource(Res.string.library_remove_message, target.item.name)
- } else {
- stringResource(Res.string.library_remove_from_list_message, target.item.name, listTitle)
- }
- }.orEmpty(),
- isVisible = pendingRemovalTarget != null,
- confirmText = stringResource(Res.string.library_remove_confirm),
- dismissText = stringResource(Res.string.action_cancel),
- onConfirm = {
- val target = pendingRemovalTarget
- pendingRemovalTarget = null
- target?.let {
- val listKey = target.listKey
- if (listKey.isNullOrBlank()) {
- LibraryRepository.remove(target.item.id)
- } else {
- coroutineScope.launch {
- runCatching {
- LibraryRepository.removeFromList(target.item, listKey)
- }.onFailure { error ->
- NuvioToastController.show(
- error.message ?: getString(Res.string.trakt_lists_update_failed),
- )
- }
- }
- }
- }
- },
- onDismiss = { pendingRemovalTarget = null },
- )
}
private fun LazyListScope.librarySections(
sections: List,
onPosterClick: ((LibraryItem) -> Unit)?,
onSectionViewAllClick: ((LibrarySection) -> Unit)?,
- onPosterLongClick: (LibraryItem, LibrarySection) -> Unit,
+ onPosterLongClick: ((LibraryItem, LibrarySection) -> Unit)?,
) {
items(
items = sections,
@@ -267,7 +212,7 @@ private fun LazyListScope.librarySections(
HomePosterCard(
item = item.toMetaPreview(),
onClick = onPosterClick?.let { { it(item) } },
- onLongClick = { onPosterLongClick(item, section) },
+ onLongClick = onPosterLongClick?.let { { it(item, section) } },
)
}
}
From 85ce75e59de214c68e8c4fcb986a12fe93ff2029 Mon Sep 17 00:00:00 2001
From: "openai-code-agent[bot]" <242516109+Codex@users.noreply.github.com>
Date: Mon, 18 May 2026 14:37:45 +0000
Subject: [PATCH 10/10] merge: bring feat/mediamp-sg-rework into cmp-rewrite
Co-authored-by: CreepsoOff <51055703+CreepsoOff@users.noreply.github.com>
---
.github/copilot-commit-instructions.md | 22 +
.github/workflows/copilot-setup-steps.yml | 254 ++++
.gitignore | 42 +-
.gitmodules | 4 +
README.md | 32 +-
composeApp/build.gradle.kts | 473 ++++++-
composeApp/desktop-proguard-rules.pro | 62 +
composeApp/scripts/package-release-inno.ps1 | 138 ++
.../updater/AppUpdaterPlatform.android.kt | 23 +-
.../kotlin/com/nuvio/app/Platform.android.kt | 3 +-
.../ui/DesktopContextMenuPointer.android.kt | 5 +
...esktopHorizontalLazyRowGestures.android.kt | 6 +
.../ui/NuvioImageDecodeQuality.android.kt | 4 +
.../ui/PosterCardStylePlatform.android.kt | 4 +
.../CollectionCardRemoteImage.android.kt | 17 +-
.../player/PlayerLibassSupport.android.kt | 3 +
.../player/PlayerPlatformEffects.android.kt | 26 +
.../player/PlayerPlaybackNetworking.kt | 29 -
.../player/PlayerRuntimeTrace.android.kt | 15 +
.../AlwaysAnimateGifPreference.android.kt | 7 +
.../settings/AppLanguageDefaults.android.kt | 8 +
.../DebugLogsSettingsSection.android.kt | 8 +
.../DesktopDecoderSettingsSection.android.kt | 8 +
.../KeybindsSettingsContent.android.kt | 6 +
.../PlatformPlaybackLicense.android.kt | 19 +
.../PlatformSettingsSearch.android.kt | 6 +
.../settings/ThemeSettingsStorage.android.kt | 30 +-
.../updater/AppUpdaterPlatform.android.kt | 23 +-
.../drawable/nuvio_window_icon.png | Bin 0 -> 73029 bytes
.../composeResources/values-el/strings.xml | 2 +
.../composeResources/values-es/strings.xml | 2 +
.../composeResources/values-fr/strings.xml | 91 +-
.../composeResources/values-it/strings.xml | 2 +
.../composeResources/values-pl/strings.xml | 2 +
.../composeResources/values-pt/strings.xml | 2 +
.../composeResources/values-tr/strings.xml | 2 +
.../composeResources/values/strings.xml | 47 +-
.../commonMain/kotlin/com/nuvio/app/App.kt | 145 ++-
.../kotlin/com/nuvio/app/Platform.kt | 3 +-
.../com/nuvio/app/core/auth/AuthRepository.kt | 19 +-
.../nuvio/app/core/logging/SafeLogRedactor.kt | 49 +
.../app/core/network/SupabaseProvider.kt | 6 +
.../app/core/sync/ProfileSettingsSync.kt | 2 +
.../app/core/ui/DesktopContextMenuPointer.kt | 9 +
.../ui/DesktopHorizontalLazyRowGestures.kt | 6 +
.../ui/NuvioContinueWatchingActionSheet.kt | 1 +
.../app/core/ui/NuvioPosterActionSheet.kt | 1 +
.../nuvio/app/core/ui/NuvioShelfComponents.kt | 154 ++-
.../app/core/ui/PosterCardStyleRepository.kt | 76 +-
.../nuvio/app/core/ui/SizedImageRequest.kt | 54 +
.../app/features/addons/AddonRepository.kt | 3 +-
.../app/features/catalog/CatalogScreen.kt | 2 +
.../collection/CollectionEditorRepository.kt | 4 +-
.../collection/CollectionEditorScreen.kt | 38 +-
.../features/collection/FolderDetailScreen.kt | 6 +-
.../TmdbCollectionSourceResolver.kt | 10 +-
.../features/details/MetaDetailsRepository.kt | 8 +-
.../app/features/details/MetaDetailsScreen.kt | 2 +
.../features/details/PersonDetailScreen.kt | 44 +-
.../details/TmdbEntityBrowseScreen.kt | 3 +
.../details/components/DetailActionButtons.kt | 3 +
.../details/components/DetailCastSection.kt | 25 +-
.../components/DetailFloatingHeader.kt | 4 +
.../features/details/components/DetailHero.kt | 14 +-
.../components/DetailProductionSection.kt | 11 +-
.../details/components/DetailSeriesContent.kt | 28 +-
.../components/DetailTrailersSection.kt | 2 +
.../features/downloads/DownloadsRepository.kt | 4 +-
.../com/nuvio/app/features/home/HomeScreen.kt | 24 +-
.../components/CollectionCardRemoteImage.kt | 4 +-
.../components/HomeCollectionRowSection.kt | 55 +-
.../components/HomeContinueWatchingSection.kt | 63 +-
.../home/components/HomeHeroSection.kt | 11 +-
.../app/features/library/LibraryRepository.kt | 27 +
.../features/player/ExternalPlayerPlatform.kt | 2 +
.../app/features/player/PlayerControls.kt | 170 ++-
.../nuvio/app/features/player/PlayerEngine.kt | 70 +
.../features/player/PlayerEpisodesPanel.kt | 2 +
.../features/player/PlayerLibassSupport.kt | 3 +
.../features/player/PlayerPlatformEffects.kt | 38 +
.../app/features/player/PlayerRuntimeTrace.kt | 6 +
.../nuvio/app/features/player/PlayerScreen.kt | 338 ++++-
.../features/player/skip/NextEpisodeCard.kt | 2 +
.../features/profiles/ProfileEditScreen.kt | 22 +-
.../profiles/ProfileSelectionScreen.kt | 11 +-
.../features/profiles/ProfileSwitcherTab.kt | 32 +-
.../features/search/SearchDiscoverContent.kt | 31 +-
.../settings/AlwaysAnimateGifPreference.kt | 7 +
.../app/features/settings/AppLanguage.kt | 12 +-
.../features/settings/AppLanguageDefaults.kt | 5 +
.../settings/DebugLogsSettingsSection.kt | 6 +
.../settings/DesktopDecoderSettingsSection.kt | 6 +
.../settings/KeybindsSettingsContent.kt | 6 +
.../settings/LicensesAttributionsPage.kt | 50 +-
.../settings/NotificationsSettingsPage.kt | 4 +-
.../settings/PlatformSettingsSearch.kt | 14 +
.../features/settings/PlaybackSettingsPage.kt | 32 +-
.../PosterCustomizationSettingsPage.kt | 65 +-
.../features/settings/SettingsComponents.kt | 8 +-
.../app/features/settings/SettingsRootPage.kt | 18 +
.../app/features/settings/SettingsScreen.kt | 14 +
.../app/features/settings/SettingsSearch.kt | 2 +
.../settings/SupportersContributorsPage.kt | 121 +-
.../features/settings/TraktSettingsPage.kt | 2 +-
.../app/features/streams/StreamsRepository.kt | 3 +-
.../app/features/streams/StreamsScreen.kt | 2 +
.../features/trakt/TraktCommentsRepository.kt | 3 +-
.../nuvio/app/features/trakt/TraktIdUtils.kt | 4 +-
.../features/trakt/TraktLibraryRepository.kt | 3 +-
.../trakt/TraktPublicListSourceResolver.kt | 12 +-
.../nuvio/app/features/updater/AppUpdater.kt | 508 +++++++-
.../features/updater/AppUpdaterPlatform.kt | 27 +-
.../watchprogress/WatchProgressRepository.kt | 2 +
.../app/core/format/ReleaseDateDisplayTest.kt | 7 +
.../details/SeriesPlaybackResolverTest.kt | 7 +
.../nuvio/app/features/home/HomeScreenTest.kt | 63 +-
.../updater/AppUpdateVersionComparatorTest.kt | 128 ++
.../watching/domain/SeriesContinuityTest.kt | 7 +
.../nuvio/app/testing/LanguageTestSupport.kt | 10 +
.../kotlin/com/nuvio/app/DesktopApp.kt | 316 +++++
.../nuvio/app/DesktopWindowLocals.desktop.kt | 5 +
.../kotlin/com/nuvio/app/Platform.desktop.kt | 10 +
.../app/core/auth/AuthStorage.desktop.kt | 19 +
.../core/build/AppFeaturePolicy.desktop.kt | 6 +-
...PlatformLocalAccountDataCleaner.desktop.kt | 38 +
.../core/sync/AppForegroundMonitor.desktop.kt | 12 +
.../ui/DesktopContextMenuPointer.desktop.kt | 16 +
...esktopHorizontalLazyRowGestures.desktop.kt | 53 +
.../nuvio/app/core/ui/DesktopUi.desktop.kt | 63 +
.../app/core/ui/NativeTabBridge.desktop.kt | 18 +
.../ui/NuvioImageDecodeQuality.desktop.kt | 18 +
.../ui/PosterCardStylePlatform.desktop.kt | 11 +
.../DesktopBorderlessFullscreenController.kt | 301 +++++
...DesktopExternalPlaybackWindowController.kt | 45 +
.../app/desktop/DesktopPlayerRegistry.kt | 96 ++
.../nuvio/app/desktop/DesktopPreferences.kt | 124 ++
.../nuvio/app/desktop/DesktopRuntimeLog.kt | 167 +++
.../desktop/DesktopSingleInstanceManager.kt | 242 ++++
.../nuvio/app/desktop/DesktopUriHandler.kt | 56 +
.../app/desktop/DesktopWindowStateStore.kt | 41 +
.../app/desktop/WindowsNativeBootstrap.kt | 204 +++
.../desktop/WindowsUrlProtocolRegistrar.kt | 195 +++
.../features/addons/AddonPlatform.desktop.kt | 262 ++++
...CollectionMobileSettingsStorage.desktop.kt | 37 +
.../collection/CollectionStorage.desktop.kt | 16 +
.../debrid/DebridSettingsStorage.desktop.kt | 110 ++
.../details/DetailsDesktop.desktop.kt | 34 +
.../downloads/DownloadsDesktop.desktop.kt | 74 ++
.../HomeCatalogSettingsStorage.desktop.kt | 16 +
.../CollectionCardRemoteImage.desktop.kt | 506 ++++++++
.../library/LibraryDesktop.desktop.kt | 19 +
.../mdblist/MdbListSettingsStorage.desktop.kt | 131 ++
.../NotificationsDesktop.desktop.kt | 149 +++
.../notifications/WindowsToastHelper.kt | 352 +++++
.../player/ExternalPlayerPlatform.desktop.kt | 117 ++
.../app/features/player/KeybindsStorage.kt | 84 ++
.../app/features/player/NativePlayerBridge.kt | 295 +++++
.../features/player/PlayerDesktop.desktop.kt | 1151 +++++++++++++++++
.../player/PlayerLibassSupport.desktop.kt | 5 +
.../player/PlayerRuntimeTrace.desktop.kt | 13 +
.../player/WindowsExternalPlayerSupport.kt | 297 +++++
.../player/desktop/DesktopPlayerBackend.kt | 22 +
.../desktop/DesktopPlayerBackendFactory.kt | 119 ++
.../player/desktop/DesktopPlayerError.kt | 114 ++
.../player/desktop/DesktopPlayerRequest.kt | 14 +
.../player/desktop/DesktopPlayerState.kt | 37 +
.../desktop/DesktopPlayerSurfaceHost.kt | 113 ++
.../UnavailableDesktopPlayerBackend.kt | 56 +
.../player/desktop/WindowsDisplayWakeLock.kt | 95 ++
.../desktop/mpv/DesktopMpvPlaybackSettings.kt | 51 +
.../desktop/mpv/MpvDesktopPlayerBackend.kt | 805 ++++++++++++
.../desktop/mpv/MpvDesktopPlayerSurface.kt | 17 +
.../player/desktop/mpv/MpvDiagnostics.kt | 20 +
.../player/desktop/mpv/MpvPropertyAccess.kt | 28 +
.../player/desktop/mpv/MpvResizeMapper.kt | 21 +
.../player/desktop/mpv/MpvRuntimeBootstrap.kt | 94 ++
.../player/desktop/mpv/MpvRuntimeLocator.kt | 104 ++
.../player/desktop/mpv/MpvStateMapper.kt | 16 +
.../player/desktop/mpv/MpvTrackMapper.kt | 49 +
.../NativeBridgeDesktopPlayerBackend.kt | 341 +++++
.../nativebridge/NativeBridgeJnaApi.kt | 5 +
.../NativeBridgeRuntimeLocator.kt | 33 +
.../nativebridge/NativeBridgeStateMapper.kt | 28 +
.../player/skip/DateComponents.desktop.kt | 12 +
.../features/plugins/PluginCrypto.desktop.kt | 53 +
.../plugins/PluginPlatform.desktop.kt | 19 +
.../ProfileHoverHapticFeedback.desktop.kt | 21 +
.../profiles/ProfileStorage.desktop.kt | 15 +
.../profiles/ProfileStorageDesktop.desktop.kt | 44 +
.../search/SearchHistoryStorage.desktop.kt | 16 +
.../AlwaysAnimateGifPreference.desktop.kt | 17 +
.../settings/AppLanguageDefaults.desktop.kt | 8 +
.../DebugLogsSettingsSection.desktop.kt | 48 +
.../DesktopDecoderSettingsSection.desktop.kt | 239 ++++
.../KeybindsSettingsContent.desktop.kt | 301 +++++
.../PlatformPlaybackLicense.desktop.kt | 21 +
.../PlatformSettingsSearch.desktop.kt | 106 ++
.../settings/SettingsDesktop.desktop.kt | 124 ++
.../streams/StreamsDesktop.desktop.kt | 21 +
.../tmdb/TmdbSettingsStorage.desktop.kt | 181 +++
.../TrailerExtractionPlatform.desktop.kt | 162 +++
.../features/trakt/TraktDesktop.desktop.kt | 77 ++
.../trakt/TraktSettingsStorage.desktop.kt | 16 +
.../updater/AppUpdaterPlatform.desktop.kt | 131 +-
.../watched/WatchedDesktop.desktop.kt | 19 +
.../WatchProgressDesktop.desktop.kt | 72 ++
.../WindowsExternalPlayerSupportTest.kt | 137 ++
.../mpv/DesktopMpvPlaybackSettingsTest.kt | 36 +
.../app/features/plugins/PluginRuntime.kt | 3 +-
.../kotlin/com/nuvio/app/Platform.ios.kt | 3 +-
.../core/ui/DesktopContextMenuPointer.ios.kt | 5 +
.../DesktopHorizontalLazyRowGestures.ios.kt | 6 +
.../core/ui/NuvioImageDecodeQuality.ios.kt | 4 +
.../core/ui/PosterCardStylePlatform.ios.kt | 4 +
.../CollectionCardRemoteImage.ios.kt | 15 +-
.../player/PlayerLibassSupport.ios.kt | 3 +
.../player/PlayerPlatformEffects.ios.kt | 26 +
.../features/player/PlayerRuntimeTrace.ios.kt | 11 +
.../AlwaysAnimateGifPreference.ios.kt | 7 +
.../settings/AppLanguageDefaults.ios.kt | 14 +
.../settings/DebugLogsSettingsSection.ios.kt | 8 +
.../DesktopDecoderSettingsSection.ios.kt | 8 +
.../settings/KeybindsSettingsContent.ios.kt | 6 +
.../settings/PlatformPlaybackLicense.ios.kt | 19 +
.../settings/PlatformSettingsSearch.ios.kt | 6 +
.../settings/ThemeSettingsStorage.ios.kt | 27 +-
.../updater/AppUpdaterPlatform.ios.kt | 23 +-
gradle/libs.versions.toml | 5 +
gradle/wrapper/gradle-wrapper.properties | 2 +-
iosApp/Configuration/Version.xcconfig | 5 +-
libass-android | 1 -
mediamp | 1 +
scripts/build-windows-release.ps1 | 126 ++
settings.gradle.kts | 19 +-
vendor/quickjs-kt | 1 -
235 files changed, 13868 insertions(+), 524 deletions(-)
create mode 100644 .github/copilot-commit-instructions.md
create mode 100644 .github/workflows/copilot-setup-steps.yml
create mode 100644 composeApp/desktop-proguard-rules.pro
create mode 100644 composeApp/scripts/package-release-inno.ps1
create mode 100644 composeApp/src/androidMain/kotlin/com/nuvio/app/core/ui/DesktopContextMenuPointer.android.kt
create mode 100644 composeApp/src/androidMain/kotlin/com/nuvio/app/core/ui/DesktopHorizontalLazyRowGestures.android.kt
create mode 100644 composeApp/src/androidMain/kotlin/com/nuvio/app/core/ui/NuvioImageDecodeQuality.android.kt
create mode 100644 composeApp/src/androidMain/kotlin/com/nuvio/app/core/ui/PosterCardStylePlatform.android.kt
create mode 100644 composeApp/src/androidMain/kotlin/com/nuvio/app/features/player/PlayerLibassSupport.android.kt
create mode 100644 composeApp/src/androidMain/kotlin/com/nuvio/app/features/player/PlayerRuntimeTrace.android.kt
create mode 100644 composeApp/src/androidMain/kotlin/com/nuvio/app/features/settings/AlwaysAnimateGifPreference.android.kt
create mode 100644 composeApp/src/androidMain/kotlin/com/nuvio/app/features/settings/AppLanguageDefaults.android.kt
create mode 100644 composeApp/src/androidMain/kotlin/com/nuvio/app/features/settings/DebugLogsSettingsSection.android.kt
create mode 100644 composeApp/src/androidMain/kotlin/com/nuvio/app/features/settings/DesktopDecoderSettingsSection.android.kt
create mode 100644 composeApp/src/androidMain/kotlin/com/nuvio/app/features/settings/KeybindsSettingsContent.android.kt
create mode 100644 composeApp/src/androidMain/kotlin/com/nuvio/app/features/settings/PlatformPlaybackLicense.android.kt
create mode 100644 composeApp/src/androidMain/kotlin/com/nuvio/app/features/settings/PlatformSettingsSearch.android.kt
create mode 100644 composeApp/src/commonMain/composeResources/drawable/nuvio_window_icon.png
create mode 100644 composeApp/src/commonMain/kotlin/com/nuvio/app/core/logging/SafeLogRedactor.kt
create mode 100644 composeApp/src/commonMain/kotlin/com/nuvio/app/core/ui/DesktopContextMenuPointer.kt
create mode 100644 composeApp/src/commonMain/kotlin/com/nuvio/app/core/ui/DesktopHorizontalLazyRowGestures.kt
create mode 100644 composeApp/src/commonMain/kotlin/com/nuvio/app/core/ui/SizedImageRequest.kt
create mode 100644 composeApp/src/commonMain/kotlin/com/nuvio/app/features/player/PlayerLibassSupport.kt
create mode 100644 composeApp/src/commonMain/kotlin/com/nuvio/app/features/player/PlayerRuntimeTrace.kt
create mode 100644 composeApp/src/commonMain/kotlin/com/nuvio/app/features/settings/AlwaysAnimateGifPreference.kt
create mode 100644 composeApp/src/commonMain/kotlin/com/nuvio/app/features/settings/AppLanguageDefaults.kt
create mode 100644 composeApp/src/commonMain/kotlin/com/nuvio/app/features/settings/DebugLogsSettingsSection.kt
create mode 100644 composeApp/src/commonMain/kotlin/com/nuvio/app/features/settings/DesktopDecoderSettingsSection.kt
create mode 100644 composeApp/src/commonMain/kotlin/com/nuvio/app/features/settings/KeybindsSettingsContent.kt
create mode 100644 composeApp/src/commonMain/kotlin/com/nuvio/app/features/settings/PlatformSettingsSearch.kt
create mode 100644 composeApp/src/commonTest/kotlin/com/nuvio/app/features/updater/AppUpdateVersionComparatorTest.kt
create mode 100644 composeApp/src/commonTest/kotlin/com/nuvio/app/testing/LanguageTestSupport.kt
create mode 100644 composeApp/src/desktopMain/kotlin/com/nuvio/app/DesktopApp.kt
create mode 100644 composeApp/src/desktopMain/kotlin/com/nuvio/app/DesktopWindowLocals.desktop.kt
create mode 100644 composeApp/src/desktopMain/kotlin/com/nuvio/app/Platform.desktop.kt
create mode 100644 composeApp/src/desktopMain/kotlin/com/nuvio/app/core/auth/AuthStorage.desktop.kt
create mode 100644 composeApp/src/desktopMain/kotlin/com/nuvio/app/core/storage/PlatformLocalAccountDataCleaner.desktop.kt
create mode 100644 composeApp/src/desktopMain/kotlin/com/nuvio/app/core/sync/AppForegroundMonitor.desktop.kt
create mode 100644 composeApp/src/desktopMain/kotlin/com/nuvio/app/core/ui/DesktopContextMenuPointer.desktop.kt
create mode 100644 composeApp/src/desktopMain/kotlin/com/nuvio/app/core/ui/DesktopHorizontalLazyRowGestures.desktop.kt
create mode 100644 composeApp/src/desktopMain/kotlin/com/nuvio/app/core/ui/DesktopUi.desktop.kt
create mode 100644 composeApp/src/desktopMain/kotlin/com/nuvio/app/core/ui/NativeTabBridge.desktop.kt
create mode 100644 composeApp/src/desktopMain/kotlin/com/nuvio/app/core/ui/NuvioImageDecodeQuality.desktop.kt
create mode 100644 composeApp/src/desktopMain/kotlin/com/nuvio/app/core/ui/PosterCardStylePlatform.desktop.kt
create mode 100644 composeApp/src/desktopMain/kotlin/com/nuvio/app/desktop/DesktopBorderlessFullscreenController.kt
create mode 100644 composeApp/src/desktopMain/kotlin/com/nuvio/app/desktop/DesktopExternalPlaybackWindowController.kt
create mode 100644 composeApp/src/desktopMain/kotlin/com/nuvio/app/desktop/DesktopPlayerRegistry.kt
create mode 100644 composeApp/src/desktopMain/kotlin/com/nuvio/app/desktop/DesktopPreferences.kt
create mode 100644 composeApp/src/desktopMain/kotlin/com/nuvio/app/desktop/DesktopRuntimeLog.kt
create mode 100644 composeApp/src/desktopMain/kotlin/com/nuvio/app/desktop/DesktopSingleInstanceManager.kt
create mode 100644 composeApp/src/desktopMain/kotlin/com/nuvio/app/desktop/DesktopUriHandler.kt
create mode 100644 composeApp/src/desktopMain/kotlin/com/nuvio/app/desktop/DesktopWindowStateStore.kt
create mode 100644 composeApp/src/desktopMain/kotlin/com/nuvio/app/desktop/WindowsNativeBootstrap.kt
create mode 100644 composeApp/src/desktopMain/kotlin/com/nuvio/app/desktop/WindowsUrlProtocolRegistrar.kt
create mode 100644 composeApp/src/desktopMain/kotlin/com/nuvio/app/features/addons/AddonPlatform.desktop.kt
create mode 100644 composeApp/src/desktopMain/kotlin/com/nuvio/app/features/collection/CollectionMobileSettingsStorage.desktop.kt
create mode 100644 composeApp/src/desktopMain/kotlin/com/nuvio/app/features/collection/CollectionStorage.desktop.kt
create mode 100644 composeApp/src/desktopMain/kotlin/com/nuvio/app/features/debrid/DebridSettingsStorage.desktop.kt
create mode 100644 composeApp/src/desktopMain/kotlin/com/nuvio/app/features/details/DetailsDesktop.desktop.kt
create mode 100644 composeApp/src/desktopMain/kotlin/com/nuvio/app/features/downloads/DownloadsDesktop.desktop.kt
create mode 100644 composeApp/src/desktopMain/kotlin/com/nuvio/app/features/home/HomeCatalogSettingsStorage.desktop.kt
create mode 100644 composeApp/src/desktopMain/kotlin/com/nuvio/app/features/home/components/CollectionCardRemoteImage.desktop.kt
create mode 100644 composeApp/src/desktopMain/kotlin/com/nuvio/app/features/library/LibraryDesktop.desktop.kt
create mode 100644 composeApp/src/desktopMain/kotlin/com/nuvio/app/features/mdblist/MdbListSettingsStorage.desktop.kt
create mode 100644 composeApp/src/desktopMain/kotlin/com/nuvio/app/features/notifications/NotificationsDesktop.desktop.kt
create mode 100644 composeApp/src/desktopMain/kotlin/com/nuvio/app/features/notifications/WindowsToastHelper.kt
create mode 100644 composeApp/src/desktopMain/kotlin/com/nuvio/app/features/player/ExternalPlayerPlatform.desktop.kt
create mode 100644 composeApp/src/desktopMain/kotlin/com/nuvio/app/features/player/KeybindsStorage.kt
create mode 100644 composeApp/src/desktopMain/kotlin/com/nuvio/app/features/player/NativePlayerBridge.kt
create mode 100644 composeApp/src/desktopMain/kotlin/com/nuvio/app/features/player/PlayerDesktop.desktop.kt
create mode 100644 composeApp/src/desktopMain/kotlin/com/nuvio/app/features/player/PlayerLibassSupport.desktop.kt
create mode 100644 composeApp/src/desktopMain/kotlin/com/nuvio/app/features/player/PlayerRuntimeTrace.desktop.kt
create mode 100644 composeApp/src/desktopMain/kotlin/com/nuvio/app/features/player/WindowsExternalPlayerSupport.kt
create mode 100644 composeApp/src/desktopMain/kotlin/com/nuvio/app/features/player/desktop/DesktopPlayerBackend.kt
create mode 100644 composeApp/src/desktopMain/kotlin/com/nuvio/app/features/player/desktop/DesktopPlayerBackendFactory.kt
create mode 100644 composeApp/src/desktopMain/kotlin/com/nuvio/app/features/player/desktop/DesktopPlayerError.kt
create mode 100644 composeApp/src/desktopMain/kotlin/com/nuvio/app/features/player/desktop/DesktopPlayerRequest.kt
create mode 100644 composeApp/src/desktopMain/kotlin/com/nuvio/app/features/player/desktop/DesktopPlayerState.kt
create mode 100644 composeApp/src/desktopMain/kotlin/com/nuvio/app/features/player/desktop/DesktopPlayerSurfaceHost.kt
create mode 100644 composeApp/src/desktopMain/kotlin/com/nuvio/app/features/player/desktop/UnavailableDesktopPlayerBackend.kt
create mode 100644 composeApp/src/desktopMain/kotlin/com/nuvio/app/features/player/desktop/WindowsDisplayWakeLock.kt
create mode 100644 composeApp/src/desktopMain/kotlin/com/nuvio/app/features/player/desktop/mpv/DesktopMpvPlaybackSettings.kt
create mode 100644 composeApp/src/desktopMain/kotlin/com/nuvio/app/features/player/desktop/mpv/MpvDesktopPlayerBackend.kt
create mode 100644 composeApp/src/desktopMain/kotlin/com/nuvio/app/features/player/desktop/mpv/MpvDesktopPlayerSurface.kt
create mode 100644 composeApp/src/desktopMain/kotlin/com/nuvio/app/features/player/desktop/mpv/MpvDiagnostics.kt
create mode 100644 composeApp/src/desktopMain/kotlin/com/nuvio/app/features/player/desktop/mpv/MpvPropertyAccess.kt
create mode 100644 composeApp/src/desktopMain/kotlin/com/nuvio/app/features/player/desktop/mpv/MpvResizeMapper.kt
create mode 100644 composeApp/src/desktopMain/kotlin/com/nuvio/app/features/player/desktop/mpv/MpvRuntimeBootstrap.kt
create mode 100644 composeApp/src/desktopMain/kotlin/com/nuvio/app/features/player/desktop/mpv/MpvRuntimeLocator.kt
create mode 100644 composeApp/src/desktopMain/kotlin/com/nuvio/app/features/player/desktop/mpv/MpvStateMapper.kt
create mode 100644 composeApp/src/desktopMain/kotlin/com/nuvio/app/features/player/desktop/mpv/MpvTrackMapper.kt
create mode 100644 composeApp/src/desktopMain/kotlin/com/nuvio/app/features/player/desktop/nativebridge/NativeBridgeDesktopPlayerBackend.kt
create mode 100644 composeApp/src/desktopMain/kotlin/com/nuvio/app/features/player/desktop/nativebridge/NativeBridgeJnaApi.kt
create mode 100644 composeApp/src/desktopMain/kotlin/com/nuvio/app/features/player/desktop/nativebridge/NativeBridgeRuntimeLocator.kt
create mode 100644 composeApp/src/desktopMain/kotlin/com/nuvio/app/features/player/desktop/nativebridge/NativeBridgeStateMapper.kt
create mode 100644 composeApp/src/desktopMain/kotlin/com/nuvio/app/features/player/skip/DateComponents.desktop.kt
create mode 100644 composeApp/src/desktopMain/kotlin/com/nuvio/app/features/plugins/PluginCrypto.desktop.kt
create mode 100644 composeApp/src/desktopMain/kotlin/com/nuvio/app/features/plugins/PluginPlatform.desktop.kt
create mode 100644 composeApp/src/desktopMain/kotlin/com/nuvio/app/features/profiles/ProfileHoverHapticFeedback.desktop.kt
create mode 100644 composeApp/src/desktopMain/kotlin/com/nuvio/app/features/profiles/ProfileStorage.desktop.kt
create mode 100644 composeApp/src/desktopMain/kotlin/com/nuvio/app/features/profiles/ProfileStorageDesktop.desktop.kt
create mode 100644 composeApp/src/desktopMain/kotlin/com/nuvio/app/features/search/SearchHistoryStorage.desktop.kt
create mode 100644 composeApp/src/desktopMain/kotlin/com/nuvio/app/features/settings/AlwaysAnimateGifPreference.desktop.kt
create mode 100644 composeApp/src/desktopMain/kotlin/com/nuvio/app/features/settings/AppLanguageDefaults.desktop.kt
create mode 100644 composeApp/src/desktopMain/kotlin/com/nuvio/app/features/settings/DebugLogsSettingsSection.desktop.kt
create mode 100644 composeApp/src/desktopMain/kotlin/com/nuvio/app/features/settings/DesktopDecoderSettingsSection.desktop.kt
create mode 100644 composeApp/src/desktopMain/kotlin/com/nuvio/app/features/settings/KeybindsSettingsContent.desktop.kt
create mode 100644 composeApp/src/desktopMain/kotlin/com/nuvio/app/features/settings/PlatformPlaybackLicense.desktop.kt
create mode 100644 composeApp/src/desktopMain/kotlin/com/nuvio/app/features/settings/PlatformSettingsSearch.desktop.kt
create mode 100644 composeApp/src/desktopMain/kotlin/com/nuvio/app/features/settings/SettingsDesktop.desktop.kt
create mode 100644 composeApp/src/desktopMain/kotlin/com/nuvio/app/features/streams/StreamsDesktop.desktop.kt
create mode 100644 composeApp/src/desktopMain/kotlin/com/nuvio/app/features/tmdb/TmdbSettingsStorage.desktop.kt
create mode 100644 composeApp/src/desktopMain/kotlin/com/nuvio/app/features/trailer/TrailerExtractionPlatform.desktop.kt
create mode 100644 composeApp/src/desktopMain/kotlin/com/nuvio/app/features/trakt/TraktDesktop.desktop.kt
create mode 100644 composeApp/src/desktopMain/kotlin/com/nuvio/app/features/trakt/TraktSettingsStorage.desktop.kt
create mode 100644 composeApp/src/desktopMain/kotlin/com/nuvio/app/features/watched/WatchedDesktop.desktop.kt
create mode 100644 composeApp/src/desktopMain/kotlin/com/nuvio/app/features/watchprogress/WatchProgressDesktop.desktop.kt
create mode 100644 composeApp/src/desktopTest/kotlin/com/nuvio/app/features/player/WindowsExternalPlayerSupportTest.kt
create mode 100644 composeApp/src/desktopTest/kotlin/com/nuvio/app/features/player/desktop/mpv/DesktopMpvPlaybackSettingsTest.kt
create mode 100644 composeApp/src/iosMain/kotlin/com/nuvio/app/core/ui/DesktopContextMenuPointer.ios.kt
create mode 100644 composeApp/src/iosMain/kotlin/com/nuvio/app/core/ui/DesktopHorizontalLazyRowGestures.ios.kt
create mode 100644 composeApp/src/iosMain/kotlin/com/nuvio/app/core/ui/NuvioImageDecodeQuality.ios.kt
create mode 100644 composeApp/src/iosMain/kotlin/com/nuvio/app/core/ui/PosterCardStylePlatform.ios.kt
create mode 100644 composeApp/src/iosMain/kotlin/com/nuvio/app/features/player/PlayerLibassSupport.ios.kt
create mode 100644 composeApp/src/iosMain/kotlin/com/nuvio/app/features/player/PlayerRuntimeTrace.ios.kt
create mode 100644 composeApp/src/iosMain/kotlin/com/nuvio/app/features/settings/AlwaysAnimateGifPreference.ios.kt
create mode 100644 composeApp/src/iosMain/kotlin/com/nuvio/app/features/settings/AppLanguageDefaults.ios.kt
create mode 100644 composeApp/src/iosMain/kotlin/com/nuvio/app/features/settings/DebugLogsSettingsSection.ios.kt
create mode 100644 composeApp/src/iosMain/kotlin/com/nuvio/app/features/settings/DesktopDecoderSettingsSection.ios.kt
create mode 100644 composeApp/src/iosMain/kotlin/com/nuvio/app/features/settings/KeybindsSettingsContent.ios.kt
create mode 100644 composeApp/src/iosMain/kotlin/com/nuvio/app/features/settings/PlatformPlaybackLicense.ios.kt
create mode 100644 composeApp/src/iosMain/kotlin/com/nuvio/app/features/settings/PlatformSettingsSearch.ios.kt
delete mode 160000 libass-android
create mode 160000 mediamp
create mode 100644 scripts/build-windows-release.ps1
delete mode 160000 vendor/quickjs-kt
diff --git a/.github/copilot-commit-instructions.md b/.github/copilot-commit-instructions.md
new file mode 100644
index 000000000..ecd751834
--- /dev/null
+++ b/.github/copilot-commit-instructions.md
@@ -0,0 +1,22 @@
+Generate commit messages using Conventional Commits.
+
+Format:
+type(scope): short imperative summary
+
+Allowed types:
+- fix
+- feat
+- chore
+- refactor
+- test
+- docs
+- build
+
+Rules:
+- Keep the subject under 72 characters.
+- Be specific, not generic.
+- Do not mention AI, Copilot, Codex, Claude, or generated code.
+- Do not include secrets, tokens, local paths, or logs.
+- For Nuvio Desktop changes, prefer scopes like desktop, player, mpv, trakt, packaging, settings.
+- For mediamp submodule changes, prefer scope mpv or mediamp.
+- For submodule pointer updates, mention the submodule and why it changed.
\ No newline at end of file
diff --git a/.github/workflows/copilot-setup-steps.yml b/.github/workflows/copilot-setup-steps.yml
new file mode 100644
index 000000000..04b052a00
--- /dev/null
+++ b/.github/workflows/copilot-setup-steps.yml
@@ -0,0 +1,254 @@
+name: "Copilot Setup Steps"
+
+on:
+ workflow_dispatch:
+ push:
+ paths:
+ - ".github/workflows/copilot-setup-steps.yml"
+ pull_request:
+ paths:
+ - ".github/workflows/copilot-setup-steps.yml"
+
+jobs:
+ copilot-setup-steps:
+ runs-on: [self-hosted, Windows, X64]
+ timeout-minutes: 59
+
+ permissions:
+ contents: read
+
+ steps:
+ - name: Checkout code
+ uses: actions/checkout@v6
+ with:
+ submodules: recursive
+ lfs: true
+
+ - name: Show runner and repository context
+ shell: pwsh
+ run: |
+ $ErrorActionPreference = "Stop"
+
+ Write-Host "Runner name: $env:RUNNER_NAME"
+ Write-Host "Runner OS: $env:RUNNER_OS"
+ Write-Host "Runner arch: $env:RUNNER_ARCH"
+ Write-Host "Repository: $env:GITHUB_REPOSITORY"
+ Write-Host "Ref: $env:GITHUB_REF"
+ Write-Host "Ref name: $env:GITHUB_REF_NAME"
+ Write-Host "Workspace: $env:GITHUB_WORKSPACE"
+ Write-Host ""
+
+ git --version
+ git status --short --branch
+ git remote -v
+ git submodule status --recursive
+
+ - name: Setup Java 21
+ uses: actions/setup-java@v4
+ with:
+ distribution: temurin
+ java-version: "21"
+
+ - name: Force Java 21 tools first in PATH
+ shell: pwsh
+ run: |
+ $ErrorActionPreference = "Stop"
+
+ if ([string]::IsNullOrWhiteSpace($env:JAVA_HOME)) {
+ throw "JAVA_HOME is empty after actions/setup-java."
+ }
+
+ $env:Path = "$env:JAVA_HOME\bin;$env:Path"
+
+ Write-Host "JAVA_HOME=$env:JAVA_HOME"
+ java -version
+ javac -version
+ jpackage --version
+ where.exe java
+ where.exe javac
+ where.exe jpackage
+
+ - name: Setup Gradle
+ uses: gradle/actions/setup-gradle@v4
+
+ - name: Setup MSVC developer environment
+ uses: ilammy/msvc-dev-cmd@v1
+ with:
+ arch: x64
+
+ - name: Verify Windows build tools
+ shell: pwsh
+ run: |
+ $ErrorActionPreference = "Stop"
+
+ $env:Path = "$env:JAVA_HOME\bin;$env:Path"
+
+ Write-Host "=== Java ==="
+ java -version
+ javac -version
+ jpackage --version
+ Write-Host "JAVA_HOME=$env:JAVA_HOME"
+ where.exe java
+ where.exe javac
+ where.exe jpackage
+
+ Write-Host ""
+ Write-Host "=== Gradle wrapper ==="
+ if (-not (Test-Path ".\gradlew.bat")) {
+ throw "gradlew.bat not found at repository root."
+ }
+ .\gradlew.bat --version --no-daemon
+
+ Write-Host ""
+ Write-Host "=== Gradle wrapper properties ==="
+ if (Test-Path ".\gradle\wrapper\gradle-wrapper.properties") {
+ Get-Content ".\gradle\wrapper\gradle-wrapper.properties"
+ } else {
+ Write-Warning "gradle-wrapper.properties not found."
+ }
+
+ Write-Host ""
+ Write-Host "=== Git LFS ==="
+ git lfs version
+
+ Write-Host ""
+ Write-Host "=== CMake ==="
+ cmake --version
+ where.exe cmake
+
+ Write-Host ""
+ Write-Host "=== Ninja ==="
+ ninja --version
+ where.exe ninja
+
+ Write-Host ""
+ Write-Host "=== MSVC cl ==="
+ cl 2>&1 | Select-Object -First 10
+ where.exe cl
+
+ - name: Verify optional MPV CLI without user config
+ shell: pwsh
+ continue-on-error: true
+ run: |
+ Write-Host "=== Optional global MPV ==="
+ Write-Host "This is only an environment sanity check."
+ Write-Host "Nuvio Desktop playback validation must use the repository MediaMP/libmpv integration, not this global mpv.exe."
+ where.exe mpv
+ mpv --no-config --version
+
+ - name: Create local.properties from Copilot Agent secrets
+ shell: pwsh
+ env:
+ ACTIONS_SUPABASE_URL: ${{ secrets.SUPABASE_URL }}
+ ACTIONS_SUPABASE_ANON_KEY: ${{ secrets.SUPABASE_ANON_KEY }}
+ ACTIONS_TRAKT_CLIENT_ID: ${{ secrets.TRAKT_CLIENT_ID }}
+ ACTIONS_TRAKT_CLIENT_SECRET: ${{ secrets.TRAKT_CLIENT_SECRET }}
+ ACTIONS_TRAKT_REDIRECT_URI: ${{ secrets.TRAKT_REDIRECT_URI }}
+ ACTIONS_CONTRIBUTIONS_URL: ${{ secrets.CONTRIBUTIONS_URL }}
+ ACTIONS_CONTRIBUTIONS_EXTRA: ${{ secrets.CONTRIBUTIONS_EXTRA }}
+ ACTIONS_DONATIONS_BASE_URL: ${{ secrets.DONATIONS_BASE_URL }}
+ ACTIONS_DONATIONS_DONATE_URL: ${{ secrets.DONATIONS_DONATE_URL }}
+ ACTIONS_INTRODB_API_URL: ${{ secrets.INTRODB_API_URL }}
+ ACTIONS_IMDB_RATINGS_API_BASE_URL: ${{ secrets.IMDB_RATINGS_API_BASE_URL }}
+ ACTIONS_IMDB_TAPFRAME_API_BASE_URL: ${{ secrets.IMDB_TAPFRAME_API_BASE_URL }}
+ run: |
+ $ErrorActionPreference = "Stop"
+
+ function Get-ConfigValue {
+ param(
+ [Parameter(Mandatory = $true)]
+ [string]$Name,
+
+ [Parameter(Mandatory = $true)]
+ [string]$ActionsName
+ )
+
+ $agentValue = [Environment]::GetEnvironmentVariable($Name)
+ if (-not [string]::IsNullOrWhiteSpace($agentValue)) {
+ return $agentValue
+ }
+
+ $actionsValue = [Environment]::GetEnvironmentVariable($ActionsName)
+ if (-not [string]::IsNullOrWhiteSpace($actionsValue)) {
+ return $actionsValue
+ }
+
+ return ""
+ }
+
+ $values = [ordered]@{
+ SUPABASE_URL = Get-ConfigValue "SUPABASE_URL" "ACTIONS_SUPABASE_URL"
+ SUPABASE_ANON_KEY = Get-ConfigValue "SUPABASE_ANON_KEY" "ACTIONS_SUPABASE_ANON_KEY"
+ TRAKT_CLIENT_ID = Get-ConfigValue "TRAKT_CLIENT_ID" "ACTIONS_TRAKT_CLIENT_ID"
+ TRAKT_CLIENT_SECRET = Get-ConfigValue "TRAKT_CLIENT_SECRET" "ACTIONS_TRAKT_CLIENT_SECRET"
+ TRAKT_REDIRECT_URI = Get-ConfigValue "TRAKT_REDIRECT_URI" "ACTIONS_TRAKT_REDIRECT_URI"
+ CONTRIBUTIONS_URL = Get-ConfigValue "CONTRIBUTIONS_URL" "ACTIONS_CONTRIBUTIONS_URL"
+ CONTRIBUTIONS_EXTRA = Get-ConfigValue "CONTRIBUTIONS_EXTRA" "ACTIONS_CONTRIBUTIONS_EXTRA"
+ DONATIONS_BASE_URL = Get-ConfigValue "DONATIONS_BASE_URL" "ACTIONS_DONATIONS_BASE_URL"
+ DONATIONS_DONATE_URL = Get-ConfigValue "DONATIONS_DONATE_URL" "ACTIONS_DONATIONS_DONATE_URL"
+ INTRODB_API_URL = Get-ConfigValue "INTRODB_API_URL" "ACTIONS_INTRODB_API_URL"
+ IMDB_RATINGS_API_BASE_URL = Get-ConfigValue "IMDB_RATINGS_API_BASE_URL" "ACTIONS_IMDB_RATINGS_API_BASE_URL"
+ IMDB_TAPFRAME_API_BASE_URL = Get-ConfigValue "IMDB_TAPFRAME_API_BASE_URL" "ACTIONS_IMDB_TAPFRAME_API_BASE_URL"
+ }
+
+ $missing = @()
+ foreach ($entry in $values.GetEnumerator()) {
+ if ([string]::IsNullOrWhiteSpace($entry.Value)) {
+ $missing += $entry.Key
+ }
+ }
+
+ if ($missing.Count -gt 0) {
+ Write-Warning "Missing config values: $($missing -join ', ')"
+ Write-Warning "For Copilot Coding Agent, check Settings > Secrets and variables > Agents."
+ }
+
+ $lines = foreach ($entry in $values.GetEnumerator()) {
+ "$($entry.Key)=$($entry.Value)"
+ }
+
+ $lines | Set-Content -Path "local.properties" -Encoding UTF8
+
+ Write-Host "local.properties created. Redacted keys:"
+ foreach ($entry in $values.GetEnumerator()) {
+ if ([string]::IsNullOrWhiteSpace($entry.Value)) {
+ Write-Host "$($entry.Key)="
+ } else {
+ Write-Host "$($entry.Key)="
+ }
+ }
+
+ - name: Check repository guidance files
+ shell: pwsh
+ run: |
+ $files = @("AGENTS.md", "CLAUDE.md", "PLAN.md", "README.md")
+
+ foreach ($file in $files) {
+ if (Test-Path ".\$file") {
+ Write-Host ""
+ Write-Host "=== Found $file ==="
+ Get-Content ".\$file" -TotalCount 120
+ } else {
+ Write-Host "$file not found."
+ }
+ }
+
+ - name: Preflight desktop compile
+ shell: pwsh
+ continue-on-error: true
+ run: |
+ $env:Path = "$env:JAVA_HOME\bin;$env:Path"
+ .\gradlew.bat :composeApp:desktopMainClasses --no-daemon --stacktrace
+
+ - name: Preflight Kotlin desktop compile
+ shell: pwsh
+ continue-on-error: true
+ run: |
+ $env:Path = "$env:JAVA_HOME\bin;$env:Path"
+ .\gradlew.bat :composeApp:compileKotlinDesktop --no-daemon --stacktrace
+
+ - name: Final git state
+ if: always()
+ shell: pwsh
+ run: |
+ git status --short --branch
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index 36411ebab..ec92d17f1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,10 +20,50 @@ captures
**/xcshareddata/WorkspaceSettings.xcsettings
node_modules/
logs/
+*.log
+hs_err_pid*.log
+replay_pid*.log
+desktop-runtime.log
Docs
keystore/
scripts/build-distribution.sh
asset
scripts/scrape_android_compose_animation_docs.py
tools
-AGENTS.md
+AGENTS.md*
+.cursor/
+mediamp-backup-*/
+backup/
+-tree -d experiment3 mediamp
+.agents
+.claude
+.codex/
+.junie
+.vscode
+skills-lock.json
+.github/workflows/claude-pr-fix.yml
+.github/workflows/claude-pr-review.yml
+composeApp/desktop-icons/
+composeApp/src/androidMain/res/mipmap-xhdpi/nuvio-windows.ico
+composeApp/src/windowsPackageResources/
+composeApp/scripts/package-release-inno.ps1
+.env
+composeApp/runtime-config/release.properties
+Nuvio-*-x64-portable.zip
+CONTEXT_REPORT.md
+GIF_IMPLEMENTATION_REPORT.md
+MPV_IMPLEMENTATION_REPORT.md
+MPV_REWORK.md
+MPV_REWORK_2.md
+NEXT_STEPS.md
+NOTIFICATIONS_AND_TOASTS_IMPLEMENTATION_REPORT.md
+NEW_PROGRESS/
+objective-status.md
+.commandcode/taste/
+*.tmp
+*.py
+libs/
+mpv-player/
+composeApp-run_output.txt
+# Kiro agent spec/tooling artifacts. Local only; never committed.
+.kiro/
diff --git a/.gitmodules b/.gitmodules
index 00634e560..91730f7a4 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,7 @@
[submodule "MPVKit"]
path = MPVKit
url = https://github.com/tapframe/MPVNuvio.git
+[submodule "mediamp"]
+ path = mediamp
+ url = https://github.com/CreepsoOff/mediamp-nuvio.git
+ branch = windows-nuvio
diff --git a/README.md b/README.md
index 7f01b6692..324abd1e0 100644
--- a/README.md
+++ b/README.md
@@ -26,6 +26,24 @@ The mobile app is built from a single shared codebase in [composeApp](./composeA
## Installation
+### Windows Desktop
+
+Nuvio Desktop is currently a Windows-first build. Download the latest
+installer or portable ZIP from the
+[Nuvio Desktop releases](https://github.com/CreepsoOff/NuvioDesktop/releases).
+
+Upgrade paths:
+
+- Installer builds: run the newer installer over the existing installation.
+- Portable ZIP builds: close Nuvio, extract the new ZIP, and replace the old
+ portable folder while keeping any user data stored under Windows AppData.
+- In-app updates: when available, use the updater from the app settings/about
+ screen and pick the installer or portable asset that matches your install.
+
+Linux and Wine are not supported release targets for Nuvio Desktop. They may
+start on some systems, but playback, fullscreen, notifications, and packaging
+behavior are only validated for Windows.
+
### Android
Download the latest Android build from [GitHub Releases](https://github.com/NuvioMedia/NuvioMobile/releases/latest).
@@ -62,6 +80,18 @@ Useful commands:
Versioning is driven from `iosApp/Configuration/Version.xcconfig`, which is used as the shared source of truth for both iOS and Android builds.
+## Desktop Playback Notes
+
+Nuvio is a client for user-configured addons, accounts, sources, and streams.
+The Desktop player supports direct media URLs returned by addons, including
+Torrentio-style addons when a debrid service resolves the item to a playable
+HTTP(S) stream. Raw `magnet:`, `.torrent`, or bare `infoHash` playback is not
+supported unless an addon or debrid resolver converts it to a direct stream URL.
+
+Windows HDR passthrough is a known limitation of the current Compose Desktop /
+MPV rendering path. Some systems may tone-map HDR content or lose HDR behavior
+during fullscreen until a future renderer path is validated.
+
## Legal & DMCA
Nuvio functions solely as a client-side interface for browsing metadata and playing media provided by user-installed extensions and/or user-provided sources. It is intended for content the user owns or is otherwise authorized to access.
@@ -98,4 +128,4 @@ For comprehensive legal information, including our full disclaimer, third-party
[issues-shield]: https://img.shields.io/github/issues/NuvioMedia/NuvioMobile.svg?style=for-the-badge
[issues-url]: https://github.com/NuvioMedia/NuvioMobile/issues
[license-shield]: https://img.shields.io/github/license/NuvioMedia/NuvioMobile.svg?style=for-the-badge
-[license-url]: https://github.com/NuvioMedia/NuvioMobile/blob/main/LICENSE
\ No newline at end of file
+[license-url]: https://github.com/NuvioMedia/NuvioMobile/blob/main/LICENSE
diff --git a/composeApp/build.gradle.kts b/composeApp/build.gradle.kts
index 89ebdf465..c65b66e88 100644
--- a/composeApp/build.gradle.kts
+++ b/composeApp/build.gradle.kts
@@ -1,18 +1,27 @@
import org.jetbrains.compose.desktop.application.dsl.TargetFormat
import org.gradle.api.DefaultTask
+import org.gradle.api.attributes.Attribute
+import org.gradle.api.file.DuplicatesStrategy
import org.gradle.api.file.DirectoryProperty
import org.gradle.api.file.RegularFileProperty
import org.gradle.api.provider.Property
+import org.gradle.api.tasks.Copy
import org.gradle.api.tasks.Input
+import org.gradle.api.tasks.InputDirectory
import org.gradle.api.tasks.InputFile
+import org.gradle.api.tasks.Internal
import org.gradle.api.tasks.Optional
import org.gradle.api.tasks.OutputDirectory
import org.gradle.api.tasks.TaskAction
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
import org.jetbrains.kotlin.gradle.tasks.KotlinCompilationTask
+import java.io.File
import java.util.Properties
+import javax.imageio.ImageIO
abstract class GenerateRuntimeConfigsTask : DefaultTask() {
+ private val defaultSupabaseUrl = "https://dpyhjjcoabcglfmgecug.supabase.co"
+
@get:OutputDirectory
abstract val outputDir: DirectoryProperty
@@ -20,18 +29,84 @@ abstract class GenerateRuntimeConfigsTask : DefaultTask() {
@get:InputFile
abstract val localPropertiesFile: RegularFileProperty
+ @get:Optional
+ @get:InputFile
+ abstract val releasePropertiesFile: RegularFileProperty
+
@get:Input
abstract val appVersionName: Property
@get:Input
abstract val appVersionCode: Property
+ private fun loadProperties(file: File?): Properties =
+ Properties().apply {
+ file
+ ?.takeIf(File::exists)
+ ?.inputStream()
+ ?.use(::load)
+ }
+
+ private fun resolveRuntimeValue(
+ key: String,
+ releaseProperties: Properties,
+ localProperties: Properties,
+ defaultValue: String = "",
+ ): String {
+ System.getenv(key)
+ ?.takeIf(String::isNotBlank)
+ ?.let { return it }
+
+ localProperties.getProperty(key)
+ ?.takeIf(String::isNotBlank)
+ ?.let { return it }
+
+ releaseProperties.getProperty(key)
+ ?.takeIf(String::isNotBlank)
+ ?.let { return it }
+
+ return defaultValue
+ }
+
+ private fun kotlinStringLiteral(value: String): String =
+ buildString(value.length + 8) {
+ value.forEach { character ->
+ when (character) {
+ '\\' -> append("\\\\")
+ '"' -> append("\\\"")
+ '\n' -> append("\\n")
+ '\r' -> append("\\r")
+ '\t' -> append("\\t")
+ else -> append(character)
+ }
+ }
+ }
+
@TaskAction
fun generate() {
- val props = Properties()
- localPropertiesFile.asFile.orNull?.takeIf { it.exists() }?.inputStream()?.use { props.load(it) }
+ val releaseProperties = loadProperties(releasePropertiesFile.asFile.orNull)
+ val localProperties = loadProperties(localPropertiesFile.asFile.orNull)
+ val supabaseUrl = resolveRuntimeValue("SUPABASE_URL", releaseProperties, localProperties, defaultSupabaseUrl)
+ val supabaseAnonKey = resolveRuntimeValue("SUPABASE_ANON_KEY", releaseProperties, localProperties)
+ val traktClientId = resolveRuntimeValue("TRAKT_CLIENT_ID", releaseProperties, localProperties)
+ val traktClientSecret = resolveRuntimeValue("TRAKT_CLIENT_SECRET", releaseProperties, localProperties)
+ val traktRedirectUri = resolveRuntimeValue(
+ "TRAKT_REDIRECT_URI",
+ releaseProperties,
+ localProperties,
+ "nuvio://auth/trakt",
+ )
+ val introDbUrl = resolveRuntimeValue("INTRODB_API_URL", releaseProperties, localProperties)
+ val contributionsUrl = resolveRuntimeValue("CONTRIBUTIONS_URL", releaseProperties, localProperties)
+ val donationsBaseUrl = resolveRuntimeValue("DONATIONS_BASE_URL", releaseProperties, localProperties)
+ val donationsDonateUrl = resolveRuntimeValue("DONATIONS_DONATE_URL", releaseProperties, localProperties)
+ val contributionsExtra = resolveRuntimeValue("CONTRIBUTIONS_EXTRA", releaseProperties, localProperties)
+ val imdbRatingsApiBaseUrl = resolveRuntimeValue("IMDB_RATINGS_API_BASE_URL", releaseProperties, localProperties)
+ val imdbTapframeApiBaseUrl = resolveRuntimeValue("IMDB_TAPFRAME_API_BASE_URL", releaseProperties, localProperties)
+ val directDebridApiBaseUrl = resolveRuntimeValue("DIRECT_DEBRID_API_BASE_URL", releaseProperties, localProperties)
val outDir = outputDir.get().asFile
+ outDir.deleteRecursively()
outDir.resolve("com/nuvio/app/core/network").apply {
mkdirs()
resolve("SupabaseConfig.kt").writeText(
@@ -39,8 +114,8 @@ abstract class GenerateRuntimeConfigsTask : DefaultTask() {
|package com.nuvio.app.core.network
|
|object SupabaseConfig {
- | const val URL = "${props.getProperty("SUPABASE_URL", "")}"
- | const val ANON_KEY = "${props.getProperty("SUPABASE_ANON_KEY", "")}"
+ | const val URL = "${kotlinStringLiteral(supabaseUrl)}"
+ | const val ANON_KEY = "${kotlinStringLiteral(supabaseAnonKey)}"
|}
""".trimMargin()
)
@@ -55,9 +130,9 @@ abstract class GenerateRuntimeConfigsTask : DefaultTask() {
|package com.nuvio.app.features.trakt
|
|object TraktConfig {
- | const val CLIENT_ID = "${props.getProperty("TRAKT_CLIENT_ID", "")}"
- | const val CLIENT_SECRET = "${props.getProperty("TRAKT_CLIENT_SECRET", "")}"
- | const val REDIRECT_URI = "${props.getProperty("TRAKT_REDIRECT_URI", "nuvio://auth/trakt")}"
+ | const val CLIENT_ID = "${kotlinStringLiteral(traktClientId)}"
+ | const val CLIENT_SECRET = "${kotlinStringLiteral(traktClientSecret)}"
+ | const val REDIRECT_URI = "${kotlinStringLiteral(traktRedirectUri)}"
|}
""".trimMargin()
)
@@ -70,7 +145,7 @@ abstract class GenerateRuntimeConfigsTask : DefaultTask() {
|package com.nuvio.app.features.player.skip
|
|object IntroDbConfig {
- | const val URL = "${props.getProperty("INTRODB_API_URL", "")}"
+ | const val URL = "${kotlinStringLiteral(introDbUrl)}"
|}
""".trimMargin()
)
@@ -83,8 +158,8 @@ abstract class GenerateRuntimeConfigsTask : DefaultTask() {
|package com.nuvio.app.features.details
|
|object ImdbEpisodeRatingsConfig {
- | const val IMDB_RATINGS_API_BASE_URL = "${props.getProperty("IMDB_RATINGS_API_BASE_URL", "")}"
- | const val IMDB_TAPFRAME_API_BASE_URL = "${props.getProperty("IMDB_TAPFRAME_API_BASE_URL", "")}"
+ | const val IMDB_RATINGS_API_BASE_URL = "${kotlinStringLiteral(imdbRatingsApiBaseUrl)}"
+ | const val IMDB_TAPFRAME_API_BASE_URL = "${kotlinStringLiteral(imdbTapframeApiBaseUrl)}"
|}
""".trimMargin()
)
@@ -97,7 +172,7 @@ abstract class GenerateRuntimeConfigsTask : DefaultTask() {
|package com.nuvio.app.features.debrid
|
|object DebridConfig {
- | const val DIRECT_DEBRID_API_BASE_URL = "${props.getProperty("DIRECT_DEBRID_API_BASE_URL", "")}"
+ | const val DIRECT_DEBRID_API_BASE_URL = "${kotlinStringLiteral(directDebridApiBaseUrl)}"
|}
""".trimMargin()
)
@@ -124,9 +199,10 @@ abstract class GenerateRuntimeConfigsTask : DefaultTask() {
|package com.nuvio.app.features.settings
|
|object CommunityConfig {
- | const val CONTRIBUTIONS_URL = "${props.getProperty("CONTRIBUTIONS_URL", "")}"
- | const val DONATIONS_BASE_URL = "${props.getProperty("DONATIONS_BASE_URL", "")}"
- | const val DONATIONS_DONATE_URL = "${props.getProperty("DONATIONS_DONATE_URL", "")}"
+ | const val CONTRIBUTIONS_URL = "${kotlinStringLiteral(contributionsUrl)}"
+ | const val DONATIONS_BASE_URL = "${kotlinStringLiteral(donationsBaseUrl)}"
+ | const val DONATIONS_DONATE_URL = "${kotlinStringLiteral(donationsDonateUrl)}"
+ | const val CONTRIBUTIONS_EXTRA = "${kotlinStringLiteral(contributionsExtra)}"
|}
""".trimMargin()
)
@@ -134,6 +210,79 @@ abstract class GenerateRuntimeConfigsTask : DefaultTask() {
}
}
+abstract class RenameReleaseDmgTask : DefaultTask() {
+ @get:Input
+ abstract val versionName: Property
+
+ @get:OutputDirectory
+ abstract val dmgDirectory: DirectoryProperty
+
+ @TaskAction
+ fun renameArtifact() {
+ val dmgDir = dmgDirectory.get().asFile
+ val targetFile = dmgDir.resolve("Nuvio-${versionName.get()}.dmg")
+ val sourceFile = dmgDir.listFiles()
+ ?.filter { it.extension == "dmg" && it.name.startsWith("Nuvio-") }
+ ?.maxByOrNull { it.lastModified() }
+ ?: error("No DMG output found in ${dmgDir.path}")
+
+ if (sourceFile.absolutePath != targetFile.absolutePath) {
+ targetFile.delete()
+ sourceFile.copyTo(targetFile, overwrite = true)
+ sourceFile.delete()
+ }
+ }
+}
+
+abstract class SyncWindowsPackageResourcesTask : DefaultTask() {
+ @get:InputDirectory
+ abstract val sourceDirectory: DirectoryProperty
+
+ @get:Internal
+ abstract val targetDirectory: DirectoryProperty
+
+ @get:InputFile
+ abstract val installerSidebarPng: RegularFileProperty
+
+ @get:InputFile
+ abstract val installerBannerBmp: RegularFileProperty
+
+ @get:InputFile
+ abstract val installerSetupIconIco: RegularFileProperty
+
+ @TaskAction
+ fun sync() {
+ val sourceRoot = sourceDirectory.get().asFile
+ val targetRoot = targetDirectory.get().asFile
+ sourceRoot.walkTopDown()
+ .filter { it.isFile }
+ .forEach { sourceFile ->
+ val targetFile = targetRoot.resolve(sourceFile.relativeTo(sourceRoot))
+ targetFile.parentFile.mkdirs()
+ sourceFile.copyTo(targetFile, overwrite = true)
+ }
+
+ val sidebarPngFile = installerSidebarPng.get().asFile
+ val sidebarBmpTarget = targetRoot.resolve("BackgroundImage.bmp")
+ sidebarBmpTarget.parentFile.mkdirs()
+ val sidebarImage = ImageIO.read(sidebarPngFile)
+ ?: error("Unable to read Windows installer sidebar PNG: ${sidebarPngFile.absolutePath}")
+ check(ImageIO.write(sidebarImage, "bmp", sidebarBmpTarget)) {
+ "Unable to write WiX sidebar BMP: ${sidebarBmpTarget.absolutePath}"
+ }
+
+ val bannerBmpFile = installerBannerBmp.get().asFile
+ val bannerBmpTarget = targetRoot.resolve("bannrbmp.bmp")
+ bannerBmpTarget.parentFile.mkdirs()
+ bannerBmpFile.copyTo(bannerBmpTarget, overwrite = true)
+
+ val setupIconFile = installerSetupIconIco.get().asFile
+ val setupIconTarget = targetRoot.resolve("JavaApp.ico")
+ setupIconTarget.parentFile.mkdirs()
+ setupIconFile.copyTo(setupIconTarget, overwrite = true)
+ }
+}
+
fun readXcconfigValue(file: File, key: String): String? {
if (!file.exists()) return null
return file.readLines()
@@ -191,7 +340,14 @@ val generatedRuntimeConfigDir = layout.buildDirectory.dir("generated/runtime-con
val generateRuntimeConfigs = tasks.register("generateRuntimeConfigs") {
outputDir.set(generatedRuntimeConfigDir)
- localPropertiesFile.set(rootProject.layout.projectDirectory.file("local.properties"))
+ val localProperties = rootProject.layout.projectDirectory.file("local.properties")
+ if (localProperties.asFile.exists()) {
+ localPropertiesFile.set(localProperties)
+ }
+ val releaseProperties = layout.projectDirectory.file("runtime-config/release.properties")
+ if (releaseProperties.asFile.exists()) {
+ releasePropertiesFile.set(releaseProperties)
+ }
appVersionName.set(releaseAppVersionName)
appVersionCode.set(releaseAppVersionCode)
}
@@ -206,6 +362,12 @@ kotlin {
jvmTarget.set(JvmTarget.JVM_11)
}
}
+
+ jvm("desktop") {
+ compilerOptions {
+ jvmTarget.set(JvmTarget.JVM_11)
+ }
+ }
val iosTargets = listOf(
iosArm64(),
@@ -245,6 +407,21 @@ kotlin {
val commonMain by getting {
kotlin.srcDir(generatedRuntimeConfigDir)
}
+ val desktopMain by getting {
+ kotlin.srcDir(fullCommonSourceDir)
+ dependencies {
+ implementation(compose.desktop.currentOs)
+ implementation(libs.ktor.client.java)
+ implementation(libs.kotlinx.coroutines.swing)
+ implementation(libs.quickjs.kt)
+ implementation(libs.ksoup)
+ implementation(libs.jna)
+ implementation("net.java.dev.jna:jna-platform:5.14.0")
+ implementation("com.squareup.okhttp3:okhttp:4.12.0")
+ implementation("org.openani.mediamp:mediamp-api:0.1.0-dev-1")
+ implementation("org.openani.mediamp:mediamp-mpv:0.1.0-dev-1") { attributes { attribute(Attribute.of("org.jetbrains.kotlin.platform.type", String::class.java), "jvm") } }
+ }
+ }
androidMain.dependencies {
implementation(libs.compose.uiToolingPreview)
implementation(libs.androidx.appcompat)
@@ -310,6 +487,272 @@ dependencies {
debugImplementation(libs.compose.uiTooling)
}
+compose.desktop {
+ application {
+ mainClass = "com.nuvio.app.DesktopAppKt"
+
+ val mediampRootDir = rootProject.file("mediamp")
+ val mediampNativeBuildDir = mediampRootDir.resolve("mediamp-mpv/build-ci")
+ val mediampPrebuiltDir = mediampRootDir.resolve("mediamp-mpv/libmpv/lib/windows/x86_64")
+ fun File.safePath(): String = absolutePath.replace("\\", "/")
+
+ jvmArgs(
+ "-Dskiko.renderApi=OPENGL",
+ "-Djava.library.path=" + listOf(
+ mediampNativeBuildDir.safePath(),
+ mediampNativeBuildDir.resolve("Debug").safePath(),
+ mediampNativeBuildDir.resolve("Release").safePath(),
+ mediampPrebuiltDir.safePath(),
+ System.getenv("NUVIO_MPV_DIR")?.let { "$it/bin" } ?: "",
+ ).filter { it.isNotEmpty() }.joinToString(System.getProperty("path.separator")),
+ )
+
+ buildTypes.release.proguard {
+ configurationFiles.from(project.file("desktop-proguard-rules.pro"))
+ }
+
+ nativeDistributions {
+ packageName = "Nuvio"
+ packageVersion = releaseAppVersionName
+ vendor = "Creepso"
+ modules("java.net.http")
+
+ val hostOs = System.getProperty("os.name").lowercase()
+ when {
+ hostOs.contains("windows") -> targetFormats(TargetFormat.Exe, TargetFormat.Msi)
+ hostOs.contains("mac") -> targetFormats(TargetFormat.Dmg)
+ }
+
+ windows {
+ iconFile.set(project.file("desktop-icons/nuvio-windows.ico"))
+ menu = true
+ shortcut = true
+ menuGroup = "Nuvio"
+ exePackageVersion = releaseAppVersionName
+ msiPackageVersion = releaseAppVersionName
+ }
+
+ macOS {
+ dockName = "Nuvio"
+ iconFile.set(project.file("desktop-icons/nuvio.icns"))
+ infoPlist {
+ extraKeysRawXml = """
+ NSRequiresAquaSystemAppearance
+
+ """.trimIndent()
+ }
+ }
+ }
+ }
+}
+
+val packageWindowsNativeRuntime = tasks.register("packageWindowsNativeRuntime") {
+ val mediampRootDir = rootProject.file("mediamp")
+ val mediampNativeBuildDir = mediampRootDir.resolve("mediamp-mpv/build-ci")
+ val mediampPrebuiltDir = mediampRootDir.resolve("mediamp-mpv/libmpv/lib/windows/x86_64")
+ val system32Dir = File(System.getenv("WINDIR") ?: "C:/Windows", "System32")
+ val appDir = layout.buildDirectory.dir("compose/binaries/main-release/app/Nuvio/app")
+ val nativeDir = appDir.map { it.dir("native") }
+ val launcherDir = layout.buildDirectory.dir("compose/binaries/main-release/app/Nuvio")
+
+ group = "compose desktop"
+ description = "Copies MediaMP/MPV native DLLs into the Windows app image and points java.library.path at them."
+ duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+
+ from(mediampNativeBuildDir) {
+ include("*.dll")
+ }
+ from(mediampNativeBuildDir.resolve("Release")) {
+ include("*.dll")
+ }
+ from(mediampPrebuiltDir) {
+ include("*.dll")
+ }
+ from(system32Dir) {
+ include("MSVCP140.dll", "msvcp140.dll")
+ include("VCRUNTIME140.dll", "vcruntime140.dll")
+ include("VCRUNTIME140_1.dll", "vcruntime140_1.dll")
+ }
+ into(nativeDir)
+
+ doLast {
+ val appDirectory = appDir.get().asFile
+ val nativeDirectory = nativeDir.get().asFile
+ val launcherDirectory = launcherDir.get().asFile
+ val cfgFile = appDirectory.resolve("Nuvio.cfg")
+ if (!cfgFile.isFile) return@doLast
+
+ val libraryPathOption = "java-options=-Djava.library.path=\$APPDIR/native"
+ val lines = cfgFile.readLines()
+ var replaced = false
+ val patchedLines = lines.map { line ->
+ if (line.startsWith("java-options=-Djava.library.path=")) {
+ replaced = true
+ libraryPathOption
+ } else {
+ line
+ }
+ }.toMutableList()
+ if (!replaced) {
+ val javaOptionsIndex = patchedLines.indexOf("[JavaOptions]")
+ if (javaOptionsIndex >= 0) {
+ patchedLines.add(javaOptionsIndex + 1, libraryPathOption)
+ } else {
+ patchedLines.add("")
+ patchedLines.add("[JavaOptions]")
+ patchedLines.add(libraryPathOption)
+ }
+ }
+ cfgFile.writeText(patchedLines.joinToString(System.lineSeparator()) + System.lineSeparator())
+
+ nativeDirectory.listFiles { file -> file.isFile && file.extension.equals("dll", ignoreCase = true) }
+ .orEmpty()
+ .forEach { dll ->
+ dll.copyTo(launcherDirectory.resolve(dll.name), overwrite = true)
+ }
+
+ val requiredDlls = listOf(
+ "mediampv.dll",
+ "libmpv-2.dll",
+ "avcodec-61.dll",
+ "avformat-61.dll",
+ "avutil-59.dll",
+ "swscale-8.dll",
+ "vulkan-1.dll",
+ "MSVCP140.dll",
+ "VCRUNTIME140.dll",
+ "VCRUNTIME140_1.dll",
+ )
+ fun File.hasDll(name: String): Boolean =
+ listFiles { file -> file.isFile && file.name.equals(name, ignoreCase = true) }?.isNotEmpty() == true
+
+ val missingFromNative = requiredDlls.filterNot { nativeDirectory.hasDll(it) }
+ val missingFromLauncher = requiredDlls.filterNot { launcherDirectory.hasDll(it) }
+ check(missingFromNative.isEmpty()) {
+ "Windows native runtime is incomplete in ${nativeDirectory.absolutePath}: missing ${missingFromNative.joinToString()}"
+ }
+ check(missingFromLauncher.isEmpty()) {
+ "Windows launcher native fallback is incomplete in ${launcherDirectory.absolutePath}: missing ${missingFromLauncher.joinToString()}"
+ }
+ }
+}
+
+tasks.matching { it.name == "createReleaseDistributable" }.configureEach {
+ finalizedBy(packageWindowsNativeRuntime)
+}
+
+packageWindowsNativeRuntime.configure {
+ mustRunAfter(tasks.matching { it.name == "createReleaseDistributable" })
+}
+
+val windowsPackageResourcesSource = layout.projectDirectory.dir("src/windowsPackageResources").asFile
+val composeWindowsResourceDir = layout.buildDirectory.dir("compose/tmp/resources")
+val windowsInstallerSidebarPngFile = layout.projectDirectory.file("desktop-icons/nuvio-installer-sidebar.png").asFile
+val windowsInstallerBannerBmpFile = layout.projectDirectory.file("desktop-icons/nuvio-installer-banner.bmp").asFile
+val windowsInstallerSetupIconFile = layout.projectDirectory.file("desktop-icons/nuvio-installer.ico").asFile
+
+val syncWindowsPackageResources = tasks.register("syncWindowsPackageResources") {
+ group = "compose desktop"
+ description = "Copies Windows jpackage/WiX override resources into the jpackage --resource-dir used by packageReleaseExe."
+ sourceDirectory.set(windowsPackageResourcesSource)
+ targetDirectory.set(composeWindowsResourceDir)
+ installerSidebarPng.set(windowsInstallerSidebarPngFile)
+ installerBannerBmp.set(windowsInstallerBannerBmpFile)
+ installerSetupIconIco.set(windowsInstallerSetupIconFile)
+}
+
+tasks.matching {
+ it.name == "packageReleaseDistributionForCurrentOS" ||
+ it.name == "packageReleaseExe" ||
+ it.name == "packageReleaseMsi"
+}.configureEach {
+ dependsOn("createReleaseDistributable")
+ dependsOn(packageWindowsNativeRuntime)
+ dependsOn(syncWindowsPackageResources)
+ inputs.dir(windowsPackageResourcesSource)
+}
+
+syncWindowsPackageResources.configure {
+ mustRunAfter(tasks.matching {
+ it.name == "createReleaseDistributable" || it.name == "createRuntimeImage"
+ })
+}
+
+tasks.matching { it.name == "runReleaseDistributable" }.configureEach {
+ dependsOn(packageWindowsNativeRuntime)
+}
+
+val packageReleaseInnoExe = tasks.register("packageReleaseInnoExe") {
+ group = "compose desktop"
+ description = "Builds a Windows installer with Inno Setup (no WiX), using the release app image."
+ dependsOn("createReleaseDistributable")
+ dependsOn(packageWindowsNativeRuntime)
+
+ val appImageDir = layout.buildDirectory.dir("compose/binaries/main-release/app/Nuvio").get().asFile.absolutePath
+ val outputDir = layout.buildDirectory.dir("compose/binaries/main-release/inno").get().asFile.absolutePath
+ val scriptPath = layout.projectDirectory.file("scripts/package-release-inno.ps1").asFile.absolutePath
+ val setupIcon = layout.projectDirectory.file("desktop-icons/nuvio-windows.ico").asFile.absolutePath
+ val appIcon = layout.projectDirectory.file("desktop-icons/nuvio-windows.ico").asFile.absolutePath
+ val sidebarPng = layout.projectDirectory.file("desktop-icons/nuvio-installer-sidebar.png").asFile.absolutePath
+
+ commandLine(
+ "powershell",
+ "-NoProfile",
+ "-ExecutionPolicy",
+ "Bypass",
+ "-File",
+ scriptPath,
+ "-AppDir",
+ appImageDir,
+ "-OutputDir",
+ outputDir,
+ "-AppVersion",
+ releaseAppVersionName,
+ "-AppBuild",
+ releaseAppVersionCode.toString(),
+ "-SetupIcon",
+ setupIcon,
+ "-AppIcon",
+ appIcon,
+ "-SidebarPng",
+ sidebarPng,
+ )
+}
+
+tasks.register("packageReleasePortableZip") {
+ group = "compose desktop"
+ description = "Builds a portable Windows ZIP package (no installer, no WiX/NSIS/Inno)."
+ dependsOn("createReleaseDistributable")
+ dependsOn(packageWindowsNativeRuntime)
+
+ val portableRootName = "Nuvio-${releaseAppVersionName}-portable"
+ val appImageDir = layout.buildDirectory.dir("compose/binaries/main-release/app/Nuvio")
+ val portableMarkerFile = layout.buildDirectory.file("compose/tmp/portable-marker/Nuvio.portable")
+
+ archiveBaseName.set("Nuvio-${releaseAppVersionName}-portable")
+ archiveExtension.set("zip")
+ destinationDirectory.set(layout.buildDirectory.dir("compose/binaries/main-release/portable"))
+
+ // Ensure the portable marker sits next to `Nuvio.exe` inside the generated ZIP root.
+ into(portableRootName)
+ from(appImageDir)
+ doFirst {
+ val markerFile = portableMarkerFile.get().asFile
+ markerFile.parentFile.mkdirs()
+ markerFile.writeText("")
+ }
+ from(portableMarkerFile)
+}
+
+val renameReleaseDmgArtifact = tasks.register("renameReleaseDmgArtifact") {
+ versionName.set(releaseAppVersionName)
+ dmgDirectory.set(layout.buildDirectory.dir("compose/binaries/main-release/dmg"))
+}
+
+tasks.matching { it.name == "packageReleaseDmg" }.configureEach {
+ finalizedBy(renameReleaseDmgArtifact)
+}
+
configurations.all {
exclude(group = "androidx.media3", module = "media3-exoplayer")
exclude(group = "androidx.media3", module = "media3-ui")
diff --git a/composeApp/desktop-proguard-rules.pro b/composeApp/desktop-proguard-rules.pro
new file mode 100644
index 000000000..148c2b45e
--- /dev/null
+++ b/composeApp/desktop-proguard-rules.pro
@@ -0,0 +1,62 @@
+-dontshrink
+-dontoptimize
+-dontobfuscate
+-keepattributes *Annotation*,Signature,InnerClasses,EnclosingMethod
+
+-keep class com.nuvio.app.** { *; }
+-keep interface com.nuvio.app.** { *; }
+-keep enum com.nuvio.app.** { *; }
+
+-keep class coil3.** { *; }
+-keep interface coil3.** { *; }
+-keep enum coil3.** { *; }
+
+-keep class io.ktor.** { *; }
+-keep interface io.ktor.** { *; }
+-keep enum io.ktor.** { *; }
+
+-keep class kotlinx.serialization.** { *; }
+-keep interface kotlinx.serialization.** { *; }
+-keep enum kotlinx.serialization.** { *; }
+
+-keep class dev.whyoleg.** { *; }
+-keep interface dev.whyoleg.** { *; }
+-keep enum dev.whyoleg.** { *; }
+
+-keep class dev.chrisbanes.haze.** { *; }
+-keep interface dev.chrisbanes.haze.** { *; }
+-keep enum dev.chrisbanes.haze.** { *; }
+
+-keep class com.typesafe.config.** { *; }
+-keep interface com.typesafe.config.** { *; }
+-keep enum com.typesafe.config.** { *; }
+
+-keep class io.ktor.client.engine.java.** { *; }
+-keep class io.ktor.serialization.kotlinx.json.** { *; }
+-keep class coil3.network.ktor3.internal.** { *; }
+-keep class dev.whyoleg.cryptography.providers.jdk.** { *; }
+-keep class io.ktor.server.config.** { *; }
+
+-dontwarn androidx.compose.ui.test.**
+-dontwarn dev.chrisbanes.haze.**
+-dontwarn com.google.common.truth.**
+-dontwarn org.objectweb.asm.**
+
+# OkHttp ships optional integrations for Android, Conscrypt, BouncyCastle and
+# OpenJSSE that are runtime-probed via reflection. None of them are present on
+# the Desktop JVM classpath, so ProGuard sees missing references and fails the
+# release build. Silence those references for the Windows Desktop distribution.
+-dontwarn android.**
+-dontwarn dalvik.**
+-dontwarn org.conscrypt.**
+-dontwarn org.bouncycastle.**
+-dontwarn org.openjsse.**
+-dontwarn okhttp3.internal.platform.android.**
+-dontwarn okhttp3.internal.platform.AndroidPlatform
+-dontwarn okhttp3.internal.platform.Android10Platform
+-dontwarn okhttp3.internal.platform.ConscryptPlatform
+-dontwarn okhttp3.internal.platform.ConscryptPlatform$**
+-dontwarn okhttp3.internal.platform.BouncyCastlePlatform
+-dontwarn okhttp3.internal.platform.BouncyCastlePlatform$**
+-dontwarn okhttp3.internal.platform.OpenJSSEPlatform
+-dontwarn okhttp3.internal.platform.OpenJSSEPlatform$**
diff --git a/composeApp/scripts/package-release-inno.ps1 b/composeApp/scripts/package-release-inno.ps1
new file mode 100644
index 000000000..de3f0f04b
--- /dev/null
+++ b/composeApp/scripts/package-release-inno.ps1
@@ -0,0 +1,138 @@
+param(
+ [Parameter(Mandatory=$true)]
+ [string]$AppDir,
+
+ [Parameter(Mandatory=$true)]
+ [string]$OutputDir,
+
+ [Parameter(Mandatory=$true)]
+ [string]$AppVersion,
+
+ [Parameter(Mandatory=$true)]
+ [string]$AppBuild,
+
+ [Parameter(Mandatory=$true)]
+ [string]$SetupIcon,
+
+ [Parameter(Mandatory=$true)]
+ [string]$AppIcon,
+
+ [Parameter(Mandatory=$true)]
+ [string]$SidebarPng
+)
+
+$ErrorActionPreference = "Stop"
+
+# Resolve paths
+$appDirResolved = (Resolve-Path $AppDir).Path
+$outputDirResolved = (Resolve-Path $OutputDir).Path
+$setupIconResolved = (Resolve-Path $SetupIcon).Path
+$appIconResolved = (Resolve-Path $AppIcon).Path
+$sidebarPngResolved = (Resolve-Path $SidebarPng).Path
+
+# Generate .iss file
+$issPath = Join-Path $outputDirResolved "Nuvio-$AppVersion-$AppBuild-x64.iss"
+
+$issContent = @"
+#define MyAppName "Nuvio"
+#define MyAppVersion "$AppVersion"
+#define MyAppPublisher "Creepso"
+
+[Setup]
+AppId={{7E14C1D3-BFA0-45B4-BD5E-0B3D8D6D3C11}
+AppName={#MyAppName}
+AppVersion={#MyAppVersion}
+AppPublisher={#MyAppPublisher}
+DefaultDirName={autopf}\{#MyAppName}
+DefaultGroupName={#MyAppName}
+OutputDir=$($outputDirResolved.Replace('\', '\\'))
+OutputBaseFilename=Nuvio-$AppVersion-$AppBuild-x64
+Compression=lzma
+SolidCompression=yes
+WizardStyle=modern
+SetupIconFile=$($setupIconResolved.Replace('\', '\\'))
+WizardImageFile=$($sidebarPngResolved.Replace('\', '\\'))
+WizardSmallImageFile=$($sidebarPngResolved.Replace('\', '\\'))
+UninstallDisplayIcon={app}\Nuvio.exe
+
+[Languages]
+Name: "french"; MessagesFile: "compiler:Languages\French.isl"
+Name: "english"; MessagesFile: "compiler:Default.isl"
+
+[Tasks]
+Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
+
+[Files]
+Source: "$($appDirResolved.Replace('\', '\\'))\*"; DestDir: "{app}"; Flags: recursesubdirs ignoreversion
+
+[Icons]
+Name: "{group}\Nuvio"; Filename: "{app}\Nuvio.exe"; IconFilename: "{app}\Nuvio.exe"
+Name: "{autodesktop}\Nuvio"; Filename: "{app}\Nuvio.exe"; IconFilename: "{app}\Nuvio.exe"; Tasks: desktopicon
+
+[Registry]
+Root: HKCU; Subkey: "Software\Classes\nuvio"; ValueType: string; ValueData: "URL:Nuvio Protocol"; Flags: uninsdeletekey
+Root: HKCU; Subkey: "Software\Classes\nuvio"; ValueType: string; ValueName: "URL Protocol"; ValueData: ""; Flags: uninsdeletevalue
+Root: HKCU; Subkey: "Software\Classes\nuvio\DefaultIcon"; ValueType: string; ValueData: """{app}\Nuvio.exe"",0"
+Root: HKCU; Subkey: "Software\Classes\nuvio\shell\open\command"; ValueType: string; ValueData: """{app}\Nuvio.exe"" ""%1"""
+
+[Run]
+Filename: "{app}\Nuvio.exe"; Description: "{cm:LaunchProgram,Nuvio}"; Flags: nowait postinstall skipifsilent
+
+[Code]
+procedure CurStepChanged(CurStep: TSetupStep);
+var
+ InstalledFile: string;
+begin
+ if CurStep = ssPostInstall then
+ begin
+ InstalledFile := ExpandConstant('{app}\.installed');
+ SaveStringToFile(InstalledFile, 'installed-by-inno-setup', False);
+ end;
+end;
+"@
+
+Write-Host "Writing ISS to $issPath"
+New-Item -ItemType Directory -Force -Path $outputDirResolved | Out-Null
+Set-Content -LiteralPath $issPath -Value $issContent -Encoding UTF8
+
+# Locate Inno Setup compiler
+$isccPaths = @(
+ "${env:ProgramFiles(x86)}\Inno Setup 6\ISCC.exe",
+ "${env:ProgramFiles(x86)}\Inno Setup 5\ISCC.exe",
+ "${env:ProgramFiles}\Inno Setup 6\ISCC.exe"
+)
+
+$iscc = $null
+foreach ($p in $isccPaths) {
+ if (Test-Path $p) {
+ $iscc = $p
+ break
+ }
+}
+
+if (-not $iscc) {
+ # Try registry lookup
+ $regPath = "HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Inno Setup 6_is1"
+ if (Test-Path $regPath) {
+ $installLocation = (Get-ItemProperty $regPath).InstallLocation
+ if ($installLocation) {
+ $candidate = Join-Path $installLocation "ISCC.exe"
+ if (Test-Path $candidate) { $iscc = $candidate }
+ }
+ }
+}
+
+if (-not $iscc) {
+ Write-Error "Inno Setup compiler (ISCC.exe) not found. Install Inno Setup 6 from https://jrsoftware.org/isinfo.php"
+ exit 1
+}
+
+Write-Host "Compiling installer with $iscc"
+& $iscc $issPath
+
+if ($LASTEXITCODE -ne 0) {
+ Write-Error "ISCC failed with exit code $LASTEXITCODE"
+ exit $LASTEXITCODE
+}
+
+Write-Host "Installer created successfully in $outputDirResolved"
diff --git a/composeApp/src/androidFull/kotlin/com/nuvio/app/features/updater/AppUpdaterPlatform.android.kt b/composeApp/src/androidFull/kotlin/com/nuvio/app/features/updater/AppUpdaterPlatform.android.kt
index 09009d5dc..70c5c0951 100644
--- a/composeApp/src/androidFull/kotlin/com/nuvio/app/features/updater/AppUpdaterPlatform.android.kt
+++ b/composeApp/src/androidFull/kotlin/com/nuvio/app/features/updater/AppUpdaterPlatform.android.kt
@@ -2,6 +2,15 @@ package com.nuvio.app.features.updater
actual object AppUpdaterPlatform {
actual val isSupported: Boolean = true
+ actual val supportsAutoCheck: Boolean = true
+ actual val supportsDownloadAndInstall: Boolean = true
+ actual val gitHubOwner: String = "NuvioMedia"
+ actual val gitHubRepo: String = "NuvioMobile"
+ actual val stableReleaseChannelBranch: String? = "cmp-rewrite"
+ actual val nightlyReleaseTag: String? = null
+ actual val installerAssetExtensions: List = listOf(".apk")
+ actual val portableZipAssetExtensions: List = emptyList()
+ actual val portableZipAssetNameContains: String? = null
actual fun getSupportedAbis(): List = AndroidAppUpdaterPlatform.getSupportedAbis()
@@ -11,6 +20,12 @@ actual object AppUpdaterPlatform {
AndroidAppUpdaterPlatform.setIgnoredTag(tag)
}
+ actual fun getNightlyBuildMode(): Boolean = false
+
+ actual fun setNightlyBuildMode(enabled: Boolean) = Unit
+
+ actual fun prefersPortableUpdate(): Boolean = false
+
actual suspend fun downloadApk(
assetUrl: String,
assetName: String,
@@ -24,4 +39,10 @@ actual object AppUpdaterPlatform {
}
actual fun installDownloadedApk(path: String): Result = AndroidAppUpdaterPlatform.installDownloadedApk(path)
-}
\ No newline at end of file
+
+ actual fun openDownloadedFileLocation(path: String): Result =
+ Result.failure(IllegalStateException("Opening download location is unavailable on this build."))
+
+ actual fun openReleasePage(url: String): Result =
+ Result.failure(IllegalStateException("Opening release pages is unavailable on this build."))
+}
diff --git a/composeApp/src/androidMain/kotlin/com/nuvio/app/Platform.android.kt b/composeApp/src/androidMain/kotlin/com/nuvio/app/Platform.android.kt
index 5ba9da3cc..84a136a4e 100644
--- a/composeApp/src/androidMain/kotlin/com/nuvio/app/Platform.android.kt
+++ b/composeApp/src/androidMain/kotlin/com/nuvio/app/Platform.android.kt
@@ -8,4 +8,5 @@ class AndroidPlatform : Platform {
actual fun getPlatform(): Platform = AndroidPlatform()
-internal actual val isIos: Boolean = false
\ No newline at end of file
+internal actual val isIos: Boolean = false
+internal actual val isDesktop: Boolean = false
\ No newline at end of file
diff --git a/composeApp/src/androidMain/kotlin/com/nuvio/app/core/ui/DesktopContextMenuPointer.android.kt b/composeApp/src/androidMain/kotlin/com/nuvio/app/core/ui/DesktopContextMenuPointer.android.kt
new file mode 100644
index 000000000..448b56741
--- /dev/null
+++ b/composeApp/src/androidMain/kotlin/com/nuvio/app/core/ui/DesktopContextMenuPointer.android.kt
@@ -0,0 +1,5 @@
+package com.nuvio.app.core.ui
+
+import androidx.compose.ui.Modifier
+
+actual fun Modifier.desktopContextMenuPointer(onContextMenu: (() -> Unit)?): Modifier = this
diff --git a/composeApp/src/androidMain/kotlin/com/nuvio/app/core/ui/DesktopHorizontalLazyRowGestures.android.kt b/composeApp/src/androidMain/kotlin/com/nuvio/app/core/ui/DesktopHorizontalLazyRowGestures.android.kt
new file mode 100644
index 000000000..7d8244b34
--- /dev/null
+++ b/composeApp/src/androidMain/kotlin/com/nuvio/app/core/ui/DesktopHorizontalLazyRowGestures.android.kt
@@ -0,0 +1,6 @@
+package com.nuvio.app.core.ui
+
+import androidx.compose.foundation.lazy.LazyListState
+import androidx.compose.ui.Modifier
+
+actual fun Modifier.desktopHorizontalLazyRowGestures(listState: LazyListState): Modifier = this
diff --git a/composeApp/src/androidMain/kotlin/com/nuvio/app/core/ui/NuvioImageDecodeQuality.android.kt b/composeApp/src/androidMain/kotlin/com/nuvio/app/core/ui/NuvioImageDecodeQuality.android.kt
new file mode 100644
index 000000000..0a7f47741
--- /dev/null
+++ b/composeApp/src/androidMain/kotlin/com/nuvio/app/core/ui/NuvioImageDecodeQuality.android.kt
@@ -0,0 +1,4 @@
+package com.nuvio.app.core.ui
+
+internal actual fun nuvioQualityDecodeDimensionPx(displayDimensionPx: Int): Int =
+ displayDimensionPx.coerceAtLeast(1)
diff --git a/composeApp/src/androidMain/kotlin/com/nuvio/app/core/ui/PosterCardStylePlatform.android.kt b/composeApp/src/androidMain/kotlin/com/nuvio/app/core/ui/PosterCardStylePlatform.android.kt
new file mode 100644
index 000000000..7266b78b2
--- /dev/null
+++ b/composeApp/src/androidMain/kotlin/com/nuvio/app/core/ui/PosterCardStylePlatform.android.kt
@@ -0,0 +1,4 @@
+package com.nuvio.app.core.ui
+
+internal actual fun resolvedPosterWidthDp(preset: PosterCardWidthPreset): Int =
+ legacyMobilePosterWidthDp(preset)
diff --git a/composeApp/src/androidMain/kotlin/com/nuvio/app/features/home/components/CollectionCardRemoteImage.android.kt b/composeApp/src/androidMain/kotlin/com/nuvio/app/features/home/components/CollectionCardRemoteImage.android.kt
index 0bd54dcb3..3c70aaf5f 100644
--- a/composeApp/src/androidMain/kotlin/com/nuvio/app/features/home/components/CollectionCardRemoteImage.android.kt
+++ b/composeApp/src/androidMain/kotlin/com/nuvio/app/features/home/components/CollectionCardRemoteImage.android.kt
@@ -11,17 +11,24 @@ import coil3.request.ImageRequest
@Composable
internal actual fun CollectionCardRemoteImage(
imageUrl: String,
+ animatedImageUrl: String?,
contentDescription: String,
modifier: Modifier,
contentScale: ContentScale,
animateIfPossible: Boolean,
+ animateNow: Boolean,
) {
+ val effectiveImageUrl = if (animateIfPossible && !animatedImageUrl.isNullOrBlank()) {
+ animatedImageUrl
+ } else {
+ imageUrl
+ }
val context = LocalContext.current
- val request: ImageRequest = remember(context, imageUrl) {
+ val request: ImageRequest = remember(context, effectiveImageUrl) {
ImageRequest.Builder(context)
- .data(imageUrl)
- .memoryCacheKey("home-collection:$imageUrl")
- .diskCacheKey(imageUrl)
+ .data(effectiveImageUrl)
+ .memoryCacheKey("home-collection:$effectiveImageUrl")
+ .diskCacheKey(effectiveImageUrl)
.build()
}
@@ -31,4 +38,4 @@ internal actual fun CollectionCardRemoteImage(
modifier = modifier,
contentScale = contentScale,
)
-}
\ No newline at end of file
+}
diff --git a/composeApp/src/androidMain/kotlin/com/nuvio/app/features/player/PlayerLibassSupport.android.kt b/composeApp/src/androidMain/kotlin/com/nuvio/app/features/player/PlayerLibassSupport.android.kt
new file mode 100644
index 000000000..3adeec9d2
--- /dev/null
+++ b/composeApp/src/androidMain/kotlin/com/nuvio/app/features/player/PlayerLibassSupport.android.kt
@@ -0,0 +1,3 @@
+package com.nuvio.app.features.player
+
+internal actual val platformShowsAndroidLibassToggle: Boolean = true
diff --git a/composeApp/src/androidMain/kotlin/com/nuvio/app/features/player/PlayerPlatformEffects.android.kt b/composeApp/src/androidMain/kotlin/com/nuvio/app/features/player/PlayerPlatformEffects.android.kt
index c02f9f6a6..031f9356a 100644
--- a/composeApp/src/androidMain/kotlin/com/nuvio/app/features/player/PlayerPlatformEffects.android.kt
+++ b/composeApp/src/androidMain/kotlin/com/nuvio/app/features/player/PlayerPlatformEffects.android.kt
@@ -77,6 +77,9 @@ actual fun ManagePlayerPictureInPicture(
}
}
+@Composable
+actual fun ManagePlayerCursorVisibility(visible: Boolean) = Unit
+
@Composable
actual fun rememberPlayerGestureController(): PlayerGestureController? {
val context = LocalContext.current
@@ -99,6 +102,29 @@ actual fun rememberPlayerGestureController(): PlayerGestureController? {
return controller
}
+@Composable
+actual fun rememberPlayerFullscreenController(): PlayerFullscreenController =
+ remember {
+ object : PlayerFullscreenController {
+ override val isFullscreenSupported: Boolean = false
+ override val isFullscreen: Boolean = false
+ override fun toggleFullscreen() = Unit
+ }
+ }
+
+@Composable
+actual fun ManageFullscreenKeyboardShortcuts(isHomeRouteActive: Boolean) = Unit
+
+@Composable
+actual fun BindPlayerKeyboardShortcuts(
+ enabled: Boolean,
+ handlers: PlayerKeyboardShortcutHandlers,
+) = Unit
+
+actual val usesNativePlayerChrome: Boolean = false
+
+actual val usesAnimatedPlayerChrome: Boolean = true
+
private tailrec fun Context.findActivity(): Activity? =
when (this) {
is Activity -> this
diff --git a/composeApp/src/androidMain/kotlin/com/nuvio/app/features/player/PlayerPlaybackNetworking.kt b/composeApp/src/androidMain/kotlin/com/nuvio/app/features/player/PlayerPlaybackNetworking.kt
index 01653e477..b44e5c380 100644
--- a/composeApp/src/androidMain/kotlin/com/nuvio/app/features/player/PlayerPlaybackNetworking.kt
+++ b/composeApp/src/androidMain/kotlin/com/nuvio/app/features/player/PlayerPlaybackNetworking.kt
@@ -8,14 +8,7 @@ import com.nuvio.app.core.network.IPv4FirstDns
import okhttp3.OkHttpClient
import java.net.HttpURLConnection
import java.net.URL
-import java.security.SecureRandom
-import java.security.cert.X509Certificate
import java.util.concurrent.TimeUnit
-import javax.net.ssl.HostnameVerifier
-import javax.net.ssl.HttpsURLConnection
-import javax.net.ssl.SSLContext
-import javax.net.ssl.TrustManager
-import javax.net.ssl.X509TrustManager
internal object PlayerPlaybackNetworking {
private val DEFAULT_STREAM_HEADERS = mapOf(
@@ -29,27 +22,9 @@ internal object PlayerPlaybackNetworking {
"Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 " +
"(KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36"
- private val trustAllManager = object : X509TrustManager {
- override fun checkClientTrusted(chain: Array?, authType: String?) = Unit
-
- override fun checkServerTrusted(chain: Array?, authType: String?) = Unit
-
- override fun getAcceptedIssuers(): Array = emptyArray()
- }
-
- private val playbackHostnameVerifier = HostnameVerifier { _, _ -> true }
-
- private val sslContext: SSLContext by lazy {
- SSLContext.getInstance("TLS").apply {
- init(null, arrayOf(trustAllManager), SecureRandom())
- }
- }
-
private val playbackHttpClient: OkHttpClient by lazy {
OkHttpClient.Builder()
.dns(IPv4FirstDns())
- .sslSocketFactory(sslContext.socketFactory, trustAllManager)
- .hostnameVerifier(playbackHostnameVerifier)
.connectTimeout(15, TimeUnit.SECONDS)
.readTimeout(15, TimeUnit.SECONDS)
.writeTimeout(15, TimeUnit.SECONDS)
@@ -84,10 +59,6 @@ internal object PlayerPlaybackNetworking {
): HttpURLConnection {
val mergedHeaders = DEFAULT_STREAM_HEADERS + headers
return (URL(url).openConnection() as HttpURLConnection).apply {
- if (this is HttpsURLConnection) {
- sslSocketFactory = sslContext.socketFactory
- hostnameVerifier = playbackHostnameVerifier
- }
instanceFollowRedirects = true
connectTimeout = connectTimeoutMs
readTimeout = readTimeoutMs
diff --git a/composeApp/src/androidMain/kotlin/com/nuvio/app/features/player/PlayerRuntimeTrace.android.kt b/composeApp/src/androidMain/kotlin/com/nuvio/app/features/player/PlayerRuntimeTrace.android.kt
new file mode 100644
index 000000000..f42920cb6
--- /dev/null
+++ b/composeApp/src/androidMain/kotlin/com/nuvio/app/features/player/PlayerRuntimeTrace.android.kt
@@ -0,0 +1,15 @@
+package com.nuvio.app.features.player
+
+import android.util.Log
+
+internal actual object PlayerRuntimeTrace {
+ private const val Tag = "NuvioPlayerScreen"
+
+ actual fun info(message: String) {
+ Log.i(Tag, message)
+ }
+
+ actual fun warn(message: String) {
+ Log.w(Tag, message)
+ }
+}
diff --git a/composeApp/src/androidMain/kotlin/com/nuvio/app/features/settings/AlwaysAnimateGifPreference.android.kt b/composeApp/src/androidMain/kotlin/com/nuvio/app/features/settings/AlwaysAnimateGifPreference.android.kt
new file mode 100644
index 000000000..8dd9a4c84
--- /dev/null
+++ b/composeApp/src/androidMain/kotlin/com/nuvio/app/features/settings/AlwaysAnimateGifPreference.android.kt
@@ -0,0 +1,7 @@
+package com.nuvio.app.features.settings
+
+internal actual object AlwaysAnimateGifPreference {
+ actual val isSupported: Boolean = false
+ actual fun load(): Boolean = false
+ actual fun save(enabled: Boolean) = Unit
+}
diff --git a/composeApp/src/androidMain/kotlin/com/nuvio/app/features/settings/AppLanguageDefaults.android.kt b/composeApp/src/androidMain/kotlin/com/nuvio/app/features/settings/AppLanguageDefaults.android.kt
new file mode 100644
index 000000000..331b52e25
--- /dev/null
+++ b/composeApp/src/androidMain/kotlin/com/nuvio/app/features/settings/AppLanguageDefaults.android.kt
@@ -0,0 +1,8 @@
+package com.nuvio.app.features.settings
+
+import java.util.Locale
+
+internal actual object AppLanguageDefaults {
+ actual fun systemLanguageCode(): String? =
+ Locale.getDefault().toLanguageTag().takeIf { it.isNotBlank() }
+}
diff --git a/composeApp/src/androidMain/kotlin/com/nuvio/app/features/settings/DebugLogsSettingsSection.android.kt b/composeApp/src/androidMain/kotlin/com/nuvio/app/features/settings/DebugLogsSettingsSection.android.kt
new file mode 100644
index 000000000..fedf96b30
--- /dev/null
+++ b/composeApp/src/androidMain/kotlin/com/nuvio/app/features/settings/DebugLogsSettingsSection.android.kt
@@ -0,0 +1,8 @@
+package com.nuvio.app.features.settings
+
+import androidx.compose.runtime.Composable
+
+@Composable
+internal actual fun DebugLogsSettingsSection(isTablet: Boolean) {
+ // No-op on Android — debug logs are desktop-only
+}
diff --git a/composeApp/src/androidMain/kotlin/com/nuvio/app/features/settings/DesktopDecoderSettingsSection.android.kt b/composeApp/src/androidMain/kotlin/com/nuvio/app/features/settings/DesktopDecoderSettingsSection.android.kt
new file mode 100644
index 000000000..233095cb3
--- /dev/null
+++ b/composeApp/src/androidMain/kotlin/com/nuvio/app/features/settings/DesktopDecoderSettingsSection.android.kt
@@ -0,0 +1,8 @@
+package com.nuvio.app.features.settings
+
+import androidx.compose.runtime.Composable
+
+@Composable
+internal actual fun DesktopDecoderSettingsSection(isTablet: Boolean) {
+ // Desktop-specific decoder settings. Not applicable on Android.
+}
diff --git a/composeApp/src/androidMain/kotlin/com/nuvio/app/features/settings/KeybindsSettingsContent.android.kt b/composeApp/src/androidMain/kotlin/com/nuvio/app/features/settings/KeybindsSettingsContent.android.kt
new file mode 100644
index 000000000..86a23854d
--- /dev/null
+++ b/composeApp/src/androidMain/kotlin/com/nuvio/app/features/settings/KeybindsSettingsContent.android.kt
@@ -0,0 +1,6 @@
+package com.nuvio.app.features.settings
+
+import androidx.compose.runtime.Composable
+
+@Composable
+internal actual fun KeybindsSettingsContent(isTablet: Boolean) = Unit
diff --git a/composeApp/src/androidMain/kotlin/com/nuvio/app/features/settings/PlatformPlaybackLicense.android.kt b/composeApp/src/androidMain/kotlin/com/nuvio/app/features/settings/PlatformPlaybackLicense.android.kt
new file mode 100644
index 000000000..6710ad6a0
--- /dev/null
+++ b/composeApp/src/androidMain/kotlin/com/nuvio/app/features/settings/PlatformPlaybackLicense.android.kt
@@ -0,0 +1,19 @@
+package com.nuvio.app.features.settings
+
+import androidx.compose.runtime.Composable
+import nuvio.composeapp.generated.resources.Res
+import nuvio.composeapp.generated.resources.settings_licenses_attributions_exoplayer_body
+import nuvio.composeapp.generated.resources.settings_licenses_attributions_exoplayer_license
+import nuvio.composeapp.generated.resources.settings_licenses_attributions_exoplayer_title
+import org.jetbrains.compose.resources.stringResource
+
+private const val ApacheLicenseUrl = "https://www.apache.org/licenses/LICENSE-2.0"
+
+@Composable
+internal actual fun platformPlaybackLicense(): PlatformPlaybackLicense =
+ PlatformPlaybackLicense(
+ title = stringResource(Res.string.settings_licenses_attributions_exoplayer_title),
+ body = stringResource(Res.string.settings_licenses_attributions_exoplayer_body),
+ license = stringResource(Res.string.settings_licenses_attributions_exoplayer_license),
+ link = ApacheLicenseUrl,
+ )
diff --git a/composeApp/src/androidMain/kotlin/com/nuvio/app/features/settings/PlatformSettingsSearch.android.kt b/composeApp/src/androidMain/kotlin/com/nuvio/app/features/settings/PlatformSettingsSearch.android.kt
new file mode 100644
index 000000000..fe148ae92
--- /dev/null
+++ b/composeApp/src/androidMain/kotlin/com/nuvio/app/features/settings/PlatformSettingsSearch.android.kt
@@ -0,0 +1,6 @@
+package com.nuvio.app.features.settings
+
+import androidx.compose.runtime.Composable
+
+@Composable
+internal actual fun platformSettingsSearchEntries(): List = emptyList()
diff --git a/composeApp/src/androidMain/kotlin/com/nuvio/app/features/settings/ThemeSettingsStorage.android.kt b/composeApp/src/androidMain/kotlin/com/nuvio/app/features/settings/ThemeSettingsStorage.android.kt
index e082a5360..ccc3c1217 100644
--- a/composeApp/src/androidMain/kotlin/com/nuvio/app/features/settings/ThemeSettingsStorage.android.kt
+++ b/composeApp/src/androidMain/kotlin/com/nuvio/app/features/settings/ThemeSettingsStorage.android.kt
@@ -19,6 +19,7 @@ actual object ThemeSettingsStorage {
private const val amoledEnabledKey = "amoled_enabled"
private const val liquidGlassNativeTabBarEnabledKey = "liquid_glass_native_tab_bar_enabled"
private const val selectedAppLanguageKey = "selected_app_language"
+ private const val lastSelectedAppLanguageKey = "last_selected_app_language"
private val profileScopedSyncKeys = listOf(
selectedThemeKey,
amoledEnabledKey,
@@ -30,7 +31,8 @@ actual object ThemeSettingsStorage {
fun initialize(context: Context) {
preferences = context.getSharedPreferences(preferencesName, Context.MODE_PRIVATE)
- applySelectedAppLanguage(loadSelectedAppLanguage() ?: AppLanguage.ENGLISH.code)
+ val language = AppLanguage.fromSystemCodeOrEnglish(loadSelectedAppLanguage())
+ applySelectedAppLanguage(language.code)
}
actual fun loadSelectedTheme(): String? =
@@ -70,17 +72,26 @@ actual object ThemeSettingsStorage {
}
actual fun loadSelectedAppLanguage(): String? {
- val value = preferences?.getString(selectedAppLanguageKey, null)
- if (value != null) return value
- val legacy = preferences?.getString(ProfileScopedKey.of(selectedAppLanguageKey), null)
- if (legacy != null) saveSelectedAppLanguage(legacy)
- return legacy
+ val profileValue = loadProfileSelectedAppLanguage()
+ if (profileValue != null) return profileValue
+
+ val lastValue = preferences?.getString(lastSelectedAppLanguageKey, null)
+ if (lastValue != null) return lastValue
+
+ val legacyGlobal = preferences?.getString(selectedAppLanguageKey, null)
+ if (legacyGlobal != null) {
+ saveSelectedAppLanguage(legacyGlobal)
+ return legacyGlobal
+ }
+
+ return AppLanguageDefaults.systemLanguageCode()
}
actual fun saveSelectedAppLanguage(languageCode: String) {
preferences
?.edit()
- ?.putString(selectedAppLanguageKey, languageCode)
+ ?.putString(ProfileScopedKey.of(selectedAppLanguageKey), languageCode)
+ ?.putString(lastSelectedAppLanguageKey, languageCode)
?.apply()
}
@@ -94,7 +105,7 @@ actual object ThemeSettingsStorage {
loadSelectedTheme()?.let { put(selectedThemeKey, encodeSyncString(it)) }
loadAmoledEnabled()?.let { put(amoledEnabledKey, encodeSyncBoolean(it)) }
loadLiquidGlassNativeTabBarEnabled()?.let { put(liquidGlassNativeTabBarEnabledKey, encodeSyncBoolean(it)) }
- loadSelectedAppLanguage()?.let { put(selectedAppLanguageKey, encodeSyncString(it)) }
+ loadProfileSelectedAppLanguage()?.let { put(selectedAppLanguageKey, encodeSyncString(it)) }
}
actual fun replaceFromSyncPayload(payload: JsonObject) {
@@ -109,4 +120,7 @@ actual object ThemeSettingsStorage {
payload.decodeSyncString(selectedAppLanguageKey)?.let(::saveSelectedAppLanguage)
applySelectedAppLanguage(loadSelectedAppLanguage() ?: AppLanguage.ENGLISH.code)
}
+
+ private fun loadProfileSelectedAppLanguage(): String? =
+ preferences?.getString(ProfileScopedKey.of(selectedAppLanguageKey), null)
}
diff --git a/composeApp/src/androidPlaystore/kotlin/com/nuvio/app/features/updater/AppUpdaterPlatform.android.kt b/composeApp/src/androidPlaystore/kotlin/com/nuvio/app/features/updater/AppUpdaterPlatform.android.kt
index 01acbee90..bd6d87d46 100644
--- a/composeApp/src/androidPlaystore/kotlin/com/nuvio/app/features/updater/AppUpdaterPlatform.android.kt
+++ b/composeApp/src/androidPlaystore/kotlin/com/nuvio/app/features/updater/AppUpdaterPlatform.android.kt
@@ -2,6 +2,15 @@ package com.nuvio.app.features.updater
actual object AppUpdaterPlatform {
actual val isSupported: Boolean = false
+ actual val supportsAutoCheck: Boolean = false
+ actual val supportsDownloadAndInstall: Boolean = false
+ actual val gitHubOwner: String = "NuvioMedia"
+ actual val gitHubRepo: String = "NuvioMobile"
+ actual val stableReleaseChannelBranch: String? = "cmp-rewrite"
+ actual val nightlyReleaseTag: String? = null
+ actual val installerAssetExtensions: List = listOf(".apk")
+ actual val portableZipAssetExtensions: List = emptyList()
+ actual val portableZipAssetNameContains: String? = null
actual fun getSupportedAbis(): List = emptyList()
@@ -9,6 +18,12 @@ actual object AppUpdaterPlatform {
actual fun setIgnoredTag(tag: String?) = Unit
+ actual fun getNightlyBuildMode(): Boolean = false
+
+ actual fun setNightlyBuildMode(enabled: Boolean) = Unit
+
+ actual fun prefersPortableUpdate(): Boolean = false
+
actual suspend fun downloadApk(
assetUrl: String,
assetName: String,
@@ -21,4 +36,10 @@ actual object AppUpdaterPlatform {
actual fun installDownloadedApk(path: String): Result =
Result.failure(IllegalStateException("In-app updates are unavailable on this build."))
-}
\ No newline at end of file
+
+ actual fun openDownloadedFileLocation(path: String): Result =
+ Result.failure(IllegalStateException("Opening download location is unavailable on this build."))
+
+ actual fun openReleasePage(url: String): Result =
+ Result.failure(IllegalStateException("Opening release pages is unavailable on this build."))
+}
diff --git a/composeApp/src/commonMain/composeResources/drawable/nuvio_window_icon.png b/composeApp/src/commonMain/composeResources/drawable/nuvio_window_icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..9fc0d4ade566f9e7c836ab59e107a320f1b98976
GIT binary patch
literal 73029
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�S!7UKs==_g8Y3;#-bFg
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