#220 implement update navigation routes for trending buttons pr

daniebeler · Feb 19, 2025 · 45df35f · 45df35f
1 parent 2688b6c
commit 45df35f
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 12 deletions.
diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/app/src/commonMain/kotlin/com/daniebeler/pfpixelix/App.kt b/app/src/commonMain/kotlin/com/daniebeler/pfpixelix/App.kt
@@ -401,8 +401,11 @@ private fun NavGraphBuilder.navigationGraph(
         }
     }
 
-    composable(Destinations.Search.route) {
-        ExploreComposable(navController)
+    composable(Destinations.Search.route) { navBackStackEntry ->
+        val initialPage = navBackStackEntry.arguments?.getString("initialPage")
+        initialPage?.let {
+            ExploreComposable(navController, it.toIntOrNull() ?: 0)
+        }
     }
 
     composable(Destinations.Conversation.route) {

diff --git a/app/src/commonMain/kotlin/com/daniebeler/pfpixelix/common/Destinations.kt b/app/src/commonMain/kotlin/com/daniebeler/pfpixelix/common/Destinations.kt
@@ -57,7 +57,7 @@ sealed class Destinations(
     )
 
     data object Search : Destinations(
-        route = "search_screen",
+        route = "search_screen/{initialPage}",
         icon = Res.drawable.search_outline,
         activeIcon = Res.drawable.search,
         label = Res.string.search

diff --git a/...rc/commonMain/kotlin/com/daniebeler/pfpixelix/ui/composables/explore/ExploreComposable.kt b/...rc/commonMain/kotlin/com/daniebeler/pfpixelix/ui/composables/explore/ExploreComposable.kt
@@ -85,6 +85,7 @@ import pixelix.app.generated.resources.search_outline
 @Composable
 fun ExploreComposable(
     navController: NavController,
+    initialPage: Int = 0,
     viewModel: ExploreViewModel = injectViewModel(key = "search-viewmodel-key") { exploreViewModel }
 ) {
     val context: KmpContext = LocalKmpContext.current
@@ -206,10 +207,9 @@ fun ExploreComposable(
                     navController = navController
                 )
             } else {
-                TrendingComposable(navController)
+                TrendingComposable(navController, initialPage = initialPage)
             }
         }
-
     }
 }
 

diff --git a/...ain/kotlin/com/daniebeler/pfpixelix/ui/composables/explore/trending/TrendingComposable.kt b/...ain/kotlin/com/daniebeler/pfpixelix/ui/composables/explore/trending/TrendingComposable.kt
@@ -47,9 +47,9 @@ import pixelix.app.generated.resources.what_makes_an_account_trend
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
-fun TrendingComposable(navController: NavController) {
+fun TrendingComposable(navController: NavController, initialPage: Int) {
 
-    val pagerState = rememberPagerState(initialPage = 0, pageCount = { 3 })
+    val pagerState = rememberPagerState(initialPage = initialPage, pageCount = { 3 })
 
     val scope = rememberCoroutineScope()
 

diff --git a/...ommonMain/kotlin/com/daniebeler/pfpixelix/ui/composables/followers/FollowingComposable.kt b/...ommonMain/kotlin/com/daniebeler/pfpixelix/ui/composables/followers/FollowingComposable.kt
@@ -80,7 +80,7 @@ fun FollowingComposable(
                 message = message,
                 buttonText = stringResource(Res.string.explore_trending_profiles),
                 onClick = {
-                    Navigate.navigate("trending_screen/accounts", navController)
+                    Navigate.navigate("search_screen/1", navController)
                 })
         )
     }

diff --git a/...iebeler/pfpixelix/ui/composables/settings/followed_hashtags/FollowedHashtagsComposable.kt b/...iebeler/pfpixelix/ui/composables/settings/followed_hashtags/FollowedHashtagsComposable.kt
@@ -89,7 +89,7 @@ fun FollowedHashtagsComposable(
                             message = "Followed hashtags will appear here",
                             buttonText = "Explore trending hashtags",
                             onClick = {
-                                Navigate.navigate("trending_screen/hashtags", navController)
+                                Navigate.navigate("search_screen/2", navController)
                             })
                     )
                 }

diff --git a/...com/daniebeler/pfpixelix/ui/composables/timelines/home_timeline/HomeTimelineComposable.kt b/...com/daniebeler/pfpixelix/ui/composables/timelines/home_timeline/HomeTimelineComposable.kt
@@ -35,7 +35,7 @@ fun HomeTimelineComposable(
                 message = stringResource(Res.string.follow_accounts_or_hashtags_to_fill_your_home_timeline),
                 buttonText = stringResource(Res.string.explore_trending_profiles),
                 onClick = {
-                    Navigate.navigate("trending_screen/accounts", navController)
+                    Navigate.navigate("search_screen/1", navController)
                 }),
             getItemsPaginated = {
                 viewModel.getItemsPaginated()