domain module

app/build.gradle.kts

@@ -81,6 +81,7 @@ dependencies {
     implementation(projects.core.common)
     implementation(projects.core.ui)
     implementation(projects.core.data)
+    implementation(projects.core.domain)
     implementation(projects.core.model)
     implementation(projects.core.datastore)
 

app/src/main/kotlin/dev/meloda/fast/MainViewModel.kt

@@ -10,12 +10,12 @@ import com.google.accompanist.permissions.ExperimentalPermissionsApi
 import com.google.accompanist.permissions.PermissionStatus
 import dev.meloda.fast.auth.AuthGraph
 import dev.meloda.fast.common.LongPollController
-import dev.meloda.fast.common.UserConfig
 import dev.meloda.fast.common.extensions.ifEmpty
 import dev.meloda.fast.common.extensions.listenValue
 import dev.meloda.fast.common.extensions.setValue
 import dev.meloda.fast.common.model.LongPollState
-import dev.meloda.fast.data.db.GetCurrentAccountUseCase
+import dev.meloda.fast.data.UserConfig
+import dev.meloda.fast.domain.GetCurrentAccountUseCase
 import dev.meloda.fast.datastore.AppSettings
 import dev.meloda.fast.datastore.UserSettings
 import dev.meloda.fast.model.BaseError

app/src/main/kotlin/dev/meloda/fast/common/AppGlobal.kt

@@ -18,7 +18,6 @@ class AppGlobal : Application(), ImageLoaderFactory {
 
         val preferences = PreferenceManager.getDefaultSharedPreferences(this)
         AppSettings.init(preferences)
-        UserConfig.init(preferences)
 
         initKoin()
     }

app/src/main/kotlin/dev/meloda/fast/common/di/ApplicationModule.kt

@@ -4,14 +4,19 @@ import android.content.Context
 import android.content.res.Resources
 import android.os.PowerManager
 import androidx.preference.PreferenceManager
+import coil.ImageLoader
 import dev.meloda.fast.MainViewModelImpl
 import dev.meloda.fast.auth.captcha.di.captchaModule
 import dev.meloda.fast.auth.login.di.loginModule
 import dev.meloda.fast.auth.validation.di.validationModule
 import dev.meloda.fast.chatmaterials.di.chatMaterialsModule
+import dev.meloda.fast.common.LongPollController
+import dev.meloda.fast.common.LongPollControllerImpl
 import dev.meloda.fast.common.provider.Provider
+import dev.meloda.fast.common.provider.ResourceProvider
+import dev.meloda.fast.common.provider.ResourceProviderImpl
 import dev.meloda.fast.conversations.di.conversationsModule
-import dev.meloda.fast.data.di.dataModule
+import dev.meloda.fast.domain.di.domainModule
 import dev.meloda.fast.friends.di.friendsModule
 import dev.meloda.fast.languagepicker.di.languagePickerModule
 import dev.meloda.fast.messageshistory.di.messagesHistoryModule
@@ -28,7 +33,7 @@ import org.koin.dsl.bind
 import org.koin.dsl.module
 
 val applicationModule = module {
-    includes(dataModule)
+    includes(domainModule)
     includes(
         loginModule,
         validationModule,
@@ -55,4 +60,13 @@ val applicationModule = module {
     viewModelOf(::MainViewModelImpl) {
         qualifier = qualifier("main")
     }
+
+    single {
+        ImageLoader.Builder(get())
+            .crossfade(true)
+            .build()
+    }
+
+    singleOf(::LongPollControllerImpl) bind LongPollController::class
+    singleOf(::ResourceProviderImpl) bind ResourceProvider::class
 }

app/src/main/kotlin/dev/meloda/fast/presentation/MainActivity.kt

@@ -36,7 +36,6 @@ import dev.meloda.fast.MainViewModel
 import dev.meloda.fast.MainViewModelImpl
 import dev.meloda.fast.common.AppConstants
 import dev.meloda.fast.common.LongPollController
-import dev.meloda.fast.common.extensions.isSdkAtLeast
 import dev.meloda.fast.common.model.LongPollState
 import dev.meloda.fast.datastore.AppSettings
 import dev.meloda.fast.datastore.UserSettings
@@ -239,7 +238,7 @@ class MainActivity : AppCompatActivity() {
     }
 
     private fun createNotificationChannels() {
-        isSdkAtLeast(Build.VERSION_CODES.O) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
             val noCategoryName = getString(UiR.string.notification_channel_no_category_name)
             val noCategoryDescriptionText =
                 getString(UiR.string.notification_channel_no_category_description)

app/src/main/kotlin/dev/meloda/fast/service/OnlineService.kt

@@ -4,9 +4,9 @@ import android.app.Service
 import android.content.Intent
 import android.os.IBinder
 import android.util.Log
-import dev.meloda.fast.common.UserConfig
 import dev.meloda.fast.common.extensions.createTimerFlow
-import dev.meloda.fast.data.api.account.AccountUseCase
+import dev.meloda.fast.data.UserConfig
+import dev.meloda.fast.domain.AccountUseCase
 import dev.meloda.fast.data.processState
 import kotlinx.coroutines.CoroutineExceptionHandler
 import kotlinx.coroutines.CoroutineScope

app/src/main/kotlin/dev/meloda/fast/service/longpolling/LongPollingService.kt

@@ -13,12 +13,12 @@ import androidx.core.app.ServiceCompat
 import com.conena.nanokt.android.app.stopForegroundCompat
 import dev.meloda.fast.common.AppConstants
 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.model.LongPollState
-import dev.meloda.fast.data.LongPollUpdatesParser
-import dev.meloda.fast.data.LongPollUseCase
+import dev.meloda.fast.domain.LongPollUpdatesParser
+import dev.meloda.fast.domain.LongPollUseCase
+import dev.meloda.fast.data.UserConfig
 import dev.meloda.fast.data.processState
 import dev.meloda.fast.datastore.AppSettings
 import dev.meloda.fast.model.api.data.LongPollUpdates

app/src/main/kotlin/dev/meloda/fast/service/longpolling/di/LongPollModule.kt

@@ -1,8 +1,8 @@
 package dev.meloda.fast.service.longpolling.di
 
-import dev.meloda.fast.data.LongPollUpdatesParser
-import dev.meloda.fast.data.LongPollUseCase
-import dev.meloda.fast.data.LongPollUseCaseImpl
+import dev.meloda.fast.domain.LongPollUpdatesParser
+import dev.meloda.fast.domain.LongPollUseCase
+import dev.meloda.fast.domain.LongPollUseCaseImpl
 import org.koin.core.module.dsl.singleOf
 import org.koin.dsl.bind
 import org.koin.dsl.module