Compare commits

13 Commits

Author SHA1 Message Date
3941641d1f Merge pull request 'My job and Egor's job' (#6) from student-15047/NTO-2025-Android-TeamTask:main into main
Reviewed-on: student-18211/NTO-2025-Android-TeamTask#6
2025-12-08 19:17:52 +00:00
b11e010cdc completed user authorization with a saved user, and also optimized imports 2025-12-08 22:07:43 +03:00
8a5fee532b I completed all the tasks assigned to me and combined my part of the project with Egor's part. 2025-12-08 21:22:55 +03:00
d4fc4a929f Merge pull request 'I made the logic for moving between screens and added stubs' (#5) from student-15047/NTO-2025-Android-TeamTask:main into main
Reviewed-on: student-18211/NTO-2025-Android-TeamTask#5
2025-12-05 18:35:30 +00:00
2d9682ebba merge upstream 2025-12-05 18:33:07 +00:00
655baf713f I made the logic for moving between screens and added stubs 2025-12-05 21:32:25 +03:00
32cdc2b3a6 Merge pull request 'add booking to main branch' (#4) from student-15047/NTO-2025-Android-TeamTask:main into main
Reviewed-on: student-18211/NTO-2025-Android-TeamTask#4
2025-12-05 17:24:18 +00:00
f632ddbe2b Merge remote-tracking branch 'origin/main'
# Conflicts:
#	app/src/main/java/ru/myitschool/work/ui/screen/NavigationGraph.kt
#	app/src/main/java/ru/myitschool/work/ui/screen/book/BookIntent.kt
#	app/src/main/java/ru/myitschool/work/ui/screen/book/BookScreen.kt
#	app/src/main/java/ru/myitschool/work/ui/screen/book/BookState.kt
#	app/src/main/java/ru/myitschool/work/ui/screen/book/BookViewModel.kt
#	app/src/main/res/values/strings.xml
2025-12-05 18:31:20 +03:00
f5ff5dbca8 I merge fork 2025-12-05 18:28:06 +03:00
09e97f9d67 I configured the server connection and improved the logic 2025-12-04 23:19:42 +03:00
47e9018b67 revert abc0f81356
revert Merge pull request 'Added appearance and basic booking functionality' (#1) from student-15047/NTO-2025-Android-TeamTask:to-book into main

Reviewed-on: student-18211/NTO-2025-Android-TeamTask#1
2025-11-30 16:05:59 +00:00
abc0f81356 Merge pull request 'Added appearance and basic booking functionality' (#1) from student-15047/NTO-2025-Android-TeamTask:to-book into main
Reviewed-on: student-18211/NTO-2025-Android-TeamTask#1
2025-11-30 16:04:45 +00:00
2807368adb Added appearance and basic booking functionality 2025-11-30 17:52:39 +03:00
20 changed files with 917 additions and 36 deletions

View File

@@ -1,7 +1,7 @@
package ru.myitschool.work.core package ru.myitschool.work.core
object Constants { object Constants {
const val HOST = "http://10.0.2.2:8080" const val HOST = "http://192.168.1.74:8080"
const val AUTH_URL = "/auth" const val AUTH_URL = "/auth"
const val INFO_URL = "/info" const val INFO_URL = "/info"
const val BOOKING_URL = "/booking" const val BOOKING_URL = "/booking"

View File

@@ -1,16 +1,42 @@
package ru.myitschool.work.data.repo package ru.myitschool.work.data.repo
import android.content.Context
import android.util.Log
import ru.myitschool.work.App
import ru.myitschool.work.data.source.NetworkDataSource import ru.myitschool.work.data.source.NetworkDataSource
object AuthRepository { object AuthRepository {
private var codeCache: String? = null private var codeCache: String? = null
private const val PREF_NAME = "auth_prefs"
private const val KEY_SAVED_CODE = "saved_code"
private val context: Context get() = App.context
suspend fun checkAndSave(text: String): Result<Boolean> { private fun loadSavedCode(): String? {
return NetworkDataSource.checkAuth(text).onSuccess { success -> return context.getSharedPreferences(PREF_NAME, Context.MODE_PRIVATE)
.getString(KEY_SAVED_CODE, null)
}
fun getSavedCode(): String? = loadSavedCode()
suspend fun checkAndSave(text: String): Result<Unit> {
return NetworkDataSource.checkAuth(text).fold(
onSuccess = { success ->
if (success) { if (success) {
codeCache = text codeCache = text
} context.getSharedPreferences(PREF_NAME, Context.MODE_PRIVATE)
} .edit()
.putString(KEY_SAVED_CODE, text)
.apply()
Result.success(Unit)
} else {
Result.failure(IllegalStateException("Неверный код для авторизации"))
}
},
onFailure = { error ->
Log.e("AuthRepository", "Auth failed", error)
Result.failure(error)
}
)
} }
} }

View File

@@ -0,0 +1,14 @@
package ru.myitschool.work.data.repo
import ru.myitschool.work.data.source.NetworkDataSource
import ru.myitschool.work.ui.screen.BookingItem
object BookRepository {
suspend fun loadBooks(code: String): Result<Map<String, List<BookingItem>>> {
return NetworkDataSource.getFreeBooking(code)
}
suspend fun sendData(code: String, data: String, placeId: Int) : Result<Boolean> {
return NetworkDataSource.createNewBooking(code, data, placeId)
}
}

View File

@@ -0,0 +1,16 @@
package ru.myitschool.work.data.repo
import androidx.core.content.edit
import ru.myitschool.work.data.source.NetworkDataSource
import ru.myitschool.work.ui.screen.UserInfo
object MainRepository {
suspend fun loadUserInfo(code: String): Result<UserInfo> {
return NetworkDataSource.getInfo(code)
}
fun clearAuth() {
val prefs = ru.myitschool.work.App.context
.getSharedPreferences("auth_prefs", android.content.Context.MODE_PRIVATE)
prefs.edit { clear() }
}
}

View File

@@ -1,16 +1,26 @@
package ru.myitschool.work.data.source package ru.myitschool.work.data.source
import android.util.Log
import io.ktor.client.HttpClient import io.ktor.client.HttpClient
import io.ktor.client.call.body
import io.ktor.client.engine.cio.CIO import io.ktor.client.engine.cio.CIO
import io.ktor.client.plugins.contentnegotiation.ContentNegotiation import io.ktor.client.plugins.contentnegotiation.ContentNegotiation
import io.ktor.client.request.get import io.ktor.client.request.get
import io.ktor.client.request.post
import io.ktor.client.request.setBody
import io.ktor.client.statement.bodyAsText import io.ktor.client.statement.bodyAsText
import io.ktor.http.ContentType
import io.ktor.http.HttpStatusCode import io.ktor.http.HttpStatusCode
import io.ktor.http.contentType
import io.ktor.serialization.kotlinx.json.json import io.ktor.serialization.kotlinx.json.json
import io.ktor.utils.io.InternalAPI
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.withContext import kotlinx.coroutines.withContext
import kotlinx.serialization.json.Json import kotlinx.serialization.json.Json
import ru.myitschool.work.core.Constants import ru.myitschool.work.core.Constants
import ru.myitschool.work.ui.screen.BookingItem
import ru.myitschool.work.ui.screen.CreateBookingRequest
import ru.myitschool.work.ui.screen.UserInfo
object NetworkDataSource { object NetworkDataSource {
private val client by lazy { private val client by lazy {
@@ -28,9 +38,56 @@ object NetworkDataSource {
} }
} }
suspend fun checkAuth(code: String): Result<Boolean> = withContext(Dispatchers.IO) { suspend fun checkAuth(code: String): Result<Boolean> = withContext(Dispatchers.IO) {
return@withContext runCatching { return@withContext runCatching {
val response = client.get(getUrl(code, Constants.AUTH_URL)) val response = client.get(getUrl(code, Constants.AUTH_URL))
Log.d("NetworkDataSource", "Auth response: ${response.status}")
when (response.status) {
HttpStatusCode.OK -> true
else -> error("Неверный код для авторизации")
}
}.onFailure { error ->
Log.e("NetworkDataSource", "Auth request failed", error)
}
}
suspend fun getInfo(code: String): Result<UserInfo> = withContext(Dispatchers.IO){
return@withContext runCatching {
val response = client.get(getUrl(code, Constants.INFO_URL))
when(response.status){
HttpStatusCode.OK -> {
response.body<UserInfo>()
}
else -> error("Ошибка получения данных")
}
}
}
suspend fun getFreeBooking(code: String): Result<Map<String, List<BookingItem>>> =
withContext(Dispatchers.IO) {
runCatching {
val response = client.get(getUrl(code, Constants.BOOKING_URL))
when (response.status) {
HttpStatusCode.OK -> {
// Используйте response.body с явным указанием типа
response.body<Map<String, List<BookingItem>>>()
}
else -> error(response.bodyAsText())
}
}
}
@OptIn(InternalAPI::class)
suspend fun createNewBooking(code: String, data: String, placeId: Int): Result<Boolean> =
withContext(Dispatchers.IO) {
return@withContext runCatching {
val response = client.post(getUrl(code, Constants.BOOK_URL)) {
contentType(ContentType.Application.Json)
setBody(CreateBookingRequest(data, placeId)) // используйте setBody вместо body
}
when (response.status) { when (response.status) {
HttpStatusCode.OK -> true HttpStatusCode.OK -> true
else -> error(response.bodyAsText()) else -> error(response.bodyAsText())

View File

@@ -5,11 +5,7 @@ import ru.myitschool.work.data.repo.AuthRepository
class CheckAndSaveAuthCodeUseCase( class CheckAndSaveAuthCodeUseCase(
private val repository: AuthRepository private val repository: AuthRepository
) { ) {
suspend operator fun invoke( suspend operator fun invoke(text: String): Result<Unit> {
text: String return repository.checkAndSave(text)
): Result<Unit> {
return repository.checkAndSave(text).mapCatching { success ->
if (!success) error("Code is incorrect")
}
} }
} }

View File

@@ -0,0 +1,38 @@
package ru.myitschool.work.ui.screen
import kotlinx.serialization.Serializable
@Serializable
data class UserInfo(
val name: String,
val photoUrl: String? = null,
val booking: Map<String, List<BookingItem>>
) {
fun bookingToList() : List<Booking> {
val bookings = mutableListOf<Booking>()
booking.forEach {
it.value.forEach { value ->
bookings.add(Booking(it.key, value.place))
}
}
return bookings
}
}
@Serializable
data class Booking(
val date: String,
val place: String
)
@Serializable
data class BookingItem(
val id: Int,
val place: String
)
@Serializable
data class CreateBookingRequest(
val date: String,
val placeId: Int
)

View File

@@ -1,12 +1,11 @@
package ru.myitschool.work.ui.screen package ru.myitschool.work.ui.screen
import android.util.Log
import androidx.compose.animation.EnterTransition import androidx.compose.animation.EnterTransition
import androidx.compose.animation.ExitTransition import androidx.compose.animation.ExitTransition
import androidx.compose.foundation.layout.Box
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.lifecycle.viewmodel.compose.viewModel
import androidx.navigation.NavHostController import androidx.navigation.NavHostController
import androidx.navigation.compose.NavHost import androidx.navigation.compose.NavHost
import androidx.navigation.compose.composable import androidx.navigation.compose.composable
@@ -15,6 +14,8 @@ import ru.myitschool.work.ui.nav.AuthScreenDestination
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 ru.myitschool.work.ui.screen.auth.AuthScreen import ru.myitschool.work.ui.screen.auth.AuthScreen
import ru.myitschool.work.ui.screen.book.BookScreen
import ru.myitschool.work.ui.screen.main.MainScreen
@Composable @Composable
fun AppNavHost( fun AppNavHost(
@@ -29,21 +30,19 @@ fun AppNavHost(
startDestination = AuthScreenDestination, startDestination = AuthScreenDestination,
) { ) {
composable<AuthScreenDestination> { composable<AuthScreenDestination> {
Log.d("compose", "Auth")
AuthScreen(navController = navController) AuthScreen(navController = navController)
} }
composable<MainScreenDestination> { composable<MainScreenDestination> {
Box( Log.d("compose", "Main")
contentAlignment = Alignment.Center MainScreen(viewModel = viewModel(), navController)
) {
Text(text = "Hello")
}
} }
composable<BookScreenDestination> { composable<BookScreenDestination> {
Box( Log.d("compose", "Book")
contentAlignment = Alignment.Center BookScreen(
) { viewModel = viewModel(),
Text(text = "Hello") navController = navController
} )
} }
} }
} }

View File

@@ -21,7 +21,6 @@ import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.platform.testTag import androidx.compose.ui.platform.testTag
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.text.style.TextAlign
@@ -30,6 +29,7 @@ import androidx.lifecycle.viewmodel.compose.viewModel
import androidx.navigation.NavController import androidx.navigation.NavController
import ru.myitschool.work.R import ru.myitschool.work.R
import ru.myitschool.work.core.TestIds import ru.myitschool.work.core.TestIds
import ru.myitschool.work.data.repo.AuthRepository
import ru.myitschool.work.ui.nav.MainScreenDestination import ru.myitschool.work.ui.nav.MainScreenDestination
@Composable @Composable
@@ -45,6 +45,8 @@ fun AuthScreen(
} }
} }
AuthRepository.getSavedCode()?.let { viewModel.onIntent(AuthIntent.Send(it)) }
Column( Column(
modifier = Modifier modifier = Modifier
.fillMaxSize() .fillMaxSize()
@@ -74,6 +76,11 @@ private fun Content(
state: AuthState.Data state: AuthState.Data
) { ) {
var inputText by remember { mutableStateOf("") } var inputText by remember { mutableStateOf("") }
val isValidCode = inputText.length == 4 && inputText.isNotEmpty() && inputText.none { it.isWhitespace() } && inputText.all { ch ->
ch in '0'..'9' || ch in 'A'..'Z' || ch in 'a'..'z'
}
Spacer(modifier = Modifier.size(16.dp)) Spacer(modifier = Modifier.size(16.dp))
TextField( TextField(
modifier = Modifier.testTag(TestIds.Auth.CODE_INPUT).fillMaxWidth(), modifier = Modifier.testTag(TestIds.Auth.CODE_INPUT).fillMaxWidth(),
@@ -82,15 +89,23 @@ private fun Content(
inputText = it inputText = it
viewModel.onIntent(AuthIntent.TextInput(it)) viewModel.onIntent(AuthIntent.TextInput(it))
}, },
label = { Text(stringResource(R.string.auth_label)) } label = { Text(stringResource(R.string.auth_label)) },
) )
if (state.error != null) {
Text(
text = state.error,
color = MaterialTheme.colorScheme.error,
modifier = Modifier
.testTag(TestIds.Auth.ERROR)
)
}
Spacer(modifier = Modifier.size(16.dp)) Spacer(modifier = Modifier.size(16.dp))
Button( Button(
modifier = Modifier.testTag(TestIds.Auth.SIGN_BUTTON).fillMaxWidth(), modifier = Modifier.testTag(TestIds.Auth.SIGN_BUTTON).fillMaxWidth(),
onClick = { onClick = {
viewModel.onIntent(AuthIntent.Send(inputText)) viewModel.onIntent(AuthIntent.Send(inputText))
}, },
enabled = true enabled = isValidCode
) { ) {
Text(stringResource(R.string.auth_sign_in)) Text(stringResource(R.string.auth_sign_in))
} }

View File

@@ -2,5 +2,7 @@ package ru.myitschool.work.ui.screen.auth
sealed interface AuthState { sealed interface AuthState {
object Loading: AuthState object Loading: AuthState
object Data: AuthState data class Data(
val error: String? = null
) : AuthState
} }

View File

@@ -15,7 +15,7 @@ import ru.myitschool.work.domain.auth.CheckAndSaveAuthCodeUseCase
class AuthViewModel : ViewModel() { class AuthViewModel : ViewModel() {
private val checkAndSaveAuthCodeUseCase by lazy { CheckAndSaveAuthCodeUseCase(AuthRepository) } private val checkAndSaveAuthCodeUseCase by lazy { CheckAndSaveAuthCodeUseCase(AuthRepository) }
private val _uiState = MutableStateFlow<AuthState>(AuthState.Data) private val _uiState = MutableStateFlow<AuthState>(AuthState.Data())
val uiState: StateFlow<AuthState> = _uiState.asStateFlow() val uiState: StateFlow<AuthState> = _uiState.asStateFlow()
private val _actionFlow: MutableSharedFlow<Unit> = MutableSharedFlow() private val _actionFlow: MutableSharedFlow<Unit> = MutableSharedFlow()
@@ -24,20 +24,23 @@ class AuthViewModel : ViewModel() {
fun onIntent(intent: AuthIntent) { fun onIntent(intent: AuthIntent) {
when (intent) { when (intent) {
is AuthIntent.Send -> { is AuthIntent.Send -> {
viewModelScope.launch(Dispatchers.Default) { viewModelScope.launch(Dispatchers.IO) {
_uiState.update { AuthState.Loading } _uiState.update { AuthState.Loading }
checkAndSaveAuthCodeUseCase.invoke("9999").fold( checkAndSaveAuthCodeUseCase.invoke(intent.text).fold(
onSuccess = { onSuccess = {
_actionFlow.emit(Unit) _actionFlow.emit(Unit)
}, },
onFailure = { error -> onFailure = { error ->
error.printStackTrace() _uiState.update {
_actionFlow.emit(Unit) AuthState.Data(error.message ?: "Неверный код для авторизации")
}
} }
) )
} }
} }
is AuthIntent.TextInput -> Unit is AuthIntent.TextInput -> {
_uiState.update { AuthState.Data() }
}
} }
} }
} }

View File

@@ -0,0 +1,8 @@
package ru.myitschool.work.ui.screen.book
sealed interface BookIntent {
data class Send(val code : String, val data: String, val placeId : Int) : BookIntent
data object BackToMainScreen : BookIntent
data object ToAuthScreen : BookIntent
data object LoadData : BookIntent
}

View File

@@ -0,0 +1,220 @@
package ru.myitschool.work.ui.screen.book;
import android.util.Log
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.selection.selectableGroup
import androidx.compose.material3.Button
import androidx.compose.material3.CircularProgressIndicator
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.NavigationBar
import androidx.compose.material3.NavigationBarItem
import androidx.compose.material3.RadioButton
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.collectAsState
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.testTag
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.dp
import androidx.lifecycle.viewmodel.compose.viewModel
import androidx.navigation.NavController
import ru.myitschool.work.R
import ru.myitschool.work.core.TestIds
import ru.myitschool.work.data.repo.AuthRepository
import ru.myitschool.work.ui.nav.AuthScreenDestination
import ru.myitschool.work.ui.nav.MainScreenDestination
import java.time.LocalDate
import java.time.format.DateTimeFormatter
@Composable
fun BookScreen(
viewModel: BookViewModel = viewModel(),
navController: NavController,
modifier: Modifier = Modifier
) {
val state by viewModel.uiState.collectAsState()
LaunchedEffect(Unit) {
Log.d("BookScreen", "1")
viewModel.navigationFlow.collect { event ->
Log.d("navigation", "Event received: $event")
when (event) {
BookNavigationEvent.NavigateToMain -> {
Log.d("BookScreen", "3")
navController.navigate(MainScreenDestination)
}
BookNavigationEvent.NavigateToAuth -> {
Log.d("BookScreen", "4")
navController.navigate(AuthScreenDestination) {
Log.d("BookScreen", "5")
popUpTo(navController.graph.startDestinationId) {
Log.d("BookScreen", "6")
inclusive = true
}
}
}
}
}
}
Column(
modifier = modifier.fillMaxSize()
) {
// Text("" + selectedTime.value + "," + currentTime.value + "," + selectedBooking.value)
when (state) {
is BookState.Data -> {
var selectedTime : String? by remember { mutableStateOf(null) }
var selectedBooking : Int? by remember { mutableStateOf(null) }
var currentTime : String? by remember { mutableStateOf(null) }
val options = (state as BookState.Data).booking
if (currentTime == null)
for (el in options) {
if (!el.value.isEmpty()) {
currentTime = el.key
break
}
}
NavigationBar(
Modifier.fillMaxWidth()
) {
val inputFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd")
val outputFormatter = DateTimeFormatter.ofPattern("dd.MM")
options.keys
.map { LocalDate.parse(it, inputFormatter) }
.sorted()
// .map { it.format(inputFormatter) }
.forEachIndexed { index, label ->
options[label.format(inputFormatter)]?.let {
if (!it.isEmpty()) {
NavigationBarItem(
selected = currentTime == label.format(inputFormatter),
onClick = {
currentTime = label.format(inputFormatter)
},
icon = {
Text(
text = label.format(outputFormatter),
modifier = Modifier
.testTag(TestIds.Book.ITEM_DATE)
)
},
modifier = Modifier
.testTag(TestIds.Book.getIdDateItemByPosition(index))
)
}
}
}
}
LazyColumn(
Modifier
.fillMaxWidth()
) {
options[currentTime]?.forEach { book ->
item {
Row(
Modifier
.fillMaxWidth()
.selectableGroup()
.testTag(TestIds.Book.getIdPlaceItemByPosition(book.id)),
horizontalArrangement = Arrangement.SpaceBetween,
verticalAlignment = Alignment.CenterVertically
) {
Text(
text = book.place,
modifier = Modifier
.testTag(TestIds.Book.ITEM_PLACE_TEXT)
)
RadioButton(
selected = book.id == selectedBooking && currentTime == selectedTime,
onClick = {
selectedBooking = book.id
selectedTime = currentTime
},
modifier = Modifier
.testTag(TestIds.Book.ITEM_PLACE_SELECTOR)
)
}
}
}
}
Button(
onClick = {
viewModel.onIntent(BookIntent.Send(AuthRepository.getSavedCode()!!, selectedTime!!, selectedBooking!!))
},
modifier = Modifier
.testTag(TestIds.Book.BOOK_BUTTON),
enabled = selectedBooking != null
) {
Text(stringResource(R.string.to_book))
}
}
is BookState.Error -> {
Text(
text = (state as BookState.Error).error,
color = MaterialTheme.colorScheme.error,
modifier = Modifier
.testTag(TestIds.Book.ERROR)
)
Button(
onClick = {
viewModel.onIntent(BookIntent.LoadData)
},
modifier = Modifier
.testTag(TestIds.Book.REFRESH_BUTTON)
) {
Text(stringResource(R.string.upadate)) // А что сюда писать?
}
}
BookState.Loading -> {
CircularProgressIndicator(
modifier = Modifier
.align(Alignment.CenterHorizontally)
.size(64.dp)
)
}
BookState.NotData -> {
Text(
text = stringResource(R.string.not_book),
modifier = Modifier
.testTag(TestIds.Book.EMPTY)
)
}
}
Button(
onClick = {
viewModel.onIntent(BookIntent.BackToMainScreen)
},
modifier = Modifier
.testTag(TestIds.Book.BACK_BUTTON)
) {
Text(stringResource(R.string.back))
}
}
}

View File

@@ -0,0 +1,14 @@
package ru.myitschool.work.ui.screen.book
import ru.myitschool.work.ui.screen.BookingItem
sealed interface BookState {
object Loading: BookState
data class Data(
val booking: Map<String, List<BookingItem>> = mapOf()
): BookState
data class Error(
val error : String
): BookState
object NotData : BookState
}

View File

@@ -0,0 +1,121 @@
package ru.myitschool.work.ui.screen.book
import android.util.Log
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.flow.MutableSharedFlow
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.SharedFlow
import kotlinx.coroutines.flow.StateFlow
import kotlinx.coroutines.flow.asStateFlow
import kotlinx.coroutines.flow.update
import kotlinx.coroutines.launch
import ru.myitschool.work.data.repo.AuthRepository
import ru.myitschool.work.data.repo.BookRepository
class BookViewModel : ViewModel() {
private val _uiState = MutableStateFlow<BookState>(BookState.Loading)
val uiState: StateFlow<BookState> = _uiState.asStateFlow();
private val _navigationFlow = MutableSharedFlow<BookNavigationEvent>(replay = 0, extraBufferCapacity = 1)
val navigationFlow: SharedFlow<BookNavigationEvent> = _navigationFlow
init {
loadData()
}
private fun loadData() {
viewModelScope.launch(Dispatchers.IO) {
_uiState.update { BookState.Loading }
val code = AuthRepository.getSavedCode() ?: run {
_navigationFlow.emit(BookNavigationEvent.NavigateToAuth)
Log.d("", "Go to AuthScreen")
return@launch
}
Log.d("", "Проверка")
// _uiState.update {
// BookState.Data(
// listOf(
// Booking(
// "19.04",
// "Рабочее место у окна"
// ),
// Booking(
// "19.04",
// "Переговорная комната № 1"
// ),
// Booking(
// "19.04",
// "Коворкинг А"
// ),
// Booking(
// "20.04",
// "Кабинет № 33"
// ),
// ).toMap()
// )
// }
BookRepository.loadBooks(code).fold(
onSuccess = {
it.let { bookings ->
_uiState.update {
Log.d("test", bookings.isEmpty().toString())
when (!bookings.isEmpty()) {
true -> BookState.Data(
booking = bookings
)
false -> BookState.NotData
}
}
}
},
onFailure = { error ->
_uiState.update {
BookState.Error(
error = error.message ?: "Не удалось загрузить данные"
)
}
}
)
}
}
fun onIntent(intent: BookIntent) {
when (intent) {
is BookIntent.Send -> {
viewModelScope.launch(Dispatchers.IO) {
_uiState.update { BookState.Loading }
BookRepository.sendData(intent.code, intent.data, intent.placeId).fold(
onSuccess = {
Log.d("send date", "success")
_navigationFlow.emit(BookNavigationEvent.NavigateToMain)
},
onFailure = { error ->
Log.d("send date", "error: $error")
_uiState.update {
BookState.Error(error.message ?: "Неизвестная ошибка")
}
}
)
}
}
BookIntent.BackToMainScreen -> {
viewModelScope.launch {
_navigationFlow.emit(BookNavigationEvent.NavigateToMain)
}
}
BookIntent.LoadData -> loadData()
BookIntent.ToAuthScreen -> {
viewModelScope.launch {
_navigationFlow.emit(BookNavigationEvent.NavigateToAuth)
}
}
}
}
}
sealed interface BookNavigationEvent {
object NavigateToAuth : BookNavigationEvent
object NavigateToMain : BookNavigationEvent
}

View File

@@ -0,0 +1,7 @@
package ru.myitschool.work.ui.screen.main
sealed interface MainIntent {
data object LoadData : MainIntent
data object Logout : MainIntent
data object AddBooking : MainIntent
}

View File

@@ -0,0 +1,223 @@
package ru.myitschool.work.ui.screen.main
import android.util.Log
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.height
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.wrapContentSize
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.itemsIndexed
import androidx.compose.foundation.shape.CircleShape
import androidx.compose.material3.Button
import androidx.compose.material3.CircularProgressIndicator
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.collectAsState
import androidx.compose.runtime.getValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
import androidx.compose.ui.platform.testTag
import androidx.compose.ui.unit.dp
import androidx.lifecycle.viewmodel.compose.viewModel
import androidx.navigation.NavController
import coil3.compose.AsyncImage
import ru.myitschool.work.core.TestIds
import ru.myitschool.work.ui.nav.AuthScreenDestination
import ru.myitschool.work.ui.nav.BookScreenDestination
import ru.myitschool.work.ui.screen.Booking
@Composable
fun MainScreen(
viewModel: MainViewModel = viewModel(),
navController: NavController
) {
val state by viewModel.uiState.collectAsState()
LaunchedEffect(state) {
Log.d("MainScreen", "UI State: $state")
}
LaunchedEffect(viewModel) {
viewModel.navigationFlow.collect { event ->
when (event) {
MainNavigationEvent.NavigateToAuth -> {
navController.navigate(AuthScreenDestination) {
popUpTo(navController.graph.startDestinationId) { inclusive = true }
}
}
MainNavigationEvent.NavigateToBook -> {
navController.navigate(BookScreenDestination)
}
}
}
}
when (state) {
MainState.Loading -> {
CircularProgressIndicator(
modifier = Modifier
.fillMaxSize()
.wrapContentSize(Alignment.Center)
)
}
is MainState.Content -> {
Content(
state = state as MainState.Content,
onRefresh = { viewModel.onIntent(MainIntent.LoadData) },
onLogout = { viewModel.onIntent(MainIntent.Logout) },
onAddBooking = { viewModel.onIntent(MainIntent.AddBooking) }
)
}
is MainState.ErrorOnly -> {
Column(
modifier = Modifier
.fillMaxSize()
.padding(24.dp),
horizontalAlignment = Alignment.CenterHorizontally,
verticalArrangement = Arrangement.Center
) {
Text(
text = (state as MainState.ErrorOnly).message,
color = MaterialTheme.colorScheme.error,
modifier = Modifier.testTag(TestIds.Main.ERROR)
)
Spacer(modifier = Modifier.height(16.dp))
Button(
onClick = { viewModel.onIntent(MainIntent.LoadData) },
modifier = Modifier.testTag(TestIds.Main.REFRESH_BUTTON)
) {
Text("Обновить")
}
}
}
}
}
@Composable
private fun Content(
state: MainState.Content,
onRefresh: () -> Unit,
onLogout: () -> Unit,
onAddBooking: () -> Unit,
modifier: Modifier = Modifier
) {
Column(
modifier = modifier
.fillMaxSize()
.padding(16.dp),
horizontalAlignment = Alignment.CenterHorizontally
) {
state.userPhotoUrl?.let { url ->
AsyncImage(
model = url,
contentDescription = "Аватар",
modifier = Modifier
.size(80.dp)
.clip(CircleShape)
.testTag(TestIds.Main.PROFILE_IMAGE)
)
}
state.userName?.let {
Text(
text = it,
style = MaterialTheme.typography.headlineSmall,
modifier = Modifier.testTag(TestIds.Main.PROFILE_NAME)
)
}
Spacer(modifier = Modifier.height(8.dp))
Row(
modifier = Modifier.fillMaxWidth(),
horizontalArrangement = Arrangement.SpaceBetween
) {
Button(
onClick = onLogout,
modifier = Modifier.testTag(TestIds.Main.LOGOUT_BUTTON)
) {
Text("Выйти")
}
Button(
onClick = onRefresh,
modifier = Modifier.testTag(TestIds.Main.REFRESH_BUTTON)
) {
Text("Обновить")
}
Button(
onClick = onAddBooking,
modifier = Modifier.testTag(TestIds.Main.ADD_BUTTON)
) {
Text("Забронировать")
}
}
Spacer(modifier = Modifier.height(16.dp))
if (state.error != null) {
Text(
text = state.error,
color = MaterialTheme.colorScheme.error,
modifier = Modifier.testTag(TestIds.Main.ERROR)
)
Spacer(modifier = Modifier.height(8.dp))
}
Text(
text = "Бронирования",
style = MaterialTheme.typography.titleMedium,
modifier = Modifier
.fillMaxWidth()
.testTag("main_bookings_title")
)
Spacer(modifier = Modifier.height(8.dp))
Row(
modifier = Modifier
.fillMaxWidth()
.padding(horizontal = 8.dp),
horizontalArrangement = Arrangement.SpaceBetween
) {
Text(
text = "Дата",
style = MaterialTheme.typography.labelMedium,
modifier = Modifier.testTag("main_bookings_header_date")
)
Text(
text = "Место",
style = MaterialTheme.typography.labelMedium,
modifier = Modifier.testTag("main_bookings_header_place")
)
}
Spacer(modifier = Modifier.height(8.dp))
LazyColumn(modifier = Modifier.fillMaxSize()) {
itemsIndexed(state.bookings) { index, item ->
BookingItemView(booking = item, index = index)
Spacer(modifier = Modifier.height(8.dp))
}
}
}
}
@Composable
private fun BookingItemView(booking: Booking, index: Int) {
Row(
modifier = Modifier
.fillMaxWidth()
.testTag(TestIds.Main.getIdItemByPosition(index))
.padding(8.dp)
) {
Text(
text = booking.date,
modifier = Modifier.testTag(TestIds.Main.ITEM_DATE)
)
Spacer(modifier = Modifier.weight(1f))
Text(
text = booking.place,
modifier = Modifier.testTag(TestIds.Main.ITEM_PLACE)
)
}
}

View File

@@ -0,0 +1,16 @@
package ru.myitschool.work.ui.screen.main
import ru.myitschool.work.ui.screen.Booking
sealed interface MainState {
object Loading : MainState
data class Content(
val userName: String?,
val userPhotoUrl: String?,
val bookings: List<Booking>,
val error: String? = null
) : MainState
data class ErrorOnly(
val message: String
) : MainState
}

View File

@@ -0,0 +1,102 @@
package ru.myitschool.work.ui.screen.main
import android.util.Log
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.flow.MutableSharedFlow
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.SharedFlow
import kotlinx.coroutines.flow.StateFlow
import kotlinx.coroutines.flow.asStateFlow
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
import ru.myitschool.work.data.repo.AuthRepository
import ru.myitschool.work.data.repo.MainRepository
import ru.myitschool.work.ui.screen.Booking
import java.time.LocalDate
import java.time.format.DateTimeFormatter
class MainViewModel : ViewModel() {
private val _uiState = MutableStateFlow<MainState>(MainState.Loading)
val uiState: StateFlow<MainState> = _uiState.asStateFlow()
private val _navigationFlow = MutableSharedFlow<MainNavigationEvent>(replay = 0, extraBufferCapacity = 1)
val navigationFlow: SharedFlow<MainNavigationEvent> = _navigationFlow
fun formatDateString(isoDate: String): String {
val inputFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd")
val outputFormatter = DateTimeFormatter.ofPattern("dd.MM.yyyy")
val date = LocalDate.parse(isoDate, inputFormatter)
return date.format(outputFormatter)
}
init {
loadData()
}
private fun loadData() {
viewModelScope.launch(Dispatchers.IO) {
withContext(Dispatchers.Main) {
_uiState.value = MainState.Loading
}
val code = AuthRepository.getSavedCode() ?: run {
_navigationFlow.emit(MainNavigationEvent.NavigateToAuth)
return@launch
}
MainRepository.loadUserInfo(code).fold(
onSuccess = { userInfo ->
val inputFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd")
val outputFormatter = DateTimeFormatter.ofPattern("dd.MM.yyyy")
val sortedBookings = userInfo.bookingToList()
.sortedBy { LocalDate.parse(it.date, inputFormatter) }
.map { booking ->
Booking(
date = LocalDate.parse(booking.date, inputFormatter).format(outputFormatter),
place = booking.place
)
}
withContext(Dispatchers.Main) {
_uiState.value = MainState.Content(
userName = userInfo.name,
userPhotoUrl = userInfo.photoUrl ?: "",
bookings = sortedBookings,
error = null
)
}
},
onFailure = { error ->
Log.e("MainViewModel", "Ошибка загрузки", error)
withContext(Dispatchers.Main) {
_uiState.value = MainState.ErrorOnly(
error.message ?: "Не удалось загрузить данные"
)
}
}
)
}
}
fun onIntent(intent: MainIntent) {
when (intent) {
MainIntent.LoadData -> loadData()
MainIntent.Logout -> {
MainRepository.clearAuth()
viewModelScope.launch {
_navigationFlow.emit(MainNavigationEvent.NavigateToAuth)
}
}
MainIntent.AddBooking -> {
viewModelScope.launch {
_navigationFlow.emit(MainNavigationEvent.NavigateToBook)
}
}
}
}
}
sealed interface MainNavigationEvent {
object NavigateToAuth : MainNavigationEvent
object NavigateToBook : MainNavigationEvent
}

View File

@@ -4,4 +4,8 @@
<string name="auth_title">Привет! Введи код для авторизации</string> <string name="auth_title">Привет! Введи код для авторизации</string>
<string name="auth_label">Код</string> <string name="auth_label">Код</string>
<string name="auth_sign_in">Войти</string> <string name="auth_sign_in">Войти</string>
<string name="to_book">забронировать</string>
<string name="back">Назад</string>
<string name="not_book">Всё забранировано</string>
<string name="upadate">Обновить</string>
</resources> </resources>