From 194dab430b45ba77d4b7d5a6e23ccdb3445bfd23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9A=D0=B0=D1=88=D0=B8=D0=BD=20=D0=9C=D0=B0=D0=BA=D1=81?= =?UTF-8?q?=D0=B8=D0=BC?= Date: Sat, 23 Dec 2023 03:39:04 +0400 Subject: [PATCH] =?UTF-8?q?=D0=9A=D1=80=D0=B0=D1=81=D0=B8=D0=B2=D0=BE=20?= =?UTF-8?q?=D0=B2=D1=8B=D0=BD=D0=B5=D1=81=D0=BB=D0=B8.=20=D0=9E=D1=81?= =?UTF-8?q?=D1=82=D0=B0=D0=BB=D0=B0=D1=81=D1=8C=20=D1=81=D1=82=D1=80=D0=B0?= =?UTF-8?q?=D0=BD=D0=B8=D1=87=D0=BA=D1=83=20=D0=BF=D0=BE=D0=BB=D1=8C=D0=B7?= =?UTF-8?q?=D0=BE=D0=B2=D0=B0=D1=82=D0=B5=D0=BB=D1=8F=20=D0=B8=20=D0=BE?= =?UTF-8?q?=D1=82=D1=87=D0=B5=D1=82=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../example/myapplication/composeui/Cart.kt | 21 ++------------ .../database/entities/composeui/BikeList.kt | 2 +- .../database/entities/composeui/ErroreList.kt | 29 +++++++++++++++++++ .../database/entities/composeui/RentList.kt | 17 +---------- server/data.json | 26 ----------------- 5 files changed, 33 insertions(+), 62 deletions(-) create mode 100644 app/src/main/java/com/example/myapplication/database/entities/composeui/ErroreList.kt diff --git a/app/src/main/java/com/example/myapplication/composeui/Cart.kt b/app/src/main/java/com/example/myapplication/composeui/Cart.kt index 7b7d5c4..55e1a46 100644 --- a/app/src/main/java/com/example/myapplication/composeui/Cart.kt +++ b/app/src/main/java/com/example/myapplication/composeui/Cart.kt @@ -58,6 +58,7 @@ import com.example.myapplication.database.entities.composeui.AppViewModelProvide import com.example.myapplication.database.entities.composeui.CartUiState import com.example.myapplication.database.entities.composeui.CartViewModel import com.example.myapplication.database.entities.composeui.CurrentUserViewModel +import com.example.myapplication.database.entities.composeui.ErroreList import com.example.myapplication.database.entities.model.Item import com.example.myapplication.database.entities.model.ItemFromCart import com.example.myapplication.ui.theme.PmudemoTheme @@ -121,27 +122,9 @@ fun Cart( } ) } else { - // Пользователь не авторизован, показываем экран с сообщением - UnauthorizedScreen() + ErroreList() } } - -@Composable -fun UnauthorizedScreen() { - // Экран с сообщением о неудачной авторизации - Column( - modifier = Modifier - .fillMaxSize() - .padding(16.dp), - verticalArrangement = Arrangement.Center, - horizontalAlignment = Alignment.CenterHorizontally - ) { - Text("Oops! Something went wrong.", fontWeight = FontWeight.Bold) - Spacer(modifier = Modifier.height(8.dp)) - Text("Please try again later.") - } -} - @OptIn(ExperimentalMaterial3Api::class) @Composable private fun Cart( diff --git a/app/src/main/java/com/example/myapplication/database/entities/composeui/BikeList.kt b/app/src/main/java/com/example/myapplication/database/entities/composeui/BikeList.kt index 5704198..216e8a8 100644 --- a/app/src/main/java/com/example/myapplication/database/entities/composeui/BikeList.kt +++ b/app/src/main/java/com/example/myapplication/database/entities/composeui/BikeList.kt @@ -105,7 +105,7 @@ fun BikeList( ) } } else { - UnauthorizedScreen() + ErroreList() } } diff --git a/app/src/main/java/com/example/myapplication/database/entities/composeui/ErroreList.kt b/app/src/main/java/com/example/myapplication/database/entities/composeui/ErroreList.kt new file mode 100644 index 0000000..d114bdb --- /dev/null +++ b/app/src/main/java/com/example/myapplication/database/entities/composeui/ErroreList.kt @@ -0,0 +1,29 @@ +package com.example.myapplication.database.entities.composeui + +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.unit.dp + +@Composable +fun ErroreList() { + Column( + modifier = Modifier + .fillMaxSize() + .padding(16.dp), + verticalArrangement = Arrangement.Center, + horizontalAlignment = Alignment.CenterHorizontally + ) { + Text("На данный момент страница не доступна.", fontWeight = FontWeight.Bold) + Spacer(modifier = Modifier.height(8.dp)) + Text("Пожалуйста, пройдите авторизацию.") + } +} \ No newline at end of file diff --git a/app/src/main/java/com/example/myapplication/database/entities/composeui/RentList.kt b/app/src/main/java/com/example/myapplication/database/entities/composeui/RentList.kt index facf349..6efb3fe 100644 --- a/app/src/main/java/com/example/myapplication/database/entities/composeui/RentList.kt +++ b/app/src/main/java/com/example/myapplication/database/entities/composeui/RentList.kt @@ -105,22 +105,7 @@ fun RentList( } } else { // Пользователь не авторизован, показываем экран с сообщением - UnauthorizedScreen() - } -} - -@Composable -fun UnauthorizedScreen() { - Column( - modifier = Modifier - .fillMaxSize() - .padding(16.dp), - verticalArrangement = Arrangement.Center, - horizontalAlignment = Alignment.CenterHorizontally - ) { - Text("Oops! Something went wrong.", fontWeight = FontWeight.Bold) - Spacer(modifier = Modifier.height(8.dp)) - Text("Please try again later.") + ErroreList() } } diff --git a/server/data.json b/server/data.json index 84f3584..dd031bd 100644 --- a/server/data.json +++ b/server/data.json @@ -54,32 +54,6 @@ } ], "rents": [ - { - "id": 6, - "userId": 2, - "items": [ - { - "id": 1, - "dateTime": 2021, - "frozenWeight": 26.6, - "count": 2, - "bikeId": 1 - } - ] - }, - { - "id": 8, - "userId": 2, - "items": [ - { - "id": 4, - "dateTime": 2023, - "frozenWeight": 26.3, - "count": 2, - "bikeId": 2 - } - ] - }, { "id": 9, "userId": 7,