diff --git a/.gitea/workflows/automerge-with-core.yaml b/.gitea/workflows/automerge-with-core.yaml
index 67b0c20..e040dbd 100644
--- a/.gitea/workflows/automerge-with-core.yaml
+++ b/.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.3
+ uses: Vova-SH/sync-upstream-repo@1.0.5
with:
upstream_repo: ${{ env.CORE_REPO }}
token: ${{ env.TOKEN }}
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 8c899db..a5ccda1 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -1,5 +1,7 @@
plugins {
+ composeCompiler
kotlinAndroid
+ kotlinSerialization version Version.Kotlin.language
androidApplication
}
@@ -19,6 +21,7 @@ android {
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
}
+ buildFeatures.compose = true
buildFeatures.viewBinding = true
compileOptions {
@@ -32,6 +35,17 @@ android {
}
dependencies {
- defaultLibrary()
-
+ defaultComposeLibrary()
+ implementation("androidx.datastore:datastore-preferences:1.1.7")
+ 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")
}
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 9ee5c40..a2c02bd 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -2,7 +2,10 @@
+
+
+ android:usesCleartextTraffic="true"
+ tools:targetApi="31">
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/java/ru/myitschool/work/App.kt b/app/src/main/java/ru/myitschool/work/App.kt
new file mode 100644
index 0000000..aa33483
--- /dev/null
+++ b/app/src/main/java/ru/myitschool/work/App.kt
@@ -0,0 +1,15 @@
+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
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/ru/myitschool/work/core/Constants.kt b/app/src/main/java/ru/myitschool/work/core/Constants.kt
new file mode 100644
index 0000000..a8b7cc5
--- /dev/null
+++ b/app/src/main/java/ru/myitschool/work/core/Constants.kt
@@ -0,0 +1,9 @@
+package ru.myitschool.work.core
+
+object Constants {
+ const val HOST = "http://10.0.2.2:8080"
+ const val AUTH_URL = "/auth"
+ const val INFO_URL = "/info"
+ const val BOOKING_URL = "/booking"
+ const val BOOK_URL = "/book"
+}
\ No newline at end of file
diff --git a/app/src/main/java/ru/myitschool/work/core/TestIds.kt b/app/src/main/java/ru/myitschool/work/core/TestIds.kt
new file mode 100644
index 0000000..d67b884
--- /dev/null
+++ b/app/src/main/java/ru/myitschool/work/core/TestIds.kt
@@ -0,0 +1,35 @@
+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"
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/ru/myitschool/work/data/repo/AuthRepository.kt b/app/src/main/java/ru/myitschool/work/data/repo/AuthRepository.kt
new file mode 100644
index 0000000..3ef28f1
--- /dev/null
+++ b/app/src/main/java/ru/myitschool/work/data/repo/AuthRepository.kt
@@ -0,0 +1,16 @@
+package ru.myitschool.work.data.repo
+
+import ru.myitschool.work.data.source.NetworkDataSource
+
+object AuthRepository {
+
+ private var codeCache: String? = null
+
+ suspend fun checkAndSave(text: String): Result {
+ return NetworkDataSource.checkAuth(text).onSuccess { success ->
+ if (success) {
+ codeCache = text
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/ru/myitschool/work/data/source/NetworkDataSource.kt b/app/src/main/java/ru/myitschool/work/data/source/NetworkDataSource.kt
new file mode 100644
index 0000000..fbdfef5
--- /dev/null
+++ b/app/src/main/java/ru/myitschool/work/data/source/NetworkDataSource.kt
@@ -0,0 +1,42 @@
+package ru.myitschool.work.data.source
+
+import io.ktor.client.HttpClient
+import io.ktor.client.engine.cio.CIO
+import io.ktor.client.plugins.contentnegotiation.ContentNegotiation
+import io.ktor.client.request.get
+import io.ktor.client.statement.bodyAsText
+import io.ktor.http.HttpStatusCode
+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
+
+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 = withContext(Dispatchers.IO) {
+ return@withContext runCatching {
+ val response = client.get(getUrl(code, Constants.AUTH_URL))
+ when (response.status) {
+ HttpStatusCode.OK -> true
+ else -> error(response.bodyAsText())
+ }
+ }
+ }
+
+ private fun getUrl(code: String, targetUrl: String) = "${Constants.HOST}/api/$code$targetUrl"
+}
\ No newline at end of file
diff --git a/app/src/main/java/ru/myitschool/work/domain/auth/CheckAndSaveAuthCodeUseCase.kt b/app/src/main/java/ru/myitschool/work/domain/auth/CheckAndSaveAuthCodeUseCase.kt
new file mode 100644
index 0000000..012fb6f
--- /dev/null
+++ b/app/src/main/java/ru/myitschool/work/domain/auth/CheckAndSaveAuthCodeUseCase.kt
@@ -0,0 +1,15 @@
+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 {
+ return repository.checkAndSave(text).mapCatching { success ->
+ if (!success) error("Code is incorrect")
+ }
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/ru/myitschool/work/ui/nav/AppDestination.kt b/app/src/main/java/ru/myitschool/work/ui/nav/AppDestination.kt
new file mode 100644
index 0000000..557b893
--- /dev/null
+++ b/app/src/main/java/ru/myitschool/work/ui/nav/AppDestination.kt
@@ -0,0 +1,3 @@
+package ru.myitschool.work.ui.nav
+
+sealed interface AppDestination
\ No newline at end of file
diff --git a/app/src/main/java/ru/myitschool/work/ui/nav/AuthScreenDestination.kt b/app/src/main/java/ru/myitschool/work/ui/nav/AuthScreenDestination.kt
new file mode 100644
index 0000000..52660b1
--- /dev/null
+++ b/app/src/main/java/ru/myitschool/work/ui/nav/AuthScreenDestination.kt
@@ -0,0 +1,6 @@
+package ru.myitschool.work.ui.nav
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data object AuthScreenDestination: AppDestination
\ No newline at end of file
diff --git a/app/src/main/java/ru/myitschool/work/ui/nav/BookScreenDestination.kt b/app/src/main/java/ru/myitschool/work/ui/nav/BookScreenDestination.kt
new file mode 100644
index 0000000..9a33073
--- /dev/null
+++ b/app/src/main/java/ru/myitschool/work/ui/nav/BookScreenDestination.kt
@@ -0,0 +1,6 @@
+package ru.myitschool.work.ui.nav
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data object BookScreenDestination: AppDestination
\ No newline at end of file
diff --git a/app/src/main/java/ru/myitschool/work/ui/nav/MainScreenDestination.kt b/app/src/main/java/ru/myitschool/work/ui/nav/MainScreenDestination.kt
new file mode 100644
index 0000000..deca45f
--- /dev/null
+++ b/app/src/main/java/ru/myitschool/work/ui/nav/MainScreenDestination.kt
@@ -0,0 +1,6 @@
+package ru.myitschool.work.ui.nav
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data object MainScreenDestination: AppDestination
\ No newline at end of file
diff --git a/app/src/main/java/ru/myitschool/work/ui/root/RootActivity.kt b/app/src/main/java/ru/myitschool/work/ui/root/RootActivity.kt
new file mode 100644
index 0000000..54b156d
--- /dev/null
+++ b/app/src/main/java/ru/myitschool/work/ui/root/RootActivity.kt
@@ -0,0 +1,30 @@
+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)
+ )
+ }
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/ru/myitschool/work/ui/screen/NavigationGraph.kt b/app/src/main/java/ru/myitschool/work/ui/screen/NavigationGraph.kt
new file mode 100644
index 0000000..01b0f32
--- /dev/null
+++ b/app/src/main/java/ru/myitschool/work/ui/screen/NavigationGraph.kt
@@ -0,0 +1,49 @@
+package ru.myitschool.work.ui.screen
+
+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.navigation.NavHostController
+import androidx.navigation.compose.NavHost
+import androidx.navigation.compose.composable
+import androidx.navigation.compose.rememberNavController
+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
+
+@Composable
+fun AppNavHost(
+ modifier: Modifier = Modifier,
+ navController: NavHostController = rememberNavController()
+) {
+ NavHost(
+ modifier = modifier,
+ enterTransition = { EnterTransition.None },
+ exitTransition = { ExitTransition.None },
+ navController = navController,
+ startDestination = AuthScreenDestination,
+ ) {
+ composable {
+ AuthScreen(navController = navController)
+ }
+ composable {
+ Box(
+ contentAlignment = Alignment.Center
+ ) {
+ Text(text = "Hello")
+ }
+ }
+ composable {
+ Box(
+ contentAlignment = Alignment.Center
+ ) {
+ Text(text = "Hello")
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/ru/myitschool/work/ui/screen/auth/AuthIntent.kt b/app/src/main/java/ru/myitschool/work/ui/screen/auth/AuthIntent.kt
new file mode 100644
index 0000000..74f200a
--- /dev/null
+++ b/app/src/main/java/ru/myitschool/work/ui/screen/auth/AuthIntent.kt
@@ -0,0 +1,6 @@
+package ru.myitschool.work.ui.screen.auth
+
+sealed interface AuthIntent {
+ data class Send(val text: String): AuthIntent
+ data class TextInput(val text: String): AuthIntent
+}
\ No newline at end of file
diff --git a/app/src/main/java/ru/myitschool/work/ui/screen/auth/AuthScreen.kt b/app/src/main/java/ru/myitschool/work/ui/screen/auth/AuthScreen.kt
new file mode 100644
index 0000000..f99978e
--- /dev/null
+++ b/app/src/main/java/ru/myitschool/work/ui/screen/auth/AuthScreen.kt
@@ -0,0 +1,97 @@
+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
+import ru.myitschool.work.ui.nav.MainScreenDestination
+
+@Composable
+fun AuthScreen(
+ viewModel: AuthViewModel = viewModel(),
+ navController: NavController
+) {
+ val state by viewModel.uiState.collectAsState()
+
+ LaunchedEffect(Unit) {
+ viewModel.actionFlow.collect {
+ navController.navigate(MainScreenDestination)
+ }
+ }
+
+ 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 = true
+ ) {
+ Text(stringResource(R.string.auth_sign_in))
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/ru/myitschool/work/ui/screen/auth/AuthState.kt b/app/src/main/java/ru/myitschool/work/ui/screen/auth/AuthState.kt
new file mode 100644
index 0000000..a06ba76
--- /dev/null
+++ b/app/src/main/java/ru/myitschool/work/ui/screen/auth/AuthState.kt
@@ -0,0 +1,6 @@
+package ru.myitschool.work.ui.screen.auth
+
+sealed interface AuthState {
+ object Loading: AuthState
+ object Data: AuthState
+}
\ No newline at end of file
diff --git a/app/src/main/java/ru/myitschool/work/ui/screen/auth/AuthViewModel.kt b/app/src/main/java/ru/myitschool/work/ui/screen/auth/AuthViewModel.kt
new file mode 100644
index 0000000..3153640
--- /dev/null
+++ b/app/src/main/java/ru/myitschool/work/ui/screen/auth/AuthViewModel.kt
@@ -0,0 +1,43 @@
+package ru.myitschool.work.ui.screen.auth
+
+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.domain.auth.CheckAndSaveAuthCodeUseCase
+
+class AuthViewModel : ViewModel() {
+ private val checkAndSaveAuthCodeUseCase by lazy { CheckAndSaveAuthCodeUseCase(AuthRepository) }
+ private val _uiState = MutableStateFlow(AuthState.Data)
+ val uiState: StateFlow = _uiState.asStateFlow()
+
+ private val _actionFlow: MutableSharedFlow = MutableSharedFlow()
+ val actionFlow: SharedFlow = _actionFlow
+
+ fun onIntent(intent: AuthIntent) {
+ when (intent) {
+ is AuthIntent.Send -> {
+ viewModelScope.launch(Dispatchers.Default) {
+ _uiState.update { AuthState.Loading }
+ checkAndSaveAuthCodeUseCase.invoke("9999").fold(
+ onSuccess = {
+ _actionFlow.emit(Unit)
+ },
+ onFailure = { error ->
+ error.printStackTrace()
+ _actionFlow.emit(Unit)
+ }
+ )
+ }
+ }
+ is AuthIntent.TextInput -> Unit
+ }
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/ru/myitschool/work/ui/theme/Color.kt b/app/src/main/java/ru/myitschool/work/ui/theme/Color.kt
new file mode 100644
index 0000000..22226f4
--- /dev/null
+++ b/app/src/main/java/ru/myitschool/work/ui/theme/Color.kt
@@ -0,0 +1,11 @@
+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)
\ No newline at end of file
diff --git a/app/src/main/java/ru/myitschool/work/ui/theme/Theme.kt b/app/src/main/java/ru/myitschool/work/ui/theme/Theme.kt
new file mode 100644
index 0000000..d9cc58f
--- /dev/null
+++ b/app/src/main/java/ru/myitschool/work/ui/theme/Theme.kt
@@ -0,0 +1,57 @@
+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
+ )
+}
\ No newline at end of file
diff --git a/app/src/main/java/ru/myitschool/work/ui/theme/Type.kt b/app/src/main/java/ru/myitschool/work/ui/theme/Type.kt
new file mode 100644
index 0000000..61b2923
--- /dev/null
+++ b/app/src/main/java/ru/myitschool/work/ui/theme/Type.kt
@@ -0,0 +1,34 @@
+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
+ )
+ */
+)
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 96034ac..fa8bda6 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,3 +1,7 @@
Work
+ RootActivity
+ Привет! Введи код для авторизации
+ Код
+ Войти
\ No newline at end of file
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
deleted file mode 100644
index 89e63d4..0000000
--- a/app/src/main/res/values/themes.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-
\ No newline at end of file
diff --git a/build.gradle.kts b/build.gradle.kts
index 64d8748..572c00e 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -2,4 +2,6 @@
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
}
\ No newline at end of file
diff --git a/gradlew b/gradlew
index 4f906e0..1b6c787 100644
--- a/gradlew
+++ b/gradlew
@@ -1,7 +1,7 @@
-#!/usr/bin/env sh
+#!/bin/sh
#
-# Copyright 2015 the original author or authors.
+# Copyright © 2015-2021 the original authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -17,67 +17,101 @@
#
##############################################################################
-##
-## Gradle start up script for UN*X
-##
+#
+# Gradle start up script for POSIX generated by Gradle.
+#
+# 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
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
- ls=`ls -ld "$PRG"`
- link=`expr "$ls" : '.*-> \(.*\)$'`
- if expr "$link" : '/.*' > /dev/null; then
- PRG="$link"
- else
- PRG=`dirname "$PRG"`"/$link"
- fi
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+ APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path
+ [ -h "$app_path" ]
+do
+ ls=$( ls -ld "$app_path" )
+ link=${ls#*' -> '}
+ case $link in #(
+ /*) app_path=$link ;; #(
+ *) app_path=$APP_HOME$link ;;
+ esac
done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
+
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
+APP_BASE_NAME=${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
- CYGWIN* )
- cygwin=true
- ;;
- Darwin* )
- darwin=true
- ;;
- MINGW* )
- msys=true
- ;;
- NONSTOP* )
- nonstop=true
- ;;
+case "$( uname )" in #(
+ CYGWIN* ) cygwin=true ;; #(
+ Darwin* ) darwin=true ;; #(
+ MSYS* | MINGW* ) msys=true ;; #(
+ NONSTOP* ) nonstop=true ;;
esac
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
@@ -87,9 +121,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
@@ -98,7 +132,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
@@ -106,80 +140,95 @@ location of your Java installation."
fi
# Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
- MAX_FD_LIMIT=`ulimit -H -n`
- if [ $? -eq 0 ] ; then
- if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
- MAX_FD="$MAX_FD_LIMIT"
- fi
- ulimit -n $MAX_FD
- if [ $? -ne 0 ] ; then
- warn "Could not set maximum file descriptor limit: $MAX_FD"
- fi
- else
- warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
- fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
- GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin or MSYS, switch paths to Windows format before running java
-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
- APP_HOME=`cygpath --path --mixed "$APP_HOME"`
- CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-
- JAVACMD=`cygpath --unix "$JAVACMD"`
-
- # We build the pattern for arguments to be converted via cygpath
- ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
- SEP=""
- for dir in $ROOTDIRSRAW ; do
- ROOTDIRS="$ROOTDIRS$SEP$dir"
- SEP="|"
- 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" ;;
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+ case $MAX_FD in #(
+ max*)
+ MAX_FD=$( ulimit -H -n ) ||
+ warn "Could not query maximum file descriptor limit"
+ esac
+ case $MAX_FD in #(
+ '' | soft) :;; #(
+ *)
+ ulimit -n "$MAX_FD" ||
+ warn "Could not set maximum file descriptor limit to $MAX_FD"
esac
fi
-# Escape application args
-save () {
- for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
- echo " "
-}
-APP_ARGS=`save "$@"`
+# Collect all arguments for the java command, stacking in reverse order:
+# * args from the command line
+# * the main class name
+# * -classpath
+# * -D...appname settings
+# * --module-path (only if needed)
+# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+ APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+ CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+ JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+ # Now convert the arguments - kludge to limit ourselves to /bin/sh
+ for arg do
+ if
+ case $arg in #(
+ -*) false ;; # don't mess with options #(
+ /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath
+ [ -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
+fi
+
+# Collect all arguments for the java command;
+# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+# shell script including quotes and variable substitutions, so put them in
+# double quotes to make sure that they get re-expanded; and
+# * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+ "-Dorg.gradle.appname=$APP_BASE_NAME" \
+ -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" "$@"