rovkinmax · rovkinmax · Aug 31, 2026 · Aug 31, 2026
diff --git a/...oidTest/kotlin/com/kino/puber/ui/feature/player/component/PlayerScreenContentFocusTest.kt b/...oidTest/kotlin/com/kino/puber/ui/feature/player/component/PlayerScreenContentFocusTest.kt
diff --git a/...c/androidTest/kotlin/com/kino/puber/ui/feature/player/component/PlayerVideoSurfaceTest.kt b/...c/androidTest/kotlin/com/kino/puber/ui/feature/player/component/PlayerVideoSurfaceTest.kt
@@ -3,7 +3,6 @@ package com.kino.puber.ui.feature.player.component
 import android.view.WindowManager
 import androidx.activity.ComponentActivity
 import androidx.compose.runtime.mutableStateOf
-import androidx.compose.ui.focus.FocusRequester
 import androidx.compose.ui.test.junit4.v2.createAndroidComposeRule
 import androidx.media3.common.Player
 import androidx.media3.exoplayer.ExoPlayer
@@ -41,8 +40,6 @@ internal class PlayerVideoSurfaceTest {
                     PlayerVideoSurface(
                         content = contentState.value,
                         exoPlayer = { player },
-                        onAction = {},
-                        focusRequester = FocusRequester(),
                         playerViewFactory = { context ->
                             player = player ?: ExoPlayer.Builder(context).build()
                             PlayerView(context).also(playerViewReference::set)
@@ -114,8 +111,6 @@ internal class PlayerVideoSurfaceTest {
                 PlayerVideoSurface(
                     content = contentState.value,
                     exoPlayer = { player },
-                    onAction = {},
-                    focusRequester = FocusRequester(),
                     playerViewFactory = { context ->
                         player = ExoPlayer.Builder(context).build()
                         object : PlayerView(context) {
@@ -164,8 +159,6 @@ internal class PlayerVideoSurfaceTest {
                         PlayerVideoSurface(
                             content = contentState.value,
                             exoPlayer = { player },
-                            onAction = {},
-                            focusRequester = FocusRequester(),
                             playerViewFactory = { context ->
                                 player = player ?: ExoPlayer.Builder(context).build()
                                 PlayerView(context).also(playerViewReference::set)

diff --git a/app/src/main/java/com/kino/puber/ui/feature/player/component/AudioSubtitlesPanel.kt b/app/src/main/java/com/kino/puber/ui/feature/player/component/AudioSubtitlesPanel.kt
@@ -20,6 +20,7 @@ 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.graphics.Color
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
@@ -35,6 +36,7 @@ import com.kino.puber.ui.feature.player.model.SubtitleTrackUIState
 @Composable
 internal fun AudioSubtitlesPanel(
     visible: Boolean,
+    isFocusOwner: Boolean,
     soundModes: List<SoundModeUIState>,
     selectedSoundModeIndex: Int,
     audioTracks: List<AudioTrackUIState>,
@@ -54,8 +56,18 @@ internal fun AudioSubtitlesPanel(
         enter = slideInVertically(initialOffsetY = { it }),
         exit = slideOutVertically(targetOffsetY = { it }),
     ) {
+        val initialFocusTarget = when {
+            soundModes.isNotEmpty() -> AudioSubtitlesFocusTarget.SoundMode
+            audioTracks.isNotEmpty() -> AudioSubtitlesFocusTarget.AudioTrack
+            subtitleTracks.isNotEmpty() -> AudioSubtitlesFocusTarget.Subtitle
+            else -> AudioSubtitlesFocusTarget.SubtitleSize
+        }
+        val panelFocusRequester = rememberRequestingFocusRequester(
+            focusKey = initialFocusTarget,
+            isFocusOwner = isFocusOwner,
+        )
+
         AudioSubtitlesPanelContainer {
-            val panelFocusRequester = rememberRequestingFocusRequester()
             AudioSubtitlesColumns(
                 soundModes = soundModes,
                 selectedSoundModeIndex = selectedSoundModeIndex,
@@ -64,15 +76,28 @@ internal fun AudioSubtitlesPanel(
                 subtitleTracks = subtitleTracks,
                 selectedSubtitleIndex = selectedSubtitleIndex,
                 panelFocusRequester = panelFocusRequester,
+                initialFocusTarget = initialFocusTarget,
                 onSoundModeSelected = onSoundModeSelected,
                 onAudioTrackSelected = onAudioTrackSelected,
                 onSubtitleSelected = onSubtitleSelected,
             )
-            SubtitleSizeButton(onClick = onSubtitleSizeClick)
+            SubtitleSizeButton(
+                onClick = onSubtitleSizeClick,
+                focusRequester = panelFocusRequester.takeIf {
+                    initialFocusTarget == AudioSubtitlesFocusTarget.SubtitleSize
+                },
+            )
         }
     }
 }
 
+private enum class AudioSubtitlesFocusTarget {
+    SoundMode,
+    AudioTrack,
+    Subtitle,
+    SubtitleSize,
+}
+
 @Composable
 private fun AudioSubtitlesPanelContainer(content: @Composable BoxScope.() -> Unit) {
     Box(
@@ -101,6 +126,7 @@ private fun AudioSubtitlesColumns(
     subtitleTracks: List<SubtitleTrackUIState>,
     selectedSubtitleIndex: Int,
     panelFocusRequester: FocusRequester,
+    initialFocusTarget: AudioSubtitlesFocusTarget,
     onSoundModeSelected: (Int) -> Unit,
     onAudioTrackSelected: (Int) -> Unit,
     onSubtitleSelected: (Int) -> Unit,
@@ -111,16 +137,32 @@ private fun AudioSubtitlesColumns(
             .padding(top = 24.dp, bottom = 16.dp),
         horizontalArrangement = Arrangement.SpaceEvenly,
     ) {
-        SoundModeColumn(soundModes, selectedSoundModeIndex, onSoundModeSelected)
-        AudioTrackColumn(audioTracks, selectedAudioTrackIndex, panelFocusRequester, onAudioTrackSelected)
-        SubtitleColumn(subtitleTracks, selectedSubtitleIndex, onSubtitleSelected)
+        SoundModeColumn(
+            soundModes,
+            selectedSoundModeIndex,
+            panelFocusRequester.takeIf { initialFocusTarget == AudioSubtitlesFocusTarget.SoundMode },
+            onSoundModeSelected,
+        )
+        AudioTrackColumn(
+            audioTracks,
+            selectedAudioTrackIndex,
+            panelFocusRequester.takeIf { initialFocusTarget == AudioSubtitlesFocusTarget.AudioTrack },
+            onAudioTrackSelected,
+        )
+        SubtitleColumn(
+            subtitleTracks,
+            selectedSubtitleIndex,
+            panelFocusRequester.takeIf { initialFocusTarget == AudioSubtitlesFocusTarget.Subtitle },
+            onSubtitleSelected,
+        )
     }
 }
 
 @Composable
 private fun RowScope.SoundModeColumn(
     soundModes: List<SoundModeUIState>,
     selectedSoundModeIndex: Int,
+    panelFocusRequester: FocusRequester?,
     onSoundModeSelected: (Int) -> Unit,
 ) {
     if (soundModes.isEmpty()) return
@@ -131,14 +173,15 @@ private fun RowScope.SoundModeColumn(
         selectedIndex = selectedSoundModeIndex,
         onItemSelected = onSoundModeSelected,
         modifier = Modifier.weight(1f),
+        firstItemFocusRequester = panelFocusRequester,
     )
 }
 
 @Composable
 private fun RowScope.AudioTrackColumn(
     audioTracks: List<AudioTrackUIState>,
     selectedAudioTrackIndex: Int,
-    panelFocusRequester: FocusRequester,
+    panelFocusRequester: FocusRequester?,
     onAudioTrackSelected: (Int) -> Unit,
 ) {
     if (audioTracks.isEmpty()) return
@@ -157,6 +200,7 @@ private fun RowScope.AudioTrackColumn(
 private fun RowScope.SubtitleColumn(
     subtitleTracks: List<SubtitleTrackUIState>,
     selectedSubtitleIndex: Int,
+    panelFocusRequester: FocusRequester?,
     onSubtitleSelected: (Int) -> Unit,
 ) {
     val labels = remember(subtitleTracks) { subtitleTracks.map { it.label } }
@@ -166,16 +210,21 @@ private fun RowScope.SubtitleColumn(
         selectedIndex = selectedSubtitleIndex,
         onItemSelected = onSubtitleSelected,
         modifier = Modifier.weight(1f),
+        firstItemFocusRequester = panelFocusRequester,
     )
 }
 
 @Composable
-private fun BoxScope.SubtitleSizeButton(onClick: () -> Unit) {
+private fun BoxScope.SubtitleSizeButton(
+    onClick: () -> Unit,
+    focusRequester: FocusRequester?,
+) {
     Button(
         onClick = onClick,
         modifier = Modifier
             .align(Alignment.TopEnd)
-            .padding(top = 16.dp, end = 16.dp),
+            .padding(top = 16.dp, end = 16.dp)
+            .then(focusRequester?.let { Modifier.focusRequester(it) } ?: Modifier),
         colors = ButtonDefaults.colors(
             containerColor = Color.Transparent,
             contentColor = MaterialTheme.colorScheme.onSurface,

diff --git a/app/src/main/java/com/kino/puber/ui/feature/player/component/PanelFocusRequester.kt b/app/src/main/java/com/kino/puber/ui/feature/player/component/PanelFocusRequester.kt
@@ -2,14 +2,79 @@ package com.kino.puber.ui.feature.player.component
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberUpdatedState
+import androidx.compose.runtime.withFrameNanos
 import androidx.compose.ui.focus.FocusRequester
 
 @Composable
-internal fun rememberRequestingFocusRequester(): FocusRequester {
+internal fun rememberRequestingFocusRequester(
+    focusKey: Any?,
+    isFocusOwner: Boolean,
+): FocusRequester {
     val focusRequester = remember { FocusRequester() }
-    LaunchedEffect(Unit) {
-        runCatching { focusRequester.requestFocus() }
+    val latestIsFocusOwner by rememberUpdatedState(isFocusOwner)
+    LaunchedEffect(focusKey, isFocusOwner) {
+        if (isFocusOwner) {
+            focusRequester.requestWhenAttached(
+                isOwner = { latestIsFocusOwner },
+            )
+        }
     }
     return focusRequester
 }
+
+internal suspend fun FocusRequester.requestWhenAttached(
+    isOwner: () -> Boolean,
+    fallback: FocusRequester? = null,
+): Boolean = requestFocusWithFallback(
+    isOwner = isOwner,
+    awaitNextAttempt = { withFrameNanos { } },
+    requestPrimaryFocus = { runCatching { requestFocus() }.getOrDefault(false) },
+    requestFallbackFocus = fallback?.let { fallbackRequester ->
+        { runCatching { fallbackRequester.requestFocus() }.getOrDefault(false) }
+    },
+)
+
+internal suspend fun requestFocusWithRetry(
+    isOwner: () -> Boolean,
+    awaitNextAttempt: suspend () -> Unit,
+    requestFocus: () -> Boolean,
+): Boolean = requestFocusWithFallback(
+    isOwner = isOwner,
+    awaitNextAttempt = awaitNextAttempt,
+    requestPrimaryFocus = requestFocus,
+    requestFallbackFocus = null,
+)
+
+internal suspend fun requestFocusWithFallback(
+    isOwner: () -> Boolean,
+    awaitNextAttempt: suspend () -> Unit,
+    requestPrimaryFocus: () -> Boolean,
+    requestFallbackFocus: (() -> Boolean)?,
+): Boolean {
+    val primaryFocused = requestBoundedFocus(isOwner, awaitNextAttempt, requestPrimaryFocus)
+    val fallback = requestFallbackFocus
+    return when {
+        primaryFocused -> true
+        !isOwner() -> false
+        fallback == null -> false
+        else -> requestBoundedFocus(isOwner, awaitNextAttempt, fallback)
+    }
+}
+
+private suspend fun requestBoundedFocus(
+    isOwner: () -> Boolean,
+    awaitNextAttempt: suspend () -> Unit,
+    requestFocus: () -> Boolean,
+): Boolean {
+    repeat(FOCUS_REQUEST_ATTEMPTS) {
+        awaitNextAttempt()
+        if (!isOwner()) return false
+        if (requestFocus()) return true
+    }
+    return false
+}
+
+private const val FOCUS_REQUEST_ATTEMPTS = 30