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.
159 lines
5.2 KiB
Swift
159 lines
5.2 KiB
Swift
//
|
|
// SplitAddEditView.swift
|
|
// Workouts
|
|
//
|
|
// Created by rzen on 7/18/25 at 9:42 AM.
|
|
//
|
|
// Copyright 2025 Rouslan Zenetl. All Rights Reserved.
|
|
//
|
|
|
|
import SwiftUI
|
|
import SwiftData
|
|
|
|
struct SplitAddEditView: View {
|
|
@Environment(SyncEngine.self) private var sync
|
|
@Environment(\.modelContext) private var modelContext
|
|
@Environment(\.dismiss) private var dismiss
|
|
|
|
let split: Split?
|
|
var onDelete: (() -> Void)?
|
|
|
|
@State private var name: String = ""
|
|
@State private var color: String = "indigo"
|
|
@State private var systemImage: String = "dumbbell.fill"
|
|
@State private var showingIconPicker: Bool = false
|
|
@State private var showingDeleteConfirmation: Bool = false
|
|
|
|
var isEditing: Bool { split != nil }
|
|
|
|
init(split: Split?, onDelete: (() -> Void)? = nil) {
|
|
self.split = split
|
|
self.onDelete = onDelete
|
|
if let split = split {
|
|
_name = State(initialValue: split.name)
|
|
_color = State(initialValue: split.color)
|
|
_systemImage = State(initialValue: split.systemImage)
|
|
}
|
|
}
|
|
|
|
var body: some View {
|
|
NavigationStack {
|
|
Form {
|
|
Section(header: Text("Name")) {
|
|
TextField("Name", text: $name)
|
|
.bold()
|
|
}
|
|
|
|
Section(header: Text("Appearance")) {
|
|
Picker("Color", selection: $color) {
|
|
ForEach(availableColors, id: \.self) { colorName in
|
|
HStack {
|
|
Circle()
|
|
.fill(Color.color(from: colorName))
|
|
.frame(width: 20, height: 20)
|
|
Text(colorName.capitalized)
|
|
}
|
|
.tag(colorName)
|
|
}
|
|
}
|
|
|
|
Button {
|
|
showingIconPicker = true
|
|
} label: {
|
|
HStack {
|
|
Text("Icon")
|
|
.foregroundColor(.primary)
|
|
Spacer()
|
|
Image(systemName: systemImage)
|
|
.font(.title2)
|
|
.foregroundColor(.accentColor)
|
|
}
|
|
}
|
|
}
|
|
|
|
if let split = split {
|
|
Section(header: Text("Exercises")) {
|
|
NavigationLink {
|
|
ExerciseListView(split: split)
|
|
} label: {
|
|
ListItem(
|
|
text: "Exercises",
|
|
count: split.exercisesArray.count
|
|
)
|
|
}
|
|
}
|
|
|
|
Section {
|
|
Button("Delete Split", role: .destructive) {
|
|
showingDeleteConfirmation = true
|
|
}
|
|
}
|
|
}
|
|
}
|
|
.navigationTitle(isEditing ? "Edit Split" : "New Split")
|
|
.toolbar {
|
|
ToolbarItem(placement: .navigationBarLeading) {
|
|
Button("Cancel") {
|
|
dismiss()
|
|
}
|
|
}
|
|
|
|
ToolbarItem(placement: .navigationBarTrailing) {
|
|
Button("Save") {
|
|
save()
|
|
dismiss()
|
|
}
|
|
.disabled(name.isEmpty)
|
|
}
|
|
}
|
|
.sheet(isPresented: $showingIconPicker) {
|
|
SFSymbolPicker(selection: $systemImage)
|
|
}
|
|
.confirmationDialog(
|
|
"Delete This Split?",
|
|
isPresented: $showingDeleteConfirmation,
|
|
titleVisibility: .visible
|
|
) {
|
|
Button("Delete", role: .destructive) {
|
|
if let split = split {
|
|
Task {
|
|
await sync.delete(split: split)
|
|
}
|
|
dismiss()
|
|
onDelete?()
|
|
}
|
|
}
|
|
} message: {
|
|
Text("This will permanently delete the split and all its exercises.")
|
|
}
|
|
}
|
|
}
|
|
|
|
private func save() {
|
|
if let split = split {
|
|
// Update existing split
|
|
var doc = SplitDocument(from: split)
|
|
doc.name = name
|
|
doc.color = color
|
|
doc.systemImage = systemImage
|
|
doc.updatedAt = Date()
|
|
Task { await sync.save(split: doc) }
|
|
} else {
|
|
// Create new split
|
|
let existing = (try? modelContext.fetch(FetchDescriptor<Split>())) ?? []
|
|
let doc = SplitDocument(
|
|
schemaVersion: SplitDocument.currentSchema,
|
|
id: ULID.make(),
|
|
name: name,
|
|
color: color,
|
|
systemImage: systemImage,
|
|
order: existing.count,
|
|
createdAt: Date(),
|
|
updatedAt: Date(),
|
|
exercises: []
|
|
)
|
|
Task { await sync.save(split: doc) }
|
|
}
|
|
}
|
|
}
|