forked from student-18211/NTO-2025-Android-TeamTask
completed user authorization with a saved user, and also optimized imports
This commit is contained in:
@@ -1,8 +1,8 @@
|
||||
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
|
||||
import androidx.core.content.edit
|
||||
|
||||
object MainRepository {
|
||||
suspend fun loadUserInfo(code: String): Result<UserInfo> {
|
||||
|
||||
@@ -16,10 +16,8 @@ import io.ktor.serialization.kotlinx.json.json
|
||||
import io.ktor.utils.io.InternalAPI
|
||||
import kotlinx.coroutines.Dispatchers
|
||||
import kotlinx.coroutines.withContext
|
||||
import kotlinx.serialization.Serializable
|
||||
import kotlinx.serialization.json.Json
|
||||
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.CreateBookingRequest
|
||||
import ru.myitschool.work.ui.screen.UserInfo
|
||||
@@ -66,8 +64,6 @@ object NetworkDataSource {
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
suspend fun getFreeBooking(code: String): Result<Map<String, List<BookingItem>>> =
|
||||
withContext(Dispatchers.IO) {
|
||||
runCatching {
|
||||
|
||||
@@ -3,10 +3,7 @@ package ru.myitschool.work.ui.screen
|
||||
import android.util.Log
|
||||
import androidx.compose.animation.EnterTransition
|
||||
import androidx.compose.animation.ExitTransition
|
||||
import androidx.compose.foundation.layout.Box
|
||||
import androidx.compose.material3.Text
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.ui.Alignment
|
||||
import androidx.compose.ui.Modifier
|
||||
import androidx.lifecycle.viewmodel.compose.viewModel
|
||||
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.screen.auth.AuthScreen
|
||||
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.MainViewModel
|
||||
|
||||
@Composable
|
||||
fun AppNavHost(
|
||||
|
||||
@@ -5,7 +5,6 @@ import androidx.compose.foundation.layout.Column
|
||||
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.material3.Button
|
||||
@@ -30,6 +29,7 @@ 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.MainScreenDestination
|
||||
|
||||
@Composable
|
||||
@@ -45,6 +45,8 @@ fun AuthScreen(
|
||||
}
|
||||
}
|
||||
|
||||
AuthRepository.getSavedCode()?.let { viewModel.onIntent(AuthIntent.Send(it)) }
|
||||
|
||||
Column(
|
||||
modifier = Modifier
|
||||
.fillMaxSize()
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
package ru.myitschool.work.ui.screen.book
|
||||
|
||||
import ru.myitschool.work.data.source.NetworkDataSource
|
||||
import ru.myitschool.work.ui.screen.BookingItem
|
||||
|
||||
sealed interface BookState {
|
||||
|
||||
@@ -8,7 +8,6 @@ import kotlinx.coroutines.flow.MutableSharedFlow
|
||||
import kotlinx.coroutines.flow.MutableStateFlow
|
||||
import kotlinx.coroutines.flow.SharedFlow
|
||||
import kotlinx.coroutines.flow.StateFlow
|
||||
import kotlinx.coroutines.flow.asSharedFlow
|
||||
import kotlinx.coroutines.flow.asStateFlow
|
||||
import kotlinx.coroutines.flow.update
|
||||
import kotlinx.coroutines.launch
|
||||
|
||||
Reference in New Issue
Block a user