Convergence

Fix typo in podspec version quoting characters.

.gitignore

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

CONTRIBUTING.md

@@ -0,0 +1,187 @@
+Contributing to the ResearchKit Framework
+===========================
+
+This page focuses on code contributions to the existing
+codebase. However, other types of contributions are welcome too, in
+keeping with the ResearchKit™ framework [best practices](../../wiki/best-practices). For example,
+contributions of original free-to-use survey content, back-end integrations,
+validation data, and analysis or processing tools are all welcome. Ask
+on [researchkit-dev](https://lists.apple.com/mailman/listinfo/researchkit-dev) or [contact us](https://developer.apple.com/contact/researchkit/) for guidance.
+
+
+Contributing software
+---------------------
+
+This page assumes you already know how to check out and build the
+code. Contributions to the ResearchKit framework are expected to comply with the
+[ResearchKit Contribution Terms and License Policy](#contribution); please familiarize yourself
+with this policy prior to submitting a pull request. For any contribution, ensure that you own
+the rights or have permission from the copyright holder.  (e.g. code, images, surveys, videos
+and other content you may include)
+
+To contribute to ResearchKit:
+
+1. [Choose or create an issue to work on.](#create)
+2. [Create a personal fork of the ResearchKit framework.](#fork)
+3. [Develop your changes in your fork.](#develop)
+4. [Run the tests.](#test)
+5. [Submit a pull request.](#request)
+6. Make any changes requested by the reviewer, and update your pull request as needed.
+7. Once accepted, your pull request will be merged into master.
+
+Choosing an issue to work on<a name="create"></a>
+----------------------------
+
+To find an issue to work on, either pick something that you need for
+your app, or select one of the issues from our [issue list](../../issues). Or,
+consider one of the areas where we'd like to extend ResearchKit:
+
+* Faster 'get started' to a useful app
+* More active tasks
+* Data analysis for active tasks
+* More consent sections
+* Back end integrations
+
+If in doubt, bring your idea up on [researchkit-dev](https://lists.apple.com/mailman/listinfo/researchkit-dev).
+
+
+Creating a personal fork<a name="fork"></a>
+------------------------
+
+On GitHub, it's easy to create a personal fork. Just tap the "Fork"
+button on the top right, and clone your new repository.
+
+
+Develop your changes in your fork<a name="develop"></a>
+---------------------------------
+
+Develop your changes using your normal development process. If you
+already have code from an existing project, you may need to adjust its
+style to more closely match the [ResearchKit framework coding style](./docs-standalone/coding-style-guide.md).
+
+New components may need to expose new Public or Private
+headers. Public headers are for APIs that are likely to be a stable
+part of the interface of the ResearchKit framework. Private headers are for APIs that
+may need to be accessed from app-side unit tests, or that are more
+subject to change than the public interface. All other headers should
+be internal, "Project" headers.
+
+Please review and ensure that any contributions you make comply with
+the [ResearchKit Contribution Terms and License Policy](#contribution).
+
+Add automated tests for your feature, where it is possible to do
+so. For UI driven components where it is harder to write automated
+tests, add UI to at least one test application so that the new
+features can be reviewed and tested. Consider also whether to add new
+code to other existing demo apps to exercise your feature.
+
+When adding UI driven components, make sure that they are accessible. 
+Follow the steps outlined in the [Best Practices](../../wiki/best-practices) 
+section under Accessibility. Before submitting the pull request, you should 
+audit your components with Voice Over (or other relevant assistive technologies) 
+enabled.
+
+Keep changes that fix different issues separate. For bug fixes,
+separate bugs should be submitted as separate pull requests. A good
+way to do this is to create a new branch in your fork for each new
+bug work on.
+
+Any new user-visible strings should be included in the English
+`ResearchKit.strings` table so that they can be picked up and
+localized in the next release cycle.
+
+
+Run the tests<a name="test"></a>
+-------------
+
+All unit tests should pass, and there should be no warnings. Also
+verify that test apps run on both device and simulator.
+
+Where your code affects UI presentation, also test:
+
+* Multiple device form factors (for instance, iPhone 4S, iPhone 5, iPhone 6, iPhone 6 Plus).
+* Dynamic text, especially at the "Large" setting.
+* Rotation between portrait and landscape, where appropriate.
+
+You can use the apps in the `Testing` and `samples` directories to
+test your changes.
+
+Submit a pull request<a name="request"></a>
+---------------------
+
+The reviewers may request changes. Make the changes, and update your
+pull request as needed. Reviews will focus on coding style,
+correctness, and design consistency.
+
+This process does not take the place of an ethical review, for example
+by an institutional review board (IRB) or ethics committee.
+
+After acceptance<a name="after"></a>
+----------------
+
+Once your pull request has been accepted, your changes will be merged
+to master. You are still responsible for your change after it is
+accepted. Stay in contact, in case bugs are detected that may require
+your attention.
+
+When the project is next branched for release, your changes will be
+incorporated. Queries may come back to you regarding localization,
+documentation, or other issues during this process.
+
+
+
+
+Release process
+-----------------
+
+The `master` branch is used for work in progress. On `master`:
+
+* All test apps should build and run error free.
+* Unit tests should all pass.
+* Everything should be continuously in working order in English (the
+  base language).
+
+  The project will make periodic releases. When preparing a stable release, we
+  will branch from `master` to a convergence branch. During this process,
+  changes will be made first to the convergence branch, and then merged into
+  `master`. On the convergence branch, changes will be made only to:
+
+  * Fix high priority issues.
+  * Update documentation.
+  * Bring localization up to date.
+  * Ensure good behavior across all supported devices.
+
+  After the converging process is completed, we will merge everything to the
+  `stable` branch and tag with a new release number. The most recent release
+  will be highlighted in the [README](../..). 
+
+
+  ResearchKit Contribution Terms and License Policy<a name="contribution"></a>
+  =======================================
+
+  Thank you for your interest in contributing to the ResearchKit
+  community.  In order to maintain consistency and license compatibility
+  throughout the project, all contributions must comply with our
+  licensing policy and terms for contributing code to the ResearchKit
+  project:
+
+  1.  If you are submitting a patch to the existing codebase, you
+  represent that you have the right to license the patch, including 
+  all code and content, to Apple and the community, and agree by 
+  submitting the patch that your changes are
+  licensed under the existing license terms of the file you are
+  modifying (i.e., [ResearchKit BSD license](LICENSE)).
+  You confirm that you have added your copyright (name and year) to 
+  the relevant files for changes that are more than 10 lines of code.
+  2.  If you are submitting a new file for inclusion in the ResearchKit 
+  framework (no code or other content is copied from another source), you 
+  have included your copyright (name and year) and a copy of the ResearchKit 
+  BSD license. By submitting your new file you represent that you have the 
+  right to license your file to Apple and the community, and agree that your 
+  file submission is licensed under the ResearchKit BSD license.
+  3.  If you aren't the author of the patch, you agree that you have 
+  the right to submit the patch, and have included the original copyright 
+  notices and licensing terms with it, to the extent that they exist. 
+  If there wasn't a copyright notice or license, please make a note of it 
+  in your response. Generally we can only take in patches that are 
+  BSD-licensed in order to maintain license compatibility within the project.

README.md

@@ -1,69 +1,81 @@
 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.
+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 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)
+* [Getting Started](#gettingstarted)
+* Documentation:
+    * [Programming Guide](http://researchkit.org/docs/docs/Overview/GuideOverview.html)
+    *  [Framework Reference](http://researchkit.org/docs/index.html)
+* [Best Practices](../../wiki/best-practices)
+* [Contributing to ResearchKit](CONTRIBUTING.md)
+* [Website](http://researchkit.org) and [Blog](http://researchkit.org/blog.html)
+* [ResearchKit BSD License](#license)
 
 Getting More Information
 ========================
 
-* 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/)
+* Join the [*ResearchKit* Forum](https://forums.developer.apple.com/community/researchkit) for discussing uses of the *ResearchKit framework and* related projects.
 
-Use cases
+Use Cases
 ===========
 
-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.
+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.
 
 Surveys
 -------
 
-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)
+The *ResearchKit framework* provides a pre-built user interface for surveys, which can be presented
+modally on an *iPhone*, *iPod Touch*, or *iPad*. See
+ *[Creating Surveys](http://researchkit.org/docs/docs/Survey/CreatingSurveys.html)* for more
+ information.
 
 
 Consent
 ----------------
 
-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)
+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.
+See *[Obtaining Consent](http://researchkit.org/docs/docs/InformedConsent/InformedConsent.html)* for
+more information.
 
 
 Active Tasks
 ------------
 
-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)
+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. See
+*[Active Tasks](http://researchkit.org/docs/docs/ActiveTasks/ActiveTasks.html)* for more
+information.
+
+Charts
+------------
+*ResearchKit* includes a *Charts module*. It features three chart types: a *pie chart* (`ORKPieChartView`), a *line graph chart* (`ORKLineGraphChartView`), and a *discrete graph chart* (`ORKDiscreteGraphChartView`).
+
+The views in the *Charts module* can be used independently of the rest of *ResearchKit*. They don't automatically connect with any other part of *ResearchKit*: the developer has to supply the data to be displayed through the views' `dataSources`, which allows for maximum flexibility.
 
 
-Getting started<a name="gettingstarted"></a>
+Getting Started<a name="gettingstarted"></a>
 ===============
 
 
 Requirements
 ------------
 
-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.
+The primary *ResearchKit framework* codebase supports *iOS* and requires *Xcode 8.0* 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.
 
 
 Installation
 ------------
 
-The lastest stable version of ResearchKit framework can be cloned with
+The latest stable version of *ResearchKit framework* can be cloned with
 
 ```
 git clone -b stable https://github.com/ResearchKit/ResearchKit.git
@@ -78,73 +90,93 @@ git clone https://github.com/ResearchKit/ResearchKit.git
 Building
 --------
 
-Build the ResearchKit framework by opening `ResearchKit.xcodeproj` and running the
-`ResearchKit` framework target. Optionally, run the unit tests too.
+Build the *ResearchKit framework* by opening `ResearchKit.xcodeproj` and running the `ResearchKit`
+framework target. Optionally, run the unit tests too.
 
 
 Adding the ResearchKit framework to your App
 ------------------------------
 
-This walk-through shows how to embed the ResearchKit framework in your app as a
-dynamic framework, and present a simple task view controller.
+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
+### 1. Add the ResearchKit framework to Your Project
 
-To get started, drag `ResearchKit.xcodeproj` from your checkout into
-your iOS app project in Xcode:
+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"/>
+  <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.
+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"/>
+  <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
+Note: You can also import *ResearchKit* into your project using a
+ [dependency manager](./docs-standalone/dependency-management.md) such as *CocoaPods* or *Carthage*.
 
-In this walk-through, we will use the ResearchKit framework to modally present a
-simple single-step task showing a single instruction.
+### 2. Create a Step
 
-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
+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 	
+*Objective-C*
+
+```objc
 ORKInstructionStep *myStep =
   [[ORKInstructionStep alloc] initWithIdentifier:@"intro"];
 myStep.title = @"Welcome to ResearchKit";
 ```
 
-###3. Create a Task
+*Swift*
 
-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`.
+```swift
+let myStep = ORKInstructionStep(identifier: "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`.
+
+*Objective-C*
 
 ```objc
 ORKOrderedTask *task =
   [[ORKOrderedTask alloc] initWithIdentifier:@"task" steps:@[myStep]];
 ```
 
-###4. Present the Task
+*Swift*
 
-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
+```swift
+let task = ORKOrderedTask(identifier: "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.
 
+*Objective-C*
+
 ```objc
 ORKTaskViewController *taskViewController =
   [[ORKTaskViewController alloc] initWithTask:task taskRunUUID:nil];
@@ -152,9 +184,19 @@ 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:
+*Swift*
+
+```swift
+let taskViewController = ORKTaskViewController(task: task, taskRunUUID: nil)
+taskViewController.delegate = self
+presentViewController(taskViewController, animated: true, 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:
+
+*Objective-C*
 
 ```objc
 - (void)taskViewController:(ORKTaskViewController *)taskViewController
@@ -169,9 +211,22 @@ which you must implement in order to handle the completion of the task:
 }
 ```
 
- 
-If you now run your app, you should see your first ResearchKit framework
-instruction step:
+*Swift*
+
+```swift
+func taskViewController(_ taskViewController: ORKTaskViewController, 
+                didFinishWith reason: ORKTaskViewControllerFinishReason, 
+                                    error: Error?) {
+    let taskResult = taskViewController.result
+    // You could do something with the result here.
+
+    // Then, dismiss the task view controller.
+    dismiss(true, completion: nil)
+}
+```
+
+
+If you now run your app, you should see your first *ResearchKit framework* instruction step:
 
 <center>
 <figure>
@@ -184,38 +239,37 @@ instruction step:
 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.
+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 the first tab, and displays a browser for the
+results of the last completed task in the second tab. The third tab shows some examples from the *Charts module*.
 
 
 
 License<a name="license"></a>
 =======
 
-The source in the ResearchKit repository is made available under the
-following license unless another license is explicitly identified:
+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.
- 
+Copyright (c) 2015 - 2017, 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

RELEASE-NOTES.md

@@ -0,0 +1,346 @@
+# ResearchKit Release Notes
+
+## ResearchKit 1.5 Release Notes
+
+*ResearchKit 1.5* supports *iOS* and requires *Xcode 8.0* or newer. The minimum supported *Base SDK* is *8.0*.
+
+In addition to general stabiltiy and performance improvements, *ResearchKit 1.5* includes the following new features and enhancements.
+
+- **New Active Tasks**
+
+ - **Stroop Test**
+
+    *Contributed by [Apple Inc](https://github.com/researchkit).*
+
+    The *Stroop Test* shows the participant different combinations of text and tint colors on the screen.
+    
+    Users must ignore the text and instead select the button that reflects the first letter of the tint color.
+
+ - **Trail Making Test**
+
+    *Contributed by Faraz Hussain.*
+
+    The *Trail Making Test* instructs participants to connect a series of labelled circles and the time to complete the test is recorded.
+
+ - **Range of Motion Test**
+
+    *Contributed by Daren Levy, Dr. Raj Karia, John Guydo.*
+
+    Participants are instructed to follow a series of steps while accelerometer and gyroscope data is captured to measure flexed and extended positions for both the shoulder and knee.
+    
+ - **Touch Anywhere Active Task**
+
+    *Contributed by Daren Levy, Dr. Raj Karia, John Guydo*
+
+    Allows the user to get their device in the proper position and then tap the screen to indicate they are ready to  begin the next step.
+    
+- **New Steps**
+
+ - **Video Instruction Step**
+
+    *Contributed by [Oliver Schäfer](https://github.com/oliverschaefer).*
+
+    The *Video Instruction Step* provides a step to be used to display a video.
+
+    This step can be used to display videos to users from either a local or remote source.
+
+- **Other Improvements**
+ 
+ - **Tone Audiometry Test**
+
+    *Contributed by [Apple Inc](https://github.com/researchkit).*
+
+    Updated to include both a left and right button.
+
+ - **Digital Object Identifier**
+
+    *Contributed by [Apple Inc](https://github.com/researchkit).*
+
+    Assigns a Digital Object Identifier to the ResearchKit repository on GitHub to use when referencing the framework.
+
+
+## ResearchKit 1.4 Release Notes
+
+*ResearchKit 1.4* supports *iOS* and requires *Xcode 8.0* or newer. The minimum supported *Base SDK* is *8.0*.
+
+In addition to general stabiltiy and performance improvements, *ResearchKit 1.4* includes the following new features and enhancements.
+
+- **New Active Task**
+
+ - **Hand Tremor Task**
+
+    *Contributed by [Shannon Young](https://github.com/syoung-smallwisdom).*
+
+    The *Hand Tremor Task* asks the participant to hold the device with their most affected hand in various positions while accelerometer and motion data is captured.
+
+ - **Walk Back and Forth Task**
+
+    *Contributed by [Shannon Young](https://github.com/syoung-smallwisdom).*
+
+    The *Walk Back and Forth Task* addresses the concern of researchers/participants who have difficulty locating an unobstructed path for 20 steps.
+
+    Instructs users to walk and turn in a full circle, allowing the tests to be conducted in a smaller space.
+
+- **New Steps**
+
+ - **Video Capture Step**
+
+    *Contributed by [Apple Inc](https://github.com/researchkit).*
+
+    The *Video Capture Step* provides a step to be used to record video.
+
+    The step can be used as part of a survey to capture video respones as well.
+
+ - **Review Step**
+    
+    *Contributed by [Oliver Schäfer](https://github.com/oliverschaefer).*
+
+    The *Review Step* allows a participant to review and modify their answers to a survey.
+
+    The step can be used in the middle of a survey, at the end of a survey, or a standalone module.
+
+ - **Signature Step**
+
+    *Contributed by [Oliver Schäfer](https://github.com/oliverschaefer).*
+
+    The *Signature Step* provides an interface for a participant to sign their name.
+
+    The step can be used for handwriting detection or simply to sign a document.
+
+ - **Table Step**
+
+    *Contributed by [Shannon Young](https://github.com/syoung-smallwisdom).*
+
+    The *Table Step* provides a way to neatly display data in a table.
+
+- **Other Improvements**
+ 
+ - **Data Collection Module**
+
+    *Contributed by [Apple Inc](https://github.com/researchkit).*
+
+    The *Data Collection Module* makes it even easier to aggregate data from HealthKit and device sensors.
+
+ - **Tapping Test**
+
+    *Contributed by [Michał Zaborowski](https://github.com/m1entus).*
+
+    The *Tapping Test* is updated to include tap duration as part of the result.
+
+
+## ResearchKit 1.3 Release Notes
+
+*ResearchKit 1.3* supports *iOS* and requires *Xcode 7.2* or newer. The minimum supported *Base SDK* is *8.0*.
+
+In addition to general stability and performance improvements, *ResearchKit 1.3* includes the following new features and enhancements.
+
+- **New Active Task**
+
+ - **9-Hole Peg Test**
+
+    *Contributed by [Julien Therier](https://github.com/julientherier).*
+
+    The *9-Hole Peg Test task* is used to test upper extremity functionality.
+
+    The test involves putting a variable number of pegs in a hole and subsequently removing them.
+
+    The test is documented in the scientific literature to measure the *[MSFC score in Multiple Sclerosis](http://www.nationalmssociety.org/For-Professionals/Researchers/Resources-for-Researchers/Clinical-Study-Measures/9-Hole-Peg-Test-(9-HPT))* or *[Parkinson's Disease](http://www.ncbi.nlm.nih.gov/pubmed/22020457)*.
+
+- **Sample App**
+
+    *Contributed by [Apple Inc](https://github.com/researchkit).*
+
+    The *Sample App* (`ORKSample` project on *ResearchKit*'s workspace) serves as a template application that combines different modules from the *ResearchKit framework*.
+
+- **Account Module**
+
+    *Contributed by [Apple Inc](https://github.com/researchkit).*
+
+    The *Account Module* provides steps to facilitate account creation and login.
+
+    The module includes the following steps:
+
+    1. *Registration*, used to allow the participant to create a new account.
+    2. *Verification*, used to confirm if the participant has verified the provided email address.
+    3. *Login*, used to allow registered users to login.
+
+- **Passcode with Touch ID**
+
+    *Contributed by [Apple Inc](https://github.com/researchkit).*
+
+    The *Passcode with Touch ID module* provides the ability to secure any *ResearchKit* application with a numeric passcode.
+
+    This module includes a *Keychain Wrapper* that stores the passcode on the device, as well as the option to use *Touch ID* on compatible devices. The passcode module supports 4-digit and 6-digit numeric codes.
+
+    The passcode module provides the following components:
+
+    1. *Passcode creation step*, which can be used as part of onboarding to create a passcode and store it in the keychain.
+    2. *Passcode authentication view controller*, which can be modally presented when appropriate.
+    3. *Passcode modification view controller*, which allows the participant to change their passcode.
+
+- **Other Improvements**
+
+ - **Optional Form Items**
+
+    *Contributed by [Ricardo Sánchez-Sáez](https://github.com/rsanchezsaez).*
+
+    Adds the `optional` property to `ORKFormItem`.
+
+    The *Continue/Done* button of form steps is enabled when all of the following conditions are met:
+
+    - At least one form item has an answer.
+    - All the non-optional form items have answers.
+    - All answered form items have valid answers.
+
+ - **Location Question**
+
+    *Contributed by [Quintiles](https://github.com/QuintilesRK).*
+
+    A *Location Question* can be used to request details about the participant's current location or about a specific address.
+
+    The question uses *MapKit* to provide a visual representation for the specified address.
+
+ - **Wait Step**
+
+    *Contributed by [Quintiles](https://github.com/QuintilesRK).*
+
+    The *Wait Step* provides a step to be used in-between steps when additional data processing is required.
+
+    The step supports both indeterminate and determinate progress views, as well as the ability to show text status updates.
+
+ - **Validated Text Answer Format**
+
+    *Contributed by [Quintiles](https://github.com/QuintilesRK).*
+
+    The *Validated Text Answer Format* enhances the existing *Text Answer Format* by providing input validation using a regular expression.
+
+    A valid *NSRegularExpression* object and an *error message* string are required to properly use this answer format.
+
+
+## ResearchKit 1.2 Release Notes
+
+*ResearchKit 1.2* supports *iOS* and requires *Xcode 7.0* or newer. The minimum supported *Base SDK* is *8.0*.
+
+In addition to general stability and performance improvements, *ResearchKit 1.2* includes the following new features and enhancements.
+
+- **New Active Tasks**
+
+ - **Tower of Hanoi Task**
+
+    *Contributed by [coxy1989](https://github.com/coxy1989).*
+
+    The *[Tower of Hanoi](https://en.wikipedia.org/wiki/Tower_of_Hanoi#Applications) task* is frequently used in psychological research on problem solving.
+
+    It is a mathematical puzzle consisting of three rods and a number of disks of different sizes which can slide onto any rod. The puzzle starts with the disks in a stack in ascending order of size on one rod (the smallest at the top).
+
+    The objective of the puzzle is to move the entire stack to another rod, obeying the following rules:
+
+    1. Only one disk can be moved at a time.
+    2. Each move consists of taking the upper disk from one of the stacks and placing it on top of another stack.
+    3. No disk may be placed on top of a smaller disk.
+
+ - **Paced Serial Addition Test Task**
+
+    *Contributed by [Julien Therier](https://github.com/julientherier).*
+
+    The *Paced Serial Addition Test task* provides adaptations of both the *Paced Auditory Serial Addition Test (PASAT)* and the *Paced Visual Serial Addition Test (PVSAT)*.
+
+    The *[PASAT](https://en.wikipedia.org/wiki/Paced_Auditory_Serial_Addition_Test)* is a neuropsychological test used to assess capacity and rate of information processing and sustained and divided attention.
+
+    Both tests are documented in the scientific literature ([Fos et al., 2000](http://www.ncbi.nlm.nih.gov/pubmed/11125707); [Nagels et al., 2005](http://www.ncbi.nlm.nih.gov/pubmed/15823678)) as a measure of the [*Multiple Sclerosis Functional Score*](http://www.nationalmssociety.org/For-Professionals/Researchers/Resources-for-Researchers/Clinical-Study-Measures/Multiple-Sclerosis-Functional-Composite-%28MSFC%29).
+
+    This task generates a series of single digits (for example, 60 of them), at the specific frequency (for example, one new digit every 2 or 3 seconds). The user must add the newly presented digit to the one prior to it.
+
+ - **Timed Walk Task**
+
+    *Contributed by [Julien Therier](https://github.com/julientherier).*
+
+    The *Timed Walk task* measures gait speed and is an adaptation of the [*Timed 25-Foot Walk*](http://www.nationalmssociety.org/For-Professionals/Researchers/Resources-for-Researchers/Clinical-Study-Measures/Timed-25-Foot-Walk-%28T25-FW%29) in the context of *multiple sclerosis*.
+
+    Gait speed has been demonstrated to be a useful and reliable functional measure of walking ability. When administering the *Timed Walk Task*, patients are allowed to use assistive devices (canes, crutches, walkers).
+
+- **Charts Module**
+
+ *Contributed by [coxy1989](https://github.com/coxy1989) and [Ricardo Sánchez-Sáez](https://github.com/rsanchezsaez).*
+
+ A *Charts module* has been implemented. It features three chart types: a *pie chart* (`ORKPieChartView`), a *line graph chart* (`ORKLineGraphChartView`), and a *discrete graph chart* (`ORKDiscreteGraphChartView`).
+
+ The views in the *Charts module* can be used independently of the rest of *ResearchKit*. It doesn't automatically connect with any other *ResearchKit* module: the developer has to supply the data to be displayed through the views' `dataSources`, which allows for maximum flexibility.
+
+- **Other Improvements**
+
+ - **Scale Answer Format**
+
+    *Contributed by [Apple Inc](https://github.com/researchkit).*
+
+    *Discrete scales* now support *text choice* labels, and all *scales* support images in place of the minimum and maximum range labels.
+
+ - **Result Predicates**
+
+    *Contributed by [Ricardo Sánchez-Sáez](https://github.com/rsanchezsaez).*
+
+    The predicate-building methods in `ORKResultPredicate` now use the new `ORKResultSelector` class for unequivocally identifying a *question step result* or a *form item result*.
+
+    This eliminates ambiguity when matching results with the same inner scope identifier. For example, a *form item result* can have the same identifier as a *question step result* or as another *form item result* in a different *form step*, and you can now match them separately.
+
+
+## ResearchKit 1.1 Release Notes
+
+*ResearchKit 1.1* supports *iOS* and requires *Xcode 6.3* or newer. The minimum supported *Base SDK* is *8.0*.
+
+In addition to general stability and performance improvements, *ResearchKit 1.1* includes the following new features and enhancements.
+
+- **Navigable Ordered Task**
+
+ *Contributed by [Ricardo Sánchez-Sáez](https://github.com/rsanchezsaez).*
+
+ A new type of *conditional ordered task* (`ORKNavigableOrderedTask`) has been implemented.
+
+ The developer can use the `ORKStepNavigationRule` subclasses to dynamically navigate between the task steps:
+ - `ORKPredicateStepNavigationRule` allows to make conditional jumps by matching previous results (either those of the ongoing task, or those of any previously stored task result tree). You typically use the class methods in the `ORKResultPredicate` class to match answers in the most commonly used result types.
+ - `ORKDirectStepNavigationRule` provides support for unconditional jumps.
+
+- **New Active Tasks**
+ - **Reaction Time Task**
+
+    *Contributed by [coxy1989](https://github.com/coxy1989).*
+
+    The *Reaction Time Task* is an adaptation of the [*Simple Reaction Time test (SRT)*](http://www.cambridgecognition.com/tests/simple-reaction-time-srt). *SRT* measures reaction time through delivery of a known stimulus to a known location to elicit a known response.
+
+    This test is deployed in a range of research questions across fields including medicine, sports science and psychology.
+
+    Although it classically involves pressing the space bar or clicking a mouse in response to an event on screen, the *ResearchKit* implementation relies on the study participant shaking the device when she sees a blue circle on the screen, which we think is more correlatable to a true stimulus reaction test.
+
+ - **Tone Audiometry Task**
+
+    *Contributed by [Vincent Tourraine](https://github.com/vtourraine).*
+
+    The *Tone Audiometry Task* is an adaptation of the [*Pure Tone Audiometry test (PTA)*](https://en.wikipedia.org/wiki/Pure_tone_audiometry). *PTA* is a key hearing test used to identify hearing threshold levels of an individual, enabling determination of the degree, type and configuration of a hearing loss.
+
+    The *ResearchKit* implementation generates a series of pure sinusoid sounds, with different frequencies and on different channels (left or right). The test starts at the minimum volume and is gradually increased until the participant perceives it and taps a button. At that time, the current sound amplitude, frequency and channel are recorded.
+
+- **Scale Answer Format Enhancements**
+
+ *Contributed by [Ricardo Sánchez-Sáez](https://github.com/rsanchezsaez) and [Bruce Duncan](https://github.com/brucehappy).*
+
+ Support for discrete and continuous *vertical scales* has been added. Some questions, like mood measurement or symptom severity measurement queries may be more naturally presented using a *vertical scale*.
+
+ The *Scale Answer Format* has also been improved by making it usable within forms.
+
+- **Image Capture Step**
+
+ *Contributed by [Bruce Duncan](https://github.com/brucehappy).*
+
+ An *Image Capture Step* has been added. The researcher can ask the participant to take pictures of relevant body parts. The researcher can provide a body part image template to facilitate the scale and orientation of the taken pictures.
+
+- **iPad Support**
+
+ *Contributed by [Ricardo Sánchez-Sáez](https://github.com/rsanchezsaez) and [Apple Inc](https://github.com/researchkit).*
+
+ *iPad support* for all orientations has been implemented.
+
+- **iPhone Landscape Support**
+
+  *Contributed by [Apple Inc.](https://github.com/researchkit) and [Ricardo Sánchez-Sáez](https://github.com/rsanchezsaez).*
+
+  *iPhone landscape orientation support* has been implemented.

RKWorkspace.xcworkspace/contents.xcworkspacedata

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   <FileRef
+      location = "group:ResearchKit.xcodeproj">
+   </FileRef>
+   <FileRef
+      location = "group:Testing/ORKTest/ORKTest.xcodeproj">
+   </FileRef>
+   <FileRef
+      location = "group:samples/ORKCatalog/ORKCatalog.xcodeproj">
+   </FileRef>
+   <FileRef
+      location = "group:samples/ORKSample/ORKSample.xcodeproj">
+   </FileRef>
+</Workspace>

ResearchKit.podspec

@@ -0,0 +1,15 @@
+Pod::Spec.new do |s|
+  s.name         = 'ResearchKit'
+  s.version      = '1.5.0'
+  s.summary      = 'ResearchKit is an open source software framework that makes it easy to create apps for medical research or for other research projects.'
+  s.homepage     = 'https://www.github.com/ResearchKit/ResearchKit'
+  s.documentation_url = 'http://researchkit.github.io/docs/'
+  s.license      = { :type => 'BSD', :file => 'LICENSE' }
+  s.author       = { 'researchkit.org' => 'http://researchkit.org' }
+  s.source       = { :git => 'https://github.com/ResearchKit/ResearchKit.git', :tag => s.version.to_s }
+  s.public_header_files = `./scripts/find_headers.rb --public --private`.split("\n")
+  s.source_files = 'ResearchKit/**/*.{h,m,swift}'
+  s.resources    = 'ResearchKit/**/*.{fsh,vsh}', 'ResearchKit/Animations/**/*.m4v', 'ResearchKit/Artwork.xcassets', 'ResearchKit/Localized/*.lproj'
+  s.platform     = :ios, '8.0'
+  s.requires_arc = true
+end

ResearchKit.xcodeproj/xcshareddata/xcschemes/ResearchKit.xcscheme

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0630"
-   version = "1.8">
+   LastUpgradeVersion = "0900"
+   version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
       buildImplicitDependencies = "YES">
@@ -23,10 +23,10 @@
       </BuildActionEntries>
    </BuildAction>
    <TestAction
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      buildConfiguration = "Debug">
+      shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
             skipped = "NO">
@@ -48,13 +48,15 @@
             ReferencedContainer = "container:ResearchKit.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
    </TestAction>
    <LaunchAction
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Debug"
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
       debugServiceExtension = "internal"
@@ -72,10 +74,10 @@
       </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
+      buildConfiguration = "Release"
       shouldUseLaunchSchemeArgsEnv = "YES"
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Release"
       debugDocumentVersioning = "YES">
       <MacroExpansion>
          <BuildableReference

ResearchKit.xcodeproj/xcshareddata/xcschemes/docs.xcscheme

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0630"
-   version = "1.8">
+   LastUpgradeVersion = "0900"
+   version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
       buildImplicitDependencies = "YES">
@@ -23,19 +23,21 @@
       </BuildActionEntries>
    </BuildAction>
    <TestAction
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      buildConfiguration = "Debug">
+      shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
+      <AdditionalOptions>
+      </AdditionalOptions>
    </TestAction>
    <LaunchAction
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Debug"
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
       debugServiceExtension = "internal"
@@ -53,10 +55,10 @@
       </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
+      buildConfiguration = "Release"
       shouldUseLaunchSchemeArgsEnv = "YES"
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Release"
       debugDocumentVersioning = "YES">
       <MacroExpansion>
          <BuildableReference

ResearchKit/Accessibility/ORKAccessibility.h

@@ -28,8 +28,8 @@
  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+
 // Shared header for accessibility functionality.
-
-#import "UIView+ORKAccessibility.h"
 #import "ORKAccessibilityFunctions.h"
-
+#import "ORKLineGraphAccessibilityElement.h"
+#import "UIView+ORKAccessibility.h"

ResearchKit/Accessibility/ORKAccessibilityFunctions.h

@@ -28,8 +28,12 @@
  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+
 #import "ORKDefines.h"
-#import "ORKHelpers.h"
+#import "ORKHelpers_Internal.h"
+
+
+NS_ASSUME_NONNULL_BEGIN
 
 @class ORKScaleSlider;
 
@@ -41,7 +45,7 @@ ORK_EXTERN NSString *ORKAccessibilityFormatContinuousScaleSliderValue(CGFloat va
 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) {
+ORK_INLINE void ORKAccessibilityPostNotificationAfterDelay(UIAccessibilityNotifications notification, _Nullable id argument, NSTimeInterval delay) {
     ORKAccessibilityPerformBlockAfterDelay(delay, ^{
         UIAccessibilityPostNotification(notification, argument);
     });
@@ -50,3 +54,5 @@ ORK_INLINE void ORKAccessibilityPostNotificationAfterDelay(UIAccessibilityNotifi
 // 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, ...);
+
+NS_ASSUME_NONNULL_END

ResearchKit/Accessibility/ORKAccessibilityFunctions.m

@@ -28,13 +28,18 @@
  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <UIKit/UIKit.h>
-#import "ORKAccessibilityFunctions.h"
-#import "ORKAnswerFormat_Internal.h"
+
+@import UIKit;
+
 #import "ORKScaleSlider.h"
 #import "ORKScaleSliderView.h"
+
+#import "ORKAnswerFormat_Internal.h"
+
+#import "ORKAccessibilityFunctions.h"
 #import "UIView+ORKAccessibility.h"
 
+
 NSString *ORKAccessibilityFormatScaleSliderValue(CGFloat value, ORKScaleSlider *slider) {
     ORKScaleSliderView *sliderView = (ORKScaleSliderView *)[slider ork_superviewOfType:[ORKScaleSliderView class]];
     if (!slider || !sliderView) {

ResearchKit/Accessibility/ORKLineGraphAccessibilityElement.h

@@ -28,13 +28,16 @@
  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <ResearchKit/ResearchKit_Private.h>
-#import "ORKConsentSection.h"
+
+@import UIKit;
+
 
 NS_ASSUME_NONNULL_BEGIN
 
-NSURL *__nullable ORKMovieURLForConsentSectionType(ORKConsentSectionType type);
+@interface ORKLineGraphAccessibilityElement : UIAccessibilityElement
 
-UIImage *__nullable ORKImageForConsentSectionType(ORKConsentSectionType type);
+- (nonnull instancetype)initWithAccessibilityContainer:(nonnull UIView *)container index:(NSInteger)index maxIndex:(NSInteger)maxIndex;
+
+@end
 
 NS_ASSUME_NONNULL_END

ResearchKit/Accessibility/ORKLineGraphAccessibilityElement.m

@@ -0,0 +1,66 @@
+/*
+ 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 "ORKLineGraphAccessibilityElement.h"
+
+
+@interface ORKLineGraphAccessibilityElement()
+
+@property (assign, nonatomic) NSInteger index;
+@property (assign, nonatomic) NSInteger maxIndex;
+
+@end
+
+
+@implementation ORKLineGraphAccessibilityElement
+
+- (nonnull instancetype)initWithAccessibilityContainer:(nonnull UIView *)container index:(NSInteger)index maxIndex:(NSInteger)maxIndex {
+    self = [super initWithAccessibilityContainer:container];
+    if (self) {
+        self.index = index;
+        self.maxIndex = maxIndex;
+    }
+    return self;
+}
+
+- (CGRect)accessibilityFrame {
+    if (self.maxIndex == 0) {
+        return [super accessibilityFrame];
+    }
+    
+    CGRect containerFrame = [self.accessibilityContainer frame];
+    CGFloat height = CGRectGetHeight(containerFrame);
+    CGFloat width = CGRectGetWidth(containerFrame) / self.maxIndex;
+    CGFloat x = self.index * width;
+    
+    return UIAccessibilityConvertFrameToScreenCoordinates(CGRectMake(x, 0, width, height), self.accessibilityContainer);
+}
+
+@end

ResearchKit/Accessibility/UIView+ORKAccessibility.h

@@ -28,8 +28,9 @@
  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <UIKit/UIKit.h>
-#import <ResearchKit/ResearchKit.h>
+
+@import UIKit;
+
 
 NS_ASSUME_NONNULL_BEGIN
 

ResearchKit/Accessibility/UIView+ORKAccessibility.m

@@ -28,8 +28,10 @@
  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+
 #import "UIView+ORKAccessibility.h"
 
+
 @implementation UIView (ORKAccessibility)
 
 - (UIView *)ork_superviewOfType:(Class)aClass {
@@ -40,8 +42,7 @@
     id superview = [self superview];
     if (superview == nil) {
         return nil;
-    }
-    else if ([superview isKindOfClass:aClass]) {
+    } else if ([superview isKindOfClass:aClass]) {
         return superview;
     }
     

ResearchKit/ActiveTasks/CLLocation+ORKJSONDictionary.h

@@ -28,8 +28,9 @@
  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <CoreLocation/CoreLocation.h>
-#import <ResearchKit/ResearchKit.h>
+
+@import CoreLocation;
+
 
 NS_ASSUME_NONNULL_BEGIN
 

ResearchKit/ActiveTasks/CLLocation+ORKJSONDictionary.m

@@ -28,13 +28,15 @@
  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+
 #import "CLLocation+ORKJSONDictionary.h"
-#import "ORKHelpers.h"
+
+#import "ORKHelpers_Internal.h"
+
 
 @implementation CLLocation (ORKJSONDictionary)
 
-- (NSDictionary *)ork_JSONDictionary
-{
+- (NSDictionary *)ork_JSONDictionary {
     CLLocationCoordinate2D coord = self.coordinate;
     CLLocationDistance altitude = self.altitude;
     CLLocationAccuracy horizAccuracy = self.horizontalAccuracy;
@@ -44,32 +46,28 @@
     NSDate *timestamp = self.timestamp;
     CLFloor *floor = self.floor;
     
-    NSMutableDictionary *dict = [NSMutableDictionary dictionaryWithObject:ORKStringFromDateISO8601(timestamp) forKey:@"timestamp"];
+    NSMutableDictionary *dictionary = [@{ @"timestamp": ORKStringFromDateISO8601(timestamp) } mutableCopy];
     
-    if (horizAccuracy >= 0)
-    {
-        dict[@"coordinate"] = @{ @"latitude" : [NSDecimalNumber numberWithDouble:coord.latitude], @"longitude" : [NSDecimalNumber numberWithDouble:coord.longitude]};
-        dict[@"horizontalAccuracy"] = [NSDecimalNumber numberWithDouble:horizAccuracy];
+    if (horizAccuracy >= 0) {
+        dictionary[@"coordinate"] = @{ @"latitude": [NSDecimalNumber numberWithDouble:coord.latitude],
+                                       @"longitude": [NSDecimalNumber numberWithDouble:coord.longitude]};
+        dictionary[@"horizontalAccuracy"] = [NSDecimalNumber numberWithDouble:horizAccuracy];
     }
-    if (vertAccuracy >= 0)
-    {
-        dict[@"altitude"] = [NSDecimalNumber numberWithDouble:altitude];
-        dict[@"verticalAccuracy"] = [NSDecimalNumber numberWithDouble:vertAccuracy];
+    if (vertAccuracy >= 0) {
+        dictionary[@"altitude"] = [NSDecimalNumber numberWithDouble:altitude];
+        dictionary[@"verticalAccuracy"] = [NSDecimalNumber numberWithDouble:vertAccuracy];
     }
-    if (course >= 0)
-    {
-        dict[@"course"] = [NSDecimalNumber numberWithDouble:course];
+    if (course >= 0) {
+        dictionary[@"course"] = [NSDecimalNumber numberWithDouble:course];
     }
-    if (speed >= 0)
-    {
-        dict[@"speed"] = [NSDecimalNumber numberWithDouble:speed];
+    if (speed >= 0) {
+        dictionary[@"speed"] = [NSDecimalNumber numberWithDouble:speed];
     }
-    if (floor)
-    {
-        dict[@"floor"] = @(floor.level);
+    if (floor) {
+        dictionary[@"floor"] = @(floor.level);
     }
 
-    return dict;
+    return dictionary;
 }
 
 @end

ResearchKit/ActiveTasks/CMAccelerometerData+ORKJSONDictionary.h

@@ -28,8 +28,9 @@
  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <CoreMotion/CoreMotion.h>
-#import <ResearchKit/ResearchKit.h>
+
+@import CoreMotion;
+
 
 NS_ASSUME_NONNULL_BEGIN
 

ResearchKit/ActiveTasks/CMAccelerometerData+ORKJSONDictionary.m

@@ -31,16 +31,16 @@
 
 #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;
+- (NSDictionary *)ork_JSONDictionary {
+    NSDictionary *dictionary = @{ @"timestamp": [NSDecimalNumber numberWithDouble:self.timestamp],
+                                 @"x": [NSDecimalNumber numberWithDouble:self.acceleration.x],
+                                 @"y": [NSDecimalNumber numberWithDouble:self.acceleration.y],
+                                 @"z": [NSDecimalNumber numberWithDouble:self.acceleration.z]
+                                 };
+    return dictionary;
 }
 
 @end

ResearchKit/ActiveTasks/CMDeviceMotion+ORKJSONDictionary.h

@@ -29,8 +29,8 @@
  */
 
 
-#import <CoreMotion/CoreMotion.h>
-#import <ResearchKit/ResearchKit.h>
+@import CoreMotion;
+
 
 NS_ASSUME_NONNULL_BEGIN
 

ResearchKit/ActiveTasks/CMDeviceMotion+ORKJSONDictionary.m

@@ -31,46 +31,46 @@
 
 #import "CMDeviceMotion+ORKJSONDictionary.h"
 
+
 @implementation CMDeviceMotion (ORKJSONDictionary)
 
-- (NSDictionary *)ork_JSONDictionary
-{
+- (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;
+    NSDictionary *dictionary = @{@"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 dictionary;
 }
 
 @end

ResearchKit/ActiveTasks/CMMotionActivity+ORKJSONDictionary.h

@@ -29,8 +29,8 @@
  */
 
 
-#import <CoreMotion/CoreMotion.h>
-#import <ResearchKit/ResearchKit.h>
+@import CoreMotion;
+
 
 NS_ASSUME_NONNULL_BEGIN
 

ResearchKit/ActiveTasks/CMMotionActivity+ORKJSONDictionary.m

@@ -30,62 +30,55 @@
 
 
 #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";
+#import "ORKHelpers_Internal.h"
 
-static NSString *stringFromActivityConfidence(CMMotionActivityConfidence confidence)
-{
-    NSDictionary *confidences = @{@(CMMotionActivityConfidenceHigh) : @"high",
-                                  @(CMMotionActivityConfidenceMedium) : @"medium",
-                                  @(CMMotionActivityConfidenceLow) : @"low"};
+
+static NSString *const ActivityUnknown = @"unknown";
+static NSString *const ActivityStationary = @"stationary";
+static NSString *const ActivityWalking = @"walking";
+static NSString *const ActivityRunning = @"running";
+static NSString *const ActivityAutomotive = @"automotive";
+static NSString *const StartDateKey = @"startDate";
+static NSString *const EndDateKey = @"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];
+static NSArray *activityArray(CMMotionActivity *activity) {
+    NSMutableArray *array = [NSMutableArray array];
+    if (activity.unknown) {
+        [array addObject:ActivityUnknown];
     }
-    if (activity.stationary)
-    {
-        [ret addObject:kActivityStationary];
+    if (activity.stationary) {
+        [array addObject:ActivityStationary];
     }
-    if (activity.walking)
-    {
-        [ret addObject:kActivityWalking];
+    if (activity.walking) {
+        [array addObject:ActivityWalking];
     }
-    if (activity.running)
-    {
-        [ret addObject:kActivityRunning];
+    if (activity.running) {
+        [array addObject:ActivityRunning];
     }
-    if (activity.automotive)
-    {
-        [ret addObject:kActivityAutomotive];
+    if (activity.automotive) {
+        [array addObject:ActivityAutomotive];
     }
-    return ret;
+    return array;
 }
 
-    
-static NSString * const kActivityKey = @"activity";
+static NSString *const ActivityKey = @"activity";
+static NSString *const ConfidenceKey = @"confidence";
 
-static NSString * const kConfidenceKey = @"confidence";
 
 @implementation CMMotionActivity (ORKJSONDictionary)
 
-- (NSDictionary *)ork_JSONDictionary
-{
-    return @{kConfidenceKey : stringFromActivityConfidence(self.confidence),
-             kActivityKey : activityArray(self),
-             kStartDateKey : ORKStringFromDateISO8601(self.startDate)};
+- (NSDictionary *)ork_JSONDictionary {
+    return @{ConfidenceKey: stringFromActivityConfidence(self.confidence),
+             ActivityKey: activityArray(self),
+             StartDateKey: ORKStringFromDateISO8601(self.startDate)};
 }
 
 @end

ResearchKit/ActiveTasks/CMPedometerData+ORKJSONDictionary.h

@@ -29,8 +29,8 @@
  */
 
 
-#import <CoreMotion/CoreMotion.h>
-#import <ResearchKit/ResearchKit.h>
+@import CoreMotion;
+
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -38,7 +38,6 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (NSDictionary *)ork_JSONDictionary;
 
-
 @end
 
 NS_ASSUME_NONNULL_END

ResearchKit/ActiveTasks/CMPedometerData+ORKJSONDictionary.m

@@ -30,21 +30,20 @@
 
 
 #import "CMPedometerData+ORKJSONDictionary.h"
-#import "ORKHelpers.h"
-#import <CoreMotion/CoreMotion.h>
+
+#import "ORKHelpers_Internal.h"
+
+@import CoreMotion;
+
 
 @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];
+- (NSDictionary *)ork_JSONDictionary {
+    NSMutableDictionary *dictionary = [@{ @"startDate": ORKStringFromDateISO8601(self.startDate), @"endDate": ORKStringFromDateISO8601(self.endDate) } mutableCopy];
+    for (NSString *key in @[ @"numberOfSteps", @"distance", @"floorsAscended", @"floorsDescended" ]) {
+        [dictionary setValue:[self valueForKey:key] forKey:key];
     }
-    return dict;
+    return dictionary;
 }
 
 @end

ResearchKit/ActiveTasks/HKSample+ORKJSONDictionary.h

@@ -29,8 +29,8 @@
  */
 
 
-#import <HealthKit/HealthKit.h>
-#import <ResearchKit/ResearchKit.h>
+@import HealthKit;
+
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -41,8 +41,7 @@ typedef NS_OPTIONS(NSInteger, ORKSampleJSONOptions) {
 };
 
 /**
- * JSON serialization aid for HKSample.
- *
+ JSON serialization aid for HKSample.
  */
 @interface HKSample (ORKJSONDictionary)
 
@@ -52,8 +51,7 @@ typedef NS_OPTIONS(NSInteger, ORKSampleJSONOptions) {
 
 
 /**
- * JSON serialization aid for HKCorrelation.
- *
+ JSON serialization aid for HKCorrelation.
  */
 @interface HKCorrelation (ORKJSONDictionary)
 

ResearchKit/ActiveTasks/HKSample+ORKJSONDictionary.m

@@ -30,121 +30,117 @@
 
 
 #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";
+#import "ORKHelpers_Internal.h"
 
-@interface HKCategorySample (ORKJSONDictionary)
 
-@end
-
-@interface HKQuantitySample (ORKJSONDictionary)
-
-@end
+static NSString *const HKSampleIdentifierKey = @"type"; // For compatibility with Health XML export
+static NSString *const HKUUIDKey = @"uuid";
+static NSString *const HKSampleStartDateKey = @"startDate";
+static NSString *const HKSampleEndDateKey = @"endDate";
+static NSString *const HKSampleValue = @"value";
+static NSString *const HKMetadataKey = @"metadata";
+static NSString *const HKSourceKey = @"source";
+static NSString *const HKUnitKey = @"unit";
+static NSString *const HKCorrelatedObjectsKey = @"objects";
+// static NSString *const HKSourceIdentifierKey = @"sourceBundleIdentifier";
 
 
 @implementation HKSample (ORKJSONDictionary)
 
-- (NSDictionary *)ork_JSONDictionaryWithOptions:(ORKSampleJSONOptions)options unit:(HKUnit *)unit
-{
-    NSMutableDictionary *mdict = [NSMutableDictionary dictionaryWithCapacity:12];
+- (NSMutableDictionary *)ork_JSONMutableDictionaryWithOptions:(ORKSampleJSONOptions)options unit:(HKUnit *)unit {
+    NSMutableDictionary *mutableDictionary = [NSMutableDictionary dictionaryWithCapacity:12];
     
     // Type identification
     HKSampleType *sampleType = [self sampleType];
-    mdict[kHKSampleIdentifierKey] = [sampleType identifier];
+    mutableDictionary[HKSampleIdentifierKey] = [sampleType identifier];
     
     // consider adding @"class" : NSStringFromClass(sampleType) ?
     
     // Start and end dates
     NSDate *startDate = [self startDate];
-    if (startDate)
-    {
-        mdict[kHKSampleStartDateKey] = ORKStringFromDateISO8601(startDate);
+    if (startDate) {
+        mutableDictionary[HKSampleStartDateKey] = ORKStringFromDateISO8601(startDate);
     }
     
     NSDate *endDate = [self endDate];
-    if (endDate)
-    {
-        mdict[kHKSampleEndDateKey] = ORKStringFromDateISO8601(endDate);
+    if (endDate) {
+        mutableDictionary[HKSampleEndDateKey] = ORKStringFromDateISO8601(endDate);
     }
-    if (unit)
-    {
-        mdict[kHKUnitKey] = [unit unitString];
+    if (unit) {
+        mutableDictionary[HKUnitKey] = [unit unitString];
     }
-    if ((options & ORKSampleIncludeUUID))
-    {
+    if ((options & ORKSampleIncludeUUID)) {
         NSUUID *uuid = [self UUID];
-        if (uuid)
-        {
-            mdict[kHKUUIDKey] = [uuid UUIDString];
+        if (uuid) {
+            mutableDictionary[HKUUIDKey] = uuid.UUIDString;
         }
     }
     
-    if ( (options & ORKSampleIncludeMetadata) && [self.metadata count] > 0)
-    {
+    if ( (options & ORKSampleIncludeMetadata) && self.metadata.count > 0) {
         NSMutableDictionary *metadata = [self.metadata mutableCopy];
-        for (NSString *k in metadata)
-        {
+        for (NSString *k in metadata) {
             id obj = metadata[k];
-            if ([obj isKindOfClass:[NSDate class]])
-            {
+            if ([obj isKindOfClass:[NSDate class]]) {
                 metadata[k] = ORKStringFromDateISO8601(obj);
             }
         }
         
-        mdict[kHKMetadataKey] = metadata;
+        mutableDictionary[HKMetadataKey] = metadata;
     }
     
-    if (options & ORKSampleIncludeSource)
-    {
-        HKSource *source = [self source];
-        if (source.name)
-        {
-            mdict[kHKSourceKey] = source.name;
+    if (options & ORKSampleIncludeSource) {
+        HKSource *source = [[self sourceRevision] source];
+        if (source.name) {
+            mutableDictionary[HKSourceKey] = source.name;
         }
     }
         
-    return mdict;
+    return mutableDictionary;
 }
 
+- (NSDictionary *)ork_JSONDictionaryWithOptions:(ORKSampleJSONOptions)options unit:(HKUnit *)unit {
+    return [self ork_JSONMutableDictionaryWithOptions:options unit:unit];
+}
+
+@end
+
+
+@interface HKCategorySample (ORKJSONDictionary)
+
 @end
 
 
 @implementation HKCategorySample (ORKJSONDictionary)
 
-- (NSDictionary *)ork_JSONDictionaryWithOptions:(ORKSampleJSONOptions)options unit:(HKUnit *)unit
-{
-    NSMutableDictionary *dict = [[super ork_JSONDictionaryWithOptions:options unit:unit] mutableCopy];
+- (NSDictionary *)ork_JSONDictionaryWithOptions:(ORKSampleJSONOptions)options unit:(HKUnit *)unit {
+    NSMutableDictionary *dictionary = [self ork_JSONMutableDictionaryWithOptions:options unit:unit];
     
-    NSInteger value = [self value];
-    dict[kHKSampleValue] = @(value);
+    NSInteger value = self.value;
+    dictionary[HKSampleValue] = @(value);
     
-    return dict;
+    return dictionary;
 }
 
 @end
 
+
+@interface HKQuantitySample (ORKJSONDictionary)
+
+@end
+
+
 @implementation HKQuantitySample (ORKJSONDictionary)
 
-- (NSDictionary *)ork_JSONDictionaryWithOptions:(ORKSampleJSONOptions)options unit:(HKUnit *)unit
-{
-    NSMutableDictionary *dict = [[super ork_JSONDictionaryWithOptions:options unit:unit] mutableCopy];
+- (NSDictionary *)ork_JSONDictionaryWithOptions:(ORKSampleJSONOptions)options unit:(HKUnit *)unit {
+    NSMutableDictionary *dictionary = [self ork_JSONMutableDictionaryWithOptions:options unit:unit];
     
     HKQuantity *quantity = [self quantity];
     double value = [quantity doubleValueForUnit:unit];
-    dict[kHKSampleValue] = @(value);
+    dictionary[HKSampleValue] = @(value);
     
     
-    return dict;
+    return dictionary;
 }
 
 @end
@@ -152,29 +148,22 @@ static NSString *const kHKCorrelatedObjectsKey = @"objects";
 
 @implementation HKCorrelation (ORKJSONDictionary)
 
-
-- (NSDictionary *)ork_JSONDictionaryWithOptions:(ORKSampleJSONOptions)options sampleTypes:(NSArray *)sampleTypes units:(NSArray *)units
-{
-    NSMutableDictionary *mdict = (NSMutableDictionary *)[self ork_JSONDictionaryWithOptions:options unit:nil];
+- (NSDictionary *)ork_JSONDictionaryWithOptions:(ORKSampleJSONOptions)options sampleTypes:(NSArray *)sampleTypes units:(NSArray *)units {
+    NSMutableDictionary *mutableDictionary = [self ork_JSONMutableDictionaryWithOptions:options unit:nil];
     
     // The correlated objects
-    NSMutableArray *correlatedObjects = [NSMutableArray arrayWithCapacity:[sampleTypes count]];
-    for (HKSample *sample in self.objects)
-    {
+    NSMutableArray *correlatedObjects = [NSMutableArray arrayWithCapacity:sampleTypes.count];
+    for (HKSample *sample in self.objects) {
         NSUInteger idx = [sampleTypes indexOfObject:sample.sampleType];
-        if (idx == NSNotFound)
-        {
+        if (idx == NSNotFound) {
             continue;
         }
         
         [correlatedObjects addObject:[sample ork_JSONDictionaryWithOptions:options unit:units[idx]]];
     }
-    mdict[kHKCorrelatedObjectsKey] = correlatedObjects;
+    mutableDictionary[HKCorrelatedObjectsKey] = correlatedObjects;
     
-    
-    return mdict;
+    return mutableDictionary;
 }
 
-
-
 @end

ResearchKit/ActiveTasks/ORKAccelerometerRecorder.h

@@ -28,8 +28,11 @@
  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+
+@import UIKit;
 #import <ResearchKit/ORKRecorder.h>
 
+
 NS_ASSUME_NONNULL_BEGIN
 
 /**
@@ -49,16 +52,18 @@ ORK_CLASS_AVAILABLE
 /**
  Returns an initialized accelerometer recorder using the specified frequency.
  
- @param frequency    The frequency of accelerometer data collected from CoreMotion, in hertz (Hz).
+ @param identifier          The unique identifier of the recorder (assigned by the recorder configuration).
+ @param frequency           The frequency of accelerometer data collected from CoreMotion, in hertz (Hz).
+ @param step                The step that requested this recorder.
+ @param outputDirectory     The directory in which the accelerometer data should be stored.
+ 
  @return An initialized accelerometer recorder.
  */
-- (instancetype)initWithFrequency:(double)frequency
-                             step:(ORKStep *)step
-                  outputDirectory:(NSURL *)outputDirectory;
+- (instancetype)initWithIdentifier:(NSString *)identifier
+                         frequency:(double)frequency
+                              step:(nullable ORKStep *)step
+                   outputDirectory:(nullable NSURL *)outputDirectory;
 
 @end
 
 NS_ASSUME_NONNULL_END
-
-
-

ResearchKit/ActiveTasks/ORKAccelerometerRecorder.m

@@ -28,50 +28,52 @@
  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"
+
+#import "ORKHelpers_Internal.h"
+#import "CMAccelerometerData+ORKJSONDictionary.h"
+
+@import CoreMotion;
 
 
-@interface ORKAccelerometerRecorder()
-{
+@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)
-    {
+- (instancetype)initWithIdentifier:(NSString *)identifier frequency:(double)frequency step:(ORKStep *)step outputDirectory:(NSURL *)outputDirectory {
+    self = [super initWithIdentifier:identifier step:step outputDirectory:outputDirectory];
+    if (self) {
         self.frequency = frequency;
         self.continuesInBackground = YES;
     }
     return self;
 }
 
-- (void)dealloc
-{
+- (void)dealloc {
     [_logger finishCurrentLog];
 }
 
-- (NSString *)recorderType
-{
+- (NSString *)recorderType {
     return @"accel";
 }
 
 - (void)setFrequency:(double)frequency {
-    if (frequency <=0) {
+    if (frequency <= 0) {
         _frequency = 1;
     } else {
         _frequency = frequency;
@@ -83,45 +85,39 @@
 }
 
 - (void)start {
-    
     [super start];
+    
     self.motionManager = [self createMotionManager];
     
-    if (! _logger) {
-        NSError *err = nil;
-        _logger = [self makeJSONDataLoggerWithError:&err];
-        if (! _logger) {
-            [self finishRecordingWithError:err];
+    if (!_logger) {
+        NSError *error = nil;
+        _logger = [self makeJSONDataLoggerWithError:&error];
+        if (!_logger) {
+            [self finishRecordingWithError:error];
             return;
         }
     }
     
-    if (! self.motionManager || ! self.motionManager.accelerometerAvailable)
-    {
+    if (!self.motionManager || !self.motionManager.accelerometerAvailable) {
         NSError *error = [NSError errorWithDomain:NSCocoaErrorDomain
                                              code:NSFeatureUnsupportedError
-                                         userInfo:@{@"recorder" : self}];
+                                         userInfo:@{@"recorder": self}];
         [self finishRecordingWithError:error];
         return;
     }
     
-    self.motionManager.accelerometerUpdateInterval = 1.0/_frequency;
+    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)
-     {
+    [self.motionManager startAccelerometerUpdatesToQueue:[[NSOperationQueue alloc] init] withHandler:^(CMAccelerometerData *data, NSError *error) {
          BOOL success = NO;
-         if (data)
-         {
+         if (data) {
              success = [_logger append:[data ork_JSONDictionary] error:&error];
          }
-         if (!success)
-         {
+         if (!success) {
              dispatch_async(dispatch_get_main_queue(), ^{
                  _recordingError = error;
                  [self stop];
@@ -131,7 +127,7 @@
 }
 
 - (NSDictionary *)userInfo {
-    return  @{ @"frequency" : @(self.frequency) };;
+    return  @{ @"frequency": @(self.frequency) };
 }
 
 - (void)stop {
@@ -150,28 +146,24 @@
     [super stop];
 }
 
-- (void)doStopRecording
-{
+- (void)doStopRecording {
     if (self.isRecording) {
         [self.motionManager stopAccelerometerUpdates];
         self.motionManager = nil;
     }
 }
 
-- (void)finishRecordingWithError:(NSError *)error
-{
+- (void)finishRecordingWithError:(NSError *)error {
     [self doStopRecording];
     [super finishRecordingWithError:nil];
 }
 
-- (void)reset
-{
+- (void)reset {
     [super reset];
     
     _logger = nil;
 }
 
-
 - (BOOL)isRecording {
     return self.motionManager.accelerometerActive;
 }
@@ -180,67 +172,60 @@
     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];
+- (instancetype)initWithIdentifier:(NSString *)identifier {
+    @throw [NSException exceptionWithName:NSGenericException reason:@"Use subclass designated initializer" userInfo:nil];
+}
+
+- (instancetype)initWithIdentifier:(NSString *)identifier frequency:(double)frequency {
+    self = [super initWithIdentifier:identifier];
     if (self) {
-        _frequency = freq;
+        _frequency = frequency;
     }
     return self;
 }
 #pragma clang diagnostic pop
 
-- (ORKRecorder *)recorderForStep:(ORKStep *)step outputDirectory:(NSURL *)outputDirectory
-{
-    return [[ORKAccelerometerRecorder alloc] initWithFrequency:self.frequency step:step outputDirectory:outputDirectory];
+- (ORKRecorder *)recorderForStep:(ORKStep *)step outputDirectory:(NSURL *)outputDirectory {
+    return [[ORKAccelerometerRecorder alloc] initWithIdentifier:self.identifier
+                                                      frequency:self.frequency
+                                                           step:step
+                                                outputDirectory:outputDirectory];
 }
 
-- (instancetype)initWithCoder:(NSCoder *)aDecoder
-{
+- (instancetype)initWithCoder:(NSCoder *)aDecoder {
     self = [super initWithCoder:aDecoder];
-    if (self)
-    {
+    if (self) {
         ORK_DECODE_DOUBLE(aDecoder, frequency);
     }
     return self;
 }
 
-- (void)encodeWithCoder:(NSCoder *)aCoder
-{
+- (void)encodeWithCoder:(NSCoder *)aCoder {
     [super encodeWithCoder:aCoder];
     ORK_ENCODE_DOUBLE(aCoder, frequency);
 }
 
-+ (BOOL)supportsSecureCoding
-{
++ (BOOL)supportsSecureCoding {
     return YES;
 }
 
-
 - (BOOL)isEqual:(id)object {
     BOOL isParentSame = [super isEqual:object];
     
     __typeof(self) castObject = object;
     return (isParentSame &&
-            (self.frequency == castObject.frequency)) ;
+            (self.frequency == castObject.frequency));
 }
 
-
 - (ORKPermissionMask)requestedPermissionMask {
     return ORKPermissionCoreMotionAccelerometer;
 }
 
-
-
 @end

ResearchKit/ActiveTasks/ORKActiveStep.h

@@ -29,9 +29,12 @@
  */
 
 
-#import <ResearchKit/ORKDefines.h>
+@import UIKit;
+@import HealthKit;
 #import <ResearchKit/ORKStep.h>
-#import <UIKit/UIKit.h>
+
+
+@class ORKRecorderConfiguration;
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -100,6 +103,16 @@ automatically navigates forward when the timer expires.
  */
 @property (nonatomic) BOOL shouldSpeakCountDown;
 
+/**
+ A Boolean value indicating whether to speak the halfway point 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 shouldSpeakRemainingTimeAtHalfway;
+
 
 /**
  A Boolean value indicating whether to start the count down timer automatically when the step starts, or
@@ -169,6 +182,14 @@ The default value of this property is `NO`.
  */
 @property (nonatomic, copy, nullable) NSString *spokenInstruction;
 
+/**
+ Localized text that represents an instructional voice prompt for when the step finishes.
+ 
+ Instructional speech begins when the step finishes. If VoiceOver is active,
+ the instruction is spoken by VoiceOver.
+ */
+@property (nonatomic, copy, nullable) NSString *finishedSpokenInstruction;
+
 /**
  An image to be displayed below the instructions for the step.
  
@@ -191,34 +212,7 @@ The default value of this property is `NO`.
  
  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;
-
+@property (nonatomic, copy, nullable) NSArray<ORKRecorderConfiguration *> *recorderConfigurations;
 
 @end
 

ResearchKit/ActiveTasks/ORKActiveStep.m

@@ -30,16 +30,19 @@
 
 
 #import "ORKActiveStep.h"
-#import "ORKHelpers.h"
-#import "ORKStep_Private.h"
 #import "ORKActiveStep_Internal.h"
+
 #import "ORKActiveStepViewController.h"
 #import "ORKRecorder_Private.h"
 
+#import "ORKStep_Private.h"
+
+#import "ORKHelpers_Internal.h"
+
+
 @implementation ORKActiveStep
 
-+ (Class)stepViewControllerClass
-{
++ (Class)stepViewControllerClass {
     return [ORKActiveStepViewController class];
 }
 
@@ -53,25 +56,25 @@
 
 - (BOOL)hasTitle {
     NSString *title = self.title;
-    return  ( title != nil && title.length > 0);
+    return  (title != nil && title.length > 0);
 }
 
 - (BOOL)hasText {
     NSString *text = self.text;
-    return  ( text != nil && text.length > 0);
+    return  (text != nil && text.length > 0);
 }
 
 - (BOOL)hasVoice {
-    return  ( _spokenInstruction != nil && _spokenInstruction.length > 0);
+    BOOL hasSpokenInstruction = (_spokenInstruction != nil && _spokenInstruction.length > 0);
+    BOOL hasFinishedSpokenInstruction = (_finishedSpokenInstruction != nil && _finishedSpokenInstruction.length > 0);
+    return  (hasSpokenInstruction || hasFinishedSpokenInstruction);
 }
 
 - (BOOL)isRestorable {
     return NO;
 }
 
-
-+ (BOOL)supportsSecureCoding
-{
++ (BOOL)supportsSecureCoding {
     return YES;
 }
 
@@ -83,12 +86,12 @@
     return self;
 }
 
-- (instancetype)copyWithZone:(NSZone *)zone
-{
+- (instancetype)copyWithZone:(NSZone *)zone {
     ORKActiveStep *step = [super copyWithZone:zone];
     step.stepDuration = self.stepDuration;
     step.shouldStartTimerAutomatically = self.shouldStartTimerAutomatically;
     step.shouldSpeakCountDown = self.shouldSpeakCountDown;
+    step.shouldSpeakRemainingTimeAtHalfway = self.shouldSpeakRemainingTimeAtHalfway;
     step.shouldShowDefaultTimer = self.shouldShowDefaultTimer;
     step.shouldPlaySoundOnStart = self.shouldPlaySoundOnStart;
     step.shouldPlaySoundOnFinish = self.shouldPlaySoundOnFinish;
@@ -97,20 +100,19 @@
     step.shouldUseNextAsSkipButton = self.shouldUseNextAsSkipButton;
     step.shouldContinueOnFinish = self.shouldContinueOnFinish;
     step.spokenInstruction = self.spokenInstruction;
+    step.finishedSpokenInstruction = self.finishedSpokenInstruction;
     step.recorderConfigurations = [self.recorderConfigurations copy];
     step.image = self.image;
     return step;
 }
 
-
-- (instancetype)initWithCoder:(NSCoder *)aDecoder
-{
+- (instancetype)initWithCoder:(NSCoder *)aDecoder {
     self = [super initWithCoder:aDecoder];
-    if (self)
-    {
+    if (self ) {
         ORK_DECODE_DOUBLE(aDecoder, stepDuration);
         ORK_DECODE_BOOL(aDecoder, shouldStartTimerAutomatically);
         ORK_DECODE_BOOL(aDecoder, shouldSpeakCountDown);
+        ORK_DECODE_BOOL(aDecoder, shouldSpeakRemainingTimeAtHalfway);
         ORK_DECODE_BOOL(aDecoder, shouldShowDefaultTimer);
         ORK_DECODE_BOOL(aDecoder, shouldPlaySoundOnStart);
         ORK_DECODE_BOOL(aDecoder, shouldPlaySoundOnFinish);
@@ -119,18 +121,19 @@
         ORK_DECODE_BOOL(aDecoder, shouldUseNextAsSkipButton);
         ORK_DECODE_BOOL(aDecoder, shouldContinueOnFinish);
         ORK_DECODE_OBJ_CLASS(aDecoder, spokenInstruction, NSString);
+        ORK_DECODE_OBJ_CLASS(aDecoder, finishedSpokenInstruction, NSString);
         ORK_DECODE_IMAGE(aDecoder, image);
         ORK_DECODE_OBJ_ARRAY(aDecoder, recorderConfigurations, ORKRecorderConfiguration);
     }
     return self;
 }
 
-- (void)encodeWithCoder:(NSCoder *)aCoder
-{
+- (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, shouldSpeakRemainingTimeAtHalfway);
     ORK_ENCODE_BOOL(aCoder, shouldShowDefaultTimer);
     ORK_ENCODE_BOOL(aCoder, shouldPlaySoundOnStart);
     ORK_ENCODE_BOOL(aCoder, shouldPlaySoundOnFinish);
@@ -140,49 +143,45 @@
     ORK_ENCODE_BOOL(aCoder, shouldContinueOnFinish);
     ORK_ENCODE_IMAGE(aCoder, image);
     ORK_ENCODE_OBJ(aCoder, spokenInstruction);
+    ORK_ENCODE_OBJ(aCoder, finishedSpokenInstruction);
     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.finishedSpokenInstruction, castObject.finishedSpokenInstruction) &&
             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.shouldSpeakRemainingTimeAtHalfway == castObject.shouldSpeakRemainingTimeAtHalfway) &&
             (self.shouldPlaySoundOnStart == castObject.shouldPlaySoundOnStart) &&
             (self.shouldPlaySoundOnFinish == castObject.shouldPlaySoundOnFinish) &&
             (self.shouldVibrateOnStart == castObject.shouldVibrateOnStart) &&
             (self.shouldVibrateOnFinish == castObject.shouldVibrateOnFinish) &&
             (self.shouldContinueOnFinish == castObject.shouldContinueOnFinish) &&
-            (self.shouldUseNextAsSkipButton == castObject.shouldUseNextAsSkipButton)) ;
+            (self.shouldUseNextAsSkipButton == castObject.shouldUseNextAsSkipButton));
 }
 
-
-
-
-
-- (NSSet *)requestedHealthKitTypesForReading {
-    NSMutableSet *set = [NSMutableSet set];
+- (NSSet<HKObjectType *> *)requestedHealthKitTypesForReading {
+    NSMutableSet<HKObjectType *> *set = [NSMutableSet set];
     for (ORKRecorderConfiguration *config in self.recorderConfigurations) {
-        NSSet *subset = [config requestedHealthKitTypesForReading];
+        NSSet<HKObjectType *> *subset = [config requestedHealthKitTypesForReading];
         if (subset) {
             [set unionSet:subset];
         }
     }
     return set;
-    
 }
 
 - (ORKPermissionMask)requestedPermissions {
-    ORKPermissionMask mask = ORKPermissionNone;
+    ORKPermissionMask mask = [super requestedPermissions];
     for (ORKRecorderConfiguration *config in self.recorderConfigurations) {
         mask |= [config requestedPermissionMask];
     }

ResearchKit/ActiveTasks/ORKActiveStepQuantityView.h

@@ -28,15 +28,18 @@
  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <ResearchKit/ResearchKit_Private.h>
+
+@import UIKit;
 #import "ORKLabel.h"
 
+
 NS_ASSUME_NONNULL_BEGIN
 
 @interface ORKQuantityLabel : ORKLabel
 
 @end
 
+
 @interface ORKActiveStepQuantityView : UIView
 
 @property (nonatomic, strong, nullable) NSString *title;
@@ -44,13 +47,12 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, strong, nullable) UIImage *image;
 @property (nonatomic) BOOL enabled;
 
-
-@property (nonatomic, readonly, strong, nullable) UILabel *titleLabel;
-@property (nonatomic, readonly, strong, nullable) UILabel *valueLabel;
-
+@property (nonatomic, strong, readonly, nullable) UILabel *titleLabel;
+@property (nonatomic, strong, readonly, nullable) UILabel *valueLabel;
 
 @end
 
+
 @interface ORKQuantityPairView : UIView
 
 @property (nonatomic, strong, nullable) ORKActiveStepQuantityView *leftView;

ResearchKit/ActiveTasks/ORKActiveStepQuantityView.m

@@ -28,11 +28,14 @@
  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"
+#import "ORKTintedImageView.h"
+
+#import "ORKHelpers_Internal.h"
+#import "ORKSkin.h"
 
 
 @implementation ORKQuantityLabel
@@ -44,12 +47,13 @@
 @end
 
 
-@implementation ORKActiveStepQuantityView
-{
+@implementation ORKActiveStepQuantityView {
     ORKSubheadlineLabel *_titleLabel;
     ORKQuantityLabel *_valueLabel;
     ORKTintedImageView *_imageView;
     UIView *_valueHolder;
+    
+    NSLayoutConstraint *_zeroWidthConstraint;
 }
 
 - (instancetype)initWithFrame:(CGRect)frame {
@@ -82,15 +86,14 @@
             view.isAccessibilityElement = NO;
         }
         
-        [self setNeedsUpdateConstraints];
-        
+        [self setUpConstraints];
     }
     return self;
 }
 
 - (void)setEnabled:(BOOL)enabled {
     _enabled = enabled;
-    self.hidden = ! enabled;
+    self.hidden = !enabled;
     [self setNeedsUpdateConstraints];
 }
 
@@ -109,69 +112,93 @@
     _imageView.image = image;
 }
 
-- (void)updateConstraints {
-    [self removeConstraints:[self constraints]];
+- (void)setUpConstraints {
     
     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];
-    }
+    NSMutableArray *constraints = [NSMutableArray array];
     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
+    [constraints addObjectsFromArray:[NSLayoutConstraint constraintsWithVisualFormat:@"V:|[_titleLabel]"
+                                                                                       options:(NSLayoutFormatOptions)0
+                                                                                       metrics:nil
+                                                                                         views:views]];
+    [constraints addObjectsFromArray:[NSLayoutConstraint constraintsWithVisualFormat:@"H:|[_titleLabel]|"
+                                                                                       options:(NSLayoutFormatOptions)0
+                                                                                       metrics:nil
+                                                                                         views:views]];
+    [constraints addObjectsFromArray:[NSLayoutConstraint constraintsWithVisualFormat:@"H:|[_imageView]-10-[_valueLabel]|"
+                                                                                       options:NSLayoutFormatAlignAllCenterY
+                                                                                       metrics:nil
+                                                                                         views:views]];
+    [constraints addObject:[NSLayoutConstraint constraintWithItem:_valueLabel
                                                                   attribute:NSLayoutAttributeFirstBaseline
                                                                   relatedBy:NSLayoutRelationEqual
                                                                      toItem:_titleLabel
                                                                   attribute:NSLayoutAttributeLastBaseline
-                                                                 multiplier:1 constant:TitleBaselineToValueBaseline]];
-    [additionalConstraints addObject:[NSLayoutConstraint constraintWithItem:self
+                                                                 multiplier:1.0
+                                                                   constant:TitleBaselineToValueBaseline]];
+    [constraints addObject:[NSLayoutConstraint constraintWithItem:self
                                                                   attribute:NSLayoutAttributeBottom
                                                                   relatedBy:NSLayoutRelationEqual
                                                                      toItem:_valueLabel
                                                                   attribute:NSLayoutAttributeLastBaseline
-                                                                 multiplier:1 constant:ValueBaselineToBottom]];
-    [additionalConstraints addObject:[NSLayoutConstraint constraintWithItem:_valueHolder
+                                                                 multiplier:1.0
+                                                                   constant:ValueBaselineToBottom]];
+    [constraints addObject:[NSLayoutConstraint constraintWithItem:_valueHolder
                                                                   attribute:NSLayoutAttributeCenterX
                                                                   relatedBy:NSLayoutRelationEqual
                                                                      toItem:self
                                                                   attribute:NSLayoutAttributeCenterX
-                                                                 multiplier:1 constant:0]];
-    [additionalConstraints addObject:[NSLayoutConstraint constraintWithItem:_valueLabel
+                                                                 multiplier:1.0
+                                                                   constant:0.0]];
+    [constraints addObject:[NSLayoutConstraint constraintWithItem:_valueLabel
                                                                   attribute:NSLayoutAttributeTop
                                                                   relatedBy:NSLayoutRelationGreaterThanOrEqual
                                                                      toItem:_valueHolder
                                                                   attribute:NSLayoutAttributeTop
-                                                                 multiplier:1 constant:0]];
-    [additionalConstraints addObject:[NSLayoutConstraint constraintWithItem:_valueLabel
+                                                                 multiplier:1.0
+                                                                   constant:0.0]];
+    [constraints addObject:[NSLayoutConstraint constraintWithItem:_valueLabel
                                                                   attribute:NSLayoutAttributeBottom
                                                                   relatedBy:NSLayoutRelationLessThanOrEqual
                                                                      toItem:_valueHolder
                                                                   attribute:NSLayoutAttributeBottom
-                                                                 multiplier:1 constant:0]];
-    [additionalConstraints addObject:[NSLayoutConstraint constraintWithItem:_valueHolder
+                                                                 multiplier:1.0
+                                                                   constant:0.0]];
+    [constraints addObject:[NSLayoutConstraint constraintWithItem:_valueHolder
                                                                   attribute:NSLayoutAttributeLeft
                                                                   relatedBy:NSLayoutRelationGreaterThanOrEqual
                                                                      toItem:self
                                                                   attribute:NSLayoutAttributeLeft
-                                                                 multiplier:1 constant:0]];
-    [additionalConstraints addObject:[NSLayoutConstraint constraintWithItem:_valueHolder
+                                                                 multiplier:1.0
+                                                                   constant:0.0]];
+    [constraints addObject:[NSLayoutConstraint constraintWithItem:_valueHolder
                                                                   attribute:NSLayoutAttributeRight
                                                                   relatedBy:NSLayoutRelationLessThanOrEqual
                                                                      toItem:self
                                                                   attribute:NSLayoutAttributeRight
-                                                                 multiplier:1 constant:0]];
-    for (NSLayoutConstraint *constraint in additionalConstraints) {
-        constraint.priority = UILayoutPriorityDefaultHigh;
+                                                                 multiplier:1.0
+                                                                   constant:0.0]];
+    for (NSLayoutConstraint *constraint in constraints) {
+        constraint.priority = UILayoutPriorityRequired - 2;
     }
-    [self addConstraints:additionalConstraints];
     
+    [NSLayoutConstraint activateConstraints:constraints];
+    
+    _zeroWidthConstraint = [NSLayoutConstraint constraintWithItem:self
+                                                        attribute:NSLayoutAttributeWidth
+                                                        relatedBy:NSLayoutRelationEqual
+                                                           toItem:nil
+                                                        attribute:NSLayoutAttributeNotAnAttribute
+                                                       multiplier:1.0
+                                                         constant:0.0];
+    _zeroWidthConstraint.priority = UILayoutPriorityRequired - 1;
+    [self setNeedsUpdateConstraints];
+}
+
+- (void)updateConstraints {
+    _zeroWidthConstraint.active = !_enabled;
     [super updateConstraints];
 }
 
@@ -195,10 +222,9 @@
 
 @end
 
-@implementation ORKQuantityPairView
-{
+
+@implementation ORKQuantityPairView {
     UIView *_metricKeyline;
-    NSArray *_constraints;
 }
 
 - (instancetype)initWithFrame:(CGRect)frame {
@@ -215,59 +241,88 @@
         [self setKeylineHidden:NO];
         _metricKeyline.backgroundColor = [UIColor ork_midGrayTintColor];
         
-        
         [self addSubview:_leftView];
         [self addSubview:_rightView];
         [self addSubview:_metricKeyline];
-        [self setNeedsUpdateConstraints];
-        
+        [self setUpConstraints];
     }
     return self;
 }
 
-- (void)updateConstraints {
+- (void)setUpConstraints {
     
-    
-    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];
+    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];
+    NSArray *horizConstraints = [NSLayoutConstraint constraintsWithVisualFormat:@"H:|-[_leftView]-s-[_rightView]-|"
+                                                                        options:NSLayoutFormatAlignAllTop|NSLayoutFormatAlignAllBottom|NSLayoutFormatDirectionLeftToRight
+                                                                        metrics:@{ @"s": @(1.0 / scale) }
+                                                                          views:views];
     for (NSLayoutConstraint *constraint in horizConstraints) {
-        constraint.priority = UILayoutPriorityDefaultHigh+1;
+        constraint.priority = UILayoutPriorityDefaultHigh + 1;
     }
     [constraints addObjectsFromArray:horizConstraints];
     
-    [constraints addObjectsFromArray:[NSLayoutConstraint constraintsWithVisualFormat:@"H:[_leftView][_metricKeyline(==s)]" options:NSLayoutFormatAlignAllTop|NSLayoutFormatDirectionLeftToRight metrics:@{@"s":@(1/scale)} views:views]];
+    // Ensure baseline alignment of title and value
+    [constraints addObject:[NSLayoutConstraint constraintWithItem:_leftView.titleLabel
+                                                        attribute:NSLayoutAttributeFirstBaseline
+                                                        relatedBy:NSLayoutRelationEqual
+                                                           toItem:_rightView.titleLabel
+                                                        attribute:NSLayoutAttributeFirstBaseline
+                                                       multiplier:1.0
+                                                         constant:0.0]];
+    [constraints addObject:[NSLayoutConstraint constraintWithItem:_leftView.valueLabel
+                                                        attribute:NSLayoutAttributeFirstBaseline
+                                                        relatedBy:NSLayoutRelationEqual
+                                                           toItem:_rightView.valueLabel
+                                                        attribute:NSLayoutAttributeFirstBaseline
+                                                       multiplier:1.0
+                                                         constant:0.0]];
+    
+    [constraints addObjectsFromArray:[NSLayoutConstraint constraintsWithVisualFormat:@"H:[_leftView][_metricKeyline(==s)]"
+                                                                             options:NSLayoutFormatAlignAllTop|NSLayoutFormatDirectionLeftToRight
+                                                                             metrics:@{ @"s": @(1.0 / scale) }
+                                                                               views:views]];
     NSLayoutConstraint *keylineBottom = [NSLayoutConstraint constraintWithItem:_metricKeyline
                                                                      attribute:NSLayoutAttributeBottom
                                                                      relatedBy:NSLayoutRelationEqual
                                                                         toItem:_leftView.valueLabel
                                                                      attribute:NSLayoutAttributeLastBaseline
-                                                                    multiplier:1 constant:0];
+                                                                    multiplier:1.0
+                                                                      constant:0.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;
+    NSLayoutConstraint *maxWidthConstraint = [NSLayoutConstraint constraintWithItem:self
+                                                                          attribute:NSLayoutAttributeWidth
+                                                                          relatedBy:NSLayoutRelationEqual
+                                                                             toItem:nil
+                                                                          attribute:NSLayoutAttributeNotAnAttribute
+                                                                         multiplier:1.0
+                                                                           constant:ORKScreenMetricMaxDimension];
+    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];
+    NSLayoutConstraint *equalWidthConstraint = [NSLayoutConstraint constraintWithItem:_leftView
+                                                                            attribute:NSLayoutAttributeWidth
+                                                                            relatedBy:NSLayoutRelationEqual
+                                                                               toItem:_rightView
+                                                                            attribute:NSLayoutAttributeWidth
+                                                                           multiplier:1.0
+                                                                             constant:0.0];
     equalWidthConstraint.priority = UILayoutPriorityDefaultLow;
     [constraints addObject:equalWidthConstraint];
     
-    [self addConstraints:constraints];
-    _constraints = constraints;
-    [super updateConstraints];
+    [NSLayoutConstraint activateConstraints:constraints];
 }
 
 - (void)setKeylineHidden:(BOOL)keylineHidden {
@@ -276,4 +331,3 @@
 }
 
 @end
-

ResearchKit/ActiveTasks/ORKActiveStepTimer.h

@@ -28,8 +28,9 @@
  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <Foundation/Foundation.h>
-#import <ResearchKit/ResearchKit.h>
+
+@import Foundation;
+
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -37,7 +38,6 @@ NS_ASSUME_NONNULL_BEGIN
 
 typedef void (^ORKActiveStepTimerHandler)(ORKActiveStepTimer *timer, BOOL finished);
 
-
 @interface ORKActiveStepTimer : NSObject
 
 - (instancetype)initWithDuration:(NSTimeInterval)duration interval:(NSTimeInterval)interval runtime:(NSTimeInterval)runtime handler:(ORKActiveStepTimerHandler)handler;

ResearchKit/ActiveTasks/ORKActiveStepTimer.m

@@ -28,24 +28,27 @@
  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+
 #import "ORKActiveStepTimer.h"
+
+#import "ORKHelpers_Internal.h"
+
+@import UIKit;
 #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
-{
+
+@implementation ORKActiveStepTimer {
     uint64_t _startTime;
     NSTimeInterval _preExistingRuntime;
     dispatch_queue_t _queue;
@@ -54,11 +57,10 @@ static NSTimeInterval timeIntervalFromMachTime(uint64_t delta) {
     uint32_t _isRunning;
 }
 
-
 - (instancetype)initWithDuration:(NSTimeInterval)duration interval:(NSTimeInterval)interval runtime:(NSTimeInterval)runtime handler:(ORKActiveStepTimerHandler)handler {
     self = [super init];
     if (self) {
-        if (! handler) {
+        if (!handler) {
             @throw [NSException exceptionWithName:NSInvalidArgumentException reason:@"Handler is required" userInfo:nil];
         }
         
@@ -158,10 +160,10 @@ static NSTimeInterval timeIntervalFromMachTime(uint64_t delta) {
     if (_backgroundTaskIdentifier == UIBackgroundTaskInvalid) {
         return;
     }
-    UIBackgroundTaskIdentifier ident = _backgroundTaskIdentifier;
+    UIBackgroundTaskIdentifier identifier = _backgroundTaskIdentifier;
     _backgroundTaskIdentifier = UIBackgroundTaskInvalid;
     dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-        [[UIApplication sharedApplication] endBackgroundTask:ident];
+        [[UIApplication sharedApplication] endBackgroundTask:identifier];
     });
 }
 
@@ -178,7 +180,6 @@ static NSTimeInterval timeIntervalFromMachTime(uint64_t delta) {
 }
 
 - (void)queue_resume {
-    
     if (_timer != NULL) {
         // Already resumed
         return;
@@ -200,9 +201,9 @@ static NSTimeInterval timeIntervalFromMachTime(uint64_t delta) {
         assert(0);
         return;
     }
-    __weak typeof(self) weakSelf = self;
+    ORKWeakTypeOf(self) weakSelf = self;
     dispatch_source_set_event_handler(_timer, ^{
-        typeof(self) strongSelf = weakSelf;
+        ORKStrongTypeOf(self) strongSelf = weakSelf;
         [strongSelf hiqueue_event];
     });
     
@@ -211,7 +212,7 @@ static NSTimeInterval timeIntervalFromMachTime(uint64_t delta) {
     _startTime = mach_absolute_time();
     dispatch_source_set_timer(_timer,
                               dispatch_time(DISPATCH_TIME_NOW, timeUntilNextFire * NSEC_PER_SEC),
-                              _interval * NSEC_PER_SEC ,
+                              _interval * NSEC_PER_SEC,
                               0.05 * NSEC_PER_SEC);
     dispatch_resume(_timer);
 }
@@ -227,7 +228,7 @@ static NSTimeInterval timeIntervalFromMachTime(uint64_t delta) {
     _preExistingRuntime += timeIntervalFromMachTime(now - _startTime);
     _startTime = 0;
     
-    if (! atFinish) {
+    if (!atFinish) {
         // If we are atFinish, the task will be released after the handler completes
         [self queue_releaseBackgroundTask];
     }
@@ -239,5 +240,4 @@ static NSTimeInterval timeIntervalFromMachTime(uint64_t delta) {
     [self queue_releaseBackgroundTask];
 }
 
-
 @end

ResearchKit/ActiveTasks/ORKActiveStepTimerView.h

@@ -28,22 +28,25 @@
  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <UIKit/UIKit.h>
 
-#import <ResearchKit/ResearchKit_Private.h>
+@import UIKit;
 #import "ORKCustomStepView_Internal.h"
-#import "ORKCountdownLabel.h"
-#import "ORKTextButton.h"
+
 
 NS_ASSUME_NONNULL_BEGIN
 
+@class ORKActiveStep;
+@class ORKCountdownLabel;
+@class ORKTextButton;
+
 @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
+NS_ASSUME_NONNULL_END

ResearchKit/ActiveTasks/ORKActiveStepTimerView.m

@@ -28,31 +28,37 @@
  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 "ORKCountdownLabel.h"
 #import "ORKSurveyAnswerCellForText.h"
 #import "ORKSurveyAnswerCellForNumber.h"
-#import "ORKActiveStep_Internal.h"
+#import "ORKTextButton.h"
+#import "ORKVoiceEngine.h"
+
 #import "ORKActiveStepViewController_Internal.h"
 #import "ORKStepViewController_Internal.h"
 
+#import "ORKActiveStep_Internal.h"
 
-@implementation ORKActiveStepTimerView
-{
+#import "ORKHelpers_Internal.h"
+#import "ORKSkin.h"
+
+
+@implementation ORKActiveStepTimerView {
     BOOL _started;
     BOOL _registeredForNotifications;
+    
+    NSLayoutConstraint *_countDownLabelBottomToStartTimerButtonTopConstraint;
+    NSLayoutConstraint *_countDownLabelZeroHeightConstraint;
+    NSLayoutConstraint *_startTimerButtonZeroHeightConstraint;
 }
 
-- (instancetype)initWithFrame:(CGRect)frame
-{
+- (instancetype)initWithFrame:(CGRect)frame {
     self = [super initWithFrame:frame];
-    if (self)
-    {
-        
+    if (self) {
         // Count Down
         {
             _countDownLabel = [ORKCountdownLabel new];
@@ -61,10 +67,8 @@
             
             [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];
@@ -75,17 +79,16 @@
         
         _countDownLabel.accessibilityTraits |= UIAccessibilityTraitUpdatesFrequently;
         
-        [self setTranslatesAutoresizingMaskIntoConstraints:NO];
-        
-        
+        self.translatesAutoresizingMaskIntoConstraints = NO;
+        [self setUpConstraints];
     }
     return self;
 }
 
 - (void)applicationDidBecomeActive:(NSNotification *)notification {
-    ORKActiveStepViewController *vc = self.activeStepViewController;
-    if (vc) {
-        [self updateDisplay:vc];
+    ORKActiveStepViewController *viewController = self.activeStepViewController;
+    if (viewController) {
+        [self updateDisplay:viewController];
     }
 }
 
@@ -93,13 +96,13 @@
     if (registered == _registeredForNotifications) {
         return;
     }
-    
+
     registered = _registeredForNotifications;
-    NSNotificationCenter *nfc = [NSNotificationCenter defaultCenter];
+    NSNotificationCenter *notificationCenter = [NSNotificationCenter defaultCenter];
     if (registered) {
-        [nfc addObserver:self selector:@selector(applicationDidBecomeActive:) name:UIApplicationDidBecomeActiveNotification object:nil];
+        [notificationCenter addObserver:self selector:@selector(applicationDidBecomeActive:) name:UIApplicationDidBecomeActiveNotification object:nil];
     } else {
-        [nfc removeObserver:self name:UIApplicationDidBecomeActiveNotification object:nil];
+        [notificationCenter removeObserver:self name:UIApplicationDidBecomeActiveNotification object:nil];
     }
 }
 
@@ -107,9 +110,7 @@
     [self setRegisteredForNotifications:(self.window != nil)];
 }
 
-
-- (void)setStep:(ORKActiveStep *)step
-{
+- (void)setStep:(ORKActiveStep *)step {
     _step = step;
     _countDownLabel.hidden = !(_step.hasCountDown);
     BOOL hasTimerButton = (_step.hasCountDown && _step.shouldStartTimerAutomatically == NO);
@@ -121,19 +122,16 @@
     [self setNeedsUpdateConstraints];
 }
 
-- (void)startTimerButtonTapped:(id)sender
-{
+- (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;
 }
@@ -147,8 +145,7 @@
 
 - (void)resumeStep:(ORKActiveStepViewController *)viewController {
     self.step = (ORKActiveStep *)viewController.step;
-    if ([viewController timerActive])
-    {
+    if ([viewController timerActive]) {
         _startTimerButton.alpha = 0;
         [self updateDisplay:viewController];
     }
@@ -157,44 +154,81 @@
 - (void)finishStep:(ORKActiveStepViewController *)viewController {
 }
 
-- (void)setNeedsUpdateConstraints
-{
-    [NSLayoutConstraint deactivateConstraints:[self constraints]];
-    [super setNeedsUpdateConstraints];
+static const CGFloat CountDownLabelToButtonMargin = 2.0;
+
+- (void)setUpConstraints {
+    NSDictionary *views = NSDictionaryOfVariableBindings(_countDownLabel, _startTimerButton);
+    ORKEnableAutoLayoutForViews(views.allValues);
     
+    NSMutableArray *constraints = [NSMutableArray new];
+    
+    for (UIView *view in views.allValues) {
+        [constraints addObject:[NSLayoutConstraint constraintWithItem:view
+                                                            attribute:NSLayoutAttributeWidth
+                                                            relatedBy:NSLayoutRelationLessThanOrEqual
+                                                               toItem:self
+                                                            attribute:NSLayoutAttributeWidth
+                                                           multiplier:1.0
+                                                             constant:0.0]];
+        [constraints addObject:[NSLayoutConstraint constraintWithItem:view
+                                                            attribute:NSLayoutAttributeCenterX
+                                                            relatedBy:NSLayoutRelationLessThanOrEqual
+                                                               toItem:self
+                                                            attribute:NSLayoutAttributeCenterX
+                                                           multiplier:1.0
+                                                             constant:0.0]];
+    }
+    
+    [constraints addObject:[NSLayoutConstraint constraintWithItem:self
+                                                        attribute:NSLayoutAttributeTop
+                                                        relatedBy:NSLayoutRelationEqual
+                                                           toItem:_countDownLabel
+                                                        attribute:NSLayoutAttributeTop
+                                                       multiplier:1.0
+                                                         constant:0.0]];
+
+    _countDownLabelBottomToStartTimerButtonTopConstraint = [NSLayoutConstraint constraintWithItem:_startTimerButton
+                                                                                        attribute:NSLayoutAttributeTop
+                                                                                        relatedBy:NSLayoutRelationEqual
+                                                                                           toItem:_countDownLabel
+                                                                                        attribute:NSLayoutAttributeBottom
+                                                                                       multiplier:1.0
+                                                                                         constant:CountDownLabelToButtonMargin];
+    [constraints addObject:_countDownLabelBottomToStartTimerButtonTopConstraint];
+
+    [constraints addObject:[NSLayoutConstraint constraintWithItem:_startTimerButton
+                                                        attribute:NSLayoutAttributeBottom
+                                                        relatedBy:NSLayoutRelationEqual
+                                                           toItem:self
+                                                        attribute:NSLayoutAttributeBottom
+                                                       multiplier:1.0
+                                                         constant:0.0]];
+
+    [NSLayoutConstraint activateConstraints:constraints];
+    
+    _countDownLabelZeroHeightConstraint = [NSLayoutConstraint constraintWithItem:_countDownLabel
+                                                                   attribute:NSLayoutAttributeHeight
+                                                                   relatedBy:NSLayoutRelationEqual
+                                                                      toItem:nil
+                                                                   attribute:NSLayoutAttributeNotAnAttribute
+                                                                  multiplier:1.0
+                                                                    constant:0.0];
+    _startTimerButtonZeroHeightConstraint = [NSLayoutConstraint constraintWithItem:_startTimerButton
+                                                                         attribute:NSLayoutAttributeHeight
+                                                                         relatedBy:NSLayoutRelationEqual
+                                                                            toItem:nil
+                                                                         attribute:NSLayoutAttributeNotAnAttribute
+                                                                        multiplier:1.0
+                                                                          constant:0.0];
+    [self 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]];
-    }
-    
+- (void)updateConstraints {
+    _countDownLabelZeroHeightConstraint.active = _countDownLabel.hidden;
+    _startTimerButtonZeroHeightConstraint.active = (_countDownLabel.hidden || _startTimerButton.hidden);
+    _countDownLabelBottomToStartTimerButtonTopConstraint.constant =
+    (_countDownLabel.hidden || _startTimerButton.hidden) ? 0.0 : CountDownLabelToButtonMargin;
     [super updateConstraints];
 }
 
-
 @end
-

ResearchKit/ActiveTasks/ORKActiveStepViewController.h

@@ -29,13 +29,13 @@
  */
 
 
+@import UIKit;
 #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
@@ -105,10 +105,8 @@ ORK_CLASS_AVAILABLE
  */
 @property (nonatomic, strong, readonly, nullable) NSArray *recorders;
 
-
 /// @name Active step life cycle
 
-
 /**
  A Boolean value that indicates whether the step has finished. (read-only)
  
@@ -118,8 +116,7 @@ ORK_CLASS_AVAILABLE
  
  In addition, when a step is finished, all recorders are stopped.
  */
-@property (nonatomic, assign, getter=isFinished, readonly) BOOL finished;
-
+@property (nonatomic, assign, readonly, getter=isFinished) BOOL finished;
 
 /**
  A Boolean value that indicates whether the step has started. (read-only)
@@ -140,7 +137,6 @@ ORK_CLASS_AVAILABLE
  */
 - (void)stepDidFinish;
 
-
 /**
  A Boolean value that indicates whether to suspend the step if the app is not
  active or the screen is off.

ResearchKit/ActiveTasks/ORKActiveStepViewController.m

@@ -30,25 +30,30 @@
 
 
 #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 (){
+#import "ORKActiveStepTimer.h"
+#import "ORKActiveStepTimerView.h"
+#import "ORKActiveStepView.h"
+#import "ORKNavigationContainerView.h"
+#import "ORKStepHeaderView_Internal.h"
+#import "ORKVerticalContainerView.h"
+#import "ORKVoiceEngine.h"
+
+#import "ORKActiveStepViewController_Internal.h"
+#import "ORKStepViewController_Internal.h"
+#import "ORKTaskViewController_Internal.h"
+#import "ORKRecorder_Internal.h"
+
+#import "ORKActiveStep_Internal.h"
+#import "ORKResult.h"
+#import "ORKTask.h"
+
+#import "ORKAccessibility.h"
+#import "ORKHelpers_Internal.h"
+#import "ORKSkin.h"
+
+
+@interface ORKActiveStepViewController () {
     ORKActiveStepView *_activeStepView;
     ORKActiveStepTimer *_activeStepTimer;
 
@@ -56,6 +61,7 @@
     
     SystemSoundID _alertSound;
     NSURL *_alertSoundURL;
+    BOOL _hasSpokenHalfwayCountdown;
 }
 
 @property (nonatomic, strong) NSArray *recorders;
@@ -76,10 +82,8 @@
         _timerUpdateInterval = 1;
     }
     return self;
-    
 }
 
-
 - (void)applicationWillResignActive:(NSNotification *)notification {
     if (self.suspendIfInactive) {
         [self suspend];
@@ -93,6 +97,7 @@
 }
 
 - (ORKActiveStep *)activeStep {
+    NSAssert(self.step == nil || [self.step isKindOfClass:[ORKActiveStep class]], @"Step should be a subclass of an ORKActiveStep");
     return (ORKActiveStep *)self.step;
 }
 
@@ -100,12 +105,11 @@
     return _activeStepView;
 }
 
-- (void)viewDidLoad
-{
+- (void)viewDidLoad {
     [super viewDidLoad];
     
     _activeStepView = [[ORKActiveStepView alloc] initWithFrame:self.view.bounds];
-    [_activeStepView setTranslatesAutoresizingMaskIntoConstraints:NO];
+    _activeStepView.translatesAutoresizingMaskIntoConstraints = NO;
     [_activeStepView setCustomView:_customView];
     [self updateContinueButtonItem];
     _activeStepView.headerView.learnMoreButtonItem = self.learnMoreButtonItem;
@@ -113,14 +117,22 @@
     _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];
+    NSMutableArray *constraints = [NSMutableArray new];
+    [constraints addObjectsFromArray:[NSLayoutConstraint constraintsWithVisualFormat:@"H:|[activeStepView]|"
+                                                                             options:(NSLayoutFormatOptions)0
+                                                                             metrics:nil
+                                                                               views:@{@"activeStepView": _activeStepView}]];
+    [constraints addObjectsFromArray:[NSLayoutConstraint constraintsWithVisualFormat:@"V:[topLayoutGuide][activeStepView]|"
+                                                                             options:(NSLayoutFormatOptions)0
+                                                                             metrics:nil
+                                                                               views:@{@"activeStepView": _activeStepView,
+                                                                                       @"topLayoutGuide": self.topLayoutGuide}]];
+    [NSLayoutConstraint activateConstraints:constraints];
     
     [self prepareStep];
 }
-- (void)stepDidChange
-{
+
+- (void)stepDidChange {
     [super stepDidChange];
     _activeStepView.activeStep = [self activeStep];
     [self updateContinueButtonItem];
@@ -129,20 +141,17 @@
     [self prepareStep];
 }
 
-- (UIView *)customViewContainer
-{
-    __unused UIView *v = [self view];
+- (UIView *)customViewContainer {
+    __unused UIView *view = [self view];
     return _activeStepView.customViewContainer;
 }
 
-- (UIImageView *)imageView
-{
-    __unused UIView *v = [self view];
+- (ORKTintedImageView *)imageView {
+    __unused UIView *view = [self view];
     return _activeStepView.imageView;
 }
 
-- (void)setCustomView:(UIView *)customView
-{
+- (void)setCustomView:(UIView *)customView {
     _customView = customView;
     [_activeStepView setStepView:_customView];
 }
@@ -154,21 +163,19 @@
     [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])
-        {
+        if(self.started){
+            // Should call resume instead of start when the task has been started.
+            [self resume];
+        } else if ([[self activeStep] shouldStartTimerAutomatically]) {
             [self start];
         }
     });
-    
-    
 }
 
 - (void)viewWillDisappear:(BOOL)animated {
@@ -187,56 +194,47 @@
     [self updateContinueButtonItem];
 }
 
-- (void)setLearnMoreButtonItem:(UIBarButtonItem *)learnMoreButtonItem
-{
+- (void)setLearnMoreButtonItem:(UIBarButtonItem *)learnMoreButtonItem {
     [super setLearnMoreButtonItem:learnMoreButtonItem];
     _activeStepView.headerView.learnMoreButtonItem = self.learnMoreButtonItem;
 }
 
-- (void)setSkipButtonItem:(UIBarButtonItem *)skipButtonItem
-{
+- (void)setSkipButtonItem:(UIBarButtonItem *)skipButtonItem {
     [super setSkipButtonItem:skipButtonItem];
     _activeStepView.continueSkipContainer.skipButtonItem = skipButtonItem;
 }
 
-- (void)setFinished:(BOOL)finished
-{
+- (void)setFinished:(BOOL)finished {
     _finished = finished;
-    
     _activeStepView.continueSkipContainer.continueEnabled = finished;
 }
 
 - (ORKStepResult *)result {
     ORKStepResult *sResult = [super result];
-    sResult.results = _recorderResults;
+    if (_recorderResults) {
+        sResult.results = [sResult.results arrayByAddingObjectsFromArray:_recorderResults] ? : _recorderResults;
+    }
     return sResult;
 }
 
 #pragma mark - transition
 
 - (void)recordersDidChange {
-    
 }
 
 - (void)recordersWillStart {
-    
 }
 
 - (void)recordersWillStop {
-    
 }
 
-
-- (void)prepareRecorders
-{
+- (void)prepareRecorders {
     // Stop any existing recorders
     [self recordersWillStop];
-    for (ORKRecorder *recorder in self.recorders)
-    {
+    for (ORKRecorder *recorder in self.recorders) {
         recorder.delegate = nil;
         [recorder stop];
     }
-    
     NSMutableArray *recorders = [NSMutableArray array];
     
     for (ORKRecorderConfiguration * provider in self.activeStep.recorderConfigurations) {
@@ -249,7 +247,6 @@
         
         [recorders addObject:recorder];
     }
-
     self.recorders = recorders;
     
     [self recordersDidChange];
@@ -261,8 +258,7 @@
 }
 
 - (void)prepareStep {
-    
-    if (self.activeStep==nil) {
+    if (self.activeStep == nil) {
         return;
     }
     
@@ -271,13 +267,10 @@
     ORK_Log_Debug(@"%@", self);
     _activeStepView.activeStep = self.activeStep;
     
-    if ([self.activeStep hasCountDown])
-    {
+    if ([self.activeStep hasCountDown]) {
         ORKActiveStepTimerView *timerView = [ORKActiveStepTimerView new];
         _activeStepView.activeCustomView = timerView;
-    }
-    else
-    {
+    } else {
         _activeStepView.activeCustomView = nil;
     }
     _activeStepView.activeCustomView.activeStepViewController = self;
@@ -291,7 +284,6 @@
     [self recordersWillStart];
     // Start recorders
     for (ORKRecorder *recorder in self.recorders) {
-        
         [recorder viewController:self willStartStepWithView:self.customViewContainer];
         [recorder start];
     }
@@ -304,8 +296,7 @@
     }
 }
 
-- (void)playSound
-{
+- (void)playSound {
     if (_alertSoundURL == nil) {
         _alertSoundURL = [NSURL URLWithString:@"/System/Library/Audio/UISounds/short_low_high.caf"];
         AudioServicesCreateSystemSoundID((__bridge CFURLRef)(_alertSoundURL), &_alertSound);
@@ -321,14 +312,11 @@
     
     [self startRecorders];
     
-    
     if (self.activeStep.shouldVibrateOnStart) {
-        
         AudioServicesPlayAlertSound(kSystemSoundID_Vibrate);
     }
     
     if (self.activeStep.shouldPlaySoundOnStart) {
-        
         [self playSound];
     }
     
@@ -337,14 +325,14 @@
         // 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];
+            [[ORKVoiceEngine sharedVoiceEngine] speakText:self.activeStep.spokenInstruction];
         });
     }
 }
 
 - (void)suspend {
     ORK_Log_Debug(@"%@",self);
-    if (self.finished || ! self.started) {
+    if (self.finished || !self.started) {
         return;
     }
     
@@ -356,7 +344,7 @@
 
 - (void)resume {
     ORK_Log_Debug(@"%@",self);
-    if (self.finished || ! self.started) {
+    if (self.finished || !self.started) {
         return;
     }
     
@@ -366,7 +354,6 @@
     [_activeStepView.activeCustomView resumeStep:self];
 }
 
-
 - (void)finish {
     ORK_Log_Debug(@"%@",self);
     if (self.finished) {
@@ -383,7 +370,10 @@
     if (self.activeStep.shouldVibrateOnFinish) {
         AudioServicesPlayAlertSound(kSystemSoundID_Vibrate);
     }
-    if (! self.activeStep.startsFinished) {
+    if (self.activeStep.hasVoice && self.activeStep.finishedSpokenInstruction) {
+        [[ORKVoiceEngine sharedVoiceEngine] speakText:self.activeStep.finishedSpokenInstruction];
+    }
+    if (!self.activeStep.startsFinished) {
         if (self.activeStep.shouldContinueOnFinish) {
             [self goForward];
         }
@@ -405,20 +395,18 @@
     _activeStepTimer = nil;
 }
 
-- (void)startTimer
-{
+- (void)startTimer {
     [self resetTimer];
     
     NSTimeInterval stepDuration = self.activeStep.stepDuration;
     
     if (stepDuration > 0) {
-        
-        __weak typeof(self) weakSelf = self;
+        ORKWeakTypeOf(self) weakSelf = self;
         _activeStepTimer = [[ORKActiveStepTimer alloc] initWithDuration:stepDuration
                                                         interval:_timerUpdateInterval
                                                          runtime:0
                                                          handler:^(ORKActiveStepTimer *timer, BOOL finished) {
-                                                             typeof(self) strongSelf = weakSelf;
+                                                             ORKStrongTypeOf(self) strongSelf = weakSelf;
                                                              [strongSelf countDownTimerFired:timer finished:finished];
                                                          }];
         [_activeStepTimer resume];
@@ -426,7 +414,6 @@
 }
 
 - (void)countDownTimerFired:(ORKActiveStepTimer *)timer finished:(BOOL)finished {
-    
     if (finished) {
         [self finish];
     }
@@ -434,6 +421,7 @@
     ORKActiveStepCustomView *customView = _activeStepView.activeCustomView;
     [customView updateDisplay:self];
     
+    
     ORKVoiceEngine *voice = [ORKVoiceEngine sharedVoiceEngine];
     
     if (!finished && self.activeStep.shouldSpeakCountDown) {
@@ -447,6 +435,13 @@
             [voice speakInt:countDownValue];
         }
     }
+    
+    BOOL isHalfway = !_hasSpokenHalfwayCountdown && timer.runtime > timer.duration / 2.0;
+    if (!finished && self.activeStep.shouldSpeakRemainingTimeAtHalfway && !UIAccessibilityIsVoiceOverRunning() && isHalfway) {
+        _hasSpokenHalfwayCountdown = YES;
+        NSString *text = [NSString localizedStringWithFormat:ORKLocalizedString(@"COUNTDOWN_SPOKEN_REMAINING_%@", nil), @(countDownValue)];
+        [voice speakText:text];
+    }
 }
 
 - (BOOL)timerActive {
@@ -462,21 +457,19 @@
 
 #pragma mark - action handlers
 
-- (void)stepDidFinish
-{
+- (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;
+        ORKStrongTypeOf(self.delegate) strongDelegate = self.delegate;
         if ([strongDelegate respondsToSelector:@selector(stepViewController:recorder:didFailWithError:)]) {
             [strongDelegate stepViewController:self recorder:recorder didFailWithError:error];
         }
@@ -492,25 +485,21 @@
     }
 }
 
+static NSString *const _ORKFinishedRestoreKey = @"finished";
+static NSString *const _ORKRecorderResultsRestoreKey = @"recorderResults";
 
-static NSString * const _ORKFinishedRestoreKey = @"finished";
-static NSString * const _ORKRecorderResultsRestoreKey = @"recorderResults";
-
-- (void)encodeRestorableStateWithCoder:(NSCoder *)coder
-{
+- (void)encodeRestorableStateWithCoder:(NSCoder *)coder {
     [super encodeRestorableStateWithCoder:coder];
     
     [coder encodeBool:_finished forKey:_ORKFinishedRestoreKey];
     [coder encodeObject:_recorderResults forKey:_ORKRecorderResultsRestoreKey];
 }
 
-- (void)decodeRestorableStateWithCoder:(NSCoder *)coder
-{
+- (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

@@ -29,20 +29,20 @@
  */
 
 
-
 #import "ORKActiveStepViewController.h"
-#import "ORKActiveStepTimer.h"
+
 
 NS_ASSUME_NONNULL_BEGIN
 
+@class ORKActiveStepTimer;
 @class ORKActiveStepView;
 
 @interface ORKActiveStepViewController ()
 
-
 /**
- * The customViewContainer allows custom view to be its subview.
- * @note When ORKTouchRecorder is present, its gesture recognizer attaches to customViewContainer.
+ 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;
 
@@ -50,10 +50,8 @@ NS_ASSUME_NONNULL_BEGIN
 
 @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
@@ -61,6 +59,7 @@ NS_ASSUME_NONNULL_BEGIN
 - (void)applicationWillResignActive:(NSNotification *)notification;
 - (void)applicationDidBecomeActive:(NSNotification *)notification;
 
+- (void)stopRecorders;
 
 @end
 

ResearchKit/ActiveTasks/ORKActiveStep_Internal.h

@@ -28,18 +28,21 @@
  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <ResearchKit/ORKActiveStep.h>
+
+#import "ORKActiveStep.h"
+
+
+NS_ASSUME_NONNULL_BEGIN
 
 @interface ORKActiveStep ()
 
-/**
- * Convenience methods.
- */
+ // Convenience methods.
 - (BOOL)startsFinished;
 - (BOOL)hasCountDown;
 - (BOOL)hasTitle;
 - (BOOL)hasText;
 - (BOOL)hasVoice;
 
-
 @end
+
+NS_ASSUME_NONNULL_END

ResearchKit/ActiveTasks/ORKAudioContentView.h

@@ -28,9 +28,11 @@
  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <UIKit/UIKit.h>
+
+@import UIKit;
 #import "ORKCustomStepView_Internal.h"
 
+
 NS_ASSUME_NONNULL_BEGIN
 
 @interface ORKAudioContentView : ORKActiveStepCustomView
@@ -38,6 +40,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, copy, nullable) UIColor *keyColor;
 @property (nonatomic, copy, nullable) UIColor *alertColor;
 
+@property (nonatomic, assign) BOOL failed;
 @property (nonatomic, assign, getter=isFinished) BOOL finished;
 @property (nonatomic, assign) NSTimeInterval timeLeft;
 

ResearchKit/ActiveTasks/ORKAudioContentView.m

@@ -28,12 +28,16 @@
  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 "ORKLabel.h"
+
 #import "ORKAccessibility.h"
+#import "ORKHelpers_Internal.h"
+#import "ORKSkin.h"
+
 
 // The central blue region.
 static const CGFloat GraphViewBlueZoneHeight = 170;
@@ -53,33 +57,39 @@ static const CGFloat GraphViewRedZoneHeight = 25;
 
 @end
 
-static const CGFloat kValueLineWidth = 4.5;
-static const CGFloat kValueLineMargin = 1.5;
+
+static const CGFloat ValueLineWidth = 4.5;
+static const CGFloat ValueLineMargin = 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]];
+        [self setUpConstraints];
         
 #if TARGET_IPHONE_SIMULATOR
-        _values = @[@(0.2),@(0.6),@(0.55), @(0.1), @(0.75), @(0.7)];
+        _values = @[ @(0.2), @(0.6), @(0.55), @(0.1), @(0.75), @(0.7) ];
 #endif
     }
     return self;
 }
 
+- (void)setUpConstraints {
+    
+    NSLayoutConstraint *heightConstraint = [NSLayoutConstraint constraintWithItem:self
+                                                                        attribute:NSLayoutAttributeHeight
+                                                                        relatedBy:NSLayoutRelationEqual
+                                                                           toItem:nil
+                                                                        attribute:NSLayoutAttributeNotAnAttribute
+                                                                       multiplier:1.0
+                                                                         constant:CGFLOAT_MAX];
+    heightConstraint.priority = UILayoutPriorityFittingSizeLevel;
+    
+    [NSLayoutConstraint activateConstraints:@[heightConstraint]];
+}
+
 - (void)setValues:(NSArray *)values {
     _values = [values copy];
     [self setNeedsDisplay];
@@ -101,58 +111,58 @@ static const CGFloat kValueLineMargin = 1.5;
 }
 
 - (void)drawRect:(CGRect)rect {
-    CGRect r = self.bounds;
+    CGRect bounds = self.bounds;
     
-    CGContextRef ctx = UIGraphicsGetCurrentContext();
-    CGContextSetFillColorWithColor(ctx, [UIColor whiteColor].CGColor);
-    CGContextFillRect(ctx, r);
+    CGContextRef context = UIGraphicsGetCurrentContext();
+    CGContextSetFillColorWithColor(context, [UIColor whiteColor].CGColor);
+    CGContextFillRect(context, bounds);
     
-    CGFloat scale = [self.window.screen scale];
+    CGFloat scale = self.window.screen.scale;
     
-    CGFloat midY = CGRectGetMidY(r);
-    CGFloat maxX = CGRectGetMaxX(r);
-    CGFloat halfHeight = r.size.height/2;
-    CGContextSaveGState(ctx);
+    CGFloat midY = CGRectGetMidY(bounds);
+    CGFloat maxX = CGRectGetMaxX(bounds);
+    CGFloat halfHeight = bounds.size.height / 2;
+    CGContextSaveGState(context);
     {
         UIBezierPath *centerLine = [UIBezierPath new];
-        [centerLine moveToPoint:(CGPoint){.x=0,.y=midY}];
-        [centerLine addLineToPoint:(CGPoint){.x=maxX,.y=midY}];
+        [centerLine moveToPoint:(CGPoint){.x = 0, .y = midY}];
+        [centerLine addLineToPoint:(CGPoint){.x = maxX, .y = midY}];
         
-        CGContextSetLineWidth(ctx, 1/scale);
+        CGContextSetLineWidth(context, 1.0 / scale);
         [_keyColor setStroke];
-        CGFloat lengths[2] = {3,3};
-        CGContextSetLineDash(ctx, 0, lengths, 2);
+        CGFloat lengths[2] = {3, 3};
+        CGContextSetLineDash(context, 0, lengths, 2);
         
         [centerLine stroke];
     }
-    CGContextRestoreGState(ctx);
+    CGContextRestoreGState(context);
     
-    CGFloat lineStep = kValueLineMargin + kValueLineWidth;
+    CGFloat lineStep = ValueLineMargin + ValueLineWidth;
     
-    CGContextSaveGState(ctx);
+    CGContextSaveGState(context);
     {
-        CGFloat x = maxX - lineStep/2;
-        CGContextSetLineWidth(ctx, kValueLineWidth);
-        CGContextSetLineCap(ctx, kCGLineCapRound);
+        CGFloat x = maxX - lineStep / 2;
+        CGContextSetLineWidth(context, ValueLineWidth);
+        CGContextSetLineCap(context, kCGLineCapRound);
         
         UIBezierPath *path1 = [UIBezierPath new];
         path1.lineCapStyle = kCGLineCapRound;
-        path1.lineWidth = kValueLineWidth;
+        path1.lineWidth = ValueLineWidth;
         UIBezierPath *path2 = [path1 copy];
         
         for (NSNumber *value in [_values reverseObjectEnumerator]) {
-            CGFloat floatValue = [value doubleValue];
+            CGFloat floatValue = value.doubleValue;
             
-            UIBezierPath *p = nil;
+            UIBezierPath *path = nil;
             if (floatValue > _alertThreshold) {
-                p = path1;
+                path = path1;
                 [_alertColor setStroke];
             } else {
-                p = path2;
+                path = path2;
                 [_keyColor setStroke];
             }
-            [p moveToPoint:(CGPoint){.x=x,.y=midY-floatValue*halfHeight}];
-            [p addLineToPoint:(CGPoint){.x=x,.y=midY+floatValue*halfHeight}];
+            [path moveToPoint:(CGPoint){.x = x, .y = midY - floatValue*halfHeight}];
+            [path addLineToPoint:(CGPoint){.x = x, .y = midY + floatValue*halfHeight}];
             
             x -= lineStep;
             
@@ -169,29 +179,29 @@ static const CGFloat kValueLineMargin = 1.5;
         [path2 stroke];
         
     }
-    CGContextRestoreGState(ctx);
-    
+    CGContextRestoreGState(context);
 }
 
 @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];
+    return [UIFont fontWithDescriptor:alternativeDescriptor size:[alternativeDescriptor pointSize] + 4];
 }
 
-
 @end
 
-@interface ORKAudioContentView()
+
+@interface ORKAudioContentView ()
 
 @property (nonatomic, strong) ORKHeadlineLabel *alertLabel;
 @property (nonatomic, strong) UILabel *timerLabel;
@@ -199,9 +209,8 @@ static const CGFloat kValueLineMargin = 1.5;
 
 @end
 
-@implementation ORKAudioContentView
-{
-    NSArray *_constraints;
+
+@implementation ORKAudioContentView {
     NSMutableArray *_samples;
     UIColor *_keyColor;
 }
@@ -209,8 +218,7 @@ static const CGFloat kValueLineMargin = 1.5;
 - (instancetype)initWithFrame:(CGRect)frame {
     self = [super initWithFrame:frame];
     if (self) {
-        CGFloat margin = ORKStandardMarginForView(self);
-        self.layoutMargins = (UIEdgeInsets){.left=2*margin,.right=2*margin};
+        self.layoutMargins = ORKStandardFullScreenLayoutMarginsForView(self);
         
         self.alertLabel = [ORKHeadlineLabel new];
         _alertLabel.translatesAutoresizingMaskIntoConstraints = NO;
@@ -230,11 +238,11 @@ static const CGFloat kValueLineMargin = 1.5;
         _timerLabel.text = @"06:00";
         _alertLabel.text = ORKLocalizedString(@"AUDIO_TOO_LOUD_LABEL", nil);
         
-        self.alertThreshold = GraphViewBlueZoneHeight/(GraphViewRedZoneHeight*2+GraphViewBlueZoneHeight);
+        self.alertThreshold = GraphViewBlueZoneHeight / ((GraphViewRedZoneHeight * 2) + GraphViewBlueZoneHeight);
         
         [self updateGraphSamples];
         [self applyKeyColor];
-        [self setNeedsUpdateConstraints];
+        [self setUpConstraints];
     }
     return self;
 }
@@ -243,6 +251,12 @@ static const CGFloat kValueLineMargin = 1.5;
     [self applyKeyColor];
 }
 
+- (void)setFailed:(BOOL)failed {
+    _failed = failed;
+    _alertLabel.text = failed ? ORKLocalizedString(@"AUDIO_GENERIC_ERROR_LABEL", nil) : ORKLocalizedString(@"AUDIO_TOO_LOUD_LABEL", nil);
+    [self updateAlertLabelHidden];
+}
+
 - (void)setFinished:(BOOL)finished {
     _finished = finished;
     [self updateAlertLabelHidden];
@@ -265,41 +279,44 @@ static const CGFloat kValueLineMargin = 1.5;
 
 - (void)setAlertColor:(UIColor *)alertColor {
     _alertColor = alertColor;
-    
     _alertLabel.textColor = alertColor;
     _graphView.alertColor = alertColor;
 }
 
-- (void)updateConstraints {
-    if ([_constraints count]) {
-        [NSLayoutConstraint deactivateConstraints:_constraints];
-        _constraints = nil;
-    }
-    
+- (void)setUpConstraints {
     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 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]];
+                                                       multiplier:1.0
+                                                         constant:0.0]];
+    
+    const CGFloat sideMargin = self.layoutMargins.left + (2 * ORKStandardLeftMarginForTableViewCell(self));
+    const CGFloat innerMargin = 2;
+
     [constraints addObjectsFromArray:
-     [NSLayoutConstraint constraintsWithVisualFormat:@"H:|-[_graphView]-2-[_timerLabel]-|"
+     [NSLayoutConstraint constraintsWithVisualFormat:@"H:|-sideMargin-[_graphView]-innerMargin-[_timerLabel]-sideMargin-|"
                                              options:NSLayoutFormatAlignAllCenterY
-                                             metrics:nil views:views]];
+                                             metrics:@{@"sideMargin": @(sideMargin), @"innerMargin": @(innerMargin)}
+                                               views:views]];
     
+    [constraints addObject:[NSLayoutConstraint constraintWithItem:_graphView
+                                                        attribute:NSLayoutAttributeHeight
+                                                        relatedBy:NSLayoutRelationEqual
+                                                           toItem:nil
+                                                        attribute:NSLayoutAttributeNotAnAttribute
+                                                       multiplier:1.0
+                                                         constant:(GraphViewBlueZoneHeight + GraphViewRedZoneHeight * 2)]];
     
-    [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 {
@@ -314,20 +331,18 @@ static const CGFloat kValueLineMargin = 1.5;
 }
 
 - (void)updateTimerLabel {
-    static NSDateComponentsFormatter *_formatter = nil;
+    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;
+        NSDateComponentsFormatter *formatter = [NSDateComponentsFormatter new];
+        formatter.unitsStyle = NSDateComponentsFormatterUnitsStylePositional;
+        formatter.zeroFormattingBehavior = NSDateComponentsFormatterZeroFormattingBehaviorPad;
+        formatter.allowedUnits = NSCalendarUnitMinute | NSCalendarUnitSecond;
     });
     
-    NSString *s = [_formatter stringFromTimeInterval:MAX(round(_timeLeft),0)];
-    _timerLabel.text = s;
-    _timerLabel.hidden = (s == nil);
-    
+    NSString *string = [formatter stringFromTimeInterval:MAX(round(_timeLeft),0)];
+    _timerLabel.text = string;
+    _timerLabel.hidden = (string == nil);    
 }
 
 - (void)updateGraphSamples {
@@ -336,9 +351,13 @@ static const CGFloat kValueLineMargin = 1.5;
 }
 
 - (void)updateAlertLabelHidden {
-    NSNumber *sample = [_samples lastObject];
-    BOOL hide = _finished || !([sample doubleValue] > _alertThreshold);
-    _alertLabel.hidden = hide;
+    NSNumber *sample = _samples.lastObject;
+    BOOL show = (!_finished && (sample.doubleValue > _alertThreshold)) || _failed;
+    
+    if (_alertLabel.hidden && show) {
+        UIAccessibilityPostNotification(UIAccessibilityAnnouncementNotification, _alertLabel.text);
+    }
+    _alertLabel.hidden = !show;
 }
 
 - (void)setSamples:(NSArray *)samples {
@@ -348,13 +367,13 @@ static const CGFloat kValueLineMargin = 1.5;
 
 - (void)addSample:(NSNumber *)sample {
     NSAssert(sample != nil, @"Sample should be non-nil");
-    if (! _samples) {
+    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];
+    if (_samples.count > 500) {
+        _samples = [[_samples subarrayWithRange:(NSRange){250, _samples.count - 250}] mutableCopy];
     }
     [self updateGraphSamples];
 }
@@ -371,11 +390,9 @@ static const CGFloat kValueLineMargin = 1.5;
 }
 
 - (NSString *)accessibilityLabel {
-    if (_alertLabel.isHidden) {
-        return _timerLabel.accessibilityLabel;
-    }
-    
-    return ORKAccessibilityStringForVariables(_timerLabel.accessibilityLabel, _alertLabel.accessibilityLabel);
+    NSString *timerAxString = _timerLabel.isHidden ? nil : _timerLabel.accessibilityLabel;
+    NSString *alertAxString = _alertLabel.isHidden ? nil : _alertLabel.accessibilityLabel;
+    return ORKAccessibilityStringForVariables(ORKLocalizedString(@"AX_AUDIO_BAR_GRAPH", nil), timerAxString, alertAxString);
 }
 
 - (UIAccessibilityTraits)accessibilityTraits {

ResearchKit/ActiveTasks/ORKAudioGenerator.h

@@ -0,0 +1,110 @@
+/*
+ Copyright (c) 2015, Shazino SAS. 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 software is based on the original source by Matt Gallagher.
+ http://www.cocoawithlove.com/2010/10/ios-tone-generator-introduction-to.html
+
+ Copyright (c) 2009-2011 Matt Gallagher. All rights reserved.
+
+ This software is provided 'as-is', without any express or implied warranty. In
+ no event will the authors be held liable for any damages arising from the use
+ of this software. Permission is granted to anyone to use this software for any
+ purpose, including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not claim
+    that you wrote the original software. If you use this software in a product,
+    an acknowledgment in the product documentation would be appreciated but is
+    not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+    misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
+ */
+
+
+@import UIKit;
+@import AVFoundation;
+#import "ORKTypes.h"
+
+
+NS_ASSUME_NONNULL_BEGIN
+
+/**
+ The `ORKAudioGenerator` class represents an audio tone generator.
+ */
+ORK_CLASS_AVAILABLE
+@interface ORKAudioGenerator : NSObject
+
+/**
+ Plays a tone at a specific frequency in stereo.
+
+ The sound is a "pure" sinusoid tone.
+
+ @param frequency The audio frequency in hertz.
+ */
+- (void)playSoundAtFrequency:(double)frequency;
+
+/**
+ Plays a tone at a specific frequency on a specific channel, with a fade-in effect.
+
+ The sound is a "pure" sinusoid tone.
+ The fade-in effect is applied linearly for the peak amplitude, from a 0 to 1 factor.
+
+ @param frequency The audio frequency in hertz.
+ @param channel The audio channel (left or right).
+ @param duration The fade-in duration.
+ */
+- (void)playSoundAtFrequency:(double)frequency
+                   onChannel:(ORKAudioChannel)channel
+              fadeInDuration:(NSTimeInterval)duration;
+
+/**
+ Stops the audio being played.
+ */
+- (void)stop;
+
+/**
+ Returns the peak audio volume being currently played, in decibels (dB).
+
+ @return The current audio volume in decibels.
+ */
+- (double)volumeInDecibels;
+
+/**
+ Returns the peak audio volume amplitude being currently played (from 0 to 1).
+
+ @return The current audio volume amplitude.
+ */
+- (double)volumeAmplitude;
+
+@end
+
+NS_ASSUME_NONNULL_END

ResearchKit/ActiveTasks/ORKAudioGenerator.m

@@ -0,0 +1,283 @@
+/*
+ Copyright (c) 2015, Shazino SAS. 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 software is based on the original source by Matt Gallagher.
+ http://www.cocoawithlove.com/2010/10/ios-tone-generator-introduction-to.html
+
+ Copyright (c) 2009-2011 Matt Gallagher. All rights reserved.
+
+ This software is provided 'as-is', without any express or implied warranty. In
+ no event will the authors be held liable for any damages arising from the use
+ of this software. Permission is granted to anyone to use this software for any
+ purpose, including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not claim
+ that you wrote the original software. If you use this software in a product,
+ an acknowledgment in the product documentation would be appreciated but is
+ not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
+ */
+
+
+#import "ORKAudioGenerator.h"
+
+@import AudioToolbox;
+
+
+@interface ORKAudioGenerator () {
+  @public
+    AudioComponentInstance _toneUnit;
+    double _frequency;
+    double _theta;
+    ORKAudioChannel _activeChannel;
+    BOOL _playsStereo;
+    double _fadeInFactor;
+    NSTimeInterval _fadeInDuration;
+}
+
+- (void)setupAudioSession;
+- (void)createToneUnit;
+- (void)play;
+- (void)handleInterruption:(id)sender;
+
+@end
+
+
+const double ORKSineWaveToneGeneratorAmplitudeDefault = 0.03f;
+const double ORKSineWaveToneGeneratorSampleRateDefault = 44100.0f;
+
+OSStatus ORKAudioGeneratorRenderTone(void *inRefCon,
+                                     AudioUnitRenderActionFlags *ioActionFlags,
+                                     const AudioTimeStamp 		*inTimeStamp,
+                                     UInt32 					inBusNumber,
+                                     UInt32 					inNumberFrames,
+                                     AudioBufferList 			*ioData) {
+    // Fixed amplitude is good enough for our purposes
+    const double amplitude = ORKSineWaveToneGeneratorAmplitudeDefault;
+
+    // Get the tone parameters out of the view controller
+    ORKAudioGenerator *audioGenerator = (__bridge ORKAudioGenerator *)inRefCon;
+    double theta = audioGenerator->_theta;
+    double theta_increment = 2.0 * M_PI * audioGenerator->_frequency / ORKSineWaveToneGeneratorSampleRateDefault;
+
+    double fadeInFactor = audioGenerator->_fadeInFactor;
+
+    // This is a mono tone generator so we only need the first buffer
+    Float32 *bufferActive    = (Float32 *)ioData->mBuffers[audioGenerator->_activeChannel].mData;
+    Float32 *bufferNonActive = (Float32 *)ioData->mBuffers[1 - audioGenerator->_activeChannel].mData;
+
+    // Generate the samples
+    for (UInt32 frame = 0; frame < inNumberFrames; frame++) {
+        double bufferValue = sin(theta) * amplitude * pow(10, 2 * fadeInFactor - 2);
+        bufferActive[frame] = bufferValue;
+        if (audioGenerator->_playsStereo) {
+            bufferNonActive[frame] = bufferValue;
+        } else {
+            bufferNonActive[frame] = 0;
+        }
+
+        theta += theta_increment;
+        if (theta > 2.0 * M_PI) {
+            theta -= 2.0 * M_PI;
+        }
+
+        fadeInFactor += 1.0 / (ORKSineWaveToneGeneratorSampleRateDefault * audioGenerator->_fadeInDuration);
+        if (fadeInFactor >= 1) {
+            fadeInFactor = 1;
+        }
+    }
+
+    // Store the theta back in the view controller
+    audioGenerator->_theta = theta;
+    audioGenerator->_fadeInFactor = fadeInFactor;
+
+    return noErr;
+}
+
+
+@implementation ORKAudioGenerator
+
+- (instancetype)init {
+    self = [super init];
+    if (self) {
+        [self setupAudioSession];
+        
+        // Automatically stop and then restart audio playback when the app resigns active.
+        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(applicationDidBecomeActive:) name:UIApplicationDidBecomeActiveNotification object:nil];
+        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(applicationWillResignActive:) name:UIApplicationWillResignActiveNotification object:nil];
+    }
+    return self;
+}
+
+- (void)dealloc {
+    [self stop];
+    
+    [[NSNotificationCenter defaultCenter] removeObserver:self];
+}
+
+- (void)applicationDidBecomeActive:(NSNotification *)notification {
+    if (_toneUnit) {
+        __unused OSErr error = AudioOutputUnitStart(_toneUnit);
+        NSAssert1(error == noErr, @"Error starting unit: %hd", error);
+    }
+}
+
+- (void)applicationWillResignActive:(NSNotification *)notification {
+    if (_toneUnit) {
+        __unused OSErr error = AudioOutputUnitStop(_toneUnit);
+        NSAssert1(error == noErr, @"Error stopping unit: %hd", error);
+    }
+}
+
+- (double)volumeInDecibels {
+    return 20 * log(self.volumeAmplitude);
+}
+
+- (double)volumeAmplitude {
+    return ORKSineWaveToneGeneratorAmplitudeDefault * pow(10, 2 * _fadeInFactor - 2);
+}
+
+- (void)playSoundAtFrequency:(double)playFrequency {
+    _frequency = playFrequency;
+    _fadeInFactor = 0;
+    _fadeInDuration = 0.5;
+    _playsStereo = YES;
+
+    [self play];
+}
+
+- (void)playSoundAtFrequency:(double)playFrequency
+                   onChannel:(ORKAudioChannel)playChannel
+              fadeInDuration:(NSTimeInterval)duration {
+    _frequency = playFrequency;
+    _activeChannel = playChannel;
+    _fadeInFactor = 0;
+    _fadeInDuration = duration;
+    _playsStereo = NO;
+
+    [self play];
+}
+
+- (void)play {
+    if (!_toneUnit) {
+        [self createToneUnit];
+
+        // Stop changing parameters on the unit
+        OSErr error = AudioUnitInitialize(_toneUnit);
+        NSAssert1(error == noErr, @"Error initializing unit: %hd", error);
+
+        // Start playback
+        error = AudioOutputUnitStart(_toneUnit);
+        NSAssert1(error == noErr, @"Error starting unit: %hd", error);
+    }
+}
+
+- (void)stop {
+    if (_toneUnit) {
+        AudioOutputUnitStop(_toneUnit);
+        AudioUnitUninitialize(_toneUnit);
+        AudioComponentInstanceDispose(_toneUnit);
+        _toneUnit = nil;
+    }
+}
+
+- (void)setupAudioSession {
+    AVAudioSession *audioSession = [AVAudioSession sharedInstance];
+    BOOL ok;
+    NSError *setCategoryError = nil;
+    ok = [audioSession setCategory:AVAudioSessionCategoryPlayback error:&setCategoryError];
+    NSAssert1(ok, @"Audio error %@", setCategoryError);
+    [[NSNotificationCenter defaultCenter] addObserver:self
+                                             selector:@selector(handleInterruption:)
+                                                 name:AVAudioSessionInterruptionNotification
+                                               object:audioSession];
+}
+
+- (void)createToneUnit {
+    // Configure the search parameters to find the default playback output unit
+    // (called the kAudioUnitSubType_RemoteIO on iOS but
+    // kAudioUnitSubType_DefaultOutput on Mac OS X)
+    AudioComponentDescription defaultOutputDescription;
+    defaultOutputDescription.componentType = kAudioUnitType_Output;
+    defaultOutputDescription.componentSubType = kAudioUnitSubType_RemoteIO;
+    defaultOutputDescription.componentManufacturer = kAudioUnitManufacturer_Apple;
+    defaultOutputDescription.componentFlags = 0;
+    defaultOutputDescription.componentFlagsMask = 0;
+
+    // Get the default playback output unit
+    AudioComponent defaultOutput = AudioComponentFindNext(NULL, &defaultOutputDescription);
+    NSAssert(defaultOutput, @"Can't find default output");
+
+    // Create a new unit based on this that we'll use for output
+    OSErr error = AudioComponentInstanceNew(defaultOutput, &_toneUnit);
+    NSAssert1(_toneUnit, @"Error creating unit: %hd", error);
+
+    // Set our tone rendering function on the unit
+    AURenderCallbackStruct input;
+    input.inputProc = ORKAudioGeneratorRenderTone;
+    input.inputProcRefCon = (__bridge void *)(self);
+    error = AudioUnitSetProperty(_toneUnit,
+                               kAudioUnitProperty_SetRenderCallback,
+                               kAudioUnitScope_Input,
+                               0,
+                               &input,
+                               sizeof(input));
+    NSAssert1(error == noErr, @"Error setting callback: %hd", error);
+
+    // Set the format to 32 bit, single channel, floating point, linear PCM
+    const int four_bytes_per_float = 4;
+    const int eight_bits_per_byte = 8;
+    AudioStreamBasicDescription streamFormat;
+    streamFormat.mSampleRate = ORKSineWaveToneGeneratorSampleRateDefault;
+    streamFormat.mFormatID = kAudioFormatLinearPCM;
+    streamFormat.mFormatFlags = kAudioFormatFlagsNativeFloatPacked | kAudioFormatFlagIsNonInterleaved;
+    streamFormat.mBytesPerPacket = four_bytes_per_float;
+    streamFormat.mFramesPerPacket = 1;
+    streamFormat.mBytesPerFrame = four_bytes_per_float;
+    streamFormat.mChannelsPerFrame = 2;
+    streamFormat.mBitsPerChannel = four_bytes_per_float * eight_bits_per_byte;
+    error = AudioUnitSetProperty (_toneUnit,
+                                kAudioUnitProperty_StreamFormat,
+                                kAudioUnitScope_Input,
+                                0,
+                                &streamFormat,
+                                sizeof(AudioStreamBasicDescription));
+    NSAssert1(error == noErr, @"Error setting stream format: %hd", error);
+}
+
+- (void)handleInterruption:(id)sender {
+    [self stop];
+}
+
+@end

ResearchKit/ActiveTasks/ORKAudioLevelNavigationRule.h

@@ -0,0 +1,77 @@
+/*
+ Copyright (c) 2016, Sage Bionetworks
+ Copyright (c) 2016, Apple Inc.
+ 
+ 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/ORKStepNavigationRule.h>
+
+
+NS_ASSUME_NONNULL_BEGIN
+
+ORK_CLASS_AVAILABLE
+@interface ORKAudioLevelNavigationRule : ORKStepNavigationRule
+
+/*
+ The `init` and `new` methods are unavailable.
+ 
+ `ORKStepNavigationRule` classes should be initialized with custom designated initializers on each
+ subclass.
+ */
++ (instancetype)new NS_UNAVAILABLE;
+- (instancetype)init NS_UNAVAILABLE;
+
+/**
+ Returns an initialized direct-step navigation rule using the specified destination step identifier.
+ 
+ @param audioLevelStepIdentifier   The identifier of the step with the audio file to check.
+ @param destinationStepIdentifier  The identifier of the destination step if audio test passes.
+ @param recordingSettings          Use key AVNumberOfChannelsKey to sepcify the number of recording channels.
+ @return A audio level step navigation rule.
+ */
+- (instancetype)initWithAudioLevelStepIdentifier:(NSString *)audioLevelStepIdentifier
+                       destinationStepIdentifier:(NSString *)destinationStepIdentifier
+                               recordingSettings:(NSDictionary *)recordingSettings NS_DESIGNATED_INITIALIZER;
+
+/**
+ Returns a new direct-step navigation rule initialized from data in a given unarchiver.
+ 
+ @param aDecoder    The coder from which to initialize the step navigation rule.
+ 
+ @return A new direct-step navigation rule.
+ */
+- (instancetype)initWithCoder:(NSCoder *)aDecoder NS_DESIGNATED_INITIALIZER;
+
+@property (nonatomic, copy, readonly) NSString *audioLevelStepIdentifier;
+@property (nonatomic, copy, readonly) NSString *destinationStepIdentifier;
+@property (nonatomic, copy, readonly) NSDictionary *recordingSettings;
+
+@end
+
+NS_ASSUME_NONNULL_END

ResearchKit/ActiveTasks/ORKAudioLevelNavigationRule.m

@@ -0,0 +1,217 @@
+/*
+ Copyright (c) 2016, Sage Bionetworks
+ Copyright (c) 2016, Apple Inc.
+ 
+ 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 "ORKAudioLevelNavigationRule.h"
+
+#import "ORKResult.h"
+#import "ORKResultPredicate.h"
+#import "ORKStepNavigationRule_Internal.h"
+
+#import "ORKHelpers_Internal.h"
+
+#import <AVFoundation/AVFoundation.h>
+
+
+Float32 const VolumeThreshold = 0.45;
+UInt16  const LinearPCMBitDepth = 16;
+Float32 const MaxAmplitude = 32767.0;
+Float32 const VolumeClamp = 60.0;
+
+
+@interface ORKAudioLevelNavigationRule ()
+
+@property (nonatomic, copy, readwrite) NSString *audioLevelStepIdentifier;
+@property (nonatomic, copy, readwrite) NSString *destinationStepIdentifier;
+@property (nonatomic, copy, readwrite) NSDictionary *recordingSettings;
+
+@end
+
+
+@implementation ORKAudioLevelNavigationRule
+
++ (instancetype)new {
+    ORKThrowMethodUnavailableException();
+}
+
+- (instancetype)init {
+    ORKThrowMethodUnavailableException();
+}
+
+- (instancetype)initWithAudioLevelStepIdentifier:(NSString *)audioLevelStepIdentifier
+                       destinationStepIdentifier:(NSString *)destinationStepIdentifier
+                               recordingSettings:(NSDictionary *)recordingSettings
+{
+    ORKThrowInvalidArgumentExceptionIfNil(audioLevelStepIdentifier);
+    ORKThrowInvalidArgumentExceptionIfNil(destinationStepIdentifier);
+    ORKThrowInvalidArgumentExceptionIfNil(recordingSettings);
+    self = [super init];
+    if (self) {
+        _audioLevelStepIdentifier = [audioLevelStepIdentifier copy];
+        _destinationStepIdentifier = [destinationStepIdentifier copy];
+        _recordingSettings = [recordingSettings copy];
+    }
+    return self;
+}
+
+#pragma mark NSSecureCoding
+
++ (BOOL)supportsSecureCoding {
+    return YES;
+}
+
+- (instancetype)initWithCoder:(NSCoder *)aDecoder {
+    self = [super initWithCoder:aDecoder];
+    if (self) {
+        ORK_DECODE_OBJ_CLASS(aDecoder, audioLevelStepIdentifier, NSString);
+        ORK_DECODE_OBJ_CLASS(aDecoder, destinationStepIdentifier, NSString);
+        ORK_DECODE_OBJ_CLASS(aDecoder, recordingSettings, NSDictionary);
+    }
+    return self;
+}
+
+- (void)encodeWithCoder:(NSCoder *)aCoder {
+    [super encodeWithCoder:aCoder];
+    ORK_ENCODE_OBJ(aCoder, audioLevelStepIdentifier);
+    ORK_ENCODE_OBJ(aCoder, destinationStepIdentifier);
+    ORK_ENCODE_OBJ(aCoder, recordingSettings);
+}
+
+#pragma mark NSCopying
+
+- (instancetype)copyWithZone:(NSZone *)zone {
+    typeof(self) rule = [[[self class] allocWithZone:zone] initWithAudioLevelStepIdentifier:self.audioLevelStepIdentifier destinationStepIdentifier:self.destinationStepIdentifier recordingSettings:self.recordingSettings];
+    return rule;
+}
+
+- (BOOL)isEqual:(id)object {
+    BOOL isParentSame = [super isEqual:object];
+    __typeof(self) castObject = object;
+    return (isParentSame
+            && ORKEqualObjects(self.audioLevelStepIdentifier, castObject.audioLevelStepIdentifier)
+            && ORKEqualObjects(self.destinationStepIdentifier, castObject.destinationStepIdentifier)
+            && ORKEqualObjects(self.recordingSettings, castObject.recordingSettings));
+}
+
+- (NSUInteger)hash {
+    return _audioLevelStepIdentifier.hash ^ _destinationStepIdentifier.hash ^ _recordingSettings.hash;
+}
+
+#pragma mark - Required overrides
+
+- (NSString *)identifierForDestinationStepWithTaskResult:(ORKTaskResult *)taskResult {
+    
+    // Get the result file
+    ORKStepResult *stepResult = (ORKStepResult *)[taskResult resultForIdentifier:self.audioLevelStepIdentifier];
+    ORKFileResult *audioLevelResult = (ORKFileResult *)[stepResult.results firstObject];
+    
+    // Check the volume
+    if ((audioLevelResult.fileURL != nil) && [self checkAudioLevelFromSoundFile:audioLevelResult.fileURL]) {
+        // Returning nil will drop through to the next step (which should be the the step that has the instructions
+        // for moving to a quieter room).
+        return nil;
+    }
+    
+    return self.destinationStepIdentifier;
+}
+
+- (BOOL)checkAudioLevelFromSoundFile:(NSURL *)fileURL {
+    // Setup reader
+    AVURLAsset *urlAsset = [AVURLAsset URLAssetWithURL:fileURL options:nil];
+    if (urlAsset.tracks.count == 0) {
+        NSLog(@"No tracks found for urlAsset: %@", fileURL);
+        return NO;
+    }
+    
+    NSError *error = nil;
+    AVAssetReader *reader = [[AVAssetReader alloc] initWithAsset:urlAsset error:&error];
+    AVAssetTrack *track = [urlAsset.tracks objectAtIndex:0];
+    NSDictionary *outputSettings = @{AVFormatIDKey: @(kAudioFormatLinearPCM),
+                                     AVLinearPCMBitDepthKey: @(LinearPCMBitDepth),
+                                     AVLinearPCMIsBigEndianKey: @(NO),
+                                     AVLinearPCMIsFloatKey: @(NO),
+                                     AVLinearPCMIsNonInterleaved: @(NO)};
+    AVAssetReaderTrackOutput *output = [[AVAssetReaderTrackOutput alloc] initWithTrack:track outputSettings:outputSettings];
+    [reader addOutput:output];
+    
+    // Setup initial values - Assume 2 channels if not in recording settings
+    const UInt32 channelCount = (UInt32)[self.recordingSettings[AVNumberOfChannelsKey] unsignedIntegerValue] ? : 2;
+    const UInt32 bytesPerSample = 2 * channelCount;
+    
+    // setup criteria block - Use a high-pass filter and a rolling average of the amplitude
+    // normalized to be < 1
+    __block Float32 rollingAvg = 0;
+    __block UInt64 totalCount = 0;
+    void (^processVolume)(Float32) = ^(Float32 amplitude) {
+        if (amplitude != 0) {
+            Float32 dB = 20 * log10(ABS(amplitude) / MaxAmplitude);
+            float clampedValue = MAX(dB / VolumeClamp, -1) + 1;
+            totalCount++;
+            rollingAvg = (rollingAvg * (totalCount - 1) + clampedValue) / totalCount;
+        }
+    };
+    
+    // While there are samples to read and the number of samples above the decibel threshold
+    // is less than the total number of allowed samples over the limit, keep going
+    [reader startReading];
+    while (reader.status == AVAssetReaderStatusReading) {
+        
+        AVAssetReaderTrackOutput *trackOutput = (AVAssetReaderTrackOutput *)[reader.outputs objectAtIndex:0];
+        CMSampleBufferRef sampleBufferRef = [trackOutput copyNextSampleBuffer];
+        
+        if (sampleBufferRef) {
+            CMBlockBufferRef blockBufferRef = CMSampleBufferGetDataBuffer(sampleBufferRef);
+            size_t length = CMBlockBufferGetDataLength(blockBufferRef);
+            
+            NSMutableData *data = [NSMutableData dataWithLength:length];
+            CMBlockBufferCopyDataBytes(blockBufferRef, 0, length, data.mutableBytes);
+            
+            SInt16 *samples = (SInt16 *) data.mutableBytes;
+            UInt64 sampleCount = length / bytesPerSample;
+            for (UInt32 i = 0; i < sampleCount ; i++) {
+                Float32 left = (Float32) *samples++;
+                processVolume(left);
+                if (channelCount == 2) {
+                    Float32 right = (Float32) *samples++;
+                    processVolume(right);
+                }
+            }
+            
+            CMSampleBufferInvalidate(sampleBufferRef);
+            CFRelease(sampleBufferRef);
+        }
+    }
+    
+    return rollingAvg > VolumeThreshold;
+}
+
+
+@end

ResearchKit/ActiveTasks/ORKAudioRecorder.h

@@ -28,8 +28,11 @@
  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+
+@import UIKit;
+@import AVFoundation;
 #import <ResearchKit/ORKRecorder.h>
-#import <AVFoundation/AVFoundation.h>
+
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -58,20 +61,22 @@ ORK_CLASS_AVAILABLE
  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;
+@property (nonatomic, copy, readonly) 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.
+ @param identifier          The unique identifier of the recorder (assigned by the recorder configuration).
+ @param recorderSettings    The settings for the recording session.
+ @param step                The step that requested this recorder.
+ @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;
-
+- (instancetype)initWithIdentifier:(NSString *)identifier
+                  recorderSettings:(nullable NSDictionary *)recorderSettings
+                              step:(nullable ORKStep *)step
+                   outputDirectory:(nullable NSURL *)outputDirectory NS_DESIGNATED_INITIALIZER;
 
 /**
  Reference to the audio recorder being used.

ResearchKit/ActiveTasks/ORKAudioRecorder.m

@@ -28,11 +28,13 @@
  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"
+
+#import "ORKHelpers_Internal.h"
+
 
 @interface ORKAudioRecorder ()
 
@@ -40,43 +42,38 @@
 
 @property (nonatomic, copy) NSDictionary *recorderSettings;
 
+@property (nonatomic, copy) NSString *savedSessionCategory;
+
 @end
 
+
 @implementation ORKAudioRecorder
 
-- (void)dealloc
-{
+- (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];
++ (NSDictionary *)defaultRecorderSettings {
+    return @{AVFormatIDKey              : @(kAudioFormatMPEG4AAC),
+             AVEncoderAudioQualityKey   : @(AVAudioQualityMin),
+             AVNumberOfChannelsKey      : @(2),
+             AVSampleRateKey            : @(44100.0)};
 }
 
-- (instancetype)initWithRecorderSettings:(NSDictionary *)recorderSettings
-                                    step:(ORKStep *)step
-                         outputDirectory:(NSURL *)outputDirectory
-{
-    self = [super initWithStep:step outputDirectory:outputDirectory];
+- (instancetype)initWithIdentifier:(NSString *)identifier
+                  recorderSettings:(NSDictionary *)recorderSettings
+                              step:(ORKStep *)step
+                   outputDirectory:(NSURL *)outputDirectory {
+    self = [super initWithIdentifier:identifier step:step outputDirectory:outputDirectory];
     if (self) {
         
         self.continuesInBackground = YES;
-        if (! recorderSettings)
-        {
+        if (!recorderSettings) {
             recorderSettings = [[self class] defaultRecorderSettings];
         }
-        if (! [recorderSettings isKindOfClass:[NSDictionary class]])
-        {
+        if (![recorderSettings isKindOfClass:[NSDictionary class]]) {
             @throw [NSException exceptionWithName:NSInvalidArgumentException reason:@"recorderSettings should be a dictionary" userInfo:recorderSettings];
         }
         self.recorderSettings = recorderSettings;
@@ -84,47 +81,57 @@
     return self;
 }
 
+- (void)restoreSavedAudioSessionCategory {
+    if (_savedSessionCategory) {
+        NSError *error;
+        if (![[AVAudioSession sharedInstance] setCategory:_savedSessionCategory error:&error]) {
+            ORK_Log_Error(@"Failed to restore the audio session category: %@", [error localizedDescription]);
+        }
+        _savedSessionCategory = nil;
+    }
+}
+
 - (void)start {
-    
+    if (self.outputDirectory == nil) {
+        @throw [NSException exceptionWithName:NSDestinationInvalidException reason:@"audioRecorder requires an output directory" userInfo:nil];
+    }
     // Only create the file when we should actually start recording.
-    if (! _audioRecorder) {
+    if (!_audioRecorder) {
         
         NSError *error = nil;
         NSURL *soundFileURL = [self recordingFileURL];
-        if (! [self recreateFileWithError:&error]) {
+        if (![self recreateFileWithError:&error]) {
             [self finishRecordingWithError:error];
             return;
         }
         
         
         AVAudioSession *audioSession = [AVAudioSession sharedInstance];
-        if (! [audioSession setCategory:AVAudioSessionCategoryPlayAndRecord error:&error]) {
+        _savedSessionCategory = audioSession.category;
+        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) {
+        if (!_audioRecorder) {
             [self finishRecordingWithError:error];
             return;
         }
         
-#if ! TARGET_IPHONE_SIMULATOR
-        if (!_audioRecorder.recording)
-        {
+#if !TARGET_IPHONE_SIMULATOR
+        if (!_audioRecorder.recording) {
             [_audioRecorder prepareToRecord];
         }
 #endif
     }
     
-#if ! TARGET_IPHONE_SIMULATOR
-    if (!_audioRecorder.recording)
-    {
+#if !TARGET_IPHONE_SIMULATOR
+    if (!_audioRecorder.recording) {
         [_audioRecorder prepareToRecord];
         [_audioRecorder record];
     }
@@ -134,16 +141,15 @@
 }
 
 - (void)stop {
-    if (! _audioRecorder) {
+    if (!_audioRecorder) {
         // Error has already been returned.
-        
         return;
     }
     
     [self doStopRecording];
     
     NSURL *fileUrl = [self recordingFileURL];
-    if (! [[NSFileManager defaultManager] fileExistsAtPath:[[self recordingFileURL] path]]) {
+    if (![[NSFileManager defaultManager] fileExistsAtPath:[[self recordingFileURL] path]]) {
         fileUrl = nil;
     }
     
@@ -158,131 +164,119 @@
 
 - (NSString *)mimeType {
     NSDictionary *recorderSettings = [self recorderSettings];
-    unsigned int recorderFormat = [recorderSettings[AVFormatIDKey] unsignedIntValue];
+    unsigned int recorderFormat = ((NSNumber *)recorderSettings[AVFormatIDKey]).unsignedIntValue;
     
     NSString *contentType = @"audio";
-    switch (recorderFormat)
-    {
-        case kAudioFormatLinearPCM:
-        {
-            int numBits = [recorderSettings[AVLinearPCMBitDepthKey] intValue] ? : 16;
+    switch (recorderFormat) {
+        case kAudioFormatLinearPCM: {
+            int numBits = ((NSNumber *)recorderSettings[AVLinearPCMBitDepthKey]).intValue ? : 16;
             contentType = [NSString stringWithFormat:@"audio/L%d", numBits];
             break;
         }
-        case kAudioFormatAC3:
+        case kAudioFormatAC3: {
             contentType = @"audio/ac3";
             break;
+        }
         case kAudioFormatMPEG4AAC:
         case kAudioFormatMPEG4CELP:
         case kAudioFormatMPEG4HVXC:
         case kAudioFormatMPEG4TwinVQ:
-        case kAudioFormatAppleLossless:
+        case kAudioFormatAppleLossless: {
             contentType = @"audio/m4a";
             break;
-        case kAudioFormatULaw:
+        }
+        case kAudioFormatULaw: {
             contentType = @"audio/basic";
             break;
+        }
     }
-    
     return contentType;
-    
 }
 
-
-- (NSString *)recorderType
-{
+- (NSString *)recorderType {
     return @"audio";
 }
 
-- (void)doStopRecording
-{
+- (void)doStopRecording {
     if (self.isRecording) {
-#if ! TARGET_IPHONE_SIMULATOR
+#if !TARGET_IPHONE_SIMULATOR
         [_audioRecorder stop];
         
         [self applyFileProtection:ORKFileProtectionComplete toFileAtURL:[self recordingFileURL]];
 #endif
+        [self restoreSavedAudioSessionCategory];
     }
 }
 
-- (void)finishRecordingWithError:(NSError *)error
-{
+- (void)finishRecordingWithError:(NSError *)error {
     [self doStopRecording];
-    
+
     [super finishRecordingWithError:error];
 }
 
-- (NSString *)extension
-{
+- (NSString *)extension {
     NSDictionary *recorderSettings = [self recorderSettings];
-    unsigned int recorderFormat = [recorderSettings[AVFormatIDKey] unsignedIntValue];
+    unsigned int recorderFormat = ((NSNumber *)recorderSettings[AVFormatIDKey]).unsignedIntValue;
     
     NSString *extension = @"au";
-    switch (recorderFormat)
-    {
+    switch (recorderFormat) {
         case kAudioFormatLinearPCM:
         {
             extension = @"pcm";
             break;
         }
-        case kAudioFormatAC3:
+        case kAudioFormatAC3: {
             extension = @"ac3";
             break;
+        }
         case kAudioFormatMPEG4AAC:
         case kAudioFormatMPEG4CELP:
         case kAudioFormatMPEG4HVXC:
         case kAudioFormatMPEG4TwinVQ:
-        case kAudioFormatAppleLossless:
+        case kAudioFormatAppleLossless: {
             extension = @"m4a";
             break;
+        }
     }
     return extension;
 }
 
-- (NSURL *)recordingFileURL
-{
+- (NSURL *)recordingFileURL {
     return [[self recordingDirectoryURL] URLByAppendingPathComponent:[NSString stringWithFormat:@"%@.%@", [self logName], [self extension]]];
 }
 
-
-- (BOOL)recreateFileWithError:(NSError * __autoreleasing *)error
-{
+- (BOOL)recreateFileWithError:(NSError **)error {
     NSURL *url = [self recordingFileURL];
-    if (! url) {
+    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];
+    NSFileManager *fileManager = [NSFileManager defaultManager];
     
-    if (! [fm createDirectoryAtURL:url withIntermediateDirectories:YES attributes:nil error:error]) {
+    if (![fileManager createDirectoryAtURL:url withIntermediateDirectories:YES attributes:nil error:error]) {
         return NO;
     }
     
-    if ([fm fileExistsAtPath:[url path]]) {
-        if (! [fm removeItemAtPath:[url path] error:error]) {
+    if ([fileManager fileExistsAtPath:[url path]]) {
+        if (![fileManager 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];
+    [fileManager createFileAtPath:[url path] contents:nil attributes:nil];
+    [fileManager setAttributes:@{NSFileProtectionKey: ORKFileProtectionFromMode(ORKFileProtectionCompleteUnlessOpen)} ofItemAtPath:[url path] error:error];
     return YES;
 }
 
-
 - (void)reset {
     [_audioRecorder stop];
     _audioRecorder = nil;
     [super reset];
 }
 
-
-@end
-
-@interface ORKAudioRecorderConfiguration ()
 @end
 
 
@@ -290,13 +284,15 @@
 
 #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]])
-        {
+- (instancetype)initWithIdentifier:(NSString *)identifier {
+    @throw [NSException exceptionWithName:NSGenericException reason:@"Use subclass designated initializer" userInfo:nil];
+}
+
+- (instancetype)initWithIdentifier:(NSString *)identifier
+                  recorderSettings:(NSDictionary *)recorderSettings {
+    self = [super initWithIdentifier:identifier];
+    if (self) {
+        if (recorderSettings && ![recorderSettings isKindOfClass:[NSDictionary class]]) {
             @throw [NSException exceptionWithName:NSInvalidArgumentException reason:@"recorderSettings should be a dictionary" userInfo:recorderSettings];
         }
         _recorderSettings = recorderSettings;
@@ -306,31 +302,27 @@
 #pragma clang diagnostic pop
 
 - (ORKRecorder *)recorderForStep:(ORKStep *)step
-                outputDirectory:(NSURL *)outputDirectory
-{
-    return [[ORKAudioRecorder alloc] initWithRecorderSettings:(NSDictionary *__nonnull)self.recorderSettings
-                                                        step:step
-                                             outputDirectory:outputDirectory];
+                 outputDirectory:(NSURL *)outputDirectory {
+    return [[ORKAudioRecorder alloc] initWithIdentifier:self.identifier
+                                       recorderSettings:self.recorderSettings
+                                                   step:step
+                                        outputDirectory:outputDirectory];
 }
 
-- (instancetype)initWithCoder:(NSCoder *)aDecoder
-{
+- (instancetype)initWithCoder:(NSCoder *)aDecoder {
     self = [super initWithCoder:aDecoder];
-    if (self)
-    {
+    if (self) {
         ORK_DECODE_OBJ_CLASS(aDecoder, recorderSettings, NSDictionary);
     }
     return self;
 }
 
-- (void)encodeWithCoder:(NSCoder *)aCoder
-{
+- (void)encodeWithCoder:(NSCoder *)aCoder {
     [super encodeWithCoder:aCoder];
     ORK_ENCODE_OBJ(aCoder, recorderSettings);
 }
 
-+ (BOOL)supportsSecureCoding
-{
++ (BOOL)supportsSecureCoding {
     return YES;
 }
 
@@ -339,12 +331,11 @@
     
     __typeof(self) castObject = object;
     return (isParentSame &&
-            ORKEqualObjects(self.recorderSettings, castObject.recorderSettings)) ;
+            ORKEqualObjects(self.recorderSettings, castObject.recorderSettings));
 }
 
-
 - (ORKPermissionMask)requestedPermissionMask {
     return ORKPermissionAudioRecording;
 }
 
-@end
+@end

ResearchKit/ActiveTasks/ORKAudioStep.h

@@ -28,15 +28,16 @@
  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+
+@import Foundation;
 #import <ResearchKit/ORKActiveStep.h>
 
+
 NS_ASSUME_NONNULL_BEGIN
 
 ORK_CLASS_AVAILABLE
 @interface ORKAudioStep : ORKActiveStep
 
-@property (nonatomic, assign) NSTimeInterval duration;
-
 @end
 
-NS_ASSUME_NONNULL_END
+NS_ASSUME_NONNULL_END

ResearchKit/ActiveTasks/ORKAudioStep.m

@@ -28,69 +28,43 @@
  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"
 
+#import "ORKHelpers_Internal.h"
+
+
 @implementation ORKAudioStep
 
 + (Class)stepViewControllerClass {
     return [ORKAudioStepViewController class];
 }
 
+- (instancetype)initWithIdentifier:(NSString *)identifier {
+    self = [super initWithIdentifier:identifier];
+    if (self) {
+        self.shouldShowDefaultTimer = NO;
+        self.shouldStartTimerAutomatically = YES;
+    }
+    return self;
+}
+
 - (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];
+    if ( self.stepDuration < ORKAudioTaskMinimumDuration) {
+        @throw [NSException exceptionWithName:NSInvalidArgumentException reason:[NSString stringWithFormat:@"duration cannot 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

@@ -28,13 +28,19 @@
  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <ResearchKit/ResearchKit_Private.h>
+
+@import Foundation;
+#import <ResearchKit/ORKDefines.h>
+#import <ResearchKit/ORKActiveStepViewController.h>
+
 
 NS_ASSUME_NONNULL_BEGIN
 
 ORK_CLASS_AVAILABLE
 @interface ORKAudioStepViewController : ORKActiveStepViewController
 
+@property (nonatomic, assign) CGFloat alertThreshold;
+
 @end
 
-NS_ASSUME_NONNULL_END
+NS_ASSUME_NONNULL_END

ResearchKit/ActiveTasks/ORKAudioStepViewController.m

@@ -28,18 +28,25 @@
  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 "ORKAudioContentView.h"
 #import "ORKCustomStepView_Internal.h"
+#import "ORKVerticalContainerView.h"
+
+#import "ORKActiveStepViewController_Internal.h"
+#import "ORKAudioRecorder.h"
+
+#import "ORKAudioStep.h"
+#import "ORKStep_Private.h"
+
+#import "ORKHelpers_Internal.h"
+
+@import AVFoundation;
+
 
 @interface ORKAudioStepViewController ()
 
@@ -47,16 +54,15 @@
 
 @end
 
-@implementation ORKAudioStepViewController
-{
+
+@implementation ORKAudioStepViewController {
     ORKAudioContentView *_audioContentView;
     ORKAudioRecorder *_audioRecorder;
-    
     ORKActiveStepTimer *_timer;
+    NSError *_audioRecorderError;
 }
 
 - (instancetype)initWithStep:(ORKStep *)step {
-    
     self = [super initWithStep:step];
     if (self) {
         // Continue audio recording in the background
@@ -65,19 +71,24 @@
     return self;
 }
 
+- (void)setAlertThreshold:(CGFloat)alertThreshold {
+    _alertThreshold = alertThreshold;
+    if (self.isViewLoaded && alertThreshold > 0) {
+        _audioContentView.alertThreshold = alertThreshold;
+    }
+}
+
 - (void)viewDidLoad {
     [super viewDidLoad];
     // Do any additional setup after loading the view.
-    
     _audioContentView = [ORKAudioContentView new];
-    _audioContentView.timeLeft = self.audioStep.duration;
-    self.activeStepView.activeCustomView = _audioContentView;
-}
+    _audioContentView.timeLeft = self.audioStep.stepDuration;
 
-- (void)viewDidAppear:(BOOL)animated {
-    [super viewDidAppear:animated];
-    
-    [self start];
+    if (self.alertThreshold > 0) {
+        _audioContentView.alertThreshold = self.alertThreshold;
+    }
+
+    self.activeStepView.activeCustomView = _audioContentView;
 }
 
 - (void)audioRecorderDidChange {
@@ -93,7 +104,6 @@
             break;
         }
     }
-    
     _audioRecorder = audioRecorder;
     [self audioRecorderDidChange];
 }
@@ -103,26 +113,26 @@
 }
 
 - (void)doSample {
+    if (_audioRecorderError) {
+        return;
+    }
     [_avAudioRecorder updateMeters];
     float value = [_avAudioRecorder averagePowerForChannel:0];
-    
     // Assume value is in range roughly -60dB to 0dB
-    float clampedValue = MAX(value/60.0, -1) + 1;
-    
+    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;
+    if (!_timer) {
+        NSTimeInterval duration = self.audioStep.stepDuration;
+        ORKWeakTypeOf(self) weakSelf = self;
+        _timer = [[ORKActiveStepTimer alloc] initWithDuration:duration interval:duration / 100 runtime:0 handler:^(ORKActiveStepTimer *timer, BOOL finished) {
+            ORKStrongTypeOf(self) strongSelf = weakSelf;
             [strongSelf doSample];
             if (finished) {
-                [self finish];
+                [strongSelf finish];
             }
         }];
         [_timer resume];
@@ -130,16 +140,15 @@
     _audioContentView.finished = NO;
 }
 
-
 - (void)start {
     [super start];
     [self audioRecorderDidChange];
-    
     [_timer reset];
     _timer = nil;
     [self startNewTimerIfNeeded];
     
 }
+
 - (void)suspend {
     [super suspend];
     [_timer pause];
@@ -147,13 +156,18 @@
         [_audioContentView addSample:@(0)];
     }
 }
+
 - (void)resume {
     [super resume];
     [self audioRecorderDidChange];
     [self startNewTimerIfNeeded];
     [_timer resume];
 }
+
 - (void)finish {
+    if (_audioRecorderError) {
+        return;
+    }
     [super finish];
     [_timer reset];
     _timer = nil;
@@ -166,7 +180,12 @@
 - (void)setAvAudioRecorder:(AVAudioRecorder *)recorder {
     _avAudioRecorder = nil;
     _avAudioRecorder = recorder;
-    
+}
+
+- (void)recorder:(ORKRecorder *)recorder didFailWithError:(NSError *)error {
+    [super recorder:recorder didFailWithError:error];
+    _audioRecorderError = error;
+    _audioContentView.failed = YES;
 }
 
 @end

ResearchKit/ActiveTasks/ORKCountdownStep.h

@@ -28,9 +28,14 @@
  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <ResearchKit/ResearchKit.h>
+
+@import Foundation;
+#import <ResearchKit/ORKDefines.h>
 #import <ResearchKit/ORKActiveStep.h>
 
+
+NS_ASSUME_NONNULL_BEGIN
+
 /**
  The `ORKCountdownStep` class represents a step that displays a label and a
  countdown for a time equal to its duration.
@@ -44,3 +49,5 @@ ORK_CLASS_AVAILABLE
 @interface ORKCountdownStep : ORKActiveStep
 
 @end
+
+NS_ASSUME_NONNULL_END

ResearchKit/ActiveTasks/ORKCountdownStep.m

@@ -28,18 +28,19 @@
  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+
 #import "ORKCountdownStep.h"
+
 #import "ORKCountdownStepViewController.h"
 
+
 @implementation ORKCountdownStep
 
-+ (Class)stepViewControllerClass
-{
++ (Class)stepViewControllerClass {
     return [ORKCountdownStepViewController class];
 }
 
-- (instancetype)initWithIdentifier:(NSString *)identifier
-{
+- (instancetype)initWithIdentifier:(NSString *)identifier {
     self = [super initWithIdentifier:identifier];
     if (self) {
         self.shouldStartTimerAutomatically = YES;
@@ -56,9 +57,8 @@
     
     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];
+    if ( self.stepDuration < ORKCountdownStepMinimumDuration) {
+        @throw [NSException exceptionWithName:NSInvalidArgumentException reason:[NSString stringWithFormat:@"duration cannot be shorter than %@ seconds.", @(ORKCountdownStepMinimumDuration)]  userInfo:nil];
     }
     
 }

ResearchKit/ActiveTasks/ORKCountdownStepViewController.h

@@ -28,7 +28,13 @@
  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <ResearchKit/ResearchKit_Private.h>
+
+@import Foundation;
+#import <ResearchKit/ORKDefines.h>
+#import <ResearchKit/ORKActiveStepViewController.h>
+
+
+NS_ASSUME_NONNULL_BEGIN
 
 /**
  The `ORKCountdownStepViewController` class represents the step view controller that corresponds to an `ORKCountdownStep`.
@@ -41,3 +47,5 @@ ORK_CLASS_AVAILABLE
 @interface ORKCountdownStepViewController : ORKActiveStepViewController
 
 @end
+
+NS_ASSUME_NONNULL_END

ResearchKit/ActiveTasks/ORKCountdownStepViewController.m

@@ -28,29 +28,38 @@
  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 "ORKActiveStepView.h"
+#import "ORKCustomStepView_Internal.h"
 #import "ORKLabel.h"
 #import "ORKSubheadlineLabel.h"
-#import "ORKHelpers.h"
+#import "ORKVerticalContainerView.h"
+
+#import "ORKActiveStepViewController_Internal.h"
+#import "ORKStepViewController_Internal.h"
+
+#import "ORKActiveStep.h"
+#import "ORKResult.h"
+
 #import "ORKAccessibility.h"
-#import "ORKActiveStepView.h"
+#import "ORKHelpers_Internal.h"
+
 
 @interface ORKCountDownViewLabel : ORKLabel
 
 @end
 
+
 @implementation ORKCountDownViewLabel
 + (UIFont *)defaultFont {
     return ORKThinFontWithSize(56);
 }
 @end
 
+
 @interface ORKCountdownView : ORKActiveStepCustomView
 
 @property (nonatomic, strong) ORKSubheadlineLabel *textLabel;
@@ -61,15 +70,17 @@
 
 @end
 
+
 @implementation ORKCountdownView {
     CAShapeLayer *_circleLayer;
 }
 
-- (instancetype)init
-{
+static const CGFloat ProgressIndicatorDiameter = 104.0;
+static const CGFloat ProgressIndicatorOuterMargin = 1.0;
+
+- (instancetype)init {
     self = [super init];
     if (self) {
-        
         _textLabel = [ORKSubheadlineLabel new];
         _textLabel.textAlignment = NSTextAlignmentCenter;
         _textLabel.translatesAutoresizingMaskIntoConstraints = NO;
@@ -86,46 +97,11 @@
         [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]];
+        [self setUpConstraints];
         
         _circleLayer = [CAShapeLayer layer];
-        static const CGFloat ProgressIndicatorRadius = ProgressIndicatorDiameter/2;
-        _circleLayer.path = [[UIBezierPath bezierPathWithArcCenter:CGPointMake(ProgressIndicatorRadius+ProgressIndicatorOuterMargin, ProgressIndicatorRadius+ProgressIndicatorOuterMargin)
+        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
@@ -134,31 +110,79 @@
         _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)setUpConstraints {
+    NSMutableArray *constraints = [NSMutableArray new];
+    
+    NSDictionary *metrics = @{@"d": @(ProgressIndicatorDiameter + 2 * ProgressIndicatorOuterMargin)};
+    NSDictionary *views = NSDictionaryOfVariableBindings(_textLabel, _timeLabel, _progressView);
+    
+    [constraints addObjectsFromArray:[NSLayoutConstraint constraintsWithVisualFormat:@"V:|[_textLabel]-(>=0)-[_progressView(==d)]|"
+                                                                             options:NSLayoutFormatDirectionLeadingToTrailing | NSLayoutFormatAlignAllCenterX
+                                                                             metrics:metrics
+                                                                               views:views]];
+    [constraints addObjectsFromArray:[NSLayoutConstraint constraintsWithVisualFormat:@"H:|-(>=0)-[_textLabel]-(>=0)-|"
+                                                                             options:NSLayoutFormatDirectionLeadingToTrailing
+                                                                             metrics:metrics
+                                                                               views:views]];
+    [constraints addObjectsFromArray:[NSLayoutConstraint constraintsWithVisualFormat:@"H:|-(>=0)-[_progressView(==d)]-(>=0)-|"
+                                                                             options:NSLayoutFormatDirectionLeadingToTrailing
+                                                                             metrics:metrics
+                                                                               views:views]];
+    [constraints addObject:[NSLayoutConstraint constraintWithItem:_progressView
+                                                        attribute:NSLayoutAttributeCenterX
+                                                        relatedBy:NSLayoutRelationEqual
+                                                           toItem:self
+                                                        attribute:NSLayoutAttributeCenterX
+                                                       multiplier:1.0
+                                                         constant:0.0]];
+    [constraints addObject:[NSLayoutConstraint constraintWithItem:_timeLabel
+                                                        attribute:NSLayoutAttributeCenterX
+                                                        relatedBy:NSLayoutRelationEqual
+                                                           toItem:_progressView
+                                                        attribute:NSLayoutAttributeCenterX
+                                                       multiplier:1.0
+                                                         constant:0.0]];
+    
+    // Constant required in order to give appearance of vertical centering (compensating for leading on font)
+    [constraints addObject:[NSLayoutConstraint constraintWithItem:_timeLabel
+                                                        attribute:NSLayoutAttributeCenterY
+                                                        relatedBy:NSLayoutRelationEqual
+                                                           toItem:_progressView
+                                                        attribute:NSLayoutAttributeCenterY
+                                                       multiplier:1.0
+                                                         constant:-3.0]];
+    [constraints addObject:[NSLayoutConstraint constraintWithItem:_progressView
+                                                        attribute:NSLayoutAttributeTop
+                                                        relatedBy:NSLayoutRelationEqual
+                                                           toItem:_textLabel
+                                                        attribute:NSLayoutAttributeLastBaseline
+                                                       multiplier:1.0
+                                                         constant:16.0 - ProgressIndicatorOuterMargin]];
+
+    [NSLayoutConstraint activateConstraints:constraints];
+}
+
 - (void)tintColorDidChange {
     _circleLayer.strokeColor = self.tintColor.CGColor;
 }
 
 - (void)startAnimateWithDuration:(NSTimeInterval)duration {
-    
     CAKeyframeAnimation *animation = [CAKeyframeAnimation animationWithKeyPath:@"strokeEnd"];
-    animation.duration = duration*2;
+    animation.duration = duration * 2;
     animation.removedOnCompletion = YES;
-    animation.values = @[@(1.0), @(0.0), @(0.0)];
-    animation.keyTimes =  @[@(0.0), @(0.5), @(1.0)];
+    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
@@ -184,12 +208,12 @@
 
 @end
 
+
 @implementation ORKCountdownStepViewController {
     NSInteger _countDown;
 }
 
 - (instancetype)initWithStep:(ORKStep *)step {
-    
     self = [super initWithStep:step];
     if (self) {
         self.suspendIfInactive = NO;
@@ -217,17 +241,16 @@
 - (void)viewDidAppear:(BOOL)animated {
     [super viewDidAppear:animated];
     
-    UIAccessibilityPostNotification(UIAccessibilityAnnouncementNotification, [@(_countDown) stringValue]);
+    UIAccessibilityPostNotification(UIAccessibilityAnnouncementNotification, @(_countDown).stringValue);
     [_countdownView startAnimateWithDuration:[(ORKActiveStep *)self.step stepDuration]];
 }
 
 - (void)updateCountdownLabel {
-    _countdownView.timeLabel.text = [NSString stringWithFormat:@"%lu", (unsigned long)_countDown];
+    _countdownView.timeLabel.text = ORKLocalizedStringFromNumber(@(_countDown));
 }
 
 - (void)countDownTimerFired:(ORKActiveStepTimer *)timer finished:(BOOL)finished {
-
-    _countDown = MAX((_countDown-1), 0);
+    _countDown = MAX((_countDown - 1), 0);
     [self updateCountdownLabel];
     
     if (UIAccessibilityIsVoiceOverRunning()) {
@@ -240,17 +263,13 @@
                                                               [super countDownTimerFired:timer finished:finished];
                                                           }];
             UIAccessibilityPostNotification(UIAccessibilityAnnouncementNotification, ORKLocalizedString(@"AX_ANNOUNCE_BEGIN_TASK", nil));
-        }
-        else {
-            UIAccessibilityPostNotification(UIAccessibilityAnnouncementNotification, [@(_countDown) stringValue]);
+        } else {
+            UIAccessibilityPostNotification(UIAccessibilityAnnouncementNotification, @(_countDown).stringValue);
             [super countDownTimerFired:timer finished:finished];
         }
-    }
-    else
-    {
+    } else {
         [super countDownTimerFired:timer finished:finished];
     }
 }
 
-
 @end

ResearchKit/ActiveTasks/ORKDataLogger.h

@@ -29,8 +29,9 @@
  */
 
 
-#import <Foundation/Foundation.h>
-#import <ResearchKit/ORKDefines.h>
+@import Foundation;
+#import <ResearchKit/ORKTypes.h>
+
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -64,6 +65,18 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 
+@protocol ORKDataLoggerExtendedDelegate <ORKDataLoggerDelegate>
+
+@optional
+/**
+ Tells the delegate that the maximum current log file lifetime changed.
+ @param dataLogger  Source of this event.
+ */
+- (void)dataLoggerThresholdsDidChange:(ORKDataLogger *)dataLogger;
+
+@end
+
+
 @class ORKLogFormatter;
 
 /**
@@ -94,13 +107,14 @@ ORK_CLASS_AVAILABLE
 /**
  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`.
+ @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;
 
++ (instancetype)new NS_UNAVAILABLE;
+- (instancetype)init NS_UNAVAILABLE;
 
 /**
  Returns an initialized data logger using the specified URL, log name, formatter, and delegate.
@@ -110,6 +124,7 @@ ORK_CLASS_AVAILABLE
  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;
@@ -160,10 +175,11 @@ ORK_CLASS_AVAILABLE
  than through this object.
  
  @param block   The block to call during enumeration.
- @param error   Any error detected during the 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;
+- (BOOL)enumerateLogs:(void (^)(NSURL *logFileUrl, BOOL *stop))block error:(NSError * _Nullable *)error;
 
 /**
  Enumerates the URLs of completed log files not yet marked uploaded,
@@ -174,10 +190,11 @@ ORK_CLASS_AVAILABLE
  than through this object.
  
  @param block   The block to call during enumeration.
- @param error   Any error detected during the 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;
+- (BOOL)enumerateLogsNeedingUpload:(void (^)(NSURL *logFileUrl, BOOL *stop))block error:(NSError * _Nullable *)error;
 
 /**
  Enumerates the URLs of completed log files not already marked uploaded,
@@ -188,10 +205,11 @@ ORK_CLASS_AVAILABLE
  than through this object.
  
  @param block   The block to call during enumeration.
- @param error   Any error detected during the 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;
+- (BOOL)enumerateLogsAlreadyUploaded:(void (^)(NSURL *logFileUrl, BOOL *stop))block error:(NSError * _Nullable *)error;
 
 /**
  Appends an object to the log file, which is formatted with `logFormatter`.
@@ -202,11 +220,12 @@ ORK_CLASS_AVAILABLE
  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.
+ @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;
+- (BOOL)append:(id)object error:(NSError * _Nullable *)error;
 
 /**
  Appends multiple objects to the log file.
@@ -214,16 +233,18 @@ ORK_CLASS_AVAILABLE
  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.
+ @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;
+- (BOOL)appendObjects:(NSArray *)objects error:(NSError * _Nullable *)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`.
  */
@@ -240,9 +261,10 @@ ORK_CLASS_AVAILABLE
  @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;
+- (BOOL)markFileUploaded:(BOOL)uploaded atURL:(NSURL *)url error:(NSError * _Nullable *)error;
 
 /**
  Removes files if they are marked uploaded.
@@ -253,21 +275,23 @@ ORK_CLASS_AVAILABLE
  
  @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;
+- (BOOL)removeUploadedFiles:(NSArray<NSURL *> *)fileURLs withError:(NSError * _Nullable *)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;
-
+- (BOOL)removeAllFilesWithError:(NSError * _Nullable *)error;
 
 @end
 
+
 /**
  The `ORKLogFormatter` class represents the base (default) log formatter, which appends data
  blindly to a log file.
@@ -285,6 +309,7 @@ ORK_CLASS_AVAILABLE
  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;
@@ -293,6 +318,7 @@ ORK_CLASS_AVAILABLE
  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;
@@ -304,9 +330,10 @@ ORK_CLASS_AVAILABLE
  
  @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;
+- (BOOL)beginLogWithFileHandle:(NSFileHandle *)fileHandle error:(NSError * _Nullable *)error;
 
 /**
  Appends the specified object to the log file.
@@ -314,9 +341,10 @@ ORK_CLASS_AVAILABLE
  @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;
+- (BOOL)appendObject:(id)object fileHandle:(NSFileHandle *)fileHandle error:(NSError * _Nullable *)error;
 
 /**
  Appends the specified objects to the log file.
@@ -324,12 +352,14 @@ ORK_CLASS_AVAILABLE
  @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;
+- (BOOL)appendObjects:(NSArray *)objects fileHandle:(NSFileHandle *)fileHandle error:(NSError * _Nullable *)error;
 
 @end
 
+
 /**
  The `ORKJSONLogFormatter` class represents a log formatter for producing JSON output.
  
@@ -352,7 +382,6 @@ ORK_CLASS_AVAILABLE
  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>
 
@@ -377,6 +406,7 @@ ORK_CLASS_AVAILABLE
 
 @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
@@ -408,6 +438,9 @@ ORK_CLASS_AVAILABLE
 ORK_CLASS_AVAILABLE
 @interface ORKDataLoggerManager : NSObject <ORKDataLoggerDelegate>
 
++ (instancetype)new NS_UNAVAILABLE;
+- (instancetype)init NS_UNAVAILABLE;
+
 /**
  Returns an initialized data logger manager using the specified directory and delegate.
  
@@ -415,6 +448,7 @@ ORK_CLASS_AVAILABLE
  
  @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;
@@ -440,6 +474,7 @@ ORK_CLASS_AVAILABLE
  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;
@@ -449,6 +484,7 @@ ORK_CLASS_AVAILABLE
  
  @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.
  */
@@ -458,6 +494,7 @@ ORK_CLASS_AVAILABLE
  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;
@@ -470,7 +507,7 @@ ORK_CLASS_AVAILABLE
 - (void)removeDataLogger:(ORKDataLogger *)logger;
 
 /// Returns the set of log names of the data loggers managed by this object.
-- (NSArray *)logNames;
+- (NSArray<NSString *> *)logNames;
 
 /**
  Enumerates all the logs that need upload across all data loggers, sorted from oldest to first.
@@ -479,9 +516,10 @@ ORK_CLASS_AVAILABLE
  
  @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;
+- (BOOL)enumerateLogsNeedingUpload:(void (^)(ORKDataLogger *dataLogger, NSURL *logFileUrl, BOOL *stop))block error:(NSError * _Nullable *)error;
 
 /**
  Unmarks the set of uploaded files.
@@ -489,11 +527,12 @@ ORK_CLASS_AVAILABLE
  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 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;
+- (BOOL)unmarkUploadedFiles:(NSArray<NSURL *> *)fileURLs error:(NSError * _Nullable *)error;
 
 /**
  Removes a set of uploaded files.
@@ -502,11 +541,12 @@ ORK_CLASS_AVAILABLE
  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 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;
+- (BOOL)removeUploadedFiles:(NSArray<NSURL *> *)fileURLs error:(NSError * _Nullable *)error;
 
 /**
  Removes old and uploaded logs to bring total bytes down to a threshold.
@@ -514,16 +554,29 @@ ORK_CLASS_AVAILABLE
  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 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;
+- (BOOL)removeOldAndUploadedLogsToThreshold:(unsigned long long)bytes error:(NSError * _Nullable *)error;
 
 @end
 
 
-NS_ASSUME_NONNULL_END
+@interface ORKDataLogger (Tests)
 
+/// The file handle to which to write
+- (nullable NSFileHandle *)fileHandle;
+
+@end
+
+
+@interface NSURL (ORKDataLogger)
+
+- (BOOL)ork_isUploaded;
+- (BOOL)ork_setUploaded:(BOOL)uploaded error:(NSError * _Nullable *)error;
+
+@end
+
+NS_ASSUME_NONNULL_END

ResearchKit/ActiveTasks/ORKDeviceMotionRecorder.h

@@ -28,8 +28,23 @@
  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+
+@import UIKit;
 #import <ResearchKit/ORKRecorder.h>
 
+
+NS_ASSUME_NONNULL_BEGIN
+
+@class CMDeviceMotion;
+
+@protocol ORKDeviceMotionRecorderDelegate <ORKRecorderDelegate>
+
+@optional
+
+- (void)deviceMotionRecorderDidUpdateWithMotion:(CMDeviceMotion *)motion;
+
+@end
+
 /**
  The `ORKDeviceMotionRecorder` class represents a recorder that requests and collects device motion data from CoreMotion at a fixed frequency.
  
@@ -40,18 +55,25 @@ ORK_CLASS_AVAILABLE
 @interface ORKDeviceMotionRecorder : ORKRecorder
 
 /**
- * The frequency of motion data collection from CoreMotion in hertz (Hz).
+ 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).
+ @param identifier          The unique identifier of the recorder (assigned by the recorder configuration).
+ @param frequency           The frequency of motion data collection from CoreMotion in hertz (Hz).
+ @param step                The step that requested this recorder.
+ @param outputDirectory     The directory in which the device motion data should be stored.
+ 
  @return An initialized motion data recorder.
  */
-- (instancetype)initWithFrequency:(double)frequency
-                             step:(ORKStep *)step
-                  outputDirectory:(NSURL *)outputDirectory NS_DESIGNATED_INITIALIZER;
+- (instancetype)initWithIdentifier:(NSString *)identifier
+                         frequency:(double)frequency
+                              step:(nullable ORKStep *)step
+                   outputDirectory:(nullable NSURL *)outputDirectory NS_DESIGNATED_INITIALIZER;
 
 @end
+
+NS_ASSUME_NONNULL_END

ResearchKit/ActiveTasks/ORKDeviceMotionRecorder.m

@@ -28,20 +28,25 @@
  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 "ORKRecorder_Internal.h"
+
+#import "ORKHelpers_Internal.h"
 #import "CMDeviceMotion+ORKJSONDictionary.h"
 
-@interface ORKDeviceMotionRecorder()
-{
+@import CoreMotion;
+
+
+@interface ORKDeviceMotionRecorder () {
     ORKDataLogger *_logger;
 }
 
 @property (nonatomic, strong) CMMotionManager *motionManager;
+
 @property (nonatomic) NSTimeInterval uptime;
 
 @end
@@ -49,35 +54,28 @@
 
 @implementation ORKDeviceMotionRecorder
 
-
-- (instancetype)initWithFrequency:(double)frequency
-                             step:(ORKStep *)step
-                  outputDirectory:(NSURL *)outputDirectory
-{
-    self = [super initWithStep:step
-               outputDirectory:(NSURL *)outputDirectory];
-    if (self)
-    {
+- (instancetype)initWithIdentifier:(NSString *)identifier
+                         frequency:(double)frequency
+                              step:(ORKStep *)step
+                   outputDirectory:(NSURL *)outputDirectory {
+    self = [super initWithIdentifier:identifier
+                                step:step
+                     outputDirectory:outputDirectory];
+    if (self) {
         self.frequency = frequency;
         self.continuesInBackground = YES;
     }
     return self;
 }
 
-
-- (void)dealloc
-{
+- (void)dealloc {
     [_logger finishCurrentLog];
 }
 
-- (void)setFrequency:(double)frequency
-{
-    if (frequency <= 0)
-    {
+- (void)setFrequency:(double)frequency {
+    if (frequency <= 0) {
         _frequency = 1;
-    }
-    else
-    {
+    } else {
         _frequency = frequency;
     }
 }
@@ -87,36 +85,34 @@
 }
 
 - (void)start {
-    
     [super start];
     
-    if (! _logger) {
-        NSError *err = nil;
-        _logger = [self makeJSONDataLoggerWithError:&err];
-        if (! _logger) {
-            [self finishRecordingWithError:err];
+    if (!_logger) {
+        NSError *error = nil;
+        _logger = [self makeJSONDataLoggerWithError:&error];
+        if (!_logger) {
+            [self finishRecordingWithError:error];
             return;
         }
     }
     
     self.motionManager = [self createMotionManager];
-    self.motionManager.deviceMotionUpdateInterval = 1.0/_frequency;
+    self.motionManager.deviceMotionUpdateInterval = 1.0 / _frequency;
     
     self.uptime = [NSProcessInfo processInfo].systemUptime;
     
     [self.motionManager stopDeviceMotionUpdates];
     
-    [self.motionManager
-     startDeviceMotionUpdatesToQueue:[NSOperationQueue mainQueue]
-     withHandler:^(CMDeviceMotion *data, NSError *error)
-     {
+    [self.motionManager startDeviceMotionUpdatesToQueue:[NSOperationQueue mainQueue] withHandler:^(CMDeviceMotion *data, NSError *error) {
          BOOL success = NO;
-         if (data)
-         {
+         if (data) {
              success = [_logger append:[data ork_JSONDictionary] error:&error];
+             id delegate = self.delegate;
+             if ([delegate respondsToSelector:@selector(deviceMotionRecorderDidUpdateWithMotion:)]) {
+                 [delegate deviceMotionRecorderDidUpdateWithMotion:data];
+             }
          }
-         if (!success)
-         {
+         if (!success) {
              dispatch_async(dispatch_get_main_queue(), ^{
                  [self finishRecordingWithError:error];
              });
@@ -124,13 +120,10 @@
      }];
 }
 
-
-- (NSString *)recorderType
-{
+- (NSString *)recorderType {
     return @"deviceMotion";
 }
 
-
 - (void)stop {
     [self doStopRecording];
     [_logger finishCurrentLog];
@@ -146,16 +139,14 @@
     [super stop];
 }
 
-- (void)doStopRecording
-{
+- (void)doStopRecording {
     if (self.isRecording) {
         [self.motionManager stopDeviceMotionUpdates];
         self.motionManager = nil;
     }
 }
 
-- (void)finishRecordingWithError:(NSError *)error
-{
+- (void)finishRecordingWithError:(NSError *)error {
     [self doStopRecording];
     [super finishRecordingWithError:error];
 }
@@ -168,8 +159,7 @@
     return @"application/json";
 }
 
-- (void)reset
-{
+- (void)reset {
     [super reset];
     
     _logger = nil;
@@ -178,16 +168,16 @@
 @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];
+- (instancetype)initWithIdentifier:(NSString *)identifier {
+    @throw [NSException exceptionWithName:NSGenericException reason:@"Use subclass designated initializer" userInfo:nil];
+}
+
+- (instancetype)initWithIdentifier:(NSString *)identifier frequency:(double)freq {
+    self = [super initWithIdentifier:identifier];
     if (self) {
         _frequency = freq;
     }
@@ -195,32 +185,27 @@
 }
 #pragma clang diagnostic pop
 
-- (ORKRecorder *)recorderForStep:(ORKStep *)step outputDirectory:(NSURL *)outputDirectory
-{
-    return [[ORKDeviceMotionRecorder alloc] initWithFrequency:self.frequency
-                                                        step:step
-                                             outputDirectory:(NSURL *)outputDirectory];
+- (ORKRecorder *)recorderForStep:(ORKStep *)step outputDirectory:(NSURL *)outputDirectory {
+    return [[ORKDeviceMotionRecorder alloc] initWithIdentifier:self.identifier
+                                                     frequency:self.frequency
+                                                          step:step
+                                               outputDirectory:outputDirectory];
 }
 
-
-- (instancetype)initWithCoder:(NSCoder *)aDecoder
-{
+- (instancetype)initWithCoder:(NSCoder *)aDecoder {
     self = [super initWithCoder:aDecoder];
-    if (self)
-    {
+    if (self) {
         ORK_DECODE_DOUBLE(aDecoder, frequency);
     }
     return self;
 }
 
-- (void)encodeWithCoder:(NSCoder *)aCoder
-{
+- (void)encodeWithCoder:(NSCoder *)aCoder {
     [super encodeWithCoder:aCoder];
     ORK_ENCODE_DOUBLE(aCoder, frequency);
 }
 
-+ (BOOL)supportsSecureCoding
-{
++ (BOOL)supportsSecureCoding {
     return YES;
 }
 
@@ -229,7 +214,7 @@
     
     __typeof(self) castObject = object;
     return (isParentSame &&
-            (self.frequency == castObject.frequency)) ;
+            (self.frequency == castObject.frequency));
 }
 
 - (ORKPermissionMask)requestedPermissionMask {

ResearchKit/ActiveTasks/ORKFitnessContentView.h

@@ -28,8 +28,10 @@
  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+
 #import "ORKCustomStepView_Internal.h"
 
+
 NS_ASSUME_NONNULL_BEGIN
 
 @interface ORKFitnessContentView : ORKActiveStepCustomView

ResearchKit/ActiveTasks/ORKFitnessContentView.m

@@ -28,18 +28,23 @@
  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"
 
+#import "ORKHelpers_Internal.h"
+#import "ORKSkin.h"
+
+@import CoreMotion;
+@import HealthKit;
+
+
 // #define LAYOUT_TEST 1
 // #define LAYOUT_DEBUG 1
 
-@interface ORKFitnessContentView()
-{
+@interface ORKFitnessContentView () {
     ORKQuantityLabel *_timerLabel;
     ORKQuantityPairView *_quantityPairView;
     UIView *_imageSpacer1;
@@ -47,13 +52,12 @@
     ORKTintedImageView *_imageView;
     NSLengthFormatter *_lengthFormatter;
     NSLayoutConstraint *_imageRatioConstraint;
-    ORKScreenType _screenType;
-    NSArray *_constraints;
     NSLayoutConstraint *_topConstraint;
 }
 
 @end
 
+
 @implementation ORKFitnessContentView
 
 - (ORKActiveStepQuantityView *)distanceView {
@@ -67,13 +71,12 @@
 - (instancetype)initWithFrame:(CGRect)frame {
     self = [super initWithFrame:frame];
     if (self) {
-        _screenType = ORKScreenTypeiPhone4;
         _timerLabel = [ORKQuantityLabel new];
         _quantityPairView = [ORKQuantityPairView new];
         _imageSpacer1 = [UIView new];
-        [_imageSpacer1 setTranslatesAutoresizingMaskIntoConstraints:NO];
+        _imageSpacer1.translatesAutoresizingMaskIntoConstraints = NO;
         _imageSpacer2 = [UIView new];
-        [_imageSpacer2 setTranslatesAutoresizingMaskIntoConstraints:NO];
+        _imageSpacer2.translatesAutoresizingMaskIntoConstraints = NO;
         [self addSubview:_imageSpacer1];
         [self addSubview:_imageSpacer2];
         [self heartRateView].image = [UIImage imageNamed:@"heart-fitness" inBundle:[NSBundle bundleForClass:[self class]] compatibleWithTraitCollection:nil];
@@ -94,7 +97,7 @@
         self.hasDistance = _hasDistance;
         
 #if LAYOUT_TEST
-        self.timeLeft = 60*5;
+        self.timeLeft = 60 * 5;
         self.hasHeartRate = YES;
         self.hasDistance = YES;
         self.distanceInMeters = 100;
@@ -104,11 +107,14 @@
         self.backgroundColor = [[UIColor redColor] colorWithAlphaComponent:0.2];
         _quantityPairView.backgroundColor = [[UIColor orangeColor] colorWithAlphaComponent:0.2];
 #endif
-        
+      
+        [self setDistanceInMeters:0];
+        [self heartRateView].title = ORKLocalizedString(@"FITNESS_HEARTRATE_TITLE", nil);
+
         [self addSubview:_quantityPairView];
         [self addSubview:_imageView];
         [self addSubview:_timerLabel];
-        [self setNeedsUpdateConstraints];
+        [self setUpConstraints];
         
         [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(localeDidChange:) name:NSCurrentLocaleDidChangeNotification object:nil];
         
@@ -125,7 +131,6 @@
     _lengthFormatter = [NSLengthFormatter new];
     _lengthFormatter.numberFormatter.maximumFractionDigits = 1;
     _lengthFormatter.numberFormatter.maximumSignificantDigits = 3;
-    
 }
 
 - (void)localeDidChange:(NSNotification *)notification {
@@ -133,56 +138,116 @@
     [self setDistanceInMeters:_distanceInMeters];
 }
 
-
-
-
 - (void)willMoveToWindow:(UIWindow *)newWindow {
     [super willMoveToWindow:newWindow];
-    _screenType = ORKGetScreenTypeForWindow(newWindow);
-    [self updateConstraintConstants];
+    [self updateConstraintConstantsForWindow:newWindow];
 }
 
-- (void)updateConstraintConstants {
-    ORKScreenType screenType = _screenType;
-    const CGFloat CaptionBaselineToTimerTop = ORKGetMetricForScreenType(ORKScreenMetricCaptionBaselineToFitnessTimerTop, screenType);
-    const CGFloat CaptionBaselineToStepViewTop = ORKGetMetricForScreenType(ORKScreenMetricLearnMoreBaselineToStepViewTop, screenType);
+- (void)updateConstraintConstantsForWindow:(UIWindow *)window {
+    const CGFloat CaptionBaselineToTimerTop = ORKGetMetricForWindow(ORKScreenMetricCaptionBaselineToFitnessTimerTop, window);
+    const CGFloat CaptionBaselineToStepViewTop = ORKGetMetricForWindow(ORKScreenMetricLearnMoreBaselineToStepViewTop, window);
     _topConstraint.constant = (CaptionBaselineToTimerTop - CaptionBaselineToStepViewTop);
 }
 
-- (void)updateConstraints {
-    
-    
-    if (_constraints) {
-        [self removeConstraints:_constraints];
-        _constraints = nil;
-    }
+- (void)setUpConstraints {
     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 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.0
+                                                   constant:0.0];
     [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 addObject:[NSLayoutConstraint constraintWithItem:_timerLabel
+                                                        attribute:NSLayoutAttributeCenterX
+                                                        relatedBy:NSLayoutRelationEqual
+                                                           toItem:self
+                                                        attribute:NSLayoutAttributeCenterX
+                                                       multiplier:1.0
+                                                         constant:0.0]];
     
-    [constraints addObjectsFromArray:[NSLayoutConstraint constraintsWithVisualFormat:@"H:|[_quantityPairView]|" options:(NSLayoutFormatOptions)0 metrics:nil views:views]];
+    [constraints addObject:[NSLayoutConstraint constraintWithItem:_timerLabel
+                                                        attribute:NSLayoutAttributeWidth
+                                                        relatedBy:NSLayoutRelationLessThanOrEqual
+                                                           toItem:self attribute:NSLayoutAttributeWidth
+                                                       multiplier:1.0
+                                                         constant:0.0]];
     
-    NSLayoutConstraint *maxWidthConstraint = [NSLayoutConstraint constraintWithItem:self attribute:NSLayoutAttributeWidth relatedBy:NSLayoutRelationEqual toItem:nil attribute:NSLayoutAttributeNotAnAttribute multiplier:1 constant:10000];
-    maxWidthConstraint.priority = UILayoutPriorityRequired-1;
+    [constraints addObject:[NSLayoutConstraint constraintWithItem:_imageView
+                                                        attribute:NSLayoutAttributeWidth
+                                                        relatedBy:NSLayoutRelationLessThanOrEqual
+                                                           toItem:self attribute:NSLayoutAttributeWidth
+                                                       multiplier:1.0
+                                                         constant:0.0]];
+    
+    [constraints addObjectsFromArray:
+     [NSLayoutConstraint constraintsWithVisualFormat:@"V:[_imageView][_imageSpacer2(>=0)][_quantityPairView]|"
+                                             options:(NSLayoutFormatOptions)0
+                                             metrics:nil
+                                               views:views]];
+    
+    [constraints addObject:[NSLayoutConstraint constraintWithItem:_imageSpacer1
+                                                        attribute:NSLayoutAttributeWidth
+                                                        relatedBy:NSLayoutRelationEqual
+                                                           toItem:nil
+                                                        attribute:NSLayoutAttributeNotAnAttribute
+                                                       multiplier:1.0
+                                                         constant:0.0]];
+    
+    [constraints addObject:[NSLayoutConstraint constraintWithItem:_imageSpacer2
+                                                        attribute:NSLayoutAttributeWidth
+                                                        relatedBy:NSLayoutRelationEqual
+                                                           toItem:nil
+                                                        attribute:NSLayoutAttributeNotAnAttribute
+                                                       multiplier:1.0
+                                                         constant:0.0]];
+    
+    [constraints addObject:[NSLayoutConstraint constraintWithItem:_imageSpacer1
+                                                        attribute:NSLayoutAttributeHeight
+                                                        relatedBy:NSLayoutRelationEqual
+                                                           toItem:_imageSpacer2
+                                                        attribute:NSLayoutAttributeHeight
+                                                       multiplier:1.0
+                                                         constant:0.0]];
+    
+    NSLayoutConstraint *imageSpacerHeightConstraint = [NSLayoutConstraint constraintWithItem:_imageSpacer1
+                                                                                   attribute:NSLayoutAttributeHeight
+                                                                                   relatedBy:NSLayoutRelationEqual
+                                                                                      toItem:nil
+                                                                                   attribute:NSLayoutAttributeNotAnAttribute
+                                                                                  multiplier:1.0
+                                                                                    constant:ORKScreenMetricMaxDimension];
+    imageSpacerHeightConstraint.priority = UILayoutPriorityDefaultLow - 1;
+    [constraints addObject:imageSpacerHeightConstraint];
+    
+    [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.0
+                                                                           constant:ORKScreenMetricMaxDimension];
+    maxWidthConstraint.priority = UILayoutPriorityRequired - 1;
     [constraints addObject:maxWidthConstraint];
     
-    [self addConstraints:constraints];
-    _constraints = constraints;
-    [super updateConstraints];
+    [NSLayoutConstraint activateConstraints:constraints];
+    [self updateConstraintConstantsForWindow:self.window];
 }
 
 - (void)setImage:(UIImage *)image {
@@ -191,9 +256,15 @@
     
     _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];
+    CGSize size = image.size;
+    if (size.width > 0 && size.height > 0) {
+        _imageRatioConstraint = [NSLayoutConstraint constraintWithItem:_imageView
+                                                             attribute:NSLayoutAttributeHeight
+                                                             relatedBy:NSLayoutRelationEqual
+                                                                toItem:_imageView
+                                                             attribute:NSLayoutAttributeWidth
+                                                            multiplier:size.height / size.width
+                                                              constant:0.0];
         _imageRatioConstraint.active = YES;
     }
 }
@@ -213,11 +284,10 @@
 - (void)setHeartRate:(NSString *)heartRate {
     _heartRate = heartRate;
     [self heartRateView].value = heartRate;
-    [self heartRateView].title = ORKLocalizedString(@"FITNESS_HEARTRATE_TITLE", nil);
 }
 
 - (void)updateKeylineVisible {
-    [_quantityPairView setKeylineHidden:! (_hasDistance && _hasHeartRate)];
+    [_quantityPairView setKeylineHidden:!(_hasDistance && _hasHeartRate)];
 }
 
 - (void)setDistanceInMeters:(double)distanceInMeters {
@@ -244,12 +314,12 @@
     double conversionFactor = 1.0;
     if ([hkUnit isNull] && (unit == NSLengthFormatterUnitYard)) {
         hkUnit = [HKUnit footUnit];
-        conversionFactor = 1/3.0;
+        conversionFactor = 1.0 / 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].title = [NSString localizedStringWithFormat:ORKLocalizedString(@"FITNESS_DISTANCE_TITLE_FORMAT", nil), unitString];
     [self distanceView].value = distanceString;
 }
 
@@ -259,19 +329,18 @@
 }
 
 - (void)updateTimerLabel {
-    static NSDateComponentsFormatter *_formatter = nil;
+    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;
+        formatter = [NSDateComponentsFormatter new];
+        formatter.unitsStyle = NSDateComponentsFormatterUnitsStylePositional;
+        formatter.zeroFormattingBehavior = NSDateComponentsFormatterZeroFormattingBehaviorPad;
+        formatter.allowedUnits = NSCalendarUnitMinute | NSCalendarUnitSecond;
     });
     
-    NSString *s = [_formatter stringFromTimeInterval:MAX(round(_timeLeft),0)];
-    _timerLabel.text = s;
-    _timerLabel.hidden = (s == nil);
+    NSString *labelString = [formatter stringFromTimeInterval:MAX(round(_timeLeft),0)];
+    _timerLabel.text = labelString;
+    _timerLabel.hidden = (labelString == nil);
 }
 
 @end

ResearchKit/ActiveTasks/ORKFitnessStep.h

@@ -28,9 +28,14 @@
  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <ResearchKit/ResearchKit.h>
+
+@import Foundation;
+#import <ResearchKit/ORKDefines.h>
 #import <ResearchKit/ORKActiveStep.h>
 
+
+NS_ASSUME_NONNULL_BEGIN
+
 /**
  Fitness step.
  
@@ -43,3 +48,5 @@ ORK_CLASS_AVAILABLE
 @interface ORKFitnessStep : ORKActiveStep
 
 @end
+
+NS_ASSUME_NONNULL_END

ResearchKit/ActiveTasks/ORKFitnessStep.m

@@ -28,30 +28,37 @@
  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];
 }
 
+- (instancetype)initWithIdentifier:(NSString *)identifier {
+    self = [super initWithIdentifier:identifier];
+    if (self) {
+        self.shouldShowDefaultTimer = NO;
+    }
+    return self;
+}
+
 - (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];
+    if (self.stepDuration < ORKFitnessStepMinimumDuration) {
+        @throw [NSException exceptionWithName:NSInvalidArgumentException reason:[NSString stringWithFormat:@"rest duration cannot be shorter than %@ seconds.", @(ORKFitnessStepMinimumDuration)]  userInfo:nil];
     }
-    
 }
 
-- (instancetype)copyWithZone:(NSZone *)zone
-{
+- (instancetype)copyWithZone:(NSZone *)zone {
     ORKFitnessStep *step = [super copyWithZone:zone];
     return step;
 }
@@ -60,6 +67,4 @@
     return NO;
 }
 
-
-
 @end

ResearchKit/ActiveTasks/ORKFitnessStepViewController.h

@@ -28,7 +28,13 @@
  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <ResearchKit/ResearchKit_Private.h>
+
+@import Foundation;
+#import <ResearchKit/ORKDefines.h>
+#import <ResearchKit/ORKActiveStepViewController.h>
+
+
+NS_ASSUME_NONNULL_BEGIN
 
 /**
  Step view controller corresponding to `ORKFitnessStep`.
@@ -40,3 +46,5 @@ ORK_CLASS_AVAILABLE
 @interface ORKFitnessStepViewController : ORKActiveStepViewController
 
 @end
+
+NS_ASSUME_NONNULL_END

ResearchKit/ActiveTasks/ORKFitnessStepViewController.m

@@ -28,33 +28,37 @@
  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 "ORKActiveStepTimer.h"
+#import "ORKActiveStepView.h"
 #import "ORKFitnessContentView.h"
 #import "ORKVerticalContainerView.h"
-#import "ORKFitnessStep.h"
+
+#import "ORKStepViewController_Internal.h"
 #import "ORKHealthQuantityTypeRecorder.h"
 #import "ORKPedometerRecorder.h"
-#import "ORKActiveStepView.h"
+
+#import "ORKActiveStepViewController_Internal.h"
+#import "ORKFitnessStep.h"
+#import "ORKStep_Private.h"
+
+#import "ORKHelpers_Internal.h"
 
 
-@interface ORKFitnessStepViewController () <ORKHealthQuantityTypeRecorderDelegate,ORKPedometerRecorderDelegate>
-{
+@interface ORKFitnessStepViewController () <ORKHealthQuantityTypeRecorderDelegate, ORKPedometerRecorderDelegate> {
     NSInteger _intendedSteps;
     ORKFitnessContentView *_contentView;
     NSNumberFormatter *_hrFormatter;
-    
 }
+
 @end
 
+
 @implementation ORKFitnessStepViewController
 
-
-- (instancetype)initWithStep:(ORKStep *)step {
-    
+- (instancetype)initWithStep:(ORKStep *)step {    
     self = [super initWithStep:step];
     if (self) {
         self.suspendIfInactive = NO;

ResearchKit/ActiveTasks/ORKHealthQuantityTypeRecorder.h

@@ -28,8 +28,11 @@
  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+
+@import UIKit;
 #import <ResearchKit/ORKRecorder.h>
 
+
 NS_ASSUME_NONNULL_BEGIN
 
 @class ORKHealthQuantityTypeRecorder;
@@ -37,11 +40,11 @@ NS_ASSUME_NONNULL_BEGIN
 @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.
@@ -49,14 +52,28 @@ NS_ASSUME_NONNULL_BEGIN
 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;
+@property (nonatomic, copy, readonly) HKQuantityType *quantityType;
 
-- (instancetype)initWithHealthQuantityType:(HKQuantityType *)quantityType
-                                      unit:(HKUnit *)unit
-                                      step:(ORKStep *)step
-                           outputDirectory:(NSURL *)outputDirectory NS_DESIGNATED_INITIALIZER;
+@property (nonatomic, copy, readonly) HKUnit *unit;
+
+@property (nonatomic, copy, readonly, nullable) HKQuantitySample *lastSample;
+
+/**
+ Returns an initialized health quantity type recorder using the specified quantity type and unit.
+ 
+ @param identifier          The unique identifier of the recorder (assigned by the recorder configuration).
+ @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.
+ @param step                The step that requested this recorder.
+ @param outputDirectory     The directory in which the HealthKit data should be stored.
+ 
+ @return An initialized health quantity type recorder.
+*/
+- (instancetype)initWithIdentifier:(NSString *)identifier
+                healthQuantityType:(HKQuantityType *)quantityType
+                              unit:(HKUnit *)unit
+                              step:(nullable ORKStep *)step
+                   outputDirectory:(nullable NSURL *)outputDirectory NS_DESIGNATED_INITIALIZER;
 
 @end
 

ResearchKit/ActiveTasks/ORKHealthQuantityTypeRecorder.m

@@ -28,55 +28,69 @@
  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+
 #import "ORKHealthQuantityTypeRecorder.h"
-#import "ORKHelpers.h"
+#import "ORKHelpers_Internal.h"
 #import "ORKDataLogger.h"
 #import "ORKRecorder_Private.h"
 #import "ORKRecorder_Internal.h"
 #import "HKSample+ORKJSONDictionary.h"
 
-@interface ORKHealthQuantityTypeRecorder()
-{
+
+@interface ORKHealthQuantityTypeRecorder () {
     ORKDataLogger *_logger;
     BOOL _isRecording;
     HKHealthStore *_healthStore;
     NSPredicate *_samplePredicate;
     HKObserverQuery *_observerQuery;
-    NSInteger _anchor;
+    /// Either the HKQueryAnchor object *or* NSUInteger value are tracked since the initializer for
+    /// iOS 8 and iOS 9 use different objects. Only one will actually be referenced in the initalizer.
+    HKQueryAnchor *_anchor;
+    NSUInteger _anchorValue;
     HKQuantitySample *_lastSample;
 }
 
-@property (nonatomic, strong) NSError *recordingError;
-
 @end
 
+#ifdef __IPHONE_10_0
+/// Add a protocol defining the initializer for iOS 8 apps. This signature was deprecated in iOS 9
+/// and deleted in iOS 10.
+@interface HKAnchoredObjectQuery (iOS8)
+- (instancetype)initWithType:(HKSampleType *)type
+                   predicate:(NSPredicate *)predicate
+                      anchor:(NSUInteger)anchor
+                       limit:(NSUInteger)limit
+           completionHandler:(void (^)(HKAnchoredObjectQuery *query,
+                                       NSArray<__kindof HKSample *> *results,
+                                       NSUInteger newAnchor,
+                                       NSError *error))handler NS_DEPRECATED_IOS(8_0, 9_0);
+@end
+#endif
 
 @implementation ORKHealthQuantityTypeRecorder
 
-
-- (instancetype)initWithHealthQuantityType:(HKQuantityType *)quantityType
-                                      unit:(HKUnit *)unit
-                                      step:(ORKStep *)step
-                           outputDirectory:(NSURL *)outputDirectory
-{
-    self = [super initWithStep:step
-               outputDirectory:(NSURL *)outputDirectory];
-    if (self)
-    {
+- (instancetype)initWithIdentifier:(NSString *)identifier
+                healthQuantityType:(HKQuantityType *)quantityType
+                              unit:(HKUnit *)unit
+                              step:(ORKStep *)step
+                   outputDirectory:(NSURL *)outputDirectory {
+    self = [super initWithIdentifier:identifier
+                                step:step
+                     outputDirectory: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;
+        _anchorValue = HKAnchoredObjectQueryNoAnchor;
+        _anchor = [HKQueryAnchor anchorFromValue:_anchorValue];
     }
     return self;
 }
 
-
-- (void)dealloc
-{
+- (void)dealloc {
     [_logger finishCurrentLog];
 }
 
@@ -89,14 +103,13 @@
     if (delegate && [delegate respondsToSelector:@selector(healthQuantityTypeRecorderDidUpdate:)]) {
         [delegate healthQuantityTypeRecorderDidUpdate:self];
     }
-    
 }
 
 static const NSInteger _HealthAnchoredQueryLimit = 100;
 
-- (void)query_logResults:(NSArray *)results withAnchor:(NSUInteger)newAnchor {
+- (void)query_logResults:(NSArray *)results withAnchor:(HKQueryAnchor*)newAnchor anchorValue:(NSUInteger)anchorValue {
     
-    NSUInteger resultCount = [results count];
+    NSUInteger resultCount = results.count;
     if (resultCount == 0) {
         return;
     }
@@ -108,72 +121,88 @@ static const NSInteger _HealthAnchoredQueryLimit = 100;
     }];
     
     dispatch_async(dispatch_get_main_queue(), ^{
-        [self updateMostRecentSample:[results lastObject]];
+        [self updateMostRecentSample:results.lastObject];
         
         NSError *error = nil;
-        if (! [_logger appendObjects:dictionaries error:&error]) {
+        if (![_logger appendObjects:dictionaries error:&error]) {
             // Logger writes are unrecoverable
             [self finishRecordingWithError:error];
             return;
         }
         
         _anchor = newAnchor;
+        _anchorValue = anchorValue;
         
         if (resultCount == _HealthAnchoredQueryLimit) {
             // Do another fetch immediately rather than wait for an observation
             [self doFetchNewData];
         }
-        
     });
-    
 }
 
-
 - (void)doFetchNewData {
-    if (! _healthStore || ! _isRecording) {
+    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];
-                                                
-                                            }];
+    void (^handleResults)(NSArray <__kindof HKSample *> *, HKQueryAnchor *, NSUInteger, NSError *) = ^ (NSArray *results, HKQueryAnchor *newAnchor, NSUInteger newAnchorValue, 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_Warning(@"Anchored query error: %@", error);
+            return;
+        }
+        
+        __typeof(self) strongSelf = weakSelf;
+        [strongSelf query_logResults:results withAnchor:newAnchor anchorValue:newAnchorValue];
+    };
+    
+    
+    HKAnchoredObjectQuery *anchoredQuery;
+    if ([HKAnchoredObjectQuery instancesRespondToSelector:@selector(initWithType:predicate:anchor:limit:resultsHandler:)]) {
+        
+        anchoredQuery = [[HKAnchoredObjectQuery alloc] initWithType:_quantityType
+                                                          predicate:_samplePredicate
+                                                             anchor:_anchor
+                                                              limit:_HealthAnchoredQueryLimit
+                                                     resultsHandler:
+                         ^(HKAnchoredObjectQuery *query, NSArray *sampleObjects, NSArray *deletedObjects, HKQueryAnchor *newAnchor, NSError *error) {
+                             handleResults(sampleObjects, newAnchor, 0, error);
+                         }];
+    } else if ([HKAnchoredObjectQuery instancesRespondToSelector:@selector(initWithType:predicate:anchor:limit:completionHandler:)]) {
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+        anchoredQuery = [[HKAnchoredObjectQuery alloc] initWithType:_quantityType
+                                                          predicate:_samplePredicate
+                                                             anchor:_anchorValue
+                                                              limit:_HealthAnchoredQueryLimit
+                                                  completionHandler:
+                         ^(HKAnchoredObjectQuery *query, NSArray<__kindof HKSample *> *results, NSUInteger newAnchor, NSError *error) {
+                             handleResults(results, nil, newAnchor, error);
+                         }];
+#pragma clang diagnostic pop
+    }
+    else {
+        NSAssert(NO, @"Could not instantiate an HKAnchoredObjectQuery.");
+    }
+
     [_healthStore executeQuery:anchoredQuery];
 }
 
-
 - (void)start {
-    
     [super start];
     
-    
-    if (! _logger) {
+    if (!_logger) {
         NSError *err = nil;
         _logger = [self makeJSONDataLoggerWithError:&err];
-        if (! _logger) {
+        if (!_logger) {
             [self finishRecordingWithError:err];
             return;
         }
     }
     
-    if (! [HKHealthStore isHealthDataAvailable])
-    {
+    if (![HKHealthStore isHealthDataAvailable]) {
         [self finishRecordingWithError:[NSError errorWithDomain:NSCocoaErrorDomain
                                                            code:NSFeatureUnsupportedError
                                                        userInfo:@{@"recorder" : self}]];
@@ -191,16 +220,6 @@ static const NSInteger _HealthAnchoredQueryLimit = 100;
         }
     }
     
-    [_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];
     
@@ -230,15 +249,12 @@ static const NSInteger _HealthAnchoredQueryLimit = 100;
     [_healthStore executeQuery:_observerQuery];
 }
 
-
-- (NSString *)recorderType
-{
+- (NSString *)recorderType {
     return _quantityType.identifier;
 }
 
-
 - (void)stop {
-    if (! _isRecording) {
+    if (!_isRecording) {
         return;
     }
     
@@ -251,14 +267,12 @@ static const NSInteger _HealthAnchoredQueryLimit = 100;
         fileUrl = logFileUrl;
     } error:&error];
     
-    
     [self reportFileResultWithFile:fileUrl error:error];
     
     [super stop];
 }
 
-- (void)doStopRecording
-{
+- (void)doStopRecording {
     if (_isRecording) {
         NSAssert(_observerQuery != nil, @"Observer query should be non-nil when recording");
         [_healthStore stopQuery:_observerQuery];
@@ -271,8 +285,7 @@ static const NSInteger _HealthAnchoredQueryLimit = 100;
     }
 }
 
-- (void)finishRecordingWithError:(NSError *)error
-{
+- (void)finishRecordingWithError:(NSError *)error {
     [self doStopRecording];
     [super finishRecordingWithError:error];
 }
@@ -285,8 +298,7 @@ static const NSInteger _HealthAnchoredQueryLimit = 100;
     return @"application/json";
 }
 
-- (void)reset
-{
+- (void)reset {
     [super reset];
     
     _logger = nil;
@@ -294,15 +306,17 @@ static const NSInteger _HealthAnchoredQueryLimit = 100;
 
 @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];
+- (instancetype)initWithIdentifier:(NSString *)identifier {
+    @throw [NSException exceptionWithName:NSGenericException reason:@"Use subclass designated initializer" userInfo:nil];
+}
+
+- (instancetype)initWithIdentifier:(NSString *)identifier healthQuantityType:(HKQuantityType *)quantityType unit:(HKUnit *)unit {
+    self = [super initWithIdentifier:identifier];
     if (self) {
         NSParameterAssert(quantityType != nil);
         NSParameterAssert(unit != nil);
@@ -314,34 +328,29 @@ static const NSInteger _HealthAnchoredQueryLimit = 100;
 }
 #pragma clang diagnostic pop
 
-- (ORKRecorder *)recorderForStep:(ORKStep *)step outputDirectory:(NSURL *)outputDirectory
-{
-    return [[ORKHealthQuantityTypeRecorder alloc] initWithHealthQuantityType:_quantityType
-                                                                       unit:_unit
-                                                                       step:step
-                                                            outputDirectory:outputDirectory];
+- (ORKRecorder *)recorderForStep:(ORKStep *)step outputDirectory:(NSURL *)outputDirectory {
+    return [[ORKHealthQuantityTypeRecorder alloc] initWithIdentifier:self.identifier
+                                                  healthQuantityType:_quantityType
+                                                                unit:_unit
+                                                                step:step
+                                                     outputDirectory:outputDirectory];
 }
 
-
-- (instancetype)initWithCoder:(NSCoder *)aDecoder
-{
+- (instancetype)initWithCoder:(NSCoder *)aDecoder {
     self = [super initWithCoder:aDecoder];
-    if (self)
-    {
+    if (self) {
         ORK_DECODE_OBJ_CLASS(aDecoder, quantityType, HKQuantityType);
         ORK_DECODE_OBJ_CLASS(aDecoder, unit, HKUnit);
     }
     return self;
 }
 
-- (void)encodeWithCoder:(NSCoder *)aCoder
-{
+- (void)encodeWithCoder:(NSCoder *)aCoder {
     ORK_ENCODE_OBJ(aCoder, quantityType);
     ORK_ENCODE_OBJ(aCoder, unit);
 }
 
-+ (BOOL)supportsSecureCoding
-{
++ (BOOL)supportsSecureCoding {
     return YES;
 }
 
@@ -351,10 +360,9 @@ static const NSInteger _HealthAnchoredQueryLimit = 100;
     __typeof(self) castObject = object;
     return (isParentSame &&
             ORKEqualObjects(self.quantityType, castObject.quantityType)&&
-            ORKEqualObjects(self.unit, castObject.unit)) ;
+            ORKEqualObjects(self.unit, castObject.unit));
 }
 
-
 - (NSSet *)requestedHealthKitTypesForReading {
     return [NSSet setWithObject:_quantityType];
 }

ResearchKit/ActiveTasks/ORKHolePegTestPlaceContentView.h

@@ -0,0 +1,66 @@
+/*
+ Copyright (c) 2015, Shazino SAS. 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;
+#import "ORKCustomStepView_Internal.h"
+#import "ORKTypes.h"
+
+
+NS_ASSUME_NONNULL_BEGIN
+
+@protocol ORKHolePegTestPlaceContentViewDelegate;
+
+ORK_CLASS_AVAILABLE
+@interface ORKHolePegTestPlaceContentView : ORKActiveStepCustomView
+
+- (instancetype)initWithCoder:(NSCoder *)aDecoder NS_UNAVAILABLE;
+- (instancetype)initWithFrame:(CGRect)frame NS_UNAVAILABLE;
+- (instancetype)initWithMovingDirection:(ORKBodySagittal)movingDirection rotated:(BOOL)rotated NS_DESIGNATED_INITIALIZER;
+
+@property (nonatomic, assign) ORKBodySagittal movingDirection;
+@property (nonatomic, assign) double threshold;
+@property (nonatomic, assign, getter = isRotated) BOOL rotated;
+@property (nonatomic, weak) id<ORKHolePegTestPlaceContentViewDelegate> delegate;
+
+- (void)setProgress:(CGFloat)progress animated:(BOOL)animated;
+
+@end
+
+
+@protocol ORKHolePegTestPlaceContentViewDelegate <NSObject>
+
+- (void)holePegTestPlaceDidProgress:(ORKHolePegTestPlaceContentView *)holePegTestPlaceContentView;
+- (void)holePegTestPlaceDidSucceed:(ORKHolePegTestPlaceContentView *)holePegTestPlaceContentView withDistance:(CGFloat)distance;
+- (void)holePegTestPlaceDidFail:(ORKHolePegTestPlaceContentView *)holePegTestPlaceContentView;
+
+@end
+
+NS_ASSUME_NONNULL_END

ResearchKit/ActiveTasks/ORKHolePegTestPlaceContentView.m

@@ -0,0 +1,399 @@
+/*
+ Copyright (c) 2015, Shazino SAS. 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 "ORKHolePegTestPlaceContentView.h"
+
+#import "ORKDirectionView.h"
+#import "ORKHolePegTestPlaceHoleView.h"
+#import "ORKHolePegTestPlacePegView.h"
+
+#import "ORKHelpers_Internal.h"
+#import "ORKSkin.h"
+
+
+static const CGFloat ORKOrientationThreshold = 12.0f;
+static const CGFloat ORKHolePegViewDiameter = 88.0f;
+#define degreesToRadians(degrees) ((degrees) / 180.0 * M_PI)
+
+
+@interface ORKHolePegTestPlaceContentView () <UIGestureRecognizerDelegate>
+
+@property (nonatomic, strong) UIProgressView *progressView;
+@property (nonatomic, strong) ORKHolePegTestPlacePegView *pegView;
+@property (nonatomic, strong) ORKHolePegTestPlaceHoleView *holeView;
+@property (nonatomic, strong) ORKDirectionView *directionView;
+@property (nonatomic, copy) NSArray *constraints;
+
+@property (nonatomic, strong) UIPinchGestureRecognizer *pinchRecognizer;
+@property (nonatomic, strong) UIPanGestureRecognizer *panRecognizer;
+@property (nonatomic, strong) UIRotationGestureRecognizer *rotationRecognizer;
+@property (nonatomic, assign, getter = isMovable) BOOL movable;
+@property (nonatomic, assign, getter = hasMoveEnded) BOOL moveEnded;
+@property (nonatomic, assign) CGFloat rotation;
+@property (nonatomic, assign) CGFloat rotationOffset;
+@property (nonatomic, assign) CGPoint translation;
+@property (nonatomic, assign) CGPoint translationOffset;
+@property (nonatomic, assign) CGPoint startPoint;
+
+@end
+
+
+@implementation ORKHolePegTestPlaceContentView
+
+- (instancetype)initWithCoder:(NSCoder *)aDecoder {
+    ORKThrowMethodUnavailableException();
+}
+
+- (instancetype)initWithFrame:(CGRect)frame {
+    ORKThrowMethodUnavailableException();
+}
+
+- (instancetype)initWithMovingDirection:(ORKBodySagittal)movingDirection rotated:(BOOL)rotated {
+    self = [super initWithFrame:CGRectZero];
+    if (self) {
+        self.movingDirection = movingDirection;
+        self.rotated = rotated;
+
+        self.progressView = [UIProgressView new];
+        self.progressView.progressTintColor = self.tintColor;
+        [self.progressView setTranslatesAutoresizingMaskIntoConstraints:NO];
+        [self.progressView setAlpha:0];
+        [self addSubview:self.progressView];
+        
+        self.holeView = [[ORKHolePegTestPlaceHoleView alloc] initWithFrame:CGRectMake(0, 0, ORKHolePegViewDiameter, ORKHolePegViewDiameter)];
+        self.holeView.rotated = self.isRotated;
+        [self.holeView setTranslatesAutoresizingMaskIntoConstraints:NO];
+        [self addSubview:self.holeView];
+        
+        self.pegView = [[ORKHolePegTestPlacePegView alloc] initWithFrame:CGRectMake(0, 0, ORKHolePegViewDiameter, ORKHolePegViewDiameter)];
+        self.pegView.rotated = self.isRotated;
+        [self.pegView setTranslatesAutoresizingMaskIntoConstraints:NO];
+        [self addSubview:self.pegView];
+        
+        self.directionView = [[ORKDirectionView alloc] initWithOrientation:(self.movingDirection == ORKBodySagittalLeft) ? ORKBodySagittalRight : ORKBodySagittalLeft];
+        [self.directionView setTranslatesAutoresizingMaskIntoConstraints:NO];
+        [self addSubview:self.directionView];
+        
+        [self setTranslatesAutoresizingMaskIntoConstraints:NO];
+        [self setNeedsUpdateConstraints];
+        
+        self.movable = NO;
+        self.moveEnded = NO;
+        self.startPoint = CGPointZero;
+        
+        self.pinchRecognizer = [[UIPinchGestureRecognizer alloc] initWithTarget:self
+                                                                         action:@selector(handlePinch:)];
+        self.pinchRecognizer.delegate = self;
+        [self addGestureRecognizer:self.pinchRecognizer];
+        
+        self.panRecognizer = [[UIPanGestureRecognizer alloc] initWithTarget:self
+                                                                     action:@selector(handlePan:)];
+        self.panRecognizer.delegate = self;
+        [self addGestureRecognizer:self.panRecognizer];
+        
+        if (rotated) {
+            self.rotationRecognizer = [[UIRotationGestureRecognizer alloc] initWithTarget:self
+                                                                                   action:@selector(handleRotate:)];
+            self.rotationRecognizer.delegate = self;
+            [self addGestureRecognizer:self.rotationRecognizer];
+        }
+    }
+    return self;
+}
+
+- (void)tintColorDidChange {
+    [super tintColorDidChange];
+    self.progressView.progressTintColor = self.tintColor;
+}
+
+- (void)setProgress:(CGFloat)progress animated:(BOOL)animated {
+    [self.progressView setProgress:progress animated:animated];
+    [UIView animateWithDuration:animated ? 0.2 : 0 animations:^{
+        [self.progressView setAlpha:(progress == 0) ? 0 : 1];
+    }];
+}
+
+- (void)updateLayoutMargins {
+    CGFloat margin = ORKStandardHorizontalMarginForView(self);
+    self.layoutMargins = (UIEdgeInsets){.left = margin * 2, .right = margin * 2};
+}
+
+- (void)setFrame:(CGRect)frame {
+    [super setFrame:frame];
+    [self updateLayoutMargins];
+}
+
+- (void)setBounds:(CGRect)bounds {
+    [super setBounds:bounds];
+    [self updateLayoutMargins];
+}
+
+- (void)updateConstraints {
+    if ([self.constraints count]) {
+        [NSLayoutConstraint deactivateConstraints:self.constraints];
+        self.constraints = nil;
+    }
+
+    NSMutableArray *constraintsArray = [NSMutableArray array];
+    
+    NSDictionary *views = NSDictionaryOfVariableBindings(_progressView, _pegView, _holeView, _directionView);
+    NSDictionary *metrics = @{@"diameter": @(ORKHolePegViewDiameter)};
+    
+    [constraintsArray addObjectsFromArray:
+     [NSLayoutConstraint constraintsWithVisualFormat:@"H:|-[_progressView]-|"
+                                             options:(NSLayoutFormatOptions)0
+                                             metrics:nil views:views]];
+    
+    [constraintsArray addObjectsFromArray:
+     [NSLayoutConstraint constraintsWithVisualFormat:(self.movingDirection == ORKBodySagittalLeft) ? @"H:|-[_pegView]->=0-[_holeView]-|" : @"H:|-[_holeView]->=0-[_pegView]-|"
+                                             options:NSLayoutFormatAlignAllCenterY
+                                             metrics:nil views:views]];
+    
+    [constraintsArray addObjectsFromArray:
+     [NSLayoutConstraint constraintsWithVisualFormat:@"V:|[_progressView]"
+                                             options:(NSLayoutFormatOptions)0
+                                             metrics:nil views:views]];
+    
+    [constraintsArray addObjectsFromArray:
+     [NSLayoutConstraint constraintsWithVisualFormat:@"V:|->=0-[_pegView(diameter)]->=0-|"
+                                             options:(NSLayoutFormatOptions)0
+                                             metrics:metrics views:views]];
+    
+    [constraintsArray addObjectsFromArray:
+     [NSLayoutConstraint constraintsWithVisualFormat:@"V:|->=0-[_holeView]->=0-|"
+                                             options:(NSLayoutFormatOptions)0
+                                             metrics:nil views:views]];
+
+    [constraintsArray addObject:[NSLayoutConstraint constraintWithItem:self.pegView
+                                                             attribute:NSLayoutAttributeCenterY
+                                                             relatedBy:NSLayoutRelationEqual
+                                                                toItem:self
+                                                             attribute:NSLayoutAttributeCenterY
+                                                            multiplier:1
+                                                              constant:0]];
+    
+    [constraintsArray addObject:[NSLayoutConstraint constraintWithItem:self.directionView
+                                                             attribute:NSLayoutAttributeCenterX
+                                                             relatedBy:NSLayoutRelationEqual
+                                                                toItem:self
+                                                             attribute:NSLayoutAttributeCenterX
+                                                            multiplier:1
+                                                              constant:0]];
+    
+    [constraintsArray addObject:[NSLayoutConstraint constraintWithItem:self.directionView
+                                                             attribute:NSLayoutAttributeCenterY
+                                                             relatedBy:NSLayoutRelationEqual
+                                                                toItem:self
+                                                             attribute:NSLayoutAttributeCenterY
+                                                            multiplier:1
+                                                              constant:0]];
+    
+    self.constraints = constraintsArray;
+    [self addConstraints:self.constraints];
+    
+    [NSLayoutConstraint activateConstraints:self.constraints];
+    [super updateConstraints];
+}
+
+#pragma mark - gesture recognizer methods
+
+- (void)pickupPegWithGestureRecognizer:(UIGestureRecognizer *)gestureRecognizer {
+    CGPoint touch = [gestureRecognizer locationInView:self];
+    CGPoint touch1 = [gestureRecognizer locationOfTouch:0 inView:self];
+    CGPoint touch2 = [gestureRecognizer locationOfTouch:1 inView:self];
+    double distance = hypot(touch1.x - touch2.x, touch1.y - touch2.y);
+    
+    if (distance < 3 * CGRectGetWidth(self.pegView.frame) &&
+        CGRectContainsPoint(self.pegView.frame, touch)) {
+        self.movable = YES;
+    } else {
+        self.movable = NO;
+    }
+}
+
+- (void)handlePinch:(UIPinchGestureRecognizer *)pinchGestureRecognizer {
+    if ([pinchGestureRecognizer numberOfTouches] == 2) {
+        [self pickupPegWithGestureRecognizer:pinchGestureRecognizer];
+    }
+}
+
+- (void)handlePan:(UIPanGestureRecognizer *)panGestureRecognizer {
+    if ([panGestureRecognizer numberOfTouches] != 2 ||
+        panGestureRecognizer.state == UIGestureRecognizerStateEnded ||
+        panGestureRecognizer.state == UIGestureRecognizerStateCancelled ||
+        panGestureRecognizer.state == UIGestureRecognizerStateFailed) {
+        [self resetTransformAtPoint:[panGestureRecognizer locationInView:self]];
+    } else {
+        if (self.isMovable) {
+            self.translation = CGPointMake([panGestureRecognizer translationInView:self].x - self.translationOffset.x,
+                                           [panGestureRecognizer translationInView:self].y - self.translationOffset.y);
+            [self updateTransformAtPoint:[panGestureRecognizer locationInView:self]];
+        } else {
+            self.translationOffset = CGPointMake([panGestureRecognizer translationInView:self].x - self.translation.x,
+                                                 [panGestureRecognizer translationInView:self].y - self.translation.y);
+            if (CGPointEqualToPoint(self.startPoint, CGPointZero)) {
+                [self pickupPegWithGestureRecognizer:panGestureRecognizer];
+            }
+        }
+    }
+}
+
+- (void)handleRotate:(UIRotationGestureRecognizer *)rotationGestureRecognizer {
+    if ([rotationGestureRecognizer numberOfTouches] != 2 ||
+        rotationGestureRecognizer.state == UIGestureRecognizerStateEnded ||
+        rotationGestureRecognizer.state == UIGestureRecognizerStateCancelled ||
+        rotationGestureRecognizer.state == UIGestureRecognizerStateFailed) {
+        [self resetTransformAtPoint:[rotationGestureRecognizer locationInView:self]];
+    } else {
+        if (self.isMovable) {
+            self.rotation = rotationGestureRecognizer.rotation - self.rotationOffset;
+            [self updateTransformAtPoint:[rotationGestureRecognizer locationInView:self]];
+        } else {
+            self.rotationOffset = rotationGestureRecognizer.rotation - self.rotation;
+        }
+    }
+}
+
+- (void)updateTransformAtPoint:(CGPoint)point {
+    self.pegView.transform = CGAffineTransformMakeTranslation(self.translation.x, self.translation.y);
+    self.pegView.transform = CGAffineTransformRotate(self.pegView.transform, self.rotation);
+    [self pegViewDidMoveAtPoint:point];
+}
+
+- (void)resetTransformAtPoint:(CGPoint)point {
+    if (!self.hasMoveEnded) {
+        self.movable = NO;
+        self.moveEnded = YES;
+
+        self.pinchRecognizer.enabled = NO;
+        self.panRecognizer.enabled = NO;
+        self.rotationRecognizer.enabled = NO;
+
+        BOOL animated = ![self pegViewMoveDidEndAtPoint:point];
+        self.pegView.hidden = !animated;
+
+        [UIView animateWithDuration:animated ? 0.15f : 0.0f
+                              delay:0.0f
+                            options:UIViewAnimationOptionCurveEaseOut
+                         animations:^(){
+                             self.pegView.transform = CGAffineTransformIdentity;
+                             self.pegView.alpha = 1.0f;
+                         }
+                         completion:^(BOOL finished){
+                             self.rotation = 0.0f;
+                             self.rotationOffset = 0.0f;
+                             self.translation = CGPointZero;
+                             self.translationOffset = CGPointZero;
+                             self.pinchRecognizer.enabled = YES;
+                             self.panRecognizer.enabled = YES;
+                             self.rotationRecognizer.enabled = YES;
+                             self.moveEnded = NO;
+                             self.pegView.hidden = NO;
+                         }];
+    }
+}
+
+- (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer
+shouldRecognizeSimultaneouslyWithGestureRecognizer:(UIGestureRecognizer *)otherGestureRecognizer {
+    return YES;
+}
+
+#pragma mark - peg view delegate
+
+- (void)pegViewDidMoveAtPoint:(CGPoint)point {
+    self.directionView.hidden = YES;
+    
+    if (CGPointEqualToPoint(self.startPoint, CGPointZero)) {
+        self.startPoint = point;
+    }
+    
+    if ([self.delegate respondsToSelector:@selector(holePegTestPlaceDidProgress:)]) {
+        [self.delegate holePegTestPlaceDidProgress:self];
+    }
+    
+    if (self.holeView.isSuccess) {
+        self.holeView.success = NO;
+    }
+    
+    if ([self holeViewContainsPegView]) {
+        self.pegView.alpha = 1.0f;
+    } else {
+        self.pegView.alpha = 0.2f;
+    }
+}
+
+- (BOOL)pegViewMoveDidEndAtPoint:(CGPoint)point {
+    self.directionView.hidden = NO;
+    
+    BOOL succeeded = NO;
+    if ([self holeViewContainsPegView]) {
+        if ([self.delegate respondsToSelector:@selector(holePegTestPlaceDidSucceed:withDistance:)]) {
+            CGFloat distance = hypotf(point.x - self.startPoint.x, point.y - self.startPoint.y);
+            [self.delegate holePegTestPlaceDidSucceed:self withDistance:distance];
+        }
+        self.holeView.success = YES;
+        succeeded = YES;
+    } else {
+        if ([self.delegate respondsToSelector:@selector(holePegTestPlaceDidFail:)]) {
+            [self.delegate holePegTestPlaceDidFail:self];
+        }
+        self.holeView.success = NO;
+    }
+    self.startPoint = CGPointZero;
+    return succeeded;
+}
+
+- (BOOL)holeViewContainsPegView {
+    CGRect detectionFrame = CGRectMake(CGRectGetMidX(self.holeView.frame) - (self.threshold * CGRectGetWidth(self.holeView.frame) / 2),
+                                       CGRectGetMidY(self.holeView.frame) - (self.threshold * CGRectGetHeight(self.holeView.frame) / 2),
+                                       self.threshold * CGRectGetWidth(self.holeView.frame),
+                                       self.threshold * CGRectGetHeight(self.holeView.frame));
+    
+    CGPoint pegCenter = CGPointMake(CGRectGetMaxX(self.pegView.frame) - CGRectGetWidth(self.pegView.frame) / 2,
+                                    CGRectGetMaxY(self.pegView.frame) - CGRectGetHeight(self.pegView.frame) / 2);
+    
+    if (CGRectContainsPoint(detectionFrame, pegCenter)) {
+        if (self.isRotated) {
+            double rotation = atan2(self.pegView.transform.b, self.pegView.transform.a);
+            double angle = fmod(fabs(rotation), M_PI_2);
+            if (angle > M_PI_4 - degreesToRadians(ORKOrientationThreshold) &&
+                angle < M_PI_4 + degreesToRadians(ORKOrientationThreshold)) {
+                return YES;
+            }
+        } else {
+            return YES;
+        }
+    }
+    
+    return NO;
+}
+
+@end

ResearchKit/ActiveTasks/ORKHolePegTestPlaceHoleView.h

@@ -0,0 +1,46 @@
+/*
+ Copyright (c) 2015, Shazino SAS. 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;
+#import "ORKDefines.h"
+
+
+NS_ASSUME_NONNULL_BEGIN
+
+ORK_CLASS_AVAILABLE
+@interface ORKHolePegTestPlaceHoleView : UIView <CAAnimationDelegate>
+
+@property (nonatomic, assign, getter = isRotated) BOOL rotated;
+@property (nonatomic, assign, getter = isSuccess) BOOL success;
+
+@end
+
+NS_ASSUME_NONNULL_END

ResearchKit/ActiveTasks/ORKHolePegTestPlaceHoleView.m

@@ -0,0 +1,173 @@
+/*
+ Copyright (c) 2015, Shazino SAS. 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 "ORKHolePegTestPlaceHoleView.h"
+
+#import "ORKHelpers_Internal.h"
+
+
+static const CGFloat ORKPlaceHoleViewRotation = 45.0f;
+
+
+@interface ORKHolePegTestPlaceHoleView ()
+
+@property (nonatomic, strong) CAShapeLayer *checkLayer;
+@property (nonatomic, strong) CAShapeLayer *crossLayer;
+
+@end
+
+
+@implementation ORKHolePegTestPlaceHoleView
+
+- (instancetype)initWithFrame:(CGRect)frame
+{
+    self = [super initWithFrame:frame];
+    if (self) {
+        UIBezierPath *path = [[UIBezierPath alloc] init];
+        [path moveToPoint:CGPointMake(27.7f, 46.9f)];
+        [path addLineToPoint:CGPointMake(36.1f, 56.3f)];
+        [path addLineToPoint:CGPointMake(62.8f, 30.3f)];
+        path.lineCapStyle = kCGLineCapRound;
+        path.lineWidth = 3.6f;
+        
+        CAShapeLayer *checkLayer = [CAShapeLayer new];
+        checkLayer.path = path.CGPath;
+        checkLayer.lineWidth = 3.6f;
+        checkLayer.lineCap = kCALineCapRound;
+        checkLayer.lineJoin = kCALineJoinRound;
+        checkLayer.frame = self.layer.bounds;
+        checkLayer.strokeColor = self.tintColor.CGColor;
+        checkLayer.backgroundColor = [UIColor clearColor].CGColor;
+        checkLayer.fillColor = nil;
+        self.checkLayer = checkLayer;
+        
+        self.opaque = NO;
+        self.success = NO;
+    }
+    
+    return self;
+}
+
+- (CGSize)intrinsicContentSize {
+    return CGSizeMake(self.frame.size.width, self.frame.size.height);
+}
+
+#pragma mark - drawing method
+
+- (void)tintColorDidChange {
+    [super tintColorDidChange];
+    self.checkLayer.strokeColor = self.tintColor.CGColor;
+    [self setNeedsDisplay];
+}
+
+- (void)setSuccess:(BOOL)success
+{
+    _success = success;
+    [self.checkLayer removeFromSuperlayer];
+    [self.crossLayer removeFromSuperlayer];
+    [self setNeedsDisplay];
+}
+
+- (void)setRotated:(BOOL)rotated
+{
+    _rotated = rotated;
+    [self setNeedsDisplay];
+}
+
+- (void)drawRect:(CGRect)rect {
+    CGContextRef context = UIGraphicsGetCurrentContext();
+    CGContextSaveGState(context);
+    
+    CGRect bounds = self.bounds;
+    UIBezierPath *path = [UIBezierPath bezierPathWithOvalInRect:CGRectInset(bounds, 1.0f, 1.0f)];
+    path.lineWidth = 2.0f;
+    [self.tintColor setStroke];
+    [path stroke];
+
+    if (self.isSuccess) {
+        [self.layer addSublayer:self.checkLayer];
+        
+        CAMediaTimingFunction *timing = [[CAMediaTimingFunction alloc] initWithControlPoints:0.180739998817444
+                                                                                            :0
+                                                                                            :0.577960014343262
+                                                                                            :0.918200016021729];
+        
+        CABasicAnimation *animation = [CABasicAnimation animationWithKeyPath:@"strokeEnd"];
+        [animation setTimingFunction:timing];
+        [animation setFillMode:kCAFillModeBoth];
+        animation.fromValue = @(0);
+        animation.toValue = @(1);
+        animation.duration = 0.3f;
+        animation.delegate = self;
+        [self.checkLayer addAnimation:animation forKey:@"strokeEnd"];
+    } else if (self.isRotated) {
+        UIBezierPath *crossPath = [[UIBezierPath alloc] init];
+        [crossPath moveToPoint:CGPointMake(CGRectGetWidth(bounds) * 7/16, CGRectGetHeight(bounds) * 1/4)];
+        [crossPath addLineToPoint:CGPointMake(CGRectGetWidth(bounds) * 7/16, CGRectGetHeight(bounds) * 7/16)];
+        [crossPath addLineToPoint:CGPointMake(CGRectGetWidth(bounds) * 1/4, CGRectGetHeight(bounds) * 7/16)];
+        [crossPath addLineToPoint:CGPointMake(CGRectGetWidth(bounds) * 1/4, CGRectGetHeight(bounds) * 9/16)];
+        [crossPath addLineToPoint:CGPointMake(CGRectGetWidth(bounds) * 7/16, CGRectGetHeight(bounds) * 9/16)];
+        [crossPath addLineToPoint:CGPointMake(CGRectGetWidth(bounds) * 7/16, CGRectGetHeight(bounds) * 3/4)];
+        [crossPath addLineToPoint:CGPointMake(CGRectGetWidth(bounds) * 9/16, CGRectGetHeight(bounds) * 3/4)];
+        [crossPath addLineToPoint:CGPointMake(CGRectGetWidth(bounds) * 9/16, CGRectGetHeight(bounds) * 9/16)];
+        [crossPath addLineToPoint:CGPointMake(CGRectGetWidth(bounds) * 3/4, CGRectGetHeight(bounds) * 9/16)];
+        [crossPath addLineToPoint:CGPointMake(CGRectGetWidth(bounds) * 3/4, CGRectGetHeight(bounds) * 7/16)];
+        [crossPath addLineToPoint:CGPointMake(CGRectGetWidth(bounds) * 9/16, CGRectGetHeight(bounds) * 7/16)];
+        [crossPath addLineToPoint:CGPointMake(CGRectGetWidth(bounds) * 9/16, CGRectGetHeight(bounds) * 1/4)];
+        [crossPath closePath];
+        
+        CAShapeLayer *crossLayer = [[CAShapeLayer alloc] init];
+        crossLayer.path = crossPath.CGPath;
+        crossLayer.bounds = CGPathGetBoundingBox(crossLayer.path);
+        crossLayer.anchorPoint = CGPointMake(0.5, 0.5);
+        crossLayer.fillColor = self.tintColor.CGColor;
+        
+        CATransform3D transform = CATransform3DMakeTranslation(CGRectGetMidX(bounds), CGRectGetMidY(bounds), 1);
+        transform = CATransform3DRotate(transform, ORKPlaceHoleViewRotation * (M_PI / 180), 0, 0, 1);
+        crossLayer.transform = transform;
+        
+        self.crossLayer = crossLayer;
+        
+        [self.layer addSublayer:self.crossLayer];
+    }
+    
+    CGContextRestoreGState(context);
+}
+
+- (void)animationDidStop:(CAAnimation *)theAnimation finished:(BOOL)flag {
+    ORKWeakTypeOf(self) weakSelf = self;
+    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.7f * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+        ORKStrongTypeOf(self) strongSelf = weakSelf;
+        strongSelf.success = NO;
+    });
+}
+
+@end

ResearchKit/ActiveTasks/ORKHolePegTestPlacePegView.h

@@ -0,0 +1,45 @@
+/*
+ Copyright (c) 2015, Shazino SAS. 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;
+#import "ORKDefines.h"
+
+
+NS_ASSUME_NONNULL_BEGIN
+
+ORK_CLASS_AVAILABLE
+@interface ORKHolePegTestPlacePegView : UIView
+
+@property (nonatomic, assign, getter = isRotated) BOOL rotated;
+
+@end
+
+NS_ASSUME_NONNULL_END

ResearchKit/ActiveTasks/ORKHolePegTestPlacePegView.m

@@ -0,0 +1,93 @@
+/*
+ Copyright (c) 2015, Shazino SAS. 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 "ORKHolePegTestPlacePegView.h"
+
+
+@implementation ORKHolePegTestPlacePegView
+
+- (instancetype)initWithFrame:(CGRect)frame
+{
+    self = [super initWithFrame:frame];
+    if (self) {
+        self.opaque = NO;
+    }
+    
+    return self;
+}
+
+- (CGSize)intrinsicContentSize {
+    return CGSizeMake(self.frame.size.width, self.frame.size.height);
+}
+
+#pragma mark - drawing method
+
+- (void)tintColorDidChange {
+    [super tintColorDidChange];
+    [self setNeedsDisplay];
+}
+
+- (void)setRotated:(BOOL)rotated
+{
+    _rotated = rotated;
+    [self setNeedsDisplay];
+}
+
+- (void)drawRect:(CGRect)rect {
+    CGContextRef context = UIGraphicsGetCurrentContext();
+    CGContextSaveGState(context);
+    
+    CGRect bounds = self.bounds;
+    UIBezierPath *path = [UIBezierPath bezierPathWithOvalInRect:bounds];
+    
+    if (self.isRotated) {
+        [path moveToPoint:CGPointMake(CGRectGetWidth(bounds) * 7/16, CGRectGetHeight(bounds) * 1/4)];
+        [path addLineToPoint:CGPointMake(CGRectGetWidth(bounds) * 7/16, CGRectGetHeight(bounds) * 7/16)];
+        [path addLineToPoint:CGPointMake(CGRectGetWidth(bounds) * 1/4, CGRectGetHeight(bounds) * 7/16)];
+        [path addLineToPoint:CGPointMake(CGRectGetWidth(bounds) * 1/4, CGRectGetHeight(bounds) * 9/16)];
+        [path addLineToPoint:CGPointMake(CGRectGetWidth(bounds) * 7/16, CGRectGetHeight(bounds) * 9/16)];
+        [path addLineToPoint:CGPointMake(CGRectGetWidth(bounds) * 7/16, CGRectGetHeight(bounds) * 3/4)];
+        [path addLineToPoint:CGPointMake(CGRectGetWidth(bounds) * 9/16, CGRectGetHeight(bounds) * 3/4)];
+        [path addLineToPoint:CGPointMake(CGRectGetWidth(bounds) * 9/16, CGRectGetHeight(bounds) * 9/16)];
+        [path addLineToPoint:CGPointMake(CGRectGetWidth(bounds) * 3/4, CGRectGetHeight(bounds) * 9/16)];
+        [path addLineToPoint:CGPointMake(CGRectGetWidth(bounds) * 3/4, CGRectGetHeight(bounds) * 7/16)];
+        [path addLineToPoint:CGPointMake(CGRectGetWidth(bounds) * 9/16, CGRectGetHeight(bounds) * 7/16)];
+        [path addLineToPoint:CGPointMake(CGRectGetWidth(bounds) * 9/16, CGRectGetHeight(bounds) * 1/4)];
+        [path closePath];
+    }
+    
+    [self.tintColor setFill];
+    [path fill];
+    
+    CGContextRestoreGState(context);
+}
+
+@end

ResearchKit/ActiveTasks/ORKHolePegTestPlaceStep.h

@@ -0,0 +1,50 @@
+/*
+ Copyright (c) 2015, Shazino SAS. 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;
+#import <ResearchKit/ORKDefines.h>
+#import <ResearchKit/ORKActiveStep.h>
+
+
+NS_ASSUME_NONNULL_BEGIN
+
+ORK_CLASS_AVAILABLE
+@interface ORKHolePegTestPlaceStep : ORKActiveStep
+
+@property (nonatomic, assign) ORKBodySagittal movingDirection;
+@property (nonatomic, assign, getter = isDominantHandTested) BOOL dominantHandTested;
+@property (nonatomic, assign) NSInteger numberOfPegs;
+@property (nonatomic, assign) double threshold;
+@property (nonatomic, assign, getter = isRotated) BOOL rotated;
+
+@end
+
+NS_ASSUME_NONNULL_END

ResearchKit/ActiveTasks/ORKHolePegTestPlaceStep.m

@@ -0,0 +1,136 @@
+/*
+ Copyright (c) 2015, Shazino SAS. 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 "ORKHolePegTestPlaceStep.h"
+#import "ORKHolePegTestPlaceStepViewController.h"
+#import "ORKHelpers_Internal.h"
+
+
+@implementation ORKHolePegTestPlaceStep
+
++ (Class)stepViewControllerClass {
+    return [ORKHolePegTestPlaceStepViewController class];
+}
+
+- (instancetype)initWithIdentifier:(NSString *)identifier {
+    self = [super initWithIdentifier:identifier];
+    if (self) {
+        self.shouldShowDefaultTimer = NO;
+        self.shouldContinueOnFinish = YES;
+    }
+    return self;
+}
+
+- (void)validateParameters {
+    [super validateParameters];
+    
+    int const ORKHolePegTestMinimumNumberOfPegs = 1;
+    
+    double const ORKHolePegTestMinimumThreshold = 0.0f;
+    double const ORKHolePegTestMaximumThreshold = 1.0f;
+    
+    NSTimeInterval const ORKHolePegTestMinimumDuration = 1.0f;
+    
+    if (self.movingDirection != ORKBodySagittalLeft &&
+        self.movingDirection != ORKBodySagittalRight) {
+        @throw [NSException exceptionWithName:NSInvalidArgumentException reason:[NSString stringWithFormat:@"moving direction should be left or right."] userInfo:nil];
+    }
+    
+    if (self.numberOfPegs < ORKHolePegTestMinimumNumberOfPegs) {
+        @throw [NSException exceptionWithName:NSInvalidArgumentException reason:[NSString stringWithFormat:@"number of pegs must be greater than or equal to %@.", @(ORKHolePegTestMinimumNumberOfPegs)] userInfo:nil];
+    }
+    
+    if (self.threshold < ORKHolePegTestMinimumThreshold ||
+        self.threshold > ORKHolePegTestMaximumThreshold) {
+        @throw [NSException exceptionWithName:NSInvalidArgumentException reason:[NSString stringWithFormat:@"threshold must be greater than or equal to %@ and lower or equal to %@.", @(ORKHolePegTestMinimumThreshold), @(ORKHolePegTestMaximumThreshold)] userInfo:nil];
+    }
+    
+    if (self.stepDuration < ORKHolePegTestMinimumDuration) {
+        @throw [NSException exceptionWithName:NSInvalidArgumentException reason:[NSString stringWithFormat:@"duration cannot be shorter than %@ seconds.", @(ORKHolePegTestMinimumDuration)] userInfo:nil];
+    }
+}
+
+- (BOOL)allowsBackNavigation {
+    return NO;
+}
+
++ (BOOL)supportsSecureCoding {
+    return YES;
+}
+
+- (instancetype)initWithCoder:(NSCoder *)aDecoder {
+    self = [super initWithCoder:aDecoder];
+    if (self) {
+        ORK_DECODE_ENUM(aDecoder, movingDirection);
+        ORK_DECODE_BOOL(aDecoder, dominantHandTested);
+        ORK_DECODE_INTEGER(aDecoder, numberOfPegs);
+        ORK_DECODE_DOUBLE(aDecoder, threshold);
+        ORK_DECODE_BOOL(aDecoder, rotated);
+    }
+    return self;
+}
+
+- (void)encodeWithCoder:(NSCoder *)aCoder {
+    [super encodeWithCoder:aCoder];
+    ORK_ENCODE_ENUM(aCoder, movingDirection);
+    ORK_ENCODE_BOOL(aCoder, dominantHandTested);
+    ORK_ENCODE_INTEGER(aCoder, numberOfPegs);
+    ORK_ENCODE_DOUBLE(aCoder, threshold);
+    ORK_ENCODE_BOOL(aCoder, rotated);
+}
+
+- (instancetype)copyWithZone:(NSZone *)zone {
+    __typeof(self) step = [super copyWithZone:zone];
+    step.movingDirection = self.movingDirection;
+    step.dominantHandTested = self.dominantHandTested;
+    step.numberOfPegs = self.numberOfPegs;
+    step.threshold = self.threshold;
+    step.rotated = self.rotated;
+    return step;
+}
+
+- (NSUInteger)hash {
+    return [super hash] ^ self.movingDirection ^ self.dominantHandTested ^ self.numberOfPegs ^ (NSInteger)(self.threshold * 100) ^ self.rotated;
+}
+
+- (BOOL)isEqual:(id)object {
+    BOOL isParentSame = [super isEqual:object];
+    
+    __typeof(self) castObject = object;
+    return (isParentSame &&
+            (self.movingDirection == castObject.movingDirection) &&
+            (self.dominantHandTested == castObject.dominantHandTested) &&
+            (self.numberOfPegs == castObject.numberOfPegs) &&
+            (self.threshold == castObject.threshold) &&
+            (self.rotated == castObject.rotated));
+}
+
+@end

ResearchKit/ActiveTasks/ORKHolePegTestPlaceStepViewController.h

@@ -0,0 +1,44 @@
+/*
+ Copyright (c) 2015, Shazino SAS. 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;
+#import <ResearchKit/ORKDefines.h>
+#import <ResearchKit/ORKActiveStepViewController.h>
+
+
+NS_ASSUME_NONNULL_BEGIN
+
+ORK_CLASS_AVAILABLE
+@interface ORKHolePegTestPlaceStepViewController : ORKActiveStepViewController
+
+@end
+
+NS_ASSUME_NONNULL_END

ResearchKit/ActiveTasks/ORKHolePegTestPlaceStepViewController.m

@@ -0,0 +1,181 @@
+/*
+ Copyright (c) 2015, Shazino SAS. 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 "ORKHolePegTestPlaceStepViewController.h"
+
+#import "ORKActiveStepView.h"
+#import "ORKHolePegTestPlaceContentView.h"
+
+#import "ORKActiveStepViewController_Internal.h"
+#import "ORKStepViewController_Internal.h"
+#import "ORKTaskViewController.h"
+
+#import "ORKHolePegTestPlaceStep.h"
+#import "ORKNavigableOrderedTask.h"
+#import "ORKResult.h"
+
+#import "ORKHelpers_Internal.h"
+
+
+@interface ORKHolePegTestPlaceStepViewController () <ORKHolePegTestPlaceContentViewDelegate>
+
+@property (nonatomic, strong) NSMutableArray *samples;
+@property (nonatomic, strong) ORKHolePegTestPlaceContentView *holePegTestPlaceContentView;
+@property (nonatomic, assign) NSTimeInterval sampleStart;
+@property (nonatomic, assign) NSUInteger successes;
+@property (nonatomic, assign) NSUInteger failures;
+
+@end
+
+
+@implementation ORKHolePegTestPlaceStepViewController
+
+- (instancetype)initWithStep:(ORKStep *)step {
+    self = [super initWithStep:step];
+    if (self) {
+        self.suspendIfInactive = YES;
+    }
+    return self;
+}
+
+- (ORKHolePegTestPlaceStep *)holePegTestPlaceStep {
+    return (ORKHolePegTestPlaceStep *)self.step;
+}
+
+- (void)initializeInternalButtonItems {
+    [super initializeInternalButtonItems];
+    
+    // Don't show next button
+    self.internalContinueButtonItem = nil;
+    self.internalDoneButtonItem = nil;
+}
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    
+    self.holePegTestPlaceContentView = [[ORKHolePegTestPlaceContentView alloc] initWithMovingDirection:[self holePegTestPlaceStep].movingDirection
+                                                                                               rotated:[self holePegTestPlaceStep].rotated];
+    self.holePegTestPlaceContentView.threshold = [self holePegTestPlaceStep].threshold;
+    self.holePegTestPlaceContentView.delegate = self;
+    self.activeStepView.activeCustomView = self.holePegTestPlaceContentView;
+    self.activeStepView.stepViewFillsAvailableSpace = YES;
+}
+
+#pragma mark - step life cycle methods
+
+- (void)start {
+    self.successes = 0;
+    self.failures = 0;
+    self.samples = [NSMutableArray array];
+    [self.holePegTestPlaceContentView setProgress:0.001f animated:NO];
+    
+    [super start];
+}
+
+#pragma mark - result methods
+
+- (ORKStepResult *)result {
+    ORKStepResult *sResult = [super result];
+
+    NSMutableArray *results = [NSMutableArray arrayWithArray:sResult.results];
+
+    ORKHolePegTestResult *holePegTestResult = [[ORKHolePegTestResult alloc] initWithIdentifier:self.step.identifier];
+    holePegTestResult.movingDirection = [self holePegTestPlaceStep].movingDirection;
+    holePegTestResult.dominantHandTested = [self holePegTestPlaceStep].isDominantHandTested;
+    holePegTestResult.numberOfPegs = [self holePegTestPlaceStep].numberOfPegs;
+    holePegTestResult.threshold = [self holePegTestPlaceStep].threshold;
+    holePegTestResult.rotated = [self holePegTestPlaceStep].isRotated;
+    holePegTestResult.totalSuccesses = self.successes;
+    holePegTestResult.totalFailures = self.failures;
+    holePegTestResult.totalTime = [self holePegTestPlaceStep].stepDuration - self.timeRemaining;
+    double totalDistance = 0.0;
+    for (ORKHolePegTestSample *sample in self.samples) {
+        totalDistance += sample.distance;
+    }
+    holePegTestResult.totalDistance = totalDistance;
+    holePegTestResult.samples = self.samples;
+
+    [results addObject:holePegTestResult];
+    
+    sResult.results = [results copy];
+    
+    return sResult;
+}
+
+- (void)saveSampleWithDistance:(CGFloat)distance {
+    ORKHolePegTestSample *sample = [[ORKHolePegTestSample alloc] init];
+    sample.time = CACurrentMediaTime() - self.sampleStart;
+    sample.distance = distance;
+    self.sampleStart = CACurrentMediaTime();
+    
+    [self.samples addObject:sample];
+}
+
+#pragma mark - hole peg test content view delegate
+
+- (NSString *)stepTitle {
+    NSString *title = ([self holePegTestPlaceStep].movingDirection == ORKBodySagittalLeft) ? ORKLocalizedString(@"HOLE_PEG_TEST_PLACE_INSTRUCTION_LEFT_HAND", nil) : ORKLocalizedString(@"HOLE_PEG_TEST_PLACE_INSTRUCTION_RIGHT_HAND", nil);
+    return title;
+}
+
+- (void)holePegTestPlaceDidProgress:(ORKHolePegTestPlaceContentView *)holePegTestPlaceContentView {
+    if (!self.isStarted) {
+        self.sampleStart = CACurrentMediaTime();
+        [self start];
+    }
+    
+    [self.activeStepView updateTitle:[self stepTitle]
+                                text:ORKLocalizedString(@"HOLE_PEG_TEST_TEXT_2", nil)];
+}
+
+- (void)holePegTestPlaceDidSucceed:(ORKHolePegTestPlaceContentView *)holePegTestPlaceContentView withDistance:(CGFloat)distance {
+    self.successes++;
+    
+    [self saveSampleWithDistance:distance];
+    
+    [holePegTestPlaceContentView setProgress:((CGFloat)self.successes / [self holePegTestPlaceStep].numberOfPegs) animated:YES];
+    [self.activeStepView updateTitle:[self stepTitle]
+                                text:ORKLocalizedString(@"HOLE_PEG_TEST_TEXT", nil)];
+    
+    if (self.successes >= [self holePegTestPlaceStep].numberOfPegs) {
+        [((ORKNavigableOrderedTask *)self.taskViewController.task) removeNavigationRuleForTriggerStepIdentifier:[self holePegTestPlaceStep].identifier];
+        [self finish];
+    }
+}
+
+- (void)holePegTestPlaceDidFail:(ORKHolePegTestPlaceContentView *)holePegTestPlaceContentView {
+    self.failures++;
+    
+    [self.activeStepView updateTitle:[self stepTitle]
+                                text:ORKLocalizedString(@"HOLE_PEG_TEST_TEXT", nil)];
+}
+
+@end

ResearchKit/ActiveTasks/ORKHolePegTestRemoveContentView.h

@@ -0,0 +1,65 @@
+/*
+ Copyright (c) 2015, Shazino SAS. 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;
+#import "ORKCustomStepView_Internal.h"
+#import "ORKTypes.h"
+
+
+NS_ASSUME_NONNULL_BEGIN
+
+@protocol ORKHolePegTestRemoveContentViewDelegate;
+
+ORK_CLASS_AVAILABLE
+@interface ORKHolePegTestRemoveContentView : ORKActiveStepCustomView
+
+- (instancetype)initWithCoder:(NSCoder *)aDecoder NS_UNAVAILABLE;
+- (instancetype)initWithFrame:(CGRect)frame NS_UNAVAILABLE;
+- (instancetype)initWithMovingDirection:(ORKBodySagittal)movingDirection NS_DESIGNATED_INITIALIZER;
+
+@property (nonatomic, assign) ORKBodySagittal movingDirection;
+@property (nonatomic, assign) double threshold;
+@property (nonatomic, weak) id<ORKHolePegTestRemoveContentViewDelegate> delegate;
+
+- (void)setProgress:(CGFloat)progress animated:(BOOL)animated;
+
+@end
+
+
+@protocol ORKHolePegTestRemoveContentViewDelegate <NSObject>
+
+- (void)holePegTestRemoveDidProgress:(ORKHolePegTestRemoveContentView *)holePegTestRemoveContentView;
+- (void)holePegTestRemoveDidSucceed:(ORKHolePegTestRemoveContentView *)holePegTestRemoveContentView withDistance:(CGFloat)distance;
+- (void)holePegTestRemoveDidFail:(ORKHolePegTestRemoveContentView *)holePegTestRemoveContentView;
+
+@end
+
+NS_ASSUME_NONNULL_END

ResearchKit/ActiveTasks/ORKHolePegTestRemoveContentView.m

@@ -0,0 +1,358 @@
+/*
+ Copyright (c) 2015, Shazino SAS. 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 "ORKHolePegTestRemoveContentView.h"
+
+#import "ORKDirectionView.h"
+#import "ORKHolePegTestRemovePegView.h"
+#import "ORKSeparatorView.h"
+
+#import "ORKHelpers_Internal.h"
+#import "ORKSkin.h"
+
+
+static const CGFloat PegViewDiameter = 88.0f;
+static const CGFloat PegViewSeparatorWidth = 2.0f;
+
+
+@interface ORKHolePegTestRemoveContentView () <UIGestureRecognizerDelegate>
+
+@property (nonatomic, strong) UIProgressView *progressView;
+@property (nonatomic, strong) ORKHolePegTestRemovePegView *pegView;
+@property (nonatomic, strong) ORKSeparatorView *separatorView;
+@property (nonatomic, strong) ORKDirectionView *directionView;
+@property (nonatomic, strong) UIView *container;
+@property (nonatomic, copy) NSArray *constraints;
+
+@property (nonatomic, strong) UIPinchGestureRecognizer *pinchRecognizer;
+@property (nonatomic, strong) UIPanGestureRecognizer *panRecognizer;
+@property (nonatomic, assign, getter = isMovable) BOOL movable;
+@property (nonatomic, assign, getter = hasMoveEnded) BOOL moveEnded;
+@property (nonatomic, assign) CGPoint translation;
+@property (nonatomic, assign) CGPoint translationOffset;
+@property (nonatomic, assign) CGPoint startPoint;
+
+@end
+
+
+@implementation ORKHolePegTestRemoveContentView
+
+- (instancetype)initWithCoder:(NSCoder *)aDecoder {
+    ORKThrowMethodUnavailableException();
+}
+
+- (instancetype)initWithFrame:(CGRect)frame {
+    ORKThrowMethodUnavailableException();
+}
+
+- (instancetype)initWithMovingDirection:(ORKBodySagittal)movingDirection {
+    self = [super initWithFrame:CGRectZero];
+    if (self) {
+        self.movingDirection = movingDirection;
+        self.opaque = NO;
+        
+        self.container = [UIView new];
+        self.container.translatesAutoresizingMaskIntoConstraints = NO;
+        
+        self.progressView = [UIProgressView new];
+        self.progressView.progressTintColor = self.tintColor;
+        [self.progressView setTranslatesAutoresizingMaskIntoConstraints:NO];
+        [self.progressView setAlpha:0];
+        [self addSubview:self.progressView];
+        
+        self.pegView = [[ORKHolePegTestRemovePegView alloc] initWithFrame:CGRectMake(0, 0, PegViewDiameter, PegViewDiameter)];
+        [self.pegView setTranslatesAutoresizingMaskIntoConstraints:NO];
+        [self.container addSubview:self.pegView];
+        
+        self.separatorView = [[ORKSeparatorView alloc] init];
+        [self.separatorView setTranslatesAutoresizingMaskIntoConstraints:NO];
+        [self.container addSubview:self.separatorView];
+        
+        self.directionView = [[ORKDirectionView alloc] initWithOrientation:(self.movingDirection == ORKBodySagittalLeft) ? ORKBodySagittalRight : ORKBodySagittalLeft];
+        [self.directionView setTranslatesAutoresizingMaskIntoConstraints:NO];
+        [self addSubview:self.directionView];
+        
+        [self addSubview:self.container];
+        
+        [self setTranslatesAutoresizingMaskIntoConstraints:NO];
+        [self setNeedsUpdateConstraints];
+        
+        self.movable = NO;
+        self.moveEnded = NO;
+        self.startPoint = CGPointZero;
+        
+        self.pinchRecognizer = [[UIPinchGestureRecognizer alloc] initWithTarget:self
+                                                                         action:@selector(handlePinch:)];
+        self.pinchRecognizer.delegate = self;
+        [self addGestureRecognizer:self.pinchRecognizer];
+        
+        self.panRecognizer = [[UIPanGestureRecognizer alloc] initWithTarget:self
+                                                                     action:@selector(handlePan:)];
+        self.panRecognizer.delegate = self;
+        [self addGestureRecognizer:self.panRecognizer];
+    }
+    return self;
+}
+
+- (void)tintColorDidChange {
+    [super tintColorDidChange];
+    self.progressView.progressTintColor = self.tintColor;
+}
+
+- (void)setProgress:(CGFloat)progress animated:(BOOL)animated {
+    [self.progressView setProgress:progress animated:animated];
+    [UIView animateWithDuration:animated ? 0.2 : 0 animations:^{
+        [self.progressView setAlpha:(progress == 0) ? 0 : 1];
+    }];
+}
+
+- (void)updateLayoutMargins {
+    CGFloat margin = ORKStandardHorizontalMarginForView(self);
+    self.layoutMargins = (UIEdgeInsets){.left = margin * 2, .right = margin * 2};
+}
+
+- (void)setFrame:(CGRect)frame {
+    [super setFrame:frame];
+    [self updateLayoutMargins];
+}
+
+- (void)setBounds:(CGRect)bounds {
+    [super setBounds:bounds];
+    [self updateLayoutMargins];
+}
+
+- (void)updateConstraints {
+    if ([self.constraints count]) {
+        [NSLayoutConstraint deactivateConstraints:self.constraints];
+        self.constraints = nil;
+    }
+
+    NSMutableArray *constraintsArray = [NSMutableArray array];
+    
+    NSDictionary *views = NSDictionaryOfVariableBindings(_progressView, _container, _pegView, _separatorView, _directionView);
+    NSDictionary *metrics = @{@"diameter": @(PegViewDiameter), @"separator": @(PegViewSeparatorWidth), @"margin": @((1 + self.threshold) * PegViewDiameter)};
+    
+    [constraintsArray addObjectsFromArray:
+     [NSLayoutConstraint constraintsWithVisualFormat:@"H:|-[_progressView]-|"
+                                             options:(NSLayoutFormatOptions)0
+                                             metrics:nil views:views]];
+    
+    [constraintsArray addObjectsFromArray:
+     [NSLayoutConstraint constraintsWithVisualFormat:(self.movingDirection == ORKBodySagittalLeft) ? @"H:|-[_pegView(diameter)]->=0-[_separatorView(separator)]-(margin)-|" : @"H:|-(margin)-[_separatorView(separator)]->=0-[_pegView(diameter)]-|"
+                                             options:NSLayoutFormatAlignAllCenterY
+                                             metrics:metrics views:views]];
+    
+    [constraintsArray addObjectsFromArray:
+     [NSLayoutConstraint constraintsWithVisualFormat:@"H:|[_container]|"
+                                             options:(NSLayoutFormatOptions)0
+                                             metrics:nil views:views]];
+    
+    [constraintsArray addObjectsFromArray:
+     [NSLayoutConstraint constraintsWithVisualFormat:@"V:|-(>=0)-[_pegView(diameter)]-(>=0)-|"
+                                             options:(NSLayoutFormatOptions)0
+                                             metrics:metrics views:views]];
+    
+    [constraintsArray addObjectsFromArray:
+     [NSLayoutConstraint constraintsWithVisualFormat:@"V:|-[_separatorView]-|"
+                                             options:(NSLayoutFormatOptions)0
+                                             metrics:nil views:views]];
+    
+    [constraintsArray addObjectsFromArray:
+     [NSLayoutConstraint constraintsWithVisualFormat:@"V:|[_progressView][_container]|"
+                                             options:(NSLayoutFormatOptions)0
+                                             metrics:metrics views:views]];
+    
+    [constraintsArray addObject:[NSLayoutConstraint constraintWithItem:self.directionView
+                                                             attribute:NSLayoutAttributeCenterX
+                                                             relatedBy:NSLayoutRelationEqual
+                                                                toItem:self
+                                                             attribute:NSLayoutAttributeCenterX
+                                                            multiplier:1
+                                                              constant:0]];
+    
+    [constraintsArray addObject:[NSLayoutConstraint constraintWithItem:self.directionView
+                                                             attribute:NSLayoutAttributeCenterY
+                                                             relatedBy:NSLayoutRelationEqual
+                                                                toItem:self
+                                                             attribute:NSLayoutAttributeCenterY
+                                                            multiplier:1
+                                                              constant:0]];
+    
+    self.constraints = constraintsArray;
+    [self addConstraints:self.constraints];
+    
+    [NSLayoutConstraint activateConstraints:self.constraints];
+    [super updateConstraints];
+}
+
+#pragma mark - gesture recognizer methods
+
+- (void)pickupPegWithGestureRecognizer:(UIGestureRecognizer *)gestureRecognizer {
+    CGPoint touch = [gestureRecognizer locationInView:self];
+    CGPoint touch1 = [gestureRecognizer locationOfTouch:0 inView:self];
+    CGPoint touch2 = [gestureRecognizer locationOfTouch:1 inView:self];
+    double distance = hypot(touch1.x - touch2.x, touch1.y - touch2.y);
+    
+    if (distance < 3 * CGRectGetWidth(self.pegView.frame) &&
+        CGRectContainsPoint(self.pegView.frame, touch)) {
+        self.movable = YES;
+    } else {
+        self.movable = NO;
+    }
+}
+
+- (void)handlePinch:(UIPinchGestureRecognizer *)pinchGestureRecognizer {
+    if ([pinchGestureRecognizer numberOfTouches] == 2) {
+        [self pickupPegWithGestureRecognizer:pinchGestureRecognizer];
+    }
+}
+
+- (void)handlePan:(UIPanGestureRecognizer *)panGestureRecognizer {
+    if ([panGestureRecognizer numberOfTouches] != 2 ||
+        panGestureRecognizer.state == UIGestureRecognizerStateEnded ||
+        panGestureRecognizer.state == UIGestureRecognizerStateCancelled ||
+        panGestureRecognizer.state == UIGestureRecognizerStateFailed) {
+        [self resetTransformAtPoint:[panGestureRecognizer locationInView:self]];
+    } else {
+        if (self.isMovable) {
+            self.translation = CGPointMake([panGestureRecognizer translationInView:self].x - self.translationOffset.x,
+                                           [panGestureRecognizer translationInView:self].y - self.translationOffset.y);
+            [self updateTransformAtPoint:[panGestureRecognizer locationInView:self]];
+        } else {
+            self.translationOffset = CGPointMake([panGestureRecognizer translationInView:self].x - self.translation.x,
+                                                 [panGestureRecognizer translationInView:self].y - self.translation.y);
+            if (CGPointEqualToPoint(self.startPoint, CGPointZero)) {
+                [self pickupPegWithGestureRecognizer:panGestureRecognizer];
+            }
+        }
+    }
+}
+
+- (void)updateTransformAtPoint:(CGPoint)point {
+    self.pegView.transform = CGAffineTransformMakeTranslation(self.translation.x, self.translation.y);
+    [self pegViewDidMoveAtPoint:point];
+}
+
+- (void)resetTransformAtPoint:(CGPoint)point {
+    if (!self.hasMoveEnded) {
+        self.movable = NO;
+        self.moveEnded = YES;
+        
+        self.pinchRecognizer.enabled = NO;
+        self.panRecognizer.enabled = NO;
+        
+        BOOL animated = ![self pegViewMoveDidEndAtPoint:point];
+        
+        [UIView animateWithDuration:animated ? 0.15f : 0.0f
+                              delay:animated ? 0.0f : 0.30f
+                            options:UIViewAnimationOptionCurveEaseOut
+                         animations:^(){
+                             self.pegView.transform = CGAffineTransformIdentity;
+                             self.pegView.alpha = 1.0f;
+                         }
+                         completion:^(BOOL finished){
+                             self.translation = CGPointZero;
+                             self.translationOffset = CGPointZero;
+                             self.pinchRecognizer.enabled = YES;
+                             self.panRecognizer.enabled = YES;
+                             self.moveEnded = NO;
+                             self.pegView.hidden = NO;
+                         }];
+    }
+}
+
+- (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer
+shouldRecognizeSimultaneouslyWithGestureRecognizer:(UIGestureRecognizer *)otherGestureRecognizer {
+    return YES;
+}
+
+#pragma mark - peg view delegate
+
+- (void)pegViewDidMoveAtPoint:(CGPoint)point {
+    self.directionView.hidden = YES;
+    
+    if (CGPointEqualToPoint(self.startPoint, CGPointZero)) {
+        self.startPoint = point;
+    }
+    
+    if ([self.delegate respondsToSelector:@selector(holePegTestRemoveDidProgress:)]) {
+        [self.delegate holePegTestRemoveDidProgress:self];
+    }
+    
+    if (self.pegView.isSuccess) {
+        self.pegView.success = NO;
+    }
+    
+    if ([self pegViewBehindLine]) {
+        self.pegView.alpha = 1.0f;
+    } else {
+        self.pegView.alpha = 0.2f;
+    }
+}
+
+- (BOOL)pegViewMoveDidEndAtPoint:(CGPoint)point {
+    self.directionView.hidden = NO;
+    
+    BOOL succeeded = NO;
+    if ([self pegViewBehindLine]) {
+        if ([self.delegate respondsToSelector:@selector(holePegTestRemoveDidSucceed:withDistance:)]) {
+            CGFloat distance = hypotf(point.x - self.startPoint.x, point.y - self.startPoint.y);
+            [self.delegate holePegTestRemoveDidSucceed:self withDistance:distance];
+        }
+        self.pegView.success = YES;
+        succeeded = YES;
+    } else {
+        if ([self.delegate respondsToSelector:@selector(holePegTestRemoveDidFail:)]) {
+            [self.delegate holePegTestRemoveDidFail:self];
+        }
+        self.pegView.success = NO;
+    }
+    self.startPoint = CGPointZero;
+    return succeeded;
+}
+
+- (BOOL)pegViewBehindLine {
+    if (self.movingDirection == ORKBodySagittalLeft) {
+        if (CGRectGetMinX(self.pegView.frame) > CGRectGetMaxX(self.separatorView.frame)) {
+            return YES;
+        } else {
+            return NO;
+        }
+    } else {
+        if (CGRectGetMaxX(self.pegView.frame) < CGRectGetMinX(self.separatorView.frame)) {
+            return YES;
+        } else {
+            return NO;
+        }
+    }
+}
+
+@end

ResearchKit/ActiveTasks/ORKHolePegTestRemovePegView.h

@@ -0,0 +1,45 @@
+/*
+ Copyright (c) 2015, Shazino SAS. 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;
+#import "ORKDefines.h"
+
+
+NS_ASSUME_NONNULL_BEGIN
+
+ORK_CLASS_AVAILABLE
+@interface ORKHolePegTestRemovePegView : UIView <CAAnimationDelegate>
+
+@property (nonatomic, assign, getter = isSuccess) BOOL success;
+
+@end
+
+NS_ASSUME_NONNULL_END

ResearchKit/ActiveTasks/ORKHolePegTestRemovePegView.m

@@ -0,0 +1,122 @@
+/*
+ Copyright (c) 2015, Shazino SAS. 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 "ORKHolePegTestRemovePegView.h"
+
+
+@interface ORKHolePegTestRemovePegView ()
+
+@property (nonatomic, strong) CAShapeLayer *checkLayer;
+
+@end
+
+
+@implementation ORKHolePegTestRemovePegView
+
+- (instancetype)initWithFrame:(CGRect)frame
+{
+    self = [super initWithFrame:frame];
+    if (self) {
+        UIBezierPath *path = [[UIBezierPath alloc] init];
+        [path moveToPoint:CGPointMake(27.7f, 46.9f)];
+        [path addLineToPoint:CGPointMake(36.1f, 56.3f)];
+        [path addLineToPoint:CGPointMake(62.8f, 30.3f)];
+        path.lineCapStyle = kCGLineCapRound;
+        path.lineWidth = 3.6f;
+        
+        CAShapeLayer *checkLayer = [CAShapeLayer new];
+        checkLayer.path = path.CGPath;
+        checkLayer.lineWidth = 3.6f;
+        checkLayer.lineCap = kCALineCapRound;
+        checkLayer.lineJoin = kCALineJoinRound;
+        checkLayer.frame = self.layer.bounds;
+        checkLayer.strokeColor = [UIColor whiteColor].CGColor;
+        checkLayer.backgroundColor = [UIColor clearColor].CGColor;
+        checkLayer.fillColor = nil;
+        self.checkLayer = checkLayer;
+        
+        self.opaque = NO;
+        self.success = NO;
+    }
+    
+    return self;
+}
+
+- (void)tintColorDidChange {
+    [super tintColorDidChange];
+    [self setNeedsDisplay];
+}
+
+#pragma mark - drawing method
+
+- (void)setSuccess:(BOOL)success
+{
+    _success = success;
+    [self.checkLayer removeFromSuperlayer];
+    [self setNeedsDisplay];
+}
+
+- (void)drawRect:(CGRect)rect {
+    CGContextRef context = UIGraphicsGetCurrentContext();
+    CGContextSaveGState(context);
+    
+    CGRect bounds = self.bounds;
+    UIBezierPath *path = [UIBezierPath bezierPathWithOvalInRect:bounds];
+    path.lineWidth = 2.0f;
+    [self.tintColor setFill];
+    [path fill];
+    
+    if (self.isSuccess) {
+        [self.layer addSublayer:self.checkLayer];
+        
+        CAMediaTimingFunction *timing = [[CAMediaTimingFunction alloc] initWithControlPoints:0.180739998817444
+                                                                                            :0
+                                                                                            :0.577960014343262
+                                                                                            :0.918200016021729];
+        
+        CABasicAnimation *animation = [CABasicAnimation animationWithKeyPath:@"strokeEnd"];
+        [animation setTimingFunction:timing];
+        [animation setFillMode:kCAFillModeBoth];
+        animation.fromValue = @(0);
+        animation.toValue = @(1);
+        animation.duration = 0.25f;
+        animation.delegate = self;
+        [self.checkLayer addAnimation:animation forKey:@"strokeEnd"];
+    }
+    
+    CGContextRestoreGState(context);
+}
+
+- (void)animationDidStop:(CAAnimation *)theAnimation finished:(BOOL)flag {
+    self.success = NO;
+}
+
+@end

ResearchKit/ActiveTasks/ORKHolePegTestRemoveStep.h

@@ -0,0 +1,49 @@
+/*
+ Copyright (c) 2015, Shazino SAS. 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;
+#import <ResearchKit/ORKDefines.h>
+#import <ResearchKit/ORKActiveStep.h>
+
+
+NS_ASSUME_NONNULL_BEGIN
+
+ORK_CLASS_AVAILABLE
+@interface ORKHolePegTestRemoveStep : ORKActiveStep
+
+@property (nonatomic, assign) ORKBodySagittal movingDirection;
+@property (nonatomic, assign, getter = isDominantHandTested) BOOL dominantHandTested;
+@property (nonatomic, assign) NSInteger numberOfPegs;
+@property (nonatomic, assign) double threshold;
+
+@end
+
+NS_ASSUME_NONNULL_END

ResearchKit/ActiveTasks/ORKHolePegTestRemoveStep.m

@@ -0,0 +1,134 @@
+/*
+ Copyright (c) 2015, Shazino SAS. 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 "ORKHolePegTestRemoveStep.h"
+
+#import "ORKHolePegTestRemoveStepViewController.h"
+
+#import "ORKHelpers_Internal.h"
+
+
+@implementation ORKHolePegTestRemoveStep
+
++ (Class)stepViewControllerClass {
+    return [ORKHolePegTestRemoveStepViewController class];
+}
+
+- (instancetype)initWithIdentifier:(NSString *)identifier {
+    self = [super initWithIdentifier:identifier];
+    if (self) {
+        self.shouldShowDefaultTimer = NO;
+        self.shouldContinueOnFinish = YES;
+    }
+    return self;
+}
+
+- (void)validateParameters {
+    [super validateParameters];
+    
+    int const ORKHolePegTestMinimumNumberOfPegs = 1;
+    
+    double const ORKHolePegTestMinimumThreshold = 0.0f;
+    double const ORKHolePegTestMaximumThreshold = 1.0f;
+    
+    NSTimeInterval const ORKHolePegTestMinimumDuration = 1.0f;
+    
+    if (self.movingDirection != ORKBodySagittalLeft &&
+        self.movingDirection != ORKBodySagittalRight) {
+        @throw [NSException exceptionWithName:NSInvalidArgumentException reason:[NSString stringWithFormat:@"moving direction should be left or right."] userInfo:nil];
+    }
+    
+    if (self.numberOfPegs < ORKHolePegTestMinimumNumberOfPegs) {
+        @throw [NSException exceptionWithName:NSInvalidArgumentException reason:[NSString stringWithFormat:@"number of pegs must be greater than or equal to %@.", @(ORKHolePegTestMinimumNumberOfPegs)] userInfo:nil];
+    }
+    
+    if (self.threshold < ORKHolePegTestMinimumThreshold ||
+        self.threshold > ORKHolePegTestMaximumThreshold) {
+        @throw [NSException exceptionWithName:NSInvalidArgumentException reason:[NSString stringWithFormat:@"threshold must be greater than or equal to %@ and lower or equal to %@.", @(ORKHolePegTestMinimumThreshold), @(ORKHolePegTestMaximumThreshold)] userInfo:nil];
+    }
+    
+    if (self.stepDuration < ORKHolePegTestMinimumDuration) {
+        @throw [NSException exceptionWithName:NSInvalidArgumentException reason:[NSString stringWithFormat:@"duration cannot be shorter than %@ seconds.", @(ORKHolePegTestMinimumDuration)] userInfo:nil];
+    }
+}
+
+- (BOOL)allowsBackNavigation {
+    return NO;
+}
+
++ (BOOL)supportsSecureCoding {
+    return YES;
+}
+
+- (instancetype)initWithCoder:(NSCoder *)aDecoder {
+    self = [super initWithCoder:aDecoder];
+    if (self) {
+        ORK_DECODE_ENUM(aDecoder, movingDirection);
+        ORK_DECODE_BOOL(aDecoder, dominantHandTested);
+        ORK_DECODE_INTEGER(aDecoder, numberOfPegs);
+        ORK_DECODE_DOUBLE(aDecoder, threshold);
+    }
+    return self;
+}
+
+- (void)encodeWithCoder:(NSCoder *)aCoder {
+    [super encodeWithCoder:aCoder];
+    ORK_ENCODE_ENUM(aCoder, movingDirection);
+    ORK_ENCODE_BOOL(aCoder, dominantHandTested);
+    ORK_ENCODE_INTEGER(aCoder, numberOfPegs);
+    ORK_ENCODE_DOUBLE(aCoder, threshold);
+}
+
+- (instancetype)copyWithZone:(NSZone *)zone {
+    __typeof(self) step = [super copyWithZone:zone];
+    step.movingDirection = self.movingDirection;
+    step.dominantHandTested = self.dominantHandTested;
+    step.numberOfPegs = self.numberOfPegs;
+    step.threshold = self.threshold;
+    return step;
+}
+
+- (NSUInteger)hash {
+    return [super hash] ^ self.movingDirection ^ self.dominantHandTested ^ self.numberOfPegs ^ (NSInteger)(self.threshold * 100);
+}
+
+- (BOOL)isEqual:(id)object {
+    BOOL isParentSame = [super isEqual:object];
+    
+    __typeof(self) castObject = object;
+    return (isParentSame &&
+            (self.movingDirection == castObject.movingDirection) &&
+            (self.dominantHandTested == castObject.dominantHandTested) &&
+            (self.numberOfPegs == castObject.numberOfPegs) &&
+            (self.threshold == castObject.threshold));
+}
+
+@end

ResearchKit/ActiveTasks/ORKHolePegTestRemoveStepViewController.h

@@ -0,0 +1,44 @@
+/*
+ Copyright (c) 2015, Shazino SAS. 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;
+#import <ResearchKit/ORKDefines.h>
+#import <ResearchKit/ORKActiveStepViewController.h>
+
+
+NS_ASSUME_NONNULL_BEGIN
+
+ORK_CLASS_AVAILABLE
+@interface ORKHolePegTestRemoveStepViewController : ORKActiveStepViewController
+
+@end
+
+NS_ASSUME_NONNULL_END

ResearchKit/ActiveTasks/ORKHolePegTestRemoveStepViewController.m

@@ -0,0 +1,180 @@
+/*
+ Copyright (c) 2015, Shazino SAS. 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 "ORKHolePegTestRemoveStepViewController.h"
+
+#import "ORKActiveStepView.h"
+#import "ORKHolePegTestRemoveContentView.h"
+
+#import "ORKActiveStepViewController_Internal.h"
+#import "ORKStepViewController_Internal.h"
+#import "ORKTaskViewController.h"
+
+#import "ORKHolePegTestRemoveStep.h"
+
+#import "ORKHelpers_Internal.h"
+#import "ORKResult.h"
+
+
+@interface ORKHolePegTestRemoveStepViewController () <ORKHolePegTestRemoveContentViewDelegate>
+
+@property (nonatomic, strong) NSMutableArray *samples;
+@property (nonatomic, strong) ORKHolePegTestRemoveContentView *holePegTestRemoveContentView;
+@property (nonatomic, assign) NSTimeInterval sampleStart;
+@property (nonatomic, assign) NSUInteger successes;
+@property (nonatomic, assign) NSUInteger failures;
+
+@end
+
+
+@implementation ORKHolePegTestRemoveStepViewController
+
+- (instancetype)initWithStep:(ORKStep *)step {
+    self = [super initWithStep:step];
+    if (self) {
+        self.suspendIfInactive = YES;
+    }
+    return self;
+}
+
+- (ORKHolePegTestRemoveStep *)holePegTestRemoveStep {
+    return (ORKHolePegTestRemoveStep *)self.step;
+}
+
+- (void)initializeInternalButtonItems {
+    [super initializeInternalButtonItems];
+    
+    // Don't show next button
+    self.internalContinueButtonItem = nil;
+    self.internalDoneButtonItem = nil;
+}
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    
+    self.holePegTestRemoveContentView = [[ORKHolePegTestRemoveContentView alloc] initWithMovingDirection:[self holePegTestRemoveStep].movingDirection];
+    self.holePegTestRemoveContentView.threshold = [self holePegTestRemoveStep].threshold;
+    self.holePegTestRemoveContentView.delegate = self;
+    self.activeStepView.activeCustomView = self.holePegTestRemoveContentView;
+    self.activeStepView.stepViewFillsAvailableSpace = YES;
+    
+    NSString *identifier = [[self holePegTestRemoveStep].identifier stringByReplacingOccurrencesOfString:@"remove" withString:@"place"];
+    NSTimeInterval placeStepDuration = ((ORKHolePegTestResult *)[[self.taskViewController.result stepResultForStepIdentifier:identifier].results firstObject]).totalTime;
+    [self holePegTestRemoveStep].stepDuration -= placeStepDuration;
+    
+    [self start];
+}
+
+#pragma mark - step life cycle methods
+
+- (void)start {
+    self.sampleStart = CACurrentMediaTime();
+    self.successes = 0;
+    self.failures = 0;
+    self.samples = [NSMutableArray array];
+    [self.holePegTestRemoveContentView setProgress:0.001f animated:NO];
+    
+    [super start];
+}
+
+#pragma mark - result methods
+
+- (ORKStepResult *)result {
+    ORKStepResult *sResult = [super result];
+    
+    NSMutableArray *results = [NSMutableArray arrayWithArray:sResult.results];
+    
+    ORKHolePegTestResult *holePegTestResult = [[ORKHolePegTestResult alloc] initWithIdentifier:self.step.identifier];
+    holePegTestResult.movingDirection = [self holePegTestRemoveStep].movingDirection;
+    holePegTestResult.dominantHandTested = [self holePegTestRemoveStep].isDominantHandTested;
+    holePegTestResult.numberOfPegs = [self holePegTestRemoveStep].numberOfPegs;
+    holePegTestResult.threshold = [self holePegTestRemoveStep].threshold;
+    holePegTestResult.rotated = NO;
+    holePegTestResult.totalSuccesses = self.successes;
+    holePegTestResult.totalFailures = self.failures;
+    holePegTestResult.totalTime = [self holePegTestRemoveStep].stepDuration - self.timeRemaining;
+    double totalDistance = 0.0;
+    for (ORKHolePegTestSample *sample in self.samples) {
+        totalDistance += sample.distance;
+    }
+    holePegTestResult.totalDistance = totalDistance;
+    holePegTestResult.samples = self.samples;
+    
+    [results addObject:holePegTestResult];
+    
+    sResult.results = [results copy];
+    
+    return sResult;
+}
+
+- (void)saveSampleWithDistance:(CGFloat)distance {
+    ORKHolePegTestSample *sample = [[ORKHolePegTestSample alloc] init];
+    sample.time = CACurrentMediaTime() - self.sampleStart;
+    sample.distance = distance;
+    self.sampleStart = CACurrentMediaTime();
+    
+    [self.samples addObject:sample];
+}
+
+#pragma mark - hole peg test content view delegate
+
+- (NSString *)stepTitle {
+    NSString *title = ([self holePegTestRemoveStep].movingDirection == ORKBodySagittalLeft) ? ORKLocalizedString(@"HOLE_PEG_TEST_REMOVE_INSTRUCTION_RIGHT_HAND", nil) : ORKLocalizedString(@"HOLE_PEG_TEST_REMOVE_INSTRUCTION_LEFT_HAND", nil);
+    return title;
+}
+
+- (void)holePegTestRemoveDidProgress:(ORKHolePegTestRemoveContentView *)holePegTestRemoveContentView {
+    [self.activeStepView updateTitle:[self stepTitle]
+                                text:ORKLocalizedString(@"HOLE_PEG_TEST_TEXT_2", nil)];
+}
+
+- (void)holePegTestRemoveDidSucceed:(ORKHolePegTestRemoveContentView *)holePegTestRemoveContentView withDistance:(CGFloat)distance {
+    self.successes++;
+    
+    [self saveSampleWithDistance:distance];
+    
+    [holePegTestRemoveContentView setProgress:((CGFloat)self.successes / [self holePegTestRemoveStep].numberOfPegs) animated:YES];
+    [self.activeStepView updateTitle:[self stepTitle]
+                                text:ORKLocalizedString(@"HOLE_PEG_TEST_TEXT", nil)];
+    
+    if (self.successes >= [self holePegTestRemoveStep].numberOfPegs) {
+        [self finish];
+    }
+}
+
+- (void)holePegTestRemoveDidFail:(ORKHolePegTestRemoveContentView *)holePegTestRemoveContentView {
+    self.failures++;
+    
+    [self.activeStepView updateTitle:[self stepTitle]
+                                text:ORKLocalizedString(@"HOLE_PEG_TEST_TEXT", nil)];
+}
+
+@end

ResearchKit/ActiveTasks/ORKLocationRecorder.h

@@ -28,8 +28,14 @@
  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+
+@import UIKit;
+@import CoreLocation;
 #import <ResearchKit/ORKRecorder.h>
 
+
+NS_ASSUME_NONNULL_BEGIN
+
 /**
  The `ORKLocationRecorder` class represents a recorder for collecting location data from CoreLocation.
  
@@ -41,4 +47,25 @@
 ORK_CLASS_AVAILABLE
 @interface ORKLocationRecorder : ORKRecorder
 
+/**
+ Returns an initialized location recorder.
+ 
+ @param identifier          The unique identifier of the recorder (assigned by the recorder configuration).
+ @param step                The step that requested this recorder.
+ @param outputDirectory     The directory in which the location data should be stored.
+ 
+ @return An initialized location recorder.
+*/
+- (instancetype)initWithIdentifier:(NSString *)identifier
+                              step:(nullable ORKStep *)step
+                   outputDirectory:(nullable NSURL *)outputDirectory NS_DESIGNATED_INITIALIZER;
+
+
+/**
+ The location manager, if any, being used by this recorder.
+ */
+@property (nonatomic, strong, nullable, readonly) CLLocationManager *locationManager;
+
 @end
+
+NS_ASSUME_NONNULL_END

ResearchKit/ActiveTasks/ORKLocationRecorder.m

@@ -28,20 +28,26 @@
  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>
-{
+#import "ORKLocationRecorder.h"
+
+#import "ORKDataLogger.h"
+
+#import "ORKRecorder_Internal.h"
+
+#import "CLLocation+ORKJSONDictionary.h"
+
+#import <CoreLocation/CoreLocation.h>
+
+
+@interface ORKLocationRecorder () <CLLocationManagerDelegate> {
     ORKDataLogger *_logger;
     NSError *_recordingError;
     BOOL _started;
 }
-@property (nonatomic, strong) CLLocationManager *locationManager;
+
+@property (nonatomic, strong, nullable) CLLocationManager *locationManager;
+
 @property (nonatomic) NSTimeInterval uptime;
 
 @end
@@ -49,19 +55,15 @@
 
 @implementation ORKLocationRecorder
 
-
-- (instancetype)initWithStep:(ORKStep *)step outputDirectory:(NSURL *)outputDirectory
-{
-    self = [super initWithStep:step outputDirectory:outputDirectory];
-    if (self)
-    {
+- (instancetype)initWithIdentifier:(NSString *)identifier step:(ORKStep *)step outputDirectory:(NSURL *)outputDirectory {
+    self = [super initWithIdentifier:identifier step:step outputDirectory:outputDirectory];
+    if (self) {
         self.continuesInBackground = YES;
     }
     return self;
 }
 
-- (void)dealloc
-{
+- (void)dealloc {
     [_logger finishCurrentLog];
 }
 
@@ -76,27 +78,26 @@
 - (void)start {
     [super start];
     
-    if (! _logger) {
-        NSError *err = nil;
-        _logger = [self makeJSONDataLoggerWithError:&err];
-        if (! _logger) {
-            [self finishRecordingWithError:err];
+    if (!_logger) {
+        NSError *error = nil;
+        _logger = [self makeJSONDataLoggerWithError:&error];
+        if (!_logger) {
+            [self finishRecordingWithError:error];
             return;
         }
     }
     
     self.locationManager = [self createLocationManager];
-    if ([CLLocationManager authorizationStatus] <= kCLAuthorizationStatusDenied)
-    {
+    if ([CLLocationManager authorizationStatus] <= kCLAuthorizationStatusDenied) {
         [self.locationManager requestWhenInUseAuthorization];
     }
     self.locationManager.pausesLocationUpdatesAutomatically = NO;
     self.locationManager.delegate = self;
     
-    if (! self.locationManager) {
+    if (!self.locationManager) {
         NSError *error = [NSError errorWithDomain:NSCocoaErrorDomain
                                              code:NSFeatureUnsupportedError
-                                         userInfo:@{@"recorder" : self}];
+                                         userInfo:@{@"recorder": self}];
         [self finishRecordingWithError:error];
         return;
     }
@@ -115,7 +116,6 @@
     [self doStopRecording];
     [_logger finishCurrentLog];
     
-    
     NSError *error = _recordingError;
     _recordingError = nil;
     __block NSURL *fileUrl = nil;
@@ -129,14 +129,12 @@
 }
 
 - (void)locationManager:(CLLocationManager *)manager
-     didUpdateLocations:(NSArray *)locations
-{
+     didUpdateLocations:(NSArray *)locations {
     BOOL success = YES;
-    NSParameterAssert([locations count] >= 0);
+    NSParameterAssert(locations.count >= 0);
     NSError *error = nil;
-    if (locations)
-    {
-        NSMutableArray *dictionaries = [NSMutableArray arrayWithCapacity:[locations count]];
+    if (locations) {
+        NSMutableArray *dictionaries = [NSMutableArray arrayWithCapacity:locations.count];
         [locations enumerateObjectsUsingBlock:^(CLLocation *obj, NSUInteger idx, BOOL *stop) {
             NSDictionary *d = [obj ork_JSONDictionary];
             [dictionaries addObject:d];
@@ -144,8 +142,7 @@
         
         success = [_logger appendObjects:dictionaries error:&error];
     }
-    if (!success)
-    {
+    if (!success) {
         dispatch_async(dispatch_get_main_queue(), ^{
             _recordingError = error;
             [self stop];
@@ -153,8 +150,7 @@
     }
 }
 
-- (void)finishRecordingWithError:(NSError *)error
-{
+- (void)finishRecordingWithError:(NSError *)error {
     [self doStopRecording];
     [super finishRecordingWithError:nil];
 }
@@ -163,14 +159,12 @@
     return [CLLocationManager locationServicesEnabled] && (self.locationManager != nil) && ([CLLocationManager authorizationStatus] > kCLAuthorizationStatusDenied);
 }
 
-- (void)reset
-{
+- (void)reset {
     [super reset];
     
     _logger = nil;
 }
 
-
 - (NSString *)mimeType {
     return @"application/json";
 }
@@ -178,35 +172,31 @@
 @end
 
 
-@interface ORKLocationRecorderConfiguration()
-@end
-
 @implementation ORKLocationRecorderConfiguration
 
-- (ORKRecorder *)recorderForStep:(ORKStep *)step outputDirectory:(NSURL *)outputDirectory {
-    return [[ORKLocationRecorder alloc] initWithStep:step outputDirectory:outputDirectory];
+- (instancetype)initWithIdentifier:(NSString *)identifier {
+    return [super initWithIdentifier:identifier];
 }
 
-
+- (ORKRecorder *)recorderForStep:(ORKStep *)step outputDirectory:(NSURL *)outputDirectory {
+    return [[ORKLocationRecorder alloc] initWithIdentifier:self.identifier step:step outputDirectory:outputDirectory];
+}
 
 - (instancetype)initWithCoder:(NSCoder *)aDecoder {
     self = [super initWithCoder:aDecoder];
     return self;
 }
 
-+ (BOOL)supportsSecureCoding
-{
++ (BOOL)supportsSecureCoding {
     return YES;
 }
 
-
 - (BOOL)isEqual:(id)object {
     BOOL isParentSame = [super isEqual:object];
     
     return isParentSame;
 }
 
-
 - (ORKPermissionMask)requestedPermissionMask {
     return ORKPermissionCoreLocation;
 }

ResearchKit/ActiveTasks/ORKPSATContentView.h

@@ -0,0 +1,53 @@
+/*
+ Copyright (c) 2015, Shazino SAS. 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;
+#import "ORKTypes.h"
+#import "ORKCustomStepView_Internal.h"
+
+
+NS_ASSUME_NONNULL_BEGIN
+
+@class ORKPSATKeyboardView;
+
+@interface ORKPSATContentView : ORKActiveStepCustomView
+
+@property (nonatomic, strong) ORKPSATKeyboardView *keyboardView;
+
+- (instancetype)initWithFrame:(CGRect)frame NS_UNAVAILABLE;
+- (instancetype)initWithPresentationMode:(ORKPSATPresentationMode)presentationMode NS_DESIGNATED_INITIALIZER;
+- (void)setEnabled:(BOOL)enabled;
+- (void)setAddition:(NSUInteger)additionIndex forTotal:(NSUInteger)totalAddition withDigit:(NSNumber *)digit;
+- (void)setProgress:(CGFloat)progress animated:(BOOL)animated;
+
+@end
+
+NS_ASSUME_NONNULL_END

ResearchKit/ActiveTasks/ORKPSATContentView.m

@@ -0,0 +1,164 @@
+/*
+ Copyright (c) 2015, Shazino SAS. 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 "ORKPSATContentView.h"
+
+#import "ORKBorderedButton.h"
+#import "ORKPSATKeyboardView.h"
+#import "ORKTapCountLabel.h"
+#import "ORKVoiceEngine.h"
+
+#import "ORKHelpers_Internal.h"
+#import "ORKSkin.h"
+
+
+@interface ORKPSATContentView ()
+
+@property (nonatomic, assign, getter = isAuditory) BOOL auditory;
+@property (nonatomic, strong) UIProgressView *progressView;
+@property (nonatomic, strong) ORKTapCountLabel *digitLabel;
+
+@end
+
+
+@implementation ORKPSATContentView
+
+- (instancetype)initWithFrame:(CGRect)frame {
+    ORKThrowMethodUnavailableException();
+}
+
+- (instancetype)initWithCoder:(NSCoder *)aDecoder {
+    self = [self initWithPresentationMode:ORKPSATPresentationModeAuditory];
+    return self;
+}
+
+- (instancetype)initWithPresentationMode:(ORKPSATPresentationMode)presentationMode {
+    self = [super initWithFrame:CGRectZero];
+    
+    if (self) {
+        
+        _digitLabel = [ORKTapCountLabel new];
+        _digitLabel.textAlignment = NSTextAlignmentCenter;
+        _digitLabel.translatesAutoresizingMaskIntoConstraints = NO;
+        [self addSubview:_digitLabel];
+        _auditory = (presentationMode & ORKPSATPresentationModeAuditory) ? YES : NO;
+        if (!(presentationMode & ORKPSATPresentationModeVisual)) {
+            _digitLabel.hidden = YES;
+        }
+        
+        _progressView = [UIProgressView new];
+        _progressView.translatesAutoresizingMaskIntoConstraints = NO;
+        _progressView.progressTintColor = [self tintColor];
+        [_progressView setAlpha:0];
+        [self addSubview:_progressView];
+        
+        _keyboardView = [ORKPSATKeyboardView new];
+        _keyboardView.translatesAutoresizingMaskIntoConstraints = NO;
+        [self addSubview:_keyboardView];
+        
+        self.translatesAutoresizingMaskIntoConstraints = NO;
+
+        [self setNeedsUpdateConstraints];
+    }
+    
+    return self;
+}
+
+- (void)setEnabled:(BOOL)enabled {
+    self.keyboardView.enabled = enabled;
+}
+
+- (void)setAddition:(NSUInteger)additionIndex forTotal:(NSUInteger)totalAddition withDigit:(NSNumber *)digit {
+    if (digit.integerValue == -1) {
+        self.digitLabel.textColor = [[UIColor blackColor] colorWithAlphaComponent:0.3f];
+        self.digitLabel.text = ORKLocalizedString(@"PSAT_NO_DIGIT", nil);
+    } else {
+        [self.keyboardView.selectedAnswerButton setSelected:NO];
+        self.digitLabel.textColor = nil;
+        self.digitLabel.text = [NSNumberFormatter localizedStringFromNumber:digit
+                                                                numberStyle:NSNumberFormatterNoStyle];
+        if (self.isAuditory) {
+            [[ORKVoiceEngine sharedVoiceEngine] speakInt:digit.integerValue];
+        }
+    }
+}
+
+- (void)tintColorDidChange {
+    [super tintColorDidChange];
+    self.progressView.progressTintColor = self.tintColor;
+}
+
+- (void)setProgress:(CGFloat)progress animated:(BOOL)animated {
+    [self.progressView setProgress:progress animated:animated];
+    [UIView animateWithDuration:animated ? 0.2 : 0 animations:^{
+        [self.progressView setAlpha:(progress == 0) ? 0 : 1];
+    }];
+}
+
+- (void)updateConstraints {
+    [NSLayoutConstraint deactivateConstraints:self.constraints];
+    
+    const CGFloat ORKPSATKeyboardWidth = ORKGetMetricForWindow(ORKScreenMetricPSATKeyboardViewWidth, self.window);
+    const CGFloat ORKPSATKeyboardHeight = ORKGetMetricForWindow(ORKScreenMetricPSATKeyboardViewHeight, self.window);
+    
+    NSMutableArray *constraints = [NSMutableArray array];
+
+    NSDictionary *views = NSDictionaryOfVariableBindings(_progressView, _digitLabel, _keyboardView);
+    
+    [constraints addObjectsFromArray:
+     [NSLayoutConstraint constraintsWithVisualFormat:@"H:|-[_progressView]-|"
+                                             options:(NSLayoutFormatOptions)0
+                                             metrics:nil
+                                               views:views]];
+    
+    [constraints addObjectsFromArray:
+     [NSLayoutConstraint constraintsWithVisualFormat:@"H:|-[_keyboardView(==keyboardWidth)]-|"
+                                             options:(NSLayoutFormatOptions)0
+                                             metrics:@{ @"keyboardWidth": @(ORKPSATKeyboardWidth) }
+                                               views:views]];
+    
+    [constraints addObjectsFromArray:
+     [NSLayoutConstraint constraintsWithVisualFormat:@"V:[_keyboardView(==keyboardHeight)]"
+                                             options:(NSLayoutFormatOptions)0
+                                             metrics:@{ @"keyboardHeight": @(ORKPSATKeyboardHeight) }
+                                               views:views]];
+    
+    [constraints addObjectsFromArray:
+     [NSLayoutConstraint constraintsWithVisualFormat:@"V:|[_progressView]-[_digitLabel]-(>=10)-[_keyboardView]-|"
+                                             options:NSLayoutFormatAlignAllCenterX
+                                             metrics:nil
+                                               views:views]];
+    
+    [NSLayoutConstraint activateConstraints:constraints];
+    [super updateConstraints];
+}
+
+@end

ResearchKit/ActiveTasks/ORKPSATKeyboardView.h

@@ -0,0 +1,56 @@
+/*
+ Copyright (c) 2015, Shazino SAS. 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;
+#import "ORKDefines.h"
+
+
+NS_ASSUME_NONNULL_BEGIN
+
+@class ORKBorderedButton;
+@protocol ORKPSATKeyboardViewDelegate;
+
+@interface ORKPSATKeyboardView : UIView
+
+@property (nonatomic, weak) id<ORKPSATKeyboardViewDelegate> delegate;
+@property (nonatomic, weak) ORKBorderedButton *selectedAnswerButton;
+
+- (void)setEnabled:(BOOL)enabled;
+
+@end
+
+@protocol ORKPSATKeyboardViewDelegate <NSObject>
+
+- (void)keyboardView:(ORKPSATKeyboardView *)keyboardView didSelectAnswer:(NSInteger)answer;
+
+@end
+
+NS_ASSUME_NONNULL_END

ResearchKit/ActiveTasks/ORKPSATKeyboardView.m

@@ -0,0 +1,153 @@
+/*
+ Copyright (c) 2015, Shazino SAS. 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 "ORKPSATKeyboardView.h"
+
+#import "ORKBorderedButton.h"
+
+
+NSUInteger const ORKPSATMinimumAnswer = 3;
+NSUInteger const ORKPSATMaximumAnswer = 17;
+
+@interface ORKPSATKeyboardView ()
+
+@property (nonatomic, strong, readonly) NSArray *answerButtons;
+@property (nonatomic, strong) NSArray *constraints;
+
+@end
+
+
+@implementation ORKPSATKeyboardView
+
+- (instancetype)init {
+    self = [super init];
+    if (self) {
+        NSMutableArray *buttonsArray = [[NSMutableArray alloc] initWithCapacity:(ORKPSATMaximumAnswer - ORKPSATMinimumAnswer) + 1];
+        ORKBorderedButton *answerButton = nil;
+        for (int i = ORKPSATMinimumAnswer; i <= ORKPSATMaximumAnswer; i++) {
+            answerButton = [self answerButtonWithTitle:[NSNumberFormatter localizedStringFromNumber:@(i)
+                                                                                        numberStyle:NSNumberFormatterNoStyle]];
+            [buttonsArray addObject:answerButton];
+            [self addSubview:answerButton];
+        }
+        _answerButtons = [NSArray arrayWithArray:buttonsArray];
+        
+        self.translatesAutoresizingMaskIntoConstraints = NO;
+        
+        [self setNeedsUpdateConstraints];
+    }
+    
+    return self;
+}
+
+- (ORKBorderedButton *)answerButtonWithTitle:(NSString *)title {
+    ORKBorderedButton *answerButton = [ORKBorderedButton new];
+    answerButton.translatesAutoresizingMaskIntoConstraints = NO;
+    [answerButton setTitle:title forState:UIControlStateNormal];
+    [answerButton addTarget:self action:@selector(buttonPressed:forEvent:) forControlEvents:UIControlEventTouchUpInside];
+    answerButton.accessibilityTraits |= UIAccessibilityTraitKeyboardKey;
+    return answerButton;
+}
+
+- (void)setEnabled:(BOOL)enabled {
+    for (ORKBorderedButton *answerButton in self.answerButtons) {
+        [answerButton setEnabled:enabled];
+    }
+}
+
+- (void)updateConstraints {
+    [NSLayoutConstraint deactivateConstraints:self.constraints];
+    
+    NSMutableArray *constraints = [NSMutableArray array];
+    
+    ORKBorderedButton *answer3Button = self.answerButtons[0];
+    ORKBorderedButton *answer4Button = self.answerButtons[1];
+    ORKBorderedButton *answer5Button = self.answerButtons[2];
+    ORKBorderedButton *answer6Button = self.answerButtons[3];
+    ORKBorderedButton *answer7Button = self.answerButtons[4];
+    ORKBorderedButton *answer8Button = self.answerButtons[5];
+    ORKBorderedButton *answer9Button = self.answerButtons[6];
+    ORKBorderedButton *answer10Button = self.answerButtons[7];
+    ORKBorderedButton *answer11Button = self.answerButtons[8];
+    ORKBorderedButton *answer12Button = self.answerButtons[9];
+    ORKBorderedButton *answer13Button = self.answerButtons[10];
+    ORKBorderedButton *answer14Button = self.answerButtons[11];
+    ORKBorderedButton *answer15Button = self.answerButtons[12];
+    ORKBorderedButton *answer16Button = self.answerButtons[13];
+    ORKBorderedButton *answer17Button = self.answerButtons[14];
+
+    
+    NSDictionary *views = NSDictionaryOfVariableBindings(answer3Button, answer4Button, answer5Button, answer6Button, answer7Button, answer8Button, answer9Button, answer10Button, answer11Button, answer12Button, answer13Button, answer14Button, answer15Button, answer16Button, answer17Button);
+    
+    // First line of answer buttons
+    [constraints addObjectsFromArray:
+     [NSLayoutConstraint constraintsWithVisualFormat:@"H:|-[answer3Button]-[answer4Button(==answer3Button)]-[answer5Button(==answer3Button)]-[answer6Button(==answer3Button)]-[answer7Button(==answer3Button)]-|"
+                                             options:NSLayoutFormatAlignAllCenterY|NSLayoutFormatAlignAllTop|NSLayoutFormatAlignAllBottom
+                                             metrics:nil views:views]];
+    
+    // Second line of answer buttons
+    [constraints addObjectsFromArray:
+     [NSLayoutConstraint constraintsWithVisualFormat:@"H:|-[answer8Button]-[answer9Button(==answer8Button)]-[answer10Button(==answer8Button)]-[answer11Button(==answer8Button)]-[answer12Button(==answer8Button)]-|"
+                                             options:NSLayoutFormatAlignAllCenterY|NSLayoutFormatAlignAllTop|NSLayoutFormatAlignAllBottom
+                                             metrics:nil views:views]];
+    
+    // Third line of answer buttons
+    [constraints addObjectsFromArray:
+     [NSLayoutConstraint constraintsWithVisualFormat:@"H:|-[answer13Button]-[answer14Button(==answer13Button)]-[answer15Button(==answer13Button)]-[answer16Button(==answer13Button)]-[answer17Button(==answer13Button)]-|"
+                                             options:NSLayoutFormatAlignAllCenterY|NSLayoutFormatAlignAllTop|NSLayoutFormatAlignAllBottom
+                                             metrics:nil views:views]];
+    
+    // Align vertically
+    [constraints addObjectsFromArray:
+     [NSLayoutConstraint constraintsWithVisualFormat:@"V:|-[answer3Button]-[answer8Button(==answer3Button)]-[answer13Button(==answer3Button)]-|"
+                                             options:(NSLayoutFormatOptions)0
+                                             metrics:nil views:views]];
+    
+    [NSLayoutConstraint activateConstraints:constraints];
+    [super updateConstraints];
+}
+
+#pragma mark buttonAction
+
+- (IBAction)buttonPressed:(id)button forEvent:(UIEvent *)event {
+    ORKBorderedButton *tappedAnswerButton = (ORKBorderedButton *)button;
+    
+    [self.selectedAnswerButton setSelected:NO];
+    self.selectedAnswerButton = tappedAnswerButton;
+    [self.selectedAnswerButton setSelected:YES];
+    
+    if ([self.delegate respondsToSelector:@selector(keyboardView:didSelectAnswer:)]) {
+        NSInteger answerValue = [self.answerButtons indexOfObject:tappedAnswerButton] + ORKPSATMinimumAnswer;
+        [self.delegate keyboardView:self didSelectAnswer:answerValue];
+    }
+}
+
+@end

ResearchKit/ActiveTasks/ORKPSATStep.h

@@ -0,0 +1,49 @@
+/*
+ Copyright (c) 2015, Shazino SAS. 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;
+#import <ResearchKit/ORKDefines.h>
+#import <ResearchKit/ORKActiveStep.h>
+
+
+NS_ASSUME_NONNULL_BEGIN
+
+ORK_CLASS_AVAILABLE
+@interface ORKPSATStep : ORKActiveStep
+
+@property (nonatomic, assign) ORKPSATPresentationMode presentationMode;
+@property (nonatomic, assign) NSTimeInterval interStimulusInterval;
+@property (nonatomic, assign) NSTimeInterval stimulusDuration;
+@property (nonatomic, assign) NSInteger seriesLength;
+
+@end
+
+NS_ASSUME_NONNULL_END

ResearchKit/ActiveTasks/ORKPSATStep.m

@@ -0,0 +1,143 @@
+/*
+ Copyright (c) 2015, Shazino SAS. 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 "ORKPSATStep.h"
+
+#import "ORKPSATStepViewController.h"
+
+#import "ORKHelpers_Internal.h"
+
+
+@implementation ORKPSATStep
+
++ (Class)stepViewControllerClass {
+    return [ORKPSATStepViewController class];
+}
+
+- (instancetype)initWithIdentifier:(NSString *)identifier {
+    self = [super initWithIdentifier:identifier];
+    if (self) {
+        self.shouldStartTimerAutomatically = YES;
+        self.shouldShowDefaultTimer = NO;
+        self.shouldContinueOnFinish = YES;
+    }
+    return self;
+}
+
+- (void)validateParameters {
+    [super validateParameters];
+
+    NSTimeInterval const ORKPSATInterStimulusMinimumInterval = 1.0;
+    NSTimeInterval const ORKPSATInterStimulusMaximumInterval = 5.0;
+    
+    NSTimeInterval const ORKPSATStimulusMinimumDuration = 0.2;
+    
+    NSInteger const ORKPSATSerieMinimumLength = 10;
+    NSInteger const ORKPSATSerieMaximumLength = 120;
+
+    NSTimeInterval totalDuration = (self.seriesLength + 1) * self.interStimulusInterval;
+    if (self.stepDuration != totalDuration) {
+        @throw [NSException exceptionWithName:NSInvalidArgumentException reason:[NSString stringWithFormat:@"step duration must be equal to %@ seconds.", @(totalDuration)] userInfo:nil];
+    }
+    
+    if (!(self.presentationMode & ORKPSATPresentationModeAuditory) &&
+        !(self.presentationMode & ORKPSATPresentationModeVisual)) {
+        @throw [NSException exceptionWithName:NSInvalidArgumentException reason:@"step presentation mode must be auditory and/or visual." userInfo:nil];
+    }
+    
+    if (self.interStimulusInterval < ORKPSATInterStimulusMinimumInterval ||
+        self.interStimulusInterval > ORKPSATInterStimulusMaximumInterval) {
+        @throw [NSException exceptionWithName:NSInvalidArgumentException reason:[NSString stringWithFormat:@"inter stimulus interval must be greater than or equal to %@ seconds and less than or equal to %@ seconds.", @(ORKPSATInterStimulusMinimumInterval), @(ORKPSATInterStimulusMaximumInterval)] userInfo:nil];
+    }
+    
+    if ((self.presentationMode & ORKPSATPresentationModeVisual) &&
+        (self.stimulusDuration < ORKPSATStimulusMinimumDuration || self.stimulusDuration > self.interStimulusInterval)) {
+        @throw [NSException exceptionWithName:NSInvalidArgumentException reason:[NSString stringWithFormat:@"stimulus duration must be greater than or equal to %@ seconds and less than or equal to %@ seconds.", @(ORKPSATStimulusMinimumDuration), @(self.interStimulusInterval)] userInfo:nil];
+    }
+    
+    if (self.seriesLength < ORKPSATSerieMinimumLength ||
+        self.seriesLength > ORKPSATSerieMaximumLength) {
+        @throw [NSException exceptionWithName:NSInvalidArgumentException reason:[NSString stringWithFormat:@"serie length must be greater than or equal to %@ additions and less than or equal to %@ additions.", @(ORKPSATSerieMinimumLength), @(ORKPSATSerieMaximumLength)] userInfo:nil];
+    }
+}
+
+- (BOOL)allowsBackNavigation {
+    return NO;
+}
+
++ (BOOL)supportsSecureCoding {
+    return YES;
+}
+
+- (instancetype)initWithCoder:(NSCoder *)aDecoder {
+    self = [super initWithCoder:aDecoder];
+    if (self) {
+        ORK_DECODE_ENUM(aDecoder, presentationMode);
+        ORK_DECODE_DOUBLE(aDecoder, interStimulusInterval);
+        ORK_DECODE_DOUBLE(aDecoder, stimulusDuration);
+        ORK_DECODE_INTEGER(aDecoder, seriesLength);
+    }
+    return self;
+}
+
+- (void)encodeWithCoder:(NSCoder *)aCoder {
+    [super encodeWithCoder:aCoder];
+    ORK_ENCODE_ENUM(aCoder, presentationMode);
+    ORK_ENCODE_DOUBLE(aCoder, interStimulusInterval);
+    ORK_ENCODE_DOUBLE(aCoder, stimulusDuration);
+    ORK_ENCODE_INTEGER(aCoder, seriesLength);
+}
+
+- (instancetype)copyWithZone:(NSZone *)zone {
+    ORKPSATStep *step = [super copyWithZone:zone];
+    step.presentationMode = self.presentationMode;
+    step.interStimulusInterval = self.interStimulusInterval;
+    step.stimulusDuration = self.stimulusDuration;
+    step.seriesLength = self.seriesLength;
+    return step;
+}
+
+- (NSUInteger)hash {
+    return [super hash] ^ self.presentationMode ^ (NSInteger)(self.interStimulusInterval*100) ^ (NSInteger)(self.stimulusDuration*100) ^ self.seriesLength;
+}
+
+- (BOOL)isEqual:(id)object {
+    BOOL isParentSame = [super isEqual:object];
+    
+    __typeof(self) castObject = object;
+    return (isParentSame &&
+            (self.presentationMode == castObject.presentationMode) &&
+            (self.interStimulusInterval == castObject.interStimulusInterval) &&
+            (self.stimulusDuration == castObject.stimulusDuration) &&
+            (self.seriesLength == castObject.seriesLength));
+}
+
+@end

ResearchKit/ActiveTasks/ORKPSATStepViewController.h

@@ -0,0 +1,44 @@
+/*
+ Copyright (c) 2015, Shazino SAS. 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;
+#import <ResearchKit/ORKDefines.h>
+#import <ResearchKit/ORKActiveStepViewController.h>
+
+
+NS_ASSUME_NONNULL_BEGIN
+
+ORK_CLASS_AVAILABLE
+@interface ORKPSATStepViewController : ORKActiveStepViewController
+
+@end
+
+NS_ASSUME_NONNULL_END

ResearchKit/ActiveTasks/ORKPSATStepViewController.m

@@ -0,0 +1,243 @@
+/*
+ Copyright (c) 2015, Shazino SAS. 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 "ORKPSATStepViewController.h"
+
+#import "ORKActiveStepTimer.h"
+#import "ORKActiveStepView.h"
+#import "ORKPSATContentView.h"
+#import "ORKPSATKeyboardView.h"
+#import "ORKVerticalContainerView.h"
+
+#import "ORKActiveStepViewController_Internal.h"
+#import "ORKPSATStep.h"
+#import "ORKResult.h"
+#import "ORKStepViewController_Internal.h"
+
+#import "ORKHelpers_Internal.h"
+
+
+@interface ORKPSATStepViewController () <ORKPSATKeyboardViewDelegate>
+
+@property (nonatomic, strong) NSMutableArray *samples;
+@property (nonatomic, strong) ORKPSATContentView *psatContentView;
+@property (nonatomic, strong) NSArray<NSNumber *> *digits;
+@property (nonatomic, assign) NSUInteger currentDigitIndex;
+@property (nonatomic, assign) NSInteger currentAnswer;
+@property (nonatomic, strong) ORKActiveStepTimer *clearDigitsTimer;
+@property (nonatomic, assign) NSTimeInterval answerStart;
+@property (nonatomic, assign) NSTimeInterval answerEnd;
+
+@end
+
+
+@implementation ORKPSATStepViewController
+
+- (instancetype)initWithStep:(ORKStep *)step {
+    self = [super initWithStep:step];
+    
+    if (self) {
+        self.suspendIfInactive = YES;
+    }
+    
+    return self;
+}
+
+- (ORKPSATStep *)psatStep {
+    NSAssert(self.step == nil || [self.step isKindOfClass:[ORKPSATStep class]], @"Step class must be subclass of ORKPSATStep.");
+    return (ORKPSATStep *)self.step;
+}
+
+- (NSArray *)arrayWithPSATDigits {
+    NSMutableArray *array = [[NSMutableArray alloc] initWithCapacity:[self psatStep].seriesLength + 1];
+    NSUInteger digit = 0;
+    for (NSUInteger i = 0; i < [self psatStep].seriesLength + 1; i++) {
+        do
+        {
+            digit = (arc4random() % (9)) + 1;
+        } while (digit == ((NSNumber *)[array lastObject]).integerValue);
+        [array addObject:@(digit)];
+    }
+    return array;
+}
+
+- (void)initializeInternalButtonItems {
+    [super initializeInternalButtonItems];
+    
+    // Don't show buttons
+    self.internalContinueButtonItem = nil;
+    self.internalDoneButtonItem = nil;
+}
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    
+    self.activeStepView.stepViewFillsAvailableSpace = YES;
+    self.psatContentView = [[ORKPSATContentView alloc] initWithPresentationMode:[self psatStep].presentationMode];
+    self.psatContentView.keyboardView.delegate = self;
+    [self.psatContentView setEnabled:NO];
+    self.activeStepView.activeCustomView = self.psatContentView;
+    
+    self.timerUpdateInterval = [self psatStep].interStimulusInterval;
+}
+
+- (ORKStepResult *)result {
+    
+    ORKStepResult *sResult = [super result];
+    
+    NSMutableArray *results = [NSMutableArray arrayWithArray:sResult.results];
+    
+    ORKPSATResult *PSATResult = [[ORKPSATResult alloc] initWithIdentifier:self.step.identifier];
+    PSATResult.presentationMode = [self psatStep].presentationMode;
+    PSATResult.interStimulusInterval = [self psatStep].interStimulusInterval;
+    if ([self psatStep].presentationMode & ORKPSATPresentationModeVisual) {
+        PSATResult.stimulusDuration = [self psatStep].stimulusDuration;
+    } else {
+        PSATResult.stimulusDuration = 0.0;
+    }
+    PSATResult.length = [self psatStep].seriesLength;
+    PSATResult.initialDigit = self.digits[0].integerValue;
+    NSInteger totalCorrect = 0;
+    BOOL previousAnswerCorrect = NO;
+    NSInteger totalDyad = 0;
+    CGFloat totalTime = 0.0;
+    for (ORKPSATSample *sample in self.samples) {
+        totalTime += sample.time;
+        if (sample.isCorrect) {
+            totalCorrect++;
+            if (previousAnswerCorrect) {
+                totalDyad++;
+            }
+        }
+        previousAnswerCorrect = sample.isCorrect;
+    }
+    PSATResult.totalCorrect = totalCorrect;
+    PSATResult.totalTime = totalTime;
+    PSATResult.totalDyad = totalDyad;
+    PSATResult.samples = self.samples;
+
+    [results addObject:PSATResult];
+    
+    sResult.results = [results copy];
+    
+    return sResult;
+}
+
+- (void)start {
+    self.digits = [self arrayWithPSATDigits];
+    self.currentDigitIndex = 0;
+    [self.psatContentView setAddition:self.currentDigitIndex forTotal:[self psatStep].seriesLength withDigit:self.digits[self.currentDigitIndex]];
+    [self.psatContentView setProgress:0.001 animated:NO];
+    self.currentAnswer = -1;
+    self.samples = [NSMutableArray array];
+    
+    if ([self psatStep].presentationMode & ORKPSATPresentationModeVisual &&
+        ([self psatStep].interStimulusInterval - [self psatStep].stimulusDuration) > 0.05 ) {
+        
+        // Don't show `-` if the difference between stimulusDuration and interStimulusInterval is less than timer's resolution.
+        ORKWeakTypeOf(self) weakSelf = self;
+        self.clearDigitsTimer = [[ORKActiveStepTimer alloc] initWithDuration:[self psatStep].stepDuration
+                                                                    interval:[self psatStep].interStimulusInterval
+                                                                     runtime:-[self psatStep].stimulusDuration
+                                                                     handler:^(ORKActiveStepTimer *timer, BOOL finished) {
+                                                                         ORKStrongTypeOf(self) strongSelf = weakSelf;
+                                                                         [strongSelf clearDigitsTimerFired];
+                                                                     }];
+        [self.clearDigitsTimer resume];
+    }
+    
+    [super start];
+}
+
+- (void)suspend {
+    [self.clearDigitsTimer pause];
+    [super suspend];
+}
+
+- (void)resume {
+    [self.clearDigitsTimer resume];
+    [super resume];
+}
+
+- (void)finish {
+    [self.clearDigitsTimer reset];
+    self.clearDigitsTimer = nil;
+    [super finish];
+}
+
+- (void)countDownTimerFired:(ORKActiveStepTimer *)timer finished:(BOOL)finished {
+    if (self.currentDigitIndex == 0) {
+        [self.psatContentView setEnabled:YES];
+        [self.activeStepView updateTitle:ORKLocalizedString(@"PSAT_INSTRUCTION", nil) text:nil];
+    } else {
+        [self saveSample];
+    }
+    
+    self.currentDigitIndex++;
+    self.answerStart = CACurrentMediaTime();
+    self.answerEnd = 0;
+    
+    if (self.currentDigitIndex <= [self psatStep].seriesLength) {
+        [self.psatContentView setAddition:self.currentDigitIndex forTotal:[self psatStep].seriesLength withDigit:self.digits[self.currentDigitIndex]];
+    }
+    
+    self.currentAnswer = -1;
+    
+    CGFloat progress = finished ? 1 : (timer.runtime / timer.duration);
+    [self.psatContentView setProgress:progress animated:YES];
+    
+    [super countDownTimerFired:timer finished:finished];
+}
+
+- (void)clearDigitsTimerFired {
+    [self.psatContentView setAddition:self.currentDigitIndex forTotal:[self psatStep].seriesLength withDigit:@(-1)];
+}
+
+- (void)saveSample {
+    ORKPSATSample *sample = [[ORKPSATSample alloc] init];
+    NSInteger previousDigit = self.digits[self.currentDigitIndex - 1].integerValue;
+    NSInteger currentDigit = self.digits[self.currentDigitIndex].integerValue;;
+    sample.correct = previousDigit + currentDigit == self.currentAnswer ? YES : NO;
+    sample.digit = currentDigit;
+    sample.answer = self.currentAnswer;
+    sample.time = self.answerEnd == 0 ? [self psatStep].interStimulusInterval : self.answerEnd - self.answerStart;
+    
+    [self.samples addObject:sample];
+}
+
+#pragma mark - keyboard view delegate
+
+- (void)keyboardView:(ORKPSATKeyboardView *)keyboardView didSelectAnswer:(NSInteger)answer {
+    self.currentAnswer = answer;
+    self.answerEnd = CACurrentMediaTime();
+}
+
+@end

ResearchKit/ActiveTasks/ORKPedometerRecorder.h

@@ -28,8 +28,11 @@
  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+
+@import UIKit;
 #import <ResearchKit/ORKRecorder.h>
 
+
 NS_ASSUME_NONNULL_BEGIN
 
 @class ORKPedometerRecorder;
@@ -37,11 +40,11 @@ NS_ASSUME_NONNULL_BEGIN
 @protocol ORKPedometerRecorderDelegate <ORKRecorderDelegate>
 
 @optional
-
 - (void)pedometerRecorderDidUpdate:(ORKPedometerRecorder *)pedometerRecorder;
 
 @end
 
+
 /**
  A recorder that requests and collects device motion data from CoreMotion at a fixed frequency.
  
@@ -52,13 +55,24 @@ 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;
+/**
+ Returns an initialized pedometer recorder.
+ 
+ @param identifier          The unique identifier of the recorder (assigned by the recorder configuration).
+ @param step                The step that requested this recorder.
+ @param outputDirectory     The directory in which the pedometer data should be stored.
+ 
+ @return An initialized pedometer recorder.
+ */
+- (instancetype)initWithIdentifier:(NSString *)identifier
+                              step:(nullable ORKStep *)step
+                   outputDirectory:(nullable NSURL *)outputDirectory NS_DESIGNATED_INITIALIZER;
 
 @end
 

ResearchKit/ActiveTasks/ORKPedometerRecorder.m

@@ -28,53 +28,50 @@
  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()
-{
+#import "ORKPedometerRecorder.h"
+
+#import "ORKDataLogger.h"
+
+#import "ORKRecorder_Internal.h"
+
+#import "ORKHelpers_Internal.h"
+#import "CMPedometerData+ORKJSONDictionary.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)
-    {
+- (instancetype)initWithIdentifier:(NSString *)identifier
+                              step:(ORKStep *)step
+                   outputDirectory:(NSURL *)outputDirectory {
+    self = [super initWithIdentifier:identifier
+                                step:step
+                     outputDirectory:outputDirectory];
+    if (self) {
         self.continuesInBackground = YES;
     }
     return self;
 }
 
-
-- (void)dealloc
-{
+- (void)dealloc {
     [_logger finishCurrentLog];
 }
 
-
-
 - (void)updateStatisticsWithData:(CMPedometerData *)pedometerData {
-    
     _lastUpdateDate = pedometerData.endDate;
-    _totalNumberOfSteps = [pedometerData.numberOfSteps integerValue];
+    _totalNumberOfSteps = pedometerData.numberOfSteps.integerValue;
     if (pedometerData.distance) {
-        _totalDistance = [pedometerData.distance doubleValue];
+        _totalDistance = pedometerData.distance.doubleValue;
     } else {
         _totalDistance = -1;
     }
@@ -90,62 +87,55 @@
 }
 
 - (void)start {
-    
     [super start];
     
     _lastUpdateDate = nil;
     _totalNumberOfSteps = 0;
     _totalDistance = -1;
     
-    if (! _logger) {
-        NSError *err = nil;
-        _logger = [self makeJSONDataLoggerWithError:&err];
-        if (! _logger) {
-            [self finishRecordingWithError:err];
+    if (!_logger) {
+        NSError *error = nil;
+        _logger = [self makeJSONDataLoggerWithError:&error];
+        if (!_logger) {
+            [self finishRecordingWithError:error];
             return;
         }
     }
     
     self.pedometer = [self createPedometer];
     
-    if (! [[self.pedometer class] isStepCountingAvailable])
-    {
+    if (![[self.pedometer class] isStepCountingAvailable]) {
         [self finishRecordingWithError:[NSError errorWithDomain:NSCocoaErrorDomain
                                                            code:NSFeatureUnsupportedError
-                                                       userInfo:@{@"recorder" : self}]];
+                                                       userInfo:@{@"recorder": self}]];
         return;
     }
 
     _isRecording = YES;
-    __weak __typeof(self) weakSelf = self;
+    ORKWeakTypeOf(self) weakSelf = self;
     [self.pedometer startPedometerUpdatesFromDate:[NSDate date] withHandler:^(CMPedometerData *pedometerData, NSError *error) {
         
         BOOL success = NO;
-        if (pedometerData)
-        {
+        if (pedometerData) {
             success = [_logger append:[pedometerData ork_JSONDictionary] error:&error];
             dispatch_async(dispatch_get_main_queue(), ^{
-                __typeof(self) strongSelf = weakSelf;
+                ORKStrongTypeOf(self) strongSelf = weakSelf;
                 [strongSelf updateStatisticsWithData:pedometerData];
             });
         }
-        if (!success || error)
-        {
+        if (!success || error) {
             dispatch_async(dispatch_get_main_queue(), ^{
-                __typeof(self) strongSelf = weakSelf;
+                ORKStrongTypeOf(self) strongSelf = weakSelf;
                 [strongSelf finishRecordingWithError:error];
             });
         }
     }];
 }
 
-
-- (NSString *)recorderType
-{
+- (NSString *)recorderType {
     return @"pedometer";
 }
 
-
 - (void)stop {
     [self doStopRecording];
     [_logger finishCurrentLog];
@@ -154,17 +144,15 @@
     __block NSURL *fileUrl = nil;
     [_logger enumerateLogs:^(NSURL *logFileUrl, BOOL *stop) {
         fileUrl = logFileUrl;
-    } error:&error];
-    
-    
+    }
+                     error:&error];
     
     [self reportFileResultWithFile:fileUrl error:error];
     
     [super stop];
 }
 
-- (void)doStopRecording
-{
+- (void)doStopRecording {
     if (_isRecording) {
         [self.pedometer stopPedometerUpdates];
         _isRecording = NO;
@@ -172,8 +160,7 @@
     }
 }
 
-- (void)finishRecordingWithError:(NSError *)error
-{
+- (void)finishRecordingWithError:(NSError *)error {
     [self doStopRecording];
     [super finishRecordingWithError:error];
 }
@@ -186,8 +173,7 @@
     return @"application/json";
 }
 
-- (void)reset
-{
+- (void)reset {
     [super reset];
     
     _logger = nil;
@@ -196,47 +182,35 @@
 @end
 
 
-@interface ORKPedometerRecorderConfiguration()
-@end
-
-
 @implementation ORKPedometerRecorderConfiguration
 
-- (instancetype)init {
-    self = [super ork_init];
-    return self;
+- (instancetype)initWithIdentifier:(NSString *)identifier {
+    return [super initWithIdentifier:identifier];
 }
 
-- (ORKRecorder *)recorderForStep:(ORKStep *)step outputDirectory:(NSURL *)outputDirectory
-{
-    return [[ORKPedometerRecorder alloc] initWithStep:step
-                                     outputDirectory:outputDirectory];
+- (ORKRecorder *)recorderForStep:(ORKStep *)step outputDirectory:(NSURL *)outputDirectory {
+    return [[ORKPedometerRecorder alloc] initWithIdentifier:self.identifier
+                                                       step:step
+                                            outputDirectory:outputDirectory];
 }
 
-
-- (instancetype)initWithCoder:(NSCoder *)aDecoder
-{
+- (instancetype)initWithCoder:(NSCoder *)aDecoder {
     self = [super initWithCoder:aDecoder];
     return self;
 }
 
-+ (BOOL)supportsSecureCoding
-{
++ (BOOL)supportsSecureCoding {
     return YES;
 }
 
-
 - (BOOL)isEqual:(id)object {
     BOOL isParentSame = [super isEqual:object];
     
-    return (isParentSame) ;
+    return (isParentSame);
 }
 
-
-
 - (ORKPermissionMask)requestedPermissionMask {
     return ORKPermissionCoreMotionActivity;
 }
 
 @end
-