Merge branch 'NuvioMedia:cmp-rewrite' into introdb

composeApp/src/commonMain/kotlin/com/nuvio/app/features/player/PlayerScreen.kt

@@ -223,7 +223,6 @@ fun PlayerScreen(
             activeEpisodeNumber,
         ) { mutableStateOf(false) }
         var hasSentCompletionScrobbleForCurrentItem by remember(
-            activeSourceUrl,
             activeVideoId,
             activeSeasonNumber,
             activeEpisodeNumber,
@@ -383,7 +382,6 @@ fun PlayerScreen(
             val progressPercent = currentPlaybackProgressPercent()
             if (progressPercent >= 1f && progressPercent < 80f) {
                 emitTraktScrobbleStop(progressPercent)
-                hasSentCompletionScrobbleForCurrentItem = false
                 return
             }
 
@@ -1199,15 +1197,20 @@ fun PlayerScreen(
             pausedOverlayVisible = true
         }
 
-        LaunchedEffect(playbackSnapshot.positionMs, playbackSnapshot.isPlaying, playbackSnapshot.isEnded, playbackSnapshot.durationMs) {
+        LaunchedEffect(
+            playbackSnapshot.positionMs,
+            playbackSnapshot.isPlaying,
+            playbackSnapshot.isLoading,
+            playbackSnapshot.isEnded,
+            playbackSnapshot.durationMs,
+        ) {
             if (playbackSnapshot.isEnded) {
-                hasSentCompletionScrobbleForCurrentItem = false
                 flushWatchProgress()
                 previousIsPlaying = false
                 return@LaunchedEffect
             }
 
-            if (previousIsPlaying && !playbackSnapshot.isPlaying) {
+            if (previousIsPlaying && !playbackSnapshot.isPlaying && !playbackSnapshot.isLoading) {
                 flushWatchProgress()
             }
 
@@ -1215,7 +1218,9 @@ fun PlayerScreen(
                 emitTraktScrobbleStart()
             }
 
+            if (!playbackSnapshot.isLoading) {
                 previousIsPlaying = playbackSnapshot.isPlaying
+            }
 
             if (!playbackSnapshot.isPlaying) {
                 return@LaunchedEffect

composeApp/src/commonMain/kotlin/com/nuvio/app/features/settings/AppLanguage.kt

@@ -4,7 +4,7 @@ import nuvio.composeapp.generated.resources.Res
 import nuvio.composeapp.generated.resources.lang_english
 import nuvio.composeapp.generated.resources.lang_french
 import nuvio.composeapp.generated.resources.lang_spanish
-import nuvio.composeapp.generated.resources.lang_portuguese
+import nuvio.composeapp.generated.resources.lang_portuguese_portugal
 import nuvio.composeapp.generated.resources.lang_turkish
 import nuvio.composeapp.generated.resources.lang_italian
 import nuvio.composeapp.generated.resources.lang_greek
@@ -18,6 +18,7 @@ enum class AppLanguage(
     ENGLISH("en", Res.string.lang_english),
     FRENCH("fr", Res.string.lang_french),
     SPANISH("es", Res.string.lang_spanish),
+    PORTUGUESE("pt", Res.string.lang_portuguese_portugal),
     TURKISH("tr", Res.string.lang_turkish),
     ITALIAN("it", Res.string.lang_italian),
     GREEK("el", Res.string.lang_greek),

composeApp/src/commonMain/kotlin/com/nuvio/app/features/settings/ThemeSettingsRepository.kt

@@ -48,8 +48,8 @@ object ThemeSettingsRepository {
         _selectedTheme.value = theme
         _amoledEnabled.value = ThemeSettingsStorage.loadAmoledEnabled() ?: false
         val appLanguage = AppLanguage.fromCode(ThemeSettingsStorage.loadSelectedAppLanguage())
-        _selectedAppLanguage.value = appLanguage
         ThemeSettingsStorage.applySelectedAppLanguage(appLanguage.code)
+        _selectedAppLanguage.value = appLanguage
     }
 
     fun setTheme(theme: AppTheme) {
@@ -69,8 +69,8 @@ object ThemeSettingsRepository {
     fun setAppLanguage(language: AppLanguage) {
         ensureLoaded()
         if (_selectedAppLanguage.value == language) return
-        _selectedAppLanguage.value = language
         ThemeSettingsStorage.saveSelectedAppLanguage(language.code)
         ThemeSettingsStorage.applySelectedAppLanguage(language.code)
+        _selectedAppLanguage.value = language
     }
 }

composeApp/src/iosMain/kotlin/com/nuvio/app/features/player/PlayerEngine.ios.kt

@@ -34,23 +34,22 @@ actual fun PlatformPlayerSurface(
     onError: (String?) -> Unit,
 ) {
     sanitizePlaybackResponseHeaders(sourceResponseHeaders)
+    val latestOnControllerReady = rememberUpdatedState(onControllerReady)
     val latestOnSnapshot = rememberUpdatedState(onSnapshot)
     val latestOnError = rememberUpdatedState(onError)
 
-    val bridge = remember(sourceUrl) {
+    val bridge = remember {
         NuvioPlayerBridgeFactory.create()
     }
 
     if (bridge == null) {
         LaunchedEffect(Unit) {
-            onError("MPV player engine not available. Please rebuild the app.")
+            latestOnError.value("MPV player engine not available. Please rebuild the app.")
         }
         return
     }
 
-    // Create controller
+    val controller = remember(bridge) {
-    LaunchedEffect(bridge) {
-        onControllerReady(
         object : PlayerEngineController {
             override fun play() {
                 bridge.play()
@@ -207,7 +206,10 @@ actual fun PlatformPlayerSurface(
                 )
             }
         }
-        )
+    }
+
+    LaunchedEffect(controller, sourceUrl, sourceAudioUrl, sourceHeaders, sourceResponseHeaders) {
+        latestOnControllerReady.value(controller)
     }
 
     // Load file and set initial state

composeApp/src/iosMain/kotlin/com/nuvio/app/features/settings/ThemeSettingsStorage.ios.kt

@@ -50,7 +50,17 @@ actual object ThemeSettingsStorage {
         NSUserDefaults.standardUserDefaults.setObject(languageCode, forKey = selectedAppLanguageKey)
     }
 
-    actual fun applySelectedAppLanguage(languageCode: String) = Unit
+    actual fun applySelectedAppLanguage(languageCode: String) {
+        val normalizedCode = languageCode
+            .trim()
+            .takeIf { it.isNotBlank() }
+            ?: AppLanguage.ENGLISH.code
+        NSUserDefaults.standardUserDefaults.setObject(
+            listOf(normalizedCode),
+            forKey = "AppleLanguages",
+        )
+        NSUserDefaults.standardUserDefaults.synchronize()
+    }
 
     actual fun exportToSyncPayload(): JsonObject = buildJsonObject {
         loadSelectedTheme()?.let { put(selectedThemeKey, encodeSyncString(it)) }
@@ -69,5 +79,6 @@ actual object ThemeSettingsStorage {
         payload.decodeSyncString(selectedThemeKey)?.let(::saveSelectedTheme)
         payload.decodeSyncBoolean(amoledEnabledKey)?.let(::saveAmoledEnabled)
         payload.decodeSyncString(selectedAppLanguageKey)?.let(::saveSelectedAppLanguage)
+        applySelectedAppLanguage(loadSelectedAppLanguage() ?: AppLanguage.ENGLISH.code)
     }
 }

iosApp/Configuration/Version.xcconfig

@@ -1,3 +1,3 @@
-CURRENT_PROJECT_VERSION=49
+CURRENT_PROJECT_VERSION=50
-MARKETING_VERSION=0.1.0
+MARKETING_VERSION=0.1.13