Update variables name
Some checks failed
Merge core/template-android-project to this repo / merge-if-needed (push) Has been cancelled
Some checks failed
Merge core/template-android-project to this repo / merge-if-needed (push) Has been cancelled
This commit is contained in:
@@ -9,9 +9,9 @@ object AppRepository {
|
|||||||
return NetworkDataSource.getUser().map { dto ->
|
return NetworkDataSource.getUser().map { dto ->
|
||||||
UserEntity(
|
UserEntity(
|
||||||
name = dto.name,
|
name = dto.name,
|
||||||
booking = dto.booking.map { bookingDto ->
|
bookingList = dto.booking.map { bookingDto ->
|
||||||
BookingEntity(
|
BookingEntity(
|
||||||
room = bookingDto.room,
|
roomName = bookingDto.room,
|
||||||
time = bookingDto.time
|
time = bookingDto.time
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
package ru.myitschool.work.domain.entities
|
package ru.myitschool.work.domain.entities
|
||||||
|
|
||||||
data class BookingEntity(
|
data class BookingEntity(
|
||||||
val room: String,
|
val roomName: String,
|
||||||
val time: String,
|
val time: String,
|
||||||
)
|
)
|
||||||
@@ -2,5 +2,5 @@ package ru.myitschool.work.domain.entities
|
|||||||
|
|
||||||
data class UserEntity(
|
data class UserEntity(
|
||||||
val name: String,
|
val name: String,
|
||||||
val booking: List<BookingEntity>
|
val bookingList: List<BookingEntity>
|
||||||
)
|
)
|
||||||
@@ -76,14 +76,14 @@ fun Screen(
|
|||||||
LazyColumn(
|
LazyColumn(
|
||||||
modifier = Modifier.weight(1f)
|
modifier = Modifier.weight(1f)
|
||||||
) {
|
) {
|
||||||
items(currentState.userEntity.booking) { book ->
|
items(currentState.userEntity.bookingList) { book ->
|
||||||
Row(
|
Row(
|
||||||
modifier = Modifier.padding(vertical = 16.dp, horizontal = 8.dp),
|
modifier = Modifier.padding(vertical = 16.dp, horizontal = 8.dp),
|
||||||
verticalAlignment = Alignment.CenterVertically
|
verticalAlignment = Alignment.CenterVertically
|
||||||
) {
|
) {
|
||||||
Text(
|
Text(
|
||||||
modifier = Modifier.weight(1f),
|
modifier = Modifier.weight(1f),
|
||||||
text = book.room,
|
text = book.roomName,
|
||||||
style = MaterialTheme.typography.bodyLarge
|
style = MaterialTheme.typography.bodyLarge
|
||||||
)
|
)
|
||||||
Text(
|
Text(
|
||||||
|
|||||||
Reference in New Issue
Block a user