From 2aa2605b4891595b180960f039efbbfc9506dee2 Mon Sep 17 00:00:00 2001 From: KotlinGeekDev Date: Fri, 18 Apr 2025 14:24:51 +0100 Subject: [PATCH] Migrate Lists route to new navigation setup. --- .../vitorpamplona/amethyst/ui/navigation/AppNavigation.kt | 8 +------- .../vitorpamplona/amethyst/ui/navigation/DrawerContent.kt | 6 +++--- .../com/vitorpamplona/amethyst/ui/navigation/Routes.kt | 7 +------ 3 files changed, 5 insertions(+), 16 deletions(-) diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/AppNavigation.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/AppNavigation.kt index af29b0bd5..e5bc645f2 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/AppNavigation.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/AppNavigation.kt @@ -108,13 +108,7 @@ fun AppNavigation( composable { DiscoverScreen(accountViewModel, nav) } composable { NotificationScreen(sharedPreferencesViewModel, accountViewModel, nav) } - composable( - Route.Lists.route, - enterTransition = { slideInHorizontallyFromEnd }, - exitTransition = { scaleOut }, - popEnterTransition = { scaleIn }, - popExitTransition = { slideOutHorizontallyToEnd }, - ) { ListsScreen(accountViewModel, nav) } + composableFromEnd { ListsScreen(accountViewModel, nav) } composable { NewUserMetadataScreen(nav, accountViewModel) } composable { SearchScreen(accountViewModel, nav) } diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/DrawerContent.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/DrawerContent.kt index 1cad79dc5..71f743db5 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/DrawerContent.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/DrawerContent.kt @@ -452,11 +452,11 @@ fun ListContent( ) NavigationRow( - title = stringRes(Route.Lists.contentDescriptor), - icon = Route.Lists.icon, + title = R.string.my_lists, + icon = R.drawable.format_list_bulleted_type, tint = MaterialTheme.colorScheme.onBackground, nav = nav, - route = Route.Lists.route, + route = Route.Lists, ) NavigationRow( diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/Routes.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/Routes.kt index 3f18e8260..b7c29242a 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/Routes.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/Routes.kt @@ -61,12 +61,7 @@ sealed class Route { @Serializable object Settings : Route() - object Lists : - Route( - route = "Lists", - icon = R.drawable.format_list_bulleted_type, - contentDescriptor = R.string.my_lists, - ) + @Serializable object Lists : Route() @Serializable object EditProfile : Route()