Skip to content

Commit c059814

Browse files
committed
Fix various github action erros
1 parent 460a370 commit c059814

File tree

5 files changed

+31
-27
lines changed

5 files changed

+31
-27
lines changed

PennMobile/src/main/java/com/pennapps/labs/pennmobile/NotificationsSettingsView.kt

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
@file:Suppress("ktlint:standard:no-wildcard-imports")
22

3+
package com.pennapps.labs.pennmobile
4+
35
import androidx.compose.foundation.background
46
import androidx.compose.foundation.layout.*
57
import androidx.compose.foundation.lazy.LazyColumn
@@ -20,11 +22,12 @@ import androidx.compose.ui.unit.dp
2022
@Suppress("ktlint:standard:function-naming")
2123
@OptIn(ExperimentalMaterial3Api::class)
2224
@Composable
23-
fun NotificationSettingsList(settingsList: List<Pair<String, Boolean>>) {
25+
fun NotificationSettingsList(settingsList: List<Pair<String, Boolean>>,
26+
modifier: Modifier = Modifier) {
2427
val scrollBehavior = TopAppBarDefaults.pinnedScrollBehavior(rememberTopAppBarState())
2528

2629
Scaffold(
27-
modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection),
30+
modifier = modifier.nestedScroll(scrollBehavior.nestedScrollConnection),
2831
topBar = {
2932
Column {
3033
CenterAlignedTopAppBar(
@@ -102,12 +105,13 @@ fun NotificationSettingsList(settingsList: List<Pair<String, Boolean>>) {
102105
fun NotificationSettingRow(
103106
label: String,
104107
isEnabledInitial: Boolean,
108+
modifier: Modifier = Modifier
105109
) {
106110
var isEnabled by remember { mutableStateOf(isEnabledInitial) }
107111

108112
Row(
109113
modifier =
110-
Modifier
114+
modifier
111115
.fillMaxWidth()
112116
.padding(horizontal = 32.dp, vertical = 4.dp),
113117
verticalAlignment = Alignment.CenterVertically,
@@ -141,11 +145,10 @@ fun NotificationSettingRow(
141145
fun saveNotificationSettings() {
142146
}
143147

144-
@Suppress("ktlint:standard:function-naming")
145148
@Preview(showBackground = true)
146149
@Composable
147-
fun AppWithListPreview() {
148-
var settingsList =
150+
private fun AppWithListPreview() {
151+
val settingsList =
149152
listOf(
150153
"Penn Course Alert" to false,
151154
"Laundry" to true,

PennMobile/src/main/java/com/pennapps/labs/pennmobile/compose/presentation/components/AppSnackBar.kt

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ import androidx.compose.material3.SnackbarDuration
2121
import androidx.compose.material3.Text
2222
import androidx.compose.runtime.Composable
2323
import androidx.compose.runtime.LaunchedEffect
24+
import androidx.compose.runtime.getValue
25+
import androidx.compose.runtime.rememberUpdatedState
2426
import androidx.compose.ui.Alignment
2527
import androidx.compose.ui.Modifier
2628
import androidx.compose.ui.graphics.Color
@@ -60,6 +62,8 @@ fun AppSnackBar(
6062
contentColor = AppColors.TabTextBlue,
6163
),
6264
) {
65+
val currentDismiss by rememberUpdatedState(dismiss)
66+
6367
val duration =
6468
when (duration) {
6569
SnackbarDuration.Short -> 3000L
@@ -72,7 +76,7 @@ fun AppSnackBar(
7276

7377
if (duration != Long.MAX_VALUE) {
7478
delay(duration)
75-
dismiss()
79+
currentDismiss()
7680
}
7781
}
7882

@@ -139,17 +143,6 @@ private fun PreviewAppSnackBar() =
139143
.fillMaxSize()
140144
.background(MaterialTheme.colorScheme.background),
141145
) {
142-
// AppSnackBar(
143-
// snackBarContainerColor = AppColors.LabelRed,
144-
// snackBarContentColor = Color.White,
145-
// message = "Log in to add dining halls to favourites",
146-
// snackBarActionLabel = "Log In",
147-
// dismiss = {},
148-
// performSnackBarAction = { },
149-
// duration = SnackbarDuration.Short,
150-
// modifier = Modifier.align(Alignment.BottomCenter)
151-
// )
152-
153146
AppSnackBar(
154147
snackBarContainerColor = AppColors.LabelRed,
155148
snackBarContentColor = Color.White,

PennMobile/src/main/java/com/pennapps/labs/pennmobile/dining/composables/DiningInsightsScreen.kt

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.pennapps.labs.pennmobile.dining.composables
22

33
import GilroyExtraBold
4-
import PennMobileTheme
4+
import com.pennapps.labs.pennmobile.ui.theme.PennMobileTheme
55
import android.util.Log
66
import androidx.compose.foundation.layout.Arrangement
77
import androidx.compose.foundation.layout.PaddingValues
@@ -15,6 +15,7 @@ import androidx.compose.runtime.Composable
1515
import androidx.compose.runtime.LaunchedEffect
1616
import androidx.compose.runtime.collectAsState
1717
import androidx.compose.runtime.getValue
18+
import androidx.compose.runtime.rememberUpdatedState
1819
import androidx.compose.ui.Modifier
1920
import androidx.compose.ui.unit.dp
2021
import androidx.hilt.navigation.compose.hiltViewModel
@@ -25,10 +26,12 @@ import com.pennapps.labs.pennmobile.dining.viewmodels.DiningInsightsViewModel
2526
@Suppress("ktlint:standard:function-naming")
2627
@Composable
2728
fun DiningInsightsScreen(
29+
onLoginRequirement: () -> Unit,
2830
modifier: Modifier = Modifier,
29-
viewModel: DiningInsightsViewModel = hiltViewModel(),
30-
onLoginRequired: () -> Unit,
31+
viewModel: DiningInsightsViewModel = hiltViewModel()
3132
) {
33+
val currentOnLoginRequirement by rememberUpdatedState(onLoginRequirement)
34+
3235
PennMobileTheme {
3336
LaunchedEffect(Unit) {
3437
viewModel.checkTokenAndFetch()
@@ -37,7 +40,7 @@ fun DiningInsightsScreen(
3740
val loginRequired by viewModel.loginRequired.collectAsState()
3841
LaunchedEffect(loginRequired) {
3942
if (loginRequired) {
40-
onLoginRequired()
43+
currentOnLoginRequirement()
4144
}
4245
}
4346

PennMobile/src/main/java/com/pennapps/labs/pennmobile/dining/fragments/DiningFragment.kt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,9 @@ class DiningFragment : Fragment() {
9696

9797
@OptIn(ExperimentalMaterial3Api::class)
9898
@Composable
99-
fun DiningHallListScreen(viewModel: DiningViewModel = hiltViewModel()) {
99+
fun DiningHallListScreen(
100+
modifier: Modifier = Modifier,
101+
viewModel: DiningViewModel = hiltViewModel()) {
100102
val pullToRefreshState = rememberPullToRefreshState()
101103
val isDataRefreshing by viewModel.isRefreshing.collectAsState()
102104
val allDiningHalls by viewModel.allDiningHalls.collectAsState()
@@ -119,6 +121,7 @@ class DiningFragment : Fragment() {
119121
}
120122

121123
Scaffold(
124+
modifier = modifier,
122125
snackbarHost = {
123126
SnackbarHost(
124127
hostState = snackBarHostState,

PennMobile/src/main/java/com/pennapps/labs/pennmobile/ui/theme/Theme.kt

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,18 @@
1+
package com.pennapps.labs.pennmobile.ui.theme
2+
3+
import AppShapes
4+
import AppTypography
15
import androidx.compose.foundation.background
26
import androidx.compose.foundation.isSystemInDarkTheme
37
import androidx.compose.foundation.layout.Box
48
import androidx.compose.foundation.layout.fillMaxSize
59
import androidx.compose.material3.MaterialTheme
610
import androidx.compose.runtime.Composable
711
import androidx.compose.ui.Modifier
8-
import com.pennapps.labs.pennmobile.ui.theme.DarkColors
9-
import com.pennapps.labs.pennmobile.ui.theme.LightColors
1012

11-
@Suppress("ktlint:standard:function-naming")
1213
@Composable
1314
fun PennMobileTheme(
15+
modifier: Modifier = Modifier,
1416
darkTheme: Boolean = isSystemInDarkTheme(),
1517
content: @Composable () -> Unit,
1618
) {
@@ -23,7 +25,7 @@ fun PennMobileTheme(
2325
) {
2426
Box(
2527
modifier =
26-
Modifier
28+
modifier
2729
.fillMaxSize()
2830
.background(colors.background),
2931
) {

0 commit comments

Comments
 (0)