wip

Workouts/Models/Split.swift

@@ -5,27 +5,13 @@ import SwiftUI
 @Model
 final class Split {
     var name: String = ""
-    var intro: String = ""
     var color: String = "indigo"
     var systemImage: String = "dumbbell.fill"
+    var order: Int = 0
     
     // Returns the SwiftUI Color for the stored color name
-    func getColor() -> Color {
-        switch color {
-        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
-        }
+    func getColor () -> Color {
+        return Color.color(from: self.color)
     }
     
     @Relationship(deleteRule: .cascade, inverse: \SplitExerciseAssignment.split)
@@ -34,11 +20,11 @@ final class Split {
     @Relationship(deleteRule: .nullify, inverse: \Workout.split)
     var workouts: [Workout]? = []
     
-    init(name: String, intro: String, color: String = "indigo", systemImage: String = "dumbbell.fill") {
+    init(name: String, color: String = "indigo", systemImage: String = "dumbbell.fill", order: Int = 0) {
         self.name = name
-        self.intro = intro
         self.color = color
         self.systemImage = systemImage
+        self.order = order
     }
     
     static let unnamed = "Unnamed Split"
@@ -52,7 +38,7 @@ extension Split: EditableEntity {
     }
 
     static func createNew() -> Split {
-        return Split(name: "", intro: "")
+        return Split(name: "")
     }
     
     static var navigationTitle: String {
@@ -72,10 +58,6 @@ extension Split: EditableEntity {
 fileprivate struct SplitFormView: View {
     @Binding var model: Split
     
-    @State private var showingAddSheet: Bool = false
-    @State private var itemToEdit: SplitExerciseAssignment? = nil
-    @State private var itemToDelete: SplitExerciseAssignment? = nil
-    
     // Available colors for splits
     private let availableColors = ["red", "orange", "yellow", "green", "mint", "teal", "cyan", "blue", "indigo", "purple", "pink", "brown"]
     
@@ -88,15 +70,10 @@ fileprivate struct SplitFormView: View {
                 .bold()
         }
         
-        Section(header: Text("Description")) {
-            TextEditor(text: $model.intro)
-                .frame(minHeight: 100)
-        }
-        
         Section(header: Text("Appearance")) {
             Picker("Color", selection: $model.color) {
                 ForEach(availableColors, id: \.self) { colorName in
-                    let tempSplit = Split(name: "", intro: "", color: colorName)
+                    let tempSplit = Split(name: "", color: colorName)
                     HStack {
                         Circle()
                             .fill(tempSplit.getColor())
@@ -121,75 +98,7 @@ fileprivate struct SplitFormView: View {
         
         Section(header: Text("Exercises")) {
             NavigationLink {
-                NavigationStack {
-                    Form {
-                        List {
-                            if let assignments = model.exercises, !assignments.isEmpty {
-                                let sortedAssignments = assignments.sorted(by: { $0.order == $1.order ? $0.exercise?.name ?? Exercise.unnamed < $1.exercise?.name ?? Exercise.unnamed : $0.order < $1.order })
-                                ForEach(sortedAssignments) { item in
-                                    ListItem(
-                                        title: item.exercise?.name ?? Exercise.unnamed,
-                                        text: item.setup.isEmpty ? nil : item.setup,
-                                        subtitle: "\(item.sets) × \(item.reps) × \(item.weight) lbs"
-                                    )
-                                    .swipeActions {
-                                        Button(role: .destructive) {
-                                            itemToDelete = item
-                                        } label: {
-                                            Label("Delete", systemImage: "trash")
-                                        }
-                                        Button {
-                                            itemToEdit = item
-                                        } label: {
-                                            Label("Edit", systemImage: "pencil")
-                                        }
-                                        .tint(.indigo)
-                                    }
-                                }
-                            } else {
-                                Text("No exercises added yet.")
-                            }
-                        }
-                    }
-                    .navigationTitle("Exercises")
-                }
-                .toolbar {
-                    ToolbarItem(placement: .navigationBarTrailing) {
-                        Button(action: { showingAddSheet.toggle() }) {
-                            Image(systemName: "plus")
-                        }
-                    }
-                }
-                .sheet (isPresented: $showingAddSheet) {
-                    ExercisePickerView { exercise in
-                        itemToEdit = SplitExerciseAssignment(
-                            order: 0,
-                            sets: 3,
-                            reps: 10,
-                            weight: 40,
-                            split: model,
-                            exercise: exercise
-                        )
-                    }
-                }
-                .sheet(item: $itemToEdit) { item in
-                    SplitExerciseAssignmentAddEditView(model: item)
-                }
-                .confirmationDialog(
-                    "Delete Exercise?",
-                    isPresented: .constant(itemToDelete != nil),
-                    titleVisibility: .visible
-                ) {
-                    Button("Delete", role: .destructive) {
-                        if let item = itemToDelete {
-                            withAnimation {
-                                model.exercises?.removeAll { $0.id == item.id }
-                                itemToDelete = nil
-                            }
-                        }
-                    }
-                }
-
+                SplitExercisesListView(model: model)
             } label: {
                 ListItem(
                     text: "Exercises",