Added step count for walking and running activity types on workout view.

stevetrease · stevetrease · commit c18b376dbd47 · 2018-08-06T21:32:34.000+03:00
diff --git a/Pods/Pods.xcodeproj/xcuserdata/steve.xcuserdatad/xcschemes/Charts.xcscheme b/Pods/Pods.xcodeproj/xcuserdata/steve.xcuserdatad/xcschemes/Charts.xcscheme
diff --git a/Pods/Pods.xcodeproj/xcuserdata/steve.xcuserdatad/xcschemes/Pods-iOS Steps Today.xcscheme b/Pods/Pods.xcodeproj/xcuserdata/steve.xcuserdatad/xcschemes/Pods-iOS Steps Today.xcscheme
diff --git a/Pods/Pods.xcodeproj/xcuserdata/steve.xcuserdatad/xcschemes/Pods-iOS Steps Watch Extension.xcscheme b/Pods/Pods.xcodeproj/xcuserdata/steve.xcuserdatad/xcschemes/Pods-iOS Steps Watch Extension.xcscheme
diff --git a/Pods/Pods.xcodeproj/xcuserdata/steve.xcuserdatad/xcschemes/Pods-iOS Steps Watch.xcscheme b/Pods/Pods.xcodeproj/xcuserdata/steve.xcuserdatad/xcschemes/Pods-iOS Steps Watch.xcscheme
diff --git a/Pods/Pods.xcodeproj/xcuserdata/steve.xcuserdatad/xcschemes/Pods-iOS Steps.xcscheme b/Pods/Pods.xcodeproj/xcuserdata/steve.xcuserdatad/xcschemes/Pods-iOS Steps.xcscheme
diff --git a/Pods/Pods.xcodeproj/xcuserdata/steve.xcuserdatad/xcschemes/UICountingLabel.xcscheme b/Pods/Pods.xcodeproj/xcuserdata/steve.xcuserdatad/xcschemes/UICountingLabel.xcscheme
diff --git a/build b/build
@@ -1 +1 @@
-670
+679
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>670</string>
+	<string>679</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>670</string>
+	<string>679</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>670</string>
+	<string>679</string>
 	<key>UIBackgroundModes</key>
 	<array/>
 	<key>UISupportedInterfaceOrientations</key>
diff --git a/iOS Steps.xcodeproj/project.pbxproj b/iOS Steps.xcodeproj/project.pbxproj
@@ -411,7 +411,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0830;
-				LastUpgradeCheck = 0900;
+				LastUpgradeCheck = 1000;
 				ORGANIZATIONNAME = Steve;
 				TargetAttributes = {
 					AA3AF8F41E95501500903F2B = {
@@ -835,13 +835,15 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -890,13 +892,15 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
diff --git a/iOS Steps.xcodeproj/xcshareddata/xcschemes/iOS Steps.xcscheme b/iOS Steps.xcodeproj/xcshareddata/xcschemes/iOS Steps.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0940"
+   LastUpgradeVersion = "1000"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/iOS Steps.xcodeproj/xcuserdata/steve.xcuserdatad/xcschemes/iOS Steps Today.xcscheme b/iOS Steps.xcodeproj/xcuserdata/steve.xcuserdatad/xcschemes/iOS Steps Today.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0940"
+   LastUpgradeVersion = "1000"
    wasCreatedForAppExtension = "YES"
    version = "2.0">
    <BuildAction
diff --git a/iOS Steps.xcodeproj/xcuserdata/steve.xcuserdatad/xcschemes/iOS Steps Watch (Notification).xcscheme b/iOS Steps.xcodeproj/xcuserdata/steve.xcuserdatad/xcschemes/iOS Steps Watch (Notification).xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0940"
+   LastUpgradeVersion = "1000"
    version = "2.0">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/iOS Steps.xcodeproj/xcuserdata/steve.xcuserdatad/xcschemes/iOS Steps Watch.xcscheme b/iOS Steps.xcodeproj/xcuserdata/steve.xcuserdatad/xcschemes/iOS Steps Watch.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0940"
+   LastUpgradeVersion = "1000"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/iOS Steps.xcworkspace/xcuserdata/steve.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/iOS Steps.xcworkspace/xcuserdata/steve.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -10,13 +10,13 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "iOS Steps/DayViewController.swift"
-            timestampString = "534246754.330896"
+            timestampString = "555272841.668443"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "61"
             endingLineNumber = "61"
-            landmarkName = "unknown"
-            landmarkType = "0">
+            landmarkName = "viewDidLoad()"
+            landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
    </Breakpoints>
diff --git a/iOS Steps/ActivityViewController.swift b/iOS Steps/ActivityViewController.swift
@@ -124,6 +124,7 @@ class ActivityViewController: UIViewController, UITableViewDelegate, UITableView
         distanceFormatter.numberFormatter.minimumFractionDigits = 1
         let distanceString = distanceFormatter.string(from: distance)
         
+        
         let cell = tableView.dequeueReusableCell(withIdentifier: "cellIDwalking")! as! CustomTableViewCell
         cell.energyLabel.text = energyString
         cell.durationLabel.text = durationString
@@ -132,6 +133,19 @@ class ActivityViewController: UIViewController, UITableViewDelegate, UITableView
         cell.activityLabel.text = healthKitManager.workoutTypeIcon(workout.workoutActivityType)
         // cell.activityImage.image = healthKitManager.workoutTypeImage(workout.workoutActivityType)
         
+
+        if (workout.workoutActivityType == . running || workout.workoutActivityType == .walking) {
+            healthKitManager.stepsBetween(startDate: workout.startDate, endDate: workout.endDate, completion: { (steps) in
+                OperationQueue.main.addOperation {
+                    let stepFormatter = NumberFormatter()
+                    stepFormatter.maximumFractionDigits = 0
+                    stepFormatter.numberStyle = NumberFormatter.Style.decimal
+                    cell.energyLabel.text = stepFormatter.string(from: steps! as NSNumber)!
+                }
+            })
+        }
+        
+        
         return cell
     }
     
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: 670 (ec33714)" 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: 679 (3b8868e)" 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: 669 (977bffe)" 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: 678 (3b8868e)" 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/HealthKitManager.swift b/iOS Steps/HealthKitManager.swift
@@ -318,4 +318,26 @@ class HealthKitManager {
         }
         print ("HeakthKit available? ", isHealthKitEnabled)
     }
+    
+    
+    func stepsBetween (startDate: Date, endDate: Date, completion:@escaping (Int?)->()) {
+        let type = HKQuantityType.quantityType(forIdentifier: HKQuantityTypeIdentifier.stepCount)
+        
+        //  Set the predicate
+        let predicate = HKQuery.predicateForSamples(withStart: startDate, end: endDate, options: [])
+        
+        let query = HKStatisticsQuery(quantityType: type!, quantitySamplePredicate: predicate, options: .cumulativeSum) { query, results, error in
+            let quantity = results?.sumQuantity()
+            let unit = HKUnit.count()
+            let steps = quantity?.doubleValue(for: unit)
+            
+            if steps != nil {
+                completion(Int(steps!))
+            } else {
+                print("getTodayStepCount: results are nil - returning zero steps")
+                completion(0)
+            }
+        }
+        healthStore.execute(query)
+    }
 }
diff --git a/iOS Steps/Info.plist b/iOS Steps/Info.plist
@@ -30,7 +30,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>670</string>
+	<string>679</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>ITSEncryptionExportComplianceCode</key>
