.gitea/workflows/automerge-with-checking.yaml

@@ -19,7 +19,7 @@ jobs:
       - name: Check out repository code
         uses: actions/checkout@v4
       - name: Sync repos
-        uses: Vova-SH/sync-upstream-repo@1.0.5
+        uses: Vova-SH/sync-upstream-repo@1.0.2
         with:
           upstream_repo: ${{ env.CORE_REPO }}
           token: ${{ env.TOKEN }}

.gitea/workflows/automerge-with-core.yaml

@@ -19,7 +19,7 @@ jobs:
       - name: Check out repository code
         uses: actions/checkout@v4
       - name: Sync repos
-        uses: Vova-SH/sync-upstream-repo@1.0.5
+        uses: Vova-SH/sync-upstream-repo@latest
         with:
           upstream_repo: ${{ env.CORE_REPO }}
           token: ${{ env.TOKEN }}

.gitmodules

@@ -3,4 +3,7 @@
 	url = https://git.sicampus.ru/core/gradle.git
 [submodule "buildSrc"]
 	path = buildSrc
-	url = https://git.sicampus.ru/core/dependecies.git
+	url = https://git.sicampus.ru/core/dependecies.git
+[submodule "test-lib"]
+	path = testLib
+	url = https://git.sicampus.ru/core/test-lib

app/build.gradle.kts

@@ -1,7 +1,5 @@
 plugins {
-    composeCompiler
     kotlinAndroid
-    kotlinSerialization version Version.Kotlin.language
     androidApplication
 }
 
@@ -34,17 +32,6 @@ android {
 }
 
 dependencies {
-    defaultComposeLibrary()
+    defaultLibrary()
-    implementation("androidx.datastore:datastore-preferences:1.1.7")
+    androidTestImplementation(project(path = ":testLib"))
-    implementation("org.jetbrains.kotlinx:kotlinx-collections-immutable:0.4.0")
-    implementation("androidx.navigation:navigation-compose:2.9.6")
-    val coil = "3.3.0"
-    implementation("io.coil-kt.coil3:coil-compose:$coil")
-    implementation("io.coil-kt.coil3:coil-network-ktor3:$coil")
-    val ktor = "3.3.1"
-    implementation("io.ktor:ktor-client-core:$ktor")
-    implementation("io.ktor:ktor-client-cio:$ktor")
-    implementation("io.ktor:ktor-client-content-negotiation:$ktor")
-    implementation("io.ktor:ktor-serialization-kotlinx-json:$ktor")
-    implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.9.0")
 }

app/src/main/AndroidManifest.xml

@@ -2,10 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
 
-    <uses-permission android:name="android.permission.INTERNET" />
-
     <application
-        android:name=".App"
         android:allowBackup="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_rules"
@@ -13,19 +10,7 @@
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:usesCleartextTraffic="true"
+        android:theme="@style/Theme.Default"
-        tools:targetApi="31">
+        tools:targetApi="31" />
-        <activity
-            android:name=".ui.root.RootActivity"
-            android:exported="true"
-            android:windowSoftInputMode="adjustResize"
-            android:label="@string/title_activity_root">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-    </application>
 
 </manifest>

app/src/main/java/ru/myitschool/work/App.kt

@@ -1,15 +0,0 @@
-package ru.myitschool.work
-
-import android.app.Application
-import android.content.Context
-
-class App: Application() {
-    override fun onCreate() {
-        super.onCreate()
-        context = this
-    }
-
-    companion object {
-        lateinit var context: Context
-    }
-}

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

@@ -1,9 +0,0 @@
-package ru.myitschool.work.core
-
-object Constants {
-    const val HOST = "http://localhost:8090"
-    const val AUTH_URL = "/auth"
-    const val INFO_URL = "/info"
-    const val BOOKING_URL = "/booking"
-    const val BOOK_URL = "/book"
-}

app/src/main/java/ru/myitschool/work/core/TestIds.kt

@@ -1,35 +0,0 @@
-package ru.myitschool.work.core
-
-object TestIds {
-    object Auth {
-        const val ERROR = "auth_error"
-        const val SIGN_BUTTON = "auth_sign_button"
-        const val CODE_INPUT = "auth_code_input"
-    }
-    object Main {
-        const val ERROR = "main_error"
-        const val ADD_BUTTON = "main_add_button"
-        const val REFRESH_BUTTON = "main_refresh_button"
-        const val LOGOUT_BUTTON = "main_logout_button"
-        const val PROFILE_IMAGE = "main_image"
-        const val PROFILE_NAME = "main_name"
-        const val ITEM_PLACE = "main_item_place"
-        const val ITEM_DATE = "main_item_date"
-
-        fun getIdItemByPosition(position: Int) = "main_book_pos_$position"
-    }
-
-    object Book {
-        const val ERROR = "book_error"
-        const val EMPTY = "book_empty"
-        const val REFRESH_BUTTON = "book_refresh_button"
-        const val BACK_BUTTON = "book_back_button"
-        const val BOOK_BUTTON = "book_book_button"
-        const val ITEM_DATE = "book_date"
-        const val ITEM_PLACE_TEXT = "book_place_text"
-        const val ITEM_PLACE_SELECTOR = "book_place_selector"
-
-        fun getIdDateItemByPosition(position: Int) = "book_date_pos_$position"
-        fun getIdPlaceItemByPosition(position: Int) = "book_place_pos_$position"
-    }
-}

app/src/main/java/ru/myitschool/work/data/dto/BookRequestDto.kt

@@ -1,12 +0,0 @@
-package ru.myitschool.work.data.dto
-
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
-
-@Serializable
-data class BookRequestDto(
-    @SerialName("date")
-    val date: String,
-    @SerialName("placeId")
-    val placeId: String,
-)

app/src/main/java/ru/myitschool/work/data/dto/PlaceDto.kt

@@ -1,12 +0,0 @@
-package ru.myitschool.work.data.dto
-
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
-
-@Serializable
-data class PlaceDto(
-    @SerialName("id")
-    val id: String?,
-    @SerialName("place")
-    val place: String?,
-)

app/src/main/java/ru/myitschool/work/data/dto/UserDto.kt

@@ -1,15 +0,0 @@
-package ru.myitschool.work.data.dto
-
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
-
-@Serializable
-data class UserDto(
-    @SerialName("name")
-    val name: String?,
-    @SerialName("photoUrl")
-    val photoUrl: String?,
-    @SerialName("booking")
-    val booking: Map<String, PlaceDto>?
-) {
-}

app/src/main/java/ru/myitschool/work/data/repo/AuthRepository.kt

@@ -1,51 +0,0 @@
-package ru.myitschool.work.data.repo
-
-import android.content.Context
-import androidx.datastore.core.DataStore
-import androidx.datastore.preferences.core.Preferences
-import androidx.datastore.preferences.core.edit
-import androidx.datastore.preferences.core.stringPreferencesKey
-import androidx.datastore.preferences.preferencesDataStore
-import kotlinx.coroutines.flow.firstOrNull
-import ru.myitschool.work.App
-import ru.myitschool.work.data.source.NetworkDataSource
-
-object AuthRepository {
-    private const val STORE = "AUTH-STORE"
-    private const val CODE_KEY = "CODE"
-
-    private var codeCache: String? = null
-
-    suspend fun checkAndSave(text: String): Result<Boolean> {
-        return NetworkDataSource.checkAuth(text).onSuccess { success ->
-            if (success) {
-                codeCache = text
-                App.context.userDataStore.edit { preferences ->
-                    val prefKey = stringPreferencesKey(CODE_KEY)
-                    preferences[prefKey] = text
-                }
-            }
-        }
-    }
-
-    suspend fun getCode(): String? {
-        if (codeCache == null) {
-            codeCache = App.context.userDataStore.data
-                .firstOrNull()
-                ?.let { preferences ->
-                    preferences[stringPreferencesKey(CODE_KEY)]
-                }
-        }
-        return codeCache
-    }
-
-    suspend fun logout() {
-        codeCache = null
-        App.context.userDataStore.edit { preferences ->
-            val prefKey = stringPreferencesKey(CODE_KEY)
-            preferences.remove(prefKey)
-        }
-    }
-
-    private val Context.userDataStore: DataStore<Preferences> by preferencesDataStore(name = STORE)
-}

app/src/main/java/ru/myitschool/work/data/repo/BookRepository.kt

