From 06bd65c4e41bf070b4cfeb700ac57717a1415373 Mon Sep 17 00:00:00 2001
From: nm17 <nm17@riseup.net>
Date: Mon, 5 Jun 2023 22:50:01 +0400
Subject: [PATCH] =?UTF-8?q?fix:=20=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=B8=D0=BB=20=D0=BD=D0=B5=D0=B4=D0=BE-=D0=BC=D0=B5=D1=80?=
 =?UTF-8?q?=D0=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/ru/nm17/narodmon/appNarodMonApiClient/client.kt  | 8 +++++---
 .../java/ru/nm17/narodmon/ui/elements/AgreementDialog.kt  | 1 +
 .../main/java/ru/nm17/narodmon/ui/elements/Scaffolds.kt   | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/ru/nm17/narodmon/appNarodMonApiClient/client.kt b/app/src/main/java/ru/nm17/narodmon/appNarodMonApiClient/client.kt
index ec594fe..d3a4fe8 100644
--- a/app/src/main/java/ru/nm17/narodmon/appNarodMonApiClient/client.kt
+++ b/app/src/main/java/ru/nm17/narodmon/appNarodMonApiClient/client.kt
@@ -16,8 +16,10 @@ import io.ktor.http.headers
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.flow.flowOn
+import kotlinx.coroutines.flow.take
 import kotlinx.datetime.Clock
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.SerializationException
@@ -120,7 +122,7 @@ class Client private constructor(
         val client = this.httpClient1Min
         return flow<Result4k<AppInitResponse, APIError>> {
 
-            val resp = client.post("https://narodmon.ru/api") {
+            val resp = this@Client.httpClient1Min.take(1).first().post("https://narodmon.ru/api") {
                 contentType(ContentType.Application.Json)
                 setBody(
                     getJSONRequestBody("appInit", request)
@@ -132,7 +134,7 @@ class Client private constructor(
         }.flowOn(Dispatchers.IO)
 
     }
-    public fun appInit(request: AppInitRequest): Flow<Result4k<AppInitResponse, APIError>> {
+    /*public fun jjhgjhg(request: AppInitRequest): Flow<Result4k<AppInitResponse, APIError>> {
         val client = this.httpClient1Min
         return flow<Result4k<AppInitResponse, APIError>> {
 
@@ -147,5 +149,5 @@ class Client private constructor(
 
         }.flowOn(Dispatchers.IO)
 
-    }
+    }*/
 }
\ No newline at end of file
diff --git a/app/src/main/java/ru/nm17/narodmon/ui/elements/AgreementDialog.kt b/app/src/main/java/ru/nm17/narodmon/ui/elements/AgreementDialog.kt
index 25d8c97..fe97557 100644
--- a/app/src/main/java/ru/nm17/narodmon/ui/elements/AgreementDialog.kt
+++ b/app/src/main/java/ru/nm17/narodmon/ui/elements/AgreementDialog.kt
@@ -23,6 +23,7 @@ import androidx.compose.ui.platform.LocalUriHandler
 import ru.nm17.narodmon.R
 import kotlin.system.exitProcess
 
+@OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun AgreementDialog(modifier: Modifier = Modifier, onClick: () -> Unit) {
     val uriHandler = LocalUriHandler.current
diff --git a/app/src/main/java/ru/nm17/narodmon/ui/elements/Scaffolds.kt b/app/src/main/java/ru/nm17/narodmon/ui/elements/Scaffolds.kt
index 016df5f..0c09c86 100644
--- a/app/src/main/java/ru/nm17/narodmon/ui/elements/Scaffolds.kt
+++ b/app/src/main/java/ru/nm17/narodmon/ui/elements/Scaffolds.kt
@@ -60,7 +60,7 @@ fun GenericNavScaffold(title: @Composable () -> Unit, content: @Composable (Padd
                 leadingContent = {
                     Icon(Icons.Default.AccountCircle, contentDescription = "")
                 },
-                headlineText = { Text(text = "Гость", style = MaterialTheme.typography.titleLarge)},
+                headlineContent = { Text(text = "Гость", style = MaterialTheme.typography.titleLarge)},
                 modifier = Modifier.height(72.dp)
             )
             Divider()