updated docs

Merging main into stable

.gitattributes

@@ -0,0 +1 @@
+LFS-Files/** filter=lfs diff=lfs merge=lfs -text

.gitignore

@@ -18,6 +18,4 @@ DerivedData
 *.xcuserstate
 
 .DS_Store
-
-StudyDemo/ResearchKit
 *.pyc

.lfsconfig

@@ -0,0 +1,2 @@
+[lfs]
+	fetchexclude = *

LICENSE

@@ -1,28 +0,0 @@
-Copyright (c) 2015, Apple Inc. All rights reserved.
- 
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
- 
-1.  Redistributions of source code must retain the above copyright notice, this
-list of conditions and the following disclaimer.
- 
-2.  Redistributions in binary form must reproduce the above copyright notice,
-this list of conditions and the following disclaimer in the documentation and/or
-other materials provided with the distribution.
- 
-3. Neither the name of the copyright holder(s) nor the names of any contributors
-may be used to endorse or promote products derived from this software without
-specific prior written permission. No license is granted to the trademarks of
-the copyright holders even if such marks are included in this software.
- 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-

README.md

@@ -1,229 +1,178 @@
+
+![ResearchKit](https://github.com/user-attachments/assets/0384c1a6-ec67-45d3-be68-136a2e4cacff)
+
 ResearchKit Framework
 ===========
 
-The ResearchKit™ framework is an open source software framework that makes it easy to
-create apps for medical research or for other research projects.
+![VCS](https://img.shields.io/badge/dvcs-Git%20%2B%20LFS-tomato.svg) ![Platform](https://img.shields.io/cocoapods/p/ResearchKit.svg) ![CocoaPods](https://img.shields.io/cocoapods/v/ResearchKit.svg) ![Carthage Compatible](https://img.shields.io/badge/Carthage-compatible-yellow.svg?style=flat) [![License](https://img.shields.io/badge/license-BSD-green.svg?style=flat)](https://github.com/ResearchKit/ResearchKit#license) ![](https://travis-ci.com/ResearchKit/ResearchKit.svg?branch=master)
 
-* Getting Started: [Getting Started](#gettingstarted)
-* Documentation: ([Programming Guide](http://researchkit.org/docs/docs/Overview/GuideOverview.html)) ([API](http://researchkit.org/docs/index.html))
-* Best practices: [Best Practices](../../wiki/best_practices)
-* Contributing to ResearchKit: [Contributing](../../wiki/contributing)
-* Website and blog: ([researchkit.org](http://researchkit.org/index.html))  ([Blog](http://researchkit.org/blog.html))
-* ResearchKit BSD License: [License](#license)
+The *ResearchKit™ framework* is an open source software framework that makes it easy to create apps
+for medical research or for other research projects.
 
-Getting More Information
-========================
+# Table of Contents
 
-* Join [researchkit-users](https://lists.apple.com/mailman/listinfo/researchkit-users) for discussing uses of the ResearchKit framework and related projects.
-* Join [researchkit-dev](https://lists.apple.com/mailman/listinfo/researchkit-dev) for discussing ongoing work to improve and expand the framework.
-* Or [contact us](https://developer.apple.com/contact/researchkit/)
+* [Requirements](#requirements)
+* [Documentation](#documentation)
+* [Getting Started](#gettingstarted)
+	* [Installing](#installation)
+	* [ORKCatalog App](#orkcatalog-app)
+* [Surveys](#surveys)
+* [Consent](#consent)
+* [Active Tasks](#active-tasks)
+* [Getting Help](#getting-help)
+* [License](#license)
 
-Use cases
-===========
+# Requirements <a name="requirements"></a>
 
-A task in the ResearchKit framework contains a set of steps to present to a
-user. Everything, whether it’s a survey, the consent process, or active tasks,
-is represented as a task that can be presented with a task view controller.
+The *ResearchKit framework* codebase supports iOS and requires Xcode 12.0 or newer. The *ResearchKit framework* has a Base SDK version of 13.0.
 
-Surveys
--------
+# Documentation <a name="documentation"></a>
 
-The ResearchKit framework provides a pre-built user interface for surveys, which can be
-presented modally on an iPhone, iPod Touch, or iPad.  [Surveys](http://researchkit.org/docs/docs/Survey/CreatingSurveys.html)
+<img width="1000" alt="ebedded-framework" src="https://github.com/ResearchKit/ResearchKit/assets/29615893/19d6edd3-3d95-4416-9ac4-24ccb35e09c2">
+
+View the *ResearchKit framework* documentation by setting ResearchKit as your target in Xcode and selecting 'Build Documentation' in the Product menu dropdown.
 
 
-Consent
-----------------
+# Getting Started <a name="gettingstarted"></a>
 
-The ResearchKit framework provides visual consent templates that you can customize to
-explain the details of your research study and obtain a signature if needed.  [Consent](http://researchkit.org/docs/docs/InformedConsent/InformedConsent.html)
+* [Website](https://www.researchandcare.org)
+* [WWDC: ResearchKit and CareKit Reimagined](https://developer.apple.com/videos/play/wwdc2019/217/)
 
 
-Active Tasks
-------------
+### Install as an embedded framework <a name="installation"></a>
 
-Some studies may need data beyond survey questions or the passive data collection
-capabilities available through use of the HealthKit and CoreMotion APIs if you are
-programming for iOS. ResearchKit's active tasks invite users to perform activities
-under semi-controlled conditions, while iPhone sensors actively collect data.  [Active Tasks](http://researchkit.org/docs/docs/ActiveTasks/ActiveTasks.html)
+Download the project source code and drag in ResearchKit.xcodeproj. Then, embed *ResearchKit* framework in your app by adding it to the "Frameworks, Libraries, and Embedded Content" section for your target as shown in the figure below.
 
+<img width="1000" alt="ebedded-framework" src="https://github.com/ResearchKit/ResearchKit/assets/29615893/7479f313-ecc7-4d94-8c64-c58ae7362a4d">
 
-Getting started<a name="gettingstarted"></a>
-===============
+### ORKCatalog App <a name="orkcatalog-app"></a>
 
+The included catalog app demonstrates the different modules that are available in *ResearchKit*. Find the
+project in ResearchKit's [`samples`](samples) directory.
 
-Requirements
-------------
+|   |   |
+|---|---|
+| ![catalog-home](https://github.com/ResearchKit/ResearchKit/assets/29615893/45357cf8-17bf-4f38-aebc-bdf1c3395eb5) | ![catalog-survey](https://github.com/ResearchKit/ResearchKit/assets/29615893/a850f20b-7a05-4d14-bc2d-2d6dab7af30d) |
 
-The primary ResearchKit framework codebase supports iOS and requires Xcode 6.3
-or newer. The ResearchKit framework has a Base SDK version of 8.0, meaning that apps
-using the ResearchKit framework can run on devices with iOS 8.0 or newer.
+# Surveys <a name="surveys"></a>
 
+The *ResearchKit framework* provides a pre-built user interface for surveys, which can be presented
+modally on an *iPhone* or *iPad*. The example below shows the process to present a height question for a participant to answer.
 
-Installation
-------------
+```swift
+import ResearchKit
+import ResearchKitUI
+    
+let sectionHeaderFormItem = ORKFormItem(sectionTitle: "Your question here.")
 
-The lastest stable version of ResearchKit framework can be cloned with
+let heightQuestionFormItem = ORKFormItem(identifier: "heightQuestionFormItem1", text: nil, answerFormat: ORKAnswerFormat.heightAnswerFormat())
+heightQuestionFormItem.placeholder = "Tap here"
 
-```
-git clone -b stable https://github.com/ResearchKit/ResearchKit.git
+let formStep = ORKFormStep(identifier: "HeightQuestionIdentifier", title: "Height", text: "Local system")
+formStep.formItems = [sectionHeaderFormItem, heightQuestionFormItem]
+
+return formStep
 ```
 
-Or, for the latest changes, use the `master` branch:
+The height question is presented in the figure below.
 
+|   |   |
+|---|---|
+| ![height-question](https://github.com/ResearchKit/ResearchKit/assets/29615893/4f425329-83b7-45c3-84f9-58cdbcaf2529) | ![height-question-2](https://github.com/ResearchKit/ResearchKit/assets/29615893/2cc0dc2c-5c2a-4b50-a4be-834363fb64b5) |
+
+# Consent <a name="consent"></a>
+
+The *ResearchKit framework* provides classes that you can customize to explain the
+details of your research study and obtain a signature if needed. Use *ResearchKit's* provided classes to quickly welcome, and inform your participants of what the study entails.
+
+```swift
+import ResearchKit
+import ResearchKitUI
+
+// Welcome page.
+let welcomeStep = ORKInstructionStep(identifier: String(describing: Identifier.consentWelcomeInstructionStep))
+welcomeStep.iconImage = UIImage(systemName: "hand.wave")
+welcomeStep.title = "Welcome!"
+welcomeStep.detailText = "Thank you for joining our study. Tap Next to learn more before signing up."
+        
+// Before You Join page.
+let beforeYouJoinStep = ORKInstructionStep(identifier: String(describing: Identifier.informedConsentInstructionStep))
+beforeYouJoinStep.iconImage = UIImage(systemName: "doc.text.magnifyingglass")
+beforeYouJoinStep.title = "Before You Join"
+        
+let sharingHealthDataBodyItem = ORKBodyItem(text: "The study will ask you to share some of your Health data.",
+                                            detailText: nil,
+                                            image: UIImage(systemName: "heart.fill"),
+                                            learnMoreItem: nil,
+                                            bodyItemStyle: .image)
+        
+let completingTasksBodyItem = ORKBodyItem(text: "You will be asked to complete various tasks over the duration of the study.",
+                                          detailText: nil,
+                                          image: UIImage(systemName: "checkmark.circle.fill"),
+                                          learnMoreItem: nil,
+                                          bodyItemStyle: .image)
+        
+let signatureBodyItem = ORKBodyItem(text: "Before joining, we will ask you to sign an informed consent document.",
+                                    detailText: nil,
+                                    image: UIImage(systemName: "signature"),
+                                    learnMoreItem: nil,
+                                    bodyItemStyle: .image)
+        
+let secureDataBodyItem = ORKBodyItem(text: "Your data is kept private and secure.",
+                                     detailText: nil,
+                                     image: UIImage(systemName: "lock.fill"),
+                                     learnMoreItem: nil,
+                                     bodyItemStyle: .image)
+        
+beforeYouJoinStep.bodyItems = [
+    sharingHealthDataBodyItem,
+    completingTasksBodyItem,
+    signatureBodyItem,
+    secureDataBodyItem
+]
 ```
-git clone https://github.com/ResearchKit/ResearchKit.git
+The consent steps are presented in the figure below.
+
+|   |   |
+|---|---|
+| ![consent-welcome-page](https://github.com/ResearchKit/ResearchKit/assets/29615893/e6cbbe07-47ed-4bb4-a84a-f3bf612e9122) | ![consent-before-you-join](https://github.com/ResearchKit/ResearchKit/assets/29615893/687fe345-14d9-4356-9c37-c6a2714875ae) |
+
+Vist the `Obtaining Consent`article in ResearchKit's Documentation for
+more examples that include signature collection and PDF file storage.
+
+# Active Tasks <a name="active-tasks"></a>
+
+Some studies may need data beyond survey questions or the passive data collection capabilities
+available through use of the *HealthKit* and *CoreMotion* APIs if you are programming for *iOS*.
+*ResearchKit*'s active tasks invite users to perform activities under semi-controlled conditions,
+while *iPhone* sensors actively collect data.
+ResearchKit active tasks are not diagnostic tools nor medical devices of any kind and output from those active tasks may not be used for diagnosis. Developers and researchers are responsible for complying with all applicable laws and regulations with respect to further development and use of the active tasks.
+
+Use predefined tasks provided by *ResearchKit* to guide your participants through specific actions.
+
+```swift
+import ResearchKit
+import ResearchKitUI
+import ResearchKitActiveTask
+
+let orderedTask = ORKOrderedTask.dBHLToneAudiometryTask(withIdentifier: "dBHLToneAudiometryTaskIdentifier",
+							intendedUseDescription: nil, options: [])
+							
+let taskViewController = ORKTaskViewController(task: orderedTask, taskRun: nil)
+taskViewController.delegate = self
+
+present(taskViewController, animated: true)
 ```
+The dBHL Tone Audiometry task is presented in the figure below.
 
-Building
---------
+|   |   |
+|---|---|
+| ![noise-check](https://github.com/ResearchKit/ResearchKit/assets/29615893/d8fb669c-bb60-482d-9a2d-e5b6b6696aa5) | ![dbhl-tone-test](https://github.com/ResearchKit/ResearchKit/assets/29615893/04df862b-46bc-4749-8c3e-02d2e54dbcbf) |
 
-Build the ResearchKit framework by opening `ResearchKit.xcodeproj` and running the
-`ResearchKit` framework target. Optionally, run the unit tests too.
+# Getting Help <a name="getting-help"></a>
 
+GitHub is our primary forum for ResearchKit. Feel free to open up issues about questions, problems, or ideas.
 
-Adding the ResearchKit framework to your App
-------------------------------
+# License <a name="license"></a>
 
-This walk-through shows how to embed the ResearchKit framework in your app as a
-dynamic framework, and present a simple task view controller.
-
-###1. Add the ResearchKit framework to Your Project
-
-To get started, drag `ResearchKit.xcodeproj` from your checkout into
-your iOS app project in Xcode:
-
-<center>
-<figure>
-  <img src="../../wiki/AddingResearchKitXcode.png" alt="Adding the ResearchKit framework to your project" align="middle"/>
-</figure>
-</center>
-
-Then, embed the ResearchKit framework as a dynamic framework in your app, by adding
-it to the Embedded Binaries section of the General pane for your
-target as shown in the figure below.
-
-<center>
-<figure>
-  <img src="../../wiki/AddedBinaries.png" width="100%" alt="Adding the ResearchKit framework to Embedded Binaries" align="middle"/>
-   <figcaption><center>Adding the ResearchKit framework to Embedded Binaries</center></figcaption>
-</figure>
-</center>
-
-###2. Create a Step
-
-In this walk-through, we will use the ResearchKit framework to modally present a
-simple single-step task showing a single instruction.
-
-Create a step for your task by adding some code, perhaps in
-`viewDidAppear:` of an existing view controller. To keep things
-simple, we'll use an instruction step (`ORKInstructionStep`) and name
-the step `myStep`.
-
-```objc 	
-ORKInstructionStep *myStep =
-  [[ORKInstructionStep alloc] initWithIdentifier:@"intro"];
-myStep.title = @"Welcome to ResearchKit";
-```
-
-###3. Create a Task
-
-Use the ordered task class (`ORKOrderedTask`) to create a task that
-contains myStep. An ordered task is just a task where the order and
-selection of later steps does not depend on the results of earlier
-ones. Name your task `task` and initialize it with `myStep`.
-
-```objc
-ORKOrderedTask *task =
-  [[ORKOrderedTask alloc] initWithIdentifier:@"task" steps:@[myStep]];
-```
-
-###4. Present the Task
-
-Create a task view controller (`ORKTaskViewController`) and initialize
-it with your `task`. A task view controller manages a task and collects the
-results of each step. In this case, your task view
-controller simply displays your instruction step.
-
-```objc
-ORKTaskViewController *taskViewController =
-  [[ORKTaskViewController alloc] initWithTask:task taskRunUUID:nil];
-taskViewController.delegate = self;
-[self presentViewController:taskViewController animated:YES completion:nil];
-```
-
-The above snippet assumes that your class implements the
-`ORKTaskViewControllerDelegate` protocol. This has just one required method,
-which you must implement in order to handle the completion of the task:
-
-```objc
-- (void)taskViewController:(ORKTaskViewController *)taskViewController
-       didFinishWithReason:(ORKTaskViewControllerFinishReason)reason
-                     error:(NSError *)error {
-
-    ORKTaskResult *taskResult = [taskViewController result];
-    // You could do something with the result here.
-
-    // Then, dismiss the task view controller.
-    [self dismissViewControllerAnimated:YES completion:nil];
-}
-```
-
- 
-If you now run your app, you should see your first ResearchKit framework
-instruction step:
-
-<center>
-<figure>
-  <img src="../../wiki/HelloWorld.png" width="50%" alt="HelloWorld example screenshot" align="middle"/>
-</figure>
-</center>
-
-
-
-What else can the ResearchKit framework do?
------------------------------
-
-The ResearchKit [`ORKCatalog`](samples/ORKCatalog) sample app is a
-good place to start. Find the project in ResearchKit's
-[`samples`](samples) directory. This project includes a list of all
-the types of steps supported by the ResearchKit framework in one tab, and displays a
-browser for the results of the last completed task in the other tab.
-
-
-
-License<a name="license"></a>
-=======
-
-The source in the ResearchKit repository is made available under the
-following license unless another license is explicitly identified:
-
-```
-Copyright (c) 2015, Apple Inc. All rights reserved.
- 
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
- 
-1.  Redistributions of source code must retain the above copyright notice, this
-list of conditions and the following disclaimer.
- 
-2.  Redistributions in binary form must reproduce the above copyright notice,
-this list of conditions and the following disclaimer in the documentation and/or
-other materials provided with the distribution.
- 
-3. Neither the name of the copyright holder(s) nor the names of any contributors
-may be used to endorse or promote products derived from this software without
-specific prior written permission. No license is granted to the trademarks of
-the copyright holders even if such marks are included in this software.
- 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-```
+This project is made available under the terms of a BSD license. See the [LICENSE](LICENSE) file.

ResearchKit.xcodeproj/project.xcworkspace/contents.xcworkspacedata

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Workspace
-   version = "1.0">
-   <FileRef
-      location = "self:ResearchKit.xcodeproj">
-   </FileRef>
-</Workspace>

ResearchKit.xcodeproj/xcshareddata/xcschemes/ResearchKit.xcscheme

@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
-   LastUpgradeVersion = "0630"
-   version = "1.8">
-   <BuildAction
-      parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
-      <BuildActionEntries>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "B183A4731A8535D100C76870"
-               BuildableName = "ResearchKit.framework"
-               BlueprintName = "ResearchKit"
-               ReferencedContainer = "container:ResearchKit.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-      </BuildActionEntries>
-   </BuildAction>
-   <TestAction
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      buildConfiguration = "Debug">
-      <Testables>
-         <TestableReference
-            skipped = "NO">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "86CC8E991AC09332001CCD89"
-               BuildableName = "ResearchKitTests.xctest"
-               BlueprintName = "ResearchKitTests"
-               ReferencedContainer = "container:ResearchKit.xcodeproj">
-            </BuildableReference>
-         </TestableReference>
-      </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "B183A4731A8535D100C76870"
-            BuildableName = "ResearchKit.framework"
-            BlueprintName = "ResearchKit"
-            ReferencedContainer = "container:ResearchKit.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-   </TestAction>
-   <LaunchAction
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      launchStyle = "0"
-      useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Debug"
-      ignoresPersistentStateOnLaunch = "NO"
-      debugDocumentVersioning = "YES"
-      debugServiceExtension = "internal"
-      allowLocationSimulation = "YES">
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "B183A4731A8535D100C76870"
-            BuildableName = "ResearchKit.framework"
-            BlueprintName = "ResearchKit"
-            ReferencedContainer = "container:ResearchKit.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
-   </LaunchAction>
-   <ProfileAction
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      savedToolIdentifier = ""
-      useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Release"
-      debugDocumentVersioning = "YES">
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "B183A4731A8535D100C76870"
-            BuildableName = "ResearchKit.framework"
-            BlueprintName = "ResearchKit"
-            ReferencedContainer = "container:ResearchKit.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-   </ProfileAction>
-   <AnalyzeAction
-      buildConfiguration = "Debug">
-   </AnalyzeAction>
-   <ArchiveAction
-      buildConfiguration = "Release"
-      revealArchiveInOrganizer = "YES">
-   </ArchiveAction>
-</Scheme>

ResearchKit.xcodeproj/xcshareddata/xcschemes/docs.xcscheme

@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
-   LastUpgradeVersion = "0630"
-   version = "1.8">
-   <BuildAction
-      parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
-      <BuildActionEntries>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "B18FF3A41A9FE25700C0C3B0"
-               BuildableName = "docs"
-               BlueprintName = "docs"
-               ReferencedContainer = "container:ResearchKit.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-      </BuildActionEntries>
-   </BuildAction>
-   <TestAction
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      buildConfiguration = "Debug">
-      <Testables>
-      </Testables>
-   </TestAction>
-   <LaunchAction
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      launchStyle = "0"
-      useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Debug"
-      ignoresPersistentStateOnLaunch = "NO"
-      debugDocumentVersioning = "YES"
-      debugServiceExtension = "internal"
-      allowLocationSimulation = "YES">
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "B18FF3A41A9FE25700C0C3B0"
-            BuildableName = "docs"
-            BlueprintName = "docs"
-            ReferencedContainer = "container:ResearchKit.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
-   </LaunchAction>
-   <ProfileAction
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      savedToolIdentifier = ""
-      useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Release"
-      debugDocumentVersioning = "YES">
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "B18FF3A41A9FE25700C0C3B0"
-            BuildableName = "docs"
-            BlueprintName = "docs"
-            ReferencedContainer = "container:ResearchKit.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-   </ProfileAction>
-   <AnalyzeAction
-      buildConfiguration = "Debug">
-   </AnalyzeAction>
-   <ArchiveAction
-      buildConfiguration = "Release"
-      revealArchiveInOrganizer = "YES">
-   </ArchiveAction>
-</Scheme>

ResearchKit/Accessibility/ORKAccessibility.h

@@ -1,35 +0,0 @@
-/*
- Copyright (c) 2015, Apple Inc. All rights reserved.
- 
- Redistribution and use in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met:
- 
- 1.  Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
- 
- 2.  Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation and/or
- other materials provided with the distribution.
- 
- 3.  Neither the name of the copyright holder(s) nor the names of any contributors
- may be used to endorse or promote products derived from this software without
- specific prior written permission. No license is granted to the trademarks of
- the copyright holders even if such marks are included in this software.
- 
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-// Shared header for accessibility functionality.
-
-#import "UIView+ORKAccessibility.h"
-#import "ORKAccessibilityFunctions.h"
-

ResearchKit/Accessibility/ORKAccessibilityFunctions.h

@@ -1,52 +0,0 @@
-/*
- Copyright (c) 2015, Apple Inc. All rights reserved.
- 
- Redistribution and use in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met:
- 
- 1.  Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
- 
- 2.  Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation and/or
- other materials provided with the distribution.
- 
- 3.  Neither the name of the copyright holder(s) nor the names of any contributors
- may be used to endorse or promote products derived from this software without
- specific prior written permission. No license is granted to the trademarks of
- the copyright holders even if such marks are included in this software.
- 
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import "ORKDefines.h"
-#import "ORKHelpers.h"
-
-@class ORKScaleSlider;
-
-// Used to properly format values from the ORKScaleSlider.
-ORK_EXTERN NSString *ORKAccessibilityFormatScaleSliderValue(CGFloat value, ORKScaleSlider *slider);
-ORK_EXTERN NSString *ORKAccessibilityFormatContinuousScaleSliderValue(CGFloat value, ORKScaleSlider *slider);
-
-// Performs a block on the main thread after a delay. If Voice Over is not running, the block is performed immediately.
-ORK_EXTERN void ORKAccessibilityPerformBlockAfterDelay(NSTimeInterval delay, void(^block)(void));
-
-// Convenience for posting an accessibility notification after a delay.
-ORK_INLINE void ORKAccessibilityPostNotificationAfterDelay(UIAccessibilityNotifications notification, id argument, NSTimeInterval delay) {
-    ORKAccessibilityPerformBlockAfterDelay(delay, ^{
-        UIAccessibilityPostNotification(notification, argument);
-    });
-}
-
-// Creates a string suitable for Voice Over by joining the variables with ", " and avoiding nil and empty strings.
-#define ORKAccessibilityStringForVariables(...) _ORKAccessibilityStringForVariables(ORK_NARG(__VA_ARGS__),  ##__VA_ARGS__)
-ORK_EXTERN NSString *_ORKAccessibilityStringForVariables(NSInteger numParameters, NSString *baseString, ...);

ResearchKit/Accessibility/ORKAccessibilityFunctions.m

@@ -1,88 +0,0 @@
-/*
- Copyright (c) 2015, Apple Inc. All rights reserved.
- 
- Redistribution and use in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met:
- 
- 1.  Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
- 
- 2.  Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation and/or
- other materials provided with the distribution.
- 
- 3.  Neither the name of the copyright holder(s) nor the names of any contributors
- may be used to endorse or promote products derived from this software without
- specific prior written permission. No license is granted to the trademarks of
- the copyright holders even if such marks are included in this software.
- 
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import <UIKit/UIKit.h>
-#import "ORKAccessibilityFunctions.h"
-#import "ORKAnswerFormat_Internal.h"
-#import "ORKScaleSlider.h"
-#import "ORKScaleSliderView.h"
-#import "UIView+ORKAccessibility.h"
-
-NSString *ORKAccessibilityFormatScaleSliderValue(CGFloat value, ORKScaleSlider *slider) {
-    ORKScaleSliderView *sliderView = (ORKScaleSliderView *)[slider ork_superviewOfType:[ORKScaleSliderView class]];
-    if (!slider || !sliderView) {
-        return nil;
-    }
-    
-    NSNumber *normalizedValue = [sliderView.formatProvider normalizedValueForNumber:@(value)];
-    return [sliderView.formatProvider localizedStringForNumber:normalizedValue];
-}
-
-NSString *ORKAccessibilityFormatContinuousScaleSliderValue(CGFloat value, ORKScaleSlider *slider) {
-    ORKScaleSliderView *sliderView = (ORKScaleSliderView *)[slider ork_superviewOfType:[ORKScaleSliderView class]];
-    if (!slider || !sliderView) {
-        return nil;
-    }
-    
-    return [sliderView.formatProvider localizedStringForNumber:@(value)];
-}
-
-void ORKAccessibilityPerformBlockAfterDelay(NSTimeInterval delay, void(^block)(void)) {
-    if (block == nil) {
-        return;
-    }
-    if (!UIAccessibilityIsVoiceOverRunning()) {
-        delay = 0;
-    }
-    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(delay * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-        block();
-    });
-}
-
-NSString *_ORKAccessibilityStringForVariables(NSInteger numParameters, NSString *baseString, ...) {
-    NSMutableArray *variables = [[NSMutableArray alloc] init];
-    
-    NSInteger paramIndex = 0;
-    
-    va_list args;
-    va_start(args, baseString);
-    for (__unsafe_unretained NSString *variable = baseString;
-         paramIndex < numParameters;
-         variable = va_arg(args, __unsafe_unretained NSString *), paramIndex++) {
-        
-        if ([variable isKindOfClass:[NSString class]] && variable.length > 0) {
-            [variables addObject:variable];
-        }
-        
-    }
-    va_end(args);
-    
-    return [variables componentsJoinedByString:@", "];
-}

ResearchKit/Accessibility/UIView+ORKAccessibility.h

@@ -1,42 +0,0 @@
-/*
- Copyright (c) 2015, Apple Inc. All rights reserved.
- 
- Redistribution and use in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met:
- 
- 1.  Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
- 
- 2.  Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation and/or
- other materials provided with the distribution.
- 
- 3.  Neither the name of the copyright holder(s) nor the names of any contributors
- may be used to endorse or promote products derived from this software without
- specific prior written permission. No license is granted to the trademarks of
- the copyright holders even if such marks are included in this software.
- 
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import <UIKit/UIKit.h>
-#import <ResearchKit/ResearchKit.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface UIView (ORKAccessibility)
-
-- (nullable UIView *)ork_superviewOfType:(nullable Class)aClass;
-
-@end
-
-NS_ASSUME_NONNULL_END

ResearchKit/Accessibility/UIView+ORKAccessibility.m

@@ -1,51 +0,0 @@
-/*
- Copyright (c) 2015, Apple Inc. All rights reserved.
- 
- Redistribution and use in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met:
- 
- 1.  Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
- 
- 2.  Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation and/or
- other materials provided with the distribution.
- 
- 3.  Neither the name of the copyright holder(s) nor the names of any contributors
- may be used to endorse or promote products derived from this software without
- specific prior written permission. No license is granted to the trademarks of
- the copyright holders even if such marks are included in this software.
- 
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import "UIView+ORKAccessibility.h"
-
-@implementation UIView (ORKAccessibility)
-
-- (UIView *)ork_superviewOfType:(Class)aClass {
-    if (aClass == nil) {
-        return nil;
-    }
-    
-    id superview = [self superview];
-    if (superview == nil) {
-        return nil;
-    }
-    else if ([superview isKindOfClass:aClass]) {
-        return superview;
-    }
-    
-    return [superview ork_superviewOfType:aClass];
-}
-
-@end

ResearchKit/ActiveTasks/CLLocation+ORKJSONDictionary.h

@@ -1,42 +0,0 @@
-/*
- Copyright (c) 2015, Apple Inc. All rights reserved.
- 
- Redistribution and use in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met:
- 
- 1.  Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
- 
- 2.  Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation and/or
- other materials provided with the distribution.
- 
- 3.  Neither the name of the copyright holder(s) nor the names of any contributors
- may be used to endorse or promote products derived from this software without
- specific prior written permission. No license is granted to the trademarks of
- the copyright holders even if such marks are included in this software.
- 
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import <CoreLocation/CoreLocation.h>
-#import <ResearchKit/ResearchKit.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface CLLocation (ORKJSONDictionary)
-
-- (NSDictionary *)ork_JSONDictionary;
-
-@end
-
-NS_ASSUME_NONNULL_END

ResearchKit/ActiveTasks/CLLocation+ORKJSONDictionary.m

@@ -1,75 +0,0 @@
-/*
- Copyright (c) 2015, Apple Inc. All rights reserved.
- 
- Redistribution and use in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met:
- 
- 1.  Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
- 
- 2.  Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation and/or
- other materials provided with the distribution.
- 
- 3.  Neither the name of the copyright holder(s) nor the names of any contributors
- may be used to endorse or promote products derived from this software without
- specific prior written permission. No license is granted to the trademarks of
- the copyright holders even if such marks are included in this software.
- 
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import "CLLocation+ORKJSONDictionary.h"
-#import "ORKHelpers.h"
-
-@implementation CLLocation (ORKJSONDictionary)
-
-- (NSDictionary *)ork_JSONDictionary
-{
-    CLLocationCoordinate2D coord = self.coordinate;
-    CLLocationDistance altitude = self.altitude;
-    CLLocationAccuracy horizAccuracy = self.horizontalAccuracy;
-    CLLocationAccuracy vertAccuracy = self.verticalAccuracy;
-    CLLocationDirection course = self.course;
-    CLLocationSpeed speed = self.speed;
-    NSDate *timestamp = self.timestamp;
-    CLFloor *floor = self.floor;
-    
-    NSMutableDictionary *dict = [NSMutableDictionary dictionaryWithObject:ORKStringFromDateISO8601(timestamp) forKey:@"timestamp"];
-    
-    if (horizAccuracy >= 0)
-    {
-        dict[@"coordinate"] = @{ @"latitude" : [NSDecimalNumber numberWithDouble:coord.latitude], @"longitude" : [NSDecimalNumber numberWithDouble:coord.longitude]};
-        dict[@"horizontalAccuracy"] = [NSDecimalNumber numberWithDouble:horizAccuracy];
-    }
-    if (vertAccuracy >= 0)
-    {
-        dict[@"altitude"] = [NSDecimalNumber numberWithDouble:altitude];
-        dict[@"verticalAccuracy"] = [NSDecimalNumber numberWithDouble:vertAccuracy];
-    }
-    if (course >= 0)
-    {
-        dict[@"course"] = [NSDecimalNumber numberWithDouble:course];
-    }
-    if (speed >= 0)
-    {
-        dict[@"speed"] = [NSDecimalNumber numberWithDouble:speed];
-    }
-    if (floor)
-    {
-        dict[@"floor"] = @(floor.level);
-    }
-
-    return dict;
-}
-
-@end

ResearchKit/ActiveTasks/CMAccelerometerData+ORKJSONDictionary.h

@@ -1,42 +0,0 @@
-/*
- Copyright (c) 2015, Apple Inc. All rights reserved.
- 
- Redistribution and use in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met:
- 
- 1.  Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
- 
- 2.  Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation and/or
- other materials provided with the distribution.
- 
- 3.  Neither the name of the copyright holder(s) nor the names of any contributors
- may be used to endorse or promote products derived from this software without
- specific prior written permission. No license is granted to the trademarks of
- the copyright holders even if such marks are included in this software.
- 
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import <CoreMotion/CoreMotion.h>
-#import <ResearchKit/ResearchKit.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface CMAccelerometerData (ORKJSONDictionary)
-
-- (NSDictionary *)ork_JSONDictionary;
-
-@end
-
-NS_ASSUME_NONNULL_END

ResearchKit/ActiveTasks/CMAccelerometerData+ORKJSONDictionary.m

@@ -1,46 +0,0 @@
-/*
- Copyright (c) 2015, Apple Inc. All rights reserved.
- 
- Redistribution and use in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met:
- 
- 1.  Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
- 
- 2.  Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation and/or
- other materials provided with the distribution.
- 
- 3.  Neither the name of the copyright holder(s) nor the names of any contributors
- may be used to endorse or promote products derived from this software without
- specific prior written permission. No license is granted to the trademarks of
- the copyright holders even if such marks are included in this software.
- 
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-
-#import "CMAccelerometerData+ORKJSONDictionary.h"
-
-@implementation CMAccelerometerData (ORKJSONDictionary)
-
-- (NSDictionary *)ork_JSONDictionary
-{
-    NSDictionary *dict = @{@"timestamp": [NSDecimalNumber numberWithDouble:self.timestamp],
-                           @"x" : [NSDecimalNumber numberWithDouble:self.acceleration.x],
-                           @"y" : [NSDecimalNumber numberWithDouble:self.acceleration.y],
-                           @"z" : [NSDecimalNumber numberWithDouble:self.acceleration.z]
-                           };
-    return dict;
-}
-
-@end

ResearchKit/ActiveTasks/CMDeviceMotion+ORKJSONDictionary.h

@@ -1,43 +0,0 @@
-/*
- Copyright (c) 2015, Apple Inc. All rights reserved.
- 
- Redistribution and use in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met:
- 
- 1.  Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
- 
- 2.  Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation and/or
- other materials provided with the distribution.
- 
- 3.  Neither the name of the copyright holder(s) nor the names of any contributors
- may be used to endorse or promote products derived from this software without
- specific prior written permission. No license is granted to the trademarks of
- the copyright holders even if such marks are included in this software.
- 
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-
-#import <CoreMotion/CoreMotion.h>
-#import <ResearchKit/ResearchKit.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface CMDeviceMotion (ORKJSONDictionary)
-
-- (NSDictionary *)ork_JSONDictionary;
-
-@end
-
-NS_ASSUME_NONNULL_END

ResearchKit/ActiveTasks/CMDeviceMotion+ORKJSONDictionary.m

@@ -1,76 +0,0 @@
-/*
- Copyright (c) 2015, Apple Inc. All rights reserved.
- 
- Redistribution and use in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met:
- 
- 1.  Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
- 
- 2.  Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation and/or
- other materials provided with the distribution.
- 
- 3.  Neither the name of the copyright holder(s) nor the names of any contributors
- may be used to endorse or promote products derived from this software without
- specific prior written permission. No license is granted to the trademarks of
- the copyright holders even if such marks are included in this software.
- 
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-
-#import "CMDeviceMotion+ORKJSONDictionary.h"
-
-@implementation CMDeviceMotion (ORKJSONDictionary)
-
-- (NSDictionary *)ork_JSONDictionary
-{
-    CMQuaternion attitude = self.attitude.quaternion;
-    CMRotationRate rotationRate = self.rotationRate;
-    CMAcceleration gravity = self.gravity;
-    CMAcceleration userAccel = self.userAcceleration;
-    CMCalibratedMagneticField field = self.magneticField;
-    
-    NSDictionary *dict = @{@"timestamp": [NSDecimalNumber numberWithDouble:self.timestamp],
-                           @"attitude" : @{
-                                   @"x" : [NSDecimalNumber numberWithDouble:attitude.x],
-                                   @"y" : [NSDecimalNumber numberWithDouble:attitude.y],
-                                   @"z" : [NSDecimalNumber numberWithDouble:attitude.z],
-                                   @"w" : [NSDecimalNumber numberWithDouble:attitude.w]
-                                   },
-                           @"rotationRate" : @{
-                                   @"x" : [NSDecimalNumber numberWithDouble:rotationRate.x],
-                                   @"y" : [NSDecimalNumber numberWithDouble:rotationRate.y],
-                                   @"z" : [NSDecimalNumber numberWithDouble:rotationRate.z]
-                                   },
-                           @"gravity" : @{
-                                   @"x" : [NSDecimalNumber numberWithDouble:gravity.x],
-                                   @"y" : [NSDecimalNumber numberWithDouble:gravity.y],
-                                   @"z" : [NSDecimalNumber numberWithDouble:gravity.z]
-                                   },
-                           @"userAcceleration" : @{
-                                   @"x" : [NSDecimalNumber numberWithDouble:userAccel.x],
-                                   @"y" : [NSDecimalNumber numberWithDouble:userAccel.y],
-                                   @"z" : [NSDecimalNumber numberWithDouble:userAccel.z]
-                                   },
-                           @"magneticField" : @{
-                                   @"x" : [NSDecimalNumber numberWithDouble:field.field.x],
-                                   @"y" : [NSDecimalNumber numberWithDouble:field.field.y],
-                                   @"z" : [NSDecimalNumber numberWithDouble:field.field.z],
-                                   @"accuracy" : [NSDecimalNumber numberWithDouble:field.accuracy]
-                                   }
-                           };
-    return dict;
-}
-
-@end

ResearchKit/ActiveTasks/CMMotionActivity+ORKJSONDictionary.h

@@ -1,43 +0,0 @@
-/*
- Copyright (c) 2015, Apple Inc. All rights reserved.
- 
- Redistribution and use in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met:
- 
- 1.  Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
- 
- 2.  Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation and/or
- other materials provided with the distribution.
- 
- 3.  Neither the name of the copyright holder(s) nor the names of any contributors
- may be used to endorse or promote products derived from this software without
- specific prior written permission. No license is granted to the trademarks of
- the copyright holders even if such marks are included in this software.
- 
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-
-#import <CoreMotion/CoreMotion.h>
-#import <ResearchKit/ResearchKit.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface CMMotionActivity (ORKJSONDictionary)
-
-- (NSDictionary *)ork_JSONDictionary;
-
-@end
-
-NS_ASSUME_NONNULL_END

ResearchKit/ActiveTasks/CMMotionActivity+ORKJSONDictionary.m

@@ -1,91 +0,0 @@
-/*
- Copyright (c) 2015, Apple Inc. All rights reserved.
- 
- Redistribution and use in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met:
- 
- 1.  Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
- 
- 2.  Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation and/or
- other materials provided with the distribution.
- 
- 3.  Neither the name of the copyright holder(s) nor the names of any contributors
- may be used to endorse or promote products derived from this software without
- specific prior written permission. No license is granted to the trademarks of
- the copyright holders even if such marks are included in this software.
- 
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-
-#import "CMMotionActivity+ORKJSONDictionary.h"
-#import "ORKHelpers.h"
-
-static NSString * const kActivityUnknown = @"unknown";
-static NSString * const kActivityStationary = @"stationary";
-static NSString * const kActivityWalking = @"walking";
-static NSString * const kActivityRunning = @"running";
-static NSString * const kActivityAutomotive = @"automotive";
-static NSString * const kStartDateKey = @"startDate";
-static NSString * const kEndDateKey = @"endDate";
-
-static NSString *stringFromActivityConfidence(CMMotionActivityConfidence confidence)
-{
-    NSDictionary *confidences = @{@(CMMotionActivityConfidenceHigh) : @"high",
-                                  @(CMMotionActivityConfidenceMedium) : @"medium",
-                                  @(CMMotionActivityConfidenceLow) : @"low"};
-    return confidences[@(confidence)];
-}
-
-static NSArray *activityArray(CMMotionActivity *activity)
-{
-    NSMutableArray *ret = [NSMutableArray array];
-    if (activity.unknown)
-    {
-        [ret addObject:kActivityUnknown];
-    }
-    if (activity.stationary)
-    {
-        [ret addObject:kActivityStationary];
-    }
-    if (activity.walking)
-    {
-        [ret addObject:kActivityWalking];
-    }
-    if (activity.running)
-    {
-        [ret addObject:kActivityRunning];
-    }
-    if (activity.automotive)
-    {
-        [ret addObject:kActivityAutomotive];
-    }
-    return ret;
-}
-
-    
-static NSString * const kActivityKey = @"activity";
-
-static NSString * const kConfidenceKey = @"confidence";
-
-@implementation CMMotionActivity (ORKJSONDictionary)
-
-- (NSDictionary *)ork_JSONDictionary
-{
-    return @{kConfidenceKey : stringFromActivityConfidence(self.confidence),
-             kActivityKey : activityArray(self),
-             kStartDateKey : ORKStringFromDateISO8601(self.startDate)};
-}
-
-@end

ResearchKit/ActiveTasks/CMPedometerData+ORKJSONDictionary.h

@@ -1,44 +0,0 @@
-/*
- Copyright (c) 2015, Apple Inc. All rights reserved.
- 
- Redistribution and use in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met:
- 
- 1.  Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
- 
- 2.  Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation and/or
- other materials provided with the distribution.
- 
- 3.  Neither the name of the copyright holder(s) nor the names of any contributors
- may be used to endorse or promote products derived from this software without
- specific prior written permission. No license is granted to the trademarks of
- the copyright holders even if such marks are included in this software.
- 
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-
-#import <CoreMotion/CoreMotion.h>
-#import <ResearchKit/ResearchKit.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface CMPedometerData (ORKJSONDictionary)
-
-- (NSDictionary *)ork_JSONDictionary;
-
-
-@end
-
-NS_ASSUME_NONNULL_END

ResearchKit/ActiveTasks/CMPedometerData+ORKJSONDictionary.m

@@ -1,50 +0,0 @@
-/*
- Copyright (c) 2015, Apple Inc. All rights reserved.
- 
- Redistribution and use in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met:
- 
- 1.  Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
- 
- 2.  Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation and/or
- other materials provided with the distribution.
- 
- 3.  Neither the name of the copyright holder(s) nor the names of any contributors
- may be used to endorse or promote products derived from this software without
- specific prior written permission. No license is granted to the trademarks of
- the copyright holders even if such marks are included in this software.
- 
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-
-#import "CMPedometerData+ORKJSONDictionary.h"
-#import "ORKHelpers.h"
-#import <CoreMotion/CoreMotion.h>
-
-@implementation CMPedometerData (ORKJSONDictionary)
-
-- (NSDictionary *)ork_JSONDictionary
-{
-    NSMutableDictionary *dict = [@{@"startDate": ORKStringFromDateISO8601(self.startDate),
-                                   @"endDate": ORKStringFromDateISO8601(self.endDate)
-                                   } mutableCopy];
-    for (NSString *key in @[@"numberOfSteps", @"distance", @"floorsAscended", @"floorsDescended"])
-    {
-        [dict setValue:[self valueForKey:key] forKey:key];
-    }
-    return dict;
-}
-
-@end

ResearchKit/ActiveTasks/HKSample+ORKJSONDictionary.h

@@ -1,64 +0,0 @@
-/*
- Copyright (c) 2015, Apple Inc. All rights reserved.
- 
- Redistribution and use in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met:
- 
- 1.  Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
- 
- 2.  Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation and/or
- other materials provided with the distribution.
- 
- 3.  Neither the name of the copyright holder(s) nor the names of any contributors
- may be used to endorse or promote products derived from this software without
- specific prior written permission. No license is granted to the trademarks of
- the copyright holders even if such marks are included in this software.
- 
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-
-#import <HealthKit/HealthKit.h>
-#import <ResearchKit/ResearchKit.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-typedef NS_OPTIONS(NSInteger, ORKSampleJSONOptions) {
-    ORKSampleIncludeMetadata = 0x1,
-    ORKSampleIncludeSource = 0x2,
-    ORKSampleIncludeUUID = 0x4
-};
-
-/**
- * JSON serialization aid for HKSample.
- *
- */
-@interface HKSample (ORKJSONDictionary)
-
-- (NSDictionary *)ork_JSONDictionaryWithOptions:(ORKSampleJSONOptions)options unit:(nullable HKUnit *)unit;
-
-@end
-
-
-/**
- * JSON serialization aid for HKCorrelation.
- *
- */
-@interface HKCorrelation (ORKJSONDictionary)
-
-- (NSDictionary *)ork_JSONDictionaryWithOptions:(ORKSampleJSONOptions)options sampleTypes:(NSArray *)sampleTypes units:(NSArray *)units;
-
-@end
-
-NS_ASSUME_NONNULL_END

ResearchKit/ActiveTasks/HKSample+ORKJSONDictionary.m

@@ -1,180 +0,0 @@
-/*
- Copyright (c) 2015, Apple Inc. All rights reserved.
- 
- Redistribution and use in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met:
- 
- 1.  Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
- 
- 2.  Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation and/or
- other materials provided with the distribution.
- 
- 3.  Neither the name of the copyright holder(s) nor the names of any contributors
- may be used to endorse or promote products derived from this software without
- specific prior written permission. No license is granted to the trademarks of
- the copyright holders even if such marks are included in this software.
- 
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-
-#import "HKSample+ORKJSONDictionary.h"
-#import "ORKHelpers.h"
-
-static NSString *const kHKSampleIdentifierKey = @"type"; // For compatibility with Health XML export
-static NSString *const kHKUUIDKey = @"uuid";
-static NSString *const kHKSampleStartDateKey = @"startDate";
-static NSString *const kHKSampleEndDateKey = @"endDate";
-static NSString *const kHKSampleValue = @"value";
-static NSString *const kHKMetadataKey = @"metadata";
-static NSString *const kHKSourceKey = @"source";
-static NSString *const kHKUnitKey = @"unit";
-static NSString *const kHKCorrelatedObjectsKey = @"objects";
-// static NSString *const kHKSourceIdentifierKey = @"sourceBundleIdentifier";
-
-@interface HKCategorySample (ORKJSONDictionary)
-
-@end
-
-@interface HKQuantitySample (ORKJSONDictionary)
-
-@end
-
-
-@implementation HKSample (ORKJSONDictionary)
-
-- (NSDictionary *)ork_JSONDictionaryWithOptions:(ORKSampleJSONOptions)options unit:(HKUnit *)unit
-{
-    NSMutableDictionary *mdict = [NSMutableDictionary dictionaryWithCapacity:12];
-    
-    // Type identification
-    HKSampleType *sampleType = [self sampleType];
-    mdict[kHKSampleIdentifierKey] = [sampleType identifier];
-    
-    // consider adding @"class" : NSStringFromClass(sampleType) ?
-    
-    // Start and end dates
-    NSDate *startDate = [self startDate];
-    if (startDate)
-    {
-        mdict[kHKSampleStartDateKey] = ORKStringFromDateISO8601(startDate);
-    }
-    
-    NSDate *endDate = [self endDate];
-    if (endDate)
-    {
-        mdict[kHKSampleEndDateKey] = ORKStringFromDateISO8601(endDate);
-    }
-    if (unit)
-    {
-        mdict[kHKUnitKey] = [unit unitString];
-    }
-    if ((options & ORKSampleIncludeUUID))
-    {
-        NSUUID *uuid = [self UUID];
-        if (uuid)
-        {
-            mdict[kHKUUIDKey] = [uuid UUIDString];
-        }
-    }
-    
-    if ( (options & ORKSampleIncludeMetadata) && [self.metadata count] > 0)
-    {
-        NSMutableDictionary *metadata = [self.metadata mutableCopy];
-        for (NSString *k in metadata)
-        {
-            id obj = metadata[k];
-            if ([obj isKindOfClass:[NSDate class]])
-            {
-                metadata[k] = ORKStringFromDateISO8601(obj);
-            }
-        }
-        
-        mdict[kHKMetadataKey] = metadata;
-    }
-    
-    if (options & ORKSampleIncludeSource)
-    {
-        HKSource *source = [self source];
-        if (source.name)
-        {
-            mdict[kHKSourceKey] = source.name;
-        }
-    }
-        
-    return mdict;
-}
-
-@end
-
-
-@implementation HKCategorySample (ORKJSONDictionary)
-
-- (NSDictionary *)ork_JSONDictionaryWithOptions:(ORKSampleJSONOptions)options unit:(HKUnit *)unit
-{
-    NSMutableDictionary *dict = [[super ork_JSONDictionaryWithOptions:options unit:unit] mutableCopy];
-    
-    NSInteger value = [self value];
-    dict[kHKSampleValue] = @(value);
-    
-    return dict;
-}
-
-@end
-
-@implementation HKQuantitySample (ORKJSONDictionary)
-
-- (NSDictionary *)ork_JSONDictionaryWithOptions:(ORKSampleJSONOptions)options unit:(HKUnit *)unit
-{
-    NSMutableDictionary *dict = [[super ork_JSONDictionaryWithOptions:options unit:unit] mutableCopy];
-    
-    HKQuantity *quantity = [self quantity];
-    double value = [quantity doubleValueForUnit:unit];
-    dict[kHKSampleValue] = @(value);
-    
-    
-    return dict;
-}
-
-@end
-
-
-@implementation HKCorrelation (ORKJSONDictionary)
-
-
-- (NSDictionary *)ork_JSONDictionaryWithOptions:(ORKSampleJSONOptions)options sampleTypes:(NSArray *)sampleTypes units:(NSArray *)units
-{
-    NSMutableDictionary *mdict = (NSMutableDictionary *)[self ork_JSONDictionaryWithOptions:options unit:nil];
-    
-    // The correlated objects
-    NSMutableArray *correlatedObjects = [NSMutableArray arrayWithCapacity:[sampleTypes count]];
-    for (HKSample *sample in self.objects)
-    {
-        NSUInteger idx = [sampleTypes indexOfObject:sample.sampleType];
-        if (idx == NSNotFound)
-        {
-            continue;
-        }
-        
-        [correlatedObjects addObject:[sample ork_JSONDictionaryWithOptions:options unit:units[idx]]];
-    }
-    mdict[kHKCorrelatedObjectsKey] = correlatedObjects;
-    
-    
-    return mdict;
-}
-
-
-
-@end

ResearchKit/ActiveTasks/ORKAccelerometerRecorder.h

@@ -1,64 +0,0 @@
-/*
- Copyright (c) 2015, Apple Inc. All rights reserved.
- 
- Redistribution and use in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met:
- 
- 1.  Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
- 
- 2.  Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation and/or
- other materials provided with the distribution.
- 
- 3.  Neither the name of the copyright holder(s) nor the names of any contributors
- may be used to endorse or promote products derived from this software without
- specific prior written permission. No license is granted to the trademarks of
- the copyright holders even if such marks are included in this software.
- 
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import <ResearchKit/ORKRecorder.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-/**
- The `ORKAccelerometerRecorder` class represents a recorder that requests and collects raw accelerometer data from CoreMotion at a fixed frequency.
- 
- The accelerometer recorder continues to record when the application enters the
- background by using the background task support provided by UIApplication.
- */
-ORK_CLASS_AVAILABLE
-@interface ORKAccelerometerRecorder : ORKRecorder
-
-/**
- The frequency of accelerometer data collected from CoreMotion, in hertz (Hz).
- */
-@property (nonatomic, readonly) double frequency;
-
-/**
- Returns an initialized accelerometer recorder using the specified frequency.
- 
- @param frequency    The frequency of accelerometer data collected from CoreMotion, in hertz (Hz).
- @return An initialized accelerometer recorder.
- */
-- (instancetype)initWithFrequency:(double)frequency
-                             step:(ORKStep *)step
-                  outputDirectory:(NSURL *)outputDirectory;
-
-@end
-
-NS_ASSUME_NONNULL_END
-
-
-

ResearchKit/ActiveTasks/ORKAccelerometerRecorder.m

@@ -1,246 +0,0 @@
-/*
- Copyright (c) 2015, Apple Inc. All rights reserved.
- 
- Redistribution and use in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met:
- 
- 1.  Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
- 
- 2.  Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation and/or
- other materials provided with the distribution.
- 
- 3.  Neither the name of the copyright holder(s) nor the names of any contributors
- may be used to endorse or promote products derived from this software without
- specific prior written permission. No license is granted to the trademarks of
- the copyright holders even if such marks are included in this software.
- 
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import "ORKAccelerometerRecorder.h"
-#import "ORKDataLogger.h"
-#import "CMAccelerometerData+ORKJSONDictionary.h"
-#import <CoreMotion/CoreMotion.h>
-#import "ORKRecorder_Internal.h"
-#import "ORKRecorder_Private.h"
-#import "ORKHelpers.h"
-
-
-@interface ORKAccelerometerRecorder()
-{
-    ORKDataLogger *_logger;
-    NSError *_recordingError;
-}
-@property (nonatomic, strong) CMMotionManager *motionManager;
-@property (nonatomic) NSTimeInterval uptime;
-
-@end
-
-@implementation ORKAccelerometerRecorder
-
-- (instancetype)initWithFrequency:(double)frequency step:(ORKStep *)step outputDirectory:(NSURL *)outputDirectory
-{
-    self = [super initWithStep:step outputDirectory:outputDirectory];
-    if (self)
-    {
-        self.frequency = frequency;
-        self.continuesInBackground = YES;
-    }
-    return self;
-}
-
-- (void)dealloc
-{
-    [_logger finishCurrentLog];
-}
-
-- (NSString *)recorderType
-{
-    return @"accel";
-}
-
-- (void)setFrequency:(double)frequency {
-    if (frequency <=0) {
-        _frequency = 1;
-    } else {
-        _frequency = frequency;
-    }
-}
-
-- (CMMotionManager *)createMotionManager {
-    return [[CMMotionManager alloc] init];
-}
-
-- (void)start {
-    
-    [super start];
-    self.motionManager = [self createMotionManager];
-    
-    if (! _logger) {
-        NSError *err = nil;
-        _logger = [self makeJSONDataLoggerWithError:&err];
-        if (! _logger) {
-            [self finishRecordingWithError:err];
-            return;
-        }
-    }
-    
-    if (! self.motionManager || ! self.motionManager.accelerometerAvailable)
-    {
-        NSError *error = [NSError errorWithDomain:NSCocoaErrorDomain
-                                             code:NSFeatureUnsupportedError
-                                         userInfo:@{@"recorder" : self}];
-        [self finishRecordingWithError:error];
-        return;
-    }
-    
-    self.motionManager.accelerometerUpdateInterval = 1.0/_frequency;
-    
-    self.uptime = [NSProcessInfo processInfo].systemUptime;
-    
-    [self.motionManager stopAccelerometerUpdates];
-    
-    [self.motionManager
-     startAccelerometerUpdatesToQueue:[[NSOperationQueue alloc] init]
-     withHandler:^(CMAccelerometerData *data, NSError *error)
-     {
-         BOOL success = NO;
-         if (data)
-         {
-             success = [_logger append:[data ork_JSONDictionary] error:&error];
-         }
-         if (!success)
-         {
-             dispatch_async(dispatch_get_main_queue(), ^{
-                 _recordingError = error;
-                 [self stop];
-             });
-         }
-     }];
-}
-
-- (NSDictionary *)userInfo {
-    return  @{ @"frequency" : @(self.frequency) };;
-}
-
-- (void)stop {
-    [self doStopRecording];
-    [_logger finishCurrentLog];
-    
-    NSError *error = _recordingError;
-    _recordingError = nil;
-    __block NSURL *fileUrl = nil;
-    [_logger enumerateLogs:^(NSURL *logFileUrl, BOOL *stop) {
-        fileUrl = logFileUrl;
-    } error:&error];
-    
-    [self reportFileResultWithFile:fileUrl error:error];
-    
-    [super stop];
-}
-
-- (void)doStopRecording
-{
-    if (self.isRecording) {
-        [self.motionManager stopAccelerometerUpdates];
-        self.motionManager = nil;
-    }
-}
-
-- (void)finishRecordingWithError:(NSError *)error
-{
-    [self doStopRecording];
-    [super finishRecordingWithError:nil];
-}
-
-- (void)reset
-{
-    [super reset];
-    
-    _logger = nil;
-}
-
-
-- (BOOL)isRecording {
-    return self.motionManager.accelerometerActive;
-}
-
-- (NSString *)mimeType {
-    return @"application/json";
-}
-
-
-
-@end
-
-
-@interface ORKAccelerometerRecorderConfiguration()
-@end
-
-@implementation ORKAccelerometerRecorderConfiguration
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wobjc-designated-initializers"
-- (instancetype)initWithFrequency:(double)freq {
-    self = [self ork_init];
-    if (self) {
-        _frequency = freq;
-    }
-    return self;
-}
-#pragma clang diagnostic pop
-
-- (ORKRecorder *)recorderForStep:(ORKStep *)step outputDirectory:(NSURL *)outputDirectory
-{
-    return [[ORKAccelerometerRecorder alloc] initWithFrequency:self.frequency step:step outputDirectory:outputDirectory];
-}
-
-- (instancetype)initWithCoder:(NSCoder *)aDecoder
-{
-    self = [super initWithCoder:aDecoder];
-    if (self)
-    {
-        ORK_DECODE_DOUBLE(aDecoder, frequency);
-    }
-    return self;
-}
-
-- (void)encodeWithCoder:(NSCoder *)aCoder
-{
-    [super encodeWithCoder:aCoder];
-    ORK_ENCODE_DOUBLE(aCoder, frequency);
-}
-
-+ (BOOL)supportsSecureCoding
-{
-    return YES;
-}
-
-
-- (BOOL)isEqual:(id)object {
-    BOOL isParentSame = [super isEqual:object];
-    
-    __typeof(self) castObject = object;
-    return (isParentSame &&
-            (self.frequency == castObject.frequency)) ;
-}
-
-
-- (ORKPermissionMask)requestedPermissionMask {
-    return ORKPermissionCoreMotionAccelerometer;
-}
-
-
-
-@end

ResearchKit/ActiveTasks/ORKActiveStep.h

@@ -1,225 +0,0 @@
-/*
- Copyright (c) 2015, Apple Inc. All rights reserved.
- 
- Redistribution and use in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met:
- 
- 1.  Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
- 
- 2.  Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation and/or
- other materials provided with the distribution.
- 
- 3.  Neither the name of the copyright holder(s) nor the names of any contributors
- may be used to endorse or promote products derived from this software without
- specific prior written permission. No license is granted to the trademarks of
- the copyright holders even if such marks are included in this software.
- 
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-
-#import <ResearchKit/ORKDefines.h>
-#import <ResearchKit/ORKStep.h>
-#import <UIKit/UIKit.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-/**
- The `ORKActiveStep` class is the base class for steps in active tasks, which
- are steps that collect sensor data in a semi-controlled environment, as opposed
- to the purely passive data collection enabled by HealthKit, or the more subjective data
- collected when users fill in surveys.
- 
- In addition to the behaviors of `ORKStep`, active steps have the concept of
- life cycle, which includes a defined start and finish.
- 
- The ResearchKit framework provides built-in behaviors that allow active steps to play voice prompts, speak a count down, and have a
- defined duration.
- 
- To present an active step in your app, it's likely that you will subclass `ORKActiveStep` and
- `ORKActiveStepViewController` to present custom UI and custom
- prompts. For example subclasses, see `ORKSpatialSpanMemoryStep` or `ORKFitnessStep`.
- Active steps may also need `ORKResult` subclasses to record their results
- if these don't come purely from recorders.
- 
- If you develop a new active step subclass, consider contributing your
- code to the ResearchKit project so that it's available for others to use in
- their studies.
- 
- See also: `ORKActiveStepViewController`
- */
-ORK_CLASS_AVAILABLE
-@interface ORKActiveStep : ORKStep
-
-/**
- The duration of the step in seconds.
- 
- If the step duration is greater than zero, a built-in timer starts when the
- step starts. If `shouldStartTimerAutomatically` is set, the timer
- starts when the step's view appears. When the timer expires, a sound or
- vibration may be played. If `shouldContinueOnFinish` is set, the step
-automatically navigates forward when the timer expires.
- 
- The default value of this property is `0`, which disables the built-in timer.
- 
- See also: `ORKActiveStepViewController`
- */
-@property (nonatomic) NSTimeInterval stepDuration;
-
-/**
- A Boolean value indicating whether to show a view with a default timer.
- 
- The default timer UI is not used in any of the current predefined tasks,
- but it can be displayed in a simple active task that does not require custom
- UI and needs only a count down timer on screen during data collection.
- 
- Note that this property is ignored if `stepDuration` is `0`.
- 
- The default value of this property is `YES`.
- */
-@property (nonatomic) BOOL shouldShowDefaultTimer;
-
-/**
- A Boolean value indicating whether to speak the last few seconds in the count down of the
- duration of a timed step.
- 
- When the value of this property is `YES`, `AVSpeechSynthesizer` is used to synthesize the countdown. Note that this property is ignored if VoiceOver is enabled.
- 
- The default value of this property is `NO`.
- */
-@property (nonatomic) BOOL shouldSpeakCountDown;
-
-
-/**
- A Boolean value indicating whether to start the count down timer automatically when the step starts, or
- require the user to take some explicit action to start the step, such as tapping a button.
- 
- Usually the explicit action needs to come from custom UI in an
- `ORKActiveStepViewController` subclass.
- 
- The default value of this property is `NO`.
- */
-@property (nonatomic) BOOL shouldStartTimerAutomatically;
-
-/**
- A Boolean value indicating whether to play a default sound when the step starts.
- 
-The default value of this property is `NO`.
- */
-@property (nonatomic) BOOL shouldPlaySoundOnStart;
-
-/**
- A Boolean value indicating whether to play a default sound when the step finishes.
- 
-The default value of this property is `NO`.
- */
-@property (nonatomic) BOOL shouldPlaySoundOnFinish;
-
-/**
- A Boolean value indicating whether to vibrate when the step starts.
- 
- The default value of this property is `NO`.
- */
-@property (nonatomic) BOOL shouldVibrateOnStart;
-
-/**
- A Boolean value indicating whether to vibrate when the step finishes.
- 
- The default value of this property is `NO`.
- */
-@property (nonatomic) BOOL shouldVibrateOnFinish;
-
-/**
- A Boolean value indicating whether the Next button should double as a skip action before
- the step finishes.
- 
- When the value of this property is `YES`, the ResearchKit framework hides the skip button and makes the Next button function as a skip button when the step has not yet finished.
- 
- The default value of this property is `NO`.
- */
-@property (nonatomic) BOOL shouldUseNextAsSkipButton;
-
-/**
- A Boolean value indicating whether to transition automatically when the step finishes.
- 
- When the value of this property is `YES`, the active step view controller automatically performs the
- continue action when the `[ORKActiveStepViewController finish]` method
- is called.
- 
- The default value of this property is `NO`.
- */
-@property (nonatomic) BOOL shouldContinueOnFinish;
-
-/**
- Localized text that represents an instructional voice prompt.
- 
- Instructional speech begins when the step starts. If VoiceOver is active,
- the instruction is spoken by VoiceOver.
- */
-@property (nonatomic, copy, nullable) NSString *spokenInstruction;
-
-/**
- An image to be displayed below the instructions for the step.
- 
- The image can be stretched to fit the available space. When choosing a size
- for this asset, be sure to take into account the variations in device form factors.
- */
-@property (nonatomic, strong, nullable) UIImage *image;
-
-/**
- An array of recorder configurations that define the parameters for recorders to be
- run during a step to collect sensor or other data.
- 
- If you want to collect data from sensors while the step is in progress,
- add one or more recorder configurations to the array. The active step view
- controller instantiates recorders and collates their results as children
- of the step result.
- 
- The set of recorder configurations is scanned when populating the
- `requestedHealthKitTypesForReading` and `requestedPermissions` properties.
- 
- See also: `ORKRecorderConfiguration` and `ORKRecorder`.
- */
-@property (nonatomic, copy, nullable) NSArray *recorderConfigurations;
-
-
-/**
- The set of HealthKit types the step requests for reading. (read-only)
- 
- The task view controller uses this set of types when constructing a list of
- all the HealthKit types required by all the steps in a task, so that it can
- present the HealthKit access dialog just once during that task.
- 
- By default, the property scans the recorders and collates the HealthKit
- types the recorders require. Subclasses may override this implementation.
- */
-@property (nonatomic, readonly, nullable) NSSet *requestedHealthKitTypesForReading;
-
-/**
- The set of access permissions required for the step. (read-only)
- 
- The permission mask is used by the task view controller to determine the types of
- access to request from users when they complete the initial instruction steps
- in a task. If your step requires access to APIs that limit access, include
- the permissions you require in this mask.
- 
- By default, the property scans the recorders and collates the permissions
- required by the recorders. Subclasses may override this implementation.
- */
-@property (nonatomic, readonly) ORKPermissionMask requestedPermissions;
-
-
-@end
-
-NS_ASSUME_NONNULL_END

ResearchKit/ActiveTasks/ORKActiveStep.m

@@ -1,192 +0,0 @@
-/*
- Copyright (c) 2015, Apple Inc. All rights reserved.
- 
- Redistribution and use in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met:
- 
- 1.  Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
- 
- 2.  Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation and/or
- other materials provided with the distribution.
- 
- 3.  Neither the name of the copyright holder(s) nor the names of any contributors
- may be used to endorse or promote products derived from this software without
- specific prior written permission. No license is granted to the trademarks of
- the copyright holders even if such marks are included in this software.
- 
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-
-#import "ORKActiveStep.h"
-#import "ORKHelpers.h"
-#import "ORKStep_Private.h"
-#import "ORKActiveStep_Internal.h"
-#import "ORKActiveStepViewController.h"
-#import "ORKRecorder_Private.h"
-
-@implementation ORKActiveStep
-
-+ (Class)stepViewControllerClass
-{
-    return [ORKActiveStepViewController class];
-}
-
-- (BOOL)startsFinished {
-    return (_stepDuration == 0);
-}
-
-- (BOOL)hasCountDown {
-    return (_stepDuration > 0) && _shouldShowDefaultTimer;
-}
-
-- (BOOL)hasTitle {
-    NSString *title = self.title;
-    return  ( title != nil && title.length > 0);
-}
-
-- (BOOL)hasText {
-    NSString *text = self.text;
-    return  ( text != nil && text.length > 0);
-}
-
-- (BOOL)hasVoice {
-    return  ( _spokenInstruction != nil && _spokenInstruction.length > 0);
-}
-
-- (BOOL)isRestorable {
-    return NO;
-}
-
-
-+ (BOOL)supportsSecureCoding
-{
-    return YES;
-}
-
-- (instancetype)initWithIdentifier:(NSString *)identifier {
-    self = [super initWithIdentifier:identifier];
-    if (self) {
-        self.shouldShowDefaultTimer = YES;
-    }
-    return self;
-}
-
-- (instancetype)copyWithZone:(NSZone *)zone
-{
-    ORKActiveStep *step = [super copyWithZone:zone];
-    step.stepDuration = self.stepDuration;
-    step.shouldStartTimerAutomatically = self.shouldStartTimerAutomatically;
-    step.shouldSpeakCountDown = self.shouldSpeakCountDown;
-    step.shouldShowDefaultTimer = self.shouldShowDefaultTimer;
-    step.shouldPlaySoundOnStart = self.shouldPlaySoundOnStart;
-    step.shouldPlaySoundOnFinish = self.shouldPlaySoundOnFinish;
-    step.shouldVibrateOnStart = self.shouldVibrateOnStart;
-    step.shouldVibrateOnFinish = self.shouldVibrateOnFinish;
-    step.shouldUseNextAsSkipButton = self.shouldUseNextAsSkipButton;
-    step.shouldContinueOnFinish = self.shouldContinueOnFinish;
-    step.spokenInstruction = self.spokenInstruction;
-    step.recorderConfigurations = [self.recorderConfigurations copy];
-    step.image = self.image;
-    return step;
-}
-
-
-- (instancetype)initWithCoder:(NSCoder *)aDecoder
-{
-    self = [super initWithCoder:aDecoder];
-    if (self)
-    {
-        ORK_DECODE_DOUBLE(aDecoder, stepDuration);
-        ORK_DECODE_BOOL(aDecoder, shouldStartTimerAutomatically);
-        ORK_DECODE_BOOL(aDecoder, shouldSpeakCountDown);
-        ORK_DECODE_BOOL(aDecoder, shouldShowDefaultTimer);
-        ORK_DECODE_BOOL(aDecoder, shouldPlaySoundOnStart);
-        ORK_DECODE_BOOL(aDecoder, shouldPlaySoundOnFinish);
-        ORK_DECODE_BOOL(aDecoder, shouldVibrateOnStart);
-        ORK_DECODE_BOOL(aDecoder, shouldVibrateOnFinish);
-        ORK_DECODE_BOOL(aDecoder, shouldUseNextAsSkipButton);
-        ORK_DECODE_BOOL(aDecoder, shouldContinueOnFinish);
-        ORK_DECODE_OBJ_CLASS(aDecoder, spokenInstruction, NSString);
-        ORK_DECODE_IMAGE(aDecoder, image);
-        ORK_DECODE_OBJ_ARRAY(aDecoder, recorderConfigurations, ORKRecorderConfiguration);
-    }
-    return self;
-}
-
-- (void)encodeWithCoder:(NSCoder *)aCoder
-{
-    [super encodeWithCoder:aCoder];
-    ORK_ENCODE_DOUBLE(aCoder, stepDuration);
-    ORK_ENCODE_BOOL(aCoder, shouldStartTimerAutomatically);
-    ORK_ENCODE_BOOL(aCoder, shouldSpeakCountDown);
-    ORK_ENCODE_BOOL(aCoder, shouldShowDefaultTimer);
-    ORK_ENCODE_BOOL(aCoder, shouldPlaySoundOnStart);
-    ORK_ENCODE_BOOL(aCoder, shouldPlaySoundOnFinish);
-    ORK_ENCODE_BOOL(aCoder, shouldVibrateOnStart);
-    ORK_ENCODE_BOOL(aCoder, shouldVibrateOnFinish);
-    ORK_ENCODE_BOOL(aCoder, shouldUseNextAsSkipButton);
-    ORK_ENCODE_BOOL(aCoder, shouldContinueOnFinish);
-    ORK_ENCODE_IMAGE(aCoder, image);
-    ORK_ENCODE_OBJ(aCoder, spokenInstruction);
-    ORK_ENCODE_OBJ(aCoder, recorderConfigurations);
-}
-
-
-
-- (BOOL)isEqual:(id)object {
-    BOOL isParentSame = [super isEqual:object];
-    
-    __typeof(self) castObject = object;
-    return (isParentSame &&
-            ORKEqualObjects(self.spokenInstruction, castObject.spokenInstruction) &&
-            ORKEqualObjects(self.recorderConfigurations, castObject.recorderConfigurations) &&
-            ORKEqualObjects(self.image, castObject.image) &&
-            (self.stepDuration == castObject.stepDuration) &&
-            (self.shouldShowDefaultTimer == castObject.shouldShowDefaultTimer) &&
-            (self.shouldStartTimerAutomatically == castObject.shouldStartTimerAutomatically) &&
-            (self.shouldSpeakCountDown == castObject.shouldSpeakCountDown) &&
-            (self.shouldPlaySoundOnStart == castObject.shouldPlaySoundOnStart) &&
-            (self.shouldPlaySoundOnFinish == castObject.shouldPlaySoundOnFinish) &&
-            (self.shouldVibrateOnStart == castObject.shouldVibrateOnStart) &&
-            (self.shouldVibrateOnFinish == castObject.shouldVibrateOnFinish) &&
-            (self.shouldContinueOnFinish == castObject.shouldContinueOnFinish) &&
-            (self.shouldUseNextAsSkipButton == castObject.shouldUseNextAsSkipButton)) ;
-}
-
-
-
-
-
-- (NSSet *)requestedHealthKitTypesForReading {
-    NSMutableSet *set = [NSMutableSet set];
-    for (ORKRecorderConfiguration *config in self.recorderConfigurations) {
-        NSSet *subset = [config requestedHealthKitTypesForReading];
-        if (subset) {
-            [set unionSet:subset];
-        }
-    }
-    return set;
-    
-}
-
-- (ORKPermissionMask)requestedPermissions {
-    ORKPermissionMask mask = ORKPermissionNone;
-    for (ORKRecorderConfiguration *config in self.recorderConfigurations) {
-        mask |= [config requestedPermissionMask];
-    }
-    return mask;
-}
-
-@end

ResearchKit/ActiveTasks/ORKActiveStepQuantityView.h

@@ -1,63 +0,0 @@
-/*
- Copyright (c) 2015, Apple Inc. All rights reserved.
- 
- Redistribution and use in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met:
- 
- 1.  Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
- 
- 2.  Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation and/or
- other materials provided with the distribution.
- 
- 3.  Neither the name of the copyright holder(s) nor the names of any contributors
- may be used to endorse or promote products derived from this software without
- specific prior written permission. No license is granted to the trademarks of
- the copyright holders even if such marks are included in this software.
- 
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import <ResearchKit/ResearchKit_Private.h>
-#import "ORKLabel.h"
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface ORKQuantityLabel : ORKLabel
-
-@end
-
-@interface ORKActiveStepQuantityView : UIView
-
-@property (nonatomic, strong, nullable) NSString *title;
-@property (nonatomic, strong, nullable) NSString *value;
-@property (nonatomic, strong, nullable) UIImage *image;
-@property (nonatomic) BOOL enabled;
-
-
-@property (nonatomic, readonly, strong, nullable) UILabel *titleLabel;
-@property (nonatomic, readonly, strong, nullable) UILabel *valueLabel;
-
-
-@end
-
-@interface ORKQuantityPairView : UIView
-
-@property (nonatomic, strong, nullable) ORKActiveStepQuantityView *leftView;
-@property (nonatomic, strong, nullable) ORKActiveStepQuantityView *rightView;
-
-@property (nonatomic, assign) BOOL keylineHidden;
-
-@end
-
-NS_ASSUME_NONNULL_END

ResearchKit/ActiveTasks/ORKActiveStepQuantityView.m

@@ -1,279 +0,0 @@
-/*
- Copyright (c) 2015, Apple Inc. All rights reserved.
- 
- Redistribution and use in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met:
- 
- 1.  Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
- 
- 2.  Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation and/or
- other materials provided with the distribution.
- 
- 3.  Neither the name of the copyright holder(s) nor the names of any contributors
- may be used to endorse or promote products derived from this software without
- specific prior written permission. No license is granted to the trademarks of
- the copyright holders even if such marks are included in this software.
- 
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import "ORKActiveStepQuantityView.h"
-#import "ORKHelpers.h"
-#import "ORKSkin.h"
-#import "ORKTintedImageView.h"
-#import "ORKSubheadlineLabel.h"
-
-
-@implementation ORKQuantityLabel
-
-+ (UIFont *)defaultFont {
-    return ORKTimeFontForSize(35);
-}
-
-@end
-
-
-@implementation ORKActiveStepQuantityView
-{
-    ORKSubheadlineLabel *_titleLabel;
-    ORKQuantityLabel *_valueLabel;
-    ORKTintedImageView *_imageView;
-    UIView *_valueHolder;
-}
-
-- (instancetype)initWithFrame:(CGRect)frame {
-    self = [super initWithFrame:frame];
-    if (self) {
-        _titleLabel = [ORKSubheadlineLabel new];
-        _titleLabel.textAlignment = NSTextAlignmentCenter;
-        _valueLabel = [ORKQuantityLabel new];
-        _valueLabel.textAlignment = NSTextAlignmentCenter;
-        _imageView = [ORKTintedImageView new];
-        _imageView.shouldApplyTint = YES;
-        _valueHolder = [UIView new];
-        _titleLabel.translatesAutoresizingMaskIntoConstraints = NO;
-        _valueLabel.translatesAutoresizingMaskIntoConstraints = NO;
-        _imageView.translatesAutoresizingMaskIntoConstraints = NO;
-        _valueHolder.translatesAutoresizingMaskIntoConstraints = NO;
-        
-        [self addSubview:_titleLabel];
-        [_valueHolder addSubview:_valueLabel];
-        [_valueHolder addSubview:_imageView];
-        [self addSubview:_valueHolder];
-        
-#if LAYOUT_DEBUG
-        self.backgroundColor = [[UIColor blueColor] colorWithAlphaComponent:0.2];
-        _titleLabel.backgroundColor = [[UIColor greenColor] colorWithAlphaComponent:0.2];
-        _valueLabel.backgroundColor = [[UIColor greenColor] colorWithAlphaComponent:0.2];
-#endif
-        
-        for (UIView *view in @[_titleLabel, _valueLabel, _imageView]) {
-            view.isAccessibilityElement = NO;
-        }
-        
-        [self setNeedsUpdateConstraints];
-        
-    }
-    return self;
-}
-
-- (void)setEnabled:(BOOL)enabled {
-    _enabled = enabled;
-    self.hidden = ! enabled;
-    [self setNeedsUpdateConstraints];
-}
-
-- (void)setTitle:(NSString *)title {
-    _title = title;
-    _titleLabel.text = title;
-}
-
-- (void)setValue:(NSString *)value {
-    _value = value;
-    _valueLabel.text = value;
-}
-
-- (void)setImage:(UIImage *)image {
-    _image = nil;
-    _imageView.image = image;
-}
-
-- (void)updateConstraints {
-    [self removeConstraints:[self constraints]];
-    
-    const CGFloat TitleBaselineToValueBaseline = 40;
-    const CGFloat ValueBaselineToBottom = 36;
-    
-    if (! _enabled) {
-        NSLayoutConstraint *zeroWidthConstraint = [NSLayoutConstraint constraintWithItem:self attribute:NSLayoutAttributeWidth relatedBy:NSLayoutRelationEqual toItem:nil attribute:NSLayoutAttributeNotAnAttribute multiplier:1 constant:0];
-        zeroWidthConstraint.priority = UILayoutPriorityRequired-1;
-        [self addConstraint:zeroWidthConstraint];
-    }
-    NSDictionary *views = NSDictionaryOfVariableBindings(_titleLabel, _valueLabel, _imageView);
-    NSMutableArray *additionalConstraints = [NSMutableArray array];
-    [additionalConstraints addObjectsFromArray:[NSLayoutConstraint constraintsWithVisualFormat:@"V:|[_titleLabel]" options:0 metrics:nil views:views]];
-    [additionalConstraints addObjectsFromArray:[NSLayoutConstraint constraintsWithVisualFormat:@"H:|[_titleLabel]|" options:0 metrics:nil views:views]];
-    [additionalConstraints addObjectsFromArray:[NSLayoutConstraint constraintsWithVisualFormat:@"H:|[_imageView]-10-[_valueLabel]|" options:NSLayoutFormatAlignAllCenterY metrics:nil views:views]];
-    [additionalConstraints addObject:[NSLayoutConstraint constraintWithItem:_valueLabel
-                                                                  attribute:NSLayoutAttributeFirstBaseline
-                                                                  relatedBy:NSLayoutRelationEqual
-                                                                     toItem:_titleLabel
-                                                                  attribute:NSLayoutAttributeLastBaseline
-                                                                 multiplier:1 constant:TitleBaselineToValueBaseline]];
-    [additionalConstraints addObject:[NSLayoutConstraint constraintWithItem:self
-                                                                  attribute:NSLayoutAttributeBottom
-                                                                  relatedBy:NSLayoutRelationEqual
-                                                                     toItem:_valueLabel
-                                                                  attribute:NSLayoutAttributeLastBaseline
-                                                                 multiplier:1 constant:ValueBaselineToBottom]];
-    [additionalConstraints addObject:[NSLayoutConstraint constraintWithItem:_valueHolder
-                                                                  attribute:NSLayoutAttributeCenterX
-                                                                  relatedBy:NSLayoutRelationEqual
-                                                                     toItem:self
-                                                                  attribute:NSLayoutAttributeCenterX
-                                                                 multiplier:1 constant:0]];
-    [additionalConstraints addObject:[NSLayoutConstraint constraintWithItem:_valueLabel
-                                                                  attribute:NSLayoutAttributeTop
-                                                                  relatedBy:NSLayoutRelationGreaterThanOrEqual
-                                                                     toItem:_valueHolder
-                                                                  attribute:NSLayoutAttributeTop
-                                                                 multiplier:1 constant:0]];
-    [additionalConstraints addObject:[NSLayoutConstraint constraintWithItem:_valueLabel
-                                                                  attribute:NSLayoutAttributeBottom
-                                                                  relatedBy:NSLayoutRelationLessThanOrEqual
-                                                                     toItem:_valueHolder
-                                                                  attribute:NSLayoutAttributeBottom
-                                                                 multiplier:1 constant:0]];
-    [additionalConstraints addObject:[NSLayoutConstraint constraintWithItem:_valueHolder
-                                                                  attribute:NSLayoutAttributeLeft
-                                                                  relatedBy:NSLayoutRelationGreaterThanOrEqual
-                                                                     toItem:self
-                                                                  attribute:NSLayoutAttributeLeft
-                                                                 multiplier:1 constant:0]];
-    [additionalConstraints addObject:[NSLayoutConstraint constraintWithItem:_valueHolder
-                                                                  attribute:NSLayoutAttributeRight
-                                                                  relatedBy:NSLayoutRelationLessThanOrEqual
-                                                                     toItem:self
-                                                                  attribute:NSLayoutAttributeRight
-                                                                 multiplier:1 constant:0]];
-    for (NSLayoutConstraint *constraint in additionalConstraints) {
-        constraint.priority = UILayoutPriorityDefaultHigh;
-    }
-    [self addConstraints:additionalConstraints];
-    
-    [super updateConstraints];
-}
-
-#pragma mark Accessibility
-
-- (BOOL)isAccessibilityElement {
-    return YES;
-}
-
-- (NSString *)accessibilityLabel {
-    return _titleLabel.accessibilityLabel;
-}
-
-- (NSString *)accessibilityValue {
-    return _valueLabel.accessibilityLabel;
-}
-
-- (UIAccessibilityTraits)accessibilityTraits {
-    return [super accessibilityTraits] | UIAccessibilityTraitUpdatesFrequently;
-}
-
-@end
-
-@implementation ORKQuantityPairView
-{
-    UIView *_metricKeyline;
-    NSArray *_constraints;
-}
-
-- (instancetype)initWithFrame:(CGRect)frame {
-    self = [super initWithFrame:frame];
-    if (self) {
-        _leftView = [ORKActiveStepQuantityView new];
-        _rightView = [ORKActiveStepQuantityView new];
-        
-        _leftView.translatesAutoresizingMaskIntoConstraints = NO;
-        _rightView.translatesAutoresizingMaskIntoConstraints = NO;
-        _metricKeyline = [UIView new];
-        _metricKeyline.translatesAutoresizingMaskIntoConstraints = NO;
-        self.translatesAutoresizingMaskIntoConstraints = NO;
-        [self setKeylineHidden:NO];
-        _metricKeyline.backgroundColor = [UIColor ork_midGrayTintColor];
-        
-        
-        [self addSubview:_leftView];
-        [self addSubview:_rightView];
-        [self addSubview:_metricKeyline];
-        [self setNeedsUpdateConstraints];
-        
-    }
-    return self;
-}
-
-- (void)updateConstraints {
-    
-    
-    if (_constraints) {
-        [self removeConstraints:_constraints];
-        _constraints = nil;
-    }
-    NSMutableArray *constraints = [NSMutableArray array];
-    NSDictionary *views = NSDictionaryOfVariableBindings(_leftView, _rightView, _metricKeyline);
-    
-    // Leave space for the keyline between these views, and then constrain it to be 1px wide and go from top to bottom baseline of metric views.
-    CGFloat scale = [[UIScreen mainScreen] scale];
-    NSArray *vertConstraints = [NSLayoutConstraint constraintsWithVisualFormat:@"V:|[_leftView]|" options:(NSLayoutFormatOptions)0 metrics:nil views:views];
-    [constraints addObjectsFromArray:vertConstraints];
-    
-    NSArray *horizConstraints = [NSLayoutConstraint constraintsWithVisualFormat:@"H:|-[_leftView]-s-[_rightView]-|" options:NSLayoutFormatAlignAllTop|NSLayoutFormatAlignAllBottom|NSLayoutFormatDirectionLeftToRight metrics:@{@"s":@(1/scale)} views:views];
-    for (NSLayoutConstraint *constraint in horizConstraints) {
-        constraint.priority = UILayoutPriorityDefaultHigh+1;
-    }
-    [constraints addObjectsFromArray:horizConstraints];
-    
-    [constraints addObjectsFromArray:[NSLayoutConstraint constraintsWithVisualFormat:@"H:[_leftView][_metricKeyline(==s)]" options:NSLayoutFormatAlignAllTop|NSLayoutFormatDirectionLeftToRight metrics:@{@"s":@(1/scale)} views:views]];
-    NSLayoutConstraint *keylineBottom = [NSLayoutConstraint constraintWithItem:_metricKeyline
-                                                                     attribute:NSLayoutAttributeBottom
-                                                                     relatedBy:NSLayoutRelationEqual
-                                                                        toItem:_leftView.valueLabel
-                                                                     attribute:NSLayoutAttributeLastBaseline
-                                                                    multiplier:1 constant:0];
-    [constraints addObject:keylineBottom];
-    
-    NSLayoutConstraint *maxWidthConstraint = [NSLayoutConstraint constraintWithItem:self attribute:NSLayoutAttributeWidth relatedBy:NSLayoutRelationEqual toItem:nil attribute:NSLayoutAttributeNotAnAttribute multiplier:1 constant:10000];
-    maxWidthConstraint.priority = UILayoutPriorityRequired-2;
-    [constraints addObject:maxWidthConstraint];
-    
-    
-    // This constraint should be beaten out by the full-width-coverage and zero-width constraints if only one of the views is enabled.
-    NSLayoutConstraint *equalWidthConstraint = [NSLayoutConstraint constraintWithItem:_leftView attribute:NSLayoutAttributeWidth relatedBy:NSLayoutRelationEqual toItem:_rightView attribute:NSLayoutAttributeWidth multiplier:1 constant:0];
-    equalWidthConstraint.priority = UILayoutPriorityDefaultLow;
-    [constraints addObject:equalWidthConstraint];
-    
-    [self addConstraints:constraints];
-    _constraints = constraints;
-    [super updateConstraints];
-}
-
-- (void)setKeylineHidden:(BOOL)keylineHidden {
-    _keylineHidden = keylineHidden;
-    _metricKeyline.hidden = keylineHidden;
-}
-
-@end
-

ResearchKit/ActiveTasks/ORKActiveStepTimer.h

@@ -1,70 +0,0 @@
-/*
- Copyright (c) 2015, Apple Inc. All rights reserved.
- 
- Redistribution and use in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met:
- 
- 1.  Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
- 
- 2.  Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation and/or
- other materials provided with the distribution.
- 
- 3.  Neither the name of the copyright holder(s) nor the names of any contributors
- may be used to endorse or promote products derived from this software without
- specific prior written permission. No license is granted to the trademarks of
- the copyright holders even if such marks are included in this software.
- 
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import <Foundation/Foundation.h>
-#import <ResearchKit/ResearchKit.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@class ORKActiveStepTimer;
-
-typedef void (^ORKActiveStepTimerHandler)(ORKActiveStepTimer *timer, BOOL finished);
-
-
-@interface ORKActiveStepTimer : NSObject
-
-- (instancetype)initWithDuration:(NSTimeInterval)duration interval:(NSTimeInterval)interval runtime:(NSTimeInterval)runtime handler:(ORKActiveStepTimerHandler)handler;
-
-@property (nonatomic, assign) NSTimeInterval duration;
-
-@property (nonatomic, readonly) NSTimeInterval interval;
-
-@property (nonatomic, readonly) NSTimeInterval runtime;
-
-/*
- Handler callbacks are returned on interval boundaries. The timer automatically
- pauses itself when finished=YES.
- 
- This handler is retained. Be careful not to create a retain cycle.
- */
-@property (nonatomic, copy, readonly) ORKActiveStepTimerHandler handler;
-
-// Pauses the timer.
-- (void)pause;
-
-// Resumes the timer where it left off.
-- (void)resume;
-
-// Sets runtime to 0. Stops the timer if it is running.
-- (void)reset;
-
-@end
-
-NS_ASSUME_NONNULL_END

ResearchKit/ActiveTasks/ORKActiveStepTimer.m

@@ -1,243 +0,0 @@
-/*
- Copyright (c) 2015, Apple Inc. All rights reserved.
- 
- Redistribution and use in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met:
- 
- 1.  Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
- 
- 2.  Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation and/or
- other materials provided with the distribution.
- 
- 3.  Neither the name of the copyright holder(s) nor the names of any contributors
- may be used to endorse or promote products derived from this software without
- specific prior written permission. No license is granted to the trademarks of
- the copyright holders even if such marks are included in this software.
- 
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import "ORKActiveStepTimer.h"
-#include <mach/mach.h>
-#include <mach/mach_time.h>
-#import <UIKit/UIKit.h>
-
-static NSTimeInterval timeIntervalFromMachTime(uint64_t delta) {
-    
-    static mach_timebase_info_data_t    sTimebaseInfo;
-    if ( sTimebaseInfo.denom == 0 ) {
-        (void) mach_timebase_info(&sTimebaseInfo);
-    }
-    uint64_t elapsedNano = delta * sTimebaseInfo.numer / sTimebaseInfo.denom;
-    
-    return elapsedNano * 1.0 / NSEC_PER_SEC;
-}
-
-@implementation ORKActiveStepTimer
-{
-    uint64_t _startTime;
-    NSTimeInterval _preExistingRuntime;
-    dispatch_queue_t _queue;
-    dispatch_source_t _timer;
-    UIBackgroundTaskIdentifier _backgroundTaskIdentifier;
-    uint32_t _isRunning;
-}
-
-
-- (instancetype)initWithDuration:(NSTimeInterval)duration interval:(NSTimeInterval)interval runtime:(NSTimeInterval)runtime handler:(ORKActiveStepTimerHandler)handler {
-    self = [super init];
-    if (self) {
-        if (! handler) {
-            @throw [NSException exceptionWithName:NSInvalidArgumentException reason:@"Handler is required" userInfo:nil];
-        }
-        
-        _duration = duration;
-        _interval = interval;
-        _handler = [handler copy];
-        _preExistingRuntime = runtime;
-        _backgroundTaskIdentifier = UIBackgroundTaskInvalid;
-        
-        _queue = dispatch_queue_create("active_step", DISPATCH_QUEUE_SERIAL);
-        
-    }
-    return self;
-}
-
-- (void)dealloc {
-    [self queue_pauseAtFinish:NO];
-}
-
-- (NSTimeInterval)runtime {
-    __block NSTimeInterval runtime = 0;
-    dispatch_sync(_queue, ^{
-        runtime = [self queue_runtime];
-    });
-    return MIN(runtime,_duration);
-}
-
-- (void)pause {
-    dispatch_sync(_queue, ^{
-        [self queue_pauseAtFinish:NO];
-    });
-}
-
-- (void)resume {
-    dispatch_sync(_queue, ^{
-        [self queue_resume];
-    });
-}
-
-- (void)reset {
-    dispatch_sync(_queue, ^{
-        [self queue_reset];
-    });
-}
-
-- (NSTimeInterval)queue_runtime {
-    NSTimeInterval runtime = _preExistingRuntime;
-    if (_timer != NULL) {
-        uint64_t now = mach_absolute_time();
-        runtime += timeIntervalFromMachTime(now - _startTime);
-    }
-    return runtime;
-}
-
-- (void)setDuration:(NSTimeInterval)duration {
-    dispatch_sync(_queue, ^{
-        _duration = duration;
-    });
-}
-
-- (void)hiqueue_event {
-    dispatch_sync(_queue, ^{
-        [self queue_event];
-    });
-}
-
-- (void)queue_event {
-    [self queue_assertBackgroundTask];
-    
-    NSTimeInterval runtime = [self queue_runtime];
-    BOOL finished = (runtime >= _duration);
-    if (finished) {
-        [self queue_pauseAtFinish:YES];
-    }
-    
-    dispatch_async(dispatch_get_main_queue(), ^{
-        _handler(self, finished);
-        dispatch_sync(_queue, ^{
-            
-            // If the timer is still NULL here, we can safely release the background task.
-            if (_timer == NULL) {
-                [self queue_releaseBackgroundTask];
-            }
-        });
-    });
-}
-
-- (void)queue_clearTimer {
-    if (_timer != NULL) {
-        
-        dispatch_source_cancel(_timer);
-        _timer = NULL;
-    }
-}
-
-- (void)queue_releaseBackgroundTask {
-    if (_backgroundTaskIdentifier == UIBackgroundTaskInvalid) {
-        return;
-    }
-    UIBackgroundTaskIdentifier ident = _backgroundTaskIdentifier;
-    _backgroundTaskIdentifier = UIBackgroundTaskInvalid;
-    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-        [[UIApplication sharedApplication] endBackgroundTask:ident];
-    });
-}
-
-- (void)queue_assertBackgroundTask {
-    if (_backgroundTaskIdentifier != UIBackgroundTaskInvalid) {
-        return;
-    }
-    _backgroundTaskIdentifier = [[UIApplication sharedApplication] beginBackgroundTaskWithExpirationHandler:^{
-        // This is guaranteed to be called synchronously on the main queue, switch to our queue to invalidate the identifier
-        dispatch_sync(_queue, ^{
-            _backgroundTaskIdentifier = UIBackgroundTaskInvalid;
-        });
-    }];
-}
-
-- (void)queue_resume {
-    
-    if (_timer != NULL) {
-        // Already resumed
-        return;
-    }
-    if ([self queue_runtime] >= _duration) {
-        // Already finished. Fire one event to indicate.
-        [self queue_event];
-        return;
-    }
-    
-    // We want to run in the background if we can, so voice can be played, etc.
-    assert(_backgroundTaskIdentifier == UIBackgroundTaskInvalid);
-    
-    [self queue_assertBackgroundTask];
-    
-    _timer = dispatch_source_create(DISPATCH_SOURCE_TYPE_TIMER,
-                                    0, 0, dispatch_get_global_queue(QOS_CLASS_USER_INTERACTIVE, 0));
-    if (_timer == NULL) {
-        assert(0);
-        return;
-    }
-    __weak typeof(self) weakSelf = self;
-    dispatch_source_set_event_handler(_timer, ^{
-        typeof(self) strongSelf = weakSelf;
-        [strongSelf hiqueue_event];
-    });
-    
-    NSTimeInterval timeUntilNextFire = (floor(_preExistingRuntime / _interval) + 1)*_interval -  _preExistingRuntime;
-    
-    _startTime = mach_absolute_time();
-    dispatch_source_set_timer(_timer,
-                              dispatch_time(DISPATCH_TIME_NOW, timeUntilNextFire * NSEC_PER_SEC),
-                              _interval * NSEC_PER_SEC ,
-                              0.05 * NSEC_PER_SEC);
-    dispatch_resume(_timer);
-}
-
-- (void)queue_pauseAtFinish:(BOOL)atFinish {
-    if (_timer == NULL) {
-        // Not running
-        return;
-    }
-    
-    uint64_t now = mach_absolute_time();
-    [self queue_clearTimer];
-    _preExistingRuntime += timeIntervalFromMachTime(now - _startTime);
-    _startTime = 0;
-    
-    if (! atFinish) {
-        // If we are atFinish, the task will be released after the handler completes
-        [self queue_releaseBackgroundTask];
-    }
-}
-
-- (void)queue_reset {
-    [self queue_clearTimer];
-    _preExistingRuntime = 0;
-    [self queue_releaseBackgroundTask];
-}
-
-
-@end

ResearchKit/ActiveTasks/ORKActiveStepTimerView.h

@@ -1,49 +0,0 @@
-/*
- Copyright (c) 2015, Apple Inc. All rights reserved.
- 
- Redistribution and use in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met:
- 
- 1.  Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
- 
- 2.  Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation and/or
- other materials provided with the distribution.
- 
- 3.  Neither the name of the copyright holder(s) nor the names of any contributors
- may be used to endorse or promote products derived from this software without
- specific prior written permission. No license is granted to the trademarks of
- the copyright holders even if such marks are included in this software.
- 
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import <UIKit/UIKit.h>
-
-#import <ResearchKit/ResearchKit_Private.h>
-#import "ORKCustomStepView_Internal.h"
-#import "ORKCountdownLabel.h"
-#import "ORKTextButton.h"
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface ORKActiveStepTimerView : ORKActiveStepCustomView
-
-@property (nonatomic, strong, nullable) ORKCountdownLabel *countDownLabel;
-@property (nonatomic, strong, nullable) ORKTextButton *startTimerButton;
-
-@property (nonatomic, strong, nullable) ORKActiveStep *step;
-
-@end
-
-NS_ASSUME_NONNULL_END

ResearchKit/ActiveTasks/ORKActiveStepTimerView.m

@@ -1,200 +0,0 @@
-/*
- Copyright (c) 2015, Apple Inc. All rights reserved.
- 
- Redistribution and use in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met:
- 
- 1.  Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
- 
- 2.  Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation and/or
- other materials provided with the distribution.
- 
- 3.  Neither the name of the copyright holder(s) nor the names of any contributors
- may be used to endorse or promote products derived from this software without
- specific prior written permission. No license is granted to the trademarks of
- the copyright holders even if such marks are included in this software.
- 
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import "ORKActiveStepTimerView.h"
-#import "ORKActiveStepTimer.h"
-#import "ORKHelpers.h"
-#import "ORKSkin.h"
-#import "ORKActiveStepViewController_Internal.h"
-#import "ORKVoiceEngine.h"
-#import "ORKSurveyAnswerCellForText.h"
-#import "ORKSurveyAnswerCellForNumber.h"
-#import "ORKActiveStep_Internal.h"
-#import "ORKActiveStepViewController_Internal.h"
-#import "ORKStepViewController_Internal.h"
-
-
-@implementation ORKActiveStepTimerView
-{
-    BOOL _started;
-    BOOL _registeredForNotifications;
-}
-
-- (instancetype)initWithFrame:(CGRect)frame
-{
-    self = [super initWithFrame:frame];
-    if (self)
-    {
-        
-        // Count Down
-        {
-            _countDownLabel = [ORKCountdownLabel new];
-            _countDownLabel.textAlignment = NSTextAlignmentCenter;
-            _countDownLabel.text = @" ";
-            
-            [self addSubview:_countDownLabel];
-        }
-        
-        // Count down start button
-        {
-            
-            _startTimerButton = [ORKTextButton new];
-            [_startTimerButton setTitle:ORKLocalizedString(@"BUTTON_START_TIMER", nil) forState:UIControlStateNormal];
-            [_startTimerButton addTarget:self action:@selector(startTimerButtonTapped:) forControlEvents:UIControlEventTouchUpInside];
-            _startTimerButton.exclusiveTouch = YES;
-            
-            [self addSubview:_startTimerButton];
-        }
-        
-        _countDownLabel.accessibilityTraits |= UIAccessibilityTraitUpdatesFrequently;
-        
-        [self setTranslatesAutoresizingMaskIntoConstraints:NO];
-        
-        
-    }
-    return self;
-}
-
-- (void)applicationDidBecomeActive:(NSNotification *)notification {
-    ORKActiveStepViewController *vc = self.activeStepViewController;
-    if (vc) {
-        [self updateDisplay:vc];
-    }
-}
-
-- (void)setRegisteredForNotifications:(BOOL)registered {
-    if (registered == _registeredForNotifications) {
-        return;
-    }
-    
-    registered = _registeredForNotifications;
-    NSNotificationCenter *nfc = [NSNotificationCenter defaultCenter];
-    if (registered) {
-        [nfc addObserver:self selector:@selector(applicationDidBecomeActive:) name:UIApplicationDidBecomeActiveNotification object:nil];
-    } else {
-        [nfc removeObserver:self name:UIApplicationDidBecomeActiveNotification object:nil];
-    }
-}
-
-- (void)didMoveToWindow {
-    [self setRegisteredForNotifications:(self.window != nil)];
-}
-
-
-- (void)setStep:(ORKActiveStep *)step
-{
-    _step = step;
-    _countDownLabel.hidden = !(_step.hasCountDown);
-    BOOL hasTimerButton = (_step.hasCountDown && _step.shouldStartTimerAutomatically == NO);
-    _startTimerButton.hidden = !hasTimerButton;
-    _startTimerButton.alpha = 1;
-    
-    [_countDownLabel setCountDownValue:(NSInteger)[_step stepDuration]];
-    
-    [self setNeedsUpdateConstraints];
-}
-
-- (void)startTimerButtonTapped:(id)sender
-{
-    [self.activeStepViewController start];
-    UIAccessibilityPostNotification(UIAccessibilityLayoutChangedNotification, _countDownLabel);
-}
-
-
-- (void)updateDisplay:(ORKActiveStepViewController *)viewController {
-    NSInteger countDownValue = (NSInteger)round(viewController.timeRemaining);
-    [_countDownLabel setCountDownValue:countDownValue];
-}
-
-
-- (void)resetStep:(ORKActiveStepViewController *)viewController {
-    self.step = (ORKActiveStep *)viewController.step;
-}
-
-- (void)startStep:(ORKActiveStepViewController *)viewController {
-    _startTimerButton.alpha = 0;
-}
-
-- (void)suspendStep:(ORKActiveStepViewController *)viewController {
-}
-
-- (void)resumeStep:(ORKActiveStepViewController *)viewController {
-    self.step = (ORKActiveStep *)viewController.step;
-    if ([viewController timerActive])
-    {
-        _startTimerButton.alpha = 0;
-        [self updateDisplay:viewController];
-    }
-}
-
-- (void)finishStep:(ORKActiveStepViewController *)viewController {
-}
-
-- (void)setNeedsUpdateConstraints
-{
-    [NSLayoutConstraint deactivateConstraints:[self constraints]];
-    [super setNeedsUpdateConstraints];
-    
-}
-
-- (void)updateConstraints
-{
-    NSDictionary *dictionary = NSDictionaryOfVariableBindings(_countDownLabel, _startTimerButton);
-    NSDictionary *metrics = @{@"CS" : @(2)};
-    ORKEnableAutoLayoutForViews([dictionary allValues]);
-    
-    for (UIView *v in [dictionary allValues])
-    {
-        [self addConstraint:[NSLayoutConstraint constraintWithItem:v attribute:NSLayoutAttributeWidth relatedBy:NSLayoutRelationLessThanOrEqual toItem:self attribute:NSLayoutAttributeWidth multiplier:1 constant:0]];
-        [self addConstraint:[NSLayoutConstraint constraintWithItem:v attribute:NSLayoutAttributeCenterX relatedBy:NSLayoutRelationLessThanOrEqual toItem:self attribute:NSLayoutAttributeCenterX multiplier:1 constant:0]];
-    }
-    
-    if (! _countDownLabel.hidden)
-    {
-        NSMutableString *verticalLayout = [NSMutableString new];
-        [verticalLayout appendString:@"V:|[_countDownLabel]"];
-        if (! _startTimerButton.hidden)
-        {
-            [verticalLayout appendString:@"-CS-[_startTimerButton]"];
-        }
-        [verticalLayout appendString:@"|"];
-        [self addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:verticalLayout options:NSLayoutFormatAlignAllCenterX metrics:metrics views:dictionary]];
-    }
-    else
-    {
-        [self addConstraint:[NSLayoutConstraint constraintWithItem:self attribute:NSLayoutAttributeHeight relatedBy:NSLayoutRelationEqual toItem:nil attribute:NSLayoutAttributeNotAnAttribute multiplier:1 constant:0]];
-    }
-    
-    [super updateConstraints];
-}
-
-
-@end
-

ResearchKit/ActiveTasks/ORKActiveStepViewController.h

@@ -1,263 +0,0 @@
-/*
- Copyright (c) 2015, Apple Inc. All rights reserved.
- 
- Redistribution and use in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met:
- 
- 1.  Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
- 
- 2.  Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation and/or
- other materials provided with the distribution.
- 
- 3.  Neither the name of the copyright holder(s) nor the names of any contributors
- may be used to endorse or promote products derived from this software without
- specific prior written permission. No license is granted to the trademarks of
- the copyright holders even if such marks are included in this software.
- 
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-
-#import <ResearchKit/ORKStepViewController.h>
-#import <ResearchKit/ORKRecorder.h>
-
-
-NS_ASSUME_NONNULL_BEGIN
-
-
-/**
- The `ORKActiveStepViewController` class is the base class for displaying `ORKActiveStep`
- subclasses. The predefined active tasks defined in `ORKOrderedTask` all make use
- of subclasses of `ORKActiveStep`, paired with `ORKActiveStepViewController`
- subclasses.
- 
- An active step view controller is typically instantiated by a task view controller
- when it encounters an active step in a task. Active steps generally include some form of sensor-driven data collection, or involve some highly interactive content, such as a cognitive task or game.
- 
- Examples of active step view controller subclasses include `ORKWalkingTaskStepViewController`,
- `ORKCountdownStepViewController`, `ORKSpatialSpanMemoryStepViewController`,
- `ORKFitnessStepViewController`, and `ORKAudioStepViewController`.
- 
- The primary feature that active step view controllers enable is life cycle. After an active step is presented, it can be started to start a timer. When the timer expires, the
- step is  considered finished. Some steps may have the concept of suspend and resume, such as when
- the app is put in the background, and during which data recording is temporarily paused.
- These life cycle methods generally apply to any recorders being used to record
- data from the device's sensors, but they should also be applied to any UI
- being displayed to clearly indicate when data is being collected
- for the task.
- 
- When you develop a new active step, you should subclass `ORKActiveStepViewController`
- and define your specific UI. When subclassing, pay special attention to the life cycle
- methods, `start`, `finish`, `suspend`, and `resume`. Also, be sure to test for
- the expected behavior when the user suspends and resumes the app, during task
- save and restore, and during UIKit's UI state restoration.
- 
- See also: `ORKActiveStep`.
- */
-ORK_CLASS_AVAILABLE
-@interface ORKActiveStepViewController : ORKStepViewController <ORKRecorderDelegate>
-
-/// @name UI Customization
-
-/**
- The custom view for the active step.
- 
- Attach a custom view here, and implement `sizeThatFits:` or
- use `intrinsicContentSize` or provide constraints that request the size needed for
- the custom view within the active step's layout.
- 
- Custom views can be used for visual instructions with animation,
- or for getting interactive input.
- */
-@property (nonatomic, strong, nullable) UIView *customView;
-
-/**
- The image view for the active step. (read-only)
- 
- The image view is created on demand when this property is accessed, and is a
- shortcut to display an image in the custom area of an active task (that is, instead of
- using `customView`).
- */
-@property (nonatomic, strong, readonly, nullable) UIImageView *imageView;
-
-/// @name Data collection
-
-/**
- The array of recorders currently in use by the active step. (read-only)
- 
- Recorders are generated when the step starts, based on the recorder
- configurations of the step. Each recorder is an instance of `ORKRecorder`, and
- is created by the active step view controller using the array of recorder
- configurations in the step.
- 
- See also: `ORKRecorderConfiguration` and `ORKActiveStep`.
- */
-@property (nonatomic, strong, readonly, nullable) NSArray *recorders;
-
-
-/// @name Active step life cycle
-
-
-/**
- A Boolean value that indicates whether the step has finished. (read-only)
- 
- If the step is considered finished, the Continue button is enabled and the Skip
- button is hidden. When the step is not finished, the Continue button is disabled and the Skip
- button is visible.
- 
- In addition, when a step is finished, all recorders are stopped.
- */
-@property (nonatomic, assign, getter=isFinished, readonly) BOOL finished;
-
-
-/**
- A Boolean value that indicates whether the step has started. (read-only)
- 
- If the step has not yet started, recorders are not yet running, and time
- is not counted against the `duration` of the step.
- */
-@property (nonatomic, assign, readonly, getter=isStarted) BOOL started;
-
-/**
- Tells the view controller that the active step has finished.
- 
- This method is an override point for subclasses, called by the base class when
- the step has just finished.
- 
- The default implementation does nothing except in the case of steps that have countdown
- enabled. When countdown is enabled in a step, the view controller attempts to navigate automatically to the next step, if so configured.
- */
-- (void)stepDidFinish;
-
-
-/**
- A Boolean value that indicates whether to suspend the step if the app is not
- active or the screen is off.
- 
- Active steps that require the screen in order to work should suspend
- recording when the app goes into the background. Other active steps require
- the step to continue while the app is in the background. For example, the fitness check
- active step continues to collect data while the screen is off, and continues
- to give voice prompts.
- */
-@property (nonatomic, assign) BOOL suspendIfInactive;
-
-/**
- Starts the active step.
- 
- Call this method to start the timer on the active step, if there is one, and
- to start any data recording.
- 
- When you start the step, recorders are instantiated based on their configurations and then started. All
- timers should start, and the UI should show users that the step is in progress.
- 
- This method does nothing if the step has already started.
- 
- Subclasses should super when overriding this method.
- */
-- (void)start;
-
-/**
- Suspends the active step.
- 
- Call this method to suspend data recording and the step's timer.
- 
- This method may called automatically when the app is suspended.
- The view controller can be configured not to suspend even if the app
- goes into the background (for more information, see `suspendIfInactive`).
- 
- Subclasses should call super when overriding this method.
- */
-- (void)suspend;
-
-/**
- Resumes the active step.
- 
- Call this method when the step should be resumed. Calls to this method should
- be paired with previous calls to `suspend`.
- 
- This method may be called automatically when the app is resumed. The view
- controller can be configured not to suspend even if the app
- goes into the background (for more information, see `suspendIfInactive`).
- 
- When the step is resumed, the UI should resume at the point where the user left off,
- or, if that does not make sense for the particular step, to the most recent
- suitable point.
- 
- Subclasses should call super when overriding this method.
- */
-- (void)resume;
-
-/**
- Finishes the active step.
- 
- Call this method to finish the active step. If the active step is configured with
- a timer, this method is called automatically when the timer expires.
- 
- Finishing the active step stops all data recording and stops any timers. In steps that have the
- `shouldContinueOnFinish` property set, forward navigation to the next step
- may ensue.
- 
- This method does nothing if the step has already finished.
- 
- Subclasses should call super when overriding this method.
- */
-- (void)finish;
-
-/// @name Recorder life cycle
-
-/**
- Tells the view controller that the set of recorders changed.
- 
- This method is usually called by the active step view controller in response
- to `start` or `resume`.
- 
- Subclasses may override this method.
- */
-- (void)recordersDidChange;
-
-/**
- Tells the view controller that the recorders are about to start.
- 
- This method is called by the active step view controller after instantiating
- the recorders, but before starting them.
- 
- Subclasses may override this method.
- */
-- (void)recordersWillStart;
-
-/**
- Tells the view controller that the recorders are about to stop.
- 
- This method is called by the active step view controller before
- stopping the recorders.
- 
- Subclasses may override this method.
- */
-- (void)recordersWillStop;
-
-/**
- Tells the view controller that the step has been loaded and is about to start.
- 
- This method is called by the active step view controller just after the step
- has been set. The base implementation instantiates the recorders and timer but
- does not start them.
- 
- Subclasses may override this method, but must also call super.
- */
-- (void)prepareStep;
-
-@end
-
-NS_ASSUME_NONNULL_END

ResearchKit/ActiveTasks/ORKActiveStepViewController.m

@@ -1,516 +0,0 @@
-/*
- Copyright (c) 2015, Apple Inc. All rights reserved.
- 
- Redistribution and use in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met:
- 
- 1.  Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
- 
- 2.  Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation and/or
- other materials provided with the distribution.
- 
- 3.  Neither the name of the copyright holder(s) nor the names of any contributors
- may be used to endorse or promote products derived from this software without
- specific prior written permission. No license is granted to the trademarks of
- the copyright holders even if such marks are included in this software.
- 
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-
-#import "ORKActiveStepViewController.h"
-#import "ORKVoiceEngine.h"
-#import "ORKSkin.h"
-#import "ORKHelpers.h"
-#import "ORKActiveStep.h"
-#import "ORKTask.h"
-#import "ORKTaskViewController.h"
-#import "ORKVerticalContainerView.h"
-#import "ORKStepViewController_Internal.h"
-#import "ORKActiveStepViewController_Internal.h"
-#import "ORKActiveStep_Internal.h"
-#import "ORKRecorder_Internal.h"
-#import "ORKTaskViewController_Internal.h"
-#import "ORKActiveStepTimerView.h"
-#import "ORKActiveStepTimer.h"
-#import "ORKAccessibility.h"
-#import "ORKStepHeaderView_Internal.h"
-#import "ORKActiveStepView.h"
-
-@interface ORKActiveStepViewController (){
-    ORKActiveStepView *_activeStepView;
-    ORKActiveStepTimer *_activeStepTimer;
-
-    NSArray *_recorderResults;
-    
-    SystemSoundID _alertSound;
-    NSURL *_alertSoundURL;
-}
-
-@property (nonatomic, strong) NSArray *recorders;
-
-@end
-
-
-@implementation ORKActiveStepViewController
-
-- (instancetype)initWithStep:(ORKStep *)step {
-    
-    self = [super initWithStep:step];
-    if (self) {
-        _recorderResults = [NSArray new];
-        
-        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(applicationWillResignActive:) name:UIApplicationWillResignActiveNotification object:nil];
-        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(applicationDidBecomeActive:) name:UIApplicationDidBecomeActiveNotification object:nil];
-        _timerUpdateInterval = 1;
-    }
-    return self;
-    
-}
-
-
-- (void)applicationWillResignActive:(NSNotification *)notification {
-    if (self.suspendIfInactive) {
-        [self suspend];
-    }
-}
-
-- (void)applicationDidBecomeActive:(NSNotification *)notification {
-    if (self.suspendIfInactive) {
-        [self resume];
-    }
-}
-
-- (ORKActiveStep *)activeStep {
-    return (ORKActiveStep *)self.step;
-}
-
-- (ORKActiveStepView *)activeStepView {
-    return _activeStepView;
-}
-
-- (void)viewDidLoad
-{
-    [super viewDidLoad];
-    
-    _activeStepView = [[ORKActiveStepView alloc] initWithFrame:self.view.bounds];
-    [_activeStepView setTranslatesAutoresizingMaskIntoConstraints:NO];
-    [_activeStepView setCustomView:_customView];
-    [self updateContinueButtonItem];
-    _activeStepView.headerView.learnMoreButtonItem = self.learnMoreButtonItem;
-    _activeStepView.continueSkipContainer.skipButtonItem = self.skipButtonItem;
-    _activeStepView.continueSkipContainer.continueEnabled = _finished;
-    [self.view addSubview:_activeStepView];
-    
-    NSMutableArray *constraints = [NSMutableArray arrayWithArray:[NSLayoutConstraint constraintsWithVisualFormat:@"H:|[s]|" options:0 metrics:nil views:@{@"s":_activeStepView}]];
-    [constraints addObjectsFromArray:[NSLayoutConstraint constraintsWithVisualFormat:@"V:[tg][s]|" options:0 metrics:nil views:@{@"s":_activeStepView,@"tg":self.topLayoutGuide}]];
-    [self.view addConstraints:constraints];
-    
-    [self prepareStep];
-}
-- (void)stepDidChange
-{
-    [super stepDidChange];
-    _activeStepView.activeStep = [self activeStep];
-    [self updateContinueButtonItem];
-    
-    
-    [self prepareStep];
-}
-
-- (UIView *)customViewContainer
-{
-    __unused UIView *v = [self view];
-    return _activeStepView.customViewContainer;
-}
-
-- (UIImageView *)imageView
-{
-    __unused UIView *v = [self view];
-    return _activeStepView.imageView;
-}
-
-- (void)setCustomView:(UIView *)customView
-{
-    _customView = customView;
-    [_activeStepView setStepView:_customView];
-}
-
-- (void)viewWillAppear:(BOOL)animated {
-    [super viewWillAppear:animated];
-    ORK_Log_Debug(@"%@",self);
-
-    [self.taskViewController setRegisteredScrollView:_activeStepView];
-}
-
-
-- (void)viewDidAppear:(BOOL)animated {
-    [super viewDidAppear:animated];
-    ORK_Log_Debug(@"%@",self);
-    
-    // Wait for animation complete 
-    dispatch_async(dispatch_get_main_queue(), ^{
-        
-        if ([[self activeStep] shouldStartTimerAutomatically])
-        {
-            [self start];
-        }
-    });
-    
-    
-}
-
-- (void)viewWillDisappear:(BOOL)animated {
-    [super viewWillDisappear:animated];
-    ORK_Log_Debug(@"%@",self);
-    
-    [self suspend];
-}
-
-- (void)updateContinueButtonItem {
-    _activeStepView.continueSkipContainer.continueButtonItem = self.continueButtonItem;
-}
-
-- (void)setContinueButtonItem:(UIBarButtonItem *)continueButtonItem {
-    [super setContinueButtonItem:continueButtonItem];
-    [self updateContinueButtonItem];
-}
-
-- (void)setLearnMoreButtonItem:(UIBarButtonItem *)learnMoreButtonItem
-{
-    [super setLearnMoreButtonItem:learnMoreButtonItem];
-    _activeStepView.headerView.learnMoreButtonItem = self.learnMoreButtonItem;
-}
-
-- (void)setSkipButtonItem:(UIBarButtonItem *)skipButtonItem
-{
-    [super setSkipButtonItem:skipButtonItem];
-    _activeStepView.continueSkipContainer.skipButtonItem = skipButtonItem;
-}
-
-- (void)setFinished:(BOOL)finished
-{
-    _finished = finished;
-    
-    _activeStepView.continueSkipContainer.continueEnabled = finished;
-}
-
-- (ORKStepResult *)result {
-    ORKStepResult *sResult = [super result];
-    sResult.results = _recorderResults;
-    return sResult;
-}
-
-#pragma mark - transition
-
-- (void)recordersDidChange {
-    
-}
-
-- (void)recordersWillStart {
-    
-}
-
-- (void)recordersWillStop {
-    
-}
-
-
-- (void)prepareRecorders
-{
-    // Stop any existing recorders
-    [self recordersWillStop];
-    for (ORKRecorder *recorder in self.recorders)
-    {
-        recorder.delegate = nil;
-        [recorder stop];
-    }
-    
-    NSMutableArray *recorders = [NSMutableArray array];
-    
-    for (ORKRecorderConfiguration * provider in self.activeStep.recorderConfigurations) {
-        // If the outputDirectory is nil, recorders which require one will generate an error.
-        // We start them anyway, because we don't know which recorders will require an outputDirectory.
-        ORKRecorder *recorder = [provider recorderForStep:self.step
-                                          outputDirectory:self.outputDirectory];
-        recorder.configuration = provider;
-        recorder.delegate = self;
-        
-        [recorders addObject:recorder];
-    }
-
-    self.recorders = recorders;
-    
-    [self recordersDidChange];
-}
-
-- (void)setOutputDirectory:(NSURL *)outputDirectory {
-    [super setOutputDirectory:outputDirectory];
-    [self prepareStep];
-}
-
-- (void)prepareStep {
-    
-    if (self.activeStep==nil) {
-        return;
-    }
-    
-    self.finished = [[self activeStep] startsFinished];
-    
-    ORK_Log_Debug(@"%@", self);
-    _activeStepView.activeStep = self.activeStep;
-    
-    if ([self.activeStep hasCountDown])
-    {
-        ORKActiveStepTimerView *timerView = [ORKActiveStepTimerView new];
-        _activeStepView.activeCustomView = timerView;
-    }
-    else
-    {
-        _activeStepView.activeCustomView = nil;
-    }
-    _activeStepView.activeCustomView.activeStepViewController = self;
-    [_activeStepView.activeCustomView resetStep:self];
-    [self resetTimer];
-    
-    [self prepareRecorders];
-}
-
-- (void)startRecorders {
-    [self recordersWillStart];
-    // Start recorders
-    for (ORKRecorder *recorder in self.recorders) {
-        
-        [recorder viewController:self willStartStepWithView:self.customViewContainer];
-        [recorder start];
-    }
-}
-
-- (void)stopRecorders {
-    [self recordersWillStop];
-    for (ORKRecorder *recorder in self.recorders) {
-        [recorder stop];
-    }
-}
-
-- (void)playSound
-{
-    if (_alertSoundURL == nil) {
-        _alertSoundURL = [NSURL URLWithString:@"/System/Library/Audio/UISounds/short_low_high.caf"];
-        AudioServicesCreateSystemSoundID((__bridge CFURLRef)(_alertSoundURL), &_alertSound);
-    }
-    AudioServicesPlaySystemSound(_alertSound);
-}
-
-- (void)start {
-    ORK_Log_Debug(@"%@",self);
-    self.started = YES;
-    [self startTimer];
-    [_activeStepView.activeCustomView startStep:self];
-    
-    [self startRecorders];
-    
-    
-    if (self.activeStep.shouldVibrateOnStart) {
-        
-        AudioServicesPlayAlertSound(kSystemSoundID_Vibrate);
-    }
-    
-    if (self.activeStep.shouldPlaySoundOnStart) {
-        
-        [self playSound];
-    }
-    
-    // Start speech
-    if (self.activeStep.hasVoice && self.activeStep.spokenInstruction) {
-        // Let VO speak "Step x of y" before the instruction.
-        // If VO is not running, the text is spoken immediately.
-        ORKAccessibilityPerformBlockAfterDelay(1.5, ^{
-            [[ORKVoiceEngine sharedVoiceEngine] speakText:(NSString *__nonnull)self.activeStep.spokenInstruction];
-        });
-    }
-}
-
-- (void)suspend {
-    ORK_Log_Debug(@"%@",self);
-    if (self.finished || ! self.started) {
-        return;
-    }
-    
-    [_activeStepTimer pause];
-    [_activeStepView.activeCustomView suspendStep:self];
-    
-    [self stopRecorders];
-}
-
-- (void)resume {
-    ORK_Log_Debug(@"%@",self);
-    if (self.finished || ! self.started) {
-        return;
-    }
-    
-    [_activeStepTimer resume];
-    [self prepareRecorders];
-    [self startRecorders];
-    [_activeStepView.activeCustomView resumeStep:self];
-}
-
-
-- (void)finish {
-    ORK_Log_Debug(@"%@",self);
-    if (self.finished) {
-        return;
-    }
-    
-    self.finished = YES;
-    [_activeStepTimer pause];
-    [_activeStepView.activeCustomView finishStep:self];
-    [self stopRecorders];
-    if (self.activeStep.shouldPlaySoundOnFinish) {
-        [self playSound];
-    }
-    if (self.activeStep.shouldVibrateOnFinish) {
-        AudioServicesPlayAlertSound(kSystemSoundID_Vibrate);
-    }
-    if (! self.activeStep.startsFinished) {
-        if (self.activeStep.shouldContinueOnFinish) {
-            [self goForward];
-        }
-    }
-    [self stepDidFinish];
-}
-
-- (void)dealloc {
-    AudioServicesDisposeSystemSoundID(_alertSound);
-    NSNotificationCenter *nfc = [NSNotificationCenter defaultCenter];
-    [nfc removeObserver:self name:UIApplicationWillResignActiveNotification object:nil];
-    [nfc removeObserver:self name:UIApplicationDidBecomeActiveNotification object:nil];
-}
-
-#pragma mark - timers
-
-- (void)resetTimer {
-    [_activeStepTimer reset];
-    _activeStepTimer = nil;
-}
-
-- (void)startTimer
-{
-    [self resetTimer];
-    
-    NSTimeInterval stepDuration = self.activeStep.stepDuration;
-    
-    if (stepDuration > 0) {
-        
-        __weak typeof(self) weakSelf = self;
-        _activeStepTimer = [[ORKActiveStepTimer alloc] initWithDuration:stepDuration
-                                                        interval:_timerUpdateInterval
-                                                         runtime:0
-                                                         handler:^(ORKActiveStepTimer *timer, BOOL finished) {
-                                                             typeof(self) strongSelf = weakSelf;
-                                                             [strongSelf countDownTimerFired:timer finished:finished];
-                                                         }];
-        [_activeStepTimer resume];
-    }
-}
-
-- (void)countDownTimerFired:(ORKActiveStepTimer *)timer finished:(BOOL)finished {
-    
-    if (finished) {
-        [self finish];
-    }
-    NSInteger countDownValue = (NSInteger)round(timer.duration - timer.runtime);
-    ORKActiveStepCustomView *customView = _activeStepView.activeCustomView;
-    [customView updateDisplay:self];
-    
-    ORKVoiceEngine *voice = [ORKVoiceEngine sharedVoiceEngine];
-    
-    if (!finished && self.activeStep.shouldSpeakCountDown) {
-        // Speak entire countdown if VO is running.
-        if (UIAccessibilityIsVoiceOverRunning()) {
-            [voice speakInt:countDownValue];
-            return;
-        }
-        
-        if (0 < countDownValue && countDownValue <= 3) {
-            [voice speakInt:countDownValue];
-        }
-    }
-}
-
-- (BOOL)timerActive {
-    return (_activeStepTimer != nil);
-}
-
-- (NSTimeInterval)timeRemaining {
-    if (_activeStepTimer == nil) {
-        return self.activeStep.stepDuration;
-    }
-    return _activeStepTimer.duration - _activeStepTimer.runtime;
-}
-
-#pragma mark - action handlers
-
-- (void)stepDidFinish
-{
-}
-
-#pragma mark - ORKRecorderDelegate
-
-- (void)recorder:(ORKRecorder *)recorder didCompleteWithResult:(ORKResult *)result {
-    
-    _recorderResults = [_recorderResults arrayByAddingObject:result];
-    [self notifyDelegateOnResultChange];
-}
-
-- (void)recorder:(ORKRecorder *)recorder didFailWithError:(NSError *)error {
-    if (error) {
-        STRONGTYPE(self.delegate) strongDelegate = self.delegate;
-        if ([strongDelegate respondsToSelector:@selector(stepViewController:recorder:didFailWithError:)]) {
-            [strongDelegate stepViewController:self recorder:recorder didFailWithError:error];
-        }
-        
-        // If the recorder returns an error indicating that file write failed, and the output directory was nil,
-        // we consider it a fatal error and fail the step. Otherwise, developers might be confused to get
-        // no output, just because they did not set an output directory.
-        if ([error.domain isEqualToString:NSCocoaErrorDomain] &&
-            error.code == NSFileWriteInvalidFileNameError &&
-            self.outputDirectory == nil) {
-            [strongDelegate stepViewControllerDidFail:self withError:error];
-        }
-    }
-}
-
-
-static NSString * const _ORKFinishedRestoreKey = @"finished";
-static NSString * const _ORKRecorderResultsRestoreKey = @"recorderResults";
-
-- (void)encodeRestorableStateWithCoder:(NSCoder *)coder
-{
-    [super encodeRestorableStateWithCoder:coder];
-    
-    [coder encodeBool:_finished forKey:_ORKFinishedRestoreKey];
-    [coder encodeObject:_recorderResults forKey:_ORKRecorderResultsRestoreKey];
-}
-
-- (void)decodeRestorableStateWithCoder:(NSCoder *)coder
-{
-    [super decodeRestorableStateWithCoder:coder];
-    
-    self.finished = [coder decodeBoolForKey:_ORKFinishedRestoreKey];
-    _recorderResults = [coder decodeObjectOfClass:[NSArray class] forKey:_ORKRecorderResultsRestoreKey];
-}
-
-
-@end

ResearchKit/ActiveTasks/ORKActiveStepViewController_Internal.h

@@ -1,67 +0,0 @@
-/*
- Copyright (c) 2015, Apple Inc. All rights reserved.
- 
- Redistribution and use in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met:
- 
- 1.  Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
- 
- 2.  Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation and/or
- other materials provided with the distribution.
- 
- 3.  Neither the name of the copyright holder(s) nor the names of any contributors
- may be used to endorse or promote products derived from this software without
- specific prior written permission. No license is granted to the trademarks of
- the copyright holders even if such marks are included in this software.
- 
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-
-
-#import "ORKActiveStepViewController.h"
-#import "ORKActiveStepTimer.h"
-
-NS_ASSUME_NONNULL_BEGIN
-
-@class ORKActiveStepView;
-
-@interface ORKActiveStepViewController ()
-
-
-/**
- * The customViewContainer allows custom view to be its subview.
- * @note When ORKTouchRecorder is present, its gesture recognizer attaches to customViewContainer.
- */
-@property (nonatomic, strong, readonly, nullable) UIView *customViewContainer;
-
-@property (nonatomic, strong, readonly, nullable) ORKActiveStepView *activeStepView;
-
-@property (nonatomic, readonly) NSTimeInterval timeRemaining;
-@property (nonatomic, readonly) BOOL timerActive;
-
-@property (nonatomic, assign) NSTimeInterval timerUpdateInterval;
-
-
-@property (nonatomic, assign, getter=isStarted) BOOL started;
-
-- (void)countDownTimerFired:(ORKActiveStepTimer *)timer finished:(BOOL)finished; // Let subclass receive timer fires
-
-- (void)applicationWillResignActive:(NSNotification *)notification;
-- (void)applicationDidBecomeActive:(NSNotification *)notification;
-
-
-@end
-
-NS_ASSUME_NONNULL_END

ResearchKit/ActiveTasks/ORKActiveStep_Internal.h

@@ -1,45 +0,0 @@
-/*
- Copyright (c) 2015, Apple Inc. All rights reserved.
- 
- Redistribution and use in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met:
- 
- 1.  Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
- 
- 2.  Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation and/or
- other materials provided with the distribution.
- 
- 3.  Neither the name of the copyright holder(s) nor the names of any contributors
- may be used to endorse or promote products derived from this software without
- specific prior written permission. No license is granted to the trademarks of
- the copyright holders even if such marks are included in this software.
- 
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import <ResearchKit/ORKActiveStep.h>
-
-@interface ORKActiveStep ()
-
-/**
- * Convenience methods.
- */
-- (BOOL)startsFinished;
-- (BOOL)hasCountDown;
-- (BOOL)hasTitle;
-- (BOOL)hasText;
-- (BOOL)hasVoice;
-
-
-@end

ResearchKit/ActiveTasks/ORKAudioContentView.h

@@ -1,54 +0,0 @@
-/*
- Copyright (c) 2015, Apple Inc. All rights reserved.
- 
- Redistribution and use in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met:
- 
- 1.  Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
- 
- 2.  Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation and/or
- other materials provided with the distribution.
- 
- 3.  Neither the name of the copyright holder(s) nor the names of any contributors
- may be used to endorse or promote products derived from this software without
- specific prior written permission. No license is granted to the trademarks of
- the copyright holders even if such marks are included in this software.
- 
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import <UIKit/UIKit.h>
-#import "ORKCustomStepView_Internal.h"
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface ORKAudioContentView : ORKActiveStepCustomView
-
-@property (nonatomic, copy, nullable) UIColor *keyColor;
-@property (nonatomic, copy, nullable) UIColor *alertColor;
-
-@property (nonatomic, assign, getter=isFinished) BOOL finished;
-@property (nonatomic, assign) NSTimeInterval timeLeft;
-
-@property (nonatomic, assign) CGFloat alertThreshold;
-
-@property (nonatomic, copy, nullable) NSArray *samples;
-
-// Samples should be in the range of (0, 1).
-- (void)addSample:(NSNumber *)sample;
-- (void)removeAllSamples;
-
-@end
-
-NS_ASSUME_NONNULL_END

ResearchKit/ActiveTasks/ORKAudioContentView.m

@@ -1,385 +0,0 @@
-/*
- Copyright (c) 2015, Apple Inc. All rights reserved.
- 
- Redistribution and use in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met:
- 
- 1.  Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
- 
- 2.  Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation and/or
- other materials provided with the distribution.
- 
- 3.  Neither the name of the copyright holder(s) nor the names of any contributors
- may be used to endorse or promote products derived from this software without
- specific prior written permission. No license is granted to the trademarks of
- the copyright holders even if such marks are included in this software.
- 
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import "ORKAudioContentView.h"
-#import "ORKHelpers.h"
-#import "ORKSkin.h"
-#import "ORKLabel.h"
-#import "ORKHeadlineLabel.h"
-#import "ORKAccessibility.h"
-
-// The central blue region.
-static const CGFloat GraphViewBlueZoneHeight = 170;
-
-// The two bands at top and bottom which are "loud" each have this height.
-static const CGFloat GraphViewRedZoneHeight = 25;
-
-
-@interface ORKAudioGraphView : UIView
-
-@property (nonatomic, strong) UIColor *keyColor;
-@property (nonatomic, strong) UIColor *alertColor;
-
-@property (nonatomic, copy) NSArray *values;
-
-@property (nonatomic) CGFloat alertThreshold;
-
-@end
-
-static const CGFloat kValueLineWidth = 4.5;
-static const CGFloat kValueLineMargin = 1.5;
-
-@implementation ORKAudioGraphView
-
-- (instancetype)initWithFrame:(CGRect)frame {
-    self = [super initWithFrame:frame];
-    if (self) {
-        NSLayoutConstraint *c1 = [NSLayoutConstraint constraintWithItem:self
-                                                              attribute:NSLayoutAttributeWidth
-                                                              relatedBy:NSLayoutRelationEqual
-                                                                 toItem:nil attribute:NSLayoutAttributeNotAnAttribute multiplier:1 constant:CGFLOAT_MAX];
-        c1.priority = UILayoutPriorityFittingSizeLevel;
-        NSLayoutConstraint *c2 = [NSLayoutConstraint constraintWithItem:self
-                                                              attribute:NSLayoutAttributeHeight
-                                                              relatedBy:NSLayoutRelationEqual
-                                                                 toItem:nil attribute:NSLayoutAttributeNotAnAttribute multiplier:1 constant:CGFLOAT_MAX];
-        c2.priority = UILayoutPriorityFittingSizeLevel;
-        [NSLayoutConstraint activateConstraints:@[c1,c2]];
-        
-#if TARGET_IPHONE_SIMULATOR
-        _values = @[@(0.2),@(0.6),@(0.55), @(0.1), @(0.75), @(0.7)];
-#endif
-    }
-    return self;
-}
-
-- (void)setValues:(NSArray *)values {
-    _values = [values copy];
-    [self setNeedsDisplay];
-}
-
-- (void)setKeyColor:(UIColor *)keyColor {
-    _keyColor = [keyColor copy];
-    [self setNeedsDisplay];
-}
-
-- (void)setAlertColor:(UIColor *)alertColor {
-    _alertColor = [alertColor copy];
-    [self setNeedsDisplay];
-}
-
-- (void)setAlertThreshold:(CGFloat)alertThreshold {
-    _alertThreshold = alertThreshold;
-    [self setNeedsDisplay];
-}
-
-- (void)drawRect:(CGRect)rect {
-    CGRect r = self.bounds;
-    
-    CGContextRef ctx = UIGraphicsGetCurrentContext();
-    CGContextSetFillColorWithColor(ctx, [UIColor whiteColor].CGColor);
-    CGContextFillRect(ctx, r);
-    
-    CGFloat scale = [self.window.screen scale];
-    
-    CGFloat midY = CGRectGetMidY(r);
-    CGFloat maxX = CGRectGetMaxX(r);
-    CGFloat halfHeight = r.size.height/2;
-    CGContextSaveGState(ctx);
-    {
-        UIBezierPath *centerLine = [UIBezierPath new];
-        [centerLine moveToPoint:(CGPoint){.x=0,.y=midY}];
-        [centerLine addLineToPoint:(CGPoint){.x=maxX,.y=midY}];
-        
-        CGContextSetLineWidth(ctx, 1/scale);
-        [_keyColor setStroke];
-        CGFloat lengths[2] = {3,3};
-        CGContextSetLineDash(ctx, 0, lengths, 2);
-        
-        [centerLine stroke];
-    }
-    CGContextRestoreGState(ctx);
-    
-    CGFloat lineStep = kValueLineMargin + kValueLineWidth;
-    
-    CGContextSaveGState(ctx);
-    {
-        CGFloat x = maxX - lineStep/2;
-        CGContextSetLineWidth(ctx, kValueLineWidth);
-        CGContextSetLineCap(ctx, kCGLineCapRound);
-        
-        UIBezierPath *path1 = [UIBezierPath new];
-        path1.lineCapStyle = kCGLineCapRound;
-        path1.lineWidth = kValueLineWidth;
-        UIBezierPath *path2 = [path1 copy];
-        
-        for (NSNumber *value in [_values reverseObjectEnumerator]) {
-            CGFloat floatValue = [value doubleValue];
-            
-            UIBezierPath *p = nil;
-            if (floatValue > _alertThreshold) {
-                p = path1;
-                [_alertColor setStroke];
-            } else {
-                p = path2;
-                [_keyColor setStroke];
-            }
-            [p moveToPoint:(CGPoint){.x=x,.y=midY-floatValue*halfHeight}];
-            [p addLineToPoint:(CGPoint){.x=x,.y=midY+floatValue*halfHeight}];
-            
-            x -= lineStep;
-            
-            if (x < 0) {
-                break;
-            }
-            
-        }
-        
-        [_alertColor setStroke];
-        [path1 stroke];
-        
-        [_keyColor setStroke];
-        [path2 stroke];
-        
-    }
-    CGContextRestoreGState(ctx);
-    
-}
-
-@end
-
-@interface ORKAudioTimerLabel : ORKLabel
-
-@end
-
-@implementation ORKAudioTimerLabel
-
-+ (UIFont *)defaultFont {
-    
-    UIFontDescriptor *descriptor = [UIFontDescriptor preferredFontDescriptorWithTextStyle:UIFontTextStyleSubheadline];
-    UIFontDescriptor *alternativeDescriptor = ORKFontDescriptorForLightStylisticAlternative(descriptor);
-    return [UIFont fontWithDescriptor:alternativeDescriptor size:[alternativeDescriptor pointSize]+4];
-}
-
-
-@end
-
-@interface ORKAudioContentView()
-
-@property (nonatomic, strong) ORKHeadlineLabel *alertLabel;
-@property (nonatomic, strong) UILabel *timerLabel;
-@property (nonatomic, strong) ORKAudioGraphView *graphView;
-
-@end
-
-@implementation ORKAudioContentView
-{
-    NSArray *_constraints;
-    NSMutableArray *_samples;
-    UIColor *_keyColor;
-}
-
-- (instancetype)initWithFrame:(CGRect)frame {
-    self = [super initWithFrame:frame];
-    if (self) {
-        CGFloat margin = ORKStandardMarginForView(self);
-        self.layoutMargins = (UIEdgeInsets){.left=2*margin,.right=2*margin};
-        
-        self.alertLabel = [ORKHeadlineLabel new];
-        _alertLabel.translatesAutoresizingMaskIntoConstraints = NO;
-        self.timerLabel = [ORKAudioTimerLabel new];
-        _timerLabel.translatesAutoresizingMaskIntoConstraints = NO;
-        _timerLabel.textAlignment = NSTextAlignmentRight;
-        self.graphView = [ORKAudioGraphView new];
-        _graphView.translatesAutoresizingMaskIntoConstraints = NO;
-        self.translatesAutoresizingMaskIntoConstraints = NO;
-        
-        self.alertColor = [UIColor ork_redColor];
-        
-        [self addSubview:_alertLabel];
-        [self addSubview:_timerLabel];
-        [self addSubview:_graphView];
-        
-        _timerLabel.text = @"06:00";
-        _alertLabel.text = ORKLocalizedString(@"AUDIO_TOO_LOUD_LABEL", nil);
-        
-        self.alertThreshold = GraphViewBlueZoneHeight/(GraphViewRedZoneHeight*2+GraphViewBlueZoneHeight);
-        
-        [self updateGraphSamples];
-        [self applyKeyColor];
-        [self setNeedsUpdateConstraints];
-    }
-    return self;
-}
-
-- (void)tintColorDidChange {
-    [self applyKeyColor];
-}
-
-- (void)setFinished:(BOOL)finished {
-    _finished = finished;
-    [self updateAlertLabelHidden];
-}
-
-- (void)applyKeyColor {
-    UIColor *keyColor = [self keyColor];
-    _timerLabel.textColor = keyColor;
-    _graphView.keyColor = keyColor;
-}
-
-- (UIColor *)keyColor {
-    return _keyColor ? : [self tintColor];
-}
-
-- (void)setKeyColor:(UIColor *)keyColor {
-    _keyColor = keyColor;
-    [self applyKeyColor];
-}
-
-- (void)setAlertColor:(UIColor *)alertColor {
-    _alertColor = alertColor;
-    
-    _alertLabel.textColor = alertColor;
-    _graphView.alertColor = alertColor;
-}
-
-- (void)updateConstraints {
-    if ([_constraints count]) {
-        [NSLayoutConstraint deactivateConstraints:_constraints];
-        _constraints = nil;
-    }
-    
-    NSMutableArray *constraints = [NSMutableArray array];
-    
-    NSDictionary *views = NSDictionaryOfVariableBindings(_timerLabel, _alertLabel, _graphView);
-    [constraints addObjectsFromArray:
-     [NSLayoutConstraint constraintsWithVisualFormat:@"V:|[_graphView]-[_alertLabel]|"
-                                             options:(NSLayoutFormatOptions)0
-                                             metrics:nil views:views]];
-    [constraints addObject:[NSLayoutConstraint constraintWithItem:_alertLabel
-                                                        attribute:NSLayoutAttributeCenterX
-                                                        relatedBy:NSLayoutRelationEqual
-                                                           toItem:self
-                                                        attribute:NSLayoutAttributeCenterX
-                                                       multiplier:1 constant:0]];
-    [constraints addObjectsFromArray:
-     [NSLayoutConstraint constraintsWithVisualFormat:@"H:|-[_graphView]-2-[_timerLabel]-|"
-                                             options:NSLayoutFormatAlignAllCenterY
-                                             metrics:nil views:views]];
-    
-    
-    [constraints addObject:[NSLayoutConstraint constraintWithItem:_graphView attribute:NSLayoutAttributeHeight relatedBy:NSLayoutRelationEqual toItem:nil attribute:NSLayoutAttributeNotAnAttribute multiplier:1 constant:(GraphViewBlueZoneHeight+GraphViewRedZoneHeight*2)]];
-    
-    _constraints = constraints;
-    [NSLayoutConstraint activateConstraints:constraints];
-    [super updateConstraints];
-}
-
-- (void)setAlertThreshold:(CGFloat)alertThreshold {
-    _alertThreshold = alertThreshold;
-    _graphView.alertThreshold = alertThreshold;
-    [self updateGraphSamples];
-}
-
-- (void)setTimeLeft:(NSTimeInterval)timeLeft {
-    _timeLeft = timeLeft;
-    [self updateTimerLabel];
-}
-
-- (void)updateTimerLabel {
-    static NSDateComponentsFormatter *_formatter = nil;
-    static dispatch_once_t onceToken;
-    dispatch_once(&onceToken, ^{
-        NSDateComponentsFormatter *fmt = [NSDateComponentsFormatter new];
-        fmt.unitsStyle = NSDateComponentsFormatterUnitsStylePositional;
-        fmt.zeroFormattingBehavior = NSDateComponentsFormatterZeroFormattingBehaviorPad;
-        fmt.allowedUnits = NSCalendarUnitMinute | NSCalendarUnitSecond;
-        _formatter = fmt;
-    });
-    
-    NSString *s = [_formatter stringFromTimeInterval:MAX(round(_timeLeft),0)];
-    _timerLabel.text = s;
-    _timerLabel.hidden = (s == nil);
-    
-}
-
-- (void)updateGraphSamples {
-    _graphView.values = _samples;
-    [self updateAlertLabelHidden];
-}
-
-- (void)updateAlertLabelHidden {
-    NSNumber *sample = [_samples lastObject];
-    BOOL hide = _finished || !([sample doubleValue] > _alertThreshold);
-    _alertLabel.hidden = hide;
-}
-
-- (void)setSamples:(NSArray *)samples {
-    _samples = [samples mutableCopy];
-    [self updateGraphSamples];
-}
-
-- (void)addSample:(NSNumber *)sample {
-    NSAssert(sample != nil, @"Sample should be non-nil");
-    if (! _samples) {
-        _samples = [NSMutableArray array];
-    }
-    [_samples addObject:sample];
-    // Try to keep around 250 samples
-    if ([_samples count] > 500) {
-        _samples = [[_samples subarrayWithRange:(NSRange){250,_samples.count-250}] mutableCopy];
-    }
-    [self updateGraphSamples];
-}
-
-- (void)removeAllSamples {
-    _samples = nil;
-    [self updateGraphSamples];
-}
-
-#pragma mark Accessibility
-
-- (BOOL)isAccessibilityElement {
-    return YES;
-}
-
-- (NSString *)accessibilityLabel {
-    if (_alertLabel.isHidden) {
-        return _timerLabel.accessibilityLabel;
-    }
-    
-    return ORKAccessibilityStringForVariables(_timerLabel.accessibilityLabel, _alertLabel.accessibilityLabel);
-}
-
-- (UIAccessibilityTraits)accessibilityTraits {
-    return [super accessibilityTraits] | UIAccessibilityTraitUpdatesFrequently;
-}
-
-@end

ResearchKit/ActiveTasks/ORKAudioRecorder.h

@@ -1,85 +0,0 @@
-/*
- Copyright (c) 2015, Apple Inc. All rights reserved.
- 
- Redistribution and use in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met:
- 
- 1.  Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
- 
- 2.  Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation and/or
- other materials provided with the distribution.
- 
- 3.  Neither the name of the copyright holder(s) nor the names of any contributors
- may be used to endorse or promote products derived from this software without
- specific prior written permission. No license is granted to the trademarks of
- the copyright holders even if such marks are included in this software.
- 
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import <ResearchKit/ORKRecorder.h>
-#import <AVFoundation/AVFoundation.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-/**
- The ORKAudioRecorder class represents a recorder that uses the app's 
- `AVAudioSession` object to record audio.
- 
- To ensure audio recording continues when a task enters the background,
- add the `audio` tag to `UIBackgroundModes` in your app's `Info.plist` file.
- */
-ORK_CLASS_AVAILABLE
-@interface ORKAudioRecorder : ORKRecorder
-
-/**
- The default audio format settings.
- 
- If no settings are specified, the audio configuration is
- MPEG4 AAC, 2 channels, 16 bit, 44.1 kHz, AVAudioQualityMin.
- */
-+ (NSDictionary *)defaultRecorderSettings;
-
-/**
- Audio format settings
- 
- Settings for the recording session.
- Passed to  AVAudioRecorder`'s `-initWithURL:settings:error:`
- For information on the settings available for an audio recorder, see "AV Foundation Audio Settings Constants".
- */
-@property (nonatomic, copy, readonly, nullable) NSDictionary *recorderSettings;
-
-/**
- Returns an initialized audio recorder using the specified settings, step, and output directory.
- 
- @param recorderSettings The settings for the recording session.
- @param step The step that requested this recording.
- @param outputDirectory The directory in which the audio output should be stored.
- @return An initialized audio recorder.
- */
-- (instancetype)initWithRecorderSettings:(NSDictionary *)recorderSettings
-                                    step:(ORKStep *)step
-                         outputDirectory:(NSURL *)outputDirectory NS_DESIGNATED_INITIALIZER;
-
-
-/**
- Reference to the audio recorder being used.
- 
- The value of this property is used in the audio task in order to display recorded volume in real time during the task.
- */
-@property (nonatomic, strong, readonly, nullable) AVAudioRecorder *audioRecorder;
-
-@end
-
-NS_ASSUME_NONNULL_END

ResearchKit/ActiveTasks/ORKAudioRecorder.m

@@ -1,350 +0,0 @@
-/*
- Copyright (c) 2015, Apple Inc. All rights reserved.
- 
- Redistribution and use in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met:
- 
- 1.  Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
- 
- 2.  Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation and/or
- other materials provided with the distribution.
- 
- 3.  Neither the name of the copyright holder(s) nor the names of any contributors
- may be used to endorse or promote products derived from this software without
- specific prior written permission. No license is granted to the trademarks of
- the copyright holders even if such marks are included in this software.
- 
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import "ORKAudioRecorder.h"
-#import "ORKHelpers.h"
-#import "ORKRecorder_Internal.h"
-#import "ORKRecorder_Private.h"
-#import "ORKDefines_Private.h"
-
-@interface ORKAudioRecorder ()
-
-@property (nonatomic, strong) AVAudioRecorder *audioRecorder;
-
-@property (nonatomic, copy) NSDictionary *recorderSettings;
-
-@end
-
-@implementation ORKAudioRecorder
-
-- (void)dealloc
-{
-    ORK_Log_Debug(@"Remove audiorecorder %p", self);
-    [_audioRecorder stop];
-    _audioRecorder = nil;
-}
-
-
-+ (NSDictionary *)defaultRecorderSettings
-{
-    return [NSDictionary
-            dictionaryWithObjectsAndKeys:
-            @(kAudioFormatMPEG4AAC), AVFormatIDKey,
-            @(AVAudioQualityMin), AVEncoderAudioQualityKey,
-            @(2), AVNumberOfChannelsKey,
-            @(44100.0), AVSampleRateKey,
-            nil];
-}
-
-- (instancetype)initWithRecorderSettings:(NSDictionary *)recorderSettings
-                                    step:(ORKStep *)step
-                         outputDirectory:(NSURL *)outputDirectory
-{
-    self = [super initWithStep:step outputDirectory:outputDirectory];
-    if (self) {
-        
-        self.continuesInBackground = YES;
-        if (! recorderSettings)
-        {
-            recorderSettings = [[self class] defaultRecorderSettings];
-        }
-        if (! [recorderSettings isKindOfClass:[NSDictionary class]])
-        {
-            @throw [NSException exceptionWithName:NSInvalidArgumentException reason:@"recorderSettings should be a dictionary" userInfo:recorderSettings];
-        }
-        self.recorderSettings = recorderSettings;
-    }
-    return self;
-}
-
-- (void)start {
-    
-    // Only create the file when we should actually start recording.
-    if (! _audioRecorder) {
-        
-        NSError *error = nil;
-        NSURL *soundFileURL = [self recordingFileURL];
-        if (! [self recreateFileWithError:&error]) {
-            [self finishRecordingWithError:error];
-            return;
-        }
-        
-        
-        AVAudioSession *audioSession = [AVAudioSession sharedInstance];
-        if (! [audioSession setCategory:AVAudioSessionCategoryPlayAndRecord error:&error]) {
-            [self finishRecordingWithError:error];
-            return;
-        }
-        
-        
-        ORK_Log_Debug(@"Create audioRecorder %p", self);
-        _audioRecorder = [[AVAudioRecorder alloc]
-                          initWithURL:soundFileURL
-                          settings:self.recorderSettings
-                          error:&error];
-        if (! _audioRecorder) {
-            [self finishRecordingWithError:error];
-            return;
-        }
-        
-#if ! TARGET_IPHONE_SIMULATOR
-        if (!_audioRecorder.recording)
-        {
-            [_audioRecorder prepareToRecord];
-        }
-#endif
-    }
-    
-#if ! TARGET_IPHONE_SIMULATOR
-    if (!_audioRecorder.recording)
-    {
-        [_audioRecorder prepareToRecord];
-        [_audioRecorder record];
-    }
-#endif
-    [super start];
-    
-}
-
-- (void)stop {
-    if (! _audioRecorder) {
-        // Error has already been returned.
-        
-        return;
-    }
-    
-    [self doStopRecording];
-    
-    NSURL *fileUrl = [self recordingFileURL];
-    if (! [[NSFileManager defaultManager] fileExistsAtPath:[[self recordingFileURL] path]]) {
-        fileUrl = nil;
-    }
-    
-    [self reportFileResultWithFile:fileUrl error:nil];
-    
-    [super stop];
-}
-
-- (BOOL)isRecording {
-    return _audioRecorder.recording;
-}
-
-- (NSString *)mimeType {
-    NSDictionary *recorderSettings = [self recorderSettings];
-    unsigned int recorderFormat = [recorderSettings[AVFormatIDKey] unsignedIntValue];
-    
-    NSString *contentType = @"audio";
-    switch (recorderFormat)
-    {
-        case kAudioFormatLinearPCM:
-        {
-            int numBits = [recorderSettings[AVLinearPCMBitDepthKey] intValue] ? : 16;
-            contentType = [NSString stringWithFormat:@"audio/L%d", numBits];
-            break;
-        }
-        case kAudioFormatAC3:
-            contentType = @"audio/ac3";
-            break;
-        case kAudioFormatMPEG4AAC:
-        case kAudioFormatMPEG4CELP:
-        case kAudioFormatMPEG4HVXC:
-        case kAudioFormatMPEG4TwinVQ:
-        case kAudioFormatAppleLossless:
-            contentType = @"audio/m4a";
-            break;
-        case kAudioFormatULaw:
-            contentType = @"audio/basic";
-            break;
-    }
-    
-    return contentType;
-    
-}
-
-
-- (NSString *)recorderType
-{
-    return @"audio";
-}
-
-- (void)doStopRecording
-{
-    if (self.isRecording) {
-#if ! TARGET_IPHONE_SIMULATOR
-        [_audioRecorder stop];
-        
-        [self applyFileProtection:ORKFileProtectionComplete toFileAtURL:[self recordingFileURL]];
-#endif
-    }
-}
-
-- (void)finishRecordingWithError:(NSError *)error
-{
-    [self doStopRecording];
-    
-    [super finishRecordingWithError:error];
-}
-
-- (NSString *)extension
-{
-    NSDictionary *recorderSettings = [self recorderSettings];
-    unsigned int recorderFormat = [recorderSettings[AVFormatIDKey] unsignedIntValue];
-    
-    NSString *extension = @"au";
-    switch (recorderFormat)
-    {
-        case kAudioFormatLinearPCM:
-        {
-            extension = @"pcm";
-            break;
-        }
-        case kAudioFormatAC3:
-            extension = @"ac3";
-            break;
-        case kAudioFormatMPEG4AAC:
-        case kAudioFormatMPEG4CELP:
-        case kAudioFormatMPEG4HVXC:
-        case kAudioFormatMPEG4TwinVQ:
-        case kAudioFormatAppleLossless:
-            extension = @"m4a";
-            break;
-    }
-    return extension;
-}
-
-- (NSURL *)recordingFileURL
-{
-    return [[self recordingDirectoryURL] URLByAppendingPathComponent:[NSString stringWithFormat:@"%@.%@", [self logName], [self extension]]];
-}
-
-
-- (BOOL)recreateFileWithError:(NSError * __autoreleasing *)error
-{
-    NSURL *url = [self recordingFileURL];
-    if (! url) {
-        if (error) {
-            *error = [NSError errorWithDomain:NSCocoaErrorDomain code:NSFileWriteInvalidFileNameError userInfo:@{NSLocalizedDescriptionKey:ORKLocalizedString(@"ERROR_RECORDER_NO_OUTPUT_DIRECTORY", nil)}];
-        }
-        return NO;
-    }
-    
-    NSFileManager *fm = [NSFileManager defaultManager];
-    
-    if (! [fm createDirectoryAtURL:url withIntermediateDirectories:YES attributes:nil error:error]) {
-        return NO;
-    }
-    
-    if ([fm fileExistsAtPath:[url path]]) {
-        if (! [fm removeItemAtPath:[url path] error:error]) {
-            return NO;
-        }
-    }
-    
-    [fm createFileAtPath:[url path] contents:nil attributes:nil];
-    [fm setAttributes:@{NSFileProtectionKey : ORKFileProtectionFromMode(ORKFileProtectionCompleteUnlessOpen)} ofItemAtPath:[url path] error:error];
-    return YES;
-}
-
-
-- (void)reset {
-    [_audioRecorder stop];
-    _audioRecorder = nil;
-    [super reset];
-}
-
-
-@end
-
-@interface ORKAudioRecorderConfiguration ()
-@end
-
-
-@implementation ORKAudioRecorderConfiguration
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wobjc-designated-initializers"
-- (instancetype)initWithRecorderSettings:(NSDictionary *)recorderSettings
-{
-    self = [self ork_init];
-    if (self)
-    {
-        if (recorderSettings && ! [recorderSettings isKindOfClass:[NSDictionary class]])
-        {
-            @throw [NSException exceptionWithName:NSInvalidArgumentException reason:@"recorderSettings should be a dictionary" userInfo:recorderSettings];
-        }
-        _recorderSettings = recorderSettings;
-    }
-    return self;
-}
-#pragma clang diagnostic pop
-
-- (ORKRecorder *)recorderForStep:(ORKStep *)step
-                outputDirectory:(NSURL *)outputDirectory
-{
-    return [[ORKAudioRecorder alloc] initWithRecorderSettings:(NSDictionary *__nonnull)self.recorderSettings
-                                                        step:step
-                                             outputDirectory:outputDirectory];
-}
-
-- (instancetype)initWithCoder:(NSCoder *)aDecoder
-{
-    self = [super initWithCoder:aDecoder];
-    if (self)
-    {
-        ORK_DECODE_OBJ_CLASS(aDecoder, recorderSettings, NSDictionary);
-    }
-    return self;
-}
-
-- (void)encodeWithCoder:(NSCoder *)aCoder
-{
-    [super encodeWithCoder:aCoder];
-    ORK_ENCODE_OBJ(aCoder, recorderSettings);
-}
-
-+ (BOOL)supportsSecureCoding
-{
-    return YES;
-}
-
-- (BOOL)isEqual:(id)object {
-    BOOL isParentSame = [super isEqual:object];
-    
-    __typeof(self) castObject = object;
-    return (isParentSame &&
-            ORKEqualObjects(self.recorderSettings, castObject.recorderSettings)) ;
-}
-
-
-- (ORKPermissionMask)requestedPermissionMask {
-    return ORKPermissionAudioRecording;
-}
-
-@end

ResearchKit/ActiveTasks/ORKAudioStep.h

@@ -1,42 +0,0 @@
-/*
- Copyright (c) 2015, Apple Inc. All rights reserved.
- 
- Redistribution and use in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met:
- 
- 1.  Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
- 
- 2.  Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation and/or
- other materials provided with the distribution.
- 
- 3.  Neither the name of the copyright holder(s) nor the names of any contributors
- may be used to endorse or promote products derived from this software without
- specific prior written permission. No license is granted to the trademarks of
- the copyright holders even if such marks are included in this software.
- 
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import <ResearchKit/ORKActiveStep.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-ORK_CLASS_AVAILABLE
-@interface ORKAudioStep : ORKActiveStep
-
-@property (nonatomic, assign) NSTimeInterval duration;
-
-@end
-
-NS_ASSUME_NONNULL_END

ResearchKit/ActiveTasks/ORKAudioStep.m

@@ -1,96 +0,0 @@
-/*
- Copyright (c) 2015, Apple Inc. All rights reserved.
- 
- Redistribution and use in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met:
- 
- 1.  Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
- 
- 2.  Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation and/or
- other materials provided with the distribution.
- 
- 3.  Neither the name of the copyright holder(s) nor the names of any contributors
- may be used to endorse or promote products derived from this software without
- specific prior written permission. No license is granted to the trademarks of
- the copyright holders even if such marks are included in this software.
- 
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import "ORKAudioStep.h"
-#import "ORKAudioStepViewController.h"
-#import "ORKHelpers.h"
-#import "ORKStep_Private.h"
-
-@implementation ORKAudioStep
-
-+ (Class)stepViewControllerClass {
-    return [ORKAudioStepViewController class];
-}
-
-- (void)validateParameters {
-    
-    [super validateParameters];
-    
-    NSTimeInterval const ORKAudioTaskMinimumDuration = 5.0;
-    
-    if ( self.duration < ORKAudioTaskMinimumDuration)
-    {
-        @throw [NSException exceptionWithName:NSInvalidArgumentException reason:[NSString stringWithFormat:@"duration can not be shorter than %@ seconds.", @(ORKAudioTaskMinimumDuration)]  userInfo:nil];
-    }
-}
-
-- (instancetype)copyWithZone:(NSZone *)zone
-{
-    ORKAudioStep *step = [super copyWithZone:zone];
-    step.duration = self.duration;
-    return step;
-}
-
-- (BOOL)startsFinished {
-    return NO;
-}
-
-- (instancetype)initWithCoder:(NSCoder *)aDecoder
-{
-    self = [super initWithCoder:aDecoder];
-    if (self)
-    {
-        ORK_DECODE_DOUBLE(aDecoder, duration);
-    }
-    return self;
-}
-
-- (void)encodeWithCoder:(NSCoder *)aCoder
-{
-    [super encodeWithCoder:aCoder];
-    ORK_ENCODE_DOUBLE(aCoder, duration);
-}
-
-+ (BOOL)supportsSecureCoding
-{
-    return YES;
-}
-
-
-- (BOOL)isEqual:(id)object {
-    BOOL isParentSame = [super isEqual:object];
-    
-    __typeof(self) castObject = object;
-    return (isParentSame &&
-            (self.duration == castObject.duration)) ;
-}
-
-
-@end

ResearchKit/ActiveTasks/ORKAudioStepViewController.h

@@ -1,40 +0,0 @@
-/*
- Copyright (c) 2015, Apple Inc. All rights reserved.
- 
- Redistribution and use in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met:
- 
- 1.  Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
- 
- 2.  Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation and/or
- other materials provided with the distribution.
- 
- 3.  Neither the name of the copyright holder(s) nor the names of any contributors
- may be used to endorse or promote products derived from this software without
- specific prior written permission. No license is granted to the trademarks of
- the copyright holders even if such marks are included in this software.
- 
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import <ResearchKit/ResearchKit_Private.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-ORK_CLASS_AVAILABLE
-@interface ORKAudioStepViewController : ORKActiveStepViewController
-
-@end
-
-NS_ASSUME_NONNULL_END

ResearchKit/ActiveTasks/ORKAudioStepViewController.m

@@ -1,172 +0,0 @@
-/*
- Copyright (c) 2015, Apple Inc. All rights reserved.
- 
- Redistribution and use in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met:
- 
- 1.  Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
- 
- 2.  Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation and/or
- other materials provided with the distribution.
- 
- 3.  Neither the name of the copyright holder(s) nor the names of any contributors
- may be used to endorse or promote products derived from this software without
- specific prior written permission. No license is granted to the trademarks of
- the copyright holders even if such marks are included in this software.
- 
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import "ORKAudioStepViewController.h"
-#import "ORKAudioContentView.h"
-#import "ORKActiveStepViewController_Internal.h"
-#import "ORKVerticalContainerView.h"
-#import <AVFoundation/AVFoundation.h>
-#import "ORKActiveStepTimer.h"
-#import "ORKHelpers.h"
-#import "ORKStep_Private.h"
-#import "ORKAudioStep.h"
-#import "ORKAudioRecorder.h"
-#import "ORKActiveStepView.h"
-#import "ORKCustomStepView_Internal.h"
-
-@interface ORKAudioStepViewController ()
-
-@property (nonatomic, strong) AVAudioRecorder *avAudioRecorder;
-
-@end
-
-@implementation ORKAudioStepViewController
-{
-    ORKAudioContentView *_audioContentView;
-    ORKAudioRecorder *_audioRecorder;
-    
-    ORKActiveStepTimer *_timer;
-}
-
-- (instancetype)initWithStep:(ORKStep *)step {
-    
-    self = [super initWithStep:step];
-    if (self) {
-        // Continue audio recording in the background
-        self.suspendIfInactive = NO;
-    }
-    return self;
-}
-
-- (void)viewDidLoad {
-    [super viewDidLoad];
-    // Do any additional setup after loading the view.
-    
-    _audioContentView = [ORKAudioContentView new];
-    _audioContentView.timeLeft = self.audioStep.duration;
-    self.activeStepView.activeCustomView = _audioContentView;
-}
-
-- (void)viewDidAppear:(BOOL)animated {
-    [super viewDidAppear:animated];
-    
-    [self start];
-}
-
-- (void)audioRecorderDidChange {
-    _audioRecorder.audioRecorder.meteringEnabled = YES;
-    [self setAvAudioRecorder:_audioRecorder.audioRecorder];
-}
-
-- (void)recordersDidChange {
-    ORKAudioRecorder *audioRecorder = nil;
-    for (ORKRecorder *recorder in self.recorders) {
-        if ([recorder isKindOfClass:[ORKAudioRecorder class]]) {
-            audioRecorder = (ORKAudioRecorder *)recorder;
-            break;
-        }
-    }
-    
-    _audioRecorder = audioRecorder;
-    [self audioRecorderDidChange];
-}
-
-- (ORKAudioStep *)audioStep {
-    return (ORKAudioStep *)self.step;
-}
-
-- (void)doSample {
-    [_avAudioRecorder updateMeters];
-    float value = [_avAudioRecorder averagePowerForChannel:0];
-    
-    // Assume value is in range roughly -60dB to 0dB
-    float clampedValue = MAX(value/60.0, -1) + 1;
-    
-    [_audioContentView addSample:@(clampedValue)];
-    _audioContentView.timeLeft = [_timer duration] - [_timer runtime];
-}
-
-- (void)startNewTimerIfNeeded {
-    if (! _timer) {
-        
-        NSTimeInterval duration = self.audioStep.duration;
-        __weak typeof(self) weakSelf = self;
-        _timer = [[ORKActiveStepTimer alloc] initWithDuration:duration interval:duration/100 runtime:0 handler:^(ORKActiveStepTimer *timer, BOOL finished) {
-            typeof(self) strongSelf = weakSelf;
-            [strongSelf doSample];
-            if (finished) {
-                [self finish];
-            }
-        }];
-        [_timer resume];
-    }
-    _audioContentView.finished = NO;
-}
-
-
-- (void)start {
-    [super start];
-    [self audioRecorderDidChange];
-    
-    [_timer reset];
-    _timer = nil;
-    [self startNewTimerIfNeeded];
-    
-}
-- (void)suspend {
-    [super suspend];
-    [_timer pause];
-    if (_avAudioRecorder) {
-        [_audioContentView addSample:@(0)];
-    }
-}
-- (void)resume {
-    [super resume];
-    [self audioRecorderDidChange];
-    [self startNewTimerIfNeeded];
-    [_timer resume];
-}
-- (void)finish {
-    [super finish];
-    [_timer reset];
-    _timer = nil;
-}
-
-- (void)stepDidFinish {
-    _audioContentView.finished = YES;
-}
-
-- (void)setAvAudioRecorder:(AVAudioRecorder *)recorder {
-    _avAudioRecorder = nil;
-    _avAudioRecorder = recorder;
-    
-}
-
-@end

ResearchKit/ActiveTasks/ORKCountdownStep.h

@@ -1,46 +0,0 @@
-/*
- Copyright (c) 2015, Apple Inc. All rights reserved.
- 
- Redistribution and use in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met:
- 
- 1.  Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
- 
- 2.  Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation and/or
- other materials provided with the distribution.
- 
- 3.  Neither the name of the copyright holder(s) nor the names of any contributors
- may be used to endorse or promote products derived from this software without
- specific prior written permission. No license is granted to the trademarks of
- the copyright holders even if such marks are included in this software.
- 
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import <ResearchKit/ResearchKit.h>
-#import <ResearchKit/ORKActiveStep.h>
-
-/**
- The `ORKCountdownStep` class represents a step that displays a label and a
- countdown for a time equal to its duration.
- 
- To use the countdown step, set the `duration` property, incorporate it into a
- task, and present the task with a task view controller.
- 
- The countdown step is used in most of ResearchKit's predefined active tasks.
- */
-ORK_CLASS_AVAILABLE
-@interface ORKCountdownStep : ORKActiveStep
-
-@end

ResearchKit/ActiveTasks/ORKCountdownStep.m

@@ -1,66 +0,0 @@
-/*
- Copyright (c) 2015, Apple Inc. All rights reserved.
- 
- Redistribution and use in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met:
- 
- 1.  Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
- 
- 2.  Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation and/or
- other materials provided with the distribution.
- 
- 3.  Neither the name of the copyright holder(s) nor the names of any contributors
- may be used to endorse or promote products derived from this software without
- specific prior written permission. No license is granted to the trademarks of
- the copyright holders even if such marks are included in this software.
- 
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import "ORKCountdownStep.h"
-#import "ORKCountdownStepViewController.h"
-
-@implementation ORKCountdownStep
-
-+ (Class)stepViewControllerClass
-{
-    return [ORKCountdownStepViewController class];
-}
-
-- (instancetype)initWithIdentifier:(NSString *)identifier
-{
-    self = [super initWithIdentifier:identifier];
-    if (self) {
-        self.shouldStartTimerAutomatically = YES;
-        self.shouldShowDefaultTimer = NO;
-        self.shouldContinueOnFinish = YES;
-        self.stepDuration = 5.0;
-    }
-    return self;
-}
-
-- (void)validateParameters {
-    
-    [super validateParameters];
-    
-    NSTimeInterval const ORKCountdownStepMinimumDuration = 3.0;
-    
-    if ( self.stepDuration < ORKCountdownStepMinimumDuration)
-    {
-        @throw [NSException exceptionWithName:NSInvalidArgumentException reason:[NSString stringWithFormat:@"duration can not be shorter than %@ seconds.", @(ORKCountdownStepMinimumDuration)]  userInfo:nil];
-    }
-    
-}
-
-@end

ResearchKit/ActiveTasks/ORKCountdownStepViewController.h

@@ -1,43 +0,0 @@
-/*
- Copyright (c) 2015, Apple Inc. All rights reserved.
- 
- Redistribution and use in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met:
- 
- 1.  Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
- 
- 2.  Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation and/or
- other materials provided with the distribution.
- 
- 3.  Neither the name of the copyright holder(s) nor the names of any contributors
- may be used to endorse or promote products derived from this software without
- specific prior written permission. No license is granted to the trademarks of
- the copyright holders even if such marks are included in this software.
- 
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import <ResearchKit/ResearchKit_Private.h>
-
-/**
- The `ORKCountdownStepViewController` class represents the step view controller that corresponds to an `ORKCountdownStep`.
- 
- It is not usually necessary to instantiate this view controller directly.
- Instead, add a countdown step to a task, and present the task in a task
- view controller.
- */
-ORK_CLASS_AVAILABLE
-@interface ORKCountdownStepViewController : ORKActiveStepViewController
-
-@end

ResearchKit/ActiveTasks/ORKCountdownStepViewController.m

@@ -1,256 +0,0 @@
-/*
- Copyright (c) 2015, Apple Inc. All rights reserved.
- 
- Redistribution and use in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met:
- 
- 1.  Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
- 
- 2.  Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation and/or
- other materials provided with the distribution.
- 
- 3.  Neither the name of the copyright holder(s) nor the names of any contributors
- may be used to endorse or promote products derived from this software without
- specific prior written permission. No license is granted to the trademarks of
- the copyright holders even if such marks are included in this software.
- 
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import "ORKCountdownStepViewController.h"
-#import "ORKCustomStepView_Internal.h"
-#import "ORKActiveStepViewController_internal.h"
-#import "ORKVerticalContainerView.h"
-#import "ORKStepViewController_Internal.h"
-#import "ORKActiveStepTimer.h"
-#import "ORKResult.h"
-#import "ORKLabel.h"
-#import "ORKSubheadlineLabel.h"
-#import "ORKHelpers.h"
-#import "ORKAccessibility.h"
-#import "ORKActiveStepView.h"
-
-@interface ORKCountDownViewLabel : ORKLabel
-
-@end
-
-@implementation ORKCountDownViewLabel
-+ (UIFont *)defaultFont {
-    return ORKThinFontWithSize(56);
-}
-@end
-
-@interface ORKCountdownView : ORKActiveStepCustomView
-
-@property (nonatomic, strong) ORKSubheadlineLabel *textLabel;
-@property (nonatomic, strong) ORKCountDownViewLabel *timeLabel;
-@property (nonatomic, strong) UIView *progressView;
-
-- (void)startAnimateWithDuration:(NSTimeInterval)duration;
-
-@end
-
-@implementation ORKCountdownView {
-    CAShapeLayer *_circleLayer;
-}
-
-- (instancetype)init
-{
-    self = [super init];
-    if (self) {
-        
-        _textLabel = [ORKSubheadlineLabel new];
-        _textLabel.textAlignment = NSTextAlignmentCenter;
-        _textLabel.translatesAutoresizingMaskIntoConstraints = NO;
-        _textLabel.text =  ORKLocalizedString(@"COUNTDOWN_LABEL", nil);
-        [self addSubview:_textLabel];
-        
-        _timeLabel = [ORKCountDownViewLabel new];
-        _timeLabel.translatesAutoresizingMaskIntoConstraints = NO;
-        _timeLabel.textAlignment = NSTextAlignmentCenter;
-        [self addSubview:_timeLabel];
-        
-        _progressView = [UIView new];
-        _progressView.translatesAutoresizingMaskIntoConstraints = NO;
-        [self addSubview:_progressView];
-        
-        self.translatesAutoresizingMaskIntoConstraints = NO;
-        
-        static const CGFloat ProgressIndicatorDiameter = 104;
-        static const CGFloat ProgressIndicatorOuterMargin = 1;
-        NSDictionary *metrics = @{@"d":@(ProgressIndicatorDiameter+2*ProgressIndicatorOuterMargin)};
-        
-        NSDictionary *views = NSDictionaryOfVariableBindings(_textLabel, _timeLabel, _progressView);
-        
-        [self addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"V:|[_textLabel]-(>=0)-[_progressView(==d)]|" options:NSLayoutFormatDirectionLeadingToTrailing|NSLayoutFormatAlignAllCenterX metrics:metrics views:views]];
-        [self addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"H:|-(>=0)-[_textLabel]-(>=0)-|" options:NSLayoutFormatDirectionLeadingToTrailing metrics:metrics views:views]];
-        [self addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"H:|-(>=0)-[_progressView(==d)]-(>=0)-|" options:NSLayoutFormatDirectionLeadingToTrailing metrics:metrics views:views]];
-        [self addConstraint:[NSLayoutConstraint constraintWithItem:_progressView
-                                                         attribute:NSLayoutAttributeCenterX
-                                                         relatedBy:NSLayoutRelationEqual
-                                                            toItem:self
-                                                         attribute:NSLayoutAttributeCenterX
-                                                        multiplier:1.0 constant:0]];
-        [self addConstraint:[NSLayoutConstraint constraintWithItem:_timeLabel
-                                                         attribute:NSLayoutAttributeCenterX
-                                                         relatedBy:NSLayoutRelationEqual
-                                                            toItem:_progressView
-                                                         attribute:NSLayoutAttributeCenterX
-                                                        multiplier:1.0 constant:0]];
-        
-        // Constant required in order to give appearance of vertical centering (compensating for leading on font)
-        [self addConstraint:[NSLayoutConstraint constraintWithItem:_timeLabel
-                                                         attribute:NSLayoutAttributeCenterY
-                                                         relatedBy:NSLayoutRelationEqual
-                                                            toItem:_progressView
-                                                         attribute:NSLayoutAttributeCenterY
-                                                        multiplier:1.0 constant:-3]];
-        [self addConstraint:[NSLayoutConstraint constraintWithItem:_progressView
-                                                         attribute:NSLayoutAttributeTop
-                                                         relatedBy:NSLayoutRelationEqual
-                                                            toItem:_textLabel
-                                                         attribute:NSLayoutAttributeLastBaseline
-                                                        multiplier:1 constant:16-ProgressIndicatorOuterMargin]];
-        
-        _circleLayer = [CAShapeLayer layer];
-        static const CGFloat ProgressIndicatorRadius = ProgressIndicatorDiameter/2;
-        _circleLayer.path = [[UIBezierPath bezierPathWithArcCenter:CGPointMake(ProgressIndicatorRadius+ProgressIndicatorOuterMargin, ProgressIndicatorRadius+ProgressIndicatorOuterMargin)
-                                                            radius:ProgressIndicatorRadius
-                                                        startAngle:M_PI + M_PI_2
-                                                          endAngle:-M_PI_2
-                                                         clockwise:NO] CGPath];
-        _circleLayer.fillColor = [UIColor clearColor].CGColor;
-        _circleLayer.strokeColor = self.tintColor.CGColor;
-        _circleLayer.lineWidth = 1;
-        
-        
-        [_progressView.layer.sublayers makeObjectsPerformSelector:@selector(removeFromSuperlayer)];
-        [_progressView.layer addSublayer:_circleLayer];
-        
-        _textLabel.isAccessibilityElement = NO;
-        _timeLabel.isAccessibilityElement = NO;
-        
-    }
-    return self;
-}
-
-- (void)tintColorDidChange {
-    _circleLayer.strokeColor = self.tintColor.CGColor;
-}
-
-- (void)startAnimateWithDuration:(NSTimeInterval)duration {
-    
-    CAKeyframeAnimation *animation = [CAKeyframeAnimation animationWithKeyPath:@"strokeEnd"];
-    animation.duration = duration*2;
-    animation.removedOnCompletion = YES;
-    animation.values = @[@(1.0), @(0.0), @(0.0)];
-    animation.keyTimes =  @[@(0.0), @(0.5), @(1.0)];
-    animation.timingFunction=[CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionLinear];
-    [_circleLayer addAnimation:animation forKey:@"drawCircleAnimation"];
-
-}
-
-#pragma mark Accessibility
-
-- (BOOL)isAccessibilityElement {
-    return YES;
-}
-
-- (NSString *)accessibilityLabel {
-    return ORKAccessibilityStringForVariables(_textLabel.accessibilityLabel, _timeLabel.accessibilityLabel);
-}
-
-- (UIAccessibilityTraits)accessibilityTraits {
-    return [super accessibilityTraits] | UIAccessibilityTraitUpdatesFrequently;
-}
-
-@end
-
-
-@interface ORKCountdownStepViewController ()
-
-@property (nonatomic, strong) ORKCountdownView *countdownView;
-
-@end
-
-@implementation ORKCountdownStepViewController {
-    NSInteger _countDown;
-}
-
-- (instancetype)initWithStep:(ORKStep *)step {
-    
-    self = [super initWithStep:step];
-    if (self) {
-        self.suspendIfInactive = NO;
-    }
-    return self;
-}
-
-- (void)setStep:(ORKStep *)step {
-    [super setStep:step];
-    _countDown = round([(ORKActiveStep *)step stepDuration]);
-}
-
-- (void)viewDidLoad {
-    [super viewDidLoad];
-    
-    self.learnMoreButtonItem = nil;
-    
-    _countdownView = [[ORKCountdownView alloc] init];
-    _countdownView.translatesAutoresizingMaskIntoConstraints = NO;
-    self.activeStepView.activeCustomView = _countdownView;
-    
-    [self updateCountdownLabel];
-}
-
-- (void)viewDidAppear:(BOOL)animated {
-    [super viewDidAppear:animated];
-    
-    UIAccessibilityPostNotification(UIAccessibilityAnnouncementNotification, [@(_countDown) stringValue]);
-    [_countdownView startAnimateWithDuration:[(ORKActiveStep *)self.step stepDuration]];
-}
-
-- (void)updateCountdownLabel {
-    _countdownView.timeLabel.text = [NSString stringWithFormat:@"%lu", (unsigned long)_countDown];
-}
-
-- (void)countDownTimerFired:(ORKActiveStepTimer *)timer finished:(BOOL)finished {
-
-    _countDown = MAX((_countDown-1), 0);
-    [self updateCountdownLabel];
-    
-    if (UIAccessibilityIsVoiceOverRunning()) {
-        if (finished) {
-            [[NSNotificationCenter defaultCenter] addObserverForName:UIAccessibilityAnnouncementDidFinishNotification
-                                                              object:nil
-                                                               queue:nil
-                                                          usingBlock:^(NSNotification *note) {
-                                                              [[NSNotificationCenter defaultCenter] removeObserver:self name:UIAccessibilityAnnouncementDidFinishNotification object:nil];
-                                                              [super countDownTimerFired:timer finished:finished];
-                                                          }];
-            UIAccessibilityPostNotification(UIAccessibilityAnnouncementNotification, ORKLocalizedString(@"AX_ANNOUNCE_BEGIN_TASK", nil));
-        }
-        else {
-            UIAccessibilityPostNotification(UIAccessibilityAnnouncementNotification, [@(_countDown) stringValue]);
-            [super countDownTimerFired:timer finished:finished];
-        }
-    }
-    else
-    {
-        [super countDownTimerFired:timer finished:finished];
-    }
-}
-
-
-@end

ResearchKit/ActiveTasks/ORKDataLogger.h

@@ -1,529 +0,0 @@
-/*
- Copyright (c) 2015, Apple Inc. All rights reserved.
- 
- Redistribution and use in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met:
- 
- 1.  Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
- 
- 2.  Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation and/or
- other materials provided with the distribution.
- 
- 3.  Neither the name of the copyright holder(s) nor the names of any contributors
- may be used to endorse or promote products derived from this software without
- specific prior written permission. No license is granted to the trademarks of
- the copyright holders even if such marks are included in this software.
- 
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-
-#import <Foundation/Foundation.h>
-#import <ResearchKit/ORKDefines.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@class ORKDataLogger;
-@class HKUnit;
-
-/**
- The `ORKDataLoggerDelegate` protocol defines methods that the delegate of an `ORKDataLogger` object uses to handle data being logged to disk.
- */
-@protocol ORKDataLoggerDelegate <NSObject>
-
-/**
- Tells the delegate when a log file rollover occurs.
- 
- @param dataLogger  The data logger providing the notification.
- @param fileUrl The URL of the newly renamed log file.
- */
-- (void)dataLogger:(ORKDataLogger *)dataLogger finishedLogFile:(NSURL *)fileUrl;
-
-@optional
-/**
- Tells the delegate if the number of bytes in completed logs changes.
- 
- When files are removed or added, or marked as uploaded or unmarked, this delegate method is called a short time later. Multiple directory changes
- are rolled up into a single delegate callback.
- 
- @param dataLogger  The data logger providing the notification.
- */
-- (void)dataLoggerByteCountsDidChange:(ORKDataLogger *)dataLogger;
-
-@end
-
-
-@class ORKLogFormatter;
-
-/**
- The `ORKDataLogger` class is an internal component used by some `ORKRecorder`
- subclasses for writing data to disk during tasks. An `ORKDataLogger` object manages one log as a set of files in a directory.
- 
- The current log file is at `directory/logName`.
- Historic log files are at `directory/logName-(timestamp)-(count)`
- where timestamp is of the form `YYYYMMddHHmmss` (Zulu) and indicates the time
- the log finished (that is, was rolled over). If more than one rollover occurs within
- one second, additional log files may be created with increasing `count`.
- 
- The user is responsible for managing the historic log files, but the `ORKDataLogger` class
- provides tools for enumerating them (in sorted order).
- 
- The data logger contains a concept of whether a file has been uploaded, which
- is tracked using file attributes. This feature can facilitate a workflow in which
- log files are archived and queued for upload before actually sending them to
- a server. When archived and ready for upload, the files could be marked uploaded
- by the `ORKDataLogger`. When the upload is complete and the data has been handed
- off downstream, the files can then be deleted. If the upload fails, the uploaded
- files can have that flag cleared, to indicate that they should be included
- in the next archiving attempt.
- */
-ORK_CLASS_AVAILABLE
-@interface ORKDataLogger : NSObject
-
-/**
- Returns a data logger with an `ORKJSONLogFormatter`.
- 
- @param url The URL of the directory in which to place log files.
- @param logName The prefix on the log file name in an ASCII string. Note that
-   the string must not contain the hyphen character ("-"), because a hyphen is used as a separator in the log naming scheme.
- @param delegate  The initial delegate. May be `nil`.
- */
-+ (ORKDataLogger *)JSONDataLoggerWithDirectory:(NSURL *)url logName:(NSString *)logName delegate:(nullable id<ORKDataLoggerDelegate>)delegate;
-
-
-/**
- Returns an initialized data logger using the specified URL, log name, formatter, and delegate.
- 
- @param url         The URL of the directory in which to place log files
- @param logName     The prefix on the log file name in an ASCII string. Note that
- the string must not contain the hyphen character ("-"), because a hyphen is used as a separator in the log naming scheme.
- @param formatter   The type of formatter to use for the log, such as `ORKJSONLogFormatter`.
- @param delegate    The initial delegate. May be `nil`.
- @return An initialized data logger.
- */
-- (instancetype)initWithDirectory:(NSURL *)url logName:(NSString *)logName formatter:(ORKLogFormatter *)formatter delegate:(nullable id<ORKDataLoggerDelegate>)delegate NS_DESIGNATED_INITIALIZER;
-
-/// The delegate to be notified when file sizes change or the log rolls over.
-@property (weak, nullable) id<ORKDataLoggerDelegate> delegate;
-
-/// The log formatter being used.
-@property (strong, readonly) ORKLogFormatter *logFormatter;
-
-/**
- The maximum current log file size.
- 
- When the current log reaches this size, it is automatically rolled over.
- */
-@property size_t maximumCurrentLogFileSize;
-
-/**
- The maximum current log file lifetime.
- 
- When the current log file has been active this long, it is rolled over.
- */
-@property NSTimeInterval maximumCurrentLogFileLifetime;
-
-/// The number of bytes of log data that are not marked uploaded, excluding the current file. This value is lazily updated.
-@property unsigned long long pendingBytes;
-
-/// The number of bytes of log data that are marked uploaded. This value is lazily updated.
-@property unsigned long long uploadedBytes;
-
-/// The file protection mode to use for newly created files.
-@property (assign) ORKFileProtectionMode fileProtectionMode;
-
-/// The prefix on the log file names.
-@property (copy, readonly) NSString *logName;
-
-/// Forces a roll-over now.
-- (void)finishCurrentLog;
-
-/// The current log file's location.
-- (NSURL *)currentLogFileURL;
-
-/**
- Enumerates the URLs of completed log files, sorted to put the oldest first.
- 
- Takes a snapshot of the current directory's relevant files, sorts them,
- and enumerates them. Errors can occur if changes are being made to the filesystem other
- than through this object.
- 
- @param block   The block to call during enumeration.
- @param error   Any error detected during the enumeration
- @return `YES` if the enumeration was successful; otherwise, `NO`.
- */
-- (BOOL)enumerateLogs:(void (^)(NSURL *logFileUrl, BOOL *stop))block error:(NSError * __autoreleasing *)error;
-
-/**
- Enumerates the URLs of completed log files not yet marked uploaded,
- sorted to put the oldest first.
- 
- This method takes a snapshot of the current directory's completed nonuploaded log files, sorts them,
- and then enumerates them. Errors can occur if changes are being made to the filesystem other
- than through this object.
- 
- @param block   The block to call during enumeration.
- @param error   Any error detected during the enumeration
- @return `YES` if the enumeration was successful; otherwise, `NO`.
- */
-- (BOOL)enumerateLogsNeedingUpload:(void (^)(NSURL *logFileUrl, BOOL *stop))block error:(NSError * __autoreleasing *)error;
-
-/**
- Enumerates the URLs of completed log files not already marked uploaded,
- sorted to put the oldest first.
- 
- Takes a snapshot of the current directory's completed uploaded log files, sorts them,
- and then enumerates them. Errors can occur if changes are being made to the filesystem other
- than through this object.
- 
- @param block   The block to call during enumeration.
- @param error   Any error detected during the enumeration
- @return `YES` if the enumeration was successful; otherwise, `NO`.
- */
-- (BOOL)enumerateLogsAlreadyUploaded:(void (^)(NSURL *logFileUrl, BOOL *stop))block error:(NSError * __autoreleasing *)error;
-
-/**
- Appends an object to the log file, which is formatted with `logFormatter`.
- 
- The default log formatter expects NSData; call canAcceptLogObjectOfClass: on `logFormatter` to determine if it will accept this object.
- 
- Note that the current log file is created and opened lazily when a request to
- log data is made. If an attempt is made to log data and there is no access due
- to file protection, the log is immediately rolled over and a new file created.
- 
- @param object Should be an object of a class that is accepted by the logFormatter.
- @param error  Error output, if the append fails.
- @return `YES` if appending succeeds; otherwise, `NO`.
- */
-- (BOOL)append:(id)object error:(NSError * __autoreleasing *)error;
-
-/**
- Appends multiple objects to the log file.
- 
- This method formats and appends all the objects at once. Using this method may have efficiency
- and atomicity gains for error handling, compared to making multiple calls to `append:error`.
- 
- @param objects An array of objects of a class that is accepted by the logFormatter.
- @param error  Error output, if the append fails.
- @return `YES` if appending succeeds; otherwise, `NO`.
- */
-- (BOOL)appendObjects:(NSArray *)objects error:(NSError * __nullable __autoreleasing *)error;
-
-/**
- Checks whether a file has been marked as uploaded.
- 
- @param url     The URL to check.
- @return `YES` if the uploaded attribute has been set on the file and the file exists; otherwise,
-         `NO`.
- */
-- (BOOL)isFileUploadedAtURL:(NSURL *)url;
-
-/**
- Marks or unmarks a file as uploaded.
- 
- This method uses an extended attribute on the filesystem to mark a file as uploaded.
- This is intended for book-keeping use only and to track which files have already
- been attached to a pending upload. When the upload is sufficiently complete,
- the file should be removed.
- 
- @param uploaded    A Boolean value that indicates whether to mark the file uploaded or not uploaded.
- @param url         The URL to mark.
- @param error       The error that occurred, if the operation fails.
- @return `YES` if adding or removing the attribute succeeded; otherwise, `NO`.
- */
-- (BOOL)markFileUploaded:(BOOL)uploaded atURL:(NSURL *)url error:(NSError * __nullable __autoreleasing *)error;
-
-/**
- Removes files if they are marked uploaded.
- 
- If a file is in the list, but is no longer marked uploaded, this method does not remove the file. This workflow lets you unmark files selectively if they could not be added
- to the archive, and later call `removeUploadedFiles:withError:` to remove only
- the files that are still marked uploaded.
- 
- @param fileURLs    The array of files that should be removed.
- @param error       The error that occurred, if the operation fails.
- @return `YES` if removing the files succeeded; otherwise, `NO`.
- */
-- (BOOL)removeUploadedFiles:(NSArray *)fileURLs withError:(NSError * __nullable __autoreleasing *)error;
-
-/**
- Removes all files managed by this logger (files that have the `logName` prefix).
- 
- @param error       The error that occurred, if operation fails.
- @return `YES` if removing the files succeeded.; otherwise, `NO`.
- */
-- (BOOL)removeAllFilesWithError:(NSError *__nullable __autoreleasing *)error;
-
-
-@end
-
-/**
- The `ORKLogFormatter` class represents the base (default) log formatter, which appends data
- blindly to a log file.
- 
- A log formatter is used by a data logger to format objects
- for output to the log, and to begin a new log file and end an existing log file.
- `ORKLogFormatter` accepts NSData and has neither a header nor a footer.
- 
- A log formatter should ensure that the log is always in a valid state, so that
- even if the app is killed, the log is still readable.
- */
-@interface ORKLogFormatter : NSObject
-
-/**
- Returns a Boolean value that indicates whether the log formatter can serialize the specified type of object.
- 
- @param c       The class of object to serialize.
- @return `YES` if the log formatter can serialize this object class; otherwise, `NO`.
- */
-- (BOOL)canAcceptLogObjectOfClass:(Class)c;
-
-/**
- Returns a Boolean value that indicates whether the log formatter can serialize the specified type of object.
- 
- @param object       The object to serialize.
- @return `YES` if the log formatter can serialize `object`; otherwise, `NO`
- */
-- (BOOL)canAcceptLogObject:(id)object;
-
-/**
- Begins a new log file on the specified file handle.
- 
- For example, may write a header or opening stanza of a new log file.
- 
- @param fileHandle      The file handle to which to write.
- @param error           The error output, on failure.
- @return  `YES` if the write succeeds; otherwise, `NO`.
- */
-- (BOOL)beginLogWithFileHandle:(NSFileHandle *)fileHandle error:(NSError * __nullable __autoreleasing *)error;
-
-/**
- Appends the specified object to the log file.
- 
- @param object          The object to write.
- @param fileHandle      The file handle to which to write.
- @param error           The error output, on failure.
- @return `YES` if the write succeeds; otherwise, `NO`.
- */
-- (BOOL)appendObject:(id)object fileHandle:(NSFileHandle *)fileHandle error:(NSError * __nullable __autoreleasing *)error;
-
-/**
- Appends the specified objects to the log file.
- 
- @param objects         The objects to write.
- @param fileHandle      The file handle to which to write.
- @param error           The error output, on failure.
- @return  `YES` if the write succeeds; otherwise, `NO`.
- */
-- (BOOL)appendObjects:(NSArray *)objects fileHandle:(NSFileHandle *)fileHandle error:(NSError * __nullable __autoreleasing *)error;
-
-@end
-
-/**
- The `ORKJSONLogFormatter` class represents a log formatter for producing JSON output.
- 
- The JSON log formatter accepts `NSDictionary` objects for serialization.
- The JSON output is a dictionary that contains one key, `items`,
- which contains the array of logged items. The log itself does not contain
- any timestamp information, so the items should include such fields,
- if desired.
- */
-ORK_CLASS_AVAILABLE
-@interface ORKJSONLogFormatter : ORKLogFormatter
-
-@end
-
-
-@class ORKJSONDataLogger;
-@class ORKDataLoggerManager;
-
-/**
- The `ORKDataLoggerManagerDelegate` protocol defines methods a delegate can implement to receive notifications
- when the data loggers managed by a `ORKDataLoggerManager` reach a certain file size threshold.
- */
-
-ORK_CLASS_AVAILABLE
-@protocol ORKDataLoggerManagerDelegate <NSObject>
-
-/**
- Called by the data logger manager when the total size of files
- that are not marked uploaded has reached a threshold.
- 
- @param dataLoggerManager       The manager that produced the notification.
- @param pendingUploadBytes      The number of bytes managed by all the loggers, which
-            have not yet been marked uploaded.
- */
-- (void)dataLoggerManager:(ORKDataLoggerManager *)dataLoggerManager pendingUploadBytesReachedThreshold:(unsigned long long)pendingUploadBytes;
-
-/**
- Called by the data logger manager when the total size of files
- managed by any of the loggers has reached a threshold.
- 
- @param dataLoggerManager       The manager that produced the notification.
- @param totalBytes              The total number of bytes of all files managed.
- */
-- (void)dataLoggerManager:(ORKDataLoggerManager *)dataLoggerManager totalBytesReachedThreshold:(unsigned long long)totalBytes;
-
-@end
-
-/**
- The `ORKDataLoggerManager` class represents a manager for multiple `ORKDataLogger` instances,
- which tracks the total size of log files produced and can notify its delegate
- when file sizes reach configurable thresholds.
- 
- The `ORKDataLoggerManager` class is an internal component used by some `ORKRecorder`
- subclasses for writing data to disk during tasks.
- 
- This manager can be used to organize the `ORKDataLogger` logs in a directory,
- and keep track of the total number of bytes stored on disk by each logger. The
- delegate can be informed if either the number of bytes pending upload, or the total
- number of bytes, exceeds configurable thresholds.
- 
- The configuration of the loggers and their thresholds is persisted in a
- configuration file in the log directory.
- 
- If the number of bytes pending upload exceeds the threshold, the natural action is to
- upload them. A block-based enumeration is provided for enumerating all the logs
- pending upload. Use `enumerateLogsNeedingUpload:error:`, and when a log has been
- processed for upload, use the logger to mark it uploaded.
- 
- When the upload succeeds (or at least is successfully queued), the uploaded files
- can be removed across all the loggers by calling `removeUploadedFiles:error:`
- 
- If the total number of bytes exceeds the threshold, the natural action is to remove log
- files that have been marked uploaded, and then remove old log files until the
- threshold is no longer exceeded. You can do this by calling `removeOldAndUploadedLogsToThreshold:error:`
- */
-ORK_CLASS_AVAILABLE
-@interface ORKDataLoggerManager : NSObject <ORKDataLoggerDelegate>
-
-/**
- Returns an initialized data logger manager using the specified directory and delegate.
- 
- Designated initializer.
- 
- @param directory       The file URL of the directory where the data loggers should coexist.
- @param delegate        The delegate to receive notifications.
- @return An initialized data logger manager.
- */
-- (instancetype)initWithDirectory:(NSURL *)directory delegate:(nullable id<ORKDataLoggerManagerDelegate>)delegate NS_DESIGNATED_INITIALIZER;
-
-/// The delegate of the data logger manager.
-@property (weak, nullable) id<ORKDataLoggerManagerDelegate> delegate;
-
-/// The threshold for delegate callback for total bytes not marked uploaded.
-@property unsigned long long pendingUploadBytesThreshold;
-
-/// The threshold for delegate callback for total bytes of completed logs.
-@property unsigned long long totalBytesThreshold;
-
-/// The total number of bytes of files not marked as pending upload.
-@property unsigned long long pendingUploadBytes;
-
-/// The total number of bytes for all the loggers.
-@property unsigned long long totalBytes;
-
-/**
- Adds a data logger with a JSON log format to the directory.
- 
- This method throws an exception if a logger already exists with the specified log name.
- 
- @param logName     The log name prefix for the data logger.
- @return The `ORKDataLogger` object that was added.
- */
-- (ORKDataLogger *)addJSONDataLoggerForLogName:(NSString *)logName;
-
-/**
- Adds a data logger with a particular formatter to the directory.
- 
- @param logName     The log name prefix for the data logger.
- @param formatter   The log formatter instance to use for this logger.
- @return The `ORKDataLogger` object that was added, or the existing one if one already existed for
- that log name.
- */
-- (ORKDataLogger *)addDataLoggerForLogName:(NSString *)logName formatter:(ORKLogFormatter *)formatter;
-
-/**
- Retrieves the already existing data logger for a log name.
- 
- @param logName     The log name prefix for the data logger.
- @return The `ORKDataLogger` object that was retrieved, or `nil` if one already existed for that log name.
- */
-- (nullable ORKDataLogger *)dataLoggerForLogName:(NSString *)logName;
-
-/**
- Removes a data logger.
- 
- @param logger      The logger to remove.
- */
-- (void)removeDataLogger:(ORKDataLogger *)logger;
-
-/// Returns the set of log names of the data loggers managed by this object.
-- (NSArray *)logNames;
-
-/**
- Enumerates all the logs that need upload across all data loggers, sorted from oldest to first.
- 
- Before sorting the logs, this method fetches all the data loggers' logs that need upload.
- 
- @param block       The block to call during enumeration.
- @param error       The error, on failure.
- @return `YES` if the enumeration succeeds; otherwise, `NO`.
- */
-- (BOOL)enumerateLogsNeedingUpload:(void (^)(ORKDataLogger *dataLogger, NSURL *logFileUrl, BOOL *stop))block error:(NSError * __autoreleasing *)error;
-
-/**
- Unmarks the set of uploaded files.
- 
- Use this method to indicate that the specified files should no longer be marked uploaded (for example, because
- the upload did not succeed).
- 
- @param fileURLs     The array of file URLs that should no longer be marked uploaded.
- @param error       The error, on failure.
- @return `YES` if the operation succeeds; otherwise, `NO`.
- */
-- (BOOL)unmarkUploadedFiles:(NSArray *)fileURLs error:(NSError * __nullable __autoreleasing *)error;
-
-/**
- Removes a set of uploaded files.
- 
- This method is analogous to a similar method in `ORKDataLogger`, but it accepts an array of files
- that may relate to any of the data loggers. It is an error to pass a URL which would not
- belong to one of the loggers managed by this manager.
- 
- @param fileURLs     The array of file URLs that should be removed.
- @param error       The error, on failure.
- @return `YES` if the operation succeeds; otherwise, `NO`.
- */
-- (BOOL)removeUploadedFiles:(NSArray *)fileURLs error:(NSError * __nullable __autoreleasing *)error;
-
-/**
- Removes old and uploaded logs to bring total bytes down to a threshold.
- 
- This method removes uploaded logs first, followed by the oldest log files across
- all of the data loggers, until the total usage falls below a threshold.
- 
- @param bytes       The threshold down to which to remove old log files. File
-                    removal stops when the total bytes managed by all the data
-                    loggers reaches this threshold.
- @param error       The error, on failure.
- @return `YES` if the operation succeeds; otherwise, `NO`.
- */
-- (BOOL)removeOldAndUploadedLogsToThreshold:(unsigned long long)bytes error:(NSError * __nullable __autoreleasing *)error;
-
-@end
-
-
-NS_ASSUME_NONNULL_END
-

ResearchKit/ActiveTasks/ORKDataLogger_Private.h

@@ -1,55 +0,0 @@
-/*
- Copyright (c) 2015, Apple Inc. All rights reserved.
- 
- Redistribution and use in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met:
- 
- 1.  Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
- 
- 2.  Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation and/or
- other materials provided with the distribution.
- 
- 3.  Neither the name of the copyright holder(s) nor the names of any contributors
- may be used to endorse or promote products derived from this software without
- specific prior written permission. No license is granted to the trademarks of
- the copyright holders even if such marks are included in this software.
- 
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-
-#import <ResearchKit/ResearchKit.h>
-
-NS_ASSUME_NONNULL_BEGIN
-/*
- Exposing a minimal set of extra facilities to permit unit testing.
- */
-
-
-@interface ORKDataLogger()
-- (nullable NSFileHandle *)fileHandle;
-@end
-
-@protocol ORKDataLoggerExtendedDelegate <ORKDataLoggerDelegate>
-@optional
-- (void)dataLoggerThresholdsDidChange:(ORKDataLogger *)dataLogger;
-@end
-
-
-@interface NSURL (ORKDataLogger)
-- (BOOL)ork_isUploaded;
-- (BOOL)ork_setUploaded:(BOOL)uploaded error:(NSError * __autoreleasing *)error;
-@end
-
-NS_ASSUME_NONNULL_END

ResearchKit/ActiveTasks/ORKDeviceMotionRecorder.h

@@ -1,57 +0,0 @@
-/*
- Copyright (c) 2015, Apple Inc. All rights reserved.
- 
- Redistribution and use in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met:
- 
- 1.  Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
- 
- 2.  Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation and/or
- other materials provided with the distribution.
- 
- 3.  Neither the name of the copyright holder(s) nor the names of any contributors
- may be used to endorse or promote products derived from this software without
- specific prior written permission. No license is granted to the trademarks of
- the copyright holders even if such marks are included in this software.
- 
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import <ResearchKit/ORKRecorder.h>
-
-/**
- The `ORKDeviceMotionRecorder` class represents a recorder that requests and collects device motion data from CoreMotion at a fixed frequency.
- 
- To ensure that the motion recorder continues to record when the app enters the
- background, use the background task support provided by `UIApplication`.
- */
-ORK_CLASS_AVAILABLE
-@interface ORKDeviceMotionRecorder : ORKRecorder
-
-/**
- * The frequency of motion data collection from CoreMotion in hertz (Hz).
- */
-@property (nonatomic, readonly) double frequency;
-
-/**
- Returns an initialized device motion recorder using the specified frequency.
- 
- @param frequency    The frequency of motion data collection from CoreMotion in hertz (Hz).
- @return An initialized motion data recorder.
- */
-- (instancetype)initWithFrequency:(double)frequency
-                             step:(ORKStep *)step
-                  outputDirectory:(NSURL *)outputDirectory NS_DESIGNATED_INITIALIZER;
-
-@end

ResearchKit/ActiveTasks/ORKDeviceMotionRecorder.m

@@ -1,239 +0,0 @@
-/*
- Copyright (c) 2015, Apple Inc. All rights reserved.
- 
- Redistribution and use in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met:
- 
- 1.  Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
- 
- 2.  Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation and/or
- other materials provided with the distribution.
- 
- 3.  Neither the name of the copyright holder(s) nor the names of any contributors
- may be used to endorse or promote products derived from this software without
- specific prior written permission. No license is granted to the trademarks of
- the copyright holders even if such marks are included in this software.
- 
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import "ORKDeviceMotionRecorder.h"
-#import "ORKHelpers.h"
-#import "ORKRecorder_Internal.h"
-#import "ORKRecorder_Private.h"
-#import "ORKDataLogger.h"
-#import <CoreMotion/CoreMotion.h>
-#import "CMDeviceMotion+ORKJSONDictionary.h"
-
-@interface ORKDeviceMotionRecorder()
-{
-    ORKDataLogger *_logger;
-}
-
-@property (nonatomic, strong) CMMotionManager *motionManager;
-@property (nonatomic) NSTimeInterval uptime;
-
-@end
-
-
-@implementation ORKDeviceMotionRecorder
-
-
-- (instancetype)initWithFrequency:(double)frequency
-                             step:(ORKStep *)step
-                  outputDirectory:(NSURL *)outputDirectory
-{
-    self = [super initWithStep:step
-               outputDirectory:(NSURL *)outputDirectory];
-    if (self)
-    {
-        self.frequency = frequency;
-        self.continuesInBackground = YES;
-    }
-    return self;
-}
-
-
-- (void)dealloc
-{
-    [_logger finishCurrentLog];
-}
-
-- (void)setFrequency:(double)frequency
-{
-    if (frequency <= 0)
-    {
-        _frequency = 1;
-    }
-    else
-    {
-        _frequency = frequency;
-    }
-}
-
-- (CMMotionManager *)createMotionManager {
-    return [[CMMotionManager alloc] init];
-}
-
-- (void)start {
-    
-    [super start];
-    
-    if (! _logger) {
-        NSError *err = nil;
-        _logger = [self makeJSONDataLoggerWithError:&err];
-        if (! _logger) {
-            [self finishRecordingWithError:err];
-            return;
-        }
-    }
-    
-    self.motionManager = [self createMotionManager];
-    self.motionManager.deviceMotionUpdateInterval = 1.0/_frequency;
-    
-    self.uptime = [NSProcessInfo processInfo].systemUptime;
-    
-    [self.motionManager stopDeviceMotionUpdates];
-    
-    [self.motionManager
-     startDeviceMotionUpdatesToQueue:[NSOperationQueue mainQueue]
-     withHandler:^(CMDeviceMotion *data, NSError *error)
-     {
-         BOOL success = NO;
-         if (data)
-         {
-             success = [_logger append:[data ork_JSONDictionary] error:&error];
-         }
-         if (!success)
-         {
-             dispatch_async(dispatch_get_main_queue(), ^{
-                 [self finishRecordingWithError:error];
-             });
-         }
-     }];
-}
-
-
-- (NSString *)recorderType
-{
-    return @"deviceMotion";
-}
-
-
-- (void)stop {
-    [self doStopRecording];
-    [_logger finishCurrentLog];
-    
-    NSError *error = nil;
-    __block NSURL *fileUrl = nil;
-    [_logger enumerateLogs:^(NSURL *logFileUrl, BOOL *stop) {
-        fileUrl = logFileUrl;
-    } error:&error];
-    
-    [self reportFileResultWithFile:fileUrl error:error];
-    
-    [super stop];
-}
-
-- (void)doStopRecording
-{
-    if (self.isRecording) {
-        [self.motionManager stopDeviceMotionUpdates];
-        self.motionManager = nil;
-    }
-}
-
-- (void)finishRecordingWithError:(NSError *)error
-{
-    [self doStopRecording];
-    [super finishRecordingWithError:error];
-}
-
-- (BOOL)isRecording {
-    return self.motionManager.deviceMotionActive;
-}
-
-- (NSString *)mimeType {
-    return @"application/json";
-}
-
-- (void)reset
-{
-    [super reset];
-    
-    _logger = nil;
-}
-
-@end
-
-
-@interface ORKDeviceMotionRecorderConfiguration()
-@end
-
-
-@implementation ORKDeviceMotionRecorderConfiguration
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wobjc-designated-initializers"
-- (instancetype)initWithFrequency:(double)freq {
-    self = [super ork_init];
-    if (self) {
-        _frequency = freq;
-    }
-    return self;
-}
-#pragma clang diagnostic pop
-
-- (ORKRecorder *)recorderForStep:(ORKStep *)step outputDirectory:(NSURL *)outputDirectory
-{
-    return [[ORKDeviceMotionRecorder alloc] initWithFrequency:self.frequency
-                                                        step:step
-                                             outputDirectory:(NSURL *)outputDirectory];
-}
-
-
-- (instancetype)initWithCoder:(NSCoder *)aDecoder
-{
-    self = [super initWithCoder:aDecoder];
-    if (self)
-    {
-        ORK_DECODE_DOUBLE(aDecoder, frequency);
-    }
-    return self;
-}
-
-- (void)encodeWithCoder:(NSCoder *)aCoder
-{
-    [super encodeWithCoder:aCoder];
-    ORK_ENCODE_DOUBLE(aCoder, frequency);
-}
-
-+ (BOOL)supportsSecureCoding
-{
-    return YES;
-}
-
-- (BOOL)isEqual:(id)object {
-    BOOL isParentSame = [super isEqual:object];
-    
-    __typeof(self) castObject = object;
-    return (isParentSame &&
-            (self.frequency == castObject.frequency)) ;
-}
-
-- (ORKPermissionMask)requestedPermissionMask {
-    return ORKPermissionCoreMotionAccelerometer;
-}
-
-@end

ResearchKit/ActiveTasks/ORKFitnessContentView.h

@@ -1,51 +0,0 @@
-/*
- Copyright (c) 2015, Apple Inc. All rights reserved.
- 
- Redistribution and use in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met:
- 
- 1.  Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
- 
- 2.  Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation and/or
- other materials provided with the distribution.
- 
- 3.  Neither the name of the copyright holder(s) nor the names of any contributors
- may be used to endorse or promote products derived from this software without
- specific prior written permission. No license is granted to the trademarks of
- the copyright holders even if such marks are included in this software.
- 
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import "ORKCustomStepView_Internal.h"
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface ORKFitnessContentView : ORKActiveStepCustomView
-
-@property (nonatomic, assign, getter=isFinished) BOOL finished;
-
-@property (nonatomic) BOOL hasHeartRate;
-@property (nonatomic) BOOL hasDistance;
-
-@property (nonatomic, copy, nullable) NSString *heartRate;
-@property (nonatomic) double distanceInMeters;
-
-@property (nonatomic, strong, nullable) UIImage *image;
-
-@property (nonatomic, assign) NSTimeInterval timeLeft;
-
-@end
-
-NS_ASSUME_NONNULL_END

ResearchKit/ActiveTasks/ORKFitnessContentView.m

@@ -1,277 +0,0 @@
-/*
- Copyright (c) 2015, Apple Inc. All rights reserved.
- 
- Redistribution and use in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met:
- 
- 1.  Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
- 
- 2.  Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation and/or
- other materials provided with the distribution.
- 
- 3.  Neither the name of the copyright holder(s) nor the names of any contributors
- may be used to endorse or promote products derived from this software without
- specific prior written permission. No license is granted to the trademarks of
- the copyright holders even if such marks are included in this software.
- 
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import "ORKFitnessContentView.h"
-#import "ORKHelpers.h"
-#import <CoreMotion/CoreMotion.h>
-#import "ORKSkin.h"
-#import "ORKActiveStepQuantityView.h"
-#import "ORKTintedImageView.h"
-
-// #define LAYOUT_TEST 1
-// #define LAYOUT_DEBUG 1
-
-@interface ORKFitnessContentView()
-{
-    ORKQuantityLabel *_timerLabel;
-    ORKQuantityPairView *_quantityPairView;
-    UIView *_imageSpacer1;
-    UIView *_imageSpacer2;
-    ORKTintedImageView *_imageView;
-    NSLengthFormatter *_lengthFormatter;
-    NSLayoutConstraint *_imageRatioConstraint;
-    ORKScreenType _screenType;
-    NSArray *_constraints;
-    NSLayoutConstraint *_topConstraint;
-}
-
-@end
-
-@implementation ORKFitnessContentView
-
-- (ORKActiveStepQuantityView *)distanceView {
-    return _quantityPairView.leftView;
-}
-
-- (ORKActiveStepQuantityView *)heartRateView {
-    return _quantityPairView.rightView;
-}
-
-- (instancetype)initWithFrame:(CGRect)frame {
-    self = [super initWithFrame:frame];
-    if (self) {
-        _screenType = ORKScreenTypeiPhone4;
-        _timerLabel = [ORKQuantityLabel new];
-        _quantityPairView = [ORKQuantityPairView new];
-        _imageSpacer1 = [UIView new];
-        [_imageSpacer1 setTranslatesAutoresizingMaskIntoConstraints:NO];
-        _imageSpacer2 = [UIView new];
-        [_imageSpacer2 setTranslatesAutoresizingMaskIntoConstraints:NO];
-        [self addSubview:_imageSpacer1];
-        [self addSubview:_imageSpacer2];
-        [self heartRateView].image = [UIImage imageNamed:@"heart-fitness" inBundle:[NSBundle bundleForClass:[self class]] compatibleWithTraitCollection:nil];
-        [self updateLengthFormatter];
-        _imageView = [ORKTintedImageView new];
-        _imageView.contentMode = UIViewContentModeScaleAspectFit;
-        _imageView.shouldApplyTint = YES;
-        _timerLabel.translatesAutoresizingMaskIntoConstraints = NO;
-        _quantityPairView.translatesAutoresizingMaskIntoConstraints = NO;
-        _imageView.translatesAutoresizingMaskIntoConstraints = NO;
-        self.translatesAutoresizingMaskIntoConstraints = NO;
-        [self updateKeylineVisible];
-        
-        _timerLabel.accessibilityTraits |= UIAccessibilityTraitUpdatesFrequently;
-        _imageView.isAccessibilityElement = NO;
-        
-        self.hasHeartRate = _hasHeartRate;
-        self.hasDistance = _hasDistance;
-        
-#if LAYOUT_TEST
-        self.timeLeft = 60*5;
-        self.hasHeartRate = YES;
-        self.hasDistance = YES;
-        self.distanceInMeters = 100;
-        self.heartRate = @"22";
-#endif
-#if LAYOUT_DEBUG
-        self.backgroundColor = [[UIColor redColor] colorWithAlphaComponent:0.2];
-        _quantityPairView.backgroundColor = [[UIColor orangeColor] colorWithAlphaComponent:0.2];
-#endif
-        
-        [self addSubview:_quantityPairView];
-        [self addSubview:_imageView];
-        [self addSubview:_timerLabel];
-        [self setNeedsUpdateConstraints];
-        
-        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(localeDidChange:) name:NSCurrentLocaleDidChangeNotification object:nil];
-        
-        [self tintColorDidChange];
-    }
-    return self;
-}
-
-- (void)dealloc {
-    [[NSNotificationCenter defaultCenter] removeObserver:self];
-}
-
-- (void)updateLengthFormatter {
-    _lengthFormatter = [NSLengthFormatter new];
-    _lengthFormatter.numberFormatter.maximumFractionDigits = 1;
-    _lengthFormatter.numberFormatter.maximumSignificantDigits = 3;
-    
-}
-
-- (void)localeDidChange:(NSNotification *)notification {
-    [self updateLengthFormatter];
-    [self setDistanceInMeters:_distanceInMeters];
-}
-
-
-
-
-- (void)willMoveToWindow:(UIWindow *)newWindow {
-    [super willMoveToWindow:newWindow];
-    _screenType = ORKGetScreenTypeForWindow(newWindow);
-    [self updateConstraintConstants];
-}
-
-- (void)updateConstraintConstants {
-    ORKScreenType screenType = _screenType;
-    const CGFloat CaptionBaselineToTimerTop = ORKGetMetricForScreenType(ORKScreenMetricCaptionBaselineToFitnessTimerTop, screenType);
-    const CGFloat CaptionBaselineToStepViewTop = ORKGetMetricForScreenType(ORKScreenMetricLearnMoreBaselineToStepViewTop, screenType);
-    _topConstraint.constant = (CaptionBaselineToTimerTop - CaptionBaselineToStepViewTop);
-}
-
-- (void)updateConstraints {
-    
-    
-    if (_constraints) {
-        [self removeConstraints:_constraints];
-        _constraints = nil;
-    }
-    NSMutableArray *constraints = [NSMutableArray array];
-    NSDictionary *views = NSDictionaryOfVariableBindings(_timerLabel, _imageView, _quantityPairView, _imageSpacer1, _imageSpacer2);
-    [constraints addObjectsFromArray:[NSLayoutConstraint constraintsWithVisualFormat:@"V:[_timerLabel][_imageSpacer1(>=0)][_imageView]" options:NSLayoutFormatAlignAllCenterX metrics:nil views:views]];
-    _topConstraint = [NSLayoutConstraint constraintWithItem:_timerLabel attribute:NSLayoutAttributeTop relatedBy:NSLayoutRelationEqual toItem:self attribute:NSLayoutAttributeTop multiplier:1 constant:0];
-    [self updateConstraintConstants];
-    [constraints addObject:_topConstraint];
-    [constraints addObject:[NSLayoutConstraint constraintWithItem:_timerLabel attribute:NSLayoutAttributeCenterX relatedBy:NSLayoutRelationEqual toItem:self attribute:NSLayoutAttributeCenterX multiplier:1 constant:0]];
-    [constraints addObject:[NSLayoutConstraint constraintWithItem:_timerLabel attribute:NSLayoutAttributeWidth relatedBy:NSLayoutRelationLessThanOrEqual toItem:self attribute:NSLayoutAttributeWidth multiplier:1 constant:0]];
-    [constraints addObject:[NSLayoutConstraint constraintWithItem:_imageView attribute:NSLayoutAttributeWidth relatedBy:NSLayoutRelationLessThanOrEqual toItem:self attribute:NSLayoutAttributeWidth multiplier:1 constant:0]];
-    
-    [constraints addObjectsFromArray:[NSLayoutConstraint constraintsWithVisualFormat:@"V:[_imageView][_imageSpacer2(>=0)][_quantityPairView]|" options:0 metrics:nil views:views]];
-    [constraints addObject:[NSLayoutConstraint constraintWithItem:_imageSpacer1 attribute:NSLayoutAttributeWidth relatedBy:NSLayoutRelationEqual toItem:nil attribute:NSLayoutAttributeNotAnAttribute multiplier:1 constant:0]];
-    [constraints addObject:[NSLayoutConstraint constraintWithItem:_imageSpacer2 attribute:NSLayoutAttributeWidth relatedBy:NSLayoutRelationEqual toItem:nil attribute:NSLayoutAttributeNotAnAttribute multiplier:1 constant:0]];
-    [constraints addObject:[NSLayoutConstraint constraintWithItem:_imageSpacer1 attribute:NSLayoutAttributeHeight relatedBy:NSLayoutRelationEqual toItem:_imageSpacer2 attribute:NSLayoutAttributeHeight multiplier:1 constant:0]];
-    NSLayoutConstraint *c1 = [NSLayoutConstraint constraintWithItem:_imageSpacer1 attribute:NSLayoutAttributeHeight relatedBy:NSLayoutRelationEqual toItem:nil attribute:NSLayoutAttributeNotAnAttribute multiplier:1 constant:1000];
-    c1.priority = UILayoutPriorityDefaultLow-1;
-    [constraints addObject:c1];
-    
-    [constraints addObjectsFromArray:[NSLayoutConstraint constraintsWithVisualFormat:@"H:|[_quantityPairView]|" options:(NSLayoutFormatOptions)0 metrics:nil views:views]];
-    
-    NSLayoutConstraint *maxWidthConstraint = [NSLayoutConstraint constraintWithItem:self attribute:NSLayoutAttributeWidth relatedBy:NSLayoutRelationEqual toItem:nil attribute:NSLayoutAttributeNotAnAttribute multiplier:1 constant:10000];
-    maxWidthConstraint.priority = UILayoutPriorityRequired-1;
-    [constraints addObject:maxWidthConstraint];
-    
-    [self addConstraints:constraints];
-    _constraints = constraints;
-    [super updateConstraints];
-}
-
-- (void)setImage:(UIImage *)image {
-    _image = image;
-    _imageView.image = image;
-    
-    _imageRatioConstraint.active = NO;
-    
-    CGSize sz = image.size;
-    if (sz.width > 0 && sz.height > 0) {
-        _imageRatioConstraint = [NSLayoutConstraint constraintWithItem:_imageView attribute:NSLayoutAttributeHeight relatedBy:NSLayoutRelationEqual toItem:_imageView attribute:NSLayoutAttributeWidth multiplier:sz.height/sz.width constant:0];
-        _imageRatioConstraint.active = YES;
-    }
-}
-
-- (void)setHasDistance:(BOOL)hasDistance {
-    _hasDistance = hasDistance;
-    [self distanceView].enabled = _hasDistance;
-    [self updateKeylineVisible];
-}
-
-- (void)setHasHeartRate:(BOOL)hasHeartRate {
-    _hasHeartRate = hasHeartRate;
-    [self heartRateView].enabled = _hasHeartRate;
-    [self updateKeylineVisible];
-}
-
-- (void)setHeartRate:(NSString *)heartRate {
-    _heartRate = heartRate;
-    [self heartRateView].value = heartRate;
-    [self heartRateView].title = ORKLocalizedString(@"FITNESS_HEARTRATE_TITLE", nil);
-}
-
-- (void)updateKeylineVisible {
-    [_quantityPairView setKeylineHidden:! (_hasDistance && _hasHeartRate)];
-}
-
-- (void)setDistanceInMeters:(double)distanceInMeters {
-    _distanceInMeters = distanceInMeters;
-    double displayDistance = _distanceInMeters;
-    NSString *distanceString = nil;
-    NSLengthFormatterUnit unit;
-    NSString *unitString = [_lengthFormatter unitStringFromMeters:displayDistance usedUnit:&unit];
-    
-    switch (unit) {
-        case NSLengthFormatterUnitCentimeter:
-        case NSLengthFormatterUnitMillimeter:
-            unit = NSLengthFormatterUnitMeter;
-            // Force showing 0 meters if the distance is sufficiently short to be displayed in cm or mm
-            unitString = [_lengthFormatter unitStringFromValue:0 unit:NSLengthFormatterUnitMeter];
-            displayDistance = 0;
-            break;
-        default:
-            break;
-    }
-    
-    // Use HealthKit to convert the unit, so we can use the number formatter directly.
-    HKUnit *hkUnit = [HKUnit unitFromLengthFormatterUnit:unit];
-    double conversionFactor = 1.0;
-    if ([hkUnit isNull] && (unit == NSLengthFormatterUnitYard)) {
-        hkUnit = [HKUnit footUnit];
-        conversionFactor = 1/3.0;
-    }
-    HKQuantity *quantity = [HKQuantity quantityWithUnit:[HKUnit meterUnit] doubleValue:displayDistance];
-    distanceString = [_lengthFormatter.numberFormatter stringFromNumber:@([quantity doubleValueForUnit:hkUnit]*conversionFactor)];
-    
-    [self distanceView].title = [NSString stringWithFormat:ORKLocalizedString(@"FITNESS_DISTANCE_TITLE_FORMAT", nil), unitString];
-    [self distanceView].value = distanceString;
-}
-
-- (void)setTimeLeft:(NSTimeInterval)timeLeft {
-    _timeLeft = timeLeft;
-    [self updateTimerLabel];
-}
-
-- (void)updateTimerLabel {
-    static NSDateComponentsFormatter *_formatter = nil;
-    static dispatch_once_t onceToken;
-    dispatch_once(&onceToken, ^{
-        NSDateComponentsFormatter *fmt = [NSDateComponentsFormatter new];
-        fmt.unitsStyle = NSDateComponentsFormatterUnitsStylePositional;
-        fmt.zeroFormattingBehavior = NSDateComponentsFormatterZeroFormattingBehaviorPad;
-        fmt.allowedUnits = NSCalendarUnitMinute | NSCalendarUnitSecond;
-        _formatter = fmt;
-    });
-    
-    NSString *s = [_formatter stringFromTimeInterval:MAX(round(_timeLeft),0)];
-    _timerLabel.text = s;
-    _timerLabel.hidden = (s == nil);
-}
-
-@end

ResearchKit/ActiveTasks/ORKFitnessStep.h

@@ -1,45 +0,0 @@
-/*
- Copyright (c) 2015, Apple Inc. All rights reserved.
- 
- Redistribution and use in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met:
- 
- 1.  Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
- 
- 2.  Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation and/or
- other materials provided with the distribution.
- 
- 3.  Neither the name of the copyright holder(s) nor the names of any contributors
- may be used to endorse or promote products derived from this software without
- specific prior written permission. No license is granted to the trademarks of
- the copyright holders even if such marks are included in this software.
- 
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import <ResearchKit/ResearchKit.h>
-#import <ResearchKit/ORKActiveStep.h>
-
-/**
- Fitness step.
- 
- Displays usual header, a counting-up timer, read outs for distance and/or
- heart rate if corresponding recorders are attached.
- 
- Also displays an image during the task.
- */
-ORK_CLASS_AVAILABLE
-@interface ORKFitnessStep : ORKActiveStep
-
-@end

ResearchKit/ActiveTasks/ORKFitnessStep.m

@@ -1,65 +0,0 @@
-/*
- Copyright (c) 2015, Apple Inc. All rights reserved.
- 
- Redistribution and use in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met:
- 
- 1.  Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
- 
- 2.  Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation and/or
- other materials provided with the distribution.
- 
- 3.  Neither the name of the copyright holder(s) nor the names of any contributors
- may be used to endorse or promote products derived from this software without
- specific prior written permission. No license is granted to the trademarks of
- the copyright holders even if such marks are included in this software.
- 
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import "ORKFitnessStep.h"
-#import "ORKFitnessStepViewController.h"
-
-@implementation ORKFitnessStep
-
-+ (Class)stepViewControllerClass {
-    return [ORKFitnessStepViewController class];
-}
-
-- (void)validateParameters {
-    
-    [super validateParameters];
-    
-    NSTimeInterval const ORKFitnessStepMinimumDuration = 5.0;
-    
-    if ( self.stepDuration < ORKFitnessStepMinimumDuration)
-    {
-        @throw [NSException exceptionWithName:NSInvalidArgumentException reason:[NSString stringWithFormat:@"rest duration can not be shorter than %@ seconds.", @(ORKFitnessStepMinimumDuration)]  userInfo:nil];
-    }
-    
-}
-
-- (instancetype)copyWithZone:(NSZone *)zone
-{
-    ORKFitnessStep *step = [super copyWithZone:zone];
-    return step;
-}
-
-- (BOOL)startsFinished {
-    return NO;
-}
-
-
-
-@end

ResearchKit/ActiveTasks/ORKFitnessStepViewController.h

@@ -1,42 +0,0 @@
-/*
- Copyright (c) 2015, Apple Inc. All rights reserved.
- 
- Redistribution and use in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met:
- 
- 1.  Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
- 
- 2.  Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation and/or
- other materials provided with the distribution.
- 
- 3.  Neither the name of the copyright holder(s) nor the names of any contributors
- may be used to endorse or promote products derived from this software without
- specific prior written permission. No license is granted to the trademarks of
- the copyright holders even if such marks are included in this software.
- 
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import <ResearchKit/ResearchKit_Private.h>
-
-/**
- Step view controller corresponding to `ORKFitnessStep`.
- 
- Observes countdown timer, heart rate, and distance, and relays these to the
- screen during the task.
- */
-ORK_CLASS_AVAILABLE
-@interface ORKFitnessStepViewController : ORKActiveStepViewController
-
-@end

ResearchKit/ActiveTasks/ORKFitnessStepViewController.m

@@ -1,149 +0,0 @@
-/*
- Copyright (c) 2015, Apple Inc. All rights reserved.
- 
- Redistribution and use in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met:
- 
- 1.  Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
- 
- 2.  Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation and/or
- other materials provided with the distribution.
- 
- 3.  Neither the name of the copyright holder(s) nor the names of any contributors
- may be used to endorse or promote products derived from this software without
- specific prior written permission. No license is granted to the trademarks of
- the copyright holders even if such marks are included in this software.
- 
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import "ORKFitnessStepViewController.h"
-#import "ORKHelpers.h"
-#import "ORKStep_Private.h"
-#import "ORKStepViewController_Internal.h"
-#import "ORKActiveStepViewController_Internal.h"
-#import "ORKFitnessContentView.h"
-#import "ORKVerticalContainerView.h"
-#import "ORKFitnessStep.h"
-#import "ORKHealthQuantityTypeRecorder.h"
-#import "ORKPedometerRecorder.h"
-#import "ORKActiveStepView.h"
-
-
-@interface ORKFitnessStepViewController () <ORKHealthQuantityTypeRecorderDelegate,ORKPedometerRecorderDelegate>
-{
-    NSInteger _intendedSteps;
-    ORKFitnessContentView *_contentView;
-    NSNumberFormatter *_hrFormatter;
-    
-}
-@end
-
-@implementation ORKFitnessStepViewController
-
-
-- (instancetype)initWithStep:(ORKStep *)step {
-    
-    self = [super initWithStep:step];
-    if (self) {
-        self.suspendIfInactive = NO;
-    }
-    return self;
-}
-
-- (ORKFitnessStep *)fitnessStep {
-    return (ORKFitnessStep *)self.step;
-}
-
-- (void)stepDidChange {
-    [super stepDidChange];
-    _hrFormatter = [[NSNumberFormatter alloc] init];
-    _hrFormatter.numberStyle = kCFNumberFormatterNoStyle;
-    _contentView.timeLeft = self.fitnessStep.stepDuration;
-    
-}
-
-- (void)viewDidLoad {
-    [super viewDidLoad];
-    // Do any additional setup after loading the view.
-    _contentView = [ORKFitnessContentView new];
-    _contentView.image = self.fitnessStep.image;
-    _contentView.timeLeft = self.fitnessStep.stepDuration;
-    self.activeStepView.activeCustomView = _contentView;
-    self.activeStepView.stepViewFillsAvailableSpace = YES;
-}
-
-- (void)updateHeartRateWithQuantity:(HKQuantitySample *)quantity unit:(HKUnit *)unit {
-    if (quantity != nil) {
-        _contentView.hasHeartRate = YES;
-    }
-    if (quantity) {
-        _contentView.heartRate = [_hrFormatter stringFromNumber:@([quantity.quantity doubleValueForUnit:unit])];
-    } else {
-        _contentView.heartRate = @"--";
-    }
-}
-
-- (void)updateDistance:(double)distanceInMeters {
-    _contentView.hasDistance = YES;
-    _contentView.distanceInMeters = distanceInMeters;
-    
-}
-
-- (void)recordersDidChange {
-    [super recordersDidChange];
-    
-    ORKPedometerRecorder *pedometerRecorder = nil;
-    ORKHealthQuantityTypeRecorder *heartRateRecorder = nil;
-    for (ORKRecorder *recorder in self.recorders) {
-        if ([recorder isKindOfClass:[ORKPedometerRecorder class]]) {
-            pedometerRecorder = (ORKPedometerRecorder *)recorder;
-        } else if ([recorder isKindOfClass:[ORKHealthQuantityTypeRecorder class]]) {
-            ORKHealthQuantityTypeRecorder *rec1 = (ORKHealthQuantityTypeRecorder *)recorder;
-            if ([[[rec1 quantityType] identifier] isEqualToString:HKQuantityTypeIdentifierHeartRate]) {
-                heartRateRecorder = (ORKHealthQuantityTypeRecorder *)recorder;
-            }
-        }
-    }
-    
-    if (heartRateRecorder == nil) {
-        _contentView.hasHeartRate = NO;
-    }
-    _contentView.heartRate = @"--";
-    _contentView.hasDistance = (pedometerRecorder != nil);
-    _contentView.distanceInMeters = 0;
-    
-}
-
-- (void)countDownTimerFired:(ORKActiveStepTimer *)timer finished:(BOOL)finished {
-    _contentView.timeLeft = finished ? 0 : (timer.duration - timer.runtime);
-    [super countDownTimerFired:timer finished:finished];
-}
-
-#pragma mark - ORKHealthQuantityTypeRecorderDelegate
-
-- (void)healthQuantityTypeRecorderDidUpdate:(ORKHealthQuantityTypeRecorder *)healthQuantityTypeRecorder {
-    if ([[healthQuantityTypeRecorder.quantityType identifier] isEqualToString:HKQuantityTypeIdentifierHeartRate]) {
-        [self updateHeartRateWithQuantity:healthQuantityTypeRecorder.lastSample unit:healthQuantityTypeRecorder.unit];
-    }
-}
-
-#pragma mark - ORKPedometerRecorderDelegate
-
-- (void)pedometerRecorderDidUpdate:(ORKPedometerRecorder *)pedometerRecorder {
-    double distanceInMeters = pedometerRecorder.totalDistance;
-    [self updateDistance:distanceInMeters];
-}
-
-@end

ResearchKit/ActiveTasks/ORKHealthQuantityTypeRecorder.h

@@ -1,63 +0,0 @@
-/*
- Copyright (c) 2015, Apple Inc. All rights reserved.
- 
- Redistribution and use in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met:
- 
- 1.  Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
- 
- 2.  Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation and/or
- other materials provided with the distribution.
- 
- 3.  Neither the name of the copyright holder(s) nor the names of any contributors
- may be used to endorse or promote products derived from this software without
- specific prior written permission. No license is granted to the trademarks of
- the copyright holders even if such marks are included in this software.
- 
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import <ResearchKit/ORKRecorder.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@class ORKHealthQuantityTypeRecorder;
-
-@protocol ORKHealthQuantityTypeRecorderDelegate <ORKRecorderDelegate>
-
-@optional
-
-- (void)healthQuantityTypeRecorderDidUpdate:(ORKHealthQuantityTypeRecorder *)healthQuantityTypeRecorder;
-
-@end
-
-/**
- The `ORKHealthQuantityTypeRecorder` class represents a recorder for collecting real time sample data from HealthKit, such as heart rate, during
- an active task.
- */
-ORK_CLASS_AVAILABLE
-@interface ORKHealthQuantityTypeRecorder : ORKRecorder
-
-@property (nonatomic, readonly, copy) HKQuantityType *quantityType;
-@property (nonatomic, readonly, copy) HKUnit *unit;
-@property (nonatomic, readonly, copy, nullable) HKQuantitySample *lastSample;
-
-- (instancetype)initWithHealthQuantityType:(HKQuantityType *)quantityType
-                                      unit:(HKUnit *)unit
-                                      step:(ORKStep *)step
-                           outputDirectory:(NSURL *)outputDirectory NS_DESIGNATED_INITIALIZER;
-
-@end
-
-NS_ASSUME_NONNULL_END

ResearchKit/ActiveTasks/ORKHealthQuantityTypeRecorder.m

@@ -1,362 +0,0 @@
-/*
- Copyright (c) 2015, Apple Inc. All rights reserved.
- 
- Redistribution and use in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met:
- 
- 1.  Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
- 
- 2.  Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation and/or
- other materials provided with the distribution.
- 
- 3.  Neither the name of the copyright holder(s) nor the names of any contributors
- may be used to endorse or promote products derived from this software without
- specific prior written permission. No license is granted to the trademarks of
- the copyright holders even if such marks are included in this software.
- 
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import "ORKHealthQuantityTypeRecorder.h"
-#import "ORKHelpers.h"
-#import "ORKDataLogger.h"
-#import "ORKRecorder_Private.h"
-#import "ORKRecorder_Internal.h"
-#import "HKSample+ORKJSONDictionary.h"
-
-@interface ORKHealthQuantityTypeRecorder()
-{
-    ORKDataLogger *_logger;
-    BOOL _isRecording;
-    HKHealthStore *_healthStore;
-    NSPredicate *_samplePredicate;
-    HKObserverQuery *_observerQuery;
-    NSInteger _anchor;
-    HKQuantitySample *_lastSample;
-}
-
-@property (nonatomic, strong) NSError *recordingError;
-
-@end
-
-
-@implementation ORKHealthQuantityTypeRecorder
-
-
-- (instancetype)initWithHealthQuantityType:(HKQuantityType *)quantityType
-                                      unit:(HKUnit *)unit
-                                      step:(ORKStep *)step
-                           outputDirectory:(NSURL *)outputDirectory
-{
-    self = [super initWithStep:step
-               outputDirectory:(NSURL *)outputDirectory];
-    if (self)
-    {
-        NSParameterAssert(quantityType != nil);
-        NSParameterAssert(unit != nil);
-        // Quantity type and unit are immutable, so should be equivalent to -copy
-        _quantityType = quantityType;
-        _unit = unit;
-        self.continuesInBackground = YES;
-        _anchor = HKAnchoredObjectQueryNoAnchor;
-    }
-    return self;
-}
-
-
-- (void)dealloc
-{
-    [_logger finishCurrentLog];
-}
-
-- (void)updateMostRecentSample:(HKQuantitySample *)sample {
-    [self willChangeValueForKey:@"lastSample"];
-    _lastSample = sample;
-    [self didChangeValueForKey:@"lastSample"];
-    
-    id<ORKHealthQuantityTypeRecorderDelegate> delegate =  (id<ORKHealthQuantityTypeRecorderDelegate>)self.delegate;
-    if (delegate && [delegate respondsToSelector:@selector(healthQuantityTypeRecorderDidUpdate:)]) {
-        [delegate healthQuantityTypeRecorderDidUpdate:self];
-    }
-    
-}
-
-static const NSInteger _HealthAnchoredQueryLimit = 100;
-
-- (void)query_logResults:(NSArray *)results withAnchor:(NSUInteger)newAnchor {
-    
-    NSUInteger resultCount = [results count];
-    if (resultCount == 0) {
-        return;
-    }
-    
-    // Do conversion to dictionary on whatever queue we happen to be on.
-    NSMutableArray *dictionaries = [NSMutableArray arrayWithCapacity:resultCount];
-    [results enumerateObjectsUsingBlock:^(HKQuantitySample *sample, NSUInteger idx, BOOL *stop) {
-        [dictionaries addObject:[sample ork_JSONDictionaryWithOptions:ORKSampleIncludeSource|ORKSampleIncludeMetadata unit:_unit]];
-    }];
-    
-    dispatch_async(dispatch_get_main_queue(), ^{
-        [self updateMostRecentSample:[results lastObject]];
-        
-        NSError *error = nil;
-        if (! [_logger appendObjects:dictionaries error:&error]) {
-            // Logger writes are unrecoverable
-            [self finishRecordingWithError:error];
-            return;
-        }
-        
-        _anchor = newAnchor;
-        
-        if (resultCount == _HealthAnchoredQueryLimit) {
-            // Do another fetch immediately rather than wait for an observation
-            [self doFetchNewData];
-        }
-        
-    });
-    
-}
-
-
-- (void)doFetchNewData {
-    if (! _healthStore || ! _isRecording) {
-        return;
-    }
-    NSAssert(_samplePredicate != nil, @"Sample predicate should be non-nil if recording");
-    
-    
-    __weak typeof(self) weakSelf = self;
-    HKAnchoredObjectQuery *anchoredQuery = [[HKAnchoredObjectQuery alloc]
-                                            initWithType:_quantityType
-                                            predicate:_samplePredicate
-                                            anchor:_anchor
-                                            limit:_HealthAnchoredQueryLimit
-                                            completionHandler:^(HKAnchoredObjectQuery *query, NSArray *results, NSUInteger newAnchor, NSError *error)
-                                            {
-                                                if (error) {
-                                                    // An error in the query's not the end of the world: we'll probably get another chance. Just log it.
-                                                    ORK_Log_Debug(@"Anchored query error: %@", error);
-                                                    return;
-                                                }
-                                                
-                                                __typeof(self) strongSelf = weakSelf;
-                                                [strongSelf query_logResults:results withAnchor:newAnchor];
-                                                
-                                            }];
-    [_healthStore executeQuery:anchoredQuery];
-}
-
-
-- (void)start {
-    
-    [super start];
-    
-    
-    if (! _logger) {
-        NSError *err = nil;
-        _logger = [self makeJSONDataLoggerWithError:&err];
-        if (! _logger) {
-            [self finishRecordingWithError:err];
-            return;
-        }
-    }
-    
-    if (! [HKHealthStore isHealthDataAvailable])
-    {
-        [self finishRecordingWithError:[NSError errorWithDomain:NSCocoaErrorDomain
-                                                           code:NSFeatureUnsupportedError
-                                                       userInfo:@{@"recorder" : self}]];
-        return;
-    }
-    
-    if (!_healthStore) {
-        // Get a new obsever query
-        _healthStore = [HKHealthStore new];
-    } else {
-        // Reset
-        if (_observerQuery) {
-            [_healthStore stopQuery:_observerQuery];
-            _observerQuery = nil;
-        }
-    }
-    
-    [_healthStore enableBackgroundDeliveryForType:_quantityType
-                                        frequency:HKUpdateFrequencyImmediate
-                                   withCompletion:^(BOOL success, NSError *error) {
-                                       
-                                       // Doesn't really matter if this succeeds, but nice if it does.
-                                       if (! success) {
-                                           ORK_Log_Debug(@"Failed to enable background delivery: %@", error);
-                                       }
-                                   }];
-    
-    _lastSample = nil;
-    _samplePredicate = [HKQuery predicateForSamplesWithStartDate:[NSDate date] endDate:nil options:HKQueryOptionStrictStartDate];
-    
-    NSAssert(!_observerQuery, @"observer query should not exist if not recording");
-    
-    __weak __typeof(self) weakSelf = self;
-    _observerQuery = [[HKObserverQuery alloc]
-                      initWithSampleType:_quantityType
-                      predicate:_samplePredicate
-                      updateHandler:^(HKObserverQuery *query, HKObserverQueryCompletionHandler completionHandler, NSError *error) {
-                          __typeof(self) strongSelf = weakSelf;
-                          
-                          dispatch_async(dispatch_get_main_queue(), ^{
-                              if (error) {
-                                  [strongSelf finishRecordingWithError:error];
-                              } else {
-                                  [strongSelf doFetchNewData];
-                              }
-                          });
-                          
-                          // Immediately signal receipt. We've fired off to either finish or do a new fetch.
-                          completionHandler();
-                          
-                      }];
-    
-    _isRecording = YES;
-    [_healthStore executeQuery:_observerQuery];
-}
-
-
-- (NSString *)recorderType
-{
-    return _quantityType.identifier;
-}
-
-
-- (void)stop {
-    if (! _isRecording) {
-        return;
-    }
-    
-    [self doStopRecording];
-    [_logger finishCurrentLog];
-    
-    NSError *error = nil;
-    __block NSURL *fileUrl = nil;
-    [_logger enumerateLogs:^(NSURL *logFileUrl, BOOL *stop) {
-        fileUrl = logFileUrl;
-    } error:&error];
-    
-    
-    [self reportFileResultWithFile:fileUrl error:error];
-    
-    [super stop];
-}
-
-- (void)doStopRecording
-{
-    if (_isRecording) {
-        NSAssert(_observerQuery != nil, @"Observer query should be non-nil when recording");
-        [_healthStore stopQuery:_observerQuery];
-        _observerQuery = nil;
-        
-        _samplePredicate = nil;
-        _isRecording = NO;
-        
-        [self updateMostRecentSample:nil];
-    }
-}
-
-- (void)finishRecordingWithError:(NSError *)error
-{
-    [self doStopRecording];
-    [super finishRecordingWithError:error];
-}
-
-- (BOOL)isRecording {
-    return _isRecording;
-}
-
-- (NSString *)mimeType {
-    return @"application/json";
-}
-
-- (void)reset
-{
-    [super reset];
-    
-    _logger = nil;
-}
-
-@end
-
-@interface ORKHealthQuantityTypeRecorderConfiguration()
-@end
-
-@implementation ORKHealthQuantityTypeRecorderConfiguration
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wobjc-designated-initializers"
-- (instancetype)initWithHealthQuantityType:(HKQuantityType *)quantityType unit:(HKUnit *)unit {
-    self = [super ork_init];
-    if (self) {
-        NSParameterAssert(quantityType != nil);
-        NSParameterAssert(unit != nil);
-        // Quantity type and unit are immutable, so should be equivalent to -copy
-        _quantityType = quantityType;
-        _unit = unit;
-    }
-    return self;
-}
-#pragma clang diagnostic pop
-
-- (ORKRecorder *)recorderForStep:(ORKStep *)step outputDirectory:(NSURL *)outputDirectory
-{
-    return [[ORKHealthQuantityTypeRecorder alloc] initWithHealthQuantityType:_quantityType
-                                                                       unit:_unit
-                                                                       step:step
-                                                            outputDirectory:outputDirectory];
-}
-
-
-- (instancetype)initWithCoder:(NSCoder *)aDecoder
-{
-    self = [super initWithCoder:aDecoder];
-    if (self)
-    {
-        ORK_DECODE_OBJ_CLASS(aDecoder, quantityType, HKQuantityType);
-        ORK_DECODE_OBJ_CLASS(aDecoder, unit, HKUnit);
-    }
-    return self;
-}
-
-- (void)encodeWithCoder:(NSCoder *)aCoder
-{
-    ORK_ENCODE_OBJ(aCoder, quantityType);
-    ORK_ENCODE_OBJ(aCoder, unit);
-}
-
-+ (BOOL)supportsSecureCoding
-{
-    return YES;
-}
-
-- (BOOL)isEqual:(id)object {
-    BOOL isParentSame = [super isEqual:object];
-    
-    __typeof(self) castObject = object;
-    return (isParentSame &&
-            ORKEqualObjects(self.quantityType, castObject.quantityType)&&
-            ORKEqualObjects(self.unit, castObject.unit)) ;
-}
-
-
-- (NSSet *)requestedHealthKitTypesForReading {
-    return [NSSet setWithObject:_quantityType];
-}
-
-@end

ResearchKit/ActiveTasks/ORKLocationRecorder.h

@@ -1,44 +0,0 @@
-/*
- Copyright (c) 2015, Apple Inc. All rights reserved.
- 
- Redistribution and use in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met:
- 
- 1.  Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
- 
- 2.  Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation and/or
- other materials provided with the distribution.
- 
- 3.  Neither the name of the copyright holder(s) nor the names of any contributors
- may be used to endorse or promote products derived from this software without
- specific prior written permission. No license is granted to the trademarks of
- the copyright holders even if such marks are included in this software.
- 
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import <ResearchKit/ORKRecorder.h>
-
-/**
- The `ORKLocationRecorder` class represents a recorder for collecting location data from CoreLocation.
- 
- Because location data is sensitive information, you need to take special care in handling it, including removoing or otherwise preparing it for a
- anonymous data set.
- 
- The accuracy of location data may be limited indoors.
- */
-ORK_CLASS_AVAILABLE
-@interface ORKLocationRecorder : ORKRecorder
-
-@end

ResearchKit/ActiveTasks/ORKLocationRecorder.m

@@ -1,214 +0,0 @@
-/*
- Copyright (c) 2015, Apple Inc. All rights reserved.
- 
- Redistribution and use in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met:
- 
- 1.  Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
- 
- 2.  Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation and/or
- other materials provided with the distribution.
- 
- 3.  Neither the name of the copyright holder(s) nor the names of any contributors
- may be used to endorse or promote products derived from this software without
- specific prior written permission. No license is granted to the trademarks of
- the copyright holders even if such marks are included in this software.
- 
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import "ORKLocationRecorder.h"
-#import <CoreLocation/CoreLocation.h>
-#import "CLLocation+ORKJSONDictionary.h"
-#import "ORKDataLogger.h"
-#import "ORKRecorder_Internal.h"
-#import "ORKRecorder_Private.h"
-
-@interface ORKLocationRecorder() <CLLocationManagerDelegate>
-{
-    ORKDataLogger *_logger;
-    NSError *_recordingError;
-    BOOL _started;
-}
-@property (nonatomic, strong) CLLocationManager *locationManager;
-@property (nonatomic) NSTimeInterval uptime;
-
-@end
-
-
-@implementation ORKLocationRecorder
-
-
-- (instancetype)initWithStep:(ORKStep *)step outputDirectory:(NSURL *)outputDirectory
-{
-    self = [super initWithStep:step outputDirectory:outputDirectory];
-    if (self)
-    {
-        self.continuesInBackground = YES;
-    }
-    return self;
-}
-
-- (void)dealloc
-{
-    [_logger finishCurrentLog];
-}
-
-- (NSString *)recorderType {
-    return @"location";
-}
-
-- (CLLocationManager *)createLocationManager {
-    return [[CLLocationManager alloc] init];
-}
-
-- (void)start {
-    [super start];
-    
-    if (! _logger) {
-        NSError *err = nil;
-        _logger = [self makeJSONDataLoggerWithError:&err];
-        if (! _logger) {
-            [self finishRecordingWithError:err];
-            return;
-        }
-    }
-    
-    self.locationManager = [self createLocationManager];
-    if ([CLLocationManager authorizationStatus] <= kCLAuthorizationStatusDenied)
-    {
-        [self.locationManager requestWhenInUseAuthorization];
-    }
-    self.locationManager.pausesLocationUpdatesAutomatically = NO;
-    self.locationManager.delegate = self;
-    
-    if (! self.locationManager) {
-        NSError *error = [NSError errorWithDomain:NSCocoaErrorDomain
-                                             code:NSFeatureUnsupportedError
-                                         userInfo:@{@"recorder" : self}];
-        [self finishRecordingWithError:error];
-        return;
-    }
-    
-    self.uptime = [NSProcessInfo processInfo].systemUptime;
-    [self.locationManager startUpdatingLocation];
-}
-
-- (void)doStopRecording {
-    [self.locationManager stopUpdatingLocation];
-    self.locationManager.delegate = nil;
-    self.locationManager = nil;
-}
-
-- (void)stop {
-    [self doStopRecording];
-    [_logger finishCurrentLog];
-    
-    
-    NSError *error = _recordingError;
-    _recordingError = nil;
-    __block NSURL *fileUrl = nil;
-    [_logger enumerateLogs:^(NSURL *logFileUrl, BOOL *stop) {
-        fileUrl = logFileUrl;
-    } error:&error];
-    
-    [self reportFileResultWithFile:fileUrl error:error];
-    
-    [super stop];
-}
-
-- (void)locationManager:(CLLocationManager *)manager
-     didUpdateLocations:(NSArray *)locations
-{
-    BOOL success = YES;
-    NSParameterAssert([locations count] >= 0);
-    NSError *error = nil;
-    if (locations)
-    {
-        NSMutableArray *dictionaries = [NSMutableArray arrayWithCapacity:[locations count]];
-        [locations enumerateObjectsUsingBlock:^(CLLocation *obj, NSUInteger idx, BOOL *stop) {
-            NSDictionary *d = [obj ork_JSONDictionary];
-            [dictionaries addObject:d];
-        }];
-        
-        success = [_logger appendObjects:dictionaries error:&error];
-    }
-    if (!success)
-    {
-        dispatch_async(dispatch_get_main_queue(), ^{
-            _recordingError = error;
-            [self stop];
-        });
-    }
-}
-
-- (void)finishRecordingWithError:(NSError *)error
-{
-    [self doStopRecording];
-    [super finishRecordingWithError:nil];
-}
-
-- (BOOL)isRecording {
-    return [CLLocationManager locationServicesEnabled] && (self.locationManager != nil) && ([CLLocationManager authorizationStatus] > kCLAuthorizationStatusDenied);
-}
-
-- (void)reset
-{
-    [super reset];
-    
-    _logger = nil;
-}
-
-
-- (NSString *)mimeType {
-    return @"application/json";
-}
-
-@end
-
-
-@interface ORKLocationRecorderConfiguration()
-@end
-
-@implementation ORKLocationRecorderConfiguration
-
-- (ORKRecorder *)recorderForStep:(ORKStep *)step outputDirectory:(NSURL *)outputDirectory {
-    return [[ORKLocationRecorder alloc] initWithStep:step outputDirectory:outputDirectory];
-}
-
-
-
-- (instancetype)initWithCoder:(NSCoder *)aDecoder {
-    self = [super initWithCoder:aDecoder];
-    return self;
-}
-
-+ (BOOL)supportsSecureCoding
-{
-    return YES;
-}
-
-
-- (BOOL)isEqual:(id)object {
-    BOOL isParentSame = [super isEqual:object];
-    
-    return isParentSame;
-}
-
-
-- (ORKPermissionMask)requestedPermissionMask {
-    return ORKPermissionCoreLocation;
-}
-
-@end

ResearchKit/ActiveTasks/ORKPedometerRecorder.h

@@ -1,65 +0,0 @@
-/*
- Copyright (c) 2015, Apple Inc. All rights reserved.
- 
- Redistribution and use in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met:
- 
- 1.  Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
- 
- 2.  Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation and/or
- other materials provided with the distribution.
- 
- 3.  Neither the name of the copyright holder(s) nor the names of any contributors
- may be used to endorse or promote products derived from this software without
- specific prior written permission. No license is granted to the trademarks of
- the copyright holders even if such marks are included in this software.
- 
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import <ResearchKit/ORKRecorder.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@class ORKPedometerRecorder;
-
-@protocol ORKPedometerRecorderDelegate <ORKRecorderDelegate>
-
-@optional
-
-- (void)pedometerRecorderDidUpdate:(ORKPedometerRecorder *)pedometerRecorder;
-
-@end
-
-/**
- A recorder that requests and collects device motion data from CoreMotion at a fixed frequency.
- 
- The accelerometer recorder continues to record if the application enters the
- background using UIApplication's background task support.
- */
-ORK_CLASS_AVAILABLE
-@interface ORKPedometerRecorder : ORKRecorder
-
-@property (nonatomic, readonly, nullable) NSDate *lastUpdateDate;
-@property (nonatomic, readonly) NSInteger totalNumberOfSteps;
-
-// Negative if an invalid value.
-@property (nonatomic, readonly) NSInteger totalDistance;
-
-- (instancetype)initWithStep:(ORKStep *)step
-             outputDirectory:(NSURL *)outputDirectory NS_DESIGNATED_INITIALIZER;
-
-@end
-
-NS_ASSUME_NONNULL_END

ResearchKit/ActiveTasks/ORKPedometerRecorder.m

@@ -1,242 +0,0 @@
-/*
- Copyright (c) 2015, Apple Inc. All rights reserved.
- 
- Redistribution and use in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met:
- 
- 1.  Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
- 
- 2.  Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation and/or
- other materials provided with the distribution.
- 
- 3.  Neither the name of the copyright holder(s) nor the names of any contributors
- may be used to endorse or promote products derived from this software without
- specific prior written permission. No license is granted to the trademarks of
- the copyright holders even if such marks are included in this software.
- 
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import "ORKPedometerRecorder.h"
-#import "ORKDataLogger.h"
-#import "CMPedometerData+ORKJSONDictionary.h"
-#import "ORKRecorder_Internal.h"
-#import "ORKRecorder_Private.h"
-
-@interface ORKPedometerRecorder()
-{
-    ORKDataLogger *_logger;
-    BOOL _isRecording;
-}
-
-@property (nonatomic, strong) CMPedometer *pedometer;
-@property (nonatomic, strong) NSError *recordingError;
-
-@end
-
-
-@implementation ORKPedometerRecorder
-
-
-- (instancetype)initWithStep:(ORKStep *)step
-             outputDirectory:(NSURL *)outputDirectory
-{
-    self = [super initWithStep:step
-               outputDirectory:(NSURL *)outputDirectory];
-    if (self)
-    {
-        self.continuesInBackground = YES;
-    }
-    return self;
-}
-
-
-- (void)dealloc
-{
-    [_logger finishCurrentLog];
-}
-
-
-
-- (void)updateStatisticsWithData:(CMPedometerData *)pedometerData {
-    
-    _lastUpdateDate = pedometerData.endDate;
-    _totalNumberOfSteps = [pedometerData.numberOfSteps integerValue];
-    if (pedometerData.distance) {
-        _totalDistance = [pedometerData.distance doubleValue];
-    } else {
-        _totalDistance = -1;
-    }
-    
-    id delegate = self.delegate;
-    if ([delegate respondsToSelector:@selector(pedometerRecorderDidUpdate:)]) {
-        [delegate pedometerRecorderDidUpdate:self];
-    }
-}
-
-- (CMPedometer *)createPedometer {
-    return [[CMPedometer alloc] init];
-}
-
-- (void)start {
-    
-    [super start];
-    
-    _lastUpdateDate = nil;
-    _totalNumberOfSteps = 0;
-    _totalDistance = -1;
-    
-    if (! _logger) {
-        NSError *err = nil;
-        _logger = [self makeJSONDataLoggerWithError:&err];
-        if (! _logger) {
-            [self finishRecordingWithError:err];
-            return;
-        }
-    }
-    
-    self.pedometer = [self createPedometer];
-    
-    if (! [[self.pedometer class] isStepCountingAvailable])
-    {
-        [self finishRecordingWithError:[NSError errorWithDomain:NSCocoaErrorDomain
-                                                           code:NSFeatureUnsupportedError
-                                                       userInfo:@{@"recorder" : self}]];
-        return;
-    }
-
-    _isRecording = YES;
-    __weak __typeof(self) weakSelf = self;
-    [self.pedometer startPedometerUpdatesFromDate:[NSDate date] withHandler:^(CMPedometerData *pedometerData, NSError *error) {
-        
-        BOOL success = NO;
-        if (pedometerData)
-        {
-            success = [_logger append:[pedometerData ork_JSONDictionary] error:&error];
-            dispatch_async(dispatch_get_main_queue(), ^{
-                __typeof(self) strongSelf = weakSelf;
-                [strongSelf updateStatisticsWithData:pedometerData];
-            });
-        }
-        if (!success || error)
-        {
-            dispatch_async(dispatch_get_main_queue(), ^{
-                __typeof(self) strongSelf = weakSelf;
-                [strongSelf finishRecordingWithError:error];
-            });
-        }
-    }];
-}
-
-
-- (NSString *)recorderType
-{
-    return @"pedometer";
-}
-
-
-- (void)stop {
-    [self doStopRecording];
-    [_logger finishCurrentLog];
-    
-    NSError *error = nil;
-    __block NSURL *fileUrl = nil;
-    [_logger enumerateLogs:^(NSURL *logFileUrl, BOOL *stop) {
-        fileUrl = logFileUrl;
-    } error:&error];
-    
-    
-    
-    [self reportFileResultWithFile:fileUrl error:error];
-    
-    [super stop];
-}
-
-- (void)doStopRecording
-{
-    if (_isRecording) {
-        [self.pedometer stopPedometerUpdates];
-        _isRecording = NO;
-        self.pedometer = nil;
-    }
-}
-
-- (void)finishRecordingWithError:(NSError *)error
-{
-    [self doStopRecording];
-    [super finishRecordingWithError:error];
-}
-
-- (BOOL)isRecording {
-    return _isRecording;
-}
-
-- (NSString *)mimeType {
-    return @"application/json";
-}
-
-- (void)reset
-{
-    [super reset];
-    
-    _logger = nil;
-}
-
-@end
-
-
-@interface ORKPedometerRecorderConfiguration()
-@end
-
-
-@implementation ORKPedometerRecorderConfiguration
-
-- (instancetype)init {
-    self = [super ork_init];
-    return self;
-}
-
-- (ORKRecorder *)recorderForStep:(ORKStep *)step outputDirectory:(NSURL *)outputDirectory
-{
-    return [[ORKPedometerRecorder alloc] initWithStep:step
-                                     outputDirectory:outputDirectory];
-}
-
-
-- (instancetype)initWithCoder:(NSCoder *)aDecoder
-{
-    self = [super initWithCoder:aDecoder];
-    return self;
-}
-
-+ (BOOL)supportsSecureCoding
-{
-    return YES;
-}
-
-
-- (BOOL)isEqual:(id)object {
-    BOOL isParentSame = [super isEqual:object];
-    
-    return (isParentSame) ;
-}
-
-
-
-- (ORKPermissionMask)requestedPermissionMask {
-    return ORKPermissionCoreMotionActivity;
-}
-
-@end
-

ResearchKit/ActiveTasks/ORKRecorder.h

@@ -1,428 +0,0 @@
-/*
- Copyright (c) 2015, Apple Inc. All rights reserved.
- 
- Redistribution and use in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met:
- 
- 1.  Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
- 
- 2.  Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation and/or
- other materials provided with the distribution.
- 
- 3.  Neither the name of the copyright holder(s) nor the names of any contributors
- may be used to endorse or promote products derived from this software without
- specific prior written permission. No license is granted to the trademarks of
- the copyright holders even if such marks are included in this software.
- 
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-
-#import <ResearchKit/ORKDefines.h>
-#import <ResearchKit/ORKStep.h>
-#import <HealthKit/HealthKit.h>
-#import <ResearchKit/ORKResult.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@class ORKRecorder;
-
-/**
- The `ORKRecorderConfiguration` class is the abstract base class for recorder configurations
- that can be attached to an active step (`ORKActiveStep`).
- 
- Recorder configurations provide an easy way to collect CoreMotion
- or other sensor data into a serialized format during the duration of an active step.
- If you want to filter or process the data in real time, it is better to
- use the existing APIs directly.
- 
- To use a recorder, include its configuration in the `recorderConfigurations` property
- of an `ORKActiveStep` object, include that step in a task, and present it with
- a task view controller.
- 
- To add a new recorder, subclass both `ORKRecorderConfiguration` and `ORKRecorder`,
- and add the new `ORKRecorderConfiguration` subclass to an `ORKActiveStep` object.
- */
-ORK_CLASS_AVAILABLE
-@interface ORKRecorderConfiguration : NSObject <NSSecureCoding>
-
-/**
- The `init` method is unavailable outside the framework on `ORKRecorderConfiguration`,
- because it is an abstract class.
- 
- `ORKRecorderConfiguration` classes should be initialized with custom designated
- initializers on each subclass.
- */
-- (instancetype)init NS_UNAVAILABLE;
-
-/**
- Returns a recorder instance using this configuration.
- 
- @param step      The step for which this recorder is being created.
- @param outputDirectory     The directory in which all output file data should be written
- (if producing `ORKFileResult` instances).
- 
- @return A configured recorder instance.
- */
-- (nullable ORKRecorder *)recorderForStep:(nullable ORKStep *)step outputDirectory:(nullable NSURL *)outputDirectory;
-
-/**
- Returns the HealthKit types for which this recorder requires read access in a set of `HKSampleType` objects.
- 
- Typically, the task view controller automatically collects
- and collates the types of HealthKit data requested by each of the active steps in a task,
- and requests access to them at the end of the initial instruction
- steps in the task.
- 
- If your recorder requires or would benefit from read access to HealthKit at
- runtime during the task, return the appropriate set of `HKSampleType` objects.
- */
-- (nullable NSSet *)requestedHealthKitTypesForReading;
-
-@end
-
-
-/**
- The `ORKAccelerometerRecorderConfiguration` subclass configures
- the collection of accelerometer data during an active step.
- 
- Accelerometer data is serialized to JSON and returned as an `ORKFileResult` object.
- For details on the format, see `CMAccelerometerData+ORKJSONDictionary`.
- 
- To use a recorder, include its configuration in the `recorderConfigurations` property
- of an `ORKActiveStep` object, include that step in a task, and present it with
- a task view controller.
- */
-ORK_CLASS_AVAILABLE
-@interface ORKAccelerometerRecorderConfiguration : ORKRecorderConfiguration
-
-/**
- The frequency of accelerometer data collection in samples per second (Hz).
- */
-@property (nonatomic, readonly) double frequency;
-
-/**
- Returns an initialized accelerometer recorder configuration using the specified frequency.
- 
- This method is the designated initializer.
- 
- @param frequency The frequency of accelerometer data collection in samples per second (Hz).
- @return An initialized accelerometer recorder configuration.
- */
-- (instancetype)initWithFrequency:(double)frequency NS_DESIGNATED_INITIALIZER;
-
-- (instancetype)initWithCoder:(NSCoder *)aDecoder NS_DESIGNATED_INITIALIZER;
-
-@end
-
-
-
-/**
- The `ORKAudioRecorderConfiguration` class represents a configuration that records
- audio data during an active step.
- 
- An `ORKAudioRecorderConfiguration` generates an `ORKAudioRecorder` object.
- 
- To use a recorder, include its configuration in the `recorderConfigurations` property
- of an `ORKActiveStep` object, include that step in a task, and present it with
- a task view controller.
- */
-ORK_CLASS_AVAILABLE
-@interface ORKAudioRecorderConfiguration : ORKRecorderConfiguration
-
-/**
- The audio format settings for the recorder.
- 
- Pass the settings for the recording session to the `AVAudioRecorder` method `initWithURL:settings:error:`.
- For information on the settings available for an audio recorder, see "AV Foundation Audio Settings Constants" in
- the AVFoundation documentation.
- 
- The results are returned as an `ORKFileResult` object, which points to an audio file.
- */
-@property (nonatomic, readonly, nullable) NSDictionary *recorderSettings;
-
-/**
- Returns an initialized audio recorder configuration using the specified settings.
- 
- This method is the designated initializer.
- 
- For information on the settings available for an audio recorder, see "AV Foundation Audio Settings Constants".
- 
- @param recorderSettings The settings for the recording session.
- */
-- (instancetype)initWithRecorderSettings:(NSDictionary *)recorderSettings NS_DESIGNATED_INITIALIZER;
-
-- (instancetype)initWithCoder:(NSCoder *)aDecoder NS_DESIGNATED_INITIALIZER;
-
-@end
-
-
-/**
- The `ORKDeviceMotionRecorderConfiguration` class represents a configuration
- that records device motion data during an active step.
- 
- Device motion data is the processed motion data provided by CoreMotion and obtained
- from a `CMMotionManager` object. The data can include measures of the overall device orientation
- obtained from combining accelerometer, magnetometer, and gyroscope data.
- 
- Device motion data is serialized to JSON and returned as an `ORKFileResult` object.
- For details on the format, see `CMDeviceMotion+ORKJSONDictionary`.
- 
- To use a recorder, include its configuration in the `recorderConfigurations` property
- of an `ORKActiveStep` object, include that step in a task, and present it with
- a task view controller.
- */
-ORK_CLASS_AVAILABLE
-@interface ORKDeviceMotionRecorderConfiguration : ORKRecorderConfiguration
-
-/**
- The frequency of motion data collection in samples per second (Hz).
- */
-@property (nonatomic, readonly) double frequency;
-
-/**
- Returns an initialized device motion recorder configuration using the specified frequency.
- 
- This method is the designated initializer.
- 
- @param frequency    Motion data collection frequency in samples per second (Hz).
- @return An initialized device motion recorder configuration.
- */
-- (instancetype)initWithFrequency:(double)frequency NS_DESIGNATED_INITIALIZER;
-
-- (instancetype)initWithCoder:(NSCoder *)aDecoder NS_DESIGNATED_INITIALIZER;
-
-@end
-
-
-
-/**
- The `ORKPedometerRecorderConfiguration` class represents a configuration
- that records pedometer data during an active step.
- 
- Pedometer data consists of information about the processed steps provided by CoreMotion, obtained
- from a `CMPedometer` object. The pedometer object essentially reports the total number of steps taken since the
- start of recording, updating the value every time a significant number of steps have
- been detected.
- 
- Pedometer data is serialized to JSON and returned as an `ORKFileResult` object.
- For details on the format, see `CMPedometerData+ORKJSONDictionary`.
- 
- To use a recorder, include its configuration in the `recorderConfigurations` property
- of an `ORKActiveStep` object, include that step in a task, and present it with
- a task view controller.
- */
-ORK_CLASS_AVAILABLE
-@interface ORKPedometerRecorderConfiguration : ORKRecorderConfiguration
-
-/**
- Returns an initialized pedometer recorder configuration.
- 
- This method is the designated initializer.
- 
- Note that the recorder instantiates a `CMPedometer` object, so no parameters are required.
- */
-- (instancetype)init NS_DESIGNATED_INITIALIZER;
-
-- (instancetype)initWithCoder:(NSCoder *)aDecoder NS_DESIGNATED_INITIALIZER;
-
-@end
-
-/**
- The `ORKLocationRecorderConfiguration` class represents a configuration
- that records location data during an active step.
- 
- The location data reported is the location provided by CoreLocation.
- 
- If this configuration is included in an active step in a task, the task
- view controller requests access to location data at the end of the
- initial instruction steps in the task.
- 
- Location data is serialized to JSON and returned as an `ORKFileResult` object.
- For details on the format, see `CLLocation+ORKJSONDictionary`.
- 
- To use a recorder, include its configuration in the `recorderConfigurations` property
- of an `ORKActiveStep` object, include that step in a task, and present it with
- a task view controller.
- */
-ORK_CLASS_AVAILABLE
-@interface ORKLocationRecorderConfiguration : ORKRecorderConfiguration
-
-/**
- Returns an initialized location recorder configuration.
- 
- This method is the designated initializer.
- 
- No parameters are required.
- */
-- (instancetype)init NS_DESIGNATED_INITIALIZER;
-- (instancetype)initWithCoder:(NSCoder *)aDecoder NS_DESIGNATED_INITIALIZER;
-
-@end
-
-
-/**
- The `ORKHealthQuantityTypeRecorderConfiguration` class represents a configuration
- that records data from a HealthKit quantity type during an active step.
- 
- Before you can use this configuration, you must use Xcode to enable the appropriate HealthKit entitlement
- for your app.
- 
- HealthKit quantity type data is serialized to JSON and returned as an `ORKFileResult` object.
- For details on the format, see `HKSample+ORKJSONDictionary`.
- 
- To use a recorder, include its configuration in the `recorderConfigurations` property
- of an `ORKActiveStep` object, include that step in a task, and present it with
- a task view controller.
- */
-ORK_CLASS_AVAILABLE
-@interface ORKHealthQuantityTypeRecorderConfiguration : ORKRecorderConfiguration
-
-/**
- Returns an initialized health quantity type recorder configuration using the specified quantity type and unit designation.
- 
- This method is the designated initializer.
- 
- @param quantityType    The quantity type that should be collected during the active task.
- @param unit            The unit for the data that should be collected and serialized.
- @return An initialized health quantity type recorder configuration.
- */
-- (instancetype)initWithHealthQuantityType:(HKQuantityType *)quantityType unit:(HKUnit *)unit NS_DESIGNATED_INITIALIZER;
-
-- (instancetype)initWithCoder:(NSCoder *)aDecoder NS_DESIGNATED_INITIALIZER;
-
-/**
- The quantity type to be collected from HealthKit. (read-only)
- */
-@property (nonatomic, readonly, copy) HKQuantityType *quantityType;
-
-
-/**
- The unit in which to serialize the data from HealthKit. (read-only)
- */
-@property (nonatomic, readonly, copy) HKUnit *unit;
-
-@end
-
-/**
- The `ORKRecorderDelegate` protocol defines methods that the delegate of an `ORKRecorder` object should use to handle errors and log the
- completed results.
- 
- This protocol is implemented by `ORKActiveStepViewController`; your app should not
-need to implement it.
- */
-@protocol ORKRecorderDelegate <NSObject>
-
-/**
- Tells the delegate that the recorder has completed with the specified result.
- 
- Typically, this method is called once when recording is stopped.
- 
- @param recorder        The generating recorder object.
- @param result          The generated result.
- */
-- (void)recorder:(ORKRecorder *)recorder didCompleteWithResult:(nullable ORKResult *)result;
-
-/**
- Tells the delegate that recording failed.
- 
- Typically, this method is called once when the error occurred.
- 
- @param recorder        The generating recorder object.
- @param error           The error that occurred.
- */
-- (void)recorder:(ORKRecorder *)recorder didFailWithError:(NSError *)error;
-
-@end
-
-/**
- A recorder is the runtime companion to an `ORKRecorderConfiguration` object, and is
- usually generated by one.
- 
- During active tasks, it is often useful to collect one or more pieces of data
- from sensors on the device. In research tasks, it's not always
- necessary to display that data, but it's important to record it in a controlled manner.
- 
- An active step (`ORKActiveStep`) has an array of recorder configurations
- (`ORKRecorderConfiguration`) that identify the types of data it needs to record
- for the duration of the step. When a step starts, the active step view controller
- instantiates a recorder for each of the step's recorder configurations.
- The step view controller starts the recorder when the active step is started, and stops the
- recorder when the active step is finished.
- 
- The results of recording are typically written to a file specified by the value of the `outputDirectory` property.
- 
- Usually, the `ORKActiveStepViewController` object is the recorder's delegate, and it
- receives callbacks when errors occur or when recording is complete.
- */
-ORK_CLASS_AVAILABLE
-@interface ORKRecorder : NSObject
-
-- (instancetype)init NS_UNAVAILABLE;
-
-/// @name Configuration
-
-@property (nonatomic, weak, nullable) id<ORKRecorderDelegate> delegate;
-
-/**
- The step that produced this recorder, configured during initialization.
- */
-@property (nonatomic, strong, readonly, nullable) ORKStep *step;
-
-/**
- The configuration that produced this recorder.
- */
-@property (nonatomic, strong, readonly, nullable) ORKRecorderConfiguration *configuration;
-
-/**
- The file URL of the output directory configured during initialization.
- 
- Typically, you set the `outputDirectory` property for the `ORKTaskViewController` object
- before presenting the task.
- */
-@property (nonatomic, copy, readonly, nullable) NSURL *outputDirectory;
-
-/**
- Returns the log prefix for the log file.
- */
-- (nullable NSString *)logName;
-
-/// @name Runtime Life Cycle
-
-/**
- Starts data recording.
- 
- If an error occurs when recording starts, it is returned through the delegate.
- */
-- (void)start NS_REQUIRES_SUPER;
-
-/**
- Stops data recording, which generally triggers the return of results.
- 
- If an error occurs when stopping the recorder, it is returned through the delegate.
- Subclasses should call `finishRecordingWithError:` rather than calling super.
- */
-- (void)stop NS_REQUIRES_SUPER;
-
-/**
- A Boolean value indicating whether the recorder is currently recording.
- 
- @return `YES` if the recorder is recording; otherwise, `NO`.
- */
-@property (nonatomic, readonly, getter=isRecording) BOOL recording;
-
-@end
-
-NS_ASSUME_NONNULL_END
-

ResearchKit/ActiveTasks/ORKRecorder.m

@@ -1,273 +0,0 @@
-/*
- Copyright (c) 2015, Apple Inc. All rights reserved.
- 
- Redistribution and use in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met:
- 
- 1.  Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
- 
- 2.  Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation and/or
- other materials provided with the distribution.
- 
- 3.  Neither the name of the copyright holder(s) nor the names of any contributors
- may be used to endorse or promote products derived from this software without
- specific prior written permission. No license is granted to the trademarks of
- the copyright holders even if such marks are included in this software.
- 
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-
-#import "ORKRecorder.h"
-#import "ORKRecorder_Internal.h"
-#import "ORKRecorder_Private.h"
-#import "ORKHelpers.h"
-#import "ORKDataLogger.h"
-#import "ORKDefines_Private.h"
-
-@implementation ORKRecorderConfiguration
-
-- (instancetype)ork_init
-{
-    return [super init];
-}
-
-- (instancetype)initWithCoder:(NSCoder *)aDecoder
-{
-    return [super init];
-}
-
-- (void)encodeWithCoder:(NSCoder *)aCoder
-{
-}
-
-- (BOOL)isEqual:(id)object {
-    if ([self class] != [object class]) {
-        return NO;
-    }
-    
-    return YES;
-}
-
-- (NSUInteger)hash {
-    return 0;
-}
-
-+ (BOOL)supportsSecureCoding
-{
-    return YES;
-}
-
-- (ORKRecorder *)recorderForStep:(ORKStep *)step outputDirectory:(NSURL *)outputDirectory
-{
-    return nil;
-}
-
-
-- (NSSet *)requestedHealthKitTypesForReading {
-    return nil;
-}
-- (ORKPermissionMask)requestedPermissionMask {
-    return ORKPermissionNone;
-}
-
-
-@end
-
-@implementation ORKRecorder
-{
-    UIBackgroundTaskIdentifier _backgroundTask;
-    NSUUID *_recorderUUID;
-}
-
-- (instancetype)init
-{
-    @throw [NSException exceptionWithName:NSGenericException reason:@"Use designated initializer" userInfo:nil];
-}
-
-- (instancetype)ork_init
-{
-    return [super init];
-}
-
-- (instancetype)initWithStep:(ORKStep *)step outputDirectory:(NSURL *)outputDirectory;
-{
-    self = [super init];
-    if (self)
-    {
-        _outputDirectory = outputDirectory;
-        self.step = step;
-        _backgroundTask = NSNotFound;
-        _recorderUUID = [NSUUID UUID];
-    }
-    return self;
-}
-
-- (void)viewController:(UIViewController *)viewController willStartStepWithView:(UIView *)view {
-
-}
-
-- (void)start
-{
-    if (self.continuesInBackground)
-    {
-        UIApplication *app = [UIApplication sharedApplication];
-        UIBackgroundTaskIdentifier oldTask = _backgroundTask;
-        _backgroundTask = [app beginBackgroundTaskWithName:[NSString stringWithFormat:@"%@.%p",NSStringFromClass([self class]),self] expirationHandler:^{
-            [self stop];
-        }];
-        if (oldTask != NSNotFound)
-        {
-            [app endBackgroundTask:oldTask];
-        }
-    }
-    
-    self.startDate = [NSDate date];
-}
-
-
-- (void)stop
-{
-    [self finishRecordingWithError:nil];
-    [self reset];
-}
-
-
-- (void)finishRecordingWithError:(NSError *)error
-{
-    // NOTE. This method may be called multiple times (once when someone tries
-    // to finish, and another time with -stop is actually called.
-    
-    
-    if (error)
-    {
-        // ALWAYS report errors to the delegate, even if we think we're finished already
-        
-        id<ORKRecorderDelegate> localDelegate = self.delegate;
-        if (localDelegate && [localDelegate respondsToSelector:@selector(recorder:didFailWithError:)])
-        {
-            [localDelegate recorder:self didFailWithError:error];
-        }
-        
-        [self reset];
-    }
-    
-    
-    if (_backgroundTask != NSNotFound)
-    {
-        // End the background task asynchronously, so whatever we're doing cleaning up the recorder has a chance to complete.
-        UIBackgroundTaskIdentifier ident = _backgroundTask;
-        _backgroundTask = NSNotFound;
-        
-        // Hold the background task for a little extra to give time for the next step to kick in,
-        // if it is an automatic transition.
-        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-            [[UIApplication sharedApplication] endBackgroundTask:ident];
-        });
-    }
-    
-}
-
-- (NSURL *)recordingDirectoryURL
-{
-    if (! _outputDirectory) {
-        return nil;
-    }
-    
-    return [NSURL fileURLWithPath:[_outputDirectory.path stringByAppendingPathComponent:[NSString stringWithFormat:@"recorder-%@",[_recorderUUID UUIDString]]]];
-}
-
-- (NSString *)recorderType
-{
-    return @"recorder";
-}
-
-- (NSString *)logName
-{
-    return [NSString stringWithFormat:@"%@_%@", [self recorderType],self.step.identifier];
-}
-
-- (ORKDataLogger *)makeJSONDataLoggerWithError:(NSError * __autoreleasing *)error
-{
-    NSURL *workingDir = [self recordingDirectoryURL];
-    if (! workingDir) {
-        if (error) {
-            *error = [NSError errorWithDomain:NSCocoaErrorDomain code:NSFileWriteInvalidFileNameError userInfo:@{NSLocalizedDescriptionKey:ORKLocalizedString(@"ERROR_RECORDER_NO_OUTPUT_DIRECTORY", nil)}];
-        }
-        return nil;
-    }
-    if (![[NSFileManager defaultManager] createDirectoryAtURL:workingDir withIntermediateDirectories:YES attributes:nil error:error]) {
-        return nil;
-    }
-    
-    NSString *ident = [self logName];
-    NSString *logName = [ident stringByReplacingOccurrencesOfString:@"-" withString:@"_"];
-    
-    // Class B data protection for temporary file during active task logging.
-    ORKDataLogger *logger = [[ORKDataLogger alloc] initWithDirectory:workingDir logName:logName formatter:[ORKJSONLogFormatter new] delegate:nil];
-    
-    logger.fileProtectionMode = ORKFileProtectionCompleteUnlessOpen;
-    return logger;
-}
-
-- (void)reset
-{
-    _recorderUUID = [NSUUID UUID];
-}
-
-- (NSString *)mimeType {
-    return nil;
-}
-
-- (NSDictionary *)userInfo {
-    return nil;
-}
-
-- (void)applyFileProtection:(ORKFileProtectionMode)fileProtection toFileAtURL:(NSURL *)url {
-    NSFileManager *fm = [NSFileManager defaultManager];
-    NSError *error = nil;
-    if (!  [fm setAttributes:@{NSFileProtectionKey : ORKFileProtectionFromMode(fileProtection)} ofItemAtPath:[url path] error:&error]) {
-        ORK_Log_Debug(@"Error setting %@ on %@: %@", ORKFileProtectionFromMode(fileProtection), url, error);
-    }
-}
-
-- (void)reportFileResultWithFile:(NSURL *)fileUrl error:(NSError *)error {
-    
-    id<ORKRecorderDelegate> localDelegate = self.delegate;
-    if (fileUrl && !error) {
-        if (localDelegate && [localDelegate respondsToSelector:@selector(recorder:didCompleteWithResult:)]) {
-            ORKFileResult *result = [[ORKFileResult alloc] initWithIdentifier:(NSString *__nonnull)self.step.identifier];
-            result.contentType = [self mimeType];
-            result.fileURL = fileUrl;
-            result.userInfo = [self userInfo];
-            result.startDate = self.startDate;
-            
-            [localDelegate recorder:self didCompleteWithResult:result];
-            
-            // Point future recording at a new directory
-            [self reset];
-        }
-    } else {
-        if (! error)
-        {
-            error = [NSError errorWithDomain:NSCocoaErrorDomain
-                                        code:NSFileReadNoSuchFileError
-                                    userInfo:@{NSLocalizedDescriptionKey:ORKLocalizedString(@"ERROR_RECORDER_NO_DATA", nil)}];
-        }
-        [self finishRecordingWithError:error];
-    }
-}
-
-@end
-

ResearchKit/ActiveTasks/ORKRecorder_Internal.h

@@ -1,70 +0,0 @@
-/*
- Copyright (c) 2015, Apple Inc. All rights reserved.
- 
- Redistribution and use in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met:
- 
- 1.  Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
- 
- 2.  Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation and/or
- other materials provided with the distribution.
- 
- 3.  Neither the name of the copyright holder(s) nor the names of any contributors
- may be used to endorse or promote products derived from this software without
- specific prior written permission. No license is granted to the trademarks of
- the copyright holders even if such marks are included in this software.
- 
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-
-#import <ResearchKit/ORKRecorder.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@class ORKDataLogger;
-
-@interface ORKRecorderConfiguration()
-
-- (instancetype)ork_init;  
-
-@end
-
-
-
-@interface ORKRecorder ()
-
-- (instancetype)ork_init;
-
-@property (nonatomic, strong, nullable) ORKStep *step;
-
-@property (nonatomic, strong, nullable) ORKRecorderConfiguration *configuration;
-
-@property (nonatomic) BOOL continuesInBackground;
-
-@property (nonatomic, copy, nullable) NSDate *startDate;
-
-- (NSString *)recorderType;
-
-- (nullable ORKDataLogger *)makeJSONDataLoggerWithError:(NSError * __autoreleasing *)error NS_REQUIRES_SUPER;
-
-- (void)reset NS_REQUIRES_SUPER;
-
-- (void)reportFileResultWithFile:(NSURL *)fileUrl error:(nullable NSError *)error;
-
-- (nullable NSURL *)recordingDirectoryURL;
-
-@end
-
-NS_ASSUME_NONNULL_END

ResearchKit/ActiveTasks/ORKRecorder_Private.h

@@ -1,102 +0,0 @@
-/*
- Copyright (c) 2015, Apple Inc. All rights reserved.
- 
- Redistribution and use in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met:
- 
- 1.  Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
- 
- 2.  Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation and/or
- other materials provided with the distribution.
- 
- 3.  Neither the name of the copyright holder(s) nor the names of any contributors
- may be used to endorse or promote products derived from this software without
- specific prior written permission. No license is granted to the trademarks of
- the copyright holders even if such marks are included in this software.
- 
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import <ResearchKit/ORKRecorder.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@class ORKStep;
-
-/**
- The `ORKTouchRecorderConfiguration` is a recorder configuration class for
- generating an `ORKTouchRecorder`.
- 
- It is currently considered private, and is not used in any of the active tasks.
- */
-ORK_CLASS_AVAILABLE
-@interface ORKTouchRecorderConfiguration: ORKRecorderConfiguration
-
-- (instancetype)init;
-
-@end
-
-
-@interface ORKRecorder()
-
-- (instancetype)initWithStep:(nullable ORKStep *)step
-             outputDirectory:(nullable NSURL *)outputDirectory;
-
-
-/**
- A preparation step to provide viewController and view before record starting.
- 
- The step view controller should call this method before starting the recorder,
- so that recorders that need a view or gesture recognizer in order to function
- can attach themselves.
- 
- @param viewController  The view controller that is about to 'start'
- @param view            Primary active view for the step.
- */
-- (void)viewController:(UIViewController *)viewController willStartStepWithView:(nullable UIView *)view;
-
-/**
- Indicates that recording has failed; stop recording and report the error to the
- delegate
- 
- @param error       Error that occurred.
- */
-- (void)finishRecordingWithError:(nullable NSError *)error;
-
-/**
- Helper for subclasses to request that file protection be applied to a file on disk.
- 
- This method is exposed to facilitate unit testing.
- 
- @param fileProtection  Level of file protection desired
- @param url             URL of file to protect.
- */
-- (void)applyFileProtection:(ORKFileProtectionMode)fileProtection toFileAtURL:(NSURL *)url;
-
-@end
-
-
-@interface ORKRecorderConfiguration()
-
-/**
- Returns the permission mask indicating the permissions required for this configuration.
- 
- This method is typically overridden in new recorder configuration subclasses.
- */
-- (ORKPermissionMask)requestedPermissionMask;
-
-
-@end
-
-NS_ASSUME_NONNULL_END

ResearchKit/ActiveTasks/ORKSpatialSpanGame.h

@@ -1,81 +0,0 @@
-/*
- Copyright (c) 2015, Apple Inc. All rights reserved.
- 
- Redistribution and use in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met:
- 
- 1.  Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
- 
- 2.  Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation and/or
- other materials provided with the distribution.
- 
- 3.  Neither the name of the copyright holder(s) nor the names of any contributors
- may be used to endorse or promote products derived from this software without
- specific prior written permission. No license is granted to the trademarks of
- the copyright holders even if such marks are included in this software.
- 
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import <Foundation/Foundation.h>
-
-
-/**
- The `ORKSpatialSpanGame` class represents a model object that represents one game-like experience in a spatial span memory task.
- 
- A game consists of a subset of a permutation of the integers [0 .. gameSize-1],
- which represent the sequence of targets that should be tapped.
- 
- */
-@interface ORKSpatialSpanGame : NSObject
-
-/**
- Returns an initialized spatial span game using the specified game size, sequence length, and seed.
- 
- This method is the designated initializer.
- @param gameSize         The number of tiles in the game.
- @param sequenceLength   The number of elements in the sequence that the user has to remember.
- @param seed             The generator that should be used for generating the sequence. A value of 0 means that a random seed is used.
- */
-- (instancetype)initWithGameSize:(NSInteger)gameSize
-                  sequenceLength:(NSInteger)sequenceLength
-                            seed:(uint32_t)seed NS_DESIGNATED_INITIALIZER;
-
-/// The number of tiles in the game.
-@property (nonatomic, readonly) NSInteger gameSize;
-
-/// The length of the sequence. A sequence is a sub-array of a random permutation of integers (0..gameSize-1) that  has a length of `sequenceLength`.
-@property (nonatomic, readonly) NSInteger sequenceLength;
-
-/// The seed to use to generate the sequence. Note that if you pass `seed` to another game, you get the same game.
-@property (nonatomic, readonly) uint32_t seed;
-
-/**
- Enumerates the sequence, calling the block once for each element.
- 
- @param handler The block to be called for each element in the sequence. The `handler` block takes the following parameters:
- 
- `step`  The step in the sequence. The step starts at 0 and increments by one on each call.
- `tileIndex` The index in [ 0 .. gameSize ] that corresponds to the step's element of the sequence.
- `isLastStep` A Boolean value that indicates if this is the last step in the sequence.
-  `stop`   A Boolean value that indicates if the enumeration should be terminated (pass `NO` to terminate the enumeration).
- */
-
-- (void)enumerateSequenceWithHandler:(void(^)(NSInteger step, NSInteger tileIndex, BOOL isLastStep, BOOL *stop))handler;
-
-/// Returns the value of the specified step in the sequence.
-- (NSInteger)tileIndexForStep:(NSInteger)step;
-
-
-@end

ResearchKit/ActiveTasks/ORKSpatialSpanGame.m

@@ -1,104 +0,0 @@
-/*
- Copyright (c) 2015, Apple Inc. All rights reserved.
- 
- Redistribution and use in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met:
- 
- 1.  Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
- 
- 2.  Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation and/or
- other materials provided with the distribution.
- 
- 3.  Neither the name of the copyright holder(s) nor the names of any contributors
- may be used to endorse or promote products derived from this software without
- specific prior written permission. No license is granted to the trademarks of
- the copyright holders even if such marks are included in this software.
- 
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import "ORKSpatialSpanGame.h"
-
-@implementation ORKSpatialSpanGame
-{
-    NSInteger *_sequence;
-}
-
-- (void)generateSequence {
-    _sequence = calloc(_gameSize, sizeof(NSInteger));
-    if (_sequence == NULL) {
-        return;
-    }
-    for (NSInteger i = 0; i < _gameSize; i++) {
-        _sequence[i] = i;
-    }
-    
-    // Knuth algorithm: swap each with a random element elsewhere in the array.
-    // Note: we will only use the first _sequenceLength elements of this array
-    srandom(_seed);
-    for (NSInteger i = 0; i < _gameSize; i++) {
-        NSInteger rand_i = random() % _gameSize;
-        NSInteger tmp = _sequence[i];
-        _sequence[i] = _sequence[rand_i];
-        _sequence[rand_i] = tmp;
-    }
-}
-
-- (void)dealloc {
-    if (_sequence != NULL) {
-        free(_sequence);
-        _sequence = NULL;
-    }
-}
-
-- (instancetype)initWithGameSize:(NSInteger)gameSize
-                  sequenceLength:(NSInteger)sequenceLength
-                            seed:(uint32_t)seed {
-    self = [super init];
-    if (self) {
-        _gameSize = gameSize;
-        _sequenceLength = sequenceLength;
-        NSParameterAssert(_gameSize > 0);
-        NSParameterAssert(_sequenceLength > 0);
-        NSParameterAssert(_sequenceLength < _gameSize);
-        _seed = seed;
-        if (_seed == 0) {
-            _seed = arc4random();
-        }
-        [self generateSequence];
-        
-        if (_sequence == NULL) {
-            self = nil;
-        }
-        
-    }
-    return self;
-}
-
-
-
-/// Step parameter is the step in the sequence; tileIndex is the value of that step of the sequence.
-- (void)enumerateSequenceWithHandler:(void(^)(NSInteger step, NSInteger tileIndex, BOOL isLastStep, BOOL *stop))handler {
-    BOOL stop = NO;
-    for (NSInteger i = 0; i < _sequenceLength; i++) {
-        handler(i, _sequence[i], (i == _sequenceLength), &stop);
-        if (stop) break;
-    }
-}
-
-- (NSInteger)tileIndexForStep:(NSInteger)step {
-    return _sequence[step];
-}
-
-@end

ResearchKit/ActiveTasks/ORKSpatialSpanGameState.h

@@ -1,68 +0,0 @@
-/*
- Copyright (c) 2015, Apple Inc. All rights reserved.
- 
- Redistribution and use in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met:
- 
- 1.  Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
- 
- 2.  Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation and/or
- other materials provided with the distribution.
- 
- 3.  Neither the name of the copyright holder(s) nor the names of any contributors
- may be used to endorse or promote products derived from this software without
- specific prior written permission. No license is granted to the trademarks of
- the copyright holders even if such marks are included in this software.
- 
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import <Foundation/Foundation.h>
-#import "ORKSpatialSpanTargetView.h"
-
-NS_ASSUME_NONNULL_BEGIN
-
-@class ORKSpatialSpanGame;
-
-typedef NS_ENUM(NSInteger, ORKSpatialSpanResult) {
-    ORKSpatialSpanResultIgnore,
-    ORKSpatialSpanResultCorrect,
-    ORKSpatialSpanResultIncorrect
-};
-
-@interface ORKSpatialSpanGameState : NSObject
-
-- (instancetype)initWithGame:(ORKSpatialSpanGame *)game NS_DESIGNATED_INITIALIZER;
-
-@property (nonatomic, strong, readonly, nullable) ORKSpatialSpanGame *game;
-
-@property (nonatomic, readonly, getter=isComplete) BOOL complete;
-
-/// Enumerates all tiles, indicating the state of each tile at the specified state of the game.
-- (void)enumerateTilesWithHandler:(void (^)(NSInteger tileIndex, ORKSpatialSpanTargetState state, BOOL *stop))handler;
-
-/// Returns a result indicating whether the user's tap was correct, incorrect, or ignorable.
-- (ORKSpatialSpanResult)playTileIndex:(NSInteger)tileIndex;
-
-- (void)reset;
-
-// Returns `NSNotFound` if there have been no plays
-- (NSInteger)lastSuccessfulTileIndex;
-
-// Number of tiles that have been successfully tapped
-- (NSInteger)currentStepIndex;
-
-@end
-
-NS_ASSUME_NONNULL_END

ResearchKit/ActiveTasks/ORKSpatialSpanGameState.m

@@ -1,113 +0,0 @@
-/*
- Copyright (c) 2015, Apple Inc. All rights reserved.
- 
- Redistribution and use in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met:
- 
- 1.  Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
- 
- 2.  Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation and/or
- other materials provided with the distribution.
- 
- 3.  Neither the name of the copyright holder(s) nor the names of any contributors
- may be used to endorse or promote products derived from this software without
- specific prior written permission. No license is granted to the trademarks of
- the copyright holders even if such marks are included in this software.
- 
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import "ORKSpatialSpanGameState.h"
-#import "ORKSpatialSpanGame.h"
-
-
-@implementation ORKSpatialSpanGameState {
-    NSMutableArray *_plays;
-    ORKSpatialSpanTargetState *_states;
-}
-
-
-- (instancetype)initWithGame:(ORKSpatialSpanGame *)game {
-    self = [super init];
-    if (self) {
-        _game = game;
-        _plays = [NSMutableArray array];
-        
-        _states = calloc([_game gameSize], sizeof(ORKSpatialSpanTargetState));
-        if (_states == NULL) {
-            self = nil;
-        }
-    }
-    return self;
-}
-
-- (void)dealloc {
-    if (_states != NULL) {
-        free(_states);
-        _states = NULL;
-    }
-}
-
-
-- (void)reset {
-    const NSInteger gameSize = [_game gameSize];
-    for (NSInteger tileIndex = 0; tileIndex < gameSize; tileIndex++) {
-        _states[tileIndex] = ORKSpatialSpanTargetStateQuiescent;
-    }
-    [_plays removeAllObjects];
-    _complete = NO;
-}
-
-/// Enumerate all tiles, indicating the state of each tile at this point in the game.
-- (void)enumerateTilesWithHandler:(void (^)(NSInteger tileIndex, ORKSpatialSpanTargetState state, BOOL *stop))handler {
-    const NSInteger gameSize = [_game gameSize];
-    BOOL stop = NO;
-    for (NSInteger tileIndex = 0; tileIndex < gameSize; tileIndex++) {
-        handler(tileIndex, _states[tileIndex], &stop);
-        if (stop) break;
-    }
-}
-
-/// User tapped a tile. Returns YES if it was the correct next tile.
-- (ORKSpatialSpanResult)playTileIndex:(NSInteger)tileIndex {
-    if (_states[tileIndex] != ORKSpatialSpanTargetStateQuiescent) {
-        return ORKSpatialSpanResultIgnore;
-    }
-    
-    NSInteger sequencePosition = [_plays count];
-    BOOL correct = ([_game tileIndexForStep:sequencePosition] == tileIndex);
-    _states[tileIndex] = correct ? ORKSpatialSpanTargetStateCorrect : ORKSpatialSpanTargetStateIncorrect;
-    if (correct) {
-        [_plays addObject:@(tileIndex)];
-    }
-    if ([_plays count] >= [_game sequenceLength]) {
-        _complete = YES;
-    }
-    
-    return correct ? ORKSpatialSpanResultCorrect : ORKSpatialSpanResultIncorrect;
-}
-
-
-- (NSInteger)currentStepIndex {
-    return [_plays count];
-}
-
-- (NSInteger)lastSuccessfulTileIndex {
-    if (! [_plays count]) {
-        return NSNotFound;
-    }
-    return [[_plays lastObject] integerValue];
-}
-
-@end

ResearchKit/ActiveTasks/ORKSpatialSpanMemoryContentView.h

@@ -1,84 +0,0 @@
-/*
- Copyright (c) 2015, Apple Inc. All rights reserved.
- 
- Redistribution and use in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met:
- 
- 1.  Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
- 
- 2.  Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation and/or
- other materials provided with the distribution.
- 
- 3.  Neither the name of the copyright holder(s) nor the names of any contributors
- may be used to endorse or promote products derived from this software without
- specific prior written permission. No license is granted to the trademarks of
- the copyright holders even if such marks are included in this software.
- 
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import "ORKCustomStepView_Internal.h"
-#import "ORKSpatialSpanTargetView.h"
-
-NS_ASSUME_NONNULL_BEGIN
-
-typedef struct {
-    NSInteger width;
-    NSInteger height;
-} ORKGridSize;
-
-@class ORKSpatialSpanMemoryGameView;
-
-@protocol ORKSpatialSpanMemoryGameViewDelegate<NSObject>
-
-- (void)gameView:(ORKSpatialSpanMemoryGameView *)gameView didTapTileWithIndex:(NSInteger)tileIndex recognizer:(UITapGestureRecognizer *)recognizer;
-
-@end
-
-@interface ORKSpatialSpanMemoryGameView : UIView <ORKSpatialSpanTargetViewDelegate>
-
-@property (nonatomic, weak, nullable) id<ORKSpatialSpanMemoryGameViewDelegate> delegate;
-
-@property (nonatomic, assign) ORKGridSize gridSize;
-
-@property (nonatomic, readonly) NSInteger numberOfTiles;
-
-@property (nonatomic, readonly, nullable) NSArray *tileViews;
-
-@property (nonatomic, strong, nullable) UIImage *customTargetImage;
-
-- (void)resetTilesAnimated:(BOOL)animated;
-
-- (void)setState:(ORKSpatialSpanTargetState)state forTileIndex:(NSInteger)tileIndex animated:(BOOL)animated;
-- (ORKSpatialSpanTargetState)stateForTileIndex:(NSInteger)tileIndex;
-
-@end
-
-
-@interface ORKSpatialSpanMemoryContentView : ORKActiveStepCustomView
-
-@property (nonatomic, readonly, strong) ORKSpatialSpanMemoryGameView *gameView;
-
-@property (nonatomic, assign, getter=isFooterHidden) BOOL footerHidden;
-
-@property (nonatomic, strong, nullable) NSString *capitalizedPluralItemDescription;
-
-// Things that can be shown in the footer.
-@property (nonatomic, assign) NSInteger numberOfItems;
-@property (nonatomic, assign) NSInteger score;
-@property (nonatomic, strong, nullable) UIBarButtonItem *buttonItem;
-
-@end
-
-NS_ASSUME_NONNULL_END

ResearchKit/ActiveTasks/ORKSpatialSpanMemoryContentView.m

@@ -1,305 +0,0 @@
-/*
- Copyright (c) 2015, Apple Inc. All rights reserved.
- 
- Redistribution and use in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met:
- 
- 1.  Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
- 
- 2.  Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation and/or
- other materials provided with the distribution.
- 
- 3.  Neither the name of the copyright holder(s) nor the names of any contributors
- may be used to endorse or promote products derived from this software without
- specific prior written permission. No license is granted to the trademarks of
- the copyright holders even if such marks are included in this software.
- 
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import "ORKSpatialSpanMemoryContentView.h"
-#import "ORKSpatialSpanTargetView.h"
-#import "ORKActiveStepQuantityView.h"
-#import "ORKVerticalContainerView.h"
-#import "ORKSkin.h"
-#import "ORKHelpers.h"
-
-
-// #define LAYOUT_DEBUG 1
-
-@implementation ORKSpatialSpanMemoryGameView
-
-#pragma mark Primary interface
-
-- (void)setGridSize:(ORKGridSize)gridSize {
-    _gridSize = gridSize;
-#if LAYOUT_DEBUG
-    self.backgroundColor = [[UIColor redColor] colorWithAlphaComponent:0.2];
-#endif
-    [self resetTilesAnimated:NO];
-}
-
-- (NSInteger)numberOfTiles {
-    return _gridSize.width * _gridSize.height;
-}
-
-- (ORKSpatialSpanTargetView *)makeTargetView {
-    ORKSpatialSpanTargetView *targetView = [[ORKSpatialSpanTargetView alloc] init];
-    targetView.customTargetImage = _customTargetImage;
-    return targetView;
-}
-
-- (void)resetTilesAnimated:(BOOL)animated {
-    NSArray *currentViews = _tileViews;
-    NSInteger numberOfTilesOld = [_tileViews count];
-    NSInteger numberOfTilesNew = _gridSize.width*_gridSize.height;
-    NSMutableArray *newViews = [NSMutableArray arrayWithCapacity:numberOfTilesNew];
-    NSArray *viewsToRemove = nil;
-    if (numberOfTilesOld <= numberOfTilesNew) {
-        [newViews addObjectsFromArray:currentViews];
-        NSInteger tilesToAdd = numberOfTilesNew - numberOfTilesOld;
-        for (NSInteger idx = 0; idx < tilesToAdd; idx++) {
-            [newViews addObject:[self makeTargetView]];
-        }
-    } else {
-        [newViews addObjectsFromArray:[currentViews subarrayWithRange:(NSRange){0,numberOfTilesNew}]];
-        viewsToRemove = [currentViews subarrayWithRange:(NSRange){numberOfTilesNew, numberOfTilesOld-numberOfTilesNew}];
-    }
-    
-    void(^resetBlock)(void) = ^(void) {
-        for (ORKSpatialSpanTargetView *view in viewsToRemove) {
-            view.delegate = nil;
-            [view removeFromSuperview];
-        }
-        if (numberOfTilesNew > numberOfTilesOld) {
-            NSArray *addedViews = [newViews subarrayWithRange:(NSRange){numberOfTilesOld,numberOfTilesNew-numberOfTilesOld}];
-            for (ORKSpatialSpanTargetView *view in addedViews) {
-                view.delegate = self;
-                [self addSubview:view];
-            }
-        }
-        
-        _tileViews = newViews;
-        for (ORKSpatialSpanTargetView *view in _tileViews) {
-            [view setState:ORKSpatialSpanTargetStateQuiescent];
-        }
-        
-        [self layoutSubviews];
-    };
-    
-    if (animated) {
-        [UIView transitionWithView:self duration:0.3 options:UIViewAnimationOptionCurveEaseInOut animations:resetBlock completion:NULL];
-    } else {
-        resetBlock();
-    }
-    
-}
-
-- (void)setCustomTargetImage:(UIImage *)customTargetImage {
-    _customTargetImage = customTargetImage;
-    for (ORKSpatialSpanTargetView *view in _tileViews) {
-        view.customTargetImage = _customTargetImage;
-    }
-}
-
-- (void)targetView:(ORKSpatialSpanTargetView *)targetView recognizer:(UITapGestureRecognizer *)recognizer {
-    [_delegate gameView:self
-    didTapTileWithIndex:[_tileViews indexOfObject:targetView]
-         recognizer:recognizer];
-}
-
-- (void)layoutSubviews {
-    [super layoutSubviews];
-    
-    CGRect bds = [self bounds];
-    CGFloat gridItemEdgeLength =  ORKFloorToViewScale(MIN(bds.size.width / _gridSize.width, bds.size.height / _gridSize.height), self);
-    
-    gridItemEdgeLength = MIN(gridItemEdgeLength, 114);
-    CGSize gridItemSize = (CGSize){gridItemEdgeLength, gridItemEdgeLength};
-    
-    CGPoint centeringOffset = CGPointZero;
-    centeringOffset.x = 0.5*(bds.size.width - (gridItemSize.width * _gridSize.width));
-    centeringOffset.y = 0.5*(bds.size.height - (gridItemSize.height * _gridSize.height));
-    
-    NSInteger tileIndex = 0;
-    for (NSInteger x = 0; x < _gridSize.width; x++) {
-        for (NSInteger y = 0; y < _gridSize.height; y++) {
-            ORKSpatialSpanTargetView *targetView = [_tileViews objectAtIndex:tileIndex];
-            
-            CGPoint origin = (CGPoint){.x = ORKFloorToViewScale(centeringOffset.x + x * gridItemSize.width, self),
-                .y = ORKFloorToViewScale(centeringOffset.y + y * gridItemSize.height, self)};
-            targetView.frame = (CGRect){.origin=origin, .size=gridItemSize};
-            
-            tileIndex ++;
-        }
-    }
-}
-
-- (void)setState:(ORKSpatialSpanTargetState)state forTileIndex:(NSInteger)tileIndex animated:(BOOL)animated {
-    ORKSpatialSpanTargetView *view = [_tileViews objectAtIndex:tileIndex];
-    [view setState:state animated:animated];
-}
-
-- (ORKSpatialSpanTargetState)stateForTileIndex:(NSInteger)tileIndex {
-    return [(ORKSpatialSpanTargetView *)[_tileViews objectAtIndex:tileIndex] state];
-}
-
-#pragma mark Accessibility
-
-- (BOOL)isAccessibilityElement {
-    return NO;
-}
-
-@end
-
-@implementation ORKSpatialSpanMemoryContentView {
-    ORKQuantityPairView *_quantityPairView;
-    ORKNavigationContainerView *_continueView;
-    NSArray *_constraints;
-    NSLayoutConstraint *_topConstraint;
-}
-
-- (ORKActiveStepQuantityView *)countView {
-    return [_quantityPairView leftView];
-}
-
-- (ORKActiveStepQuantityView *)scoreView {
-    return [_quantityPairView rightView];
-}
-
-- (instancetype)initWithFrame:(CGRect)frame {
-    self = [super initWithFrame:frame];
-    if (self) {
-        _gameView = [ORKSpatialSpanMemoryGameView new];
-        _gameView.translatesAutoresizingMaskIntoConstraints = NO;
-        [self addSubview:_gameView];
-        
-        _quantityPairView = [ORKQuantityPairView new];
-        _quantityPairView.translatesAutoresizingMaskIntoConstraints = NO;
-        [self addSubview:_quantityPairView];
-        
-        _continueView = [ORKNavigationContainerView new];
-        _continueView.translatesAutoresizingMaskIntoConstraints = NO;
-        _continueView.continueEnabled = YES;
-        _continueView.bottomMargin = 20;
-        [self addSubview:_continueView];
-        
-        ORKActiveStepQuantityView *countView = [self countView];
-        ORKActiveStepQuantityView *scoreView = [self scoreView];
-        
-        _capitalizedPluralItemDescription = [ORKLocalizedString(@"SPATIAL_SPAN_MEMORY_TARGET_STANDALONE", nil) capitalizedStringWithLocale:[NSLocale currentLocale]];
-        
-        countView.title = [NSString stringWithFormat:ORKLocalizedString(@"MEMORY_GAME_ITEM_COUNT_TITLE_%@", nil), _capitalizedPluralItemDescription];
-        scoreView.title = ORKLocalizedString(@"MEMORY_GAME_SCORE_TITLE", nil);
-        countView.enabled = YES;
-        scoreView.enabled = YES;
-        
-        self.numberOfItems = 0;
-        self.score = 0;
-        
-        [self updateMargins];
-        
-#if LAYOUT_DEBUG
-        self.backgroundColor = [[UIColor greenColor] colorWithAlphaComponent:0.2];
-        _gameView.backgroundColor = [[UIColor blueColor] colorWithAlphaComponent:0.2];
-        _continueView.backgroundColor = [[UIColor cyanColor] colorWithAlphaComponent:0.2];
-        _quantityPairView.backgroundColor = [[UIColor redColor] colorWithAlphaComponent:0.2];
-        [self scoreView].backgroundColor = [[UIColor purpleColor] colorWithAlphaComponent:0.2];
-        [self countView].backgroundColor = [[UIColor purpleColor] colorWithAlphaComponent:0.2];
-#endif
-        
-        
-        [self setNeedsUpdateConstraints];
-    }
-    return self;
-}
-
-- (void)setCapitalizedPluralItemDescription:(NSString *)capitalizedPluralItemDescription {
-    _capitalizedPluralItemDescription = capitalizedPluralItemDescription;
-    [self countView].title = [NSString stringWithFormat:ORKLocalizedString(@"MEMORY_GAME_ITEM_COUNT_TITLE_%@", nil), _capitalizedPluralItemDescription];
-}
-
-- (void)setNumberOfItems:(NSInteger)numberOfItems {
-    ORKActiveStepQuantityView *countView = [self countView];
-    countView.value = [NSString stringWithFormat:@"%ld", (long)numberOfItems];
-}
-
-
-- (void)setScore:(NSInteger)score {
-    ORKActiveStepQuantityView *scoreView = [self scoreView];
-    scoreView.value = [NSString stringWithFormat:@"%ld", (long)score];
-}
-
-- (void)updateFooterHidden {
-    _quantityPairView.hidden = (_footerHidden || (_buttonItem != nil));
-}
-
-- (void)setFooterHidden:(BOOL)footerHidden {
-    _footerHidden = footerHidden;
-    [self updateFooterHidden];
-}
-
-- (void)setButtonItem:(UIBarButtonItem *)buttonItem {
-    _buttonItem = buttonItem;
-    _continueView.continueButtonItem = buttonItem;
-    _continueView.hidden = (buttonItem == nil);
-    [self updateFooterHidden];
-}
-
-
-- (void)updateMargins {
-    self.layoutMargins = (UIEdgeInsets){.left=ORKStandardMarginForView(self),.right=ORKStandardMarginForView(self)};
-    _quantityPairView.layoutMargins = self.layoutMargins;
-}
-
-- (void)traitCollectionDidChange:(UITraitCollection *)previousTraitCollection {
-    [self updateMargins];
-}
-
-- (void)updateConstraints {
-    if (_constraints) {
-        [NSLayoutConstraint deactivateConstraints:_constraints];
-        _constraints = nil;
-    }
-    
-    NSMutableArray *constraints = [NSMutableArray array];
-    
-    NSDictionary *views = NSDictionaryOfVariableBindings(_gameView, _quantityPairView, _continueView);
-    
-    [constraints addObjectsFromArray:[NSLayoutConstraint constraintsWithVisualFormat:@"V:|-(>=0)-[_gameView][_quantityPairView]|" options:NSLayoutFormatAlignAllCenterX metrics:nil views:views]];
-    NSLayoutConstraint *c1 = [NSLayoutConstraint constraintWithItem:_gameView attribute:NSLayoutAttributeHeight relatedBy:NSLayoutRelationEqual toItem:nil attribute:NSLayoutAttributeNotAnAttribute multiplier:1 constant:1000];
-    c1.priority = UILayoutPriorityDefaultLow-1;
-    [constraints addObject:c1];
-    
-    [constraints addObjectsFromArray:[NSLayoutConstraint constraintsWithVisualFormat:@"H:|-[_gameView]-|" options:(NSLayoutFormatOptions)0 metrics:nil views:views]];
-    
-    [constraints addObjectsFromArray:[NSLayoutConstraint constraintsWithVisualFormat:@"H:|[_quantityPairView]|" options:(NSLayoutFormatOptions)0 metrics:nil views:views]];
-    [constraints addObjectsFromArray:[NSLayoutConstraint constraintsWithVisualFormat:@"H:|[_continueView]|" options:(NSLayoutFormatOptions)0 metrics:nil views:views]];
-    [constraints addObject:[NSLayoutConstraint constraintWithItem:_continueView attribute:NSLayoutAttributeBottom relatedBy:NSLayoutRelationEqual toItem:_quantityPairView attribute:NSLayoutAttributeBottom multiplier:1 constant:0]];
-    [constraints addObject:[NSLayoutConstraint constraintWithItem:_continueView attribute:NSLayoutAttributeTop relatedBy:NSLayoutRelationGreaterThanOrEqual toItem:_quantityPairView attribute:NSLayoutAttributeTop multiplier:1 constant:0]];
-    
-    NSLayoutConstraint *maxWidthConstraint = [NSLayoutConstraint constraintWithItem:self attribute:NSLayoutAttributeWidth relatedBy:NSLayoutRelationEqual toItem:nil attribute:NSLayoutAttributeNotAnAttribute multiplier:1 constant:10000];
-    maxWidthConstraint.priority = UILayoutPriorityRequired-1;
-    [constraints addObject:maxWidthConstraint];
-
-    
-    [NSLayoutConstraint activateConstraints:constraints];
-    _constraints = constraints;
-    
-    [super updateConstraints];
-}
-
-
-
-@end

ResearchKit/ActiveTasks/ORKSpatialSpanMemoryStep.h

@@ -1,50 +0,0 @@
-/*
- Copyright (c) 2015, Apple Inc. All rights reserved.
- 
- Redistribution and use in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met:
- 
- 1.  Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
- 
- 2.  Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation and/or
- other materials provided with the distribution.
- 
- 3.  Neither the name of the copyright holder(s) nor the names of any contributors
- may be used to endorse or promote products derived from this software without
- specific prior written permission. No license is granted to the trademarks of
- the copyright holders even if such marks are included in this software.
- 
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import <ResearchKit/ResearchKit_Private.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-ORK_CLASS_AVAILABLE
-@interface ORKSpatialSpanMemoryStep : ORKActiveStep
-
-@property (nonatomic, assign) NSInteger initialSpan;
-@property (nonatomic, assign) NSInteger minimumSpan;
-@property (nonatomic, assign) NSInteger maximumSpan;
-@property (nonatomic, assign) NSTimeInterval playSpeed;
-@property (nonatomic, assign) NSInteger maxTests;
-@property (nonatomic, assign) NSInteger maxConsecutiveFailures;
-@property (nonatomic, assign) BOOL requireReversal;
-@property (nonatomic, strong, nullable) UIImage *customTargetImage;
-@property (nonatomic, copy, nullable) NSString *customTargetPluralName;
-
-@end
-
-NS_ASSUME_NONNULL_END

ResearchKit/ActiveTasks/ORKSpatialSpanMemoryStep.m

@@ -1,192 +0,0 @@
-/*
- Copyright (c) 2015, Apple Inc. All rights reserved.
- 
- Redistribution and use in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met:
- 
- 1.  Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
- 
- 2.  Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation and/or
- other materials provided with the distribution.
- 
- 3.  Neither the name of the copyright holder(s) nor the names of any contributors
- may be used to endorse or promote products derived from this software without
- specific prior written permission. No license is granted to the trademarks of
- the copyright holders even if such marks are included in this software.
- 
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import "ORKSpatialSpanMemoryStep.h"
-#import "ORKSpatialSpanMemoryStepViewController.h"
-#import "ORKHelpers.h"
-#import "ORKStep_Private.h"
-
-@implementation ORKSpatialSpanMemoryStep
-
-+ (Class)stepViewControllerClass {
-    return [ORKSpatialSpanMemoryStepViewController class];
-}
-
-- (instancetype)initWithIdentifier:(NSString *)identifier {
-    self = [super initWithIdentifier:identifier];
-    self.shouldStartTimerAutomatically = YES;
-    self.shouldContinueOnFinish = YES;
-    return self;
-}
-
-- (instancetype)copyWithZone:(NSZone *)zone
-{
-    ORKSpatialSpanMemoryStep *step = [super copyWithZone:zone];
-    step.initialSpan = self.initialSpan;
-    step.minimumSpan = self.minimumSpan;
-    step.maximumSpan = self.maximumSpan;
-    step.playSpeed = self.playSpeed;
-    step.maxTests = self.maxTests;
-    step.maxConsecutiveFailures = self.maxConsecutiveFailures;
-    step.requireReversal = self.requireReversal;
-    step.customTargetImage = self.customTargetImage;
-    step.customTargetPluralName = self.customTargetPluralName;
-    return step;
-}
-
-- (void)validateParameters {
-    
-    [super validateParameters];
-    
-    NSInteger const ORKSpatialSpanMemoryTaskMinimumInitialSpan = 2;
-    NSInteger const ORKSpatialSpanMemoryTaskMaximumSpan = 20;
-    NSTimeInterval const ORKSpatialSpanMemoryTaskMinimumPlaySpeed = 0.5;
-    NSTimeInterval const ORKSpatialSpanMemoryTaskMaximumPlaySpeed = 20;
-    NSInteger const ORKSpatialSpanMemoryTaskMinimumMaxTests = 1;
-    NSInteger const ORKSpatialSpanMemoryTaskMinimumMaxConsecutiveFailures = 1;
-    
-    if ( self.initialSpan < ORKSpatialSpanMemoryTaskMinimumInitialSpan)
-    {
-        @throw [NSException exceptionWithName:NSInvalidArgumentException
-                                       reason:[NSString stringWithFormat:@"initialSpan can not be less than %@.", @(ORKSpatialSpanMemoryTaskMinimumInitialSpan)]
-                                     userInfo:nil];
-    }
-    
-    if ( self.minimumSpan > self.initialSpan)
-    {
-        @throw [NSException exceptionWithName:NSInvalidArgumentException reason:@"initialSpan can not be less than minimumSpan." userInfo:nil];
-    }
-    
-    if ( self.initialSpan > self.maximumSpan)
-    {
-        @throw [NSException exceptionWithName:NSInvalidArgumentException reason:@"maximumSpan can not be less than initialSpan." userInfo:nil];
-    }
-    
-    if ( self.maximumSpan > ORKSpatialSpanMemoryTaskMaximumSpan)
-    {
-        @throw [NSException exceptionWithName:NSInvalidArgumentException
-                                       reason:[NSString stringWithFormat:@"maximumSpan can not be more than %@.", @(ORKSpatialSpanMemoryTaskMaximumSpan)]
-                                     userInfo:nil];
-    }
-    
-    if  (self.playSpeed < ORKSpatialSpanMemoryTaskMinimumPlaySpeed)
-    {
-        @throw [NSException exceptionWithName:NSInvalidArgumentException
-                                       reason:[NSString stringWithFormat:@"playSpeed can not be shorter than %@ seconds.", @(ORKSpatialSpanMemoryTaskMinimumPlaySpeed)]
-                                     userInfo:nil];
-    }
-    
-    if  (self.playSpeed > ORKSpatialSpanMemoryTaskMaximumPlaySpeed)
-    {
-        @throw [NSException exceptionWithName:NSInvalidArgumentException
-                                       reason:[NSString stringWithFormat:@"playSpeed can not be longer than %@ seconds.", @(ORKSpatialSpanMemoryTaskMaximumPlaySpeed)]
-                                     userInfo:nil];
-    }
-    
-    if  (self.maxTests < ORKSpatialSpanMemoryTaskMinimumMaxTests)
-    {
-        @throw [NSException exceptionWithName:NSInvalidArgumentException
-                                       reason:[NSString stringWithFormat:@"maxTests can not be less than %@.", @(ORKSpatialSpanMemoryTaskMinimumMaxTests)]
-                                     userInfo:nil];
-    }
-    
-    if  (self.maxConsecutiveFailures < ORKSpatialSpanMemoryTaskMinimumMaxConsecutiveFailures)
-    {
-        @throw [NSException exceptionWithName:NSInvalidArgumentException
-                                       reason:[NSString stringWithFormat:@"maxConsecutiveFailures can not be less than %@.", @(ORKSpatialSpanMemoryTaskMinimumMaxConsecutiveFailures)]
-                                     userInfo:nil];
-    }
-}
-
-- (BOOL)startsFinished {
-    return NO;
-}
-
-- (instancetype)initWithCoder:(NSCoder *)aDecoder
-{
-    self = [super initWithCoder:aDecoder];
-    if (self)
-    {
-        ORK_DECODE_INTEGER(aDecoder, initialSpan);
-        ORK_DECODE_INTEGER(aDecoder, minimumSpan);
-        ORK_DECODE_INTEGER(aDecoder, maximumSpan);
-        ORK_DECODE_INTEGER(aDecoder, playSpeed);
-        ORK_DECODE_INTEGER(aDecoder, maxTests);
-        ORK_DECODE_INTEGER(aDecoder, maxConsecutiveFailures);
-        ORK_DECODE_BOOL(aDecoder, requireReversal);
-        ORK_DECODE_IMAGE(aDecoder, customTargetImage);
-        ORK_DECODE_OBJ_CLASS(aDecoder, customTargetPluralName, NSString);
-    }
-    return self;
-}
-
-- (void)encodeWithCoder:(NSCoder *)aCoder
-{
-    [super encodeWithCoder:aCoder];
-    ORK_ENCODE_INTEGER(aCoder, initialSpan);
-    ORK_ENCODE_INTEGER(aCoder, minimumSpan);
-    ORK_ENCODE_INTEGER(aCoder, maximumSpan);
-    ORK_ENCODE_INTEGER(aCoder, playSpeed);
-    ORK_ENCODE_INTEGER(aCoder, maxTests);
-    ORK_ENCODE_INTEGER(aCoder, maxConsecutiveFailures);
-    ORK_ENCODE_BOOL(aCoder, requireReversal);
-    ORK_ENCODE_IMAGE(aCoder, customTargetImage);
-    ORK_ENCODE_OBJ(aCoder, customTargetPluralName);
-}
-
-+ (BOOL)supportsSecureCoding
-{
-    return YES;
-}
-
-
-- (BOOL)isEqual:(id)object {
-    BOOL isParentSame = [super isEqual:object];
-    
-    __typeof(self) castObject = object;
-    return (isParentSame &&
-            (self.initialSpan == castObject.initialSpan) &&
-            (self.minimumSpan == castObject.minimumSpan) &&
-            (self.maximumSpan == castObject.maximumSpan) &&
-            (self.playSpeed == castObject.playSpeed) &&
-            (self.maxTests == castObject.maxTests) &&
-            (self.maxConsecutiveFailures == castObject.maxConsecutiveFailures) &&
-            (ORKEqualObjects(self.customTargetPluralName, castObject.customTargetPluralName)) &&
-            (self.requireReversal == castObject.requireReversal)) ;
-}
-
-
-
-- (BOOL)allowsBackNavigation {
-    return NO;
-}
-
-@end
-

ResearchKit/ActiveTasks/ORKSpatialSpanMemoryStepViewController.h

@@ -1,39 +0,0 @@
-/*
- Copyright (c) 2015, Apple Inc. All rights reserved.
- 
- Redistribution and use in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met:
- 
- 1.  Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
- 
- 2.  Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation and/or
- other materials provided with the distribution.
- 
- 3.  Neither the name of the copyright holder(s) nor the names of any contributors
- may be used to endorse or promote products derived from this software without
- specific prior written permission. No license is granted to the trademarks of
- the copyright holders even if such marks are included in this software.
- 
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import <ResearchKit/ResearchKit_Private.h>
-
-/**
- View controller corresponding to `ORKSpatialSpanMemoryStep`.
- */
-ORK_CLASS_AVAILABLE
-@interface ORKSpatialSpanMemoryStepViewController : ORKActiveStepViewController
-
-@end

ResearchKit/ActiveTasks/ORKSpatialSpanMemoryStepViewController.m

@@ -1,776 +0,0 @@
-/*
- Copyright (c) 2015, Apple Inc. All rights reserved.
- 
- Redistribution and use in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met:
- 
- 1.  Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
- 
- 2.  Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation and/or
- other materials provided with the distribution.
- 
- 3.  Neither the name of the copyright holder(s) nor the names of any contributors
- may be used to endorse or promote products derived from this software without
- specific prior written permission. No license is granted to the trademarks of
- the copyright holders even if such marks are included in this software.
- 
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import "ORKSpatialSpanMemoryStepViewController.h"
-#import "ORKHelpers.h"
-#import "ORKActiveStep_Internal.h"
-#import "ORKStep_Private.h"
-#import "ORKActiveStepViewController_Internal.h"
-#import "ORKSpatialSpanMemoryContentView.h"
-#import "ORKVerticalContainerView.h"
-#import "ORKStepViewController_Internal.h"
-#import "ORKSpatialSpanGame.h"
-#import "ORKSpatialSpanGameState.h"
-#import "ORKVerticalContainerView_Internal.h"
-#import "ORKSkin.h"
-#import "ORKResult.h"
-#import <QuartzCore/CABase.h>
-#import "ORKSpatialSpanMemoryStep.h"
-#import "ORKActiveStepView.h"
-
-static const NSTimeInterval kMemoryGameActivityTimeout = 20;
-
-typedef NS_ENUM(NSInteger, ORKSpatialSpanStepState) {
-    ORKSpatialSpanStepStateInitial,
-    ORKSpatialSpanStepStatePlayback,
-    ORKSpatialSpanStepStateGameplay,
-    ORKSpatialSpanStepStateTimeout,
-    ORKSpatialSpanStepStateFailed,
-    ORKSpatialSpanStepStateSuccess,
-    ORKSpatialSpanStepStateRestart,
-    ORKSpatialSpanStepStateComplete,
-    ORKSpatialSpanStepStateStopped,
-    ORKSpatialSpanStepStatePaused
-};
-
-@class ORKState;
-
-typedef void (^_ORKStateHandler)(ORKState *fromState, ORKState *_toState, id context);
-
-// Poor man's state machine:
-// Define entry and exit handlers for each state.
-// Transitions are a free for all!
-@interface ORKState : NSObject
-
-+ (ORKState *)stateWithState:(NSInteger)state entryHandler:(_ORKStateHandler)entryHandler exitHandler:(_ORKStateHandler)exitHandler context:(id)context;
-
-@property (nonatomic, assign) NSInteger state;
-
-@property (nonatomic, weak) id context;
-
-@property (nonatomic, copy) _ORKStateHandler entryHandler;
-- (void)setEntryHandler:(_ORKStateHandler)entryHandler;
-
-@property (nonatomic, copy) _ORKStateHandler exitHandler;
-- (void)setExitHandler:(_ORKStateHandler)exitHandler;
-
-@end
-
-@implementation ORKState;
-
-+ (ORKState *)stateWithState:(NSInteger)state entryHandler:(_ORKStateHandler)entryHandler exitHandler:(_ORKStateHandler)exitHandler context:(id)context {
-    ORKState *s = [ORKState new];
-    s.state = state;
-    s.entryHandler = entryHandler;
-    s.exitHandler = exitHandler;
-    s.context = context;
-    return s;
-}
-
-
-@end
-
-@interface ORKSpatialSpanMemoryStepViewController() <ORKSpatialSpanMemoryGameViewDelegate>
-
-@end
-
-@implementation ORKSpatialSpanMemoryStepViewController
-{
-    ORKSpatialSpanMemoryContentView *_contentView;
-    ORKState *_state;
-    NSDictionary *_states;
-    ORKGridSize _gridSize;
-    
-    ORKSpatialSpanGameState *_currentGameState;
-    
-    // ORKSpatialSpanMemoryGameRecord
-    NSMutableArray *_gameRecords;
-    NSTimeInterval _gameStartTime;
-    NSInteger _lastRoundScore;
-    
-    NSInteger _playbackIndex;
-    
-    NSInteger _score;
-    NSInteger _numberOfItems;
-    
-    NSInteger _gamesCounter;
-    NSInteger _consecutiveGamesFailed;
-    NSInteger _nextGameSequenceLength;
-    
-    NSTimer *_playbackTimer;
-    NSTimer *_activityTimer;
-
-}
-
-- (ORKSpatialSpanMemoryStep *)spatialSpanStep {
-    return (ORKSpatialSpanMemoryStep *)self.step;
-}
-
-- (instancetype)initWithStep:(ORKStep *)step {
-    
-    self = [super initWithStep:step];
-    if (self) {
-        self.suspendIfInactive = YES;
-    }
-    return self;
-}
-
-#pragma mark Overrides
-
-
-- (void)viewDidLoad {
-    [super viewDidLoad];
-    
-    _contentView = [ORKSpatialSpanMemoryContentView new];
-    _contentView.translatesAutoresizingMaskIntoConstraints = NO;
-    _contentView.footerHidden = YES;
-    _contentView.gameView.delegate = self;
-    self.activeStepView.activeCustomView = _contentView;
-    self.activeStepView.stepViewFillsAvailableSpace = NO;
-    self.activeStepView.minimumStepHeaderHeight = ORKGetMetricForScreenType(ORKScreenMetricMinimumStepHeaderHeightForMemoryGame, ORKGetScreenTypeForWindow(self.view.window));
-    
-    [self resetUI];
-    
-    UITapGestureRecognizer *tapGestureRecognizer = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(handleUserTap:)];
-    [self.activeStepView addGestureRecognizer:tapGestureRecognizer];
-}
-
-
-- (void)stepDidChange {
-    [super stepDidChange];
-    
-    [self initializeStates];
-    
-}
-
-- (void)start {
-    [super start];
-    
-    if (! _state) {
-        [self transitionToState:ORKSpatialSpanStepStateInitial];
-    }
-    
-    [self transitionToState:ORKSpatialSpanStepStatePlayback];
-}
-- (void)suspend {
-    [super suspend];
-    switch (_state.state) {
-        case ORKSpatialSpanStepStatePlayback:
-        case ORKSpatialSpanStepStateGameplay:
-            [self transitionToState:ORKSpatialSpanStepStatePaused];
-            break;
-        default:
-            break;
-    }
-}
-- (void)resume {
-    [super resume];
-}
-- (void)finish {
-    [super finish];
-    [self transitionToState:ORKSpatialSpanStepStateStopped];
-}
-
-
-- (ORKStepResult *)result {
-    ORKStepResult *sResult = [super result];
-    
-    // "Now" is the end time of the result, which is either actually now,
-    // or the last time we were in the responder chain.
-    NSDate *now = sResult.endDate;
-    
-    NSMutableArray *results = [NSMutableArray arrayWithArray:sResult.results];
-    
-    ORKSpatialSpanMemoryResult *memoryResult = [[ORKSpatialSpanMemoryResult alloc] initWithIdentifier:(NSString *__nonnull)self.step.identifier];
-    memoryResult.startDate = sResult.startDate;
-    memoryResult.endDate = now;
-    
-    NSMutableArray *records = [NSMutableArray new];
-    
-    __block NSInteger numberOfFailures = 0;
-    __block NSInteger score = 0;
-    // Only include valid records
-    [_gameRecords enumerateObjectsUsingBlock:^(id obj, NSUInteger idx, BOOL *stop) {
-        ORKSpatialSpanMemoryGameRecord *record = (ORKSpatialSpanMemoryGameRecord *)obj;
-        if (record.gameStatus != ORKSpatialSpanMemoryGameStatusUnknown) {
-            [records addObject:record];
-            
-            score += record.score;
-            
-            if (record.gameStatus != ORKSpatialSpanMemoryGameStatusSuccess)
-            {
-                numberOfFailures++;
-            }
-        }
-    }];
-    
-    memoryResult.score = score;
-    memoryResult.numberOfFailures = numberOfFailures;
-    memoryResult.numberOfGames = records.count;
-    memoryResult.gameRecords = [records copy];
-    
-    [results addObject:memoryResult];
-    sResult.results = [results copy];
-    
-    return sResult;
-}
-
-#pragma mark UpdateGameRecord
-
-- (ORKSpatialSpanMemoryGameRecord *)currentGameRecord {
-    return _gameRecords? [_gameRecords lastObject] : nil;
-}
-
-- (void)createGameRecord {
-    
-    if (_gameRecords == nil) {
-        _gameRecords = [NSMutableArray new];
-    }
-    
-    ORKSpatialSpanMemoryGameRecord *gameRecord = [ORKSpatialSpanMemoryGameRecord new];
-    gameRecord.seed = _currentGameState.game.seed;
-    gameRecord.gameSize = _currentGameState.game.gameSize;
-    
-    NSMutableArray *targetSequence = [NSMutableArray new];
-    [_currentGameState.game enumerateSequenceWithHandler:^(NSInteger step, NSInteger tileIndex, BOOL isLastStep, BOOL *stop) {
-        [targetSequence addObject:@(tileIndex)];
-    }];
-    gameRecord.sequence = [targetSequence copy];
-    [_gameRecords addObject:gameRecord];
-    
-    _lastRoundScore = _score;
-}
-
-- (void)updateGameRecordTargetRects
-{
-    ORKSpatialSpanMemoryGameRecord *record = [self currentGameRecord];
-    NSArray *tileViews = _contentView.gameView.tileViews;
-    NSMutableArray *targetRects = [NSMutableArray new];
-    for (UIView *tileView in tileViews) {
-        CGRect rect = [self.view convertRect:tileView.frame fromView:tileView.superview];
-        [targetRects addObject:[NSValue valueWithCGRect:rect]];
-    }
-    record.targetRects = [targetRects copy];
-    NSAssert(tileViews.count == 0 || tileViews.count == record.gameSize, nil);
-}
-
-- (void)updateGameRecordOnStartingGamePlay
-{
-    _gameStartTime = CACurrentMediaTime();
-}
-
-- (void)handleUserTap:(UITapGestureRecognizer *)tapRecognizer
-{
-    if (_state.state != ORKSpatialSpanStepStateGameplay) {
-        return;
-    }
-    [self updateGameRecordOnTouch:-1 location:[tapRecognizer locationInView: self.view]];
-}
-
-- (void)updateGameRecordOnTouch:(NSInteger)targetIndex location:(CGPoint)location
-{
-    ORKSpatialSpanMemoryGameTouchSample *sample = [ORKSpatialSpanMemoryGameTouchSample new];
-    
-    sample.timestamp = CACurrentMediaTime() - _gameStartTime;
-    sample.location = location;
-    sample.targetIndex = targetIndex;
-    
-    ORKSpatialSpanMemoryGameRecord *record = [self currentGameRecord];
-    
-    NSAssert(record, nil);
-    
-    NSInteger currentStep = 0;
-    
-    for (ORKSpatialSpanMemoryGameTouchSample *aSample in record.touchSamples) {
-        if (aSample.isCorrect) {
-            currentStep++;
-        }
-    }
-    
-    sample.correct = (targetIndex == [_currentGameState.game tileIndexForStep:currentStep]);
-    
-    NSMutableArray *sampleArray = [NSMutableArray arrayWithArray:record.touchSamples];
-    
-    [sampleArray addObject:sample];
-    
-    record.touchSamples = [sampleArray copy];
-    
-}
-
-- (void)updateGameRecordOnSuccess
-{
-    [self currentGameRecord].gameStatus = ORKSpatialSpanMemoryGameStatusSuccess;
-}
-
-- (void)updateGameRecordOnFailure
-{
-    [self currentGameRecord].gameStatus = ORKSpatialSpanMemoryGameStatusFailure;
-}
-
-- (void)updateGameRecordOnTimeout
-{
-    [self currentGameRecord].gameStatus = ORKSpatialSpanMemoryGameStatusTimeout;
-}
-
-- (void)updateGameRecordScore
-{
-    [self currentGameRecord].score = _score - _lastRoundScore;
-}
-
-- (void)updateGameRecordOnPause
-{
-    [self currentGameRecord].gameStatus = ORKSpatialSpanMemoryGameStatusUnknown;
-}
-
-
-#pragma mark ORKSpatialSpanStepStateInitial
-
-- (ORKGridSize)gridSizeForSpan:(NSInteger)span {
-    NSInteger numberOfGridEntriesDesired = span*2;
-    NSInteger value = (NSInteger)ceil(sqrt(numberOfGridEntriesDesired));
-    value = MAX(value, 2);
-    value = MIN(value, 6);
-    return (ORKGridSize){value,value};
-}
-
-- (void)resetGameAndUI {
-    _score = 0;
-    _numberOfItems = 0;
-    _gamesCounter = 0;
-    _consecutiveGamesFailed = 0;
-    ORKSpatialSpanMemoryStep *step = [self spatialSpanStep];
-    _nextGameSequenceLength = step.initialSpan;
-    
-    [self resetForNewGame];
-}
-
-- (void)resetUI {
-    _contentView.numberOfItems = _score;
-    _contentView.score = _numberOfItems;
-    _contentView.footerHidden = YES;
-    _contentView.buttonItem = nil;
-    _contentView.gameView.gridSize = _gridSize;
-    
-    _contentView.gameView.customTargetImage = [[self spatialSpanStep] customTargetImage];
-}
-
-- (void)resetForNewGame {
-    [self.activeStepView updateTitle:self.step.title text:self.step.text];
-    
-    _numberOfItems = 0;
-    
-    NSInteger sequenceLength = _nextGameSequenceLength;
-    _gridSize = [self gridSizeForSpan:sequenceLength];
-    
-    ORKSpatialSpanGame *game = [[ORKSpatialSpanGame alloc] initWithGameSize:_gridSize.width*_gridSize.height sequenceLength:sequenceLength seed:0];
-    ORKSpatialSpanGameState *gameState = [[ORKSpatialSpanGameState alloc] initWithGame:game];
-    
-    _currentGameState = gameState;
-    
-    [self createGameRecord];
-    
-    [self resetUI];
-    
-}
-
-
-#pragma mark ORKSpatialSpanStepStatePlayback
-
-- (void)applyTargetState:(ORKSpatialSpanTargetState)targetState toSequenceIndex:(NSInteger)index duration:(NSTimeInterval)duration {
-    ORKSpatialSpanGame *game = _currentGameState.game;
-    if (index == NSNotFound || index < 0 || index >= game.sequenceLength ) {
-        return;
-    }
-    
-    NSInteger tileIndex = [game tileIndexForStep:index];
-    ORKSpatialSpanMemoryGameView *gameView = _contentView.gameView;
-    [gameView setState:targetState forTileIndex:tileIndex animated:YES];
-    if (duration > 0 && targetState != ORKSpatialSpanTargetStateQuiescent) {
-        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(duration * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-            [self applyTargetState:ORKSpatialSpanTargetStateQuiescent toSequenceIndex:index duration:0];
-        });
-    }
-}
-
-- (void)playbackNextItem {
-    const NSInteger sequenceLength = _currentGameState.game.sequenceLength;
-    if (_playbackIndex >= sequenceLength) {
-        [self transitionToState:ORKSpatialSpanStepStateGameplay];
-    } else {
-        ORKSpatialSpanMemoryStep *step = [self spatialSpanStep];
-        
-        NSInteger index = _playbackIndex;
-        NSInteger previousIndex = index-1;
-        if (step.requireReversal) {
-            // Play the indexes in reverse order when we require reversal. The participant
-            // is then required to tap the sequence in the forward direction, which
-            // appears as a reversal to them.
-            index = sequenceLength - 1 - index;
-            previousIndex = sequenceLength - 1 - previousIndex;
-        }
-        
-        // Make sure the previous step *is *cleared
-        [self applyTargetState:ORKSpatialSpanTargetStateQuiescent toSequenceIndex:previousIndex duration:0];
-        
-        // The active display should be visible for half the timer interval
-        [self applyTargetState:ORKSpatialSpanTargetStateActive toSequenceIndex:index duration:step.playSpeed/2];
-    }
-    _playbackIndex++;
-}
-
-- (void)startPlayback {
-    _playbackIndex = 0;
-    _contentView.footerHidden = YES;
-    _contentView.buttonItem = nil;
-    ORKSpatialSpanMemoryStep *step = [self spatialSpanStep];
-    NSString *title = [NSString stringWithFormat:ORKLocalizedString(@"MEMORY_GAME_PLAYBACK_TITLE_%@", nil), step.customTargetPluralName ? : ORKLocalizedString(@"SPATIAL_SPAN_MEMORY_TARGET_PLURAL", nil)];
-    
-    [self.activeStepView updateTitle:title text:nil];
-    
-    
-    [_contentView.gameView resetTilesAnimated:NO];
-    
-    _playbackTimer = [NSTimer scheduledTimerWithTimeInterval:step.playSpeed target:self selector:@selector(playbackNextItem) userInfo:nil repeats:YES];
-}
-
-- (void)finishPlayback {
-    [_playbackTimer invalidate];
-    _playbackTimer = nil;
-}
-
-#pragma mark ORKSpatialSpanStepStateGameplay
-
-- (void)setNumberOfItems:(NSInteger)numberOfItems {
-    _numberOfItems = numberOfItems;
-    [_contentView setNumberOfItems:_numberOfItems];
-}
-
-- (void)setScore:(NSInteger)score {
-    _score = score;
-    [_contentView setScore:_score];
-    [self updateGameRecordScore];
-}
-
-- (void)activityTimeout {
-    [self transitionToState:ORKSpatialSpanStepStateTimeout];
-}
-
-- (void)resetActivityTimer {
-    [_activityTimer invalidate];
-    _activityTimer = nil;
-    
-    _activityTimer = [NSTimer scheduledTimerWithTimeInterval:kMemoryGameActivityTimeout target:self selector:@selector(activityTimeout) userInfo:nil repeats:NO];
-}
-
-- (void)startGameplay {
-    [self setNumberOfItems:0];
-    
-    // Update the target rects here, since layout will be complete by this point.
-    [self updateGameRecordTargetRects];
-    
-    _contentView.footerHidden = NO;
-    _contentView.buttonItem = nil;
-    ORKSpatialSpanMemoryStep *step = [self spatialSpanStep];
-    NSString *pluralItemName = step.customTargetPluralName ? : ORKLocalizedString(@"SPATIAL_SPAN_MEMORY_TARGET_PLURAL", nil);
-    NSString *standaloneItemName = step.customTargetPluralName ? : ORKLocalizedString(@"SPATIAL_SPAN_MEMORY_TARGET_STANDALONE", nil);
-    _contentView.capitalizedPluralItemDescription = [standaloneItemName capitalizedStringWithLocale:[NSLocale currentLocale]];
-    NSString *titleFormat = step.requireReversal ?  ORKLocalizedString(@"MEMORY_GAME_GAMEPLAY_REVERSE_TITLE_%@", nil) : ORKLocalizedString(@"MEMORY_GAME_GAMEPLAY_TITLE_%@", nil);
-    NSString *title = [NSString stringWithFormat:titleFormat, pluralItemName];
-    [self.activeStepView updateTitle:title text:nil];
-    
-    [self resetActivityTimer];
-    
-    // Ensure tiles are all reset at this point
-    [_currentGameState reset];
-    [_contentView.gameView resetTilesAnimated:NO];
-    [_contentView setScore:_score];
-    [_contentView setNumberOfItems:_numberOfItems];
-    
-    [self updateGameRecordOnStartingGamePlay];
-}
-
-- (void)finishGameplay {
-    [_activityTimer invalidate];
-    _activityTimer = nil;
-}
-
-
-- (void)gameView:(ORKSpatialSpanMemoryGameView *)gameView didTapTileWithIndex:(NSInteger)tileIndex recognizer:(UITapGestureRecognizer *)recognizer {
-    if (_state.state != ORKSpatialSpanStepStateGameplay) {
-        return;
-    }
-    
-    [self updateGameRecordOnTouch:tileIndex location:[recognizer locationInView:self.view]];
-    
-    ORKSpatialSpanResult result = [_currentGameState playTileIndex:tileIndex];
-    switch (result) {
-        case ORKSpatialSpanResultIgnore:
-            break;
-        case ORKSpatialSpanResultCorrect:
-            [gameView setState:ORKSpatialSpanTargetStateCorrect forTileIndex:tileIndex animated:YES];
-            NSInteger stepIndex = [_currentGameState currentStepIndex];
-            
-            [self setNumberOfItems:_numberOfItems+1];
-            [self setScore:_score + (round(log2(stepIndex))+1)*5];
-            
-            [self resetActivityTimer];
-            if ([_currentGameState isComplete]) {
-                [self transitionToState:ORKSpatialSpanStepStateSuccess];
-            }
-            
-            
-            break;
-        case ORKSpatialSpanResultIncorrect:
-            [gameView setState:ORKSpatialSpanTargetStateIncorrect forTileIndex:tileIndex animated:YES];
-            [self transitionToState:ORKSpatialSpanStepStateFailed];
-            break;
-    }
-}
-
-#pragma mark ORKSpatialSpanStepStateSuccess
-
-- (void)updateGameCountersForSuccess:(BOOL)success {
-    
-    ORKSpatialSpanMemoryStep *step = [self spatialSpanStep];
-    if (success) {
-        NSInteger sequenceLength = [_currentGameState.game sequenceLength];
-        [self setScore:_score + (round(log2(sequenceLength))+1)*5];
-        _gamesCounter++;
-        _consecutiveGamesFailed = 0;
-        _nextGameSequenceLength = MIN(_nextGameSequenceLength + 1, step.maximumSpan);
-    } else {
-        _gamesCounter++;
-        _consecutiveGamesFailed++;
-        _nextGameSequenceLength = MAX(_nextGameSequenceLength - 1, step.minimumSpan);
-    }
-}
-
-- (void)continueAction {
-    
-    ORKSpatialSpanMemoryStep *step = [self spatialSpanStep];
-    if (_gamesCounter < step.maxTests && _consecutiveGamesFailed < step.maxConsecutiveFailures) {
-        // Generate a new game
-        [self transitionToState:ORKSpatialSpanStepStateRestart];
-        UIAccessibilityPostNotification(UIAccessibilityScreenChangedNotification, nil);
-    } else {
-        [self finish];
-    }
-}
-
-- (void)showSuccess {
-    
-    [self updateGameRecordOnSuccess];
-    
-    [self updateGameCountersForSuccess:YES];
-    if ([self finishIfCompletedGames]) {
-        return;
-    }
-    
-    
-    [self.activeStepView updateTitle:ORKLocalizedString(@"MEMORY_GAME_COMPLETE_TITLE", nil) text:ORKLocalizedString(@"MEMORY_GAME_COMPLETE_MESSAGE", nil)];
-    
-    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.75 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-        _contentView.buttonItem = [[UIBarButtonItem alloc] initWithTitle:ORKLocalizedString(@"BUTTON_NEXT", nil) style:UIBarButtonItemStylePlain target:self action:@selector(continueAction)];
-    });
-}
-
-#pragma mark ORKSpatialSpanStepStateFailed
-
-
-- (void)tryAgainAction {
-    // Restart with a new, shorter game
-    [self transitionToState:ORKSpatialSpanStepStateRestart];
-    UIAccessibilityPostNotification(UIAccessibilityScreenChangedNotification, nil);
-}
-
-
-- (BOOL)finishIfCompletedGames {
-    
-    ORKSpatialSpanMemoryStep *step = [self spatialSpanStep];
-    if (_consecutiveGamesFailed >= step.maxConsecutiveFailures || _gamesCounter >= step.maxTests) {
-        [self transitionToState:ORKSpatialSpanStepStateComplete];
-        return YES;
-    }
-    return NO;
-}
-
-- (void)showFailed {
-    
-    [self updateGameRecordOnFailure];
-    
-    [self updateGameCountersForSuccess:NO];
-    if ([self finishIfCompletedGames]) {
-        return;
-    }
-    [self.activeStepView updateTitle:ORKLocalizedString(@"MEMORY_GAME_FAILED_TITLE", nil) text:ORKLocalizedString(@"MEMORY_GAME_FAILED_MESSAGE", nil)];
-    
-    
-    _contentView.buttonItem = [[UIBarButtonItem alloc] initWithTitle:ORKLocalizedString(@"BUTTON_NEXT", nil) style:UIBarButtonItemStylePlain target:self action:@selector(tryAgainAction)];
-}
-
-#pragma mark ORKSpatialSpanStepStateTimeout
-
-- (void)showTimeout {
-    
-    [self updateGameRecordOnTimeout];
-    
-    [self updateGameCountersForSuccess:NO];
-    if ([self finishIfCompletedGames]) {
-        return;
-    }
-    
-    [self.activeStepView updateTitle:ORKLocalizedString(@"MEMORY_GAME_TIMEOUT_TITLE", nil) text:ORKLocalizedString(@"MEMORY_GAME_TIMEOUT_MESSAGE", nil)];
-    
-    _contentView.buttonItem = [[UIBarButtonItem alloc] initWithTitle:ORKLocalizedString(@"BUTTON_NEXT", nil) style:UIBarButtonItemStylePlain target:self action:@selector(tryAgainAction)];
-}
-
-#pragma mark ORKSpatialSpanStepStateComplete
-
-- (void)showComplete {
-    [self.activeStepView updateTitle:ORKLocalizedString(@"MEMORY_GAME_COMPLETE_TITLE", nil) text:nil];
-    
-    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.75 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-        _contentView.buttonItem = [[UIBarButtonItem alloc] initWithTitle:ORKLocalizedString(@"BUTTON_NEXT", nil) style:UIBarButtonItemStylePlain target:self action:@selector(continueAction)];
-    });
-}
-
-#pragma mark ORKSpatialSpanStepStateRestart
-
-- (void)doRestart {
-    [self resetForNewGame];
-    dispatch_async(dispatch_get_main_queue(), ^{
-        // Dispatch, so we don't do this in the middle of a state transition
-        if (_state.state == ORKSpatialSpanStepStateRestart) {
-            [self transitionToState:ORKSpatialSpanStepStatePlayback];
-        }
-    });
-}
-
-- (void)showPausedFromState:(ORKState *)fromState {
-    [self updateGameRecordOnPause];
-    
-    // Do not update game counters - doesn't count as a game.
-    
-    [_activityTimer invalidate]; _activityTimer = nil;
-    [_playbackTimer invalidate]; _playbackTimer = nil;
-    
-    [self resetForNewGame];
-    [self.activeStepView updateTitle:ORKLocalizedString(@"MEMORY_GAME_PAUSED_TITLE", nil) text:ORKLocalizedString(@"MEMORY_GAME_PAUSED_MESSAGE", nil)];
-    _contentView.buttonItem = [[UIBarButtonItem alloc] initWithTitle:ORKLocalizedString(@"BUTTON_NEXT", nil) style:UIBarButtonItemStylePlain target:self action:@selector(continueAction)];
-}
-
-
-#pragma mark State machine
-
-- (void)initializeStates {
-    NSMutableDictionary *states = [NSMutableDictionary dictionary];
-    
-    states[@(ORKSpatialSpanStepStateInitial)] = [ORKState stateWithState:ORKSpatialSpanStepStateInitial
-                                                           entryHandler:^(ORKState *from, ORKState *to, ORKSpatialSpanMemoryStepViewController *this) {
-                                                               [this resetGameAndUI];
-                                                           }
-                                                            exitHandler:nil context:self];
-    
-    states[@(ORKSpatialSpanStepStatePlayback)] = [ORKState stateWithState:ORKSpatialSpanStepStatePlayback
-                                                            entryHandler:^(ORKState *from, ORKState *to, ORKSpatialSpanMemoryStepViewController *this) {
-                                                     [this startPlayback];
-                                                 }
-                                                             exitHandler:^(ORKState *from, ORKState *to, ORKSpatialSpanMemoryStepViewController *this) {
-                                                     [this finishPlayback];
-                                                 } context:self];
-    
-    states[@(ORKSpatialSpanStepStateGameplay)] = [ORKState stateWithState:ORKSpatialSpanStepStateGameplay
-                                                            entryHandler:^(ORKState *from, ORKState *to, ORKSpatialSpanMemoryStepViewController *this) {
-                                                                [this startGameplay];
-                                                            }
-                                                             exitHandler:^(ORKState *from, ORKState *to, ORKSpatialSpanMemoryStepViewController *this) {
-                                                                 [this finishGameplay];
-                                                             } context:self];
-    
-    states[@(ORKSpatialSpanStepStateSuccess)] = [ORKState stateWithState:ORKSpatialSpanStepStateSuccess
-                                                           entryHandler:^(ORKState *from, ORKState *to, ORKSpatialSpanMemoryStepViewController *this) {
-                                                               [this showSuccess];
-                                                            }
-                                                             exitHandler:nil context:self];
-    
-    states[@(ORKSpatialSpanStepStateFailed)] = [ORKState stateWithState:ORKSpatialSpanStepStateFailed
-                                                           entryHandler:^(ORKState *from, ORKState *to, ORKSpatialSpanMemoryStepViewController *this) {
-                                                               [this showFailed];
-                                                           }
-                                                            exitHandler:nil context:self];
-    
-    states[@(ORKSpatialSpanStepStateTimeout)] = [ORKState stateWithState:ORKSpatialSpanStepStateTimeout
-                                                          entryHandler:^(ORKState *from, ORKState *to, ORKSpatialSpanMemoryStepViewController *this) {
-                                                              [this showTimeout];
-                                                          }
-                                                           exitHandler:nil context:self];
-    
-    states[@(ORKSpatialSpanStepStateRestart)] = [ORKState stateWithState:ORKSpatialSpanStepStateRestart
-                                                           entryHandler:^(ORKState *from, ORKState *to, ORKSpatialSpanMemoryStepViewController *this) {
-                                                               [this doRestart];
-                                                           }
-                                                            exitHandler:nil context:self];
-    
-    states[@(ORKSpatialSpanStepStateComplete)] = [ORKState stateWithState:ORKSpatialSpanStepStateComplete
-                                                            entryHandler:^(ORKState *from, ORKState *to, ORKSpatialSpanMemoryStepViewController *this) {
-                                                                [this showComplete];
-                                                            } exitHandler:nil context:self];
-    
-    states[@(ORKSpatialSpanStepStateStopped)] = [ORKState stateWithState:ORKSpatialSpanStepStateStopped
-                                                           entryHandler:nil
-                                                            exitHandler:nil
-                                                                context:self];
-    
-    states[@(ORKSpatialSpanStepStatePaused)] = [ORKState stateWithState:ORKSpatialSpanStepStatePaused
-                                                          entryHandler:^(ORKState *from, ORKState *to, ORKSpatialSpanMemoryStepViewController *this) {
-                                                              [this showPausedFromState:from];
-                                                          } exitHandler:nil context:self];
-    
-    _states = states;
-    
-    [self transitionToState:ORKSpatialSpanStepStateInitial];
-}
-
-- (void)transitionToState:(ORKSpatialSpanStepState)state {
-    ORKState *stateObject = _states[@(state)];
-    
-    ORKState *oldState = _state;
-    if (oldState.exitHandler != nil) {
-        oldState.exitHandler(oldState, stateObject, oldState.context);
-    }
-    _state = stateObject;
-    if (stateObject.entryHandler) {
-        stateObject.entryHandler(oldState, stateObject, stateObject.context);
-    }
-}
-
-
-
-@end

ResearchKit/ActiveTasks/ORKSpatialSpanTargetView.h

@@ -1,64 +0,0 @@
-/*
- Copyright (c) 2015, Apple Inc. All rights reserved.
- 
- Redistribution and use in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met:
- 
- 1.  Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
- 
- 2.  Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation and/or
- other materials provided with the distribution.
- 
- 3.  Neither the name of the copyright holder(s) nor the names of any contributors
- may be used to endorse or promote products derived from this software without
- specific prior written permission. No license is granted to the trademarks of
- the copyright holders even if such marks are included in this software.
- 
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import <UIKit/UIKit.h>
-#import <ResearchKit/ResearchKit.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-typedef NS_ENUM(NSInteger, ORKSpatialSpanTargetState) {
-    ORKSpatialSpanTargetStateQuiescent,
-    ORKSpatialSpanTargetStateActive,
-    ORKSpatialSpanTargetStateCorrect,
-    ORKSpatialSpanTargetStateIncorrect
-};
-
-@class ORKSpatialSpanTargetView;
-
-@protocol ORKSpatialSpanTargetViewDelegate<NSObject>
-
-- (void)targetView:(ORKSpatialSpanTargetView *)targetView recognizer:(UITapGestureRecognizer *)recognizer;
-
-@end
-
-@interface ORKSpatialSpanTargetView : UIView
-
-@property (nonatomic, weak, nullable) id<ORKSpatialSpanTargetViewDelegate> delegate;
-
-@property (nonatomic, assign) ORKSpatialSpanTargetState state;
-- (void)setState:(ORKSpatialSpanTargetState)state animated:(BOOL)animated;
-
-@property (nonatomic, strong, nullable) UIColor *color;
-
-@property (nonatomic, strong, nullable) UIImage *customTargetImage;
-
-@end
-
-NS_ASSUME_NONNULL_END

ResearchKit/ActiveTasks/ORKSpatialSpanTargetView.m

@@ -1,379 +0,0 @@
-/*
- Copyright (c) 2015, Apple Inc. All rights reserved.
- 
- Redistribution and use in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met:
- 
- 1.  Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
- 
- 2.  Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation and/or
- other materials provided with the distribution.
- 
- 3.  Neither the name of the copyright holder(s) nor the names of any contributors
- may be used to endorse or promote products derived from this software without
- specific prior written permission. No license is granted to the trademarks of
- the copyright holders even if such marks are included in this software.
- 
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import "ORKSpatialSpanTargetView.h"
-#import "ORKHelpers.h"
-#import "ORKSkin.h"
-#import "ORKTintedImageView.h"
-#import "ORKAccessibility.h"
-#import "ORKDefines_Private.h"
-
-static const UIEdgeInsets _ORKFlowerMargins = (UIEdgeInsets){12,12,12,12};
-static const CGSize ORKFlowerBezierPathSize = (CGSize){90,90};
-static UIBezierPath *ORKFlowerBezierPath() {
-    
-    UIBezierPath *bezierPath = UIBezierPath.bezierPath;
-    [bezierPath moveToPoint: CGPointMake(58.8, 45)];
-    [bezierPath addCurveToPoint: CGPointMake(51.9, 33.2) controlPoint1: CGPointMake(107.8, 41.8) controlPoint2: CGPointMake(79.3, -7.2)];
-    [bezierPath addCurveToPoint: CGPointMake(38.1, 33.2) controlPoint1: CGPointMake(73.6, -10.4) controlPoint2: CGPointMake(16.5, -10.4)];
-    [bezierPath addCurveToPoint: CGPointMake(31.2, 45) controlPoint1: CGPointMake(10.8, -7.2) controlPoint2: CGPointMake(-17.8, 41.8)];
-    [bezierPath addCurveToPoint: CGPointMake(38.1, 56.8) controlPoint1: CGPointMake(-17.8, 48.2) controlPoint2: CGPointMake(10.7, 97.2)];
-    [bezierPath addCurveToPoint: CGPointMake(51.9, 56.8) controlPoint1: CGPointMake(16.4, 100.4) controlPoint2: CGPointMake(73.5, 100.4)];
-    [bezierPath addCurveToPoint: CGPointMake(58.8, 45) controlPoint1: CGPointMake(79.2, 97.2) controlPoint2: CGPointMake(107.8, 48.2)];
-    [bezierPath closePath];
-    [bezierPath moveToPoint: CGPointMake(45, 53.1)];
-    [bezierPath addCurveToPoint: CGPointMake(36.7, 45) controlPoint1: CGPointMake(40.4, 53.1) controlPoint2: CGPointMake(36.7, 49.5)];
-    [bezierPath addCurveToPoint: CGPointMake(45, 36.9) controlPoint1: CGPointMake(36.7, 40.5) controlPoint2: CGPointMake(40.4, 36.9)];
-    [bezierPath addCurveToPoint: CGPointMake(53.3, 45) controlPoint1: CGPointMake(49.6, 36.9) controlPoint2: CGPointMake(53.3, 40.5)];
-    [bezierPath addCurveToPoint: CGPointMake(45, 53.1) controlPoint1: CGPointMake(53.3, 49.5) controlPoint2: CGPointMake(49.6, 53.1)];
-    [bezierPath closePath];
-    bezierPath.miterLimit = 4;
-    
-    return bezierPath;
-}
-
-static const CGSize ORKCheckBezierPathSize = (CGSize){28,28};
-static UIBezierPath *ORKCheckBezierPath() {
-    
-    UIBezierPath *bezierPath = UIBezierPath.bezierPath;
-    [bezierPath moveToPoint: CGPointMake(11.6, 19)];
-    [bezierPath addCurveToPoint: CGPointMake(11.1, 18.8) controlPoint1: CGPointMake(11.4, 19) controlPoint2: CGPointMake(11.2, 18.9)];
-    [bezierPath addLineToPoint: CGPointMake(7.5, 15.5)];
-    [bezierPath addCurveToPoint: CGPointMake(7.5, 14.4) controlPoint1: CGPointMake(7.2, 15.2) controlPoint2: CGPointMake(7.2, 14.7)];
-    [bezierPath addCurveToPoint: CGPointMake(8.6, 14.4) controlPoint1: CGPointMake(7.8, 14.1) controlPoint2: CGPointMake(8.3, 14.1)];
-    [bezierPath addLineToPoint: CGPointMake(11.6, 17.2)];
-    [bezierPath addLineToPoint: CGPointMake(19.6, 9.2)];
-    [bezierPath addCurveToPoint: CGPointMake(20.7, 9.2) controlPoint1: CGPointMake(19.9, 8.9) controlPoint2: CGPointMake(20.4, 8.9)];
-    [bezierPath addCurveToPoint: CGPointMake(20.7, 10.3) controlPoint1: CGPointMake(21, 9.5) controlPoint2: CGPointMake(21, 10)];
-    [bezierPath addLineToPoint: CGPointMake(12.2, 18.8)];
-    [bezierPath addCurveToPoint: CGPointMake(11.6, 19) controlPoint1: CGPointMake(12, 18.9) controlPoint2: CGPointMake(11.8, 19)];
-    [bezierPath closePath];
-    bezierPath.miterLimit = 4;
-    
-    return bezierPath;
-}
-
-static const CGSize ORKErrorBezierPathSize = (CGSize){28,28};
-static UIBezierPath *ORKErrorBezierPath() {
-    
-    UIBezierPath *bezier3Path = UIBezierPath.bezierPath;
-    [bezier3Path moveToPoint: CGPointMake(15.1, 14)];
-    [bezier3Path addLineToPoint: CGPointMake(18.8, 10.3)];
-    [bezier3Path addCurveToPoint: CGPointMake(18.8, 9.2) controlPoint1: CGPointMake(19.1, 10) controlPoint2: CGPointMake(19.1, 9.5)];
-    [bezier3Path addCurveToPoint: CGPointMake(17.7, 9.2) controlPoint1: CGPointMake(18.5, 8.9) controlPoint2: CGPointMake(18, 8.9)];
-    [bezier3Path addLineToPoint: CGPointMake(14, 12.9)];
-    [bezier3Path addLineToPoint: CGPointMake(10.3, 9.2)];
-    [bezier3Path addCurveToPoint: CGPointMake(9.2, 9.2) controlPoint1: CGPointMake(10, 8.9) controlPoint2: CGPointMake(9.5, 8.9)];
-    [bezier3Path addCurveToPoint: CGPointMake(9.2, 10.3) controlPoint1: CGPointMake(8.9, 9.5) controlPoint2: CGPointMake(8.9, 10)];
-    [bezier3Path addLineToPoint: CGPointMake(12.9, 14)];
-    [bezier3Path addLineToPoint: CGPointMake(9.2, 17.7)];
-    [bezier3Path addCurveToPoint: CGPointMake(9.2, 18.8) controlPoint1: CGPointMake(8.9, 18) controlPoint2: CGPointMake(8.9, 18.5)];
-    [bezier3Path addCurveToPoint: CGPointMake(9.7, 19) controlPoint1: CGPointMake(9.3, 18.9) controlPoint2: CGPointMake(9.5, 19)];
-    [bezier3Path addCurveToPoint: CGPointMake(10.2, 18.8) controlPoint1: CGPointMake(9.9, 19) controlPoint2: CGPointMake(10.1, 18.9)];
-    [bezier3Path addLineToPoint: CGPointMake(13.9, 15.1)];
-    [bezier3Path addLineToPoint: CGPointMake(17.6, 18.8)];
-    [bezier3Path addCurveToPoint: CGPointMake(18.1, 19) controlPoint1: CGPointMake(17.7, 18.9) controlPoint2: CGPointMake(17.9, 19)];
-    [bezier3Path addCurveToPoint: CGPointMake(18.6, 18.8) controlPoint1: CGPointMake(18.3, 19) controlPoint2: CGPointMake(18.5, 18.9)];
-    [bezier3Path addCurveToPoint: CGPointMake(18.6, 17.7) controlPoint1: CGPointMake(18.9, 18.5) controlPoint2: CGPointMake(18.9, 18)];
-    [bezier3Path addLineToPoint: CGPointMake(15.1, 14)];
-    [bezier3Path closePath];
-    bezier3Path.miterLimit = 4;
-    return bezier3Path;
-}
-
-@interface ORKPathView : UIView
-
-- (instancetype)initWithBezierPath:(UIBezierPath *)path canvasSize:(CGSize)canvasSize canvasMargins:(UIEdgeInsets)margins color:(UIColor *)color;
-
-@property (nonatomic, readonly) UIEdgeInsets canvasMargins;
-@property (nonatomic, readonly) CGSize canvasSize;
-@property (nonatomic, readonly, strong) UIBezierPath *path;
-@property (nonatomic, readonly, strong) UIColor *color;
-
-@end
-
-@implementation ORKPathView
-
-- (instancetype)initWithBezierPath:(UIBezierPath *)path canvasSize:(CGSize)canvasSize canvasMargins:(UIEdgeInsets)margins color:(UIColor *)color
-{
-    CGRect r = (CGRect){CGPointZero, canvasSize};
-    CGRect outsetRect = UIEdgeInsetsInsetRect(r, (UIEdgeInsets){.top=-margins.top,.left=-margins.left,.right=-margins.right,.bottom=-margins.bottom});
-    self = [super initWithFrame:outsetRect];
-    if (self) {
-        _canvasMargins = margins;
-        _canvasSize = canvasSize;
-        _path = path;
-        _color = color;
-        self.tintColor = color;
-        self.opaque = NO;
-        [self setNeedsDisplay];
-    }
-    return self;
-}
-
-- (void)setColor:(UIColor *)color {
-    _color = color;
-    self.tintColor = color;
-    [self setNeedsDisplay];
-}
-
-- (void)drawRect:(CGRect)rect {
-    CGRect bds = [self bounds];
-    
-    CGContextRef ctx = UIGraphicsGetCurrentContext();
-    [[UIColor clearColor] setFill];
-    CGContextFillRect(ctx, bds);
-    
-    CGFloat baseWidth = _canvasSize.width + _canvasMargins.left + _canvasMargins.right;
-    CGFloat baseHeight = _canvasSize.height + _canvasMargins.top + _canvasMargins.bottom;
-    
-    CGFloat aspectRatio = MIN( bds.size.width / baseWidth, bds.size.height / baseHeight);
-    
-    CGContextSaveGState(ctx);
-    
-    CGContextScaleCTM(ctx, aspectRatio, aspectRatio);
-    CGContextTranslateCTM(ctx, _canvasMargins.left, _canvasMargins.top);
-    
-    [self.tintColor setFill];
-    [_path fill];
-    
-    CGContextRestoreGState(ctx);
-    
-}
-
-- (void)tintColorDidChange {
-    [self setNeedsDisplay];
-}
-
-
-@end
-
-
-@implementation ORKSpatialSpanTargetView {
-    UITapGestureRecognizer *_tapRecognizer;
-    
-    CGFloat _flowerScaleFactor;
-    UIView *_flowerView;
-    UIView *_checkView;
-    UIView *_errorView;
-}
-
-- (UIView *)newFlowerViewWithImage:(UIImage *)image {
-    if (image == nil) {
-        return [[ORKPathView alloc] initWithBezierPath:ORKFlowerBezierPath() canvasSize:ORKFlowerBezierPathSize canvasMargins:_ORKFlowerMargins color:[UIColor blackColor]];
-    } else {
-        ORKTintedImageView *imageView = [[ORKTintedImageView alloc] initWithImage:image];
-        imageView.shouldApplyTint = YES;
-        imageView.contentMode = UIViewContentModeScaleAspectFit;
-        return imageView;
-    }
-}
-
-- (instancetype)initWithFrame:(CGRect)frame {
-    self = [super initWithFrame:frame];
-    if (self) {
-        _tapRecognizer = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(handleTap:)];
-        [self addGestureRecognizer:_tapRecognizer];
-        
-        _flowerScaleFactor = 1;
-        _flowerView = [self newFlowerViewWithImage:nil];
-        [self addSubview:_flowerView];
-        
-        _checkView = [[ORKPathView alloc] initWithBezierPath:ORKCheckBezierPath() canvasSize:ORKCheckBezierPathSize canvasMargins:UIEdgeInsetsZero color:[self tintColor]];
-        _checkView.backgroundColor = [UIColor whiteColor];
-        _checkView.layer.masksToBounds = YES;
-        _checkView.hidden = YES;
-        [self addSubview:_checkView];
-        
-        _errorView = [[ORKPathView alloc] initWithBezierPath:ORKErrorBezierPath() canvasSize:ORKErrorBezierPathSize canvasMargins:UIEdgeInsetsZero color:[UIColor ork_redColor]];
-        _errorView.backgroundColor = [UIColor whiteColor];
-        _errorView.layer.masksToBounds = YES;
-        _errorView.hidden = YES;
-        [self addSubview:_errorView];
-        
-        for (UIView *view in @[_flowerView, _checkView, _errorView]) {
-            view.isAccessibilityElement = NO;
-        }
-    }
-    return self;
-}
-
-- (void)setCustomTargetImage:(UIImage *)customTargetImage {
-    UIImage *oldTargetImage = _customTargetImage;
-    _customTargetImage = customTargetImage;
-    if ((customTargetImage == nil) != (oldTargetImage == nil)) {
-        [_flowerView removeFromSuperview];
-        _flowerView = [self newFlowerViewWithImage:customTargetImage];
-        _flowerScaleFactor = (customTargetImage ? 0.8 : 1);
-        _flowerView.transform = CGAffineTransformMakeScale(_flowerScaleFactor, _flowerScaleFactor);
-        [self insertSubview:_flowerView atIndex:0];
-    } else if (customTargetImage) {
-        [(UIImageView *)_flowerView setImage:customTargetImage];
-    }
-    [self setNeedsLayout];
-}
-
-- (void)handleTap:(UITapGestureRecognizer *)recognizer {
-    [_delegate targetView:self recognizer:recognizer];
-}
-
-- (void)setState:(ORKSpatialSpanTargetState)state {
-    
-    [self setState:state animated:NO];
-}
-
-- (void)tintColorDidChange {
-    if ([_checkView isKindOfClass:[ORKPathView class]]) {
-        [(ORKPathView *)_checkView setColor:[self tintColor]];
-    }
-    [self setState:_state];
-}
-
-- (void)setState:(ORKSpatialSpanTargetState)state animated:(BOOL)animated {
-    _state = state;
-    
-    CGFloat newAlpha;
-    
-    BOOL checkHidden = YES;
-    BOOL errorHidden = YES;
-    CGAffineTransform newTransform = CGAffineTransformMakeScale(_flowerScaleFactor, _flowerScaleFactor);
-    
-    CGFloat oldCircleAlpha = [_errorView.layer.presentationLayer opacity];
-    CGFloat newCircleAlpha;
-    CGAffineTransform oldCircleTransform = CGAffineTransformIdentity;
-    CGAffineTransform newCircleTransform = CGAffineTransformIdentity;
-    BOOL useSpring = NO;
-    NSTimeInterval duration = 0.3;
-    switch (state) {
-        case ORKSpatialSpanTargetStateQuiescent:
-            _flowerView.tintColor = [self tintColor];
-            newAlpha = 0.2;
-            newCircleAlpha = 0.0;
-            newCircleTransform = CGAffineTransformMakeScale(0.2, 0.2);
-            break;
-        case ORKSpatialSpanTargetStateActive:
-            _flowerView.tintColor = [self tintColor];
-            newAlpha = 1.0;
-            newCircleTransform = CGAffineTransformMakeScale(0.2, 0.2);
-            newCircleAlpha = 0.0;
-            break;
-        case ORKSpatialSpanTargetStateIncorrect:
-            _flowerView.tintColor = [UIColor ork_redColor];
-            newTransform = CGAffineTransformMakeScale(0.9*_flowerScaleFactor, 0.9*_flowerScaleFactor);
-            oldCircleAlpha = 0;
-            newCircleAlpha = 1;
-            oldCircleTransform = CGAffineTransformMakeScale(0.2, 0.2);
-            newCircleTransform = CGAffineTransformMakeScale(1.0, 1.0);
-            newAlpha = 1.0;
-            errorHidden = NO;
-            useSpring = NO;
-            break;
-        case ORKSpatialSpanTargetStateCorrect:
-            _flowerView.tintColor = [self tintColor];
-            newTransform = CGAffineTransformMakeScale(1.1*_flowerScaleFactor, 1.1*_flowerScaleFactor);
-            oldCircleAlpha = 0;
-            newCircleAlpha = 1;
-            oldCircleTransform = CGAffineTransformMakeScale(0.2, 0.2);
-            newCircleTransform = CGAffineTransformMakeScale(1.0, 1.0);
-            newAlpha = 1.0;
-            checkHidden = NO;
-            useSpring = YES;
-            duration = 0.5;
-            break;
-    }
-    
-    _checkView.alpha = oldCircleAlpha;
-    _errorView.alpha = newCircleAlpha;
-    _checkView.transform = oldCircleTransform;
-    _errorView.transform = oldCircleTransform;
-    
-    _errorView.hidden = errorHidden;
-    _checkView.hidden = checkHidden;
-    _flowerView.transform = CGAffineTransformMakeScale(_flowerScaleFactor, _flowerScaleFactor);
-    
-    
-    [UIView animateWithDuration:(animated?duration:0) delay:0 usingSpringWithDamping:useSpring?0.5:1 initialSpringVelocity:0 options:(UIViewAnimationOptions)UIViewAnimationOptionBeginFromCurrentState animations:^{
-        _errorView.alpha = newCircleAlpha;
-        _checkView.alpha = newCircleAlpha;
-        _errorView.transform = newCircleTransform;
-        _checkView.transform = newCircleTransform;
-        self.alpha = newAlpha;
-        _flowerView.transform = newTransform;
-        
-    } completion:NULL];
-}
-
-- (void)layoutSubviews {
-    [super layoutSubviews];
-    CGRect bds = self.bounds;
-    _flowerView.center = (CGPoint){CGRectGetMidX(bds), CGRectGetMidY(bds)};
-    _flowerView.bounds = bds;
-    _flowerView.transform = CGAffineTransformMakeScale(_flowerScaleFactor, _flowerScaleFactor);
-    
-    CGFloat designWidth = ORKFlowerBezierPathSize.width + _ORKFlowerMargins.left + _ORKFlowerMargins.right;
-    CGFloat scaleFactor = bds.size.width / designWidth;
-    CGAffineTransform tfm = CGAffineTransformMakeScale(scaleFactor, scaleFactor);
-    
-    CGRect checkRect = CGRectApplyAffineTransform((CGRect){CGPointZero,ORKCheckBezierPathSize}, tfm);
-    [_checkView setBounds:checkRect];
-    _checkView.layer.cornerRadius = checkRect.size.width/2;
-    CGRect errorRect = CGRectApplyAffineTransform((CGRect){CGPointZero,ORKErrorBezierPathSize}, tfm);
-    [_errorView setBounds:errorRect];
-    _errorView.layer.cornerRadius = errorRect.size.width/2;
-    _errorView.center = _flowerView.center;
-    _checkView.center = _flowerView.center;
-}
-
-#pragma mark Accessibility
-
-- (BOOL)isAccessibilityElement {
-    return YES;
-}
-
-- (NSString *)accessibilityLabel {
-    NSString *state;
-    switch (self.state) {
-        case ORKSpatialSpanTargetStateActive:
-            state = ORKLocalizedString(@"AX.MEMORY.TILE.ACTIVE", nil);
-            break;
-        case ORKSpatialSpanTargetStateCorrect:
-            state = ORKLocalizedString(@"AX.MEMORY.TILE.CORRECT", nil);
-            break;
-        case ORKSpatialSpanTargetStateIncorrect:
-            state = ORKLocalizedString(@"AX.MEMORY.TILE.INCORRECT", nil);
-            break;
-        case ORKSpatialSpanTargetStateQuiescent:
-            state = ORKLocalizedString(@"AX.MEMORY.TILE.QUIESCENT", nil);
-            break;
-    }
-    return ORKAccessibilityStringForVariables(ORKLocalizedString(@"AX.MEMORY.TILE.LABEL", nil), state);
-}
-
-@end

ResearchKit/ActiveTasks/ORKTappingContentView.h

@@ -1,47 +0,0 @@
-/*
- Copyright (c) 2015, Apple Inc. All rights reserved.
- 
- Redistribution and use in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met:
- 
- 1.  Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
- 
- 2.  Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation and/or
- other materials provided with the distribution.
- 
- 3.  Neither the name of the copyright holder(s) nor the names of any contributors
- may be used to endorse or promote products derived from this software without
- specific prior written permission. No license is granted to the trademarks of
- the copyright holders even if such marks are included in this software.
- 
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import "ORKCustomStepView_Internal.h"
-#import "ORKRoundTappingButton.h"
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface ORKTappingContentView : ORKActiveStepCustomView
-
-- (void)setTapCount:(NSUInteger)tapCount;
-- (void)setProgress:(CGFloat)progress animated:(BOOL)animated;
-
-@property (nonatomic, strong, readonly) ORKRoundTappingButton *tapButton1;
-
-@property (nonatomic, strong, readonly) ORKRoundTappingButton *tapButton2;
-
-@end
-
-NS_ASSUME_NONNULL_END

ResearchKit/ActiveTasks/ORKTappingContentView.m

@@ -1,243 +0,0 @@
-/*
- Copyright (c) 2015, Apple Inc. All rights reserved.
- 
- Redistribution and use in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met:
- 
- 1.  Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
- 
- 2.  Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation and/or
- other materials provided with the distribution.
- 
- 3.  Neither the name of the copyright holder(s) nor the names of any contributors
- may be used to endorse or promote products derived from this software without
- specific prior written permission. No license is granted to the trademarks of
- the copyright holders even if such marks are included in this software.
- 
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import "ORKTappingContentView.h"
-#import "ORKActiveStepTimer.h"
-#import "ORKResult.h"
-#import "ORKSkin.h"
-#import "ORKSubheadlineLabel.h"
-#import "ORKTapCountLabel.h"
-#import "ORKHelpers.h"
-
-@interface ORKTappingContentView ()
-
-@property (nonatomic, strong) ORKSubheadlineLabel *tapCaptionLabel;
-@property (nonatomic, strong) ORKTapCountLabel *tapCountLabel;
-@property (nonatomic, strong) UIProgressView *progressView;
-
-@end
-
-@implementation ORKTappingContentView {
-   
-    NSArray *_constraints;
-    ORKScreenType _screenType;
-    UIView *_buttonContainer;
-}
-
-- (instancetype)init {
-    self = [super init];
-    if (self) {
-        
-        _screenType = ORKScreenTypeiPhone4;
-        _tapCaptionLabel = [ORKSubheadlineLabel new];
-        _tapCaptionLabel.textAlignment = NSTextAlignmentCenter;
-        _tapCaptionLabel.translatesAutoresizingMaskIntoConstraints = NO;
-        _tapCountLabel = [ORKTapCountLabel new];
-        _tapCountLabel.textAlignment = NSTextAlignmentCenter;
-        _tapCountLabel.translatesAutoresizingMaskIntoConstraints = NO;
-        _buttonContainer = [UIView new];
-        _buttonContainer.translatesAutoresizingMaskIntoConstraints = NO;
-        
-        _progressView = [UIProgressView new];
-        _progressView.translatesAutoresizingMaskIntoConstraints = NO;
-        _progressView.progressTintColor = [self tintColor];
-        [_progressView setAlpha:0];
-        
-        _tapButton1 = [[ORKRoundTappingButton alloc] init];
-        _tapButton1.translatesAutoresizingMaskIntoConstraints = NO;
-        [_tapButton1 setTitle:ORKLocalizedString(@"TAP_BUTTON_TITLE", nil) forState:UIControlStateNormal];
-        
-        _tapButton2 = [[ORKRoundTappingButton alloc] init];
-        _tapButton2.translatesAutoresizingMaskIntoConstraints = NO;
-        [_tapButton2 setTitle:ORKLocalizedString(@"TAP_BUTTON_TITLE", nil) forState:UIControlStateNormal];
-        
-        [self addSubview:_tapCaptionLabel];
-        [self addSubview:_tapCountLabel];
-        [self addSubview:_progressView];
-        [self addSubview:_buttonContainer];
-        
-        [_buttonContainer addSubview:_tapButton1];
-        [_buttonContainer addSubview:_tapButton2];
-        
-        self.translatesAutoresizingMaskIntoConstraints = NO;
-        
-        _tapCaptionLabel.text = ORKLocalizedString(@"TOTAL_TAPS_LABEL", nil);
-        [self setTapCount:0];
-        
-        [self setNeedsUpdateConstraints];
-        
-        _tapCountLabel.accessibilityTraits |= UIAccessibilityTraitUpdatesFrequently;
-    }
-     return self;
-}
-
-- (void)tintColorDidChange {
-    [super tintColorDidChange];
-    _progressView.progressTintColor = [self tintColor];
-}
-
-- (void)setTapCount:(NSUInteger)tapCount {
-    _tapCountLabel.text = [NSString stringWithFormat:@"%02lu", (unsigned long)tapCount];
-}
-
-- (void)setProgress:(CGFloat)progress animated:(BOOL)animated {
-    [_progressView setProgress:progress animated:animated];
-    [UIView animateWithDuration:animated ? 0.2 : 0 animations:^{
-        [_progressView setAlpha:(progress == 0) ? 0 : 1];
-    }];
-}
-
-- (void)resetStep:(ORKActiveStepViewController *)viewController {
-    [super resetStep:viewController];
-    [self setTapCount:0];
-    _tapButton1.enabled = YES;
-    _tapButton2.enabled = YES;
-}
-
-- (void)finishStep:(ORKActiveStepViewController *)viewController {
-    [super finishStep:viewController];
-    _tapButton1.enabled = NO;
-    _tapButton2.enabled = NO;
-}
-
-- (void)willMoveToWindow:(UIWindow *)newWindow {
-    [super willMoveToWindow:newWindow];
-    _screenType = ORKGetScreenTypeForWindow(newWindow);
-    [self setNeedsUpdateConstraints];
-}
-
-- (void)updateConstraints {
-    if ([_constraints count]) {
-        [NSLayoutConstraint deactivateConstraints:_constraints];
-        _constraints = nil;
-    }
-    
-    ORKScreenType screenType = _screenType;
-    const CGFloat HeaderBaselineToCaptionTop = ORKGetMetricForScreenType(ORKScreenMetricCaptionBaselineToTappingLabelTop, screenType);
-    const CGFloat AssumedHeaderBaselineToStepViewTop = ORKGetMetricForScreenType(ORKScreenMetricLearnMoreBaselineToStepViewTop, screenType);
-    CGFloat margin = ORKStandardMarginForView(self);
-    self.layoutMargins = (UIEdgeInsets) { .left=margin*2, .right=margin*2 };
-    
-    static const CGFloat CaptionBaselineToTapCountBaseline = 56;
-    static const CGFloat TapButtonBottomToBottom = 36;
-    
-    NSMutableArray *constraints = [NSMutableArray array];
-    
-    NSDictionary *views = NSDictionaryOfVariableBindings(_buttonContainer, _tapCaptionLabel, _tapCountLabel, _progressView, _tapButton1, _tapButton2);
-    [constraints addObject:[NSLayoutConstraint constraintWithItem:_progressView
-                                                        attribute:NSLayoutAttributeTop
-                                                        relatedBy:NSLayoutRelationEqual
-                                                           toItem:self
-                                                        attribute:NSLayoutAttributeTop
-                                                       multiplier:1 constant:(HeaderBaselineToCaptionTop/3) - AssumedHeaderBaselineToStepViewTop]];
-    
-    [constraints addObject:[NSLayoutConstraint constraintWithItem:_tapCaptionLabel
-                                                        attribute:NSLayoutAttributeTop
-                                                        relatedBy:NSLayoutRelationEqual
-                                                           toItem:self
-                                                        attribute:NSLayoutAttributeTop
-                                                       multiplier:1 constant:(HeaderBaselineToCaptionTop - AssumedHeaderBaselineToStepViewTop)]];
-    
-    [constraints addObject:[NSLayoutConstraint constraintWithItem:_tapCountLabel
-                                                        attribute:NSLayoutAttributeFirstBaseline
-                                                        relatedBy:NSLayoutRelationEqual
-                                                           toItem:_tapCaptionLabel
-                                                        attribute:NSLayoutAttributeFirstBaseline
-                                                       multiplier:1 constant:CaptionBaselineToTapCountBaseline]];
-    
-    [constraints addObject:[NSLayoutConstraint constraintWithItem:self
-                                                        attribute:NSLayoutAttributeBottom
-                                                        relatedBy:NSLayoutRelationEqual
-                                                           toItem:_buttonContainer
-                                                        attribute:NSLayoutAttributeBottom
-                                                       multiplier:1 constant:TapButtonBottomToBottom]];
-    
-    [constraints addObjectsFromArray:
-     [NSLayoutConstraint constraintsWithVisualFormat:@"V:[_tapCountLabel]-(>=10)-[_buttonContainer]"
-                                             options:NSLayoutFormatAlignAllCenterX
-                                             metrics:nil views:views]];
-    
-    [constraints addObjectsFromArray:
-     [NSLayoutConstraint constraintsWithVisualFormat:@"H:|-[_progressView]-|"
-                                             options:(NSLayoutFormatOptions)0
-                                             metrics:nil views:views]];
-    NSLayoutConstraint *wideProgress = [NSLayoutConstraint constraintWithItem:_progressView
-                                                                    attribute:NSLayoutAttributeWidth
-                                                                    relatedBy:NSLayoutRelationEqual
-                                                                       toItem:nil
-                                                                    attribute:NSLayoutAttributeNotAnAttribute
-                                                                   multiplier:1
-                                                                     constant:2000];
-    wideProgress.priority = UILayoutPriorityRequired-1;
-    [constraints addObject:wideProgress];
-    
-    [constraints addObjectsFromArray:
-     [NSLayoutConstraint constraintsWithVisualFormat:@"H:|-[_tapCaptionLabel]-|"
-                                             options:(NSLayoutFormatOptions)0
-                                             metrics:nil views:views]];
-    
-    [constraints addObjectsFromArray:
-     [NSLayoutConstraint constraintsWithVisualFormat:@"H:|-[_tapCountLabel]-|"
-                                             options:(NSLayoutFormatOptions)0
-                                             metrics:nil views:views]];
-    
-    [constraints addObjectsFromArray:
-     [NSLayoutConstraint constraintsWithVisualFormat:@"V:|[_tapButton1]|"
-                                             options:(NSLayoutFormatOptions)0
-                                             metrics:nil views:views]];
-    [constraints addObjectsFromArray:
-     [NSLayoutConstraint constraintsWithVisualFormat:@"V:|[_tapButton2]|"
-                                             options:(NSLayoutFormatOptions)0
-                                             metrics:nil views:views]];
-    
-    
-    [constraints addObjectsFromArray:
-     [NSLayoutConstraint constraintsWithVisualFormat:@"H:|[_tapButton1]-(>=24)-[_tapButton2(==_tapButton1)]|"
-                                             options:(NSLayoutFormatOptions)0
-                                             metrics:nil views:views]];
-    
-    
-    [constraints addObject:[NSLayoutConstraint constraintWithItem:_tapButton1
-                                                        attribute:NSLayoutAttributeCenterY
-                                                        relatedBy:NSLayoutRelationEqual
-                                                           toItem:_tapButton2
-                                                        attribute:NSLayoutAttributeCenterY
-                                                       multiplier:1 constant:0]];
-
-    
-    
-    _constraints = constraints;
-    [self addConstraints:_constraints];
-    
-    [NSLayoutConstraint activateConstraints:constraints];
-    [super updateConstraints];
-}
-
-@end

ResearchKit/ActiveTasks/ORKTappingIntervalStep.h

@@ -1,40 +0,0 @@
-/*
- Copyright (c) 2015, Apple Inc. All rights reserved.
- 
- Redistribution and use in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met:
- 
- 1.  Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
- 
- 2.  Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation and/or
- other materials provided with the distribution.
- 
- 3.  Neither the name of the copyright holder(s) nor the names of any contributors
- may be used to endorse or promote products derived from this software without
- specific prior written permission. No license is granted to the trademarks of
- the copyright holders even if such marks are included in this software.
- 
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import <ResearchKit/ResearchKit_Private.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-ORK_CLASS_AVAILABLE
-@interface ORKTappingIntervalStep : ORKActiveStep
-
-@end
-
-NS_ASSUME_NONNULL_END

ResearchKit/ActiveTasks/ORKTappingIntervalStep.m

@@ -1,54 +0,0 @@
-/*
- Copyright (c) 2015, Apple Inc. All rights reserved.
- 
- Redistribution and use in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met:
- 
- 1.  Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
- 
- 2.  Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation and/or
- other materials provided with the distribution.
- 
- 3.  Neither the name of the copyright holder(s) nor the names of any contributors
- may be used to endorse or promote products derived from this software without
- specific prior written permission. No license is granted to the trademarks of
- the copyright holders even if such marks are included in this software.
- 
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import "ORKTappingIntervalStep.h"
-#import "ORKTappingIntervalStepViewController.h"
-
-@implementation ORKTappingIntervalStep
-
-+ (Class)stepViewControllerClass {
-    return [ORKTappingIntervalStepViewController class];
-}
-
-- (void)validateParameters {
-    
-    [super validateParameters];
-    
-    NSTimeInterval const ORKTwoFingerTappingMinimumDuration = 5.0;
-    
-    if ( self.stepDuration < ORKTwoFingerTappingMinimumDuration) {
-        @throw [NSException exceptionWithName:NSInvalidArgumentException reason:[NSString stringWithFormat:@"duration can not be shorter than %@ seconds.", @(ORKTwoFingerTappingMinimumDuration)]  userInfo:nil];
-    }
-
-}
-
-
-
-@end

ResearchKit/ActiveTasks/ORKTappingIntervalStepViewController.h

@@ -1,40 +0,0 @@
-/*
- Copyright (c) 2015, Apple Inc. All rights reserved.
- 
- Redistribution and use in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met:
- 
- 1.  Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
- 
- 2.  Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation and/or
- other materials provided with the distribution.
- 
- 3.  Neither the name of the copyright holder(s) nor the names of any contributors
- may be used to endorse or promote products derived from this software without
- specific prior written permission. No license is granted to the trademarks of
- the copyright holders even if such marks are included in this software.
- 
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import <ResearchKit/ResearchKit_Private.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-ORK_CLASS_AVAILABLE
-@interface ORKTappingIntervalStepViewController : ORKActiveStepViewController
-
-@end
-
-NS_ASSUME_NONNULL_END

ResearchKit/ActiveTasks/ORKTappingIntervalStepViewController.m

@@ -1,222 +0,0 @@
-/*
- Copyright (c) 2015, Apple Inc. All rights reserved.
- 
- Redistribution and use in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met:
- 
- 1.  Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
- 
- 2.  Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation and/or
- other materials provided with the distribution.
- 
- 3.  Neither the name of the copyright holder(s) nor the names of any contributors
- may be used to endorse or promote products derived from this software without
- specific prior written permission. No license is granted to the trademarks of
- the copyright holders even if such marks are included in this software.
- 
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import "ORKTappingIntervalStepViewController.h"
-#import "ORKTappingContentView.h"
-#import "ORKActiveStepViewController_internal.h"
-#import "ORKVerticalContainerView.h"
-#import "ORKStepViewController_Internal.h"
-#import "ORKActiveStepTimer.h"
-#import "ORKResult.h"
-#import "ORKHelpers.h"
-#import "ORKActiveStepView.h"
-
-@interface ORKTappingIntervalStepViewController () <UIGestureRecognizerDelegate>
-
-@property (nonatomic, strong) NSMutableArray *samples;
-
-@end
-
-@implementation ORKTappingIntervalStepViewController {
-    
-    ORKTappingContentView *_tappingContentView;
-    NSTimeInterval _tappingStart;
-    BOOL _expired;
-    
-    CGRect _buttonRect1;
-    CGRect _buttonRect2;
-    CGSize _viewSize;
-    
-    NSUInteger _hitButtonCount;
-    
-    UIGestureRecognizer *_touchDownRecognizer;
-}
-
-
-- (instancetype)initWithStep:(ORKStep *)step {
-    
-    self = [super initWithStep:step];
-    if (self) {
-        self.suspendIfInactive = YES;
-    }
-    return self;
-}
-
-- (void)initializeInternalButtonItems
-{
-    [super initializeInternalButtonItems];
-    
-    // Don't show next button
-    self.internalContinueButtonItem = nil;
-    self.internalDoneButtonItem = nil;
-}
-
-- (void)viewDidLoad {
-    [super viewDidLoad];
-    
-    _tappingStart = 0;
-    
-    _touchDownRecognizer = [UIGestureRecognizer new];
-    _touchDownRecognizer.delegate = self;
-    [self.view addGestureRecognizer:_touchDownRecognizer];
-    
-    self.activeStepView.stepViewFillsAvailableSpace = YES;
-    
-    self.timerUpdateInterval = 0.1;
-    
-    _expired = NO;
-    
-    _tappingContentView = [[ORKTappingContentView alloc] init];
-    self.activeStepView.activeCustomView = _tappingContentView;
-    
-    [_tappingContentView.tapButton1 addTarget:self action:@selector(buttonPressed:forEvent:) forControlEvents:UIControlEventTouchDown];
-    [_tappingContentView.tapButton2 addTarget:self action:@selector(buttonPressed:forEvent:) forControlEvents:UIControlEventTouchDown];
-        
-}
-
-
-- (void)viewDidAppear:(BOOL)animated {
-    [super viewDidAppear:animated];
-    
-    _buttonRect1 = [self.view convertRect:_tappingContentView.tapButton1.bounds fromView:_tappingContentView.tapButton1];
-    _buttonRect2 = [self.view convertRect:_tappingContentView.tapButton2.bounds fromView:_tappingContentView.tapButton2];
-    _viewSize = self.view.frame.size;
-}
-
-- (ORKStepResult *)result {
-    
-    ORKStepResult *sResult = [super result];
-    
-    // "Now" is the end time of the result, which is either actually now,
-    // or the last time we were in the responder chain.
-    NSDate *now = sResult.endDate;
-    
-    NSMutableArray *results = [NSMutableArray arrayWithArray:sResult.results];
-    
-    ORKTappingIntervalResult *tappingResult = [[ORKTappingIntervalResult alloc] initWithIdentifier:(NSString *__nonnull)self.step.identifier];
-    tappingResult.startDate = sResult.startDate;
-    tappingResult.endDate = now;
-    tappingResult.buttonRect1 = _buttonRect1;
-    tappingResult.buttonRect2 = _buttonRect2;
-    tappingResult.stepViewSize = _viewSize;
-    
-    tappingResult.samples = _samples;
-    
-    [results addObject:tappingResult];
-    sResult.results = [results copy];
-    
-    return sResult;
-}
-
-- (void)receiveTouch:(UITouch *)touch onButton:(ORKTappingButtonIdentifier)buttonIdentifier {
-    
-    if (_expired || self.samples == nil) {
-        return;
-    }
-    
-    NSTimeInterval ti = CACurrentMediaTime();
-    
-    if (_tappingStart == 0) {
-        _tappingStart = ti;
-    }
-    
-    
-    CGPoint location = [touch locationInView:self.view];
-    
-    // Add new sample
-    ti = ti-_tappingStart;
-    
-    
-    ORKTappingSample *sample = [[ORKTappingSample alloc] init];
-    sample.buttonIdentifier = buttonIdentifier;
-    sample.location = location;
-    sample.timestamp = ti;
-
-    [self.samples addObject:sample];
-    
-    if (buttonIdentifier == ORKTappingButtonIdentifierLeft || buttonIdentifier == ORKTappingButtonIdentifierRight) {
-        _hitButtonCount++;
-    }
-    // Update label
-    [_tappingContentView setTapCount:_hitButtonCount];
-}
-
-- (void)stepDidFinish {
-    [super stepDidFinish];
-    
-    _expired = YES;
-    [_tappingContentView finishStep:self];
-    [self goForward];
-}
-
-
-- (void)countDownTimerFired:(ORKActiveStepTimer *)timer finished:(BOOL)finished {
-    CGFloat progress = finished ? 1 : (timer.runtime / timer.duration);
-    [_tappingContentView setProgress:progress animated:YES];
-    [super countDownTimerFired:timer finished:finished];
-}
-
-- (void)start {
-    [super start];
-    [_tappingContentView setProgress:0.001 animated:NO];
-}
-
-#pragma mark buttonAction
-
-- (IBAction)buttonPressed:(id)button forEvent:(UIEvent *)event {
-    
-    if (self.samples == nil) {
-        // Start timer on first touch event on button
-        _samples = [NSMutableArray array];
-        _hitButtonCount = 0;
-        [self start];
-    }
-    
-    NSInteger index = (button == _tappingContentView.tapButton1) ? ORKTappingButtonIdentifierLeft : ORKTappingButtonIdentifierRight;
-    
-    [self receiveTouch:[[event touchesForView:button] anyObject] onButton:index] ;
-}
-
-#pragma mark UIGestureRecognizerDelegate
-
-- (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer shouldReceiveTouch:(UITouch *)touch {
-    CGPoint location = [touch locationInView:self.view];
-
-    BOOL shouldReceive = !(CGRectContainsPoint(_buttonRect1, location) || CGRectContainsPoint(_buttonRect2, location));
-    
-    if (shouldReceive && touch.phase == UITouchPhaseBegan) {
-        [self receiveTouch:touch onButton:ORKTappingButtonIdentifierNone];
-    }
-    
-    return NO;
-}
-
-@end
-

ResearchKit/ActiveTasks/ORKTouchRecorder.h

@@ -1,54 +0,0 @@
-/*
- Copyright (c) 2015, Apple Inc. All rights reserved.
- 
- Redistribution and use in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met:
- 
- 1.  Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
- 
- 2.  Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation and/or
- other materials provided with the distribution.
- 
- 3.  Neither the name of the copyright holder(s) nor the names of any contributors
- may be used to endorse or promote products derived from this software without
- specific prior written permission. No license is granted to the trademarks of
- the copyright holders even if such marks are included in this software.
- 
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import <ResearchKit/ORKRecorder.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-/**
- The `ORKTouchRecorder` class defines the attributes and behavior of touch events recorder.
- 
- This class is considered private because its interface is not yet considered
- stable. It is not currently used by any of the pre-defined active tasks.
- */
-ORK_CLASS_AVAILABLE
-@interface ORKTouchRecorder : ORKRecorder
-
-/**
- The `ORKTouchRecorder` attaches a gesture recognizer to `touchView` to receive touch events.
- 
- Use `-viewController:willStartStepWithView:` to set the `touchView` property before
- the touch recorder starts.
- */
-@property (nonatomic, strong, readonly, nullable) UIView *touchView;
-
-@end
-
-NS_ASSUME_NONNULL_END

ResearchKit/ActiveTasks/ORKTouchRecorder.m

@@ -1,265 +0,0 @@
-/*
- Copyright (c) 2015, Apple Inc. All rights reserved.
- 
- Redistribution and use in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met:
- 
- 1.  Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
- 
- 2.  Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation and/or
- other materials provided with the distribution.
- 
- 3.  Neither the name of the copyright holder(s) nor the names of any contributors
- may be used to endorse or promote products derived from this software without
- specific prior written permission. No license is granted to the trademarks of
- the copyright holders even if such marks are included in this software.
- 
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import "ORKTouchRecorder.h"
-#import "ORKDataLogger.h"
-#import "ORKRecorder_Internal.h"
-#import "ORKRecorder_Private.h"
-#import "UITouch+ORKJSONDictionary.h"
-
-@protocol ORKTouchRecordingDelegate <NSObject>
-
-- (void)view:(UIView *)view didDetectTouch:(UITouch *)touch;
-
-@end
-
-@interface ORKTouchGestureRecognizer : UIGestureRecognizer
-
-@property (nonatomic, weak) id<ORKTouchRecordingDelegate> eventDelegate;
-
-@end
-
-@implementation ORKTouchGestureRecognizer
-
-- (instancetype)init
-{
-    self = [super init];
-    if (self) {
-        
-    }
-    return self;
-}
-
-- (void)reportTouches:(NSSet *)touches {
-    
-    for (UITouch *touch in touches) {
-        [self.eventDelegate view:self.view didDetectTouch:touch];
-    }
-}
-
-- (void)touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event {
-    
-    [self reportTouches:touches];
-}
-- (void)touchesMoved:(NSSet *)touches withEvent:(UIEvent *)event {
-    
-    [self reportTouches:touches];
-}
-- (void)touchesEnded:(NSSet *)touches withEvent:(UIEvent *)event {
-    
-    [self reportTouches:touches];
-}
-- (void)touchesCancelled:(NSSet *)touches withEvent:(UIEvent *)event {
-    
-    [self reportTouches:touches];
-}
-
-
-@end
-
-
-@interface ORKTouchRecordingView : UIView
-
-@property (nonatomic, weak) id<ORKTouchRecordingDelegate> deleagte;
-
-@end
-
-@interface ORKTouchRecorder () <ORKTouchRecordingDelegate>
-{
-    ORKDataLogger *_logger;
-}
-@property (nonatomic, strong) ORKTouchGestureRecognizer *gestureRecognizer;
-
-@property (nonatomic, strong) NSMutableArray *touchArray;
-
-@property (nonatomic) NSTimeInterval uptime;
-
-@property (nonatomic, strong) NSError *recordingError;
-
-@end
-
-@implementation ORKTouchRecorder
-
-- (instancetype)initWithStep:(ORKStep *)step outputDirectory:(NSURL *)outputDirectory
-{
-    self = [super initWithStep:step
-               outputDirectory:(NSURL *)outputDirectory];
-    return self;
-}
-
-
-- (void)dealloc
-{
-    [_logger finishCurrentLog];
-}
-
-- (void)viewController:(UIViewController *)viewController willStartStepWithView:(UIView *)view {
-    if (self.isRecording == NO) {
-        _touchView = view;
-    }
-}
-
-- (void)start {
-    
-    if (! _logger) {
-        NSError *err = nil;
-        _logger = [self makeJSONDataLoggerWithError:&err];
-        if (! _logger) {
-            [self finishRecordingWithError:err];
-            return;
-        }
-    }
-    
-    if (self.touchView) {
-        [self.touchView addGestureRecognizer:self.gestureRecognizer];
-        
-        [super start];
-        
-        self.touchArray = [NSMutableArray array];
-        _uptime = [NSProcessInfo processInfo].systemUptime;
-        
-    }
-    else
-    {
-        @throw [NSException exceptionWithName:NSGenericException
-                                       reason:@"No touch capture view provided"
-                                     userInfo:@{@"recorder": self}];
-    }
-}
-
-- (ORKTouchGestureRecognizer *)gestureRecognizer {
-    if (_gestureRecognizer == nil) {
-        _gestureRecognizer = [ORKTouchGestureRecognizer new];
-        _gestureRecognizer.eventDelegate = self;
-    }
-    return _gestureRecognizer;
-}
-
-- (void)stop {
-    [self doStopRecording];
-    [_logger finishCurrentLog];
-    
-    NSError *error = nil;
-    __block NSURL *fileUrl = nil;
-    [_logger enumerateLogs:^(NSURL *logFileUrl, BOOL *stop) {
-        fileUrl = logFileUrl;
-    } error:&error];
-    
-    [self reportFileResultWithFile:fileUrl error:error];
-    
-    [super stop];
-}
-
-- (void)doStopRecording
-{
-    if (_touchView)
-    {
-        [self.touchView removeGestureRecognizer:self.gestureRecognizer];
-        _touchView = nil;
-    }
-}
-
-- (void)finishRecordingWithError:(NSError *)error
-{
-    [self doStopRecording];
-    [super finishRecordingWithError:error];
-}
-
-- (NSString *)recorderType
-{
-    return @"touch";
-}
-
-
-- (NSString *)mimeType {
-    return @"application/json";
-}
-
-- (void)reset
-{
-    [super reset];
-    
-    _logger = nil;
-}
-
-#pragma mark - ORKTouchRecordingDelegate
-
-- (void)view:(UIView *)view didDetectTouch:(UITouch *)touch {
-    
-    if ([self.touchArray containsObject:touch] == NO) {
-        [self.touchArray addObject:touch];
-    }
-    
-    NSError *err = nil;
-    if (![_logger append:[touch ork_JSONDictionaryInView:view allTouches:self.touchArray] error:&err])
-    {
-        assert(err != nil);
-        [self finishRecordingWithError:err];
-    }
-}
-
-@end
-
-@interface ORKTouchRecorderConfiguration()
-
-@end
-
-
-@implementation ORKTouchRecorderConfiguration
-
-- (instancetype)init
-{
-    return [self ork_init];
-}
-
-- (ORKRecorder *)recorderForStep:(ORKStep *)step
-               outputDirectory:(NSURL *)outputDirectory {
-    ORKTouchRecorder *recorder = [[ORKTouchRecorder alloc] initWithStep:step
-                                                      outputDirectory:outputDirectory];
-    return recorder;
-}
-
-- (instancetype)initWithCoder:(NSCoder *)aDecoder
-{
-    self = [super initWithCoder:aDecoder];
-    if (self)
-    {
-    }
-    return self;
-}
-
-+ (BOOL)supportsSecureCoding
-{
-    return YES;
-}
-
-
-@end
-

ResearchKit/ActiveTasks/ORKVoiceEngine.h

@@ -1,53 +0,0 @@
-/*
- Copyright (c) 2015, Apple Inc. All rights reserved.
- 
- Redistribution and use in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met:
- 
- 1.  Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
- 
- 2.  Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation and/or
- other materials provided with the distribution.
- 
- 3.  Neither the name of the copyright holder(s) nor the names of any contributors
- may be used to endorse or promote products derived from this software without
- specific prior written permission. No license is granted to the trademarks of
- the copyright holders even if such marks are included in this software.
- 
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-
-#import <Foundation/Foundation.h>
-#import <AVFoundation/AVFoundation.h>
-#import <ResearchKit/ResearchKit.h>
-
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface ORKVoiceEngine : NSObject <AVSpeechSynthesizerDelegate>
-
-+ (ORKVoiceEngine *)sharedVoiceEngine;
-
-- (void)speakText:(NSString *)text;
-
-- (void)speakInt:(NSInteger)number;
-
-- (void)stopTalking;
-
-- (BOOL)isSpeaking;
-
-@end
-
-NS_ASSUME_NONNULL_END

ResearchKit/ActiveTasks/ORKVoiceEngine.m

@@ -1,108 +0,0 @@
-/*
- Copyright (c) 2015, Apple Inc. All rights reserved.
- 
- Redistribution and use in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met:
- 
- 1.  Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
- 
- 2.  Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation and/or
- other materials provided with the distribution.
- 
- 3.  Neither the name of the copyright holder(s) nor the names of any contributors
- may be used to endorse or promote products derived from this software without
- specific prior written permission. No license is granted to the trademarks of
- the copyright holders even if such marks are included in this software.
- 
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-
-#import "ORKVoiceEngine.h"
-#import "ORKHelpers.h"
-
-
-@interface ORKVoiceEngine ()
-
-@property (nonatomic, strong)  AVSpeechSynthesizer *speechSynthesizer;
-
-@end
-
-@implementation ORKVoiceEngine
-
-
-
-+(ORKVoiceEngine *)sharedVoiceEngine
-{
-    static ORKVoiceEngine *shared;
-    static dispatch_once_t onceToken;
-    dispatch_once(&onceToken, ^{
-        shared = [ORKVoiceEngine new];
-    });
-    return shared;
-}
-
-- (instancetype)init
-{
-    self = [super init];
-    if (self) {
-        self.speechSynthesizer = [[AVSpeechSynthesizer alloc] init];
-        self.speechSynthesizer.delegate = self;
-    }
-    return self;
-}
-
-- (void)dealloc
-{
-    [self.speechSynthesizer stopSpeakingAtBoundary:AVSpeechBoundaryImmediate];
-    self.speechSynthesizer.delegate = nil;
-    self.speechSynthesizer = nil;
-}
-
-- (void)speakText:(NSString *)text {
-    if (self.speechSynthesizer.isSpeaking) {
-        [self stopTalking];
-    }
-    
-    if (UIAccessibilityIsVoiceOverRunning()) {
-        UIAccessibilityPostNotification(UIAccessibilityAnnouncementNotification, text);
-        return;
-    }
-    
-    AVSpeechUtterance *utterance = [[AVSpeechUtterance alloc] initWithString:text];
-    utterance.rate = AVSpeechUtteranceMaximumSpeechRate / 7;
-
-    [self.speechSynthesizer speakUtterance:utterance];
-}
-
-- (void)speakInt:(NSInteger)number {
-    [self speakText:[NSString stringWithFormat:@"%ld",(long)number]];
-}
-
-- (void)stopTalking {
-    [self.speechSynthesizer stopSpeakingAtBoundary:AVSpeechBoundaryWord];
-}
-
-
-- (void)speechSynthesizer:(AVSpeechSynthesizer *)synthesizer didFinishSpeechUtterance:(AVSpeechUtterance *)utterance {
-    
-}
-
-- (BOOL)isSpeaking
-{
-    return self.speechSynthesizer.isSpeaking;
-}
-
-
-@end

ResearchKit/ActiveTasks/ORKWalkingTaskStep.h

@@ -1,53 +0,0 @@
-/*
- Copyright (c) 2015, Apple Inc. All rights reserved.
- 
- Redistribution and use in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met:
- 
- 1.  Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
- 
- 2.  Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation and/or
- other materials provided with the distribution.
- 
- 3.  Neither the name of the copyright holder(s) nor the names of any contributors
- may be used to endorse or promote products derived from this software without
- specific prior written permission. No license is granted to the trademarks of
- the copyright holders even if such marks are included in this software.
- 
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import <ResearchKit/ORKActiveStep.h>
-
-/**
- The `ORKWalkingTaskStep` class implements a step that's used in the predefined
- walking task.
- 
- You don't usually need to instantiate a walking step directly;
- instead, it is instantiated as part of a predefined task. See the
- predefined active tasks defined in `ORKOrderedTask`.
- */
-ORK_CLASS_AVAILABLE
-@interface ORKWalkingTaskStep : ORKActiveStep
-
-/**
- The number of steps the user should be asked to take in each leg of the
- walking task step.
- 
- The step finishes when the number of steps have been completed,
- or after `1.5 * numberOfStepsPerLeg` seconds, whichever comes first.
- */
-@property (nonatomic, assign) NSInteger numberOfStepsPerLeg;
-
-@end

ResearchKit/ActiveTasks/ORKWalkingTaskStep.m

@@ -1,100 +0,0 @@
-/*
- Copyright (c) 2015, Apple Inc. All rights reserved.
- 
- Redistribution and use in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met:
- 
- 1.  Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
- 
- 2.  Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation and/or
- other materials provided with the distribution.
- 
- 3.  Neither the name of the copyright holder(s) nor the names of any contributors
- may be used to endorse or promote products derived from this software without
- specific prior written permission. No license is granted to the trademarks of
- the copyright holders even if such marks are included in this software.
- 
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import "ORKWalkingTaskStep.h"
-#import "ORKHelpers.h"
-#import "ORKWalkingTaskStepViewController.h"
-#import "ORKStep_Private.h"
-
-@implementation ORKWalkingTaskStep
-
-+ (Class)stepViewControllerClass {
-    return [ORKWalkingTaskStepViewController class];
-}
-
-- (void)validateParameters {
-    
-    [super validateParameters];
-    
-    NSInteger const ORKShortWalkTaskMinimumNumberOfStepsPerLeg = 1;
-    
-    if ( self.numberOfStepsPerLeg < ORKShortWalkTaskMinimumNumberOfStepsPerLeg)
-    {
-        @throw [NSException exceptionWithName:NSInvalidArgumentException
-                                       reason:[NSString stringWithFormat:@"numberOfStepsPerLeg can not be less than %@.", @(ORKShortWalkTaskMinimumNumberOfStepsPerLeg)]
-                                     userInfo:nil];
-    }
-}
-
-
-
-- (instancetype)copyWithZone:(NSZone *)zone
-{
-    ORKWalkingTaskStep *step = [super copyWithZone:zone];
-    step.numberOfStepsPerLeg = self.numberOfStepsPerLeg;
-    return step;
-}
-
-- (BOOL)startsFinished {
-    return NO;
-}
-
-- (instancetype)initWithCoder:(NSCoder *)aDecoder
-{
-    self = [super initWithCoder:aDecoder];
-    if (self)
-    {
-        ORK_DECODE_INTEGER(aDecoder, numberOfStepsPerLeg);
-    }
-    return self;
-}
-
-- (void)encodeWithCoder:(NSCoder *)aCoder
-{
-    [super encodeWithCoder:aCoder];
-    ORK_ENCODE_INTEGER(aCoder, numberOfStepsPerLeg);
-}
-
-+ (BOOL)supportsSecureCoding
-{
-    return YES;
-}
-
-
-- (BOOL)isEqual:(id)object {
-    BOOL isParentSame = [super isEqual:object];
-    
-    __typeof(self) castObject = object;
-    return (isParentSame &&
-            (self.numberOfStepsPerLeg == castObject.numberOfStepsPerLeg)) ;
-}
-
-
-@end

ResearchKit/ActiveTasks/ORKWalkingTaskStepViewController.h

@@ -1,42 +0,0 @@
-/*
- Copyright (c) 2015, Apple Inc. All rights reserved.
- 
- Redistribution and use in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met:
- 
- 1.  Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
- 
- 2.  Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation and/or
- other materials provided with the distribution.
- 
- 3.  Neither the name of the copyright holder(s) nor the names of any contributors
- may be used to endorse or promote products derived from this software without
- specific prior written permission. No license is granted to the trademarks of
- the copyright holders even if such marks are included in this software.
- 
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import <ResearchKit/ResearchKit_Private.h>
-
-/**
- View controller corresponding to the `ORKWalkingTaskStep`.
- 
- Observes the results of the pedometer, in order to finish early
- when the threshold number of steps have been observed.
- */
-ORK_CLASS_AVAILABLE
-@interface ORKWalkingTaskStepViewController : ORKActiveStepViewController
-
-@end

ResearchKit/ActiveTasks/ORKWalkingTaskStepViewController.m

@@ -1,290 +0,0 @@
-/*
- Copyright (c) 2015, Apple Inc. All rights reserved.
- 
- Redistribution and use in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met:
- 
- 1.  Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
- 
- 2.  Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation and/or
- other materials provided with the distribution.
- 
- 3.  Neither the name of the copyright holder(s) nor the names of any contributors
- may be used to endorse or promote products derived from this software without
- specific prior written permission. No license is granted to the trademarks of
- the copyright holders even if such marks are included in this software.
- 
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import "ORKWalkingTaskStepViewController.h"
-#import "ORKHelpers.h"
-#import "ORKStep_Private.h"
-#import "ORKStepViewController_Internal.h"
-#import "ORKActiveStepViewController_Internal.h"
-#import "ORKCustomStepView_Internal.h"
-#import "ORKActiveStepViewController_Internal.h"
-#import "ORKVerticalContainerView_Internal.h"
-#import "ORKSkin.h"
-#import "ORKWalkingTaskStep.h"
-#import "ORKPedometerRecorder.h"
-#import "ORKActiveStepView.h"
-
-static const CGFloat kProgressCircleDiameter = 10;
-static const CGFloat kProgressCircleSpacing = 4;
-
-@interface ORKWalkingProgressCircleView : UIView
-@property (nonatomic, assign) BOOL completed;
-@end
-
-@implementation ORKWalkingProgressCircleView
-
-- (instancetype)initWithFrame:(CGRect)frame {
-    self = [super initWithFrame:frame];
-    if (self) {
-        [self setCompleted:NO];
-        self.backgroundColor = [self tintColor];
-        self.layer.cornerRadius = kProgressCircleDiameter/2;
-    }
-    return self;
-}
-
-- (void)tintColorDidChange {
-    [super tintColorDidChange];
-    self.backgroundColor = [self tintColor];
-}
-
-- (CGSize)intrinsicContentSize {
-    return (CGSize){kProgressCircleDiameter,kProgressCircleDiameter};
-}
-
-- (CGSize)sizeThatFits:(CGSize)size {
-    return (CGSize){kProgressCircleDiameter,kProgressCircleDiameter};
-}
-
-- (void)setCompleted:(BOOL)completed {
-    _completed = completed;
-    self.alpha = (completed ? 1.0 : 0.6);
-}
-
-@end
-
-@interface ORKWalkingProgressView : UIView
-
-@property (nonatomic, assign) NSInteger count;
-
-@end
-
-@implementation ORKWalkingProgressView
-{
-    NSArray *_circles;
-    NSInteger _index;
-    NSTimer *_timer;
-}
-
-- (instancetype)initWithFrame:(CGRect)frame {
-    self = [super initWithFrame:frame];
-    if (self) {
-        self.count = 3;
-    }
-    return self;
-}
-
-- (void)dealloc {
-    [_timer invalidate];
-    _timer = nil;
-}
-
-- (void)setCount:(NSInteger)count {
-    _count = count;
-    if (count != [_circles count]) {
-        for (UIView *v in _circles) {
-            [v removeFromSuperview];
-        }
-        NSMutableArray *newCircles = [NSMutableArray array];
-        for (NSInteger idx = 0; idx < count; idx ++) {
-            ORKWalkingProgressCircleView *circle = [ORKWalkingProgressCircleView new];
-            [newCircles addObject:circle];
-            [self addSubview:circle];
-        }
-        
-        _circles = newCircles;
-        [self invalidateIntrinsicContentSize];
-        [self setNeedsLayout];
-        self.index = _index;
-    }
-}
-
-- (void)setIndex:(NSInteger)index {
-    _index = index;
-    [_circles enumerateObjectsUsingBlock:^(ORKWalkingProgressCircleView *circle, NSUInteger idx, BOOL *stop) {
-        circle.completed = (idx < _index);
-    }];
-}
-
-- (void)didMoveToWindow {
-    if (self.window) {
-        [self startAnimating];
-    } else {
-        [self stopAnimating];
-    }
-}
-- (void)stopAnimating {
-    [_timer invalidate];
-    _timer = nil;
-}
-
-- (void)incrementIndex {
-    self.index = (_index + 1) % (_count + 1);
-}
-
-- (void)startAnimating {
-    [self stopAnimating];
-    self.index = 0;
-    _timer = [NSTimer scheduledTimerWithTimeInterval:0.5 target:self selector:@selector(incrementIndex) userInfo:nil repeats:YES];
-}
-
-- (CGSize)sizeThatFits:(CGSize)size {
-    size.height = kProgressCircleDiameter;
-    size.width = (_count * kProgressCircleDiameter) + MAX(_count-1,0) * kProgressCircleSpacing;
-    return size;
-}
-
-- (CGSize)intrinsicContentSize {
-    return [self sizeThatFits:CGSizeZero];
-}
-
-- (void)layoutSubviews {
-    CGSize sz = (CGSize){kProgressCircleDiameter,kProgressCircleDiameter};
-    CGFloat xStep = kProgressCircleDiameter + kProgressCircleSpacing;
-    CGFloat x0 = 0;
-    for (UIView *v in _circles) {
-        v.frame = (CGRect){{x0,0},sz};
-        x0 += xStep;
-    }
-}
-
-
-@end
-
-
-
-
-@interface ORKWalkingContentView : ORKActiveStepCustomView
-{
-    ORKScreenType _screenType;
-    NSLayoutConstraint *_topConstraint;
-}
-
-@property  (nonatomic, strong, readonly) ORKWalkingProgressView *progressView;
-
-@end
-
-@implementation ORKWalkingContentView
-
-- (void)willMoveToWindow:(UIWindow *)newWindow {
-    [super willMoveToWindow:newWindow];
-    _screenType = ORKGetScreenTypeForWindow(newWindow);
-    [self updateConstraintConstants];
-}
-
-- (instancetype)initWithFrame:(CGRect)frame {
-    self = [super initWithFrame:frame];
-    if (self) {
-        _progressView = [ORKWalkingProgressView new];
-        _progressView.translatesAutoresizingMaskIntoConstraints = NO;
-        _screenType = ORKScreenTypeiPhone4;
-        
-#if LAYOUT_DEBUG
-        self.backgroundColor = [[UIColor cyanColor] colorWithAlphaComponent:0.2];
-        _progressView.backgroundColor = [[UIColor yellowColor] colorWithAlphaComponent:0.2];
-#endif
-        
-        [self addSubview:_progressView];
-        [self setNeedsUpdateConstraints];
-        
-    }
-    return self;
-}
-
-- (void)updateConstraintConstants {
-    
-    ORKScreenType screenType = _screenType;
-    const CGFloat CaptionBaselineToProgressTop = 100;
-    const CGFloat CaptionBaselineToStepViewTop = ORKGetMetricForScreenType(ORKScreenMetricLearnMoreBaselineToStepViewTop, screenType);
-    [_topConstraint setConstant:(CaptionBaselineToProgressTop - CaptionBaselineToStepViewTop)];
-}
-
-- (void)updateConstraints {
-    [self removeConstraints:[self constraints]];
-    NSDictionary *views = NSDictionaryOfVariableBindings(_progressView);
-    [self addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"V:[_progressView]-(>=0)-|" options:NSLayoutFormatAlignAllCenterX metrics:nil views:views]];
-    _topConstraint = [NSLayoutConstraint constraintWithItem:_progressView attribute:NSLayoutAttributeTop relatedBy:NSLayoutRelationEqual toItem:self attribute:NSLayoutAttributeTop multiplier:1 constant:0];
-    [self updateConstraintConstants];
-    [self addConstraint:_topConstraint];
-    [self addConstraint:[NSLayoutConstraint constraintWithItem:_progressView attribute:NSLayoutAttributeCenterX relatedBy:NSLayoutRelationEqual toItem:self attribute:NSLayoutAttributeCenterX multiplier:1 constant:0]];
-    
-    [super updateConstraints];
-}
-
-
-@end
-
-@interface ORKWalkingTaskStepViewController () <ORKPedometerRecorderDelegate>
-{
-    NSInteger _intendedSteps;
-    ORKWalkingContentView *_contentView;
-}
-@end
-
-@implementation ORKWalkingTaskStepViewController
-
-
-- (instancetype)initWithStep:(ORKStep *)step {
-    
-    self = [super initWithStep:step];
-    if (self) {
-        self.suspendIfInactive = NO;
-    }
-    return self;
-}
-
-- (ORKWalkingTaskStep *)walkingTaskStep {
-    return (ORKWalkingTaskStep *)self.step;
-}
-
-
-- (void)viewDidLoad {
-    [super viewDidLoad];
-    
-    _contentView = [ORKWalkingContentView new];
-    _contentView.translatesAutoresizingMaskIntoConstraints = NO;
-    self.activeStepView.activeCustomView = _contentView;
-}
-
-- (void)stepDidChange {
-    [super stepDidChange];
-    
-    _intendedSteps = [[self walkingTaskStep] numberOfStepsPerLeg];
-}
-
-- (void)pedometerRecorderDidUpdate:(ORKPedometerRecorder *)pedometerRecorder {
-    NSInteger numberOfSteps = [pedometerRecorder totalNumberOfSteps];
-    ORK_Log_Debug(@"Steps: %lld", (long long)numberOfSteps);
-    if (_intendedSteps > 0 && numberOfSteps >= _intendedSteps) {
-        [self finish];
-    }
-}
-
-@end

ResearchKit/ActiveTasks/UITouch+ORKJSONDictionary.h

@@ -1,43 +0,0 @@
-/*
- Copyright (c) 2015, Apple Inc. All rights reserved.
- 
- Redistribution and use in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met:
- 
- 1.  Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
- 
- 2.  Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation and/or
- other materials provided with the distribution.
- 
- 3.  Neither the name of the copyright holder(s) nor the names of any contributors
- may be used to endorse or promote products derived from this software without
- specific prior written permission. No license is granted to the trademarks of
- the copyright holders even if such marks are included in this software.
- 
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-
-#import <UIKit/UIKit.h>
-#import <ResearchKit/ResearchKit.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface UITouch (ORKJSONDictionary)
-
-- (NSDictionary *)ork_JSONDictionaryInView:(UIView *)view allTouches:(NSArray *)allTouches;
-
-@end
-
-NS_ASSUME_NONNULL_END