Merge pull request #139 from hoc081098/flowext_0_4_0_snapshot

deps: flowExt 0.4.0-SNAPSHOT

Author: hoc081098

.idea/compiler.xml

@@ -70,7 +70,7 @@ object deps {
 
   const val coil = "io.coil-kt:coil:2.0.0-rc03"
   const val viewBindingDelegate = "com.github.hoc081098:ViewBindingDelegate:1.3.1"
-  const val flowExt = "io.github.hoc081098:FlowExt:0.3.0"
+  const val flowExt = "io.github.hoc081098:FlowExt:0.4.0-SNAPSHOT"
   const val timber = "com.jakewharton.timber:timber:5.0.1"
 
   object arrow {

buildSrc/src/main/kotlin/deps.kt

@@ -50,6 +50,7 @@ dependencies {
   implementation(deps.lifecycle.runtimeKtx)
 
   implementation(deps.timber)
+  implementation(deps.flowExt)
 
   addUnitTest()
 }

core-ui/build.gradle.kts

@@ -7,11 +7,11 @@ import androidx.annotation.CheckResult
 import androidx.appcompat.widget.SearchView
 import androidx.core.widget.doOnTextChanged
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+import com.hoc081098.flowext.startWith
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.channels.awaitClose
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.callbackFlow
-import kotlinx.coroutines.flow.onStart
 import kotlinx.coroutines.flow.take
 import timber.log.Timber
 import kotlin.coroutines.EmptyCoroutineContext
@@ -93,13 +93,11 @@ fun SearchView.queryTextEvents(): Flow<SearchViewQueryTextEvent> {
     })
 
     awaitClose { setOnQueryTextListener(null) }
-  }.onStart {
-    emit(
-      SearchViewQueryTextEvent(
-        view = this@queryTextEvents,
-        query = query,
-        isSubmitted = false,
-      )
+  }.startWith {
+    SearchViewQueryTextEvent(
+      view = this@queryTextEvents,
+      query = query,
+      isSubmitted = false,
     )
   }
 }
@@ -111,5 +109,5 @@ fun EditText.textChanges(): Flow<CharSequence?> {
 
     val listener = doOnTextChanged { text, _, _, _ -> trySend(text) }
     awaitClose { removeTextChangedListener(listener) }
-  }.onStart { emit(text) }
+  }.startWith { text }
 }

core-ui/src/main/java/com/hoc/flowmvi/core_ui/FlowBinding.kt

@@ -7,6 +7,7 @@ import com.hoc.flowmvi.domain.model.User
 import com.hoc.flowmvi.domain.usecase.AddUserUseCase
 import com.hoc.flowmvi.mvi_base.AbstractMviViewModel
 import com.hoc081098.flowext.flatMapFirst
+import com.hoc081098.flowext.flowFromSuspend
 import com.hoc081098.flowext.mapTo
 import com.hoc081098.flowext.startWith
 import com.hoc081098.flowext.withLatestFrom
@@ -19,7 +20,6 @@ import kotlinx.coroutines.flow.catch
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.filterIsInstance
-import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.mapNotNull
 import kotlinx.coroutines.flow.merge
@@ -110,7 +110,7 @@ class AddVM(
       .withLatestFrom(userFormFlow) { _, userForm -> userForm }
       .mapNotNull { it?.orNull() }
       .flatMapFirst { user ->
-        flow { emit(addUser(user)) }
+        flowFromSuspend { addUser(user) }
           .map { result ->
             result.fold(
               ifLeft = { PartialStateChange.AddUser.AddUserFailure(user, it) },

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

@@ -6,7 +6,9 @@ import com.hoc.flowmvi.domain.usecase.GetUsersUseCase
 import com.hoc.flowmvi.domain.usecase.RefreshGetUsersUseCase
 import com.hoc.flowmvi.domain.usecase.RemoveUserUseCase
 import com.hoc.flowmvi.mvi_base.AbstractMviViewModel
+import com.hoc081098.flowext.defer
 import com.hoc081098.flowext.flatMapFirst
+import com.hoc081098.flowext.flowFromSuspend
 import com.hoc081098.flowext.startWith
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.FlowPreview
@@ -15,13 +17,11 @@ import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asFlow
 import kotlinx.coroutines.flow.catch
-import kotlinx.coroutines.flow.emitAll
 import kotlinx.coroutines.flow.filter
 import kotlinx.coroutines.flow.filterIsInstance
 import kotlinx.coroutines.flow.filterNot
 import kotlinx.coroutines.flow.flatMapConcat
 import kotlinx.coroutines.flow.flatMapMerge
-import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.merge
 import kotlinx.coroutines.flow.onEach
@@ -121,11 +121,10 @@ class MainVM(
           .log("Intent")
           .map { it.user }
           .flatMapMerge { userItem ->
-            flow {
+            flowFromSuspend {
               userItem
                 .toDomain()
                 .flatMap { removeUser(it) }
-                .let { emit(it) }
             }
               .map { result ->
                 result.fold(
@@ -137,5 +136,3 @@ class MainVM(
       )
     }
 }
-
-private fun <T> defer(flowFactory: () -> Flow<T>): Flow<T> = flow { emitAll(flowFactory()) }

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

@@ -5,6 +5,7 @@ import androidx.lifecycle.viewModelScope
 import com.hoc.flowmvi.domain.usecase.SearchUsersUseCase
 import com.hoc.flowmvi.mvi_base.AbstractMviViewModel
 import com.hoc081098.flowext.flatMapFirst
+import com.hoc081098.flowext.flowFromSuspend
 import com.hoc081098.flowext.startWith
 import com.hoc081098.flowext.takeUntil
 import kotlinx.coroutines.ExperimentalCoroutinesApi
@@ -20,7 +21,6 @@ import kotlinx.coroutines.flow.emptyFlow
 import kotlinx.coroutines.flow.filter
 import kotlinx.coroutines.flow.filterIsInstance
 import kotlinx.coroutines.flow.flatMapLatest
-import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.merge
 import kotlinx.coroutines.flow.onEach
@@ -55,7 +55,7 @@ class SearchVM(
 
   private fun SharedFlow<ViewIntent>.toPartialStateChangesFlow(): Flow<PartialStateChange> {
     val executeSearch: suspend (String) -> Flow<PartialStateChange> = { query: String ->
-      flow { emit(searchUsersUseCase(query)) }
+      flowFromSuspend { searchUsersUseCase(query) }
         .map { result ->
           result.fold(
             ifLeft = { PartialStateChange.Failure(it, query) },