From c0fd4f7d52d92d755aa35d4d6329afabab30b271 Mon Sep 17 00:00:00 2001
From: Trey t <treytartt@fastmail.com>
Date: Wed, 21 Jun 2023 08:18:50 -0500
Subject: [PATCH] WIP

---
 Werkout_ios/APIModels/Workout.swift       | 2 +-
 Werkout_ios/Views/AllWorkoutsView.swift   | 8 +++-----
 Werkout_ios/Views/WorkoutDetailView.swift | 3 +++
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/Werkout_ios/APIModels/Workout.swift b/Werkout_ios/APIModels/Workout.swift
index 55a86e8..fc38f63 100644
--- a/Werkout_ios/APIModels/Workout.swift
+++ b/Werkout_ios/APIModels/Workout.swift
@@ -7,7 +7,7 @@
 
 import Foundation
 
-struct Workout: Codable {
+struct Workout: Codable, Identifiable {
     let id: Int
     let name: String
     let description: String?
diff --git a/Werkout_ios/Views/AllWorkoutsView.swift b/Werkout_ios/Views/AllWorkoutsView.swift
index c131f2d..3aaeae4 100644
--- a/Werkout_ios/Views/AllWorkoutsView.swift
+++ b/Werkout_ios/Views/AllWorkoutsView.swift
@@ -59,11 +59,9 @@ struct AllWorkoutsView: View {
                 })
             }
         }
-        .sheet(isPresented: $showWorkoutDetail) {
-            if let selectedWorkout = selectedWorkout {
-                let viewModel = WorkoutDetailViewModel(workout: selectedWorkout)
-                WorkoutDetailView(viewModel: viewModel)
-            }
+        .sheet(item: $selectedWorkout) { item in
+            let viewModel = WorkoutDetailViewModel(workout: item)
+            WorkoutDetailView(viewModel: viewModel)
         }
         .onReceive(pub) { (output) in
             self.needsUpdating = true
diff --git a/Werkout_ios/Views/WorkoutDetailView.swift b/Werkout_ios/Views/WorkoutDetailView.swift
index 5f496a2..1674f83 100644
--- a/Werkout_ios/Views/WorkoutDetailView.swift
+++ b/Werkout_ios/Views/WorkoutDetailView.swift
@@ -52,6 +52,7 @@ struct TopButtonsView: View {
                 }, label: {
                     Image(systemName: "xmark.octagon.fill")
                         .font(.title)
+                        .frame(maxWidth: .infinity, maxHeight: .infinity)
                 })
                 .frame(maxWidth: .infinity, maxHeight: .infinity)
                 .background(.red)
@@ -62,6 +63,7 @@ struct TopButtonsView: View {
                 }, label: {
                     Image(systemName: "figure.golf")
                         .font(.title)
+                        .frame(maxWidth: .infinity, maxHeight: .infinity)
                 })
                 .frame(maxWidth: .infinity, maxHeight: .infinity)
                 .background(.green)
@@ -73,6 +75,7 @@ struct TopButtonsView: View {
                 }, label: {
                     Image(systemName: "checkmark")
                         .font(.title)
+                        .frame(maxWidth: .infinity, maxHeight: .infinity)
                 })
                 .frame(maxWidth: .infinity, maxHeight: .infinity)
                 .background(.blue)