Use new Gesture Navigation CircuitX library (#1494)

chrisbanes · Sep 5, 2023 · 5aa88ac · 5aa88ac
1 parent 1ab9e93
commit 5aa88ac
Show file tree

Hide file tree

Showing 8 changed files with 5 additions and 589 deletions.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -69,6 +69,7 @@ appauth = "net.openid:appauth:0.8.1"
 chucker-library = { module = "com.github.chuckerteam.chucker:library", version.ref = "chucker" }
 
 circuit-foundation = { module = "com.slack.circuit:circuit-foundation", version.ref = "circuit" }
+circuit-gestureNavigation = { module = "com.slack.circuit:circuitx-gesture-navigation", version.ref = "circuit" }
 circuit-overlay = { module = "com.slack.circuit:circuit-overlay", version.ref = "circuit" }
 circuit-runtime = { module = "com.slack.circuit:circuit-runtime", version.ref = "circuit" }
 

diff --git a/ui/root/build.gradle.kts b/ui/root/build.gradle.kts
@@ -25,13 +25,12 @@ kotlin {
 
                 implementation(projects.common.ui.screens)
                 implementation(libs.circuit.foundation)
+                implementation(libs.circuit.gestureNavigation)
                 implementation(libs.circuit.overlay)
                 implementation(projects.common.ui.circuitOverlay)
 
                 implementation(compose.foundation)
-                implementation(compose.material)
                 implementation(compose.materialIconsExtended)
-                implementation(compose.animation)
             }
         }
 

diff --git a/ui/root/src/androidMain/kotlin/app/tivi/home/GestureNavDecoration.kt b/ui/root/src/androidMain/kotlin/app/tivi/home/GestureNavDecoration.kt
diff --git a/ui/root/src/commonMain/kotlin/app/tivi/home/GestureNavDecoration.kt b/ui/root/src/commonMain/kotlin/app/tivi/home/GestureNavDecoration.kt
diff --git a/ui/root/src/commonMain/kotlin/app/tivi/home/Home.kt b/ui/root/src/commonMain/kotlin/app/tivi/home/Home.kt
@@ -51,7 +51,6 @@ import app.tivi.screens.DiscoverScreen
 import app.tivi.screens.LibraryScreen
 import app.tivi.screens.SearchScreen
 import app.tivi.screens.UpNextScreen
-import app.tivi.util.Logger
 import com.moriatsushi.insetsx.navigationBars
 import com.moriatsushi.insetsx.safeContentPadding
 import com.moriatsushi.insetsx.statusBars
@@ -62,12 +61,12 @@ import com.slack.circuit.foundation.NavigableCircuitContent
 import com.slack.circuit.overlay.ContentWithOverlays
 import com.slack.circuit.runtime.Navigator
 import com.slack.circuit.runtime.screen.Screen
+import com.slack.circuitx.gesturenavigation.GestureNavigationDecoration
 
 @Composable
 internal fun Home(
     backstack: SaveableBackStack,
     navigator: Navigator,
-    logger: Logger,
     modifier: Modifier = Modifier,
 ) {
     val windowSizeClass = LocalWindowSizeClass.current
@@ -134,8 +133,8 @@ internal fun Home(
                 NavigableCircuitContent(
                     navigator = navigator,
                     backstack = backstack,
-                    decoration = remember(navigator, logger) {
-                        GestureNavDecoration(navigator, logger)
+                    decoration = remember(navigator) {
+                        GestureNavigationDecoration(onBackInvoked = navigator::pop)
                     },
                     modifier = Modifier
                         .weight(1f)

diff --git a/ui/root/src/commonMain/kotlin/app/tivi/home/TiviContent.kt b/ui/root/src/commonMain/kotlin/app/tivi/home/TiviContent.kt
@@ -94,7 +94,6 @@ fun TiviContent(
                     Home(
                         backstack = backstack,
                         navigator = tiviNavigator,
-                        logger = logger,
                         modifier = modifier,
                     )
                 }