@@ -1,53 +0,0 @@
-package ru.myitschool.work.data.repo
-
-import ru.myitschool.work.data.dto.BookRequestDto
-import ru.myitschool.work.data.source.NetworkDataSource
-import ru.myitschool.work.domain.book.entities.BookRequestData
-import ru.myitschool.work.domain.book.entities.BookingData
-import ru.myitschool.work.domain.main.entities.MainInfoEntity
-
-class BookRepository(
-    private val authRepository: AuthRepository
-) {
-    suspend fun getInfo(): Result<MainInfoEntity> {
-        val code = authRepository.getCode() ?: return getNoAuthResult()
-        return NetworkDataSource.getInfo(code).mapCatching { dto ->
-            MainInfoEntity(
-                name = dto.name ?: error("Name is null"),
-                photoUrl = dto.photoUrl ?: error("Photo url is null"),
-                book = dto.booking?.mapNotNull { (date, place) ->
-                    MainInfoEntity.Book(
-                        date = date,
-                        place = place.place ?: return@mapNotNull null
-                    )
-                } ?: listOf()
-            )
-        }
-    }
-
-    suspend fun getBookingInfo(): Result<List<BookingData>> {
-        val code = authRepository.getCode() ?: return getNoAuthResult()
-        return NetworkDataSource.getBooking(code).mapCatching { dto ->
-            dto?.map { (date, places) ->
-                BookingData(
-                    date = date,
-                    places = places.mapNotNull { place ->
-                        BookingData.Place(
-                            id = place.id ?: return@mapNotNull null,
-                            name = place.place ?: return@mapNotNull null
-                        )
-                    }
-                )
-            } ?: error("map is null")
-        }
-    }
-
-    suspend fun sendBook(data: BookRequestData): Result<Boolean> {
-        val code = authRepository.getCode() ?: return getNoAuthResult()
-        val dto = BookRequestDto(data.date, data.placeId)
-        return NetworkDataSource.addBook(code, dto)
-    }
-    private fun <T> getNoAuthResult() = Result.failure<T>(
-        IllegalStateException("No auth")
-    )
-}

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

@@ -1,89 +0,0 @@
-package ru.myitschool.work.data.source
-
-import io.ktor.client.HttpClient
-import io.ktor.client.call.body
-import io.ktor.client.engine.cio.CIO
-import io.ktor.client.plugins.contentnegotiation.ContentNegotiation
-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.http.ContentType
-import io.ktor.http.HttpStatusCode
-import io.ktor.http.contentType
-import io.ktor.serialization.kotlinx.json.json
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.withContext
-import kotlinx.serialization.json.Json
-import ru.myitschool.work.core.Constants
-import ru.myitschool.work.data.dto.PlaceDto
-import ru.myitschool.work.data.dto.BookRequestDto
-import ru.myitschool.work.data.dto.UserDto
-
-object NetworkDataSource {
-    private val client by lazy {
-        HttpClient(CIO) {
-            install(ContentNegotiation) {
-                json(
-                    Json {
-                        isLenient = true
-                        ignoreUnknownKeys = true
-                        explicitNulls = true
-                        encodeDefaults = true
-                    }
-                )
-            }
-        }
-    }
-
-    suspend fun checkAuth(code: String): Result<Boolean> = withContext(Dispatchers.IO) {
-        return@withContext runCatching {
-            val response = client.get(getUrl(code, Constants.AUTH_URL))
-            when (response.status) {
-                HttpStatusCode.OK -> true
-                else -> false
-            }
-        }
-    }
-
-    suspend fun getInfo(code: String): Result<UserDto> = withContext(Dispatchers.IO) {
-        return@withContext runCatching {
-            println("!!!!!!!!!!!!!! getInfo $code")
-            val response = client.get(getUrl(code, Constants.INFO_URL))
-            if (response.status == HttpStatusCode.OK) {
-                println("!!!!!!!!!!!!!! getInfo OK ${response.bodyAsText()}")
-                response.body<UserDto>()
-            } else {
-                println("!!!!!!!!!!!!!! getInfo ERROR ${response.bodyAsText()}")
-                error(response.bodyAsText())
-            }
-        }
-    }
-
-    suspend fun getBooking(code: String): Result<Map<String, List<PlaceDto>>?> = withContext(Dispatchers.IO) {
-        return@withContext runCatching {
-            val response = client.get(getUrl(code, Constants.BOOKING_URL))
-            if (response.status == HttpStatusCode.OK) {
-                response.body<Map<String, List<PlaceDto>>>()
-            } else {
-                error(response.bodyAsText())
-            }
-        }
-    }
-
-    suspend fun addBook(code: String, data: BookRequestDto): Result<Boolean> = withContext(Dispatchers.IO) {
-        return@withContext runCatching {
-            val response = client.post(getUrl(code, Constants.BOOK_URL)) {
-                contentType(ContentType.Application.Json)
-                setBody(data)
-            }
-            when (response.status) {
-                HttpStatusCode.Created -> true
-                HttpStatusCode.Conflict -> false
-                else -> error(response.bodyAsText())
-            }
-        }
-    }
-
-    private fun getUrl(code: String, targetUrl: String) = "${Constants.HOST}/api/$code$targetUrl"
-}

app/src/main/java/ru/myitschool/work/domain/auth/CheckAndSaveAuthCodeUseCase.kt

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

app/src/main/java/ru/myitschool/work/domain/auth/CheckCodeFormatUseCase.kt

@@ -1,12 +0,0 @@
-package ru.myitschool.work.domain.auth
-
-class CheckCodeFormatUseCase {
-    operator fun invoke(
-        text: String
-    ): Boolean {
-        return text.length == 4 && text.all { char ->
-            char.isLetterOrDigit() &&
-                    ((char >= 'A' && char <= 'Z') || (char >= 'a' && char <= 'z') || char.isDigit())
-        }
-    }
-}

app/src/main/java/ru/myitschool/work/domain/auth/GetCodeUseCase.kt

@@ -1,11 +0,0 @@
-package ru.myitschool.work.domain.auth
-
-import ru.myitschool.work.data.repo.AuthRepository
-
-class GetCodeUseCase(
-    private val repository: AuthRepository
-) {
-    suspend operator fun invoke(): String? {
-        return repository.getCode()
-    }
-}

app/src/main/java/ru/myitschool/work/domain/auth/LogoutUseCase.kt

@@ -1,11 +0,0 @@
-package ru.myitschool.work.domain.auth
-
-import ru.myitschool.work.data.repo.AuthRepository
-
-class LogoutUseCase(
-    private val repository: AuthRepository
-) {
-    suspend operator fun invoke() {
-        repository.logout()
-    }
-}

app/src/main/java/ru/myitschool/work/domain/book/GetBookingDataUseCase.kt

@@ -1,19 +0,0 @@
-package ru.myitschool.work.domain.book
-
-import ru.myitschool.work.data.repo.BookRepository
-import ru.myitschool.work.domain.book.entities.BookingData
-import java.time.LocalDate
-
-class GetBookingDataUseCase(
-    private val repository: BookRepository
-) {
-    suspend operator fun invoke(): Result<List<BookingData>> {
-        return repository.getBookingInfo().map { data ->
-            data
-                .sortedBy { book ->
-                    LocalDate.parse(book.date)
-                }
-                .filter { it.places.isNotEmpty() }
-        }
-    }
-}

app/src/main/java/ru/myitschool/work/domain/book/SendBookRequestUseCase.kt

@@ -1,14 +0,0 @@
-package ru.myitschool.work.domain.book
-
-import ru.myitschool.work.data.repo.BookRepository
-import ru.myitschool.work.domain.book.entities.BookRequestData
-
-class SendBookRequestUseCase(
-    private val repository: BookRepository
-) {
-    suspend operator fun invoke(data: BookRequestData): Result<Unit> {
-        return repository.sendBook(data).mapCatching { success ->
-            if (!success) error("Book error")
-        }
-    }
-}

app/src/main/java/ru/myitschool/work/domain/book/entities/BookRequestData.kt

@@ -1,6 +0,0 @@
-package ru.myitschool.work.domain.book.entities
-
-data class BookRequestData(
-    val date: String,
-    val placeId: String
-)

app/src/main/java/ru/myitschool/work/domain/book/entities/BookingData.kt

