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

room screen base added

Browse Source
This commit is contained in:
student-i-nikolaevskiy 2026-02-25 17:55:26 +03:00
parent 6fecb0890b
commit 4799227616
4 changed files with 146 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/ru/myitschool/work/core/Constants.kt
View File

@ -1,7 +1,7 @@
package ru.myitschool.work.core
object Constants {
const val HOST = "http://10.0.0.12:49165"
const val HOST = "http://10.0.0.103:49165"
const val AUTH_URL = "/login"
const val INFO_URL = "/info"
const val BOOKING_URL = "/booking"

2
app/src/main/java/ru/myitschool/work/ui/screen/auth/AuthScreen.kt
View File

@ -108,7 +108,7 @@ private fun Content(
)
}
Spacer(modifier = Modifier.size(48.dp))
Spacer(modifier = Modifier.size(48.dp))
Text(
text = stringResource(R.string.auth_title_1),
style = MaterialTheme.typography.headlineLarge,

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

@ -0,0 +1,7 @@
package ru.myitschool.work.ui.screen.room
sealed interface CardState {
data object Booked: CardState
data object Open: CardState
data object BookedByMe: CardState
}

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

@ -1,14 +1,150 @@
package ru.myitschool.work.ui.screen.room
import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.itemsIndexed
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material3.Button
import androidx.compose.material3.Card
import androidx.compose.material3.CardDefaults
import androidx.compose.material3.CircularProgressIndicator
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.runtime.collectAsState
import androidx.compose.runtime.getValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.testTag
import androidx.compose.ui.unit.dp
import androidx.lifecycle.viewmodel.compose.viewModel
import androidx.navigation.NavController
import ru.myitschool.work.core.TestIds
import ru.myitschool.work.ui.screen.auth.AuthViewModel
@Composable
fun RoomScreen(
viewModel: AuthViewModel = viewModel(),
viewModel: RoomViewModel = viewModel(),
navController: NavController
) {
val state by viewModel.uiState.collectAsState()
Column(
horizontalAlignment = Alignment.CenterHorizontally,
verticalArrangement = Arrangement.SpaceBetween,
modifier = Modifier
.fillMaxSize()
.background(MaterialTheme.colorScheme.surfaceContainerLow)
) {
when(val currentState = state) {
is RoomState.Data -> {
Column(
horizontalAlignment = Alignment.CenterHorizontally,
verticalArrangement = Arrangement.Center,
modifier = Modifier
.fillMaxSize()
.padding(20.dp)
) {
Text(
text = "TEST_LOCATOIN",
style = MaterialTheme.typography.displayMedium
)
Spacer(modifier = Modifier.size(12.dp))
LazyColumn {
itemsIndexed(currentState.data.data.entries.toList()) { index, item ->
DayCard(item.key, item.value.toString(), index)
}
}
}
Row(
modifier = Modifier
.fillMaxWidth()
) {
Button(
onClick = { viewModel.onIntent(RoomIntent.Booking(1488, "1488")) }
) {
Text("Book")
}
Button(
onClick = { viewModel.onIntent(RoomIntent.UnBook(1488, "1488")) }
) {
Text("Cancel")
}
}
}
is RoomState.Error -> {
Card(
shape = RoundedCornerShape(20.dp),
colors = CardDefaults.cardColors(
containerColor = MaterialTheme.colorScheme.errorContainer,
),
) {
Text(
modifier = Modifier.testTag(TestIds.Auth.ERROR).padding(16.dp),
text = currentState.error,
style = MaterialTheme.typography.bodyMedium,
color = MaterialTheme.colorScheme.onErrorContainer,
)
}
Button(
onClick = { viewModel.onIntent(RoomIntent.Refresh) }
) {
Text("Refresh")
}
}
is RoomState.Loading -> {
CircularProgressIndicator()
}
}
}
}
@Composable
fun DayCard(name: String?, day: String, index: Int) {
Card(
shape = RoundedCornerShape(20.dp),
colors = CardDefaults.cardColors(
containerColor = if (name == null) {
MaterialTheme.colorScheme.surfaceContainerLowest
} else if (name == "hitler") {
MaterialTheme.colorScheme.secondaryContainer
} else {
MaterialTheme.colorScheme.tertiaryContainer
}, //REMAKE TO STATE
),
modifier = Modifier.fillMaxWidth()
) {
Row(
horizontalArrangement = Arrangement.SpaceBetween,
verticalAlignment = Alignment.CenterVertically,
modifier = Modifier.padding(24.dp)
) {
Column(
verticalArrangement = Arrangement.Center,
) {
Text(
text = "${name}",
style = MaterialTheme.typography.labelLarge,
color = MaterialTheme.colorScheme.onSurface
)
Text(
text = "${day}",
style = MaterialTheme.typography.headlineMedium,
color = MaterialTheme.colorScheme.onSurface
)
}
Text("${index}")
}
}
}