NinjaCheetah/RIT-Dining
1
0
Fork 0
mirror of https://github.com/NinjaCheetah/RIT-Dining.git synced 2026-03-05 05:25:29 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fixed multi opening period locations in widgets

Browse Source 
Widgets for locations with multiple opening periods will still only display the first time span, but the bar will now show multiple filled in sections and the opening status label will correctly represent both periods.
This commit is contained in:
Campbell
2026-01-14 00:16:40 -05:00
parent f78de2f6ff
commit 71c37749e3
7 changed files with 105 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
TigerDineWidgets/Components/HoursGague.swift
View File

@@ -8,28 +8,21 @@
import SwiftUI
struct OpeningHoursGauge: View {
let openTime: Date?
let closeTime: Date?
let diningTimes: [DiningTimes]?
let now: Date
private let dayDuration: TimeInterval = 86_400
private var barFillColor: Color {
let calendar = Calendar.current
if let openTime = openTime, let closeTime = closeTime {
if now >= openTime && now <= closeTime {
if closeTime == calendar.date(byAdding: .day, value: 1, to: openTime)! {
return Color.green
} else if closeTime < calendar.date(byAdding: .minute, value: 30, to: now)! {
return Color.orange
} else {
return Color.green
}
} else if openTime <= calendar.date(byAdding: .minute, value: 30, to: now)! && closeTime > now {
return Color.orange
} else {
if let diningTimes = diningTimes {
let openStatus = parseMultiOpenStatus(diningTimes: diningTimes)
switch openStatus {
case .open:
return Color.green
case .closed:
return Color.red
case .openingSoon, .closingSoon:
return Color.orange
}
} else {
return Color.red
@@ -53,24 +46,27 @@ struct OpeningHoursGauge: View {
// We can skip drawing this entire capsule if the location is never open, since there would be no opening period
// to draw.
if let openTime = openTime, let closeTime = closeTime {
let openX = position(for: openTime, start: startOfToday, width: width)
let closeX = position(
for: closeTime,
start: closeTime < openTime ? startOfTomorrow : startOfToday,
width: width
)
Capsule()
.fill(
LinearGradient(
colors: [barFillColor.opacity(0.7), barFillColor],
startPoint: .leading,
endPoint: .trailing
)
if let diningTimes = diningTimes {
// Need to iterate here to account for locations that have multiple opening periods (Gracie's/Brick City Cafe).
ForEach(diningTimes, id: \.self) { diningTime in
let openX = position(for: diningTime.openTime, start: startOfToday, width: width)
let closeX = position(
for: diningTime.closeTime,
start: diningTime.closeTime < diningTime.openTime ? startOfTomorrow : startOfToday,
width: width
)
.frame(width: max(0, closeX - openX), height: barHeight)
.offset(x: openX)
Capsule()
.fill(
LinearGradient(
colors: [barFillColor.opacity(0.7), barFillColor],
startPoint: .leading,
endPoint: .trailing
)
)
.frame(width: max(0, closeX - openX), height: barHeight)
.offset(x: openX)
}
}
Circle()