85d0eaddbb
Replace Core Data + NSPersistentCloudKitContainer + App-Group store + WatchConnectivity dictionary sync with the QuickRabbit iCloud-documents architecture: - iCloud Drive JSON documents are the sole source of truth (one file per aggregate: Splits/<ULID>.json, Workouts/YYYY/MM/<ULID>.json), with a rebuildable SwiftData cache populated only by an NSMetadataQuery observer and a connect-time reconcile. Soft-delete tombstones; hard iCloud gate. - Shared model layer (ULID, Codable *Documents + stateless mappers, @Model cache entities, SwiftData container) compiled into both targets. - New iPhone<->Watch bridge over WatchConnectivity keyed by ULIDs; the phone is the sole writer of iCloud Drive, the watch round-trips documents. - AppServices DI + iCloud-required root gate; Swift 6 strict concurrency. - Starter splits generated on demand from the bundled YAML catalogs. - Migrate to XcodeGen (project.yml), iOS 26 / watchOS 26; CloudDocuments entitlement (drop CloudKit/App Group/aps-environment). - Duration stored as Int seconds (was a Date epoch hack); fix workout end-on-create, undismissable delete dialog, toolbar-hiding nav stacks, and the Settings placeholder. - Add README/CHANGELOG/LICENSE, .gitignore, refreshed REQUIREMENTS, and the Scripts/ TestFlight pipeline (release.sh + ASC API scripts). MARKETING_VERSION 2.0.
142 lines
6.6 KiB
Swift
142 lines
6.6 KiB
Swift
//
|
|
// ExercisePickerView.swift
|
|
// Workouts
|
|
//
|
|
// Created by rzen on 7/13/25 at 7:17 PM.
|
|
//
|
|
// Copyright 2025 Rouslan Zenetl. All Rights Reserved.
|
|
//
|
|
|
|
import SwiftUI
|
|
|
|
struct ExercisePickerView: View {
|
|
@Environment(\.dismiss) private var dismiss
|
|
@State private var exerciseLists: [String: ExerciseListLoader.ExerciseListData] = [:]
|
|
@State private var selectedListName: String? = nil
|
|
@State private var selectedExercises: Set<String> = []
|
|
|
|
var onExerciseSelected: ([String]) -> Void
|
|
var allowMultiSelect: Bool = false
|
|
|
|
init(onExerciseSelected: @escaping ([String]) -> Void, allowMultiSelect: Bool = false) {
|
|
self.onExerciseSelected = onExerciseSelected
|
|
self.allowMultiSelect = allowMultiSelect
|
|
}
|
|
|
|
var body: some View {
|
|
NavigationStack {
|
|
Group {
|
|
if selectedListName == nil {
|
|
// Show list of exercise list files
|
|
List {
|
|
ForEach(Array(exerciseLists.keys.sorted()), id: \.self) { fileName in
|
|
if let list = exerciseLists[fileName] {
|
|
Button(action: {
|
|
selectedListName = fileName
|
|
}) {
|
|
VStack(alignment: .leading) {
|
|
Text(list.name)
|
|
.font(.headline)
|
|
Text(list.source)
|
|
.font(.subheadline)
|
|
.foregroundColor(.secondary)
|
|
Text("\(list.exercises.count) exercises")
|
|
.font(.caption)
|
|
.foregroundColor(.secondary)
|
|
}
|
|
.padding(.vertical, 4)
|
|
}
|
|
}
|
|
}
|
|
}
|
|
.toolbar {
|
|
ToolbarItem(placement: .navigationBarLeading) {
|
|
Button("Cancel") {
|
|
dismiss()
|
|
}
|
|
}
|
|
}
|
|
.navigationTitle("Exercise Lists")
|
|
} else if let fileName = selectedListName, let list = exerciseLists[fileName] {
|
|
// Show exercises in the selected list grouped by split
|
|
List {
|
|
let exercisesByGroup = Dictionary(grouping: list.exercises) { $0.split }
|
|
let sortedGroups = exercisesByGroup.keys.sorted()
|
|
|
|
ForEach(sortedGroups, id: \.self) { splitName in
|
|
Section(header: Text(splitName)) {
|
|
ForEach(exercisesByGroup[splitName]?.sorted(by: { $0.name < $1.name }) ?? [], id: \.id) { exercise in
|
|
if allowMultiSelect {
|
|
Button(action: {
|
|
if selectedExercises.contains(exercise.name) {
|
|
selectedExercises.remove(exercise.name)
|
|
} else {
|
|
selectedExercises.insert(exercise.name)
|
|
}
|
|
}) {
|
|
HStack {
|
|
VStack(alignment: .leading) {
|
|
Text(exercise.name)
|
|
.font(.headline)
|
|
Text(exercise.type)
|
|
.font(.caption)
|
|
.foregroundColor(.secondary)
|
|
}
|
|
.padding(.vertical, 2)
|
|
|
|
Spacer()
|
|
|
|
if selectedExercises.contains(exercise.name) {
|
|
Image(systemName: "checkmark")
|
|
.foregroundColor(.accentColor)
|
|
}
|
|
}
|
|
}
|
|
} else {
|
|
Button(action: {
|
|
onExerciseSelected([exercise.name])
|
|
dismiss()
|
|
}) {
|
|
VStack(alignment: .leading) {
|
|
Text(exercise.name)
|
|
.font(.headline)
|
|
Text(exercise.type)
|
|
.font(.caption)
|
|
.foregroundColor(.secondary)
|
|
}
|
|
.padding(.vertical, 2)
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
.toolbar {
|
|
ToolbarItem(placement: .navigationBarLeading) {
|
|
Button("Back") {
|
|
selectedListName = nil
|
|
selectedExercises.removeAll()
|
|
}
|
|
}
|
|
if allowMultiSelect {
|
|
ToolbarItem(placement: .navigationBarTrailing) {
|
|
Button("Select") {
|
|
if !selectedExercises.isEmpty {
|
|
onExerciseSelected(Array(selectedExercises))
|
|
dismiss()
|
|
}
|
|
}
|
|
.disabled(selectedExercises.isEmpty)
|
|
}
|
|
}
|
|
}
|
|
.navigationTitle(list.name)
|
|
}
|
|
}
|
|
}
|
|
.onAppear {
|
|
exerciseLists = ExerciseListLoader.loadExerciseLists()
|
|
}
|
|
}
|
|
}
|