update base

Author: hoc081098

app/src/main/java/com/hoc/flowmvi/core/CoreModule.kt

@@ -1,14 +1,14 @@
 package com.hoc.flowmvi.core
 
-import com.hoc.flowmvi.core.dispatchers.CoroutineDispatchers
+import com.hoc.flowmvi.core.dispatchers.AppCoroutineDispatchers
 import com.hoc.flowmvi.core_ui.navigator.Navigator
 import org.koin.core.module.dsl.bind
 import org.koin.core.module.dsl.singleOf
 import org.koin.dsl.module
 
 @JvmField
 val coreModule = module {
-  singleOf(::DefaultCoroutineDispatchers) { bind<CoroutineDispatchers>() }
+  singleOf(::DefaultAppCoroutineDispatchers) { bind<AppCoroutineDispatchers>() }
 
   singleOf(::NavigatorImpl) { bind<Navigator>() }
 }

app/src/main/java/com/hoc/flowmvi/core/DefaultAppCoroutineDispatchers.kt

@@ -0,0 +1,10 @@
+package com.hoc.flowmvi.core
+
+import com.hoc.flowmvi.core.dispatchers.AppCoroutineDispatchers
+import kotlinx.coroutines.Dispatchers
+
+internal class DefaultAppCoroutineDispatchers : AppCoroutineDispatchers {
+  override val main get() = Dispatchers.Main
+  override val mainImmediate get() = Dispatchers.Main.immediate
+  override val io get() = Dispatchers.IO
+}

app/src/main/java/com/hoc/flowmvi/core/DefaultCoroutineDispatchers.kt

@@ -2,7 +2,8 @@ package com.hoc.flowmvi.core.dispatchers
 
 import kotlinx.coroutines.CoroutineDispatcher
 
