Merge branch 'master' of github.com:ResearchKit/ResearchKit into rsanchezsaez-ipadmargins

# Conflicts:
#	ResearchKit/ActiveTasks/ORKAudioContentView.m
#	ResearchKit/Common/ORKChoiceViewCell.m
#	ResearchKit/Common/ORKHelpers.m
#	ResearchKit/Common/ORKScaleSliderView.m
#	ResearchKit/Common/ORKSkin.m
#	ResearchKit/Common/ORKSurveyAnswerCellForText.m

Author: rsanchezsaez

ResearchKit.xcodeproj/project.pbxproj

@@ -2284,6 +2284,7 @@
 				PRODUCT_NAME = ResearchKit;
 				SDKROOT = iphoneos;
 				SKIP_INSTALL = YES;
+				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
 		};
@@ -2310,6 +2311,7 @@
 				PRODUCT_NAME = ResearchKit;
 				SDKROOT = iphoneos;
 				SKIP_INSTALL = YES;
+				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Release;
 		};

ResearchKit/Accessibility/ORKAccessibility.h

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

ResearchKit/Accessibility/ORKAccessibilityFunctions.h

@@ -28,9 +28,11 @@
  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+
 #import "ORKDefines.h"
 #import "ORKHelpers.h"
 
+
 @class ORKScaleSlider;
 
 // Used to properly format values from the ORKScaleSlider.

ResearchKit/Accessibility/ORKAccessibilityFunctions.m

@@ -28,13 +28,15 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+
 #import <UIKit/UIKit.h>
 #import "ORKAccessibilityFunctions.h"
 #import "ORKAnswerFormat_Internal.h"
 #import "ORKScaleSlider.h"
 #import "ORKScaleSliderView.h"
 #import "UIView+ORKAccessibility.h"
 
+
 NSString *ORKAccessibilityFormatScaleSliderValue(CGFloat value, ORKScaleSlider *slider) {
     ORKScaleSliderView *sliderView = (ORKScaleSliderView *)[slider ork_superviewOfType:[ORKScaleSliderView class]];
     if (!slider || !sliderView) {

ResearchKit/Accessibility/UIView+ORKAccessibility.h

@@ -28,9 +28,11 @@
  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+
 #import <UIKit/UIKit.h>
 #import <ResearchKit/ResearchKit.h>
 
+
 NS_ASSUME_NONNULL_BEGIN
 
 @interface UIView (ORKAccessibility)

ResearchKit/Accessibility/UIView+ORKAccessibility.m

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

ResearchKit/ActiveTasks/CMMotionActivity+ORKJSONDictionary.m

@@ -48,23 +48,23 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 }
 
 static NSArray *activityArray(CMMotionActivity *activity) {
-    NSMutableArray *ret = [NSMutableArray array];
+    NSMutableArray *array = [NSMutableArray array];
     if (activity.unknown) {
-        [ret addObject:kActivityUnknown];
+        [array addObject:kActivityUnknown];
     }
     if (activity.stationary) {
-        [ret addObject:kActivityStationary];
+        [array addObject:kActivityStationary];
     }
     if (activity.walking) {
-        [ret addObject:kActivityWalking];
+        [array addObject:kActivityWalking];
     }
     if (activity.running) {
-        [ret addObject:kActivityRunning];
+        [array addObject:kActivityRunning];
     }
     if (activity.automotive) {
-        [ret addObject:kActivityAutomotive];
+        [array addObject:kActivityAutomotive];
     }
-    return ret;
+    return array;
 }
 
 

ResearchKit/ActiveTasks/ORKActiveStep.h

@@ -33,6 +33,7 @@
 #import <ResearchKit/ORKStep.h>
 #import <UIKit/UIKit.h>
 
+
 NS_ASSUME_NONNULL_BEGIN
 
 /**
@@ -100,7 +101,6 @@ automatically navigates forward when the timer expires.
  */
 @property (nonatomic) BOOL shouldSpeakCountDown;
 
-
 /**
  A Boolean value indicating whether to start the count down timer automatically when the step starts, or
  require the user to take some explicit action to start the step, such as tapping a button.
@@ -193,7 +193,6 @@ The default value of this property is `NO`.
  */
 @property (nonatomic, copy, nullable) NSArray *recorderConfigurations;
 
-
 /**
  The set of HealthKit types the step requests for reading. (read-only)
  
@@ -219,7 +218,6 @@ The default value of this property is `NO`.
  */
 @property (nonatomic, readonly) ORKPermissionMask requestedPermissions;
 
-
 @end
 
 NS_ASSUME_NONNULL_END

ResearchKit/ActiveTasks/ORKActiveStep.m

@@ -36,6 +36,7 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 #import "ORKActiveStepViewController.h"
 #import "ORKRecorder_Private.h"
 
+
 @implementation ORKActiveStep
 
 + (Class)stepViewControllerClass {
@@ -52,23 +53,22 @@ - (BOOL)hasCountDown {
 
 - (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);
+    return  (_spokenInstruction != nil && _spokenInstruction.length > 0);
 }
 
 - (BOOL)isRestorable {
     return NO;
 }
 
-
 + (BOOL)supportsSecureCoding {
     return YES;
 }
@@ -99,7 +99,6 @@ - (instancetype)copyWithZone:(NSZone *)zone {
     return step;
 }
 
-
 - (instancetype)initWithCoder:(NSCoder *)aDecoder {
     self = [super initWithCoder:aDecoder];
     if (self ) {
@@ -137,8 +136,6 @@ - (void)encodeWithCoder:(NSCoder *)aCoder {
     ORK_ENCODE_OBJ(aCoder, recorderConfigurations);
 }
 
-
-
 - (BOOL)isEqual:(id)object {
     BOOL isParentSame = [super isEqual:object];
 
@@ -159,10 +156,6 @@ - (BOOL)isEqual:(id)object {
             (self.shouldUseNextAsSkipButton == castObject.shouldUseNextAsSkipButton)) ;
 }
 
-
-
-
-
 - (NSSet *)requestedHealthKitTypesForReading {
     NSMutableSet *set = [NSMutableSet set];
     for (ORKRecorderConfiguration *config in self.recorderConfigurations) {
@@ -172,7 +165,6 @@ - (NSSet *)requestedHealthKitTypesForReading {
         }
     }
     return set;
-    
 }
 
 - (ORKPermissionMask)requestedPermissions {

ResearchKit/ActiveTasks/ORKActiveStepQuantityView.h

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