NTO-2026/NTO-2026-Android-TeamTask-Template
106
0
Fork 28
Code Issues Pull Requests 3 Actions Packages Projects Releases Wiki Activity

new_select_screen #9

Open
student-i-nikolaevskiy wants to merge 42 commits from Minipigi-org/NTO-2026-Android-TeamTask-Template:new_select_screen into main
pull from: Minipigi-org/NTO-2026-Android-TeamTask-Template:new_select_screen
merge into: NTO-2026:main
Conversation 0 Commits 42 Files Changed 39 +3 -4
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 2206fae873 - Show all commits

7
app/src/main/java/ru/myitschool/work/ui/screen/room/RoomScreen.kt
View File

@ -32,8 +32,7 @@ import ru.myitschool.work.ui.screen.auth.AuthViewModel
@Composable @Composable
fun RoomScreen( fun RoomScreen(
roomId: Int, viewModel: RoomViewModel = viewModel(),
viewModel: AuthViewModel = viewModel(),
roomId: Int, roomId: Int,
navController: NavController navController: NavController
) { ) {
@ -62,7 +61,7 @@ fun RoomScreen(
) )
Spacer(modifier = Modifier.size(12.dp)) Spacer(modifier = Modifier.size(12.dp))
LazyColumn { LazyColumn {
itemsIndexed(currentState.data.data.entries.toList()) { index, item -> itemsIndexed(currentState.data.entries.toList()) { index, item ->
DayCard(item.key, item.value.toString(), index) DayCard(item.key, item.value.toString(), index)
} }
} }
@ -100,7 +99,7 @@ fun RoomScreen(
) )
} }
Button( Button(
onClick = { viewModel.onIntent(RoomIntent.Refresh) } onClick = { viewModel.onIntent(RoomIntent.Refresh(roomId)) }
) { ) {
Text("Refresh") Text("Refresh")
} }