From d9ec5483572e0cdfc637ba41f150838169562a53 Mon Sep 17 00:00:00 2001 From: Trey t Date: Mon, 17 Jun 2024 11:44:48 -0700 Subject: [PATCH] WIP --- Werkout_ios/Views/WorkoutDetail/ExerciseListView.swift | 2 +- Werkout_ios/Views/WorkoutDetail/WorkoutDetailView.swift | 2 ++ Werkout_ios/subview/AllWorkoutPickerView.swift | 2 +- Werkout_ios/subview/CountdownView.swift | 2 +- Werkout_ios/subview/ExtExerciseList.swift | 3 +-- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Werkout_ios/Views/WorkoutDetail/ExerciseListView.swift b/Werkout_ios/Views/WorkoutDetail/ExerciseListView.swift index e0d699d..63f33f4 100644 --- a/Werkout_ios/Views/WorkoutDetail/ExerciseListView.swift +++ b/Werkout_ios/Views/WorkoutDetail/ExerciseListView.swift @@ -45,7 +45,7 @@ struct ExerciseListView: View { supersetIndex == bridgeModule.currentExerciseInfo.supersetIndex && exerciseIndex == bridgeModule.currentExerciseInfo.exerciseIndex { Image(systemName: "figure.run") - .foregroundColor(.green) + .foregroundColor(Color("appColor")) } Text(supersetExecercise.exercise.extName) diff --git a/Werkout_ios/Views/WorkoutDetail/WorkoutDetailView.swift b/Werkout_ios/Views/WorkoutDetail/WorkoutDetailView.swift index 0efb660..e33b138 100644 --- a/Werkout_ios/Views/WorkoutDetail/WorkoutDetailView.swift +++ b/Werkout_ios/Views/WorkoutDetail/WorkoutDetailView.swift @@ -65,6 +65,7 @@ struct WorkoutDetailView: View { }, label: { Image(systemName: "arrow.triangle.2.circlepath.camera.fill") .frame(width: 44, height: 44) + .foregroundColor(Color("appColor")) }) .foregroundColor(.blue) .cornerRadius(4) @@ -76,6 +77,7 @@ struct WorkoutDetailView: View { }, label: { Image(systemName: "info.circle.fill") .frame(width: 44, height: 44) + .foregroundColor(Color("appColor")) }) .foregroundColor(.blue) .cornerRadius(4) diff --git a/Werkout_ios/subview/AllWorkoutPickerView.swift b/Werkout_ios/subview/AllWorkoutPickerView.swift index 6f5afc6..f5ba29d 100644 --- a/Werkout_ios/subview/AllWorkoutPickerView.swift +++ b/Werkout_ios/subview/AllWorkoutPickerView.swift @@ -30,7 +30,7 @@ struct AllWorkoutPickerView: View { Image(systemName: "figure.strengthtraining.traditional") .padding(.trailing) }) - .tint(.blue) + .tint(Color("appColor")) } } } diff --git a/Werkout_ios/subview/CountdownView.swift b/Werkout_ios/subview/CountdownView.swift index 368a73e..d15da41 100644 --- a/Werkout_ios/subview/CountdownView.swift +++ b/Werkout_ios/subview/CountdownView.swift @@ -16,7 +16,7 @@ struct CountdownView: View { HStack { if bridgeModule.currentExerciseTimeLeft >= 0 && duration > bridgeModule.currentExerciseTimeLeft { ProgressView(value: Float(bridgeModule.currentExerciseTimeLeft), total: Float(duration)) - .tint(.green) + .tint(Color("appColor")) } } } diff --git a/Werkout_ios/subview/ExtExerciseList.swift b/Werkout_ios/subview/ExtExerciseList.swift index efb0784..1b325e4 100644 --- a/Werkout_ios/subview/ExtExerciseList.swift +++ b/Werkout_ios/subview/ExtExerciseList.swift @@ -21,11 +21,10 @@ struct ExtExerciseList: View { HStack { if supersetExecerciseIdx == allSupersetExecerciseIndex { Image(systemName: "figure.run") - .foregroundColor(.green) + .foregroundColor(Color("appColor")) .font(Font.system(size: 55)) .minimumScaleFactor(0.01) .lineLimit(1) - .foregroundColor(.green) } Text(supersetExecercise.exercise.name)