Olympic/NTO-2025-Android-TeamTask
6
0
Fork 23
Code Issues Pull Requests 6 Actions Packages Projects Releases Wiki Activity

Fixed dates

Browse Source
This commit is contained in:
Игорь Николаевский
2025-12-04 11:13:08 +03:00
parent f5cab8e875
commit 03e87ad36c
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/ru/myitschool/work/ui/screen/book/BookScreen.kt
View File

@@ -43,6 +43,8 @@ import androidx.navigation.NavController
import ru.myitschool.work.core.TestIds import ru.myitschool.work.core.TestIds
import ru.myitschool.work.data.models.Booking import ru.myitschool.work.data.models.Booking
import ru.myitschool.work.ui.nav.MainScreenDestination import ru.myitschool.work.ui.nav.MainScreenDestination
import java.time.LocalDate
import java.time.format.DateTimeFormatter
@Composable @Composable
fun BookScreen( fun BookScreen(
@@ -114,7 +116,7 @@ fun BookScreen(
}, },
text = { text = {
Text( Text(
text = entry.key, text = LocalDate.parse(entry.key).format(DateTimeFormatter.ofPattern("dd.MM")),
modifier = Modifier.testTag(TestIds.Book.ITEM_DATE) modifier = Modifier.testTag(TestIds.Book.ITEM_DATE)
) )
}, },

4
app/src/main/java/ru/myitschool/work/ui/screen/main/MainScreen.kt
View File

@@ -53,6 +53,8 @@ import ru.myitschool.work.core.TestIds
import ru.myitschool.work.data.models.Booking import ru.myitschool.work.data.models.Booking
import ru.myitschool.work.ui.nav.BookScreenDestination import ru.myitschool.work.ui.nav.BookScreenDestination
import ru.myitschool.work.ui.nav.MainScreenDestination import ru.myitschool.work.ui.nav.MainScreenDestination
import java.time.LocalDate
import java.time.format.DateTimeFormatter
@Composable @Composable
fun MainScreen( fun MainScreen(
@@ -257,7 +259,7 @@ private fun Booking(booking: Booking, date: String, index: Int){
) { ) {
Column(modifier = Modifier.weight(1f)) { Column(modifier = Modifier.weight(1f)) {
Text( Text(
text = date, text = LocalDate.parse(date).format(DateTimeFormatter.ofPattern("dd.MM.yyyy")),
style = MaterialTheme.typography.bodyMedium, style = MaterialTheme.typography.bodyMedium,
color = MaterialTheme.colorScheme.onSurfaceVariant, color = MaterialTheme.colorScheme.onSurfaceVariant,
modifier = Modifier.testTag(TestIds.Main.ITEM_DATE) modifier = Modifier.testTag(TestIds.Main.ITEM_DATE)