@@ -1,11 +0,0 @@
-package ru.myitschool.work.domain.book.entities
-
-data class BookingData(
-    val date: String,
-    val places: List<Place>
-) {
-    data class Place(
-        val id: String,
-        val name: String
-    )
-}

app/src/main/java/ru/myitschool/work/domain/main/GetMainDataUseCase.kt

@@ -1,19 +0,0 @@
-package ru.myitschool.work.domain.main
-
-import ru.myitschool.work.data.repo.BookRepository
-import ru.myitschool.work.domain.main.entities.MainInfoEntity
-import java.time.LocalDate
-
-class GetMainDataUseCase(
-    private val repository: BookRepository
-) {
-    suspend operator fun invoke(): Result<MainInfoEntity> {
-        return repository.getInfo().map { main ->
-            main.copy(
-                book = main.book.sortedBy { book ->
-                    LocalDate.parse(book.date)
-                }
-            )
-        }
-    }
-}

app/src/main/java/ru/myitschool/work/domain/main/entities/MainInfoEntity.kt

@@ -1,12 +0,0 @@
-package ru.myitschool.work.domain.main.entities
-
-data class MainInfoEntity(
-    val name: String,
-    val photoUrl: String,
-    val book: List<Book>
-) {
-    data class Book(
-        val date: String,
-        val place: String,
-    )
-}

app/src/main/java/ru/myitschool/work/ui/nav/AppDestination.kt

@@ -1,3 +0,0 @@
-package ru.myitschool.work.ui.nav
-
-sealed interface AppDestination

app/src/main/java/ru/myitschool/work/ui/nav/AuthScreenDestination.kt

@@ -1,6 +0,0 @@
-package ru.myitschool.work.ui.nav
-
-import kotlinx.serialization.Serializable
-
-@Serializable
-data object AuthScreenDestination: AppDestination

app/src/main/java/ru/myitschool/work/ui/nav/BookScreenDestination.kt

@@ -1,6 +0,0 @@
-package ru.myitschool.work.ui.nav
-
-import kotlinx.serialization.Serializable
-
-@Serializable
-data object BookScreenDestination: AppDestination

app/src/main/java/ru/myitschool/work/ui/nav/MainScreenDestination.kt

@@ -1,6 +0,0 @@
-package ru.myitschool.work.ui.nav
-
-import kotlinx.serialization.Serializable
-
-@Serializable
-data object MainScreenDestination: AppDestination

app/src/main/java/ru/myitschool/work/ui/root/RootActivity.kt

@@ -1,30 +0,0 @@
-package ru.myitschool.work.ui.root
-
-import android.os.Bundle
-import androidx.activity.ComponentActivity
-import androidx.activity.compose.setContent
-import androidx.activity.enableEdgeToEdge
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.padding
-import androidx.compose.material3.Scaffold
-import androidx.compose.ui.Modifier
-import ru.myitschool.work.ui.screen.AppNavHost
-import ru.myitschool.work.ui.theme.WorkTheme
-
-class RootActivity : ComponentActivity() {
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        enableEdgeToEdge()
-        setContent {
-            WorkTheme {
-                Scaffold(modifier = Modifier.fillMaxSize()) { innerPadding ->
-                    AppNavHost(
-                        modifier = Modifier
-                            .fillMaxSize()
-                            .padding(innerPadding)
-                    )
-                }
-            }
-        }
-    }
-}

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

@@ -1,60 +0,0 @@
-package ru.myitschool.work.ui.screen
-
-import androidx.compose.animation.EnterTransition
-import androidx.compose.animation.ExitTransition
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.Modifier
-import androidx.navigation.NavHostController
-import androidx.navigation.compose.NavHost
-import androidx.navigation.compose.composable
-import androidx.navigation.compose.rememberNavController
-import kotlinx.coroutines.delay
-import ru.myitschool.work.data.repo.AuthRepository
-import ru.myitschool.work.domain.auth.GetCodeUseCase
-import ru.myitschool.work.ui.nav.AppDestination
-import ru.myitschool.work.ui.nav.AuthScreenDestination
-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.main.MainScreen
-
-@Composable
-fun AppNavHost(
-    modifier: Modifier = Modifier,
-    navController: NavHostController = rememberNavController()
-) {
-    var destination by remember { mutableStateOf<AppDestination?>(null) }
-    LaunchedEffect(Unit) {
-        val code = GetCodeUseCase(AuthRepository).invoke()
-        destination = if (code == null) {
-            AuthScreenDestination
-        } else {
-            MainScreenDestination
-        }
-    }
-    if (destination != null) {
-        NavHost(
-            modifier = modifier,
-            enterTransition = { EnterTransition.None },
-            exitTransition = { ExitTransition.None },
-            navController = navController,
-            startDestination = destination as AppDestination,
-        ) {
-            composable<AuthScreenDestination> {
-                AuthScreen(navController = navController)
-            }
-            composable<MainScreenDestination> {
-                MainScreen(navController = navController)
-            }
-            composable<BookScreenDestination> {
-                BookScreen(navController = navController)
-            }
-        }
-    }
-}

app/src/main/java/ru/myitschool/work/ui/screen/auth/AuthAction.kt

@@ -1,7 +0,0 @@
-package ru.myitschool.work.ui.screen.auth
-
-import ru.myitschool.work.ui.nav.AppDestination
-
-sealed interface AuthAction {
-    class Open(val destination: AppDestination): AuthAction
-}

app/src/main/java/ru/myitschool/work/ui/screen/auth/AuthIntent.kt

@@ -1,6 +0,0 @@
-package ru.myitschool.work.ui.screen.auth
-
-sealed interface AuthIntent {
-    data class Send(val text: String): AuthIntent
-    data class TextInput(val text: String): AuthIntent
-}

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

@@ -1,108 +0,0 @@
-package ru.myitschool.work.ui.screen.auth
-
-import androidx.compose.foundation.layout.Arrangement
-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.padding
-import androidx.compose.foundation.layout.size
-import androidx.compose.material3.Button
-import androidx.compose.material3.CircularProgressIndicator
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Text
-import androidx.compose.material3.TextField
-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.graphics.Color
-import androidx.compose.ui.platform.testTag
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.style.TextAlign
-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
-
-@Composable
-fun AuthScreen(
-    viewModel: AuthViewModel = viewModel(),
-    navController: NavController
-) {
-    val state by viewModel.uiState.collectAsState()
-
-    LaunchedEffect(Unit) {
-        viewModel.actionFlow.collect { action ->
-            when (action) {
-                is AuthAction.Open -> navController.navigate(action.destination) {
-                    popUpTo(0)
-                }
-            }
-        }
-    }
-
-    Column(
-        modifier = Modifier
-            .fillMaxSize()
-            .padding(all = 24.dp),
-        horizontalAlignment = Alignment.CenterHorizontally,
-        verticalArrangement = Arrangement.Center
-    ) {
-        Text(
-            text = stringResource(R.string.auth_title),
-            style = MaterialTheme.typography.headlineSmall,
-            textAlign = TextAlign.Center
-        )
-        when (val currentState = state) {
-            is AuthState.Data -> Content(viewModel, currentState)
-            is AuthState.Loading -> {
-                CircularProgressIndicator(
-                    modifier = Modifier.size(64.dp)
-                )
-            }
-        }
-    }
-}
-
-@Composable
-private fun Content(
-    viewModel: AuthViewModel,
-    state: AuthState.Data
-) {
-    var inputText by remember { mutableStateOf("") }
-    Spacer(modifier = Modifier.size(16.dp))
-    TextField(
-        modifier = Modifier.testTag(TestIds.Auth.CODE_INPUT).fillMaxWidth(),
-        value = inputText,
-        onValueChange = {
-            inputText = it
-            viewModel.onIntent(AuthIntent.TextInput(it))
-        },
-        label = { Text(stringResource(R.string.auth_label)) }
-    )
-    Spacer(modifier = Modifier.size(16.dp))
-    Button(
-        modifier = Modifier.testTag(TestIds.Auth.SIGN_BUTTON).fillMaxWidth(),
-        onClick = {
-            viewModel.onIntent(AuthIntent.Send(inputText))
-        },
-        enabled = state.isEnabledSend
-    ) {
-        Text(stringResource(R.string.auth_sign_in))
-    }
-    if (state.error != null) {
-        Text(
-            modifier = Modifier.testTag(TestIds.Auth.ERROR),
-            text = state.error,
-            style = MaterialTheme.typography.bodyMedium,
-            color = Color.Red,
-        )
-    }
-}

