Forced swimming distance display units to meters.

stevetrease · stevetrease · commit d780e089acb3 · 2018-08-16T19:30:40.000+03:00
diff --git a/build b/build
@@ -1 +1 @@
-704
+705
diff --git a/iOS Steps Today/Info.plist b/iOS Steps Today/Info.plist
@@ -19,7 +19,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>1.0</string>
 	<key>CFBundleVersion</key>
-	<string>704</string>
+	<string>705</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionMainStoryboard</key>
diff --git a/iOS Steps Watch Extension/Info.plist b/iOS Steps Watch Extension/Info.plist
@@ -19,7 +19,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>1.0</string>
 	<key>CFBundleVersion</key>
-	<string>704</string>
+	<string>705</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionAttributes</key>
diff --git a/iOS Steps Watch/Info.plist b/iOS Steps Watch/Info.plist
@@ -19,7 +19,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>1.0</string>
 	<key>CFBundleVersion</key>
-	<string>704</string>
+	<string>705</string>
 	<key>UIBackgroundModes</key>
 	<array/>
 	<key>UISupportedInterfaceOrientations</key>
diff --git a/iOS Steps/ActivityViewController.swift b/iOS Steps/ActivityViewController.swift
@@ -137,13 +137,16 @@ class ActivityViewController: UIViewController, UITableViewDelegate, UITableView
 
         case HKWorkoutActivityType.swimming:
             let distance = Measurement(value: (workout.totalDistance?.doubleValue(for: HKUnit.mile()))!, unit: UnitLength.miles)
-            let distanceFormatter = MeasurementFormatter()
+           
+            let distance2 = distance.converted(to: UnitLength.meters)
             
+            let distanceFormatter = MeasurementFormatter()
             distanceFormatter.unitStyle = .medium
             distanceFormatter.unitOptions = .naturalScale
+            distanceFormatter.unitOptions = .providedUnit
             distanceFormatter.numberFormatter.maximumFractionDigits = 0
             distanceFormatter.numberFormatter.minimumFractionDigits = 0
-            let distanceString = distanceFormatter.string(from: distance)
+            let distanceString = distanceFormatter.string(from: distance2)
             
             let energyFormatter = EnergyFormatter()
             energyFormatter.numberFormatter.maximumFractionDigits = 0
diff --git a/iOS Steps/Base.lproj/LaunchScreen.storyboard b/iOS Steps/Base.lproj/LaunchScreen.storyboard
@@ -21,7 +21,7 @@
                         <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Build: 704 (5234d2b)" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="yhA-lX-4Of" userLabel="APP_VERSION">
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Build: 705 (8cb5a6d)" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="yhA-lX-4Of" userLabel="APP_VERSION">
                                 <rect key="frame" x="132.5" y="527" width="55.5" height="21"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <nil key="textColor"/>
diff --git a/iOS Steps/Base.lproj/LaunchScreen.storyboardbak b/iOS Steps/Base.lproj/LaunchScreen.storyboardbak
@@ -21,7 +21,7 @@
                         <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Build: 703 (fdd9550)" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="yhA-lX-4Of" userLabel="APP_VERSION">
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Build: 704 (5234d2b)" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="yhA-lX-4Of" userLabel="APP_VERSION">
                                 <rect key="frame" x="132.5" y="527" width="55.5" height="21"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <nil key="textColor"/>
diff --git a/iOS Steps/Info.plist b/iOS Steps/Info.plist
@@ -30,7 +30,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>704</string>
+	<string>705</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>ITSEncryptionExportComplianceCode</key>
