student-18211/NTO-2025-Android-TeamTask
1
0
Fork 2
forked from Olympic/NTO-2025-Android-TeamTask
Code Pull Requests Activity

My job and Egor's job #6

Merged
student-18211 merged 2 commits from student-15047/NTO-2025-Android-TeamTask:main into main 2025-12-08 19:17:52 +00:00
Conversation 0 Commits 2 Files Changed 18 +4 -13
6 changed files with 4 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit b11e010cdc - Show all commits

2
app/src/main/java/ru/myitschool/work/data/repo/MainRepository.kt
View File

@@ -1,8 +1,8 @@
package ru.myitschool.work.data.repo package ru.myitschool.work.data.repo
import androidx.core.content.edit
import ru.myitschool.work.data.source.NetworkDataSource import ru.myitschool.work.data.source.NetworkDataSource
import ru.myitschool.work.ui.screen.UserInfo import ru.myitschool.work.ui.screen.UserInfo
import androidx.core.content.edit
object MainRepository { object MainRepository {
suspend fun loadUserInfo(code: String): Result<UserInfo> { suspend fun loadUserInfo(code: String): Result<UserInfo> {

4
app/src/main/java/ru/myitschool/work/data/source/NetworkDataSource.kt
View File

@@ -16,10 +16,8 @@ import io.ktor.serialization.kotlinx.json.json
import io.ktor.utils.io.InternalAPI 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.Serializable
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.Booking
import ru.myitschool.work.ui.screen.BookingItem import ru.myitschool.work.ui.screen.BookingItem
import ru.myitschool.work.ui.screen.CreateBookingRequest import ru.myitschool.work.ui.screen.CreateBookingRequest
import ru.myitschool.work.ui.screen.UserInfo import ru.myitschool.work.ui.screen.UserInfo
@@ -66,8 +64,6 @@ object NetworkDataSource {
} }
suspend fun getFreeBooking(code: String): Result<Map<String, List<BookingItem>>> = suspend fun getFreeBooking(code: String): Result<Map<String, List<BookingItem>>> =
withContext(Dispatchers.IO) { withContext(Dispatchers.IO) {
runCatching { runCatching {

5
app/src/main/java/ru/myitschool/work/ui/screen/NavigationGraph.kt
View File

@@ -3,10 +3,7 @@ package ru.myitschool.work.ui.screen
import android.util.Log 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.lifecycle.viewmodel.compose.viewModel
import androidx.navigation.NavHostController import androidx.navigation.NavHostController
@@ -18,9 +15,7 @@ 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.book.BookScreen
import ru.myitschool.work.ui.screen.book.BookViewModel
import ru.myitschool.work.ui.screen.main.MainScreen import ru.myitschool.work.ui.screen.main.MainScreen
import ru.myitschool.work.ui.screen.main.MainViewModel
@Composable @Composable
fun AppNavHost( fun AppNavHost(

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

@@ -5,7 +5,6 @@ import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.size
import androidx.compose.material3.Button import androidx.compose.material3.Button
@@ -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()

1
app/src/main/java/ru/myitschool/work/ui/screen/book/BookState.kt
View File

@@ -1,6 +1,5 @@
package ru.myitschool.work.ui.screen.book package ru.myitschool.work.ui.screen.book
import ru.myitschool.work.data.source.NetworkDataSource
import ru.myitschool.work.ui.screen.BookingItem import ru.myitschool.work.ui.screen.BookingItem
sealed interface BookState { sealed interface BookState {

1
app/src/main/java/ru/myitschool/work/ui/screen/book/BookViewModel.kt
View File

@@ -8,7 +8,6 @@ import kotlinx.coroutines.flow.MutableSharedFlow
import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.SharedFlow import kotlinx.coroutines.flow.SharedFlow
import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.StateFlow
import kotlinx.coroutines.flow.asSharedFlow
import kotlinx.coroutines.flow.asStateFlow import kotlinx.coroutines.flow.asStateFlow
import kotlinx.coroutines.flow.update import kotlinx.coroutines.flow.update
import kotlinx.coroutines.launch import kotlinx.coroutines.launch