app/src/main/java/ru/myitschool/work/ui/screen/auth/AuthState.kt

@@ -1,9 +0,0 @@
-package ru.myitschool.work.ui.screen.auth
-
-sealed interface AuthState {
-    object Loading: AuthState
-    data class Data(
-        val isEnabledSend: Boolean,
-        val error: String?
-    ): AuthState
-}

app/src/main/java/ru/myitschool/work/ui/screen/auth/AuthViewModel.kt

@@ -1,66 +0,0 @@
-package ru.myitschool.work.ui.screen.auth
-
-import androidx.lifecycle.ViewModel
-import androidx.lifecycle.viewModelScope
-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.domain.auth.CheckAndSaveAuthCodeUseCase
-import ru.myitschool.work.domain.auth.CheckCodeFormatUseCase
-import ru.myitschool.work.ui.nav.MainScreenDestination
-
-class AuthViewModel : ViewModel() {
-    private val checkCodeFormatUseCase by lazy { CheckCodeFormatUseCase() }
-    private val checkAndSaveAuthCodeUseCase by lazy { CheckAndSaveAuthCodeUseCase(AuthRepository) }
-    private val _uiState = MutableStateFlow<AuthState>(
-        AuthState.Data(
-            isEnabledSend = false,
-            error = null
-        )
-    )
-    val uiState: StateFlow<AuthState> = _uiState.asStateFlow()
-
-    private val _actionFlow: MutableSharedFlow<AuthAction> = MutableSharedFlow()
-    val actionFlow: SharedFlow<AuthAction> = _actionFlow
-
-    fun onIntent(intent: AuthIntent) {
-        when (intent) {
-            is AuthIntent.Send -> {
-                viewModelScope.launch {
-                    checkAndSaveAuthCodeUseCase.invoke(intent.text).fold(
-                        onSuccess = {
-                            _actionFlow.emit(AuthAction.Open(MainScreenDestination))
-                        },
-                        onFailure = { error ->
-                            updateStateIfData { oldState ->
-                                oldState.copy(
-                                    error = error.message
-                                )
-                            }
-                        }
-                    )
-                }
-            }
-            is AuthIntent.TextInput -> {
-                updateStateIfData { oldState ->
-                    oldState.copy(
-                        isEnabledSend = checkCodeFormatUseCase.invoke(intent.text),
-                        error = null
-                    )
-                }
-            }
-        }
-    }
-
-    private fun updateStateIfData(lambda: (AuthState.Data) -> AuthState) {
-        _uiState.update { state ->
-            (state as? AuthState.Data)?.let { lambda.invoke(it) } ?: state
-        }
-
-    }
-}

app/src/main/java/ru/myitschool/work/ui/screen/book/BookAction.kt

@@ -1,6 +0,0 @@
-package ru.myitschool.work.ui.screen.book
-
-sealed interface BookAction {
-    object Back: BookAction
-    object BackWithSuccess: BookAction
-}

app/src/main/java/ru/myitschool/work/ui/screen/book/BookIntent.kt

@@ -1,9 +0,0 @@
-package ru.myitschool.work.ui.screen.book
-
-sealed interface BookIntent {
-    data object Refresh: BookIntent
-    data class Add(
-        val date: String,
-        val placeId: String
-    ): BookIntent
-}

app/src/main/java/ru/myitschool/work/ui/screen/book/BookScreen.kt

@@ -1,312 +0,0 @@
-package ru.myitschool.work.ui.screen.book
-
-import androidx.compose.animation.EnterTransition
-import androidx.compose.animation.ExitTransition
-import androidx.compose.foundation.Image
-import androidx.compose.foundation.interaction.MutableInteractionSource
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Box
-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.selection.selectable
-import androidx.compose.foundation.selection.selectableGroup
-import androidx.compose.material3.Button
-import androidx.compose.material3.CircularProgressIndicator
-import androidx.compose.material3.FloatingActionButton
-import androidx.compose.material3.Icon
-import androidx.compose.material3.IconButton
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.PrimaryTabRow
-import androidx.compose.material3.RadioButton
-import androidx.compose.material3.Tab
-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.mutableIntStateOf
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.saveable.rememberSaveable
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.platform.testTag
-import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.semantics.Role
-import androidx.compose.ui.text.style.TextOverflow
-import androidx.compose.ui.unit.dp
-import androidx.lifecycle.viewmodel.compose.viewModel
-import androidx.navigation.NavController
-import androidx.navigation.NavHostController
-import androidx.navigation.compose.NavHost
-import androidx.navigation.compose.composable
-import androidx.navigation.compose.rememberNavController
-import androidx.navigation.toRoute
-import kotlinx.serialization.Serializable
-import ru.myitschool.work.R
-import ru.myitschool.work.core.TestIds
-import ru.myitschool.work.ui.screen.main.MainResult
-import java.time.LocalDate
-import java.time.format.DateTimeFormatter
-
-@Composable
-fun BookScreen(
-    viewModel: BookViewModel = viewModel(),
-    navController: NavController
-) {
-    val state by viewModel.uiState.collectAsState()
-
-    LaunchedEffect(Unit) {
-        viewModel.actionFlow.collect { action ->
-            when (action) {
-                is BookAction.Back -> navController.popBackStack()
-                is BookAction.BackWithSuccess -> {
-                    navController.previousBackStackEntry
-                        ?.savedStateHandle
-                        ?.set(MainResult.REFRESH_KEY, true)
-                    navController.popBackStack()
-                }
-            }
-        }
-    }
-
-    Column {
-        IconButton(
-            modifier = Modifier.testTag(TestIds.Book.BACK_BUTTON),
-            interactionSource = remember { MutableInteractionSource() },
-            onClick = {
-                navController.popBackStack()
-            },
-        ) {
-            Icon(
-                painter = painterResource(R.drawable.ic_back),
-                contentDescription = stringResource(R.string.book_back)
-            )
-        }
-
-        when (val currentState = state) {
-            is BookState.Data -> ContentState(viewModel, currentState)
-            is BookState.Error -> ErrorState(viewModel, currentState)
-            is BookState.Loading -> LoadingState()
-            is BookState.Empty -> EmptyState()
-        }
-    }
-}
-
-@Composable
-private fun LoadingState() {
-    Box(
-        Modifier.fillMaxWidth(),
-        contentAlignment = Alignment.Center
-    ) {
-        CircularProgressIndicator(
-            modifier = Modifier.size(64.dp)
-        )
-    }
-}
-
-@Composable
-private fun EmptyState() {
-    Box(
-        Modifier.fillMaxWidth(),
-        contentAlignment = Alignment.Center
-    ) {
-        Text(
-            modifier = Modifier.testTag(TestIds.Book.EMPTY),
-            text = stringResource(R.string.book_empty),
-            style = MaterialTheme.typography.headlineSmall,
-            color = Color.Black,
-        )
-    }
-}
-
-@Composable
-private fun ErrorState(
-    viewModel: BookViewModel,
-    state: BookState.Error
-) {
-    Column(
-        modifier = Modifier
-            .fillMaxSize()
-            .padding(all = 24.dp),
-        horizontalAlignment = Alignment.CenterHorizontally,
-        verticalArrangement = Arrangement.Center
-    ) {
-        Text(
-            modifier = Modifier.testTag(TestIds.Book.ERROR),
-            text = state.error,
-            style = MaterialTheme.typography.headlineSmall,
-            color = Color.Black,
-        )
-        Spacer(modifier = Modifier.size(16.dp))
-        Button(
-            modifier = Modifier.testTag(TestIds.Book.REFRESH_BUTTON).fillMaxWidth(),
-            onClick = {
-                viewModel.onIntent(BookIntent.Refresh)
-            },
-        ) {
-            Text(stringResource(R.string.main_refresh))
-        }
-    }
-}
-
-@Composable
-private fun ContentState(
-    viewModel: BookViewModel,
-    state: BookState.Data
-) {
-    val navController = rememberNavController()
-    val startDestination = SelectedTabDestination(index = 0)
-    var selectedDestination by rememberSaveable {
-        mutableIntStateOf(startDestination.index)
-    }
-    var selectedPlaceId by rememberSaveable {
-        mutableStateOf<String?>(null)
-    }
-    Box {
-        Column {
-            PrimaryTabRow(
-                modifier = Modifier,
-                selectedTabIndex = selectedDestination,
-            ) {
-                state.items.forEachIndexed { index, destination ->
-                    Tab(
-                        modifier = Modifier
-                            .testTag(TestIds.Book.getIdDateItemByPosition(index)),
-                        selected = selectedDestination == index,
-                        onClick = {
-                            navController.navigate(
-                                route = SelectedTabDestination(index = index)
-                            ) {
-                                launchSingleTop = true
-                            }
-                            selectedDestination = index
-                        },
-                        text = {
-                            Text(
-                                modifier = Modifier.testTag(TestIds.Book.ITEM_DATE),
-                                text = LocalDate.parse(destination.date)
-                                    .format(
-                                        DateTimeFormatter.ofPattern(
-                                            "dd.MM"
-                                        )
-                                    ),
-                                maxLines = 1,
-                                overflow = TextOverflow.Ellipsis
-                            )
-                        }
-                    )
-                }
-            }
-            TabNavHost(
-                modifier = Modifier.fillMaxSize(),
-                navController = navController,
-                startDestination = startDestination,
-                state = state,
-                onPlaceSelected = { id ->
-                    selectedPlaceId = id
-                }
-            )
-        }
-        Box(
-            modifier = Modifier
-                .padding(all = 24.dp)
-                .align(Alignment.BottomEnd),
-        ) {
-            FloatingActionButton(
-                modifier = Modifier.testTag(TestIds.Book.BOOK_BUTTON),
-                onClick = {
-                    val id = selectedPlaceId
-                    if (id != null) {
-                        viewModel.onIntent(
-                            BookIntent.Add(
-                                date = state.items[selectedDestination].date,
-                                placeId = id
-                            )
-                        )
-                    }
-                }
-            ) {
-                Image(
-                    painter = painterResource(R.drawable.ic_check),
-                    contentDescription = stringResource(R.string.book_add)
-                )
-            }
-        }
-    }
-}
-
-@Composable
-fun TabNavHost(
-    modifier: Modifier = Modifier,
-    navController: NavHostController,
-    startDestination: SelectedTabDestination,
-    state: BookState.Data,
-    onPlaceSelected: (String) -> Unit,
-) {
-    NavHost(
-        modifier = modifier,
-        enterTransition = { EnterTransition.None },
-        exitTransition = { ExitTransition.None },
-        navController = navController,
-        startDestination = startDestination,
-    ) {
-        composable<SelectedTabDestination> {
-            val index = it.toRoute<SelectedTabDestination>().index
-            val data = state.items[index]
-            val (selectedOption, onOptionSelected) = remember {
-                mutableStateOf(data.places[0].id)
-            }
-            onPlaceSelected.invoke(selectedOption)
-
-            Column(modifier.selectableGroup()) {
-                data.places.forEachIndexed { index, place ->
-                    val isSelected = place.id == selectedOption
-                    Row(
-                        Modifier
-                            .testTag(TestIds.Book.getIdPlaceItemByPosition(index))
-                            .fillMaxWidth()
-                            .height(56.dp)
-                            .selectable(
-                                selected = isSelected,
-                                onClick = {
-                                    onPlaceSelected(place.id)
-                                    onOptionSelected(place.id)
-                                },
-                                role = Role.RadioButton
-                            )
-                            .padding(horizontal = 16.dp),
-                        verticalAlignment = Alignment.CenterVertically
-                    ) {
-                        RadioButton(
-                            modifier = Modifier.testTag(TestIds.Book.ITEM_PLACE_SELECTOR),
-                            selected = isSelected,
-                            onClick = null
-                        )
-                        Text(
-                            modifier = Modifier
-                                .testTag(TestIds.Book.ITEM_PLACE_TEXT)
-                                .padding(start = 16.dp),
-                            text = place.name,
-                            style = MaterialTheme.typography.bodyLarge,
-                        )
-                    }
-                }
-            }
-        }
-    }
-}
-
-@Serializable
-data class SelectedTabDestination(
-    val index: Int
-)

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

