Some checks failed
Apple Platform CI / smoke-and-tests (push) Has been cancelled
Deep audit (issues 2-14): - Add missing WCSession handlers for applicationContext and userInfo - Fix BoundedFIFOQueue race condition with serial dispatch queue - Fix timer race condition with main thread guarantee - Fix watch pause state divergence — phone is now source of truth - Fix wrong notification posted on logout (createdNewWorkout → userLoggedOut) - Fix POST status check to accept any 2xx (was exact match) - Fix @StateObject → @ObservedObject for injected viewModel - Add pull-to-refresh to CompletedWorkoutsView - Fix typos: RefreshUserInfoFetcable, defualtPackageModle - Replace string concatenation with interpolation - Replace 6 @StateObject with @ObservedObject for BridgeModule.shared - Replace 7 hardcoded AVPlayer URLs with BaseURLs.currentBaseURL UI audit (issues 1-15): - Fix GeometryReader eating VStack space — replaced with .overlay - Fix refreshable continuation resuming before fetch completes - Remove duplicate @State workouts — derive from DataStore - Decouple leaf views from BridgeModule (pass discrete values) - Convert selectedIds from Array to Set for O(1) lookups - Extract .sorted() from var body into computed properties - Move search filter out of ForEach render loop - Replace import SwiftUI with import Combine in non-UI classes - Mark all @State properties private - Extract L/R exercise auto-add logic to WorkoutViewModel - Use enumerated() instead of .indices in ForEach - Make AddSupersetView frame flexible instead of fixed 300pt - Hoist Set construction out of per-exercise filter loop - Move ViewModel network fetch from init to load() Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
136 lines
4.7 KiB
Swift
136 lines
4.7 KiB
Swift
//
|
|
// WorkoutHistoryView.swift
|
|
// Werkout_ios
|
|
//
|
|
// Created by Trey Tartt on 6/26/23.
|
|
//
|
|
|
|
import SwiftUI
|
|
|
|
struct WorkoutHistoryView: View {
|
|
enum DifficltyString: Int {
|
|
case easy = 1
|
|
case moderate
|
|
case average
|
|
case hard
|
|
case death
|
|
|
|
var stringValue: String {
|
|
switch self {
|
|
|
|
case .easy:
|
|
return "Easy"
|
|
case .moderate:
|
|
return "Moderate"
|
|
case .average:
|
|
return "Average"
|
|
case .hard:
|
|
return "Hard"
|
|
case .death:
|
|
return "Death"
|
|
}
|
|
}
|
|
|
|
var color: Color {
|
|
switch self {
|
|
case .easy:
|
|
return WerkoutTheme.success
|
|
case .moderate:
|
|
return Color(red: 0.4, green: 0.8, blue: 0.2)
|
|
case .average:
|
|
return WerkoutTheme.warning
|
|
case .hard:
|
|
return Color(red: 1.0, green: 0.5, blue: 0.2)
|
|
case .death:
|
|
return WerkoutTheme.danger
|
|
}
|
|
}
|
|
}
|
|
|
|
let completedWorkouts: [CompletedWorkout]
|
|
|
|
@State private var selectedPlannedWorkout: Workout?
|
|
|
|
private var sortedWorkouts: [CompletedWorkout] {
|
|
completedWorkouts.sorted(by: { $0.createdAt > $1.createdAt })
|
|
}
|
|
|
|
var body: some View {
|
|
List {
|
|
ForEach(sortedWorkouts, id: \.id) { completedWorkout in
|
|
HStack {
|
|
VStack {
|
|
if let date = completedWorkout.workoutStartTime.dateFromServerDate {
|
|
Text(date.monthString)
|
|
.font(WerkoutTheme.caption)
|
|
.foregroundStyle(WerkoutTheme.textSecondary)
|
|
|
|
Text("\(date.get(.day))")
|
|
.font(WerkoutTheme.stat.monospacedDigit())
|
|
.foregroundStyle(WerkoutTheme.accent)
|
|
|
|
Text("\(date.get(.hour))")
|
|
.font(WerkoutTheme.caption)
|
|
.foregroundStyle(WerkoutTheme.textMuted)
|
|
}
|
|
}
|
|
.frame(minWidth: 60)
|
|
|
|
VStack(alignment: .leading) {
|
|
Text(completedWorkout.workout.name)
|
|
.font(WerkoutTheme.cardTitle)
|
|
.foregroundStyle(WerkoutTheme.textPrimary)
|
|
|
|
if let desc = completedWorkout.workout.description {
|
|
Text(desc)
|
|
.font(WerkoutTheme.caption)
|
|
.foregroundStyle(WerkoutTheme.textSecondary)
|
|
}
|
|
|
|
Divider()
|
|
.overlay(WerkoutTheme.divider)
|
|
|
|
if let difficulty = completedWorkout.difficulty,
|
|
let difficultyEnum = DifficltyString(rawValue: difficulty) {
|
|
Text(difficultyEnum.stringValue)
|
|
.font(WerkoutTheme.caption)
|
|
.foregroundStyle(difficultyEnum.color)
|
|
.padding(.horizontal, WerkoutTheme.sm)
|
|
.padding(.vertical, WerkoutTheme.xs)
|
|
.background(difficultyEnum.color.opacity(0.15))
|
|
.clipShape(RoundedRectangle(cornerRadius: WerkoutTheme.badgeRadius, style: .continuous))
|
|
}
|
|
|
|
if let notes = completedWorkout.notes {
|
|
Text(notes)
|
|
.font(WerkoutTheme.bodyText)
|
|
.foregroundStyle(WerkoutTheme.textSecondary)
|
|
}
|
|
}
|
|
.padding(.leading)
|
|
.contentShape(Rectangle())
|
|
.onTapGesture {
|
|
selectedPlannedWorkout = completedWorkout.workout
|
|
}
|
|
|
|
}
|
|
.listRowBackground(WerkoutTheme.surfaceCard)
|
|
}
|
|
}
|
|
.listStyle(.plain)
|
|
.background(WerkoutTheme.background)
|
|
.scrollContentBackground(.hidden)
|
|
.sheet(item: $selectedPlannedWorkout) { item in
|
|
let viewModel = WorkoutDetailViewModel(workout: item, isPreview: true)
|
|
WorkoutDetailView(viewModel: viewModel)
|
|
}
|
|
}
|
|
}
|
|
|
|
struct WorkoutHistoryView_Previews: PreviewProvider {
|
|
static let fakeHistory = PreviewData.parseCompletedWorkouts()
|
|
static var previews: some View {
|
|
WorkoutHistoryView(completedWorkouts: fakeHistory)
|
|
}
|
|
}
|