Track changes

ResearchKit.xcodeproj/xcshareddata/xcschemes/ResearchKitTests.xcscheme

@@ -54,36 +54,6 @@
                <Test
                   Identifier = "ORKDataCollectionTests">
                </Test>
-               <Test
-                  Identifier = "ORKJSONSerializationTests">
-               </Test>
-               <Test
-                  Identifier = "ORKJSONSerializationTests/testAddResult">
-               </Test>
-               <Test
-                  Identifier = "ORKJSONSerializationTests/testDateComponentsSerialization">
-               </Test>
-               <Test
-                  Identifier = "ORKJSONSerializationTests/testEquality">
-               </Test>
-               <Test
-                  Identifier = "ORKJSONSerializationTests/testInvalidDBHLValue">
-               </Test>
-               <Test
-                  Identifier = "ORKJSONSerializationTests/testMissingDefaultValueKeyInScaleAnswerFormat">
-               </Test>
-               <Test
-                  Identifier = "ORKJSONSerializationTests/testORKSampleDeserialization">
-               </Test>
-               <Test
-                  Identifier = "ORKJSONSerializationTests/testORKSerialization">
-               </Test>
-               <Test
-                  Identifier = "ORKJSONSerializationTests/testSecureCoding">
-               </Test>
-               <Test
-                  Identifier = "ORKJSONSerializationTests/testTaskModel">
-               </Test>
             </SkippedTests>
          </TestableReference>
       </Testables>

ResearchKit/Common/ORKAnswerFormat.h

@@ -32,7 +32,11 @@
  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+
 #import <UIKit/UIKit.h>
+
+
+#if TARGET_OS_IOS
 #import <ResearchKit/ORKTypes.h>
 
 @class ORKScaleAnswerFormat;
@@ -52,6 +56,7 @@
 @class ORKLocationAnswerFormat;
 @class ORKSESAnswerFormat;
 @class ORKImageChoice;
+#endif
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -434,6 +439,10 @@ ORK_CLASS_AVAILABLE
 
 @end
 
+
+#pragma mark - iOS
+
+#if TARGET_OS_IOS
 @interface ORKAnswerFormat()
 
 /// @name Factory methods
@@ -523,7 +532,7 @@ ORK_CLASS_AVAILABLE
                                                       minimumValue:(double)minimumValue
                                                       maximumValue:(double)maximumValue
                                                       defaultValue:(double)defaultValue;
-#if ORK_FEATURE_CLLOCATIONMANAGER_AUTHORIZATION && TARGET_OS_IOS
+#if ORK_FEATURE_CLLOCATIONMANAGER_AUTHORIZATION
 + (ORKLocationAnswerFormat *)locationAnswerFormat;
 #endif
 
@@ -1781,7 +1790,6 @@ This By default, the value of this property is `NO`.
   */
 @property (copy, nullable) NSString *placeholder;
 
-#if !TARGET_OS_WATCH
 /**
  The autocapitalization type that applies to the user's input.
 
@@ -1824,7 +1832,6 @@ This By default, the value of this property is `NO`.
  If specified, overrides the default password generation rules for fields with secureTextEntry.
  */
 @property (nonatomic, copy, nullable) UITextInputPasswordRules *passwordRules API_AVAILABLE(ios(12));
-#endif
 
 @end
 
@@ -2207,7 +2214,7 @@ ORK_CLASS_AVAILABLE
 
  An `ORKLocationAnswerFormat` object produces an `ORKLocationQuestionResult` object.
  */
-#if ORK_FEATURE_CLLOCATIONMANAGER_AUTHORIZATION && TARGET_OS_IOS
+#if ORK_FEATURE_CLLOCATIONMANAGER_AUTHORIZATION
 ORK_CLASS_AVAILABLE
 @interface ORKLocationAnswerFormat : ORKAnswerFormat
 
@@ -2243,4 +2250,6 @@ ORK_CLASS_AVAILABLE
 
 @end
 
+#endif
+
 NS_ASSUME_NONNULL_END

ResearchKit/Common/ORKAnswerFormat.m

@@ -90,11 +90,11 @@ BOOL ORKIsAnswerEmpty(id answer) {
 }
 
 
+#if TARGET_OS_IOS
 static NSNumberFormatterStyle ORKNumberFormattingStyleConvert(ORKNumberFormattingStyle style) {
     return style == ORKNumberFormattingStylePercent ? NSNumberFormatterPercentStyle : NSNumberFormatterDecimalStyle;
 }
 
-#if TARGET_OS_IOS
 @implementation ORKAnswerDefaultSource {
     NSMutableDictionary *_unitsTable;
 }
@@ -289,6 +289,8 @@ - (void)updateHealthKitUnitForAnswerFormat:(ORKAnswerFormat *)answerFormat force
 
 @implementation ORKAnswerFormat
 
