Skip to content

Commit 7322e5c

Browse files
kvs-coderkvs-coder
committed
small fixes with wk activity type, extend types as well
1 parent 14dec34 commit 7322e5c

File tree

3 files changed

+86
-89
lines changed

3 files changed

+86
-89
lines changed

‎Example/Pods/Pods.xcodeproj/project.pbxproj‎

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎HealthKitReporter/Classes/Decorator/Extensions+HKWorkoutActivityType.swift‎

Lines changed: 81 additions & 88 deletions
Original file line numberDiff line numberDiff line change
@@ -9,97 +9,90 @@ import Foundation
99
import HealthKit
1010

1111
extension HKWorkoutActivityType {
12-
13-
/*
14-
Simple mapping of available workout types to a human readable name.
15-
*/
1612
var name: String {
1713
switch self {
18-
case .americanFootball: return "American Football"
19-
case .archery: return "Archery"
20-
case .australianFootball: return "Australian Football"
21-
case .badminton: return "Badminton"
22-
case .baseball: return "Baseball"
23-
case .basketball: return "Basketball"
24-
case .bowling: return "Bowling"
25-
case .boxing: return "Boxing"
26-
case .climbing: return "Climbing"
27-
case .crossTraining: return "Cross Training"
28-
case .curling: return "Curling"
29-
case .cycling: return "Cycling"
30-
case .dance: return "Dance"
31-
case .danceInspiredTraining: return "Dance Inspired Training"
32-
case .elliptical: return "Elliptical"
33-
case .equestrianSports: return "Equestrian Sports"
34-
case .fencing: return "Fencing"
35-
case .fishing: return "Fishing"
36-
case .functionalStrengthTraining: return "Functional Strength Training"
37-
case .golf: return "Golf"
38-
case .gymnastics: return "Gymnastics"
39-
case .handball: return "Handball"
40-
case .hiking: return "Hiking"
41-
case .hockey: return "Hockey"
42-
case .hunting: return "Hunting"
43-
case .lacrosse: return "Lacrosse"
44-
case .martialArts: return "Martial Arts"
45-
case .mindAndBody: return "Mind and Body"
14+
case .americanFootball: return "American Football"
15+
case .archery: return "Archery"
16+
case .australianFootball: return "Australian Football"
17+
case .badminton: return "Badminton"
18+
case .baseball: return "Baseball"
19+
case .basketball: return "Basketball"
20+
case .bowling: return "Bowling"
21+
case .boxing: return "Boxing"
22+
case .climbing: return "Climbing"
23+
case .crossTraining: return "Cross Training"
24+
case .curling: return "Curling"
25+
case .cycling: return "Cycling"
26+
case .dance: return "Dance"
27+
case .danceInspiredTraining: return "Dance Inspired Training"
28+
case .elliptical: return "Elliptical"
29+
case .equestrianSports: return "Equestrian Sports"
30+
case .fencing: return "Fencing"
31+
case .fishing: return "Fishing"
32+
case .functionalStrengthTraining: return "Functional Strength Training"
33+
case .golf: return "Golf"
34+
case .gymnastics: return "Gymnastics"
35+
case .handball: return "Handball"
36+
case .hiking: return "Hiking"
37+
case .hockey: return "Hockey"
38+
case .hunting: return "Hunting"
39+
case .lacrosse: return "Lacrosse"
40+
case .martialArts: return "Martial Arts"
41+
case .mindAndBody: return "Mind and Body"
4642
case .mixedMetabolicCardioTraining: return "Mixed Metabolic Cardio Training"
47-
case .paddleSports: return "Paddle Sports"
48-
case .play: return "Play"
49-
case .preparationAndRecovery: return "Preparation and Recovery"
50-
case .racquetball: return "Racquetball"
51-
case .rowing: return "Rowing"
52-
case .rugby: return "Rugby"
53-
case .running: return "Running"
54-
case .sailing: return "Sailing"
55-
case .skatingSports: return "Skating Sports"
56-
case .snowSports: return "Snow Sports"
57-
case .soccer: return "Soccer"
58-
case .softball: return "Softball"
59-
case .squash: return "Squash"
60-
case .stairClimbing: return "Stair Climbing"
61-
case .surfingSports: return "Surfing Sports"
62-
case .swimming: return "Swimming"
63-
case .tableTennis: return "Table Tennis"
64-
case .tennis: return "Tennis"
65-
case .trackAndField: return "Track and Field"
66-
case .traditionalStrengthTraining: return "Traditional Strength Training"
67-
case .volleyball: return "Volleyball"
68-
case .walking: return "Walking"
69-
case .waterFitness: return "Water Fitness"
70-
case .waterPolo: return "Water Polo"
71-
case .waterSports: return "Water Sports"
72-
case .wrestling: return "Wrestling"
73-
case .yoga: return "Yoga"
74-
75-
// iOS 10
76-
case .barre: return "Barre"
77-
case .coreTraining: return "Core Training"
78-
case .crossCountrySkiing: return "Cross Country Skiing"
79-
case .downhillSkiing: return "Downhill Skiing"
80-
case .flexibility: return "Flexibility"
81-
case .highIntensityIntervalTraining: return "High Intensity Interval Training"
82-
case .jumpRope: return "Jump Rope"
83-
case .kickboxing: return "Kickboxing"
84-
case .pilates: return "Pilates"
85-
case .snowboarding: return "Snowboarding"
86-
case .stairs: return "Stairs"
87-
case .stepTraining: return "Step Training"
88-
case .wheelchairWalkPace: return "Wheelchair Walk Pace"
89-
case .wheelchairRunPace: return "Wheelchair Run Pace"
90-
91-
// iOS 11
92-
case .taiChi: return "Tai Chi"
93-
case .mixedCardio: return "Mixed Cardio"
94-
case .handCycling: return "Hand Cycling"
95-
96-
// iOS 13
97-
case .discSports: return "Disc Sports"
98-
case .fitnessGaming: return "Fitness Gaming"
99-
100-
// Catch-all
101-
default: return "Other"
43+
case .paddleSports: return "Paddle Sports"
44+
case .play: return "Play"
45+
case .preparationAndRecovery: return "Preparation and Recovery"
46+
case .racquetball: return "Racquetball"
47+
case .rowing: return "Rowing"
48+
case .rugby: return "Rugby"
49+
case .running: return "Running"
50+
case .sailing: return "Sailing"
51+
case .skatingSports: return "Skating Sports"
52+
case .snowSports: return "Snow Sports"
53+
case .soccer: return "Soccer"
54+
case .softball: return "Softball"
55+
case .squash: return "Squash"
56+
case .stairClimbing: return "Stair Climbing"
57+
case .surfingSports: return "Surfing Sports"
58+
case .swimming: return "Swimming"
59+
case .tableTennis: return "Table Tennis"
60+
case .tennis: return "Tennis"
61+
case .trackAndField: return "Track and Field"
62+
case .traditionalStrengthTraining: return "Traditional Strength Training"
63+
case .volleyball: return "Volleyball"
64+
case .walking: return "Walking"
65+
case .waterFitness: return "Water Fitness"
66+
case .waterPolo: return "Water Polo"
67+
case .waterSports: return "Water Sports"
68+
case .wrestling: return "Wrestling"
69+
case .yoga: return "Yoga"
70+
case .barre: return "Barre"
71+
case .coreTraining: return "Core Training"
72+
case .crossCountrySkiing: return "Cross Country Skiing"
73+
case .downhillSkiing: return "Downhill Skiing"
74+
case .flexibility: return "Flexibility"
75+
case .highIntensityIntervalTraining: return "High Intensity Interval Training"
76+
case .jumpRope: return "Jump Rope"
77+
case .kickboxing: return "Kickboxing"
78+
case .pilates: return "Pilates"
79+
case .snowboarding: return "Snowboarding"
80+
case .stairs: return "Stairs"
81+
case .stepTraining: return "Step Training"
82+
case .wheelchairWalkPace: return "Wheelchair Walk Pace"
83+
case .wheelchairRunPace: return "Wheelchair Run Pace"
84+
case .taiChi: return "Tai Chi"
85+
case .mixedCardio: return "Mixed Cardio"
86+
case .handCycling: return "Hand Cycling"
87+
case .discSports: return "Disc Sports"
88+
case .fitnessGaming: return "Fitness Gaming"
89+
case .cricket: return "Cricket"
90+
case .cardioDance: return "Cardio Dance"
91+
case .socialDance: return "Social Dance"
92+
case .pickleball: return "Pickle Ball"
93+
case .cooldown: return "Cooldown"
94+
case .other: return "Other"
95+
@unknown default: return "Unknown Workout"
10296
}
10397
}
104-
10598
}

‎HealthKitReporter/Classes/Model/Payload/Workout.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ public struct Workout: Identifiable, Sample {
109109
self.endTimestamp = workout.endDate.timeIntervalSince1970
110110
self.device = Device(device: workout.device)
111111
self.sourceRevision = SourceRevision(sourceRevision: workout.sourceRevision)
112-
self.workoutName = String(describing: workout.workoutActivityType.name)
112+
self.workoutName = workout.workoutActivityType.name
113113
self.duration = workout.duration
114114
guard #available(iOS 11.0, *) else {
115115
throw HealthKitError.notAvailable(

0 commit comments

Comments
 (0)