Convergence

Author: YuanZhu-apple

README.md

@@ -67,7 +67,7 @@ Getting Started<a name="gettingstarted"></a>
 Requirements
 ------------
 
-The primary *ResearchKit framework* codebase supports *iOS* and requires *Xcode 7.0* or newer. The
+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.
 

RELEASE-NOTES.md

@@ -1,5 +1,73 @@
 # ResearchKit Release Notes
 
+## 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.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = 'ResearchKit'
-  s.version      = '1.3.0'
+  s.version      = '1.3.1'
   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/'

ResearchKit.xcodeproj/project.pbxproj

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0700"
+   LastUpgradeVersion = "0800"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

ResearchKit.xcodeproj/xcshareddata/xcschemes/ResearchKit.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0700"
+   LastUpgradeVersion = "0800"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

ResearchKit.xcodeproj/xcshareddata/xcschemes/docs.xcscheme

@@ -90,7 +90,7 @@ - (NSMutableDictionary *)ork_JSONMutableDictionaryWithOptions:(ORKSampleJSONOpti
     }
 
     if (options & ORKSampleIncludeSource) {
-        HKSource *source = [self source];
+        HKSource *source = [[self sourceRevision] source];
         if (source.name) {
             mutableDictionary[HKSourceKey] = source.name;
         }

ResearchKit/ActiveTasks/HKSample+ORKJSONDictionary.m

@@ -352,6 +352,10 @@ - (void)updateGraphSamples {
 - (void)updateAlertLabelHidden {
     NSNumber *sample = _samples.lastObject;
     BOOL show = (!_finished && (sample.doubleValue > _alertThreshold)) || _failed;
+    
+    if (_alertLabel.hidden && show) {
+        UIAccessibilityPostNotification(UIAccessibilityAnnouncementNotification, _alertLabel.text);
+    }
     _alertLabel.hidden = !show;
 }
 
@@ -385,11 +389,9 @@ - (BOOL)isAccessibilityElement {
 }
 
 - (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/ORKAudioContentView.m

@@ -43,7 +43,7 @@ ORK_CLASS_AVAILABLE
  
  @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

ResearchKit/ActiveTasks/ORKAudioLevelNavigationRule.h

@@ -135,8 +135,7 @@ - (NSString *)identifierForDestinationStepWithTaskResult:(ORKTaskResult *)taskRe
     return self.destinationStepIdentifier;
 }
 
-- (BOOL)checkAudioLevelFromSoundFile:(NSURL *)fileURL
-{
+- (BOOL)checkAudioLevelFromSoundFile:(NSURL *)fileURL {
     // Setup reader
     AVURLAsset *urlAsset = [AVURLAsset URLAssetWithURL:fileURL options:nil];
     if (urlAsset.tracks.count == 0) {