Add navigation transitions on Android

prof18 · Sep 1, 2023 · fbda070 · fbda070
1 parent 40e76ed
commit fbda070
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/androidApp/src/main/kotlin/com/prof18/feedflow/MainActivity.kt b/androidApp/src/main/kotlin/com/prof18/feedflow/MainActivity.kt
@@ -4,6 +4,9 @@ import FeedFlowTheme
 import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
+import androidx.compose.animation.AnimatedContentTransitionScope.SlideDirection
+import androidx.compose.animation.fadeIn
+import androidx.compose.animation.fadeOut
 import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.material3.MaterialTheme
@@ -57,7 +60,14 @@ class MainActivity : ComponentActivity() {
     @Suppress("LongMethod")
     @Composable
     private fun FeedFlowNavigation(navController: NavHostController) {
-        NavHost(navController = navController, startDestination = Screen.Home.name) {
+        NavHost(
+            navController = navController,
+            startDestination = Screen.Home.name,
+            enterTransition = { fadeIn() + slideIntoContainer(SlideDirection.Start) },
+            exitTransition = { fadeOut() + slideOutOfContainer(SlideDirection.Start) },
+            popEnterTransition = { fadeIn() + slideIntoContainer(SlideDirection.End) },
+            popExitTransition = { fadeOut() + slideOutOfContainer(SlideDirection.End) },
+        ) {
             composable(Screen.Home.name) {
                 HomeScreen(
                     onSettingsButtonClicked = {

diff --git a/androidApp/src/main/kotlin/com/prof18/feedflow/home/components/HomeAppBar.kt b/androidApp/src/main/kotlin/com/prof18/feedflow/home/components/HomeAppBar.kt
@@ -66,7 +66,10 @@ internal fun HomeAppBar(
                 },
                 onMarkAllReadClicked = onMarkAllReadClicked,
                 onClearOldArticlesClicked = onClearOldArticlesClicked,
-                onSettingsButtonClicked = onSettingsButtonClicked,
+                onSettingsButtonClicked = {
+                    showMenu = false
+                    onSettingsButtonClicked()
+                },
                 onForceRefreshClick = onForceRefreshClick,
             )
         },

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -20,7 +20,7 @@ koin = "3.4.2"
 koin-android = "3.4.2"
 koin-compose = "3.4.5"
 kotlin = "1.9.0"
-nav-compose = "2.6.0"
+nav-compose = "2.7.1"
 turbine = "1.0.0"
 versions-ben-manes = "0.44.0"
 viewModel-ktx = "2.6.1"