add excersise subviews
This commit is contained in:
@@ -7,7 +7,7 @@
|
||||
|
||||
import Foundation
|
||||
|
||||
struct Equipment: Codable {
|
||||
struct Equipment: Codable, Identifiable, Equatable {
|
||||
let id: Int
|
||||
let name, createdAt, updatedAt: String
|
||||
let is_weight: Bool?
|
||||
|
||||
@@ -37,19 +37,24 @@ struct SupersetExercise: Identifiable, Codable, Equatable, Hashable {
|
||||
}
|
||||
}
|
||||
|
||||
struct Exercise: Identifiable, Codable, Equatable {
|
||||
struct Exercise: Identifiable, Codable, Equatable, Hashable {
|
||||
static func == (lhs: Exercise, rhs: Exercise) -> Bool {
|
||||
lhs.id == rhs.id
|
||||
}
|
||||
|
||||
public func hash(into hasher: inout Hasher) {
|
||||
return hasher.combine(id)
|
||||
}
|
||||
|
||||
let id: Int
|
||||
let equipment: [Equipment]
|
||||
let muscles: [Muscle]
|
||||
let audioURL, videoURL, createdAt, updatedAt: String
|
||||
let name, description, side: String
|
||||
let name, description: String
|
||||
let side, jointsUsed, movementPatterns: String?
|
||||
let isTwoDumbbells, isTrackableDistance, isAlternating, isWeight: Bool
|
||||
let isDistance, isDuration, isReps: Bool
|
||||
let jointsUsed, movementPatterns, equipmentRequired, muscleGroups: String
|
||||
let equipmentRequired, muscleGroups: String?
|
||||
let synonyms: String?
|
||||
|
||||
enum CodingKeys: String, CodingKey {
|
||||
@@ -74,8 +79,8 @@ struct Exercise: Identifiable, Codable, Equatable {
|
||||
}
|
||||
|
||||
var extName: String {
|
||||
if side.count > 0 {
|
||||
var returnString = name + " - " + side
|
||||
if side != nil && side!.count > 0 {
|
||||
var returnString = name + " - " + side!
|
||||
returnString = returnString.replacingOccurrences(of: "_", with: " ")
|
||||
return returnString.capitalized
|
||||
}
|
||||
@@ -83,10 +88,10 @@ struct Exercise: Identifiable, Codable, Equatable {
|
||||
}
|
||||
|
||||
var spacedMuscleGroups: String {
|
||||
return muscleGroups.replacingOccurrences(of: ",", with: ", ")
|
||||
return muscleGroups?.replacingOccurrences(of: ",", with: ", ") ?? ""
|
||||
}
|
||||
|
||||
var spacedEquipmentRequired: String {
|
||||
return equipmentRequired.replacingOccurrences(of: ",", with: ", ")
|
||||
return equipmentRequired?.replacingOccurrences(of: ",", with: ", ") ?? ""
|
||||
}
|
||||
}
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
|
||||
import Foundation
|
||||
|
||||
struct Muscle: Codable {
|
||||
struct Muscle: Codable, Identifiable, Equatable {
|
||||
let id: Int
|
||||
let name, createdAt, updatedAt: String
|
||||
|
||||
|
||||
Reference in New Issue
Block a user