domain module

feature/messageshistory/build.gradle.kts

@@ -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)
 

feature/messageshistory/src/main/kotlin/dev/meloda/fast/messageshistory/MessagesHistoryViewModel.kt

@@ -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

feature/messageshistory/src/main/kotlin/dev/meloda/fast/messageshistory/di/MessagesHistoryModule.kt

@@ -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
 }

feature/messageshistory/src/main/kotlin/dev/meloda/fast/messageshistory/domain/MessagesUseCaseImpl.kt

@@ -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)
-    }
-}

feature/messageshistory/src/main/kotlin/dev/meloda/fast/messageshistory/navigation/MessagesHistoryNavigation.kt

@@ -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
 

feature/messageshistory/src/main/kotlin/dev/meloda/fast/messageshistory/util/MessageMapper.kt

@@ -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