Added BackHandler implementation to the Android InternalNavContainer …

…functions and made ComposeStackNavigatorByContent.goBack() function not Composable
chRyNaN · Jan 1, 2022 · 04cb5cb · 04cb5cb
1 parent 288254d
commit 04cb5cb
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 2 deletions.
diff --git a/navigation-compose/build.gradle.kts b/navigation-compose/build.gradle.kts
@@ -48,6 +48,7 @@ kotlin {
  dependencies {
  implementation(compose.ui)
  implementation(compose.material)
+ implementation("androidx.activity:activity-compose:1.4.0")
  }
  }
  val jsMain by getting {

diff --git a/...tion-compose/src/androidMain/kotlin/com.chrynan.navigation.compose/AndroidNavContainer.kt b/...tion-compose/src/androidMain/kotlin/com.chrynan.navigation.compose/AndroidNavContainer.kt
@@ -1,5 +1,6 @@
 package com.chrynan.navigation.compose
 
+import androidx.activity.compose.BackHandler
 import androidx.compose.foundation.layout.Box
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
@@ -22,6 +23,8 @@ internal actual fun <Scope, Key> InternalNavContainer(
  scope.content(contentKey)
  }
  }
+
+ BackHandler { navigator.goBack() }
 }
 
 @Composable
@@ -37,4 +40,6 @@ internal actual fun <Scope, Key, NavigationScope : ComposeNavigationKeyScope<Key
  scope.content(contentKey)
  }
  }
+
+ BackHandler { navigator.goBack() }
 }
diff --git a/navigation-compose/src/commonMain/kotlin/com.chrynan.navigation.compose/ComposeNavigator.kt b/navigation-compose/src/commonMain/kotlin/com.chrynan.navigation.compose/ComposeNavigator.kt
@@ -70,7 +70,6 @@ interface ComposeStackNavigator<T> : ComposeNavigator<T> {
 interface ComposeStackNavigatorByContent<T> : ComposeStackNavigator<T>,
  ComposeNavigatorByContent<T> {
 
- @Composable
  fun goBack(): Boolean
 
  companion object

diff --git a/...rc/commonMain/kotlin/com.chrynan.navigation.compose/ComposeNavigatorByContentViewModel.kt b/...rc/commonMain/kotlin/com.chrynan.navigation.compose/ComposeNavigatorByContentViewModel.kt
@@ -93,7 +93,6 @@ class ComposeNavigatorByContentViewModel<Scope, Key> internal constructor(
  }
  }
 
- @Composable
  override fun goBack(): Boolean {
  val wentBack = canGoBack()