diff --git a/app/src/main/java/ru/myitschool/work/data/AppRepository.kt b/app/src/main/java/ru/myitschool/work/data/AppRepository.kt index 8c17dc7..a3d233a 100644 --- a/app/src/main/java/ru/myitschool/work/data/AppRepository.kt +++ b/app/src/main/java/ru/myitschool/work/data/AppRepository.kt @@ -9,9 +9,9 @@ object AppRepository { return NetworkDataSource.getUser().map { dto -> UserEntity( name = dto.name, - booking = dto.booking.map { bookingDto -> + bookingList = dto.booking.map { bookingDto -> BookingEntity( - room = bookingDto.room, + roomName = bookingDto.room, time = bookingDto.time ) } diff --git a/app/src/main/java/ru/myitschool/work/domain/entities/BookingEntity.kt b/app/src/main/java/ru/myitschool/work/domain/entities/BookingEntity.kt index 770758b..0bf603d 100644 --- a/app/src/main/java/ru/myitschool/work/domain/entities/BookingEntity.kt +++ b/app/src/main/java/ru/myitschool/work/domain/entities/BookingEntity.kt @@ -1,6 +1,6 @@ package ru.myitschool.work.domain.entities data class BookingEntity( - val room: String, + val roomName: String, val time: String, ) \ No newline at end of file diff --git a/app/src/main/java/ru/myitschool/work/domain/entities/UserEntity.kt b/app/src/main/java/ru/myitschool/work/domain/entities/UserEntity.kt index f763a78..86a9851 100644 --- a/app/src/main/java/ru/myitschool/work/domain/entities/UserEntity.kt +++ b/app/src/main/java/ru/myitschool/work/domain/entities/UserEntity.kt @@ -2,5 +2,5 @@ package ru.myitschool.work.domain.entities data class UserEntity( val name: String, - val booking: List + val bookingList: List ) \ No newline at end of file diff --git a/app/src/main/java/ru/myitschool/work/ui/root/RootActivity.kt b/app/src/main/java/ru/myitschool/work/ui/root/RootActivity.kt index 29370da..8fcaefb 100644 --- a/app/src/main/java/ru/myitschool/work/ui/root/RootActivity.kt +++ b/app/src/main/java/ru/myitschool/work/ui/root/RootActivity.kt @@ -76,14 +76,14 @@ fun Screen( LazyColumn( modifier = Modifier.weight(1f) ) { - items(currentState.userEntity.booking) { book -> + items(currentState.userEntity.bookingList) { book -> Row( modifier = Modifier.padding(vertical = 16.dp, horizontal = 8.dp), verticalAlignment = Alignment.CenterVertically ) { Text( modifier = Modifier.weight(1f), - text = book.room, + text = book.roomName, style = MaterialTheme.typography.bodyLarge ) Text(