properly restore focus on episode screen

apps/vbox/client/shared/src/commonMain/kotlin/ru/shadowsparky/vbox/shared/presentation/overview/episode/EpisodeOverviewComponent.kt

@@ -20,7 +20,6 @@ import org.koin.core.annotation.Named
 import ru.shadowsparky.domain.Clip
 import ru.shadowsparky.domain.ClipboardManager
 import ru.shadowsparky.domain.DispatcherProvider
-import ru.shadowsparky.ui.nav.RootComponent
 import ru.shadowsparky.ui.nav.ComponentFactory
 import ru.shadowsparky.ui.nav.RouteNavigator
 import ru.shadowsparky.vbox.shared.domain.AddOfflineVideoUseCase
@@ -71,7 +70,7 @@ class EpisodeOverviewComponent(
         }
     }
 
-    val recentlyFlow = recentlyWatchedRepository.queryRecentlyWatched(id, seasonId)
+    private val recentlyFlow = recentlyWatchedRepository.queryRecentlyWatched(id, seasonId)
 
     private val episodes = recentlyFlow.combine(episodesFromServer) { watched, season ->
         val episode = season.episodes

apps/vbox/client/shared/src/commonMain/kotlin/ru/shadowsparky/vbox/shared/presentation/overview/episode/EpisodeOverviewScreen.kt

@@ -19,6 +19,7 @@ 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.lazy.rememberLazyListState
 import androidx.compose.material3.Checkbox
 import androidx.compose.material3.CircularWavyProgressIndicator
 import androidx.compose.material3.ExperimentalMaterial3Api
@@ -30,6 +31,7 @@ import androidx.compose.runtime.Composable
 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.saveable.rememberSaveable
@@ -39,6 +41,7 @@ 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.focus.onFocusChanged
 import androidx.compose.ui.unit.dp
 import org.jetbrains.compose.resources.painterResource
 import org.jetbrains.compose.resources.stringResource
@@ -175,38 +178,45 @@ fun EpisodesOverviewList(
             buttonText = stringResource(Res.string.retry)
         ) { loadLinks() }
     } else if (episodes != null) {
+        val lazyListState = rememberLazyListState()
+        var focusedIndex by rememberSaveable { mutableIntStateOf(0) }
         val requester = remember { FocusRequester() }
         ExpressiveLazyColumn(
             modifier = Modifier.fillMaxSize(),
             contentPadding = contentPadding,
-            content = {
+            state = lazyListState,
-                section {
+        ) {
-                    itemsIndexed(
+            section {
-                        episodes,
+                itemsIndexed(
-                        { it.episode.episode }
+                    items = episodes,
-                    ) { index, episode ->
+                    key = { item -> item.episode.episode }
-                        EpisodeInfo(
+                ) { index, episode ->
-                            if (index == 0) {
+                    EpisodeInfo(
+                        Modifier.onFocusChanged { state ->
+                            if (state.isFocused) focusedIndex = index
+                        }.then(
+                            if (index == focusedIndex) {
                                 Modifier.focusRequester(requester)
                             } else {
                                 Modifier
-                            },
+                            }
-                            onLaunch,
+                        ),
-                            episode,
+                        onLaunch,
-                            onClipboardAction,
+                        episode,
-                            index,
+                        onClipboardAction,
-                            onOfflineClicked,
+                        index,
-                            isSaveMode
+                        onOfflineClicked,
-                        )
+                        isSaveMode
-                    }
+                    )
                 }
             }
-        )
+        }
         LaunchedEffect(episodes) {
-            if (episodes.isNotEmpty()) {
+            if (episodes.isEmpty()) return@LaunchedEffect
-                withFrameNanos {}
+            val index = focusedIndex.coerceIn(episodes.indices)
-                requester.requestFocus()
+            lazyListState.scrollToItem(index)
-            }
+            withFrameNanos {}
+            requester.requestFocus()
         }
     } else {
         Loading()

feature/chat/chat-client/src/commonMain/kotlin/ru/shadowsparky/chat/presentation/ChatScreen.kt

@@ -32,8 +32,9 @@ import androidx.compose.foundation.verticalScroll
 import androidx.compose.material3.Button
 import androidx.compose.material3.Card
 import androidx.compose.material3.CardDefaults
+import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
 import androidx.compose.material3.Icon
-import androidx.compose.material3.LinearProgressIndicator
+import androidx.compose.material3.LinearWavyProgressIndicator
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.OutlinedTextField
 import androidx.compose.material3.Text
@@ -130,6 +131,7 @@ fun ChatContent(component: ChatComponent, paddingValues: PaddingValues, state: C
     }
 }
 
+@OptIn(ExperimentalMaterial3ExpressiveApi::class)
 @Composable
 private fun ChatContent(
     contentPadding: PaddingValues,
@@ -224,7 +226,7 @@ private fun ChatContent(
             )
         }
         if (state.isSending) {
-            LinearProgressIndicator(Modifier.fillMaxWidth())
+            LinearWavyProgressIndicator(Modifier.fillMaxWidth())
         }
         Spacer(Modifier.height(4.dp))
         Row {

feature/updater/updater-client/src/commonMain/kotlin/ru/shadowsparky/updater/presentation/UpdateDialog.kt

@@ -24,7 +24,8 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.material3.Button
 import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.LinearProgressIndicator
+import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
+import androidx.compose.material3.LinearWavyProgressIndicator
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
@@ -178,6 +179,7 @@ private fun UpdatePermissionContent(
     }
 }
 
+@OptIn(ExperimentalMaterial3ExpressiveApi::class)
 @Composable
 private fun UpdateDownloadingContent(
     progress: Float,
@@ -194,7 +196,7 @@ private fun UpdateDownloadingContent(
             text = stringResource(Res.string.updater_title_downloading),
             style = MaterialTheme.typography.titleMedium
         )
-        LinearProgressIndicator(progress = { progress }, modifier = Modifier.fillMaxWidth())
+        LinearWavyProgressIndicator(progress = { progress }, modifier = Modifier.fillMaxWidth())
 
         val downloadedMb = ((downloadedBytes / (1024f * 1024f)) * 10).toInt() / 10.0
         val totalMb = ((totalBytes / (1024f * 1024f)) * 10).toInt() / 10.0