Workouts 2.0: re-base persistence on iCloud Drive documents
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.
This commit is contained in:
@@ -0,0 +1,41 @@
|
||||
import SwiftUI
|
||||
#if canImport(UIKit)
|
||||
import UIKit
|
||||
#endif
|
||||
|
||||
extension Color {
|
||||
static func color(from name: String) -> Color {
|
||||
switch name.lowercased() {
|
||||
case "red": return .red
|
||||
case "orange": return .orange
|
||||
case "yellow": return .yellow
|
||||
case "green": return .green
|
||||
case "mint": return .mint
|
||||
case "teal": return .teal
|
||||
case "cyan": return .cyan
|
||||
case "blue": return .blue
|
||||
case "indigo": return .indigo
|
||||
case "purple": return .purple
|
||||
case "pink": return .pink
|
||||
case "brown": return .brown
|
||||
default: return .indigo
|
||||
}
|
||||
}
|
||||
|
||||
/// Returns a darker shade by reducing HSB brightness (not opacity).
|
||||
func darker(by percentage: CGFloat = 0.2) -> Color {
|
||||
#if canImport(UIKit)
|
||||
var h: CGFloat = 0, s: CGFloat = 0, b: CGFloat = 0, a: CGFloat = 0
|
||||
guard UIColor(self).getHue(&h, saturation: &s, brightness: &b, alpha: &a) else { return self }
|
||||
return Color(hue: Double(h), saturation: Double(s),
|
||||
brightness: Double(max(0, b * (1 - percentage))), opacity: Double(a))
|
||||
#else
|
||||
return self
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
// Canonical palettes for splits (single source of truth).
|
||||
let availableColors = ["red", "orange", "yellow", "green", "mint", "teal", "cyan", "blue", "indigo", "purple", "pink", "brown"]
|
||||
|
||||
let availableIcons = ["dumbbell.fill", "figure.strengthtraining.traditional", "figure.run", "figure.hiking", "figure.cooldown", "figure.boxing", "figure.wrestling", "figure.gymnastics", "figure.handball", "figure.core.training", "heart.fill", "bolt.fill"]
|
||||
@@ -0,0 +1,40 @@
|
||||
import Foundation
|
||||
|
||||
extension Date {
|
||||
// Cached formatters — DateFormatter init is expensive and these are called
|
||||
// in list rows on every render pass.
|
||||
private static let shortDateTime: DateFormatter = {
|
||||
let f = DateFormatter(); f.dateStyle = .short; f.timeStyle = .short; return f
|
||||
}()
|
||||
private static let timeOnly: DateFormatter = {
|
||||
let f = DateFormatter(); f.dateStyle = .none; f.timeStyle = .short; return f
|
||||
}()
|
||||
private static let mediumDate: DateFormatter = {
|
||||
let f = DateFormatter(); f.dateStyle = .medium; f.timeStyle = .none; return f
|
||||
}()
|
||||
private static let monthAbbrev: DateFormatter = {
|
||||
let f = DateFormatter(); f.dateFormat = "MMM"; return f
|
||||
}()
|
||||
private static let weekdayAbbrev: DateFormatter = {
|
||||
let f = DateFormatter(); f.dateFormat = "EEE"; return f
|
||||
}()
|
||||
|
||||
func formattedDate() -> String { Self.shortDateTime.string(from: self) }
|
||||
func formattedTime() -> String { Self.timeOnly.string(from: self) }
|
||||
func formatDate() -> String { Self.mediumDate.string(from: self) }
|
||||
|
||||
func isSameDay(as other: Date) -> Bool {
|
||||
Calendar.current.isDate(self, inSameDayAs: other)
|
||||
}
|
||||
|
||||
var abbreviatedMonth: String { Self.monthAbbrev.string(from: self) }
|
||||
var abbreviatedWeekday: String { Self.weekdayAbbrev.string(from: self) }
|
||||
var dayOfMonth: Int { Calendar.current.component(.day, from: self) }
|
||||
|
||||
func humanTimeInterval(to other: Date) -> String {
|
||||
let interval = other.timeIntervalSince(self)
|
||||
let hours = Int(interval) / 3600
|
||||
let minutes = (Int(interval) % 3600) / 60
|
||||
return hours > 0 ? "\(hours)h \(minutes)m" : "\(minutes)m"
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user