@@ -1,28 +0,0 @@
-package ru.myitschool.work.ui.screen.book
-
-import kotlinx.collections.immutable.PersistentList
-import kotlinx.serialization.Serializable
-
-sealed interface BookState {
-    data object Loading : BookState
-
-    data object Empty : BookState
-    data class Error(
-        val error: String
-    ) : BookState
-
-    data class Data(
-        val items: PersistentList<Item>
-    ) : BookState {
-
-        data class Item(
-            val date: String,
-            val places: PersistentList<Place>,
-        )
-
-        data class Place(
-            val id: String,
-            val name: String,
-        )
-    }
-}

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

@@ -1,93 +0,0 @@
-package ru.myitschool.work.ui.screen.book
-
-import androidx.lifecycle.ViewModel
-import androidx.lifecycle.viewModelScope
-import kotlinx.collections.immutable.toPersistentList
-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
-import ru.myitschool.work.domain.book.GetBookingDataUseCase
-import ru.myitschool.work.domain.book.SendBookRequestUseCase
-import ru.myitschool.work.domain.book.entities.BookRequestData
-import kotlin.getValue
-
-class BookViewModel : ViewModel() {
-    private val bookRepository by lazy { BookRepository(AuthRepository) }
-    private val getBookingDataUseCase by lazy { GetBookingDataUseCase(bookRepository) }
-    private val sendBookRequestUseCase by lazy { SendBookRequestUseCase(bookRepository) }
-    private val _uiState = MutableStateFlow<BookState>(BookState.Loading)
-    val uiState: StateFlow<BookState> = _uiState.asStateFlow()
-
-    private val _actionFlow: MutableSharedFlow<BookAction> = MutableSharedFlow()
-    val actionFlow: SharedFlow<BookAction> = _actionFlow
-
-    init {
-        refresh()
-    }
-
-    fun onIntent(intent: BookIntent) {
-        when (intent) {
-            is BookIntent.Refresh -> {
-                refresh()
-            }
-
-            is BookIntent.Add -> {
-                viewModelScope.launch {
-                    sendBookRequestUseCase.invoke(
-                        BookRequestData(
-                            date = intent.date,
-                            placeId = intent.placeId
-                        )
-                    ).fold(
-                        onSuccess = {
-                            _actionFlow.emit(BookAction.BackWithSuccess)
-                        },
-                        onFailure = { error ->
-                            error.printStackTrace()
-                        }
-                    )
-                }
-            }
-        }
-    }
-
-    private fun refresh() {
-        viewModelScope.launch {
-            _uiState.update { BookState.Loading }
-            _uiState.update {
-                getBookingDataUseCase.invoke().fold(
-                    onSuccess = { data ->
-                        if (data.isEmpty()) {
-                            BookState.Empty
-                        } else {
-                            BookState.Data(
-                                items = data.map { item ->
-                                    BookState.Data.Item(
-                                        date = item.date,
-                                        places = item.places.map { place ->
-                                            BookState.Data.Place(
-                                                id = place.id,
-                                                name = place.name
-                                            )
-                                        }.toPersistentList()
-                                    )
-                                }.toPersistentList()
-                            )
-                        }
-                    },
-                    onFailure = { error ->
-                        BookState.Error(
-                            error = error.message.orEmpty()
-                        )
-                    }
-                )
-            }
-        }
-    }
-}

app/src/main/java/ru/myitschool/work/ui/screen/main/MainAction.kt

@@ -1,11 +0,0 @@
-package ru.myitschool.work.ui.screen.main
-
-import ru.myitschool.work.ui.nav.AppDestination
-import ru.myitschool.work.ui.screen.book.BookIntent
-
-sealed interface MainAction {
-    class Open(
-        val destination: AppDestination,
-        val clearBackStack: Boolean = false
-    ): MainAction
-}

app/src/main/java/ru/myitschool/work/ui/screen/main/MainIntent.kt

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

app/src/main/java/ru/myitschool/work/ui/screen/main/MainResult.kt

@@ -1,5 +0,0 @@
-package ru.myitschool.work.ui.screen.main
-
-object MainResult {
-    const val REFRESH_KEY = "refresh"
-}

app/src/main/java/ru/myitschool/work/ui/screen/main/MainScreen.kt

