fix SearchActivity

Author: hoc081098

core/src/main/java/com/hoc/flowmvi/core/FlowBinding.kt

@@ -118,7 +118,6 @@ fun EditText.textChanges(): Flow<CharSequence?> {
     checkMainThread()
 
     val listener = doOnTextChanged { text, _, _, _ -> trySend(text) }
-    addTextChangedListener(listener)
     awaitClose { removeTextChangedListener(listener) }
   }.onStart { emit(text) }
 }

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

@@ -12,9 +12,11 @@ import com.hoc.flowmvi.domain.entity.User
 import com.hoc.flowmvi.domain.usecase.AddUserUseCase
 import com.hoc.flowmvi.mvi_base.AbstractMviViewModel
 import com.hoc081098.flowext.flatMapFirst
+import com.hoc081098.flowext.mapTo
 import com.hoc081098.flowext.withLatestFrom
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.SharedFlow
 import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.catch
@@ -84,7 +86,7 @@ class AddVM(
     }
   }
 
-  private fun Flow<ViewIntent>.toPartialStateChangesFlow(): Flow<PartialStateChange> {
+  private fun SharedFlow<ViewIntent>.toPartialStateChangesFlow(): Flow<PartialStateChange> {
     val emailFlow = filterIsInstance<ViewIntent.EmailChanged>()
       .log("Intent")
       .map { it.email }
@@ -137,13 +139,13 @@ class AddVM(
     val firstChanges = merge(
       filterIsInstance<ViewIntent.EmailChangedFirstTime>()
         .log("Intent")
-        .map { PartialStateChange.FirstChange.EmailChangedFirstTime },
+        .mapTo(PartialStateChange.FirstChange.EmailChangedFirstTime),
       filterIsInstance<ViewIntent.FirstNameChangedFirstTime>()
         .log("Intent")
-        .map { PartialStateChange.FirstChange.FirstNameChangedFirstTime },
+        .mapTo(PartialStateChange.FirstChange.FirstNameChangedFirstTime),
       filterIsInstance<ViewIntent.LastNameChangedFirstTime>()
         .log("Intent")
-        .map { PartialStateChange.FirstChange.LastNameChangedFirstTime }
+        .mapTo(PartialStateChange.FirstChange.LastNameChangedFirstTime)
     )
 
     val formValuesChanges = merge(

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

@@ -72,7 +72,7 @@ internal sealed interface PartialStateChange {
       users = users,
       submittedQuery = submittedQuery,
     )
-    is QueryChanged -> state.copy(originalQuery = query)
+    is QueryChanged -> if (state.originalQuery == query) state else state.copy(originalQuery = query)
   }
 }
 

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

@@ -10,6 +10,7 @@ import com.hoc081098.flowext.takeUntil
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.FlowPreview
 import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.SharedFlow
 import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.catch
@@ -52,7 +53,7 @@ class SearchVM(
       .stateIn(viewModelScope, SharingStarted.Eagerly, initialVS)
   }
 
-  private fun Flow<ViewIntent>.toPartialStateChangesFlow(): Flow<PartialStateChange> {
+  private fun SharedFlow<ViewIntent>.toPartialStateChangesFlow(): Flow<PartialStateChange> {
     val executeSearch: suspend (String) -> Flow<PartialStateChange> = { query: String ->
       flow { emit(searchUsersUseCase(query)) }
         .map { result ->
@@ -70,6 +71,7 @@ class SearchVM(
     }
 
     val queryFlow = filterIsInstance<ViewIntent.Search>()
+      .log("Intent")
       .map { it.query }
       .shareWhileSubscribed()
 

feature-search/src/main/res/menu/menu_search.xml

@@ -7,5 +7,5 @@
     android:icon="@drawable/ic_baseline_search_24"
     android:title="Search"
     app:actionViewClass="androidx.appcompat.widget.SearchView"
-    app:showAsAction="always|collapseActionView" />
+    app:showAsAction="always" />
 </menu>