From fa162c12e62e4cb0678c03e62c3a36a94df327ea Mon Sep 17 00:00:00 2001
From: hoc081098 <hoc081098@gmail.com>
Date: Wed, 14 Dec 2022 09:24:07 +0700
Subject: [PATCH 1/8] feat(search): wip

---
 .idea/gradle.xml                              |   1 +
 app/build.gradle.kts                          |   1 +
 build.gradle.kts                              |   3 +
 buildSrc/src/main/kotlin/deps.kt              |   2 +-
 .../main/java/com/hoc/flowmvi/ui/add/AddVM.kt |   6 +-
 .../java/com/hoc/flowmvi/ui/main/MainVM.kt    |   8 +-
 feature-search/.gitignore                     |   1 +
 feature-search/build.gradle.kts               |  77 +++
 feature-search/consumer-rules.pro             |   0
 feature-search/proguard-rules.pro             |  21 +
 .../ui/search/ExampleInstrumentedTest.kt      |   1 +
 feature-search/src/main/AndroidManifest.xml   |   2 +
 .../hoc/flowmvi/ui/search/SearchContract.kt   | 103 ++++
 .../com/hoc/flowmvi/ui/search/SearchVM.kt     | 124 ++++
 .../res/drawable/ic_baseline_person_24.xml    |  10 +
 .../res/drawable/ic_baseline_search_24.xml    |  10 +
 .../src/main/res/menu/menu_search.xml         |  11 +
 .../src/main/res/values/strings.xml           |   1 +
 .../flowmvi/ui/search/SearchContractTest.kt   |  49 ++
 .../com/hoc/flowmvi/ui/search/SearchVMTest.kt | 581 ++++++++++++++++++
 .../com/hoc/flowmvi/ui/search/TestData.kt     |  30 +
 .../flowmvi/mvi_base/AbstractMviViewModel.kt  |  70 ++-
 .../com/hoc/flowmvi/mvi_base/MviViewModel.kt  |   7 +
 .../com/hoc/flowmvi/mvi_base/MviViewState.kt  |  10 +
 settings.gradle.kts                           |   1 +
 25 files changed, 1115 insertions(+), 15 deletions(-)
 create mode 100644 feature-search/.gitignore
 create mode 100644 feature-search/build.gradle.kts
 create mode 100644 feature-search/consumer-rules.pro
 create mode 100644 feature-search/proguard-rules.pro
 create mode 100644 feature-search/src/androidTest/java/com/hoc/flowmvi/ui/search/ExampleInstrumentedTest.kt
 create mode 100644 feature-search/src/main/AndroidManifest.xml
 create mode 100644 feature-search/src/main/java/com/hoc/flowmvi/ui/search/SearchContract.kt
 create mode 100644 feature-search/src/main/java/com/hoc/flowmvi/ui/search/SearchVM.kt
 create mode 100644 feature-search/src/main/res/drawable/ic_baseline_person_24.xml
 create mode 100644 feature-search/src/main/res/drawable/ic_baseline_search_24.xml
 create mode 100644 feature-search/src/main/res/menu/menu_search.xml
 create mode 100644 feature-search/src/main/res/values/strings.xml
 create mode 100644 feature-search/src/test/java/com/hoc/flowmvi/ui/search/SearchContractTest.kt
 create mode 100644 feature-search/src/test/java/com/hoc/flowmvi/ui/search/SearchVMTest.kt
 create mode 100644 feature-search/src/test/java/com/hoc/flowmvi/ui/search/TestData.kt

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index b9d346f..4e9a237 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -19,6 +19,7 @@
             <option value="$PROJECT_DIR$/domain" />
             <option value="$PROJECT_DIR$/feature-add" />
             <option value="$PROJECT_DIR$/feature-main" />
+            <option value="$PROJECT_DIR$/feature-search" />
             <option value="$PROJECT_DIR$/mvi/mvi-base" />
             <option value="$PROJECT_DIR$/mvi/mvi-testing" />
             <option value="$PROJECT_DIR$/test-utils" />
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 5eaf611..0e84543 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -89,6 +89,7 @@ dependencies {
   implementation(coreUi)
   implementation(featureMain)
   implementation(featureAdd)
+  implementation(featureSearch)
 
   implementation(deps.coroutines.android)
   implementation(deps.timber)
diff --git a/build.gradle.kts b/build.gradle.kts
index a39ed0c..2ec056e 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -16,6 +16,9 @@ buildscript {
     classpath("com.diffplug.spotless:spotless-plugin-gradle:6.12.0")
     classpath("com.google.dagger:hilt-android-gradle-plugin:${deps.daggerHilt.version}")
     classpath("com.github.ben-manes:gradle-versions-plugin:0.44.0")
+    classpath("org.jacoco:org.jacoco.core:0.8.8")
+    classpath("com.vanniktech:gradle-android-junit-jacoco-plugin:0.17.0-SNAPSHOT")
+    classpath("dev.ahmedmourad.nocopy:nocopy-gradle-plugin:1.4.0")
   }
 }
 
