From c1fbb61159fdcbd644c46eccdea39a1c23e8af98 Mon Sep 17 00:00:00 2001
From: denis0001-dev <denis0001.dev@ya.ru>
Date: Fri, 12 Sep 2025 19:38:03 +0300
Subject: [PATCH] Improve code

Signed-off-by: denis0001-dev <denis0001.dev@ya.ru>
---
 .../java/ru/fromchat/ui/PublicChatScreen.kt     | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/ru/fromchat/ui/PublicChatScreen.kt b/app/src/main/java/ru/fromchat/ui/PublicChatScreen.kt
index e8fcd77..799133c 100644
--- a/app/src/main/java/ru/fromchat/ui/PublicChatScreen.kt
+++ b/app/src/main/java/ru/fromchat/ui/PublicChatScreen.kt
@@ -10,9 +10,7 @@ import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.WindowInsetsSides
-import androidx.compose.foundation.layout.exclude
 import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.only
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.safeDrawing
 import androidx.compose.foundation.layout.size
@@ -69,6 +67,7 @@ import ru.fromchat.api.ApiClient
 import ru.fromchat.api.Message
 import ru.fromchat.api.WebSocketManager
 import ru.fromchat.api.apiRequest
+import ru.fromchat.utils.exclude
 import kotlin.time.ExperimentalTime
 import kotlin.time.Instant
 
@@ -82,13 +81,11 @@ fun PublicChatScreen() {
     val messages = remember { mutableStateListOf<Message>() }
 
     LaunchedEffect(Unit) {
-        val response = apiRequest {
+        apiRequest {
             ApiClient.getMessages()
-        }
-
-        if (response.isSuccess) {
+        }.onSuccess {
             messages.clear()
-            messages += response.getOrThrow().messages
+            messages += it.messages
         }
 
         WebSocketManager.connect()
@@ -137,11 +134,7 @@ fun PublicChatScreen() {
                 Modifier
                     .background(MaterialTheme.colorScheme.surfaceContainer)
                     .fillMaxWidth()
-                    .windowInsetsPadding(
-                        WindowInsets.safeDrawing.exclude(
-                            WindowInsets.safeDrawing.only(WindowInsetsSides.Top)
-                        )
-                    )
+                    .windowInsetsPadding(WindowInsets.safeDrawing.exclude(WindowInsetsSides.Top))
                     .padding(vertical = 8.dp, horizontal = 12.dp),
                 verticalAlignment = Alignment.CenterVertically
             ) {