more navigation stuff

prapooskur · Jan 20, 2024 · ddb3dc2 · ddb3dc2
1 parent fc56278
commit ddb3dc2
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 2 deletions.
diff --git a/android/app/src/main/java/com/pras/slugcourses/DetailedResultsScreen.kt b/android/app/src/main/java/com/pras/slugcourses/DetailedResultsScreen.kt
@@ -10,13 +10,17 @@ import androidx.compose.material3.rememberTopAppBarState
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
+import androidx.navigation.NavHostController
 import androidx.navigation.compose.rememberNavController
 import com.pras.slugcourses.api.CourseInfo
 import com.pras.slugcourses.ui.elements.CollapsingLargeTopBar
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
-fun DetailedResultsScreen(courseInfo: CourseInfo) {
+fun DetailedResultsScreen(
+    navController: NavHostController,
+    courseNumber: String
+) {
     val courseName = "${courseInfo.primary_section.subject} ${courseInfo.primary_section.catalog_nbr}"
     val scrollBehavior = TopAppBarDefaults.exitUntilCollapsedScrollBehavior(
         rememberTopAppBarState(),

diff --git a/android/app/src/main/java/com/pras/slugcourses/MainActivity.kt b/android/app/src/main/java/com/pras/slugcourses/MainActivity.kt
@@ -39,7 +39,10 @@ import androidx.navigation.NavController
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
 import androidx.navigation.compose.rememberNavController
+import com.pras.slugcourses.api.Status
+import com.pras.slugcourses.api.Type
 import com.pras.slugcourses.ui.theme.SlugCoursesTheme
+import kotlinx.serialization.json.Json
 
 private const val TAG = "MainActivity"
 
@@ -154,7 +157,27 @@ fun Init(startDestination: String) {
                         enterTransition = { fadeIn() },
                         exitTransition = { fadeOut() }
                     ) { backStackEntry ->
-                        ResultsScreen(navController = navController)
+                        val term = backStackEntry.arguments?.getString("term")?.toInt() ?: 2240
+                        val query = backStackEntry.arguments?.getString("query") ?: ""
+                        val status = Json.decodeFromString<Status>(backStackEntry.arguments?.getString("status") ?: "[]")
+                        val type = Json.decodeFromString<List<Type>>(backStackEntry.arguments?.getString("type") ?: "[]")
+                        val gened = Json.decodeFromString<List<String>>(backStackEntry.arguments?.getString("gened") ?: "[]")
+                        ResultsScreen(
+                            navController = navController,
+                            term = term,
+                            query = query ?: "",
+                            status = status,
+                            type = type,
+                            genEd = gened
+                        )
+                    }
+                    composable(
+                        "detailed/{courseNumber}",
+                        enterTransition = { fadeIn() },
+                        exitTransition = { fadeOut() }
+                    ) { backStackEntry ->
+                        val courseNumber = backStackEntry.arguments?.getString("courseNumber") ?: ""
+                        DetailedResultsScreen(navController = navController, courseNumber = courseNumber)
                     }
                     composable(
                         "chat",