Skip to content

Commit 948f06e

Browse files
stevetreasestevetrease
committed
Restructured workout cell items to show steps for wallking/runnning and swimming distance in meters.
1 parent c18b376 commit 948f06e

File tree

8 files changed

+42
-19
lines changed

8 files changed

+42
-19
lines changed

‎build‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
679
1+
682

‎iOS Steps Today/Info.plist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<key>CFBundleShortVersionString</key>
2020
<string>1.0</string>
2121
<key>CFBundleVersion</key>
22-
<string>679</string>
22+
<string>682</string>
2323
<key>NSExtension</key>
2424
<dict>
2525
<key>NSExtensionMainStoryboard</key>

‎iOS Steps Watch Extension/Info.plist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<key>CFBundleShortVersionString</key>
2020
<string>1.0</string>
2121
<key>CFBundleVersion</key>
22-
<string>679</string>
22+
<string>682</string>
2323
<key>NSExtension</key>
2424
<dict>
2525
<key>NSExtensionAttributes</key>

‎iOS Steps Watch/Info.plist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<key>CFBundleShortVersionString</key>
2020
<string>1.0</string>
2121
<key>CFBundleVersion</key>
22-
<string>679</string>
22+
<string>682</string>
2323
<key>UIBackgroundModes</key>
2424
<array/>
2525
<key>UISupportedInterfaceOrientations</key>

‎iOS Steps/ActivityViewController.swift‎

Lines changed: 35 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -117,24 +117,36 @@ class ActivityViewController: UIViewController, UITableViewDelegate, UITableView
117117
let energy = workout.totalEnergyBurned?.doubleValue(for: HKUnit.largeCalorie())
118118
let energyString = energyFormatter.string(fromValue: energy!, unit: .calorie)
119119

120-
let distance = Measurement(value: (workout.totalDistance?.doubleValue(for: HKUnit.mile()))!, unit: UnitLength.miles)
121-
let distanceFormatter = MeasurementFormatter()
122-
distanceFormatter.unitStyle = .medium
123-
distanceFormatter.numberFormatter.maximumFractionDigits = 1
124-
distanceFormatter.numberFormatter.minimumFractionDigits = 1
125-
let distanceString = distanceFormatter.string(from: distance)
126-
127-
128120
let cell = tableView.dequeueReusableCell(withIdentifier: "cellIDwalking")! as! CustomTableViewCell
129-
cell.energyLabel.text = energyString
130121
cell.durationLabel.text = durationString
131122
cell.timeLabel.text = timeString
132-
cell.distanceLabel.text = distanceString
133123
cell.activityLabel.text = healthKitManager.workoutTypeIcon(workout.workoutActivityType)
134124
// cell.activityImage.image = healthKitManager.workoutTypeImage(workout.workoutActivityType)
135125

126+
switch workout.workoutActivityType {
127+
case HKWorkoutActivityType.cycling:
128+
let distance = Measurement(value: (workout.totalDistance?.doubleValue(for: HKUnit.mile()))!, unit: UnitLength.miles)
129+
let distanceFormatter = MeasurementFormatter()
130+
distanceFormatter.unitStyle = .medium
131+
distanceFormatter.numberFormatter.maximumFractionDigits = 1
132+
distanceFormatter.numberFormatter.minimumFractionDigits = 1
133+
let distanceString = distanceFormatter.string(from: distance)
134+
135+
cell.energyLabel.text = energyString
136+
cell.distanceLabel.text = distanceString
136137

137-
if (workout.workoutActivityType == . running || workout.workoutActivityType == .walking) {
138+
case HKWorkoutActivityType.swimming:
139+
let distance = Measurement(value: (workout.totalDistance?.doubleValue(for: HKUnit.mile()))!, unit: UnitLength.meters)
140+
let distanceFormatter = MeasurementFormatter()
141+
distanceFormatter.unitStyle = .medium
142+
distanceFormatter.numberFormatter.maximumFractionDigits = 0
143+
distanceFormatter.numberFormatter.minimumFractionDigits = 0
144+
let distanceString = distanceFormatter.string(from: distance)
145+
146+
cell.energyLabel.text = energyString
147+
cell.distanceLabel.text = distanceString
148+
149+
case HKWorkoutActivityType.walking, HKWorkoutActivityType.running:
138150
healthKitManager.stepsBetween(startDate: workout.startDate, endDate: workout.endDate, completion: { (steps) in
139151
OperationQueue.main.addOperation {
140152
let stepFormatter = NumberFormatter()
@@ -143,9 +155,20 @@ class ActivityViewController: UIViewController, UITableViewDelegate, UITableView
143155
cell.energyLabel.text = stepFormatter.string(from: steps! as NSNumber)!
144156
}
145157
})
158+
159+
let distance = Measurement(value: (workout.totalDistance?.doubleValue(for: HKUnit.mile()))!, unit: UnitLength.miles)
160+
let distanceFormatter = MeasurementFormatter()
161+
distanceFormatter.unitStyle = .medium
162+
distanceFormatter.numberFormatter.maximumFractionDigits = 1
163+
distanceFormatter.numberFormatter.minimumFractionDigits = 1
164+
let distanceString = distanceFormatter.string(from: distance)
165+
166+
cell.distanceLabel.text = distanceString
167+
168+
default:
169+
print (NSURL (fileURLWithPath: "\(#file)").lastPathComponent!, "\(#function) unknown switch case")
146170
}
147171

148-
149172
return cell
150173
}
151174

‎iOS Steps/Base.lproj/LaunchScreen.storyboard‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
2222
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
2323
<subviews>
24-
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Build: 679 (3b8868e)" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="yhA-lX-4Of" userLabel="APP_VERSION">
24+
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Build: 682 (c18b376)" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="yhA-lX-4Of" userLabel="APP_VERSION">
2525
<rect key="frame" x="132.5" y="527" width="55.5" height="21"/>
2626
<fontDescription key="fontDescription" type="system" pointSize="17"/>
2727
<nil key="textColor"/>

‎iOS Steps/Base.lproj/LaunchScreen.storyboardbak‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
2222
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
2323
<subviews>
24-
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Build: 678 (3b8868e)" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="yhA-lX-4Of" userLabel="APP_VERSION">
24+
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Build: 681 (c18b376)" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="yhA-lX-4Of" userLabel="APP_VERSION">
2525
<rect key="frame" x="132.5" y="527" width="55.5" height="21"/>
2626
<fontDescription key="fontDescription" type="system" pointSize="17"/>
2727
<nil key="textColor"/>

‎iOS Steps/Info.plist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
</dict>
3131
</array>
3232
<key>CFBundleVersion</key>
33-
<string>679</string>
33+
<string>682</string>
3434
<key>ITSAppUsesNonExemptEncryption</key>
3535
<false/>
3636
<key>ITSEncryptionExportComplianceCode</key>

0 commit comments

Comments
 (0)