+#if TARGET_OS_IOS
+
 + (ORKScaleAnswerFormat *)scaleAnswerFormatWithMaximumValue:(NSInteger)scaleMaximum
                                                minimumValue:(NSInteger)scaleMinimum
                                                defaultValue:(NSInteger)defaultValue
@@ -422,7 +424,7 @@ + (ORKDateAnswerFormat *)dateAnswerFormatWithStyle:(ORKDateAnswerStyle)style
                                                                           calendar:calendar];
     [answerFormat setDaysBeforeCurrentDateToSetMinimumDate:daysBefore];
     [answerFormat setDaysAfterCurrentDateToSetMinimumDate:daysAfter];
-
+    
     return answerFormat;
 }
 
@@ -487,7 +489,7 @@ + (ORKWeightAnswerFormat *)weightAnswerFormatWithMeasurementSystem:(ORKMeasureme
                                                        defaultValue:defaultValue];
 }
 
-#if ORK_FEATURE_CLLOCATIONMANAGER_AUTHORIZATION && TARGET_OS_IOS
+#if ORK_FEATURE_CLLOCATIONMANAGER_AUTHORIZATION
 + (ORKLocationAnswerFormat *)locationAnswerFormat {
     return [ORKLocationAnswerFormat new];
 }
@@ -499,6 +501,8 @@ + (ORKSESAnswerFormat *)socioEconomicAnswerFormatWithTopRungText:(NSString *)top
                                                                 bottomRungText:bottomRungText];
 }
 
+#endif
+
 + (ORKBooleanAnswerFormat *)booleanAnswerFormat {
     return [ORKBooleanAnswerFormat new];
 }
@@ -684,6 +688,7 @@ static void ork_validateChoices(NSArray *choices) {
     return choices;
 }
 
