From 03e87ad36c120d10fb8b3aaa497b7edd5e9ff415 Mon Sep 17 00:00:00 2001 From: nicktun Date: Thu, 4 Dec 2025 11:13:08 +0300 Subject: [PATCH] Fixed dates --- .../main/java/ru/myitschool/work/ui/screen/book/BookScreen.kt | 4 +++- .../main/java/ru/myitschool/work/ui/screen/main/MainScreen.kt | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/ru/myitschool/work/ui/screen/book/BookScreen.kt b/app/src/main/java/ru/myitschool/work/ui/screen/book/BookScreen.kt index 56b622e..bfc230d 100644 --- a/app/src/main/java/ru/myitschool/work/ui/screen/book/BookScreen.kt +++ b/app/src/main/java/ru/myitschool/work/ui/screen/book/BookScreen.kt @@ -43,6 +43,8 @@ import androidx.navigation.NavController import ru.myitschool.work.core.TestIds import ru.myitschool.work.data.models.Booking import ru.myitschool.work.ui.nav.MainScreenDestination +import java.time.LocalDate +import java.time.format.DateTimeFormatter @Composable fun BookScreen( @@ -114,7 +116,7 @@ fun BookScreen( }, text = { Text( - text = entry.key, + text = LocalDate.parse(entry.key).format(DateTimeFormatter.ofPattern("dd.MM")), modifier = Modifier.testTag(TestIds.Book.ITEM_DATE) ) }, diff --git a/app/src/main/java/ru/myitschool/work/ui/screen/main/MainScreen.kt b/app/src/main/java/ru/myitschool/work/ui/screen/main/MainScreen.kt index 96728ae..0e9063d 100644 --- a/app/src/main/java/ru/myitschool/work/ui/screen/main/MainScreen.kt +++ b/app/src/main/java/ru/myitschool/work/ui/screen/main/MainScreen.kt @@ -53,6 +53,8 @@ import ru.myitschool.work.core.TestIds import ru.myitschool.work.data.models.Booking import ru.myitschool.work.ui.nav.BookScreenDestination import ru.myitschool.work.ui.nav.MainScreenDestination +import java.time.LocalDate +import java.time.format.DateTimeFormatter @Composable fun MainScreen( @@ -257,7 +259,7 @@ private fun Booking(booking: Booking, date: String, index: Int){ ) { Column(modifier = Modifier.weight(1f)) { Text( - text = date, + text = LocalDate.parse(date).format(DateTimeFormatter.ofPattern("dd.MM.yyyy")), style = MaterialTheme.typography.bodyMedium, color = MaterialTheme.colorScheme.onSurfaceVariant, modifier = Modifier.testTag(TestIds.Main.ITEM_DATE)