From d45b6d7ed814174e80781fe41d999456e9298bed Mon Sep 17 00:00:00 2001 From: dasha Date: Wed, 13 Dec 2023 20:25:02 +0400 Subject: [PATCH] =?UTF-8?q?=D1=80=D0=B5=D0=B3=D0=B8=D1=81=D1=82=D1=80?= =?UTF-8?q?=D0=B0=D1=86=D0=B8=D1=8F=20=D0=B8=20=D0=B2=D1=85=D0=BE=D0=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/example/myapplication/api/MyServerService.kt | 6 +++--- .../database/entities/composeui/UserProfile.kt | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/example/myapplication/api/MyServerService.kt b/app/src/main/java/com/example/myapplication/api/MyServerService.kt index d967afc..50e45ba 100644 --- a/app/src/main/java/com/example/myapplication/api/MyServerService.kt +++ b/app/src/main/java/com/example/myapplication/api/MyServerService.kt @@ -23,7 +23,7 @@ import retrofit2.http.Path import retrofit2.http.Query interface MyServerService { - @GET("orders") + /*@GET("orders") suspend fun getOrders(): List @GET("users") @@ -123,11 +123,11 @@ interface MyServerService { suspend fun updateOrder( @Path("id") id: Int, @Body orderRemote: OrderRemote, - ): OrderRemote + ): OrderRemote*/ companion object { //private const val BASE_URL = "http://192.168.154.166:8080/" - private const val BASE_URL = "http://192.168.0.101:8079/" + private const val BASE_URL = "http://192.168.0.101:8080/" @Volatile private var INSTANCE: MyServerService? = null diff --git a/app/src/main/java/com/example/myapplication/database/entities/composeui/UserProfile.kt b/app/src/main/java/com/example/myapplication/database/entities/composeui/UserProfile.kt index f6dc6f0..4ecbaef 100644 --- a/app/src/main/java/com/example/myapplication/database/entities/composeui/UserProfile.kt +++ b/app/src/main/java/com/example/myapplication/database/entities/composeui/UserProfile.kt @@ -113,7 +113,7 @@ fun UserProfile( visualTransformation = PasswordVisualTransformation() ) - if (!isRegistration) { + if (isRegistration) { Text( text = "Подтверждение пароля", modifier = Modifier.align(Alignment.CenterHorizontally)