@@ -1,232 +0,0 @@
-package ru.myitschool.work.ui.screen.main
-
-import androidx.compose.foundation.Image
-import androidx.compose.foundation.interaction.MutableInteractionSource
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Box
-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.CircleShape
-import androidx.compose.material3.Button
-import androidx.compose.material3.CircularProgressIndicator
-import androidx.compose.material3.FloatingActionButton
-import androidx.compose.material3.Icon
-import androidx.compose.material3.IconButton
-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.runtime.remember
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.layout.ContentScale
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.platform.testTag
-import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.unit.dp
-import androidx.lifecycle.viewmodel.compose.viewModel
-import androidx.navigation.NavController
-import coil3.compose.AsyncImage
-import coil3.request.ImageRequest
-import ru.myitschool.work.R
-import ru.myitschool.work.core.TestIds
-
-@Composable
-fun MainScreen(
-    viewModel: MainViewModel = viewModel(),
-    navController: NavController
-) {
-    val isRefreshNeeded = navController.currentBackStackEntry
-        ?.savedStateHandle
-        ?.getStateFlow(MainResult.REFRESH_KEY, false)
-        ?.collectAsState()
-        ?.value
-        ?: false
-
-    LaunchedEffect(isRefreshNeeded) {
-        if (isRefreshNeeded) {
-            println("!!!!!!!! refresh after book")
-            navController.currentBackStackEntry
-                ?.savedStateHandle
-                ?.remove<Boolean>(MainResult.REFRESH_KEY)
-            viewModel.onIntent(MainIntent.Refresh)
-        }
-    }
-
-    val state by viewModel.uiState.collectAsState()
-
-    LaunchedEffect(Unit) {
-        viewModel.actionFlow.collect { action ->
-            when (action) {
-                is MainAction.Open -> {
-                    navController.navigate(action.destination) {
-                        if (action.clearBackStack) {
-                            popUpTo(0)
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    when (val currentState = state) {
-        is MainState.Data -> ContentState(viewModel, currentState)
-        is MainState.Error -> ErrorState(viewModel, currentState)
-        is MainState.Loading -> LoadingState()
-    }
-}
-
-@Composable
-private fun LoadingState() {
-    Box(
-        Modifier.fillMaxWidth(),
-        contentAlignment = Alignment.Center
-    ) {
-        CircularProgressIndicator(
-            modifier = Modifier.size(64.dp)
-        )
-    }
-}
-
-@Composable
-private fun ErrorState(
-    viewModel: MainViewModel,
-    state: MainState.Error
-) {
-    Column(
-        modifier = Modifier
-            .fillMaxSize()
-            .padding(all = 24.dp),
-        horizontalAlignment = Alignment.CenterHorizontally,
-        verticalArrangement = Arrangement.Center
-    ) {
-        Text(
-            modifier = Modifier.testTag(TestIds.Main.ERROR),
-            text = state.error,
-            style = MaterialTheme.typography.headlineSmall,
-            color = Color.Black,
-        )
-        Spacer(modifier = Modifier.size(16.dp))
-        Button(
-            modifier = Modifier.testTag(TestIds.Main.REFRESH_BUTTON).fillMaxWidth(),
-            onClick = {
-                println("!!!!!!!! refresh on click error")
-                viewModel.onIntent(MainIntent.Refresh)
-            },
-        ) {
-            Text(stringResource(R.string.main_refresh))
-        }
-    }
-}
-
-@Composable
-private fun ContentState(
-    viewModel: MainViewModel,
-    state: MainState.Data
-) {
-    Box(
-        modifier = Modifier.padding(all = 24.dp)
-    ) {
-        Column(
-            modifier = Modifier.fillMaxSize(),
-        ) {
-            Row(
-                verticalAlignment = Alignment.CenterVertically
-            ) {
-                AsyncImage(
-                    modifier = Modifier
-                        .testTag(TestIds.Main.PROFILE_IMAGE)
-                        .size(64.dp)
-                        .clip(CircleShape),
-                    model = ImageRequest.Builder(LocalContext.current)
-                        .data(state.photoUrl)
-                        .build(),
-                    contentDescription = null,
-                    contentScale = ContentScale.Crop,
-                )
-                Text(
-                    modifier = Modifier
-                        .testTag(TestIds.Main.PROFILE_NAME)
-                        .padding(horizontal = 4.dp),
-                    text = state.name,
-                    style = MaterialTheme.typography.headlineSmall,
-                    color = Color.Black,
-                )
-                Spacer(Modifier.weight(1f))
-                IconButton(
-                    modifier = Modifier.testTag(TestIds.Main.REFRESH_BUTTON),
-                    interactionSource = remember { MutableInteractionSource() },
-                    onClick = {
-                        println("!!!!!!!! refresh on click main")
-                        viewModel.onIntent(MainIntent.Refresh)
-                    },
-                ) {
-                    Icon(
-                        painter = painterResource(R.drawable.ic_refresh),
-                        contentDescription = stringResource(R.string.main_refresh)
-                    )
-                }
-                IconButton(
-                    modifier = Modifier.testTag(TestIds.Main.LOGOUT_BUTTON),
-                    interactionSource = remember { MutableInteractionSource() },
-                    onClick = {
-                        viewModel.onIntent(MainIntent.Logout)
-                    },
-                ) {
-                    Icon(
-                        painter = painterResource(R.drawable.ic_logout),
-                        contentDescription = stringResource(R.string.main_logout)
-                    )
-                }
-            }
-            LazyColumn {
-                itemsIndexed(state.books) { index, book ->
-                    Row(
-                        modifier = Modifier
-                            .testTag(TestIds.Main.getIdItemByPosition(index))
-                            .padding(horizontal = 16.dp),
-                        verticalAlignment = Alignment.CenterVertically
-                    ) {
-                        Text(
-                            modifier = Modifier.testTag(TestIds.Main.ITEM_PLACE),
-                            text = book.place,
-                            style = MaterialTheme.typography.bodyMedium,
-                            color = Color.Black,
-                        )
-                        Spacer(modifier = Modifier.weight(1f))
-                        Text(
-                            modifier = Modifier.testTag(TestIds.Main.ITEM_DATE),
-                            text = book.date,
-                            style = MaterialTheme.typography.bodySmall,
-                            color = Color.Black,
-                        )
-                    }
-                }
-            }
-        }
-
-        FloatingActionButton(
-            modifier = Modifier.testTag(TestIds.Main.ADD_BUTTON).align(Alignment.BottomEnd),
-            onClick = {
-                viewModel.onIntent(MainIntent.Add)
-            }
-        ) {
-            Image(
-                painter = painterResource(R.drawable.ic_add),
-                contentDescription = stringResource(R.string.book_add)
-            )
-        }
-    }
-}

app/src/main/java/ru/myitschool/work/ui/screen/main/MainState.kt

@@ -1,20 +0,0 @@
-package ru.myitschool.work.ui.screen.main
-
-import kotlinx.collections.immutable.PersistentList
-
-sealed interface MainState {
-    data object Loading: MainState
-    data class Error(
-        val error: String
-    ): MainState
-    data class Data(
-        val name: String,
-        val photoUrl: String,
-        val books: PersistentList<Book>
-    ): MainState {
-        data class Book(
-            val date: String,
-            val place: String,
-        )
-    }
-}

app/src/main/java/ru/myitschool/work/ui/screen/main/MainViewModel.kt

@@ -1,95 +0,0 @@
-package ru.myitschool.work.ui.screen.main
-
-import androidx.lifecycle.ViewModel
-import androidx.lifecycle.viewModelScope
-import kotlinx.collections.immutable.toPersistentList
-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
-import ru.myitschool.work.domain.auth.LogoutUseCase
-import ru.myitschool.work.domain.main.GetMainDataUseCase
-import ru.myitschool.work.ui.nav.AuthScreenDestination
-import ru.myitschool.work.ui.nav.BookScreenDestination
-import java.time.LocalDate
-import java.time.format.DateTimeFormatter
-import kotlin.getValue
-
-class MainViewModel : ViewModel() {
-    private val getMainDataUseCase by lazy {
-        GetMainDataUseCase(BookRepository(AuthRepository))
-    }
-    private val logoutUseCase by lazy {
-        LogoutUseCase(AuthRepository)
-    }
-    private val _uiState = MutableStateFlow<MainState>(MainState.Loading)
-    val uiState: StateFlow<MainState> = _uiState.asStateFlow()
-
-    private val _actionFlow: MutableSharedFlow<MainAction> = MutableSharedFlow()
-    val actionFlow: SharedFlow<MainAction> = _actionFlow
-
-    init {
-        println("!!!!!!!! refresh init")
-        refresh()
-    }
-
-    fun onIntent(intent: MainIntent) {
-        when (intent) {
-            is MainIntent.Add -> {
-                viewModelScope.launch {
-                    _actionFlow.emit(MainAction.Open(BookScreenDestination))
-                }
-            }
-            is MainIntent.Refresh -> {
-                refresh()
-            }
-            is MainIntent.Logout -> {
-                viewModelScope.launch {
-                    logoutUseCase.invoke()
-                    _actionFlow.emit(MainAction.Open(AuthScreenDestination, true))
-                }
-            }
-        }
-    }
-
-    private fun refresh() {
-        println("!!!!!!!! refresh")
-        viewModelScope.launch {
-            _uiState.update { MainState.Loading }
-            _uiState.update {
-                getMainDataUseCase.invoke().fold(
-                    onSuccess = { data ->
-                        MainState.Data(
-                            name = data.name,
-                            photoUrl = data.photoUrl,
-                            books = data.book.map { book ->
-                                MainState.Data.Book(
-                                    date = LocalDate
-                                        .parse(book.date)
-                                        .format(
-                                            DateTimeFormatter.ofPattern(DATE_FORMAT)
-                                        ),
-                                    place = book.place
-                                )
-                            }.toPersistentList()
-                        )
-                    },
-                    onFailure = { error ->
-                        MainState.Error(
-                            error = error.message?.takeIf { it.isNotBlank() } ?: "Unknown error"
-                        )
-                    }
-                )
-            }
-        }
-    }
-
-    private companion object {
-        const val DATE_FORMAT = "dd.MM.yyyy"
-    }
-}

app/src/main/java/ru/myitschool/work/ui/theme/Color.kt

@@ -1,11 +0,0 @@
-package ru.myitschool.work.ui.theme
-
-import androidx.compose.ui.graphics.Color
-
-val Purple80 = Color(0xFFD0BCFF)
-val PurpleGrey80 = Color(0xFFCCC2DC)
-val Pink80 = Color(0xFFEFB8C8)
-
-val Purple40 = Color(0xFF6650a4)
-val PurpleGrey40 = Color(0xFF625b71)
-val Pink40 = Color(0xFF7D5260)

app/src/main/java/ru/myitschool/work/ui/theme/Theme.kt

@@ -1,57 +0,0 @@
-package ru.myitschool.work.ui.theme
-
-import android.os.Build
-import androidx.compose.foundation.isSystemInDarkTheme
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.darkColorScheme
-import androidx.compose.material3.dynamicDarkColorScheme
-import androidx.compose.material3.dynamicLightColorScheme
-import androidx.compose.material3.lightColorScheme
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.platform.LocalContext
-
-private val DarkColorScheme = darkColorScheme(
-    primary = Purple80,
-    secondary = PurpleGrey80,
-    tertiary = Pink80
-)
-
-private val LightColorScheme = lightColorScheme(
-    primary = Purple40,
-    secondary = PurpleGrey40,
-    tertiary = Pink40
-
-    /* Other default colors to override
-    background = Color(0xFFFFFBFE),
-    surface = Color(0xFFFFFBFE),
-    onPrimary = Color.White,
-    onSecondary = Color.White,
-    onTertiary = Color.White,
-    onBackground = Color(0xFF1C1B1F),
-    onSurface = Color(0xFF1C1B1F),
-    */
-)
-
-@Composable
-fun WorkTheme(
-    darkTheme: Boolean = isSystemInDarkTheme(),
-    // Dynamic color is available on Android 12+
-    dynamicColor: Boolean = true,
-    content: @Composable () -> Unit
-) {
-    val colorScheme = when {
-        dynamicColor && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S -> {
-            val context = LocalContext.current
-            if (darkTheme) dynamicDarkColorScheme(context) else dynamicLightColorScheme(context)
-        }
-
-        darkTheme -> DarkColorScheme
-        else -> LightColorScheme
-    }
-
-    MaterialTheme(
-        colorScheme = colorScheme,
-        typography = Typography,
-        content = content
-    )
-}

app/src/main/java/ru/myitschool/work/ui/theme/Type.kt

@@ -1,34 +0,0 @@
-package ru.myitschool.work.ui.theme
-
-import androidx.compose.material3.Typography
-import androidx.compose.ui.text.TextStyle
-import androidx.compose.ui.text.font.FontFamily
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.unit.sp
-
-// Set of Material typography styles to start with
-val Typography = Typography(
-    bodyLarge = TextStyle(
-        fontFamily = FontFamily.Default,
-        fontWeight = FontWeight.Normal,
-        fontSize = 16.sp,
-        lineHeight = 24.sp,
-        letterSpacing = 0.5.sp
-    )
-    /* Other default text styles to override
-    titleLarge = TextStyle(
-        fontFamily = FontFamily.Default,
-        fontWeight = FontWeight.Normal,
-        fontSize = 22.sp,
-        lineHeight = 28.sp,
-        letterSpacing = 0.sp
-    ),
-    labelSmall = TextStyle(
-        fontFamily = FontFamily.Default,
-        fontWeight = FontWeight.Medium,
-        fontSize = 11.sp,
-        lineHeight = 16.sp,
-        letterSpacing = 0.5.sp
-    )
-    */
-)

app/src/main/res/drawable/ic_add.xml

@@ -1,5 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
-      
-    <path android:fillColor="@android:color/white" android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>
-    
-</vector>

app/src/main/res/drawable/ic_back.xml

@@ -1,5 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:autoMirrored="true" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
-      
-    <path android:fillColor="@android:color/white" android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z"/>
-    
-</vector>

app/src/main/res/drawable/ic_check.xml

@@ -1,5 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
-      
-    <path android:fillColor="@android:color/white" android:pathData="M9,16.17L4.83,12l-1.42,1.41L9,19 21,7l-1.41,-1.41z"/>
-    
-</vector>

app/src/main/res/drawable/ic_logout.xml

@@ -1,5 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:autoMirrored="true" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
-      
-    <path android:fillColor="@android:color/white" android:pathData="M17,7l-1.41,1.41L18.17,11H8v2h10.17l-2.58,2.58L17,17l5,-5zM4,5h8V3H4c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h8v-2H4V5z"/>
-    
-</vector>

app/src/main/res/drawable/ic_refresh.xml

@@ -1,5 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
-      
-    <path android:fillColor="@android:color/white" android:pathData="M17.65,6.35C16.2,4.9 14.21,4 12,4c-4.42,0 -7.99,3.58 -7.99,8s3.57,8 7.99,8c3.73,0 6.84,-2.55 7.73,-6h-2.08c-0.82,2.33 -3.04,4 -5.65,4 -3.31,0 -6,-2.69 -6,-6s2.69,-6 6,-6c1.66,0 3.14,0.69 4.22,1.78L13,11h7V4l-2.35,2.35z"/>
-    
-</vector>

app/src/main/res/values/strings.xml

@@ -1,15 +1,3 @@
 <resources>
     <string name="app_name">Work</string>
-    <string name="title_activity_root">RootActivity</string>
-    <string name="auth_title">Привет! Введи код для авторизации</string>
-    <string name="auth_label">Код</string>
-    <string name="auth_sign_in">Войти</string>
-
-    <string name="main_refresh">Обновить</string>
-    <string name="main_logout">Выйти</string>
-    <string name="main_add">Добавить</string>
-
-    <string name="book_add">Забронировать</string>
-    <string name="book_back">Назад</string>
-    <string name="book_empty">Всё забронировано</string>
 </resources>

app/src/main/res/values/themes.xml

@@ -0,0 +1,16 @@
+<resources xmlns:tools="http://schemas.android.com/tools">
+    <!-- Base application theme. -->
+    <style name="Theme.Default" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
+        <!-- Primary brand color. -->
+        <item name="colorPrimary">@color/purple_500</item>
+        <item name="colorPrimaryVariant">@color/purple_700</item>
+        <item name="colorOnPrimary">@color/white</item>
+        <!-- Secondary brand color. -->
+        <item name="colorSecondary">@color/teal_200</item>
+        <item name="colorSecondaryVariant">@color/teal_700</item>
+        <item name="colorOnSecondary">@color/black</item>
+        <!-- Status bar color. -->
+        <item name="android:statusBarColor">?attr/colorPrimaryVariant</item>
+        <!-- Customize your theme here. -->
+    </style>
+</resources>

build.gradle.kts

@@ -2,6 +2,4 @@
 plugins {
     androidApplication version Version.agp apply false
     kotlinJvm version Version.Kotlin.language apply false
-    kotlinAndroid version Version.Kotlin.language apply false
-    composeCompiler version Version.Kotlin.language apply false
 }

buildSrc

@@ -1 +1 @@
-Subproject commit d302d630f12102c7159e586b57c88cfedd17e65e
+Subproject commit d9590600045906edeb852eaa3f0b9bf7d1875813

gradle

@@ -1 +1 @@
-Subproject commit a28ff9e07699e093bfecb2b1fab86e07cb768915
+Subproject commit d11514433239954cc4fa8b336c0348daf8ff7268

gradlew

@@ -1,7 +1,7 @@
-#!/bin/sh
+#!/usr/bin/env sh
 
 #
-# Copyright © 2015-2021 the original authors.
+# Copyright 2015 the original author or authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,101 +17,67 @@
 #
 
 ##############################################################################
-#
+##
-#   Gradle start up script for POSIX generated by Gradle.
+##  Gradle start up script for UN*X
-#
+##
-#   Important for running:
-#
-#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
-#       noncompliant, but you have some other compliant shell such as ksh or
-#       bash, then to run this script, type that shell name before the whole
-#       command line, like:
-#
-#           ksh Gradle
-#
-#       Busybox and similar reduced shells will NOT work, because this script
-#       requires all of these POSIX shell features:
-#         * functions;
-#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
-#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
-#         * compound commands having a testable exit status, especially «case»;
-#         * various built-in commands including «command», «set», and «ulimit».
-#
-#   Important for patching:
-#
-#   (2) This script targets any POSIX shell, so it avoids extensions provided
-#       by Bash, Ksh, etc; in particular arrays are avoided.
-#
-#       The "traditional" practice of packing multiple parameters into a
-#       space-separated string is a well documented source of bugs and security
-#       problems, so this is (mostly) avoided, by progressively accumulating
-#       options in "$@", and eventually passing that to Java.
-#
-#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
-#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
-#       see the in-line comments for details.
-#
-#       There are tweaks for specific operating systems such as AIX, CygWin,
-#       Darwin, MinGW, and NonStop.
-#
-#   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
-#       within the Gradle project.
-#
-#       You can find Gradle at https://github.com/gradle/gradle/.
-#
 ##############################################################################
 
 # Attempt to set APP_HOME
-
 # Resolve links: $0 may be a link
-app_path=$0
+PRG="$0"
-
+# Need this for relative symlinks.
-# Need this for daisy-chained symlinks.
+while [ -h "$PRG" ] ; do
-while
+    ls=`ls -ld "$PRG"`
-    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    link=`expr "$ls" : '.*-> \(.*\)$'`
-    [ -h "$app_path" ]
+    if expr "$link" : '/.*' > /dev/null; then
-do
+        PRG="$link"
-    ls=$( ls -ld "$app_path" )
+    else
-    link=${ls#*' -> '}
+        PRG=`dirname "$PRG"`"/$link"
-    case $link in             #(
+    fi
-      /*)   app_path=$link ;; #(
-      *)    app_path=$APP_HOME$link ;;
-    esac
 done
-
+SAVED="`pwd`"
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
 
 APP_NAME="Gradle"
-APP_BASE_NAME=${0##*/}
+APP_BASE_NAME=`basename "$0"`
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD=maximum
+MAX_FD="maximum"
 
 warn () {
     echo "$*"
-} >&2
+}
 
 die () {
     echo
     echo "$*"
     echo
     exit 1
-} >&2
+}
 
 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 nonstop=false
-case "$( uname )" in                #(
+case "`uname`" in
-  CYGWIN* )         cygwin=true  ;; #(
+  CYGWIN* )
-  Darwin* )         darwin=true  ;; #(
+    cygwin=true
-  MSYS* | MINGW* )  msys=true    ;; #(
+    ;;
-  NONSTOP* )        nonstop=true ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
 esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
