feat(progress): add progress tracking enhancements
- Enable zoom/pan on progress map with reset button - Add visit count badges to stadium chips - Create GamesHistoryView with year grouping and sport filters - Create StadiumVisitHistoryView for viewing all visits to a stadium - Add VisitListCard and GamesHistoryRow components - Add "See All" navigation from Recent Visits to Games History - Add tests for map interactions, visit lists, and games history Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
This commit is contained in:
@@ -0,0 +1,76 @@
|
||||
import SwiftUI
|
||||
import SwiftData
|
||||
|
||||
@MainActor
|
||||
@Observable
|
||||
final class GamesHistoryViewModel {
|
||||
private let modelContext: ModelContext
|
||||
|
||||
var allVisits: [StadiumVisit] = []
|
||||
var selectedSports: Set<Sport> = []
|
||||
var isLoading = false
|
||||
var error: String?
|
||||
|
||||
// Computed: visits grouped by year
|
||||
var visitsByYear: [Int: [StadiumVisit]] {
|
||||
let calendar = Calendar.current
|
||||
let filtered = filteredVisits
|
||||
return Dictionary(grouping: filtered) { visit in
|
||||
calendar.component(.year, from: visit.visitDate)
|
||||
}
|
||||
}
|
||||
|
||||
// Computed: sorted year keys (descending)
|
||||
var sortedYears: [Int] {
|
||||
visitsByYear.keys.sorted(by: >)
|
||||
}
|
||||
|
||||
// Computed: filtered by selected sports
|
||||
var filteredVisits: [StadiumVisit] {
|
||||
guard !selectedSports.isEmpty else { return allVisits }
|
||||
|
||||
return allVisits.filter { visit in
|
||||
guard let stadium = AppDataProvider.shared.stadium(for: visit.stadiumId) else {
|
||||
return false
|
||||
}
|
||||
return selectedSports.contains(stadium.sport)
|
||||
}
|
||||
}
|
||||
|
||||
// Total count
|
||||
var totalGamesCount: Int {
|
||||
filteredVisits.count
|
||||
}
|
||||
|
||||
init(modelContext: ModelContext) {
|
||||
self.modelContext = modelContext
|
||||
}
|
||||
|
||||
func loadGames() async {
|
||||
isLoading = true
|
||||
defer { isLoading = false }
|
||||
|
||||
let descriptor = FetchDescriptor<StadiumVisit>(
|
||||
sortBy: [SortDescriptor(\.visitDate, order: .reverse)]
|
||||
)
|
||||
|
||||
do {
|
||||
allVisits = try modelContext.fetch(descriptor)
|
||||
} catch {
|
||||
self.error = "Failed to load games: \(error.localizedDescription)"
|
||||
allVisits = []
|
||||
}
|
||||
}
|
||||
|
||||
func toggleSport(_ sport: Sport) {
|
||||
if selectedSports.contains(sport) {
|
||||
selectedSports.remove(sport)
|
||||
} else {
|
||||
selectedSports.insert(sport)
|
||||
}
|
||||
}
|
||||
|
||||
func clearFilters() {
|
||||
selectedSports.removeAll()
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,54 @@
|
||||
import SwiftUI
|
||||
import MapKit
|
||||
|
||||
@MainActor
|
||||
@Observable
|
||||
final class MapInteractionViewModel {
|
||||
// Default region: Continental US
|
||||
static let defaultRegion = MKCoordinateRegion(
|
||||
center: CLLocationCoordinate2D(latitude: 39.8283, longitude: -98.5795),
|
||||
span: MKCoordinateSpan(latitudeDelta: 35, longitudeDelta: 55)
|
||||
)
|
||||
|
||||
// City-level zoom span
|
||||
static let stadiumZoomSpan = MKCoordinateSpan(latitudeDelta: 0.01, longitudeDelta: 0.01)
|
||||
|
||||
var region: MKCoordinateRegion = MapInteractionViewModel.defaultRegion
|
||||
var hasUserInteracted: Bool = false
|
||||
var selectedStadiumId: String?
|
||||
|
||||
var shouldShowResetButton: Bool {
|
||||
hasUserInteracted
|
||||
}
|
||||
|
||||
func userDidInteract() {
|
||||
hasUserInteracted = true
|
||||
}
|
||||
|
||||
func resetToDefault() {
|
||||
withAnimation(.easeInOut(duration: 0.5)) {
|
||||
region = MapInteractionViewModel.defaultRegion
|
||||
}
|
||||
hasUserInteracted = false
|
||||
selectedStadiumId = nil
|
||||
}
|
||||
|
||||
func zoomToStadium(at coordinate: CLLocationCoordinate2D) {
|
||||
withAnimation(.easeInOut(duration: 0.3)) {
|
||||
region = MKCoordinateRegion(
|
||||
center: coordinate,
|
||||
span: MapInteractionViewModel.stadiumZoomSpan
|
||||
)
|
||||
}
|
||||
hasUserInteracted = true
|
||||
}
|
||||
|
||||
func selectStadium(id: String, coordinate: CLLocationCoordinate2D) {
|
||||
selectedStadiumId = id
|
||||
zoomToStadium(at: coordinate)
|
||||
}
|
||||
|
||||
func deselectStadium() {
|
||||
selectedStadiumId = nil
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user