From e6cc60b0649fd7f3f0ab28e083e6c64c70c0b82f Mon Sep 17 00:00:00 2001 From: Trey t Date: Sun, 18 Jun 2023 21:12:17 -0500 Subject: [PATCH] WIP --- Werkout_ios.xcodeproj/project.pbxproj | 34 ++++-- .../{Models => APIModels}/Equipment.swift | 0 .../{Models => APIModels}/Exercise.swift | 0 .../{Models => APIModels}/Muscle.swift | 0 .../RegisteredUser.swift | 0 .../{Models => APIModels}/Workout.swift | 0 Werkout_ios/Views/AddExerciseView.swift | 24 +++- Werkout_ios/Views/CreateWorkoutView.swift | 43 ------- .../CreateExerciseActionsView.swift | 99 +++++++++++++++++ .../CreateWorkoutViews/CreateViewModels.swift | 98 ++++++++++++++++ .../CreateWorkoutMainView.swift | 105 ++++++++++++++++++ .../CreateWorkoutSupersetActionsView.swift | 53 +++++++++ Werkout_ios/Werkout_iosApp.swift | 2 +- 13 files changed, 403 insertions(+), 55 deletions(-) rename Werkout_ios/{Models => APIModels}/Equipment.swift (100%) rename Werkout_ios/{Models => APIModels}/Exercise.swift (100%) rename Werkout_ios/{Models => APIModels}/Muscle.swift (100%) rename Werkout_ios/{Models => APIModels}/RegisteredUser.swift (100%) rename Werkout_ios/{Models => APIModels}/Workout.swift (100%) delete mode 100644 Werkout_ios/Views/CreateWorkoutView.swift create mode 100644 Werkout_ios/Views/CreateWorkoutViews/CreateExerciseActionsView.swift create mode 100644 Werkout_ios/Views/CreateWorkoutViews/CreateViewModels.swift create mode 100644 Werkout_ios/Views/CreateWorkoutViews/CreateWorkoutMainView.swift create mode 100644 Werkout_ios/Views/CreateWorkoutViews/CreateWorkoutSupersetActionsView.swift diff --git a/Werkout_ios.xcodeproj/project.pbxproj b/Werkout_ios.xcodeproj/project.pbxproj index fadafc1..7831781 100644 --- a/Werkout_ios.xcodeproj/project.pbxproj +++ b/Werkout_ios.xcodeproj/project.pbxproj @@ -32,7 +32,10 @@ 1CF65A652A3BF6BE0042FFBD /* AllWorkouts.json in Resources */ = {isa = PBXBuildFile; fileRef = 1CF65A642A3BF6BE0042FFBD /* AllWorkouts.json */; }; 1CF65A672A3BFF840042FFBD /* Exercises.json in Resources */ = {isa = PBXBuildFile; fileRef = 1CF65A662A3BFF840042FFBD /* Exercises.json */; }; 1CF65A692A3C018F0042FFBD /* AccountView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1CF65A682A3C018F0042FFBD /* AccountView.swift */; }; - 1CF65A6B2A3C1EAC0042FFBD /* CreateWorkoutView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1CF65A6A2A3C1EAC0042FFBD /* CreateWorkoutView.swift */; }; + 1CF65A6B2A3C1EAC0042FFBD /* CreateWorkoutMainView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1CF65A6A2A3C1EAC0042FFBD /* CreateWorkoutMainView.swift */; }; + 1CF65A6E2A3F60480042FFBD /* CreateViewModels.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1CF65A6D2A3F60480042FFBD /* CreateViewModels.swift */; }; + 1CF65A732A3F60D20042FFBD /* CreateExerciseActionsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1CF65A722A3F60D20042FFBD /* CreateExerciseActionsView.swift */; }; + 1CF65A7B2A3F83440042FFBD /* CreateWorkoutSupersetActionsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1CF65A7A2A3F83440042FFBD /* CreateWorkoutSupersetActionsView.swift */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ @@ -64,7 +67,10 @@ 1CF65A642A3BF6BE0042FFBD /* AllWorkouts.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = AllWorkouts.json; sourceTree = ""; }; 1CF65A662A3BFF840042FFBD /* Exercises.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = Exercises.json; sourceTree = ""; }; 1CF65A682A3C018F0042FFBD /* AccountView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccountView.swift; sourceTree = ""; }; - 1CF65A6A2A3C1EAC0042FFBD /* CreateWorkoutView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CreateWorkoutView.swift; sourceTree = ""; }; + 1CF65A6A2A3C1EAC0042FFBD /* CreateWorkoutMainView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CreateWorkoutMainView.swift; sourceTree = ""; }; + 1CF65A6D2A3F60480042FFBD /* CreateViewModels.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CreateViewModels.swift; sourceTree = ""; }; + 1CF65A722A3F60D20042FFBD /* CreateExerciseActionsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CreateExerciseActionsView.swift; sourceTree = ""; }; + 1CF65A7A2A3F83440042FFBD /* CreateWorkoutSupersetActionsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CreateWorkoutSupersetActionsView.swift; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -103,7 +109,7 @@ 1CF65A272A3972840042FFBD /* Persistence.swift */, 1CF65A4F2A3A1EA90042FFBD /* BridgeModule.swift */, 1CF65A3F2A3973840042FFBD /* Views */, - 1CF65A3E2A39737D0042FFBD /* Models */, + 1CF65A3E2A39737D0042FFBD /* APIModels */, 1CF65A3D2A3973760042FFBD /* Network */, 1CF65A2E2A3972850042FFBD /* Assets.xcassets */, 1CF65A302A3972850042FFBD /* Werkout_ios.entitlements */, @@ -130,7 +136,7 @@ path = Network; sourceTree = ""; }; - 1CF65A3E2A39737D0042FFBD /* Models */ = { + 1CF65A3E2A39737D0042FFBD /* APIModels */ = { isa = PBXGroup; children = ( 1CF65A422A39FB410042FFBD /* Workout.swift */, @@ -139,7 +145,7 @@ 1CF65A582A3BF4B60042FFBD /* Muscle.swift */, 1CF65A5A2A3BF4BE0042FFBD /* Equipment.swift */, ); - path = Models; + path = APIModels; sourceTree = ""; }; 1CF65A3F2A3973840042FFBD /* Views */ = { @@ -149,7 +155,7 @@ 1CF65A3B2A3972CE0042FFBD /* ExternalWorkoutDetailView.swift */, 1CF65A622A3BF6A30042FFBD /* AllWorkoutsView.swift */, 1CF65A4B2A39FDA20042FFBD /* WorkoutDetailView.swift */, - 1CF65A6A2A3C1EAC0042FFBD /* CreateWorkoutView.swift */, + 1CF65A6C2A3F60100042FFBD /* CreateWorkoutViews */, 1CF65A602A3BF6020042FFBD /* AddExerciseView.swift */, 1CF65A4D2A39FF200042FFBD /* WorkoutDetailViewModel.swift */, 1CF65A682A3C018F0042FFBD /* AccountView.swift */, @@ -169,6 +175,17 @@ path = JSON; sourceTree = ""; }; + 1CF65A6C2A3F60100042FFBD /* CreateWorkoutViews */ = { + isa = PBXGroup; + children = ( + 1CF65A6D2A3F60480042FFBD /* CreateViewModels.swift */, + 1CF65A6A2A3C1EAC0042FFBD /* CreateWorkoutMainView.swift */, + 1CF65A722A3F60D20042FFBD /* CreateExerciseActionsView.swift */, + 1CF65A7A2A3F83440042FFBD /* CreateWorkoutSupersetActionsView.swift */, + ); + path = CreateWorkoutViews; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -245,7 +262,8 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 1CF65A6B2A3C1EAC0042FFBD /* CreateWorkoutView.swift in Sources */, + 1CF65A6B2A3C1EAC0042FFBD /* CreateWorkoutMainView.swift in Sources */, + 1CF65A7B2A3F83440042FFBD /* CreateWorkoutSupersetActionsView.swift in Sources */, 1CF65A262A3972840042FFBD /* Werkout_iosApp.swift in Sources */, 1CF65A3C2A3972CE0042FFBD /* ExternalWorkoutDetailView.swift in Sources */, 1CF65A632A3BF6A30042FFBD /* AllWorkoutsView.swift in Sources */, @@ -253,12 +271,14 @@ 1CF65A4E2A39FF200042FFBD /* WorkoutDetailViewModel.swift in Sources */, 1CF65A472A39FB6C0042FFBD /* RegisteredUser.swift in Sources */, 1CF65A522A3A90A00042FFBD /* PreviewWorkout.swift in Sources */, + 1CF65A6E2A3F60480042FFBD /* CreateViewModels.swift in Sources */, 1CF65A4C2A39FDA20042FFBD /* WorkoutDetailView.swift in Sources */, 1CF65A432A39FB410042FFBD /* Workout.swift in Sources */, 1CF65A502A3A1EA90042FFBD /* BridgeModule.swift in Sources */, 1CF65A592A3BF4B60042FFBD /* Muscle.swift in Sources */, 1CF65A2B2A3972840042FFBD /* Werkout_ios.xcdatamodeld in Sources */, 1CF65A2D2A3972840042FFBD /* MainView.swift in Sources */, + 1CF65A732A3F60D20042FFBD /* CreateExerciseActionsView.swift in Sources */, 1CF65A282A3972840042FFBD /* Persistence.swift in Sources */, 1CF65A5B2A3BF4BE0042FFBD /* Equipment.swift in Sources */, 1CF65A452A39FB550042FFBD /* Exercise.swift in Sources */, diff --git a/Werkout_ios/Models/Equipment.swift b/Werkout_ios/APIModels/Equipment.swift similarity index 100% rename from Werkout_ios/Models/Equipment.swift rename to Werkout_ios/APIModels/Equipment.swift diff --git a/Werkout_ios/Models/Exercise.swift b/Werkout_ios/APIModels/Exercise.swift similarity index 100% rename from Werkout_ios/Models/Exercise.swift rename to Werkout_ios/APIModels/Exercise.swift diff --git a/Werkout_ios/Models/Muscle.swift b/Werkout_ios/APIModels/Muscle.swift similarity index 100% rename from Werkout_ios/Models/Muscle.swift rename to Werkout_ios/APIModels/Muscle.swift diff --git a/Werkout_ios/Models/RegisteredUser.swift b/Werkout_ios/APIModels/RegisteredUser.swift similarity index 100% rename from Werkout_ios/Models/RegisteredUser.swift rename to Werkout_ios/APIModels/RegisteredUser.swift diff --git a/Werkout_ios/Models/Workout.swift b/Werkout_ios/APIModels/Workout.swift similarity index 100% rename from Werkout_ios/Models/Workout.swift rename to Werkout_ios/APIModels/Workout.swift diff --git a/Werkout_ios/Views/AddExerciseView.swift b/Werkout_ios/Views/AddExerciseView.swift index 056b167..a905a19 100644 --- a/Werkout_ios/Views/AddExerciseView.swift +++ b/Werkout_ios/Views/AddExerciseView.swift @@ -7,6 +7,7 @@ import Foundation import SwiftUI +import Combine struct AddExerciseView: View { @State var exercises: [ExerciseExercise]? @@ -17,6 +18,8 @@ struct AddExerciseView: View { @State var selectedEquipment = [Equipment]() @State var filteredExercises = [ExerciseExercise]() + @State var searchString: String = "" + @EnvironmentObject var bridgeModule: BridgeModule @Environment(\.dismiss) var dismiss @@ -101,15 +104,23 @@ struct AddExerciseView: View { }.frame(height: 100) } + TextField("Filter", text: $searchString) + .onReceive(Just(searchString)) { location in + filterExercises() + } + .padding() + List() { ForEach(filteredExercises.indices, id: \.self) { i in let obj = filteredExercises[i] VStack { Text(obj.name) .frame(maxWidth: .infinity, alignment: .leading) - Text(obj.side) - .font(.footnote) - .frame(maxWidth: .infinity, alignment: .leading) + if obj.side.count > 0 { + Text(obj.side) + .font(.footnote) + .frame(maxWidth: .infinity, alignment: .leading) + } Text(obj.equipmentRequired) .font(.footnote) .frame(maxWidth: .infinity, alignment: .leading) @@ -117,6 +128,7 @@ struct AddExerciseView: View { .font(.footnote) .frame(maxWidth: .infinity, alignment: .leading) } + .contentShape(Rectangle()) .onTapGesture { selectedWorkout(obj) dismiss() @@ -172,7 +184,11 @@ struct AddExerciseView: View { } } - return hasCorrectMuscles && hasCorrectEquipment + if !searchString.isEmpty { + return exercise.name.contains(searchString) && hasCorrectMuscles && hasCorrectEquipment + } else { + return hasCorrectMuscles && hasCorrectEquipment + } }) } diff --git a/Werkout_ios/Views/CreateWorkoutView.swift b/Werkout_ios/Views/CreateWorkoutView.swift deleted file mode 100644 index 95293ce..0000000 --- a/Werkout_ios/Views/CreateWorkoutView.swift +++ /dev/null @@ -1,43 +0,0 @@ -// -// CreateWorkoutView.swift -// Werkout_ios -// -// Created by Trey Tartt on 6/15/23. -// - -import SwiftUI - -struct CreateWorkoutView: View { - @State var exercises = [ExerciseExercise]() - @State private var showAddExercise = false - - var body: some View { - VStack { - Button("add", action: { - showAddExercise.toggle() - }) - - List() { - ForEach(exercises.indices, id: \.self) { i in - let obj = exercises[i] - Text(obj.name) - } - } - } - .sheet(isPresented: $showAddExercise) { - AddExerciseView(selectedWorkout: { exercise in - addNewExercise(exercise: exercise) - }) - } - } - - func addNewExercise(exercise: ExerciseExercise) { - exercises.append(exercise) - } -} - -struct CreateWorkoutView_Previews: PreviewProvider { - static var previews: some View { - CreateWorkoutView() - } -} diff --git a/Werkout_ios/Views/CreateWorkoutViews/CreateExerciseActionsView.swift b/Werkout_ios/Views/CreateWorkoutViews/CreateExerciseActionsView.swift new file mode 100644 index 0000000..0ac3585 --- /dev/null +++ b/Werkout_ios/Views/CreateWorkoutViews/CreateExerciseActionsView.swift @@ -0,0 +1,99 @@ +// +// CreateViewRepsWeightView.swift +// Werkout_ios +// +// Created by Trey Tartt on 6/18/23. +// + +import SwiftUI + +struct CreateExerciseActionsView: View { + @ObservedObject var workoutExercise: CreateWorkoutExercise + var superset: CreateWorkoutSuperSet + var viewModel: WorkoutViewModel + + var body: some View { + VStack { + if workoutExercise.exercise.isReps { + VStack { + HStack { + VStack { + HStack { + Text("Reps: ") + Text("\(workoutExercise.reps)") + } + Stepper("", onIncrement: { + workoutExercise.increaseReps() + }, onDecrement: { + workoutExercise.decreaseReps() + }) + } + Divider() + VStack{ + HStack { + Text("Weight: ") + Text("\(workoutExercise.weight)") + } + Stepper("", onIncrement: { + workoutExercise.increaseWeight() + }, onDecrement: { + workoutExercise.decreaseWeight() + }) + } + } + } + } else if workoutExercise.exercise.isDuration { + VStack{ + HStack { + Text("Duration: ") + Text("\(workoutExercise.duration)") + } + Stepper("", onIncrement: { + workoutExercise.increaseDuration() + }, onDecrement: { + workoutExercise.decreaseDuration() + }) + } + } + + HStack { + Spacer() + Button(action: { + }) { + Image(systemName: "video.fill") + } + .frame(width: 88, height: 44) + .foregroundColor(.white) + .background(.blue) + .cornerRadius(10) + + Spacer() + + Divider() + + Spacer() + + Button(action: { + superset.deleteExerciseForChosenSuperset(exercise: workoutExercise) + viewModel.objectWillChange.send() + }) { + Image(systemName: "trash.fill") + } + .frame(width: 88, height: 44) + .foregroundColor(.white) + .background(.red) + .cornerRadius(10) + Spacer() + } + + Divider() + .background(.blue) + } + } +} + +//struct CreateViewRepsWeightView_Previews: PreviewProvider { +// static var previews: some View { +// CreateViewRepsWeightView() +// } +//} diff --git a/Werkout_ios/Views/CreateWorkoutViews/CreateViewModels.swift b/Werkout_ios/Views/CreateWorkoutViews/CreateViewModels.swift new file mode 100644 index 0000000..29e888f --- /dev/null +++ b/Werkout_ios/Views/CreateWorkoutViews/CreateViewModels.swift @@ -0,0 +1,98 @@ +// +// CreateViewModels.swift +// Werkout_ios +// +// Created by Trey Tartt on 6/18/23. +// + +import SwiftUI + +class CreateWorkoutExercise: ObservableObject, Identifiable { + let id = UUID() + var exercise: ExerciseExercise + @Published var reps: Int = 0 + @Published var duration: Int = 0 + @Published var weight: Int = 0 + + init(exercise: ExerciseExercise, reps: Int = 0, duration: Int = 0, weight: Int = 0) { + self.exercise = exercise + self.reps = reps + self.duration = duration + self.weight = weight + } + + func increaseReps() { + self.reps += 1 + } + + func decreaseReps() { + self.reps -= 1 + if self.reps < 0 { + self.reps = 0 + } + } + + func increaseDuration() { + self.duration += 15 + } + + func decreaseDuration() { + self.duration -= 15 + if self.duration < 0 { + self.duration = 0 + } + } + + func increaseWeight() { + self.weight += 5 + } + + func decreaseWeight() { + self.weight -= 15 + if self.weight < 0 { + self.weight = 0 + } + } +} + +class CreateWorkoutSuperSet: ObservableObject, Identifiable { + let id = UUID() + @Published var exercises = [CreateWorkoutExercise]() + @Published var numberOfRounds = 1 + + func increaseNumberOfRounds() { + self.numberOfRounds += 1 + } + + func decreaseNumberOfRounds() { + self.numberOfRounds -= 1 + if self.numberOfRounds < 1 { + self.numberOfRounds = 1 + } + } + + func deleteExerciseForChosenSuperset(exercise: CreateWorkoutExercise) { + if let idx = exercises.firstIndex(where: { + $0.id == exercise.id + }) { + exercises.remove(at: idx) + } + } +} + +class WorkoutViewModel: ObservableObject { + @Published var superSets = [CreateWorkoutSuperSet]() + @Published var title = String() + + func addNewSuperset() { + superSets.append(CreateWorkoutSuperSet()) + } + + func delete(superset: CreateWorkoutSuperSet) { + if let idx = superSets.firstIndex(where: { + $0.id == superset.id + }) { + superSets.remove(at: idx) + } + } +} diff --git a/Werkout_ios/Views/CreateWorkoutViews/CreateWorkoutMainView.swift b/Werkout_ios/Views/CreateWorkoutViews/CreateWorkoutMainView.swift new file mode 100644 index 0000000..820f63c --- /dev/null +++ b/Werkout_ios/Views/CreateWorkoutViews/CreateWorkoutMainView.swift @@ -0,0 +1,105 @@ +// +// CreateWorkoutView.swift +// Werkout_ios +// +// Created by Trey Tartt on 6/15/23. +// + +import SwiftUI + +struct CreateWorkoutMainView: View { + @ObservedObject var viewModel = WorkoutViewModel() + @State private var showAddExercise = false + @State var selectedCreateWorkoutSuperSet: CreateWorkoutSuperSet? + + var body: some View { + VStack { + TextField("Title", text: $viewModel.title) + .padding() + + HStack { + Button("Add Superset", action: { + viewModel.addNewSuperset() + }) + .frame(maxWidth: .infinity, alignment: .center) + .frame(height: 44) + .foregroundColor(.blue) + .background(.yellow) + .cornerRadius(8) + .padding() + .frame(maxWidth: .infinity) + + Divider() + + Button("Done", action: { + + }) + .frame(maxWidth: .infinity, alignment: .center) + .frame(height: 44) + .foregroundColor(.white) + .background(.blue) + .cornerRadius(8) + .padding() + .frame(maxWidth: .infinity) + } + .frame(height: 44) + + List() { + ForEach($viewModel.superSets, id: \.id) { superset in + Section { + ForEach(superset.exercises, id: \.id) { exercise in + HStack { + VStack { + Text(exercise.wrappedValue.exercise.name) + .font(.title2) + .frame(maxWidth: .infinity) + if exercise.wrappedValue.exercise.side.count > 0 { + Text(exercise.wrappedValue.exercise.side) + .font(.title3) + .frame(maxWidth: .infinity, alignment: .center) + } + CreateExerciseActionsView(workoutExercise: exercise.wrappedValue, + superset: superset.wrappedValue, + viewModel: viewModel) + + } + } + } + + + HStack { + Stepper("Number of rounds", onIncrement: { + superset.wrappedValue.increaseNumberOfRounds() + viewModel.objectWillChange.send() + }, onDecrement: { + superset.wrappedValue.decreaseNumberOfRounds() + viewModel.objectWillChange.send() + }) + Text("\(superset.wrappedValue.numberOfRounds)") + } + + CreateWorkoutSupersetActionsView(workoutSuperSet: superset.wrappedValue, + showAddExercise: $showAddExercise, + viewModel: viewModel, + selectedCreateWorkoutSuperSet: $selectedCreateWorkoutSuperSet) + } + } + .listRowSeparator(.hidden) + } + } + .sheet(isPresented: $showAddExercise) { + AddExerciseView(selectedWorkout: { exercise in + let workoutExercise = CreateWorkoutExercise(exercise: exercise) + selectedCreateWorkoutSuperSet?.exercises.append(workoutExercise) + viewModel.objectWillChange.send() + selectedCreateWorkoutSuperSet = nil + }) + } + } +} + +//struct CreateWorkoutView_Previews: PreviewProvider { +// static var previews: some View { +// CreateWorkoutView() +// } +//} diff --git a/Werkout_ios/Views/CreateWorkoutViews/CreateWorkoutSupersetActionsView.swift b/Werkout_ios/Views/CreateWorkoutViews/CreateWorkoutSupersetActionsView.swift new file mode 100644 index 0000000..d67334b --- /dev/null +++ b/Werkout_ios/Views/CreateWorkoutViews/CreateWorkoutSupersetActionsView.swift @@ -0,0 +1,53 @@ +// +// CreateWorkoutSupersetActionsView.swift +// Werkout_ios +// +// Created by Trey Tartt on 6/18/23. +// + +import SwiftUI + +struct CreateWorkoutSupersetActionsView: View { + var workoutSuperSet: CreateWorkoutSuperSet + @Binding var showAddExercise: Bool + var viewModel: WorkoutViewModel + @Binding var selectedCreateWorkoutSuperSet: CreateWorkoutSuperSet? + + var body: some View { + HStack { + Button(action: { + selectedCreateWorkoutSuperSet = workoutSuperSet + showAddExercise.toggle() + }) { + Text("Add exercise") + .padding() + } + .frame(maxWidth: .infinity) + .foregroundColor(.white) + .background(.green) + .cornerRadius(10) + .frame(maxWidth: .infinity, alignment: .center) + + // Button(action: { + // if let selectedCreateWorkoutSuperSet = selectedCreateWorkoutSuperSet { + // viewModel.delete(superset: selectedCreateWorkoutSuperSet) + // viewModel.objectWillChange.send() + // } + // }) { + // Text("Delete superset") + // .padding() + // } + // .frame(maxWidth: .infinity) + // .foregroundColor(.white) + // .background(.red) + // .cornerRadius(10) + // .frame(maxWidth: .infinity, alignment: .center) + } + } +} + +//struct CreateWorkoutSupersetActionsView_Previews: PreviewProvider { +// static var previews: some View { +// CreateWorkoutSupersetActionsView() +// } +//} diff --git a/Werkout_ios/Werkout_iosApp.swift b/Werkout_ios/Werkout_iosApp.swift index 79d0137..6f01ac4 100644 --- a/Werkout_ios/Werkout_iosApp.swift +++ b/Werkout_ios/Werkout_iosApp.swift @@ -46,7 +46,7 @@ struct Werkout_iosApp: App { .tabItem { Label("All Workouts", systemImage: "figure.strengthtraining.traditional") } - CreateWorkoutView() + CreateWorkoutMainView() .tabItem { Label("Create Workout", systemImage: "plus.app.fill") }