admin/WerkoutIOS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

misc ui changes

Browse Source
This commit is contained in:
Trey t
2024-11-25 10:10:46 -08:00
parent 4b6352b8fd
commit 5145896f7a
5 changed files with 9683 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9806
iphone/Werkout_ios/JSON/WorkoutDetail.json
View File

File diff suppressed because it is too large Load Diff

4
iphone/Werkout_ios/Views/AllWorkouts/AllWorkoutsListView.swift
View File

@@ -37,10 +37,10 @@ struct AllWorkoutsListView: View {
currentSort: $currentSort)
ScrollView {
LazyVStack(spacing: 20) {
LazyVStack(spacing: 10) {
ForEach(filteredWorkouts, id:\.id) { workout in
WorkoutOverviewView(workout: workout)
.padding([.leading, .trailing])
.padding([.leading, .trailing], 4)
.contentShape(Rectangle())
.onTapGesture {
selectedWorkout(workout)

29
iphone/Werkout_ios/Views/PlanWorkoutView.swift
View File

@@ -17,6 +17,7 @@ struct PlanWorkoutView: View {
VStack() {
Text(workout.name)
.font(.title)
.frame(maxWidth: .infinity, alignment: .leading)
Text(selectedDate.formatted(date: .abbreviated, time: .omitted))
.font(.system(size: 28))
@@ -34,20 +35,6 @@ struct PlanWorkoutView: View {
Divider()
HStack {
Button(action: {
planWorkout()
}, label: {
Image(systemName: "plus.app")
.font(.title)
.frame(maxWidth: .infinity, maxHeight: .infinity)
})
.frame(maxWidth: .infinity, alignment: .center)
.frame(height: 44)
.foregroundColor(.blue)
.background(.yellow)
.cornerRadius(8)
.padding()
Button(action: {
dismiss()
}, label: {
@@ -61,6 +48,20 @@ struct PlanWorkoutView: View {
.background(.red)
.cornerRadius(8)
.padding()
Button(action: {
planWorkout()
}, label: {
Image(systemName: "plus.app")
.font(.title)
.frame(maxWidth: .infinity, maxHeight: .infinity)
})
.frame(maxWidth: .infinity, alignment: .center)
.frame(height: 44)
.foregroundColor(.blue)
.background(.yellow)
.cornerRadius(8)
.padding()
}
Spacer()

10
iphone/Werkout_ios/Views/WorkoutDetail/ExerciseListView.swift
View File

@@ -155,8 +155,8 @@ struct ExerciseListView: View {
}
}
//struct ExerciseListView_Previews: PreviewProvider {
// static var previews: some View {
// ExerciseListView(workout: PreviewData.workout(), showExecersizeInfo: )
// }
//}
struct ExerciseListView_Previews: PreviewProvider {
static var previews: some View {
ExerciseListView(workout: PreviewData.workout(), showExecersizeInfo: .constant(true))
}
}

2
iphone/Werkout_ios/subview/WorkoutOverviewView.swift
View File

@@ -60,7 +60,7 @@ struct WorkoutOverviewView: View {
}
.padding()
.background(Color(uiColor: .secondarySystemBackground))
.cornerRadius(15)
.cornerRadius(2)
}
}