Skip to content

Commit 519d89b

Browse files
committed
pr fixes
1 parent c45cd18 commit 519d89b

3 files changed

Lines changed: 8 additions & 10 deletions

File tree

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,9 @@ fun NavigationController(
5858
}
5959

6060
composable("notifs_privacy") {
61-
NotifsAndPrivacyScreen {
62-
navController.navigate("privacy_settings")
63-
}
61+
NotifsAndPrivacyScreen (
62+
onPrivacyClick = {navController.navigate("privacy_settings")}
63+
)
6464
}
6565

6666
composable("privacy_settings") {

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,14 +52,14 @@ fun SettingsScreen(onSupportClick: () -> Unit,
5252
name = "About Transit",
5353
description = "Learn more about the team behind the app",
5454
icon = R.drawable.appdev_gray,
55-
onClick = { onAboutClick() })
55+
onClick = onAboutClick)
5656
HorizontalDivider(thickness = 0.5.dp)
5757

5858
SettingsPageItem(
5959
name = "Notifications and Privacy",
6060
description = "Manage permissions and analytics",
6161
icon = R.drawable.lock,
62-
onClick = { onNotificationsAndPrivacyClick() }
62+
onClick = onNotificationsAndPrivacyClick
6363
)
6464

6565
HorizontalDivider(thickness = 0.5.dp)
@@ -68,7 +68,7 @@ fun SettingsScreen(onSupportClick: () -> Unit,
6868
name = "Support",
6969
description = "Report issues and contact us",
7070
icon = R.drawable.help_outline,
71-
onClick = { onSupportClick() },
71+
onClick = onSupportClick
7272
)
7373
}
7474
Box(modifier = Modifier.fillMaxSize()) {

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,10 @@ import androidx.compose.runtime.mutableStateOf
1313
import androidx.compose.runtime.remember
1414
import androidx.compose.runtime.setValue
1515
import androidx.compose.ui.Modifier
16-
import androidx.compose.ui.platform.LocalContext
1716
import androidx.compose.ui.text.font.FontWeight
1817
import androidx.compose.ui.tooling.preview.Preview
1918
import androidx.compose.ui.unit.dp
2019
import androidx.compose.ui.unit.sp
21-
import androidx.navigation.NavController
2220
import com.cornellappdev.transit.ui.components.PrivacyOptionItem
2321
import com.cornellappdev.transit.ui.components.SwitchItem
2422
import com.cornellappdev.transit.ui.theme.TransitBlue
@@ -29,7 +27,7 @@ import com.cornellappdev.transit.ui.theme.robotoFamily
2927
* notification settings and links to privacy settings
3028
* **/
3129
@Composable
32-
fun NotifsAndPrivacyScreen(onPrivacyCLick: () -> Unit) {
30+
fun NotifsAndPrivacyScreen(onPrivacyClick: () -> Unit) {
3331

3432
var pauseAllNotifs by remember { mutableStateOf(false) }
3533
var busNotifs by remember { mutableStateOf(false) }
@@ -92,7 +90,7 @@ fun NotifsAndPrivacyScreen(onPrivacyCLick: () -> Unit) {
9290
PrivacyOptionItem(
9391
text = "Privacy Settings",
9492
subtext = "",
95-
onClick = { onPrivacyCLick() },
93+
onClick = { onPrivacyClick() },
9694
icon = Icons.Outlined.KeyboardArrowRight
9795
)
9896

0 commit comments

Comments
 (0)