@@ -121,9 +87,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
         # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD=$JAVA_HOME/jre/sh/java
+        JAVACMD="$JAVA_HOME/jre/sh/java"
     else
-        JAVACMD=$JAVA_HOME/bin/java
+        JAVACMD="$JAVA_HOME/bin/java"
     fi
     if [ ! -x "$JAVACMD" ] ; then
         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -132,7 +98,7 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
 else
-    JAVACMD=java
+    JAVACMD="java"
     which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
@@ -140,95 +106,80 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    case $MAX_FD in #(
+    MAX_FD_LIMIT=`ulimit -H -n`
-      max*)
+    if [ $? -eq 0 ] ; then
-        MAX_FD=$( ulimit -H -n ) ||
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            warn "Could not query maximum file descriptor limit"
+            MAX_FD="$MAX_FD_LIMIT"
-    esac
+        fi
-    case $MAX_FD in  #(
+        ulimit -n $MAX_FD
-      '' | soft) :;; #(
+        if [ $? -ne 0 ] ; then
-      *)
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        ulimit -n "$MAX_FD" ||
+        fi
-            warn "Could not set maximum file descriptor limit to $MAX_FD"
+    else
-    esac
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
 fi
 
-# Collect all arguments for the java command, stacking in reverse order:
+# For Darwin, add options to specify how the application appears in the dock
-#   * args from the command line
+if $darwin; then
-#   * the main class name
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-#   * -classpath
+fi
-#   * -D...appname settings
-#   * --module-path (only if needed)
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
 
 # For Cygwin or MSYS, switch paths to Windows format before running java
