Skip to content

Material 3 UI Fixes #234

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
caleb-bit merged 4 commits into from
Apr 19, 2026
Merged

Material 3 UI Fixes #234

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
517ac6c
Fix bottom sheet color
caleb-bit Apr 18, 2026
afdfb92
Fix meal bottom sheet selected icon
caleb-bit Apr 18, 2026
c9c556b
Prevent overriding surface background
caleb-bit Apr 18, 2026
16475da
Remove commented out code
caleb-bit Apr 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions app/src/main/java/com/cornellappdev/android/eatery/ui/components/upcoming/MealBottomSheet.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,15 @@ import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.TextStyle
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import com.cornellappdev.android.eatery.R
import com.cornellappdev.android.eatery.ui.components.general.MealFilter
import com.cornellappdev.android.eatery.ui.theme.EateryBlue
import com.cornellappdev.android.eatery.ui.theme.EateryBlueTypography
import com.cornellappdev.android.eatery.ui.theme.GrayZero
import com.cornellappdev.android.eatery.util.EateryPreview

/**
* The pop-up that shows up when users want to pick a different meal as the filter in the upcoming
Expand Down Expand Up @@ -118,11 +120,13 @@ fun MealBottomSheet(
Icon(
painter = painterResource(id = R.drawable.ic_selected),
contentDescription = stringResource(R.string.a11y_meal_selected_breakfast),
tint = Color.Unspecified
)
} else {
Icon(
painter = painterResource(id = R.drawable.ic_unselected),
contentDescription = stringResource(R.string.a11y_meal_select_breakfast),
tint = Color.Unspecified
)
}
}
Expand Down Expand Up @@ -168,11 +172,13 @@ fun MealBottomSheet(
Icon(
painter = painterResource(id = R.drawable.ic_selected),
contentDescription = stringResource(R.string.a11y_meal_selected_lunch),
tint = Color.Unspecified
)
} else {
Icon(
painter = painterResource(id = R.drawable.ic_unselected),
contentDescription = stringResource(R.string.a11y_meal_select_lunch),
tint = Color.Unspecified
)
}
}
Expand Down Expand Up @@ -218,11 +224,13 @@ fun MealBottomSheet(
Icon(
painter = painterResource(id = R.drawable.ic_selected),
contentDescription = stringResource(R.string.a11y_meal_selected_dinner),
tint = Color.Unspecified
)
} else {
Icon(
painter = painterResource(id = R.drawable.ic_unselected),
contentDescription = stringResource(R.string.a11y_meal_select_dinner),
tint = Color.Unspecified
)
}
}
Expand Down Expand Up @@ -267,11 +275,13 @@ fun MealBottomSheet(
Icon(
painter = painterResource(id = R.drawable.ic_selected),
contentDescription = stringResource(R.string.a11y_meal_selected_late_dinner),
tint = Color.Unspecified
)
} else {
Icon(
painter = painterResource(id = R.drawable.ic_unselected),
contentDescription = stringResource(R.string.a11y_meal_select_late_dinner),
tint = Color.Unspecified
)
}
}
Expand Down Expand Up @@ -313,3 +323,14 @@ fun MealBottomSheet(
)
}
}

@Preview(showBackground = true)
@Composable
private fun MealBottomSheetPreview() = EateryPreview {
MealBottomSheet(
isVisible = true,
selectedMeal = MealFilter.LUNCH,
onSubmit = {},
hide = {}
)
}
11 changes: 10 additions & 1 deletion app/src/main/java/com/cornellappdev/android/eatery/ui/theme/Theme.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ fun EateryBlueTheme(
dynamicColor: Boolean = false,
content: @Composable () -> Unit
) {
val colorScheme = when {
val baseColorScheme = when {
dynamicColor && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S -> {
val context = LocalContext.current
dynamicLightColorScheme(context)
Expand All @@ -59,6 +59,15 @@ fun EateryBlueTheme(
else -> LightColorScheme
}

// For bottom sheet background colors
val colorScheme = baseColorScheme.copy(
surfaceContainerLowest = Color.White,
surfaceContainerLow = Color.White,
surfaceContainer = Color.White,
surfaceContainerHigh = Color.White,
surfaceContainerHighest = Color.White
)

MaterialTheme(
colorScheme = colorScheme,
typography = EateryBlueMaterial3Typography,
Expand Down
Loading