domain module

2024-08-11 17:40:13 +03:00
parent 648850f1c8
commit 0500969d81
77 changed files with 282 additions and 267 deletions
@@ -64,7 +64,7 @@ android {
 }

 dependencies {
-    implementation(projects.core.data)
+    implementation(projects.core.domain)
    implementation(projects.core.ui)

    implementation(platform(libs.compose.bom))
@@ -11,17 +11,18 @@ import dev.meloda.fast.auth.login.model.LoginValidationArguments
 import dev.meloda.fast.auth.login.model.LoginValidationResult
 import dev.meloda.fast.auth.login.validation.LoginValidator
 import dev.meloda.fast.common.LongPollController
-import dev.meloda.fast.common.UserConfig
 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.api.users.UsersUseCase
+import dev.meloda.fast.data.UserConfig
 import dev.meloda.fast.data.db.AccountsRepository
 import dev.meloda.fast.data.processState
 import dev.meloda.fast.datastore.AppSettings
+import dev.meloda.fast.domain.OAuthUseCase
+import dev.meloda.fast.domain.UsersUseCase
 import dev.meloda.fast.model.database.AccountEntity
 import dev.meloda.fast.network.OAuthErrorDomain
 import kotlinx.coroutines.Dispatchers
@@ -70,12 +71,12 @@ interface LoginViewModel {
 }

 class LoginViewModelImpl(
-    private val oAuthUseCase: dev.meloda.fast.auth.login.OAuthUseCase,
+    private val oAuthUseCase: OAuthUseCase,
    private val usersUseCase: UsersUseCase,
    private val accountsRepository: AccountsRepository,
    private val loginValidator: LoginValidator,
    private val longPollController: LongPollController
-) : ViewModel(), dev.meloda.fast.auth.login.LoginViewModel {
+) : ViewModel(), LoginViewModel {

    override val screenState = MutableStateFlow(LoginScreenState.EMPTY)
    override val loginError = MutableStateFlow<LoginError?>(null)
@@ -1,17 +0,0 @@
-package dev.meloda.fast.auth.login
-
-import dev.meloda.fast.data.State
-import dev.meloda.fast.auth.login.model.AuthInfo
-import kotlinx.coroutines.flow.Flow
-
-interface OAuthUseCase {
-
-    fun auth(
-        login: String,
-        password: String,
-        forceSms: Boolean,
-        validationCode: String?,
-        captchaSid: String?,
-        captchaKey: String?
-    ): Flow<State<AuthInfo>>
-}
@@ -1,124 +0,0 @@
-package dev.meloda.fast.auth.login
-
-import dev.meloda.fast.auth.login.model.AuthInfo
-import dev.meloda.fast.data.State
-import dev.meloda.fast.data.api.oauth.OAuthRepository
-import dev.meloda.fast.network.OAuthErrorDomain
-import dev.meloda.fast.network.ValidationType
-import dev.meloda.fast.network.VkOAuthError
-import dev.meloda.fast.network.VkOAuthErrorType
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.flow
-
-class OAuthUseCaseImpl(
-    private val oAuthRepository: OAuthRepository
-) : OAuthUseCase {
-
-    override fun auth(
-        login: String,
-        password: String,
-        forceSms: Boolean,
-        validationCode: String?,
-        captchaSid: String?,
-        captchaKey: String?
-    ): Flow<State<AuthInfo>> = flow {
-        emit(State.Loading)
-
-        val response = oAuthRepository.auth(
-            login = login,
-            password = password,
-            validationCode = validationCode,
-            captchaSid = captchaSid,
-            captchaKey = captchaKey,
-            forceSms = forceSms
-        )
-
-        val error = response.error?.let(VkOAuthError::parse)
-        val errorType = response.errorType?.let(VkOAuthErrorType::parse)
-
-        val newState = when (error) {
-            null -> {
-                State.Success(
-                    AuthInfo(
-                        userId = response.userId,
-                        accessToken = response.accessToken,
-                        validationHash = response.validationHash
-                    )
-                )
-            }
-
-            VkOAuthError.FLOOD_CONTROL -> {
-                State.Error.OAuthError(OAuthErrorDomain.TooManyTriesError)
-            }
-
-            VkOAuthError.NEED_VALIDATION -> {
-                if (response.banInfo != null) {
-                    val info = requireNotNull(response.banInfo)
-
-                    State.Error.OAuthError(
-                        OAuthErrorDomain.UserBannedError(
-                            memberName = info.memberName,
-                            message = info.message,
-                            accessToken = info.accessToken,
-                            restoreUrl = info.restoreUrl
-                        )
-                    )
-                } else {
-                    State.Error.OAuthError(
-                        OAuthErrorDomain.ValidationRequiredError(
-                            description = response.errorDescription.orEmpty(),
-                            validationType = response.validationType.orEmpty()
-                                .let(ValidationType::parse),
-                            validationSid = response.validationSid.orEmpty(),
-                            phoneMask = response.phoneMask.orEmpty(),
-                            redirectUri = response.redirectUri.orEmpty(),
-                            validationResend = response.validationResend,
-                            restoreIfCannotGetCode = response.restoreIfCannotGetCode
-                        )
-                    )
-                }
-            }
-
-            VkOAuthError.NEED_CAPTCHA -> {
-                State.Error.OAuthError(
-                    OAuthErrorDomain.CaptchaRequiredError(
-                        captchaSid = response.captchaSid.orEmpty(),
-                        captchaImageUrl = response.captchaImage.orEmpty()
-                    )
-                )
-            }
-
-            VkOAuthError.INVALID_CLIENT -> {
-                State.Error.OAuthError(OAuthErrorDomain.InvalidCredentialsError)
-            }
-
-            VkOAuthError.INVALID_REQUEST -> {
-                when (errorType) {
-                    null -> State.Error.OAuthError(OAuthErrorDomain.UnknownError)
-
-                    VkOAuthErrorType.WRONG_OTP -> {
-                        State.Error.OAuthError(OAuthErrorDomain.WrongValidationCode)
-                    }
-
-                    VkOAuthErrorType.WRONG_OTP_FORMAT -> {
-                        State.Error.OAuthError(OAuthErrorDomain.WrongValidationCodeFormat)
-                    }
-
-                    VkOAuthErrorType.PASSWORD_BRUTEFORCE_ATTEMPT -> {
-                        State.Error.OAuthError(OAuthErrorDomain.TooManyTriesError)
-                    }
-
-                    VkOAuthErrorType.USERNAME_OR_PASSWORD_IS_INCORRECT -> {
-                        State.Error.OAuthError(OAuthErrorDomain.InvalidCredentialsError)
-                    }
-                }
-            }
-
-            VkOAuthError.UNKNOWN -> {
-                State.Error.OAuthError(OAuthErrorDomain.UnknownError)
-            }
-        }
-
-        emit(newState)
-    }
-}
@@ -1,9 +1,8 @@
 package dev.meloda.fast.auth.login.di

-import dev.meloda.fast.auth.login.LoginViewModel
 import dev.meloda.fast.auth.login.LoginViewModelImpl
-import dev.meloda.fast.auth.login.OAuthUseCase
-import dev.meloda.fast.auth.login.OAuthUseCaseImpl
+import dev.meloda.fast.domain.OAuthUseCase
+import dev.meloda.fast.domain.OAuthUseCaseImpl
 import dev.meloda.fast.auth.login.validation.LoginValidator
 import org.koin.androidx.viewmodel.dsl.viewModelOf
 import org.koin.core.module.dsl.singleOf
@@ -1,7 +0,0 @@
-package dev.meloda.fast.auth.login.model
-
-data class AuthInfo(
-    val userId: Int?,
-    val accessToken: String?,
-    val validationHash: String?
-)
@@ -4,14 +4,14 @@ import androidx.navigation.NavBackStackEntry
 import androidx.navigation.NavController
 import androidx.navigation.NavGraphBuilder
 import androidx.navigation.compose.composable
-import dev.meloda.fast.common.extensions.navigation.sharedViewModel
 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.LoginValidationArguments
 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
@@ -29,8 +29,8 @@ fun NavGraphBuilder.loginScreen(
    navController: NavController
 ) {
    composable<Login> { backStackEntry ->
-        val viewModel: dev.meloda.fast.auth.login.LoginViewModel =
-            backStackEntry.sharedViewModel<dev.meloda.fast.auth.login.LoginViewModelImpl>(navController = navController)
+        val viewModel: LoginViewModel =
+            backStackEntry.sharedViewModel<LoginViewModelImpl>(navController = navController)

        val validationCode = backStackEntry.getValidationResult()
        val captchaCode = backStackEntry.getCaptchaResult()
@@ -1,12 +0,0 @@
-package dev.meloda.fast.auth.validation
-
-import dev.meloda.fast.data.State
-import dev.meloda.fast.model.api.responses.ValidatePhoneResponse
-import kotlinx.coroutines.flow.Flow
-
-interface AuthUseCase {
-
-    fun validatePhone(
-        validationSid: String
-    ): Flow<State<ValidatePhoneResponse>>
-}
@@ -1,18 +0,0 @@
-package dev.meloda.fast.auth.validation
-
-import dev.meloda.fast.data.State
-import dev.meloda.fast.data.api.auth.AuthRepository
-import dev.meloda.fast.data.mapToState
-import dev.meloda.fast.model.api.responses.ValidatePhoneResponse
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.flow
-
-class AuthUseCaseImpl(private val repository: AuthRepository) : AuthUseCase {
-
-    override fun validatePhone(validationSid: String): Flow<State<ValidatePhoneResponse>> = flow {
-        emit(State.Loading)
-
-        val newState = repository.validatePhone(validationSid).mapToState()
-        emit(newState)
-    }
-}
@@ -12,6 +12,7 @@ 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.data.processState
+import dev.meloda.fast.domain.AuthUseCase
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -1,7 +1,7 @@
 package dev.meloda.fast.auth.validation.di

-import dev.meloda.fast.auth.validation.AuthUseCase
-import dev.meloda.fast.auth.validation.AuthUseCaseImpl
+import dev.meloda.fast.domain.AuthUseCase
+import dev.meloda.fast.domain.AuthUseCaseImpl
 import dev.meloda.fast.auth.validation.ValidationViewModel
 import dev.meloda.fast.auth.validation.ValidationViewModelImpl
 import dev.meloda.fast.auth.validation.validation.ValidationValidator
@@ -7,7 +7,7 @@ import androidx.navigation.compose.composable
 import androidx.navigation.toRoute
 import dev.meloda.fast.auth.validation.model.ValidationArguments
 import dev.meloda.fast.auth.validation.presentation.ValidationRoute
-import dev.meloda.fast.common.extensions.customNavType
+import dev.meloda.fast.ui.extensions.customNavType
 import kotlinx.serialization.Serializable
 import kotlin.reflect.typeOf

@@ -8,7 +8,7 @@ android {
 }

 dependencies {
-    implementation(projects.core.data)
+    implementation(projects.core.domain)
    implementation(projects.core.model)
    implementation(projects.core.ui)

@@ -7,8 +7,8 @@ import dev.meloda.fast.chatmaterials.navigation.ChatMaterials
 import dev.meloda.fast.chatmaterials.util.asPresentation
 import dev.meloda.fast.common.extensions.listenValue
 import dev.meloda.fast.common.extensions.setValue
-import dev.meloda.fast.data.api.messages.MessagesUseCase
 import dev.meloda.fast.data.processState
+import dev.meloda.fast.domain.MessagesUseCase
 import dev.meloda.fast.model.BaseError
 import dev.meloda.fast.model.api.domain.VkAttachmentHistoryMessage
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -9,13 +9,11 @@ android {

 dependencies {
    implementation(projects.core.common)
-    implementation(projects.core.data)
+    implementation(projects.core.domain)
    implementation(projects.core.model)
    implementation(projects.core.ui)

-    implementation(libs.nanokt.android)
-    implementation(libs.nanokt.jvm)
-    implementation(libs.nanokt)
+    implementation(libs.bundles.nanokt)

    implementation(libs.koin.android)
    implementation(libs.koin.androidx.compose)
@@ -14,12 +14,12 @@ import dev.meloda.fast.conversations.model.ConversationsShowOptions
 import dev.meloda.fast.conversations.model.UiConversation
 import dev.meloda.fast.conversations.util.asPresentation
 import dev.meloda.fast.conversations.util.extractAvatar
-import dev.meloda.fast.data.LongPollUpdatesParser
 import dev.meloda.fast.data.State
-import dev.meloda.fast.data.api.conversations.ConversationsUseCase
-import dev.meloda.fast.data.api.messages.MessagesUseCase
 import dev.meloda.fast.data.processState
 import dev.meloda.fast.datastore.UserSettings
+import dev.meloda.fast.domain.ConversationsUseCase
+import dev.meloda.fast.domain.LongPollUpdatesParser
+import dev.meloda.fast.domain.MessagesUseCase
 import dev.meloda.fast.model.BaseError
 import dev.meloda.fast.model.InteractionType
 import dev.meloda.fast.model.LongPollEvent
@@ -1,119 +0,0 @@
-package dev.meloda.fast.conversations.data
-
-import dev.meloda.fast.data.State
-import dev.meloda.fast.data.api.conversations.ConversationsRepository
-import dev.meloda.fast.data.api.conversations.ConversationsUseCase
-import dev.meloda.fast.data.mapToState
-import dev.meloda.fast.model.api.domain.VkConversation
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.flow
-import kotlinx.coroutines.withContext
-
-class ConversationsUseCaseImpl(
-    private val repository: ConversationsRepository,
-) : ConversationsUseCase {
-
-    //    override fun getConversations(
-//        count: Int?,
-//        offset: Int?,
-//        fields: String,
-//        filter: String,
-//        extended: Boolean?,
-//        startMessageId: Int?
-//    ): Flow<dev.meloda.fast.network.State<ConversationsResponseDomain>> = flow {
-//        emit(dev.meloda.fast.network.State.Loading)
-//
-//        val newState = conversationsRepository.getConversations(
-//            params = ConversationsGetRequest(
-//                count = count,
-//                offset = offset,
-//                fields = fields,
-//                filter = filter,
-//                extended = extended,
-//                startMessageId = startMessageId
-//            )
-//        ).fold(
-//            onSuccess = { response -> dev.meloda.fast.network.State.Success(response.toDomain()) },
-//            onNetworkFailure = { dev.meloda.fast.network.State.Error.ConnectionError },
-//            onUnknownFailure = { dev.meloda.fast.network.State.UNKNOWN_ERROR },
-//            onHttpFailure = { result -> result.error.toStateApiError() },
-//            onApiFailure = { result -> result.error.toStateApiError() }
-//        )
-//        emit(newState)
-//    }
-//
-
-    //
-//    override fun pin(peerId: Int): Flow<dev.meloda.fast.network.State<Unit>> = flow {
-//        emit(dev.meloda.fast.network.State.Loading)
-//
-//        val newState = conversationsRepository.pin(
-//            ConversationsPinRequest(peerId = peerId)
-//        ).fold(
-//            onSuccess = { dev.meloda.fast.network.State.Success(Unit) },
-//            onNetworkFailure = { dev.meloda.fast.network.State.Error.ConnectionError },
-//            onUnknownFailure = { dev.meloda.fast.network.State.UNKNOWN_ERROR },
-//            onHttpFailure = { result -> result.error.toStateApiError() },
-//            onApiFailure = { result -> result.error.toStateApiError() }
-//        )
-//        emit(newState)
-//    }
-//
-//    override fun unpin(peerId: Int): Flow<dev.meloda.fast.network.State<Unit>> = flow {
-//        emit(dev.meloda.fast.network.State.Loading)
-//
-//        val newState = conversationsRepository.unpin(
-//            ConversationsUnpinRequest(peerId = peerId)
-//        ).fold(
-//            onSuccess = { dev.meloda.fast.network.State.Success(Unit) },
-//            onNetworkFailure = { dev.meloda.fast.network.State.Error.ConnectionError },
-//            onUnknownFailure = { dev.meloda.fast.network.State.UNKNOWN_ERROR },
-//            onHttpFailure = { result -> result.error.toStateApiError() },
-//            onApiFailure = { result -> result.error.toStateApiError() }
-//        )
-//        emit(newState)
-//    }
-//
-//    override suspend fun storeConversations(conversations: List<VkConversationDomain>) {
-//        conversationsDao.insertAll(conversations.map(VkConversationDomain::mapToDb))
-//    }
-//
-//    override suspend fun storeGroups(groups: List<VkGroupDomain>) {
-//        groupsDao.insertAll(groups.map(VkGroupDomain::mapToDB))
-//    }
-    override fun getConversations(
-        count: Int?,
-        offset: Int?
-    ): Flow<State<List<VkConversation>>> = flow {
-        emit(State.Loading)
-
-        val newState = repository.getConversations(count, offset).mapToState()
-        emit(newState)
-    }
-
-    override suspend fun storeConversations(
-        conversations: List<VkConversation>
-    ) = withContext(Dispatchers.IO) {
-        repository.storeConversations(conversations)
-    }
-
-    override fun delete(peerId: Int): Flow<State<Int>> = flow {
-        emit(State.Loading)
-
-        val newState = repository.delete(peerId = peerId).mapToState()
-        emit(newState)
-    }
-
-    override fun changePinState(peerId: Int, pin: Boolean): Flow<State<Int>> = flow {
-        emit(State.Loading)
-
-        val newState = if (pin) {
-            repository.pin(peerId)
-        } else {
-            repository.unpin(peerId)
-        }.mapToState()
-
-        emit(newState)
-    }
-}
@@ -1,14 +1,14 @@
 package dev.meloda.fast.conversations.di

 import dev.meloda.fast.conversations.ConversationsViewModelImpl
-import dev.meloda.fast.conversations.data.ConversationsUseCaseImpl
-import dev.meloda.fast.data.api.conversations.ConversationsUseCase
+import dev.meloda.fast.domain.ConversationsUseCaseImpl
+import dev.meloda.fast.domain.ConversationsUseCase
 import org.koin.androidx.viewmodel.dsl.viewModelOf
 import org.koin.core.module.dsl.singleOf
 import org.koin.dsl.bind
 import org.koin.dsl.module

 val conversationsModule = module {
-    singleOf(::ConversationsUseCaseImpl) bind ConversationsUseCase::class
+    singleOf(::ConversationsUseCaseImpl) bind dev.meloda.fast.domain.ConversationsUseCase::class
    viewModelOf(::ConversationsViewModelImpl)
 }
@@ -3,11 +3,11 @@ package dev.meloda.fast.conversations.navigation
 import androidx.navigation.NavController
 import androidx.navigation.NavGraphBuilder
 import androidx.navigation.compose.composable
-import dev.meloda.fast.common.extensions.navigation.sharedViewModel
 import dev.meloda.fast.conversations.ConversationsViewModel
 import dev.meloda.fast.conversations.ConversationsViewModelImpl
 import dev.meloda.fast.conversations.presentation.ConversationsRoute
 import dev.meloda.fast.model.BaseError
+import dev.meloda.fast.ui.extensions.sharedViewModel
 import kotlinx.serialization.Serializable

@Serializable
@@ -23,10 +23,10 @@ import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
-import dev.meloda.fast.common.UserConfig
 import dev.meloda.fast.conversations.model.ConversationOption
 import dev.meloda.fast.conversations.model.ConversationsScreenState
 import dev.meloda.fast.conversations.model.UiConversation
+import dev.meloda.fast.data.UserConfig
 import dev.meloda.fast.ui.theme.LocalBottomPadding
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -9,14 +9,14 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.withStyle
 import com.conena.nanokt.jvm.util.dayOfMonth
 import com.conena.nanokt.jvm.util.month
+import dev.meloda.fast.common.extensions.orDots
 import dev.meloda.fast.common.model.UiImage
 import dev.meloda.fast.common.model.UiText
-import dev.meloda.fast.common.UserConfig
-import dev.meloda.fast.common.extensions.orDots
 import dev.meloda.fast.common.model.parseString
 import dev.meloda.fast.common.util.TimeUtils
 import dev.meloda.fast.conversations.model.ActionState
 import dev.meloda.fast.conversations.model.UiConversation
+import dev.meloda.fast.data.UserConfig
 import dev.meloda.fast.data.VkMemoryCache
 import dev.meloda.fast.model.InteractionType
 import dev.meloda.fast.model.api.PeerType
@@ -9,7 +9,7 @@ android {

 dependencies {
    implementation(projects.core.common)
-    implementation(projects.core.data)
+    implementation(projects.core.domain)
    implementation(projects.core.model)
    implementation(projects.core.ui)

@@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModel
 import dev.meloda.fast.common.extensions.listenValue
 import dev.meloda.fast.common.extensions.setValue
 import dev.meloda.fast.data.State
-import dev.meloda.fast.data.api.friends.FriendsUseCase
+import dev.meloda.fast.domain.FriendsUseCase
 import dev.meloda.fast.data.processState
 import dev.meloda.fast.datastore.UserSettings
 import dev.meloda.fast.friends.model.FriendsScreenState
@@ -1,15 +1,15 @@
 package dev.meloda.fast.friends.di

-import dev.meloda.fast.data.api.friends.FriendsUseCase
+import dev.meloda.fast.domain.FriendsUseCase
 import dev.meloda.fast.friends.FriendsViewModelImpl
-import dev.meloda.fast.friends.domain.FriendsUseCaseImpl
+import dev.meloda.fast.domain.FriendsUseCaseImpl
 import org.koin.androidx.viewmodel.dsl.viewModelOf
 import org.koin.core.module.dsl.singleOf
 import org.koin.dsl.bind
 import org.koin.dsl.module

 val friendsModule = module {
-    singleOf(::FriendsUseCaseImpl) bind FriendsUseCase::class
+    singleOf(::FriendsUseCaseImpl) bind dev.meloda.fast.domain.FriendsUseCase::class

    viewModelOf(::FriendsViewModelImpl)
 }
@@ -1,42 +0,0 @@
-package dev.meloda.fast.friends.domain
-
-import dev.meloda.fast.data.State
-import dev.meloda.fast.data.api.friends.FriendsRepository
-import dev.meloda.fast.data.api.friends.FriendsUseCase
-import dev.meloda.fast.data.mapToState
-import dev.meloda.fast.model.FriendsInfo
-import dev.meloda.fast.model.api.domain.VkUser
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.flow
-
-class FriendsUseCaseImpl(private val repository: FriendsRepository) : FriendsUseCase {
-
-    override fun getAllFriends(count: Int?, offset: Int?): Flow<State<FriendsInfo>> = flow {
-        emit(State.Loading)
-
-        val newState = repository.getAllFriends(count, offset).mapToState()
-        emit(newState)
-    }
-
-    override fun getFriends(
-        count: Int?, offset: Int?
-    ): Flow<State<List<VkUser>>> = flow {
-        emit(State.Loading)
-
-        val newState = repository.getFriends(count, offset).mapToState()
-        emit(newState)
-    }
-
-    override fun getOnlineFriends(
-        count: Int?, offset: Int?
-    ): Flow<State<List<Int>>> = flow {
-        emit(State.Loading)
-
-        val newState = repository.getOnlineFriends(count, offset).mapToState()
-        emit(newState)
-    }
-
-    override suspend fun storeUsers(users: List<VkUser>) {
-        repository.storeUsers(users)
-    }
-}
@@ -3,11 +3,11 @@ package dev.meloda.fast.friends.navigation
 import androidx.navigation.NavController
 import androidx.navigation.NavGraphBuilder
 import androidx.navigation.compose.composable
-import dev.meloda.fast.common.extensions.navigation.sharedViewModel
 import dev.meloda.fast.friends.FriendsViewModel
 import dev.meloda.fast.friends.FriendsViewModelImpl
 import dev.meloda.fast.friends.presentation.FriendsRoute
 import dev.meloda.fast.model.BaseError
+import dev.meloda.fast.ui.extensions.sharedViewModel
 import kotlinx.serialization.Serializable

@Serializable
@@ -9,7 +9,7 @@ android {

 dependencies {
    implementation(projects.core.common)
-    implementation(projects.core.data)
+    implementation(projects.core.domain)
    implementation(projects.core.model)
    implementation(projects.core.ui)

@@ -9,19 +9,19 @@ import androidx.lifecycle.viewModelScope
 import com.conena.nanokt.collections.indexOfFirstOrNull
 import com.conena.nanokt.collections.indexOfOrNull
 import com.conena.nanokt.text.isEmptyOrBlank
-import dev.meloda.fast.common.UserConfig
 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.provider.ResourceProvider
-import dev.meloda.fast.data.LongPollUpdatesParser
+import dev.meloda.fast.data.UserConfig
 import dev.meloda.fast.data.VkMemoryCache
-import dev.meloda.fast.data.api.conversations.ConversationsUseCase
-import dev.meloda.fast.data.api.messages.MessagesUseCase
 import dev.meloda.fast.data.processState
 import dev.meloda.fast.datastore.AppSettings
 import dev.meloda.fast.datastore.SettingsKeys
 import dev.meloda.fast.datastore.UserSettings
+import dev.meloda.fast.domain.ConversationsUseCase
+import dev.meloda.fast.domain.LongPollUpdatesParser
+import dev.meloda.fast.domain.MessagesUseCase
 import dev.meloda.fast.messageshistory.model.ActionMode
 import dev.meloda.fast.messageshistory.model.MessagesHistoryScreenState
 import dev.meloda.fast.messageshistory.model.UiItem
@@ -1,9 +1,9 @@
 package dev.meloda.fast.messageshistory.di

-import dev.meloda.fast.data.api.messages.MessagesUseCase
+import dev.meloda.fast.domain.MessagesUseCase
 import dev.meloda.fast.messageshistory.MessagesHistoryViewModel
 import dev.meloda.fast.messageshistory.MessagesHistoryViewModelImpl
-import dev.meloda.fast.messageshistory.domain.MessagesUseCaseImpl
+import dev.meloda.fast.domain.MessagesUseCaseImpl
 import dev.meloda.fast.messageshistory.validation.MessagesHistoryValidator
 import org.koin.androidx.viewmodel.dsl.viewModelOf
 import org.koin.core.module.dsl.singleOf
@@ -11,7 +11,7 @@ import org.koin.dsl.bind
 import org.koin.dsl.module

 val messagesHistoryModule = module {
-    singleOf(::MessagesUseCaseImpl) bind MessagesUseCase::class
+    singleOf(::MessagesUseCaseImpl) bind dev.meloda.fast.domain.MessagesUseCase::class
    singleOf(::MessagesHistoryValidator)
    viewModelOf(::MessagesHistoryViewModelImpl) bind MessagesHistoryViewModel::class
 }
@@ -1,111 +0,0 @@
-package dev.meloda.fast.messageshistory.domain
-
-import dev.meloda.fast.data.State
-import dev.meloda.fast.data.api.messages.MessagesHistoryInfo
-import dev.meloda.fast.data.api.messages.MessagesRepository
-import dev.meloda.fast.data.api.messages.MessagesUseCase
-import dev.meloda.fast.data.mapToState
-import dev.meloda.fast.model.api.domain.VkAttachment
-import dev.meloda.fast.model.api.domain.VkAttachmentHistoryMessage
-import dev.meloda.fast.model.api.domain.VkMessage
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.flow
-
-class MessagesUseCaseImpl(
-    private val repository: MessagesRepository
-) : MessagesUseCase {
-
-    override fun getMessagesHistory(
-        conversationId: Int,
-        count: Int?,
-        offset: Int?
-    ): Flow<State<MessagesHistoryInfo>> = flow {
-        emit(State.Loading)
-
-        val newState = repository.getHistory(
-            conversationId = conversationId,
-            offset = offset,
-            count = count
-        ).mapToState()
-
-        emit(newState)
-    }
-
-    override fun getById(
-        messageIds: List<Int>,
-        extended: Boolean?,
-        fields: String?
-    ): Flow<State<List<VkMessage>>> = flow {
-        emit(State.Loading)
-
-        val newState = repository.getById(
-            messagesIds = messageIds,
-            extended = extended,
-            fields = fields
-        ).mapToState()
-
-        emit(newState)
-    }
-
-    override fun sendMessage(
-        peerId: Int,
-        randomId: Int,
-        message: String?,
-        replyTo: Int?,
-        attachments: List<VkAttachment>?
-    ): Flow<State<Int>> = flow {
-        emit(State.Loading)
-
-        val newState = repository.send(
-            peerId = peerId,
-            randomId = randomId,
-            message = message,
-            replyTo = replyTo,
-            attachments = attachments
-        ).mapToState()
-
-        emit(newState)
-    }
-
-    override fun markAsRead(
-        peerId: Int,
-        startMessageId: Int
-    ): Flow<State<Int>> = flow {
-        emit(State.Loading)
-
-        val newState = repository.markAsRead(
-            peerId = peerId,
-            startMessageId = startMessageId
-        ).mapToState()
-
-        emit(newState)
-    }
-
-    override fun getHistoryAttachments(
-        peerId: Int,
-        count: Int?,
-        offset: Int?,
-        attachmentTypes: List<String>,
-        conversationMessageId: Int
-    ): Flow<State<List<VkAttachmentHistoryMessage>>> = flow {
-        emit(State.Loading)
-
-        val newState = repository.getHistoryAttachments(
-            peerId = peerId,
-            count = count,
-            offset = offset,
-            attachmentTypes = attachmentTypes,
-            conversationMessageId = conversationMessageId
-        ).mapToState()
-
-        emit(newState)
-    }
-
-    override suspend fun storeMessage(message: VkMessage) {
-        repository.storeMessages(listOf(message))
-    }
-
-    override suspend fun storeMessages(messages: List<VkMessage>) {
-        repository.storeMessages(messages)
-    }
-}
@@ -5,10 +5,10 @@ import androidx.navigation.NavController
 import androidx.navigation.NavGraphBuilder
 import androidx.navigation.compose.composable
 import androidx.navigation.toRoute
-import dev.meloda.fast.common.extensions.customNavType
 import dev.meloda.fast.messageshistory.model.MessagesHistoryArguments
 import dev.meloda.fast.messageshistory.presentation.MessagesHistoryRoute
 import dev.meloda.fast.model.BaseError
+import dev.meloda.fast.ui.extensions.customNavType
 import kotlinx.serialization.Serializable
 import kotlin.reflect.typeOf

@@ -5,12 +5,12 @@ import androidx.compose.ui.text.AnnotatedString
 import androidx.compose.ui.text.SpanStyle
 import androidx.compose.ui.text.buildAnnotatedString
 import androidx.compose.ui.text.font.FontWeight
-import dev.meloda.fast.common.UserConfig
 import dev.meloda.fast.common.extensions.orDots
 import dev.meloda.fast.common.model.UiImage
 import dev.meloda.fast.common.model.UiText
 import dev.meloda.fast.common.model.parseString
 import dev.meloda.fast.common.provider.ResourceProvider
+import dev.meloda.fast.data.UserConfig
 import dev.meloda.fast.data.VkMemoryCache
 import dev.meloda.fast.messageshistory.model.UiItem
 import dev.meloda.fast.model.api.PeerType
@@ -5,9 +5,9 @@ import androidx.navigation.NavController
 import androidx.navigation.NavGraphBuilder
 import androidx.navigation.compose.composable
 import androidx.navigation.toRoute
-import dev.meloda.fast.common.extensions.customNavType
 import dev.meloda.fast.photoviewer.model.PhotoViewArguments
 import dev.meloda.fast.photoviewer.presentation.PhotoViewRoute
+import dev.meloda.fast.ui.extensions.customNavType
 import kotlinx.serialization.Serializable
 import java.net.URLEncoder
 import kotlin.reflect.typeOf
@@ -9,7 +9,7 @@ android {

 dependencies {
    implementation(projects.core.common)
-    implementation(projects.core.data)
+    implementation(projects.core.domain)
    implementation(projects.core.model)
    implementation(projects.core.ui)

@@ -1,13 +1,13 @@
 package dev.meloda.fast.profile

 import androidx.lifecycle.ViewModel
-import dev.meloda.fast.common.UserConfig
 import dev.meloda.fast.common.VkConstants
 import dev.meloda.fast.common.extensions.listenValue
 import dev.meloda.fast.common.extensions.setValue
 import dev.meloda.fast.data.State
-import dev.meloda.fast.data.api.users.UsersUseCase
+import dev.meloda.fast.data.UserConfig
 import dev.meloda.fast.data.processState
+import dev.meloda.fast.domain.UsersUseCase
 import dev.meloda.fast.model.BaseError
 import dev.meloda.fast.network.VkErrorCode
 import dev.meloda.fast.profile.model.ProfileScreenState
@@ -3,11 +3,11 @@ package dev.meloda.fast.profile.navigation
 import androidx.navigation.NavController
 import androidx.navigation.NavGraphBuilder
 import androidx.navigation.compose.composable
-import dev.meloda.fast.common.extensions.navigation.sharedViewModel
 import dev.meloda.fast.model.BaseError
 import dev.meloda.fast.profile.ProfileViewModel
 import dev.meloda.fast.profile.ProfileViewModelImpl
 import dev.meloda.fast.profile.presentation.ProfileRoute
+import dev.meloda.fast.ui.extensions.sharedViewModel
 import kotlinx.serialization.Serializable

@Serializable
@@ -7,13 +7,12 @@ import androidx.core.view.HapticFeedbackConstantsCompat
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import dev.meloda.fast.common.LongPollController
-import dev.meloda.fast.common.UserConfig
 import dev.meloda.fast.common.extensions.findWithIndex
-import dev.meloda.fast.common.extensions.isSdkAtLeast
 import dev.meloda.fast.common.extensions.setValue
 import dev.meloda.fast.common.model.DarkMode
 import dev.meloda.fast.common.model.LongPollState
 import dev.meloda.fast.common.model.UiText
+import dev.meloda.fast.data.UserConfig
 import dev.meloda.fast.data.db.AccountsRepository
 import dev.meloda.fast.datastore.AppSettings
 import dev.meloda.fast.datastore.SettingsKeys
@@ -330,7 +329,7 @@ class SettingsViewModelImpl(
        val appearanceUseDynamicColors = SettingsItem.Switch(
            key = SettingsKeys.KEY_USE_DYNAMIC_COLORS,
            title = UiText.Resource(UiR.string.settings_dynamic_colors),
-            isVisible = isSdkAtLeast(Build.VERSION_CODES.S),
+            isVisible = Build.VERSION.SDK_INT >= Build.VERSION_CODES.S,
            text = UiText.Resource(UiR.string.settings_dynamic_colors_description),
            defaultValue = SettingsKeys.DEFAULT_VALUE_USE_DYNAMIC_COLORS
        )
@@ -30,7 +30,12 @@ import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.LayoutDirection
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import dev.meloda.fast.common.UserConfig
+import dev.chrisbanes.haze.HazeState
+import dev.chrisbanes.haze.haze
+import dev.chrisbanes.haze.hazeChild
+import dev.chrisbanes.haze.materials.ExperimentalHazeMaterialsApi
+import dev.chrisbanes.haze.materials.HazeMaterials
+import dev.meloda.fast.data.UserConfig
 import dev.meloda.fast.datastore.SettingsKeys
 import dev.meloda.fast.settings.HapticType
 import dev.meloda.fast.settings.SettingsViewModel
@@ -45,11 +50,6 @@ import dev.meloda.fast.settings.presentation.item.TitleTextItem
 import dev.meloda.fast.ui.components.ActionInvokeDismiss
 import dev.meloda.fast.ui.components.MaterialDialog
 import dev.meloda.fast.ui.theme.LocalThemeConfig
-import dev.chrisbanes.haze.HazeState
-import dev.chrisbanes.haze.haze
-import dev.chrisbanes.haze.hazeChild
-import dev.chrisbanes.haze.materials.ExperimentalHazeMaterialsApi
-import dev.chrisbanes.haze.materials.HazeMaterials
 import org.koin.androidx.compose.koinViewModel
 import dev.meloda.fast.ui.R as UiR