Merge pull request #14 from hoc081098/lifecycle

Lifecycle

.github/workflows/build.yml

@@ -67,7 +67,6 @@ jobs:
       # ./gradlew :navigation-core:build --stacktrace
       - name: Build
         run: |
-          ./gradlew :khonshu-navigation-core:compileKotlinJvm :khonshu-navigation-core:compileDebugKotlinAndroid :khonshu-navigation-core:compileKotlinIosX64 --stacktrace
           ./gradlew :navigation:compileKotlinJvm :navigation:compileDebugKotlinAndroid :navigation:compileKotlinIosX64 --stacktrace
 
 #      - name: Kover Xml Report

.github/workflows/sample.yml

@@ -66,6 +66,7 @@ jobs:
         os: [ macos-12 ]
     runs-on: ${{ matrix.os }}
     timeout-minutes: 30
+    if: ${{ false }}
     steps:
       - uses: actions/checkout@v3
 

gradle/libs.versions.toml

@@ -79,6 +79,7 @@ koin-androidx-compose = { module = "io.insert-koin:koin-androidx-compose", versi
 coil-compose = { module = "io.coil-kt:coil-compose", version.ref = "coil" }
 compose-rules-detekt = { module = "io.nlopez.compose.rules:detekt", version.ref = "compose-rules-detekt" }
 
+androidx-lifecycle-runtime-ktx = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version.ref = "androidx-lifecycle" }
 androidx-lifecycle-viewmodel = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version.ref = "androidx-lifecycle" }
 androidx-lifecycle-viewmodel-savedstate = { module = "androidx.lifecycle:lifecycle-viewmodel-savedstate", version.ref = "androidx-lifecycle" }
 androidx-lifecycle-runtime-compose = { module = "androidx.lifecycle:lifecycle-runtime-compose", version = "androidx-lifecycle" }

khonshu-navigation-core/build.gradle.kts

@@ -73,7 +73,9 @@ kotlin {
     commonMain {
       dependencies {
         api(compose.runtime)
+        api(compose.ui)
 
+        api(projects.lifecycle)
         api(libs.kmp.viewmodel.core)
         api(libs.kmp.viewmodel.savedstate)
         api(libs.kmp.viewmodel.compose)

khonshu-navigation-core/src/commonMain/kotlin/com/hoc081098/solivagant/navigation/EXTRA_ROUTE.kt

@@ -5,4 +5,5 @@ import com.hoc081098.solivagant.navigation.internal.InternalNavigationApi
 
 @InternalNavigationApi
 @Stable
+@Suppress("TopLevelPropertyNaming")
 public const val EXTRA_ROUTE: String = "com.hoc081098.solivagant.navigation.ROUTE"

khonshu-navigation-core/src/commonMain/kotlin/com/hoc081098/solivagant/navigation/NavEventNavigator.kt

@@ -112,6 +112,7 @@ public interface BackInterceptor {
  * the correct events were emitted.
  */
 @MainThread
+@Suppress("TooManyFunctions")
 public open class NavEventNavigator : Navigator, ResultNavigator, BackInterceptor {
 
   private val _navEvents = Channel<NavEvent>(Channel.UNLIMITED)
@@ -131,8 +132,12 @@ public open class NavEventNavigator : Navigator, ResultNavigator, BackIntercepto
    *
    * Note: You must call this before [NavigationSetup] is called with this navigator."
    */
-  protected inline fun <reified T : BaseRoute, reified O : Parcelable> registerForNavigationResult(): NavigationResultRequest<O> {
-    return registerForNavigationResult(DestinationId(T::class), O::class.qualifiedName!!)
+  protected inline fun <
+    reified T : BaseRoute,
+    reified O : Parcelable,
+    > registerForNavigationResult(): NavigationResultRequest<O> {
+    // TODO(js): cannot use qualifiedName
+    return registerForNavigationResult(DestinationId(T::class), O::class.simpleName!!)
   }
 
   @PublishedApi
@@ -141,7 +146,8 @@ public open class NavEventNavigator : Navigator, ResultNavigator, BackIntercepto
     resultType: String,
   ): NavigationResultRequest<O> {
     checkAllowedToAddRequests()
-    val requestKey = "${id.route.qualifiedName!!}-$resultType"
+    // TODO(js): cannot use qualifiedName
+    val requestKey = "${id.route.simpleName!!}-$resultType"
     val key = NavigationResultRequest.Key<O>(id, requestKey)
     val request = NavigationResultRequest(key)
     _navigationResultRequests.add(request)

khonshu-navigation-core/src/commonMain/kotlin/com/hoc081098/solivagant/navigation/NavigationSetup.kt

@@ -7,14 +7,15 @@ import androidx.compose.runtime.ProvidableCompositionLocal
 import androidx.compose.runtime.staticCompositionLocalOf
 import com.hoc081098.kmp.viewmodel.parcelable.Parcelable
 import com.hoc081098.kmp.viewmodel.parcelable.Parcelize
+import com.hoc081098.solivagant.lifecycle.Lifecycle
+import com.hoc081098.solivagant.lifecycle.LifecycleOwner
+import com.hoc081098.solivagant.lifecycle.LocalLifecycleOwner
+import com.hoc081098.solivagant.lifecycle.repeatOnLifecycle
 import com.hoc081098.solivagant.navigation.internal.InternalNavigationApi
-import com.hoc081098.solivagant.navigation.internal.LifecycleOwner
 import com.hoc081098.solivagant.navigation.internal.NavEvent
 import com.hoc081098.solivagant.navigation.internal.NavigationExecutor
 import com.hoc081098.solivagant.navigation.internal.VisibleForTesting
 import com.hoc081098.solivagant.navigation.internal.currentBackPressedDispatcher
-import com.hoc081098.solivagant.navigation.internal.currentLifecycleOwner
-import com.hoc081098.solivagant.navigation.internal.repeatOnResumeLifecycle
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 
@@ -41,7 +42,7 @@ public fun NavigationSetup(navigator: NavEventNavigator) {
     }
   }
 
-  val lifecycleOwner = currentLifecycleOwner()
+  val lifecycleOwner = LocalLifecycleOwner.current
   LaunchedEffect(lifecycleOwner, executor, navigator) {
     navigator.collectAndHandleNavEvents(lifecycleOwner, executor)
   }
@@ -63,7 +64,7 @@ internal suspend fun NavEventNavigator.collectAndHandleNavEvents(
   // whichever comes first. Basically, it has some certain delay compared to [Dispatchers.Main.immediate].
   // So we must switch to [Dispatchers.Main.immediate] before collecting events.
   withContext(Dispatchers.Main.immediate) {
-    lifecycleOwner.repeatOnResumeLifecycle {
+    lifecycleOwner.repeatOnLifecycle(state = Lifecycle.State.RESUMED) {
       navEvents.collect { event ->
         executor.navigateTo(event)
       }
@@ -131,6 +132,7 @@ internal suspend fun <R : Parcelable> NavigationExecutor.collectAndHandleNavigat
 @Parcelize
 private object InitialValue : Parcelable
 
+@Suppress("CompositionLocalAllowlist")
 @InternalNavigationApi
 public val LocalNavigationExecutor: ProvidableCompositionLocal<NavigationExecutor> = staticCompositionLocalOf {
   throw IllegalStateException("Can't use NavEventNavigationHandler outside of a navigator NavHost")