mirror of
https://github.com/fromchat-messenger/app.git
synced 2026-09-22 19:15:05 +03:00
@@ -10,9 +10,7 @@ import androidx.compose.foundation.layout.Row
|
|||||||
import androidx.compose.foundation.layout.Spacer
|
import androidx.compose.foundation.layout.Spacer
|
||||||
import androidx.compose.foundation.layout.WindowInsets
|
import androidx.compose.foundation.layout.WindowInsets
|
||||||
import androidx.compose.foundation.layout.WindowInsetsSides
|
import androidx.compose.foundation.layout.WindowInsetsSides
|
||||||
import androidx.compose.foundation.layout.exclude
|
|
||||||
import androidx.compose.foundation.layout.fillMaxWidth
|
import androidx.compose.foundation.layout.fillMaxWidth
|
||||||
import androidx.compose.foundation.layout.only
|
|
||||||
import androidx.compose.foundation.layout.padding
|
import androidx.compose.foundation.layout.padding
|
||||||
import androidx.compose.foundation.layout.safeDrawing
|
import androidx.compose.foundation.layout.safeDrawing
|
||||||
import androidx.compose.foundation.layout.size
|
import androidx.compose.foundation.layout.size
|
||||||
@@ -69,6 +67,7 @@ import ru.fromchat.api.ApiClient
|
|||||||
import ru.fromchat.api.Message
|
import ru.fromchat.api.Message
|
||||||
import ru.fromchat.api.WebSocketManager
|
import ru.fromchat.api.WebSocketManager
|
||||||
import ru.fromchat.api.apiRequest
|
import ru.fromchat.api.apiRequest
|
||||||
|
import ru.fromchat.utils.exclude
|
||||||
import kotlin.time.ExperimentalTime
|
import kotlin.time.ExperimentalTime
|
||||||
import kotlin.time.Instant
|
import kotlin.time.Instant
|
||||||
|
|
||||||
@@ -82,13 +81,11 @@ fun PublicChatScreen() {
|
|||||||
val messages = remember { mutableStateListOf<Message>() }
|
val messages = remember { mutableStateListOf<Message>() }
|
||||||
|
|
||||||
LaunchedEffect(Unit) {
|
LaunchedEffect(Unit) {
|
||||||
val response = apiRequest {
|
apiRequest {
|
||||||
ApiClient.getMessages()
|
ApiClient.getMessages()
|
||||||
}
|
}.onSuccess {
|
||||||
|
|
||||||
if (response.isSuccess) {
|
|
||||||
messages.clear()
|
messages.clear()
|
||||||
messages += response.getOrThrow().messages
|
messages += it.messages
|
||||||
}
|
}
|
||||||
|
|
||||||
WebSocketManager.connect()
|
WebSocketManager.connect()
|
||||||
@@ -137,11 +134,7 @@ fun PublicChatScreen() {
|
|||||||
Modifier
|
Modifier
|
||||||
.background(MaterialTheme.colorScheme.surfaceContainer)
|
.background(MaterialTheme.colorScheme.surfaceContainer)
|
||||||
.fillMaxWidth()
|
.fillMaxWidth()
|
||||||
.windowInsetsPadding(
|
.windowInsetsPadding(WindowInsets.safeDrawing.exclude(WindowInsetsSides.Top))
|
||||||
WindowInsets.safeDrawing.exclude(
|
|
||||||
WindowInsets.safeDrawing.only(WindowInsetsSides.Top)
|
|
||||||
)
|
|
||||||
)
|
|
||||||
.padding(vertical = 8.dp, horizontal = 12.dp),
|
.padding(vertical = 8.dp, horizontal = 12.dp),
|
||||||
verticalAlignment = Alignment.CenterVertically
|
verticalAlignment = Alignment.CenterVertically
|
||||||
) {
|
) {
|
||||||
|
|||||||
Reference in New Issue
Block a user