diff --git a/buildSrc/src/main/kotlin/deps.kt b/buildSrc/src/main/kotlin/deps.kt
index ffad6a3..ee6b385 100644
--- a/buildSrc/src/main/kotlin/deps.kt
+++ b/buildSrc/src/main/kotlin/deps.kt
@@ -108,7 +108,6 @@ object deps {
 
   const val immutableCollections = "org.jetbrains.kotlinx:kotlinx-collections-immutable:0.3.5"
 
-  const val viewBindingDelegate = "com.github.hoc081098:ViewBindingDelegate:1.2.0"
   const val flowExt = "io.github.hoc081098:FlowExt:0.5.0"
   const val timber = "com.jakewharton.timber:timber:5.0.1"
 
@@ -132,6 +131,7 @@ inline val PDsS.kotlin: PDS get() = kotlin("jvm")
 inline val PDsS.kotlinKapt: PDS get() = kotlin("kapt")
 inline val PDsS.kotlinParcelize: PDS get() = id("kotlin-parcelize")
 inline val PDsS.daggerHiltAndroid: PDS get() = id("dagger.hilt.android.plugin")
+inline val PDsS.nocopyPlugin: PDS get() = id("dev.ahmedmourad.nocopy.nocopy-gradle-plugin")
 
 inline val DependencyHandler.domain get() = project(":domain")
 inline val DependencyHandler.core get() = project(":core")
diff --git a/feature-add/src/main/java/com/hoc/flowmvi/ui/add/AddVM.kt b/feature-add/src/main/java/com/hoc/flowmvi/ui/add/AddVM.kt
index f79caaf..ea64082 100644
--- a/feature-add/src/main/java/com/hoc/flowmvi/ui/add/AddVM.kt
+++ b/feature-add/src/main/java/com/hoc/flowmvi/ui/add/AddVM.kt
@@ -52,13 +52,13 @@ class AddVM @Inject constructor(
       ?: ViewState.initial()
     Timber.tag(logTag).d("[ADD_VM] initialVS: $initialVS")
 
-    viewState = intentFlow
+    viewState = intentSharedFlow
       .toPartialStateChangeFlow(initialVS)
-      .log("PartialStateChange")
+      .debugLog("PartialStateChange")
       .sendSingleEvent()
       .scan(initialVS) { state, change -> change.reduce(state) }
       .onEach { savedStateHandle[VIEW_STATE] = it }
-      .log("ViewState")
+      .debugLog("ViewState")
       .stateIn(viewModelScope, SharingStarted.Eagerly, initialVS)
   }
 
diff --git a/feature-main/src/main/java/com/hoc/flowmvi/ui/main/MainVM.kt b/feature-main/src/main/java/com/hoc/flowmvi/ui/main/MainVM.kt
index aad1c83..5b3176a 100644
--- a/feature-main/src/main/java/com/hoc/flowmvi/ui/main/MainVM.kt
+++ b/feature-main/src/main/java/com/hoc/flowmvi/ui/main/MainVM.kt
@@ -47,15 +47,15 @@ class MainVM @Inject constructor(
     val initialVS = ViewState.initial()
 
     viewState = merge(
-      intentFlow.filterIsInstance<ViewIntent.Initial>().take(1),
-      intentFlow.filterNot { it is ViewIntent.Initial }
+      intentSharedFlow.filterIsInstance<ViewIntent.Initial>().take(1),
+      intentSharedFlow.filterNot { it is ViewIntent.Initial }
     )
       .shareWhileSubscribed()
       .toPartialStateChangeFlow()
-      .log("PartialStateChange")
+      .debugLog("PartialStateChange")
       .sendSingleEvent()
       .scan(initialVS) { vs, change -> change.reduce(vs) }
-      .log("ViewState")
+      .debugLog("ViewState")
       .stateIn(
         viewModelScope,
         SharingStarted.Eagerly,
diff --git a/feature-search/.gitignore b/feature-search/.gitignore
new file mode 100644
index 0000000..796b96d
--- /dev/null
+++ b/feature-search/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/feature-search/build.gradle.kts b/feature-search/build.gradle.kts
new file mode 100644
index 0000000..3cec980
--- /dev/null
+++ b/feature-search/build.gradle.kts
@@ -0,0 +1,77 @@
+plugins {
+  androidLib
+  kotlinAndroid
+  nocopyPlugin
+  kotlinKapt
+  daggerHiltAndroid
+}
+
+hilt {
+  enableExperimentalClasspathAggregation = true
+}
+
+android {
+  namespace = "com.hoc.flowmvi.ui.search"
+  compileSdk = appConfig.compileSdkVersion
+  buildToolsVersion = appConfig.buildToolsVersion
+
+  defaultConfig {
+    minSdk = appConfig.minSdkVersion
+    targetSdk = appConfig.targetSdkVersion
+
+    testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+    consumerProguardFiles("consumer-rules.pro")
+  }
+
+  buildTypes {
+    release {
+      isMinifyEnabled = false
+      proguardFiles(
+        getDefaultProguardFile("proguard-android-optimize.txt"),
+        "proguard-rules.pro"
+      )
+    }
+  }
+
+  buildFeatures {
+    compose = true
+  }
+  composeOptions {
+    kotlinCompilerExtensionVersion = deps.compose.androidxComposeCompiler
+  }
+  testOptions {
+    unitTests {
+      isReturnDefaultValues = true
+      isIncludeAndroidResources = true
+    }
+  }
+}
+
+dependencies {
+  implementation(domain)
+  implementation(core)
+  implementation(coreUi)
+  implementation(mviBase)
+  implementation(uiTheme)
+
+  implementationCompose()
+  implementation(deps.immutableCollections)
+
+  implementation(deps.androidx.appCompat)
+  implementation(deps.androidx.coreKtx)
+
+  implementation(deps.lifecycle.viewModelKtx)
+  implementation(deps.lifecycle.runtimeKtx)
+
+  implementation(deps.coroutines.core)
+  implementation(deps.arrow.core)
+  implementation(deps.flowExt)
+  implementation(deps.timber)
+
+  addUnitTest()
+
+  implementation(deps.daggerHilt.android)
+  kapt(deps.daggerHilt.compiler)
+
+  implementation(deps.coil.compose)
+}
diff --git a/feature-search/consumer-rules.pro b/feature-search/consumer-rules.pro
new file mode 100644
index 0000000..e69de29
diff --git a/feature-search/proguard-rules.pro b/feature-search/proguard-rules.pro
new file mode 100644
index 0000000..f1b4245
--- /dev/null
+++ b/feature-search/proguard-rules.pro
@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
diff --git a/feature-search/src/androidTest/java/com/hoc/flowmvi/ui/search/ExampleInstrumentedTest.kt b/feature-search/src/androidTest/java/com/hoc/flowmvi/ui/search/ExampleInstrumentedTest.kt
new file mode 100644
index 0000000..77fa385
--- /dev/null
+++ b/feature-search/src/androidTest/java/com/hoc/flowmvi/ui/search/ExampleInstrumentedTest.kt
@@ -0,0 +1 @@
+package com.hoc.flowmvi.ui.search
diff --git a/feature-search/src/main/AndroidManifest.xml b/feature-search/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..8072ee0
--- /dev/null
+++ b/feature-search/src/main/AndroidManifest.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest />
diff --git a/feature-search/src/main/java/com/hoc/flowmvi/ui/search/SearchContract.kt b/feature-search/src/main/java/com/hoc/flowmvi/ui/search/SearchContract.kt
new file mode 100644
index 0000000..f4399a4
--- /dev/null
+++ b/feature-search/src/main/java/com/hoc/flowmvi/ui/search/SearchContract.kt
@@ -0,0 +1,103 @@
+package com.hoc.flowmvi.ui.search
+
+import android.os.Bundle
+import androidx.core.os.bundleOf
+import com.hoc.flowmvi.domain.model.User
+import com.hoc.flowmvi.domain.model.UserError
+import com.hoc.flowmvi.mvi_base.MviIntent
+import com.hoc.flowmvi.mvi_base.MviSingleEvent
+import com.hoc.flowmvi.mvi_base.MviViewState
+import com.hoc.flowmvi.mvi_base.MviViewStateSaver
+import dev.ahmedmourad.nocopy.annotations.NoCopy
+
+@Suppress("DataClassPrivateConstructor")
+@NoCopy
+data class UserItem private constructor(
+  val id: String,
+  val email: String,
+  val avatar: String,
+  val fullName: String,
+) {
+  companion object Factory {
+    fun from(domain: User): UserItem {
+      return UserItem(
+        id = domain.id,
+        email = domain.email.value,
+        avatar = domain.avatar,
+        fullName = "${domain.firstName.value} ${domain.lastName.value}",
+      )
+    }
+  }
+}
+
+sealed interface ViewIntent : MviIntent {
+  data class Search(val query: String) : ViewIntent
+  object Retry : ViewIntent
+}
+
+data class ViewState(
+  val users: List<UserItem>,
+  val isLoading: Boolean,
+  val error: UserError?,
+  val submittedQuery: String,
+  val originalQuery: String,
+) : MviViewState {
+  companion object Factory {
+    private const val ORIGINAL_QUERY_KEY = "com.hoc.flowmvi.ui.search.original_query"
+
+    fun initial(originalQuery: String): ViewState {
+      return ViewState(
+        users = emptyList(),
+        isLoading = false,
+        error = null,
+        submittedQuery = "",
+        originalQuery = originalQuery,
+      )
+    }
+  }
+
+  class StateSaver : MviViewStateSaver<ViewState> {
+    override fun ViewState.toBundle() = bundleOf(ORIGINAL_QUERY_KEY to originalQuery)
+
+    override fun restore(bundle: Bundle?) = initial(
+      originalQuery = bundle
+        ?.getString(ORIGINAL_QUERY_KEY, "")
+        .orEmpty(),
+    )
+  }
+}
+
+internal sealed interface PartialStateChange {
+  object Loading : PartialStateChange
+  data class Success(val users: List<UserItem>, val submittedQuery: String) : PartialStateChange
+  data class Failure(val error: UserError, val submittedQuery: String) : PartialStateChange
+  data class QueryChange(val query: String) : PartialStateChange
+
+  fun reduce(state: ViewState): ViewState = when (this) {
+    is Failure -> state.copy(
+      isLoading = false,
+      error = error,
+      submittedQuery = submittedQuery,
+      users = emptyList()
+    )
+    Loading -> state.copy(
+      isLoading = true,
+      error = null,
+      users = emptyList()
+    )
+    is Success -> state.copy(
+      isLoading = false,
+      error = null,
+      users = users,
+      submittedQuery = submittedQuery,
+    )
+    is QueryChange -> {
+      if (state.originalQuery == query) state
+      else state.copy(originalQuery = query)
+    }
+  }
+}
+
+sealed interface SingleEvent : MviSingleEvent {
+  data class SearchFailure(val error: UserError) : SingleEvent
+}
diff --git a/feature-search/src/main/java/com/hoc/flowmvi/ui/search/SearchVM.kt b/feature-search/src/main/java/com/hoc/flowmvi/ui/search/SearchVM.kt
new file mode 100644
index 0000000..92b7813
--- /dev/null
+++ b/feature-search/src/main/java/com/hoc/flowmvi/ui/search/SearchVM.kt
@@ -0,0 +1,124 @@
+package com.hoc.flowmvi.ui.search
+
+import androidx.lifecycle.SavedStateHandle
+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
+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.debounce
+import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.flow.emptyFlow
+import kotlinx.coroutines.flow.filter
+import kotlinx.coroutines.flow.filterIsInstance
+import kotlinx.coroutines.flow.flatMapLatest
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.merge
+import kotlinx.coroutines.flow.onEach
+import kotlinx.coroutines.flow.scan
+import kotlinx.coroutines.flow.stateIn
+import kotlin.time.Duration.Companion.milliseconds
+import kotlin.time.ExperimentalTime
+
+@FlowPreview
+@ExperimentalTime
+@ExperimentalCoroutinesApi
+class SearchVM(
+  private val searchUsersUseCase: SearchUsersUseCase,
+  savedStateHandle: SavedStateHandle,
+  private val stateSaver: ViewState.StateSaver,
+) : AbstractMviViewModel<ViewIntent, ViewState, SingleEvent>() {
+
+  override val rawLogTag get() = "SearchVM[${System.identityHashCode(this)}]"
+
+  override val viewState: StateFlow<ViewState>
+
+  init {
+    val initialVS = stateSaver.restore(savedStateHandle[VIEW_STATE_BUNDLE_KEY])
+
+    viewState = intentSharedFlow
+      .debugLog("ViewIntent")
+      .toPartialStateChangeFlow()
+      .debugLog("PartialStateChange")
+      .onEach { sendEvent(it.toSingleEventOrNull() ?: return@onEach) }
+      .scan(initialVS) { state, change -> change.reduce(state) }
+      .debugLog("ViewState")
+      .stateIn(viewModelScope, SharingStarted.Eagerly, initialVS)
+
+    savedStateHandle.setSavedStateProvider(VIEW_STATE_BUNDLE_KEY) {
+      stateSaver.run { viewState.value.toBundle() }
+    }
+  }
+
+  private fun SharedFlow<ViewIntent>.toPartialStateChangeFlow(): Flow<PartialStateChange> {
+    val queryFlow = filterIsInstance<ViewIntent.Search>()
+      .map { it.query }
+      .shareWhileSubscribed()
+
+    val searchableQueryFlow = queryFlow
+      .debounce(SEARCH_DEBOUNCE_DURATION)
+      .filter { it.isNotBlank() }
+      .distinctUntilChanged()
+      .shareWhileSubscribed()
+
+    return merge(
+      // Search change
+      searchableQueryFlow
+        .flatMapLatest(::executeSearch),
+      // Retry change
+      filterIsInstance<ViewIntent.Retry>()
+        .toPartialStateChangeFlow(searchableQueryFlow),
+      // Query change
+      queryFlow
+        .map { PartialStateChange.QueryChange(it) },
+    )
+  }
+
+  //region Processors
+  private fun Flow<ViewIntent.Retry>.toPartialStateChangeFlow(searchableQueryFlow: SharedFlow<String>): Flow<PartialStateChange> =
+    flatMapFirst {
+      viewState.value.let { vs ->
+        if (vs.error !== null) {
+          executeSearch(vs.submittedQuery).takeUntil(searchableQueryFlow)
+        } else {
+          emptyFlow()
+        }
+      }
+    }
+  //endregion
+
+  private fun executeSearch(query: String) = flowFromSuspend { searchUsersUseCase(query) }
+    .map { result ->
+      result.fold(
+        ifLeft = { PartialStateChange.Failure(it, query) },
+        ifRight = {
+          PartialStateChange.Success(
+            it.map(UserItem::from),
+            query
+          )
+        }
+      )
+    }
+    .startWith(PartialStateChange.Loading)
+
+  internal companion object {
+    private const val VIEW_STATE_BUNDLE_KEY = "com.hoc.flowmvi.ui.search.view_state"
+    internal val SEARCH_DEBOUNCE_DURATION = 400.milliseconds
+
+    private fun PartialStateChange.toSingleEventOrNull(): SingleEvent? = when (this) {
+      is PartialStateChange.Failure -> SingleEvent.SearchFailure(error)
+      PartialStateChange.Loading,
+      is PartialStateChange.Success,
+      is PartialStateChange.QueryChange,
+      -> null
+    }
+  }
+}
diff --git a/feature-search/src/main/res/drawable/ic_baseline_person_24.xml b/feature-search/src/main/res/drawable/ic_baseline_person_24.xml
new file mode 100644
index 0000000..febde3f
--- /dev/null
+++ b/feature-search/src/main/res/drawable/ic_baseline_person_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M12,12c2.21,0 4,-1.79 4,-4s-1.79,-4 -4,-4 -4,1.79 -4,4 1.79,4 4,4zM12,14c-2.67,0 -8,1.34 -8,4v2h16v-2c0,-2.66 -5.33,-4 -8,-4z" />
+</vector>
diff --git a/feature-search/src/main/res/drawable/ic_baseline_search_24.xml b/feature-search/src/main/res/drawable/ic_baseline_search_24.xml
new file mode 100644
index 0000000..cbf0cc7
--- /dev/null
+++ b/feature-search/src/main/res/drawable/ic_baseline_search_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z" />
+</vector>
diff --git a/feature-search/src/main/res/menu/menu_search.xml b/feature-search/src/main/res/menu/menu_search.xml
new file mode 100644
index 0000000..157ee94
--- /dev/null
+++ b/feature-search/src/main/res/menu/menu_search.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <item
+        android:id="@+id/action_search"
+        android:icon="@drawable/ic_baseline_search_24"
+        android:title="Search"
+        app:actionViewClass="androidx.appcompat.widget.SearchView"
+        app:showAsAction="always" />
+</menu>
diff --git a/feature-search/src/main/res/values/strings.xml b/feature-search/src/main/res/values/strings.xml
new file mode 100644
index 0000000..7abc06d
--- /dev/null
+++ b/feature-search/src/main/res/values/strings.xml
@@ -0,0 +1 @@
+<resources></resources>
diff --git a/feature-search/src/test/java/com/hoc/flowmvi/ui/search/SearchContractTest.kt b/feature-search/src/test/java/com/hoc/flowmvi/ui/search/SearchContractTest.kt
new file mode 100644
index 0000000..907091c
--- /dev/null
+++ b/feature-search/src/test/java/com/hoc/flowmvi/ui/search/SearchContractTest.kt
@@ -0,0 +1,49 @@
+package com.hoc.flowmvi.ui.search
+
+import com.hoc.flowmvi.domain.model.User
+import com.hoc.flowmvi.test_utils.valueOrThrow
+import kotlin.test.Test
+import kotlin.test.assertEquals
+
+class SearchContractTest {
+  @Test
+  fun test_userItem_equals() {
+    assertEquals(
+      UserItem.from(createUser()),
+      UserItem.from(createUser())
+    )
+  }
+
+  @Test
+  fun test_userItem_hashCode() {
+    assertEquals(
+      UserItem.from(createUser()).hashCode(),
+      UserItem.from(createUser()).hashCode()
+    )
+  }
+
+  @Test
+  fun test_userItem_properties() {
+    val item = UserItem.from(createUser())
+    assertEquals(ID, item.id)
+    assertEquals(EMAIL, item.email)
+    assertEquals(AVATAR, item.avatar)
+    assertEquals("$FIRST_NAME $LAST_NAME", item.fullName)
+  }
+
+  private companion object {
+    private const val ID = "0"
+    private const val EMAIL = "test@gmail.com"
+    private const val AVATAR = "avatar.png"
+    private const val FIRST_NAME = "first"
+    private const val LAST_NAME = "last"
+
+    private fun createUser(): User = User.create(
+      id = ID,
+      email = EMAIL,
+      avatar = AVATAR,
+      firstName = FIRST_NAME,
+      lastName = LAST_NAME
+    ).valueOrThrow
+  }
+}
diff --git a/feature-search/src/test/java/com/hoc/flowmvi/ui/search/SearchVMTest.kt b/feature-search/src/test/java/com/hoc/flowmvi/ui/search/SearchVMTest.kt
new file mode 100644
index 0000000..9305bb0
--- /dev/null
+++ b/feature-search/src/test/java/com/hoc/flowmvi/ui/search/SearchVMTest.kt
@@ -0,0 +1,581 @@
+package com.hoc.flowmvi.ui.search
+
+import androidx.lifecycle.SavedStateHandle
+import arrow.core.left
+import arrow.core.right
+import com.hoc.flowmvi.domain.model.UserError
+import com.hoc.flowmvi.domain.usecase.SearchUsersUseCase
+import com.hoc.flowmvi.mvi_testing.BaseMviViewModelTest
+import com.hoc.flowmvi.mvi_testing.mapRight
+import com.hoc.flowmvi.mvi_testing.returnsManyWithDelay
+import com.hoc.flowmvi.mvi_testing.returnsWithDelay
+import com.hoc.flowmvi.ui.search.SearchVM.Companion.SEARCH_DEBOUNCE_DURATION
+import com.hoc081098.flowext.concatWith
+import com.hoc081098.flowext.timer
+import io.mockk.coEvery
+import io.mockk.coVerify
+import io.mockk.coVerifySequence
+import io.mockk.confirmVerified
+import io.mockk.mockk
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.FlowPreview
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.flow
+import kotlinx.coroutines.flow.flowOf
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.onCompletion
+import kotlinx.coroutines.flow.onEach
+import kotlin.test.Test
+import kotlin.time.Duration.Companion.milliseconds
+import kotlin.time.ExperimentalTime
+
+@ExperimentalCoroutinesApi
+@FlowPreview
+@ExperimentalTime
+class SearchVMTest : BaseMviViewModelTest<ViewIntent, ViewState, SingleEvent, SearchVM>() {
+  private lateinit var vm: SearchVM
+  private lateinit var savedStateHandle: SavedStateHandle
+  private lateinit var searchUsersUseCase: SearchUsersUseCase
+
+  override fun setup() {
+    super.setup()
+
+    searchUsersUseCase = mockk()
+    savedStateHandle = SavedStateHandle()
+    vm = SearchVM(
+      searchUsersUseCase = searchUsersUseCase,
+      savedStateHandle = savedStateHandle,
+      stateSaver = ViewState.StateSaver(),
+    )
+  }
+
+  override fun tearDown() {
+    confirmVerified(
+      searchUsersUseCase,
+    )
+    super.tearDown()
+  }
+
+  @Test
+  fun test_withSearchIntent_debounceSearchQuery() {
+    val query = "d"
+    coEvery { searchUsersUseCase(query) } returnsWithDelay USERS.right()
+
+    runVMTest(
+      vmProducer = { vm },
+      intents = flowOf("a", "b", "c", query)
+        .map { ViewIntent.Search(it) }
+        .onEach { delay(SEMI_TIMEOUT) }
+        .onCompletion { timeout() },
+      expectedStates = listOf(
+        ViewState.initial(""),
+        ViewState(
+          users = emptyList(),
+          isLoading = false,
+          error = null,
+          submittedQuery = "",
+          originalQuery = "a", // update originalQuery
+        ),
+        ViewState(
+          users = emptyList(),
+          isLoading = false,
+          error = null,
+          submittedQuery = "",
+          originalQuery = "b", // update originalQuery
+        ),
+        ViewState(
+          users = emptyList(),
+          isLoading = false,
+          error = null,
+          submittedQuery = "",
+          originalQuery = "c", // update originalQuery
+        ),
+        ViewState(
+          users = emptyList(),
+          isLoading = false,
+          error = null,
+          submittedQuery = "",
+          originalQuery = query, // update originalQuery
+        ),
+        ViewState(
+          users = emptyList(),
+          isLoading = true, // update isLoading
+          error = null,
+          submittedQuery = "",
+          originalQuery = query,
+        ),
+        ViewState(
+          users = USER_ITEMS, // update users
+          isLoading = false, // update isLoading
+          error = null,
+          submittedQuery = query, // update submittedQuery
+          originalQuery = query,
+        ),
+      ).mapRight(),
+      expectedEvents = emptyList(),
+    ) {
+      coVerify(exactly = 1) { searchUsersUseCase(query) }
+    }
+  }
+
+  @Test
+  fun test_withSearchIntent_debounceSearchQueryAndRejectBlank() {
+    val query = "     "
+
+    runVMTest(
+      vmProducer = { vm },
+      intents = flowOf("a", "b", "c", query)
+        .map { ViewIntent.Search(it) }
+        .onEach { delay(SEMI_TIMEOUT) }
+        .onCompletion { timeout() },
+      expectedStates = listOf(
+        ViewState.initial(""),
+        ViewState(
+          users = emptyList(),
+          isLoading = false,
+          error = null,
+          submittedQuery = "",
+          originalQuery = "a", // update originalQuery
+        ),
+        ViewState(
+          users = emptyList(),
+          isLoading = false,
+          error = null,
+          submittedQuery = "",
+          originalQuery = "b", // update originalQuery
+        ),
+        ViewState(
+          users = emptyList(),
+          isLoading = false,
+          error = null,
+          submittedQuery = "",
+          originalQuery = "c", // update originalQuery
+        ),
+        ViewState(
+          users = emptyList(),
+          isLoading = false,
+          error = null,
+          submittedQuery = "",
+          originalQuery = query, // update originalQuery
+        ),
+      ).mapRight(),
+      expectedEvents = emptyList(),
+    )
+  }
+
+  @Test
+  fun test_withSearchIntent_debounceSearchQueryThenRejectBlankAndDistinctUntilChanged() {
+    val query = "#query"
+    coEvery { searchUsersUseCase(query) } returnsWithDelay USERS.right()
+
+    runVMTest(
+      vmProducer = { vm },
+      intents = flowOf("a", "b", "c", query)
+        .map { ViewIntent.Search(it) }
+        .onEach { delay(SEMI_TIMEOUT) }
+        .onCompletion { timeout() }
+        .concatWith(timer(ViewIntent.Search(query), TOTAL_TIMEOUT))
+        .onCompletion { timeout() },
+      expectedStates = listOf(
+        ViewState.initial(""),
+        ViewState(
+          users = emptyList(),
+          isLoading = false,
+          error = null,
+          submittedQuery = "",
+          originalQuery = "a", // update originalQuery
+        ),
+        ViewState(
+          users = emptyList(),
+          isLoading = false,
+          error = null,
+          submittedQuery = "",
+          originalQuery = "b", // update originalQuery
+        ),
+        ViewState(
+          users = emptyList(),
+          isLoading = false,
+          error = null,
+          submittedQuery = "",
+          originalQuery = "c", // update originalQuery
+        ),
+        ViewState(
+          users = emptyList(),
+          isLoading = false,
+          error = null,
+          submittedQuery = "",
+          originalQuery = query, // update originalQuery
+        ),
+        ViewState(
+          users = emptyList(),
+          isLoading = true, // update isLoading
+          error = null,
+          submittedQuery = "",
+          originalQuery = query,
+        ),
+        ViewState(
+          users = USER_ITEMS, // update users
+          isLoading = false, // update isLoading
+          error = null,
+          submittedQuery = query, // update submittedQuery
+          originalQuery = query,
+        ),
+      ).mapRight(),
+      expectedEvents = emptyList(),
+    ) {
+      coVerify(exactly = 1) { searchUsersUseCase(query) }
+    }
+  }
+
+  @Test
+  fun test_withSearchIntent_debounceSearchQueryThenRejectBlankThenDistinctUntilChangedAndCancelledPreviousExecution() {
+    val query1 = "#query#1"
+    val query2 = "#query#2"
+    coEvery { searchUsersUseCase(query1) } coAnswers {
+      repeat(10) { timeout() } // (1) very long... -> cancelled by (2)
+      USERS.right()
+    }
+    coEvery { searchUsersUseCase(query2) } returns USERS.right()
+
+    runVMTest(
+      vmProducer = { vm },
+      intents = flowOf("a", "b", "c", query1)
+        .map { ViewIntent.Search(it) }
+        .onEach { delay(SEMI_TIMEOUT) }
+        .onCompletion { timeout() }
+        .concatWith(
+          timer(
+            ViewIntent.Search(query2),
+            TOTAL_TIMEOUT,
+          ).onCompletion { timeout() }, // (2)
+        ),
+      expectedStates = listOf(
+        ViewState.initial(""),
+        ViewState(
+          users = emptyList(),
+          isLoading = false,
+          error = null,
+          submittedQuery = "",
+          originalQuery = "a", // update originalQuery
+        ),
+        ViewState(
+          users = emptyList(),
+          isLoading = false,
+          error = null,
+          submittedQuery = "",
+          originalQuery = "b", // update originalQuery
+        ),
+        ViewState(
+          users = emptyList(),
+          isLoading = false,
+          error = null,
+          submittedQuery = "",
+          originalQuery = "c", // update originalQuery
+        ),
+        ViewState(
+          users = emptyList(),
+          isLoading = false,
+          error = null,
+          submittedQuery = "",
+          originalQuery = query1, // update originalQuery
+        ),
+        ViewState(
+          users = emptyList(),
+          isLoading = true, // update isLoading
+          error = null,
+          submittedQuery = "",
+          originalQuery = query1,
+        ),
+        ViewState(
+          users = emptyList(),
+          isLoading = true,
+          error = null,
+          submittedQuery = "",
+          originalQuery = query2, // update originalQuery
+        ),
+        ViewState(
+          users = USER_ITEMS, // update users
+          isLoading = false, // update isLoading
+          error = null,
+          submittedQuery = query2, // update submittedQuery
+          originalQuery = query2,
+        ),
+      ).mapRight(),
+      expectedEvents = emptyList(),
+    ) {
+      coVerifySequence {
+        searchUsersUseCase(query1)
+        searchUsersUseCase(query2)
+      }
+    }
+  }
+
+  @Test
+  fun test_withSearchIntent_returnsUserItemsWithProperLoadingState() {
+    val query = "query"
+    coEvery { searchUsersUseCase(query) } returnsWithDelay USERS.right()
+
+    runVMTest(
+      vmProducer = { vm },
+      intents = flow {
+        emit(ViewIntent.Search(query))
+        timeout()
+      },
+      expectedStates = listOf(
+        ViewState.initial(""),
+        ViewState(
+          users = emptyList(),
+          isLoading = false,
+          error = null,
+          submittedQuery = "",
+          originalQuery = query, // update originalQuery
+        ),
+        ViewState(
+          users = emptyList(),
+          isLoading = true, // update isLoading
+          error = null,
+          submittedQuery = "",
+          originalQuery = query,
+        ),
+        ViewState(
+          users = USER_ITEMS, // update users
+          isLoading = false, // update isLoading
+          error = null,
+          submittedQuery = query, // update submittedQuery
+          originalQuery = query,
+        ),
+      ).mapRight(),
+      expectedEvents = emptyList(),
+    ) {
+      coVerify(exactly = 1) { searchUsersUseCase(query) }
+    }
+  }
+
+  @Test
+  fun test_withSearchIntent_returnsUserErrorWithProperLoadingState() {
+    val query = "query"
+    val networkError = UserError.NetworkError
+    coEvery { searchUsersUseCase(query) } returnsWithDelay networkError.left()
+
+    runVMTest(
+      vmProducer = { vm },
+      intents = flow {
+        emit(ViewIntent.Search(query))
+        timeout()
+      },
+      expectedStates = listOf(
+        ViewState.initial(""),
+        ViewState(
+          users = emptyList(),
+          isLoading = false,
+          error = null,
+          submittedQuery = "",
+          originalQuery = query, // update originalQuery
+        ),
+        ViewState(
+          users = emptyList(),
+          isLoading = true, // update isLoading
+          error = null,
+          submittedQuery = "",
+          originalQuery = query,
+        ),
+        ViewState(
+          users = emptyList(),
+          isLoading = false, // update isLoading
+          error = networkError, // update error
+          submittedQuery = query, // update submittedQuery
+          originalQuery = query,
+        ),
+      ).mapRight(),
+      expectedEvents = listOf(
+        SingleEvent.SearchFailure(networkError)
+      ).mapRight(),
+    ) {
+      coVerify(exactly = 1) { searchUsersUseCase(query) }
+    }
+  }
+
+  @Test
+  fun test_withRetryIntentWhenNoError_ignored() {
+    runVMTest(
+      vmProducer = { vm },
+      intents = flowOf(ViewIntent.Retry),
+      expectedStates = listOf(
+        ViewState.initial(""),
+      ).mapRight(),
+      expectedEvents = emptyList(),
+    )
+  }
+
+  @Test
+  fun test_withRetryIntentWhenError_returnsUserItemsWithProperLoadingState() {
+    val query = "#hoc081098"
+    val networkError = UserError.NetworkError
+    coEvery { searchUsersUseCase(query) } returnsManyWithDelay listOf(
+      networkError.left(),
+      USERS.right(),
+    )
+
+    runVMTest(
+      vmProducer = { vm },
+      intents = flowOf(ViewIntent.Retry),
+      expectedStates = listOf(
+        ViewState(
+          users = emptyList(),
+          isLoading = false,
+          error = networkError,
+          submittedQuery = query,
+          originalQuery = query,
+        ),
+        ViewState(
+          users = emptyList(),
+          isLoading = true, // update isLoading
+          error = null, // update error
+          submittedQuery = query,
+          originalQuery = query,
+        ),
+        ViewState(
+          users = USER_ITEMS, // update users
+          isLoading = false, // update isLoading
+          error = null,
+          submittedQuery = query,
+          originalQuery = query,
+        ),
+      ).mapRight(),
+      expectedEvents = emptyList(),
+      preProcessingIntents = flow {
+        emit(ViewIntent.Search(query))
+        timeout()
+      },
+    ) {
+      coVerify(exactly = 2) { searchUsersUseCase(query) }
+    }
+  }
+
+  @Test
+  fun test_withRetryIntentWhenError_returnsUserErrorWithProperLoadingState() {
+    val query = "#hoc081098"
+    val networkError = UserError.NetworkError
+    coEvery { searchUsersUseCase(query) } returnsWithDelay networkError.left()
+
+    runVMTest(
+      vmProducer = { vm },
+      intents = flowOf(ViewIntent.Retry),
+      expectedStates = listOf(
+        ViewState(
+          users = emptyList(),
+          isLoading = false,
+          error = networkError,
+          submittedQuery = query,
+          originalQuery = query,
+        ),
+        ViewState(
+          users = emptyList(),
+          isLoading = true, // update isLoading
+          error = null, // update error
+          submittedQuery = query,
+          originalQuery = query,
+        ),
+        ViewState(
+          users = emptyList(),
+          isLoading = false, // update isLoading
+          error = networkError, // update error
+          submittedQuery = query,
+          originalQuery = query,
+        ),
+      ).mapRight(),
+      expectedEvents = listOf(
+        SingleEvent.SearchFailure(networkError),
+      ).mapRight(),
+      preProcessingIntents = flow {
+        emit(ViewIntent.Search(query))
+        timeout()
+      },
+    ) {
+      coVerify(exactly = 2) { searchUsersUseCase(query) }
+    }
+  }
+
+  @Test
+  fun test_withRetryIntentWhenError_cancelledBySearchIntent() {
+    val query1 = "#hoc081098#1"
+    val query2 = "#hoc081098#2"
+    val networkError = UserError.NetworkError
+
+    var count = 0
+    coEvery { searchUsersUseCase(query1) } coAnswers {
+      when (count++) {
+        0 -> networkError.left()
+        1 -> {
+          repeat(3) { timeout() } // (1) very long ... -> cancelled by (2)
+          USERS.right()
+        }
+        else -> error("Should not reach here!")
+      }
+    }
+    coEvery { searchUsersUseCase(query2) } returns USERS.right()
+
+    runVMTest(
+      vmProducer = { vm },
+      intents = flowOf<ViewIntent>(ViewIntent.Retry).concatWith(
+        flow {
+          delay(SEMI_TIMEOUT) // (2) very short ...
+          emit(ViewIntent.Search(query2))
+          timeout()
+        }
+      ),
+      expectedStates = listOf(
+        ViewState(
+          users = emptyList(),
+          isLoading = false,
+          error = networkError,
+          submittedQuery = query1,
+          originalQuery = query1,
+        ),
+        ViewState(
+          users = emptyList(),
+          isLoading = true, // update isLoading
+          error = null, // update error
+          submittedQuery = query1,
+          originalQuery = query1,
+        ),
+        ViewState(
+          users = emptyList(),
+          isLoading = true,
+          error = null,
+          submittedQuery = query1,
+          originalQuery = query2, // update originalQuery
+        ),
+        ViewState(
+          users = USER_ITEMS, // update users
+          isLoading = false, // update isLoading
+          error = null,
+          submittedQuery = query2, // update submittedQuery
+          originalQuery = query2,
+        ),
+      ).mapRight(),
+      expectedEvents = emptyList(),
+      preProcessingIntents = flow {
+        emit(ViewIntent.Search(query1))
+        timeout()
+      }
+    ) {
+      coVerifySequence {
+        searchUsersUseCase(query1)
+        searchUsersUseCase(query1)
+        searchUsersUseCase(query2)
+      }
+    }
+  }
+
+  private companion object {
+    private val EXTRAS_TIMEOUT = 100.milliseconds
+    private val TOTAL_TIMEOUT = SEARCH_DEBOUNCE_DURATION + EXTRAS_TIMEOUT
+    private val SEMI_TIMEOUT = SEARCH_DEBOUNCE_DURATION / 10
+
+    /**
+     * Extra delay to emit search intent
+     */
+    private suspend inline fun timeout() = delay(TOTAL_TIMEOUT)
+  }
+}
diff --git a/feature-search/src/test/java/com/hoc/flowmvi/ui/search/TestData.kt b/feature-search/src/test/java/com/hoc/flowmvi/ui/search/TestData.kt
new file mode 100644
index 0000000..256ea61
--- /dev/null
+++ b/feature-search/src/test/java/com/hoc/flowmvi/ui/search/TestData.kt
@@ -0,0 +1,30 @@
+package com.hoc.flowmvi.ui.search
+
+import com.hoc.flowmvi.domain.model.User
+import com.hoc.flowmvi.test_utils.valueOrThrow
+
+internal val USERS = listOf(
+  User.create(
+    id = "1",
+    email = "email1@gmail.com",
+    firstName = "first1",
+    lastName = "last1",
+    avatar = "1.png"
+  ),
+  User.create(
+    id = "2",
+    email = "email1@gmail.com",
+    firstName = "first2",
+    lastName = "last2",
+    avatar = "2.png"
+  ),
+  User.create(
+    id = "3",
+    email = "email1@gmail.com",
+    firstName = "first3",
+    lastName = "last3",
+    avatar = "3.png"
+  ),
+).map { it.valueOrThrow }
+
+internal val USER_ITEMS = USERS.map(UserItem::from)
diff --git a/mvi/mvi-base/src/main/java/com/hoc/flowmvi/mvi_base/AbstractMviViewModel.kt b/mvi/mvi-base/src/main/java/com/hoc/flowmvi/mvi_base/AbstractMviViewModel.kt
index 760718a..ec83dae 100644
--- a/mvi/mvi-base/src/main/java/com/hoc/flowmvi/mvi_base/AbstractMviViewModel.kt
+++ b/mvi/mvi-base/src/main/java/com/hoc/flowmvi/mvi_base/AbstractMviViewModel.kt
@@ -8,8 +8,10 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.hoc.flowmvi.core_ui.debugCheckImmediateMainDispatcher
 import kotlinx.coroutines.channels.Channel
-import kotlinx.coroutines.channels.trySendBlocking
+import kotlinx.coroutines.channels.onFailure
+import kotlinx.coroutines.channels.onSuccess
 import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.FlowCollector
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.SharedFlow
 import kotlinx.coroutines.flow.SharingStarted
@@ -19,6 +21,7 @@ import kotlinx.coroutines.flow.receiveAsFlow
 import kotlinx.coroutines.flow.shareIn
 import kotlinx.coroutines.flow.stateIn
 import timber.log.Timber
+import java.util.concurrent.atomic.AtomicInteger
 import kotlin.LazyThreadSafetyMode.PUBLICATION
 
 private fun debugCheckMainThread() {
@@ -31,8 +34,10 @@ private fun debugCheckMainThread() {
 
 abstract class AbstractMviViewModel<I : MviIntent, S : MviViewState, E : MviSingleEvent> :
   MviViewModel<I, S, E>, ViewModel() {
+  protected open val rawLogTag: String? = null
+
   protected val logTag by lazy(PUBLICATION) {
-    this::class.java.simpleName.let { tag: String ->
+    (rawLogTag ?: 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) {
         tag
@@ -51,6 +56,7 @@ abstract class AbstractMviViewModel<I : MviIntent, S : MviViewState, E : MviSing
   final override suspend fun processIntent(intent: I) {
     debugCheckMainThread()
     debugCheckImmediateMainDispatcher()
+
     check(intentMutableFlow.tryEmit(intent)) { "Failed to emit intent: $intent" }
     Timber.tag(logTag).d("processIntent: $intent")
   }
@@ -64,26 +70,76 @@ abstract class AbstractMviViewModel<I : MviIntent, S : MviViewState, E : MviSing
 
   // Send event and access intent flow.
 
+  /**
+   * Must be called in [kotlinx.coroutines.Dispatchers.Main.immediate],
+   * otherwise it will throw an exception.
+   *
+   * If you want to send an event from other [kotlinx.coroutines.CoroutineDispatcher],
+   * use `withContext(Dispatchers.Main.immediate) { sendEvent(event) }`.
+   */
   protected suspend fun sendEvent(event: E) {
     debugCheckMainThread()
     debugCheckImmediateMainDispatcher()
-    eventChannel.trySendBlocking(event).getOrThrow()
-    Timber.tag(logTag).d("sendEvent: event=$event")
+
+    eventChannel.trySend(event)
+      .onSuccess { Timber.tag(logTag).d("sendEvent: event=$event") }
+      .onFailure {
+        Timber
+          .tag(logTag)
+          .e(it, "Failed to send event: $event")
+      }
+      .getOrThrow()
   }
 
-  protected val intentFlow: SharedFlow<I> get() = intentMutableFlow
+  protected val intentSharedFlow: SharedFlow<I> get() = intentMutableFlow
 
   // Extensions on Flow using viewModelScope.
 
-  protected fun <T> Flow<T>.log(subject: String): Flow<T> =
-    onEach { Timber.tag(logTag).d(">>> $subject: $it") }
+  protected fun <T> Flow<T>.debugLog(subject: String): Flow<T> =
+    if (BuildConfig.DEBUG) {
+      onEach { Timber.tag(logTag).d(">>> $subject: $it") }
+    } else {
+      this
+    }
+
+  protected fun <T> SharedFlow<T>.debugLog(subject: String): SharedFlow<T> =
+    if (BuildConfig.DEBUG) {
+      val self = this
 
+      object : SharedFlow<T> by self {
+        val subscriberCount = AtomicInteger(0)
+
+        override suspend fun collect(collector: FlowCollector<T>): Nothing {
+          val count = subscriberCount.getAndIncrement()
+
+          self.collect {
+            Timber.tag(logTag).d(">>> $subject ~ $count: $it")
+            collector.emit(it)
+          }
+        }
+      }
+    } else {
+      this
+    }
+
+  /**
+   * Share the flow in [viewModelScope],
+   * start when the first subscriber arrives,
+   * and stop when the last subscriber leaves.
+   */
   protected fun <T> Flow<T>.shareWhileSubscribed(): SharedFlow<T> =
     shareIn(viewModelScope, SharingStarted.WhileSubscribed())
 
   protected fun <T> Flow<T>.stateWithInitialNullWhileSubscribed(): StateFlow<T?> =
     stateIn(viewModelScope, SharingStarted.WhileSubscribed(), null)
 
+  @Deprecated(
+    message = "This Flow is already shared in viewModelScope, so you don't need to share it again.",
+    replaceWith = ReplaceWith("this"),
+    level = DeprecationLevel.ERROR
+  )
+  protected fun <T> SharedFlow<T>.shareWhileSubscribed(): SharedFlow<T> = this
+
   private companion object {
     private const val MAX_TAG_LENGTH = 23
   }
diff --git a/mvi/mvi-base/src/main/java/com/hoc/flowmvi/mvi_base/MviViewModel.kt b/mvi/mvi-base/src/main/java/com/hoc/flowmvi/mvi_base/MviViewModel.kt
index 6bce814..2e83c6f 100644
--- a/mvi/mvi-base/src/main/java/com/hoc/flowmvi/mvi_base/MviViewModel.kt
+++ b/mvi/mvi-base/src/main/java/com/hoc/flowmvi/mvi_base/MviViewModel.kt
@@ -17,6 +17,13 @@ interface MviViewModel<I : MviIntent, S : MviViewState, E : MviSingleEvent> {
 
   val singleEvent: Flow<E>
 
+  /**
+   * Must be called in [kotlinx.coroutines.Dispatchers.Main.immediate],
+   * otherwise it will throw an exception.
+   *
+   * If you want to process an intent from other [kotlinx.coroutines.CoroutineDispatcher],
+   * use `withContext(Dispatchers.Main.immediate) { processIntent(intent) }`.
+   */
   @MainThread
   suspend fun processIntent(intent: I)
 }
diff --git a/mvi/mvi-base/src/main/java/com/hoc/flowmvi/mvi_base/MviViewState.kt b/mvi/mvi-base/src/main/java/com/hoc/flowmvi/mvi_base/MviViewState.kt
index 703d5b9..49bf744 100644
--- a/mvi/mvi-base/src/main/java/com/hoc/flowmvi/mvi_base/MviViewState.kt
+++ b/mvi/mvi-base/src/main/java/com/hoc/flowmvi/mvi_base/MviViewState.kt
@@ -1,6 +1,16 @@
 package com.hoc.flowmvi.mvi_base
 
+import android.os.Bundle
+
 /**
  * Immutable object which contains all the required information to render a [MviView].
  */
 interface MviViewState
+
+/**
+ * An interface that converts a [MviViewState] to a [Bundle] and vice versa.
+ */
+interface MviViewStateSaver<S : MviViewState> {
+  fun S.toBundle(): Bundle
+  fun restore(bundle: Bundle?): S
+}
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 27b6c30..92106f6 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -3,6 +3,7 @@ rootProject.name = "Jetpack Compose MVI Coroutines Flow"
 include(":app")
 include(":feature-main")
 include(":feature-add")
+include(":feature-search")
 include(":domain")
 include(":data")
 include(":core")

From a6d09c0ce05846d7896da230aee53ca16521c84e Mon Sep 17 00:00:00 2001
From: hoc081098 <hoc081098@gmail.com>
Date: Wed, 14 Dec 2022 10:22:05 +0700
Subject: [PATCH 2/8] feat(search): setup navigation

---
 .idea/deploymentTargetDropDown.xml            |  4 +-
 app/src/main/java/com/hoc/flowmvi/AppState.kt | 12 ++--
 .../main/java/com/hoc/flowmvi/MainActivity.kt | 10 +++-
 .../hoc/flowmvi/ui/add/AddNewUserScreen.kt    |  2 +
 .../hoc/flowmvi/ui/main/UsersListScreen.kt    | 27 +++++++--
 .../ui/main/navigation/usersListNavigation.kt |  2 +
 feature-main/src/main/res/values/strings.xml  |  2 +
 .../com/hoc/flowmvi/ui/search/SearchScreen.kt | 59 +++++++++++++++++++
 .../search/navigation/addNewUserNavigation.kt | 31 ++++++++++
 .../src/main/res/values/strings.xml           |  4 +-
 10 files changed, 139 insertions(+), 14 deletions(-)
 create mode 100644 feature-search/src/main/java/com/hoc/flowmvi/ui/search/SearchScreen.kt
 create mode 100644 feature-search/src/main/java/com/hoc/flowmvi/ui/search/navigation/addNewUserNavigation.kt

diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
index 258e49c..79476f7 100644
--- a/.idea/deploymentTargetDropDown.xml
+++ b/.idea/deploymentTargetDropDown.xml
@@ -7,11 +7,11 @@
         <deviceKey>
           <Key>
             <type value="VIRTUAL_DEVICE_PATH" />
-            <value value="$USER_HOME$/.android/avd/Resizable_Experimental_API_33.avd" />
+            <value value="$USER_HOME$/.android/avd/Pixel_4_API_32.avd" />
           </Key>
         </deviceKey>
       </Target>
     </targetSelectedWithDropDown>
-    <timeTargetWasSelectedWithDropDown value="2022-11-29T04:27:11.818970Z" />
+    <timeTargetWasSelectedWithDropDown value="2022-12-14T02:58:18.641434Z" />
   </component>
 </project>
\ No newline at end of file
diff --git a/app/src/main/java/com/hoc/flowmvi/AppState.kt b/app/src/main/java/com/hoc/flowmvi/AppState.kt
index 3f833e3..ee78db8 100644
--- a/app/src/main/java/com/hoc/flowmvi/AppState.kt
+++ b/app/src/main/java/com/hoc/flowmvi/AppState.kt
@@ -7,10 +7,9 @@ import androidx.navigation.NavDestination
 import androidx.navigation.NavHostController
 import androidx.navigation.compose.currentBackStackEntryAsState
 import androidx.navigation.compose.rememberNavController
-import com.hoc.flowmvi.Screen.AddNewUser
-import com.hoc.flowmvi.Screen.UsersList
 import com.hoc.flowmvi.ui.add.navigation.AddNewUserNavigationRoute
 import com.hoc.flowmvi.ui.main.navigation.UsersListNavigationRoute
+import com.hoc.flowmvi.ui.search.navigation.SearchUserNavigationRoute
 
 @Composable
 fun rememberJetpackComposeMVICoroutinesFlowApp(
@@ -28,7 +27,7 @@ enum class Screen {
     get() = when (this) {
       UsersList -> UsersListNavigationRoute
       AddNewUser -> AddNewUserNavigationRoute
-      SearchUsers -> TODO()
+      SearchUsers -> SearchUserNavigationRoute
     }
 
   companion object {
@@ -50,9 +49,10 @@ class JetpackComposeMVICoroutinesFlowAppState(
 
   val currentScreen: Screen?
     @Composable get() = when (currentDestination?.route) {
-      UsersListNavigationRoute -> UsersList
-      AddNewUserNavigationRoute -> AddNewUser
-      else -> TODO()
+      UsersListNavigationRoute -> Screen.UsersList
+      AddNewUserNavigationRoute -> Screen.AddNewUser
+      SearchUserNavigationRoute -> Screen.SearchUsers
+      else -> null
     }
 
   fun onNavigateUp() {
diff --git a/app/src/main/java/com/hoc/flowmvi/MainActivity.kt b/app/src/main/java/com/hoc/flowmvi/MainActivity.kt
index abf6fc2..5722339 100644
--- a/app/src/main/java/com/hoc/flowmvi/MainActivity.kt
+++ b/app/src/main/java/com/hoc/flowmvi/MainActivity.kt
@@ -24,6 +24,8 @@ import com.hoc.flowmvi.core_ui.ProvideSnackbarHostState
 import com.hoc.flowmvi.ui.add.navigation.addNewUserScreen
 import com.hoc.flowmvi.ui.add.navigation.navigateToAddNewUser
 import com.hoc.flowmvi.ui.main.navigation.usersListScreen
+import com.hoc.flowmvi.ui.search.navigation.navigateToSearchUser
+import com.hoc.flowmvi.ui.search.navigation.searchUserScreen
 import com.hoc.flowmvi.ui.theme.AppTheme
 import dagger.hilt.android.AndroidEntryPoint
 
@@ -94,13 +96,19 @@ private fun JetpackComposeMVICoroutinesFlowApp(
       ) {
         usersListScreen(
           configAppBar = { appBarState = it },
-          navigateToAddUser = { navController.navigateToAddNewUser() }
+          navigateToAddUser = navController::navigateToAddNewUser,
+          navigateToSearchUser = navController::navigateToSearchUser
         )
 
         addNewUserScreen(
           configAppBar = { appBarState = it },
           onBackClick = appState::onBackClick
         )
+
+        searchUserScreen(
+          configAppBar = { appBarState = it },
+          onBackClick = appState::onBackClick
+        )
       }
     }
   }
diff --git a/feature-add/src/main/java/com/hoc/flowmvi/ui/add/AddNewUserScreen.kt b/feature-add/src/main/java/com/hoc/flowmvi/ui/add/AddNewUserScreen.kt
index 82f41b1..4da7765 100644
--- a/feature-add/src/main/java/com/hoc/flowmvi/ui/add/AddNewUserScreen.kt
+++ b/feature-add/src/main/java/com/hoc/flowmvi/ui/add/AddNewUserScreen.kt
@@ -144,6 +144,7 @@ private fun ConfigAppBar(
 ) {
   val title = stringResource(id = R.string.add_new_user)
   val colors = TopAppBarDefaults.centerAlignedTopAppBarColors()
+
   val appBarState = remember(colors, onBackClickState) {
     AppBarState(
       title = title,
@@ -159,6 +160,7 @@ private fun ConfigAppBar(
       colors = colors
     )
   }
+
   OnLifecycleEvent(configAppBar, appBarState) { _, event ->
     if (event == Lifecycle.Event.ON_START) {
       configAppBar(appBarState)
diff --git a/feature-main/src/main/java/com/hoc/flowmvi/ui/main/UsersListScreen.kt b/feature-main/src/main/java/com/hoc/flowmvi/ui/main/UsersListScreen.kt
index 01f0aa6..fec073f 100644
--- a/feature-main/src/main/java/com/hoc/flowmvi/ui/main/UsersListScreen.kt
+++ b/feature-main/src/main/java/com/hoc/flowmvi/ui/main/UsersListScreen.kt
@@ -10,6 +10,7 @@ import androidx.compose.foundation.lazy.itemsIndexed
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Add
 import androidx.compose.material.icons.filled.Delete
+import androidx.compose.material.icons.filled.Search
 import androidx.compose.material3.AlertDialog
 import androidx.compose.material3.Divider
 import androidx.compose.material3.ExperimentalMaterial3Api
@@ -59,10 +60,15 @@ import kotlinx.coroutines.withContext
 internal fun UsersListRoute(
   configAppBar: ConfigAppBar,
   navigateToAddUser: () -> Unit,
+  navigateToSearchUser: () -> Unit,
   modifier: Modifier = Modifier,
   viewModel: MainVM = hiltViewModel(),
 ) {
-  ConfigAppBar(navigateToAddUser, configAppBar)
+  ConfigAppBar(
+    navigateToAddUser = navigateToAddUser,
+    navigateToSearchUser = navigateToSearchUser,
+    configAppBar = configAppBar
+  )
 
   val intentChannel = remember { Channel<ViewIntent>(Channel.UNLIMITED) }
   LaunchedEffect(Unit) {
@@ -143,25 +149,38 @@ internal fun UsersListRoute(
 @OptIn(ExperimentalMaterial3Api::class)
 private fun ConfigAppBar(
   navigateToAddUser: () -> Unit,
+  navigateToSearchUser: () -> Unit,
   configAppBar: ConfigAppBar
 ) {
-  val title = stringResource(id = R.string.app_name)
+  val title = stringResource(id = R.string.users_list_title)
   val colors = TopAppBarDefaults.centerAlignedTopAppBarColors()
-  val appBarState = remember(colors) {
+
+  val currentNavigateToAddUser by rememberUpdatedState(navigateToAddUser)
+  val currentNavigateToSearchUser by rememberUpdatedState(navigateToSearchUser)
+
+  val appBarState = remember(colors, title) {
     AppBarState(
       title = title,
       actions = {
-        IconButton(onClick = navigateToAddUser) {
+        IconButton(onClick = { currentNavigateToAddUser() }) {
           Icon(
             imageVector = Icons.Default.Add,
             contentDescription = "Add new user",
           )
         }
+
+        IconButton(onClick = { currentNavigateToSearchUser() }) {
+          Icon(
+            imageVector = Icons.Default.Search,
+            contentDescription = "Search user",
+          )
+        }
       },
       navigationIcon = {},
       colors = colors,
     )
   }
+
   OnLifecycleEvent(configAppBar, appBarState) { _, event ->
     if (event == Lifecycle.Event.ON_START) {
       configAppBar(appBarState)
diff --git a/feature-main/src/main/java/com/hoc/flowmvi/ui/main/navigation/usersListNavigation.kt b/feature-main/src/main/java/com/hoc/flowmvi/ui/main/navigation/usersListNavigation.kt
index d1f3fa3..e08e759 100644
--- a/feature-main/src/main/java/com/hoc/flowmvi/ui/main/navigation/usersListNavigation.kt
+++ b/feature-main/src/main/java/com/hoc/flowmvi/ui/main/navigation/usersListNavigation.kt
@@ -21,11 +21,13 @@ fun NavController.navigateUsersList(navOptions: NavOptions? = null) =
 fun NavGraphBuilder.usersListScreen(
   configAppBar: ConfigAppBar,
   navigateToAddUser: () -> Unit,
+  navigateToSearchUser: () -> Unit,
 ) {
   composable(route = UsersListNavigationRoute) {
     UsersListRoute(
       configAppBar = configAppBar,
       navigateToAddUser = navigateToAddUser,
+      navigateToSearchUser = navigateToSearchUser,
     )
   }
 }
diff --git a/feature-main/src/main/res/values/strings.xml b/feature-main/src/main/res/values/strings.xml
index ff5ddfc..18719bc 100644
--- a/feature-main/src/main/res/values/strings.xml
+++ b/feature-main/src/main/res/values/strings.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+  <string name="users_list_title">Compose MVI Flow</string>
+
   <string name="add_user">Add user</string>
   <string name="delete">Delete</string>
   <string name="delete_user_confirmaion">Do you want to delete "%s"? This action cannot be undone.</string>
diff --git a/feature-search/src/main/java/com/hoc/flowmvi/ui/search/SearchScreen.kt b/feature-search/src/main/java/com/hoc/flowmvi/ui/search/SearchScreen.kt
new file mode 100644
index 0000000..af96059
--- /dev/null
+++ b/feature-search/src/main/java/com/hoc/flowmvi/ui/search/SearchScreen.kt
@@ -0,0 +1,59 @@
+package com.hoc.flowmvi.ui.search
+
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.ArrowBack
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.TopAppBarDefaults
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.State
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberUpdatedState
+import androidx.compose.ui.res.stringResource
+import androidx.lifecycle.Lifecycle
+import com.hoc.flowmvi.core_ui.AppBarState
+import com.hoc.flowmvi.core_ui.ConfigAppBar
+import com.hoc.flowmvi.core_ui.OnLifecycleEvent
+
+@Composable
+fun SearchUserRoute(
+  configAppBar: ConfigAppBar,
+  onBackClick: () -> Unit,
+) {
+  ConfigAppBar(
+    onBackClickState = rememberUpdatedState(onBackClick),
+    configAppBar = configAppBar
+  )
+}
+
+@Composable
+@OptIn(ExperimentalMaterial3Api::class)
+private fun ConfigAppBar(
+  onBackClickState: State<() -> Unit>,
+  configAppBar: ConfigAppBar
+) {
+  val title = stringResource(id = R.string.search_user)
+  val colors = TopAppBarDefaults.centerAlignedTopAppBarColors()
+
+  val appBarState = remember(title, colors) {
+    AppBarState(
+      title = title,
+      actions = {},
+      navigationIcon = {
+        IconButton(onClick = { onBackClickState.value() }) {
+          Icon(
+            imageVector = Icons.Filled.ArrowBack,
+            contentDescription = "Back"
+          )
+        }
+      },
+      colors = colors
+    )
+  }
+  OnLifecycleEvent(configAppBar, appBarState) { _, event ->
+    if (event == Lifecycle.Event.ON_START) {
+      configAppBar(appBarState)
+    }
+  }
+}
diff --git a/feature-search/src/main/java/com/hoc/flowmvi/ui/search/navigation/addNewUserNavigation.kt b/feature-search/src/main/java/com/hoc/flowmvi/ui/search/navigation/addNewUserNavigation.kt
new file mode 100644
index 0000000..cb725cc
--- /dev/null
+++ b/feature-search/src/main/java/com/hoc/flowmvi/ui/search/navigation/addNewUserNavigation.kt
@@ -0,0 +1,31 @@
+package com.hoc.flowmvi.ui.search.navigation
+
+import androidx.navigation.NavController
+import androidx.navigation.NavGraphBuilder
+import androidx.navigation.NavOptions
+import androidx.navigation.compose.composable
+import com.hoc.flowmvi.core_ui.ConfigAppBar
+import com.hoc.flowmvi.ui.search.SearchUserRoute
+
+const val SearchUserNavigationRoute = "search_user_route"
+
+/**
+ * Navigate to search user screen
+ */
+fun NavController.navigateToSearchUser(navOptions: NavOptions? = null) =
+  navigate(SearchUserNavigationRoute, navOptions)
+
+/**
+ * Add the search user screen to the navigation graph.
+ */
+fun NavGraphBuilder.searchUserScreen(
+  configAppBar: ConfigAppBar,
+  onBackClick: () -> Unit,
+) {
+  composable(route = SearchUserNavigationRoute) {
+    SearchUserRoute(
+      configAppBar = configAppBar,
+      onBackClick = onBackClick,
+    )
+  }
+}
diff --git a/feature-search/src/main/res/values/strings.xml b/feature-search/src/main/res/values/strings.xml
index 7abc06d..1a4463f 100644
--- a/feature-search/src/main/res/values/strings.xml
+++ b/feature-search/src/main/res/values/strings.xml
@@ -1 +1,3 @@
-<resources></resources>
+<resources>
+    <string name="search_user">Search user</string>
+</resources>

From 9a5e461daa95779b3aad4c180590e550f3f19829 Mon Sep 17 00:00:00 2001
From: hoc081098 <hoc081098@gmail.com>
Date: Wed, 14 Dec 2022 10:41:42 +0700
Subject: [PATCH 3/8] feat(search): immutable

---
 .../com/hoc/flowmvi/ui/search/SearchContract.kt | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/feature-search/src/main/java/com/hoc/flowmvi/ui/search/SearchContract.kt b/feature-search/src/main/java/com/hoc/flowmvi/ui/search/SearchContract.kt
index f4399a4..0e02a6d 100644
--- a/feature-search/src/main/java/com/hoc/flowmvi/ui/search/SearchContract.kt
+++ b/feature-search/src/main/java/com/hoc/flowmvi/ui/search/SearchContract.kt
@@ -1,6 +1,7 @@
 package com.hoc.flowmvi.ui.search
 
 import android.os.Bundle
+import androidx.compose.runtime.Immutable
 import androidx.core.os.bundleOf
 import com.hoc.flowmvi.domain.model.User
 import com.hoc.flowmvi.domain.model.UserError
@@ -9,7 +10,11 @@ import com.hoc.flowmvi.mvi_base.MviSingleEvent
 import com.hoc.flowmvi.mvi_base.MviViewState
 import com.hoc.flowmvi.mvi_base.MviViewStateSaver
 import dev.ahmedmourad.nocopy.annotations.NoCopy
+import kotlinx.collections.immutable.ImmutableList
+import kotlinx.collections.immutable.persistentListOf
+import kotlinx.collections.immutable.toImmutableList
 
+@Immutable
 @Suppress("DataClassPrivateConstructor")
 @NoCopy
 data class UserItem private constructor(
@@ -30,13 +35,15 @@ data class UserItem private constructor(
   }
 }
 
+@Immutable
 sealed interface ViewIntent : MviIntent {
   data class Search(val query: String) : ViewIntent
   object Retry : ViewIntent
 }
 
+@Immutable
 data class ViewState(
-  val users: List<UserItem>,
+  val users: ImmutableList<UserItem>,
   val isLoading: Boolean,
   val error: UserError?,
   val submittedQuery: String,
@@ -47,7 +54,7 @@ data class ViewState(
 
     fun initial(originalQuery: String): ViewState {
       return ViewState(
-        users = emptyList(),
+        users = persistentListOf(),
         isLoading = false,
         error = null,
         submittedQuery = "",
@@ -78,17 +85,17 @@ internal sealed interface PartialStateChange {
       isLoading = false,
       error = error,
       submittedQuery = submittedQuery,
-      users = emptyList()
+      users = persistentListOf()
     )
     Loading -> state.copy(
       isLoading = true,
       error = null,
-      users = emptyList()
+      users = persistentListOf()
     )
     is Success -> state.copy(
       isLoading = false,
       error = null,
-      users = users,
+      users = users.toImmutableList(),
       submittedQuery = submittedQuery,
     )
     is QueryChange -> {

From 27392b368b7abad9ce188e477153e597183d3626 Mon Sep 17 00:00:00 2001
From: hoc081098 <hoc081098@gmail.com>
Date: Thu, 15 Dec 2022 12:04:53 +0700
Subject: [PATCH 4/8] feat(search): add ui

---
 .../main/java/com/hoc/flowmvi/MainActivity.kt |   9 +-
 .../com/hoc/flowmvi/core_ui/AppBarState.kt    |   2 +-
 .../hoc/flowmvi/ui/add/AddNewUserScreen.kt    |   2 +-
 .../hoc/flowmvi/ui/main/UsersListScreen.kt    |   2 +-
 .../hoc/flowmvi/ui/search/AppBarTextField.kt  | 128 +++++++
 .../hoc/flowmvi/ui/search/SearchContract.kt   |   3 +-
 .../com/hoc/flowmvi/ui/search/SearchScreen.kt | 324 +++++++++++++++++-
 .../com/hoc/flowmvi/ui/search/SearchVM.kt     |  19 +-
 .../src/main/res/values/strings.xml           |   9 +-
 9 files changed, 474 insertions(+), 24 deletions(-)
 create mode 100644 feature-search/src/main/java/com/hoc/flowmvi/ui/search/AppBarTextField.kt

diff --git a/app/src/main/java/com/hoc/flowmvi/MainActivity.kt b/app/src/main/java/com/hoc/flowmvi/MainActivity.kt
index 5722339..d43c09e 100644
--- a/app/src/main/java/com/hoc/flowmvi/MainActivity.kt
+++ b/app/src/main/java/com/hoc/flowmvi/MainActivity.kt
@@ -10,7 +10,6 @@ import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.SnackbarHost
 import androidx.compose.material3.SnackbarHostState
-import androidx.compose.material3.Text
 import androidx.compose.material3.TopAppBarColors
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
@@ -45,18 +44,14 @@ class MainActivity : AppCompatActivity() {
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun JetpackComposeMVICoroutinesFlowAppBar(
-  title: String?,
+  title: @Composable () -> Unit,
   navigationIcon: @Composable () -> Unit,
   actions: @Composable RowScope.() -> Unit,
   colors: TopAppBarColors,
   modifier: Modifier = Modifier
 ) {
   CenterAlignedTopAppBar(
-    title = {
-      if (title != null) {
-        Text(text = title)
-      }
-    },
+    title = title,
     modifier = modifier,
     navigationIcon = navigationIcon,
     actions = actions,
diff --git a/core-ui/src/main/java/com/hoc/flowmvi/core_ui/AppBarState.kt b/core-ui/src/main/java/com/hoc/flowmvi/core_ui/AppBarState.kt
index 7e47203..d98e0c7 100644
--- a/core-ui/src/main/java/com/hoc/flowmvi/core_ui/AppBarState.kt
+++ b/core-ui/src/main/java/com/hoc/flowmvi/core_ui/AppBarState.kt
@@ -9,7 +9,7 @@ import androidx.compose.runtime.Stable
 @OptIn(ExperimentalMaterial3Api::class)
 @Stable
 data class AppBarState(
-  val title: String?,
+  val title: @Composable () -> Unit,
   val actions: @Composable RowScope.() -> Unit,
   val navigationIcon: @Composable () -> Unit,
   val colors: TopAppBarColors,
diff --git a/feature-add/src/main/java/com/hoc/flowmvi/ui/add/AddNewUserScreen.kt b/feature-add/src/main/java/com/hoc/flowmvi/ui/add/AddNewUserScreen.kt
index 4da7765..ead0850 100644
--- a/feature-add/src/main/java/com/hoc/flowmvi/ui/add/AddNewUserScreen.kt
+++ b/feature-add/src/main/java/com/hoc/flowmvi/ui/add/AddNewUserScreen.kt
@@ -147,7 +147,7 @@ private fun ConfigAppBar(
 
   val appBarState = remember(colors, onBackClickState) {
     AppBarState(
-      title = title,
+      title = { Text(title) },
       actions = {},
       navigationIcon = {
         IconButton(onClick = { onBackClickState.value() }) {
diff --git a/feature-main/src/main/java/com/hoc/flowmvi/ui/main/UsersListScreen.kt b/feature-main/src/main/java/com/hoc/flowmvi/ui/main/UsersListScreen.kt
index fec073f..9687bbb 100644
--- a/feature-main/src/main/java/com/hoc/flowmvi/ui/main/UsersListScreen.kt
+++ b/feature-main/src/main/java/com/hoc/flowmvi/ui/main/UsersListScreen.kt
@@ -160,7 +160,7 @@ private fun ConfigAppBar(
 
   val appBarState = remember(colors, title) {
     AppBarState(
-      title = title,
+      title = { Text(text = title) },
       actions = {
         IconButton(onClick = { currentNavigateToAddUser() }) {
           Icon(
diff --git a/feature-search/src/main/java/com/hoc/flowmvi/ui/search/AppBarTextField.kt b/feature-search/src/main/java/com/hoc/flowmvi/ui/search/AppBarTextField.kt
new file mode 100644
index 0000000..d0a677a
--- /dev/null
+++ b/feature-search/src/main/java/com/hoc/flowmvi/ui/search/AppBarTextField.kt
@@ -0,0 +1,128 @@
+package com.hoc.flowmvi.ui.search
+
+import androidx.compose.foundation.interaction.MutableInteractionSource
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.heightIn
+import androidx.compose.foundation.text.BasicTextField
+import androidx.compose.foundation.text.KeyboardActions
+import androidx.compose.foundation.text.KeyboardOptions
+import androidx.compose.foundation.text.selection.LocalTextSelectionColors
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.LocalTextStyle
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextFieldDefaults
+import androidx.compose.material3.TextFieldDefaults.indicatorLine
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.runtime.SideEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.focus.FocusRequester
+import androidx.compose.ui.focus.focusRequester
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.SolidColor
+import androidx.compose.ui.graphics.takeOrElse
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.input.TextFieldValue
+import androidx.compose.ui.text.input.VisualTransformation
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun AppBarTextField(
+  value: String,
+  onValueChange: (String) -> Unit,
+  hint: String,
+  modifier: Modifier = Modifier,
+  keyboardOptions: KeyboardOptions = KeyboardOptions.Default,
+  keyboardActions: KeyboardActions = KeyboardActions.Default,
+) {
+  val colors = TextFieldDefaults.textFieldColors(containerColor = Color.Unspecified)
+
+  val textStyle = LocalTextStyle.current
+  // If color is not provided via the text style, use content color as a default
+  val textColor = textStyle.color.takeOrElse { MaterialTheme.colorScheme.onSurface }
+  val mergedTextStyle = textStyle.merge(TextStyle(color = textColor, lineHeight = 50.sp))
+
+  val interactionSource = remember { MutableInteractionSource() }
+
+  // Holds the latest internal TextFieldValue state. We need to keep it to have the correct value
+  // of the composition.
+  // Set the correct cursor position when this composable is first initialized
+  var textFieldValueState by remember { mutableStateOf(TextFieldValue(text = value)) }
+
+  // Holds the latest TextFieldValue that BasicTextField was recomposed with. We couldn't simply
+  // pass `TextFieldValue(text = value)` to the CoreTextField because we need to preserve the
+  // composition.
+  val textFieldValue = textFieldValueState.copy(text = value)
+
+  SideEffect {
+    if (textFieldValue.selection != textFieldValueState.selection ||
+      textFieldValue.composition != textFieldValueState.composition
+    ) {
+      textFieldValueState = textFieldValue
+    }
+  }
+  // Last String value that either text field was recomposed with or updated in the onValueChange
+  // callback. We keep track of it to prevent calling onValueChange(String) for same String when
+  // CoreTextField's onValueChange is called multiple times without recomposition in between.
+  var lastTextValue by remember(value) { mutableStateOf(value) }
+
+  // request focus when this composable is first initialized
+  val focusRequester = remember { FocusRequester() }
+  SideEffect { focusRequester.requestFocus() }
+
+  CompositionLocalProvider(LocalTextSelectionColors provides LocalTextSelectionColors.current) {
+    BasicTextField(
+      value = textFieldValue,
+      onValueChange = { newTextFieldValueState ->
+        textFieldValueState = newTextFieldValueState
+
+        val stringChangedSinceLastInvocation = lastTextValue != newTextFieldValueState.text
+        lastTextValue = newTextFieldValueState.text
+
+        if (stringChangedSinceLastInvocation) {
+          // remove newlines to avoid strange layout issues, and also because singleLine=true
+          onValueChange(newTextFieldValueState.text.replace("\n", ""))
+        }
+      },
+      modifier = modifier
+        .fillMaxWidth()
+        .heightIn(32.dp)
+        .indicatorLine(
+          enabled = true,
+          isError = false,
+          interactionSource = interactionSource,
+          colors = colors,
+        )
+        .focusRequester(focusRequester),
+      textStyle = mergedTextStyle,
+      cursorBrush = SolidColor(MaterialTheme.colorScheme.primary),
+      keyboardOptions = keyboardOptions,
+      keyboardActions = keyboardActions,
+      interactionSource = interactionSource,
+      singleLine = true,
+      maxLines = 1,
+      decorationBox = @Composable { innerTextField ->
+        // places text field with placeholder and appropriate bottom padding
+        TextFieldDefaults.TextFieldDecorationBox(
+          value = value,
+          visualTransformation = VisualTransformation.None,
+          innerTextField = innerTextField,
+          placeholder = { Text(text = hint) },
+          singleLine = true,
+          enabled = true,
+          interactionSource = interactionSource,
+          colors = colors,
+          contentPadding = PaddingValues(bottom = 4.dp)
+        )
+      }
+    )
+  }
+}
diff --git a/feature-search/src/main/java/com/hoc/flowmvi/ui/search/SearchContract.kt b/feature-search/src/main/java/com/hoc/flowmvi/ui/search/SearchContract.kt
index 0e02a6d..1253700 100644
--- a/feature-search/src/main/java/com/hoc/flowmvi/ui/search/SearchContract.kt
+++ b/feature-search/src/main/java/com/hoc/flowmvi/ui/search/SearchContract.kt
@@ -13,6 +13,7 @@ import dev.ahmedmourad.nocopy.annotations.NoCopy
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.persistentListOf
 import kotlinx.collections.immutable.toImmutableList
+import javax.inject.Inject
 
 @Immutable
 @Suppress("DataClassPrivateConstructor")
@@ -63,7 +64,7 @@ data class ViewState(
     }
   }
 
-  class StateSaver : MviViewStateSaver<ViewState> {
+  class StateSaver @Inject constructor() : MviViewStateSaver<ViewState> {
     override fun ViewState.toBundle() = bundleOf(ORIGINAL_QUERY_KEY to originalQuery)
 
     override fun restore(bundle: Bundle?) = initial(
diff --git a/feature-search/src/main/java/com/hoc/flowmvi/ui/search/SearchScreen.kt b/feature-search/src/main/java/com/hoc/flowmvi/ui/search/SearchScreen.kt
index af96059..2ad831f 100644
--- a/feature-search/src/main/java/com/hoc/flowmvi/ui/search/SearchScreen.kt
+++ b/feature-search/src/main/java/com/hoc/flowmvi/ui/search/SearchScreen.kt
@@ -1,29 +1,140 @@
 package com.hoc.flowmvi.ui.search
 
+import android.content.Context
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.animation.fadeIn
+import androidx.compose.animation.fadeOut
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.aspectRatio
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.wrapContentHeight
+import androidx.compose.foundation.lazy.grid.GridCells
+import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
+import androidx.compose.foundation.lazy.grid.items
+import androidx.compose.foundation.text.KeyboardActions
+import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.ArrowBack
+import androidx.compose.material.icons.filled.ErrorOutline
+import androidx.compose.material.icons.filled.Search
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
 import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.ReadOnlyComposable
+import androidx.compose.runtime.SideEffect
 import androidx.compose.runtime.State
+import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.rememberUpdatedState
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalFocusManager
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.input.ImeAction
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.compose.ExperimentalLifecycleComposeApi
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import arrow.core.valueOr
+import coil.compose.SubcomposeAsyncImage
+import coil.request.ImageRequest
 import com.hoc.flowmvi.core_ui.AppBarState
 import com.hoc.flowmvi.core_ui.ConfigAppBar
+import com.hoc.flowmvi.core_ui.LoadingIndicator
+import com.hoc.flowmvi.core_ui.LocalSnackbarHostState
 import com.hoc.flowmvi.core_ui.OnLifecycleEvent
+import com.hoc.flowmvi.core_ui.RetryButton
+import com.hoc.flowmvi.core_ui.collectInLaunchedEffectWithLifecycle
+import com.hoc.flowmvi.core_ui.debugCheckImmediateMainDispatcher
+import com.hoc.flowmvi.domain.model.User
+import com.hoc.flowmvi.domain.model.UserError
+import com.hoc.flowmvi.ui.theme.AppTheme
+import com.hoc081098.flowext.select
+import kotlinx.collections.immutable.ImmutableList
+import kotlinx.collections.immutable.toImmutableList
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.channels.Channel
+import kotlinx.coroutines.flow.collect
+import kotlinx.coroutines.flow.consumeAsFlow
+import kotlinx.coroutines.flow.onEach
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import timber.log.Timber
 
+@OptIn(ExperimentalLifecycleComposeApi::class)
 @Composable
 fun SearchUserRoute(
   configAppBar: ConfigAppBar,
   onBackClick: () -> Unit,
+  modifier: Modifier = Modifier,
+  viewModel: SearchVM = hiltViewModel(),
 ) {
+  val intentChannel = remember { Channel<ViewIntent>(Channel.UNLIMITED) }
+  LaunchedEffect(Unit) {
+    withContext(Dispatchers.Main.immediate) {
+      intentChannel
+        .consumeAsFlow()
+        .onEach(viewModel::processIntent)
+        .collect()
+    }
+  }
+
+  val scope = rememberCoroutineScope()
+  val snackbarHostState by rememberUpdatedState(LocalSnackbarHostState.current)
+  val context = LocalContext.current
+
+  viewModel.singleEvent.collectInLaunchedEffectWithLifecycle { event ->
+    debugCheckImmediateMainDispatcher()
+    when (event) {
+      is SingleEvent.SearchFailure -> {
+        scope.launch {
+          snackbarHostState.showSnackbar(
+            message = "Failed to search: ${event.error.getReadableMessage(context)}",
+          )
+        }
+      }
+    }
+  }
+
+  val originalQueryState = viewModel.viewState
+    .select { it.originalQuery }
+    .collectAsStateWithLifecycle(initialValue = viewModel.viewState.value.originalQuery)
+
+  val dispatch = remember {
+    { intent: ViewIntent ->
+      intentChannel.trySend(intent).getOrThrow()
+    }
+  }
+
   ConfigAppBar(
     onBackClickState = rememberUpdatedState(onBackClick),
-    configAppBar = configAppBar
+    configAppBar = configAppBar,
+    originalQueryState = originalQueryState,
+    onValueChange = { dispatch(ViewIntent.Search(it)) }
+  )
+
+  val viewState by viewModel.viewState.collectAsStateWithLifecycle()
+  SearchContent(
+    modifier = modifier,
+    viewState = viewState,
+    onRetry = { dispatch(ViewIntent.Retry) },
   )
 }
 
@@ -31,15 +142,40 @@ fun SearchUserRoute(
 @OptIn(ExperimentalMaterial3Api::class)
 private fun ConfigAppBar(
   onBackClickState: State<() -> Unit>,
-  configAppBar: ConfigAppBar
+  configAppBar: ConfigAppBar,
+  originalQueryState: State<String>,
+  onValueChange: (String) -> Unit,
 ) {
   val title = stringResource(id = R.string.search_user)
   val colors = TopAppBarDefaults.centerAlignedTopAppBarColors()
 
+  val focusManager = LocalFocusManager.current
+
   val appBarState = remember(title, colors) {
     AppBarState(
-      title = title,
-      actions = {},
+      title = {
+        val value = originalQueryState.value
+        SideEffect { Timber.d("recomposition with $value") }
+
+        AppBarTextField(
+          modifier = Modifier.fillMaxWidth(),
+          value = value,
+          onValueChange = onValueChange,
+          hint = "Search user...",
+          keyboardOptions = KeyboardOptions(imeAction = ImeAction.Search),
+          keyboardActions = KeyboardActions(
+            onSearch = { focusManager.clearFocus() }
+          ),
+        )
+      },
+      actions = {
+        IconButton(onClick = { focusManager.clearFocus() }) {
+          Icon(
+            Icons.Default.Search,
+            contentDescription = "Search",
+          )
+        }
+      },
       navigationIcon = {
         IconButton(onClick = { onBackClickState.value() }) {
           Icon(
@@ -51,9 +187,189 @@ private fun ConfigAppBar(
       colors = colors
     )
   }
+
   OnLifecycleEvent(configAppBar, appBarState) { _, event ->
     if (event == Lifecycle.Event.ON_START) {
       configAppBar(appBarState)
     }
   }
 }
+
+@Composable
+private fun SearchContent(
+  viewState: ViewState,
+  onRetry: () -> Unit,
+  modifier: Modifier = Modifier,
+) {
+  AnimatedVisibility(
+    modifier = modifier.fillMaxSize(),
+    visible = viewState.isLoading,
+    enter = fadeIn(),
+    exit = fadeOut(),
+  ) {
+    LoadingIndicator(
+      modifier = Modifier
+        .fillMaxSize(),
+    )
+  }
+
+  AnimatedVisibility(
+    modifier = modifier.fillMaxSize(),
+    visible = viewState.error !== null,
+    enter = fadeIn(),
+    exit = fadeOut(),
+  ) {
+    RetryButton(
+      modifier = Modifier
+        .fillMaxSize(),
+      onRetry = onRetry,
+      errorMessage = viewState.error?.getReadableMessage() ?: "",
+    )
+  }
+
+  UsersGrid(
+    modifier = modifier
+      .fillMaxSize(),
+    userItems = viewState.users
+  )
+}
+
+@Composable
+private fun UsersGrid(
+  userItems: ImmutableList<UserItem>,
+  modifier: Modifier = Modifier,
+) {
+  LazyVerticalGrid(
+    modifier = modifier,
+    columns = GridCells.Fixed(
+      count = 3,
+    ),
+    contentPadding = PaddingValues(8.dp),
+    verticalArrangement = Arrangement.spacedBy(8.dp),
+    horizontalArrangement = Arrangement.spacedBy(8.dp),
+  ) {
+    items(userItems, key = { it.id }) { userItem ->
+      UserItemCell(
+        userItem = userItem
+      )
+    }
+  }
+}
+
+@Composable
+fun UserItemCell(
+  userItem: UserItem,
+  modifier: Modifier = Modifier
+) {
+  Column(
+    modifier = modifier
+      .fillMaxWidth()
+      .wrapContentHeight(),
+    horizontalAlignment = Alignment.CenterHorizontally,
+  ) {
+    UserItemAvatar(
+      modifier = Modifier
+        .fillMaxWidth()
+        .aspectRatio(1f),
+      item = userItem,
+    )
+
+    Spacer(modifier = Modifier.height(8.dp))
+
+    Text(
+      modifier = Modifier
+        .fillMaxWidth(),
+      text = userItem.fullName,
+      style = MaterialTheme.typography.titleMedium,
+      maxLines = 1,
+      overflow = TextOverflow.Ellipsis,
+    )
+
+    Spacer(modifier = Modifier.height(8.dp))
+
+    Text(
+      modifier = Modifier
+        .fillMaxWidth(),
+      text = userItem.email,
+      style = MaterialTheme.typography
+        .bodySmall
+        .copy(fontSize = 13.sp),
+      maxLines = 1,
+      overflow = TextOverflow.Ellipsis,
+    )
+
+    Spacer(modifier = Modifier.height(8.dp))
+  }
+}
+
+@Preview(
+  showBackground = true,
+  showSystemUi = true,
+)
+@Composable
+fun PreviewUsersGrid() {
+  AppTheme {
+    UsersGrid(
+      userItems = (1..10).map { id ->
+        UserItem.from(
+          User.create(
+            id = id.toString(),
+            email = "hoc081098_$id@gmail.com",
+            firstName = "Petrus",
+            lastName = "Hoc $id",
+            avatar = "avatar/$id",
+          ).valueOr { throw IllegalArgumentException() }
+        )
+      }.toImmutableList()
+    )
+  }
+}
+
+@Composable
+private fun UserItemAvatar(
+  item: UserItem,
+  modifier: Modifier = Modifier,
+) {
+  SubcomposeAsyncImage(
+    modifier = modifier,
+    model = ImageRequest.Builder(LocalContext.current)
+      .data(item.avatar)
+      .crossfade(true)
+      .placeholder(R.drawable.ic_baseline_person_24)
+      .build(),
+    contentDescription = "Avatar of ${item.fullName}",
+    error = {
+      Column(
+        modifier = Modifier.fillMaxSize(),
+        verticalArrangement = Arrangement.Center,
+        horizontalAlignment = Alignment.CenterHorizontally,
+      ) {
+        Icon(
+          imageVector = Icons.Filled.ErrorOutline,
+          contentDescription = "Error",
+          modifier = Modifier.size(width = 20.dp, height = 20.dp)
+        )
+      }
+    }
+  )
+}
+
+@ReadOnlyComposable
+@Composable
+private fun UserError.getReadableMessage(): String = when (this) {
+  is UserError.InvalidId -> stringResource(R.string.invalid_id_error_message)
+  UserError.NetworkError -> stringResource(R.string.network_error_error_message)
+  UserError.ServerError -> stringResource(R.string.server_error_error_message)
+  UserError.Unexpected -> stringResource(R.string.unexpected_error_error_message)
+  is UserError.UserNotFound -> stringResource(R.string.user_not_found_error_message)
+  is UserError.ValidationFailed -> stringResource(R.string.validation_failed_error_message)
+}
+
+private fun UserError.getReadableMessage(context: Context): String = when (this) {
+  is UserError.InvalidId -> context.getString(R.string.invalid_id_error_message)
+  UserError.NetworkError -> context.getString(R.string.network_error_error_message)
+  UserError.ServerError -> context.getString(R.string.server_error_error_message)
+  UserError.Unexpected -> context.getString(R.string.unexpected_error_error_message)
+  is UserError.UserNotFound -> context.getString(R.string.user_not_found_error_message)
+  is UserError.ValidationFailed -> context.getString(R.string.validation_failed_error_message)
+}
diff --git a/feature-search/src/main/java/com/hoc/flowmvi/ui/search/SearchVM.kt b/feature-search/src/main/java/com/hoc/flowmvi/ui/search/SearchVM.kt
index 92b7813..9ba2139 100644
--- a/feature-search/src/main/java/com/hoc/flowmvi/ui/search/SearchVM.kt
+++ b/feature-search/src/main/java/com/hoc/flowmvi/ui/search/SearchVM.kt
@@ -8,6 +8,7 @@ import com.hoc081098.flowext.flatMapFirst
 import com.hoc081098.flowext.flowFromSuspend
 import com.hoc081098.flowext.startWith
 import com.hoc081098.flowext.takeUntil
+import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.FlowPreview
 import kotlinx.coroutines.flow.Flow
@@ -25,13 +26,15 @@ import kotlinx.coroutines.flow.merge
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.flow.scan
 import kotlinx.coroutines.flow.stateIn
+import javax.inject.Inject
 import kotlin.time.Duration.Companion.milliseconds
-import kotlin.time.ExperimentalTime
 
-@FlowPreview
-@ExperimentalTime
-@ExperimentalCoroutinesApi
-class SearchVM(
+@OptIn(
+  FlowPreview::class,
+  ExperimentalCoroutinesApi::class,
+)
+@HiltViewModel
+class SearchVM @Inject constructor(
   private val searchUsersUseCase: SearchUsersUseCase,
   savedStateHandle: SavedStateHandle,
   private val stateSaver: ViewState.StateSaver,
@@ -70,15 +73,15 @@ class SearchVM(
       .shareWhileSubscribed()
 
     return merge(
+      // Query change
+      queryFlow
+        .map { PartialStateChange.QueryChange(it) },
       // Search change
       searchableQueryFlow
         .flatMapLatest(::executeSearch),
       // Retry change
       filterIsInstance<ViewIntent.Retry>()
         .toPartialStateChangeFlow(searchableQueryFlow),
-      // Query change
-      queryFlow
-        .map { PartialStateChange.QueryChange(it) },
     )
   }
 
diff --git a/feature-search/src/main/res/values/strings.xml b/feature-search/src/main/res/values/strings.xml
index 1a4463f..8dbcc77 100644
--- a/feature-search/src/main/res/values/strings.xml
+++ b/feature-search/src/main/res/values/strings.xml
@@ -1,3 +1,10 @@
 <resources>
-    <string name="search_user">Search user</string>
+  <string name="search_user">Search user</string>
+
+  <string name="invalid_id_error_message">Invalid id</string>
+  <string name="network_error_error_message">Network error</string>
+  <string name="server_error_error_message">Server error</string>
+  <string name="unexpected_error_error_message">Unexpected error</string>
+  <string name="user_not_found_error_message">User not found</string>
+  <string name="validation_failed_error_message">Validation failed</string>
 </resources>

From bea8c7380a9d9045f4042f3605e97addb73d61a7 Mon Sep 17 00:00:00 2001
From: hoc081098 <hoc081098@gmail.com>
Date: Thu, 15 Dec 2022 13:53:43 +0700
Subject: [PATCH 5/8] feat(search): refactor

---
 core-ui/src/main/res/values/strings.xml       |   8 ++
 feature-add/src/main/res/values/strings.xml   |   8 --
 feature-main/src/main/res/values/strings.xml  |   7 --
 .../com/hoc/flowmvi/ui/search/SearchScreen.kt | 102 ++----------------
 .../com/hoc/flowmvi/ui/search/UserItemCell.kt | 100 +++++++++++++++++
 .../src/main/res/values/strings.xml           |   7 --
 6 files changed, 114 insertions(+), 118 deletions(-)
 create mode 100644 feature-search/src/main/java/com/hoc/flowmvi/ui/search/UserItemCell.kt

diff --git a/core-ui/src/main/res/values/strings.xml b/core-ui/src/main/res/values/strings.xml
index ca5fb31..143478f 100644
--- a/core-ui/src/main/res/values/strings.xml
+++ b/core-ui/src/main/res/values/strings.xml
@@ -1,4 +1,12 @@
 <resources>
   <string name="app_name">Compose MVI Coroutines Flow</string>
   <string name="retry">RETRY</string>
+
+  <string name="invalid_id_error_message">Invalid id</string>
+  <string name="network_error_error_message">Network error</string>
+  <string name="server_error_error_message">Server error</string>
+  <string name="unexpected_error_error_message">Unexpected error</string>
+  <string name="user_not_found_error_message">User not found</string>
+  <string name="validation_failed_error_message">Validation failed</string>
+  <string name="add_user_success">Added user successfully</string>
 </resources>
diff --git a/feature-add/src/main/res/values/strings.xml b/feature-add/src/main/res/values/strings.xml
index a43b342..b298e4d 100644
--- a/feature-add/src/main/res/values/strings.xml
+++ b/feature-add/src/main/res/values/strings.xml
@@ -2,14 +2,6 @@
 <resources>
   <string name="add_new_user">Add new user</string>
 
-  <string name="invalid_id_error_message">Invalid id</string>
-  <string name="network_error_error_message">Network error</string>
-  <string name="server_error_error_message">Server error</string>
-  <string name="unexpected_error_error_message">Unexpected error</string>
-  <string name="user_not_found_error_message">User not found</string>
-  <string name="validation_failed_error_message">Validation failed</string>
-  <string name="add_user_success">Added user successfully</string>
-
   <string name="invalid_email">Invalid email</string>
   <string name="too_short_first_name">Too short first name</string>
   <string name="too_short_last_name">Too short last name</string>
diff --git a/feature-main/src/main/res/values/strings.xml b/feature-main/src/main/res/values/strings.xml
index 18719bc..0f2baae 100644
--- a/feature-main/src/main/res/values/strings.xml
+++ b/feature-main/src/main/res/values/strings.xml
@@ -5,11 +5,4 @@
   <string name="add_user">Add user</string>
   <string name="delete">Delete</string>
   <string name="delete_user_confirmaion">Do you want to delete "%s"? This action cannot be undone.</string>
-
-  <string name="invalid_id_error_message">Invalid id</string>
-  <string name="network_error_error_message">Network error</string>
-  <string name="server_error_error_message">Server error</string>
-  <string name="unexpected_error_error_message">Unexpected error</string>
-  <string name="user_not_found_error_message">User not found</string>
-  <string name="validation_failed_error_message">Validation failed</string>
 </resources>
diff --git a/feature-search/src/main/java/com/hoc/flowmvi/ui/search/SearchScreen.kt b/feature-search/src/main/java/com/hoc/flowmvi/ui/search/SearchScreen.kt
index 2ad831f..f033fba 100644
--- a/feature-search/src/main/java/com/hoc/flowmvi/ui/search/SearchScreen.kt
+++ b/feature-search/src/main/java/com/hoc/flowmvi/ui/search/SearchScreen.kt
@@ -5,15 +5,9 @@ import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.animation.fadeIn
 import androidx.compose.animation.fadeOut
 import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.aspectRatio
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.layout.wrapContentHeight
 import androidx.compose.foundation.lazy.grid.GridCells
 import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
 import androidx.compose.foundation.lazy.grid.items
@@ -21,13 +15,10 @@ import androidx.compose.foundation.text.KeyboardActions
 import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.ArrowBack
-import androidx.compose.material.icons.filled.ErrorOutline
 import androidx.compose.material.icons.filled.Search
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Text
 import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
@@ -38,23 +29,18 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.rememberUpdatedState
-import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalFocusManager
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.input.ImeAction
-import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.compose.ExperimentalLifecycleComposeApi
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import arrow.core.valueOr
-import coil.compose.SubcomposeAsyncImage
-import coil.request.ImageRequest
 import com.hoc.flowmvi.core_ui.AppBarState
 import com.hoc.flowmvi.core_ui.ConfigAppBar
 import com.hoc.flowmvi.core_ui.LoadingIndicator
@@ -201,6 +187,11 @@ private fun SearchContent(
   onRetry: () -> Unit,
   modifier: Modifier = Modifier,
 ) {
+  UsersGrid(
+    modifier = modifier,
+    userItems = viewState.users
+  )
+
   AnimatedVisibility(
     modifier = modifier.fillMaxSize(),
     visible = viewState.isLoading,
@@ -226,12 +217,6 @@ private fun SearchContent(
       errorMessage = viewState.error?.getReadableMessage() ?: "",
     )
   }
-
-  UsersGrid(
-    modifier = modifier
-      .fillMaxSize(),
-    userItems = viewState.users
-  )
 }
 
 @Composable
@@ -240,7 +225,7 @@ private fun UsersGrid(
   modifier: Modifier = Modifier,
 ) {
   LazyVerticalGrid(
-    modifier = modifier,
+    modifier = modifier.fillMaxSize(),
     columns = GridCells.Fixed(
       count = 3,
     ),
@@ -256,52 +241,6 @@ private fun UsersGrid(
   }
 }
 
-@Composable
-fun UserItemCell(
-  userItem: UserItem,
-  modifier: Modifier = Modifier
-) {
-  Column(
-    modifier = modifier
-      .fillMaxWidth()
-      .wrapContentHeight(),
-    horizontalAlignment = Alignment.CenterHorizontally,
-  ) {
-    UserItemAvatar(
-      modifier = Modifier
-        .fillMaxWidth()
-        .aspectRatio(1f),
-      item = userItem,
-    )
-
-    Spacer(modifier = Modifier.height(8.dp))
-
-    Text(
-      modifier = Modifier
-        .fillMaxWidth(),
-      text = userItem.fullName,
-      style = MaterialTheme.typography.titleMedium,
-      maxLines = 1,
-      overflow = TextOverflow.Ellipsis,
-    )
-
-    Spacer(modifier = Modifier.height(8.dp))
-
-    Text(
-      modifier = Modifier
-        .fillMaxWidth(),
-      text = userItem.email,
-      style = MaterialTheme.typography
-        .bodySmall
-        .copy(fontSize = 13.sp),
-      maxLines = 1,
-      overflow = TextOverflow.Ellipsis,
-    )
-
-    Spacer(modifier = Modifier.height(8.dp))
-  }
-}
-
 @Preview(
   showBackground = true,
   showSystemUi = true,
@@ -325,35 +264,6 @@ fun PreviewUsersGrid() {
   }
 }
 
-@Composable
-private fun UserItemAvatar(
-  item: UserItem,
-  modifier: Modifier = Modifier,
-) {
-  SubcomposeAsyncImage(
-    modifier = modifier,
-    model = ImageRequest.Builder(LocalContext.current)
-      .data(item.avatar)
-      .crossfade(true)
-      .placeholder(R.drawable.ic_baseline_person_24)
-      .build(),
-    contentDescription = "Avatar of ${item.fullName}",
-    error = {
-      Column(
-        modifier = Modifier.fillMaxSize(),
-        verticalArrangement = Arrangement.Center,
-        horizontalAlignment = Alignment.CenterHorizontally,
-      ) {
-        Icon(
-          imageVector = Icons.Filled.ErrorOutline,
-          contentDescription = "Error",
-          modifier = Modifier.size(width = 20.dp, height = 20.dp)
-        )
-      }
-    }
-  )
-}
-
 @ReadOnlyComposable
 @Composable
 private fun UserError.getReadableMessage(): String = when (this) {
diff --git a/feature-search/src/main/java/com/hoc/flowmvi/ui/search/UserItemCell.kt b/feature-search/src/main/java/com/hoc/flowmvi/ui/search/UserItemCell.kt
new file mode 100644
index 0000000..98f5edb
--- /dev/null
+++ b/feature-search/src/main/java/com/hoc/flowmvi/ui/search/UserItemCell.kt
@@ -0,0 +1,100 @@
+package com.hoc.flowmvi.ui.search
+
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.aspectRatio
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.wrapContentHeight
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.ErrorOutline
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import coil.compose.SubcomposeAsyncImage
+import coil.request.ImageRequest
+
+@Composable
+internal fun UserItemCell(
+  userItem: UserItem,
+  modifier: Modifier = Modifier
+) {
+  Column(
+    modifier = modifier
+      .fillMaxWidth()
+      .wrapContentHeight(),
+    horizontalAlignment = Alignment.CenterHorizontally,
+  ) {
+    UserItemAvatar(
+      modifier = Modifier
+        .fillMaxWidth()
+        .aspectRatio(1f),
+      item = userItem,
+    )
+
+    Spacer(modifier = Modifier.height(8.dp))
+
+    Text(
+      modifier = Modifier
+        .fillMaxWidth(),
+      text = userItem.fullName,
+      style = MaterialTheme.typography.titleMedium,
+      maxLines = 1,
+      overflow = TextOverflow.Ellipsis,
+    )
+
+    Spacer(modifier = Modifier.height(8.dp))
+
+    Text(
+      modifier = Modifier
+        .fillMaxWidth(),
+      text = userItem.email,
+      style = MaterialTheme.typography
+        .bodySmall
+        .copy(fontSize = 13.sp),
+      maxLines = 1,
+      overflow = TextOverflow.Ellipsis,
+    )
+
+    Spacer(modifier = Modifier.height(8.dp))
+  }
+}
+
+@Composable
+private fun UserItemAvatar(
+  item: UserItem,
+  modifier: Modifier = Modifier,
+) {
+  SubcomposeAsyncImage(
+    modifier = modifier,
+    model = ImageRequest.Builder(LocalContext.current)
+      .data(item.avatar)
+      .crossfade(true)
+      .placeholder(R.drawable.ic_baseline_person_24)
+      .build(),
+    contentDescription = "Avatar of ${item.fullName}",
+    error = {
+      Column(
+        modifier = Modifier.fillMaxSize(),
+        verticalArrangement = Arrangement.Center,
+        horizontalAlignment = Alignment.CenterHorizontally,
+      ) {
+        Icon(
+          imageVector = Icons.Filled.ErrorOutline,
+          contentDescription = "Error",
+          modifier = Modifier.size(width = 20.dp, height = 20.dp)
+        )
+      }
+    }
+  )
+}
diff --git a/feature-search/src/main/res/values/strings.xml b/feature-search/src/main/res/values/strings.xml
index 8dbcc77..bf01941 100644
--- a/feature-search/src/main/res/values/strings.xml
+++ b/feature-search/src/main/res/values/strings.xml
@@ -1,10 +1,3 @@
 <resources>
   <string name="search_user">Search user</string>
-
-  <string name="invalid_id_error_message">Invalid id</string>
-  <string name="network_error_error_message">Network error</string>
-  <string name="server_error_error_message">Server error</string>
-  <string name="unexpected_error_error_message">Unexpected error</string>
-  <string name="user_not_found_error_message">User not found</string>
-  <string name="validation_failed_error_message">Validation failed</string>
 </resources>

From c1848dd2386cfa6045d211572db0b32fd7a0b55e Mon Sep 17 00:00:00 2001
From: hoc081098 <hoc081098@gmail.com>
Date: Thu, 15 Dec 2022 14:01:48 +0700
Subject: [PATCH 6/8] update main

---
 .../java/com/hoc/flowmvi/ui/main/UsersListScreen.kt    | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/feature-main/src/main/java/com/hoc/flowmvi/ui/main/UsersListScreen.kt b/feature-main/src/main/java/com/hoc/flowmvi/ui/main/UsersListScreen.kt
index 9687bbb..4b7f4c8 100644
--- a/feature-main/src/main/java/com/hoc/flowmvi/ui/main/UsersListScreen.kt
+++ b/feature-main/src/main/java/com/hoc/flowmvi/ui/main/UsersListScreen.kt
@@ -20,6 +20,7 @@ import androidx.compose.material3.Text
 import androidx.compose.material3.TextButton
 import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.ReadOnlyComposable
 import androidx.compose.runtime.getValue
@@ -135,6 +136,15 @@ internal fun UsersListRoute(
       },
     )
   }
+  DisposableEffect(viewState.userItems) {
+    shouldBeDeletedItem?.let { item ->
+      // clear shouldBeDeletedItem if it's not in userItems
+      if (viewState.userItems.none { it.id == item.id }) {
+        setShouldBeDeletedItem(null)
+      }
+    }
+    onDispose { }
+  }
 
   UsersListContent(
     modifier = modifier,

From c22c7805bdc8053a927d152ce993576f8c7170d4 Mon Sep 17 00:00:00 2001
From: hoc081098 <hoc081098@gmail.com>
Date: Thu, 15 Dec 2022 14:12:33 +0700
Subject: [PATCH 7/8] fix(main): fix state change

---
 .../com/hoc/flowmvi/ui/main/MainContract.kt   | 25 +++++++++++++------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/feature-main/src/main/java/com/hoc/flowmvi/ui/main/MainContract.kt b/feature-main/src/main/java/com/hoc/flowmvi/ui/main/MainContract.kt
index 5aeb507..93e94dd 100644
--- a/feature-main/src/main/java/com/hoc/flowmvi/ui/main/MainContract.kt
+++ b/feature-main/src/main/java/com/hoc/flowmvi/ui/main/MainContract.kt
@@ -117,16 +117,25 @@ internal sealed interface PartialStateChange {
 
     override fun reduce(viewState: ViewState) = when (this) {
       is Failure -> {
-        viewState.copy(
-          userItems = viewState.userItems.mutate { userItems ->
-            userItems.forEachIndexed { index, userItem ->
-              if (userItem.id == user.id) {
-                userItems[index] = userItem.copy(isDeleting = false)
-                return@mutate
+        // if the user is not found, remove it from the current list.
+        if (error is UserError.UserNotFound && error.id == user.id) {
+          viewState.copy(
+            userItems = viewState
+              .userItems
+              .removeAll { it.id == user.id }
+          )
+        } else {
+          viewState.copy(
+            userItems = viewState.userItems.mutate { userItems ->
+              userItems.forEachIndexed { index, userItem ->
+                if (userItem.id == user.id) {
+                  userItems[index] = userItem.copy(isDeleting = false)
+                  return@mutate
+                }
               }
             }
-          }
-        )
+          )
+        }
       }
       is Loading -> viewState.copy(
         userItems = viewState.userItems.mutate { userItems ->

From 65f015cf4028c34efa4be88a5d56da8bd0b8cc01 Mon Sep 17 00:00:00 2001
From: hoc081098 <hoc081098@gmail.com>
Date: Thu, 15 Dec 2022 14:13:34 +0700
Subject: [PATCH 8/8] refactor

---
 .../src/main/java/com/hoc/flowmvi/core_ui}/AppBarTextField.kt   | 2 +-
 .../src/main/java/com/hoc/flowmvi/ui/search/SearchScreen.kt     | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)
 rename {feature-search/src/main/java/com/hoc/flowmvi/ui/search => core-ui/src/main/java/com/hoc/flowmvi/core_ui}/AppBarTextField.kt (99%)

diff --git a/feature-search/src/main/java/com/hoc/flowmvi/ui/search/AppBarTextField.kt b/core-ui/src/main/java/com/hoc/flowmvi/core_ui/AppBarTextField.kt
similarity index 99%
rename from feature-search/src/main/java/com/hoc/flowmvi/ui/search/AppBarTextField.kt
rename to core-ui/src/main/java/com/hoc/flowmvi/core_ui/AppBarTextField.kt
index d0a677a..fd7dc52 100644
--- a/feature-search/src/main/java/com/hoc/flowmvi/ui/search/AppBarTextField.kt
+++ b/core-ui/src/main/java/com/hoc/flowmvi/core_ui/AppBarTextField.kt
@@ -1,4 +1,4 @@
-package com.hoc.flowmvi.ui.search
+package com.hoc.flowmvi.core_ui
 
 import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.PaddingValues
diff --git a/feature-search/src/main/java/com/hoc/flowmvi/ui/search/SearchScreen.kt b/feature-search/src/main/java/com/hoc/flowmvi/ui/search/SearchScreen.kt
index f033fba..1860c29 100644
--- a/feature-search/src/main/java/com/hoc/flowmvi/ui/search/SearchScreen.kt
+++ b/feature-search/src/main/java/com/hoc/flowmvi/ui/search/SearchScreen.kt
@@ -42,6 +42,7 @@ import androidx.lifecycle.compose.ExperimentalLifecycleComposeApi
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import arrow.core.valueOr
 import com.hoc.flowmvi.core_ui.AppBarState
+import com.hoc.flowmvi.core_ui.AppBarTextField
 import com.hoc.flowmvi.core_ui.ConfigAppBar
 import com.hoc.flowmvi.core_ui.LoadingIndicator
 import com.hoc.flowmvi.core_ui.LocalSnackbarHostState