Skip to content

added Hiding Dining Details if location not open #456

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

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

added Hiding Dining Details if location not open #456

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3bf7302
added Hiding Dining Details if location not open
ZaidMadanat Oct 28, 2025
43c0414
Merge remote-tracking branch 'origin/master' into zaid/hide-DiningDet…
ZaidMadanat Nov 3, 2025
2f1cc5f
changed dining detail view, removed previous BMS implementation
ZaidMadanat Nov 3, 2025
6994ad6
removed previous implentation
ZaidMadanat Nov 4, 2025
03cb13a
reverted
ZaidMadanat Nov 4, 2025
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
1 change: 0 additions & 1 deletion berkeley-mobile/Common/BMSegmentedControlView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,4 +75,3 @@ struct BMSegmentedControlView: View {
}
return PreviewWrapper()
}

21 changes: 20 additions & 1 deletion berkeley-mobile/Home/Dining/DiningDetailView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import SwiftUI
// MARK: - DiningDetailView

struct DiningDetailView: View {

@Environment(DiningHallsViewModel.self) private var viewModel

var diningHall: BMDiningHall
Expand All @@ -32,13 +33,31 @@ struct DiningDetailView: View {
return diningHall.meals[BMMeal.BMMealType.dinner]?.categoriesAndMenuItems ?? []
}
}
private var filteredTabNames: [String] {
["Breakfast", "Lunch", "Dinner"].filter { name in
let mealType: BMMeal.BMMealType? = {
switch name {
case "Breakfast": return .breakfast
case "Lunch": return .lunch
case "Dinner": return .dinner
default: return nil
}
}()
guard let mealType else { return false }
let categories = diningHall.meals[mealType]?.categoriesAndMenuItems ?? []
return !categories.isEmpty
}
}

var body: some View {
VStack {
if let allDayString {
DiningAllDayView(allDayString: allDayString)
} else {
BMSegmentedControlView(tabNames: ["Breakfast", "Lunch", "Dinner"], selectedTabIndex: $selectedTabIndex)
BMSegmentedControlView(
tabNames: filteredTabNames,
selectedTabIndex: $selectedTabIndex
)
if categoriesAndMenuItems.isEmpty {
Text("No Menu Items Available")
.fontWeight(.semibold)
Expand Down