-interface CoroutineDispatchers {
+interface AppCoroutineDispatchers {
   val main: CoroutineDispatcher
+  val mainImmediate: CoroutineDispatcher
   val io: CoroutineDispatcher
 }

core/src/main/java/com/hoc/flowmvi/core/dispatchers/CoroutineDispatchers.kt renamed to core/src/main/java/com/hoc/flowmvi/core/dispatchers/AppCoroutineDispatchers.kt

@@ -7,7 +7,7 @@ import arrow.core.leftWiden
 import arrow.core.right
 import arrow.core.valueOr
 import com.hoc.flowmvi.core.Mapper
-import com.hoc.flowmvi.core.dispatchers.CoroutineDispatchers
+import com.hoc.flowmvi.core.dispatchers.AppCoroutineDispatchers
 import com.hoc.flowmvi.data.remote.UserApiService
 import com.hoc.flowmvi.data.remote.UserBody
 import com.hoc.flowmvi.data.remote.UserResponse
@@ -39,7 +39,7 @@ import arrow.core.Either.Companion.catch as catchEither
 @ExperimentalCoroutinesApi
 internal class UserRepositoryImpl(
   private val userApiService: UserApiService,
-  private val dispatchers: CoroutineDispatchers,
+  private val dispatchers: AppCoroutineDispatchers,
   private val responseToDomain: Mapper<UserResponse, ValidatedNel<UserValidationError, User>>,
   private val domainToBody: Mapper<User, UserBody>,
   private val errorMapper: Mapper<Throwable, UserError>,

data/src/main/java/com/hoc/flowmvi/data/UserRepositoryImpl.kt

@@ -1,7 +1,7 @@
 package com.hoc.flowmvi.data
 
 import android.util.Log
-import com.hoc.flowmvi.core.dispatchers.CoroutineDispatchers
+import com.hoc.flowmvi.core.dispatchers.AppCoroutineDispatchers
 import com.hoc.flowmvi.domain.repository.UserRepository
 import com.hoc.flowmvi.test_utils.getOrThrow
 import kotlinx.coroutines.CoroutineDispatcher
@@ -38,10 +38,11 @@ class UserRepositoryImplRealAPITest : KoinTest {
     modules(
       dataModule,
       module {
-        factory<CoroutineDispatchers> {
-          object : CoroutineDispatchers {
+        factory<AppCoroutineDispatchers> {
+          object : AppCoroutineDispatchers {
             override val main: CoroutineDispatcher get() = Main
             override val io: CoroutineDispatcher get() = IO
+            override val mainImmediate: CoroutineDispatcher get() = Main.immediate
           }
         }
       }

data/src/test/java/com/hoc/flowmvi/data/UserRepositoryImplRealAPITest.kt

@@ -10,8 +10,8 @@ import com.hoc.flowmvi.data.remote.UserResponse
 import com.hoc.flowmvi.domain.model.User
 import com.hoc.flowmvi.domain.model.UserError
 import com.hoc.flowmvi.domain.model.UserValidationError
+import com.hoc.flowmvi.test_utils.TestAppCoroutineDispatchers
 import com.hoc.flowmvi.test_utils.TestCoroutineDispatcherRule
-import com.hoc.flowmvi.test_utils.TestDispatchers
 import com.hoc.flowmvi.test_utils.getOrThrow
 import com.hoc.flowmvi.test_utils.leftOrThrow
 import com.hoc.flowmvi.test_utils.valueOrThrow
@@ -121,7 +121,7 @@ class UserRepositoryImplTest {
 
     repo = UserRepositoryImpl(
       userApiService = userApiService,
-      dispatchers = TestDispatchers(coroutineRule.testDispatcher),
+      dispatchers = TestAppCoroutineDispatchers(coroutineRule.testDispatcher),
       responseToDomain = responseToDomain,
       domainToBody = domainToBody,
       errorMapper = errorMapper

data/src/test/java/com/hoc/flowmvi/data/UserRepositoryImplTest.kt

@@ -3,6 +3,7 @@ package com.hoc.flowmvi.ui.add
 import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.viewModelScope
 import arrow.core.orNull
+import com.hoc.flowmvi.core.dispatchers.AppCoroutineDispatchers
 import com.hoc.flowmvi.domain.model.User
 import com.hoc.flowmvi.domain.usecase.AddUserUseCase
 import com.hoc.flowmvi.mvi_base.AbstractMviViewModel
@@ -33,7 +34,8 @@ import timber.log.Timber
 class AddVM(
   private val addUser: AddUserUseCase,
   savedStateHandle: SavedStateHandle,
-) : AbstractMviViewModel<ViewIntent, ViewState, SingleEvent>() {
+  appCoroutineDispatchers: AppCoroutineDispatchers,
+) : AbstractMviViewModel<ViewIntent, ViewState, SingleEvent>(appCoroutineDispatchers) {
 
   override val viewState: StateFlow<ViewState>
 

feature-add/src/main/java/com/hoc/flowmvi/ui/add/AddVM.kt

@@ -2,6 +2,7 @@ package com.hoc.flowmvi.ui.main
 
 import androidx.lifecycle.viewModelScope
 import arrow.core.flatMap
+import com.hoc.flowmvi.core.dispatchers.AppCoroutineDispatchers
 import com.hoc.flowmvi.domain.usecase.GetUsersUseCase
 import com.hoc.flowmvi.domain.usecase.RefreshGetUsersUseCase
 import com.hoc.flowmvi.domain.usecase.RemoveUserUseCase
@@ -36,7 +37,8 @@ class MainVM(
   private val getUsersUseCase: GetUsersUseCase,
   private val refreshGetUsers: RefreshGetUsersUseCase,
   private val removeUser: RemoveUserUseCase,
-) : AbstractMviViewModel<ViewIntent, ViewState, SingleEvent>() {
+  appCoroutineDispatchers: AppCoroutineDispatchers,
+) : AbstractMviViewModel<ViewIntent, ViewState, SingleEvent>(appCoroutineDispatchers) {
 
   override val viewState: StateFlow<ViewState>
 

feature-main/src/main/java/com/hoc/flowmvi/ui/main/MainVM.kt

@@ -2,6 +2,7 @@ package com.hoc.flowmvi.ui.search
 
 import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.viewModelScope
+import com.hoc.flowmvi.core.dispatchers.AppCoroutineDispatchers
 import com.hoc.flowmvi.domain.usecase.SearchUsersUseCase
 import com.hoc.flowmvi.mvi_base.AbstractMviViewModel
 import com.hoc081098.flowext.flatMapFirst
@@ -36,7 +37,8 @@ import kotlin.time.ExperimentalTime
 class SearchVM(
   private val searchUsersUseCase: SearchUsersUseCase,
   private val savedStateHandle: SavedStateHandle,
-) : AbstractMviViewModel<ViewIntent, ViewState, SingleEvent>() {
+  appCoroutineDispatchers: AppCoroutineDispatchers,
+) : AbstractMviViewModel<ViewIntent, ViewState, SingleEvent>(appCoroutineDispatchers) {
 
   override val viewState: StateFlow<ViewState>
 

feature-search/src/main/java/com/hoc/flowmvi/ui/search/SearchVM.kt

@@ -38,6 +38,7 @@ dependencies {
   implementation(deps.coroutines.core)
 
   implementation(coreUi)
+  implementation(core)
   implementation(deps.timber)
 
   addUnitTest()

mvi/mvi-base/build.gradle.kts

@@ -4,7 +4,9 @@ import android.os.Build
 import androidx.annotation.CallSuper
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
+import com.hoc.flowmvi.core.dispatchers.AppCoroutineDispatchers
 import kotlinx.coroutines.channels.Channel
+import kotlinx.coroutines.currentCoroutineContext
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.SharedFlow
@@ -14,11 +16,16 @@ import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.flow.receiveAsFlow
 import kotlinx.coroutines.flow.shareIn
 import kotlinx.coroutines.flow.stateIn
+import kotlinx.coroutines.withContext
 import timber.log.Timber
+import kotlin.LazyThreadSafetyMode.PUBLICATION
+import kotlin.coroutines.ContinuationInterceptor
 
-abstract class AbstractMviViewModel<I : MviIntent, S : MviViewState, E : MviSingleEvent> :
+abstract class AbstractMviViewModel<I : MviIntent, S : MviViewState, E : MviSingleEvent>(
+  private val appCoroutineDispatchers: AppCoroutineDispatchers,
+) :
   MviViewModel<I, S, E>, ViewModel() {
-  protected val logTag by lazy(LazyThreadSafetyMode.PUBLICATION) {
+  protected val logTag by lazy(PUBLICATION) {
     this::class.java.simpleName.let { tag: String ->
       // Tag length limit was removed in API 26.
       if (tag.length <= MAX_TAG_LENGTH || Build.VERSION.SDK_INT >= 26) {
@@ -43,7 +50,14 @@ abstract class AbstractMviViewModel<I : MviIntent, S : MviViewState, E : MviSing
 
   // Send event and access intent flow.
 
-  protected suspend fun sendEvent(event: E) = eventChannel.send(event)
+  protected suspend fun sendEvent(event: E) {
+    if (currentCoroutineContext()[ContinuationInterceptor] === appCoroutineDispatchers.mainImmediate) {
+      eventChannel.send(event)
+    } else {
+      withContext(appCoroutineDispatchers.mainImmediate) { eventChannel.send(event) }
+    }
+  }
+
   protected val intentFlow: SharedFlow<I> get() = intentMutableFlow
 
   // Extensions on Flow using viewModelScope.

mvi/mvi-base/src/main/java/com/hoc/flowmvi/mvi_base/AbstractMviViewModel.kt

@@ -0,0 +1,13 @@
+package com.hoc.flowmvi.test_utils
+
+import com.hoc.flowmvi.core.dispatchers.AppCoroutineDispatchers
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.test.TestDispatcher
+
+@ExperimentalCoroutinesApi
+class TestAppCoroutineDispatchers(private val testCoroutineDispatcher: TestDispatcher) :
+  AppCoroutineDispatchers {
+  override val main get() = testCoroutineDispatcher
+  override val mainImmediate get() = testCoroutineDispatcher
+  override val io get() = testCoroutineDispatcher
+}