admin/Sportstime
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 22 audit fixes — concurrency, memory, performance, accessibility

Browse Source 
- Move 7 Data(contentsOf:) calls off MainActor via Task.detached (BootstrapService)
- Batch-fetch N+1 queries in sync merge loops (CanonicalSyncService)
- Predicate-based gamesForTeam fetch instead of fetching all games (DataProvider)
- Proper Sendable on RouteInfo with nonisolated(unsafe) polyline (LocationService)
- [weak self] in BGTaskScheduler register closures (BackgroundSyncManager)
- Cache tripDays, routeWaypoints as @State with recompute (TripDetailView)
- Remove unused AnyCancellable, add Task lifecycle management (TripDetailView)
- Cache sportStadiums, recentVisits as stored properties (ProgressViewModel)
- Dynamic Type fonts replacing hardcoded sizes (OnboardingPaywallView)
- Accessibility labels/hints on stadium picker, date picker, map, stats,
  settings toggle, and day cards

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
Trey t
2026-02-19 09:23:29 -06:00
parent dad3270be7
commit e7420061a5
12 changed files with 180 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
SportsTime/Features/Paywall/Views/OnboardingPaywallView.swift
View File

@@ -351,11 +351,11 @@ struct StadiumMapBackground: View {
GeometryReader { geo in
HStack(spacing: 4) {
Text("6")
.font(.system(size: 18, weight: .bold, design: .rounded))
.font(.title3.bold())
Text("/")
.font(.system(size: 14))
.font(.subheadline)
Text("12")
.font(.system(size: 14, weight: .medium, design: .rounded))
.font(.subheadline.weight(.medium))
}
.foregroundStyle(color.opacity(0.25))
.padding(.horizontal, 12)

68
SportsTime/Features/Progress/ViewModels/ProgressViewModel.swift
View File

@@ -49,10 +49,8 @@ final class ProgressViewModel {
/// Pre-computed progress fractions per sport (avoids filtering visits per sport per render)
private(set) var sportProgressFractions: [Sport: Double] = [:]
/// Stadiums for the selected sport
var sportStadiums: [Stadium] {
stadiums.filter { $0.sport == selectedSport }
}
/// Stadiums for the selected sport (cached, recomputed on data change)
private(set) var sportStadiums: [Stadium] = []
/// Count of trips for the selected sport (stub - can be enhanced)
var tripCount: Int {
@@ -60,30 +58,8 @@ final class ProgressViewModel {
0
}
/// Recent visits sorted by date
var recentVisits: [VisitSummary] {
visits
.sorted { $0.visitDate > $1.visitDate }
.prefix(10)
.compactMap { visit -> VisitSummary? in
guard let stadium = dataProvider.stadium(for: visit.stadiumId),
let sport = visit.sportEnum else {
return nil
}
return VisitSummary(
id: visit.id,
stadium: stadium,
visitDate: visit.visitDate,
visitType: visit.visitType,
sport: sport,
homeTeamName: visit.homeTeamName,
awayTeamName: visit.awayTeamName,
score: visit.finalScore,
photoCount: visit.photoMetadata?.count ?? 0,
notes: visit.notes
)
}
}
/// Recent visits sorted by date (cached, recomputed on data change)
private(set) var recentVisits: [VisitSummary] = []
// MARK: - Configuration
@@ -154,7 +130,8 @@ final class ProgressViewModel {
private func recomputeDerivedState() {
// Compute league progress once
let sportStadiums = stadiums.filter { $0.sport == selectedSport }
let filteredStadiums = stadiums.filter { $0.sport == selectedSport }
self.sportStadiums = filteredStadiums
let visitedStadiumIds = Set(
visits
@@ -164,12 +141,12 @@ final class ProgressViewModel {
}
)
let visited = sportStadiums.filter { visitedStadiumIds.contains($0.id) }
let remaining = sportStadiums.filter { !visitedStadiumIds.contains($0.id) }
let visited = filteredStadiums.filter { visitedStadiumIds.contains($0.id) }
let remaining = filteredStadiums.filter { !visitedStadiumIds.contains($0.id) }
leagueProgress = LeagueProgress(
sport: selectedSport,
totalStadiums: sportStadiums.count,
totalStadiums: filteredStadiums.count,
visitedStadiums: visited.count,
stadiumsVisited: visited,
stadiumsRemaining: remaining
@@ -216,6 +193,33 @@ final class ProgressViewModel {
let visited = min(sportCounts[sport] ?? 0, total)
return (sport, total > 0 ? Double(visited) / Double(total) : 0)
})
// Recompute recent visits cache
recomputeRecentVisits()
}
private func recomputeRecentVisits() {
recentVisits = visits
.sorted { $0.visitDate > $1.visitDate }
.prefix(10)
.compactMap { visit -> VisitSummary? in
guard let stadium = dataProvider.stadium(for: visit.stadiumId),
let sport = visit.sportEnum else {
return nil
}
return VisitSummary(
id: visit.id,
stadium: stadium,
visitDate: visit.visitDate,
visitType: visit.visitType,
sport: sport,
homeTeamName: visit.homeTeamName,
awayTeamName: visit.awayTeamName,
score: visit.finalScore,
photoCount: visit.photoMetadata?.count ?? 0,
notes: visit.notes
)
}
}
// MARK: - Progress Card Generation

2
SportsTime/Features/Progress/Views/ProgressTabView.swift
View File

@@ -247,6 +247,8 @@ struct ProgressTabView: View {
label: "Complete"
)
}
.accessibilityElement(children: .ignore)
.accessibilityLabel("Statistics: \(progress.visitedStadiums) visited, \(progress.totalStadiums - progress.visitedStadiums) remaining, \(String(format: "%.0f", progress.completionPercentage)) percent complete")
}
.padding(Theme.Spacing.lg)
.background(Theme.cardBackground(colorScheme))

3
SportsTime/Features/Progress/Views/StadiumVisitSheet.swift
View File

@@ -114,6 +114,8 @@ struct StadiumVisitSheet: View {
.foregroundStyle(Theme.textMuted(colorScheme))
}
}
.accessibilityLabel(selectedStadium != nil ? "Stadium: \(selectedStadium!.name)" : "Select stadium")
.accessibilityHint("Opens stadium picker")
} header: {
Text("Location")
}
@@ -122,6 +124,7 @@ struct StadiumVisitSheet: View {
// Visit Details Section
Section {
DatePicker("Date", selection: $visitDate, displayedComponents: .date)
.accessibilityHint("Select the date you visited this stadium")
Picker("Visit Type", selection: $visitType) {
ForEach(VisitType.allCases, id: \.self) { type in

3
SportsTime/Features/Settings/Views/SettingsView.swift
View File

@@ -229,6 +229,9 @@ struct SettingsView: View {
.accessibilityHidden(true)
}
}
.accessibilityLabel("Animated background")
.accessibilityValue(DesignStyleManager.shared.animationsEnabled ? "On" : "Off")
.accessibilityHint("Toggle animated sports graphics on home screen")
.accessibilityIdentifier("settings.animationsToggle")
} header: {
Text("Home Screen")

49
SportsTime/Features/Trip/Views/TripDetailView.swift
View File

@@ -6,7 +6,6 @@
import SwiftUI
import SwiftData
import MapKit
import Combine
import UniformTypeIdentifiers
struct TripDetailView: View {
@@ -41,12 +40,14 @@ struct TripDetailView: View {
@State private var itineraryItems: [ItineraryItem] = []
@State private var addItemAnchor: AddItemAnchor?
@State private var editingItem: ItineraryItem?
@State private var subscriptionCancellable: AnyCancellable?
@State private var mapUpdateTask: Task<Void, Never>?
@State private var draggedItem: ItineraryItem?
@State private var draggedTravelId: String? // Track which travel segment is being dragged
@State private var dropTargetId: String? // Track which drop zone is being hovered
@State private var travelOverrides: [String: TravelOverride] = [:] // Key: travel ID, Value: day + sortOrder
@State private var cachedSections: [ItinerarySection] = []
@State private var cachedTripDays: [Date] = []
@State private var cachedRouteWaypoints: [(name: String, coordinate: CLLocationCoordinate2D, isCustomItem: Bool)] = []
// Apple Maps state
@State private var showMultiRouteAlert = false
@@ -134,25 +135,32 @@ struct TripDetailView: View {
await loadGamesIfNeeded()
if allowCustomItems {
await loadItineraryItems()
await setupSubscription()
}
recomputeTripDays()
recomputeSections()
recomputeRouteWaypoints()
}
.onDisappear {
subscriptionCancellable?.cancel()
mapUpdateTask?.cancel()
demoSaveTask?.cancel()
}
.onChange(of: itineraryItems) { _, newItems in
handleItineraryItemsChange(newItems)
recomputeTripDays()
recomputeSections()
recomputeRouteWaypoints()
}
.onChange(of: travelOverrides.count) { _, _ in
draggedTravelId = nil
dropTargetId = nil
recomputeTripDays()
recomputeSections()
recomputeRouteWaypoints()
}
.onChange(of: loadedGames.count) { _, _ in
recomputeTripDays()
recomputeSections()
recomputeRouteWaypoints()
}
.overlay {
if isExporting { exportProgressOverlay }
@@ -194,7 +202,8 @@ struct TripDetailView: View {
print("🗺️ [MapUpdate] Mappable: \(info.title) on day \(item.day), sortOrder: \(item.sortOrder)")
}
}
Task {
mapUpdateTask?.cancel()
mapUpdateTask = Task {
updateMapRegion()
await fetchDrivingRoutes()
}
@@ -865,9 +874,16 @@ struct TripDetailView: View {
}
private var tripDays: [Date] {
cachedTripDays
}
private func recomputeTripDays() {
let calendar = Calendar.current
guard let startDate = trip.stops.first?.arrivalDate,
let endDate = trip.stops.last?.departureDate else { return [] }
let endDate = trip.stops.last?.departureDate else {
cachedTripDays = []
return
}
var days: [Date] = []
var current = calendar.startOfDay(for: startDate)
@@ -877,7 +893,7 @@ struct TripDetailView: View {
days.append(current)
current = calendar.date(byAdding: .day, value: 1, to: current)!
}
return days
cachedTripDays = days
}
private func gamesOn(date: Date) -> [RichGame] {
@@ -1045,6 +1061,10 @@ struct TripDetailView: View {
/// Route waypoints including both game stops and mappable custom items in itinerary order
private var routeWaypoints: [(name: String, coordinate: CLLocationCoordinate2D, isCustomItem: Bool)] {
cachedRouteWaypoints
}
private func recomputeRouteWaypoints() {
// Build an ordered list combining game stops and mappable custom items
// Items are ordered by (day, sortOrder) - visual order matches route order
let itemsByDay = Dictionary(grouping: mappableCustomItems) { $0.day }
@@ -1125,7 +1145,7 @@ struct TripDetailView: View {
}
}
return waypoints
cachedRouteWaypoints = waypoints
}
private func updateMapRegion() {
@@ -1357,13 +1377,6 @@ struct TripDetailView: View {
// MARK: - Itinerary Items (CloudKit persistence)
private func setupSubscription() async {
// TODO: Re-implement CloudKit subscription for ItineraryItem changes
// The subscription service was removed during the ItineraryItem refactor.
// For now, items are only loaded on view appear.
print("📡 [Subscription] CloudKit subscriptions not yet implemented for ItineraryItem")
}
private func loadItineraryItems() async {
print("🔍 [ItineraryItems] Loading items for trip: \(trip.id)")
do {
@@ -1685,6 +1698,8 @@ struct DaySection: View {
}
.frame(maxWidth: .infinity, alignment: .leading)
.cardStyle()
.accessibilityElement(children: .combine)
.accessibilityLabel("Day \(dayNumber), \(formattedDate), rest day")
} else {
// Full game day display
VStack(alignment: .leading, spacing: Theme.Spacing.sm) {
@@ -1719,6 +1734,8 @@ struct DaySection: View {
}
}
.cardStyle()
.accessibilityElement(children: .combine)
.accessibilityLabel("Day \(dayNumber), \(formattedDate), \(games.count) game\(games.count > 1 ? "s" : "") in \(gameCity ?? "unknown city")")
}
}
}
@@ -2032,6 +2049,8 @@ struct TripMapView: View {
}
.id(routeVersion) // Force Map to recreate when routes change
.mapStyle(colorScheme == .dark ? .standard(elevation: .flat, emphasis: .muted) : .standard)
.accessibilityElement(children: .contain)
.accessibilityLabel("Trip route map showing \(stopCoordinates.count) stops")
}
}