Release 0.2.0 (#150)

Release Notes * Bumped haze, agp, and guava dependencies * Implemented ordering functionality for friends list * Added scroll to top feature in friends and conversations screens * Improved messages handling * Fixed coloring issues * Cache improvements * Implemented logout functionality * Implemented new authorization flow (no auto-token re-request) * Added support for sticker pack preview attachments * Bump LongPoll to version 19 * Markdown support for messages bubbles * Adjust app name font size based on screen width --------- Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2025-04-04 21:47:05 +03:00
parent 0eb3146428
commit 82fb78e9ea
279 changed files with 9171 additions and 4517 deletions
@@ -46,6 +46,13 @@ androidComponents {
    }
 }

+// TODO: 29-Mar-25, Danil Nikolaev: remove when autofill changes will be in release
+configurations.all {
+    resolutionStrategy {
+        force(libs.compose.ui)
+    }
+}
+
 android {
    namespace = "dev.meloda.fast.auth"

@@ -6,9 +6,8 @@ import androidx.navigation.navigation
 import dev.meloda.fast.auth.captcha.navigation.captchaScreen
 import dev.meloda.fast.auth.captcha.navigation.navigateToCaptcha
 import dev.meloda.fast.auth.captcha.navigation.setCaptchaResult
-import dev.meloda.fast.auth.login.navigation.Logo
+import dev.meloda.fast.auth.login.navigation.Login
 import dev.meloda.fast.auth.login.navigation.loginScreen
-import dev.meloda.fast.auth.login.navigation.navigateToLogin
 import dev.meloda.fast.auth.userbanned.model.UserBannedArguments
 import dev.meloda.fast.auth.userbanned.navigation.navigateToUserBanned
 import dev.meloda.fast.auth.userbanned.navigation.userBannedRoute
@@ -26,9 +25,7 @@ fun NavGraphBuilder.authNavGraph(
    onNavigateToMain: () -> Unit,
    navController: NavController
 ) {
-    navigation<AuthGraph>(
-        startDestination = Logo
-    ) {
+    navigation<AuthGraph>(startDestination = Login) {
        loginScreen(
            onNavigateToCaptcha = { arguments ->
                navController.navigateToCaptcha(
@@ -57,29 +54,28 @@ fun NavGraphBuilder.authNavGraph(
                    )
                )
            },
-            onNavigateToCredentials = navController::navigateToLogin,
            navController = navController
        )

        validationScreen(
            onBack = {
-                navController.navigateUp()
                navController.setValidationResult(null)
+                navController.navigateUp()
            },
            onResult = { code ->
-                navController.popBackStack()
                navController.setValidationResult(code)
+                navController.popBackStack()
            }
        )

        captchaScreen(
            onBack = {
-                navController.navigateUp()
                navController.setCaptchaResult(null)
+                navController.navigateUp()
            },
            onResult = { code ->
-                navController.popBackStack()
                navController.setCaptchaResult(code)
+                navController.popBackStack()
            }
        )

@@ -34,7 +34,7 @@ fun NavController.navigateToCaptcha(captchaImageUrl: String) {
 }

 fun NavController.setCaptchaResult(code: String?) {
-    this.currentBackStackEntry
+    this.previousBackStackEntry
        ?.savedStateHandle
        ?.set("captcha_code", code)
 }
@@ -8,10 +8,13 @@ import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.ime
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.union
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.text.KeyboardActions
@@ -24,6 +27,7 @@ import androidx.compose.material3.FloatingActionButton
 import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Scaffold
+import androidx.compose.material3.ScaffoldDefaults
 import androidx.compose.material3.Text
 import androidx.compose.material3.TextField
 import androidx.compose.runtime.Composable
@@ -123,7 +127,9 @@ fun CaptchaScreen(

    val focusManager = LocalFocusManager.current

-    Scaffold { padding ->
+    Scaffold(
+        contentWindowInsets = ScaffoldDefaults.contentWindowInsets.union(WindowInsets.ime)
+    ) { padding ->
        Column(
            modifier = Modifier
                .fillMaxSize()
@@ -1,10 +1,11 @@
 package dev.meloda.fast.auth.login

+import android.os.Bundle
 import android.util.Log
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import dev.meloda.fast.auth.login.model.CaptchaArguments
-import dev.meloda.fast.auth.login.model.LoginError
+import dev.meloda.fast.auth.login.model.LoginDialog
 import dev.meloda.fast.auth.login.model.LoginScreenState
 import dev.meloda.fast.auth.login.model.LoginUserBannedArguments
 import dev.meloda.fast.auth.login.model.LoginValidationArguments
@@ -14,18 +15,21 @@ import dev.meloda.fast.common.LongPollController
 import dev.meloda.fast.common.VkConstants
 import dev.meloda.fast.common.extensions.listenValue
 import dev.meloda.fast.common.extensions.setValue
+import dev.meloda.fast.common.extensions.updateValue
 import dev.meloda.fast.common.model.LongPollState
 import dev.meloda.fast.data.State
 import dev.meloda.fast.data.UserConfig
+import dev.meloda.fast.data.api.auth.AuthRepository
 import dev.meloda.fast.data.db.AccountsRepository
 import dev.meloda.fast.data.processState
+import dev.meloda.fast.data.success
 import dev.meloda.fast.datastore.AppSettings
 import dev.meloda.fast.domain.LoadUserByIdUseCase
 import dev.meloda.fast.domain.OAuthUseCase
 import dev.meloda.fast.model.database.AccountEntity
 import dev.meloda.fast.network.OAuthErrorDomain
+import kotlinx.coroutines.CoroutineExceptionHandler
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.StateFlow
@@ -36,15 +40,20 @@ import kotlinx.coroutines.launch

 interface LoginViewModel {
    val screenState: StateFlow<LoginScreenState>
-    val loginError: StateFlow<LoginError?>
+    val loginDialog: StateFlow<LoginDialog?>

-    val validationCode: StateFlow<String?>
    val validationArguments: StateFlow<LoginValidationArguments?>
-    val captchaCode: StateFlow<String?>
    val captchaArguments: StateFlow<CaptchaArguments?>
    val userBannedArguments: StateFlow<LoginUserBannedArguments?>
    val isNeedToOpenMain: StateFlow<Boolean>
-    val isNeedToShowFastSignInAlert: StateFlow<Boolean>
+
+    val isNeedToClearCaptchaCode: StateFlow<Boolean>
+    val isNeedToClearValidationCode: StateFlow<Boolean>
+
+    fun onDialogConfirmed(dialog: LoginDialog, bundle: Bundle)
+    fun onDialogDismissed(dialog: LoginDialog)
+
+    fun onBackPressed()

    fun onPasswordVisibilityButtonClicked()

@@ -53,24 +62,20 @@ interface LoginViewModel {

    fun onSignInButtonClicked()

-    fun onErrorDialogDismissed()
-
    fun onNavigatedToMain()
    fun onNavigatedToUserBanned()
    fun onNavigatedToCaptcha()
    fun onNavigatedToValidation()

-    fun onValidationCodeReceived(code: String)
-    fun onCaptchaCodeReceived(code: String)
-
-    fun onLogoLongClicked()
-
-    fun onFastLogInAlertDismissed()
-    fun onFastLogInAlertConfirmClicked(token: String)
+    fun onValidationCodeReceived(code: String?)
+    fun onValidationCodeCleared()
+    fun onCaptchaCodeReceived(code: String?)
+    fun onCaptchaCodeCleared()
 }

 class LoginViewModelImpl(
    private val oAuthUseCase: OAuthUseCase,
+    private val authRepository: AuthRepository,
    private val loadUserByIdUseCase: LoadUserByIdUseCase,
    private val accountsRepository: AccountsRepository,
    private val loginValidator: LoginValidator,
@@ -78,47 +83,85 @@ class LoginViewModelImpl(
 ) : ViewModel(), LoginViewModel {

    override val screenState = MutableStateFlow(LoginScreenState.EMPTY)
-    override val loginError = MutableStateFlow<LoginError?>(null)
+    override val loginDialog = MutableStateFlow<LoginDialog?>(null)

-    override val validationCode = MutableStateFlow<String?>(null)
    override val validationArguments = MutableStateFlow<LoginValidationArguments?>(null)
-    override val captchaCode = MutableStateFlow<String?>(null)
    override val captchaArguments = MutableStateFlow<CaptchaArguments?>(null)
    override val userBannedArguments = MutableStateFlow<LoginUserBannedArguments?>(null)
    override val isNeedToOpenMain = MutableStateFlow(false)
-    override val isNeedToShowFastSignInAlert = MutableStateFlow(false)
+
+    override val isNeedToClearCaptchaCode = MutableStateFlow(false)
+    override val isNeedToClearValidationCode = MutableStateFlow(false)

    private val validationState: StateFlow<List<LoginValidationResult>> =
        screenState.map(loginValidator::validate)
            .stateIn(viewModelScope, SharingStarted.Eagerly, listOf(LoginValidationResult.Empty))

+    private val captchaSid = MutableStateFlow<String?>(null)
+    private val captchaCode = MutableStateFlow<String?>(null)
+    private val validationSid = MutableStateFlow<String?>(null)
+    private val validationCode = MutableStateFlow<String?>(null)
+
+    init {
+        captchaCode.listenValue(viewModelScope) {
+            if (it != null) {
+                login()
+            }
+        }
+        validationCode.listenValue(viewModelScope) {
+            if (it != null) {
+                login()
+            }
+        }
+    }
+
+    override fun onDialogConfirmed(dialog: LoginDialog, bundle: Bundle) {
+        onDialogDismissed(dialog)
+
+        when (dialog) {
+            is LoginDialog.Error -> Unit
+        }
+    }
+
+    override fun onDialogDismissed(dialog: LoginDialog) {
+        loginDialog.setValue { null }
+    }
+
+    override fun onBackPressed() {
+        screenState.setValue { old -> old.copy(showLogo = true) }
+    }
+
    override fun onPasswordVisibilityButtonClicked() {
        screenState.setValue { old -> old.copy(passwordVisible = !old.passwordVisible) }
    }

    override fun onLoginInputChanged(newLogin: String) {
-        val newState = screenState.value.copy(
-            login = newLogin.trim(),
-            loginError = false
-        )
-        screenState.setValue { newState }
+        screenState.setValue { old ->
+            old.copy(
+                login = newLogin.trim(),
+                loginError = false
+            )
+        }
    }

    override fun onPasswordInputChanged(newPassword: String) {
-        val newState = screenState.value.copy(
-            password = newPassword.trim(),
-            passwordError = false
-        )
-        screenState.setValue { newState }
+        screenState.setValue { old ->
+            old.copy(
+                password = newPassword.trim(),
+                passwordError = false
+            )
+        }
    }

    override fun onSignInButtonClicked() {
        if (screenState.value.isLoading) return
-        login()
-    }

-    override fun onErrorDialogDismissed() {
-        loginError.update { null }
+        if (screenState.value.showLogo) {
+            screenState.setValue { old -> old.copy(showLogo = false) }
+            return
+        }
+
+        login()
    }

    override fun onNavigatedToMain() {
@@ -137,72 +180,20 @@ class LoginViewModelImpl(
        validationArguments.update { null }
    }

-    override fun onValidationCodeReceived(code: String) {
+    override fun onValidationCodeReceived(code: String?) {
        validationCode.update { code }
-
-        login()
    }

-    override fun onCaptchaCodeReceived(code: String) {
+    override fun onValidationCodeCleared() {
+        isNeedToClearValidationCode.update { false }
+    }
+
+    override fun onCaptchaCodeReceived(code: String?) {
        captchaCode.update { code }
-
-        login()
    }

-    override fun onLogoLongClicked() {
-        isNeedToShowFastSignInAlert.update { true }
-    }
-
-    override fun onFastLogInAlertDismissed() {
-        isNeedToShowFastSignInAlert.update { false }
-    }
-
-    override fun onFastLogInAlertConfirmClicked(token: String) {
-        var currentAccount = AccountEntity(
-            userId = -1,
-            accessToken = token,
-            fastToken = null,
-            trustedHash = null
-        ).also { account ->
-            UserConfig.currentUserId = account.userId
-            UserConfig.userId = account.userId
-            UserConfig.accessToken = account.accessToken
-            UserConfig.fastToken = account.fastToken
-            UserConfig.trustedHash = account.trustedHash
-        }
-
-        loadUserByIdUseCase(
-            userId = null,
-            fields = VkConstants.USER_FIELDS,
-            nomCase = null
-        ).listenValue(viewModelScope) { state ->
-            state.processState(
-                error = { error ->
-                    UserConfig.currentUserId = -1
-                    UserConfig.userId = -1
-                    UserConfig.accessToken = ""
-
-                    // TODO: 19/07/2024, Danil Nikolaev: show error?
-                },
-                success = { response ->
-                    val actualUserId = requireNotNull(response).id
-
-                    currentAccount = currentAccount.copy(userId = actualUserId)
-
-                    UserConfig.userId = actualUserId
-                    UserConfig.currentUserId = actualUserId
-
-                    startLongPoll()
-
-                    viewModelScope.launch(Dispatchers.IO) {
-                        accountsRepository.storeAccounts(listOf(currentAccount))
-                        delay(350)
-                        isNeedToOpenMain.update { true }
-                    }
-                }
-            )
-            screenState.setValue { old -> old.copy(isLoading = state.isLoading()) }
-        }
+    override fun onCaptchaCodeCleared() {
+        isNeedToClearCaptchaCode.update { false }
    }

    private fun login(forceSms: Boolean = false) {
@@ -219,77 +210,120 @@ class LoginViewModelImpl(
        processValidation()
        if (!validationState.value.contains(LoginValidationResult.Valid)) return

-        oAuthUseCase.auth(
+        screenState.updateValue { copy(isLoading = false) }
+
+        val currentValidationSid = validationSid.value
+        val currentValidationCode = validationCode.value?.takeIf { currentValidationSid != null }
+        val currentCaptchaSid = captchaSid.value
+        val currentCaptchaCode = captchaCode.value?.takeIf { currentCaptchaSid != null }
+
+        oAuthUseCase.getSilentToken(
            login = currentState.login,
            password = currentState.password,
            forceSms = forceSms,
-            validationCode = validationCode.value,
-            captchaSid = captchaArguments.value?.captchaSid,
-            captchaKey = captchaCode.value
+            validationCode = currentValidationCode,
+            captchaSid = currentCaptchaSid,
+            captchaKey = currentCaptchaCode
        ).listenValue(viewModelScope) { state ->
            state.processState(
                error = { error ->
                    Log.d("LoginViewModelImpl", "login: error: $error")

-                    validationCode.update { null }
-                    captchaCode.update { null }
+                    screenState.updateValue { copy(isLoading = false) }
+                    captchaSid.setValue { null }

                    parseError(error)
                },
                success = { response ->
-                    val userId = response.userId
-                    val accessToken = response.accessToken
+                    val exceptionHandler =
+                        CoroutineExceptionHandler { _, _ ->
+                            screenState.updateValue { copy(isLoading = false) }
+                            loginDialog.setValue { LoginDialog.Error() }
+                        }

-                    if (userId == null || accessToken == null) {
-                        loginError.update { LoginError.Unknown }
-                        return@processState
+                    viewModelScope.launch(Dispatchers.IO + exceptionHandler) {
+                        val (anonymToken) = authRepository.getAnonymToken(
+                            VkConstants.MESSENGER_APP_ID.toString(),
+                            VkConstants.MESSENGER_APP_SECRET
+                        ).success()
+
+                        val exchangeSilentTokenResponse = authRepository.exchangeSilentToken(
+                            anonymToken = anonymToken,
+                            silentToken = response.silentToken,
+                            silentUuid = response.silentTokenUuid
+                        ).success()
+
+
+                        val getExchangeTokenResponse =
+                            authRepository.getExchangeToken(exchangeSilentTokenResponse.accessToken)
+                                .success()
+
+                        val exchangeToken =
+                            getExchangeTokenResponse.usersTokens.firstOrNull {
+                                it.userId == exchangeSilentTokenResponse.userId
+                            }
+
+                        if (exchangeToken == null) {
+                            screenState.updateValue { copy(isLoading = false) }
+                            loginDialog.setValue { LoginDialog.Error() }
+                            return@launch
+                        }
+
+                        val userId = exchangeSilentTokenResponse.userId
+                        val accessToken = exchangeSilentTokenResponse.accessToken
+
+                        // TODO: 30-Mar-25, Danil Nikolaev: get fast's app token
+
+                        val currentAccount = AccountEntity(
+                            userId = userId,
+                            accessToken = accessToken,
+                            fastToken = null,
+                            trustedHash = response.trustedHash,
+                            exchangeToken = exchangeToken.commonToken
+                        ).also { account ->
+                            UserConfig.currentUserId = account.userId
+                            UserConfig.userId = account.userId
+                            UserConfig.accessToken = account.accessToken
+                            UserConfig.fastToken = account.fastToken
+                            UserConfig.trustedHash = account.trustedHash
+                            UserConfig.exchangeToken = account.exchangeToken
+                        }
+
+                        accountsRepository.storeAccounts(listOf(currentAccount))
+
+                        startLongPoll()
+
+                        captchaSid.update { null }
+                        validationSid.update { null }
+
+                        loadUserByIdUseCase(
+                            userId = userId,
+                            fields = VkConstants.USER_FIELDS,
+                            nomCase = null
+                        ).listenValue(viewModelScope) { state ->
+                            state.processState(
+                                any = {
+                                    screenState.updateValue { copy(isLoading = false) }
+                                },
+                                error = ::parseError,
+                                success = { user ->
+                                    if (user == null) {
+                                        loginDialog.update { LoginDialog.Error() }
+                                    } else {
+                                        screenState.updateValue { copy(login = "", password = "") }
+                                        isNeedToOpenMain.update { true }
+                                    }
+                                }
+                            )
+                        }
                    }
-
-                    loadUserByIdUseCase(
-                        userId = userId,
-                        fields = VkConstants.USER_FIELDS,
-                        nomCase = null
-                    )
-
-                    val currentAccount = AccountEntity(
-                        userId = userId,
-                        accessToken = accessToken,
-                        fastToken = null,
-                        trustedHash = response.validationHash
-                    ).also { account ->
-                        UserConfig.currentUserId = account.userId
-                        UserConfig.userId = account.userId
-                        UserConfig.accessToken = account.accessToken
-                        UserConfig.fastToken = account.fastToken
-                        UserConfig.trustedHash = account.trustedHash
-                    }
-
-                    startLongPoll()
-
-                    accountsRepository.storeAccounts(listOf(currentAccount))
-
-                    captchaArguments.update { null }
-                    captchaCode.update { null }
-
-                    validationArguments.update { null }
-                    validationCode.update { null }
-
-                    screenState.setValue { old ->
-                        old.copy(
-                            login = "",
-                            password = "",
-                        )
-                    }
-
-                    isNeedToOpenMain.update { true }
                }
            )
-            screenState.emit(screenState.value.copy(isLoading = state.isLoading()))
        }
    }

-    private fun parseError(stateError: State.Error): Boolean {
-        return when (stateError) {
+    private fun parseError(stateError: State.Error) {
+        when (stateError) {
            is State.Error.OAuthError -> {
                when (val error = stateError.error) {
                    is OAuthErrorDomain.ValidationRequiredError -> {
@@ -301,6 +335,7 @@ class LoginViewModelImpl(
                            canResendSms = error.validationResend == "sms"
                        )
                        validationArguments.update { arguments }
+                        validationSid.update { error.validationSid }
                    }

                    is OAuthErrorDomain.CaptchaRequiredError -> {
@@ -309,10 +344,13 @@ class LoginViewModelImpl(
                            captchaImageUrl = error.captchaImageUrl
                        )
                        captchaArguments.update { arguments }
+                        captchaSid.update { error.captchaSid }
                    }

                    OAuthErrorDomain.InvalidCredentialsError -> {
-                        loginError.update { LoginError.WrongCredentials }
+                        loginDialog.setValue {
+                            LoginDialog.Error(errorText = "Wrong login or password.")
+                        }
                    }

                    is OAuthErrorDomain.UserBannedError -> {
@@ -326,33 +364,34 @@ class LoginViewModelImpl(
                    }

                    OAuthErrorDomain.WrongValidationCode -> {
-                        loginError.update { LoginError.WrongValidationCode }
+                        isNeedToClearValidationCode.update { true }
+                        validationCode.update { null }
+                        loginDialog.setValue {
+                            LoginDialog.Error(errorText = "Wrong validation code.")
+                        }
                    }

                    OAuthErrorDomain.WrongValidationCodeFormat -> {
-                        loginError.update { LoginError.WrongValidationCodeFormat }
+                        isNeedToClearValidationCode.update { true }
+                        validationCode.update { null }
+                        loginDialog.setValue {
+                            LoginDialog.Error(errorText = "Wrong validation code format.")
+                        }
                    }

                    OAuthErrorDomain.TooManyTriesError -> {
-                        loginError.update { LoginError.TooManyTries }
+                        loginDialog.setValue {
+                            LoginDialog.Error(errorText = "Too many tries. Try in another hour or later.")
+                        }
                    }

                    OAuthErrorDomain.UnknownError -> {
-                        loginError.update { LoginError.Unknown }
+                        loginDialog.setValue { LoginDialog.Error() }
                    }
                }
-
-                true
            }

-            is State.Error.TestError -> {
-                val message = stateError.message
-                val error = LoginError.SimpleError(message = message)
-                loginError.update { error }
-                true
-            }
-
-            else -> false
+            else -> Unit
        }
    }

@@ -0,0 +1,12 @@
+package dev.meloda.fast.auth.login.model
+
+import androidx.compose.runtime.Immutable
+
+@Immutable
+sealed class LoginDialog {
+
+    data class Error(
+        val errorText: String? = null,
+        val errorTextResId: Int? = null
+    ) : LoginDialog()
+}
@@ -1,13 +0,0 @@
-package dev.meloda.fast.auth.login.model
-
-import androidx.compose.runtime.Immutable
-
-@Immutable
-sealed class LoginError {
-    data object Unknown : LoginError()
-    data object WrongCredentials : LoginError()
-    data object TooManyTries : LoginError()
-    data object WrongValidationCode : LoginError()
-    data object WrongValidationCodeFormat : LoginError()
-    data class SimpleError(val message: String): LoginError()
-}
@@ -4,6 +4,7 @@ import androidx.compose.runtime.Immutable

@Immutable
 data class LoginScreenState(
+    val showLogo: Boolean,
    val login: String,
    val password: String,
    val isLoading: Boolean,
@@ -14,6 +15,7 @@ data class LoginScreenState(

    companion object {
        val EMPTY = LoginScreenState(
+            showLogo = true,
            login = "",
            password = "",
            isLoading = false,
@@ -1,5 +1,8 @@
 package dev.meloda.fast.auth.login.navigation

+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.navigation.NavBackStackEntry
 import androidx.navigation.NavController
 import androidx.navigation.NavGraphBuilder
@@ -10,28 +13,40 @@ import dev.meloda.fast.auth.login.model.CaptchaArguments
 import dev.meloda.fast.auth.login.model.LoginUserBannedArguments
 import dev.meloda.fast.auth.login.model.LoginValidationArguments
 import dev.meloda.fast.auth.login.presentation.LoginRoute
-import dev.meloda.fast.auth.login.presentation.LogoRoute
 import dev.meloda.fast.ui.extensions.sharedViewModel
 import kotlinx.serialization.Serializable

@Serializable
 object Login

-@Serializable
-object Logo
-
 fun NavGraphBuilder.loginScreen(
    onNavigateToCaptcha: (CaptchaArguments) -> Unit,
    onNavigateToValidation: (LoginValidationArguments) -> Unit,
    onNavigateToMain: () -> Unit,
    onNavigateToUserBanned: (LoginUserBannedArguments) -> Unit,
-    onNavigateToCredentials: () -> Unit,
    navController: NavController
 ) {
    composable<Login> { backStackEntry ->
        val viewModel: LoginViewModel =
            backStackEntry.sharedViewModel<LoginViewModelImpl>(navController = navController)

+        val clearValidationCode by viewModel.isNeedToClearValidationCode.collectAsStateWithLifecycle()
+        val clearCaptchaCode by viewModel.isNeedToClearCaptchaCode.collectAsStateWithLifecycle()
+
+        LaunchedEffect(clearValidationCode) {
+            if (clearValidationCode) {
+                backStackEntry.savedStateHandle["validation_code"] = null
+                viewModel.onValidationCodeCleared()
+            }
+        }
+
+        LaunchedEffect(clearCaptchaCode) {
+            if (clearCaptchaCode) {
+                backStackEntry.savedStateHandle["captcha_code"] = null
+                viewModel.onCaptchaCodeCleared()
+            }
+        }
+
        val validationCode = backStackEntry.getValidationResult()
        val captchaCode = backStackEntry.getCaptchaResult()

@@ -45,17 +60,6 @@ fun NavGraphBuilder.loginScreen(
            viewModel = viewModel
        )
    }
-
-    composable<Logo> {
-        LogoRoute(
-            onNavigateToMain = onNavigateToMain,
-            onGoNextButtonClicked = onNavigateToCredentials
-        )
-    }
-}
-
-fun NavController.navigateToLogin() {
-    this.navigate(route = Login)
 }

 fun NavBackStackEntry.getValidationResult(): String? {
@@ -1,6 +1,9 @@
 package dev.meloda.fast.auth.login.presentation

+import android.os.Bundle
+import androidx.activity.compose.BackHandler
 import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.animation.core.animateDpAsState
 import androidx.compose.animation.fadeIn
 import androidx.compose.animation.fadeOut
 import androidx.compose.foundation.layout.Box
@@ -28,13 +31,9 @@ import androidx.compose.material3.TextField
 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.Alignment
-import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.autofill.AutofillType
+import androidx.compose.ui.autofill.ContentType
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.focus.FocusRequester
 import androidx.compose.ui.focus.focusRequester
@@ -42,28 +41,30 @@ import androidx.compose.ui.platform.LocalFocusManager
 import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.TextRange
+import androidx.compose.ui.semantics.contentType
+import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.text.input.ImeAction
 import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.text.input.PasswordVisualTransformation
-import androidx.compose.ui.text.input.TextFieldValue
 import androidx.compose.ui.text.input.VisualTransformation
 import androidx.compose.ui.unit.dp
+import androidx.core.os.bundleOf
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import dev.meloda.fast.auth.login.LoginViewModel
+import dev.meloda.fast.auth.login.LoginViewModelImpl
 import dev.meloda.fast.auth.login.model.CaptchaArguments
-import dev.meloda.fast.auth.login.model.LoginError
+import dev.meloda.fast.auth.login.model.LoginDialog
 import dev.meloda.fast.auth.login.model.LoginScreenState
 import dev.meloda.fast.auth.login.model.LoginUserBannedArguments
 import dev.meloda.fast.auth.login.model.LoginValidationArguments
-import dev.meloda.fast.ui.basic.autoFillRequestHandler
-import dev.meloda.fast.ui.basic.connectNode
-import dev.meloda.fast.ui.basic.defaultFocusChangeAutoFill
+import dev.meloda.fast.datastore.UserSettings
 import dev.meloda.fast.ui.components.MaterialDialog
 import dev.meloda.fast.ui.components.TextFieldErrorText
 import dev.meloda.fast.ui.theme.LocalSizeConfig
 import dev.meloda.fast.ui.util.handleEnterKey
 import dev.meloda.fast.ui.util.handleTabKey
 import org.koin.androidx.compose.koinViewModel
+import org.koin.compose.koinInject
 import dev.meloda.fast.ui.R as UiR

@Composable
@@ -74,59 +75,54 @@ fun LoginRoute(
    onNavigateToValidation: (LoginValidationArguments) -> Unit,
    validationCode: String?,
    captchaCode: String?,
-    viewModel: dev.meloda.fast.auth.login.LoginViewModel = koinViewModel<dev.meloda.fast.auth.login.LoginViewModelImpl>()
+    viewModel: LoginViewModel = koinViewModel<LoginViewModelImpl>()
 ) {
    val screenState by viewModel.screenState.collectAsStateWithLifecycle()
    val isNeedToOpenMain by viewModel.isNeedToOpenMain.collectAsStateWithLifecycle()
    val userBannedArguments by viewModel.userBannedArguments.collectAsStateWithLifecycle()
    val captchaArguments by viewModel.captchaArguments.collectAsStateWithLifecycle()
    val validationArguments by viewModel.validationArguments.collectAsStateWithLifecycle()
-    val loginError by viewModel.loginError.collectAsStateWithLifecycle()
+    val loginDialog by viewModel.loginDialog.collectAsStateWithLifecycle()
+
+    BackHandler(
+        enabled = !screenState.showLogo,
+        onBack = viewModel::onBackPressed
+    )

    LaunchedEffect(isNeedToOpenMain) {
        if (isNeedToOpenMain) {
            viewModel.onNavigatedToMain()
            onNavigateToMain()
        }
-    }

+    }
    LaunchedEffect(userBannedArguments) {
        userBannedArguments?.let { arguments ->
            viewModel.onNavigatedToUserBanned()
            onNavigateToUserBanned(arguments)
        }
    }
-
    LaunchedEffect(captchaArguments) {
        captchaArguments?.let { arguments ->
            viewModel.onNavigatedToCaptcha()
            onNavigateToCaptcha(arguments)
        }
    }
-
    LaunchedEffect(validationArguments) {
        validationArguments?.let { arguments ->
            viewModel.onNavigatedToValidation()
            onNavigateToValidation(arguments)
        }
    }
-
    LaunchedEffect(validationCode) {
-        if (validationCode != null) {
-            viewModel.onValidationCodeReceived(validationCode)
-        }
+        viewModel.onValidationCodeReceived(validationCode)
    }
-
    LaunchedEffect(captchaCode) {
-        if (captchaCode != null) {
-            viewModel.onCaptchaCodeReceived(captchaCode)
-        }
+        viewModel.onCaptchaCodeReceived(captchaCode)
    }

    LoginScreen(
        screenState = screenState,
-        onLoginAutoFilled = viewModel::onLoginInputChanged,
-        onPasswordAutoFilled = viewModel::onPasswordInputChanged,
        onLoginInputChanged = viewModel::onLoginInputChanged,
        onPasswordInputChanged = viewModel::onPasswordInputChanged,
        onPasswordFieldEnterKeyClicked = viewModel::onSignInButtonClicked,
@@ -135,18 +131,16 @@ fun LoginRoute(
        onSignInButtonClicked = viewModel::onSignInButtonClicked
    )

-    HandleError(
-        onDismiss = viewModel::onErrorDialogDismissed,
-        error = loginError
+    HandleDialogs(
+        loginDialog = loginDialog,
+        onConfirmed = viewModel::onDialogConfirmed,
+        onDismissed = viewModel::onDialogDismissed
    )
 }

-@OptIn(ExperimentalComposeUiApi::class)
@Composable
 fun LoginScreen(
    screenState: LoginScreenState = LoginScreenState.EMPTY,
-    onLoginAutoFilled: (String) -> Unit = {},
-    onPasswordAutoFilled: (String) -> Unit = {},
    onLoginInputChanged: (String) -> Unit = {},
    onPasswordInputChanged: (String) -> Unit = {},
    onPasswordFieldEnterKeyClicked: () -> Unit = {},
@@ -154,218 +148,193 @@ fun LoginScreen(
    onPasswordFieldGoAction: () -> Unit = {},
    onSignInButtonClicked: () -> Unit = {}
 ) {
-    val currentSize = LocalSizeConfig.current
+    val size = LocalSizeConfig.current
    val focusManager = LocalFocusManager.current
-    val (loginFocusable, passwordFocusable) = FocusRequester.createRefs()

-    var loginText by remember { mutableStateOf(TextFieldValue(screenState.login)) }
-    val showLoginError = screenState.loginError
+    val titleSpacerSize by animateDpAsState(if (size.isHeightSmall) 24.dp else 58.dp)
+    val bottomPadding by animateDpAsState(if (size.isHeightSmall) 10.dp else 30.dp)

-    val autoFillEmailHandler = autoFillRequestHandler(
-        autofillTypes = listOf(AutofillType.EmailAddress),
-        onFill = { value ->
-            loginText = TextFieldValue(text = value, selection = TextRange(value.length))
-            onLoginAutoFilled(value)
-        }
-    )
-
-    var passwordText by remember { mutableStateOf(TextFieldValue(screenState.password)) }
-    val showPasswordError = screenState.passwordError
-
-    val autoFillPasswordHandler = autoFillRequestHandler(
-        autofillTypes = listOf(AutofillType.Password),
-        onFill = { value ->
-            passwordText = TextFieldValue(text = value, selection = TextRange(value.length))
-            onPasswordAutoFilled(value)
-        }
-    )
-
-    val titleStyle = if (currentSize.isWidthSmall) {
-        MaterialTheme.typography.displayMedium
-    } else {
-        MaterialTheme.typography.displayMedium
-    }
-
-    val titleSpacerSize = if (currentSize.isHeightSmall) {
-        24.dp
-    } else {
-        58.dp
-    }
-
-    val bottomPadding = if (currentSize.isHeightSmall) {
-        10.dp
-    } else {
-        30.dp
-    }
+    val (loginFocusable, passwordFocusable) =
+        FocusRequester.createRefs()

    Scaffold(
        contentWindowInsets = ScaffoldDefaults.contentWindowInsets.union(WindowInsets.ime)
    ) { padding ->
        Box(
            modifier = Modifier
-                .fillMaxSize()
                .padding(padding)
                .padding(top = 30.dp)
                .padding(horizontal = 30.dp)
                .padding(bottom = bottomPadding)
+                .fillMaxSize()
        ) {
-            Column(
+            AnimatedVisibility(
+                visible = screenState.showLogo,
+                enter = fadeIn(),
+                exit = fadeOut()
+            ) {
+                Logo()
+            }
+
+            AnimatedVisibility(
                modifier = Modifier
                    .fillMaxWidth()
-                    .align(Alignment.Center)
+                    .align(Alignment.Center),
+                visible = !screenState.showLogo,
+                enter = fadeIn(),
+                exit = fadeOut()
            ) {
-                Text(
-                    text = stringResource(id = UiR.string.sign_in_to_vk),
-                    color = MaterialTheme.colorScheme.onBackground,
-                    style = titleStyle
-                )
-
-                Spacer(modifier = Modifier.height(titleSpacerSize))
-
-                TextField(
+                Column(
                    modifier = Modifier
-                        .height(58.dp)
                        .fillMaxWidth()
-                        .clip(RoundedCornerShape(10.dp))
-                        .handleEnterKey {
-                            passwordFocusable.requestFocus()
-                            true
-                        }
-                        .handleTabKey {
-                            passwordFocusable.requestFocus()
-                            true
-                        }
-                        .focusRequester(loginFocusable)
-                        .connectNode(handler = autoFillEmailHandler)
-                        .defaultFocusChangeAutoFill(handler = autoFillEmailHandler),
-                    value = loginText,
-                    onValueChange = { newText ->
-                        val text = newText.text
-                        if (text.isEmpty()) {
-                            autoFillEmailHandler.requestVerifyManual()
-                        }
+                        .align(Alignment.Center)
+                ) {
+                    Text(
+                        text = stringResource(id = UiR.string.sign_in_to_vk),
+                        color = MaterialTheme.colorScheme.onBackground,
+                        style = MaterialTheme.typography.displayMedium
+                    )

-                        loginText = newText
-                        onLoginInputChanged(text)
-                    },
-                    label = { Text(text = stringResource(id = UiR.string.login_hint)) },
-                    placeholder = { Text(text = stringResource(id = UiR.string.login_hint)) },
-                    leadingIcon = {
-                        Icon(
-                            painter = painterResource(id = UiR.drawable.ic_round_person_24),
-                            contentDescription = "Login icon",
-                            tint = if (showLoginError) {
-                                MaterialTheme.colorScheme.error
-                            } else {
-                                MaterialTheme.colorScheme.primary
+                    Spacer(modifier = Modifier.height(titleSpacerSize))
+
+                    TextField(
+                        modifier = Modifier
+                            .height(58.dp)
+                            .fillMaxWidth()
+                            .clip(RoundedCornerShape(10.dp))
+                            .handleEnterKey {
+                                passwordFocusable.requestFocus()
+                                true
                            }
-                        )
-                    },
-                    keyboardOptions = KeyboardOptions.Default.copy(
-                        imeAction = ImeAction.Next,
-                        keyboardType = KeyboardType.Email
-                    ),
-                    keyboardActions = KeyboardActions(onNext = { passwordFocusable.requestFocus() }),
-                    isError = showLoginError,
-                    singleLine = true
-                )
-                AnimatedVisibility(visible = showLoginError) {
-                    TextFieldErrorText(text = stringResource(id = UiR.string.error_empty_field))
-                }
-
-                Spacer(modifier = Modifier.height(16.dp))
-
-                TextField(
-                    modifier = Modifier
-                        .height(58.dp)
-                        .fillMaxWidth()
-                        .clip(RoundedCornerShape(10.dp))
-                        .handleEnterKey {
-                            focusManager.clearFocus()
-                            onPasswordFieldEnterKeyClicked()
-                            true
-                        }
-                        .focusRequester(passwordFocusable)
-                        .connectNode(handler = autoFillPasswordHandler)
-                        .defaultFocusChangeAutoFill(handler = autoFillPasswordHandler),
-                    value = passwordText,
-                    onValueChange = { newText ->
-                        val text = newText.text
-                        if (text.isEmpty()) {
-                            autoFillPasswordHandler.requestVerifyManual()
-                        }
-
-                        passwordText = newText
-                        onPasswordInputChanged(text)
-                    },
-                    label = { Text(text = stringResource(id = UiR.string.password_login_hint)) },
-                    placeholder = { Text(text = stringResource(id = UiR.string.password_login_hint)) },
-                    leadingIcon = {
-                        Icon(
-                            painter = painterResource(id = UiR.drawable.round_vpn_key_24),
-                            contentDescription = "Password icon",
-                            tint = if (showPasswordError) {
-                                MaterialTheme.colorScheme.error
-                            } else {
-                                MaterialTheme.colorScheme.primary
+                            .handleTabKey {
+                                passwordFocusable.requestFocus()
+                                true
                            }
-                        )
-                    },
-                    trailingIcon = {
-                        val imagePainter = painterResource(
-                            id = if (screenState.passwordVisible) UiR.drawable.round_visibility_off_24
-                            else UiR.drawable.round_visibility_24
-                        )
-
-                        IconButton(onClick = onPasswordVisibilityButtonClicked) {
+                            .focusRequester(loginFocusable)
+                            .semantics {
+                                contentType = ContentType.Username + ContentType.EmailAddress
+                            },
+                        value = screenState.login,
+                        onValueChange = onLoginInputChanged,
+                        label = { Text(text = stringResource(id = UiR.string.login_hint)) },
+                        placeholder = { Text(text = stringResource(id = UiR.string.login_hint)) },
+                        leadingIcon = {
                            Icon(
-                                painter = imagePainter,
-                                contentDescription = if (screenState.passwordVisible) "Password visible icon"
-                                else "Password invisible icon"
+                                painter = painterResource(id = UiR.drawable.ic_round_person_24),
+                                contentDescription = "Login icon",
+                                tint = if (screenState.loginError) {
+                                    MaterialTheme.colorScheme.error
+                                } else {
+                                    MaterialTheme.colorScheme.primary
+                                }
                            )
-                        }
-                    },
-                    keyboardOptions = KeyboardOptions.Default.copy(
-                        imeAction = ImeAction.Go,
-                        keyboardType = KeyboardType.Password
-                    ),
-                    keyboardActions = KeyboardActions(
-                        onGo = {
-                            focusManager.clearFocus()
-                            onPasswordFieldGoAction()
-                        }
-                    ),
-                    isError = showPasswordError,
-                    visualTransformation = if (screenState.passwordVisible) {
-                        VisualTransformation.None
-                    } else {
-                        PasswordVisualTransformation()
-                    },
-                    singleLine = true
-                )
-                AnimatedVisibility(visible = showPasswordError) {
-                    TextFieldErrorText(text = stringResource(id = UiR.string.error_empty_field))
+                        },
+                        keyboardOptions = KeyboardOptions.Default.copy(
+                            imeAction = ImeAction.Next,
+                            keyboardType = KeyboardType.Email
+                        ),
+                        keyboardActions = KeyboardActions(onNext = { passwordFocusable.requestFocus() }),
+                        isError = screenState.loginError,
+                        singleLine = true
+                    )
+                    AnimatedVisibility(visible = screenState.loginError) {
+                        TextFieldErrorText(text = stringResource(id = UiR.string.error_empty_field))
+                    }
+
+                    Spacer(modifier = Modifier.height(16.dp))
+
+                    TextField(
+                        modifier = Modifier
+                            .height(58.dp)
+                            .fillMaxWidth()
+                            .clip(RoundedCornerShape(10.dp))
+                            .handleEnterKey {
+                                focusManager.clearFocus()
+                                onPasswordFieldEnterKeyClicked()
+                                true
+                            }
+                            .focusRequester(passwordFocusable)
+                            .semantics { contentType = ContentType.Password },
+                        value = screenState.password,
+                        onValueChange = onPasswordInputChanged,
+                        label = { Text(text = stringResource(id = UiR.string.password_login_hint)) },
+                        placeholder = { Text(text = stringResource(id = UiR.string.password_login_hint)) },
+                        leadingIcon = {
+                            Icon(
+                                painter = painterResource(id = UiR.drawable.round_vpn_key_24),
+                                contentDescription = "Password icon",
+                                tint = if (screenState.passwordError) {
+                                    MaterialTheme.colorScheme.error
+                                } else {
+                                    MaterialTheme.colorScheme.primary
+                                }
+                            )
+                        },
+                        trailingIcon = {
+                            val imagePainter = painterResource(
+                                id = if (screenState.passwordVisible) UiR.drawable.round_visibility_off_24
+                                else UiR.drawable.round_visibility_24
+                            )
+
+                            IconButton(onClick = onPasswordVisibilityButtonClicked) {
+                                Icon(
+                                    painter = imagePainter,
+                                    contentDescription = if (screenState.passwordVisible) "Password visible icon"
+                                    else "Password invisible icon"
+                                )
+                            }
+                        },
+                        keyboardOptions = KeyboardOptions.Default.copy(
+                            imeAction = ImeAction.Go,
+                            keyboardType = KeyboardType.Password
+                        ),
+                        keyboardActions = KeyboardActions(
+                            onGo = {
+                                focusManager.clearFocus()
+                                onPasswordFieldGoAction()
+                            }
+                        ),
+                        isError = screenState.passwordError,
+                        visualTransformation = if (screenState.passwordVisible) {
+                            VisualTransformation.None
+                        } else {
+                            PasswordVisualTransformation()
+                        },
+                        singleLine = true
+                    )
+                    AnimatedVisibility(visible = screenState.passwordError) {
+                        TextFieldErrorText(text = stringResource(id = UiR.string.error_empty_field))
+                    }
                }
            }

+
            Box(
                modifier = Modifier.align(Alignment.BottomCenter),
                contentAlignment = Alignment.Center
            ) {
-                AnimatedVisibility(
-                    visible = !screenState.isLoading,
-                    enter = fadeIn(),
-                    exit = fadeOut()
+                FloatingActionButton(
+                    onClick = {
+                        if (!screenState.isLoading) {
+                            focusManager.clearFocus()
+                            onSignInButtonClicked()
+                        }
+                    },
+                    containerColor = MaterialTheme.colorScheme.secondaryContainer,
+                    modifier = Modifier.testTag("sing_in_fab")
                ) {
-                    FloatingActionButton(
-                        onClick = {
-                            if (!screenState.isLoading) {
-                                focusManager.clearFocus()
-                                onSignInButtonClicked()
-                            }
-                        },
-                        containerColor = MaterialTheme.colorScheme.secondaryContainer,
-                        modifier = Modifier.testTag("sing_in_fab")
+                    AnimatedVisibility(
+                        visible = screenState.isLoading,
+                        enter = fadeIn(),
+                        exit = fadeOut()
+                    ) {
+                        CircularProgressIndicator()
+                    }
+
+                    AnimatedVisibility(
+                        visible = !screenState.isLoading,
+                        enter = fadeIn(),
+                        exit = fadeOut()
                    ) {
                        Icon(
                            painter = painterResource(id = UiR.drawable.ic_arrow_end),
@@ -374,77 +343,28 @@ fun LoginScreen(
                        )
                    }
                }
-                AnimatedVisibility(
-                    visible = screenState.isLoading,
-                    enter = fadeIn(),
-                    exit = fadeOut()
-                ) {
-                    CircularProgressIndicator()
-                }
            }
        }
    }
 }

+
@Composable
-fun HandleError(
-    onDismiss: () -> Unit,
-    error: LoginError?,
+fun HandleDialogs(
+    loginDialog: LoginDialog?,
+    onConfirmed: (LoginDialog, Bundle) -> Unit = { _, _ -> },
+    onDismissed: (LoginDialog) -> Unit = {},
 ) {
-    when (error) {
+    when (loginDialog) {
        null -> Unit

-        LoginError.Unknown -> {
+        is LoginDialog.Error -> {
            MaterialDialog(
-                onDismissRequest = onDismiss,
-                title = "Error",
-                text = "Unknown error",
-                confirmText = stringResource(id = UiR.string.ok)
-            )
-        }
-
-        LoginError.WrongCredentials -> {
-            MaterialDialog(
-                onDismissRequest = onDismiss,
-                title = "Error",
-                text = "Wrong login or password.",
-                confirmText = stringResource(id = UiR.string.ok)
-            )
-        }
-
-        LoginError.TooManyTries -> {
-            MaterialDialog(
-                onDismissRequest = onDismiss,
-                title = "Error",
-                text = "Too many tries. Try in another hour or later.",
-                confirmText = stringResource(id = UiR.string.ok)
-            )
-        }
-
-
-        LoginError.WrongValidationCode -> {
-            MaterialDialog(
-                onDismissRequest = onDismiss,
-                title = "Error",
-                text = "Wrong validation code.",
-                confirmText = stringResource(id = UiR.string.ok)
-            )
-        }
-
-        LoginError.WrongValidationCodeFormat -> {
-            MaterialDialog(
-                onDismissRequest = onDismiss,
-                title = "Error",
-                text = "Wrong validation code format.",
-                confirmText = stringResource(id = UiR.string.ok)
-            )
-        }
-
-        is LoginError.SimpleError -> {
-            MaterialDialog(
-                onDismissRequest = onDismiss,
-                title = "Error",
-                text = error.message,
+                onDismissRequest = { onDismissed(loginDialog) },
+                title = stringResource(UiR.string.title_error),
+                text = loginDialog.errorTextResId?.let { stringResource(it) }
+                    ?: loginDialog.errorText
+                    ?: stringResource(UiR.string.unknown_error_occurred),
                confirmText = stringResource(id = UiR.string.ok)
            )
        }
@@ -0,0 +1,91 @@
+package dev.meloda.fast.auth.login.presentation
+
+import android.os.Build
+import androidx.compose.animation.core.animateDpAsState
+import androidx.compose.animation.core.animateIntAsState
+import androidx.compose.foundation.ExperimentalFoundationApi
+import androidx.compose.foundation.combinedClickable
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.width
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import dev.meloda.fast.datastore.UserSettings
+import dev.meloda.fast.ui.R
+import dev.meloda.fast.ui.theme.LocalSizeConfig
+import org.koin.compose.koinInject
+
+@OptIn(ExperimentalFoundationApi::class)
+@Composable
+fun Logo(modifier: Modifier = Modifier) {
+    val size = LocalSizeConfig.current
+
+    val iconWidth by animateDpAsState(if (size.isWidthSmall) 110.dp else 134.dp)
+    val appNameFontSize by animateIntAsState(if (size.isWidthSmall) 32 else 40)
+    val bottomAdditionalPadding by animateDpAsState(if (size.isHeightSmall) 10.dp else 30.dp)
+
+    val userSettings: UserSettings = koinInject()
+
+    Box(
+        modifier = modifier
+            .fillMaxSize()
+            .padding(top = 30.dp)
+            .padding(horizontal = 30.dp)
+            .padding(bottom = bottomAdditionalPadding)
+    ) {
+        Column(
+            modifier = Modifier
+                .fillMaxWidth()
+                .align(Alignment.Center),
+            horizontalAlignment = Alignment.CenterHorizontally
+        ) {
+            Icon(
+                painter = painterResource(id = R.drawable.ic_logo_big),
+                contentDescription = "Application Logo",
+                tint = MaterialTheme.colorScheme.primary,
+                modifier = Modifier
+                    .width(iconWidth)
+                    .combinedClickable(
+                        interactionSource = null,
+                        indication = null,
+                        onLongClick = null,
+                        onClick = {
+                            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+                                userSettings.onEnableDynamicColorsChanged(
+                                    !userSettings.enableDynamicColors.value
+                                )
+                            }
+                        }
+                    )
+            )
+
+            Spacer(modifier = Modifier.height(46.dp))
+            Text(
+                text = stringResource(id = R.string.fast_messenger),
+                style = MaterialTheme.typography.displayMedium.copy(fontSize = appNameFontSize.sp),
+                color = MaterialTheme.colorScheme.onBackground
+            )
+        }
+    }
+}
+
+@Preview
+@Composable
+private fun LogoPreview() {
+    Logo()
+}
@@ -1,229 +0,0 @@
-package dev.meloda.fast.auth.login.presentation
-
-import androidx.compose.animation.AnimatedVisibility
-import androidx.compose.animation.core.animateDpAsState
-import androidx.compose.animation.fadeIn
-import androidx.compose.animation.fadeOut
-import androidx.compose.foundation.ExperimentalFoundationApi
-import androidx.compose.foundation.combinedClickable
-import androidx.compose.foundation.interaction.MutableInteractionSource
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.calculateEndPadding
-import androidx.compose.foundation.layout.calculateStartPadding
-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.width
-import androidx.compose.material3.CircularProgressIndicator
-import androidx.compose.material3.FloatingActionButton
-import androidx.compose.material3.Icon
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.OutlinedTextField
-import androidx.compose.material3.Scaffold
-import androidx.compose.material3.Text
-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.saveable.rememberSaveable
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.testTag
-import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.unit.LayoutDirection
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import dev.meloda.fast.auth.BuildConfig
-import dev.meloda.fast.ui.components.ActionInvokeDismiss
-import dev.meloda.fast.ui.components.MaterialDialog
-import dev.meloda.fast.ui.theme.LocalSizeConfig
-import org.koin.androidx.compose.koinViewModel
-import dev.meloda.fast.ui.R as UiR
-
-@Composable
-fun LogoRoute(
-    onNavigateToMain: () -> Unit,
-    onGoNextButtonClicked: () -> Unit,
-    viewModel: dev.meloda.fast.auth.login.LoginViewModel = koinViewModel<dev.meloda.fast.auth.login.LoginViewModelImpl>()
-) {
-    val screenState by viewModel.screenState.collectAsStateWithLifecycle()
-    val isNeedToOpenMain by viewModel.isNeedToOpenMain.collectAsStateWithLifecycle()
-    val isNeedToShowSignInAlert by viewModel.isNeedToShowFastSignInAlert.collectAsStateWithLifecycle()
-
-    LaunchedEffect(isNeedToOpenMain) {
-        if (isNeedToOpenMain) {
-            viewModel.onNavigatedToMain()
-            onNavigateToMain()
-        }
-    }
-
-    LogoScreen(
-        isLoading = screenState.isLoading,
-        onLogoLongClicked = viewModel::onLogoLongClicked,
-        onGoNextButtonClicked = onGoNextButtonClicked
-    )
-
-    if (isNeedToShowSignInAlert) {
-        SignInAlert(
-            onDismissRequest = viewModel::onFastLogInAlertDismissed,
-            onConfirmClick = viewModel::onFastLogInAlertConfirmClicked,
-        )
-    }
-}
-
-@OptIn(ExperimentalFoundationApi::class)
-@Composable
-fun LogoScreen(
-    isLoading: Boolean = false,
-    onLogoLongClicked: () -> Unit = {},
-    onGoNextButtonClicked: () -> Unit = {}
-) {
-    val currentSize = LocalSizeConfig.current
-
-    Scaffold { padding ->
-        val topPadding by animateDpAsState(
-            targetValue = padding.calculateTopPadding(),
-            label = "topPaddingAnimation"
-        )
-        val bottomPadding by animateDpAsState(
-            targetValue = padding.calculateBottomPadding(),
-            label = "bottomPaddingAnimation"
-        )
-
-        val endPadding by animateDpAsState(
-            targetValue = padding.calculateEndPadding(LayoutDirection.Ltr),
-            label = "endPaddingAnimation"
-        )
-        val startPadding by animateDpAsState(
-            targetValue = padding.calculateStartPadding(LayoutDirection.Ltr),
-            label = "startPaddingAnimation"
-        )
-
-        val iconWidth = if (currentSize.isWidthSmall) {
-            110.dp
-        } else {
-            134.dp
-        }
-
-        val appNameTextStyle = if (currentSize.isWidthSmall) {
-            MaterialTheme.typography.displayMedium.copy(fontSize = 40.sp)
-        } else {
-            MaterialTheme.typography.displayMedium
-        }
-
-        val bottomAdditionalPadding = if (currentSize.isHeightSmall) {
-            10.dp
-        } else {
-            30.dp
-        }
-
-        Box(
-            modifier = Modifier
-                .fillMaxSize()
-                .padding(
-                    start = startPadding,
-                    top = topPadding,
-                    end = endPadding,
-                    bottom = bottomPadding
-                )
-                .padding(top = 30.dp)
-                .padding(horizontal = 30.dp)
-                .padding(bottom = bottomAdditionalPadding)
-        ) {
-            Column(
-                modifier = Modifier
-                    .fillMaxWidth()
-                    .align(Alignment.Center),
-                horizontalAlignment = Alignment.CenterHorizontally
-            ) {
-                Icon(
-                    painter = painterResource(id = UiR.drawable.ic_logo_big),
-                    contentDescription = "Application Logo",
-                    tint = MaterialTheme.colorScheme.primary,
-                    modifier = Modifier
-                        .width(iconWidth)
-                        .combinedClickable(
-                            interactionSource = remember { MutableInteractionSource() },
-                            indication = null,
-                            onLongClick = onLogoLongClicked,
-                            onClick = {}
-                        )
-                )
-                Spacer(modifier = Modifier.height(46.dp))
-                Text(
-                    text = stringResource(id = UiR.string.fast_messenger),
-                    style = appNameTextStyle,
-                    color = MaterialTheme.colorScheme.onBackground
-                )
-            }
-
-            AnimatedVisibility(
-                visible = !isLoading,
-                modifier = Modifier.align(Alignment.BottomCenter),
-                enter = fadeIn(),
-                exit = fadeOut()
-            ) {
-                FloatingActionButton(
-                    onClick = {
-                        if (!isLoading) {
-                            onGoNextButtonClicked()
-                        }
-                    },
-                    containerColor = MaterialTheme.colorScheme.secondaryContainer,
-                    modifier = Modifier.testTag("go_next_fab")
-                ) {
-                    Icon(
-                        painter = painterResource(id = UiR.drawable.ic_arrow_end),
-                        contentDescription = "Go button",
-                        tint = MaterialTheme.colorScheme.onSecondaryContainer
-                    )
-                }
-            }
-
-            AnimatedVisibility(
-                visible = isLoading,
-                modifier = Modifier.align(Alignment.BottomCenter)
-            ) {
-                CircularProgressIndicator()
-            }
-        }
-    }
-}
-
-@Composable
-fun SignInAlert(
-    onDismissRequest: () -> Unit,
-    onConfirmClick: (token: String) -> Unit
-) {
-    var tokenText by rememberSaveable {
-        mutableStateOf(BuildConfig.debugToken)
-    }
-
-    val maxWidthModifier = Modifier.fillMaxWidth()
-
-    MaterialDialog(
-        onDismissRequest = onDismissRequest,
-        title = "Fast authorization",
-        confirmText = stringResource(id = UiR.string.action_authorize),
-        confirmAction = { onConfirmClick(tokenText) },
-        cancelText = stringResource(id = UiR.string.cancel),
-        actionInvokeDismiss = ActionInvokeDismiss.Always
-    ) {
-        Column(modifier = maxWidthModifier) {
-            OutlinedTextField(
-                modifier = maxWidthModifier.padding(horizontal = 16.dp),
-                value = tokenText,
-                onValueChange = { tokenText = it },
-                placeholder = { Text(text = "Access token") },
-                label = { Text(text = "Access token") }
-            )
-        }
-    }
-}
@@ -38,7 +38,7 @@ fun NavController.navigateToValidation(arguments: ValidationArguments) {
 }

 fun NavController.setValidationResult(code: String?) {
-    this.currentBackStackEntry
+    this.previousBackStackEntry
        ?.savedStateHandle
        ?.set("validation_code", code)
 }
@@ -7,10 +7,13 @@ import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.ime
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.union
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.text.KeyboardActions
@@ -23,6 +26,7 @@ import androidx.compose.material3.FloatingActionButton
 import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Scaffold
+import androidx.compose.material3.ScaffoldDefaults
 import androidx.compose.material3.Text
 import androidx.compose.material3.TextField
 import androidx.compose.runtime.Composable
@@ -35,10 +39,13 @@ 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.autofill.ContentType
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.platform.LocalFocusManager
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.semantics.contentType
+import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.text.input.ImeAction
 import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.text.input.TextFieldValue
@@ -146,7 +153,9 @@ fun ValidationScreen(

    var code by remember { mutableStateOf(TextFieldValue(screenState.code.orEmpty())) }

-    Scaffold { padding ->
+    Scaffold(
+        contentWindowInsets = ScaffoldDefaults.contentWindowInsets.union(WindowInsets.ime)
+    ) { padding ->
        Column(
            modifier = Modifier
                .fillMaxSize()
@@ -210,7 +219,8 @@ fun ValidationScreen(
                    placeholder = { Text(text = "Code") },
                    modifier = Modifier
                        .fillMaxWidth()
-                        .clip(RoundedCornerShape(10.dp)),
+                        .clip(RoundedCornerShape(10.dp))
+                        .semantics { contentType = ContentType.SmsOtpCode },
                    leadingIcon = {
                        Icon(
                            painter = painterResource(id = UiR.drawable.round_qr_code_24),