domain module

feature/conversations/build.gradle.kts

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

feature/conversations/src/main/kotlin/dev/meloda/fast/conversations/ConversationsViewModel.kt

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

feature/conversations/src/main/kotlin/dev/meloda/fast/conversations/data/ConversationsUseCaseImpl.kt

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

feature/conversations/src/main/kotlin/dev/meloda/fast/conversations/di/ConversationsModule.kt

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

feature/conversations/src/main/kotlin/dev/meloda/fast/conversations/navigation/ConversationsNavigation.kt

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

feature/conversations/src/main/kotlin/dev/meloda/fast/conversations/presentation/ConversationsList.kt

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

feature/conversations/src/main/kotlin/dev/meloda/fast/conversations/util/ConversationDomainMapper.kt

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