update error content

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

@@ -2,9 +2,7 @@ package ru.shadowsparky.chat.presentation
 
 import androiddev.feature.chat.chat_client.generated.resources.Res
 import androiddev.feature.chat.chat_client.generated.resources.chat_input_placeholder
-import androiddev.feature.chat.chat_client.generated.resources.chat_load_error
 import androiddev.feature.chat.chat_client.generated.resources.chat_ok
-import androiddev.feature.chat.chat_client.generated.resources.chat_retry_button
 import androiddev.feature.chat.chat_client.generated.resources.send
 import androidx.compose.foundation.focusable
 import androidx.compose.foundation.gestures.animateScrollBy
@@ -79,6 +77,7 @@ import ru.shadowsparky.chat.domain.ChatRoles
 import ru.shadowsparky.chat.domain.Message
 import ru.shadowsparky.chat.domain.TextToken
 import ru.shadowsparky.ui.components.AlertContent
+import ru.shadowsparky.ui.components.ErrorContent
 import ru.shadowsparky.ui.components.IconButton
 import ru.shadowsparky.ui.components.LazyColumn
 import ru.shadowsparky.ui.components.Loading
@@ -107,16 +106,7 @@ fun ChatContent(component: ChatComponent, paddingValues: PaddingValues, state: C
             }
 
             is ChatState.Error -> {
-                Column(horizontalAlignment = Alignment.CenterHorizontally) {
-                    Text(
-                        text = stringResource(Res.string.chat_load_error),
-                        color = MaterialTheme.colorScheme.error
-                    )
-                    Spacer(modifier = Modifier.height(8.dp))
-                    Button(onClick = { component.loadInitialMessages() }) {
-                        Text(stringResource(Res.string.chat_retry_button))
-                    }
-                }
+                ErrorContent(message = state.message) { component.clearSendError() }
             }
             is ChatState.Data -> {
                 ChatContent(

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

@@ -29,10 +29,14 @@ import androidx.compose.material3.LinearWavyProgressIndicator
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
+import androidx.compose.runtime.withFrameNanos
 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.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import com.arkivanov.decompose.extensions.compose.subscribeAsState
@@ -58,16 +62,19 @@ fun UpdateDialog(
             onDismissRequest = { component.reset() },
             canDismiss = canDismiss,
             content = {
+                val focusRequester = remember { FocusRequester() }
                 when (val currentState = state) {
                     is UpdateState.Checking -> UpdateCheckingContent()
                     is UpdateState.UpdateAvailable -> UpdateAvailableContent(
                         versionName = currentState.versionName,
                         changeLog = currentState.changeLog,
-                        onDownloadClick = { component.downloadUpdate(currentState.url) }
+                        onDownloadClick = { component.downloadUpdate(currentState.url) },
+                        focusRequester = focusRequester
                     )
 
                     is UpdateState.InstallPermissionRequired -> UpdatePermissionContent(
-                        onGrantClick = { component.requestPermission() }
+                        onGrantClick = { component.requestPermission() },
+                        focusRequester = focusRequester
                     )
 
                     is UpdateState.Downloading -> UpdateDownloadingContent(
@@ -77,12 +84,14 @@ fun UpdateDialog(
                     )
 
                     is UpdateState.ReadyToInstall -> UpdateReadyContent(
-                        onInstallClick = { component.installApk(currentState.filePath) }
+                        onInstallClick = { component.installApk(currentState.filePath) },
+                        focusRequester = focusRequester
                     )
 
                     is UpdateState.Error -> UpdateErrorContent(
                         message = currentState.message,
-                        onRetryClick = { component.checkUpdates() }
+                        onRetryClick = { component.checkUpdates() },
+                        focusRequester = focusRequester
                     )
 
                     is UpdateState.UpToDate -> {
@@ -98,6 +107,10 @@ fun UpdateDialog(
 
                     else -> Unit
                 }
+                LaunchedEffect(state) {
+                    withFrameNanos {}
+                    focusRequester.requestFocus()
+                }
             }
         )
     }
@@ -113,6 +126,7 @@ private fun UpdateAvailableContent(
     versionName: String,
     changeLog: String?,
     onDownloadClick: () -> Unit,
+    focusRequester: FocusRequester,
     modifier: Modifier = Modifier
 ) {
     Column(
@@ -141,7 +155,10 @@ private fun UpdateAvailableContent(
                 )
             }
             item {
-                Button(onClick = onDownloadClick, modifier = Modifier.fillMaxWidth()) {
+                Button(
+                    onClick = onDownloadClick,
+                    modifier = Modifier.focusRequester(focusRequester).fillMaxWidth()
+                ) {
                     Text(
                         stringResource(Res.string.updater_btn_download),
                         style = MaterialTheme.typography.labelLarge
@@ -155,6 +172,7 @@ private fun UpdateAvailableContent(
 @Composable
 private fun UpdatePermissionContent(
     onGrantClick: () -> Unit,
+    focusRequester: FocusRequester,
     modifier: Modifier = Modifier
 ) {
     Column(
@@ -170,7 +188,10 @@ private fun UpdatePermissionContent(
             text = stringResource(Res.string.updater_desc_permission),
             style = MaterialTheme.typography.bodyMedium
         )
-        Button(onClick = onGrantClick, modifier = Modifier.fillMaxWidth()) {
+        Button(
+            onClick = onGrantClick,
+            modifier = Modifier.focusRequester(focusRequester).fillMaxWidth()
+        ) {
             Text(
                 stringResource(Res.string.updater_btn_grant),
                 style = MaterialTheme.typography.labelLarge
@@ -215,6 +236,7 @@ private fun UpdateDownloadingContent(
 @Composable
 private fun UpdateReadyContent(
     onInstallClick: () -> Unit,
+    focusRequester: FocusRequester,
     modifier: Modifier = Modifier
 ) {
     Column(
@@ -226,7 +248,10 @@ private fun UpdateReadyContent(
             text = stringResource(Res.string.updater_title_ready),
             style = MaterialTheme.typography.titleLarge
         )
-        Button(onClick = onInstallClick, modifier = Modifier.fillMaxWidth()) {
+        Button(
+            onClick = onInstallClick,
+            modifier = Modifier.focusRequester(focusRequester).fillMaxWidth()
+        ) {
             Text(
                 stringResource(Res.string.updater_btn_install),
                 style = MaterialTheme.typography.labelLarge
@@ -260,6 +285,7 @@ private fun UpdateFinishedContent(
 private fun UpdateErrorContent(
     message: String,
     onRetryClick: () -> Unit,
+    focusRequester: FocusRequester,
     modifier: Modifier = Modifier
 ) {
     Column(
@@ -273,7 +299,10 @@ private fun UpdateErrorContent(
             color = MaterialTheme.colorScheme.error
         )
         Text(text = message, style = MaterialTheme.typography.bodyMedium)
-        Button(onClick = onRetryClick, modifier = Modifier.fillMaxWidth()) {
+        Button(
+            onClick = onRetryClick,
+            modifier = Modifier.focusRequester(focusRequester).fillMaxWidth()
+        ) {
             Text(
                 stringResource(Res.string.updater_btn_retry),
                 style = MaterialTheme.typography.labelLarge
@@ -289,7 +318,8 @@ private fun UpdateAvailablePreview() {
         UpdateAvailableContent(
             versionName = "v1.4.0",
             changeLog = "- Добавили темную тему\n- Исправили падение на главном экране\n- Повысили стабильность",
-            onDownloadClick = {}
+            onDownloadClick = {},
+            focusRequester = FocusRequester()
         )
     }
 }
@@ -310,7 +340,10 @@ private fun UpdateDownloadingPreview() {
 @Composable
 private fun UpdatePermissionPreview() {
     MaterialTheme {
-        UpdatePermissionContent(onGrantClick = {})
+        UpdatePermissionContent(
+            onGrantClick = {},
+            focusRequester = FocusRequester()
+        )
     }
 }
 
@@ -318,6 +351,10 @@ private fun UpdatePermissionPreview() {
 @Composable
 private fun UpdateErrorPreview() {
     MaterialTheme {
-        UpdateErrorContent(message = "Http status 503: Service Unavailable", onRetryClick = {})
+        UpdateErrorContent(
+            message = "Http status 503: Service Unavailable",
+            onRetryClick = {},
+            focusRequester = FocusRequester()
+        )
     }
 }

feature/video-player/src/commonMain/kotlin/ru/shadowsparky/videoplayer/ui/VideoPlayer.kt

@@ -114,7 +114,7 @@ fun VideoPlayer(
         )
     }
 
-    Box(modifier = rootModifier.fillMaxSize().background(Color.Black)) {
+    Box(modifier = rootModifier.fillMaxSize()) {
         VideoCanvas(
             controller = controller,
             modifier = rootModifier.fillMaxSize(),