Update to compose destinations 1.11.7

joaomanaia · Nov 24, 2024 · b6b37d5 · b6b37d5
1 parent 89af4ef
commit b6b37d5
Show file tree

Hide file tree

Showing 11 changed files with 45 additions and 41 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -21,7 +21,8 @@
         android:appCategory="game"
         android:isGame="true"
         android:theme="@style/Theme.NewQuiz.Starting"
-        tools:ignore="UnusedAttribute">
+        tools:ignore="UnusedAttribute"
+        android:enableOnBackInvokedCallback="true">
         <activity
             android:name="com.infinitepower.newquiz.ui.main.MainActivity"
             android:exported="true"

diff --git a/app/src/main/java/com/infinitepower/newquiz/core/navigation/AppNavGraphs.kt b/app/src/main/java/com/infinitepower/newquiz/core/navigation/AppNavGraphs.kt
@@ -67,7 +67,7 @@ internal object AppNavGraphs {
 internal fun DestinationScopeWithNoDependencies<*>.currentNavigator(
     remoteConfig: RemoteConfig
 ): CommonNavGraphNavigator {
-    return CommonNavGraphNavigator(navController, remoteConfig)
+    return CommonNavGraphNavigator(destinationsNavigator, navController, remoteConfig)
 }
 
 @Composable

diff --git a/app/src/main/java/com/infinitepower/newquiz/core/navigation/CommonNavGraphNavigator.kt b/app/src/main/java/com/infinitepower/newquiz/core/navigation/CommonNavGraphNavigator.kt
@@ -18,24 +18,26 @@ import com.infinitepower.newquiz.model.wordle.WordleQuizType
 import com.infinitepower.newquiz.multi_choice_quiz.destinations.MultiChoiceQuizScreenDestination
 import com.infinitepower.newquiz.multi_choice_quiz.saved_questions.SavedQuestionsScreenNavigator
 import com.infinitepower.newquiz.wordle.destinations.WordleScreenDestination
-import com.ramcosta.composedestinations.navigation.navigate
+import com.ramcosta.composedestinations.navigation.DestinationsNavigator
+import com.ramcosta.composedestinations.utils.destination
 
 class CommonNavGraphNavigator(
+    private val navigator: DestinationsNavigator,
     private val navController: NavController,
     private val remoteConfig: RemoteConfig
 ) : SavedQuestionsScreenNavigator,
     MazeNavigator,
     DailyChallengeScreenNavigator {
 
     override fun navigateToWordleQuiz(type: WordleQuizType) {
-        navController.navigate(WordleScreenDestination(quizType = type))
+        navigator.navigate(WordleScreenDestination(quizType = type))
     }
 
     override fun navigateToComparisonQuiz(
         category: ComparisonQuizCategory,
         mode: ComparisonMode
     ) {
-        navController.navigate(ComparisonQuizScreenDestination(category.id, mode))
+        navigator.navigate(ComparisonQuizScreenDestination(category.id, mode))
     }
 
     override fun navigateToMultiChoiceQuiz(initialQuestions: ArrayList<MultiChoiceQuestion>) {
@@ -45,7 +47,7 @@ class CommonNavGraphNavigator(
                 if (this == "random") null else this
             }
 
-        navController.navigate(
+        navigator.navigate(
             MultiChoiceQuizScreenDestination(
                 initialQuestions = initialQuestions,
                 difficulty = remoteConfigDifficulty
@@ -60,7 +62,7 @@ class CommonNavGraphNavigator(
                 if (this == "random") null else this
             }
 
-        navController.navigate(
+        navigator.navigate(
             MultiChoiceQuizScreenDestination(
                 difficulty = remoteConfigDifficulty,
                 category = category
@@ -99,21 +101,21 @@ class CommonNavGraphNavigator(
             }
         }
 
-        navController.navigate(destination) {
-            popUpTo(LevelResultsScreenDestination.route) {
+        navigator.navigate(destination) {
+            popUpTo(LevelResultsScreenDestination) {
                 inclusive = true
             }
         }
     }
 
     override fun navigateToMazeResults(itemId: Int) {
-        navController.navigate(LevelResultsScreenDestination(itemId)) {
+        navigator.navigate(LevelResultsScreenDestination(itemId)) {
             launchSingleTop = true
 
             // Remove current screen from back stack
-            val currentRoute = navController.currentDestination?.route
-            if (currentRoute != null) {
-                popUpTo(currentRoute) {
+            val currentDestination = navController.currentBackStackEntry?.destination()
+            if (currentDestination != null) {
+                popUpTo(currentDestination) {
                     inclusive = true
                 }
             }

diff --git a/app/src/main/java/com/infinitepower/newquiz/ui/navigation/CompactNavigationContainer.kt b/app/src/main/java/com/infinitepower/newquiz/ui/navigation/CompactNavigationContainer.kt
@@ -28,12 +28,13 @@ import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.PreviewLightDark
 import androidx.navigation.NavController
-import androidx.navigation.NavGraph.Companion.findStartDestination
 import androidx.navigation.compose.rememberNavController
 import com.infinitepower.newquiz.core.navigation.NavigationItem
 import com.infinitepower.newquiz.core.theme.NewQuizTheme
+import com.infinitepower.newquiz.multi_choice_quiz.destinations.MultiChoiceQuizScreenDestination
 import com.infinitepower.newquiz.ui.components.DiamondsCounter
-import com.ramcosta.composedestinations.navigation.navigate
+import com.ramcosta.composedestinations.navigation.DestinationsNavigator
+import com.ramcosta.composedestinations.navigation.EmptyDestinationsNavigator
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.coroutines.launch
 
@@ -43,6 +44,7 @@ import kotlinx.coroutines.launch
 @Composable
 @ExperimentalMaterial3Api
 internal fun CompactContainer(
+    navigator: DestinationsNavigator,
     navController: NavController,
     primaryItems: ImmutableList<NavigationItem.Item>,
     otherItems: ImmutableList<NavigationItem>,
@@ -72,7 +74,7 @@ internal fun CompactContainer(
                 items = otherItems,
                 onItemClick = { item ->
                     scope.launch { drawerState.close() }
-                    navController.navigate(item.direction)
+                    navigator.navigate(item.direction)
                 },
             )
         }
@@ -134,11 +136,12 @@ private fun CompactBottomBar(
             NavigationBarItem(
                 selected = item == selectedItem,
                 onClick = {
-                    navController.navigate(item.direction) {
+                    navController.navigate(item.direction.route) {
                         // Pop up to the start destination of the graph to
                         // avoid building up a large stack of destinations
                         // on the back stack as users select items
-                        popUpTo(navController.graph.findStartDestination().id)
+                        val startDestination = navController.graph.startDestinationRoute
+                        popUpTo(startDestination ?: MultiChoiceQuizScreenDestination.route)
                         // Avoid multiple copies of the same destination when re-selecting the same item
                         launchSingleTop = true
                     }
@@ -168,6 +171,7 @@ private fun CompactContainerPreview() {
         Surface {
             CompactContainer(
                 navController = rememberNavController(),
+                navigator = EmptyDestinationsNavigator,
                 content = {
                     Text(text = "NewQuiz")
                 },

diff --git a/app/src/main/java/com/infinitepower/newquiz/ui/navigation/ExpandedNavigationContainer.kt b/app/src/main/java/com/infinitepower/newquiz/ui/navigation/ExpandedNavigationContainer.kt
@@ -19,12 +19,11 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
-import androidx.navigation.NavController
-import androidx.navigation.compose.rememberNavController
 import com.infinitepower.newquiz.core.navigation.NavigationItem
 import com.infinitepower.newquiz.core.theme.NewQuizTheme
 import com.infinitepower.newquiz.ui.components.DiamondsCounter
-import com.ramcosta.composedestinations.navigation.navigate
+import com.ramcosta.composedestinations.navigation.DestinationsNavigator
+import com.ramcosta.composedestinations.navigation.EmptyDestinationsNavigator
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.toImmutableList
 
@@ -34,7 +33,7 @@ import kotlinx.collections.immutable.toImmutableList
 @Composable
 @ExperimentalMaterial3Api
 internal fun ExpandedContainer(
-    navController: NavController,
+    navigator: DestinationsNavigator,
     primaryItems: ImmutableList<NavigationItem.Item>,
     otherItems: ImmutableList<NavigationItem>,
     selectedItem: NavigationItem.Item?,
@@ -62,7 +61,7 @@ internal fun ExpandedContainer(
                 selectedItem = selectedItem,
                 items = allNavigationItems,
                 onItemClick = { item ->
-                    navController.navigate(item.direction)
+                    navigator.navigate(item.direction)
                 },
             )
         }
@@ -114,7 +113,7 @@ private fun MediumContainerPreview() {
     NewQuizTheme {
         Surface {
             ExpandedContainer(
-                navController = rememberNavController(),
+                navigator = EmptyDestinationsNavigator,
                 content = {
                     Text(text = "NewQuiz")
                 },

diff --git a/app/src/main/java/com/infinitepower/newquiz/ui/navigation/MediumNavigationContainer.kt b/app/src/main/java/com/infinitepower/newquiz/ui/navigation/MediumNavigationContainer.kt
@@ -29,12 +29,11 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
-import androidx.navigation.NavController
-import androidx.navigation.compose.rememberNavController
 import com.infinitepower.newquiz.core.navigation.NavigationItem
 import com.infinitepower.newquiz.core.theme.NewQuizTheme
 import com.infinitepower.newquiz.ui.components.DiamondsCounter
-import com.ramcosta.composedestinations.navigation.navigate
+import com.ramcosta.composedestinations.navigation.DestinationsNavigator
+import com.ramcosta.composedestinations.navigation.EmptyDestinationsNavigator
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.coroutines.launch
 
@@ -44,7 +43,7 @@ import kotlinx.coroutines.launch
 @Composable
 @ExperimentalMaterial3Api
 internal fun MediumContainer(
-    navController: NavController,
+    navigator: DestinationsNavigator,
     primaryItems: ImmutableList<NavigationItem.Item>,
     otherItems: ImmutableList<NavigationItem>,
     selectedItem: NavigationItem.Item?,
@@ -73,7 +72,7 @@ internal fun MediumContainer(
                 items = otherItems,
                 onItemClick = { item ->
                     scope.launch { drawerState.close() }
-                    navController.navigate(item.direction)
+                    navigator.navigate(item.direction)
                 }
             )
         }
@@ -96,7 +95,7 @@ internal fun MediumContainer(
                 primaryItems.forEach { item ->
                     NavigationRailItem(
                         selected = item == selectedItem,
-                        onClick = { navController.navigate(item.direction) },
+                        onClick = { navigator.navigate(item.direction) },
                         icon = {
                             Icon(
                                 imageVector = item.getIcon(item == selectedItem),
@@ -155,7 +154,7 @@ private fun MediumContainerPreview() {
     NewQuizTheme {
         Surface {
             MediumContainer(
-                navController = rememberNavController(),
+                navigator = EmptyDestinationsNavigator,
                 content = {
                     Text(text = "NewQuiz")
                 },

diff --git a/app/src/main/java/com/infinitepower/newquiz/ui/navigation/NavigationContainer.kt b/app/src/main/java/com/infinitepower/newquiz/ui/navigation/NavigationContainer.kt
@@ -1,6 +1,5 @@
 package com.infinitepower.newquiz.ui.navigation
 
-import androidx.compose.foundation.layout.ExperimentalLayoutApi
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.material.icons.Icons
@@ -42,6 +41,7 @@ import com.infinitepower.newquiz.multi_choice_quiz.destinations.MultiChoiceQuizL
 import com.infinitepower.newquiz.wordle.destinations.WordleListScreenDestination
 import com.ramcosta.composedestinations.spec.DestinationSpec
 import com.ramcosta.composedestinations.utils.currentDestinationAsState
+import com.ramcosta.composedestinations.utils.rememberDestinationsNavigator
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.persistentListOf
 import kotlinx.coroutines.launch
@@ -110,7 +110,6 @@ private fun List<NavigationItem>.getNavigationItemBy(
 ): NavigationItem.Item? = filterIsInstance<NavigationItem.Item>()
     .find { item -> item.direction == route }
 
-@OptIn(ExperimentalLayoutApi::class)
 @Composable
 @ExperimentalMaterial3Api
 internal fun NavigationContainer(
@@ -122,6 +121,7 @@ internal fun NavigationContainer(
 ) {
     val scope = rememberCoroutineScope()
 
+    val navigator = navController.rememberDestinationsNavigator()
     val destination by navController.currentDestinationAsState()
 
     val primaryItems = remember { getPrimaryItems() }
@@ -162,6 +162,7 @@ internal fun NavigationContainer(
     if (navigationVisible) {
         when (windowWidthSize) {
             WindowWidthSizeClass.Compact -> CompactContainer(
+                navigator = navigator,
                 navController = navController,
                 primaryItems = primaryItems,
                 otherItems = otherItems,
@@ -172,7 +173,7 @@ internal fun NavigationContainer(
             )
 
             WindowWidthSizeClass.Medium -> MediumContainer(
-                navController = navController,
+                navigator = navigator,
                 primaryItems = primaryItems,
                 otherItems = otherItems,
                 selectedItem = selectedItem,
@@ -182,7 +183,7 @@ internal fun NavigationContainer(
             )
 
             WindowWidthSizeClass.Expanded -> ExpandedContainer(
-                navController = navController,
+                navigator = navigator,
                 primaryItems = primaryItems,
                 otherItems = otherItems,
                 selectedItem = selectedItem,

diff --git a/...n-quiz/src/main/java/com/infinitepower/newquiz/comparison_quiz/ui/ComparisonQuizScreen.kt b/...n-quiz/src/main/java/com/infinitepower/newquiz/comparison_quiz/ui/ComparisonQuizScreen.kt
@@ -126,7 +126,7 @@ fun ComparisonQuizScreen(
                     comparisonMode = comparisonMode
                 )
             ) {
-                popUpTo(ComparisonQuizScreenDestination.route) {
+                popUpTo(ComparisonQuizScreenDestination) {
                     inclusive = true
                 }
             }

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -5,7 +5,7 @@ androidGradlePlugin = "8.7.2"
 androidxAnnotation = "1.9.1"
 androidxActivity = "1.9.3"
 androidxAppCompat = "1.7.0"
-androidxCoreKtx = "1.13.1"
+androidxCoreKtx = "1.15.0"
 androidxCoreSplashscreen = "1.0.1"
 androidxComposeCompiler = "1.5.14"
 androidxComposeBom = "2024.11.00"
@@ -18,8 +18,8 @@ androidxTestRules = "1.6.1"
 androidxTestRunner = "1.6.1"
 androidxTracing = "1.2.0"
 coil = "2.7.0"
-composeDestinations = "1.10.2"
-constraintlayoutCompose = "1.0.1"
+composeDestinations = "1.11.7"
+constraintlayoutCompose = "1.1.0"
 firebaseCrashlyticsPlugin = "3.0.2"
 firebasePerfPlugin = "1.4.2"
 gmsPlugin = "4.4.2"

diff --git a/...e-quiz/src/main/java/com/infinitepower/newquiz/multi_choice_quiz/MultiChoiceQuizScreen.kt b/...e-quiz/src/main/java/com/infinitepower/newquiz/multi_choice_quiz/MultiChoiceQuizScreen.kt
@@ -49,7 +49,6 @@ import com.infinitepower.newquiz.multi_choice_quiz.destinations.MultiChoiceQuizS
 import com.ramcosta.composedestinations.annotation.DeepLink
 import com.ramcosta.composedestinations.annotation.Destination
 import com.ramcosta.composedestinations.navigation.DestinationsNavigator
-import com.ramcosta.composedestinations.navigation.popUpTo
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
 import kotlin.time.Duration.Companion.seconds

diff --git a/.../java/com/infinitepower/newquiz/multi_choice_quiz/results/MultiChoiceQuizResultsScreen.kt b/.../java/com/infinitepower/newquiz/multi_choice_quiz/results/MultiChoiceQuizResultsScreen.kt
@@ -59,7 +59,6 @@ import com.infinitepower.newquiz.multi_choice_quiz.destinations.MultiChoiceQuizR
 import com.infinitepower.newquiz.multi_choice_quiz.destinations.MultiChoiceQuizScreenDestination
 import com.ramcosta.composedestinations.annotation.Destination
 import com.ramcosta.composedestinations.navigation.DestinationsNavigator
-import com.ramcosta.composedestinations.navigation.popUpTo
 import kotlinx.serialization.json.Json
 import com.infinitepower.newquiz.core.R as CoreR