Merge pull request #56 from Kotlin-Android-Open-Source/feat_add

Feat add

Author: hoc081098

app/src/main/java/com/hoc/flowmvi/MainActivity.kt

@@ -13,8 +13,10 @@ 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
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.navigation.compose.NavHost
 import com.hoc.flowmvi.core_ui.AppBarState
@@ -69,7 +71,7 @@ private fun JetpackComposeMVICoroutinesFlowApp(
 ) {
   val navController = appState.navController
   val snackbarHostState = remember { SnackbarHostState() }
-  val (appBarState, setAppBarState) = remember { mutableStateOf<AppBarState?>(null) }
+  var appBarState by remember { mutableStateOf<AppBarState?>(null) }
 
   Scaffold(
     snackbarHost = { SnackbarHost(snackbarHostState) },
@@ -91,12 +93,12 @@ private fun JetpackComposeMVICoroutinesFlowApp(
         startDestination = startScreen.route
       ) {
         usersListScreen(
-          configAppBar = setAppBarState,
+          configAppBar = { appBarState = it },
           navigateToAddUser = { navController.navigateToAddNewUser() }
         )
 
         addNewUserScreen(
-          configAppBar = setAppBarState,
+          configAppBar = { appBarState = it },
           onBackClick = appState::onBackClick
         )
       }

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

@@ -8,6 +8,5 @@ import javax.inject.Inject
 internal class DefaultCoroutineDispatchers @Inject constructor() : AppCoroutineDispatchers {
   override val main: CoroutineDispatcher get() = Dispatchers.Main
   override val io: CoroutineDispatcher get() = Dispatchers.IO
-  override val mainImmediate: CoroutineDispatcher get() = Dispatchers.Main.immediate
   override val default: CoroutineDispatcher get() = Dispatchers.Default
 }

buildSrc/src/main/kotlin/deps.kt

@@ -130,6 +130,7 @@ inline val PDsS.androidLib: PDS get() = id("com.android.library")
 inline val PDsS.kotlinAndroid: PDS get() = kotlin("android")
 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 DependencyHandler.domain get() = project(":domain")
@@ -144,7 +145,9 @@ inline val DependencyHandler.mviBase get() = project(":mvi-base")
 inline val DependencyHandler.mviTesting get() = project(":mvi-testing")
 inline val DependencyHandler.testUtils get() = project(":test-utils")
 
-fun DependencyHandler.implementationCompose() {
+fun DependencyHandler.implementationCompose(
+  includeMaterial2: Boolean = false,
+) {
   arrayOf(
     platform(deps.compose.bom),
     // activity compose
@@ -160,7 +163,10 @@ fun DependencyHandler.implementationCompose() {
     deps.compose.layout,
     deps.compose.foundation,
     deps.compose.ui,
-    deps.compose.material,
+    *(
+      if (includeMaterial2) arrayOf(deps.compose.material)
+      else emptyArray()
+      ),
     deps.compose.material3,
     deps.compose.materialIconsExtended,
     deps.compose.runtime,

core-ui/build.gradle.kts

@@ -44,5 +44,8 @@ dependencies {
   implementation(deps.lifecycle.runtimeKtx)
   implementation(deps.androidx.material)
 
+  implementation(deps.coroutines.core)
+  implementation(deps.coroutines.android)
+
   addUnitTest()
 }

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

@@ -15,4 +15,4 @@ data class AppBarState(
   val colors: TopAppBarColors,
 )
 
-typealias ConfigAppBar = (AppBarState) -> Unit
+typealias ConfigAppBar = (AppBarState?) -> Unit

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

@@ -0,0 +1,20 @@
+package com.hoc.flowmvi.core_ui
+
+import android.util.Log
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.currentCoroutineContext
+import kotlin.coroutines.ContinuationInterceptor
+
+suspend fun debugCheckImmediateMainDispatcher() {
+  if (BuildConfig.DEBUG) {
+    val interceptor = currentCoroutineContext()[ContinuationInterceptor]
+    Log.d(
+      "###",
+      "debugCheckImmediateMainDispatcher: $interceptor, ${Dispatchers.Main.immediate}, ${Dispatchers.Main}"
+    )
+
+    check(interceptor === Dispatchers.Main.immediate) {
+      "Expected ContinuationInterceptor to be Dispatchers.Main.immediate but was $interceptor"
+    }
+  }
+}

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

@@ -2,13 +2,17 @@ package com.hoc.flowmvi.core_ui
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberUpdatedState
 import androidx.compose.ui.platform.LocalLifecycleOwner
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.flowWithLifecycle
 import androidx.lifecycle.repeatOnLifecycle
 import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.withContext
 
 @Composable
 fun <T> rememberFlowWithLifecycle(
@@ -31,9 +35,13 @@ fun <T> Flow<T>.collectInLaunchedEffectWithLifecycle(
   collector: suspend CoroutineScope.(T) -> Unit
 ) {
   val flow = this
+  val currentCollector by rememberUpdatedState(collector)
+
   LaunchedEffect(flow, lifecycle, minActiveState, *keys) {
-    lifecycle.repeatOnLifecycle(minActiveState) {
-      flow.collect { collector(it) }
+    withContext(Dispatchers.Main.immediate) {
+      lifecycle.repeatOnLifecycle(minActiveState) {
+        flow.collect { currentCollector(it) }
+      }
     }
   }
 }

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

@@ -5,6 +5,5 @@ import kotlinx.coroutines.CoroutineDispatcher
 interface AppCoroutineDispatchers {
   val main: CoroutineDispatcher
   val io: CoroutineDispatcher
-  val mainImmediate: CoroutineDispatcher
   val default: CoroutineDispatcher
 }

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

@@ -84,7 +84,7 @@ internal abstract class DataModule {
 
     @Provides
     @BaseUrl
-    fun baseUrl(): String = "https://mvi-coroutines-flow-server.herokuapp.com/"
+    fun baseUrl(): String = "https://mvi-coroutines-flow-server.onrender.com/"
 
     @OptIn(ExperimentalStdlibApi::class)
     @Provides

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

@@ -38,7 +38,6 @@ class UserRepositoryImplRealAPITest : KoinTest {
           object : AppCoroutineDispatchers {
             override val main: CoroutineDispatcher get() = Main
             override val io: CoroutineDispatcher get() = IO
-            override val mainImmediate: CoroutineDispatcher get() = Main.immediate
             override val default: CoroutineDispatcher get() = IO
           }
         }