-if "$cygwin" || "$msys" ; then
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
-    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
 
-    JAVACMD=$( cygpath --unix "$JAVACMD" )
+    JAVACMD=`cygpath --unix "$JAVACMD"`
 
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    # We build the pattern for arguments to be converted via cygpath
-    for arg do
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-        if
+    SEP=""
-            case $arg in                                #(
+    for dir in $ROOTDIRSRAW ; do
-              -*)   false ;;                            # don't mess with options #(
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
-              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+        SEP="|"
-                    [ -e "$t" ] ;;                      #(
-              *)    false ;;
-            esac
-        then
-            arg=$( cygpath --path --ignore --mixed "$arg" )
-        fi
-        # Roll the args list around exactly as many times as the number of
-        # args, so each arg winds up back in the position where it started, but
-        # possibly modified.
-        #
-        # NB: a `for` loop captures its iteration list before it begins, so
-        # changing the positional parameters here affects neither the number of
-        # iterations, nor the values presented in `arg`.
-        shift                   # remove old arg
-        set -- "$@" "$arg"      # push replacement arg
     done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=`expr $i + 1`
+    done
+    case $i in
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
 fi
 
-# Collect all arguments for the java command;
+# Escape application args
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+save () {
-#     shell script including quotes and variable substitutions, so put them in
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-#     double quotes to make sure that they get re-expanded; and
+    echo " "
-#   * put everything else in single quotes, so that it's not re-expanded.
+}
+APP_ARGS=`save "$@"`
 
-set -- \
+# Collect all arguments for the java command, following the shell quoting and substitution rules
-        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
-        -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
-        "$@"
-
-# Use "xargs" to parse quoted args.
-#
-# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
-#
-# In Bash we could simply go:
-#
-#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
-#   set -- "${ARGS[@]}" "$@"
-#
-# but POSIX shell has neither arrays nor command substitution, so instead we
-# post-process each arg (as a line of input to sed) to backslash-escape any
-# character that might be a shell metacharacter, then use eval to reverse
-# that process (while maintaining the separation between arguments), and wrap
-# the whole thing up as a single "set" statement.
-#
-# This will of course break if any of these variables contains a newline or
-# an unmatched quote.
-#
-
-eval "set -- $(
-        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
-        xargs -n1 |
-        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
-        tr '\n' ' '
-    )" '"$@"'
 
 exec "$JAVACMD" "$@"

testLib

@@ -0,0 +1 @@
+Subproject commit 36d60dbf39e4dde8f7549e35f00b41807382eaa2