chore(build): increment app-tv versionCode to 2000023

Episodes missing season/identity fields from Jellyfin previously crashed
the converter due to non-null assertions. Introduce an Uncategorized
sentinel season appended to a series via Series.allSeasons so these
episodes are selectable in the season tabs on both phone and TV.

- Add UNCATEGORIZED_SEASON_ID/SERIES_ID/LABEL constants in core-model
- Make BaseItemDtoConverter null-safe and partition uncategorized episodes
- InMemoryLocalMediaRepository collects uncategorized episodes per series
- OfflineRoomMediaLocalDataSource persists and reconstructs the sentinel
- SeriesScreen and TvSeriesScreen use allSeasons for tab rendering

.gitignore

@@ -18,4 +18,5 @@
 local.properties
 .codex/
 openspec
+.opencode
 *.patch

AGENTS.md

@@ -72,7 +72,6 @@ When asked to prepare a commit:
 3. Inspect the relevant files and nearby code.
 4. Choose the simplest solution aligned with Google’s standards.
 5. Check if the code can be simplified:
-
    * If yes, simplify it.
    * Do not reduce readability.
 6. Summarize the result, including anything not verified.

README.md

@@ -53,9 +53,44 @@ cd purefin
    - For Android devices: Select your device/emulator and click Run
    - For Android TV: Select an Android TV emulator or device
 
-### Download APK
+### APK Repository
 
-_Release builds coming soon_
+APKs are distributed via the [APK Version Manager](https://apks.t.bbara.hu/docs) at `https://apks.t.bbara.hu`.
+
+#### App names
+
+| Variant | App name | Update URL                                                   |
+|---------|----------|--------------------------------------------------------------|
+| Release (phone) | `purefin-app` | `https://apks.t.bbara.hu/apps/purefin-app/update.json`       |
+| Debug (phone) | `purefin-app-debug` | `https://apks.t.bbara.hu/apps/purefin-app-debug/update.json` |
+| Release (TV) | `purefin-tv` | `https://apks.t.bbara.hu/apps/purefin-tv/update.json`        |
+
+#### Building
+
+```bash
+# Phone
+./gradlew :app:assembleDebug           # debug APK
+./gradlew :app:assembleRelease         # release APK (unsigned)
+
+# Android TV
+./gradlew :app-tv:assembleDebug        # debug APK
+./gradlew :app-tv:assembleRelease      # release APK (unsigned)
+```
+
+APK outputs go to `app/build/outputs/apk/<variant>/` and `app-tv/build/outputs/apk/<variant>/`.
+
+#### Uploading
+
+Upload via the API at `POST /api/apps/{app_name}/upload`:
+
+```bash
+curl -X POST "https://apks.t.bbara.hu/api/apps/purefin-app-debug/upload" \
+  -F "apk_file=@app/build/outputs/apk/debug/app-debug.apk" \
+  -F "version_code=$(grep purefinDebugVersionCode gradle.properties | cut -d= -f2)" \
+  -F "version_name=0.1-debug"
+```
+
+The `version_code` is defined in `gradle.properties` (`purefinReleaseVersionCode` for phone release, `purefinDebugVersionCode` for phone debug, `purefinTvVersionCode` for TV). The `version_name` is `0.1` for release or `0.1-debug` for debug. Both fields are required — the server cannot auto-extract them from the APK.
 
 ## Usage
 

app-tv/build.gradle.kts

@@ -13,13 +13,13 @@ plugins {
 
 android {
     namespace = "hu.bbara.purefin.tv"
-    compileSdk = 36
+    compileSdk = 37
 
     defaultConfig {
         applicationId = "hu.bbara.purefin.tv"
         minSdk = 29
         targetSdk = 36
-        versionCode = 2000001
+        versionCode = providers.gradleProperty("purefinTvVersionCode").get().toInt()
         versionName = "0.1"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
@@ -53,11 +53,15 @@ kotlin {
 }
 
 dependencies {
+    implementation(project(":data"))
     implementation(project(":core"))
     implementation(project(":core-model"))
     implementation(project(":core-ui"))
+    implementation(libs.androidx.compose.animation)
     implementation(libs.androidx.core.ktx)
+    implementation(libs.androidx.compose.foundation)
     implementation(libs.androidx.lifecycle.runtime.ktx)
+    implementation(libs.androidx.lifecycle.runtime.compose)
     implementation(libs.androidx.lifecycle.viewmodel.compose)
     implementation(libs.androidx.lifecycle.viewmodel.navigation3)
     implementation(libs.androidx.activity.compose)

app-tv/src/androidTest/java/hu/bbara/purefin/ui/screen/home/components/TvHomeContentTest.kt

@@ -19,10 +19,10 @@ import androidx.compose.ui.unit.dp
 import hu.bbara.purefin.model.Episode
 import hu.bbara.purefin.model.LibraryKind
 import hu.bbara.purefin.model.Movie
-import hu.bbara.purefin.ui.model.EpisodeUiModel
+import hu.bbara.purefin.core.model.EpisodeUiModel
-import hu.bbara.purefin.ui.model.MediaUiModel
+import hu.bbara.purefin.core.model.MediaUiModel
-import hu.bbara.purefin.ui.model.MovieUiModel
+import hu.bbara.purefin.core.model.MovieUiModel
-import hu.bbara.purefin.ui.model.LibraryUiModel
+import hu.bbara.purefin.core.model.LibraryUiModel
 import hu.bbara.purefin.ui.screen.home.TvHomeScreen
 import hu.bbara.purefin.ui.theme.AppTheme
 import org.junit.Assert.assertEquals

app-tv/src/androidTest/java/hu/bbara/purefin/ui/screen/home/components/TvNavigationDrawerTest.kt

@@ -24,8 +24,8 @@ import androidx.compose.ui.test.performKeyInput
 import androidx.compose.ui.test.performSemanticsAction
 import androidx.compose.ui.test.pressKey
 import androidx.compose.ui.unit.dp
-import hu.bbara.purefin.navigation.LibraryDto
+import hu.bbara.purefin.core.navigation.LibraryDto
-import hu.bbara.purefin.navigation.Route
+import hu.bbara.purefin.core.navigation.Route
 import hu.bbara.purefin.ui.theme.AppTheme
 import org.junit.Rule
 import org.junit.Test

app-tv/src/androidTest/java/hu/bbara/purefin/ui/screen/libraries/TvLibrariesOverviewScreenTest.kt

@@ -5,7 +5,7 @@ import androidx.compose.ui.test.junit4.createAndroidComposeRule
 import androidx.compose.ui.test.onNodeWithTag
 import androidx.compose.ui.test.performClick
 import hu.bbara.purefin.model.LibraryKind
-import hu.bbara.purefin.ui.model.LibraryUiModel
+import hu.bbara.purefin.core.model.LibraryUiModel
 import hu.bbara.purefin.ui.theme.AppTheme
 import org.junit.Assert.assertEquals
 import org.junit.Rule

app-tv/src/androidTest/java/hu/bbara/purefin/ui/screen/player/components/TvPlayerControlsOverlayTest.kt

@@ -1,979 +0,0 @@
-package hu.bbara.purefin.ui.screen.player.components
-
-import androidx.activity.ComponentActivity
-import androidx.compose.animation.AnimatedVisibility
-import androidx.compose.foundation.focusable
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.size
-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.focus.FocusRequester
-import androidx.compose.ui.focus.focusRequester
-import androidx.compose.ui.input.key.Key
-import androidx.compose.ui.input.key.onPreviewKeyEvent
-import androidx.compose.ui.platform.testTag
-import androidx.compose.ui.semantics.SemanticsActions
-import androidx.compose.ui.semantics.SemanticsProperties
-import androidx.compose.ui.semantics.semantics
-import androidx.compose.ui.semantics.stateDescription
-import androidx.compose.ui.test.ExperimentalTestApi
-import androidx.compose.ui.test.SemanticsMatcher
-import androidx.compose.ui.test.assert
-import androidx.compose.ui.test.assertCountEquals
-import androidx.compose.ui.test.assertIsDisplayed
-import androidx.compose.ui.test.assertIsFocused
-import androidx.compose.ui.test.assertIsNotEnabled
-import androidx.compose.ui.test.junit4.createAndroidComposeRule
-import androidx.compose.ui.test.onAllNodesWithContentDescription
-import androidx.compose.ui.test.onAllNodesWithTag
-import androidx.compose.ui.test.onNodeWithTag
-import androidx.compose.ui.test.onNodeWithText
-import androidx.compose.ui.test.performKeyInput
-import androidx.compose.ui.test.performSemanticsAction
-import androidx.compose.ui.test.pressKey
-import androidx.compose.ui.unit.dp
-import hu.bbara.purefin.player.model.PlayerUiState
-import hu.bbara.purefin.player.model.PlaylistElementUiModel
-import hu.bbara.purefin.player.model.TrackOption
-import hu.bbara.purefin.player.model.TrackType
-import hu.bbara.purefin.ui.screen.player.TV_HIDDEN_STOP_FEEDBACK_MS
-import hu.bbara.purefin.ui.screen.player.TvPlayerHiddenStopFeedback
-import hu.bbara.purefin.ui.screen.player.TvPlayerHiddenStopFeedbackTag
-import hu.bbara.purefin.ui.screen.player.handleTvPlayerRootKeyEvent
-import hu.bbara.purefin.ui.theme.AppTheme
-import kotlinx.coroutines.delay
-import org.junit.Rule
-import org.junit.Test
-
-private const val TvPlayerRootTag = "tv_player_root"
-private const val TvPlayerHiddenPauseCountTag = "tv_player_hidden_pause_count"
-private const val TvPlayerHiddenResumeCountTag = "tv_player_hidden_resume_count"
-private const val TvPlayerHiddenSeekDeltaTag = "tv_player_hidden_seek_delta"
-
-@OptIn(ExperimentalTestApi::class)
-class TvPlayerControlsOverlayTest {
-
-    @get:Rule
-    val composeRule = createAndroidComposeRule<ComponentActivity>()
-
-    @Test
-    fun requestingControlsFocus_focusesPlayPauseInsteadOfSeekBar() {
-        composeRule.setContent {
-            AppTheme {
-                OverlayHost(
-                    uiState = samplePlayerState(),
-                    requestFocus = true
-                )
-            }
-        }
-
-        composeRule.waitForIdle()
-
-        composeRule.onNodeWithTag(TvPlayerPlayPauseButtonTag).assertIsFocused()
-        composeRule.onNodeWithTag(TvPlayerSeekBarTag)
-            .assert(
-                SemanticsMatcher.expectValue(
-                    SemanticsProperties.Focused,
-                    false
-                )
-            )
-    }
-
-    @Test
-    fun downFromSeekBar_movesFocusToControlButtonsBeforePlaylist() {
-        composeRule.setContent {
-            AppTheme {
-                OverlayHost(uiState = samplePlayerState())
-            }
-        }
-
-        composeRule.onNodeWithTag(TvPlayerSeekBarTag)
-            .performSemanticsAction(SemanticsActions.RequestFocus)
-            .assertIsFocused()
-            .performKeyInput {
-                pressKey(Key.DirectionDown)
-            }
-
-        composeRule.waitForIdle()
-
-        composeRule.onNodeWithTag(TvPlayerPlaylistStateTag)
-            .assert(
-                SemanticsMatcher.expectValue(
-                    SemanticsProperties.StateDescription,
-                    "collapsed"
-                )
-            )
-        composeRule.onNodeWithTag(TvPlayerPlayPauseButtonTag).assertIsFocused()
-    }
-
-    @Test
-    fun downFromControls_expandsPlaylistAndMovesFocusToCurrentQueueItem() {
-        composeRule.setContent {
-            AppTheme {
-                OverlayHost(uiState = samplePlayerState())
-            }
-        }
-
-        composeRule.onNodeWithTag(TvPlayerPlayPauseButtonTag)
-            .performSemanticsAction(SemanticsActions.RequestFocus)
-            .assertIsFocused()
-            .performKeyInput {
-                pressKey(Key.DirectionDown)
-            }
-
-        composeRule.waitForIdle()
-
-        composeRule.onNodeWithTag(TvPlayerPlaylistStateTag)
-            .assert(
-                SemanticsMatcher.expectValue(
-                    SemanticsProperties.StateDescription,
-                    "expanded"
-                )
-            )
-        composeRule.onNodeWithTag(TvPlayerPlaylistCurrentItemTag).assertIsFocused()
-    }
-
-    @Test
-    fun upFromCurrentQueueItem_collapsesPlaylistAndRestoresFocusedControl() {
-        composeRule.setContent {
-            AppTheme {
-                OverlayHost(uiState = samplePlayerState())
-            }
-        }
-
-        composeRule.onNodeWithTag(TvPlayerPlayPauseButtonTag)
-            .performSemanticsAction(SemanticsActions.RequestFocus)
-            .performKeyInput {
-                pressKey(Key.DirectionDown)
-            }
-
-        composeRule.waitForIdle()
-
-        composeRule.onNodeWithTag(TvPlayerPlaylistCurrentItemTag)
-            .assertIsFocused()
-            .performKeyInput {
-                pressKey(Key.DirectionUp)
-            }
-
-        composeRule.waitForIdle()
-
-        composeRule.onNodeWithTag(TvPlayerPlaylistStateTag)
-            .assert(
-                SemanticsMatcher.expectValue(
-                    SemanticsProperties.StateDescription,
-                    "collapsed"
-                )
-            )
-        composeRule.onNodeWithTag(TvPlayerPlayPauseButtonTag).assertIsFocused()
-    }
-
-    @Test
-    fun rightOnLastPlaylistItem_keepsFocusInPlaylist() {
-        composeRule.setContent {
-            AppTheme {
-                OverlayHost(uiState = samplePlayerState())
-            }
-        }
-
-        composeRule.onNodeWithTag(TvPlayerPlayPauseButtonTag)
-            .performSemanticsAction(SemanticsActions.RequestFocus)
-            .performKeyInput {
-                pressKey(Key.DirectionDown)
-            }
-
-        composeRule.waitForIdle()
-
-        composeRule.onNodeWithTag(TvPlayerPlaylistCurrentItemTag)
-            .assertIsFocused()
-            .performKeyInput {
-                pressKey(Key.DirectionRight)
-            }
-
-        composeRule.waitForIdle()
-
-        composeRule.onNodeWithTag(TvPlayerPlaylistLastItemTag)
-            .assertIsFocused()
-            .performKeyInput {
-                pressKey(Key.DirectionRight)
-            }
-
-        composeRule.waitForIdle()
-
-        composeRule.onNodeWithTag(TvPlayerPlaylistStateTag)
-            .assert(
-                SemanticsMatcher.expectValue(
-                    SemanticsProperties.StateDescription,
-                    "expanded"
-                )
-            )
-        composeRule.onNodeWithTag(TvPlayerPlaylistLastItemTag).assertIsFocused()
-    }
-
-    @Test
-    fun playlistShowsQueueAsRowAndCurrentItemCanReceiveFocus() {
-        composeRule.setContent {
-            AppTheme {
-                OverlayHost(
-                    uiState = samplePlayerState(),
-                    initiallyExpanded = true
-                )
-            }
-        }
-
-        composeRule.waitForIdle()
-
-        composeRule.onNodeWithTag(TvPlayerPlaylistRowTag).assertIsDisplayed()
-        composeRule.onNodeWithTag(TvPlayerPlaylistCurrentItemTag)
-            .performSemanticsAction(SemanticsActions.RequestFocus)
-            .assertIsFocused()
-        composeRule.onNodeWithText("Currently Playing").assertIsDisplayed()
-        composeRule.onNodeWithText("Episode 2").assertIsDisplayed()
-        composeRule.onNodeWithTag(TvPlayerPlaylistFirstItemTag).assertIsDisplayed()
-        composeRule.onNodeWithText("Current").assertIsDisplayed()
-        composeRule.onNodeWithText("Already Played").assertIsDisplayed()
-    }
-
-    @Test
-    fun playlistFallsBackToFirstItemWhenNoCurrentItemExists_andFallbackItemCanReceiveFocus() {
-        composeRule.setContent {
-            AppTheme {
-                OverlayHost(
-                    uiState = samplePlayerState().copy(
-                        queue = listOf(
-                            PlaylistElementUiModel(
-                                id = "first",
-                                title = "Episode 1",
-                                subtitle = "Fallback entry",
-                                artworkUrl = null,
-                                isCurrent = false
-                            ),
-                            PlaylistElementUiModel(
-                                id = "second",
-                                title = "Episode 2",
-                                subtitle = "Later",
-                                artworkUrl = null,
-                                isCurrent = false
-                            )
-                        )
-                    ),
-                    initiallyExpanded = true
-                )
-            }
-        }
-
-        composeRule.waitForIdle()
-
-        composeRule.onNodeWithTag(TvPlayerPlaylistCurrentItemTag)
-            .performSemanticsAction(SemanticsActions.RequestFocus)
-            .assertIsFocused()
-        composeRule.onNodeWithText("Episode 1").assertIsDisplayed()
-    }
-
-    @Test
-    fun openingTrackPanel_focusesSelectedTrackAndHasNoCloseButton() {
-        composeRule.setContent {
-            AppTheme {
-                TrackPanelHost(uiState = samplePlayerState())
-            }
-        }
-
-        composeRule.onNodeWithTag(TvPlayerAudioButtonTag)
-            .performSemanticsAction(SemanticsActions.RequestFocus)
-            .assertIsFocused()
-            .performKeyInput {
-                pressKey(Key.DirectionCenter)
-            }
-
-        composeRule.waitForIdle()
-
-        composeRule.onNodeWithTag(TvPlayerTrackPanelTag).assertIsDisplayed()
-        composeRule.onNodeWithTag(TvPlayerTrackSelectedItemTag).assertIsFocused()
-        composeRule.onAllNodesWithContentDescription("Close").assertCountEquals(0)
-    }
-
-    @Test
-    fun openingTrackPanelWithoutSelection_focusesFirstTrack() {
-        composeRule.setContent {
-            AppTheme {
-                TrackPanelHost(
-                    uiState = samplePlayerState().copy(selectedAudioTrackId = null)
-                )
-            }
-        }
-
-        composeRule.onNodeWithTag(TvPlayerAudioButtonTag)
-            .performSemanticsAction(SemanticsActions.RequestFocus)
-            .performKeyInput {
-                pressKey(Key.DirectionCenter)
-            }
-
-        composeRule.waitForIdle()
-
-        composeRule.onNodeWithTag(TvPlayerTrackFirstItemTag).assertIsFocused()
-    }
-
-    @Test
-    fun backOnVisibleControls_hidesOverlayImmediately() {
-        composeRule.setContent {
-            AppTheme {
-                TrackPanelHost(uiState = samplePlayerState())
-            }
-        }
-
-        composeRule.onNodeWithTag(TvPlayerPlayPauseButtonTag)
-            .performSemanticsAction(SemanticsActions.RequestFocus)
-            .assertIsFocused()
-            .performKeyInput {
-                pressKey(Key.Back)
-            }
-
-        composeRule.waitForIdle()
-
-        composeRule.onAllNodesWithTag(TvPlayerPlayPauseButtonTag).assertCountEquals(0)
-        composeRule.onAllNodesWithTag(TvPlayerTrackPanelTag).assertCountEquals(0)
-    }
-
-    @Test
-    fun escapeOnVisibleControls_hidesOverlayImmediately() {
-        composeRule.setContent {
-            AppTheme {
-                TrackPanelHost(uiState = samplePlayerState())
-            }
-        }
-
-        composeRule.onNodeWithTag(TvPlayerPlayPauseButtonTag)
-            .performSemanticsAction(SemanticsActions.RequestFocus)
-            .assertIsFocused()
-            .performKeyInput {
-                pressKey(Key.Escape)
-            }
-
-        composeRule.waitForIdle()
-
-        composeRule.onAllNodesWithTag(TvPlayerPlayPauseButtonTag).assertCountEquals(0)
-        composeRule.onAllNodesWithTag(TvPlayerTrackPanelTag).assertCountEquals(0)
-    }
-
-    @Test
-    fun hiddenControls_centerWhilePlaying_pausesWithoutShowingControlsAndShowsStopFeedback() {
-        composeRule.setContent {
-            AppTheme {
-                TrackPanelHost(
-                    uiState = samplePlayerState(),
-                    initialControlsVisible = false
-                )
-            }
-        }
-
-        composeRule.onNodeWithTag(TvPlayerRootTag)
-            .performSemanticsAction(SemanticsActions.RequestFocus)
-            .performKeyInput {
-                pressKey(Key.DirectionCenter)
-            }
-
-        composeRule.waitForIdle()
-
-        composeRule.onAllNodesWithTag(TvPlayerPlayPauseButtonTag).assertCountEquals(0)
-        composeRule.onNodeWithTag(TvPlayerHiddenStopFeedbackTag).assertIsDisplayed()
-        composeRule.onNodeWithTag(TvPlayerHiddenPauseCountTag)
-            .assert(
-                SemanticsMatcher.expectValue(
-                    SemanticsProperties.StateDescription,
-                    "1"
-                )
-            )
-    }
-
-    @Test
-    fun hiddenControls_enterWhilePlaying_pausesWithoutShowingControlsAndShowsStopFeedback() {
-        composeRule.setContent {
-            AppTheme {
-                TrackPanelHost(
-                    uiState = samplePlayerState(),
-                    initialControlsVisible = false
-                )
-            }
-        }
-
-        composeRule.onNodeWithTag(TvPlayerRootTag)
-            .performSemanticsAction(SemanticsActions.RequestFocus)
-            .performKeyInput {
-                pressKey(Key.Enter)
-            }
-
-        composeRule.waitForIdle()
-
-        composeRule.onAllNodesWithTag(TvPlayerPlayPauseButtonTag).assertCountEquals(0)
-        composeRule.onNodeWithTag(TvPlayerHiddenStopFeedbackTag).assertIsDisplayed()
-        composeRule.onNodeWithTag(TvPlayerHiddenPauseCountTag)
-            .assert(
-                SemanticsMatcher.expectValue(
-                    SemanticsProperties.StateDescription,
-                    "1"
-                )
-            )
-    }
-
-    @Test
-    fun hiddenControls_stopFeedbackAutoHidesAfterTimeout() {
-        composeRule.mainClock.autoAdvance = false
-
-        composeRule.setContent {
-            AppTheme {
-                TrackPanelHost(
-                    uiState = samplePlayerState(),
-                    initialControlsVisible = false
-                )
-            }
-        }
-
-        composeRule.onNodeWithTag(TvPlayerRootTag)
-            .performSemanticsAction(SemanticsActions.RequestFocus)
-            .performKeyInput {
-                pressKey(Key.DirectionCenter)
-            }
-
-        composeRule.mainClock.advanceTimeByFrame()
-        composeRule.onNodeWithTag(TvPlayerHiddenStopFeedbackTag).assertIsDisplayed()
-
-        composeRule.mainClock.advanceTimeBy(TV_HIDDEN_STOP_FEEDBACK_MS - 1)
-        composeRule.mainClock.advanceTimeByFrame()
-        composeRule.onNodeWithTag(TvPlayerHiddenStopFeedbackTag).assertIsDisplayed()
-
-        composeRule.mainClock.advanceTimeBy(1)
-        composeRule.mainClock.advanceTimeBy(300)
-        composeRule.mainClock.advanceTimeByFrame()
-        composeRule.onAllNodesWithTag(TvPlayerHiddenStopFeedbackTag).assertCountEquals(0)
-
-        composeRule.mainClock.autoAdvance = true
-    }
-
-    @Test
-    fun hiddenControls_centerWhilePaused_resumesWithoutShowingControls() {
-        composeRule.setContent {
-            AppTheme {
-                TrackPanelHost(
-                    uiState = samplePlayerState().copy(isPlaying = false),
-                    initialControlsVisible = false
-                )
-            }
-        }
-
-        composeRule.onNodeWithTag(TvPlayerRootTag)
-            .performSemanticsAction(SemanticsActions.RequestFocus)
-            .performKeyInput {
-                pressKey(Key.DirectionCenter)
-            }
-
-        composeRule.waitForIdle()
-
-        composeRule.onAllNodesWithTag(TvPlayerPlayPauseButtonTag).assertCountEquals(0)
-        composeRule.onAllNodesWithTag(TvPlayerHiddenStopFeedbackTag).assertCountEquals(0)
-        composeRule.onNodeWithTag(TvPlayerHiddenPauseCountTag)
-            .assert(
-                SemanticsMatcher.expectValue(
-                    SemanticsProperties.StateDescription,
-                    "0"
-                )
-            )
-        composeRule.onNodeWithTag(TvPlayerHiddenResumeCountTag)
-            .assert(
-                SemanticsMatcher.expectValue(
-                    SemanticsProperties.StateDescription,
-                    "1"
-                )
-            )
-    }
-
-    @Test
-    fun hiddenControls_leftSeeksWithoutShowingControls() {
-        composeRule.setContent {
-            AppTheme {
-                TrackPanelHost(
-                    uiState = samplePlayerState(),
-                    initialControlsVisible = false
-                )
-            }
-        }
-
-        composeRule.onNodeWithTag(TvPlayerRootTag)
-            .performSemanticsAction(SemanticsActions.RequestFocus)
-            .performKeyInput {
-                pressKey(Key.DirectionLeft)
-            }
-
-        composeRule.waitForIdle()
-
-        composeRule.onAllNodesWithTag(TvPlayerPlayPauseButtonTag).assertCountEquals(0)
-        composeRule.onAllNodesWithTag(TvPlayerHiddenStopFeedbackTag).assertCountEquals(0)
-        composeRule.onNodeWithTag(TvPlayerHiddenSeekDeltaTag)
-            .assert(
-                SemanticsMatcher.expectValue(
-                    SemanticsProperties.StateDescription,
-                    "-10000"
-                )
-            )
-    }
-
-    @Test
-    fun hiddenControls_rightSeeksWithoutShowingControls() {
-        composeRule.setContent {
-            AppTheme {
-                TrackPanelHost(
-                    uiState = samplePlayerState(),
-                    initialControlsVisible = false
-                )
-            }
-        }
-
-        composeRule.onNodeWithTag(TvPlayerRootTag)
-            .performSemanticsAction(SemanticsActions.RequestFocus)
-            .performKeyInput {
-                pressKey(Key.DirectionRight)
-            }
-
-        composeRule.waitForIdle()
-
-        composeRule.onAllNodesWithTag(TvPlayerPlayPauseButtonTag).assertCountEquals(0)
-        composeRule.onAllNodesWithTag(TvPlayerHiddenStopFeedbackTag).assertCountEquals(0)
-        composeRule.onNodeWithTag(TvPlayerHiddenSeekDeltaTag)
-            .assert(
-                SemanticsMatcher.expectValue(
-                    SemanticsProperties.StateDescription,
-                    "10000"
-                )
-            )
-    }
-
-    @Test
-    fun backOnTrackPanel_closesItAndRestoresFocusToOpeningButton() {
-        composeRule.setContent {
-            AppTheme {
-                TrackPanelHost(uiState = samplePlayerState())
-            }
-        }
-
-        composeRule.onNodeWithTag(TvPlayerAudioButtonTag)
-            .performSemanticsAction(SemanticsActions.RequestFocus)
-            .performKeyInput {
-                pressKey(Key.DirectionCenter)
-            }
-
-        composeRule.waitForIdle()
-
-        composeRule.onNodeWithTag(TvPlayerTrackSelectedItemTag)
-            .assertIsFocused()
-            .performKeyInput {
-                pressKey(Key.Back)
-            }
-
-        composeRule.waitForIdle()
-
-        composeRule.onAllNodesWithTag(TvPlayerTrackPanelTag).assertCountEquals(0)
-        composeRule.onNodeWithTag(TvPlayerAudioButtonTag).assertIsFocused()
-    }
-
-    @Test
-    fun leftOnTrackPanel_keepsFocusInsidePanel() {
-        composeRule.setContent {
-            AppTheme {
-                TrackPanelHost(uiState = samplePlayerState())
-            }
-        }
-
-        composeRule.onNodeWithTag(TvPlayerAudioButtonTag)
-            .performSemanticsAction(SemanticsActions.RequestFocus)
-            .performKeyInput {
-                pressKey(Key.DirectionCenter)
-            }
-
-        composeRule.waitForIdle()
-
-        composeRule.onNodeWithTag(TvPlayerTrackSelectedItemTag)
-            .assertIsFocused()
-            .performKeyInput {
-                pressKey(Key.DirectionLeft)
-            }
-
-        composeRule.waitForIdle()
-
-        composeRule.onNodeWithTag(TvPlayerTrackPanelTag).assertIsDisplayed()
-        composeRule.onNodeWithTag(TvPlayerTrackSelectedItemTag).assertIsFocused()
-    }
-
-    @Test
-    fun selectingTrack_closesPanelAndRestoresFocusToOpeningButton() {
-        composeRule.setContent {
-            AppTheme {
-                TrackPanelHost(uiState = samplePlayerState())
-            }
-        }
-
-        composeRule.onNodeWithTag(TvPlayerQualityButtonTag)
-            .performSemanticsAction(SemanticsActions.RequestFocus)
-            .performKeyInput {
-                pressKey(Key.DirectionCenter)
-            }
-
-        composeRule.waitForIdle()
-
-        composeRule.onNodeWithTag(TvPlayerTrackSelectedItemTag)
-            .assertIsFocused()
-            .performKeyInput {
-                pressKey(Key.DirectionCenter)
-            }
-
-        composeRule.waitForIdle()
-
-        composeRule.onAllNodesWithTag(TvPlayerTrackPanelTag).assertCountEquals(0)
-        composeRule.onNodeWithTag(TvPlayerQualityButtonTag).assertIsFocused()
-    }
-
-    @Test
-    fun trackButtonsWithoutOptions_areDisabled() {
-        composeRule.setContent {
-            AppTheme {
-                TrackPanelHost(
-                    uiState = samplePlayerState().copy(
-                        audioTracks = emptyList(),
-                        textTracks = emptyList(),
-                        qualityTracks = emptyList(),
-                        selectedAudioTrackId = null,
-                        selectedTextTrackId = null,
-                        selectedQualityTrackId = null
-                    )
-                )
-            }
-        }
-
-        composeRule.onNodeWithTag(TvPlayerAudioButtonTag).assertIsNotEnabled()
-        composeRule.onNodeWithTag(TvPlayerSubtitlesButtonTag).assertIsNotEnabled()
-        composeRule.onNodeWithTag(TvPlayerQualityButtonTag).assertIsNotEnabled()
-    }
-}
-
-@Composable
-private fun OverlayHost(
-    uiState: PlayerUiState,
-    initiallyExpanded: Boolean = false,
-    requestFocus: Boolean = false
-) {
-    var isPlaylistExpanded by remember { mutableStateOf(initiallyExpanded) }
-    val focusRequester = remember { FocusRequester() }
-    val qualityButtonFocusRequester = remember { FocusRequester() }
-    val audioButtonFocusRequester = remember { FocusRequester() }
-    val subtitlesButtonFocusRequester = remember { FocusRequester() }
-
-    LaunchedEffect(requestFocus) {
-        if (requestFocus) {
-            focusRequester.requestFocus()
-        }
-    }
-
-    Box(modifier = Modifier.size(width = 960.dp, height = 540.dp)) {
-        TvPlayerControlsOverlay(
-            uiState = uiState,
-            focusRequester = focusRequester,
-            isPlaylistExpanded = isPlaylistExpanded,
-            qualityButtonFocusRequester = qualityButtonFocusRequester,
-            audioButtonFocusRequester = audioButtonFocusRequester,
-            subtitlesButtonFocusRequester = subtitlesButtonFocusRequester,
-            onPlayPause = {},
-            onSeek = { _ -> },
-            onSeekRelative = { _ -> },
-            onSeekLiveEdge = {},
-            onSkipSegment = {},
-            onNext = {},
-            onPrevious = {},
-            onOpenAudioPanel = {},
-            onOpenSubtitlesPanel = {},
-            onOpenQualityPanel = {},
-            onExpandPlaylist = { isPlaylistExpanded = true },
-            onCollapsePlaylist = { isPlaylistExpanded = false },
-            onSelectQueueItem = { _ -> },
-            qualityButtonEnabled = uiState.qualityTracks.isNotEmpty(),
-            audioButtonEnabled = uiState.audioTracks.isNotEmpty(),
-            subtitlesButtonEnabled = uiState.textTracks.isNotEmpty()
-        )
-    }
-}
-
-@Composable
-private fun TrackPanelHost(
-    uiState: PlayerUiState,
-    initialControlsVisible: Boolean = true
-) {
-    var controlsVisible by remember { mutableStateOf(initialControlsVisible) }
-    var trackPanelType by remember { mutableStateOf<TvTrackPanelType?>(null) }
-    var pendingTrackButtonFocus by remember { mutableStateOf<TvTrackPanelType?>(null) }
-    var stopFeedbackVisible by remember { mutableStateOf(false) }
-    var stopFeedbackRequestId by remember { mutableStateOf(0) }
-    var pauseWithoutControlsCount by remember { mutableStateOf(0) }
-    var resumeWithoutControlsCount by remember { mutableStateOf(0) }
-    var lastHiddenSeekDeltaMs by remember { mutableStateOf(0L) }
-    val rootFocusRequester = remember { FocusRequester() }
-    val controlsFocusRequester = remember { FocusRequester() }
-    val qualityButtonFocusRequester = remember { FocusRequester() }
-    val audioButtonFocusRequester = remember { FocusRequester() }
-    val subtitlesButtonFocusRequester = remember { FocusRequester() }
-    val closeTrackPanel: () -> Unit = {
-        trackPanelType?.let { panelType ->
-            pendingTrackButtonFocus = panelType
-            trackPanelType = null
-            controlsVisible = true
-        }
-    }
-    val pausePlaybackWithoutShowingControls: () -> Unit = {
-        pauseWithoutControlsCount += 1
-        stopFeedbackVisible = true
-        stopFeedbackRequestId += 1
-    }
-    val resumePlaybackWithoutShowingControls: () -> Unit = {
-        resumeWithoutControlsCount += 1
-        stopFeedbackVisible = false
-    }
-    val seekWithoutShowingControls: (Long) -> Unit = { deltaMs ->
-        lastHiddenSeekDeltaMs = deltaMs
-        stopFeedbackVisible = false
-    }
-
-    LaunchedEffect(trackPanelType, pendingTrackButtonFocus) {
-        val pendingFocus = pendingTrackButtonFocus ?: return@LaunchedEffect
-        if (trackPanelType != null) return@LaunchedEffect
-        when (pendingFocus) {
-            TvTrackPanelType.AUDIO -> audioButtonFocusRequester.requestFocus()
-            TvTrackPanelType.SUBTITLES -> subtitlesButtonFocusRequester.requestFocus()
-            TvTrackPanelType.QUALITY -> qualityButtonFocusRequester.requestFocus()
-        }
-        pendingTrackButtonFocus = null
-    }
-
-    LaunchedEffect(stopFeedbackRequestId) {
-        if (stopFeedbackRequestId == 0) return@LaunchedEffect
-        delay(TV_HIDDEN_STOP_FEEDBACK_MS)
-        stopFeedbackVisible = false
-    }
-
-    LaunchedEffect(controlsVisible, trackPanelType) {
-        if (controlsVisible || trackPanelType != null) {
-            stopFeedbackVisible = false
-        } else {
-            rootFocusRequester.requestFocus()
-        }
-    }
-
-    Box(
-        modifier = Modifier
-            .size(width = 960.dp, height = 540.dp)
-            .focusRequester(rootFocusRequester)
-            .focusable()
-            .testTag(TvPlayerRootTag)
-            .onPreviewKeyEvent { event ->
-                handleTvPlayerRootKeyEvent(
-                    event = event,
-                    isPlaying = uiState.isPlaying,
-                    controlsVisible = controlsVisible,
-                    isPlaylistExpanded = false,
-                    trackPanelType = trackPanelType,
-                    onCloseTrackPanel = closeTrackPanel,
-                    onCollapsePlaylist = { controlsVisible = true },
-                    onHideControls = { controlsVisible = false },
-                    onPausePlaybackWithoutShowingControls = pausePlaybackWithoutShowingControls,
-                    onResumePlaybackWithoutShowingControls = resumePlaybackWithoutShowingControls,
-                    onSeekRelative = seekWithoutShowingControls,
-                    onShowControls = { controlsVisible = true },
-                    onTogglePlayPause = { controlsVisible = true }
-                )
-            }
-    ) {
-        if (controlsVisible || trackPanelType != null) {
-            TvPlayerControlsOverlay(
-                uiState = uiState,
-                focusRequester = controlsFocusRequester,
-                isPlaylistExpanded = false,
-                qualityButtonFocusRequester = qualityButtonFocusRequester,
-                audioButtonFocusRequester = audioButtonFocusRequester,
-                subtitlesButtonFocusRequester = subtitlesButtonFocusRequester,
-                onPlayPause = {},
-                onSeek = { _ -> },
-                onSeekRelative = { _ -> },
-                onSeekLiveEdge = {},
-                onSkipSegment = {},
-                onNext = {},
-                onPrevious = {},
-                onOpenAudioPanel = {
-                    controlsVisible = true
-                    trackPanelType = TvTrackPanelType.AUDIO
-                },
-                onOpenSubtitlesPanel = {
-                    controlsVisible = true
-                    trackPanelType = TvTrackPanelType.SUBTITLES
-                },
-                onOpenQualityPanel = {
-                    controlsVisible = true
-                    trackPanelType = TvTrackPanelType.QUALITY
-                },
-                onExpandPlaylist = {},
-                onCollapsePlaylist = {},
-                onSelectQueueItem = { _ -> },
-                qualityButtonEnabled = uiState.qualityTracks.isNotEmpty(),
-                audioButtonEnabled = uiState.audioTracks.isNotEmpty(),
-                subtitlesButtonEnabled = uiState.textTracks.isNotEmpty()
-            )
-        }
-
-        AnimatedVisibility(
-            visible = stopFeedbackVisible,
-            modifier = Modifier.align(Alignment.Center)
-        ) {
-            TvPlayerHiddenStopFeedback()
-        }
-
-        Box(
-            modifier = Modifier
-                .testTag(TvPlayerHiddenPauseCountTag)
-                .semantics { stateDescription = pauseWithoutControlsCount.toString() }
-        )
-
-        Box(
-            modifier = Modifier
-                .testTag(TvPlayerHiddenResumeCountTag)
-                .semantics { stateDescription = resumeWithoutControlsCount.toString() }
-        )
-
-        Box(
-            modifier = Modifier
-                .testTag(TvPlayerHiddenSeekDeltaTag)
-                .semantics { stateDescription = lastHiddenSeekDeltaMs.toString() }
-        )
-
-        trackPanelType?.let { panelType ->
-            TvTrackSelectionPanel(
-                panelType = panelType,
-                uiState = uiState,
-                onSelect = { closeTrackPanel() },
-                modifier = Modifier.fillMaxSize()
-            )
-        }
-    }
-}
-
-private fun samplePlayerState(): PlayerUiState = PlayerUiState(
-    isPlaying = true,
-    title = "Sample Player",
-    subtitle = "Season 1",
-    durationMs = 3_600_000,
-    positionMs = 120_000,
-    bufferedMs = 240_000,
-    queue = listOf(
-        PlaylistElementUiModel(
-            id = "played",
-            title = "Already Played",
-            subtitle = "Episode 0",
-            artworkUrl = null,
-            isCurrent = false
-        ),
-        PlaylistElementUiModel(
-            id = "current",
-            title = "Currently Playing",
-            subtitle = "Episode 1",
-            artworkUrl = null,
-            isCurrent = true
-        ),
-        PlaylistElementUiModel(
-            id = "next",
-            title = "Episode 2",
-            subtitle = "Up next",
-            artworkUrl = null,
-            isCurrent = false
-        )
-    ),
-    audioTracks = listOf(
-        TrackOption(
-            id = "audio_en",
-            label = "English 5.1",
-            language = "en",
-            bitrate = null,
-            channelCount = 6,
-            height = null,
-            groupIndex = 0,
-            trackIndex = 0,
-            type = TrackType.AUDIO,
-            isOff = false
-        ),
-        TrackOption(
-            id = "audio_hu",
-            label = "Hungarian Stereo",
-            language = "hu",
-            bitrate = null,
-            channelCount = 2,
-            height = null,
-            groupIndex = 0,
-            trackIndex = 1,
-            type = TrackType.AUDIO,
-            isOff = false
-        )
-    ),
-    textTracks = listOf(
-        TrackOption(
-            id = "text_off",
-            label = "Off",
-            language = null,
-            bitrate = null,
-            channelCount = null,
-            height = null,
-            groupIndex = 1,
-            trackIndex = -1,
-            type = TrackType.TEXT,
-            isOff = true
-        ),
-        TrackOption(
-            id = "text_en",
-            label = "English CC",
-            language = "en",
-            bitrate = null,
-            channelCount = null,
-            height = null,
-            groupIndex = 1,
-            trackIndex = 0,
-            type = TrackType.TEXT,
-            isOff = false
-        )
-    ),
-    qualityTracks = listOf(
-        TrackOption(
-            id = "quality_auto",
-            label = "Auto",
-            language = null,
-            bitrate = null,
-            channelCount = null,
-            height = 1080,
-            groupIndex = 2,
-            trackIndex = 0,
-            type = TrackType.VIDEO,
-            isOff = false
-        ),
-        TrackOption(
-            id = "quality_720",
-            label = "720p",
-            language = null,
-            bitrate = null,
-            channelCount = null,
-            height = 720,
-            groupIndex = 2,
-            trackIndex = 1,
-            type = TrackType.VIDEO,
-            isOff = false
-        )
-    ),
-    selectedAudioTrackId = "audio_hu",
-    selectedTextTrackId = "text_en",
-    selectedQualityTrackId = "quality_auto"
-)

app-tv/src/main/AndroidManifest.xml

@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
+    <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC" />
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
+    <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
 
     <uses-feature
         android:name="android.hardware.touchscreen"
@@ -23,7 +25,11 @@
         android:label="@string/app_name"
         android:roundIcon="@mipmap/purefin_logo_round"
         android:supportsRtl="true"
+        android:usesCleartextTraffic="true"
         android:theme="@style/Theme.Purefin">
+        <meta-data
+            android:name="hu.bbara.purefin.UPDATE_MANIFEST_URL"
+            android:value="https://apks.t.bbara.hu/apps/purefin-app-tv/update.json" />
         <activity
             android:name="hu.bbara.purefin.tv.TvActivity"
             android:exported="true"
@@ -34,6 +40,9 @@
                 <category android:name="android.intent.category.LEANBACK_LAUNCHER" />
             </intent-filter>
         </activity>
+        <receiver
+            android:name="hu.bbara.purefin.core.update.AppUpdateInstallReceiver"
+            android:exported="false" />
     </application>
 
 </manifest>

app-tv/src/main/java/hu/bbara/purefin/modules/TvNavigationModule.kt

@@ -6,13 +6,14 @@ import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.android.components.ActivityRetainedComponent
 import dagger.multibindings.IntoSet
-import hu.bbara.purefin.navigation.Route
+import hu.bbara.purefin.core.navigation.Route
 import hu.bbara.purefin.navigation.tvEpisodeSection
 import hu.bbara.purefin.navigation.tvHomeSection
 import hu.bbara.purefin.navigation.tvLibrarySection
 import hu.bbara.purefin.navigation.tvLoginSection
 import hu.bbara.purefin.navigation.tvMovieSection
 import hu.bbara.purefin.navigation.tvPlayerSection
+import hu.bbara.purefin.navigation.tvSettingsSection
 import hu.bbara.purefin.navigation.tvSeriesSection
 
 @Module
@@ -60,4 +61,10 @@ object TvNavigationModule {
     fun provideTvLibraryEntryBuilder(): EntryProviderScope<Route>.() -> Unit = {
         tvLibrarySection()
     }
+
+    @IntoSet
+    @Provides
+    fun provideTvSettingsEntryBuilder(): EntryProviderScope<Route>.() -> Unit = {
+        tvSettingsSection()
+    }
 }

app-tv/src/main/java/hu/bbara/purefin/modules/TvPlaybackProfileFamilyModule.kt

@@ -4,7 +4,7 @@ import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.components.SingletonComponent
-import hu.bbara.purefin.data.PlaybackProfileFamily
+import hu.bbara.purefin.core.data.PlaybackProfileFamily
 
 @Module
 @InstallIn(SingletonComponent::class)

app-tv/src/main/java/hu/bbara/purefin/navigation/NavigationLocals.kt

@@ -3,6 +3,8 @@ package hu.bbara.purefin.navigation
 import androidx.compose.runtime.ProvidableCompositionLocal
 import androidx.compose.runtime.compositionLocalOf
 import androidx.compose.runtime.staticCompositionLocalOf
+import hu.bbara.purefin.core.navigation.NavigationManager
+import hu.bbara.purefin.core.navigation.Route
 
 val LocalNavigationManager: ProvidableCompositionLocal<NavigationManager> =
     staticCompositionLocalOf { error("NavigationManager not provided") }

app-tv/src/main/java/hu/bbara/purefin/navigation/TvRouteEntryBuilder.kt

@@ -2,13 +2,16 @@ package hu.bbara.purefin.navigation
 
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.navigation3.runtime.EntryProviderScope
-import hu.bbara.purefin.feature.browse.home.AppViewModel
+import hu.bbara.purefin.core.navigation.Route
+import hu.bbara.purefin.core.navigation.SeriesDto
+import hu.bbara.purefin.core.feature.browse.home.AppViewModel
 import hu.bbara.purefin.ui.screen.movie.TvMovieScreen
 import hu.bbara.purefin.ui.screen.series.TvSeriesScreen
-import hu.bbara.purefin.ui.screen.login.LoginScreen
+import hu.bbara.purefin.ui.screen.login.TvLoginScreen
 import hu.bbara.purefin.ui.screen.TvAppScreen
 import hu.bbara.purefin.ui.screen.library.TvLibraryScreen
 import hu.bbara.purefin.ui.screen.player.TvPlayerScreen
+import hu.bbara.purefin.ui.screen.settings.TvSettingsScreen
 
 fun EntryProviderScope<Route>.tvHomeSection() {
     entry<Route.Home> {
@@ -18,7 +21,7 @@ fun EntryProviderScope<Route>.tvHomeSection() {
 
 fun EntryProviderScope<Route>.tvLoginSection() {
     entry<Route.LoginRoute> {
-        LoginScreen()
+        TvLoginScreen()
     }
 }
 
@@ -37,7 +40,8 @@ fun EntryProviderScope<Route>.tvSeriesSection() {
 fun EntryProviderScope<Route>.tvEpisodeSection() {
     entry<Route.EpisodeRoute> { route ->
         TvSeriesScreen(
-            series = SeriesDto(id = route.item.seriesId),
+            series = SeriesDto(id = route.item.seriesId, offline = route.item.offline),
+            focusedSeasonId = route.item.seasonId,
             focusedEpisodeId = route.item.id
         )
     }
@@ -62,3 +66,9 @@ fun EntryProviderScope<Route>.tvLibrarySection() {
         )
     }
 }
+
+fun EntryProviderScope<Route>.tvSettingsSection() {
+    entry<Route.SettingsRoute> {
+        TvSettingsScreen()
+    }
+}

app-tv/src/main/java/hu/bbara/purefin/tv/TvActivity.kt

@@ -2,6 +2,8 @@ package hu.bbara.purefin.tv
 
 import android.content.pm.ApplicationInfo
 import android.os.Bundle
+import android.widget.Toast
+import androidx.activity.compose.BackHandler
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
@@ -11,15 +13,20 @@ import androidx.compose.animation.fadeOut
 import androidx.compose.animation.togetherWith
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.material3.AlertDialog
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
+import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.lifecycleScope
 import androidx.lifecycle.viewmodel.navigation3.rememberViewModelStoreNavEntryDecorator
 import androidx.navigation3.runtime.EntryProviderScope
@@ -36,15 +43,18 @@ import coil3.network.okhttp.OkHttpNetworkFetcherFactory
 import coil3.request.crossfade
 import coil3.util.DebugLogger
 import dagger.hilt.android.AndroidEntryPoint
-import hu.bbara.purefin.data.SessionBootstrapper
+import hu.bbara.purefin.core.data.SessionBootstrapper
-import hu.bbara.purefin.data.UserSessionRepository
+import hu.bbara.purefin.core.data.UserSessionRepository
-import hu.bbara.purefin.navigation.NavigationCommand
+import hu.bbara.purefin.core.feature.update.AppUpdateInfo
-import hu.bbara.purefin.navigation.NavigationManager
+import hu.bbara.purefin.core.feature.update.AppUpdateViewModel
-import hu.bbara.purefin.navigation.Route
+import hu.bbara.purefin.core.jellyfin.JellyfinAuthInterceptor
-import hu.bbara.purefin.jellyfin.JellyfinAuthInterceptor
+import hu.bbara.purefin.core.navigation.NavigationCommand
+import hu.bbara.purefin.core.navigation.NavigationManager
+import hu.bbara.purefin.core.navigation.Route
+import hu.bbara.purefin.ui.common.dialog.ExitAppDialog
 import hu.bbara.purefin.navigation.LocalNavigationBackStack
 import hu.bbara.purefin.navigation.LocalNavigationManager
-import hu.bbara.purefin.ui.screen.login.LoginScreen
+import hu.bbara.purefin.ui.screen.login.TvLoginScreen
 import hu.bbara.purefin.ui.screen.waiting.PurefinWaitingScreen
 import hu.bbara.purefin.ui.theme.AppTheme
 import hu.bbara.purefin.ui.theme.backgroundDark
@@ -135,10 +145,14 @@ class TvActivity : ComponentActivity() {
     fun MainApp(
         userSessionRepository: UserSessionRepository,
         entryBuilders: Set<@JvmSuppressWildcards EntryProviderScope<Route>.() -> Unit>,
-        navigationManager: NavigationManager
+        navigationManager: NavigationManager,
+        updateViewModel: AppUpdateViewModel = hiltViewModel()
     ) {
         var sessionLoaded by remember { mutableStateOf(false) }
-        val isLoggedIn by userSessionRepository.isLoggedIn.collectAsState(initial = false)
+        var showExitDialog by remember { mutableStateOf(false) }
+        val isLoggedIn by userSessionRepository.isLoggedIn.collectAsStateWithLifecycle(initialValue = false)
+        val availableUpdate by updateViewModel.availableUpdate.collectAsStateWithLifecycle()
+        val context = LocalContext.current
 
         LaunchedEffect(Unit) {
             userSessionRepository.isLoggedIn.collect {
@@ -146,12 +160,22 @@ class TvActivity : ComponentActivity() {
             }
         }
 
-        if (!sessionLoaded) {
+        LaunchedEffect(updateViewModel) {
-            PurefinWaitingScreen(modifier = Modifier.fillMaxSize())
+            updateViewModel.checkForUpdatesOnAppOpen()
-            return
         }
 
-        if (isLoggedIn) {
+        LaunchedEffect(updateViewModel, context) {
+            updateViewModel.snackbarMessages.collect { message ->
+                Toast.makeText(context, message, Toast.LENGTH_LONG).show()
+            }
+        }
+
+        if (!sessionLoaded) {
+            BackHandler {
+                showExitDialog = true
+            }
+            PurefinWaitingScreen(modifier = Modifier.fillMaxSize())
+        } else if (isLoggedIn) {
             @Suppress("UNCHECKED_CAST")
             val backStack = rememberNavBackStack(Route.Home) as NavBackStack<Route>
             val appEntryProvider = entryProvider {
@@ -161,7 +185,13 @@ class TvActivity : ComponentActivity() {
             LaunchedEffect(navigationManager, backStack) {
                 navigationManager.commands.collect { command ->
                     when (command) {
-                        NavigationCommand.Pop -> if (backStack.size > 1) backStack.removeLastOrNull()
+                        NavigationCommand.Pop -> {
+                            if (backStack.size > 1) {
+                                backStack.removeLastOrNull()
+                            } else {
+                                showExitDialog = true
+                            }
+                        }
                         is NavigationCommand.Navigate -> backStack.add(command.route)
                         is NavigationCommand.ReplaceAll -> {
                             backStack.clear()
@@ -171,13 +201,23 @@ class TvActivity : ComponentActivity() {
                 }
             }
 
+            BackHandler(enabled = backStack.size == 1) {
+                showExitDialog = true
+            }
+
             CompositionLocalProvider(
                 LocalNavigationManager provides navigationManager,
                 LocalNavigationBackStack provides backStack.toList()
             ) {
                 NavDisplay(
                     backStack = backStack,
-                    onBack = { navigationManager.pop() },
+                    onBack = {
+                        if (backStack.size > 1) {
+                            navigationManager.pop()
+                        } else {
+                            showExitDialog = true
+                        }
+                    },
                     modifier = Modifier.fillMaxSize().background(backgroundDark),
                     transitionSpec = {
                         fadeIn(
@@ -211,7 +251,56 @@ class TvActivity : ComponentActivity() {
                 )
             }
         } else {
-            LoginScreen()
+            BackHandler {
+                showExitDialog = true
+            }
+            TvLoginScreen()
+        }
+
+        availableUpdate?.let { update ->
+            TvUpdateAvailableDialog(
+                update = update,
+                onAccept = updateViewModel::acceptUpdate,
+                onDecline = updateViewModel::declineUpdate
+            )
+        }
+
+        if (showExitDialog) {
+            ExitAppDialog(
+                onCloseConfirmed = { finishAndRemoveTask() },
+                onDismiss = { showExitDialog = false }
+            )
         }
     }
+
+    @Composable
+    private fun TvUpdateAvailableDialog(
+        update: AppUpdateInfo,
+        onAccept: () -> Unit,
+        onDecline: () -> Unit
+    ) {
+        val versionLabel = update.versionName?.takeIf { it.isNotBlank() } ?: update.versionCode.toString()
+        val releaseNotes = update.releaseNotes?.takeIf { it.isNotBlank() }
+        val updateText = if (releaseNotes == null) {
+            "Purefin TV $versionLabel is available.\n\nVersion code: ${update.versionCode}"
+        } else {
+            "Purefin TV $versionLabel is available.\n\nVersion code: ${update.versionCode}\n\n$releaseNotes"
+        }
+
+        AlertDialog(
+            onDismissRequest = onDecline,
+            title = { Text("Update available") },
+            text = { Text(updateText) },
+            confirmButton = {
+                TextButton(onClick = onAccept) {
+                    Text("Install")
+                }
+            },
+            dismissButton = {
+                TextButton(onClick = onDecline) {
+                    Text("Not now")
+                }
+            }
+        )
+    }
 }

app-tv/src/main/java/hu/bbara/purefin/tv/TvApplication.kt

@@ -2,6 +2,12 @@ package hu.bbara.purefin.tv
 
 import android.app.Application
 import dagger.hilt.android.HiltAndroidApp
+import hu.bbara.purefin.core.logging.PurefinLogger
 
 @HiltAndroidApp
-class TvApplication : Application()
+class TvApplication : Application() {
+    override fun onCreate() {
+        super.onCreate()
+        PurefinLogger.initialize(this)
+    }
+}

app-tv/src/main/java/hu/bbara/purefin/ui/common/card/PosterCard.kt

@@ -29,12 +29,13 @@ import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
+import hu.bbara.purefin.core.model.EpisodeUiModel
+import hu.bbara.purefin.core.model.MediaUiModel
+import hu.bbara.purefin.core.model.MovieUiModel
+import hu.bbara.purefin.core.model.SeriesUiModel
+import hu.bbara.purefin.ui.common.badge.UnwatchedEpisodeBadge
 import hu.bbara.purefin.ui.common.badge.WatchStateBadge
 import hu.bbara.purefin.ui.common.image.PurefinAsyncImage
-import hu.bbara.purefin.ui.model.EpisodeUiModel
-import hu.bbara.purefin.ui.model.MediaUiModel
-import hu.bbara.purefin.ui.model.MovieUiModel
-import hu.bbara.purefin.ui.model.SeriesUiModel
 import java.util.UUID
 
 @Composable
@@ -134,10 +135,17 @@ fun PosterCardContent(
                             .align(Alignment.TopEnd)
                             .padding(indicatorPadding),
                         watched = model.watched,
-                        started = (model.progress ?: 0f) > 0f
                     )
                 }
-                else -> Unit
+                is SeriesUiModel -> {
+                    UnwatchedEpisodeBadge(
+                        unwatchedCount = model.unwatchedEpisodeCount,
+                        size = 26,
+                        modifier = Modifier
+                            .align(Alignment.TopEnd)
+                            .padding(indicatorPadding),
+                    )
+                }
             }
         }
         Column(

app-tv/src/main/java/hu/bbara/purefin/ui/common/media/MediaDetailShell.kt

@@ -27,8 +27,8 @@ import androidx.compose.ui.platform.LocalConfiguration
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import hu.bbara.purefin.image.ArtworkKind
+import hu.bbara.purefin.core.image.ArtworkKind
-import hu.bbara.purefin.image.ImageUrlBuilder
+import hu.bbara.purefin.core.image.ImageUrlBuilder
 import hu.bbara.purefin.ui.common.image.PurefinAsyncImage
 
 internal val MediaDetailHorizontalPadding = 48.dp
@@ -89,44 +89,46 @@ internal fun TvMediaDetailBodyBox(
             .fillMaxWidth()
             .heightIn(min = bodyHeight)
     ) {
-        Box(modifier = Modifier.matchParentSize()) {
+        Box(
+            modifier = Modifier
+                .fillMaxHeight()
+                .fillMaxWidth(MediaDetailBodyImageWidthFraction)
+                .align(Alignment.TopEnd)
+        ) {
             PurefinAsyncImage(
                 model = backgroundImageUrl,
                 contentDescription = null,
-                modifier = Modifier
+                modifier = Modifier.fillMaxSize(),
-                    .fillMaxHeight()
-                    .fillMaxWidth(MediaDetailBodyImageWidthFraction)
-                    .align(Alignment.TopEnd),
                 contentScale = ContentScale.Crop
             )
+            Box(
+                modifier = Modifier
+                    .matchParentSize()
+                    .background(
+                        Brush.horizontalGradient(
+                            colorStops = arrayOf(
+                                0.0f to scheme.background,
+                                0.28f to scheme.background.copy(alpha = 0.88f),
+                                0.62f to scheme.background.copy(alpha = 0.42f),
+                                1.0f to scheme.background.copy(alpha = 0.12f)
+                            )
+                        )
+                    )
+            )
+            Box(
+                modifier = Modifier
+                    .matchParentSize()
+                    .background(
+                        Brush.verticalGradient(
+                            colorStops = arrayOf(
+                                0.0f to scheme.background.copy(alpha = 0.08f),
+                                0.55f to scheme.background.copy(alpha = 0.16f),
+                                1.0f to scheme.background
+                            )
+                        )
+                    )
+            )
         }
-        Box(
-            modifier = Modifier
-                .matchParentSize()
-                .background(
-                    Brush.horizontalGradient(
-                        colorStops = arrayOf(
-                            0.0f to scheme.background,
-                            0.28f to scheme.background.copy(alpha = 0.88f),
-                            0.62f to scheme.background.copy(alpha = 0.42f),
-                            1.0f to scheme.background.copy(alpha = 0.12f)
-                        )
-                    )
-                )
-        )
-        Box(
-            modifier = Modifier
-                .matchParentSize()
-                .background(
-                    Brush.verticalGradient(
-                        colorStops = arrayOf(
-                            0.0f to scheme.background.copy(alpha = 0.08f),
-                            0.55f to scheme.background.copy(alpha = 0.16f),
-                            1.0f to scheme.background
-                        )
-                    )
-                )
-        )
         Column(
             modifier = Modifier
                 .fillMaxWidth()

app-tv/src/main/java/hu/bbara/purefin/ui/common/media/MediaDetailsTopBar.kt

@@ -5,8 +5,8 @@ import androidx.compose.animation.core.animateFloatAsState
 import androidx.compose.foundation.background
 import androidx.compose.foundation.border
 import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
@@ -81,8 +81,6 @@ internal fun MediaDetailsTopBar(
                 onClick = onBack,
                 modifier = backModifier.then(downModifier),
                 focusedScale = 1.1f,
-                focusedBorderWidth = 2.5.dp,
-                focusedBorderColor = scheme.primary,
                 focusedBackgroundColor = scheme.primary.copy(alpha = 0.25f)
             )
             if (shortcut != null) {
@@ -100,8 +98,6 @@ internal fun MediaDetailsTopBar(
                 onClick = onCastClick,
                 modifier = downModifier,
                 focusedScale = 1.1f,
-                focusedBorderWidth = 2.5.dp,
-                focusedBorderColor = scheme.primary,
                 focusedBackgroundColor = scheme.primary.copy(alpha = 0.25f)
             )
             GhostIconButton(
@@ -110,8 +106,6 @@ internal fun MediaDetailsTopBar(
                 onClick = onMoreClick,
                 modifier = downModifier,
                 focusedScale = 1.1f,
-                focusedBorderWidth = 2.5.dp,
-                focusedBorderColor = scheme.primary,
                 focusedBackgroundColor = scheme.primary.copy(alpha = 0.25f)
             )
         }

app-tv/src/main/java/hu/bbara/purefin/ui/screen/TvAppScreen.kt

@@ -1,13 +1,15 @@
 package hu.bbara.purefin.ui.screen
 
+import androidx.activity.compose.BackHandler
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.outlined.Home
 import androidx.compose.material.icons.outlined.Movie
+import androidx.compose.material.icons.outlined.Settings
 import androidx.compose.material.icons.outlined.Tv
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.hilt.navigation.compose.hiltViewModel
@@ -18,25 +20,26 @@ import androidx.navigation3.runtime.entryProvider
 import androidx.navigation3.runtime.rememberNavBackStack
 import androidx.navigation3.runtime.rememberSaveableStateHolderNavEntryDecorator
 import androidx.navigation3.ui.NavDisplay
-import hu.bbara.purefin.feature.browse.home.AppViewModel
+import hu.bbara.purefin.core.feature.browse.home.AppViewModel
+import hu.bbara.purefin.core.navigation.LibraryDto
+import hu.bbara.purefin.core.navigation.Route
 import hu.bbara.purefin.model.LibraryKind
-import hu.bbara.purefin.navigation.LibraryDto
 import hu.bbara.purefin.navigation.LocalNavigationManager
-import hu.bbara.purefin.navigation.Route
 import hu.bbara.purefin.ui.screen.home.TvHomeScreen
 import hu.bbara.purefin.ui.screen.home.components.TvDrawerDestinationItem
 import hu.bbara.purefin.ui.screen.home.components.TvNavigationDrawer
 import hu.bbara.purefin.ui.screen.library.TvLibraryScreen
+import hu.bbara.purefin.ui.screen.settings.TvSettingsScreen
 
 @Composable
 fun TvAppScreen(
     viewModel: AppViewModel = hiltViewModel(),
     modifier: Modifier = Modifier
 ) {
-    val libraries by viewModel.libraries.collectAsState()
+    val libraries by viewModel.libraries.collectAsStateWithLifecycle()
-    val continueWatching by viewModel.continueWatching.collectAsState()
+    val continueWatching by viewModel.continueWatching.collectAsStateWithLifecycle()
-    val nextUp by viewModel.nextUp.collectAsState()
+    val nextUp by viewModel.nextUp.collectAsStateWithLifecycle()
-    val latestLibraryContent by viewModel.latestLibraryContent.collectAsState()
+    val latestLibraryContent by viewModel.latestLibraryContent.collectAsStateWithLifecycle()
     val navigationManager = LocalNavigationManager.current
 
     @Suppress("UNCHECKED_CAST")
@@ -62,7 +65,11 @@ fun TvAppScreen(
                     LibraryKind.SERIES -> Icons.Outlined.Tv
                 }
             )
-        }
+        } + TvDrawerDestinationItem(
+            destination = Route.SettingsRoute,
+            label = "Settings",
+            icon = Icons.Outlined.Settings
+        )
     }
 
     LifecycleResumeEffect(Unit) {
@@ -88,16 +95,29 @@ fun TvAppScreen(
                 modifier = Modifier.fillMaxSize()
             )
         }
+        entry<Route.SettingsRoute> {
+            TvSettingsScreen(
+                onBack = { backStack.removeLastOrNull() },
+                modifier = Modifier.fillMaxSize()
+            )
+        }
+    }
+
+    BackHandler(enabled = backStack.size == 1) {
+        navigationManager.pop()
     }
 
     TvNavigationDrawer(
         destinations = destinations,
         selectedDestination = selectedDestination,
         onDestinationSelected = { destination ->
+            if (selectedDestination == Route.Home) {
+                viewModel.onRefresh()
+            }
             if (selectedDestination != destination) {
                 backStack.clear()
                 backStack.add(Route.Home)
-                if (destination is Route.LibraryRoute) {
+                if (destination != Route.Home) {
                     backStack.add(destination)
                 }
             }

app-tv/src/main/java/hu/bbara/purefin/ui/screen/episode/TvEpisodeScreen.kt

@@ -6,20 +6,20 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.collectAsState
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.withFrameNanos
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.focus.FocusRequester
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
-import hu.bbara.purefin.feature.content.episode.EpisodeScreenViewModel
+import hu.bbara.purefin.core.feature.content.episode.EpisodeScreenViewModel
-import hu.bbara.purefin.image.ArtworkKind
+import hu.bbara.purefin.core.image.ArtworkKind
-import hu.bbara.purefin.image.ImageUrlBuilder
+import hu.bbara.purefin.core.image.ImageUrlBuilder
 import hu.bbara.purefin.model.Episode
-import hu.bbara.purefin.navigation.EpisodeDto
+import hu.bbara.purefin.core.navigation.EpisodeDto
 import hu.bbara.purefin.navigation.LocalNavigationManager
-import hu.bbara.purefin.navigation.Route
+import hu.bbara.purefin.core.navigation.Route
 import hu.bbara.purefin.ui.common.media.MediaDetailOverviewSection
 import hu.bbara.purefin.ui.common.media.MediaDetailPlaybackSection
 import hu.bbara.purefin.ui.common.media.MediaDetailSectionTitle
@@ -37,15 +37,10 @@ fun TvEpisodeScreen(
     val navigationManager = LocalNavigationManager.current
 
     LaunchedEffect(episode) {
-        viewModel.selectEpisode(
+        viewModel.selectEpisode(episode)
-            seriesId = episode.seriesId,
-            seasonId = episode.seasonId,
-            episodeId = episode.id
-        )
     }
 
-    val episode = viewModel.episode.collectAsState()
+    val episode = viewModel.episode.collectAsStateWithLifecycle()
-    val seriesTitle = viewModel.seriesTitle.collectAsState()
     val selectedEpisode = episode.value
 
     if (selectedEpisode == null) {
@@ -55,7 +50,7 @@ fun TvEpisodeScreen(
 
     TvEpisodeScreenContent(
         episode = selectedEpisode,
-        seriesTitle = seriesTitle.value,
+        seriesTitle = selectedEpisode.seriesName,
         onPlay = remember(selectedEpisode.id, navigationManager) {
             {
                 navigationManager.navigate(

app-tv/src/main/java/hu/bbara/purefin/ui/screen/home/TvHomeScreen.kt

@@ -1,6 +1,6 @@
 package hu.bbara.purefin.ui.screen.home
 
-import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
@@ -10,12 +10,12 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.unit.dp
+import hu.bbara.purefin.core.model.LibraryUiModel
-import hu.bbara.purefin.ui.model.MediaUiModel
+import hu.bbara.purefin.core.model.MediaUiModel
-import hu.bbara.purefin.ui.model.MovieUiModel
+import hu.bbara.purefin.core.model.MovieUiModel
-import hu.bbara.purefin.ui.model.LibraryUiModel
 import hu.bbara.purefin.ui.screen.home.components.TvFocusedItemHero
 import hu.bbara.purefin.ui.screen.home.components.TvHomeContent
+import hu.bbara.purefin.ui.screen.home.components.TvHomeHeroBackdrop
 import java.util.UUID
 
 @Composable
@@ -31,31 +31,33 @@ fun TvHomeScreen(
     val focusedMediaUiModel = remember { mutableStateOf<MediaUiModel>(MovieUiModel.createPlaceholder()) }
 
     Surface(
-        modifier = modifier
+        modifier = modifier.fillMaxSize(),
-            .fillMaxSize()
+        color = scheme.background
-            .background(scheme.background)
     ) {
-
+        Box(modifier = Modifier.fillMaxSize()) {
-        Column(
+            TvHomeHeroBackdrop(
-            modifier = Modifier.fillMaxSize()
+                backdropImageUrl = focusedMediaUiModel.value.backdropImageUrl
-        ) {
-            TvFocusedItemHero(
-                item = focusedMediaUiModel.value,
-                height = 220.dp
-            )
-            TvHomeContent(
-                libraries = libraries,
-                libraryContent = libraryContent,
-                continueWatching = continueWatching,
-                nextUp = nextUp,
-                onMediaFocused = {
-                    focusedMediaUiModel.value = it
-                },
-                onMediaSelected = onMediaSelected,
-                modifier = Modifier
-                    .weight(1f)
-                    .fillMaxWidth()
             )
+            Column(
+                modifier = Modifier.fillMaxSize()
+            ) {
+                TvFocusedItemHero(
+                    item = focusedMediaUiModel.value
+                )
+                TvHomeContent(
+                    libraries = libraries,
+                    libraryContent = libraryContent,
+                    continueWatching = continueWatching,
+                    nextUp = nextUp,
+                    onMediaFocused = {
+                        focusedMediaUiModel.value = it
+                    },
+                    onMediaSelected = onMediaSelected,
+                    modifier = Modifier
+                        .weight(1f)
+                        .fillMaxWidth()
+                )
+            }
         }
     }
 }

app-tv/src/main/java/hu/bbara/purefin/ui/screen/home/components/TvFocusedItemHero.kt

@@ -2,118 +2,136 @@ package hu.bbara.purefin.ui.screen.home.components
 
 import androidx.compose.animation.Crossfade
 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.Row
+import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.widthIn
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.drawWithContent
 import androidx.compose.ui.graphics.Brush
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextOverflow
-import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import hu.bbara.purefin.ui.model.MediaUiModel
+import hu.bbara.purefin.core.model.MediaUiModel
 import hu.bbara.purefin.ui.common.image.PurefinAsyncImage
+import kotlin.math.roundToInt
 
 internal const val TvHomeHeroTitleTag = "tv-home-hero-title"
 internal const val TvHomeHeroProgressLabelTag = "tv-home-hero-progress-label"
 
 private const val TvHomeHeroAnimationMillis = 180
+// The billboard backdrop covers the top portion of the home screen so the hero
+// text sits at the bottom of the backdrop and the content rows begin below it.
+internal const val TvHomeHeroHeightFraction = 0.45f
+internal const val TvHomeBackdropOffset = 0.20f
 
+/**
+ * The home screen background image plus the darkening gradients that keep the
+ * hero text readable. Drawn behind the home content and sized to the top
+ * [TvHomeHeroHeightFraction] of the screen.
+ */
 @Composable
-internal fun TvFocusedItemHero(
+internal fun TvHomeHeroBackdrop(
-    item: MediaUiModel,
+    backdropImageUrl: String?,
-    height: Dp,
     modifier: Modifier = Modifier,
+    heightFraction: Float = TvHomeHeroHeightFraction + TvHomeBackdropOffset,
 ) {
     val scheme = MaterialTheme.colorScheme
-    Box(
+    Crossfade(
+        targetState = backdropImageUrl,
+        animationSpec = tween(durationMillis = TvHomeHeroAnimationMillis),
+        label = "tv-home-hero-backdrop",
         modifier = modifier
             .fillMaxWidth()
-            .height(height)
+            .fillMaxHeight(heightFraction)
-            .background(scheme.background)
+            .drawWithContent {
-    ) {
+                drawContent()
-        Crossfade(
+                // Darken the left side so the text block stays readable over any backdrop.
-            targetState = item.backdropImageUrl,
+                drawRect(
-            animationSpec = tween(durationMillis = TvHomeHeroAnimationMillis),
-            label = "tv-home-hero-background"
-        ) { imageUrl ->
-            PurefinAsyncImage(
-                model = imageUrl,
-                contentDescription = null,
-                modifier = Modifier.fillMaxSize(),
-                contentScale = ContentScale.Crop
-            )
-        }
-        Box(
-            modifier = Modifier
-                .fillMaxSize()
-                .background(
                     Brush.horizontalGradient(
                         colorStops = arrayOf(
-                            0.0f to scheme.background,
+                            0.0f to scheme.background.copy(alpha = 0.86f),
-                            0.28f to scheme.background.copy(alpha = 0.88f),
+                            0.34f to scheme.background.copy(alpha = 0.62f),
-                            0.62f to scheme.background.copy(alpha = 0.42f),
+                            0.66f to scheme.background.copy(alpha = 0.22f),
-                            1.0f to scheme.background.copy(alpha = 0.06f)
+                            1.0f to scheme.background.copy(alpha = 0.04f)
                         )
                     )
                 )
-        )
+                // Strong bottom fade so the title and metadata are legible.
-        Box(
+                drawRect(
-            modifier = Modifier
-                .fillMaxSize()
-                .background(
                     Brush.verticalGradient(
                         colorStops = arrayOf(
                             0.0f to scheme.background.copy(alpha = 0f),
-                            0.56f to scheme.background.copy(alpha = 0.1f),
+                            0.40f to scheme.background.copy(alpha = 0.10f),
+                            0.72f to scheme.background.copy(alpha = 0.58f),
                             1.0f to scheme.background
                         )
                     )
                 )
+            }
+    ) { imageUrl ->
+        PurefinAsyncImage(
+            model = imageUrl,
+            contentDescription = null,
+            modifier = Modifier.fillMaxSize(),
+            contentScale = ContentScale.Crop
         )
-        Crossfade(
+    }
-            targetState = item,
+}
-            animationSpec = tween(durationMillis = TvHomeHeroAnimationMillis),
+
-            label = "tv-home-hero-content"
+@Composable
-        ) { hero ->
+internal fun TvFocusedItemHero(
+    item: MediaUiModel,
+    modifier: Modifier = Modifier,
+    heightFraction: Float = TvHomeHeroHeightFraction,
+) {
+    val scheme = MaterialTheme.colorScheme
+    Crossfade(
+        targetState = item,
+        animationSpec = tween(durationMillis = TvHomeHeroAnimationMillis),
+        label = "tv-home-hero-content",
+        modifier = modifier
+            .fillMaxWidth()
+            .fillMaxHeight(heightFraction)
+    ) { hero ->
+        Column(
+            verticalArrangement = Arrangement.Bottom,
+            modifier = Modifier
+                .fillMaxSize()
+                .padding(horizontal = 40.dp, vertical = 16.dp)
+        ) {
             Column(
-                verticalArrangement = Arrangement.Bottom,
+                verticalArrangement = Arrangement.spacedBy(8.dp),
-                modifier = Modifier
+                modifier = Modifier.widthIn(max = 720.dp)
-                    .fillMaxSize()
-                    .padding(horizontal = 40.dp, vertical = 18.dp)
             ) {
-                Column(
+                Text(
-                    verticalArrangement = Arrangement.spacedBy(8.dp),
+                    text = hero.primaryText,
-                    modifier = Modifier.widthIn(max = 720.dp)
+                    color = scheme.onBackground,
-                ) {
+                    fontSize = 40.sp,
-                    Text(
+                    fontWeight = FontWeight.Bold,
-                        text = hero.primaryText,
+                    lineHeight = 44.sp,
-                        color = scheme.onBackground,
+                    maxLines = 2,
-                        fontSize = 34.sp,
+                    overflow = TextOverflow.Ellipsis,
-                        fontWeight = FontWeight.Bold,
+                    modifier = Modifier.testTag(TvHomeHeroTitleTag)
-                        lineHeight = 38.sp,
+                )
-                        maxLines = 1,
+                TvHomeHeroMetadataRow(item = hero)
-                        overflow = TextOverflow.Ellipsis,
+                if (hero.description.isNotBlank()) {
-                        modifier = Modifier.testTag(TvHomeHeroTitleTag)
-                    )
                     Text(
                         text = hero.description,
                         color = scheme.onSurfaceVariant,
                         fontSize = 14.sp,
                         lineHeight = 18.sp,
-                        maxLines = 1,
+                        maxLines = 2,
                         overflow = TextOverflow.Ellipsis
                     )
                 }
@@ -121,3 +139,27 @@ internal fun TvFocusedItemHero(
         }
     }
 }
+
+@Composable
+private fun TvHomeHeroMetadataRow(item: MediaUiModel) {
+    val hasSecondary = item.secondaryText.isNotBlank()
+    val progress = item.progress
+    val hasProgress = progress != null && progress > 0f && progress < 1f
+    if (!hasSecondary && !hasProgress) return
+    Row(
+        horizontalArrangement = Arrangement.spacedBy(8.dp),
+        modifier = Modifier.fillMaxWidth()
+    ) {
+        if (hasSecondary) {
+            TvHomeMetaChip(text = item.secondaryText)
+        }
+        if (hasProgress) {
+            val percent = ((progress ?: 0f) * 100f).roundToInt()
+            TvHomeMetaChip(
+                text = "Resume \u00B7 $percent%",
+                highlighted = true,
+                modifier = Modifier.testTag(TvHomeHeroProgressLabelTag)
+            )
+        }
+    }
+}

app-tv/src/main/java/hu/bbara/purefin/ui/screen/home/components/TvHomeContent.kt

@@ -2,7 +2,6 @@
 
 package hu.bbara.purefin.ui.screen.home.components
 
-import androidx.compose.foundation.background
 import androidx.compose.foundation.gestures.LocalBringIntoViewSpec
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.PaddingValues
@@ -11,7 +10,6 @@ import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.itemsIndexed
-import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.LaunchedEffect
@@ -24,8 +22,8 @@ import androidx.compose.ui.focus.FocusRequester
 import androidx.compose.ui.focus.focusRequester
 import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.unit.dp
-import hu.bbara.purefin.ui.model.LibraryUiModel
+import hu.bbara.purefin.core.model.LibraryUiModel
-import hu.bbara.purefin.ui.model.MediaUiModel
+import hu.bbara.purefin.core.model.MediaUiModel
 import java.util.UUID
 
 internal const val TvHomeInitialFocusTag = "tv-home-initial-focus-item"
@@ -42,7 +40,6 @@ fun TvHomeContent(
     contentPadding: PaddingValues = PaddingValues(bottom = 32.dp),
     modifier: Modifier = Modifier,
 ) {
-    val scheme = MaterialTheme.colorScheme
     val topOffsetPx = with(LocalDensity.current) { TvHomeFocusedItemTopOffset.toPx() }
     val hasContinueWatching = continueWatching.isNotEmpty()
     val hasNextUp = nextUp.isNotEmpty()
@@ -65,7 +62,6 @@ fun TvHomeContent(
         LazyColumn(
             modifier = modifier
                 .fillMaxSize()
-                .background(scheme.background)
                 .focusRequester(initialFocusRequester),
             verticalArrangement = Arrangement.spacedBy(24.dp),
             contentPadding = contentPadding

app-tv/src/main/java/hu/bbara/purefin/ui/screen/home/components/TvHomeModels.kt

@@ -1,7 +1,7 @@
 package hu.bbara.purefin.ui.screen.home.components
 
 import androidx.compose.ui.graphics.vector.ImageVector
-import hu.bbara.purefin.navigation.Route
+import hu.bbara.purefin.core.navigation.Route
 
 data class TvDrawerDestinationItem(
     val destination: Route,

app-tv/src/main/java/hu/bbara/purefin/ui/screen/home/components/TvHomeSections.kt

@@ -51,7 +51,7 @@ import androidx.compose.ui.unit.sp
 import hu.bbara.purefin.ui.common.bar.MediaProgressBar
 import hu.bbara.purefin.ui.common.card.PosterCardContent
 import hu.bbara.purefin.ui.common.image.PurefinAsyncImage
-import hu.bbara.purefin.ui.model.MediaUiModel
+import hu.bbara.purefin.core.model.MediaUiModel
 import java.util.UUID
 import kotlin.math.roundToInt
 

app-tv/src/main/java/hu/bbara/purefin/ui/screen/home/components/TvNavigationDrawer.kt

@@ -3,6 +3,7 @@ package hu.bbara.purefin.ui.screen.home.components
 import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
+import androidx.compose.foundation.focusGroup
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
@@ -14,21 +15,30 @@ import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.selection.selectableGroup
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
+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.focus.focusProperties
+import androidx.compose.ui.focus.onFocusChanged
 import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.semantics.selected
 import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import androidx.tv.material3.DrawerState
 import androidx.tv.material3.DrawerValue
 import androidx.tv.material3.Icon
 import androidx.tv.material3.NavigationDrawer
 import androidx.tv.material3.NavigationDrawerItem
 import androidx.tv.material3.Text
 import androidx.tv.material3.darkColorScheme
-import hu.bbara.purefin.navigation.Route
+import androidx.tv.material3.rememberDrawerState
+import hu.bbara.purefin.core.navigation.Route
 import hu.bbara.purefin.tv.R
 import androidx.tv.material3.MaterialTheme as TvMaterialTheme
 
@@ -44,11 +54,14 @@ fun TvNavigationDrawer(
     content: @Composable () -> Unit
 ) {
     ProvideTvDrawerTheme {
+        val drawerState = rememberDrawerState(DrawerValue.Closed)
+
         NavigationDrawer(
             modifier = modifier.fillMaxSize(),
-            drawerContent = { drawerValue ->
+            drawerState = drawerState,
+            drawerContent = {
                 TvNavigationDrawerRail(
-                    drawerValue = drawerValue,
+                    drawerState = drawerState,
                     destinations = destinations,
                     selectedDestination = selectedDestination,
                     onDestinationSelected = onDestinationSelected
@@ -117,6 +130,8 @@ fun TvDrawerHeader(
         AnimatedVisibility(visible = expanded) {
             Text(
                 text = "Purefin",
+                color = MaterialTheme.colorScheme.onSurface,
+                fontSize = 16.sp,
                 modifier = Modifier.testTag(TvDrawerTitleTag)
             )
         }
@@ -125,20 +140,25 @@ fun TvDrawerHeader(
 
 @Composable
 private fun androidx.tv.material3.NavigationDrawerScope.TvNavigationDrawerRail(
-    drawerValue: DrawerValue,
+    drawerState: DrawerState,
     destinations: List<TvDrawerDestinationItem>,
     selectedDestination: Route,
     onDestinationSelected: (Route) -> Unit,
 ) {
-    val expanded = drawerValue == DrawerValue.Open
+    val expanded = drawerState.currentValue == DrawerValue.Open
     val scheme = MaterialTheme.colorScheme
+    var hasDrawerFocus by remember { mutableStateOf(false) }
 
     Column(
         modifier = Modifier
             .fillMaxHeight()
             .background(scheme.surface.copy(alpha = 0.96f))
             .padding(horizontal = 12.dp, vertical = 24.dp)
-            .selectableGroup(),
+            .selectableGroup()
+            .focusGroup()
+            .onFocusChanged { state ->
+                hasDrawerFocus = state.isFocused
+            },
         verticalArrangement = Arrangement.spacedBy(12.dp)
     ) {
         TvDrawerHeader(
@@ -149,10 +169,16 @@ private fun androidx.tv.material3.NavigationDrawerScope.TvNavigationDrawerRail(
             val isSelected = destination.destination == selectedDestination
             NavigationDrawerItem(
                 selected = isSelected,
-                onClick = { onDestinationSelected(destination.destination) },
+                onClick = {
+                    onDestinationSelected(destination.destination)
+                    if (isSelected) {
+                        drawerState.setValue(DrawerValue.Closed)
+                    }
+                },
                 modifier = Modifier
                     .testTag("$TvDrawerItemTagPrefix$index")
-                    .semantics { selected = isSelected },
+                    .semantics { selected = isSelected }
+                    .focusProperties { canFocus = hasDrawerFocus || isSelected },
                 leadingContent = {
                     Icon(
                         imageVector = destination.icon,

app-tv/src/main/java/hu/bbara/purefin/ui/screen/libraries/TvLibrariesOverviewScreen.kt

@@ -43,7 +43,7 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import hu.bbara.purefin.ui.common.image.PurefinAsyncImage
-import hu.bbara.purefin.ui.model.LibraryUiModel
+import hu.bbara.purefin.core.model.LibraryUiModel
 import hu.bbara.purefin.model.LibraryKind
 
 internal const val TvLibrariesOverviewItemTagPrefix = "tv-libraries-overview-item-"

app-tv/src/main/java/hu/bbara/purefin/ui/screen/library/TvLibraryScreen.kt

@@ -15,14 +15,14 @@ import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.collectAsState
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
-import hu.bbara.purefin.feature.browse.library.LibraryViewModel
+import hu.bbara.purefin.core.feature.browse.library.LibraryViewModel
-import hu.bbara.purefin.navigation.LibraryDto
+import hu.bbara.purefin.core.navigation.LibraryDto
 import hu.bbara.purefin.ui.common.card.PosterCard
-import hu.bbara.purefin.ui.model.MediaUiModel
+import hu.bbara.purefin.core.model.MediaUiModel
 
 @Composable
 fun TvLibraryScreen(
@@ -35,7 +35,7 @@ fun TvLibraryScreen(
         viewModel.selectLibrary(libraryId = library.id)
     }
 
-    val libraryItems = viewModel.contents.collectAsState()
+    val libraryItems = viewModel.contents.collectAsStateWithLifecycle()
 
     Scaffold(
         modifier = modifier,

app-tv/src/main/java/hu/bbara/purefin/ui/screen/login/LoginScreen.kt

@@ -1,68 +0,0 @@
-package hu.bbara.purefin.ui.screen.login
-
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.collectAsState
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.rememberCoroutineScope
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.Modifier
-import androidx.hilt.navigation.compose.hiltViewModel
-import hu.bbara.purefin.feature.login.LoginViewModel
-import kotlinx.coroutines.launch
-
-@Composable
-fun LoginScreen(
-    viewModel: LoginViewModel = hiltViewModel(),
-    modifier: Modifier = Modifier
-) {
-    val serverUrl by viewModel.url.collectAsState()
-    val username by viewModel.username.collectAsState()
-    val password by viewModel.password.collectAsState()
-    val errorMessage by viewModel.errorMessage.collectAsState()
-    var isLoggingIn by remember { mutableStateOf(false) }
-    val coroutineScope = rememberCoroutineScope()
-
-    val state = remember(serverUrl, username, password, errorMessage) {
-        LoginContentState(
-            serverUrl = serverUrl,
-            username = username,
-            password = password,
-            errorMessage = errorMessage
-        )
-    }
-    val callbacks = remember(viewModel, coroutineScope) {
-        LoginContentCallbacks(
-            onServerUrlChange = {
-                viewModel.clearError()
-                viewModel.setUrl(it)
-            },
-            onUsernameChange = {
-                viewModel.clearError()
-                viewModel.setUsername(it)
-            },
-            onPasswordChange = {
-                viewModel.clearError()
-                viewModel.setPassword(it)
-            },
-            onConnect = {
-                coroutineScope.launch {
-                    isLoggingIn = true
-                    try {
-                        viewModel.login()
-                    } finally {
-                        isLoggingIn = false
-                    }
-                }
-            }
-        )
-    }
-
-    LoginContent(
-        state = state,
-        callbacks = callbacks,
-        isLoggingIn = isLoggingIn,
-        modifier = modifier
-    )
-}

app-tv/src/main/java/hu/bbara/purefin/ui/screen/login/TvLoginContent.kt

@@ -0,0 +1,609 @@
+package hu.bbara.purefin.ui.screen.login
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.border
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.layout.widthIn
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Lock
+import androidx.compose.material.icons.filled.Person
+import androidx.compose.material.icons.filled.Storage
+import androidx.compose.material.icons.filled.Visibility
+import androidx.compose.material.icons.filled.VisibilityOff
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextField
+import androidx.compose.material3.TextFieldDefaults
+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.clip
+import androidx.compose.ui.focus.FocusRequester
+import androidx.compose.ui.focus.focusProperties
+import androidx.compose.ui.focus.focusRequester
+import androidx.compose.ui.focus.onFocusChanged
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.input.PasswordVisualTransformation
+import androidx.compose.ui.text.input.VisualTransformation
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import androidx.tv.material3.Button
+import androidx.tv.material3.MaterialTheme as TvMaterialTheme
+import androidx.tv.material3.Text as TvText
+import androidx.tv.material3.darkColorScheme
+import hu.bbara.purefin.ui.common.image.PurefinLogo
+import hu.bbara.purefin.ui.screen.waiting.PurefinWaitingScreen
+
+@Composable
+fun TvLoginContent(
+    state: LoginContentState,
+    callbacks: LoginContentCallbacks,
+    modifier: Modifier = Modifier
+) {
+    if (state.isLoggingIn) {
+        PurefinWaitingScreen(modifier = modifier)
+        return
+    }
+
+    ProvideTvLoginTheme {
+        TvLoginForm(
+            state = state,
+            callbacks = callbacks,
+            modifier = modifier
+        )
+    }
+}
+
+@Composable
+private fun ProvideTvLoginTheme(content: @Composable () -> Unit) {
+    val scheme = MaterialTheme.colorScheme
+
+    TvMaterialTheme(
+        colorScheme = darkColorScheme(
+            primary = scheme.primary,
+            onPrimary = scheme.onPrimary,
+            primaryContainer = scheme.primaryContainer,
+            onPrimaryContainer = scheme.onPrimaryContainer,
+            secondary = scheme.secondary,
+            onSecondary = scheme.onSecondary,
+            secondaryContainer = scheme.secondaryContainer,
+            onSecondaryContainer = scheme.onSecondaryContainer,
+            tertiary = scheme.tertiary,
+            onTertiary = scheme.onTertiary,
+            tertiaryContainer = scheme.tertiaryContainer,
+            onTertiaryContainer = scheme.onTertiaryContainer,
+            background = scheme.background,
+            onBackground = scheme.onBackground,
+            surface = scheme.surface,
+            onSurface = scheme.onSurface,
+            surfaceVariant = scheme.surfaceVariant,
+            onSurfaceVariant = scheme.onSurfaceVariant,
+            surfaceTint = scheme.surfaceTint,
+            inverseSurface = scheme.inverseSurface,
+            inverseOnSurface = scheme.inverseOnSurface,
+            error = scheme.error,
+            onError = scheme.onError,
+            errorContainer = scheme.errorContainer,
+            onErrorContainer = scheme.onErrorContainer,
+            border = scheme.outline,
+            borderVariant = scheme.outlineVariant,
+            scrim = scheme.scrim
+        ),
+        content = content
+    )
+}
+
+@Composable
+private fun TvLoginForm(
+    state: LoginContentState,
+    callbacks: LoginContentCallbacks,
+    modifier: Modifier = Modifier
+) {
+    val scheme = MaterialTheme.colorScheme
+    val serverFocusRequester = remember { FocusRequester() }
+    val findFocusRequester = remember { FocusRequester() }
+    val changeServerFocusRequester = remember { FocusRequester() }
+    val quickConnectFocusRequester = remember { FocusRequester() }
+    val usernameFocusRequester = remember { FocusRequester() }
+    val passwordFocusRequester = remember { FocusRequester() }
+    val connectFocusRequester = remember { FocusRequester() }
+
+    LaunchedEffect(state.phase) {
+        if (state.phase == LoginContentPhase.ServerSearch) {
+            serverFocusRequester.requestFocus()
+        } else if (state.quickConnectAvailable) {
+            quickConnectFocusRequester.requestFocus()
+        } else {
+            usernameFocusRequester.requestFocus()
+        }
+    }
+
+    Box(
+        modifier = modifier
+            .fillMaxSize()
+            .background(scheme.background)
+            .padding(horizontal = 64.dp, vertical = 32.dp),
+        contentAlignment = Alignment.Center
+    ) {
+        Column(
+            modifier = Modifier
+                .widthIn(max = if (state.phase == LoginContentPhase.Login) 1040.dp else 480.dp)
+                .fillMaxWidth(),
+            horizontalAlignment = Alignment.CenterHorizontally
+        ) {
+            PurefinLogo(
+                color = scheme.primary,
+                modifier = Modifier.size(64.dp)
+            )
+
+            Text(
+                text = "Purefin",
+                color = scheme.onBackground,
+                style = MaterialTheme.typography.headlineMedium.copy(fontWeight = FontWeight.Bold),
+                modifier = Modifier.padding(top = 8.dp)
+            )
+            Text(
+                text = if (state.phase == LoginContentPhase.ServerSearch) {
+                    "Find your Jellyfin server"
+                } else {
+                    "Connect to your media server"
+                },
+                color = scheme.onSurfaceVariant,
+                style = MaterialTheme.typography.bodyLarge
+            )
+
+            Spacer(modifier = Modifier.height(20.dp))
+
+            state.errorMessage?.let { errorMessage ->
+                Text(
+                    text = errorMessage,
+                    color = scheme.onErrorContainer,
+                    style = MaterialTheme.typography.bodyMedium,
+                    maxLines = 2,
+                    overflow = TextOverflow.Ellipsis,
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .background(
+                            color = scheme.errorContainer,
+                            shape = RoundedCornerShape(14.dp)
+                        )
+                        .padding(horizontal = 14.dp, vertical = 10.dp)
+                )
+                Spacer(modifier = Modifier.height(10.dp))
+            }
+
+            when (state.phase) {
+                LoginContentPhase.ServerSearch -> TvServerSearchFields(
+                    state = state,
+                    callbacks = callbacks,
+                    serverFocusRequester = serverFocusRequester,
+                    findFocusRequester = findFocusRequester
+                )
+                LoginContentPhase.Login -> TvLoginFields(
+                    state = state,
+                    callbacks = callbacks,
+                    changeServerFocusRequester = changeServerFocusRequester,
+                    quickConnectFocusRequester = quickConnectFocusRequester,
+                    usernameFocusRequester = usernameFocusRequester,
+                    passwordFocusRequester = passwordFocusRequester,
+                    connectFocusRequester = connectFocusRequester
+                )
+            }
+        }
+    }
+}
+
+@Composable
+private fun TvServerSearchFields(
+    state: LoginContentState,
+    callbacks: LoginContentCallbacks,
+    serverFocusRequester: FocusRequester,
+    findFocusRequester: FocusRequester
+) {
+    val scheme = MaterialTheme.colorScheme
+
+    TvLoginTextField(
+        label = "Server URL",
+        value = state.serverUrl,
+        onValueChange = callbacks.onServerUrlChange,
+        placeholder = "http://192.168.1.100:8096",
+        leadingIcon = Icons.Default.Storage,
+        modifier = Modifier
+            .focusRequester(serverFocusRequester)
+            .focusProperties {
+                down = findFocusRequester
+            }
+    )
+
+    Spacer(modifier = Modifier.height(12.dp))
+
+    Button(
+        onClick = callbacks.onFindServer,
+        enabled = !state.isSearching,
+        modifier = Modifier
+            .focusRequester(findFocusRequester)
+            .focusProperties {
+                up = serverFocusRequester
+            }
+            .fillMaxWidth()
+            .height(48.dp)
+    ) {
+        TvText(
+            text = if (state.isSearching) "Searching..." else "Find server",
+            fontSize = 16.sp,
+            fontWeight = FontWeight.Bold
+        )
+    }
+
+    if (state.discoveredServers.isNotEmpty()) {
+        Spacer(modifier = Modifier.height(14.dp))
+        Text(
+            text = "Nearby servers",
+            color = scheme.onBackground,
+            style = MaterialTheme.typography.titleSmall.copy(fontWeight = FontWeight.Bold),
+            modifier = Modifier.fillMaxWidth()
+        )
+        Spacer(modifier = Modifier.height(8.dp))
+        state.discoveredServers.take(3).forEach { server ->
+            Button(
+                onClick = { callbacks.onDiscoveredServerClick(server) },
+                modifier = Modifier.fillMaxWidth().height(54.dp)
+            ) {
+                TvText(
+                    text = server.name ?: server.address,
+                    maxLines = 1,
+                    overflow = TextOverflow.Ellipsis,
+                    fontSize = 15.sp
+                )
+            }
+            Spacer(modifier = Modifier.height(8.dp))
+        }
+    }
+}
+
+@Composable
+private fun TvLoginFields(
+    state: LoginContentState,
+    callbacks: LoginContentCallbacks,
+    changeServerFocusRequester: FocusRequester,
+    quickConnectFocusRequester: FocusRequester,
+    usernameFocusRequester: FocusRequester,
+    passwordFocusRequester: FocusRequester,
+    connectFocusRequester: FocusRequester
+) {
+    val scheme = MaterialTheme.colorScheme
+    val selectedServer = state.selectedServerName ?: state.selectedServerUrl.orEmpty()
+
+    Row(
+        modifier = Modifier.fillMaxWidth(),
+        horizontalArrangement = Arrangement.spacedBy(16.dp),
+        verticalAlignment = Alignment.CenterVertically
+    ) {
+        Column(modifier = Modifier.weight(1f)) {
+            Text(
+                text = "Selected server",
+                color = scheme.onSurfaceVariant,
+                style = MaterialTheme.typography.labelMedium,
+                maxLines = 1,
+                overflow = TextOverflow.Ellipsis
+            )
+            Text(
+                text = selectedServer,
+                color = scheme.onBackground,
+                style = MaterialTheme.typography.titleMedium.copy(fontWeight = FontWeight.Bold),
+                maxLines = 1,
+                overflow = TextOverflow.Ellipsis
+            )
+        }
+        Button(
+            onClick = callbacks.onChangeServer,
+            modifier = Modifier
+                .focusRequester(changeServerFocusRequester)
+                .focusProperties {
+                    down = if (state.quickConnectAvailable) quickConnectFocusRequester else usernameFocusRequester
+                }
+                .width(176.dp)
+                .height(44.dp)
+        ) {
+            TvText(text = "Change server", fontSize = 15.sp)
+        }
+    }
+
+    Spacer(modifier = Modifier.height(18.dp))
+
+    Row(
+        modifier = Modifier.fillMaxWidth(),
+        horizontalArrangement = Arrangement.spacedBy(20.dp)
+    ) {
+        TvLoginOptionPanel(
+            title = "Quick Connect",
+            modifier = Modifier.weight(1f)
+        ) {
+            if (state.quickConnectAvailable) {
+                val quickConnectCode = state.quickConnectCode
+                if (quickConnectCode != null) {
+                    Text(
+                        text = quickConnectCode,
+                        color = scheme.primary,
+                        style = MaterialTheme.typography.headlineLarge.copy(fontWeight = FontWeight.Bold),
+                        textAlign = TextAlign.Center,
+                        modifier = Modifier.fillMaxWidth()
+                    )
+                    Text(
+                        text = "Approve this code in another Jellyfin client.",
+                        color = scheme.onSurfaceVariant,
+                        style = MaterialTheme.typography.bodySmall,
+                        textAlign = TextAlign.Center,
+                        modifier = Modifier.fillMaxWidth()
+                    )
+                    Spacer(modifier = Modifier.height(16.dp))
+                } else {
+                    Text(
+                        text = "Use another Jellyfin client to approve this TV without entering your password.",
+                        color = scheme.onSurfaceVariant,
+                        style = MaterialTheme.typography.bodyMedium,
+                        textAlign = TextAlign.Center,
+                        modifier = Modifier.fillMaxWidth()
+                    )
+                    Spacer(modifier = Modifier.height(16.dp))
+                }
+                Button(
+                    onClick = if (state.quickConnectCode == null) {
+                        callbacks.onQuickConnect
+                    } else {
+                        callbacks.onCancelQuickConnect
+                    },
+                    enabled = state.quickConnectCode != null || !state.isQuickConnecting,
+                    modifier = Modifier
+                        .focusRequester(quickConnectFocusRequester)
+                        .focusProperties {
+                            up = changeServerFocusRequester
+                            right = usernameFocusRequester
+                            down = usernameFocusRequester
+                        }
+                        .fillMaxWidth()
+                        .height(48.dp)
+                ) {
+                    TvText(
+                        text = if (state.quickConnectCode == null) {
+                            "Quick Connect"
+                        } else {
+                            "Cancel Quick Connect"
+                        },
+                        fontSize = 16.sp,
+                        fontWeight = FontWeight.Bold
+                    )
+                }
+            } else {
+                Text(
+                    text = "Quick Connect is not enabled on this server.",
+                    color = scheme.onSurfaceVariant,
+                    style = MaterialTheme.typography.bodyMedium,
+                    textAlign = TextAlign.Center,
+                    modifier = Modifier.fillMaxWidth()
+                )
+            }
+        }
+
+        TvLoginOptionPanel(
+            title = "Manual login",
+            modifier = Modifier.weight(1f)
+        ) {
+            TvLoginTextField(
+                label = "Username",
+                value = state.username,
+                onValueChange = callbacks.onUsernameChange,
+                placeholder = "Enter your username",
+                leadingIcon = Icons.Default.Person,
+                modifier = Modifier
+                    .focusRequester(usernameFocusRequester)
+                    .focusProperties {
+                        up = changeServerFocusRequester
+                        left = if (state.quickConnectAvailable) {
+                            quickConnectFocusRequester
+                        } else {
+                            FocusRequester.Default
+                        }
+                        down = passwordFocusRequester
+                    }
+            )
+
+            Spacer(modifier = Modifier.height(12.dp))
+
+            TvLoginPasswordField(
+                label = "Password",
+                value = state.password,
+                onValueChange = callbacks.onPasswordChange,
+                placeholder = "Enter your password",
+                leadingIcon = Icons.Default.Lock,
+                modifier = Modifier
+                    .focusRequester(passwordFocusRequester)
+                    .focusProperties {
+                        up = usernameFocusRequester
+                        down = connectFocusRequester
+                    }
+            )
+
+            Spacer(modifier = Modifier.height(18.dp))
+
+            Button(
+                onClick = callbacks.onConnect,
+                enabled = !state.isQuickConnecting,
+                modifier = Modifier
+                    .focusRequester(connectFocusRequester)
+                    .focusProperties {
+                        up = passwordFocusRequester
+                    }
+                    .fillMaxWidth()
+                    .height(48.dp)
+            ) {
+                TvText(
+                    text = "Connect",
+                    fontSize = 16.sp,
+                    fontWeight = FontWeight.Bold
+                )
+            }
+        }
+    }
+}
+
+@Composable
+private fun TvLoginOptionPanel(
+    title: String,
+    modifier: Modifier = Modifier,
+    content: @Composable () -> Unit
+) {
+    val scheme = MaterialTheme.colorScheme
+    val shape = RoundedCornerShape(18.dp)
+
+    Column(
+        modifier = modifier
+            .clip(shape)
+            .background(scheme.surface)
+            .border(
+                width = 1.dp,
+                color = scheme.outlineVariant.copy(alpha = 0.45f),
+                shape = shape
+            )
+            .padding(22.dp)
+    ) {
+        Text(
+            text = title,
+            color = scheme.onBackground,
+            style = MaterialTheme.typography.titleMedium.copy(fontWeight = FontWeight.Bold),
+            modifier = Modifier.fillMaxWidth()
+        )
+        Spacer(modifier = Modifier.height(18.dp))
+        content()
+    }
+}
+
+@Composable
+private fun TvLoginTextField(
+    label: String,
+    value: String,
+    onValueChange: (String) -> Unit,
+    placeholder: String,
+    leadingIcon: ImageVector,
+    modifier: Modifier = Modifier,
+    trailingIcon: (@Composable () -> Unit)? = null,
+    visualTransformation: VisualTransformation = VisualTransformation.None
+) {
+    val scheme = MaterialTheme.colorScheme
+    val shape = RoundedCornerShape(14.dp)
+    var isFocused by remember { mutableStateOf(false) }
+
+    Column(modifier = Modifier.fillMaxWidth()) {
+        Text(
+            text = label,
+            color = scheme.onBackground,
+            style = MaterialTheme.typography.titleSmall.copy(fontWeight = FontWeight.Bold),
+            modifier = Modifier.padding(bottom = 6.dp)
+        )
+        TextField(
+            value = value,
+            onValueChange = onValueChange,
+            modifier = modifier
+                .fillMaxWidth()
+                .height(52.dp)
+                .onFocusChanged { isFocused = it.isFocused || it.hasFocus }
+                .border(
+                    width = if (isFocused) 2.dp else 1.dp,
+                    color = if (isFocused) scheme.primary else scheme.outlineVariant.copy(alpha = 0.4f),
+                    shape = shape
+                )
+                .clip(shape),
+            singleLine = true,
+            textStyle = MaterialTheme.typography.bodyLarge,
+            placeholder = {
+                Text(
+                    text = placeholder,
+                    color = scheme.onSurfaceVariant,
+                    maxLines = 1,
+                    overflow = TextOverflow.Ellipsis
+                )
+            },
+            leadingIcon = {
+                Icon(
+                    imageVector = leadingIcon,
+                    contentDescription = null,
+                    tint = scheme.onSurfaceVariant
+                )
+            },
+            trailingIcon = trailingIcon,
+            visualTransformation = visualTransformation,
+            colors = TextFieldDefaults.colors(
+                focusedContainerColor = scheme.surfaceContainer,
+                unfocusedContainerColor = scheme.surface,
+                focusedIndicatorColor = Color.Transparent,
+                unfocusedIndicatorColor = Color.Transparent,
+                disabledIndicatorColor = Color.Transparent,
+                cursorColor = scheme.primary,
+                focusedTextColor = scheme.onSurface,
+                unfocusedTextColor = scheme.onSurface
+            )
+        )
+    }
+}
+
+@Composable
+private fun TvLoginPasswordField(
+    label: String,
+    value: String,
+    onValueChange: (String) -> Unit,
+    placeholder: String,
+    leadingIcon: ImageVector,
+    modifier: Modifier = Modifier
+) {
+    val scheme = MaterialTheme.colorScheme
+    var isPasswordVisible by remember { mutableStateOf(false) }
+
+    TvLoginTextField(
+        label = label,
+        value = value,
+        onValueChange = onValueChange,
+        placeholder = placeholder,
+        leadingIcon = leadingIcon,
+        modifier = modifier,
+        trailingIcon = {
+            IconButton(onClick = { isPasswordVisible = !isPasswordVisible }) {
+                Icon(
+                    imageVector = if (isPasswordVisible) {
+                        Icons.Default.VisibilityOff
+                    } else {
+                        Icons.Default.Visibility
+                    },
+                    contentDescription = if (isPasswordVisible) "Hide password" else "Show password",
+                    tint = scheme.onSurfaceVariant
+                )
+            }
+        },
+        visualTransformation = if (isPasswordVisible) {
+            VisualTransformation.None
+        } else {
+            PasswordVisualTransformation()
+        }
+    )
+}

app-tv/src/main/java/hu/bbara/purefin/ui/screen/login/TvLoginScreen.kt

@@ -0,0 +1,98 @@
+package hu.bbara.purefin.ui.screen.login
+
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.ui.Modifier
+import androidx.hilt.navigation.compose.hiltViewModel
+import hu.bbara.purefin.core.data.JellyfinServerCandidate
+import hu.bbara.purefin.core.feature.login.LoginViewModel
+import kotlinx.coroutines.launch
+
+@Composable
+fun TvLoginScreen(
+    viewModel: LoginViewModel = hiltViewModel(),
+    modifier: Modifier = Modifier
+) {
+    val serverUrl by viewModel.url.collectAsStateWithLifecycle()
+    val phase by viewModel.phase.collectAsStateWithLifecycle()
+    val selectedServer by viewModel.selectedServer.collectAsStateWithLifecycle()
+    val discoveredServers by viewModel.discoveredServers.collectAsStateWithLifecycle()
+    val username by viewModel.username.collectAsStateWithLifecycle()
+    val password by viewModel.password.collectAsStateWithLifecycle()
+    val isSearching by viewModel.isSearching.collectAsStateWithLifecycle()
+    val isLoggingIn by viewModel.isLoggingIn.collectAsStateWithLifecycle()
+    val quickConnectAvailable by viewModel.quickConnectAvailable.collectAsStateWithLifecycle()
+    val quickConnectCode by viewModel.quickConnectCode.collectAsStateWithLifecycle()
+    val isQuickConnecting by viewModel.isQuickConnecting.collectAsStateWithLifecycle()
+    val errorMessage by viewModel.errorMessage.collectAsStateWithLifecycle()
+    val coroutineScope = rememberCoroutineScope()
+
+    val state = remember(
+        phase,
+        serverUrl,
+        selectedServer,
+        discoveredServers,
+        username,
+        password,
+        isSearching,
+        isLoggingIn,
+        quickConnectAvailable,
+        quickConnectCode,
+        isQuickConnecting,
+        errorMessage
+    ) {
+        LoginContentState(
+            phase = if (phase == LoginViewModel.Phase.LOGIN) {
+                LoginContentPhase.Login
+            } else {
+                LoginContentPhase.ServerSearch
+            },
+            serverUrl = serverUrl,
+            selectedServerName = selectedServer?.name,
+            selectedServerUrl = selectedServer?.address,
+            discoveredServers = discoveredServers.map {
+                LoginServerCandidateUi(name = it.name, address = it.address)
+            },
+            username = username,
+            password = password,
+            isSearching = isSearching,
+            isLoggingIn = isLoggingIn,
+            quickConnectAvailable = quickConnectAvailable,
+            quickConnectCode = quickConnectCode,
+            isQuickConnecting = isQuickConnecting,
+            errorMessage = errorMessage
+        )
+    }
+    val callbacks = remember(viewModel, coroutineScope) {
+        LoginContentCallbacks(
+            onServerUrlChange = viewModel::setUrl,
+            onFindServer = viewModel::findServer,
+            onDiscoveredServerClick = {
+                viewModel.selectDiscoveredServer(JellyfinServerCandidate(name = it.name, address = it.address))
+            },
+            onChangeServer = viewModel::changeServer,
+            onUsernameChange = {
+                viewModel.setUsername(it)
+            },
+            onPasswordChange = {
+                viewModel.setPassword(it)
+            },
+            onConnect = {
+                coroutineScope.launch {
+                    viewModel.login()
+                }
+            },
+            onQuickConnect = viewModel::startQuickConnect,
+            onCancelQuickConnect = viewModel::cancelQuickConnect
+        )
+    }
+
+    TvLoginContent(
+        state = state,
+        callbacks = callbacks,
+        modifier = modifier
+    )
+}

app-tv/src/main/java/hu/bbara/purefin/ui/screen/movie/TvMovieScreen.kt

@@ -6,15 +6,15 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.collectAsState
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.withFrameNanos
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.focus.FocusRequester
 import androidx.hilt.navigation.compose.hiltViewModel
-import hu.bbara.purefin.feature.content.movie.MovieScreenViewModel
+import hu.bbara.purefin.core.feature.content.movie.MovieScreenViewModel
 import hu.bbara.purefin.model.Movie
-import hu.bbara.purefin.navigation.MovieDto
+import hu.bbara.purefin.core.navigation.MovieDto
 import hu.bbara.purefin.ui.common.media.MediaDetailHorizontalPadding
 import hu.bbara.purefin.ui.common.media.TvMediaDetailBodyBox
 import hu.bbara.purefin.ui.common.media.TvMediaDetailScaffold
@@ -28,11 +28,11 @@ fun TvMovieScreen(
     viewModel: MovieScreenViewModel = hiltViewModel(),
     modifier: Modifier = Modifier
 ) {
-    LaunchedEffect(movie.id) {
+    LaunchedEffect(movie) {
-        viewModel.selectMovie(movie.id)
+        viewModel.selectMovie(movie)
     }
 
-    val movieItem = viewModel.movie.collectAsState()
+    val movieItem = viewModel.movie.collectAsStateWithLifecycle()
 
     if (movieItem.value != null) {
         TvMovieScreenContent(

app-tv/src/main/java/hu/bbara/purefin/ui/screen/player/TvPlayerScreen.kt

@@ -2,7 +2,6 @@ package hu.bbara.purefin.ui.screen.player
 
 import android.app.Activity
 import android.view.WindowManager
-import androidx.activity.compose.BackHandler
 import androidx.annotation.OptIn
 import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.animation.fadeIn
@@ -12,23 +11,29 @@ import androidx.compose.animation.slideOutHorizontally
 import androidx.compose.foundation.background
 import androidx.compose.foundation.focusable
 import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.outlined.Pause
 import androidx.compose.material.icons.outlined.SkipNext
 import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableIntStateOf
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -37,31 +42,45 @@ import androidx.compose.ui.focus.FocusRequester
 import androidx.compose.ui.focus.focusRequester
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.input.key.Key
+import androidx.compose.ui.input.key.KeyEvent
 import androidx.compose.ui.input.key.KeyEventType
 import androidx.compose.ui.input.key.key
-import androidx.compose.ui.input.key.onPreviewKeyEvent
+import androidx.compose.ui.input.key.onKeyEvent
 import androidx.compose.ui.input.key.type
 import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.platform.LocalFocusManager
 import androidx.compose.ui.platform.testTag
+import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.viewinterop.AndroidView
 import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.compose.LifecycleEventEffect
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.media3.common.util.UnstableApi
 import androidx.media3.ui.AspectRatioFrameLayout
 import androidx.media3.ui.PlayerView
 import androidx.media3.ui.SubtitleView
-import hu.bbara.purefin.player.viewmodel.ControlsAutoHideBlocker
+import hu.bbara.purefin.core.player.model.TimedMarker
-import hu.bbara.purefin.player.viewmodel.PlayerViewModel
+import hu.bbara.purefin.core.player.viewmodel.PlayerViewModel
+import hu.bbara.purefin.model.SegmentType
+import hu.bbara.purefin.ui.common.visual.ValueChangeTimedVisibility
+import hu.bbara.purefin.ui.screen.player.components.PlayerSeekBarTrack
 import hu.bbara.purefin.ui.screen.player.components.TvIconButton
+import hu.bbara.purefin.ui.screen.player.components.TvNextEpisodeOverlay
 import hu.bbara.purefin.ui.screen.player.components.TvPlayerControlsOverlay
 import hu.bbara.purefin.ui.screen.player.components.TvPlayerLoadingErrorEndCard
+import hu.bbara.purefin.ui.screen.player.components.TvPlayerTimeRow
 import hu.bbara.purefin.ui.screen.player.components.TvTrackPanelType
 import hu.bbara.purefin.ui.screen.player.components.TvTrackSelectionPanel
+import kotlinx.coroutines.Job
 import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
+import java.time.LocalTime
+import java.time.format.DateTimeFormatter
+import java.util.Locale
 
 private const val TV_CONTROLS_AUTO_HIDE_MS = 5_000L
-private const val CONTROLS_VISIBLE_SUBTITLE_BOTTOM_PADDING_FRACTION = 0.22f
+private const val CONTROLS_VISIBLE_SUBTITLE_BOTTOM_PADDING_FRACTION = 0.31f
 internal const val TV_HIDDEN_STOP_FEEDBACK_MS = 1_200L
 internal const val TvPlayerHiddenStopFeedbackTag = "tv_player_hidden_stop_feedback"
 
@@ -76,23 +95,43 @@ fun TvPlayerScreen(
         viewModel.loadMedia(mediaId)
     }
 
-    val uiState by viewModel.uiState.collectAsState()
+    val scope = rememberCoroutineScope()
-    val controlsVisible by viewModel.controlsVisible.collectAsState()
+    var hideControlsJob: Job? by remember { mutableStateOf(null) }
+
+    val uiState by viewModel.uiState.collectAsStateWithLifecycle()
+    var controlsVisible by remember { mutableStateOf(true) }
     var isPlaylistExpanded by remember { mutableStateOf(false) }
     var trackPanelType by remember { mutableStateOf<TvTrackPanelType?>(null) }
     var pendingTrackButtonFocus by remember { mutableStateOf<TvTrackPanelType?>(null) }
-    var stopFeedbackVisible by remember { mutableStateOf(false) }
+
-    var stopFeedbackRequestId by remember { mutableStateOf(0) }
+    // This is a hack for timed visibility.
-    val controlsAutoHideBlocked = isPlaylistExpanded || trackPanelType != null
+    var resumeStopFeedbackCounter by remember { mutableIntStateOf(0) }
+    var hiddenSeekCounter by remember { mutableIntStateOf(0) }
+
 
     val context = LocalContext.current
-    val focusManager = LocalFocusManager.current
+
-    val rootFocusRequester = remember { FocusRequester() }
+
-    val controlsFocusRequester = remember { FocusRequester() }
+    val backgroundFocusRequester = remember { FocusRequester() }
+
+    // Main section focus requesters
+    var rootFocusRequester by remember { mutableStateOf(backgroundFocusRequester) }
+    var controlsFocusRequester by remember { mutableStateOf(FocusRequester() ) }
+
     val qualityButtonFocusRequester = remember { FocusRequester() }
     val audioButtonFocusRequester = remember { FocusRequester() }
     val subtitlesButtonFocusRequester = remember { FocusRequester() }
     val skipButtonFocusRequester = remember { FocusRequester() }
+    val nextEpisodeFocusRequester = remember { FocusRequester() }
+
+    LifecycleEventEffect(Lifecycle.Event.ON_STOP) {
+        viewModel.pausePlayback()
+    }
+    DisposableEffect(Unit) {
+        onDispose {
+            (context as? Activity)?.window?.clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
+        }
+    }
     LaunchedEffect(uiState.isPlaying) {
         val activity = context as? Activity
         if (uiState.isPlaying) {
@@ -101,102 +140,85 @@ fun TvPlayerScreen(
             activity?.window?.clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
         }
     }
-    DisposableEffect(Unit) {
+
-        onDispose {
+    fun showControls() {
-            (context as? Activity)?.window?.clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
+        controlsVisible = true
-            viewModel.setControlsAutoHideBlocked(ControlsAutoHideBlocker.PLAYLIST, false)
+    }
-            viewModel.setControlsAutoHideBlocked(ControlsAutoHideBlocker.TRACK_PANEL, false)
+    fun hideControls() {
+        controlsVisible = false
+    }
+    fun hideControlsWithTimeout() {
+        hideControlsJob?.cancel()
+        if (controlsVisible && !isPlaylistExpanded && trackPanelType == null && !uiState.isEnded && uiState.error == null) {
+            hideControlsJob = scope.launch {
+                delay(TV_CONTROLS_AUTO_HIDE_MS)
+                hideControls()
+            }
         }
     }
-
+    // Needed because of composition scheduling
-    LaunchedEffect(isPlaylistExpanded) {
+    LaunchedEffect(controlsVisible) {
-        viewModel.setControlsAutoHideBlocked(ControlsAutoHideBlocker.PLAYLIST, isPlaylistExpanded)
+        if (controlsVisible) {
-    }
+            controlsFocusRequester.requestFocus()
-
+        } else {
-    LaunchedEffect(trackPanelType) {
+            rootFocusRequester.requestFocus()
-        viewModel.setControlsAutoHideBlocked(
-            ControlsAutoHideBlocker.TRACK_PANEL,
-            trackPanelType != null
-        )
-    }
-
-    val expandPlaylist: () -> Unit = {
-        if (!isPlaylistExpanded) {
-            isPlaylistExpanded = true
         }
     }
-    val collapsePlaylistToControls: () -> Unit = {
+    LifecycleEventEffect(Lifecycle.Event.ON_START) {
-        if (isPlaylistExpanded) {
+        hideControlsWithTimeout()
-            isPlaylistExpanded = false
-            viewModel.showControls(TV_CONTROLS_AUTO_HIDE_MS)
-        }
     }
-    val showTvControls: () -> Unit = {
+
-        viewModel.showControls(TV_CONTROLS_AUTO_HIDE_MS)
+    fun expandPlaylist() {
+        // TODO: focus management for playlist expansion
+        isPlaylistExpanded = true
     }
-    val togglePlayPauseAndShowControls: () -> Unit = {
+    fun closePlaylist() {
-        viewModel.togglePlayPause(TV_CONTROLS_AUTO_HIDE_MS)
+        // TODO focus
-    }
+        isPlaylistExpanded = false
-    val pausePlaybackWithoutShowingControls: () -> Unit = {
-        viewModel.pausePlayback()
-        stopFeedbackVisible = true
-        stopFeedbackRequestId += 1
-    }
-    val resumePlaybackWithoutShowingControls: () -> Unit = {
-        viewModel.resumePlayback()
-        stopFeedbackVisible = false
-    }
-    val seekAndShowControls: (Long) -> Unit = { positionMs ->
-        viewModel.seekTo(positionMs)
-        showTvControls()
-    }
-    val seekByAndShowControls: (Long) -> Unit = { deltaMs ->
-        viewModel.seekBy(deltaMs)
-        showTvControls()
-    }
-    val seekByWithoutShowingControls: (Long) -> Unit = { deltaMs ->
-        viewModel.seekBy(deltaMs)
-        stopFeedbackVisible = false
-    }
-    val seekToLiveEdgeAndShowControls: () -> Unit = {
-        viewModel.seekToLiveEdge()
-        showTvControls()
-    }
-    val skipSegmentAndShowControls: () -> Unit = {
-        viewModel.skipActiveSegment()
-        showTvControls()
-    }
-    val nextAndShowControls: () -> Unit = {
-        viewModel.next(TV_CONTROLS_AUTO_HIDE_MS)
-    }
-    val previousAndShowControls: () -> Unit = {
-        viewModel.previous(TV_CONTROLS_AUTO_HIDE_MS)
     }
     val closeTrackPanel: () -> Unit = {
         trackPanelType?.let { panelType ->
             pendingTrackButtonFocus = panelType
             trackPanelType = null
-            viewModel.showControls(TV_CONTROLS_AUTO_HIDE_MS)
+        }
+    }
+    fun handleBack() {
+        when {
+            trackPanelType != null -> closeTrackPanel()
+            isPlaylistExpanded -> closePlaylist()
+            controlsVisible -> hideControls()
+            else -> onBack()
         }
     }
 
-    LaunchedEffect(
+
-        controlsVisible,
+    val showSkipIntroButton = !controlsVisible
-        controlsAutoHideBlocked,
+        && uiState.activeSkippableSegmentEndMs != null
-        uiState.activeSkippableSegmentEndMs
+        && uiState.activeSkippableSegmentType == SegmentType.INTRO
-    ) {
+        && !uiState.isEnded
-        if (controlsAutoHideBlocked) return@LaunchedEffect
+    val showNextEpisodeOverlay = !controlsVisible
-        if (controlsVisible) {
+        && uiState.nextEpisode != null
-            controlsFocusRequester.requestFocus()
+        && uiState.durationMs > 0L
-        } else {
+        && ((uiState.durationMs - uiState.positionMs) <= 30_000L || uiState.activeSkippableSegmentType == SegmentType.OUTRO)
-            if (uiState.activeSkippableSegmentEndMs != null) {
+        && !uiState.isEnded
-                skipButtonFocusRequester.requestFocus()
+    LaunchedEffect(showSkipIntroButton, showNextEpisodeOverlay) {
-                return@LaunchedEffect
+        rootFocusRequester = when {
+            showSkipIntroButton -> {
+                skipButtonFocusRequester
             }
-            focusManager.clearFocus()
+            showNextEpisodeOverlay -> {
+                nextEpisodeFocusRequester
+            }
+            else -> {
+                backgroundFocusRequester
+            }
+        }
+        if (!controlsVisible) {
+            rootFocusRequester.requestFocus()
         }
     }
 
+
     LaunchedEffect(trackPanelType, pendingTrackButtonFocus) {
         val pendingFocus = pendingTrackButtonFocus ?: return@LaunchedEffect
         if (trackPanelType != null) return@LaunchedEffect
@@ -208,59 +230,44 @@ fun TvPlayerScreen(
         pendingTrackButtonFocus = null
     }
 
-    LaunchedEffect(stopFeedbackRequestId) {
-        if (stopFeedbackRequestId == 0) return@LaunchedEffect
-        delay(TV_HIDDEN_STOP_FEEDBACK_MS)
-        stopFeedbackVisible = false
-    }
-
-    LaunchedEffect(controlsVisible, isPlaylistExpanded, trackPanelType, uiState.isEnded, uiState.error) {
-        if (controlsVisible || isPlaylistExpanded || trackPanelType != null || uiState.isEnded || uiState.error != null) {
-            stopFeedbackVisible = false
-        }
-    }
-
-    val playerControlsVisible =
-        controlsVisible || isPlaylistExpanded || trackPanelType != null || uiState.isEnded || uiState.error != null
     val subtitleBottomPaddingFraction =
-        if (playerControlsVisible) {
+        if (controlsVisible) {
             CONTROLS_VISIBLE_SUBTITLE_BOTTOM_PADDING_FRACTION
         } else {
             SubtitleView.DEFAULT_BOTTOM_PADDING_FRACTION
         }
 
-    BackHandler(enabled = true) {
-        when {
-            trackPanelType != null -> closeTrackPanel()
-            isPlaylistExpanded -> collapsePlaylistToControls()
-            controlsVisible -> viewModel.toggleControlsVisibility()
-            else -> onBack()
-        }
-    }
-
     Box(
         modifier = Modifier
             .fillMaxSize()
             .background(Color.Black)
             .focusRequester(rootFocusRequester)
-            .onPreviewKeyEvent { event ->
+            .onKeyEvent { event ->
-                handleTvPlayerRootKeyEvent(
+                if (event.key == Key.Back) {
-                    event = event,
+                    if (event.type == KeyEventType.KeyDown) {
-                    isPlaying = uiState.isPlaying,
+                        handleBack()
-                    controlsVisible = controlsVisible,
+                    }
-                    isPlaylistExpanded = isPlaylistExpanded,
+                    true
-                    trackPanelType = trackPanelType,
+                } else {
-                    onCloseTrackPanel = closeTrackPanel,
+                    val handled = handleTvPlayerRootKeyEvent(
-                    onCollapsePlaylist = collapsePlaylistToControls,
+                        event = event,
-                    onHideControls = { viewModel.toggleControlsVisibility() },
+                        controlsVisible = controlsVisible,
-                    onPausePlaybackWithoutShowingControls = pausePlaybackWithoutShowingControls,
+                        popupVisible = showSkipIntroButton || showNextEpisodeOverlay,
-                    onResumePlaybackWithoutShowingControls = resumePlaybackWithoutShowingControls,
+                        onShowControls = ::showControls,
-                    onSeekRelative = seekByWithoutShowingControls,
+                        onTogglePlayback = {
-                    onShowControls = showTvControls,
+                            resumeStopFeedbackCounter++
-                    onSkipSegment = skipSegmentAndShowControls,
+                            viewModel.togglePlayPause()
-                    hasSkippableSegment = uiState.activeSkippableSegmentEndMs != null,
+                        },
-                    onTogglePlayPause = togglePlayPauseAndShowControls
+                        onSeekRelative = {
-                )
+                            hiddenSeekCounter++
+                            viewModel.seekBy(it)
+                        },
+                    )
+                    if (event.type == KeyEventType.KeyDown) {
+                        hideControlsWithTimeout()
+                    }
+                    handled
+                }
             }
             .focusable()
     ) {
@@ -271,6 +278,8 @@ fun TvPlayerScreen(
                     resizeMode = AspectRatioFrameLayout.RESIZE_MODE_FIT
                     player = viewModel.player
                     subtitleView?.setBottomPaddingFraction(subtitleBottomPaddingFraction)
+                    isFocusable = false
+                    isFocusableInTouchMode = false
                 }
             },
             update = {
@@ -283,7 +292,7 @@ fun TvPlayerScreen(
         )
 
         AnimatedVisibility(
-            visible = playerControlsVisible,
+            visible = controlsVisible,
             enter = fadeIn(),
             exit = fadeOut()
         ) {
@@ -295,21 +304,25 @@ fun TvPlayerScreen(
                 qualityButtonFocusRequester = qualityButtonFocusRequester,
                 audioButtonFocusRequester = audioButtonFocusRequester,
                 subtitlesButtonFocusRequester = subtitlesButtonFocusRequester,
-                onPlayPause = togglePlayPauseAndShowControls,
+                onPlayPause = { viewModel.togglePlayPause() },
-                onSeek = seekAndShowControls,
+                onSeek = { positionMs ->
-                onSeekRelative = seekByAndShowControls,
+                    viewModel.seekTo(positionMs)
-                onSeekLiveEdge = seekToLiveEdgeAndShowControls,
+                },
-                onSkipSegment = skipSegmentAndShowControls,
+                onSeekRelative = { deltaMs ->
-                onNext = nextAndShowControls,
+                    viewModel.seekBy(deltaMs)
-                onPrevious = previousAndShowControls,
+                },
+                onSkipSegment = {
+                    viewModel.skipActiveSegment()
+                },
+                onNext = { viewModel.next() },
+                onPrevious = { viewModel.previous() },
                 onOpenAudioPanel = { trackPanelType = TvTrackPanelType.AUDIO },
                 onOpenSubtitlesPanel = { trackPanelType = TvTrackPanelType.SUBTITLES },
                 onOpenQualityPanel = { trackPanelType = TvTrackPanelType.QUALITY },
-                onExpandPlaylist = expandPlaylist,
+                onExpandPlaylist = ::expandPlaylist,
-                onCollapsePlaylist = collapsePlaylistToControls,
+                onCollapsePlaylist = ::closePlaylist,
                 onSelectQueueItem = { id ->
                     viewModel.playQueueItem(id)
-                    collapsePlaylistToControls()
                 },
                 qualityButtonEnabled = uiState.qualityTracks.isNotEmpty(),
                 audioButtonEnabled = uiState.audioTracks.isNotEmpty(),
@@ -318,42 +331,89 @@ fun TvPlayerScreen(
         }
 
         AnimatedVisibility(
-            visible = !playerControlsVisible && uiState.activeSkippableSegmentEndMs != null,
+            visible = controlsVisible,
             enter = fadeIn(),
             exit = fadeOut(),
+            modifier = Modifier
+                .align(Alignment.TopEnd)
+                .padding(horizontal = 24.dp, vertical = 16.dp)
+        ) {
+            TvPlayerClock()
+        }
+
+        AnimatedVisibility(
+            visible = showSkipIntroButton,
             modifier = Modifier
                 .align(Alignment.BottomEnd)
-                .padding(end = 24.dp, bottom = 24.dp)
+                .padding(
+                    end = 24.dp,
+                    bottom = 24.dp
+                )
         ) {
             TvIconButton(
                 icon = Icons.Outlined.SkipNext,
                 contentDescription = "Skip segment",
-                onClick = skipSegmentAndShowControls,
+                onClick = { viewModel.skipActiveSegment() },
                 size = 64,
                 label = "Skip",
                 modifier = Modifier.focusRequester(skipButtonFocusRequester)
             )
         }
 
+        AnimatedVisibility(
+            visible = showNextEpisodeOverlay,
+            modifier = Modifier
+                .align(Alignment.BottomEnd)
+                .padding(
+                    end = 32.dp,
+                    bottom = 140.dp
+                )
+        ) {
+            uiState.nextEpisode?.let { nextEpisode ->
+                TvNextEpisodeOverlay(
+                    nextEpisode = nextEpisode,
+                    onClick = { viewModel.next() },
+                    modifier = Modifier.focusRequester(nextEpisodeFocusRequester)
+                )
+            }
+        }
+
+        if (!showSkipIntroButton && !controlsVisible) {
+            ValueChangeTimedVisibility(
+                value = hiddenSeekCounter,
+                hideAfterMillis = 2500L,
+                modifier = Modifier
+                    .align(Alignment.BottomCenter)
+                    .padding(horizontal = 32.dp, vertical = 28.dp)
+            ) {
+                HiddenTvSeekTimeline(
+                    positionMs = uiState.positionMs,
+                    durationMs = uiState.durationMs,
+                    bufferedMs = uiState.bufferedMs,
+                    chapterMarkers = uiState.chapters,
+                    adMarkers = uiState.ads
+                )
+            }
+        }
+
         TvPlayerLoadingErrorEndCard(
             modifier = Modifier.align(Alignment.Center),
             uiState = uiState,
             onRetry = { viewModel.retry() },
-            onNext = nextAndShowControls,
+            onNext = { viewModel.next() },
             onReplay = {
                 viewModel.seekTo(0L)
-                togglePlayPauseAndShowControls()
+                viewModel.resumePlayback()
             },
             onDismissError = { viewModel.clearError() }
         )
 
-        AnimatedVisibility(
+        ValueChangeTimedVisibility(
-            visible = stopFeedbackVisible,
+            value = resumeStopFeedbackCounter,
-            enter = fadeIn(),
+            hideAfterMillis = TV_HIDDEN_STOP_FEEDBACK_MS,
-            exit = fadeOut(),
             modifier = Modifier.align(Alignment.Center)
         ) {
-            TvPlayerHiddenStopFeedback()
+            TvPlayerStopFeedback(stopped = !uiState.isPlaying)
         }
 
         AnimatedVisibility(
@@ -377,45 +437,74 @@ fun TvPlayerScreen(
     }
 }
 
-internal fun handleTvPlayerRootKeyEvent(
+@Composable
-    event: androidx.compose.ui.input.key.KeyEvent,
+private fun HiddenTvSeekTimeline(
-    isPlaying: Boolean,
+    positionMs: Long,
-    controlsVisible: Boolean,
+    durationMs: Long,
-    isPlaylistExpanded: Boolean,
+    bufferedMs: Long,
-    trackPanelType: TvTrackPanelType?,
+    chapterMarkers: List<TimedMarker>,
-    onCloseTrackPanel: () -> Unit,
+    adMarkers: List<TimedMarker>,
-    onCollapsePlaylist: () -> Unit,
+    modifier: Modifier = Modifier
-    onHideControls: () -> Unit,
+) {
-    onPausePlaybackWithoutShowingControls: () -> Unit,
+    val safeDuration = durationMs.takeIf { it > 0 } ?: 1L
-    onResumePlaybackWithoutShowingControls: () -> Unit,
-    onSeekRelative: (Long) -> Unit,
-    onShowControls: () -> Unit,
-    onSkipSegment: () -> Unit = {},
-    hasSkippableSegment: Boolean = false,
-    onTogglePlayPause: () -> Unit
-): Boolean {
-    if (event.type != KeyEventType.KeyDown) return false
 
-    if (event.key == Key.Back || event.key == Key.Escape) {
+    Column(
-        return when {
+        modifier = modifier
-            trackPanelType != null -> {
+            .fillMaxWidth()
-                onCloseTrackPanel()
+            .clip(RoundedCornerShape(16.dp))
-                true
+            .background(Color.Transparent)
-            }
+            .padding(horizontal = 20.dp, vertical = 12.dp)
+    ) {
+        TvPlayerTimeRow(
+            positionMs = positionMs,
+            durationMs = durationMs,
+            modifier = Modifier.fillMaxWidth()
+        )
+        PlayerSeekBarTrack(
+            positionMs = positionMs,
+            durationMs = safeDuration,
+            bufferedMs = bufferedMs,
+            chapterMarkers = chapterMarkers,
+            adMarkers = adMarkers,
+            modifier = Modifier
+                .fillMaxWidth()
+                .height(32.dp),
+            isFocused = false,
+            thumbRadius = 7.dp,
+            focusedThumbRadius = 9.dp,
+            focusedThumbHaloRadiusDelta = 0.dp
+        )
+    }
+}
 
-            isPlaylistExpanded -> {
+@Composable
-                onCollapsePlaylist()
+private fun TvPlayerClock(modifier: Modifier = Modifier) {
-                true
+    var currentTime by remember { mutableStateOf(LocalTime.now()) }
-            }
+    LaunchedEffect(Unit) {
-
+        while (true) {
-            controlsVisible -> {
+            currentTime = LocalTime.now()
-                onHideControls()
+            delay(1_000L)
-                true
-            }
-
-            else -> false
         }
     }
+    val formatter = remember { DateTimeFormatter.ofPattern("HH:mm", Locale.getDefault()) }
+    Text(
+        text = formatter.format(currentTime),
+        color = MaterialTheme.colorScheme.onBackground,
+        style = MaterialTheme.typography.titleLarge,
+        fontWeight = FontWeight.Bold,
+        modifier = modifier
+    )
+}
+
+internal fun handleTvPlayerRootKeyEvent(
+    event: KeyEvent,
+    controlsVisible: Boolean,
+    popupVisible: Boolean,
+    onTogglePlayback: () -> Unit,
+    onSeekRelative: (Long) -> Unit,
+    onShowControls: () -> Unit,
+): Boolean {
+    if (event.type != KeyEventType.KeyDown) return false
 
     if (!controlsVisible) {
         return when (event.key) {
@@ -425,7 +514,7 @@ internal fun handleTvPlayerRootKeyEvent(
             }
 
             Key.DirectionRight -> {
-                onSeekRelative(10_000)
+                onSeekRelative(30_000)
                 true
             }
 
@@ -435,14 +524,13 @@ internal fun handleTvPlayerRootKeyEvent(
             }
 
             Key.DirectionCenter, Key.Enter -> {
-                if (hasSkippableSegment) {
+                if (popupVisible) {
-                    onSkipSegment()
+                    // Do nothing because the focused component is not he root, but an overlay
-                } else if (isPlaying) {
+                    false
-                    onPausePlaybackWithoutShowingControls()
                 } else {
-                    onResumePlaybackWithoutShowingControls()
+                    onTogglePlayback()
+                    true
                 }
-                true
             }
 
             else -> false
@@ -453,9 +541,13 @@ internal fun handleTvPlayerRootKeyEvent(
 }
 
 @Composable
-internal fun TvPlayerHiddenStopFeedback(
+internal fun TvPlayerStopFeedback(
+    stopped: Boolean,
     modifier: Modifier = Modifier
 ) {
+    if (!stopped) {
+        return
+    }
     Box(
         modifier = modifier
             .testTag(TvPlayerHiddenStopFeedbackTag)
@@ -466,7 +558,7 @@ internal fun TvPlayerHiddenStopFeedback(
     ) {
         Icon(
             imageVector = Icons.Outlined.Pause,
-            contentDescription = "Pause playback",
+            contentDescription = "Play/Pause playback",
             tint = MaterialTheme.colorScheme.onSurface,
             modifier = Modifier.size(72.dp)
         )

app-tv/src/main/java/hu/bbara/purefin/ui/screen/player/components/TvIconButton.kt

@@ -54,6 +54,18 @@ internal fun TvIconButton(
         targetValue = if (isFocused) scheme.primary else Color.Transparent,
         label = "border"
     )
+    val backgroundColor by animateColorAsState(
+        targetValue = if (isFocused) {
+            scheme.primaryContainer
+        } else {
+            scheme.surfaceContainerHigh.copy(alpha = 0.72f)
+        },
+        label = "background"
+    )
+    val contentColor by animateColorAsState(
+        targetValue = if (isFocused) scheme.onPrimaryContainer else scheme.onSurface,
+        label = "content"
+    )
     val shape = RoundedCornerShape(50)
     val iconSize = (size - 24).coerceAtLeast(0).dp
 
@@ -69,10 +81,7 @@ internal fun TvIconButton(
             shape = shape
         )
         .clip(shape)
-        .background(
+        .background(backgroundColor)
-            if (isFocused) scheme.primary.copy(alpha = 0.5f)
-            else scheme.background.copy(alpha = 0.65f)
-        )
         .focusProperties { canFocus = enabled }
         .semantics {
             if (!enabled) {
@@ -86,7 +95,7 @@ internal fun TvIconButton(
         Icon(
             imageVector = icon,
             contentDescription = contentDescription,
-            tint = scheme.onBackground,
+            tint = contentColor,
             modifier = buttonModifier
                 .size(size.dp)
                 .padding(12.dp)
@@ -104,12 +113,12 @@ internal fun TvIconButton(
             Icon(
                 imageVector = icon,
                 contentDescription = contentDescription,
-                tint = scheme.onBackground,
+                tint = contentColor,
                 modifier = Modifier.size(iconSize)
             )
             Text(
                 text = label,
-                color = scheme.onBackground,
+                color = contentColor,
                 style = MaterialTheme.typography.labelLarge,
                 fontWeight = FontWeight.SemiBold
             )

app-tv/src/main/java/hu/bbara/purefin/ui/screen/player/components/TvNextEpisodeOverlay.kt

@@ -0,0 +1,143 @@
+package hu.bbara.purefin.ui.screen.player.components
+
+import androidx.compose.animation.animateColorAsState
+import androidx.compose.animation.core.animateFloatAsState
+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.Spacer
+import androidx.compose.foundation.layout.aspectRatio
+import androidx.compose.foundation.layout.fillMaxWidth
+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.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.focus.onFocusChanged
+import androidx.compose.ui.graphics.Brush
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.graphicsLayer
+import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.dp
+import coil3.compose.AsyncImage
+import hu.bbara.purefin.core.player.model.PlaylistElementUiModel
+
+/**
+ * TV-optimized overlay button that appears near the end of a media item to let the user
+ * quickly jump to the next episode. Shows the next episode's artwork and title.
+ * Supports D-pad navigation and focus animations.
+ */
+@Composable
+fun TvNextEpisodeOverlay(
+    nextEpisode: PlaylistElementUiModel,
+    onClick: () -> Unit,
+    modifier: Modifier = Modifier
+) {
+    val scheme = MaterialTheme.colorScheme
+    var isFocused by remember { mutableStateOf(false) }
+    val scale by animateFloatAsState(
+        targetValue = if (isFocused) 1.05f else 1f,
+        label = "nextEpisodeScale"
+    )
+    val borderColor by animateColorAsState(
+        targetValue = if (isFocused) scheme.primary else Color.Transparent,
+        label = "nextEpisodeBorder"
+    )
+    val backgroundColor by animateColorAsState(
+        targetValue = if (isFocused) {
+            scheme.surfaceContainerHigh.copy(alpha = 0.96f)
+        } else {
+            Color.Black.copy(alpha = 0.85f)
+        },
+        label = "nextEpisodeBackground"
+    )
+
+    Column(
+        modifier = modifier
+            .width(280.dp)
+            .graphicsLayer {
+                scaleX = scale
+                scaleY = scale
+            }
+            .border(
+                width = if (isFocused) 3.dp else 0.dp,
+                color = borderColor,
+                shape = RoundedCornerShape(20.dp)
+            )
+            .clip(RoundedCornerShape(20.dp))
+            .background(backgroundColor)
+            .onFocusChanged { isFocused = it.isFocused }
+            .clickable { onClick() },
+        verticalArrangement = Arrangement.spacedBy(0.dp)
+    ) {
+        // "Up Next" label
+        Text(
+            text = "Up Next",
+            color = scheme.secondary,
+            style = MaterialTheme.typography.labelLarge,
+            fontWeight = FontWeight.Bold,
+            maxLines = 1,
+            modifier = Modifier.padding(start = 16.dp, top = 12.dp, end = 16.dp)
+        )
+
+        Spacer(modifier = Modifier.height(6.dp))
+
+        // Thumbnail with play button overlay
+        Box(
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(horizontal = 16.dp)
+                .aspectRatio(16f / 9f)
+                .clip(RoundedCornerShape(12.dp))
+        ) {
+            AsyncImage(
+                model = nextEpisode.artworkUrl?.takeIf { it.isNotEmpty() },
+                contentDescription = nextEpisode.title,
+                modifier = Modifier.matchParentSize(),
+                contentScale = ContentScale.Crop
+            )
+
+            // Dark gradient overlay for readability
+            Box(
+                modifier = Modifier
+                    .matchParentSize()
+                    .background(
+                        Brush.verticalGradient(
+                            colors = listOf(
+                                Color.Black.copy(alpha = 0.1f),
+                                Color.Black.copy(alpha = 0.4f)
+                            )
+                        )
+                    )
+            )
+        }
+
+        Spacer(modifier = Modifier.height(12.dp))
+
+        // Episode title
+        Text(
+            text = nextEpisode.title,
+            color = scheme.onSurface,
+            style = MaterialTheme.typography.bodyMedium,
+            fontWeight = FontWeight.Medium,
+            maxLines = 2,
+            overflow = TextOverflow.Ellipsis,
+            modifier = Modifier.padding(start = 16.dp, end = 16.dp, bottom = 14.dp)
+        )
+    }
+}
+
+internal const val TvPlayerNextEpisodeOverlayTag = "tv_player_next_episode_overlay"

app-tv/src/main/java/hu/bbara/purefin/ui/screen/player/components/TvPlayerControlsOverlay.kt

@@ -16,10 +16,8 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.outlined.Forward30
 import androidx.compose.material.icons.outlined.Pause
 import androidx.compose.material.icons.outlined.PlayArrow
-import androidx.compose.material.icons.outlined.Replay10
 import androidx.compose.material.icons.outlined.SkipNext
 import androidx.compose.material.icons.outlined.SkipPrevious
 import androidx.compose.material3.MaterialTheme
@@ -46,7 +44,7 @@ import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.semantics.stateDescription
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
-import hu.bbara.purefin.player.model.PlayerUiState
+import hu.bbara.purefin.core.player.model.PlayerUiState
 
 internal const val TvPlayerPlaylistStateTag = "tv_player_playlist_state"
 internal const val TvPlayerPlayPauseButtonTag = "tv_player_play_pause_button"
@@ -63,7 +61,6 @@ internal fun TvPlayerControlsOverlay(
     onPlayPause: () -> Unit,
     onSeek: (Long) -> Unit,
     onSeekRelative: (Long) -> Unit,
-    onSeekLiveEdge: () -> Unit,
     onSkipSegment: () -> Unit,
     onNext: () -> Unit,
     onPrevious: () -> Unit,
@@ -109,7 +106,6 @@ internal fun TvPlayerControlsOverlay(
             onPlayPause = onPlayPause,
             onSeek = onSeek,
             onSeekRelative = onSeekRelative,
-            onSeekLiveEdge = onSeekLiveEdge,
             onSkipSegment = onSkipSegment,
             onNext = onNext,
             onPrevious = onPrevious,
@@ -172,7 +168,6 @@ private fun TvPlayerBottomSection(
     onPlayPause: () -> Unit,
     onSeek: (Long) -> Unit,
     onSeekRelative: (Long) -> Unit,
-    onSeekLiveEdge: () -> Unit,
     onSkipSegment: () -> Unit,
     onNext: () -> Unit,
     onPrevious: () -> Unit,
@@ -187,7 +182,6 @@ private fun TvPlayerBottomSection(
     subtitlesButtonEnabled: Boolean,
     modifier: Modifier = Modifier
 ) {
-    val scheme = MaterialTheme.colorScheme
     val playlistFocusRequester = remember { FocusRequester() }
     var wasPlaylistExpanded by remember { mutableStateOf(isPlaylistExpanded) }
 
@@ -210,24 +204,11 @@ private fun TvPlayerBottomSection(
             .testTag(TvPlayerPlaylistStateTag)
             .semantics { stateDescription = playlistExpandState }
     ) {
-        Row(
+        TvPlayerTimeRow(
-            modifier = Modifier
+            positionMs = uiState.positionMs,
-                .fillMaxWidth()
+            durationMs = uiState.durationMs,
-                .padding(horizontal = 4.dp),
+            modifier = Modifier.padding(horizontal = 4.dp)
-            horizontalArrangement = Arrangement.SpaceBetween,
+        )
-            verticalAlignment = Alignment.CenterVertically
-        ) {
-            Text(
-                text = formatTime(uiState.positionMs),
-                color = scheme.onSurface,
-                style = MaterialTheme.typography.bodyMedium
-            )
-            Text(
-                text = formatTime(uiState.durationMs),
-                color = scheme.onSurface,
-                style = MaterialTheme.typography.bodyMedium
-            )
-        }
         TvPlayerSeekBar(
             positionMs = uiState.positionMs,
             durationMs = uiState.durationMs,
@@ -261,13 +242,6 @@ private fun TvPlayerBottomSection(
                     size = 56,
                     modifier = expandPlaylistModifier
                 )
-                TvIconButton(
-                    icon = Icons.Outlined.Replay10,
-                    contentDescription = "Seek backward 10 seconds",
-                    onClick = { onSeekRelative(-10_000) },
-                    size = 56,
-                    modifier = expandPlaylistModifier
-                )
                 TvIconButton(
                     icon = if (uiState.isPlaying) Icons.Outlined.Pause else Icons.Outlined.PlayArrow,
                     contentDescription = if (uiState.isPlaying) "Pause" else "Play",
@@ -277,13 +251,6 @@ private fun TvPlayerBottomSection(
                         .focusRequester(focusRequester)
                         .testTag(TvPlayerPlayPauseButtonTag)
                 )
-                TvIconButton(
-                    icon = Icons.Outlined.Forward30,
-                    contentDescription = "Seek forward 30 seconds",
-                    onClick = { onSeekRelative(30_000) },
-                    size = 56,
-                    modifier = expandPlaylistModifier
-                )
                 TvIconButton(
                     icon = Icons.Outlined.SkipNext,
                     contentDescription = "Next",
@@ -355,6 +322,32 @@ private fun TvPlayerBottomSection(
     }
 }
 
+@Composable
+internal fun TvPlayerTimeRow(
+    positionMs: Long,
+    durationMs: Long,
+    modifier: Modifier = Modifier
+) {
+    val scheme = MaterialTheme.colorScheme
+
+    Row(
+        modifier = modifier.fillMaxWidth(),
+        horizontalArrangement = Arrangement.SpaceBetween,
+        verticalAlignment = Alignment.CenterVertically
+    ) {
+        Text(
+            text = formatTime(positionMs),
+            color = scheme.onSurface,
+            style = MaterialTheme.typography.bodyMedium
+        )
+        Text(
+            text = formatTime(durationMs),
+            color = scheme.onSurface,
+            style = MaterialTheme.typography.bodyMedium
+        )
+    }
+}
+
 private fun handleExpandPlaylistKey(
     event: androidx.compose.ui.input.key.KeyEvent,
     onExpand: () -> Unit

app-tv/src/main/java/hu/bbara/purefin/ui/screen/player/components/TvPlayerLoadingErrorEndCard.kt

@@ -4,7 +4,7 @@ import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
-import hu.bbara.purefin.player.model.PlayerUiState
+import hu.bbara.purefin.core.player.model.PlayerUiState
 
 @Composable
 internal fun TvPlayerLoadingErrorEndCard(

app-tv/src/main/java/hu/bbara/purefin/ui/screen/player/components/TvPlayerQueuePanel.kt

@@ -1,5 +1,7 @@
 package hu.bbara.purefin.ui.screen.player.components
 
+import androidx.compose.animation.animateColorAsState
+import androidx.compose.animation.core.animateFloatAsState
 import androidx.compose.foundation.background
 import androidx.compose.foundation.border
 import androidx.compose.foundation.clickable
@@ -7,14 +9,19 @@ 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.aspectRatio
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.lazy.LazyRow
 import androidx.compose.foundation.lazy.itemsIndexed
 import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.outlined.PlayArrow
+import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
@@ -25,11 +32,14 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.runtime.withFrameNanos
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.focus.FocusRequester
 import androidx.compose.ui.focus.focusRequester
 import androidx.compose.ui.focus.onFocusChanged
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.graphicsLayer
 import androidx.compose.ui.graphics.painter.ColorPainter
 import androidx.compose.ui.input.key.Key
 import androidx.compose.ui.input.key.KeyEventType
@@ -42,8 +52,8 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import coil3.compose.AsyncImage
-import hu.bbara.purefin.player.model.PlayerUiState
+import hu.bbara.purefin.core.player.model.PlayerUiState
-import hu.bbara.purefin.player.model.PlaylistElementUiModel
+import hu.bbara.purefin.core.player.model.PlaylistElementUiModel
 
 internal const val TvPlayerPlaylistRowTag = "tv_player_playlist_row"
 internal const val TvPlayerPlaylistCurrentItemTag = "tv_player_playlist_current_item"
@@ -82,75 +92,56 @@ internal fun TvPlayerQueuePanel(
         shape = RoundedCornerShape(24.dp),
         color = scheme.surface.copy(alpha = 0.94f)
     ) {
-        Column(
+        if (uiState.queue.isEmpty()) {
-            modifier = Modifier.padding(horizontal = 22.dp, vertical = 20.dp),
+            Text(
-            verticalArrangement = Arrangement.spacedBy(16.dp)
+                text = "Add something to the queue to browse it here.",
-        ) {
+                color = scheme.onSurfaceVariant,
-            Column(verticalArrangement = Arrangement.spacedBy(4.dp)) {
+                style = MaterialTheme.typography.bodyMedium
-                Text(
+            )
-                    text = "Playlist",
+        } else {
-                    color = scheme.onSurface,
+            LazyRow(
-                    style = MaterialTheme.typography.titleLarge,
+                modifier = Modifier
-                    fontWeight = FontWeight.Bold
+                    .fillMaxWidth()
-                )
+                    .testTag(TvPlayerPlaylistRowTag),
-                Text(
+                state = listState,
-                    text = queueCountLabel,
+                horizontalArrangement = Arrangement.spacedBy(14.dp),
-                    color = scheme.onSurfaceVariant,
+                contentPadding = PaddingValues(16.dp)
-                    style = MaterialTheme.typography.bodyMedium
+            ) {
-                )
+                itemsIndexed(uiState.queue, key = { _, item -> item.id }) { index, item ->
-            }
+                    val isEntryItem = index == entryIndex
-
+                    TvQueueRowCard(
-            if (uiState.queue.isEmpty()) {
+                        item = item,
-                Text(
+                        isCurrent = item.isCurrent,
-                    text = "Add something to the queue to browse it here.",
+                        isFirst = index == 0,
-                    color = scheme.onSurfaceVariant,
+                        isLast = index == uiState.queue.lastIndex,
-                    style = MaterialTheme.typography.bodyMedium
+                        onClick = { onSelect(item.id) },
-                )
+                        onReturnToControls = onReturnToControls,
-            } else {
+                        modifier = Modifier
-                LazyRow(
+                            .width(228.dp)
-                    modifier = Modifier
+                            .then(
-                        .fillMaxWidth()
+                                if (isEntryItem) {
-                        .testTag(TvPlayerPlaylistRowTag),
+                                    Modifier
-                    state = listState,
+                                        .focusRequester(firstItemFocusRequester)
-                    horizontalArrangement = Arrangement.spacedBy(14.dp),
+                                        .testTag(TvPlayerPlaylistCurrentItemTag)
-                    contentPadding = PaddingValues(end = 4.dp)
+                                } else {
-                ) {
+                                    Modifier
-                    itemsIndexed(uiState.queue, key = { _, item -> item.id }) { index, item ->
+                                }
-                        val isEntryItem = index == entryIndex
+                            )
-                        TvQueueRowCard(
+                            .then(
-                            item = item,
+                                if (index == 0 && !isEntryItem) {
-                            isCurrent = item.isCurrent,
+                                    Modifier.testTag(TvPlayerPlaylistFirstItemTag)
-                            isFirst = index == 0,
+                                } else {
-                            isLast = index == uiState.queue.lastIndex,
+                                    Modifier
-                            onClick = { onSelect(item.id) },
+                                }
-                            onReturnToControls = onReturnToControls,
+                            )
-                            modifier = Modifier
+                            .then(
-                                .width(228.dp)
+                                if (index == uiState.queue.lastIndex && !isEntryItem) {
-                                .then(
+                                    Modifier.testTag(TvPlayerPlaylistLastItemTag)
-                                    if (isEntryItem) {
+                                } else {
-                                        Modifier
+                                    Modifier
-                                            .focusRequester(firstItemFocusRequester)
+                                }
-                                            .testTag(TvPlayerPlaylistCurrentItemTag)
+                            )
-                                    } else {
+                    )
-                                        Modifier
-                                    }
-                                )
-                                .then(
-                                    if (index == 0 && !isEntryItem) {
-                                        Modifier.testTag(TvPlayerPlaylistFirstItemTag)
-                                    } else {
-                                        Modifier
-                                    }
-                                )
-                                .then(
-                                    if (index == uiState.queue.lastIndex && !isEntryItem) {
-                                        Modifier.testTag(TvPlayerPlaylistLastItemTag)
-                                    } else {
-                                        Modifier
-                                    }
-                                )
-                        )
-                    }
                 }
             }
         }
@@ -169,25 +160,49 @@ private fun TvQueueRowCard(
 ) {
     val scheme = MaterialTheme.colorScheme
     var isFocused by remember { mutableStateOf(false) }
-    val borderColor = when {
+    val scale by animateFloatAsState(
-        isFocused -> scheme.primary
+        targetValue = if (isFocused) 1.06f else 1f,
-        isCurrent -> scheme.primary.copy(alpha = 0.55f)
+        label = "queueCardScale"
-        else -> scheme.outlineVariant.copy(alpha = 0.35f)
+    )
-    }
+    val borderColor by animateColorAsState(
-    val backgroundColor = when {
+        targetValue = when {
-        isFocused -> scheme.primary.copy(alpha = 0.18f)
+            isFocused -> scheme.primary
-        isCurrent -> scheme.surfaceVariant.copy(alpha = 0.78f)
+            isCurrent -> scheme.tertiary
-        else -> scheme.surfaceVariant.copy(alpha = 0.62f)
+            else -> scheme.outlineVariant.copy(alpha = 0.5f)
+        },
+        label = "queueCardBorder"
+    )
+    val backgroundColor by animateColorAsState(
+        targetValue = when {
+            isFocused -> scheme.primaryContainer.copy(alpha = 0.96f)
+            isCurrent -> scheme.tertiaryContainer.copy(alpha = 0.86f)
+            else -> scheme.surfaceContainerHigh.copy(alpha = 0.72f)
+        },
+        label = "queueCardBackground"
+    )
+    val contentColor = when {
+        isFocused -> scheme.onPrimaryContainer
+        isCurrent -> scheme.onTertiaryContainer
+        else -> scheme.onSurface
     }
+    val shape = RoundedCornerShape(18.dp)
 
     Column(
         modifier = modifier
+            .graphicsLayer {
+                scaleX = scale
+                scaleY = scale
+            }
             .border(
-                width = if (isFocused) 2.dp else 1.dp,
+                width = when {
+                    isFocused -> 3.dp
+                    isCurrent -> 2.dp
+                    else -> 1.dp
+                },
                 color = borderColor,
-                shape = RoundedCornerShape(18.dp)
+                shape = shape
             )
-            .clip(RoundedCornerShape(18.dp))
+            .clip(shape)
             .background(backgroundColor)
             .onFocusChanged { isFocused = it.isFocused }
             .onPreviewKeyEvent { event ->
@@ -207,37 +222,34 @@ private fun TvQueueRowCard(
                 }
             }
             .clickable { onClick() }
-            .padding(12.dp),
+            .padding(4.dp),
         verticalArrangement = Arrangement.spacedBy(10.dp)
     ) {
         TvQueueArtwork(
             artworkUrl = item.artworkUrl,
+            isCurrent = isCurrent,
+            badgeColor = if (isFocused) scheme.primary else scheme.tertiary,
+            badgeContentColor = if (isFocused) scheme.onPrimary else scheme.onTertiary,
             modifier = Modifier.fillMaxWidth()
         )
-        Column(verticalArrangement = Arrangement.spacedBy(4.dp)) {
+        Text(
-            if (isCurrent) {
+            text = item.title,
-                Text(
+            color = contentColor,
-                    text = "Current",
+            style = MaterialTheme.typography.bodyMedium,
-                    color = scheme.primary,
+            fontWeight = if (isCurrent || isFocused) FontWeight.Bold else FontWeight.Medium,
-                    style = MaterialTheme.typography.labelMedium,
+            maxLines = 1,
-                    fontWeight = FontWeight.SemiBold
+            overflow = TextOverflow.Ellipsis,
-                )
+            modifier = Modifier.padding(horizontal = 8.dp)
-            }
+        )
-            Text(
-                text = item.title,
-                color = scheme.onSurface,
-                style = MaterialTheme.typography.bodyLarge,
-                fontWeight = FontWeight.SemiBold,
-                maxLines = 2,
-                overflow = TextOverflow.Ellipsis
-            )
-        }
     }
 }
 
 @Composable
 private fun TvQueueArtwork(
     artworkUrl: String?,
+    isCurrent: Boolean,
+    badgeColor: Color,
+    badgeContentColor: Color,
     modifier: Modifier = Modifier
 ) {
     val scheme = MaterialTheme.colorScheme
@@ -268,5 +280,30 @@ private fun TvQueueArtwork(
                     .background(scheme.surfaceContainerHigh)
             )
         }
+        if (isCurrent) {
+            Row(
+                modifier = Modifier
+                    .align(Alignment.TopStart)
+                    .padding(8.dp)
+                    .clip(RoundedCornerShape(50))
+                    .background(badgeColor)
+                    .padding(horizontal = 9.dp, vertical = 5.dp),
+                horizontalArrangement = Arrangement.spacedBy(4.dp),
+                verticalAlignment = Alignment.CenterVertically
+            ) {
+                Icon(
+                    imageVector = Icons.Outlined.PlayArrow,
+                    contentDescription = null,
+                    tint = badgeContentColor,
+                    modifier = Modifier.size(14.dp)
+                )
+                Text(
+                    text = "Now playing",
+                    color = badgeContentColor,
+                    style = MaterialTheme.typography.labelSmall,
+                    fontWeight = FontWeight.Bold
+                )
+            }
+        }
     }
 }

app-tv/src/main/java/hu/bbara/purefin/ui/screen/player/components/TvPlayerSeekBar.kt

@@ -22,7 +22,7 @@ import androidx.compose.ui.input.key.key
 import androidx.compose.ui.input.key.onPreviewKeyEvent
 import androidx.compose.ui.input.key.type
 import androidx.compose.ui.unit.dp
-import hu.bbara.purefin.player.model.TimedMarker
+import hu.bbara.purefin.core.player.model.TimedMarker
 
 @Composable
 internal fun TvPlayerSeekBar(

app-tv/src/main/java/hu/bbara/purefin/ui/screen/player/components/TvTrackSelectionButtons.kt

@@ -1,25 +1,30 @@
 package hu.bbara.purefin.ui.screen.player.components
 
+import androidx.compose.animation.animateColorAsState
 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.Row
 import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.heightIn
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.itemsIndexed
 import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.outlined.Check
 import androidx.compose.material.icons.outlined.ClosedCaption
 import androidx.compose.material.icons.outlined.HighQuality
 import androidx.compose.material.icons.outlined.Language
+import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
@@ -44,8 +49,8 @@ import androidx.compose.ui.input.key.type
 import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
-import hu.bbara.purefin.player.model.PlayerUiState
+import hu.bbara.purefin.core.player.model.PlayerUiState
-import hu.bbara.purefin.player.model.TrackOption
+import hu.bbara.purefin.core.player.model.TrackOption
 
 internal const val TvPlayerQualityButtonTag = "tv_player_quality_button"
 internal const val TvPlayerAudioButtonTag = "tv_player_audio_button"
@@ -211,23 +216,42 @@ private fun TvTrackOptionRow(
 ) {
     val scheme = MaterialTheme.colorScheme
     var isFocused by remember { mutableStateOf(false) }
+    val backgroundColor by animateColorAsState(
+        targetValue = when {
+            isFocused -> scheme.primaryContainer
+            selected -> scheme.secondaryContainer.copy(alpha = 0.9f)
+            else -> scheme.surfaceContainerHigh.copy(alpha = 0.72f)
+        },
+        label = "trackOptionBackground"
+    )
+    val contentColor by animateColorAsState(
+        targetValue = when {
+            isFocused -> scheme.onPrimaryContainer
+            selected -> scheme.onSecondaryContainer
+            else -> scheme.onSurface
+        },
+        label = "trackOptionContent"
+    )
+    val borderColor by animateColorAsState(
+        targetValue = when {
+            isFocused -> scheme.primary
+            selected -> scheme.secondary
+            else -> scheme.outlineVariant.copy(alpha = 0.45f)
+        },
+        label = "trackOptionBorder"
+    )
+    val shape = RoundedCornerShape(12.dp)
 
     Box(
         modifier = modifier
             .fillMaxWidth()
-            .then(
+            .border(
-                if (isFocused) {
+                width = if (isFocused) 3.dp else if (selected) 2.dp else 1.dp,
-                    Modifier.border(2.dp, scheme.primary, RoundedCornerShape(12.dp))
+                color = borderColor,
-                } else {
+                shape = shape
-                    Modifier
-                }
-            )
-            .clip(RoundedCornerShape(12.dp))
-            .background(
-                if (isFocused) scheme.primary.copy(alpha = 0.3f)
-                else if (selected) scheme.primary.copy(alpha = 0.15f)
-                else scheme.surfaceVariant.copy(alpha = 0.6f)
             )
+            .clip(shape)
+            .background(backgroundColor)
             .onFocusChanged { isFocused = it.isFocused }
             .onPreviewKeyEvent { event ->
                 if (event.type != KeyEventType.KeyDown) {
@@ -244,11 +268,25 @@ private fun TvTrackOptionRow(
             .clickable { onClick() }
             .padding(horizontal = 20.dp, vertical = 14.dp)
     ) {
-        Text(
+        Row(
-            text = label,
+            modifier = Modifier.fillMaxWidth(),
-            color = scheme.onSurface,
+            horizontalArrangement = Arrangement.SpaceBetween,
-            style = MaterialTheme.typography.bodyLarge,
+            verticalAlignment = Alignment.CenterVertically
-            fontWeight = if (selected) FontWeight.SemiBold else FontWeight.Normal
+        ) {
-        )
+            Text(
+                text = label,
+                color = contentColor,
+                style = MaterialTheme.typography.bodyLarge,
+                fontWeight = if (selected || isFocused) FontWeight.SemiBold else FontWeight.Normal
+            )
+            if (selected) {
+                Icon(
+                    imageVector = Icons.Outlined.Check,
+                    contentDescription = null,
+                    tint = contentColor,
+                    modifier = Modifier.size(22.dp)
+                )
+            }
+        }
     }
 }

app-tv/src/main/java/hu/bbara/purefin/ui/screen/series/TvSeriesScreen.kt

@@ -8,21 +8,22 @@ import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
-import androidx.compose.runtime.withFrameNanos
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.focus.FocusRequester
 import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
 import androidx.hilt.navigation.compose.hiltViewModel
-import hu.bbara.purefin.feature.content.series.SeriesViewModel
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import androidx.tv.material3.MaterialTheme
+import hu.bbara.purefin.core.feature.content.series.SeriesViewModel
+import hu.bbara.purefin.core.navigation.SeriesDto
 import hu.bbara.purefin.model.Episode
 import hu.bbara.purefin.model.Season
 import hu.bbara.purefin.model.Series
-import hu.bbara.purefin.navigation.SeriesDto
 import hu.bbara.purefin.ui.common.media.MediaDetailHorizontalPadding
 import hu.bbara.purefin.ui.common.media.TvMediaDetailBodyBox
 import hu.bbara.purefin.ui.common.media.TvMediaDetailScaffold
@@ -33,25 +34,29 @@ import hu.bbara.purefin.ui.screen.series.components.TvSeasonTabs
 import hu.bbara.purefin.ui.screen.series.components.TvSeriesHeroSection
 import hu.bbara.purefin.ui.screen.waiting.PurefinWaitingScreen
 import java.util.UUID
+import androidx.tv.material3.Text as TvText
 
 @Composable
 fun TvSeriesScreen(
     series: SeriesDto,
+    focusedSeasonId: UUID? = null,
     focusedEpisodeId: UUID? = null,
     modifier: Modifier = Modifier,
     viewModel: SeriesViewModel = hiltViewModel()
 ) {
-    LaunchedEffect(series.id) {
+    LaunchedEffect(series) {
-        viewModel.selectSeries(series.id)
+        viewModel.selectSeries(series)
     }
 
-    val series = viewModel.series.collectAsState()
+    val series = viewModel.series.collectAsStateWithLifecycle()
 
     val seriesData = series.value
-    if (seriesData != null && seriesData.seasons.isNotEmpty()) {
+    if (seriesData != null) {
         TvSeriesScreenContent(
             series = seriesData,
+            selectSeason = viewModel::selectSeason,
             onPlayEpisode = viewModel::onPlayEpisode,
+            focusedSeasonId = focusedSeasonId,
             focusedEpisodeId = focusedEpisodeId,
             modifier = modifier
         )
@@ -63,28 +68,35 @@ fun TvSeriesScreen(
 @Composable
 internal fun TvSeriesScreenContent(
     series: Series,
+    selectSeason: (UUID, UUID) -> Unit,
     onPlayEpisode: (UUID) -> Unit,
+    focusedSeasonId: UUID? = null,
     focusedEpisodeId: UUID? = null,
     modifier: Modifier = Modifier,
 ) {
-    val nextUpEpisode = remember(series.id) { series.nextUpEpisode() }
+    val defaultSeason = series.defaultSeason(focusedSeasonId)
-    val focusedEpisode = remember(series.id, focusedEpisodeId) {
+    var selectedSeasonId by remember(series.id, focusedSeasonId) {
-        focusedEpisodeId?.let { id ->
+        mutableStateOf(defaultSeason?.id)
-            series.seasons
-                .flatMap { it.episodes }
-                .firstOrNull { it.id == id }
-        }
     }
-    val initialEpisode = focusedEpisode ?: nextUpEpisode
+    val selectedSeason = series.allSeasons.firstOrNull { it.id == selectedSeasonId } ?: defaultSeason
-    var selectedSeason by remember(series.id, initialEpisode?.seasonId) {
+    val initialFocusSeasonId = defaultSeason?.id
-        mutableStateOf(series.defaultSeason(initialEpisode))
+    val initialFocusSeason = initialFocusSeasonId?.let { seasonId ->
+        series.allSeasons.firstOrNull { it.id == seasonId }
+    } ?: defaultSeason
+    val initialFocusedEpisodeId = initialFocusSeason?.focusTargetEpisodeId(focusedEpisodeId)
+    val seasonTabFocusRequester = remember { FocusRequester() }
+    var requestedInitialEpisodeFocus by remember(series.id, focusedSeasonId, focusedEpisodeId) {
+        mutableStateOf(false)
     }
-    val firstContentFocusRequester = remember { FocusRequester() }
+    var requestedInitialSeasonFocus by remember(series.id, focusedSeasonId, focusedEpisodeId) {
+        mutableStateOf(false)
+    }
+    val waitingForInitialEpisodes = initialFocusedEpisodeId == null &&
+        initialFocusSeason?.episodes?.isEmpty() == true &&
+        initialFocusSeason.episodeCount > 0
 
-    LaunchedEffect(series.id, initialEpisode?.id) {
+    LaunchedEffect(series.id, selectedSeason?.id) {
-        if (initialEpisode != null) return@LaunchedEffect
+        selectedSeason?.let { selectSeason(series.id, it.id) }
-        withFrameNanos { }
-        firstContentFocusRequester.requestFocus()
     }
 
     TvMediaDetailScaffold(
@@ -106,39 +118,55 @@ internal fun TvSeriesScreenContent(
                     modifier = Modifier.fillMaxWidth()
                 )
                 Spacer(modifier = Modifier.height(16.dp))
-                TvSeasonTabs(
+                if (selectedSeason != null) {
-                    seasons = series.seasons,
+                    TvSeasonTabs(
-                    selectedSeason = selectedSeason,
+                        seasons = series.allSeasons,
-                    firstItemFocusRequester = firstContentFocusRequester,
+                        selectedSeason = selectedSeason,
-                    firstItemTestTag = SeriesFirstSeasonTabTag,
+                        selectedItemFocusRequester = seasonTabFocusRequester,
-                    onSelect = { selectedSeason = it },
+                        firstItemTestTag = SeriesFirstSeasonTabTag,
-                    modifier = Modifier.fillMaxWidth()
+                        requestSelectedItemFocus = initialFocusedEpisodeId == null &&
-                )
+                            !waitingForInitialEpisodes &&
-                Spacer(modifier = Modifier.height(16.dp))
+                            !requestedInitialSeasonFocus,
-                TvEpisodeCarousel(
+                        onSelectedItemFocusRequested = { requestedInitialSeasonFocus = true },
-                    episodes = selectedSeason.episodes,
+                        onSelect = { selectedSeasonId = it.id },
-                    onPlayEpisode = { onPlayEpisode(it.id) },
+                        modifier = Modifier.fillMaxWidth()
-                    focusedEpisodeId = initialEpisode?.id,
+                    )
-                    modifier = Modifier.fillMaxWidth()
+                    Spacer(modifier = Modifier.height(16.dp))
-                )
+                    TvEpisodeCarousel(
+                        episodes = selectedSeason.episodes,
+                        onPlayEpisode = { onPlayEpisode(it.id) },
+                        focusedEpisodeId = initialFocusedEpisodeId,
+                        requestFocus = selectedSeason.id == initialFocusSeasonId && !requestedInitialEpisodeFocus,
+                        onFocusRequested = { requestedInitialEpisodeFocus = true },
+                        upFocusRequester = seasonTabFocusRequester,
+                        modifier = Modifier.fillMaxWidth()
+                    )
+                } else {
+                    TvText(
+                        text = "Loading seasons...",
+                        color = MaterialTheme.colorScheme.onSurfaceVariant,
+                        fontSize = 13.sp,
+                        modifier = Modifier.padding(vertical = 8.dp)
+                    )
+                }
             }
         }
     }
 }
 
-private fun Series.defaultSeason(nextUpEpisode: Episode?): Season {
+private fun Series.defaultSeason(focusedSeasonId: UUID?): Season? {
-    if (nextUpEpisode != null) {
+    if (focusedSeasonId != null) {
-        seasons.firstOrNull { it.id == nextUpEpisode.seasonId }?.let { return it }
+        allSeasons.firstOrNull { it.id == focusedSeasonId }?.let { return it }
     }
 
-    for (season in seasons) {
+    return allSeasons.firstOrNull { it.unwatchedEpisodeCount > 0 } ?: allSeasons.firstOrNull()
-        if (season.episodes.any { !it.watched }) {
-            return season
-        }
-    }
-    return seasons.first()
 }
 
-private fun Series.nextUpEpisode() = seasons.firstNotNullOfOrNull { season ->
+private fun Season.nextUpEpisode(): Episode? {
-    season.episodes.firstOrNull { !it.watched }
+    return episodes.firstOrNull { !it.watched } ?: episodes.firstOrNull()
-} ?: seasons.firstOrNull()?.episodes?.firstOrNull()
+}
+
+private fun Season.focusTargetEpisodeId(focusedEpisodeId: UUID?): UUID? {
+    val focusedEpisode = episodes.firstOrNull { it.id == focusedEpisodeId }
+    return focusedEpisode?.id ?: nextUpEpisode()?.id
+}

app-tv/src/main/java/hu/bbara/purefin/ui/screen/series/components/TvSeriesComponents.kt

@@ -5,6 +5,7 @@ import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.background
 import androidx.compose.foundation.border
 import androidx.compose.foundation.clickable
+import androidx.compose.foundation.focusGroup
 import androidx.compose.foundation.gestures.LocalBringIntoViewSpec
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
@@ -18,9 +19,9 @@ import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
-import androidx.compose.foundation.layout.wrapContentWidth
 import androidx.compose.foundation.lazy.LazyRow
 import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.lazy.itemsIndexed
 import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.icons.Icons
@@ -40,8 +41,11 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.focus.FocusRequester
+import androidx.compose.ui.focus.focusProperties
 import androidx.compose.ui.focus.focusRequester
+import androidx.compose.ui.focus.focusRestorer
 import androidx.compose.ui.focus.onFocusChanged
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.graphicsLayer
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.testTag
@@ -49,11 +53,8 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import androidx.tv.material3.Tab
+import hu.bbara.purefin.core.image.ArtworkKind
-import androidx.tv.material3.TabDefaults
+import hu.bbara.purefin.core.image.ImageUrlBuilder
-import androidx.tv.material3.TabRow
-import hu.bbara.purefin.image.ArtworkKind
-import hu.bbara.purefin.image.ImageUrlBuilder
 import hu.bbara.purefin.model.CastMember
 import hu.bbara.purefin.model.Episode
 import hu.bbara.purefin.model.Season
@@ -77,33 +78,55 @@ internal fun TvSeriesMetaChips(series: Series) {
 }
 
 @Composable
+@OptIn(ExperimentalFoundationApi::class)
 internal fun TvSeasonTabs(
     seasons: List<Season>,
     selectedSeason: Season?,
     modifier: Modifier = Modifier,
-    firstItemFocusRequester: FocusRequester? = null,
+    selectedItemFocusRequester: FocusRequester? = null,
     firstItemTestTag: String? = null,
+    requestSelectedItemFocus: Boolean = false,
+    onSelectedItemFocusRequested: () -> Unit = {},
     onSelect: (Season) -> Unit
 ) {
     val selectedSeasonIndex = seasons.indexOf(selectedSeason).coerceAtLeast(0)
+    val listState = rememberLazyListState()
 
-    TabRow(
+    LaunchedEffect(selectedSeasonIndex, requestSelectedItemFocus, seasons.size) {
-        selectedTabIndex = selectedSeasonIndex,
+        if (seasons.isEmpty()) return@LaunchedEffect
+        listState.scrollToItem(selectedSeasonIndex)
+        if (requestSelectedItemFocus && selectedItemFocusRequester != null) {
+            withFrameNanos { }
+            selectedItemFocusRequester.requestFocus()
+            onSelectedItemFocusRequested()
+        }
+    }
+
+    LazyRow(
+        state = listState,
         modifier = modifier
-            .fillMaxWidth()
+            .then(
-            .wrapContentWidth(Alignment.Start),
+                if (selectedItemFocusRequester != null) {
-        contentColor = MaterialTheme.colorScheme.onSurface
+                    Modifier.focusRestorer(selectedItemFocusRequester)
+                } else {
+                    Modifier.focusRestorer()
+                }
+            )
+            .focusGroup()
+            .fillMaxWidth(),
+        horizontalArrangement = Arrangement.spacedBy(0.dp),
+        verticalAlignment = Alignment.CenterVertically,
     ) {
-        seasons.forEachIndexed { index, season ->
+        itemsIndexed(seasons, key = { _, season -> season.id }) { index, season ->
-            Tab(
+            TvSeasonTab(
-                selected = index == selectedSeasonIndex,
+                name = season.name,
-                onFocus = { onSelect(season) },
+                isSelected = index == selectedSeasonIndex,
+                onFocused = { onSelect(season) },
                 onClick = { onSelect(season) },
-                colors = TabDefaults.underlinedIndicatorTabColors(),
                 modifier = Modifier
                     .then(
-                        if (index == 0 && firstItemFocusRequester != null) {
+                        if (index == selectedSeasonIndex && selectedItemFocusRequester != null) {
-                            Modifier.focusRequester(firstItemFocusRequester)
+                            Modifier.focusRequester(selectedItemFocusRequester)
                         } else {
                             Modifier
                         }
@@ -115,58 +138,109 @@ internal fun TvSeasonTabs(
                             Modifier
                         }
                     )
-            ) {
+            )
-                TvText(
-                    text = season.name,
-                    fontSize = 13.sp,
-                    fontWeight = if (index == selectedSeasonIndex) {
-                        FontWeight.Bold
-                    } else {
-                        FontWeight.Medium
-                    },
-                    maxLines = 1,
-                    overflow = TextOverflow.Ellipsis,
-                    modifier = Modifier.padding(horizontal = 16.dp, vertical = 8.dp)
-                )
-            }
         }
     }
 }
 
+@Composable
+private fun TvSeasonTab(
+    name: String,
+    isSelected: Boolean,
+    onFocused: () -> Unit,
+    onClick: () -> Unit,
+    modifier: Modifier = Modifier,
+) {
+    val scheme = MaterialTheme.colorScheme
+    val color = if (isSelected) scheme.primary else scheme.onSurface
+    val isFocused = remember { mutableStateOf(false) }
+
+    Box(
+        modifier = modifier
+            .onFocusChanged { state ->
+                if (state.isFocused) {
+                    onFocused()
+                    isFocused.value = true
+                } else {
+                    isFocused.value = false
+                }
+            }
+            .clickable(onClick = onClick)
+            .borderIfFocused(isFocused.value, MaterialTheme.colorScheme.primary)
+    ) {
+        TvText(
+            text = name,
+            color = color,
+            fontSize = 13.sp,
+            fontWeight = if (isSelected) FontWeight.Bold else FontWeight.Medium,
+            maxLines = 1,
+            overflow = TextOverflow.Ellipsis,
+            modifier = Modifier
+                .padding(horizontal = 16.dp, vertical = 8.dp)
+        )
+    }
+}
+
 @OptIn(ExperimentalFoundationApi::class)
 @Composable
 internal fun TvEpisodeCarousel(
     episodes: List<Episode>,
     onPlayEpisode: (Episode) -> Unit,
     modifier: Modifier = Modifier,
-    focusedEpisodeId: UUID? = null
+    focusedEpisodeId: UUID? = null,
+    requestFocus: Boolean = false,
+    onFocusRequested: () -> Unit = {},
+    upFocusRequester: FocusRequester? = null
 ) {
     val listState = rememberLazyListState()
-    val focusedEpisodeFocusRequester = remember { FocusRequester() }
+    val rowScopedFocusRequester = remember { FocusRequester() }
+    var rowFocusedEpisodeId by remember { mutableStateOf<UUID?>(null) }
+    var requestedFocusEpisodeId by remember { mutableStateOf<UUID?>(null) }
+    val focusedEpisodeIndex = focusedEpisodeId?.let { id ->
+        episodes.indexOfFirst { it.id == id }
+    } ?: -1
+    val firstUnwatchedIndex = episodes.indexOfFirst { !it.watched }
+    val targetEpisodeIndex = when {
+        focusedEpisodeIndex >= 0 -> focusedEpisodeIndex
+        firstUnwatchedIndex >= 0 -> firstUnwatchedIndex
+        episodes.isNotEmpty() -> 0
+        else -> -1
+    }
+    val targetEpisodeId = episodes.getOrNull(targetEpisodeIndex)?.id
 
-    LaunchedEffect(episodes, focusedEpisodeId) {
+    LaunchedEffect(episodes, targetEpisodeId) {
-        val focusedEpisodeIndex = focusedEpisodeId?.let { id ->
+        if (episodes.none { it.id == rowFocusedEpisodeId }) {
-            episodes.indexOfFirst { it.id == id }
+            rowFocusedEpisodeId = targetEpisodeId
-        } ?: -1
+        }
-        val firstUnwatchedIndex = episodes.indexOfFirst { !it.watched }.let { if (it == -1) 0 else it }
-        val targetIndex = focusedEpisodeIndex.takeIf { it >= 0 } ?: firstUnwatchedIndex
 
-        if (targetIndex != 0) {
+        if (targetEpisodeIndex > 0) {
-            listState.scrollToItem(targetIndex)
+            listState.scrollToItem(targetEpisodeIndex)
         } else {
             listState.scrollToItem(0)
         }
+    }
 
-        if (focusedEpisodeIndex >= 0) {
+    LaunchedEffect(requestFocus, targetEpisodeId) {
+        if (requestFocus && targetEpisodeId != null && requestedFocusEpisodeId != targetEpisodeId) {
+            rowFocusedEpisodeId = targetEpisodeId
+            if (targetEpisodeIndex > 0) {
+                listState.scrollToItem(targetEpisodeIndex)
+            } else {
+                listState.scrollToItem(0)
+            }
             withFrameNanos { }
-            focusedEpisodeFocusRequester.requestFocus()
+            rowScopedFocusRequester.requestFocus()
+            requestedFocusEpisodeId = targetEpisodeId
+            onFocusRequested()
         }
     }
 
     CompositionLocalProvider(LocalBringIntoViewSpec provides TvHomeRowBringIntoViewSpec) {
         LazyRow(
             state = listState,
-            modifier = modifier,
+            modifier = modifier
+                .focusRestorer(rowScopedFocusRequester)
+                .focusGroup(),
             contentPadding = PaddingValues(horizontal = 12.dp, vertical = 8.dp),
             horizontalArrangement = Arrangement.spacedBy(16.dp)
         ) {
@@ -174,13 +248,25 @@ internal fun TvEpisodeCarousel(
                 TvEpisodeCard(
                     episode = episode,
                     onPlayEpisode = { onPlayEpisode(episode) },
-                    modifier = if (episode.id == focusedEpisodeId) {
+                    onFocused = { rowFocusedEpisodeId = episode.id },
-                        Modifier
+                    modifier = Modifier
-                            .focusRequester(focusedEpisodeFocusRequester)
+                        .then(
-                            .testTag(SeriesNextUpEpisodeCardTag)
+                            if (episode.id == rowFocusedEpisodeId) {
-                    } else {
+                                Modifier.focusRequester(rowScopedFocusRequester)
-                        Modifier
+                            } else {
-                    }
+                                Modifier
+                            }
+                        )
+                        .then(upFocusRequester?.let { requester ->
+                            Modifier.focusProperties { up = requester }
+                        } ?: Modifier)
+                        .then(
+                            if (episode.id == targetEpisodeId) {
+                                Modifier.testTag(SeriesNextUpEpisodeCardTag)
+                            } else {
+                                Modifier
+                            }
+                        )
                 )
             }
         }
@@ -235,6 +321,7 @@ internal fun TvSeriesHeroSection(
 private fun TvEpisodeCard(
     episode: Episode,
     onPlayEpisode: () -> Unit,
+    onFocused: () -> Unit,
     modifier: Modifier = Modifier
 ) {
     val scheme = MaterialTheme.colorScheme
@@ -246,7 +333,10 @@ private fun TvEpisodeCard(
         modifier = modifier
             .width(260.dp)
             .graphicsLayer { scaleX = scale; scaleY = scale }
-            .onFocusChanged { isFocused = it.isFocused }
+            .onFocusChanged {
+                isFocused = it.isFocused
+                if (it.isFocused) onFocused()
+            }
             .clickable { onPlayEpisode() },
         verticalArrangement = Arrangement.spacedBy(12.dp)
     ) {
@@ -304,7 +394,6 @@ private fun TvEpisodeCard(
             } else {
                 WatchStateBadge(
                     watched = episode.watched,
-                    started = (episode.progress ?: 0.0) > 0.0,
                     modifier = Modifier
                         .align(Alignment.TopEnd)
                         .padding(8.dp)
@@ -342,3 +431,15 @@ internal fun CastRow(cast: List<CastMember>, modifier: Modifier = Modifier) {
 //        roleSize = 10.sp
 //    )
 }
+
+private fun Modifier.borderIfFocused(isFocused: Boolean, borderColor: Color): Modifier =
+    if (isFocused) {
+        this.border(
+            width = 2.dp,
+            color = borderColor,
+            shape = RoundedCornerShape(12.dp)
+        )
+    } else {
+        this
+    }
+

app-tv/src/main/java/hu/bbara/purefin/ui/screen/settings/TvSettingsScreen.kt

@@ -0,0 +1,382 @@
+package hu.bbara.purefin.ui.screen.settings
+
+import android.widget.Toast
+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.Row
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.text.KeyboardOptions
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.outlined.ArrowBack
+import androidx.compose.material3.DropdownMenu
+import androidx.compose.material3.DropdownMenuItem
+import androidx.compose.material3.HorizontalDivider
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.OutlinedTextField
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.Slider
+import androidx.compose.material3.Switch
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
+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.platform.LocalContext
+import androidx.compose.ui.text.input.KeyboardCapitalization
+import androidx.compose.ui.unit.dp
+import androidx.hilt.navigation.compose.hiltViewModel
+import hu.bbara.purefin.core.feature.settings.SettingsViewModel
+import hu.bbara.purefin.core.settings.BooleanSetting
+import hu.bbara.purefin.core.settings.DropdownSetting
+import hu.bbara.purefin.core.settings.RangeSetting
+import hu.bbara.purefin.core.settings.ReadOnlySetting
+import hu.bbara.purefin.core.settings.SettingOption
+import hu.bbara.purefin.core.settings.StringSetting
+import hu.bbara.purefin.core.settings.VoidSetting
+import java.util.Locale
+
+@Composable
+fun TvSettingsScreen(
+    viewModel: SettingsViewModel = hiltViewModel(),
+    onBack: () -> Unit = viewModel::onBack,
+    modifier: Modifier = Modifier
+) {
+    val settingGroups by viewModel.settingGroups.collectAsStateWithLifecycle()
+    val context = LocalContext.current
+
+    LaunchedEffect(viewModel, context) {
+        viewModel.snackbarMessages.collect { message ->
+            Toast.makeText(context, message, Toast.LENGTH_LONG).show()
+        }
+    }
+
+    Scaffold(
+        modifier = modifier.fillMaxSize(),
+        containerColor = MaterialTheme.colorScheme.background,
+        contentColor = MaterialTheme.colorScheme.onBackground,
+        topBar = {
+            TvSettingsTopBar(onBack = onBack)
+        }
+    ) { innerPadding ->
+        LazyColumn(
+            verticalArrangement = Arrangement.spacedBy(8.dp),
+            modifier = Modifier
+                .fillMaxSize()
+                .padding(innerPadding)
+        ) {
+            item {
+                Text(
+                    text = "Settings",
+                    style = MaterialTheme.typography.headlineMedium,
+                    modifier = Modifier.padding(horizontal = 28.dp, vertical = 16.dp)
+                )
+            }
+
+            settingGroups.forEach { group ->
+                group.title?.let { title ->
+                    item {
+                        Text(
+                            text = title,
+                            style = MaterialTheme.typography.titleMedium,
+                            color = MaterialTheme.colorScheme.primary,
+                            modifier = Modifier.padding(horizontal = 28.dp, vertical = 8.dp)
+                        )
+                    }
+                }
+
+                group.options.forEach { option ->
+                    item(key = option.key) {
+                        TvSettingOptionItem(
+                            option = option,
+                            viewModel = viewModel
+                        )
+                        HorizontalDivider()
+                    }
+                }
+            }
+        }
+    }
+}
+
+@Composable
+private fun TvSettingOptionItem(
+    option: SettingOption<*>,
+    viewModel: SettingsViewModel
+) {
+    when (option) {
+        is RangeSetting -> {
+            val value by viewModel.value(option).collectAsStateWithLifecycle(initialValue = null)
+            value?.let {
+                TvNumberSettingItem(
+                    title = option.title,
+                    value = it,
+                    valueRange = option.valueRange,
+                    onValueChange = { value -> viewModel.set(option, value) }
+                )
+            }
+        }
+
+        is BooleanSetting -> {
+            val value by viewModel.value(option).collectAsStateWithLifecycle(initialValue = null)
+            value?.let {
+                TvBooleanSettingItem(
+                    title = option.title,
+                    value = it,
+                    onValueChange = { value -> viewModel.set(option, value) }
+                )
+            }
+        }
+
+        is StringSetting -> {
+            val value by viewModel.value(option).collectAsStateWithLifecycle(initialValue = null)
+            value?.let {
+                TvStringSettingItem(
+                    title = option.title,
+                    value = it,
+                    onValueChange = { value -> viewModel.set(option, value) }
+                )
+            }
+        }
+
+        is ReadOnlySetting -> {
+            TvReadOnlySettingItem(
+                title = option.title,
+                value = option.value
+            )
+        }
+
+        is VoidSetting -> {
+            TvVoidSettingItem(
+                title = option.title,
+                onClick = { viewModel.onClick(option) }
+            )
+        }
+
+        is DropdownSetting<*> -> {
+            TvDropdownSettingOptionItem(
+                option = option,
+                viewModel = viewModel
+            )
+        }
+    }
+}
+
+@Composable
+private fun <T> TvDropdownSettingOptionItem(
+    option: DropdownSetting<T>,
+    viewModel: SettingsViewModel
+) {
+    val value by viewModel.value(option).collectAsStateWithLifecycle(initialValue = null)
+    value?.let {
+        TvDropdownSettingItem(
+            title = option.title,
+            value = it,
+            options = option.options,
+            onValueChange = { value -> viewModel.set(option, value) }
+        )
+    }
+}
+
+@Composable
+private fun TvSettingsTopBar(
+    onBack: () -> Unit
+) {
+    Row(
+        verticalAlignment = Alignment.CenterVertically,
+        modifier = Modifier
+            .fillMaxWidth()
+            .padding(horizontal = 16.dp, vertical = 8.dp)
+    ) {
+        IconButton(onClick = onBack) {
+            Icon(
+                imageVector = Icons.AutoMirrored.Outlined.ArrowBack,
+                contentDescription = "Back"
+            )
+        }
+    }
+}
+
+@Composable
+private fun TvReadOnlySettingItem(
+    title: String,
+    value: String,
+    modifier: Modifier = Modifier
+) {
+    Row(
+        verticalAlignment = Alignment.CenterVertically,
+        horizontalArrangement = Arrangement.SpaceBetween,
+        modifier = modifier
+            .fillMaxWidth()
+            .padding(horizontal = 28.dp, vertical = 16.dp)
+    ) {
+        Text(
+            text = title,
+            style = MaterialTheme.typography.bodyLarge
+        )
+        Text(
+            text = value,
+            style = MaterialTheme.typography.bodyMedium,
+            color = MaterialTheme.colorScheme.onSurfaceVariant
+        )
+    }
+}
+
+@Composable
+private fun TvVoidSettingItem(
+    title: String,
+    onClick: () -> Unit,
+    modifier: Modifier = Modifier
+) {
+    Row(
+        verticalAlignment = Alignment.CenterVertically,
+        modifier = modifier
+            .fillMaxWidth()
+            .clickable(onClick = onClick)
+            .padding(horizontal = 28.dp, vertical = 16.dp)
+    ) {
+        Text(
+            text = title,
+            style = MaterialTheme.typography.bodyLarge
+        )
+    }
+}
+
+@Composable
+private fun <T> TvDropdownSettingItem(
+    title: String,
+    value: T,
+    options: List<T>,
+    onValueChange: (T) -> Unit,
+    modifier: Modifier = Modifier
+) {
+    var expanded by remember { mutableStateOf(false) }
+
+    Box(modifier = modifier.fillMaxWidth()) {
+        Row(
+            verticalAlignment = Alignment.CenterVertically,
+            horizontalArrangement = Arrangement.SpaceBetween,
+            modifier = Modifier
+                .fillMaxWidth()
+                .clickable { expanded = true }
+                .padding(horizontal = 28.dp, vertical = 16.dp)
+        ) {
+            Text(
+                text = title,
+                style = MaterialTheme.typography.bodyLarge
+            )
+            Text(
+                text = value.toString(),
+                style = MaterialTheme.typography.bodyMedium,
+                color = MaterialTheme.colorScheme.onSurfaceVariant
+            )
+        }
+        DropdownMenu(
+            expanded = expanded,
+            onDismissRequest = { expanded = false }
+        ) {
+            options.forEach { option ->
+                DropdownMenuItem(
+                    text = { Text(option.toString()) },
+                    onClick = {
+                        expanded = false
+                        onValueChange(option)
+                    }
+                )
+            }
+        }
+    }
+}
+
+@Composable
+private fun TvNumberSettingItem(
+    title: String,
+    value: Double,
+    valueRange: ClosedFloatingPointRange<Double>,
+    onValueChange: (Double) -> Unit,
+    modifier: Modifier = Modifier
+) {
+    var sliderValue by remember(value) { mutableStateOf(value.toFloat()) }
+
+    Column(
+        verticalArrangement = Arrangement.spacedBy(8.dp),
+        modifier = modifier
+            .fillMaxWidth()
+            .padding(horizontal = 28.dp, vertical = 16.dp)
+    ) {
+        Text(
+            text = title,
+            style = MaterialTheme.typography.bodyLarge
+        )
+        Text(
+            text = String.format(Locale.US, "%.1f", sliderValue),
+            style = MaterialTheme.typography.bodyMedium,
+            color = MaterialTheme.colorScheme.onSurfaceVariant
+        )
+        Slider(
+            value = sliderValue,
+            onValueChange = { sliderValue = it },
+            onValueChangeFinished = { onValueChange(sliderValue.toDouble()) },
+            valueRange = valueRange.start.toFloat()..valueRange.endInclusive.toFloat(),
+            modifier = Modifier.fillMaxWidth()
+        )
+    }
+}
+
+@Composable
+private fun TvBooleanSettingItem(
+    title: String,
+    value: Boolean,
+    onValueChange: (Boolean) -> Unit,
+    modifier: Modifier = Modifier
+) {
+    Row(
+        verticalAlignment = Alignment.CenterVertically,
+        horizontalArrangement = Arrangement.SpaceBetween,
+        modifier = modifier
+            .fillMaxWidth()
+            .clickable { onValueChange(!value) }
+            .padding(horizontal = 28.dp, vertical = 16.dp)
+    ) {
+        Text(
+            text = title,
+            style = MaterialTheme.typography.bodyLarge
+        )
+        Switch(
+            checked = value,
+            onCheckedChange = onValueChange
+        )
+    }
+}
+
+@Composable
+private fun TvStringSettingItem(
+    title: String,
+    value: String,
+    onValueChange: (String) -> Unit,
+    modifier: Modifier = Modifier
+) {
+    OutlinedTextField(
+        value = value,
+        onValueChange = onValueChange,
+        label = { Text(title) },
+        singleLine = true,
+        keyboardOptions = KeyboardOptions(
+            capitalization = KeyboardCapitalization.Words
+        ),
+        modifier = modifier
+            .fillMaxWidth()
+            .padding(horizontal = 28.dp, vertical = 16.dp)
+    )
+}

app-tv/src/test/java/hu/bbara/purefin/ui/screen/home/components/TvFocusedItemHeroTest.kt

@@ -1,6 +1,6 @@
 package hu.bbara.purefin.ui.screen.home.components
 
-import hu.bbara.purefin.image.ImageUrlBuilder
+import hu.bbara.purefin.core.image.ImageUrlBuilder
 import hu.bbara.purefin.model.Episode
 import hu.bbara.purefin.model.MediaKind
 import hu.bbara.purefin.model.Movie
@@ -8,7 +8,7 @@ import hu.bbara.purefin.model.Series
 import hu.bbara.purefin.feature.browse.home.ContinueWatchingItem
 import hu.bbara.purefin.feature.browse.home.NextUpItem
 import hu.bbara.purefin.feature.browse.home.PosterItem
-import hu.bbara.purefin.image.ArtworkKind
+import hu.bbara.purefin.core.image.ArtworkKind
 import org.junit.Assert.assertEquals
 import org.junit.Test
 import java.util.UUID

app-tv/src/test/java/hu/bbara/purefin/ui/screen/home/components/TvHomeHeroStateTest.kt

@@ -5,7 +5,7 @@ import hu.bbara.purefin.model.LibraryKind
 import hu.bbara.purefin.model.MediaKind
 import hu.bbara.purefin.model.Movie
 import hu.bbara.purefin.feature.browse.home.ContinueWatchingItem
-import hu.bbara.purefin.ui.model.LibraryUiModel
+import hu.bbara.purefin.core.model.LibraryUiModel
 import hu.bbara.purefin.feature.browse.home.NextUpItem
 import hu.bbara.purefin.feature.browse.home.PosterItem
 import org.junit.Assert.assertEquals

app/build.gradle.kts

@@ -11,24 +11,29 @@ plugins {
 
 android {
     namespace = "hu.bbara.purefin"
-    compileSdk = 36
+    compileSdk = 37
 
     defaultConfig {
         applicationId = "hu.bbara.purefin"
         minSdk = 29
         targetSdk = 36
-        versionCode = 1000002
         versionName = "0.1"
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
 
     buildTypes {
+        debug {
+            applicationIdSuffix = ".debug"
+            versionNameSuffix = "-debug"
+            manifestPlaceholders["updateManifestUrl"] = "https://apks.t.bbara.hu/apps/purefin-app-debug/update.json"
+        }
         release {
             // Enables code-related app optimization.
             isMinifyEnabled = true
 
             // Enables resource shrinking.
             isShrinkResources = true
+            manifestPlaceholders["updateManifestUrl"] = "https://apks.t.bbara.hu/apps/purefin-app/update.json"
             proguardFiles(
                 getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro"
             )
@@ -40,6 +45,20 @@ android {
     }
     buildFeatures {
         compose = true
+        buildConfig = true
+    }
+}
+
+androidComponents {
+    onVariants(selector().withBuildType("debug")) { variant ->
+        variant.outputs.forEach { output ->
+            output.versionCode.set(providers.gradleProperty("purefinDebugVersionCode").map { it.toInt() })
+        }
+    }
+    onVariants(selector().withBuildType("release")) { variant ->
+        variant.outputs.forEach { output ->
+            output.versionCode.set(providers.gradleProperty("purefinReleaseVersionCode").map { it.toInt() })
+        }
     }
 }
 
@@ -57,6 +76,7 @@ dependencies {
     implementation(project(":core-ui"))
     implementation(libs.androidx.core.ktx)
     implementation(libs.androidx.lifecycle.runtime.ktx)
+    implementation(libs.androidx.lifecycle.runtime.compose)
     implementation(libs.androidx.lifecycle.viewmodel.compose)
     implementation(libs.androidx.lifecycle.viewmodel.navigation3)
     implementation(libs.androidx.activity.compose)

app/src/debug/res/values/colors.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="ic_launcher_foreground">#E53935</color>
+</resources>

app/src/main/AndroidManifest.xml

@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
+    <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC" />
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
+    <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
 
     <application
         android:name=".PurefinApplication"
@@ -16,7 +18,11 @@
         android:roundIcon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:supportsRtl="true"
+        android:usesCleartextTraffic="true"
         android:theme="@style/Theme.Purefin">
+        <meta-data
+            android:name="hu.bbara.purefin.UPDATE_MANIFEST_URL"
+            android:value="${updateManifestUrl}" />
         <activity
             android:name=".PurefinActivity"
             android:exported="true"
@@ -33,9 +39,12 @@
             android:exported="false"
             android:theme="@style/Theme.Purefin" />
         <service
-            android:name="hu.bbara.purefin.download.PurefinDownloadService"
+            android:name="hu.bbara.purefin.core.download.PurefinDownloadService"
             android:exported="false"
             android:foregroundServiceType="dataSync" />
+        <receiver
+            android:name="hu.bbara.purefin.core.update.AppUpdateInstallReceiver"
+            android:exported="false" />
     </application>
 
 </manifest>

app/src/main/java/hu/bbara/purefin/PurefinActivity.kt

@@ -2,6 +2,7 @@ package hu.bbara.purefin
 
 import android.content.pm.ApplicationInfo
 import android.os.Bundle
+import androidx.activity.compose.BackHandler
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
@@ -16,12 +17,14 @@ import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.semantics.semantics
+import androidx.compose.ui.semantics.testTagsAsResourceId
 import androidx.lifecycle.lifecycleScope
 import androidx.lifecycle.viewmodel.navigation3.rememberViewModelStoreNavEntryDecorator
 import androidx.navigation3.runtime.EntryProviderScope
@@ -38,17 +41,18 @@ import coil3.network.okhttp.OkHttpNetworkFetcherFactory
 import coil3.request.crossfade
 import coil3.util.DebugLogger
 import dagger.hilt.android.AndroidEntryPoint
-import hu.bbara.purefin.data.SessionBootstrapper
+import hu.bbara.purefin.core.data.SessionBootstrapper
-import hu.bbara.purefin.jellyfin.JellyfinAuthInterceptor
+import hu.bbara.purefin.core.jellyfin.JellyfinAuthInterceptor
-import hu.bbara.purefin.data.UserSessionRepository
+import hu.bbara.purefin.core.data.UserSessionRepository
 import hu.bbara.purefin.navigation.LocalHomeMediaSharedBoundsKey
 import hu.bbara.purefin.navigation.LocalNavigationBackStack
 import hu.bbara.purefin.navigation.LocalNavigationManager
 import hu.bbara.purefin.navigation.LocalSetHomeMediaSharedBoundsKey
 import hu.bbara.purefin.navigation.LocalSharedTransitionScope
-import hu.bbara.purefin.navigation.NavigationCommand
+import hu.bbara.purefin.core.navigation.NavigationCommand
-import hu.bbara.purefin.navigation.NavigationManager
+import hu.bbara.purefin.core.navigation.NavigationManager
-import hu.bbara.purefin.navigation.Route
+import hu.bbara.purefin.core.navigation.Route
+import hu.bbara.purefin.ui.common.dialog.ExitAppDialog
 import hu.bbara.purefin.ui.screen.waiting.PurefinWaitingScreen
 import hu.bbara.purefin.ui.screen.login.LoginScreen
 import hu.bbara.purefin.ui.theme.AppTheme
@@ -144,7 +148,8 @@ class PurefinActivity : ComponentActivity() {
         navigationManager: NavigationManager
     ) {
         var sessionLoaded by remember { mutableStateOf(false) }
-        val isLoggedIn by userSessionRepository.isLoggedIn.collectAsState(initial = false)
+        var showExitDialog by remember { mutableStateOf(false) }
+        val isLoggedIn by userSessionRepository.isLoggedIn.collectAsStateWithLifecycle(initialValue = false)
 
         LaunchedEffect(Unit) {
             userSessionRepository.isLoggedIn.collect {
@@ -153,11 +158,11 @@ class PurefinActivity : ComponentActivity() {
         }
 
         if (!sessionLoaded) {
+            BackHandler {
+                showExitDialog = true
+            }
             PurefinWaitingScreen(modifier = Modifier.fillMaxSize())
-            return
+        } else if (isLoggedIn) {
-        }
-
-        if (isLoggedIn) {
             @Suppress("UNCHECKED_CAST")
             val backStack = rememberNavBackStack(Route.Home) as NavBackStack<Route>
             var homeMediaSharedBoundsKey by remember { mutableStateOf<String?>(null) }
@@ -169,7 +174,13 @@ class PurefinActivity : ComponentActivity() {
             LaunchedEffect(navigationManager, backStack) {
                 navigationManager.commands.collect { command ->
                     when (command) {
-                        NavigationCommand.Pop -> if (backStack.size > 1) backStack.removeLastOrNull()
+                        NavigationCommand.Pop -> {
+                            if (backStack.size > 1) {
+                                backStack.removeLastOrNull()
+                            } else {
+                                showExitDialog = true
+                            }
+                        }
                         is NavigationCommand.Navigate -> backStack.add(command.route)
                         is NavigationCommand.ReplaceAll -> {
                             backStack.clear()
@@ -179,6 +190,10 @@ class PurefinActivity : ComponentActivity() {
                 }
             }
 
+            BackHandler(enabled = backStack.size == 1) {
+                showExitDialog = true
+            }
+
             SharedTransitionLayout {
                 CompositionLocalProvider(
                     LocalNavigationManager provides navigationManager,
@@ -191,8 +206,17 @@ class PurefinActivity : ComponentActivity() {
                 ) {
                     NavDisplay(
                         backStack = backStack,
-                        onBack = { navigationManager.pop() },
+                        onBack = {
-                        modifier = Modifier.fillMaxSize().background(backgroundDark),
+                            if (backStack.size > 1) {
+                                navigationManager.pop()
+                            } else {
+                                showExitDialog = true
+                            }
+                        },
+                        modifier = Modifier
+                            .fillMaxSize()
+                            .background(backgroundDark)
+                            .semantics { testTagsAsResourceId = true },
                         transitionSpec = {
                             fadeIn(
                                 animationSpec = tween(
@@ -227,7 +251,19 @@ class PurefinActivity : ComponentActivity() {
                 }
             }
         } else {
-            LoginScreen()
+            BackHandler {
+                showExitDialog = true
+            }
+            LoginScreen(
+                modifier = Modifier.semantics { testTagsAsResourceId = true }
+            )
+        }
+
+        if (showExitDialog) {
+            ExitAppDialog(
+                onCloseConfirmed = { finishAndRemoveTask() },
+                onDismiss = { showExitDialog = false }
+            )
         }
     }
 }

app/src/main/java/hu/bbara/purefin/PurefinApplication.kt

@@ -2,8 +2,12 @@ package hu.bbara.purefin
 
 import android.app.Application
 import dagger.hilt.android.HiltAndroidApp
+import hu.bbara.purefin.core.logging.PurefinLogger
 
 @HiltAndroidApp
 class PurefinApplication : Application() {
-
+    override fun onCreate() {
+        super.onCreate()
+        PurefinLogger.initialize(this)
+    }
 }

app/src/main/java/hu/bbara/purefin/modules/NavigationModule.kt

@@ -6,7 +6,7 @@ import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.android.components.ActivityRetainedComponent
 import dagger.multibindings.IntoSet
-import hu.bbara.purefin.navigation.Route
+import hu.bbara.purefin.core.navigation.Route
 import hu.bbara.purefin.navigation.appRouteEntryBuilder
 
 @Module

app/src/main/java/hu/bbara/purefin/modules/PlaybackProfileFamilyModule.kt

@@ -4,7 +4,7 @@ import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.components.SingletonComponent
-import hu.bbara.purefin.data.PlaybackProfileFamily
+import hu.bbara.purefin.core.data.PlaybackProfileFamily
 
 @Module
 @InstallIn(SingletonComponent::class)

app/src/main/java/hu/bbara/purefin/navigation/NavigationLocals.kt

@@ -6,6 +6,8 @@ import androidx.compose.animation.SharedTransitionScope
 import androidx.compose.runtime.ProvidableCompositionLocal
 import androidx.compose.runtime.compositionLocalOf
 import androidx.compose.runtime.staticCompositionLocalOf
+import hu.bbara.purefin.core.navigation.NavigationManager
+import hu.bbara.purefin.core.navigation.Route
 
 val LocalNavigationManager: ProvidableCompositionLocal<NavigationManager> =
     staticCompositionLocalOf { error("NavigationManager not provided") }

app/src/main/java/hu/bbara/purefin/navigation/RouteEntryBuilder.kt

@@ -3,12 +3,14 @@ package hu.bbara.purefin.navigation
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.navigation3.runtime.EntryProviderScope
 import androidx.navigation3.ui.LocalNavAnimatedContentScope
+import hu.bbara.purefin.core.navigation.Route
 import hu.bbara.purefin.ui.screen.library.LibraryScreen
 import hu.bbara.purefin.ui.screen.login.LoginScreen
 import hu.bbara.purefin.ui.screen.AppScreen
 import hu.bbara.purefin.ui.screen.episode.EpisodeScreen
 import hu.bbara.purefin.ui.screen.home.components.search.SearchScreen
 import hu.bbara.purefin.ui.screen.movie.MovieScreen
+import hu.bbara.purefin.ui.screen.settings.SettingsScreen
 import hu.bbara.purefin.ui.screen.series.SeriesScreen
 
 fun EntryProviderScope<Route>.appRouteEntryBuilder() {
@@ -53,4 +55,7 @@ fun EntryProviderScope<Route>.appRouteEntryBuilder() {
     entry<Route.LoginRoute> {
         LoginScreen()
     }
+    entry<Route.SettingsRoute> {
+        SettingsScreen()
+    }
 }

app/src/main/java/hu/bbara/purefin/player/PlayerActivity.kt

@@ -4,6 +4,7 @@ import android.os.Bundle
 import android.view.WindowManager
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
+import androidx.activity.viewModels
 import androidx.compose.runtime.LaunchedEffect
 import androidx.core.view.WindowCompat
 import androidx.core.view.WindowInsetsCompat
@@ -11,12 +12,14 @@ import androidx.core.view.WindowInsetsControllerCompat
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import dagger.hilt.android.AndroidEntryPoint
-import hu.bbara.purefin.player.viewmodel.PlayerViewModel
+import hu.bbara.purefin.core.player.viewmodel.PlayerViewModel
 import hu.bbara.purefin.ui.screen.player.PlayerScreen
 import hu.bbara.purefin.ui.theme.AppTheme
 
 @AndroidEntryPoint
 class PlayerActivity : ComponentActivity() {
+    private val viewModel: PlayerViewModel by viewModels()
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
@@ -43,6 +46,18 @@ class PlayerActivity : ComponentActivity() {
         }
     }
 
+    override fun onPause() {
+        super.onPause()
+        if (!isChangingConfigurations) {
+            viewModel.pausePlayback()
+        }
+    }
+
+    override fun onResume() {
+        super.onResume()
+        enterImmersiveMode()
+    }
+
     private fun enterImmersiveMode() {
         WindowCompat.setDecorFitsSystemWindows(window, false)
         WindowInsetsControllerCompat(window, window.decorView).apply {

app/src/main/java/hu/bbara/purefin/ui/common/card/MediaImageCard.kt

@@ -1,10 +1,15 @@
 package hu.bbara.purefin.ui.common.card
 
+import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.background
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.combinedClickable
+import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.BoxScope
 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.aspectRatio
 import androidx.compose.foundation.layout.fillMaxSize
@@ -12,13 +17,27 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.outlined.MoreVert
 import androidx.compose.material3.Card
 import androidx.compose.material3.CardDefaults
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.ListItem
+import androidx.compose.material3.ListItemDefaults
 import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.ModalBottomSheet
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+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.clip
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.font.FontWeight
@@ -26,7 +45,9 @@ import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import hu.bbara.purefin.ui.common.image.PurefinAsyncImage
+import hu.bbara.purefin.ui.model.MediaAction
 
+@OptIn(ExperimentalFoundationApi::class, ExperimentalMaterial3Api::class)
 @Composable
 fun MediaImageCard(
     imageUrl: String?,
@@ -34,6 +55,7 @@ fun MediaImageCard(
     onClick: () -> Unit,
     modifier: Modifier = Modifier,
     subtitle: String? = null,
+    popupActions: List<MediaAction> = emptyList(),
     imageModifier: Modifier = Modifier,
     shapeSize: Dp = 12.dp,
     imageAspectRatio: Float = 16f / 10f,
@@ -45,11 +67,19 @@ fun MediaImageCard(
     val scheme = MaterialTheme.colorScheme
     val shape = RoundedCornerShape(shapeSize)
 
+    var showBottomSheet by remember { mutableStateOf(false) }
+
     Card(
-        onClick = onClick,
         shape = shape,
         colors = CardDefaults.cardColors(containerColor = scheme.surfaceContainer),
-        modifier = modifier.fillMaxWidth()
+        modifier = modifier
+            .fillMaxWidth()
+            .combinedClickable(
+                onClick = onClick,
+                onLongClick = if (popupActions.isNotEmpty()) {
+                    { showBottomSheet = true }
+                } else null
+            )
     ) {
         Column(modifier = Modifier.fillMaxWidth()) {
             Box(
@@ -67,26 +97,69 @@ fun MediaImageCard(
                 )
                 imageOverlay()
             }
-            Column(modifier = Modifier.padding(textPadding)) {
+            Row(
-                Text(
+                modifier = Modifier.fillMaxWidth(),
-                    text = title,
+                verticalAlignment = Alignment.CenterVertically,
-                    style = titleStyle,
+                horizontalArrangement = Arrangement.SpaceBetween
-                    fontWeight = FontWeight.SemiBold,
+            ) {
-                    maxLines = 1,
+                Column(
-                    overflow = TextOverflow.Ellipsis
+                    modifier = Modifier
-                )
+                        .weight(1f)
-                subtitle
+                        .padding(textPadding)
-                    ?.takeIf { it.isNotBlank() }
+                ) {
-                    ?.let { text ->
+                    Text(
-                        Spacer(modifier = Modifier.height(4.dp))
+                        text = title,
-                        Text(
+                        style = titleStyle,
-                            text = text,
+                        fontWeight = FontWeight.SemiBold,
-                            style = subtitleStyle,
+                        maxLines = 1,
-                            color = scheme.onSurfaceVariant,
+                        overflow = TextOverflow.Ellipsis
-                            maxLines = 1,
+                    )
-                            overflow = TextOverflow.Ellipsis
+                    subtitle
+                        ?.takeIf { it.isNotBlank() }
+                        ?.let { text ->
+                            Spacer(modifier = Modifier.height(4.dp))
+                            Text(
+                                text = text,
+                                style = subtitleStyle,
+                                color = scheme.onSurfaceVariant,
+                                maxLines = 1,
+                                overflow = TextOverflow.Ellipsis
+                            )
+                        }
+                }
+                if (popupActions.isNotEmpty()) {
+                    IconButton(
+                        onClick = { showBottomSheet = true },
+                    ) {
+                        Icon(
+                            imageVector = Icons.Outlined.MoreVert,
+                            contentDescription = "More actions"
                         )
                     }
+                }
+            }
+        }
+    }
+
+    if (showBottomSheet) {
+        ModalBottomSheet(
+            onDismissRequest = { showBottomSheet = false },
+        ) {
+            Column(
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .padding(bottom = 24.dp)
+            ) {
+                popupActions.forEach { action ->
+                    ListItem(
+                        headlineContent = { Text(text = action.name) },
+                        colors = ListItemDefaults.colors(containerColor = Color.Transparent),
+                        modifier = Modifier.clickable {
+                            action.onClick()
+                            showBottomSheet = false
+                        }
+                    )
+                }
             }
         }
     }

app/src/main/java/hu/bbara/purefin/ui/common/card/PosterCard.kt

@@ -29,10 +29,10 @@ import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import hu.bbara.purefin.ui.model.EpisodeUiModel
+import hu.bbara.purefin.core.model.EpisodeUiModel
-import hu.bbara.purefin.ui.model.MediaUiModel
+import hu.bbara.purefin.core.model.MediaUiModel
-import hu.bbara.purefin.ui.model.MovieUiModel
+import hu.bbara.purefin.core.model.MovieUiModel
-import hu.bbara.purefin.ui.model.SeriesUiModel
+import hu.bbara.purefin.core.model.SeriesUiModel
 import hu.bbara.purefin.ui.common.badge.WatchStateBadge
 import hu.bbara.purefin.ui.common.image.PurefinAsyncImage
 import java.util.UUID
@@ -117,7 +117,6 @@ fun PosterCardContent(
                             .align(Alignment.TopEnd)
                             .padding(indicatorPadding),
                         watched = model.watched,
-                        started = (model.progress ?: 0f) > 0f
                     )
                 }
                 else -> Unit

app/src/main/java/hu/bbara/purefin/ui/common/media/MediaDetailScaffold.kt

@@ -0,0 +1,395 @@
+package hu.bbara.purefin.ui.common.media
+
+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.ColumnScope
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.aspectRatio
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.sizeIn
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.lazy.LazyRow
+import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.outlined.CheckCircle
+import androidx.compose.material.icons.outlined.Person
+import androidx.compose.material.icons.outlined.RadioButtonUnchecked
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.Text
+import androidx.compose.material3.TopAppBarDefaults
+import androidx.compose.material3.TopAppBarScrollBehavior
+import androidx.compose.material3.VerticalDivider
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.Brush
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.input.nestedscroll.nestedScroll
+import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.platform.testTag
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.TextUnit
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import hu.bbara.purefin.core.download.DownloadState
+import hu.bbara.purefin.model.CastMember
+import hu.bbara.purefin.ui.common.button.DownloadActionButton
+import hu.bbara.purefin.ui.common.button.MediaActionButton
+import hu.bbara.purefin.ui.common.button.MediaResumeButton
+import hu.bbara.purefin.ui.common.image.PurefinAsyncImage
+
+data class MediaDetailScaffoldUiModel(
+    val imageUrl: String,
+    val title: String,
+    val imageContentDescription: String? = null,
+    val titleFontSize: TextUnit = 32.sp,
+    val titleLineHeight: TextUnit = 38.sp,
+    val subtitle: String? = null,
+    val subtitleFontSize: TextUnit = 14.sp,
+    val subtitleFontWeight: FontWeight = FontWeight.Medium,
+    val metadataItems: List<String> = emptyList(),
+    val highlightedMetadataItem: String? = null,
+    val actions: MediaDetailActionsUiModel? = null,
+    val synopsis: MediaDetailSynopsisUiModel? = null,
+    val playbackSettings: MediaDetailPlaybackSettingsUiModel? = null,
+    val cast: MediaDetailCastUiModel? = null,
+)
+
+data class MediaDetailActionsUiModel(
+    val primaryAction: MediaDetailPrimaryActionUiModel,
+    val secondaryActions: List<MediaDetailSecondaryActionUiModel> = emptyList(),
+    val dividerThickness: Dp? = null,
+)
+
+data class MediaDetailPrimaryActionUiModel(
+    val text: String,
+    val progress: Float,
+    val onClick: () -> Unit,
+    val testTag: String? = null,
+)
+
+sealed interface MediaDetailSecondaryActionUiModel {
+    val testTag: String?
+
+    data class Download(
+        val downloadState: DownloadState,
+        val onClick: () -> Unit,
+        override val testTag: String? = null,
+    ) : MediaDetailSecondaryActionUiModel
+
+    data class Icon(
+        val icon: ImageVector,
+        val onClick: () -> Unit = {},
+        override val testTag: String? = null,
+    ) : MediaDetailSecondaryActionUiModel
+
+    data class MarkAsWatched(
+        val watched: Boolean,
+        val onClick: () -> Unit,
+        override val testTag: String? = null,
+    ) : MediaDetailSecondaryActionUiModel
+}
+
+data class MediaDetailSynopsisUiModel(
+    val text: String,
+    val bodyColor: Color? = null,
+    val bodyFontSize: TextUnit = 15.sp,
+    val bodyLineHeight: TextUnit? = 22.sp,
+    val titleSpacing: Dp = 12.dp,
+)
+
+data class MediaDetailPlaybackSettingsUiModel(
+    val audioTrack: String,
+    val subtitles: String,
+)
+
+data class MediaDetailCastUiModel(
+    val members: List<CastMember>,
+    val title: String = "Cast",
+    val topSpacing: Dp = 0.dp,
+    val cardWidth: Dp = 96.dp,
+    val nameFontSize: TextUnit = 12.sp,
+    val roleFontSize: TextUnit = 10.sp,
+)
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun MediaDetailScaffold(
+    uiModel: MediaDetailScaffoldUiModel,
+    modifier: Modifier = Modifier,
+    imageHeight: Dp = 320.dp,
+    contentOverlap: Dp = 24.dp,
+    contentSpacing: Dp = 16.dp,
+    topBar: @Composable (scrollBehavior: TopAppBarScrollBehavior) -> Unit = {},
+    content: @Composable ColumnScope.(Modifier) -> Unit = {}
+) {
+    val scheme = MaterialTheme.colorScheme
+    val isHomeMediaTransitionActive = isHomeMediaSharedBoundsTransitionActive()
+    val topBarScrollBehavior = TopAppBarDefaults.pinnedScrollBehavior()
+
+    Scaffold(
+        modifier = modifier
+            .fillMaxSize()
+            .nestedScroll(topBarScrollBehavior.nestedScrollConnection),
+        containerColor = scheme.background,
+        topBar = {
+            if (!isHomeMediaTransitionActive) {
+                topBar(topBarScrollBehavior)
+            }
+        }
+    ) { innerPadding ->
+        Column(
+            modifier = Modifier
+                .fillMaxSize()
+                .verticalScroll(rememberScrollState())
+                .padding(bottom = innerPadding.calculateBottomPadding()),
+            verticalArrangement = Arrangement.spacedBy(contentSpacing)
+        ) {
+            Box(
+                modifier = Modifier
+                    .homeMediaSharedBoundsDestination()
+                    .fillMaxWidth()
+                    .height(imageHeight)
+            ) {
+                PurefinAsyncImage(
+                    model = uiModel.imageUrl,
+                    contentDescription = uiModel.imageContentDescription,
+                    modifier = Modifier.fillMaxSize(),
+                    contentScale = ContentScale.Crop
+                )
+                Box(
+                    modifier = Modifier
+                        .matchParentSize()
+                        .background(
+                            Brush.verticalGradient(
+                                colors = listOf(
+                                    Color.Transparent,
+                                    Color.Transparent,
+                                    scheme.background.copy(alpha = 0.5f),
+                                    scheme.background
+                                )
+                            )
+                        )
+                )
+            }
+            if (!isHomeMediaTransitionActive) {
+                val contentModifier = Modifier.padding(horizontal = 16.dp)
+                MediaDetailScaffoldContent(
+                    uiModel = uiModel,
+                    modifier = contentModifier
+                )
+                content(contentModifier)
+            }
+        }
+    }
+}
+
+@Composable
+private fun ColumnScope.MediaDetailScaffoldContent(
+    uiModel: MediaDetailScaffoldUiModel,
+    modifier: Modifier = Modifier,
+) {
+    val scheme = MaterialTheme.colorScheme
+
+    Text(
+        text = uiModel.title,
+        color = scheme.onBackground,
+        fontSize = uiModel.titleFontSize,
+        fontWeight = FontWeight.Bold,
+        lineHeight = uiModel.titleLineHeight,
+        modifier = modifier
+    )
+    uiModel.subtitle?.takeIf { it.isNotBlank() }?.let { subtitle ->
+        Text(
+            text = subtitle,
+            color = scheme.onBackground,
+            fontSize = uiModel.subtitleFontSize,
+            fontWeight = uiModel.subtitleFontWeight,
+            maxLines = 1,
+            overflow = TextOverflow.Ellipsis,
+            modifier = modifier
+        )
+    }
+    if (uiModel.metadataItems.any { it.isNotBlank() }) {
+        MediaMetadataFlowRow(
+            items = uiModel.metadataItems,
+            highlightedItem = uiModel.highlightedMetadataItem,
+            modifier = modifier
+        )
+    }
+    uiModel.actions?.let { actions ->
+        MediaDetailActions(
+            uiModel = actions,
+            modifier = modifier
+        )
+    }
+    uiModel.synopsis?.takeIf { it.text.isNotBlank() }?.let { synopsis ->
+        MediaSynopsis(
+            synopsis = synopsis.text,
+            bodyColor = synopsis.bodyColor ?: scheme.onSurfaceVariant,
+            bodyFontSize = synopsis.bodyFontSize,
+            bodyLineHeight = synopsis.bodyLineHeight,
+            titleSpacing = synopsis.titleSpacing,
+            modifier = modifier
+        )
+    }
+    uiModel.playbackSettings?.let { playbackSettings ->
+        MediaPlaybackSettings(
+            backgroundColor = scheme.surface,
+            foregroundColor = scheme.onSurface,
+            audioTrack = playbackSettings.audioTrack,
+            subtitles = playbackSettings.subtitles,
+            modifier = modifier
+        )
+    }
+    uiModel.cast?.takeIf { it.members.isNotEmpty() }?.let { cast ->
+        if (cast.topSpacing > 0.dp) {
+            Spacer(modifier = Modifier.height(cast.topSpacing))
+        }
+        Text(
+            text = cast.title,
+            color = scheme.onBackground,
+            fontSize = 18.sp,
+            fontWeight = FontWeight.Bold,
+            modifier = modifier
+        )
+        Spacer(modifier = modifier.height(12.dp))
+        MediaDetailCastRow(
+            cast = cast,
+            modifier = modifier
+        )
+    }
+}
+
+@Composable
+private fun MediaDetailCastRow(
+    cast: MediaDetailCastUiModel,
+    modifier: Modifier = Modifier,
+) {
+    val scheme = MaterialTheme.colorScheme
+    val mutedStrong = scheme.onSurfaceVariant.copy(alpha = 0.7f)
+
+    LazyRow(
+        modifier = modifier,
+        contentPadding = PaddingValues(horizontal = 4.dp),
+        horizontalArrangement = Arrangement.spacedBy(16.dp)
+    ) {
+        items(cast.members) { member ->
+            Column(modifier = Modifier.width(cast.cardWidth)) {
+                PurefinAsyncImage(
+                    model = member.imageUrl,
+                    contentDescription = null,
+                    modifier = Modifier
+                        .aspectRatio(4f / 5f)
+                        .clip(RoundedCornerShape(12.dp))
+                        .background(scheme.surfaceVariant),
+                    contentScale = ContentScale.Crop,
+                    fallbackIcon = Icons.Outlined.Person
+                )
+                Spacer(modifier = Modifier.height(6.dp))
+                Text(
+                    text = member.name,
+                    color = scheme.onBackground,
+                    fontSize = cast.nameFontSize,
+                    fontWeight = FontWeight.Bold,
+                    maxLines = 1,
+                    overflow = TextOverflow.Ellipsis
+                )
+                Text(
+                    text = member.role,
+                    color = mutedStrong,
+                    fontSize = cast.roleFontSize,
+                    maxLines = 1,
+                    overflow = TextOverflow.Ellipsis
+                )
+            }
+        }
+    }
+}
+
+@Composable
+private fun MediaDetailActions(
+    uiModel: MediaDetailActionsUiModel,
+    modifier: Modifier = Modifier,
+) {
+    Row(modifier = modifier) {
+        MediaResumeButton(
+            text = uiModel.primaryAction.text,
+            progress = uiModel.primaryAction.progress,
+            onClick = uiModel.primaryAction.onClick,
+            modifier = Modifier
+                .sizeIn(maxWidth = 200.dp)
+                .optionalTestTag(uiModel.primaryAction.testTag)
+        )
+        uiModel.dividerThickness?.let { dividerThickness ->
+            VerticalDivider(
+                color = MaterialTheme.colorScheme.secondary,
+                thickness = dividerThickness,
+                modifier = Modifier
+                    .height(48.dp)
+                    .padding(horizontal = 16.dp, vertical = 8.dp)
+            )
+        } ?: Spacer(modifier = Modifier.width(12.dp))
+        Row(horizontalArrangement = Arrangement.spacedBy(12.dp)) {
+            uiModel.secondaryActions.forEach { action ->
+                when (action) {
+                    is MediaDetailSecondaryActionUiModel.Download -> {
+                        DownloadActionButton(
+                            downloadState = action.downloadState,
+                            onClick = action.onClick,
+                            modifier = Modifier.optionalTestTag(action.testTag)
+                        )
+                    }
+
+                    is MediaDetailSecondaryActionUiModel.Icon -> {
+                        MediaActionButton(
+                            backgroundColor = MaterialTheme.colorScheme.surface,
+                            iconColor = MaterialTheme.colorScheme.onSurface,
+                            icon = action.icon,
+                            height = 48.dp,
+                            onClick = action.onClick,
+                            modifier = Modifier.optionalTestTag(action.testTag)
+                        )
+                    }
+
+                    is MediaDetailSecondaryActionUiModel.MarkAsWatched -> {
+                        MediaActionButton(
+                            backgroundColor = MaterialTheme.colorScheme.surface,
+                            iconColor = if (action.watched) {
+                                MaterialTheme.colorScheme.primary
+                            } else {
+                                MaterialTheme.colorScheme.onSurface
+                            },
+                            icon = if (action.watched) {
+                                Icons.Outlined.CheckCircle
+                            } else {
+                                Icons.Outlined.RadioButtonUnchecked
+                            },
+                            height = 48.dp,
+                            onClick = action.onClick,
+                            modifier = Modifier.optionalTestTag(action.testTag)
+                        )
+                    }
+                }
+            }
+        }
+    }
+}
+
+private fun Modifier.optionalTestTag(testTag: String?): Modifier =
+    if (testTag == null) this else then(Modifier.testTag(testTag))

app/src/main/java/hu/bbara/purefin/ui/common/media/MediaHero.kt

@@ -1,51 +0,0 @@
-package hu.bbara.purefin.ui.common.media
-
-import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.height
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Brush
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.layout.ContentScale
-import androidx.compose.ui.platform.LocalConfiguration
-import androidx.compose.ui.unit.dp
-import hu.bbara.purefin.ui.common.image.PurefinAsyncImage
-
-@Composable
-fun MediaHero(
-    imageUrl: String,
-    backgroundColor: Color,
-    heightFraction: Float = 0.4f,
-    modifier: Modifier = Modifier,
-) {
-    val screenHeight = LocalConfiguration.current.screenHeightDp.dp
-    val heroHeight = screenHeight * heightFraction
-
-    Box(
-        modifier = modifier
-            .height(heroHeight)
-            .background(backgroundColor)
-    ) {
-        PurefinAsyncImage(
-            model = imageUrl,
-            contentDescription = null,
-            modifier = Modifier.fillMaxSize(),
-            contentScale = ContentScale.Crop
-        )
-        Box(
-            modifier = Modifier
-                .matchParentSize()
-                .background(
-                    Brush.verticalGradient(
-                        colors = listOf(
-                            Color.Transparent,
-                            backgroundColor.copy(alpha = 0.5f),
-                            backgroundColor
-                        )
-                    )
-                )
-        )
-    }
-}

app/src/main/java/hu/bbara/purefin/ui/common/permission/NotificationPermissionGate.kt

@@ -0,0 +1,33 @@
+package hu.bbara.purefin.ui.common.permission
+
+import android.Manifest
+import android.os.Build
+import androidx.activity.compose.rememberLauncherForActivityResult
+import androidx.activity.result.contract.ActivityResultContracts
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+
+@Composable
+fun rememberNotificationPermissionGate(): (action: () -> Unit) -> Unit {
+    val pendingAction = remember { mutableStateOf<(() -> Unit)?>(null) }
+    val launcher = rememberLauncherForActivityResult(
+        ActivityResultContracts.RequestPermission()
+    ) {
+        // Proceed regardless — notification permission is nice-to-have for downloads.
+        val action = pendingAction.value
+        pendingAction.value = null
+        action?.invoke()
+    }
+
+    return remember(launcher) {
+        { action ->
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+                pendingAction.value = action
+                launcher.launch(Manifest.permission.POST_NOTIFICATIONS)
+            } else {
+                action()
+            }
+        }
+    }
+}

app/src/main/java/hu/bbara/purefin/ui/model/MediaAction.kt

@@ -0,0 +1,6 @@
+package hu.bbara.purefin.ui.model
+
+data class MediaAction(
+    val name: String,
+    val onClick: () -> Unit
+)

app/src/main/java/hu/bbara/purefin/ui/screen/AppBottomBar.kt

@@ -9,30 +9,45 @@ import androidx.compose.material3.NavigationBar
 import androidx.compose.material3.NavigationBarItem
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.testTag
 
 @Composable
 fun AppBottomBar(
     selectedTab: Int,
+    isOnline: Boolean,
     onTabSelected: (Int) -> Unit
 ) {
-    NavigationBar {
+    NavigationBar(
+        modifier = Modifier.testTag(BottomNavigationTag)
+    ) {
+        if (isOnline) {
+            NavigationBarItem(
+                selected = selectedTab == 0,
+                onClick = { onTabSelected(0) },
+                modifier = Modifier.testTag(BottomNavigationHomeTag),
+                icon = { Icon(Icons.Outlined.Home, contentDescription = "Home") },
+                label = { Text("Home") }
+            )
+            NavigationBarItem(
+                selected = selectedTab == 1,
+                onClick = { onTabSelected(1) },
+                modifier = Modifier.testTag(BottomNavigationLibrariesTag),
+                icon = { Icon(Icons.Outlined.Collections, contentDescription = "Libraries") },
+                label = { Text("Libraries") }
+            )
+        }
         NavigationBarItem(
-            selected = selectedTab == 0,
+            selected = !isOnline || selectedTab == 2,
-            onClick = { onTabSelected(0) },
-            icon = { Icon(Icons.Outlined.Home, contentDescription = "Home") },
-            label = { Text("Home") }
-        )
-        NavigationBarItem(
-            selected = selectedTab == 1,
-            onClick = { onTabSelected(1) },
-            icon = { Icon(Icons.Outlined.Collections, contentDescription = "Libraries") },
-            label = { Text("Libraries") }
-        )
-        NavigationBarItem(
-            selected = selectedTab == 2,
             onClick = { onTabSelected(2) },
+            modifier = Modifier.testTag(BottomNavigationDownloadsTag),
             icon = { Icon(Icons.Outlined.Download, contentDescription = "Downloads") },
             label = { Text("Downloads") }
         )
     }
 }
+
+internal const val BottomNavigationTag = "bottom-navigation"
+internal const val BottomNavigationHomeTag = "bottom-navigation-home"
+internal const val BottomNavigationLibrariesTag = "bottom-navigation-libraries"
+internal const val BottomNavigationDownloadsTag = "bottom-navigation-downloads"

app/src/main/java/hu/bbara/purefin/ui/screen/AppScreen.kt

@@ -1,24 +1,32 @@
 package hu.bbara.purefin.ui.screen
 
+import androidx.activity.compose.BackHandler
 import androidx.compose.animation.core.tween
 import androidx.compose.animation.fadeIn
 import androidx.compose.animation.fadeOut
 import androidx.compose.animation.togetherWith
 import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.material3.AlertDialog
+import androidx.compose.material3.SnackbarHostState
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.LifecycleResumeEffect
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.navigation3.runtime.NavBackStack
 import androidx.navigation3.runtime.NavKey
 import androidx.navigation3.runtime.entryProvider
 import androidx.navigation3.runtime.rememberNavBackStack
 import androidx.navigation3.runtime.rememberSaveableStateHolderNavEntryDecorator
 import androidx.navigation3.ui.NavDisplay
-import hu.bbara.purefin.feature.browse.home.AppViewModel
+import hu.bbara.purefin.core.feature.browse.home.AppViewModel
+import hu.bbara.purefin.core.feature.update.AppUpdateInfo
+import hu.bbara.purefin.core.feature.update.AppUpdateViewModel
 import hu.bbara.purefin.navigation.LocalNavigationManager
 import hu.bbara.purefin.ui.screen.download.DownloadsScreen
 import hu.bbara.purefin.ui.screen.home.HomeScreen
@@ -28,29 +36,52 @@ import kotlinx.serialization.Serializable
 @Composable
 fun AppScreen(
     viewModel: AppViewModel = hiltViewModel(),
+    updateViewModel: AppUpdateViewModel = hiltViewModel(),
     modifier: Modifier = Modifier
 ) {
-    val libraries by viewModel.libraries.collectAsState()
+    val libraries by viewModel.libraries.collectAsStateWithLifecycle()
-    val libraryContent by viewModel.latestLibraryContent.collectAsState()
+    val libraryContent by viewModel.latestLibraryContent.collectAsStateWithLifecycle()
-    val suggestions by viewModel.suggestions.collectAsState()
+    val suggestions by viewModel.suggestions.collectAsStateWithLifecycle()
-    val continueWatching by viewModel.continueWatching.collectAsState()
+    val continueWatching by viewModel.continueWatching.collectAsStateWithLifecycle()
-    val nextUp by viewModel.nextUp.collectAsState()
+    val nextUp by viewModel.nextUp.collectAsStateWithLifecycle()
-    val isRefreshing by viewModel.isRefreshing.collectAsState()
+    val isRefreshing by viewModel.isRefreshing.collectAsStateWithLifecycle()
+    val isOnline by viewModel.isOnline.collectAsStateWithLifecycle()
+    val isCheckingConnection by viewModel.isCheckingConnection.collectAsStateWithLifecycle()
+    val isCheckingForUpdates by updateViewModel.isCheckingForUpdates.collectAsStateWithLifecycle()
+    val availableUpdate by updateViewModel.availableUpdate.collectAsStateWithLifecycle()
     val navigationManager = LocalNavigationManager.current
+    val snackbarHostState = remember { SnackbarHostState() }
 
     @Suppress("UNCHECKED_CAST")
     val backStack = rememberNavBackStack(AppTabRoute.Home) as NavBackStack<AppTabRoute>
     val currentRoute = backStack.lastOrNull() ?: AppTabRoute.Home
     val selectedTab = currentRoute.toTabIndex()
 
+    LaunchedEffect(isOnline, currentRoute, backStack) {
+        if (!isOnline && currentRoute != AppTabRoute.Downloads) {
+            backStack.clear()
+            backStack.add(AppTabRoute.Downloads)
+        }
+    }
+
     LifecycleResumeEffect(Unit) {
         viewModel.onResumed()
         onPauseOrDispose { }
     }
 
-    val onTabSelected = remember(backStack) {
+    LaunchedEffect(updateViewModel) {
+        updateViewModel.checkForUpdatesOnAppOpen()
+    }
+
+    LaunchedEffect(updateViewModel) {
+        updateViewModel.snackbarMessages.collect { message ->
+            snackbarHostState.showSnackbar(message)
+        }
+    }
+
+    val onTabSelected = remember(backStack, isOnline) {
         { selectedIndex: Int ->
-            val route = selectedIndex.toAppTabRoute()
+            val route = if (isOnline) selectedIndex.toAppTabRoute() else AppTabRoute.Downloads
             if (backStack.lastOrNull() != route) {
                 backStack.add(route)
             }
@@ -74,11 +105,16 @@ fun AppScreen(
                         library.name
                     )
                 },
+                onMarkWatched = viewModel::markAsWatched,
                 onProfileClick = {},
-                onSettingsClick = {},
+                onCheckForUpdates = { updateViewModel.checkForUpdates() },
+                isCheckingForUpdates = isCheckingForUpdates,
+                onSettingsClick = viewModel::openSettings,
                 onLogoutClick = viewModel::logout,
                 onSearchClick = viewModel::openSearch,
+                snackbarHostState = snackbarHostState,
                 selectedTab = selectedTab,
+                isOnline = isOnline,
                 onTabSelected = onTabSelected,
                 modifier = Modifier.fillMaxSize()
             )
@@ -89,6 +125,7 @@ fun AppScreen(
                 onLibrarySelected = { item -> viewModel.onLibrarySelected(item.id, item.name) },
                 onSearchClick = viewModel::openSearch,
                 selectedTab = selectedTab,
+                isOnline = isOnline,
                 onTabSelected = onTabSelected,
                 modifier = Modifier.fillMaxSize()
             )
@@ -96,12 +133,19 @@ fun AppScreen(
         entry<AppTabRoute.Downloads>(metadata = appTabMetadata(AppTabRoute.Downloads)) {
             DownloadsScreen(
                 selectedTab = selectedTab,
+                isOnline = isOnline,
+                isCheckingConnection = isCheckingConnection,
+                onCheckConnection = viewModel::checkConnection,
                 onTabSelected = onTabSelected,
                 modifier = Modifier.fillMaxSize()
             )
         }
     }
 
+    BackHandler(enabled = backStack.size == 1) {
+        navigationManager.pop()
+    }
+
     NavDisplay(
         backStack = backStack,
         onBack = {
@@ -120,6 +164,14 @@ fun AppScreen(
         entryProvider = tabEntryProvider,
         modifier = modifier.fillMaxSize()
     )
+
+    availableUpdate?.let { update ->
+        UpdateAvailableDialog(
+            update = update,
+            onAccept = updateViewModel::acceptUpdate,
+            onDecline = updateViewModel::declineUpdate
+        )
+    }
 }
 
 @Serializable
@@ -153,4 +205,35 @@ private fun appTabMetadata(route: AppTabRoute): Map<String, Any> =
 private fun Map<String, Any>.appTabIndex(): Int =
     this[APP_TAB_INDEX_METADATA] as? Int ?: 0
 
+@Composable
+private fun UpdateAvailableDialog(
+    update: AppUpdateInfo,
+    onAccept: () -> Unit,
+    onDecline: () -> Unit
+) {
+    val versionLabel = update.versionName?.takeIf { it.isNotBlank() } ?: update.versionCode.toString()
+    val releaseNotes = update.releaseNotes?.takeIf { it.isNotBlank() }
+    val updateText = if (releaseNotes == null) {
+        "Purefin $versionLabel is available.\n\nVersion code: ${update.versionCode}"
+    } else {
+        "Purefin $versionLabel is available.\n\nVersion code: ${update.versionCode}\n\n$releaseNotes"
+    }
+
+    AlertDialog(
+        onDismissRequest = onDecline,
+        title = { Text("Update available") },
+        text = { Text(updateText) },
+        confirmButton = {
+            TextButton(onClick = onAccept) {
+                Text("Install")
+            }
+        },
+        dismissButton = {
+            TextButton(onClick = onDecline) {
+                Text("Not now")
+            }
+        }
+    )
+}
+
 private const val APP_TAB_INDEX_METADATA = "app_tab_index"

app/src/main/java/hu/bbara/purefin/ui/screen/download/DownloadsScreen.kt

@@ -2,16 +2,23 @@ package hu.bbara.purefin.ui.screen.download
 
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Scaffold
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
-import hu.bbara.purefin.ui.screen.download.components.DownloadsContent
 import hu.bbara.purefin.ui.screen.AppBottomBar
+import hu.bbara.purefin.ui.screen.download.components.DownloadsContent
+import hu.bbara.purefin.ui.screen.home.components.DefaultTopBar
+import hu.bbara.purefin.ui.screen.home.components.DefaultTopBarTextButton
 
+@OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun DownloadsScreen(
     selectedTab: Int,
+    isOnline: Boolean,
+    isCheckingConnection: Boolean,
+    onCheckConnection: () -> Unit,
     onTabSelected: (Int) -> Unit,
     modifier: Modifier = Modifier
 ) {
@@ -19,9 +26,23 @@ fun DownloadsScreen(
         modifier = modifier.fillMaxSize(),
         containerColor = MaterialTheme.colorScheme.background,
         contentColor = MaterialTheme.colorScheme.onBackground,
+        topBar = {
+            DefaultTopBar(
+                rightActions = {
+                    if (!isOnline) {
+                        DefaultTopBarTextButton(
+                            text = if (isCheckingConnection) "Checking…" else "Check connection",
+                            onClick = onCheckConnection,
+                            enabled = !isCheckingConnection
+                        )
+                    }
+                }
+            )
+        },
         bottomBar = {
             AppBottomBar(
                 selectedTab = selectedTab,
+                isOnline = isOnline,
                 onTabSelected = onTabSelected
             )
         }

app/src/main/java/hu/bbara/purefin/ui/screen/download/components/DownloadingItemRow.kt

@@ -22,20 +22,22 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
+import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import hu.bbara.purefin.ui.common.image.PurefinAsyncImage
-import hu.bbara.purefin.feature.downloads.ActiveDownloadItem
+import hu.bbara.purefin.core.feature.downloads.ActiveDownloadItem
 
 @Composable
 internal fun DownloadingItemRow(
     item: ActiveDownloadItem,
     onCancel: (String) -> Unit,
+    modifier: Modifier = Modifier
 ) {
     Card(
-        modifier = Modifier.fillMaxWidth(),
+        modifier = modifier.fillMaxWidth(),
         colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.surfaceVariant),
         shape = RoundedCornerShape(12.dp)
     ) {
@@ -91,7 +93,10 @@ internal fun DownloadingItemRow(
                     )
                 }
             }
-            IconButton(onClick = { onCancel(item.contentId) }) {
+            IconButton(
+                onClick = { onCancel(item.contentId) },
+                modifier = Modifier.testTag("$DownloadsCancelButtonTagPrefix${item.contentId}")
+            ) {
                 Icon(
                     imageVector = Icons.Outlined.Close,
                     contentDescription = "Cancel download",
@@ -101,3 +106,5 @@ internal fun DownloadingItemRow(
         }
     }
 }
+
+internal const val DownloadsCancelButtonTagPrefix = "downloads-cancel-button-"

app/src/main/java/hu/bbara/purefin/ui/screen/download/components/DownloadsContent.kt

@@ -5,40 +5,46 @@ import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.widthIn
 import androidx.compose.foundation.lazy.grid.GridCells
 import androidx.compose.foundation.lazy.grid.GridItemSpan
 import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
 import androidx.compose.foundation.lazy.grid.items
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.outlined.Download
+import androidx.compose.material3.Card
 import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.collectAsState
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
+import hu.bbara.purefin.core.feature.downloads.DownloadsViewModel
 import hu.bbara.purefin.ui.common.card.PosterCard
-import hu.bbara.purefin.feature.downloads.DownloadsViewModel
 
 @Composable
 fun DownloadsContent(
     modifier: Modifier = Modifier,
     viewModel: DownloadsViewModel = hiltViewModel(),
 ) {
-    val downloads = viewModel.downloads.collectAsState(emptyList())
+    val downloads = viewModel.downloads.collectAsStateWithLifecycle(initialValue = emptyList())
-    val activeDownloads = viewModel.activeDownloads.collectAsState()
+    val activeDownloads = viewModel.activeDownloads.collectAsStateWithLifecycle()
 
     val isEmpty = downloads.value.isEmpty() && activeDownloads.value.isEmpty()
 
     if (isEmpty) {
         Column(
-            modifier = modifier.fillMaxSize(),
+            modifier = modifier
+                .fillMaxSize()
+                .testTag(DownloadsEmptyStateTag),
             verticalArrangement = Arrangement.Center,
             horizontalAlignment = Alignment.CenterHorizontally
         ) {
@@ -62,7 +68,9 @@ fun DownloadsContent(
         contentPadding = PaddingValues(16.dp),
         horizontalArrangement = Arrangement.spacedBy(16.dp),
         verticalArrangement = Arrangement.spacedBy(16.dp),
-        modifier = modifier.background(MaterialTheme.colorScheme.background)
+        modifier = modifier
+            .testTag(DownloadsGridTag)
+            .background(MaterialTheme.colorScheme.background)
     ) {
         if (activeDownloads.value.isNotEmpty()) {
             item(key = "downloading-header", span = { GridItemSpan(maxLineSpan) }) {
@@ -80,7 +88,8 @@ fun DownloadsContent(
             ) { item ->
                 DownloadingItemRow(
                     item = item,
-                    onCancel = { viewModel.cancelDownload(it) }
+                    onCancel = { viewModel.cancelDownload(it) },
+                    modifier = Modifier.testTag("$DownloadsActiveItemTagPrefix${item.contentId}")
                 )
             }
             if (downloads.value.isNotEmpty()) {
@@ -95,13 +104,22 @@ fun DownloadsContent(
                 }
             }
         }
-        items(downloads.value, key = { item -> item.id }) { item ->
+        items(downloads.value, key = { item -> item.media.id }) { item ->
-            PosterCard(
+            Column(
-                item = item,
+                modifier = Modifier.testTag("$DownloadsItemTagPrefix${item.media.id}")
-                onMovieSelected = viewModel::onMovieSelected,
+            ) {
-                onSeriesSelected = viewModel::onSeriesSelected,
+                PosterCard(
-                onEpisodeSelected = { _, _, _ -> },
+                    item = item.media,
-            )
+                    onMovieSelected = viewModel::onMovieSelected,
+                    onSeriesSelected = viewModel::onSeriesSelected,
+                    onEpisodeSelected = { _, _, _ -> },
+                )
+            }
         }
     }
 }
+
+internal const val DownloadsEmptyStateTag = "downloads-empty-state"
+internal const val DownloadsGridTag = "downloads-grid"
+internal const val DownloadsActiveItemTagPrefix = "downloads-active-item-"
+internal const val DownloadsItemTagPrefix = "downloads-item-"

app/src/main/java/hu/bbara/purefin/ui/screen/episode/EpisodeScreen.kt

@@ -1,54 +1,44 @@
 package hu.bbara.purefin.ui.screen.episode
 
-import android.Manifest
+import android.content.Intent
-import android.os.Build
+import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.activity.compose.rememberLauncherForActivityResult
-import androidx.activity.result.contract.ActivityResultContracts
-import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.rememberScrollState
-import androidx.compose.foundation.verticalScroll
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Scaffold
-import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.remember
-import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Brush
+import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.platform.LocalConfiguration
-import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
 import androidx.hilt.navigation.compose.hiltViewModel
-import hu.bbara.purefin.ui.screen.waiting.PurefinWaitingScreen
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import hu.bbara.purefin.ui.common.media.MediaHero
+import hu.bbara.purefin.core.download.DownloadState
-import hu.bbara.purefin.ui.common.media.MediaMetadataFlowRow
+import hu.bbara.purefin.core.feature.content.episode.EpisodeScreenViewModel
-import hu.bbara.purefin.ui.common.media.homeMediaSharedBoundsDestination
+import hu.bbara.purefin.core.image.ArtworkKind
-import hu.bbara.purefin.ui.common.media.isHomeMediaSharedBoundsTransitionActive
+import hu.bbara.purefin.core.image.ImageUrlBuilder
-import hu.bbara.purefin.download.DownloadState
+import hu.bbara.purefin.core.navigation.EpisodeDto
-import hu.bbara.purefin.image.ImageUrlBuilder
+import hu.bbara.purefin.core.navigation.Route
-import hu.bbara.purefin.navigation.EpisodeDto
-import hu.bbara.purefin.navigation.LocalNavigationBackStack
-import hu.bbara.purefin.navigation.Route
 import hu.bbara.purefin.model.CastMember
 import hu.bbara.purefin.model.Episode
-import hu.bbara.purefin.feature.content.episode.EpisodeScreenViewModel
+import hu.bbara.purefin.navigation.LocalNavigationBackStack
-import hu.bbara.purefin.ui.screen.episode.components.EpisodeDetails
+import hu.bbara.purefin.player.PlayerActivity
+import hu.bbara.purefin.ui.common.media.MediaDetailActionsUiModel
+import hu.bbara.purefin.ui.common.media.MediaDetailCastUiModel
+import hu.bbara.purefin.ui.common.media.MediaDetailPlaybackSettingsUiModel
+import hu.bbara.purefin.ui.common.media.MediaDetailPrimaryActionUiModel
+import hu.bbara.purefin.ui.common.media.MediaDetailScaffold
+import hu.bbara.purefin.ui.common.media.MediaDetailScaffoldUiModel
+import hu.bbara.purefin.ui.common.media.MediaDetailSecondaryActionUiModel
+import hu.bbara.purefin.ui.common.media.MediaDetailSynopsisUiModel
+import hu.bbara.purefin.ui.common.media.mediaPlayButtonText
+import hu.bbara.purefin.ui.common.media.mediaPlaybackProgress
+import hu.bbara.purefin.ui.common.permission.rememberNotificationPermissionGate
+import hu.bbara.purefin.ui.screen.episode.components.EpisodeDownloadButtonTag
+import hu.bbara.purefin.ui.screen.episode.components.EpisodePlayButtonTag
+import hu.bbara.purefin.ui.screen.episode.components.EpisodeWatchedButtonTag
 import hu.bbara.purefin.ui.screen.episode.components.EpisodeTopBar
 import hu.bbara.purefin.ui.screen.episode.components.EpisodeTopBarShortcut
+import hu.bbara.purefin.ui.screen.waiting.PurefinWaitingScreen
 import hu.bbara.purefin.ui.theme.AppTheme
-import hu.bbara.purefin.image.ArtworkKind
 import java.util.UUID
 
 @Composable
@@ -61,28 +51,18 @@ fun EpisodeScreen(
     val previousRoute = remember(backStack) { backStack.getOrNull(backStack.lastIndex - 1) }
 
     LaunchedEffect(episode) {
-        viewModel.selectEpisode(
+        viewModel.selectEpisode(episode)
-            seriesId = episode.seriesId,
-            seasonId = episode.seasonId,
-            episodeId = episode.id
-        )
     }
 
-    val episode = viewModel.episode.collectAsState()
+    val episode = viewModel.episode.collectAsStateWithLifecycle()
-    val downloadState = viewModel.downloadState.collectAsState()
+    val downloadState = viewModel.downloadState.collectAsStateWithLifecycle()
-
+    val requestNotificationPermission = rememberNotificationPermissionGate()
-    val notificationPermissionLauncher = rememberLauncherForActivityResult(
-        ActivityResultContracts.RequestPermission()
-    ) { _ ->
-        // Proceed with download regardless — notification is nice-to-have
-        viewModel.onDownloadClick()
-    }
 
     val onDownloadClick = {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU
+        if (downloadState.value is DownloadState.NotDownloaded) {
-            && downloadState.value is DownloadState.NotDownloaded
+            requestNotificationPermission {
-        ) {
+                viewModel.onDownloadClick()
-            notificationPermissionLauncher.launch(Manifest.permission.POST_NOTIFICATIONS)
+            }
         } else {
             viewModel.onDownloadClick()
         }
@@ -103,127 +83,94 @@ fun EpisodeScreen(
         },
         downloadState = downloadState.value,
         onBack = viewModel::onBack,
-        onSeriesClick = viewModel::onSeriesClick,
         onDownloadClick = onDownloadClick,
+        onMarkAsWatched = viewModel::markAsWatched,
         modifier = modifier
     )
 }
 
+@OptIn(ExperimentalMaterial3Api::class)
 @Composable
 private fun EpisodeScreenInternal(
     episode: Episode,
     topBarShortcut: EpisodeTopBarShortcut?,
     downloadState: DownloadState,
     onBack: () -> Unit,
-    onSeriesClick: () -> Unit,
     onDownloadClick: () -> Unit,
+    onMarkAsWatched: (Boolean) -> Unit = {},
     modifier: Modifier = Modifier,
 ) {
-    val isHomeMediaTransitionActive = isHomeMediaSharedBoundsTransitionActive()
+    val context = LocalContext.current
+    val playAction = remember(episode.id) {
+        {
+            val intent = Intent(context, PlayerActivity::class.java)
+            intent.putExtra("MEDIA_ID", episode.id.toString())
+            context.startActivity(intent)
+        }
+    }
 
-    Scaffold(
+    MediaDetailScaffold(
+        uiModel = episode.toMediaDetailScaffoldUiModel(
+            onPlayClick = playAction,
+            downloadState = downloadState,
+            onDownloadClick = onDownloadClick,
+            onMarkAsWatched = onMarkAsWatched,
+        ),
         modifier = modifier,
-        containerColor = MaterialTheme.colorScheme.background,
+        topBar = { scrollBehavior ->
-        topBar = {
+            EpisodeTopBar(
-            if (!isHomeMediaTransitionActive) {
+                shortcut = topBarShortcut,
-                EpisodeTopBar(
+                onBack = onBack,
-                    shortcut = topBarShortcut,
+                scrollBehavior = scrollBehavior
-                    onBack = onBack,
-                    onSeriesClick = onSeriesClick,
-                    modifier = Modifier
-                )
-            }
-        }
-    ) { innerPadding ->
-        Column(
-            modifier = Modifier
-                .fillMaxSize()
-                .verticalScroll(rememberScrollState())
-        ) {
-            EpisodeHeroSection(episode = episode)
-            if (!isHomeMediaTransitionActive) {
-                EpisodeDetails(
-                    episode = episode,
-                    downloadState = downloadState,
-                    onDownloadClick = onDownloadClick,
-                    modifier = Modifier
-                        .fillMaxWidth()
-                        .padding(horizontal = 16.dp)
-                        .padding(bottom = innerPadding.calculateBottomPadding())
-                )
-            }
-        }
-    }
-}
-
-@Composable
-private fun EpisodeHeroSection(
-    episode: Episode,
-    modifier: Modifier = Modifier,
-) {
-    val scheme = MaterialTheme.colorScheme
-    val screenHeight = LocalConfiguration.current.screenHeightDp.dp
-    val sectionHeight = screenHeight * 0.4f
-
-    Box(
-        modifier = modifier
-            .homeMediaSharedBoundsDestination()
-            .fillMaxWidth()
-            .height(sectionHeight)
-    ) {
-        MediaHero(
-            imageUrl = ImageUrlBuilder.finishImageUrl(episode.imageUrlPrefix, ArtworkKind.PRIMARY),
-            backgroundColor = scheme.background,
-            modifier = Modifier.fillMaxSize()
-        )
-        Box(
-            modifier = Modifier
-                .matchParentSize()
-                .background(
-                    Brush.verticalGradient(
-                        colors = listOf(
-                            Color.Transparent,
-                            Color.Transparent,
-                            scheme.background.copy(alpha = 0.5f),
-                            scheme.background
-                        )
-                    )
-                )
-        )
-        Column(
-            modifier = Modifier
-                .fillMaxWidth()
-                .align(Alignment.BottomStart)
-                .padding(16.dp)
-        ) {
-            Text(
-                text = episode.title,
-                color = scheme.onBackground,
-                fontSize = 32.sp,
-                fontWeight = FontWeight.Bold,
-                lineHeight = 38.sp
             )
-            Spacer(modifier = Modifier.height(4.dp))
+        },
-            Text(
-                text = "Episode ${episode.index}",
-                color = scheme.onBackground,
-                fontSize = 14.sp,
-                fontWeight = FontWeight.Medium
-            )
-            Spacer(modifier = Modifier.height(16.dp))
-            EpisodeMetaChips(episode = episode)
-        }
-    }
-}
-
-@Composable
-private fun EpisodeMetaChips(episode: Episode) {
-    MediaMetadataFlowRow(
-        items = listOf(episode.releaseDate, episode.rating, episode.runtime, episode.format),
-        highlightedItem = episode.format
     )
 }
 
+private fun Episode.toMediaDetailScaffoldUiModel(
+    onPlayClick: () -> Unit,
+    downloadState: DownloadState,
+    onDownloadClick: () -> Unit,
+    onMarkAsWatched: (Boolean) -> Unit,
+): MediaDetailScaffoldUiModel = MediaDetailScaffoldUiModel(
+    imageUrl = ImageUrlBuilder.finishImageUrl(imageUrlPrefix, ArtworkKind.PRIMARY),
+    title = title,
+    subtitle = "Episode $index",
+    metadataItems = listOf(releaseDate, rating, runtime, format),
+    highlightedMetadataItem = format,
+    actions = MediaDetailActionsUiModel(
+        primaryAction = MediaDetailPrimaryActionUiModel(
+            text = mediaPlayButtonText(progress, watched),
+            progress = mediaPlaybackProgress(progress),
+            onClick = onPlayClick,
+            testTag = EpisodePlayButtonTag
+        ),
+        secondaryActions = listOf(
+            MediaDetailSecondaryActionUiModel.MarkAsWatched(
+                watched = watched,
+                onClick = { onMarkAsWatched(!watched) },
+                testTag = EpisodeWatchedButtonTag
+            ),
+            MediaDetailSecondaryActionUiModel.Download(
+                downloadState = downloadState,
+                onClick = onDownloadClick,
+                testTag = EpisodeDownloadButtonTag
+            )
+        ),
+        dividerThickness = 2.dp
+    ),
+    synopsis = MediaDetailSynopsisUiModel(text = synopsis),
+    playbackSettings = MediaDetailPlaybackSettingsUiModel(
+        audioTrack = "ENG",
+        subtitles = "ENG"
+    ),
+    cast = if (cast.isNotEmpty()) {
+        MediaDetailCastUiModel(members = cast)
+    } else {
+        null
+    }
+)
+
 @Preview(showBackground = true)
 @Composable
 private fun EpisodeScreenPreview() {
@@ -233,7 +180,6 @@ private fun EpisodeScreenPreview() {
             topBarShortcut = EpisodeTopBarShortcut.Series(onClick = {}),
             downloadState = DownloadState.Downloading(progressPercent = 0.42f),
             onBack = {},
-            onSeriesClick = {},
             onDownloadClick = {}
         )
     }

app/src/main/java/hu/bbara/purefin/ui/screen/episode/components/EpisodeComponents.kt

@@ -1,49 +1,27 @@
 package hu.bbara.purefin.ui.screen.episode.components
 
-import android.content.Intent
-import androidx.compose.foundation.background
-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.Row
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.sizeIn
-import androidx.compose.foundation.layout.statusBarsPadding
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.outlined.ArrowBack
 import androidx.compose.material.icons.outlined.Cast
-import androidx.compose.material.icons.outlined.Close
-import androidx.compose.material.icons.outlined.Download
-import androidx.compose.material.icons.outlined.DownloadDone
 import androidx.compose.material.icons.outlined.MoreVert
+import androidx.compose.material3.ButtonDefaults
+import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
-import androidx.compose.material3.VerticalDivider
+import androidx.compose.material3.TextButton
+import androidx.compose.material3.TopAppBarScrollBehavior
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.remember
-import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
-import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import hu.bbara.purefin.download.DownloadState
-import hu.bbara.purefin.model.Episode
-import hu.bbara.purefin.player.PlayerActivity
 import hu.bbara.purefin.ui.common.button.GhostIconButton
-import hu.bbara.purefin.ui.common.button.MediaActionButton
+import hu.bbara.purefin.ui.screen.home.components.DefaultTopBar
-import hu.bbara.purefin.ui.common.button.MediaResumeButton
-import hu.bbara.purefin.ui.common.media.MediaPlaybackSettings
-import hu.bbara.purefin.ui.common.media.MediaSynopsis
-import hu.bbara.purefin.ui.common.media.mediaPlayButtonText
-import hu.bbara.purefin.ui.common.media.mediaPlaybackProgress
 
 internal sealed interface EpisodeTopBarShortcut {
     val label: String
@@ -54,137 +32,60 @@ internal sealed interface EpisodeTopBarShortcut {
     }
 }
 
+@OptIn(ExperimentalMaterial3Api::class)
 @Composable
 internal fun EpisodeTopBar(
     shortcut: EpisodeTopBarShortcut?,
     onBack: () -> Unit,
-    onSeriesClick: () -> Unit,
+    scrollBehavior: TopAppBarScrollBehavior? = null,
-    modifier: Modifier = Modifier
 ) {
-    val scheme = MaterialTheme.colorScheme
+    DefaultTopBar(
-    Row(
+        leftActions = {
-        modifier = modifier
-            .fillMaxWidth()
-            .statusBarsPadding()
-            .padding(16.dp),
-        horizontalArrangement = Arrangement.SpaceBetween,
-        verticalAlignment = Alignment.CenterVertically
-    ) {
-        Row(
-            horizontalArrangement = Arrangement.spacedBy(12.dp)
-        ) {
             GhostIconButton(
                 icon = Icons.Outlined.ArrowBack,
                 contentDescription = "Back",
                 onClick = onBack
             )
-            when {
+            when (shortcut) {
-                shortcut != null -> {
+                is EpisodeTopBarShortcut.Series -> {
-                    Box(
+                    TextButton(
+                        onClick = shortcut.onClick,
+                        colors = ButtonDefaults.buttonColors(
+                            containerColor = MaterialTheme.colorScheme.surface.copy(alpha = 0.65f),
+                            contentColor = MaterialTheme.colorScheme.onSurface
+                        ),
                         modifier = Modifier
                             .height(52.dp)
-                            .clickable(onClick = shortcut.onClick),
+                            .testTag(EpisodeSeriesButtonTag)
-                        contentAlignment = Alignment.Center
+                            .clip(CircleShape)
                     ) {
                         Text(
                             text = shortcut.label,
-                            color = scheme.onBackground,
+                            color = MaterialTheme.colorScheme.onBackground,
-                            fontSize = 16.sp,
+                            fontSize = 18.sp,
-                            fontWeight = FontWeight.SemiBold,
+                            fontWeight = FontWeight.Bold,
                             maxLines = 1,
                             overflow = TextOverflow.Ellipsis,
-                            modifier = Modifier
-                                .clip(CircleShape)
-                                .background(scheme.background.copy(alpha = 0.65f))
-                                .padding(horizontal = 16.dp, vertical = 10.dp)
                         )
                     }
                 }
+
+                null -> {}
             }
-        }
+        },
-        Row(horizontalArrangement = Arrangement.spacedBy(12.dp)) {
+        rightActions = {
             GhostIconButton(icon = Icons.Outlined.Cast, contentDescription = "Cast", onClick = { })
-            GhostIconButton(icon = Icons.Outlined.MoreVert, contentDescription = "More", onClick = { })
+            GhostIconButton(
-        }
+                icon = Icons.Outlined.MoreVert,
-    }
+                contentDescription = "More",
+                onClick = { })
+        },
+        withIcon = false,
+        scrollBehavior = scrollBehavior
+    )
 }
 
-@Composable
+internal const val EpisodeSeriesButtonTag = "episode-series-button"
-internal fun EpisodeDetails(
+internal const val EpisodePlayButtonTag = "episode-play-button"
-    episode: Episode,
+internal const val EpisodeDownloadButtonTag = "episode-download-button"
-    downloadState: DownloadState,
+internal const val EpisodeWatchedButtonTag = "episode-watched-button"
-    onDownloadClick: () -> Unit,
-    modifier: Modifier = Modifier
-) {
-    val scheme = MaterialTheme.colorScheme
-
-    val context = LocalContext.current
-    val playAction = remember(episode.id) {
-        {
-            val intent = Intent(context, PlayerActivity::class.java)
-            intent.putExtra("MEDIA_ID", episode.id.toString())
-            context.startActivity(intent)
-        }
-    }
-
-    Column(modifier = modifier) {
-        MediaSynopsis(
-            synopsis = episode.synopsis
-        )
-        Spacer(modifier = Modifier.height(24.dp))
-
-        Row() {
-            MediaResumeButton(
-                text = mediaPlayButtonText(episode.progress, episode.watched),
-                progress = mediaPlaybackProgress(episode.progress),
-                onClick = playAction,
-                modifier = Modifier.sizeIn(maxWidth = 200.dp)
-            )
-            VerticalDivider(
-                color = MaterialTheme.colorScheme.secondary,
-                thickness = 2.dp,
-                modifier = Modifier
-                    .height(48.dp)
-                    .padding(horizontal = 16.dp, vertical = 8.dp)
-            )
-            Row() {
-                MediaActionButton(
-                    backgroundColor = MaterialTheme.colorScheme.surface,
-                    iconColor = MaterialTheme.colorScheme.onSurface,
-                    icon = when (downloadState) {
-                        is DownloadState.NotDownloaded -> Icons.Outlined.Download
-                        is DownloadState.Downloading -> Icons.Outlined.Close
-                        is DownloadState.Downloaded -> Icons.Outlined.DownloadDone
-                        is DownloadState.Failed -> Icons.Outlined.Download
-                    },
-                    height = 48.dp,
-                    onClick = onDownloadClick
-                )
-            }
-        }
-        Spacer(modifier = Modifier.height(24.dp))
-
-        MediaPlaybackSettings(
-            backgroundColor = MaterialTheme.colorScheme.surface,
-            foregroundColor = MaterialTheme.colorScheme.onSurface,
-            //TODO fix it
-            audioTrack = "ENG",
-            subtitles = "ENG"
-        )
-        Spacer(modifier = Modifier.height(24.dp))
-
-        if (episode.cast.isNotEmpty()) {
-            Text(
-                text = "Cast",
-                color = scheme.onBackground,
-                fontSize = 18.sp,
-                fontWeight = FontWeight.Bold
-            )
-            Spacer(modifier = Modifier.height(12.dp))
-            //TODO use it
-//            MediaCastRow(
-//                cast = episode.cast
-//            )
-        }
-    }
-}

app/src/main/java/hu/bbara/purefin/ui/screen/home/HomeScreen.kt

@@ -2,17 +2,23 @@ package hu.bbara.purefin.ui.screen.home
 
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Scaffold
+import androidx.compose.material3.SnackbarHost
+import androidx.compose.material3.SnackbarHostState
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
-import hu.bbara.purefin.ui.model.LibraryUiModel
+import androidx.compose.ui.input.nestedscroll.nestedScroll
-import hu.bbara.purefin.ui.model.MediaUiModel
+import hu.bbara.purefin.core.model.LibraryUiModel
+import hu.bbara.purefin.core.model.MediaUiModel
 import hu.bbara.purefin.ui.screen.AppBottomBar
 import hu.bbara.purefin.ui.screen.home.components.HomeContent
 import hu.bbara.purefin.ui.screen.home.components.HomeTopBar
+import hu.bbara.purefin.ui.screen.home.components.rememberDefaultTopBarScrollBehavior
 import java.util.UUID
 
+@OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun HomeScreen(
     libraries: List<LibraryUiModel>,
@@ -24,30 +30,43 @@ fun HomeScreen(
     onRefresh: () -> Unit,
     onMediaSelected: (MediaUiModel) -> Unit,
     onLibrarySelected: (LibraryUiModel) -> Unit,
+    onMarkWatched: (MediaUiModel, Boolean) -> Unit,
     onProfileClick: () -> Unit,
+    onCheckForUpdates: () -> Unit,
+    isCheckingForUpdates: Boolean,
     onSettingsClick: () -> Unit,
     onLogoutClick: () -> Unit,
     onSearchClick: () -> Unit,
+    snackbarHostState: SnackbarHostState,
     selectedTab: Int,
+    isOnline: Boolean,
     onTabSelected: (Int) -> Unit,
     modifier: Modifier = Modifier
 ) {
+    val topBarScrollBehavior = rememberDefaultTopBarScrollBehavior()
+
     Scaffold(
         modifier = modifier
-            .fillMaxSize(),
+            .fillMaxSize()
+            .nestedScroll(topBarScrollBehavior.nestedScrollConnection),
         containerColor = MaterialTheme.colorScheme.background,
         contentColor = MaterialTheme.colorScheme.onBackground,
         topBar = {
             HomeTopBar(
                 onSearchClick = onSearchClick,
                 onProfileClick = onProfileClick,
+                onCheckForUpdates = onCheckForUpdates,
+                isCheckingForUpdates = isCheckingForUpdates,
                 onSettingsClick = onSettingsClick,
-                onLogoutClick = onLogoutClick
+                onLogoutClick = onLogoutClick,
+                scrollBehavior = topBarScrollBehavior
             )
         },
+        snackbarHost = { SnackbarHost(snackbarHostState) },
         bottomBar = {
             AppBottomBar(
                 selectedTab = selectedTab,
+                isOnline = isOnline,
                 onTabSelected = onTabSelected
             )
         }
@@ -63,6 +82,7 @@ fun HomeScreen(
             onMediaSelected = onMediaSelected,
             onLibrarySelected = onLibrarySelected,
             onBrowseLibrariesClick = { onTabSelected(1) },
+            onMarkAsWatched = onMarkWatched,
             modifier = Modifier.padding(innerPadding)
         )
     }

app/src/main/java/hu/bbara/purefin/ui/screen/home/components/DefaultTopBar.kt

@@ -5,90 +5,90 @@ import androidx.compose.animation.SharedTransitionScope
 import androidx.compose.animation.fadeIn
 import androidx.compose.animation.fadeOut
 import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.RowScope
-import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.layout.statusBarsPadding
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.outlined.Search
+import androidx.compose.material3.ButtonDefaults
+import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.IconButtonColors
 import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
+import androidx.compose.material3.TopAppBar
+import androidx.compose.material3.TopAppBarDefaults
+import androidx.compose.material3.TopAppBarScrollBehavior
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.vector.ImageVector
-import androidx.compose.ui.text.font.FontStyle
-import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
 import hu.bbara.purefin.navigation.HOME_SEARCH_SHARED_BOUNDS_KEY
 import hu.bbara.purefin.navigation.LocalNavSharedAnimatedVisibilityScope
 import hu.bbara.purefin.navigation.LocalSharedTransitionScope
 import hu.bbara.purefin.ui.common.image.PurefinLogo
 
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun rememberDefaultTopBarScrollBehavior(): TopAppBarScrollBehavior =
+    TopAppBarDefaults.pinnedScrollBehavior()
+
+@OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun DefaultTopBar(
     leftActions: (@Composable RowScope.() -> Unit)? = null,
     rightActions: (@Composable RowScope.() -> Unit)? = null,
+    withIcon: Boolean = true,
+    scrollBehavior: TopAppBarScrollBehavior? = null
 ) {
     val scheme = MaterialTheme.colorScheme
 
-    Surface(
+    TopAppBar(
-        color = scheme.background,
+        title = {
-        contentColor = scheme.onSurface,
+            if (withIcon) {
-        modifier = Modifier.fillMaxWidth()
+                PurefinLogo(
-    ) {
+                    modifier = Modifier.size(56.dp),
-        Row(
+                )
-            modifier = Modifier
+            }
-                .statusBarsPadding()
+        },
-                .height(84.dp)
+        navigationIcon = {
-                .padding(horizontal = 16.dp),
-            verticalAlignment = Alignment.CenterVertically,
-            horizontalArrangement = Arrangement.SpaceBetween
-        ) {
             if (leftActions != null) {
                 Row(
+                    modifier = Modifier.padding(start = 8.dp),
                     verticalAlignment = Alignment.CenterVertically,
+                    horizontalArrangement = Arrangement.spacedBy(12.dp),
                     content = leftActions
                 )
             }
-            Row(
+        },
-                modifier = Modifier,
+        actions = {
-                verticalAlignment = Alignment.CenterVertically,
-                horizontalArrangement = when {
-                    leftActions == null && rightActions != null -> Arrangement.Start
-                    leftActions != null && rightActions == null -> Arrangement.Center
-                    else -> Arrangement.Center
-                }
-            ) {
-                PurefinLogo(
-                    modifier = Modifier.size(84.dp),
-                )
-                Text(
-                    text = "PureFin",
-                    fontSize = 32.sp,
-                    fontWeight = FontWeight.Bold,
-                    fontStyle = FontStyle.Italic,
-                    color = scheme.primary
-                )
-            }
             if (rightActions != null) {
                 Row(
+                    modifier = Modifier.padding(end = 8.dp),
                     verticalAlignment = Alignment.CenterVertically,
+                    horizontalArrangement = Arrangement.spacedBy(12.dp),
                     content = rightActions
                 )
             }
-        }
+        },
-    }
+        colors = TopAppBarDefaults.topAppBarColors(
+            containerColor = Color.Transparent,
+            scrolledContainerColor = scheme.background,
+            navigationIconContentColor = scheme.onSurface,
+            titleContentColor = scheme.onSurface,
+            actionIconContentColor = scheme.onSurface
+        ),
+        scrollBehavior = scrollBehavior
+    )
 }
 
 @Composable
@@ -119,6 +119,37 @@ fun DefaultTopBarIconButton(
     }
 }
 
+@Composable
+fun DefaultTopBarTextButton(
+    text: String,
+    onClick: () -> Unit,
+    modifier: Modifier = Modifier,
+    enabled: Boolean = true,
+) {
+    val scheme = MaterialTheme.colorScheme
+
+    TextButton(
+        onClick = onClick,
+        enabled = enabled,
+        shape = CircleShape,
+        colors = ButtonDefaults.textButtonColors(
+            containerColor = scheme.surface,
+            contentColor = scheme.onSurface,
+            disabledContainerColor = scheme.surface,
+            disabledContentColor = scheme.onSurface
+        ),
+        contentPadding = PaddingValues(horizontal = 18.dp),
+        modifier = modifier
+            .height(50.dp)
+            .clip(CircleShape),
+    ) {
+        Text(
+            text = text,
+            style = MaterialTheme.typography.labelLarge,
+        )
+    }
+}
+
 @OptIn(ExperimentalSharedTransitionApi::class)
 @Composable
 fun DefaultTopBarSearchButton(

app/src/main/java/hu/bbara/purefin/ui/screen/home/components/HomeContent.kt

@@ -20,9 +20,10 @@ import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
 import androidx.compose.runtime.snapshotFlow
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.unit.dp
-import hu.bbara.purefin.ui.model.LibraryUiModel
+import hu.bbara.purefin.core.model.LibraryUiModel
-import hu.bbara.purefin.ui.model.MediaUiModel
+import hu.bbara.purefin.core.model.MediaUiModel
 import hu.bbara.purefin.ui.screen.home.components.continuewatching.ContinueWatchingSection
 import hu.bbara.purefin.ui.screen.home.components.featured.SuggestionsSection
 import hu.bbara.purefin.ui.screen.home.components.library.LibraryPosterSection
@@ -42,6 +43,7 @@ fun HomeContent(
     onMediaSelected: (MediaUiModel) -> Unit,
     onLibrarySelected: (LibraryUiModel) -> Unit,
     onBrowseLibrariesClick: () -> Unit,
+    onMarkAsWatched: (MediaUiModel, Boolean) -> Unit,
     modifier: Modifier = Modifier
 ) {
     val scheme = MaterialTheme.colorScheme
@@ -79,7 +81,9 @@ fun HomeContent(
     PullToRefreshBox(
         isRefreshing = isRefreshing,
         onRefresh = onRefresh,
-        modifier = modifier.fillMaxSize()
+        modifier = modifier
+            .fillMaxSize()
+            .testTag(HomeContentTag)
     ) {
         Box(
             modifier = Modifier
@@ -88,7 +92,9 @@ fun HomeContent(
         ) {
             LazyColumn(
                 state = listState,
-                modifier = Modifier.fillMaxSize(),
+                modifier = Modifier
+                    .fillMaxSize()
+                    .testTag(HomeContentViewportTag),
                 contentPadding = PaddingValues(top = 16.dp, bottom = 24.dp),
                 verticalArrangement = Arrangement.spacedBy(24.dp)
             ) {
@@ -96,7 +102,8 @@ fun HomeContent(
                     item(key = "featured") {
                         SuggestionsSection(
                             items = suggestions,
-                            onItemOpen = { item -> onMediaSelected(item) }
+                            onItemOpen = { item -> onMediaSelected(item) },
+                            modifier = Modifier.testTag(HomeFeaturedSectionTag)
                         )
                     }
                 }
@@ -105,17 +112,21 @@ fun HomeContent(
                     item(key = "continue-watching") {
                         ContinueWatchingSection(
                             items = continueWatching,
-                            onMediaSelected = onMediaSelected
+                            onMarkAsWatched = onMarkAsWatched,
+                            onMediaSelected = onMediaSelected,
+                            modifier = Modifier.testTag(HomeContinueWatchingSectionTag)
                         )
                     }
                 }
 
                 if (nextUp.isNotEmpty()) {
                     item(key = "next-up") {
-                        NextUpSection(
+                    NextUpSection(
-                            items = nextUp,
+                        items = nextUp,
-                            onMediaSelected = onMediaSelected
+                        onMediaSelected = onMediaSelected,
-                        )
+                        onMarkAsWatched = onMarkAsWatched,
+                        modifier = Modifier.testTag(HomeNextUpSectionTag)
+                    )
                     }
                 }
 
@@ -127,7 +138,9 @@ fun HomeContent(
                         library = library,
                         items = libraryContent[library.id].orEmpty(),
                         onLibrarySelected = onLibrarySelected,
-                        onMediaSelected = onMediaSelected
+                        onMediaSelected = onMediaSelected,
+                        onMarkAsWatched = onMarkAsWatched,
+                        modifier = Modifier.testTag("$HomeLibrarySectionTagPrefix${library.id}")
                     )
                 }
 
@@ -135,7 +148,8 @@ fun HomeContent(
                     item(key = "empty-state") {
                         HomeEmptyState(
                             onRefresh = onRefresh,
-                            onBrowseLibrariesClick = onBrowseLibrariesClick
+                            onBrowseLibrariesClick = onBrowseLibrariesClick,
+                            modifier = Modifier.testTag(HomeEmptyStateTag)
                         )
                     }
                 }
@@ -143,3 +157,11 @@ fun HomeContent(
         }
     }
 }
+
+internal const val HomeContentTag = "home-content"
+internal const val HomeContentViewportTag = "home-content-viewport"
+internal const val HomeFeaturedSectionTag = "home-section-featured"
+internal const val HomeContinueWatchingSectionTag = "home-section-continue-watching"
+internal const val HomeNextUpSectionTag = "home-section-next-up"
+internal const val HomeLibrarySectionTagPrefix = "home-section-library-"
+internal const val HomeEmptyStateTag = "home-empty-state"

app/src/main/java/hu/bbara/purefin/ui/screen/home/components/HomeTopBar.kt

@@ -1,33 +1,35 @@
 package hu.bbara.purefin.ui.screen.home.components
 
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.size
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.outlined.Person
 import androidx.compose.material3.DropdownMenu
 import androidx.compose.material3.DropdownMenuItem
+import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Text
+import androidx.compose.material3.TopAppBarScrollBehavior
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.unit.dp
 
+@OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun HomeTopBar(
     onSearchClick: () -> Unit,
     onProfileClick: () -> Unit,
+    onCheckForUpdates: () -> Unit,
+    isCheckingForUpdates: Boolean,
     onSettingsClick: () -> Unit,
     onLogoutClick: () -> Unit,
+    scrollBehavior: TopAppBarScrollBehavior? = null,
 ) {
     var isProfileMenuExpanded by remember { mutableStateOf(false) }
 
     DefaultTopBar(
+        scrollBehavior = scrollBehavior,
         rightActions = {
             DefaultTopBarSearchButton(onClick = onSearchClick)
-            Spacer(modifier = Modifier.size(12.dp))
             DefaultTopBarIconButton(
                 imageVector = Icons.Outlined.Person,
                 contentDescription = "Profile",
@@ -44,6 +46,14 @@ fun HomeTopBar(
                         onProfileClick()
                     }
                 )
+                DropdownMenuItem(
+                    text = { Text(if (isCheckingForUpdates) "Checking updates..." else "Check for updates") },
+                    enabled = !isCheckingForUpdates,
+                    onClick = {
+                        isProfileMenuExpanded = false
+                        onCheckForUpdates()
+                    }
+                )
                 DropdownMenuItem(
                     text = { Text("Settings") },
                     onClick = {

app/src/main/java/hu/bbara/purefin/ui/screen/home/components/continuewatching/ContinueWatchingCard.kt

@@ -15,13 +15,15 @@ import hu.bbara.purefin.ui.common.bar.MediaProgressBar
 import hu.bbara.purefin.ui.common.card.MediaImageCard
 import hu.bbara.purefin.ui.common.media.homeMediaSharedBoundsSource
 import hu.bbara.purefin.ui.common.media.rememberHomeMediaSharedBoundsClick
-import hu.bbara.purefin.ui.model.MediaUiModel
+import hu.bbara.purefin.ui.model.MediaAction
+import hu.bbara.purefin.core.model.MediaUiModel
 
 @Composable
 internal fun ContinueWatchingCard(
     item: MediaUiModel,
     sharedBoundsKey: String,
     onMediaSelected: (MediaUiModel) -> Unit,
+    onMarkAsWatched: (MediaUiModel, Boolean) -> Unit,
     modifier: Modifier = Modifier
 ) {
     val scheme = MaterialTheme.colorScheme
@@ -34,6 +36,16 @@ internal fun ContinueWatchingCard(
         title = item.primaryText,
         subtitle = item.secondaryText,
         onClick = onClick,
+        popupActions = listOf(
+            MediaAction(
+                name = "Mark as watched",
+                onClick = { onMarkAsWatched(item, true) }
+            ),
+            MediaAction(
+                name = "Mark as unwatched",
+                onClick = { onMarkAsWatched(item, false) }
+            )
+        ),
         imageModifier = Modifier.homeMediaSharedBoundsSource(sharedBoundsKey),
         shapeSize = 26.dp,
         imageAspectRatio = 16f / 9f,

app/src/main/java/hu/bbara/purefin/ui/screen/home/components/continuewatching/ContinueWatchingSection.kt

@@ -12,15 +12,17 @@ import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.unit.dp
 import hu.bbara.purefin.ui.common.header.SectionHeader
 import hu.bbara.purefin.ui.common.media.homeMediaSharedBoundsKey
-import hu.bbara.purefin.ui.model.MediaUiModel
+import hu.bbara.purefin.core.model.MediaUiModel
 
 @Composable
 fun ContinueWatchingSection(
     items: List<MediaUiModel>,
     onMediaSelected: (MediaUiModel) -> Unit,
+    onMarkAsWatched: (MediaUiModel, Boolean) -> Unit,
     modifier: Modifier = Modifier
 ) {
     if (items.isEmpty()) return
@@ -40,16 +42,23 @@ fun ContinueWatchingSection(
         LazyRow(
             contentPadding = PaddingValues(horizontal = 16.dp),
             horizontalArrangement = Arrangement.spacedBy(16.dp),
-            modifier = Modifier.fillMaxWidth(),
+            modifier = Modifier
+                .fillMaxWidth()
+                .testTag(HomeContinueWatchingRowTag),
             state = listState
         ) {
             itemsIndexed(items = items, key = { _, item -> item.id }) { index, item ->
                 ContinueWatchingCard(
                     item = item,
                     sharedBoundsKey = homeMediaSharedBoundsKey("continue-$index", item.id),
-                    onMediaSelected = onMediaSelected
+                    onMediaSelected = onMediaSelected,
+                    onMarkAsWatched = onMarkAsWatched,
+                    modifier = Modifier.testTag("$HomeContinueWatchingItemTagPrefix$index")
                 )
             }
         }
     }
 }
+
+internal const val HomeContinueWatchingRowTag = "home-continue-watching-row"
+internal const val HomeContinueWatchingItemTagPrefix = "home-continue-watching-item-"

app/src/main/java/hu/bbara/purefin/ui/screen/home/components/featured/SuggestionCard.kt

@@ -27,7 +27,7 @@ import hu.bbara.purefin.ui.common.bar.MediaProgressBar
 import hu.bbara.purefin.ui.common.image.PurefinAsyncImage
 import hu.bbara.purefin.ui.common.media.homeMediaSharedBoundsSource
 import hu.bbara.purefin.ui.common.media.rememberHomeMediaSharedBoundsClick
-import hu.bbara.purefin.ui.model.MediaUiModel
+import hu.bbara.purefin.core.model.MediaUiModel
 
 @Composable
 internal fun SuggestionCard(

app/src/main/java/hu/bbara/purefin/ui/screen/home/components/featured/SuggestionsSection.kt

@@ -21,9 +21,10 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
+import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.unit.dp
 import hu.bbara.purefin.ui.common.media.homeMediaSharedBoundsKey
-import hu.bbara.purefin.ui.model.MediaUiModel
+import hu.bbara.purefin.core.model.MediaUiModel
 
 @Composable
 fun SuggestionsSection(
@@ -48,13 +49,16 @@ fun SuggestionsSection(
             pageSize = PageSize.Fixed(320.dp),
             contentPadding = PaddingValues(horizontal = 16.dp),
             pageSpacing = 16.dp,
-            modifier = Modifier.fillMaxWidth()
+            modifier = Modifier
+                .fillMaxWidth()
+                .testTag(HomeFeaturedPagerTag)
         ) { page ->
             val item = items[page]
             SuggestionCard(
                 item = item,
                 sharedBoundsKey = homeMediaSharedBoundsKey("suggestion-$page", item.id),
-                onClick = { onItemOpen(item) }
+                onClick = { onItemOpen(item) },
+                modifier = Modifier.testTag("$HomeFeaturedItemTagPrefix$page")
             )
         }
         if (items.size > 1) {
@@ -86,3 +90,6 @@ fun SuggestionsSection(
         }
     }
 }
+
+internal const val HomeFeaturedPagerTag = "home-featured-pager"
+internal const val HomeFeaturedItemTagPrefix = "home-featured-item-"

app/src/main/java/hu/bbara/purefin/ui/screen/home/components/library/HomeBrowseCard.kt

@@ -6,30 +6,45 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
+import hu.bbara.purefin.core.model.EpisodeUiModel
+import hu.bbara.purefin.core.model.MediaUiModel
+import hu.bbara.purefin.core.model.MovieUiModel
+import hu.bbara.purefin.core.model.SeriesUiModel
+import androidx.compose.runtime.remember
+import hu.bbara.purefin.ui.common.badge.UnwatchedEpisodeBadge
 import hu.bbara.purefin.ui.common.badge.WatchStateBadge
 import hu.bbara.purefin.ui.common.card.MediaImageCard
 import hu.bbara.purefin.ui.common.media.homeMediaSharedBoundsSource
 import hu.bbara.purefin.ui.common.media.rememberHomeMediaSharedBoundsClick
-import hu.bbara.purefin.ui.model.EpisodeUiModel
+import hu.bbara.purefin.ui.model.MediaAction
-import hu.bbara.purefin.ui.model.MediaUiModel
-import hu.bbara.purefin.ui.model.MovieUiModel
 
 @Composable
 internal fun HomeBrowseCard(
     uiModel: MediaUiModel,
     sharedBoundsKey: String,
     onMediaSelected: (MediaUiModel) -> Unit,
+    onMarkAsWatched: (MediaUiModel, Boolean) -> Unit,
     modifier: Modifier = Modifier
 ) {
     val onClick = rememberHomeMediaSharedBoundsClick(sharedBoundsKey) {
         onMediaSelected(uiModel)
     }
 
+    val popupActions = remember(uiModel, onMarkAsWatched) {
+        buildList {
+            if (uiModel is MovieUiModel || uiModel is EpisodeUiModel || uiModel is SeriesUiModel) {
+                add(MediaAction(name = "Mark as watched") { onMarkAsWatched(uiModel, true) })
+                add(MediaAction(name = "Mark as unwatched") { onMarkAsWatched(uiModel, false) })
+            }
+        }
+    }
+
     MediaImageCard(
         imageUrl = uiModel.primaryImageUrl,
         title = uiModel.primaryText,
         subtitle = uiModel.secondaryText,
         onClick = onClick,
+        popupActions = popupActions,
         imageModifier = Modifier.homeMediaSharedBoundsSource(sharedBoundsKey),
         imageAspectRatio = 15f / 16f,
         modifier = modifier.width(188.dp)
@@ -42,10 +57,16 @@ internal fun HomeBrowseCard(
                         .align(Alignment.TopEnd)
                         .padding(8.dp),
                     watched = uiModel.watched,
-                    started = (uiModel.progress ?: 0f) > 0f
                 )
             }
-            else -> Unit
+            is SeriesUiModel -> {
+                UnwatchedEpisodeBadge(
+                    unwatchedCount = uiModel.unwatchedEpisodeCount,
+                    modifier = Modifier
+                        .align(Alignment.TopEnd)
+                        .padding(8.dp)
+                )
+            }
         }
     }
 }

app/src/main/java/hu/bbara/purefin/ui/screen/home/components/library/LibraryPosterSection.kt

@@ -12,11 +12,12 @@ import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.unit.dp
 import hu.bbara.purefin.ui.common.header.SectionHeader
 import hu.bbara.purefin.ui.common.media.homeMediaSharedBoundsKey
-import hu.bbara.purefin.ui.model.LibraryUiModel
+import hu.bbara.purefin.core.model.LibraryUiModel
-import hu.bbara.purefin.ui.model.MediaUiModel
+import hu.bbara.purefin.core.model.MediaUiModel
 
 @Composable
 fun LibraryPosterSection(
@@ -24,6 +25,7 @@ fun LibraryPosterSection(
     items: List<MediaUiModel>,
     onLibrarySelected: (LibraryUiModel) -> Unit,
     onMediaSelected: (MediaUiModel) -> Unit,
+    onMarkAsWatched: (MediaUiModel, Boolean) -> Unit,
     modifier: Modifier = Modifier,
 ) {
     if (items.isEmpty()) return
@@ -47,7 +49,9 @@ fun LibraryPosterSection(
         LazyRow(
             contentPadding = PaddingValues(horizontal = 16.dp),
             horizontalArrangement = Arrangement.spacedBy(14.dp),
-            modifier = Modifier.fillMaxWidth(),
+            modifier = Modifier
+                .fillMaxWidth()
+                .testTag("$HomeLibraryRowTagPrefix${library.id}"),
             state = listState
         ) {
             itemsIndexed(items = items, key = { _, item -> item.id }) { index, item ->
@@ -57,9 +61,14 @@ fun LibraryPosterSection(
                         origin = "library-${library.id}-$index",
                         mediaId = item.id
                     ),
-                    onMediaSelected = onMediaSelected
+                    onMediaSelected = onMediaSelected,
+                    onMarkAsWatched = onMarkAsWatched,
+                    modifier = Modifier.testTag("$HomeLibraryItemTagPrefix${library.id}-$index")
                 )
             }
         }
     }
 }
+
+internal const val HomeLibraryRowTagPrefix = "home-library-row-"
+internal const val HomeLibraryItemTagPrefix = "home-library-item-"

app/src/main/java/hu/bbara/purefin/ui/screen/home/components/nextup/NextUpCard.kt

@@ -6,6 +6,7 @@ import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.width
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Brush
 import androidx.compose.ui.graphics.Color
@@ -13,24 +14,39 @@ import androidx.compose.ui.unit.dp
 import hu.bbara.purefin.ui.common.card.MediaImageCard
 import hu.bbara.purefin.ui.common.media.homeMediaSharedBoundsSource
 import hu.bbara.purefin.ui.common.media.rememberHomeMediaSharedBoundsClick
-import hu.bbara.purefin.ui.model.MediaUiModel
+import hu.bbara.purefin.ui.model.MediaAction
+import hu.bbara.purefin.core.model.MediaUiModel
+import hu.bbara.purefin.core.model.MovieUiModel
+import hu.bbara.purefin.core.model.EpisodeUiModel
+import hu.bbara.purefin.core.model.SeriesUiModel
 
 @Composable
 internal fun NextUpCard(
     uiModel: MediaUiModel,
     sharedBoundsKey: String,
     onMediaSelected: (MediaUiModel) -> Unit,
+    onMarkAsWatched: (MediaUiModel, Boolean) -> Unit,
     modifier: Modifier = Modifier
 ) {
     val onClick = rememberHomeMediaSharedBoundsClick(sharedBoundsKey) {
         onMediaSelected(uiModel)
     }
 
+    val popupActions = remember(uiModel, onMarkAsWatched) {
+        buildList {
+            if (uiModel is MovieUiModel || uiModel is EpisodeUiModel || uiModel is SeriesUiModel) {
+                add(MediaAction(name = "Mark as watched") { onMarkAsWatched(uiModel, true) })
+                add(MediaAction(name = "Mark as unwatched") { onMarkAsWatched(uiModel, false) })
+            }
+        }
+    }
+
     MediaImageCard(
         imageUrl = uiModel.primaryImageUrl,
         title = uiModel.primaryText,
         subtitle = uiModel.secondaryText,
         onClick = onClick,
+        popupActions = popupActions,
         imageModifier = Modifier.homeMediaSharedBoundsSource(sharedBoundsKey),
         shapeSize = 24.dp,
         titleStyle = MaterialTheme.typography.titleSmall,

app/src/main/java/hu/bbara/purefin/ui/screen/home/components/nextup/NextUpSection.kt

@@ -12,15 +12,17 @@ import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.unit.dp
 import hu.bbara.purefin.ui.common.header.SectionHeader
 import hu.bbara.purefin.ui.common.media.homeMediaSharedBoundsKey
-import hu.bbara.purefin.ui.model.MediaUiModel
+import hu.bbara.purefin.core.model.MediaUiModel
 
 @Composable
 fun NextUpSection(
     items: List<MediaUiModel>,
     onMediaSelected: (MediaUiModel) -> Unit,
+    onMarkAsWatched: (MediaUiModel, Boolean) -> Unit,
     modifier: Modifier = Modifier
 ) {
     if (items.isEmpty()) return
@@ -40,16 +42,23 @@ fun NextUpSection(
         LazyRow(
             contentPadding = PaddingValues(horizontal = 16.dp),
             horizontalArrangement = Arrangement.spacedBy(14.dp),
-            modifier = Modifier.fillMaxWidth(),
+            modifier = Modifier
+                .fillMaxWidth()
+                .testTag(HomeNextUpRowTag),
             state = listState
         ) {
             itemsIndexed(items = items, key = { _, item -> item.id }) { index, item ->
                 NextUpCard(
                     uiModel = item,
                     sharedBoundsKey = homeMediaSharedBoundsKey("next-up-$index", item.id),
-                    onMediaSelected = onMediaSelected
+                    onMediaSelected = onMediaSelected,
+                    onMarkAsWatched = onMarkAsWatched,
+                    modifier = Modifier.testTag("$HomeNextUpItemTagPrefix$index")
                 )
             }
         }
     }
 }
+
+internal const val HomeNextUpRowTag = "home-next-up-row"
+internal const val HomeNextUpItemTagPrefix = "home-next-up-item-"

app/src/main/java/hu/bbara/purefin/ui/screen/home/components/search/SearchOverlay.kt

@@ -24,8 +24,8 @@ import androidx.compose.material3.SearchBar
 import androidx.compose.material3.SearchBarDefaults
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.saveable.rememberSaveable
@@ -35,7 +35,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
-import hu.bbara.purefin.feature.search.SearchViewModel
+import hu.bbara.purefin.core.feature.search.SearchViewModel
 import java.util.UUID
 import hu.bbara.purefin.model.MediaKind
 
@@ -55,7 +55,7 @@ fun SearchOverlay(
     BackHandler(onBack = onDismiss)
 
     var query by rememberSaveable { mutableStateOf("") }
-    val searchResults by searchViewModel.searchResult.collectAsState()
+    val searchResults by searchViewModel.searchResult.collectAsStateWithLifecycle()
     val dismissInteractionSource = remember { MutableInteractionSource() }
 
     Box(

app/src/main/java/hu/bbara/purefin/ui/screen/home/components/search/SearchResultCard.kt

@@ -2,7 +2,7 @@ package hu.bbara.purefin.ui.screen.home.components.search
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
-import hu.bbara.purefin.feature.search.SearchResult
+import hu.bbara.purefin.core.feature.search.SearchResult
 import hu.bbara.purefin.model.MediaKind
 import hu.bbara.purefin.ui.common.card.MediaImageCard
 

app/src/main/java/hu/bbara/purefin/ui/screen/home/components/search/SearchScreen.kt

@@ -17,7 +17,6 @@ import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.heightIn
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.layout.statusBarsPadding
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.text.KeyboardActions
@@ -30,6 +29,7 @@ import androidx.compose.material.icons.outlined.Close
 import androidx.compose.material.icons.outlined.Search
 import androidx.compose.material.icons.outlined.Tune
 import androidx.compose.material3.AlertDialog
+import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.FilterChip
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
@@ -39,15 +39,22 @@ import androidx.compose.material3.Text
 import androidx.compose.material3.TextButton
 import androidx.compose.material3.TextField
 import androidx.compose.material3.TextFieldDefaults
+import androidx.compose.material3.TopAppBarScrollBehavior
 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.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
+import androidx.compose.ui.focus.FocusRequester
+import androidx.compose.ui.focus.focusRequester
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.platform.LocalSoftwareKeyboardController
+import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.input.ImeAction
 import androidx.compose.ui.text.style.TextOverflow
@@ -55,8 +62,8 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import hu.bbara.purefin.feature.search.SearchResult
+import hu.bbara.purefin.core.feature.search.SearchResult
-import hu.bbara.purefin.feature.search.SearchViewModel
+import hu.bbara.purefin.core.feature.search.SearchViewModel
 import hu.bbara.purefin.model.Genre
 import hu.bbara.purefin.model.MediaKind
 import hu.bbara.purefin.navigation.HOME_SEARCH_SHARED_BOUNDS_KEY
@@ -64,6 +71,7 @@ import hu.bbara.purefin.navigation.LocalNavSharedAnimatedVisibilityScope
 import hu.bbara.purefin.navigation.LocalSharedTransitionScope
 import hu.bbara.purefin.ui.screen.home.components.DefaultTopBar
 import hu.bbara.purefin.ui.screen.home.components.DefaultTopBarIconButton
+import hu.bbara.purefin.ui.screen.home.components.rememberDefaultTopBarScrollBehavior
 import hu.bbara.purefin.ui.theme.AppTheme
 import java.util.UUID
 
@@ -98,7 +106,7 @@ fun SearchScreen(
         Modifier
     }
 
-    SearchFullScreenContent(
+    SearchScreenContent(
         query = query,
         searchResults = searchResults,
         genres = genres.sortedBy { it.name },
@@ -126,9 +134,9 @@ fun SearchScreen(
     )
 }
 
-@OptIn(ExperimentalLayoutApi::class)
+@OptIn(ExperimentalLayoutApi::class, ExperimentalMaterial3Api::class)
 @Composable
-private fun SearchFullScreenContent(
+private fun SearchScreenContent(
     query: String,
     searchResults: List<SearchResult>,
     genres: List<Genre>,
@@ -142,15 +150,18 @@ private fun SearchFullScreenContent(
     modifier: Modifier = Modifier
 ) {
     val scheme = MaterialTheme.colorScheme
+    val topBarScrollBehavior = rememberDefaultTopBarScrollBehavior()
+
     Scaffold(
         topBar = { SearchHeader(
-            onBack = onBack
+            onBack = onBack,
+            scrollBehavior = topBarScrollBehavior
         ) },
         modifier = modifier
             .fillMaxSize()
+            .testTag(SearchScreenTag)
+            .nestedScroll(topBarScrollBehavior.nestedScrollConnection)
             .background(scheme.background)
-            .statusBarsPadding()
-            .padding(top = 24.dp)
     ) { innerPadding ->
         Column(
             modifier = Modifier
@@ -217,13 +228,13 @@ private fun SearchResults(
 }
 
 @Composable
+@OptIn(ExperimentalMaterial3Api::class)
 private fun SearchHeader(
     onBack: () -> Unit,
-    modifier: Modifier = Modifier
+    scrollBehavior: TopAppBarScrollBehavior? = null,
 ) {
-    val scheme = MaterialTheme.colorScheme
-
     DefaultTopBar(
+        scrollBehavior = scrollBehavior,
         leftActions = {
             DefaultTopBarIconButton(
                 imageVector = Icons.Outlined.ArrowBack,
@@ -243,6 +254,11 @@ private fun SearchField(
 ) {
     val scheme = MaterialTheme.colorScheme
     val keyboardController = LocalSoftwareKeyboardController.current
+    val focusRequester = remember { FocusRequester() }
+
+    LaunchedEffect(Unit) {
+        focusRequester.requestFocus()
+    }
 
     TextField(
         value = query,
@@ -267,7 +283,10 @@ private fun SearchField(
         },
         trailingIcon = {
             if (query.isNotBlank()) {
-                IconButton(onClick = { onQueryChange("") }) {
+                IconButton(
+                    onClick = { onQueryChange("") },
+                    modifier = Modifier.testTag(SearchClearButtonTag)
+                ) {
                     Icon(
                         imageVector = Icons.Outlined.Close,
                         contentDescription = "Clear search",
@@ -292,6 +311,8 @@ private fun SearchField(
         ),
         modifier = modifier
             .fillMaxWidth()
+            .focusRequester(focusRequester)
+            .testTag(SearchQueryFieldTag)
             .height(68.dp)
     )
 }
@@ -304,18 +325,23 @@ private fun SearchResultsGrid(
 ) {
     Column(
         verticalArrangement = Arrangement.spacedBy(16.dp),
-        modifier = modifier.fillMaxWidth()
+        modifier = modifier
+            .fillMaxWidth()
+            .testTag(SearchResultsGridTag)
     ) {
-        results.chunked(2).forEach { rowItems ->
+        results.chunked(2).forEachIndexed { rowIndex, rowItems ->
             Row(
                 horizontalArrangement = Arrangement.spacedBy(16.dp),
                 modifier = Modifier.fillMaxWidth()
             ) {
-                rowItems.forEach { item ->
+                rowItems.forEachIndexed { columnIndex, item ->
+                    val itemIndex = rowIndex * 2 + columnIndex
                     SearchResultCard(
                         item = item,
                         onClick = { onResultClick(item) },
-                        modifier = Modifier.weight(1f)
+                        modifier = Modifier
+                            .weight(1f)
+                            .testTag("$SearchResultItemTagPrefix$itemIndex")
                     )
                 }
                 if (rowItems.size == 1) {
@@ -373,6 +399,7 @@ private fun GenreSelector(
         FilterChip(
             selected = false,
             onClick = { showGenres = true },
+            modifier = Modifier.testTag(SearchGenreSelectorTag),
             leadingIcon = {
                 Icon(
                     imageVector = Icons.Outlined.Tune,
@@ -394,11 +421,12 @@ private fun GenreSelector(
                 )
             }
         )
-        visibleGenres.forEach { genre ->
+        visibleGenres.forEachIndexed { index, genre ->
             GenreChip(
                 genre = genre,
                 selected = genre.name in selectedGenreNames,
-                onClick = { onGenreSelected(genre) }
+                onClick = { onGenreSelected(genre) },
+                modifier = Modifier.testTag("$SearchGenreChipTagPrefix$index")
             )
         }
     }
@@ -406,6 +434,7 @@ private fun GenreSelector(
     if (showGenres) {
         AlertDialog(
             onDismissRequest = { showGenres = false },
+            modifier = Modifier.testTag(SearchGenreDialogTag),
             title = {
                 Text(text = "Select genres")
             },
@@ -418,11 +447,12 @@ private fun GenreSelector(
                         .heightIn(max = 360.dp)
                         .verticalScroll(rememberScrollState())
                 ) {
-                    genres.forEach { genre ->
+                    genres.forEachIndexed { index, genre ->
                         GenreChip(
                             genre = genre,
                             selected = genre.name in selectedGenreNames,
-                            onClick = { onGenreSelected(genre) }
+                            onClick = { onGenreSelected(genre) },
+                            modifier = Modifier.testTag("$SearchGenreDialogChipTagPrefix$index")
                         )
                     }
                 }
@@ -477,11 +507,11 @@ private fun GenreChip(
 
 @Preview(showBackground = true)
 @Composable
-private fun SearchFullScreenPreview() {
+private fun SearchScreenPreview() {
     var query by rememberSaveable { mutableStateOf("du") }
 
     AppTheme {
-        SearchFullScreenContent(
+        SearchScreenContent(
             query = query,
             searchResults = previewSearchResults,
             genres = previewGenres,
@@ -520,3 +550,13 @@ private val previewSearchResults = listOf(
         type = MediaKind.MOVIE
     )
 )
+
+internal const val SearchScreenTag = "search-screen"
+internal const val SearchQueryFieldTag = "search-query-field"
+internal const val SearchClearButtonTag = "search-clear-button"
+internal const val SearchResultsGridTag = "search-results-grid"
+internal const val SearchResultItemTagPrefix = "search-result-item-"
+internal const val SearchGenreSelectorTag = "search-genre-selector"
+internal const val SearchGenreChipTagPrefix = "search-genre-chip-"
+internal const val SearchGenreDialogTag = "search-genre-dialog"
+internal const val SearchGenreDialogChipTagPrefix = "search-genre-dialog-chip-"

app/src/main/java/hu/bbara/purefin/ui/screen/libraries/LibrariesScreen.kt

@@ -2,36 +2,47 @@ package hu.bbara.purefin.ui.screen.libraries
 
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Scaffold
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
-import hu.bbara.purefin.ui.model.LibraryUiModel
+import androidx.compose.ui.input.nestedscroll.nestedScroll
+import hu.bbara.purefin.core.model.LibraryUiModel
 import hu.bbara.purefin.ui.screen.AppBottomBar
+import hu.bbara.purefin.ui.screen.home.components.rememberDefaultTopBarScrollBehavior
 import hu.bbara.purefin.ui.screen.libraries.components.LibrariesContent
 import hu.bbara.purefin.ui.screen.libraries.components.LibrariesTopBar
 
+@OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun LibrariesScreen(
     items: List<LibraryUiModel>,
     onLibrarySelected: (LibraryUiModel) -> Unit,
     onSearchClick: () -> Unit,
     selectedTab: Int,
+    isOnline: Boolean,
     onTabSelected: (Int) -> Unit,
     modifier: Modifier = Modifier
 ) {
+    val topBarScrollBehavior = rememberDefaultTopBarScrollBehavior()
+
     Scaffold(
-        modifier = modifier.fillMaxSize(),
+        modifier = modifier
+            .fillMaxSize()
+            .nestedScroll(topBarScrollBehavior.nestedScrollConnection),
         containerColor = MaterialTheme.colorScheme.background,
         contentColor = MaterialTheme.colorScheme.onBackground,
         topBar = {
             LibrariesTopBar(
                 onSearchClick = onSearchClick,
+                scrollBehavior = topBarScrollBehavior
             )
         },
         bottomBar = {
             AppBottomBar(
                 selectedTab = selectedTab,
+                isOnline = isOnline,
                 onTabSelected = onTabSelected
             )
         }

app/src/main/java/hu/bbara/purefin/ui/screen/libraries/components/LibrariesContent.kt

@@ -8,8 +8,9 @@ import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
 import androidx.compose.foundation.lazy.grid.items
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.unit.dp
-import hu.bbara.purefin.ui.model.LibraryUiModel
+import hu.bbara.purefin.core.model.LibraryUiModel
 
 @Composable
 fun LibrariesContent(
@@ -17,7 +18,7 @@ fun LibrariesContent(
     onLibrarySelected: (LibraryUiModel) -> Unit,
     modifier: Modifier = Modifier,
 ) {
-    BoxWithConstraints(modifier = modifier) {
+    BoxWithConstraints(modifier = modifier.testTag(LibrariesOverviewGridTag)) {
         val minCellSize = if (maxWidth >= 600.dp) 220.dp else 160.dp
 
         LazyVerticalGrid(
@@ -29,9 +30,13 @@ fun LibrariesContent(
             items(items, key = { it.id }) { item ->
                 LibraryListItem(
                     uiModel = item,
-                    onClick = { onLibrarySelected(item) }
+                    onClick = { onLibrarySelected(item) },
+                    modifier = Modifier.testTag("$LibrariesOverviewItemTagPrefix${item.id}")
                 )
             }
         }
     }
 }
+
+internal const val LibrariesOverviewGridTag = "libraries-overview-grid"
+internal const val LibrariesOverviewItemTagPrefix = "libraries-overview-item-"

app/src/main/java/hu/bbara/purefin/ui/screen/libraries/components/LibrariesTopBar.kt

@@ -1,14 +1,19 @@
 package hu.bbara.purefin.ui.screen.libraries.components
 
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.TopAppBarScrollBehavior
 import androidx.compose.runtime.Composable
 import hu.bbara.purefin.ui.screen.home.components.DefaultTopBar
 import hu.bbara.purefin.ui.screen.home.components.DefaultTopBarSearchButton
 
+@OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun LibrariesTopBar(
     onSearchClick: () -> Unit,
+    scrollBehavior: TopAppBarScrollBehavior? = null,
 ) {
     DefaultTopBar(
+        scrollBehavior = scrollBehavior,
         rightActions = {
             DefaultTopBarSearchButton(onClick = onSearchClick)
         }

app/src/main/java/hu/bbara/purefin/ui/screen/libraries/components/LibraryListItem.kt

@@ -4,7 +4,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import hu.bbara.purefin.model.LibraryKind
 import hu.bbara.purefin.ui.common.card.MediaImageCard
-import hu.bbara.purefin.ui.model.LibraryUiModel
+import hu.bbara.purefin.core.model.LibraryUiModel
 
 @Composable
 fun LibraryListItem(

app/src/main/java/hu/bbara/purefin/ui/screen/library/LibraryScreen.kt

@@ -10,25 +10,32 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.grid.GridCells
 import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
 import androidx.compose.foundation.lazy.grid.items
+import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Scaffold
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.remember
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.input.nestedscroll.nestedScroll
+import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
-import hu.bbara.purefin.feature.browse.library.LibraryViewModel
+import hu.bbara.purefin.core.feature.browse.library.LibraryViewModel
-import hu.bbara.purefin.navigation.LibraryDto
+import hu.bbara.purefin.core.model.EpisodeUiModel
+import hu.bbara.purefin.core.model.MediaUiModel
+import hu.bbara.purefin.core.model.MovieUiModel
+import hu.bbara.purefin.core.model.SeriesUiModel
+import hu.bbara.purefin.core.navigation.LibraryDto
 import hu.bbara.purefin.ui.common.badge.WatchStateBadge
 import hu.bbara.purefin.ui.common.card.MediaImageCard
-import hu.bbara.purefin.ui.model.EpisodeUiModel
+import hu.bbara.purefin.ui.model.MediaAction
-import hu.bbara.purefin.ui.model.MediaUiModel
+import hu.bbara.purefin.ui.screen.home.components.rememberDefaultTopBarScrollBehavior
-import hu.bbara.purefin.ui.model.MovieUiModel
-import hu.bbara.purefin.ui.model.SeriesUiModel
 import hu.bbara.purefin.ui.screen.library.components.LibraryTopBar
 
+@OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun LibraryScreen(
     library: LibraryDto,
@@ -39,15 +46,19 @@ fun LibraryScreen(
         viewModel.selectLibrary(libraryId = library.id)
     }
 
-    val libraryItems = viewModel.contents.collectAsState()
+    val libraryItems = viewModel.contents.collectAsStateWithLifecycle()
+    val topBarScrollBehavior = rememberDefaultTopBarScrollBehavior()
 
     Scaffold(
-        modifier = modifier,
+        modifier = modifier
+            .testTag(LibraryScreenTag)
+            .nestedScroll(topBarScrollBehavior.nestedScrollConnection),
         containerColor = MaterialTheme.colorScheme.background,
         contentColor = MaterialTheme.colorScheme.onBackground,
         topBar = {
             LibraryTopBar(
-                onBack = { viewModel.onBack() }
+                onBack = { viewModel.onBack() },
+                scrollBehavior = topBarScrollBehavior
             )
         }
     ) { innerPadding ->
@@ -57,7 +68,10 @@ fun LibraryScreen(
                 .background(MaterialTheme.colorScheme.background)
                 .padding(innerPadding)
         ) {
-            LibraryPosterGrid(libraryItems = libraryItems.value)
+            LibraryPosterGrid(
+                libraryItems = libraryItems.value,
+                onMarkAsWatched = viewModel::markAsWatched,
+            )
         }
     }
 }
@@ -66,9 +80,14 @@ fun LibraryScreen(
 internal fun LibraryPosterGrid(
     libraryItems: List<MediaUiModel>,
     modifier: Modifier = Modifier,
+    onMarkAsWatched: (MediaUiModel, Boolean) -> Unit,
     viewModel: LibraryViewModel = hiltViewModel()
 ) {
-    BoxWithConstraints(modifier = modifier.background(MaterialTheme.colorScheme.background)) {
+    BoxWithConstraints(
+        modifier = modifier
+            .testTag(LibraryPosterGridTag)
+            .background(MaterialTheme.colorScheme.background)
+    ) {
         val minCellSize = if (maxWidth >= 600.dp) 220.dp else 120.dp
 
         LazyVerticalGrid(
@@ -78,6 +97,15 @@ internal fun LibraryPosterGrid(
             verticalArrangement = Arrangement.spacedBy(16.dp),
         ) {
             items(libraryItems, key = { item -> item.id }) { item ->
+                val popupActions = remember {
+                    buildList {
+                        if (item is MovieUiModel || item is EpisodeUiModel || item is SeriesUiModel) {
+                            add(MediaAction(name = "Mark as watched") { onMarkAsWatched(item, true) })
+                            add(MediaAction(name = "Mark as unwatched") { onMarkAsWatched(item, false) })
+                        }
+                    }
+                }
+
                 MediaImageCard(
                     imageUrl = item.primaryImageUrl,
                     title = item.primaryText,
@@ -88,7 +116,9 @@ internal fun LibraryPosterGrid(
                             is SeriesUiModel -> viewModel.onSeriesSelected(item.id)
                             is EpisodeUiModel -> Unit
                         }
-                    }
+                    },
+                    popupActions = popupActions,
+                    modifier = Modifier.testTag("$LibraryPosterItemTagPrefix${item.id}")
                 ) {
                     when (item) {
                         is MovieUiModel, is EpisodeUiModel -> {
@@ -98,7 +128,6 @@ internal fun LibraryPosterGrid(
                                     .align(Alignment.TopEnd)
                                     .padding(8.dp),
                                 watched = item.watched,
-                                started = (item.progress ?: 0f) > 0f
                             )
                         }
                         else -> Unit
@@ -108,3 +137,7 @@ internal fun LibraryPosterGrid(
         }
     }
 }
+
+internal const val LibraryScreenTag = "library-screen"
+internal const val LibraryPosterGridTag = "library-poster-grid"
+internal const val LibraryPosterItemTagPrefix = "library-poster-item-"

app/src/main/java/hu/bbara/purefin/ui/screen/library/components/LibraryTopBar.kt

@@ -3,15 +3,20 @@ package hu.bbara.purefin.ui.screen.library.components
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.outlined.ArrowBack
 import androidx.compose.material.icons.outlined.FilterAlt
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.TopAppBarScrollBehavior
 import androidx.compose.runtime.Composable
 import hu.bbara.purefin.ui.screen.home.components.DefaultTopBar
 import hu.bbara.purefin.ui.screen.home.components.DefaultTopBarIconButton
 
+@OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun LibraryTopBar(
     onBack: () -> Unit,
+    scrollBehavior: TopAppBarScrollBehavior? = null,
 ) {
     DefaultTopBar(
+        scrollBehavior = scrollBehavior,
         leftActions = {
             DefaultTopBarIconButton(
                 imageVector = Icons.AutoMirrored.Outlined.ArrowBack,

app/src/main/java/hu/bbara/purefin/ui/screen/login/LoginContent.kt

@@ -0,0 +1,305 @@
+package hu.bbara.purefin.ui.screen.login
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.widthIn
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Lock
+import androidx.compose.material.icons.filled.Person
+import androidx.compose.material.icons.filled.Storage
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.testTag
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.unit.dp
+import hu.bbara.purefin.ui.common.button.PurefinTextButton
+import hu.bbara.purefin.ui.common.image.PurefinLogo
+import hu.bbara.purefin.ui.common.textfield.PurefinComplexTextField
+import hu.bbara.purefin.ui.common.textfield.PurefinPasswordField
+import hu.bbara.purefin.ui.screen.waiting.PurefinWaitingScreen
+
+@Composable
+fun LoginContent(
+    state: LoginContentState,
+    callbacks: LoginContentCallbacks,
+    modifier: Modifier = Modifier
+) {
+    val scheme = MaterialTheme.colorScheme
+
+    if (state.isLoggingIn) {
+        PurefinWaitingScreen(modifier = modifier)
+        return
+    }
+
+    Column(
+        modifier = modifier
+            .fillMaxSize()
+            .testTag(LoginContentTag)
+            .background(scheme.background)
+            .verticalScroll(rememberScrollState())
+            .padding(horizontal = 24.dp, vertical = 20.dp),
+        horizontalAlignment = Alignment.CenterHorizontally
+    ) {
+        Column(
+            modifier = Modifier
+                .widthIn(max = 420.dp)
+                .fillMaxWidth(),
+            horizontalAlignment = Alignment.CenterHorizontally
+        ) {
+            PurefinLogo(
+                color = scheme.primary,
+                modifier = Modifier.size(64.dp)
+            )
+
+            Text(
+                text = "Purefin",
+                color = scheme.onBackground,
+                style = MaterialTheme.typography.headlineSmall.copy(fontWeight = FontWeight.Bold),
+                modifier = Modifier.padding(top = 8.dp)
+            )
+            Text(
+                text = "Personal media, your way",
+                color = scheme.onSurfaceVariant,
+                style = MaterialTheme.typography.bodySmall
+            )
+
+            Spacer(modifier = Modifier.height(28.dp))
+
+            state.errorMessage?.let { errorMessage ->
+                Text(
+                    text = errorMessage,
+                    color = scheme.onErrorContainer,
+                    style = MaterialTheme.typography.bodySmall,
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .testTag(LoginErrorMessageTag)
+                        .background(
+                            scheme.errorContainer,
+                            RoundedCornerShape(12.dp)
+                        )
+                        .padding(12.dp)
+                )
+                Spacer(modifier = Modifier.height(12.dp))
+            }
+
+            when (state.phase) {
+                LoginContentPhase.ServerSearch -> ServerSearchContent(state, callbacks)
+                LoginContentPhase.Login -> LoginPhaseContent(state, callbacks)
+            }
+        }
+    }
+}
+
+@Composable
+private fun ServerSearchContent(
+    state: LoginContentState,
+    callbacks: LoginContentCallbacks
+) {
+    val scheme = MaterialTheme.colorScheme
+
+    Text(
+        text = "Find your server",
+        color = scheme.onBackground,
+        style = MaterialTheme.typography.titleMedium.copy(fontWeight = FontWeight.Bold),
+        modifier = Modifier.fillMaxWidth()
+    )
+    Text(
+        text = "Search by address or choose a nearby Jellyfin server.",
+        color = scheme.onSurfaceVariant,
+        style = MaterialTheme.typography.bodyMedium,
+        modifier = Modifier.padding(top = 2.dp, bottom = 16.dp).fillMaxWidth()
+    )
+
+    Column(modifier = Modifier.testTag(LoginServerUrlFieldTag)) {
+        PurefinComplexTextField(
+            label = "Server URL",
+            value = state.serverUrl,
+            onValueChange = callbacks.onServerUrlChange,
+            placeholder = "http://192.168.1.100:8096",
+            leadingIcon = Icons.Default.Storage
+        )
+    }
+
+    Spacer(modifier = Modifier.height(16.dp))
+
+    PurefinTextButton(
+        content = { Text(if (state.isSearching) "Searching..." else "Find server") },
+        onClick = callbacks.onFindServer,
+        enabled = !state.isSearching,
+        modifier = Modifier
+            .fillMaxWidth()
+            .testTag(LoginFindServerButtonTag)
+            .height(48.dp)
+    )
+
+    if (state.discoveredServers.isNotEmpty()) {
+        Spacer(modifier = Modifier.height(20.dp))
+        Text(
+            text = "Nearby servers",
+            color = scheme.onBackground,
+            style = MaterialTheme.typography.titleSmall.copy(fontWeight = FontWeight.Bold),
+            modifier = Modifier.fillMaxWidth()
+        )
+        Spacer(modifier = Modifier.height(8.dp))
+        state.discoveredServers.forEachIndexed { index, server ->
+            TextButton(
+                onClick = { callbacks.onDiscoveredServerClick(server) },
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .testTag("$LoginDiscoveredServerTagPrefix$index")
+            ) {
+                Text(
+                    text = server.name?.let { "$it\n${server.address}" } ?: server.address,
+                    textAlign = TextAlign.Start,
+                    modifier = Modifier.fillMaxWidth()
+                )
+            }
+        }
+    }
+}
+
+@Composable
+private fun LoginPhaseContent(
+    state: LoginContentState,
+    callbacks: LoginContentCallbacks
+) {
+    val scheme = MaterialTheme.colorScheme
+    val selectedServer = state.selectedServerName ?: state.selectedServerUrl.orEmpty()
+
+    Text(
+        text = "Log in",
+        color = scheme.onBackground,
+        style = MaterialTheme.typography.titleMedium.copy(fontWeight = FontWeight.Bold),
+        modifier = Modifier.fillMaxWidth()
+    )
+    Text(
+        text = selectedServer,
+        color = scheme.onSurfaceVariant,
+        style = MaterialTheme.typography.bodyMedium,
+        modifier = Modifier.padding(top = 2.dp).fillMaxWidth()
+    )
+    TextButton(
+        onClick = callbacks.onChangeServer,
+        modifier = Modifier
+            .fillMaxWidth()
+            .testTag(LoginChangeServerButtonTag)
+    ) {
+        Text("Change server")
+    }
+
+    if (state.quickConnectAvailable) {
+        Spacer(modifier = Modifier.height(8.dp))
+        state.quickConnectCode?.let { code ->
+            Text(
+                text = code,
+                color = scheme.primary,
+                style = MaterialTheme.typography.headlineMedium.copy(fontWeight = FontWeight.Bold),
+                textAlign = TextAlign.Center,
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .testTag(LoginQuickConnectCodeTag)
+            )
+            Text(
+                text = "Approve this code in another Jellyfin client.",
+                color = scheme.onSurfaceVariant,
+                style = MaterialTheme.typography.bodySmall,
+                textAlign = TextAlign.Center,
+                modifier = Modifier.fillMaxWidth().padding(top = 4.dp)
+            )
+            Spacer(modifier = Modifier.height(10.dp))
+            TextButton(
+                onClick = callbacks.onCancelQuickConnect,
+                modifier = Modifier.testTag(LoginQuickConnectCancelButtonTag)
+            ) {
+                Text("Cancel Quick Connect")
+            }
+        } ?: PurefinTextButton(
+            content = { Text("Quick Connect") },
+            onClick = callbacks.onQuickConnect,
+            enabled = !state.isQuickConnecting,
+            modifier = Modifier
+                .fillMaxWidth()
+                .testTag(LoginQuickConnectButtonTag)
+                .height(48.dp)
+        )
+    } else {
+        Text(
+            text = "Quick Connect is not enabled on this server.",
+            color = scheme.onSurfaceVariant,
+            style = MaterialTheme.typography.bodySmall,
+            modifier = Modifier.fillMaxWidth()
+        )
+    }
+
+    Spacer(modifier = Modifier.height(20.dp))
+
+    Text(
+        text = "Manual login",
+        color = scheme.onBackground,
+        style = MaterialTheme.typography.titleSmall.copy(fontWeight = FontWeight.Bold),
+        modifier = Modifier.fillMaxWidth()
+    )
+
+    Spacer(modifier = Modifier.height(12.dp))
+
+    Column(modifier = Modifier.testTag(LoginUsernameFieldTag)) {
+        PurefinComplexTextField(
+            label = "Username",
+            value = state.username,
+            onValueChange = callbacks.onUsernameChange,
+            placeholder = "Enter your username",
+            leadingIcon = Icons.Default.Person
+        )
+    }
+
+    Spacer(modifier = Modifier.height(12.dp))
+
+    Column(modifier = Modifier.testTag(LoginPasswordFieldTag)) {
+        PurefinPasswordField(
+            label = "Password",
+            value = state.password,
+            onValueChange = callbacks.onPasswordChange,
+            placeholder = "Enter your password",
+            leadingIcon = Icons.Default.Lock,
+        )
+    }
+
+    Spacer(modifier = Modifier.height(24.dp))
+
+    PurefinTextButton(
+        content = { Text("Connect") },
+        onClick = callbacks.onConnect,
+        enabled = !state.isQuickConnecting,
+        modifier = Modifier
+            .fillMaxWidth()
+            .testTag(LoginConnectButtonTag)
+            .height(48.dp)
+    )
+}
+
+internal const val LoginContentTag = "login-content"
+internal const val LoginFindServerButtonTag = "login-find-server-button"
+internal const val LoginServerUrlFieldTag = "login-server-url-field"
+internal const val LoginDiscoveredServerTagPrefix = "login-discovered-server-"
+internal const val LoginChangeServerButtonTag = "login-change-server-button"
+internal const val LoginUsernameFieldTag = "login-username-field"
+internal const val LoginPasswordFieldTag = "login-password-field"
+internal const val LoginQuickConnectButtonTag = "login-quick-connect-button"
+internal const val LoginQuickConnectCodeTag = "login-quick-connect-code"
+internal const val LoginQuickConnectCancelButtonTag = "login-quick-connect-cancel-button"
+internal const val LoginConnectButtonTag = "login-connect-button"
+internal const val LoginErrorMessageTag = "login-error-message"

app/src/main/java/hu/bbara/purefin/ui/screen/login/LoginScreen.kt

@@ -1,15 +1,14 @@
 package hu.bbara.purefin.ui.screen.login
 
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
-import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.hilt.navigation.compose.hiltViewModel
-import hu.bbara.purefin.feature.login.LoginViewModel
+import hu.bbara.purefin.core.data.JellyfinServerCandidate
+import hu.bbara.purefin.core.feature.login.LoginViewModel
 import kotlinx.coroutines.launch
 
 @Composable
@@ -17,52 +16,83 @@ fun LoginScreen(
     viewModel: LoginViewModel = hiltViewModel(),
     modifier: Modifier = Modifier
 ) {
-    val serverUrl by viewModel.url.collectAsState()
+    val serverUrl by viewModel.url.collectAsStateWithLifecycle()
-    val username by viewModel.username.collectAsState()
+    val phase by viewModel.phase.collectAsStateWithLifecycle()
-    val password by viewModel.password.collectAsState()
+    val selectedServer by viewModel.selectedServer.collectAsStateWithLifecycle()
-    val errorMessage by viewModel.errorMessage.collectAsState()
+    val discoveredServers by viewModel.discoveredServers.collectAsStateWithLifecycle()
-    var isLoggingIn by remember { mutableStateOf(false) }
+    val username by viewModel.username.collectAsStateWithLifecycle()
+    val password by viewModel.password.collectAsStateWithLifecycle()
+    val isSearching by viewModel.isSearching.collectAsStateWithLifecycle()
+    val isLoggingIn by viewModel.isLoggingIn.collectAsStateWithLifecycle()
+    val quickConnectAvailable by viewModel.quickConnectAvailable.collectAsStateWithLifecycle()
+    val quickConnectCode by viewModel.quickConnectCode.collectAsStateWithLifecycle()
+    val isQuickConnecting by viewModel.isQuickConnecting.collectAsStateWithLifecycle()
+    val errorMessage by viewModel.errorMessage.collectAsStateWithLifecycle()
     val coroutineScope = rememberCoroutineScope()
 
-    val state = remember(serverUrl, username, password, errorMessage) {
+    val state = remember(
+        phase,
+        serverUrl,
+        selectedServer,
+        discoveredServers,
+        username,
+        password,
+        isSearching,
+        isLoggingIn,
+        quickConnectAvailable,
+        quickConnectCode,
+        isQuickConnecting,
+        errorMessage
+    ) {
         LoginContentState(
+            phase = if (phase == LoginViewModel.Phase.LOGIN) {
+                LoginContentPhase.Login
+            } else {
+                LoginContentPhase.ServerSearch
+            },
             serverUrl = serverUrl,
+            selectedServerName = selectedServer?.name,
+            selectedServerUrl = selectedServer?.address,
+            discoveredServers = discoveredServers.map {
+                LoginServerCandidateUi(name = it.name, address = it.address)
+            },
             username = username,
             password = password,
+            isSearching = isSearching,
+            isLoggingIn = isLoggingIn,
+            quickConnectAvailable = quickConnectAvailable,
+            quickConnectCode = quickConnectCode,
+            isQuickConnecting = isQuickConnecting,
             errorMessage = errorMessage
         )
     }
     val callbacks = remember(viewModel, coroutineScope) {
         LoginContentCallbacks(
-            onServerUrlChange = {
+            onServerUrlChange = viewModel::setUrl,
-                viewModel.clearError()
+            onFindServer = viewModel::findServer,
-                viewModel.setUrl(it)
+            onDiscoveredServerClick = {
+                viewModel.selectDiscoveredServer(JellyfinServerCandidate(name = it.name, address = it.address))
             },
+            onChangeServer = viewModel::changeServer,
             onUsernameChange = {
-                viewModel.clearError()
                 viewModel.setUsername(it)
             },
             onPasswordChange = {
-                viewModel.clearError()
                 viewModel.setPassword(it)
             },
             onConnect = {
                 coroutineScope.launch {
-                    isLoggingIn = true
+                    viewModel.login()
-                    try {
-                        viewModel.login()
-                    } finally {
-                        isLoggingIn = false
-                    }
                 }
-            }
+            },
+            onQuickConnect = viewModel::startQuickConnect,
+            onCancelQuickConnect = viewModel::cancelQuickConnect
         )
     }
 
     LoginContent(
         state = state,
         callbacks = callbacks,
-        isLoggingIn = isLoggingIn,
         modifier = modifier
     )
 }

app/src/main/java/hu/bbara/purefin/ui/screen/movie/MovieScreen.kt

@@ -1,47 +1,38 @@
 package hu.bbara.purefin.ui.screen.movie
 
-import android.Manifest
+import android.content.Intent
-import android.os.Build
+import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.activity.compose.rememberLauncherForActivityResult
-import androidx.activity.result.contract.ActivityResultContracts
-import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.rememberScrollState
-import androidx.compose.foundation.verticalScroll
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Scaffold
-import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.remember
-import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Brush
+import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.platform.LocalConfiguration
-import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
 import androidx.hilt.navigation.compose.hiltViewModel
-import hu.bbara.purefin.download.DownloadState
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import hu.bbara.purefin.feature.content.movie.MovieScreenViewModel
+import hu.bbara.purefin.core.download.DownloadState
-import hu.bbara.purefin.image.ArtworkKind
+import hu.bbara.purefin.core.feature.content.movie.MovieScreenViewModel
-import hu.bbara.purefin.image.ImageUrlBuilder
+import hu.bbara.purefin.core.image.ArtworkKind
+import hu.bbara.purefin.core.image.ImageUrlBuilder
+import hu.bbara.purefin.core.navigation.MovieDto
 import hu.bbara.purefin.model.CastMember
 import hu.bbara.purefin.model.Movie
-import hu.bbara.purefin.navigation.MovieDto
+import hu.bbara.purefin.player.PlayerActivity
-import hu.bbara.purefin.ui.common.media.MediaHero
+import hu.bbara.purefin.ui.common.media.MediaDetailActionsUiModel
-import hu.bbara.purefin.ui.common.media.MediaMetadataFlowRow
+import hu.bbara.purefin.ui.common.media.MediaDetailCastUiModel
-import hu.bbara.purefin.ui.common.media.homeMediaSharedBoundsDestination
+import hu.bbara.purefin.ui.common.media.MediaDetailPlaybackSettingsUiModel
-import hu.bbara.purefin.ui.common.media.isHomeMediaSharedBoundsTransitionActive
+import hu.bbara.purefin.ui.common.media.MediaDetailPrimaryActionUiModel
-import hu.bbara.purefin.ui.screen.movie.components.MovieDetails
+import hu.bbara.purefin.ui.common.media.MediaDetailScaffold
+import hu.bbara.purefin.ui.common.media.MediaDetailScaffoldUiModel
+import hu.bbara.purefin.ui.common.media.MediaDetailSecondaryActionUiModel
+import hu.bbara.purefin.ui.common.media.MediaDetailSynopsisUiModel
+import hu.bbara.purefin.ui.common.media.mediaPlayButtonText
+import hu.bbara.purefin.ui.screen.movie.components.MovieWatchedButtonTag
+import hu.bbara.purefin.ui.common.media.mediaPlaybackProgress
+import hu.bbara.purefin.ui.common.permission.rememberNotificationPermissionGate
+import hu.bbara.purefin.ui.screen.movie.components.MovieDownloadButtonTag
+import hu.bbara.purefin.ui.screen.movie.components.MoviePlayButtonTag
 import hu.bbara.purefin.ui.screen.movie.components.MovieTopBar
 import hu.bbara.purefin.ui.screen.waiting.PurefinWaitingScreen
 import hu.bbara.purefin.ui.theme.AppTheme
@@ -49,27 +40,23 @@ import java.util.UUID
 
 @Composable
 fun MovieScreen(
-    movie: MovieDto, viewModel: MovieScreenViewModel = hiltViewModel(), modifier: Modifier = Modifier
+    movie: MovieDto,
+    viewModel: MovieScreenViewModel = hiltViewModel(),
+    modifier: Modifier = Modifier
 ) {
-    LaunchedEffect(movie.id) {
+    LaunchedEffect(movie) {
-        viewModel.selectMovie(movie.id)
+        viewModel.selectMovie(movie)
     }
 
-    val movieItem = viewModel.movie.collectAsState()
+    val movieItem = viewModel.movie.collectAsStateWithLifecycle()
-    val downloadState = viewModel.downloadState.collectAsState()
+    val downloadState = viewModel.downloadState.collectAsStateWithLifecycle()
-
+    val requestNotificationPermission = rememberNotificationPermissionGate()
-    val notificationPermissionLauncher = rememberLauncherForActivityResult(
-        ActivityResultContracts.RequestPermission()
-    ) { granted ->
-        // Proceed with download regardless — notification is nice-to-have
-        viewModel.onDownloadClick()
-    }
 
     val onDownloadClick = {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU
+        if (downloadState.value is DownloadState.NotDownloaded) {
-            && downloadState.value is DownloadState.NotDownloaded
+            requestNotificationPermission {
-        ) {
+                viewModel.onDownloadClick()
-            notificationPermissionLauncher.launch(Manifest.permission.POST_NOTIFICATIONS)
+            }
         } else {
             viewModel.onDownloadClick()
         }
@@ -81,6 +68,7 @@ fun MovieScreen(
             downloadState = downloadState.value,
             onDownloadClick = onDownloadClick,
             onBack = viewModel::onBack,
+            onMarkAsWatched = viewModel::markAsWatched,
             modifier = modifier
         )
     } else {
@@ -88,102 +76,87 @@ fun MovieScreen(
     }
 }
 
+@OptIn(ExperimentalMaterial3Api::class)
 @Composable
 private fun MovieScreenInternal(
     movie: Movie,
     downloadState: DownloadState = DownloadState.NotDownloaded,
     onDownloadClick: () -> Unit = {},
     onBack: () -> Unit,
+    onMarkAsWatched: (Boolean) -> Unit = {},
     modifier: Modifier = Modifier,
 ) {
-    val isHomeMediaTransitionActive = isHomeMediaSharedBoundsTransitionActive()
+    val context = LocalContext.current
+    val playAction = remember(movie.id) {
+        {
+            val intent = Intent(context, PlayerActivity::class.java)
+            intent.putExtra("MEDIA_ID", movie.id.toString())
+            context.startActivity(intent)
+        }
+    }
 
-    Scaffold(
+    MediaDetailScaffold(
+        uiModel = movie.toMediaDetailScaffoldUiModel(
+            onPlayClick = playAction,
+            downloadState = downloadState,
+            onDownloadClick = onDownloadClick,
+            onMarkAsWatched = onMarkAsWatched,
+        ),
         modifier = modifier,
-        containerColor = MaterialTheme.colorScheme.background,
+        topBar = { scrollBehavior ->
-        topBar = {
+            MovieTopBar(
-            if (!isHomeMediaTransitionActive) {
+                onBack = onBack,
-                MovieTopBar(
+                scrollBehavior = scrollBehavior
-                    onBack = onBack,
+            )
-                    modifier = Modifier
+        },
-                )
+    )
-            }
-        }
-    ) { innerPadding ->
-        Column(
-            modifier = Modifier
-                .fillMaxSize()
-                .verticalScroll(rememberScrollState())
-        ) {
-            MediaHeroSection(movie = movie)
-            if (!isHomeMediaTransitionActive) {
-                MovieDetails(
-                    movie = movie,
-                    downloadState = downloadState,
-                    onDownloadClick = onDownloadClick,
-                    modifier = Modifier
-                        .fillMaxWidth()
-                        .padding(horizontal = 16.dp)
-                        .padding(bottom = innerPadding.calculateBottomPadding())
-                )
-            }
-        }
-    }
 }
 
-@Composable
+private fun Movie.toMediaDetailScaffoldUiModel(
-fun MediaHeroSection(
+    onPlayClick: () -> Unit,
-    movie: Movie,
+    downloadState: DownloadState,
-    modifier: Modifier = Modifier) {
+    onDownloadClick: () -> Unit,
-
+    onMarkAsWatched: (Boolean) -> Unit,
-    val scheme = MaterialTheme.colorScheme
+): MediaDetailScaffoldUiModel = MediaDetailScaffoldUiModel(
-    val screenHeight = LocalConfiguration.current.screenHeightDp.dp
+    imageUrl = ImageUrlBuilder.finishImageUrl(imageUrlPrefix, ArtworkKind.PRIMARY),
-    val sectionHeight = screenHeight * 0.4f
+    title = title,
-
+    metadataItems = listOf(year, rating, runtime, format),
-    Box (
+    highlightedMetadataItem = format,
-        modifier = modifier
+    actions = MediaDetailActionsUiModel(
-            .homeMediaSharedBoundsDestination()
+        primaryAction = MediaDetailPrimaryActionUiModel(
-            .height(sectionHeight)
+            text = mediaPlayButtonText(progress, watched),
-    ) {
+            progress = mediaPlaybackProgress(progress),
-        MediaHero(
+            onClick = onPlayClick,
-            imageUrl = ImageUrlBuilder.finishImageUrl(movie.imageUrlPrefix, ArtworkKind.PRIMARY),
+            testTag = MoviePlayButtonTag
-            backgroundColor = MaterialTheme.colorScheme.background,
+        ),
-            modifier = Modifier.fillMaxSize()
+        secondaryActions = listOf(
-        )
+            MediaDetailSecondaryActionUiModel.MarkAsWatched(
-        Box(
+                watched = watched,
-            modifier = Modifier
+                onClick = { onMarkAsWatched(!watched) },
-                .matchParentSize()
+                testTag = MovieWatchedButtonTag
-                .background(
+            ),
-                    Brush.verticalGradient(
+            MediaDetailSecondaryActionUiModel.Download(
-                        colors = listOf(
+                downloadState = downloadState,
-                            Color.Transparent,
+                onClick = onDownloadClick,
-                            Color.Transparent,
+                testTag = MovieDownloadButtonTag
-                            scheme.background.copy(alpha = 0.5f),
-                            scheme.background
-                        )
-                    )
-                    )
-        )
-        Column (
-            modifier = Modifier.fillMaxWidth()
-                .align(Alignment.BottomStart)
-                .padding(16.dp)
-        ) {
-            Text(
-                text = movie.title,
-                color = scheme.onBackground,
-                fontSize = 32.sp,
-                fontWeight = FontWeight.Bold,
-                lineHeight = 38.sp
             )
-            Spacer(modifier = Modifier.height(16.dp))
+        ),
-            MediaMetadataFlowRow(
+        dividerThickness = 4.dp
-                items = listOf(movie.year, movie.rating, movie.runtime, movie.format),
+    ),
-                highlightedItem = movie.format
+    synopsis = MediaDetailSynopsisUiModel(text = synopsis),
-            )
+    playbackSettings = MediaDetailPlaybackSettingsUiModel(
-        }
+        audioTrack = "ENG",
+        subtitles = "ENG"
+    ),
+    cast = if (cast.isNotEmpty()) {
+        MediaDetailCastUiModel(
+            members = cast,
+            topSpacing = 24.dp
+        )
+    } else {
+        null
     }
-}
+)
 
 @Preview(showBackground = true)
 @Composable

app/src/main/java/hu/bbara/purefin/ui/screen/movie/components/MovieComponents.kt

@@ -1,146 +1,41 @@
 package hu.bbara.purefin.ui.screen.movie.components
 
-import android.content.Intent
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.ExperimentalLayoutApi
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.sizeIn
-import androidx.compose.foundation.layout.statusBarsPadding
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.outlined.ArrowBack
 import androidx.compose.material.icons.outlined.Cast
-import androidx.compose.material.icons.outlined.Close
-import androidx.compose.material.icons.outlined.Download
-import androidx.compose.material.icons.outlined.DownloadDone
 import androidx.compose.material.icons.outlined.MoreVert
-import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.Text
+import androidx.compose.material3.TopAppBarScrollBehavior
-import androidx.compose.material3.VerticalDivider
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.remember
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import hu.bbara.purefin.download.DownloadState
-import hu.bbara.purefin.model.Movie
-import hu.bbara.purefin.player.PlayerActivity
 import hu.bbara.purefin.ui.common.button.GhostIconButton
-import hu.bbara.purefin.ui.common.button.MediaActionButton
+import hu.bbara.purefin.ui.screen.home.components.DefaultTopBar
-import hu.bbara.purefin.ui.common.button.MediaResumeButton
-import hu.bbara.purefin.ui.common.media.MediaPlaybackSettings
-import hu.bbara.purefin.ui.common.media.MediaSynopsis
-import hu.bbara.purefin.ui.common.media.mediaPlayButtonText
-import hu.bbara.purefin.ui.common.media.mediaPlaybackProgress
 
+@OptIn(ExperimentalMaterial3Api::class)
 @Composable
 internal fun MovieTopBar(
     onBack: () -> Unit,
-    modifier: Modifier = Modifier
+    scrollBehavior: TopAppBarScrollBehavior? = null,
 ) {
-    Row(
+    DefaultTopBar(
-        modifier = modifier
+        leftActions = {
-            .fillMaxWidth()
+            GhostIconButton(
-            .statusBarsPadding()
+                icon = Icons.Outlined.ArrowBack,
-            .padding(16.dp),
+                contentDescription = "Back",
-        horizontalArrangement = Arrangement.SpaceBetween,
+                onClick = onBack
-        verticalAlignment = Alignment.CenterVertically
+            )
-    ) {
+        },
-        GhostIconButton(
+        rightActions = {
-            icon = Icons.Outlined.ArrowBack,
-            contentDescription = "Back",
-            onClick = onBack
-        )
-        Row(horizontalArrangement = Arrangement.spacedBy(12.dp)) {
             GhostIconButton(icon = Icons.Outlined.Cast, contentDescription = "Cast", onClick = { })
-            GhostIconButton(icon = Icons.Outlined.MoreVert, contentDescription = "More", onClick = { })
+            GhostIconButton(
-        }
+                icon = Icons.Outlined.MoreVert,
-    }
+                contentDescription = "More",
+                onClick = { })
+        },
+        withIcon = false,
+        scrollBehavior = scrollBehavior
+    )
 }
 
-@OptIn(ExperimentalLayoutApi::class)
+internal const val MoviePlayButtonTag = "movie-play-button"
-@Composable
+internal const val MovieDownloadButtonTag = "movie-download-button"
-internal fun MovieDetails(
+internal const val MovieWatchedButtonTag = "movie-watched-button"
-    movie: Movie,
-    downloadState: DownloadState,
-    onDownloadClick: () -> Unit,
-    modifier: Modifier = Modifier
-) {
-    val scheme = MaterialTheme.colorScheme
-
-    val context = LocalContext.current
-    val playAction = remember(movie.id) {
-        {
-            val intent = Intent(context, PlayerActivity::class.java)
-            intent.putExtra("MEDIA_ID", movie.id.toString())
-            context.startActivity(intent)
-        }
-    }
-
-    Column(modifier = modifier) {
-        MediaSynopsis(
-            synopsis = movie.synopsis
-        )
-        Spacer(modifier = Modifier.height(24.dp))
-
-        Row() {
-            MediaResumeButton(
-                text = mediaPlayButtonText(movie.progress, movie.watched),
-                progress = mediaPlaybackProgress(movie.progress),
-                onClick = playAction,
-                modifier = Modifier.sizeIn(maxWidth = 200.dp)
-            )
-            VerticalDivider(
-                color = MaterialTheme.colorScheme.secondary,
-                thickness = 4.dp,
-                modifier = Modifier
-                    .height(48.dp)
-                    .padding(horizontal = 16.dp, vertical = 8.dp)
-            )
-            Row() {
-                MediaActionButton(
-                    backgroundColor = MaterialTheme.colorScheme.surface,
-                    iconColor = MaterialTheme.colorScheme.onSurface,
-                    icon = when (downloadState) {
-                        is DownloadState.NotDownloaded -> Icons.Outlined.Download
-                        is DownloadState.Downloading -> Icons.Outlined.Close
-                        is DownloadState.Downloaded -> Icons.Outlined.DownloadDone
-                        is DownloadState.Failed -> Icons.Outlined.Download
-                    },
-                    height = 48.dp,
-                    onClick = onDownloadClick
-                )
-            }
-        }
-        Spacer(modifier = Modifier.height(24.dp))
-
-        MediaPlaybackSettings(
-            backgroundColor = MaterialTheme.colorScheme.surface,
-            foregroundColor = MaterialTheme.colorScheme.onSurface,
-            audioTrack = "ENG",
-            subtitles = "ENG"
-        )
-
-        if (movie.cast.isNotEmpty()) {
-            Spacer(modifier = Modifier.height(24.dp))
-            Text(
-                text = "Cast",
-                color = scheme.onBackground,
-                fontSize = 18.sp,
-                fontWeight = FontWeight.Bold
-            )
-            Spacer(modifier = Modifier.height(12.dp))
-            //TODO fix
-//            MediaCastRow(
-//                cast = movie.cast,
-//            )
-        }
-    }
-}

app/src/main/java/hu/bbara/purefin/ui/screen/player/PlayerScreen.kt

@@ -3,6 +3,7 @@ package hu.bbara.purefin.ui.screen.player
 import android.app.Activity
 import android.content.Context
 import android.media.AudioManager
+import android.provider.Settings
 import androidx.annotation.OptIn
 import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.animation.fadeIn
@@ -11,8 +12,11 @@ import androidx.compose.animation.slideInHorizontally
 import androidx.compose.animation.slideOutHorizontally
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.icons.Icons
@@ -21,11 +25,11 @@ import androidx.compose.material.icons.outlined.VolumeUp
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableFloatStateOf
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -34,25 +38,40 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.viewinterop.AndroidView
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.compose.LifecycleEventEffect
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.media3.common.util.UnstableApi
 import androidx.media3.ui.AspectRatioFrameLayout
 import androidx.media3.ui.PlayerView
 import androidx.media3.ui.SubtitleView
-import hu.bbara.purefin.player.viewmodel.PlayerViewModel
+import hu.bbara.purefin.core.player.model.TimedMarker
+import hu.bbara.purefin.core.player.viewmodel.PlayerViewModel
+import hu.bbara.purefin.model.SegmentType
 import hu.bbara.purefin.ui.common.visual.EmptyValueTimedVisibility
 import hu.bbara.purefin.ui.common.visual.ValueChangeTimedVisibility
+import hu.bbara.purefin.ui.screen.player.components.NextEpisodeOverlay
 import hu.bbara.purefin.ui.screen.player.components.PersistentOverlayContainer
 import hu.bbara.purefin.ui.screen.player.components.PlayerAdjustmentIndicator
 import hu.bbara.purefin.ui.screen.player.components.PlayerControlsOverlay
 import hu.bbara.purefin.ui.screen.player.components.PlayerGesturesLayer
 import hu.bbara.purefin.ui.screen.player.components.PlayerLoadingErrorEndCard
 import hu.bbara.purefin.ui.screen.player.components.PlayerQueuePanel
+import hu.bbara.purefin.ui.screen.player.components.PlayerSeekBarTrack
+import hu.bbara.purefin.ui.screen.player.components.PlayerTimeRow
 import hu.bbara.purefin.ui.screen.player.components.SkipSegmentButton
 import hu.bbara.purefin.ui.screen.player.components.rememberPersistentOverlayController
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
 import kotlin.math.abs
 import kotlin.math.roundToInt
 
 private const val CONTROLS_VISIBLE_SUBTITLE_BOTTOM_PADDING_FRACTION = 0.32f
+private const val BRIGHTNESS_DRAG_SENSITIVITY = 800f
+private const val BRIGHTNESS_AUTO_ENTER_THRESHOLD = 0.15f
+private const val BRIGHTNESS_AUTO_EXIT_THRESHOLD = 0.15f
+private const val CONTROLS_AUTO_HIDE_MS = 3_000L
 
 @OptIn(UnstableApi::class)
 @Composable
@@ -60,33 +79,121 @@ fun PlayerScreen(
     viewModel: PlayerViewModel,
     onBack: () -> Unit
 ) {
-    val uiState by viewModel.uiState.collectAsState()
+    val scope = rememberCoroutineScope()
-    val controlsVisible by viewModel.controlsVisible.collectAsState()
+    var hideControlsJob: Job? by remember { mutableStateOf(null) }
+
+    val uiState by viewModel.uiState.collectAsStateWithLifecycle()
+    var controlsVisible by remember { mutableStateOf(true) }
+    var controlsHasPopupOpen by remember { mutableStateOf(false) }
+
     val context = LocalContext.current
     val activity = context as? Activity
 
     val audioManager = remember { context.getSystemService(Context.AUDIO_SERVICE) as AudioManager }
     val maxVolume = remember { audioManager.getStreamMaxVolume(AudioManager.STREAM_MUSIC).coerceAtLeast(1) }
-    var volume by remember { mutableStateOf(audioManager.getStreamVolume(AudioManager.STREAM_MUSIC) / maxVolume.toFloat()) }
+    var volume by remember { mutableFloatStateOf(audioManager.getStreamVolume(AudioManager.STREAM_MUSIC) / maxVolume.toFloat()) }
-    var brightness by remember { mutableStateOf(readCurrentBrightness(activity)) }
+    var brightness by remember { mutableFloatStateOf(readCurrentBrightness(activity, context)) }
+    var isAutoBrightness by remember { mutableStateOf(false) }
+    var dragOvershoot by remember { mutableFloatStateOf(0f) }
+    var autoDragTick by remember { mutableStateOf(0) }
+    val originalScreenBrightness by remember { mutableFloatStateOf(activity?.window?.attributes?.screenBrightness ?: -1f) }
     var showQueuePanel by remember { mutableStateOf(false) }
     var horizontalSeekFeedback by remember { mutableStateOf<Long?>(null) }
+    var horizontalSeekPreviewPositionMs by remember { mutableStateOf<Long?>(null) }
     val overlayController = rememberPersistentOverlayController()
 
-    LaunchedEffect(uiState.isPlaying) {
-        if (uiState.isPlaying) {
-            showQueuePanel = false
-        }
-    }
-
-    val playerControlsVisible = controlsVisible || uiState.isEnded || uiState.error != null
     val subtitleBottomPaddingFraction =
-        if (playerControlsVisible) {
+        if (controlsVisible) {
             CONTROLS_VISIBLE_SUBTITLE_BOTTOM_PADDING_FRACTION
         } else {
             SubtitleView.DEFAULT_BOTTOM_PADDING_FRACTION
         }
 
+
+    val showSkipIntroButton = !controlsVisible && uiState.activeSkippableSegmentEndMs != null && uiState.activeSkippableSegmentType == SegmentType.INTRO
+    val showNextEpisodeOverlay = !controlsVisible
+            && uiState.nextEpisode != null
+            && uiState.durationMs > 0L
+            && ((uiState.durationMs - uiState.positionMs) <= 60_000L || uiState.activeSkippableSegmentType == SegmentType.OUTRO)
+            && !uiState.isEnded
+
+
+    fun toggleControlsVisibility() {
+        controlsVisible = !controlsVisible
+    }
+    fun hideControls() {
+        controlsVisible = false
+    }
+    fun hideControlsWithTimeout() {
+        hideControlsJob?.cancel()
+        if (controlsVisible && !controlsHasPopupOpen && !uiState.isEnded && uiState.error == null) {
+            hideControlsJob = scope.launch {
+                delay(CONTROLS_AUTO_HIDE_MS)
+                hideControls()
+            }
+        }
+    }
+    fun onScreenTap() {
+        toggleControlsVisibility()
+        hideControlsWithTimeout()
+    }
+    fun onBrightnessDragStart(isLeftSide: Boolean) {
+        if (isLeftSide) {
+            dragOvershoot = 0f
+        }
+    }
+    fun onBrightnessDragEnd() {
+        dragOvershoot = 0f
+    }
+    fun onBrightnessDrag(delta: Float) {
+        val diff = -delta / BRIGHTNESS_DRAG_SENSITIVITY
+        if (isAutoBrightness) {
+            if (diff > 0f) {
+                dragOvershoot += diff
+                if (dragOvershoot >= BRIGHTNESS_AUTO_EXIT_THRESHOLD) {
+                    isAutoBrightness = false
+                    brightness = (dragOvershoot - BRIGHTNESS_AUTO_EXIT_THRESHOLD).coerceIn(0f, 1f)
+                    dragOvershoot = 0f
+                    applyBrightness(activity, brightness, isAuto = false)
+                }
+            } else {
+                autoDragTick++
+            }
+        } else {
+            val newBrightness = brightness + diff
+            if (newBrightness <= 0f) {
+                brightness = 0f
+                applyBrightness(activity, brightness, isAuto = false)
+                dragOvershoot += newBrightness
+                if (dragOvershoot <= -BRIGHTNESS_AUTO_ENTER_THRESHOLD) {
+                    isAutoBrightness = true
+                    dragOvershoot = 0f
+                    applyBrightness(activity, brightness, isAuto = true)
+                }
+            } else {
+                brightness = newBrightness.coerceIn(0f, 1f)
+                dragOvershoot = 0f
+                applyBrightness(activity, brightness, isAuto = false)
+            }
+        }
+    }
+    fun onVolumeDrag(delta: Float) {
+        val diff = -delta / 800f
+        volume = (volume + diff).coerceIn(0f, 1f)
+        audioManager.setStreamVolume(
+            AudioManager.STREAM_MUSIC,
+            (volume * maxVolume).roundToInt(),
+            0
+        )
+    }
+    LifecycleEventEffect(Lifecycle.Event.ON_START) {
+        hideControlsWithTimeout()
+    }
+    LifecycleEventEffect(Lifecycle.Event.ON_STOP) {
+        restoreBrightness(activity, originalScreenBrightness)
+    }
+
+
     Box(
         modifier = Modifier
             .fillMaxSize()
@@ -105,6 +212,9 @@ fun PlayerScreen(
                 it.player = viewModel.player
                 it.subtitleView?.setBottomPaddingFraction(subtitleBottomPaddingFraction)
             },
+            onRelease = { playerView ->
+                playerView.player = null
+            },
             modifier = Modifier
                 .fillMaxHeight()
                 .align(Alignment.Center)
@@ -112,57 +222,78 @@ fun PlayerScreen(
 
         PlayerGesturesLayer(
             modifier = Modifier.align(Alignment.BottomCenter),
-            onTap = { viewModel.toggleControlsVisibility() },
+            controlsVisible = controlsVisible,
+            onTap = ::onScreenTap,
             onDoubleTapRight = { viewModel.seekBy(30_000) },
             onDoubleTapLeft = { viewModel.seekBy(-10_000) },
             onDoubleTapCenter = { viewModel.togglePlayPause() },
-            onVerticalDragLeft = { delta ->
+            onVerticalDragStart = ::onBrightnessDragStart,
-                val diff = (-delta / 800f)
+            onVerticalDragEnd = ::onBrightnessDragEnd,
-                brightness = (brightness + diff).coerceIn(0f, 1f)
+            onVerticalDragLeft = ::onBrightnessDrag,
-                applyBrightness(activity, brightness)
+            onVerticalDragRight = ::onVolumeDrag,
-            },
+            onHorizontalDragPreview = { deltaMs, previewPositionMs ->
-            onVerticalDragRight = { delta ->
+                horizontalSeekFeedback = deltaMs
-                val diff = (-delta / 800f)
+                horizontalSeekPreviewPositionMs = previewPositionMs?.let {
-                volume = (volume + diff).coerceIn(0f, 1f)
+                    if (uiState.durationMs > 0L) {
-                audioManager.setStreamVolume(
+                        it.coerceIn(0L, uiState.durationMs)
-                    AudioManager.STREAM_MUSIC,
+                    } else {
-                    (volume * maxVolume).roundToInt(),
+                        it.coerceAtLeast(0L)
-                    0
+                    }
-                )
+                }
-            },
-            onHorizontalDragPreview = {
-                horizontalSeekFeedback = it
             },
             onHorizontalDragSeekTo = {
                 viewModel.seekTo(it)
             },
-            currentPositionProvider = { uiState.positionMs }
+            currentPositionProvider = { uiState.positionMs },
         )
 
         EmptyValueTimedVisibility(
             value = horizontalSeekFeedback,
-            hideAfterMillis = 1_000
+            hideAfterMillis = 1_000,
+            modifier = Modifier
+                .align(Alignment.Center)
         ) {
             SeekAmountIndicator(
                 deltaMs = it,
-                modifier = Modifier
-                    .align(Alignment.Center)
             )
         }
 
+        EmptyValueTimedVisibility(
+            value = horizontalSeekPreviewPositionMs,
+            hideAfterMillis = 1_000,
+            modifier = Modifier
+                .align(Alignment.BottomCenter)
+                .padding(horizontal = 24.dp, vertical = 28.dp)
+        ) { previewPositionMs ->
+            if (!controlsVisible) {
+                HiddenSeekTimeline(
+                    positionMs = previewPositionMs,
+                    durationMs = uiState.durationMs,
+                    bufferedMs = uiState.bufferedMs,
+                    chapterMarkers = uiState.chapters,
+                    adMarkers = uiState.ads,
+                    isLive = uiState.isLive
+                )
+            }
+        }
+
         ValueChangeTimedVisibility(
-            value = brightness,
+            value = BrightnessUiState(brightness, isAutoBrightness, autoDragTick),
             hideAfterMillis = 800,
             modifier = Modifier
                 .align(Alignment.CenterStart)
                 .padding(start = 20.dp)
-        ) { currentBrightness ->
+        ) { state ->
             PlayerAdjustmentIndicator(
-                modifier = Modifier
+                modifier = Modifier.align(Alignment.Center),
-                    .align(Alignment.Center),
                 icon = Icons.Outlined.BrightnessMedium,
                 contentDescription = "Brightness",
-                value = currentBrightness
+                value = state.brightness,
+                bottomText = if (state.isAuto) {
+                    "Auto"
+                } else {
+                    "${(state.brightness * 100).roundToInt()}%"
+                }
             )
         }
 
@@ -178,19 +309,19 @@ fun PlayerScreen(
                     .align(Alignment.Center),
                 icon = Icons.Outlined.VolumeUp,
                 contentDescription = "Volume",
-                value = currentVolume
+                value = currentVolume,
+                bottomText = "${(currentVolume.coerceIn(0f, 1f) * 100).roundToInt()}%"
             )
         }
 
         AnimatedVisibility(
-            visible = playerControlsVisible,
+            visible = controlsVisible,
             enter = fadeIn(),
             exit = fadeOut()
         ) {
             PlayerControlsOverlay(
                 modifier = Modifier.fillMaxSize(),
                 uiState = uiState,
-                showControls = controlsVisible,
                 overlayController = overlayController,
                 onBack = onBack,
                 onPlayPause = { viewModel.togglePlayPause() },
@@ -201,20 +332,45 @@ fun PlayerScreen(
                 onNext = { viewModel.next() },
                 onPrevious = { viewModel.previous() },
                 onSelectTrack = { viewModel.selectTrack(it) },
-                onQueueSelected = { viewModel.playQueueItem(it) },
                 onOpenQueue = { showQueuePanel = true }
             )
         }
 
         AnimatedVisibility(
-            visible = !playerControlsVisible && uiState.activeSkippableSegmentEndMs != null,
+            visible = showSkipIntroButton,
+            enter = fadeIn(),
+            exit = fadeOut(),
+            modifier = Modifier
+                .align(Alignment.CenterEnd)
+                .padding(
+                    end = 24.dp,
+                )
+        ) {
+            SkipSegmentButton(
+                size = 72.dp,
+                fontSize = 22,
+                onClick = { viewModel.skipActiveSegment() }
+            )
+        }
+
+
+        AnimatedVisibility(
+            visible = showNextEpisodeOverlay,
             enter = fadeIn(),
             exit = fadeOut(),
             modifier = Modifier
                 .align(Alignment.BottomEnd)
-                .padding(end = 24.dp, bottom = 24.dp)
+                .padding(
+                    end = 24.dp,
+                    bottom = 24.dp
+                )
         ) {
-            SkipSegmentButton(onClick = { viewModel.skipActiveSegment() })
+            uiState.nextEpisode?.let { nextEpisode ->
+                NextEpisodeOverlay(
+                    nextEpisode = nextEpisode,
+                    onClick = { viewModel.next() }
+                )
+            }
         }
 
         PlayerLoadingErrorEndCard(
@@ -252,6 +408,48 @@ fun PlayerScreen(
     }
 }
 
+@Composable
+private fun HiddenSeekTimeline(
+    positionMs: Long,
+    durationMs: Long,
+    bufferedMs: Long,
+    chapterMarkers: List<TimedMarker>,
+    adMarkers: List<TimedMarker>,
+    isLive: Boolean,
+    modifier: Modifier = Modifier
+) {
+    val safeDuration = durationMs.takeIf { it > 0 } ?: 1L
+
+    Column(
+        modifier = modifier
+            .fillMaxWidth()
+            .clip(RoundedCornerShape(16.dp))
+            .background(Color.Transparent)
+            .padding(horizontal = 16.dp, vertical = 10.dp)
+    ) {
+        PlayerTimeRow(
+            positionMs = positionMs,
+            durationMs = durationMs,
+            isLive = isLive,
+            onSeekLiveEdge = null
+        )
+        PlayerSeekBarTrack(
+            positionMs = positionMs,
+            durationMs = safeDuration,
+            bufferedMs = bufferedMs,
+            chapterMarkers = chapterMarkers,
+            adMarkers = adMarkers,
+            modifier = Modifier
+                .fillMaxWidth()
+                .height(28.dp),
+            isFocused = false,
+            focusedTrackHeight = 4.dp,
+            focusedThumbRadius = 6.dp,
+            focusedThumbHaloRadiusDelta = 0.dp
+        )
+    }
+}
+
 @Composable
 private fun SeekAmountIndicator(deltaMs: Long, modifier: Modifier = Modifier) {
     val scheme = MaterialTheme.colorScheme
@@ -282,14 +480,34 @@ private fun formatSeekDelta(deltaMs: Long): String {
     }
 }
 
-private fun readCurrentBrightness(activity: Activity?): Float {
+private data class BrightnessUiState(val brightness: Float, val isAuto: Boolean, val dragTick: Int)
-    val current = activity?.window?.attributes?.screenBrightness
+
-    return if (current != null && current >= 0) current else 0.5f
+private fun readCurrentBrightness(activity: Activity?, context: Context): Float {
+    val windowBrightness = activity?.window?.attributes?.screenBrightness
+    if (windowBrightness != null && windowBrightness >= 0f) {
+        return windowBrightness
+    }
+    return try {
+        val systemBrightness = Settings.System.getInt(
+            context.contentResolver,
+            Settings.System.SCREEN_BRIGHTNESS
+        )
+        (systemBrightness / 255f).coerceIn(0f, 1f)
+    } catch (e: Settings.SettingNotFoundException) {
+        0.5f
+    }
 }
 
-private fun applyBrightness(activity: Activity?, value: Float) {
+private fun applyBrightness(activity: Activity?, brightness: Float, isAuto: Boolean) {
     activity ?: return
     val params = activity.window.attributes
-    params.screenBrightness = value
+    params.screenBrightness = if (isAuto) -1f else brightness
+    activity.window.attributes = params
+}
+
+private fun restoreBrightness(activity: Activity?, originalValue: Float) {
+    activity ?: return
+    val params = activity.window.attributes
+    params.screenBrightness = originalValue
     activity.window.attributes = params
 }

app/src/main/java/hu/bbara/purefin/ui/screen/player/components/NextEpisodeOverlay.kt

@@ -0,0 +1,106 @@
+package hu.bbara.purefin.ui.screen.player.components
+
+import androidx.compose.foundation.background
+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.Spacer
+import androidx.compose.foundation.layout.aspectRatio
+import androidx.compose.foundation.layout.fillMaxWidth
+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.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.Brush
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.dp
+import hu.bbara.purefin.core.player.model.PlaylistElementUiModel
+import hu.bbara.purefin.ui.common.image.PurefinAsyncImage
+
+/**
+ * Overlay button that appears near the end of a media item to let the user
+ * quickly jump to the next episode. Shows the next episode's artwork and title.
+ */
+@Composable
+fun NextEpisodeOverlay(
+    nextEpisode: PlaylistElementUiModel,
+    onClick: () -> Unit,
+    modifier: Modifier = Modifier
+) {
+    val scheme = MaterialTheme.colorScheme
+
+    Column(
+        modifier = modifier
+            .width(200.dp)
+            .clip(RoundedCornerShape(16.dp))
+            .background(Color.Black.copy(alpha = 0.85f))
+            .clickable { onClick() },
+        verticalArrangement = Arrangement.spacedBy(0.dp)
+    ) {
+        // "Up Next" label
+        Text(
+            text = "Up Next",
+            color = scheme.secondary,
+            style = MaterialTheme.typography.labelSmall,
+            fontWeight = FontWeight.Bold,
+            maxLines = 1,
+            modifier = Modifier.padding(start = 12.dp, top = 8.dp, end = 12.dp)
+        )
+
+        Spacer(modifier = Modifier.height(4.dp))
+
+        // Thumbnail with play button overlay
+        Box(
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(horizontal = 12.dp)
+                .aspectRatio(16f / 9f)
+                .clip(RoundedCornerShape(8.dp))
+        ) {
+            PurefinAsyncImage(
+                model = nextEpisode.artworkUrl,
+                contentDescription = nextEpisode.title,
+                modifier = Modifier.matchParentSize(),
+                contentScale = ContentScale.Crop
+            )
+
+            // Dark gradient overlay for readability
+            Box(
+                modifier = Modifier
+                    .matchParentSize()
+                    .background(
+                        Brush.verticalGradient(
+                            colors = listOf(
+                                Color.Black.copy(alpha = 0.1f),
+                                Color.Black.copy(alpha = 0.4f)
+                            )
+                        )
+                    )
+            )
+        }
+
+        Spacer(modifier = Modifier.height(8.dp))
+
+        // Episode title
+        Text(
+            text = nextEpisode.title,
+            color = scheme.onSurface,
+            style = MaterialTheme.typography.bodySmall,
+            fontWeight = FontWeight.Medium,
+            maxLines = 2,
+            overflow = TextOverflow.Ellipsis,
+            modifier = Modifier.padding(start = 12.dp, end = 12.dp, bottom = 10.dp)
+        )
+    }
+}
+
+internal const val PlayerNextEpisodeOverlayTag = "player_next_episode_overlay"

app/src/main/java/hu/bbara/purefin/ui/screen/player/components/PlayerAdjustmentIndicator.kt

@@ -13,6 +13,8 @@ import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
@@ -20,7 +22,6 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
-import kotlin.math.roundToInt
 
 @Composable
 fun PlayerAdjustmentIndicator(
@@ -28,11 +29,15 @@ fun PlayerAdjustmentIndicator(
     icon: ImageVector,
     contentDescription: String?,
     value: Float,
+    bottomText: String? = null,
     sliderHeight: Dp = 140.dp,
 ) {
     val scheme = MaterialTheme.colorScheme
-    val percent = (value.coerceIn(0f, 1f) * 100).roundToInt()
     val clamped = value.coerceIn(0f, 1f)
+    val previousBottomText = remember { mutableStateOf("-") }
+    if (bottomText != null) {
+        previousBottomText.value = bottomText
+    }
 
     Box(
         modifier = modifier
@@ -69,7 +74,7 @@ fun PlayerAdjustmentIndicator(
             }
             Spacer(modifier = Modifier.height(16.dp))
             Text(
-                text = "$percent%",
+                text = previousBottomText.value,
                 color = scheme.onSurface,
                 style = MaterialTheme.typography.titleMedium
             )

app/src/main/java/hu/bbara/purefin/ui/screen/player/components/PlayerControlsOverlay.kt

@@ -10,11 +10,7 @@ import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.heightIn
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.layout.width
-import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.outlined.ArrowBack
 import androidx.compose.material.icons.outlined.Cast
@@ -26,31 +22,26 @@ import androidx.compose.material.icons.outlined.PlaylistPlay
 import androidx.compose.material.icons.outlined.Replay10
 import androidx.compose.material.icons.outlined.SkipNext
 import androidx.compose.material.icons.outlined.SkipPrevious
-import androidx.compose.material3.ButtonDefaults
-import androidx.compose.material3.FilledTonalButton
-import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
-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.graphics.Brush
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
-import hu.bbara.purefin.player.model.PlayerUiState
+import hu.bbara.purefin.core.player.model.PlayerUiState
-import hu.bbara.purefin.player.model.TrackOption
+import hu.bbara.purefin.core.player.model.TrackOption
+import hu.bbara.purefin.ui.common.button.CircularTextButton
 import hu.bbara.purefin.ui.common.button.GhostIconButton
 import hu.bbara.purefin.ui.common.button.PurefinIconButton
 
 @Composable
 fun PlayerControlsOverlay(
     uiState: PlayerUiState,
-    showControls: Boolean,
     overlayController: PersistentOverlayController,
     onBack: () -> Unit,
     onPlayPause: () -> Unit,
@@ -61,16 +52,14 @@ fun PlayerControlsOverlay(
     onNext: () -> Unit,
     onPrevious: () -> Unit,
     onSelectTrack: (TrackOption) -> Unit,
-    onQueueSelected: (String) -> Unit,
     onOpenQueue: () -> Unit,
-    modifier: Modifier = Modifier
+    modifier: Modifier = Modifier,
 ) {
-    val scheme = MaterialTheme.colorScheme
-    var scrubbing by remember { mutableStateOf(false) }
 
     Box(
         modifier = modifier
             .fillMaxSize()
+            .testTag(PlayerControlsOverlayTag)
             .background(
                 Brush.verticalGradient(
                     listOf(
@@ -97,11 +86,8 @@ fun PlayerControlsOverlay(
             )
             BottomSection(
                 uiState = uiState,
-                scrubbing = scrubbing,
                 overlayController = overlayController,
-                onScrubStart = { scrubbing = true },
                 onScrub = onSeek,
-                onScrubFinished = { scrubbing = false },
                 onNext = onNext,
                 onPrevious = onPrevious,
                 onPlayPause = onPlayPause,
@@ -110,7 +96,6 @@ fun PlayerControlsOverlay(
                 onSeekLiveEdge = onSeekLiveEdge,
                 onSkipSegment = onSkipSegment,
                 onSelectTrack = onSelectTrack,
-                onQueueSelected = onQueueSelected,
                 modifier = Modifier.align(Alignment.BottomCenter)
             )
         }
@@ -150,6 +135,7 @@ private fun TopBar(
             GhostIconButton(
                 icon = Icons.Outlined.PlaylistPlay,
                 contentDescription = "Queue",
+                modifier = Modifier.testTag(PlayerQueueButtonTag),
                 onClick = onOpenQueue
             )
             GhostIconButton(icon = Icons.Outlined.Cast, contentDescription = "Cast", onClick = onCast)
@@ -161,11 +147,8 @@ private fun TopBar(
 @Composable
 private fun BottomSection(
     uiState: PlayerUiState,
-    scrubbing: Boolean,
     overlayController: PersistentOverlayController,
-    onScrubStart: () -> Unit,
     onScrub: (Long) -> Unit,
-    onScrubFinished: () -> Unit,
     onNext: () -> Unit,
     onPrevious: () -> Unit,
     onPlayPause: () -> Unit,
@@ -174,43 +157,16 @@ private fun BottomSection(
     onSeekLiveEdge: () -> Unit,
     onSkipSegment: () -> Unit,
     onSelectTrack: (TrackOption) -> Unit,
-    onQueueSelected: (String) -> Unit,
     modifier: Modifier = Modifier
 ) {
-    val scheme = MaterialTheme.colorScheme
     Column(modifier = modifier) {
-        Row(
+        PlayerTimeRow(
-            modifier = Modifier
+            positionMs = uiState.positionMs,
-                .fillMaxWidth()
+            durationMs = uiState.durationMs,
-                .padding(horizontal = 8.dp),
+            isLive = uiState.isLive,
-            horizontalArrangement = Arrangement.SpaceBetween,
+            onSeekLiveEdge = onSeekLiveEdge,
-            verticalAlignment = Alignment.CenterVertically
+            modifier = Modifier.padding(horizontal = 8.dp)
-        ) {
+        )
-            Text(
-                text = formatTime(uiState.positionMs),
-                color = scheme.onSurface,
-                style = MaterialTheme.typography.bodySmall
-            )
-            if (uiState.isLive) {
-                Row(
-                    horizontalArrangement = Arrangement.spacedBy(12.dp),
-                    verticalAlignment = Alignment.CenterVertically
-                ) {
-                    Text(text = "LIVE", color = scheme.primary, fontWeight = FontWeight.Bold)
-                    Text(
-                        text = "Catch up",
-                        color = scheme.onSurface,
-                        modifier = Modifier.clickable { onSeekLiveEdge() }
-                    )
-                }
-            } else {
-                Text(
-                    text = formatTime(uiState.durationMs),
-                    color = scheme.onSurface,
-                    style = MaterialTheme.typography.bodySmall
-                )
-            }
-        }
         PlayerSeekBar(
             positionMs = uiState.positionMs,
             durationMs = uiState.durationMs,
@@ -218,8 +174,7 @@ private fun BottomSection(
             chapterMarkers = uiState.chapters,
             adMarkers = uiState.ads,
             onSeek = onScrub,
-            onScrubStarted = onScrubStart,
+            modifier = Modifier.testTag(PlayerSeekBarTag)
-            onScrubFinished = onScrubFinished
         )
         Spacer(modifier = Modifier.height(8.dp))
         Box(
@@ -236,30 +191,35 @@ private fun BottomSection(
                     icon = Icons.Outlined.SkipPrevious,
                     contentDescription = "Previous",
                     onClick = onPrevious,
+                    modifier = Modifier.testTag(PlayerPreviousButtonTag),
                     size = 64
                 )
                 PurefinIconButton(
                     icon = Icons.Outlined.Replay10,
                     contentDescription = "Seek backward",
                     onClick = onSeekBackward,
+                    modifier = Modifier.testTag(PlayerSeekBackwardButtonTag),
                     size = 64
                 )
                 PurefinIconButton(
                     icon = if (uiState.isPlaying) Icons.Outlined.Pause else Icons.Outlined.PlayArrow,
                     contentDescription = "Play/Pause",
                     onClick = onPlayPause,
+                    modifier = Modifier.testTag(PlayerPlayPauseButtonTag),
                     size = 64
                 )
                 PurefinIconButton(
                     icon = Icons.Outlined.Forward30,
                     contentDescription = "Seek forward",
                     onClick = onSeekForward,
+                    modifier = Modifier.testTag(PlayerSeekForwardButtonTag),
                     size = 64
                 )
                 PurefinIconButton(
                     icon = Icons.Outlined.SkipNext,
                     contentDescription = "Next",
                     onClick = onNext,
+                    modifier = Modifier.testTag(PlayerNextButtonTag),
                     size = 64
                 )
             }
@@ -290,7 +250,9 @@ private fun BottomSection(
             if (uiState.activeSkippableSegmentEndMs != null) {
                 SkipSegmentButton(
                     onClick = onSkipSegment,
-                    modifier = Modifier.align(Alignment.CenterEnd)
+                    modifier = Modifier
+                        .align(Alignment.CenterEnd)
+                        .testTag(PlayerSkipSegmentButtonTag)
                 )
             }
         }
@@ -298,34 +260,77 @@ private fun BottomSection(
     }
 }
 
+internal const val PlayerControlsOverlayTag = "player-controls-overlay"
+internal const val PlayerQueueButtonTag = "player_queue_button"
+internal const val PlayerSeekBarTag = "player_seek_bar"
+internal const val PlayerPreviousButtonTag = "player_previous_button"
+internal const val PlayerSeekBackwardButtonTag = "player_seek_backward_button"
+internal const val PlayerPlayPauseButtonTag = "player_play_pause_button"
+internal const val PlayerSeekForwardButtonTag = "player_seek_forward_button"
+internal const val PlayerNextButtonTag = "player_next_button"
+internal const val PlayerSkipSegmentButtonTag = "player_skip_segment_button"
+
 @Composable
 fun SkipSegmentButton(
     onClick: () -> Unit,
+    fontSize: Int = 18,
+    size: Dp = 52.dp,
     modifier: Modifier = Modifier
 ) {
     val scheme = MaterialTheme.colorScheme
 
-    FilledTonalButton(
+    CircularTextButton(
+        text = "Skip",
+        textColor = scheme.onSecondary,
+        fontSize = fontSize,
+        containerColor = scheme.secondary,
+        size = size,
         onClick = onClick,
-        modifier = modifier.heightIn(min = 44.dp),
+        modifier = modifier
-        shape = RoundedCornerShape(50),
+    )
-        colors = ButtonDefaults.filledTonalButtonColors(
+}
-            containerColor = scheme.secondary.copy(alpha = 0.92f),
+
-            contentColor = scheme.onSecondary
+@Composable
-        ),
+internal fun PlayerTimeRow(
-        contentPadding = ButtonDefaults.ButtonWithIconContentPadding
+    positionMs: Long,
+    durationMs: Long,
+    isLive: Boolean,
+    onSeekLiveEdge: (() -> Unit)?,
+    modifier: Modifier = Modifier
+) {
+    val scheme = MaterialTheme.colorScheme
+
+    Row(
+        modifier = modifier.fillMaxWidth(),
+        horizontalArrangement = Arrangement.SpaceBetween,
+        verticalAlignment = Alignment.CenterVertically
     ) {
         Text(
-            text = "Skip",
+            text = formatTime(positionMs),
-            style = MaterialTheme.typography.labelLarge,
+            color = scheme.onSurface,
-            fontWeight = FontWeight.Bold
+            style = MaterialTheme.typography.bodySmall
-        )
-        Spacer(modifier = Modifier.width(8.dp))
-        Icon(
-            imageVector = Icons.Outlined.SkipNext,
-            contentDescription = null,
-            modifier = Modifier.size(18.dp)
         )
+        if (isLive) {
+            Row(
+                horizontalArrangement = Arrangement.spacedBy(12.dp),
+                verticalAlignment = Alignment.CenterVertically
+            ) {
+                Text(text = "LIVE", color = scheme.primary, fontWeight = FontWeight.Bold)
+                if (onSeekLiveEdge != null) {
+                    Text(
+                        text = "Catch up",
+                        color = scheme.onSurface,
+                        modifier = Modifier.clickable { onSeekLiveEdge() }
+                    )
+                }
+            }
+        } else {
+            Text(
+                text = formatTime(durationMs),
+                color = scheme.onSurface,
+                style = MaterialTheme.typography.bodySmall
+            )
+        }
     }
 }
 

app/src/main/java/hu/bbara/purefin/ui/screen/player/components/PlayerGesturesLayer.kt

@@ -10,6 +10,7 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberUpdatedState
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.input.pointer.pointerInput
@@ -22,13 +23,16 @@ import kotlin.math.abs
 @Composable
 fun PlayerGesturesLayer(
     modifier: Modifier = Modifier,
+    controlsVisible: Boolean,
     onTap: () -> Unit,
     onDoubleTapCenter: () -> Unit,
     onDoubleTapRight: () -> Unit,
     onDoubleTapLeft: () -> Unit,
     onVerticalDragLeft: (delta: Float) -> Unit,
     onVerticalDragRight: (delta: Float) -> Unit,
-    onHorizontalDragPreview: (deltaMs: Long?) -> Unit = {},
+    onVerticalDragStart: (isLeftSide: Boolean) -> Unit = {},
+    onVerticalDragEnd: () -> Unit = {},
+    onHorizontalDragPreview: (deltaMs: Long?, previewPositionMs: Long?) -> Unit = { _, _ -> },
     onHorizontalDragSeekTo: (positionMs: Long) -> Unit,
     currentPositionProvider: () -> Long,
 ) {
@@ -36,6 +40,7 @@ fun PlayerGesturesLayer(
     val horizontalThresholdPx = with(density) { HorizontalSeekGestureHelper.START_THRESHOLD.toPx() }
     val directionThresholdPx = with(density) { 20.dp.toPx() }
     val dragActive = remember { mutableStateOf(false) }
+    val currentControlsVisible = rememberUpdatedState(controlsVisible)
 
     Box(
         modifier = modifier
@@ -63,12 +68,20 @@ fun PlayerGesturesLayer(
                     val startX = down.position.x
                     dragActive.value = false
 
+                    if (currentControlsVisible.value) {
+                        // Swipe gestures are disabled while the controls overlay is visible.
+                        // Tap gestures (single/double tap) are still handled by the
+                        // pointerInput block above.
+                        return@awaitEachGesture
+                    }
+
                     var accumulatedDrag = Offset.Zero
                     var dragDirection: DragDirection? = null
                     var accumulatedHorizontalDrag = 0f
                     var isHorizontalDragActive = false
                     var lastPreviewDelta: Long? = null
                     var startPositionMs = 0L
+                    var verticalDragStarted = false
 
                     drag(down.id) { change ->
                         val delta = change.positionChange()
@@ -95,13 +108,20 @@ fun PlayerGesturesLayer(
                                     val deltaMs = HorizontalSeekGestureHelper.deltaMs(accumulatedHorizontalDrag)
                                     if (deltaMs != 0L && deltaMs != lastPreviewDelta) {
                                         lastPreviewDelta = deltaMs
-                                        onHorizontalDragPreview(deltaMs)
+                                        onHorizontalDragPreview(
+                                            deltaMs,
+                                            (startPositionMs + deltaMs).coerceAtLeast(0L)
+                                        )
                                     }
                                 }
                             }
                             DragDirection.VERTICAL -> {
                                 change.consume()
                                 val isLeftSide = startX < size.width / 2
+                                if (!verticalDragStarted) {
+                                    verticalDragStarted = true
+                                    onVerticalDragStart(isLeftSide)
+                                }
                                 if (isLeftSide) {
                                     onVerticalDragLeft(delta.y)
                                 } else {
@@ -117,10 +137,14 @@ fun PlayerGesturesLayer(
                         if (deltaMs != 0L) {
                             val targetMs = (startPositionMs + deltaMs).coerceAtLeast(0L)
                             onHorizontalDragSeekTo(targetMs)
-                            onHorizontalDragPreview(deltaMs)
+                            onHorizontalDragPreview(deltaMs, targetMs)
                         }
                     }
-                    onHorizontalDragPreview(null)
+                    onHorizontalDragPreview(null, null)
+
+                    if (verticalDragStarted) {
+                        onVerticalDragEnd()
+                    }
                 }
             }
     )

app/src/main/java/hu/bbara/purefin/ui/screen/player/components/PlayerLoadingErrorEndCard.kt

@@ -3,7 +3,7 @@ package hu.bbara.purefin.ui.screen.player.components
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
-import hu.bbara.purefin.player.model.PlayerUiState
+import hu.bbara.purefin.core.player.model.PlayerUiState
 
 @Composable
 fun PlayerLoadingErrorEndCard(

app/src/main/java/hu/bbara/purefin/ui/screen/player/components/PlayerQueuePanel.kt

@@ -26,10 +26,11 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
+import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
-import hu.bbara.purefin.player.model.PlayerUiState
+import hu.bbara.purefin.core.player.model.PlayerUiState
 import hu.bbara.purefin.ui.common.image.PurefinAsyncImage
 
 @Composable
@@ -40,7 +41,12 @@ fun PlayerQueuePanel(
     modifier: Modifier = Modifier
 ) {
     val scheme = MaterialTheme.colorScheme
-    Box(modifier = modifier.fillMaxWidth(), contentAlignment = Alignment.CenterEnd) {
+    Box(
+        modifier = modifier
+            .fillMaxWidth()
+            .testTag(PlayerPlaylistPanelTag),
+        contentAlignment = Alignment.CenterEnd
+    ) {
         Surface(
             modifier = Modifier
                 .fillMaxHeight()
@@ -78,13 +84,23 @@ fun PlayerQueuePanel(
                     enter = fadeIn(),
                     exit = fadeOut()
                 ) {
-                    LazyColumn(verticalArrangement = Arrangement.spacedBy(10.dp)) {
+                    LazyColumn(
+                        verticalArrangement = Arrangement.spacedBy(10.dp),
+                        modifier = Modifier.testTag(PlayerPlaylistRowTag)
+                    ) {
                         items(uiState.queue, key = { item -> item.id }) { item ->
                             QueueRow(
                                 title = item.title,
                                 artworkUrl = item.artworkUrl,
                                 isCurrent = item.isCurrent,
-                                onClick = { onSelect(item.id) }
+                                onClick = { onSelect(item.id) },
+                                modifier = Modifier.testTag(
+                                    if (item.isCurrent) {
+                                        PlayerPlaylistCurrentItemTag
+                                    } else {
+                                        "${PlayerPlaylistItemTagPrefix}${item.id}"
+                                    }
+                                )
                             )
                         }
                     }
@@ -106,11 +122,12 @@ private fun QueueRow(
     subtitle: String? = null,
     artworkUrl: String?,
     isCurrent: Boolean,
-    onClick: () -> Unit
+    onClick: () -> Unit,
+    modifier: Modifier = Modifier
 ) {
     val scheme = MaterialTheme.colorScheme
     Row(
-        modifier = Modifier
+        modifier = modifier
             .fillMaxWidth()
             .clip(RoundedCornerShape(12.dp))
             .background(
@@ -160,3 +177,8 @@ private fun QueueRow(
         }
     }
 }
+
+internal const val PlayerPlaylistPanelTag = "player_playlist_panel"
+internal const val PlayerPlaylistRowTag = "player_playlist_row"
+internal const val PlayerPlaylistCurrentItemTag = "player_playlist_current_item"
+internal const val PlayerPlaylistItemTagPrefix = "player_playlist_item_"