pr fixes

Author: Mihilih

app/src/main/java/com/cornellappdev/transit/ui/NavigationController.kt

@@ -47,18 +47,19 @@ fun NavigationController(
         }
 
         composable("settings") {
-            SettingsScreen { route ->
-                navController.navigate(route)
-            }
+            SettingsScreen (
+                onAboutClick = {navController.navigate("about")},
+                onSupportClick = {navController.navigate("support")},
+                onNotificationsAndPrivacyClick = {navController.navigate("notifs_privacy")})
         }
 
         composable("about") {
             AboutScreen()
         }
 
         composable("notifs_privacy") {
-            NotifsAndPrivacyScreen { route ->
-                navController.navigate(route)
+            NotifsAndPrivacyScreen {
+                navController.navigate("privacy_settings")
             }
         }
 

app/src/main/java/com/cornellappdev/transit/ui/components/PrivacyOptionItem.kt

@@ -67,7 +67,7 @@ fun PrivacyOptionItem(text: String, subtext: String = "", onClick: () -> Unit =
 
 @Preview(showBackground = true)
 @Composable
-fun PrivacyOptionItemPreview() {
+private fun PrivacyOptionItemPreview() {
     PrivacyOptionItem(
         text = "Privacy Policy",
         subtext = "Learn more about how we handle your data",

app/src/main/java/com/cornellappdev/transit/ui/components/SwitchItem.kt

@@ -38,7 +38,6 @@ fun SwitchItem(
     isChecked: Boolean,
     onCheckedChange: (Boolean) -> Unit
 ) {
-    //var isChecked by remember { mutableStateOf(true) }
     Row(
         modifier = Modifier
             .fillMaxWidth(),

app/src/main/java/com/cornellappdev/transit/ui/screens/SettingsScreen.kt

@@ -29,7 +29,9 @@ import com.cornellappdev.transit.ui.theme.robotoFamily
  * Composable for Settings Screen, which displays a list of settings options and app information.
  * **/
 @Composable
-fun SettingsScreen(onNavigate: (String) -> Unit) {
+fun SettingsScreen(onSupportClick: () -> Unit,
+                   onAboutClick: () -> Unit,
+                   onNotificationsAndPrivacyClick: () -> Unit ){
     Column(
         modifier = Modifier
             .fillMaxSize()
@@ -50,14 +52,14 @@ fun SettingsScreen(onNavigate: (String) -> Unit) {
             name = "About Transit",
             description = "Learn more about the team behind the app",
             icon = R.drawable.appdev_gray,
-            onClick = { onNavigate("about") })
+            onClick = { onAboutClick() })
         HorizontalDivider(thickness = 0.5.dp)
 
         SettingsPageItem(
             name = "Notifications and Privacy",
             description = "Manage permissions and analytics",
             icon = R.drawable.lock,
-            onClick = { onNavigate("notifs_privacy") }
+            onClick = { onNotificationsAndPrivacyClick() }
         )
 
         HorizontalDivider(thickness = 0.5.dp)
@@ -66,7 +68,7 @@ fun SettingsScreen(onNavigate: (String) -> Unit) {
             name = "Support",
             description = "Report issues and contact us",
             icon = R.drawable.help_outline,
-            onClick = { onNavigate("support") },
+            onClick = { onSupportClick() },
         )
     }
     Box(modifier = Modifier.fillMaxSize()) {
@@ -87,8 +89,5 @@ fun SettingsScreen(onNavigate: (String) -> Unit) {
 @Preview(showBackground = true)
 @Composable
 private fun SettingsScreenPreview() {
-    val navController = NavController(LocalContext.current)
-    SettingsScreen { route ->
-        navController.navigate(route)
-    }
+    SettingsScreen({}, {}, {})
 }

app/src/main/java/com/cornellappdev/transit/ui/screens/settings/NotifsAndPrivacyScreen.kt

@@ -29,7 +29,7 @@ import com.cornellappdev.transit.ui.theme.robotoFamily
  * notification settings and links to privacy settings
  * **/
 @Composable
-fun NotifsAndPrivacyScreen(onNavigate: (String) -> Unit) {
+fun NotifsAndPrivacyScreen(onPrivacyCLick: () -> Unit) {
 
     var pauseAllNotifs by remember { mutableStateOf(false) }
     var busNotifs by remember { mutableStateOf(false) }
@@ -92,7 +92,7 @@ fun NotifsAndPrivacyScreen(onNavigate: (String) -> Unit) {
         PrivacyOptionItem(
             text = "Privacy Settings",
             subtext = "",
-            onClick = { onNavigate("privacy_settings") },
+            onClick = { onPrivacyCLick() },
             icon = Icons.Outlined.KeyboardArrowRight
         )
 
@@ -104,8 +104,5 @@ fun NotifsAndPrivacyScreen(onNavigate: (String) -> Unit) {
 @Preview(showBackground = true)
 @Composable
 private fun NotifsAndPrivacyScreenPreview() {
-    val navController = NavController(LocalContext.current)
-    NotifsAndPrivacyScreen { route ->
-        navController.navigate(route)
-    }
+    NotifsAndPrivacyScreen {}
 }