feat: pull code out into lib · dunkirk.sh/wasup-chucks@af93a6b

+8

wasup-chucks.xcodeproj/project.pbxproj

··· 67 67 path = widget; 68 68 sourceTree = "<group>"; 69 69 }; 70 + 0BSHARED12F2D500000AF0585 /* Shared */ = { 71 + isa = PBXFileSystemSynchronizedRootGroup; 72 + path = Shared; 73 + sourceTree = "<group>"; 74 + }; 70 75 /* End PBXFileSystemSynchronizedRootGroup section */ 71 76 72 77 /* Begin PBXFrameworksBuildPhase section */ ··· 94 99 children = ( 95 100 0BBF201F2F2D443D00AF0585 /* wasup-chucks */, 96 101 0BBF203B2F2D46AF00AF0585 /* widget */, 102 + 0BSHARED12F2D500000AF0585 /* Shared */, 97 103 0BBF20362F2D46AF00AF0585 /* Frameworks */, 98 104 0BBF201E2F2D443D00AF0585 /* Products */, 99 105 ); ··· 136 142 ); 137 143 fileSystemSynchronizedGroups = ( 138 144 0BBF201F2F2D443D00AF0585 /* wasup-chucks */, 145 + 0BSHARED12F2D500000AF0585 /* Shared */, 139 146 ); 140 147 name = "wasup-chucks"; 141 148 packageProductDependencies = ( ··· 158 165 ); 159 166 fileSystemSynchronizedGroups = ( 160 167 0BBF203B2F2D46AF00AF0585 /* widget */, 168 + 0BSHARED12F2D500000AF0585 /* Shared */, 161 169 ); 162 170 name = widgetExtension; 163 171 packageProductDependencies = (

+130 -88

wasup-chucks/ChucksModels.swift Shared/ChucksShared.swift

··· 1 1 // 2 - // ChucksModels.swift 2 + // ChucksShared.swift 3 3 // wasup-chucks 4 4 // 5 - // Created by Kieran Klukas on 1/30/26. 5 + // Shared models and services for main app and widget. 6 6 // 7 7 8 8 import Foundation 9 9 10 10 // MARK: - API Models 11 11 12 - struct Allergen: Codable, Hashable { 13 - let url: String 14 - let alt: String 12 + public struct Allergen: Codable, Hashable, Sendable { 13 + public let url: String 14 + public let alt: String 15 + 16 + public init(url: String, alt: String) { 17 + self.url = url 18 + self.alt = alt 19 + } 15 20 } 16 21 17 - struct MenuItem: Codable, Hashable, Identifiable { 18 - let name: String 19 - let allergens: [Allergen] 20 - 21 - var id: String { name } 22 + public struct MenuItem: Codable, Hashable, Identifiable, Sendable { 23 + public let name: String 24 + public let allergens: [Allergen] 25 + 26 + public nonisolated var id: String { name } 27 + 28 + public init(name: String, allergens: [Allergen]) { 29 + self.name = name 30 + self.allergens = allergens 31 + } 22 32 } 23 33 24 - struct VenueMenu: Codable, Hashable, Identifiable { 25 - let venue: String 26 - let meal: String? 27 - let slot: String 28 - let items: [MenuItem] 29 - 30 - var id: String { "\(venue)-\(slot)" } 34 + public struct VenueMenu: Codable, Hashable, Identifiable, Sendable { 35 + public let venue: String 36 + public let meal: String? 37 + public let slot: String 38 + public let items: [MenuItem] 39 + 40 + public nonisolated var id: String { "\(venue)-\(slot)" } 41 + 42 + public init(venue: String, meal: String?, slot: String, items: [MenuItem]) { 43 + self.venue = venue 44 + self.meal = meal 45 + self.slot = slot 46 + self.items = items 47 + } 31 48 } 32 49 33 - typealias MenuResponse = [String: [VenueMenu]] 50 + public typealias MenuResponse = [String: [VenueMenu]] 34 51 35 52 // MARK: - Meal Phase 36 53 37 - enum MealPhase: String, CaseIterable, Sendable { 54 + public enum MealPhase: String, CaseIterable, Sendable { 38 55 case breakfast = "Breakfast" 39 56 case lunch = "Lunch" 40 57 case dinner = "Dinner" 41 58 case closed = "Closed" 42 - 43 - var icon: String { 59 + 60 + public nonisolated var icon: String { 44 61 switch self { 45 62 case .breakfast: return "cup.and.saucer.fill" 46 63 case .lunch: return "takeoutbag.and.cup.and.straw.fill" ··· 48 65 case .closed: return "moon.zzz.fill" 49 66 } 50 67 } 51 - 52 - var shortName: String { 68 + 69 + public nonisolated var shortName: String { 53 70 switch self { 54 71 case .breakfast: return "Breakfast" 55 72 case .lunch: return "Lunch" ··· 57 74 case .closed: return "Closed" 58 75 } 59 76 } 60 - 61 - var apiSlot: String { 77 + 78 + public nonisolated var apiSlot: String { 62 79 switch self { 63 80 case .breakfast: return "breakfast" 64 81 case .lunch: return "lunch" ··· 70 87 71 88 // MARK: - Meal Schedule 72 89 73 - struct MealSchedule: Identifiable { 74 - var id: String { phase.rawValue } 75 - let phase: MealPhase 76 - let startHour: Int 77 - let startMinute: Int 78 - let endHour: Int 79 - let endMinute: Int 80 - 81 - var startMinutes: Int { startHour * 60 + startMinute } 82 - var endMinutes: Int { endHour * 60 + endMinute } 83 - 90 + public struct MealSchedule: Identifiable, Sendable { 91 + public nonisolated var id: String { phase.rawValue } 92 + public let phase: MealPhase 93 + public let startHour: Int 94 + public let startMinute: Int 95 + public let endHour: Int 96 + public let endMinute: Int 97 + 98 + public nonisolated var startMinutes: Int { startHour * 60 + startMinute } 99 + public nonisolated var endMinutes: Int { endHour * 60 + endMinute } 100 + 101 + public init(phase: MealPhase, startHour: Int, startMinute: Int, endHour: Int, endMinute: Int) { 102 + self.phase = phase 103 + self.startHour = startHour 104 + self.startMinute = startMinute 105 + self.endHour = endHour 106 + self.endMinute = endMinute 107 + } 108 + 84 109 // Mon-Fri: Hot Breakfast 7-8:15, Continental 8:15-9:30, Lunch 10:30-2:30, Dinner 4:30-7:30 85 110 // Treating Hot + Continental as one "Breakfast" period for simplicity 86 - static let weekdaySchedule: [MealSchedule] = [ 111 + public static let weekdaySchedule: [MealSchedule] = [ 87 112 MealSchedule(phase: .breakfast, startHour: 7, startMinute: 0, endHour: 9, endMinute: 30), 88 113 MealSchedule(phase: .lunch, startHour: 10, startMinute: 30, endHour: 14, endMinute: 30), 89 114 MealSchedule(phase: .dinner, startHour: 16, startMinute: 30, endHour: 19, endMinute: 30) 90 115 ] 91 - 116 + 92 117 // Saturday: Continental 8-9, Lunch 11-1, Dinner 4:30-6:30 93 - static let saturdaySchedule: [MealSchedule] = [ 118 + public static let saturdaySchedule: [MealSchedule] = [ 94 119 MealSchedule(phase: .breakfast, startHour: 8, startMinute: 0, endHour: 9, endMinute: 0), 95 120 MealSchedule(phase: .lunch, startHour: 11, startMinute: 0, endHour: 13, endMinute: 0), 96 121 MealSchedule(phase: .dinner, startHour: 16, startMinute: 30, endHour: 18, endMinute: 30) 97 122 ] 98 - 123 + 99 124 // Sunday: Hot Breakfast 8-9, Lunch 11:30-2, Dinner 5-7:30 100 - static let sundaySchedule: [MealSchedule] = [ 125 + public static let sundaySchedule: [MealSchedule] = [ 101 126 MealSchedule(phase: .breakfast, startHour: 8, startMinute: 0, endHour: 9, endMinute: 0), 102 127 MealSchedule(phase: .lunch, startHour: 11, startMinute: 30, endHour: 14, endMinute: 0), 103 128 MealSchedule(phase: .dinner, startHour: 17, startMinute: 0, endHour: 19, endMinute: 30) 104 129 ] 105 - 106 - static func schedule(for weekday: Int) -> [MealSchedule] { 130 + 131 + public nonisolated static func schedule(for weekday: Int) -> [MealSchedule] { 107 132 switch weekday { 108 133 case 1: return sundaySchedule 109 134 case 7: return saturdaySchedule ··· 114 139 115 140 // MARK: - Cedarville Timezone 116 141 117 - struct CedarvilleTime { 118 - static var calendar: Calendar { 142 + public struct CedarvilleTime: Sendable { 143 + public nonisolated static var calendar: Calendar { 119 144 var calendar = Calendar(identifier: .gregorian) 120 - calendar.timeZone = TimeZone(identifier: "America/New_York")! 145 + calendar.timeZone = TimeZone(identifier: "America/New_York") ?? .current 121 146 return calendar 122 147 } 123 148 } 124 149 125 150 // MARK: - Chuck's Status 126 151 127 - struct ChucksStatus { 128 - let currentPhase: MealPhase 129 - let timeRemaining: TimeInterval? 130 - let nextPhase: MealPhase? 131 - let nextPhaseStart: Date? 132 - let isOpen: Bool 133 - let currentMealEnd: Date? 134 - 135 - static func calculate(for date: Date = Date()) -> ChucksStatus { 152 + public struct ChucksStatus: Sendable { 153 + public let currentPhase: MealPhase 154 + public let timeRemaining: TimeInterval? 155 + public let nextPhase: MealPhase? 156 + public let nextPhaseStart: Date? 157 + public let isOpen: Bool 158 + public let currentMealEnd: Date? 159 + 160 + public init(currentPhase: MealPhase, timeRemaining: TimeInterval?, nextPhase: MealPhase?, nextPhaseStart: Date?, isOpen: Bool, currentMealEnd: Date?) { 161 + self.currentPhase = currentPhase 162 + self.timeRemaining = timeRemaining 163 + self.nextPhase = nextPhase 164 + self.nextPhaseStart = nextPhaseStart 165 + self.isOpen = isOpen 166 + self.currentMealEnd = currentMealEnd 167 + } 168 + 169 + public nonisolated static func calculate(for date: Date = Date()) -> ChucksStatus { 136 170 let calendar = CedarvilleTime.calendar 137 171 let weekday = calendar.component(.weekday, from: date) 138 172 let schedule = MealSchedule.schedule(for: weekday) 139 - 173 + 140 174 let hour = calendar.component(.hour, from: date) 141 175 let minute = calendar.component(.minute, from: date) 142 176 let currentMinutes = hour * 60 + minute 143 - 177 + 144 178 for (index, meal) in schedule.enumerated() { 145 179 if currentMinutes >= meal.startMinutes && currentMinutes < meal.endMinutes { 146 180 let endDate = calendar.date(bySettingHour: meal.endHour, minute: meal.endMinute, second: 0, of: date)! 147 181 let remaining = endDate.timeIntervalSince(date) 148 - 182 + 149 183 let nextPhase: MealPhase? 150 184 let nextStart: Date? 151 185 if index + 1 < schedule.count { ··· 156 190 nextPhase = .closed 157 191 nextStart = nil 158 192 } 159 - 193 + 160 194 return ChucksStatus( 161 195 currentPhase: meal.phase, 162 196 timeRemaining: remaining, ··· 166 200 currentMealEnd: endDate 167 201 ) 168 202 } 169 - 203 + 170 204 if currentMinutes < meal.startMinutes { 171 205 let startDate = calendar.date(bySettingHour: meal.startHour, minute: meal.startMinute, second: 0, of: date)! 172 206 let timeUntil = startDate.timeIntervalSince(date) 173 - 207 + 174 208 return ChucksStatus( 175 209 currentPhase: .closed, 176 210 timeRemaining: timeUntil, ··· 181 215 ) 182 216 } 183 217 } 184 - 218 + 185 219 let tomorrow = calendar.date(byAdding: .day, value: 1, to: date)! 186 220 let tomorrowWeekday = calendar.component(.weekday, from: tomorrow) 187 221 let tomorrowSchedule = MealSchedule.schedule(for: tomorrowWeekday) 188 - 222 + 189 223 if let firstMeal = tomorrowSchedule.first { 190 224 var nextStart = calendar.date(bySettingHour: firstMeal.startHour, minute: firstMeal.startMinute, second: 0, of: tomorrow)! 191 225 if nextStart <= date { 192 226 nextStart = calendar.date(byAdding: .day, value: 1, to: nextStart)! 193 227 } 194 228 let timeUntil = nextStart.timeIntervalSince(date) 195 - 229 + 196 230 return ChucksStatus( 197 231 currentPhase: .closed, 198 232 timeRemaining: timeUntil, ··· 202 236 currentMealEnd: nil 203 237 ) 204 238 } 205 - 239 + 206 240 return ChucksStatus( 207 241 currentPhase: .closed, 208 242 timeRemaining: nil, ··· 218 252 219 253 extension TimeInterval { 220 254 /// Compact format for widgets: "2h" or "45m" or "30s" 221 - var compactCountdown: String { 255 + public nonisolated var compactCountdown: String { 222 256 let totalSeconds = Int(self) 223 257 let hours = totalSeconds / 3600 224 258 let minutes = (totalSeconds % 3600) / 60 225 259 let seconds = totalSeconds % 60 226 - 260 + 227 261 if hours > 0 { 228 262 return "\(hours)h" 229 263 } else if minutes > 0 { ··· 232 266 return "\(seconds)s" 233 267 } 234 268 } 235 - 269 + 236 270 /// Expanded format for app: "2h 15m" or "45m" or "30s" 237 - var expandedCountdown: String { 271 + public nonisolated var expandedCountdown: String { 238 272 let totalSeconds = Int(self) 239 273 let hours = totalSeconds / 3600 240 274 let minutes = (totalSeconds % 3600) / 60 241 275 let seconds = totalSeconds % 60 242 - 276 + 243 277 if hours > 0 && minutes > 0 { 244 278 return "\(hours)h \(minutes)m" 245 279 } else if hours > 0 { ··· 254 288 255 289 // MARK: - API Service 256 290 257 - actor ChucksService { 258 - static let shared = ChucksService() 259 - 291 + public actor ChucksService { 292 + public static let shared = ChucksService() 293 + 260 294 private let baseURL = "https://diningdata.cedarville.edu/api/menus" 261 295 private var cachedMenu: MenuResponse? 262 296 private var cacheDate: Date? 263 297 private let cacheExpiration: TimeInterval = 3600 264 - 265 - func fetchMenu(days: Int = 5) async throws -> MenuResponse { 298 + 299 + public init() {} 300 + 301 + public func fetchMenu(days: Int = 5) async throws -> MenuResponse { 266 302 if let cached = cachedMenu, 267 303 let date = cacheDate, 268 304 Date().timeIntervalSince(date) < cacheExpiration { 269 305 return cached 270 306 } 271 - 307 + 272 308 guard let url = URL(string: "\(baseURL)?days=\(days)") else { 273 309 throw ChucksError.invalidURL 274 310 } 275 - 311 + 276 312 var request = URLRequest(url: url) 277 313 request.setValue("*/*", forHTTPHeaderField: "Accept") 278 314 request.setValue("https://www.cedarville.edu", forHTTPHeaderField: "Origin") 279 315 request.setValue("https://www.cedarville.edu/offices/the-commons", forHTTPHeaderField: "Referer") 280 - 316 + 281 317 let (data, response) = try await URLSession.shared.data(for: request) 282 - 318 + 283 319 guard let httpResponse = response as? HTTPURLResponse, 284 320 httpResponse.statusCode == 200 else { 285 321 throw ChucksError.networkError 286 322 } 287 - 323 + 288 324 let menu: MenuResponse 289 325 do { 290 326 menu = try JSONDecoder().decode(MenuResponse.self, from: data) ··· 293 329 } 294 330 cachedMenu = menu 295 331 cacheDate = Date() 296 - 332 + 297 333 return menu 298 334 } 299 - 300 - func getSpecials(for date: Date, phase: MealPhase) async throws -> [MenuItem] { 335 + 336 + public func getSpecials(for date: Date, phase: MealPhase) async throws -> [MenuItem] { 301 337 let menu = try await fetchMenu() 302 338 let dateFormatter = DateFormatter() 303 339 dateFormatter.dateFormat = "yyyy-MM-dd" 304 340 dateFormatter.timeZone = TimeZone(identifier: "America/New_York") 305 341 let dateKey = dateFormatter.string(from: date) 306 - 342 + 307 343 guard let dayMenu = menu[dateKey] else { 308 344 return [] 309 345 } 310 - 311 - let slot = await phase.apiSlot 346 + 347 + let slot = phase.apiSlot 312 348 let homeCooking = dayMenu.filter { $0.venue == "Home Cooking" && $0.slot == slot } 313 349 return homeCooking.flatMap { $0.items } 314 350 } 351 + 352 + public func getSpecialsWithVenue(for date: Date, phase: MealPhase) async throws -> (items: [MenuItem], venueName: String) { 353 + let venueName = "Home Cooking" 354 + let items = try await getSpecials(for: date, phase: phase) 355 + return (items, venueName) 356 + } 315 357 } 316 358 317 - enum ChucksError: Error, LocalizedError { 359 + public enum ChucksError: Error, LocalizedError, Sendable { 318 360 case invalidURL 319 361 case networkError 320 362 case decodingError 321 363 322 - var errorDescription: String? { 364 + public nonisolated var errorDescription: String? { 323 365 switch self { 324 366 case .invalidURL: 325 367 return "Invalid URL"

+1 -1

wasup-chucks/ContentView.swift

··· 207 207 @Binding var selectedMeal: MealSchedule? 208 208 209 209 var schedule: [MealSchedule] { 210 - MealSchedule.schedule(for: Calendar.current.component(.weekday, from: Date())) 210 + MealSchedule.schedule(for: CedarvilleTime.calendar.component(.weekday, from: Date())) 211 211 } 212 212 213 213 var body: some View {

+28 -308

widget/widget.swift

····································

Configure Feed

Configure Feed