+#if TARGET_OS_IOS
 @implementation ORKValuePickerAnswerFormat {
     ORKChoiceAnswerFormatHelper *_helper;
     ORKTextChoice *_nullTextChoice;
@@ -836,7 +841,7 @@ - (id)copyWithZone:(NSZone *)zone {
 
 - (BOOL)isEqual:(id)object {
     BOOL isParentSame = [super isEqual:object];
-
+    
     __typeof(self) castObject = object;
     return (isParentSame &&
             ORKEqualObjects(self.valuePickers, castObject.valuePickers));
@@ -885,7 +890,7 @@ - (NSString *)stringForAnswer:(id)answer {
     if (![answer isKindOfClass:[NSArray class]] || ([(NSArray*)answer count] != self.valuePickers.count)) {
         return nil;
     }
-
+    
     NSArray *answers = (NSArray*)answer;
     __block NSMutableArray <NSString *> *answerTexts = [NSMutableArray new];
     [answers enumerateObjectsUsingBlock:^(id  _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
@@ -896,11 +901,11 @@ - (NSString *)stringForAnswer:(id)answer {
             *stop = YES;
         }
     }];
-
+    
     if (answerTexts.count != self.valuePickers.count) {
         return nil;
     }
-
+    
     return [answerTexts componentsJoinedByString:self.separator];
 }
 
@@ -1022,6 +1027,8 @@ - (NSArray *)choices {
 }
 
 @end
+#endif
+
 
 #pragma mark - ORKTextChoiceAnswerFormat
 
@@ -1481,6 +1488,7 @@ - (BOOL)shouldShowDontKnowButton {
 
 
 #pragma mark - ORKTextChoiceOther
+#if TARGET_OS_IOS
 @implementation ORKTextChoiceOther
 
 + (instancetype)new {
@@ -1704,6 +1712,7 @@ - (BOOL)shouldShowDontKnowButton {
 }
 
 @end
+#endif
 
 
 #pragma mark - ORKBooleanAnswerFormat
@@ -1791,7 +1800,7 @@ - (BOOL)shouldShowDontKnowButton {
 
 
 #pragma mark - ORKTimeOfDayAnswerFormat
-
+#if TARGET_OS_IOS
 @implementation ORKTimeOfDayAnswerFormat
 
 - (instancetype)init {
@@ -2818,7 +2827,7 @@ - (BOOL)shouldHideValueMarkers {
 
 
 #pragma mark - ORKTextScaleAnswerFormat
-
+#if TARGET_OS_IOS
 @interface ORKTextScaleAnswerFormat () {
 
     ORKChoiceAnswerFormatHelper *_helper;
@@ -3029,15 +3038,19 @@ - (NSArray *)choices {
 
 @end
 
+#endif
+
 
 #pragma mark - ORKTextAnswerFormat
 
 @interface ORKTextAnswerFormat()
 
+
 @end
 
 @implementation ORKTextAnswerFormat
 
+
 - (Class)questionResultClass {
     return [ORKTextQuestionResult class];
 }
@@ -3056,6 +3069,7 @@ - (void)commonInit {
 
 }
 
+
 - (instancetype)initWithMaximumLength:(NSInteger)maximumLength {
     self = [super init];
     if (self) {
@@ -3307,6 +3321,7 @@ - (NSString *)stringForAnswer:(id)answer {
     return answerString;
 }
 
+
 - (ORKQuestionResult *)resultWithIdentifier:(NSString *)identifier answer:(id)answer {
     ORKQuestionResult *questionResult = nil;
     questionResult = (ORKQuestionResult *)[super resultWithIdentifier:identifier answer:answer];
@@ -4004,7 +4019,7 @@ + (BOOL)supportsSecureCoding {
 @end
 
 
-#if ORK_FEATURE_CLLOCATIONMANAGER_AUTHORIZATION && TARGET_OS_IOS
+#if ORK_FEATURE_CLLOCATIONMANAGER_AUTHORIZATION
 #pragma mark - ORKLocationAnswerFormat
 @implementation ORKLocationAnswerFormat
 
@@ -4138,3 +4153,4 @@ - (NSString *)stringForAnswer:(id)answer {
 }
 
 @end
+#endif

ResearchKit/Common/ORKAnswerFormat_Internal.h

@@ -33,9 +33,10 @@
 #import <HealthKit/HealthKit.h>
 #endif
 
+#if TARGET_OS_IOS
 #import <ResearchKit/ORKAnswerFormat_Private.h>
 #import <ResearchKit/ORKChoiceAnswerFormatHelper.h>
-
+#endif
 @class ORKChoiceAnswerFormatHelper;
 
 NS_ASSUME_NONNULL_BEGIN
@@ -57,7 +58,7 @@ NSString *ORKQuestionTypeString(ORKQuestionType questionType);
 @end
 
 ORK_DESIGNATE_CODING_AND_SERIALIZATION_INITIALIZERS(ORKAnswerFormat)
-#if TARGET_OS_IOS || TARGET_OS_VISION
+#if TARGET_OS_IOS
 ORK_DESIGNATE_CODING_AND_SERIALIZATION_INITIALIZERS(ORKImageChoiceAnswerFormat)
 ORK_DESIGNATE_CODING_AND_SERIALIZATION_INITIALIZERS(ORKValuePickerAnswerFormat)
 ORK_DESIGNATE_CODING_AND_SERIALIZATION_INITIALIZERS(ORKMultipleValuePickerAnswerFormat)
@@ -134,11 +135,6 @@ ORK_DESIGNATE_CODING_AND_SERIALIZATION_INITIALIZERS(ORKTextChoice)
 
 @end
 
-@interface ORKDateAnswerFormat () {
-    NSDate *_currentDateOverride;
-}
-@end
-
 #if TARGET_OS_IOS
 @protocol ORKScaleAnswerFormatProvider <NSObject>
 
@@ -202,7 +198,6 @@ NSArray<Class> *ORKAllowableValueClasses(void);
 @end
 
 #if TARGET_OS_IOS
-
 @interface ORKValuePickerAnswerFormat ()
 
 - (instancetype)initWithTextChoices:(NSArray<ORKTextChoice *> *)textChoices nullChoice:(ORKTextChoice *)nullChoice NS_DESIGNATED_INITIALIZER;
@@ -211,6 +206,7 @@ NSArray<Class> *ORKAllowableValueClasses(void);
 
 @end
 
+
 @interface ORKImageChoice () <ORKAnswerOption>
 
 @end
@@ -222,7 +218,11 @@ NSArray<Class> *ORKAllowableValueClasses(void);
 
 @end
 
-@interface ORKDateAnswerFormat ()
+
+@interface ORKDateAnswerFormat () {
+    NSDate *_currentDateOverride;
+}
+
 - (NSDate *)pickerDefaultDate;
 - (nullable NSDate *)pickerMinimumDate;
 - (nullable NSDate *)pickerMaximumDate;

ResearchKit/Common/ORKAnswerFormat_Private.h

@@ -28,7 +28,12 @@
  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+
+
+#if TARGET_OS_IOS
 #import <ResearchKit/ORKAnswerFormat.h>
+#endif
+
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -55,6 +60,7 @@ ORK_EXTERN id ORKNullAnswerValue(void) ORK_AVAILABLE_DECL;
 
  An `ORKConfirmTextAnswerFormat` object produces an `ORKBooleanQuestionResult` object.
  */
+#if TARGET_OS_IOS
 ORK_CLASS_AVAILABLE
 @interface ORKConfirmTextAnswerFormat : ORKTextAnswerFormat
 
@@ -89,6 +95,7 @@ ORK_CLASS_AVAILABLE
 @property (nonatomic, copy, readonly) NSString *errorMessage;
 
 @end
+#endif
 
 @protocol ORKAnswerFormatPlatterPresentable <NSObject>